diff --git a/.claude/commands/coreex-docs-sync.md b/.claude/commands/coreex-docs-sync.md
new file mode 100644
index 00000000..43f0709d
--- /dev/null
+++ b/.claude/commands/coreex-docs-sync.md
@@ -0,0 +1,87 @@
+---
+description: "Fetch the CoreEx sample architecture docs and all per-package AI usage guides from GitHub and cache them locally under .github/docs/coreex/ for offline, faster expert guidance."
+allowed-tools: [Read, Write, Glob, Grep, WebFetch]
+---
+
+Sync the CoreEx docs to `.github/docs/coreex/`. Follow these steps exactly.
+
+## Step 1 — Detect current CoreEx version
+
+Search for the `CoreEx` NuGet package version in this order, stopping at the first match:
+1. `Directory.Packages.props` — look for `<PackageVersion Include="CoreEx" Version="..." />`
+2. Any `*.csproj` file — look for `<PackageReference Include="CoreEx" Version="..." />`
+3. `Directory.Build.props`
+
+Record the version (or `unknown` if not found). Use it in the manifest.
+
+## Step 2 — Detect referenced CoreEx packages (for manifest only)
+
+Scan `Directory.Packages.props` and all `*.csproj` files for `PackageVersion` or `PackageReference` entries whose `Include` attribute starts with `CoreEx`. Collect the distinct package names. This list goes into the manifest so the CoreEx Expert knows which packages the project currently uses — it does not limit which guides are synced.
+
+## Step 3 — Create cache directories
+
+Ensure both directories exist. Create them if absent:
+- `.github/docs/coreex/`
+- `.github/docs/coreex/agents/`
+
+## Step 4 — Fetch and write the sample architecture docs
+
+Fetch each URL below and write to the corresponding local path. Report each as it completes.
+
+| URL | Local path |
+|---|---|
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/local-dev.md` | `.github/docs/coreex/local-dev.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/layers.md` | `.github/docs/coreex/layers.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/patterns.md` | `.github/docs/coreex/patterns.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/contracts-layer.md` | `.github/docs/coreex/contracts-layer.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/domain-layer.md` | `.github/docs/coreex/domain-layer.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/application-layer.md` | `.github/docs/coreex/application-layer.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/infrastructure-layer.md` | `.github/docs/coreex/infrastructure-layer.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/hosts-layer.md` | `.github/docs/coreex/hosts-layer.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/testing.md` | `.github/docs/coreex/testing.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/tooling.md` | `.github/docs/coreex/tooling.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/samples/docs/aspire.md` | `.github/docs/coreex/aspire.md` |
+
+## Step 5 — Fetch and write all per-package guides
+
+Fetch the `AGENTS.md` for every CoreEx package listed below — regardless of whether the project currently references them. This allows the CoreEx Expert to guide on and recommend any package, including ones not yet adopted.
+
+| URL | Local path |
+|---|---|
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.AspNetCore/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.AspNetCore.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.AspNetCore.NSwag/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.AspNetCore.NSwag.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Azure.Messaging.ServiceBus/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Azure.Messaging.ServiceBus.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Caching.FusionCache/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Caching.FusionCache.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.CodeGen/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.CodeGen.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Data/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Data.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Database/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Database.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Database.Postgres/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Database.Postgres.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Database.SqlServer/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Database.SqlServer.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.DomainDriven/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.DomainDriven.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.EntityFrameworkCore/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.EntityFrameworkCore.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Events/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Events.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.RefData/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.RefData.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.UnitTesting/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.UnitTesting.md` |
+| `https://raw.githubusercontent.com/Avanade/CoreEx/main/src/CoreEx.Validation/AGENTS.md` | `.github/docs/coreex/agents/CoreEx.Validation.md` |
+
+If any fetch fails, record the failure, skip that file, and continue.
+
+## Step 6 — Write the manifest
+
+Write `.github/docs/coreex/.manifest` with this exact format:
+
+```
+synced: YYYY-MM-DD
+coreex-version: <version from Step 1, or "unknown">
+referenced-packages: <comma-separated list of packages detected in Step 2, or "none detected">
+```
+
+## Step 7 — Report
+
+Summarise:
+- How many architecture docs were written successfully.
+- How many package guides were written successfully (out of 16).
+- Any files that failed to fetch (with the error).
+- The CoreEx version and referenced packages recorded in the manifest.
+- A reminder: *"Re-run `/coreex-docs-sync` after bumping the CoreEx NuGet version or when the CoreEx Expert suggests the cache is stale."*
diff --git a/.claude/commands/coreex-expert.md b/.claude/commands/coreex-expert.md
new file mode 100644
index 00000000..286e8183
--- /dev/null
+++ b/.claude/commands/coreex-expert.md
@@ -0,0 +1,8 @@
+---
+description: "CoreEx Expert — architecture guidance, pattern decisions, and sample-aligned advice for projects using CoreEx NuGet packages."
+allowed-tools: [Read, Glob, Grep, WebFetch, WebSearch, Edit, Write]
+---
+
+Read `.github/agents/coreex-expert.agent.md` and follow the instructions in that file.
+
+The user's question or request follows. Apply the CoreEx Expert role, operating rules, and response format defined in the agent file.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 00000000..b1dbbf04
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-reportgenerator-globaltool": {
+      "version": "5.5.10",
+      "commands": [
+        "reportgenerator"
+      ]
+    }
+  }
+}
diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index f2dfd3bc..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,37 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..643a1302
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,197 @@
+root = true
+
+# ── Universal ────────────────────────────────────────────────────────────────
+
+[*]
+charset                  = utf-8
+indent_style             = space
+indent_size              = 4
+trim_trailing_whitespace = true
+insert_final_newline     = true
+end_of_line              = lf
+
+# ── C# source files ──────────────────────────────────────────────────────────
+
+[*.cs]
+indent_style = space
+indent_size  = 4
+
+# ── Formatting ───────────────────────────────────────────────────────────────
+
+# Allman-style braces — opening brace always on its own line.
+csharp_new_line_before_open_brace                                   = all
+csharp_new_line_before_else                                         = true
+csharp_new_line_before_catch                                        = true
+csharp_new_line_before_finally                                      = true
+csharp_new_line_before_members_in_object_initializers              = true
+csharp_new_line_before_members_in_anonymous_types                  = true
+csharp_new_line_between_query_expression_clauses                   = true
+
+# Indentation
+csharp_indent_case_contents                                         = true
+csharp_indent_switch_labels                                         = true
+csharp_indent_labels                                                = flush_left
+
+# Spacing
+csharp_space_after_cast                                             = false
+csharp_space_after_keywords_in_control_flow_statements             = true
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses        = false
+csharp_space_before_colon_in_inheritance_clause                    = true
+csharp_space_after_colon_in_inheritance_clause                     = true
+csharp_space_around_binary_operators                               = before_and_after
+
+# Wrapping
+csharp_preserve_single_line_statements                             = false
+csharp_preserve_single_line_blocks                                 = true
+
+# Using directives — System.* first; no blank lines between groups.
+dotnet_sort_system_directives_first                                 = false
+dotnet_separate_import_directive_groups                            = false
+
+# ── Language rules — standards (IDE warning; not a build error without EnforceCodeStyleInBuild) ──
+
+# File-scoped namespaces required.
+csharp_style_namespace_declarations                                = file_scoped:warning
+
+# Null-forgiving operator: prefer is-null checks over reference equality.
+dotnet_style_prefer_is_null_check_over_reference_equality_method  = true:warning
+
+# ── Language rules — modernisation (IDE suggestion) ──────────────────────────
+
+# Braces: omit on single-line if/else/for/while bodies; require when multi-line.
+csharp_prefer_braces                                               = when_multiline:none
+
+# Expression-bodied members: prefer => when the entire body is a single expression.
+csharp_style_expression_bodied_methods                             = when_on_single_line:none
+csharp_style_expression_bodied_properties                          = true:none
+csharp_style_expression_bodied_accessors                           = when_on_single_line:none
+csharp_style_expression_bodied_indexers                            = when_on_single_line:none
+csharp_style_expression_bodied_operators                           = when_on_single_line:none
+csharp_style_expression_bodied_lambdas                             = when_on_single_line:none
+csharp_style_expression_bodied_local_functions                     = when_on_single_line:none
+csharp_style_expression_bodied_constructors                        = when_on_single_line:none
+
+# var: prefer explicit type for built-ins; prefer var when type is obvious from RHS.
+csharp_style_var_for_built_in_types                                = false:none
+csharp_style_var_when_type_is_apparent                             = true:none
+csharp_style_var_elsewhere                                         = true:none
+
+# Null handling and pattern matching.
+dotnet_style_null_propagation                                      = true:none
+dotnet_style_coalesce_expression                                   = true:none
+csharp_style_prefer_null_check_over_type_check                     = true:none
+csharp_style_prefer_is_not_expression                              = true:none
+csharp_style_prefer_pattern_matching                               = true:none
+csharp_style_prefer_switch_expression                              = true:none
+
+# Object and collection initialisers.
+dotnet_style_object_initializer                                    = true:none
+dotnet_style_collection_initializer                                = true:none
+
+# Modern using declarations (using var x = ... instead of using (var x = ...)).
+csharp_prefer_simple_using_statement                               = true:none
+
+# Auto-properties over explicit backing fields where no extra logic exists.
+dotnet_style_prefer_auto_properties                                = true:none
+
+# Throw expressions (x ?? throw ...).
+csharp_style_throw_expression                                      = true:none
+
+# Conditional delegate invocation (handler?.Invoke() vs if (handler != null) handler()).
+csharp_style_conditional_delegate_call                             = true:none
+
+# Tuple/anonymous type member names.
+dotnet_style_prefer_inferred_tuple_names                           = true:none
+dotnet_style_prefer_inferred_anonymous_type_member_names           = true:none
+
+# Accessibility modifiers — always explicit, even when the default would apply.
+dotnet_style_require_accessibility_modifiers                       = for_non_interface_members:none
+
+# Preferred modifier order.
+csharp_preferred_modifier_order                                    = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:none
+
+# ── Naming conventions ───────────────────────────────────────────────────────
+# Rules are evaluated top-to-bottom; the first match wins.
+
+## Symbol groups
+
+dotnet_naming_symbols.private_fields.applicable_kinds             = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities   = private,private_protected
+
+dotnet_naming_symbols.non_private_fields.applicable_kinds         = field
+dotnet_naming_symbols.non_private_fields.applicable_accessibilities = public,internal,protected,protected_internal
+
+dotnet_naming_symbols.constants.applicable_kinds                  = field,local
+dotnet_naming_symbols.constants.required_modifiers                = const
+
+dotnet_naming_symbols.interfaces.applicable_kinds                 = interface
+
+dotnet_naming_symbols.type_parameters.applicable_kinds            = type_parameter
+
+dotnet_naming_symbols.async_methods.applicable_kinds              = method
+dotnet_naming_symbols.async_methods.required_modifiers            = async
+
+## Naming styles
+
+# _camelCase
+dotnet_naming_style.prefix_underscore.capitalization              = camel_case
+dotnet_naming_style.prefix_underscore.required_prefix             = _
+
+# PascalCase
+dotnet_naming_style.pascal_case.capitalization                    = pascal_case
+
+# IPascalCase
+dotnet_naming_style.i_prefix_pascal_case.capitalization           = pascal_case
+dotnet_naming_style.i_prefix_pascal_case.required_prefix          = I
+
+# TPascalCase
+dotnet_naming_style.t_prefix_pascal_case.capitalization           = pascal_case
+dotnet_naming_style.t_prefix_pascal_case.required_prefix          = T
+
+# PascalCaseAsync
+dotnet_naming_style.pascal_case_async.capitalization              = pascal_case
+dotnet_naming_style.pascal_case_async.required_suffix             = Async
+
+## Rules
+
+# Private fields → _camelCase  (warning — agreed standard)
+dotnet_naming_rule.private_fields_underscore.symbols              = private_fields
+dotnet_naming_rule.private_fields_underscore.style                = prefix_underscore
+dotnet_naming_rule.private_fields_underscore.severity             = warning
+
+# Non-private fields → PascalCase  (suggestion — rare in this codebase)
+dotnet_naming_rule.non_private_fields_pascal.symbols              = non_private_fields
+dotnet_naming_rule.non_private_fields_pascal.style                = pascal_case
+dotnet_naming_rule.non_private_fields_pascal.severity             = suggestion
+
+# Constants → PascalCase  (suggestion)
+dotnet_naming_rule.constants_pascal.symbols                       = constants
+dotnet_naming_rule.constants_pascal.style                         = pascal_case
+dotnet_naming_rule.constants_pascal.severity                      = suggestion
+
+# Interfaces → IPascalCase  (warning — agreed standard)
+dotnet_naming_rule.interfaces_i_prefix.symbols                    = interfaces
+dotnet_naming_rule.interfaces_i_prefix.style                      = i_prefix_pascal_case
+dotnet_naming_rule.interfaces_i_prefix.severity                   = warning
+
+# Type parameters → TPascalCase  (suggestion)
+dotnet_naming_rule.type_parameters_t_prefix.symbols               = type_parameters
+dotnet_naming_rule.type_parameters_t_prefix.style                 = t_prefix_pascal_case
+dotnet_naming_rule.type_parameters_t_prefix.severity              = suggestion
+
+# Async methods → PascalCaseAsync  (warning — agreed standard)
+dotnet_naming_rule.async_methods_async_suffix.symbols             = async_methods
+dotnet_naming_rule.async_methods_async_suffix.style               = pascal_case_async
+dotnet_naming_rule.async_methods_async_suffix.severity            = warning
+
+# ── Structured data files ─────────────────────────────────────────────────────
+
+[*.{json,jsn,xml,yaml,yml,props,csproj,sln,sql,pgsql}]
+indent_style = space
+indent_size  = 2
+
+# ── Markdown ──────────────────────────────────────────────────────────────────
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.filenesting.json b/.filenesting.json
new file mode 100644
index 00000000..e21bbefa
--- /dev/null
+++ b/.filenesting.json
@@ -0,0 +1,14 @@
+{
+  "help": "https://go.microsoft.com/fwlink/?linkid=866610",
+  "dependentFileProviders": {
+    "add": {
+      "pathSegment": {
+        "add": {
+          ".g.cs": [
+            ".cs"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..2bbf8c1f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+*.sh text eol=lf
\ No newline at end of file
diff --git a/.github/AI-WORKFLOWS.md b/.github/AI-WORKFLOWS.md
new file mode 100644
index 00000000..03fcd96a
--- /dev/null
+++ b/.github/AI-WORKFLOWS.md
@@ -0,0 +1,51 @@
+# AI Workflow Set
+
+This folder contains the AI artefacts that give GitHub Copilot and Claude Code authoritative knowledge of CoreEx patterns, conventions, and architecture. They can be used directly in the CoreEx repository or copied into a consuming project.
+
+## What's here
+
+| Artefact | Path | Purpose |
+|----------|------|---------|
+| Global instructions | `copilot-instructions.md` | Auto-injected project-wide context: repo shape, conventions, house rules, generated-file ownership. Applied to every chat interaction automatically. |
+| Area instructions | `instructions/*.instructions.md` | Scoped context injected automatically when editing a matching file type (contracts, services, repositories, controllers, tests, etc.). |
+| Agent | `agents/coreex-expert.agent.md` | Dedicated expert for CoreEx architecture and pattern guidance — explains conventions, reviews designs, and routes to the right command. |
+| Prompts | `prompts/*.prompt.md` | Deterministic, file-driven commands invoked with `/` in chat. |
+| Skills | `skills/*/SKILL.md` | Reasoning-based commands for open-ended tasks. Invoked with `/` in Claude Code; attach the `SKILL.md` via `#file:` in Copilot. |
+| Authoring guides | `INSTRUCTION_AUTHORING.md`, `SKILL_AUTHORING.md` | Standards for writing new instruction files and skills. |
+
+## Agent
+
+**`coreex-expert`** — invoke when you need to explain a CoreEx concept, choose between patterns, review a design, or get architecture guidance aligned to the sample implementations.
+
+- Claude Code: `@coreex-expert`
+- Copilot Chat: switch to **Agent** mode and select **CoreEx Expert**
+
+The agent uses a local doc cache (populated by `/coreex-docs-sync`) to avoid live GitHub fetches on every question. It covers all 16 CoreEx packages, distinguishing those already in the project from ones the project could adopt. See the [agent README](./agents/README.md) for the resolution flowchart, cache structure, and adoption guide.
+
+## Instructions
+
+Instructions are passive — no action is needed to activate them. The global file applies to every session; area files are injected automatically based on what you are editing.
+
+| File | Injected when editing |
+|------|-----------------------|
+| `coreex-conventions.instructions.md` | All `.cs` files — naming, nullability, expression bodies, `ConfigureAwait`, house rules |
+| `coreex-contracts.instructions.md` | Contract files — `[Contract]`, `[ReferenceData]`, source generation |
+| `coreex-application-services.instructions.md` | Application services — `TransactionAsync`, validation, event enqueuing |
+| `coreex-validators.instructions.md` | Validator files — `Validator<T,TSelf>`, rule chains |
+| `coreex-repositories.instructions.md` | Repository files — `EfDbModel`, mappers, `QueryArgsConfig`, paging |
+| `coreex-api-controllers.instructions.md` | Controller files — `WebApi` helpers, `[IdempotencyKey]`, PATCH |
+| `coreex-event-subscribers.instructions.md` | Subscriber files — `[Subscribe]`, `SubscribedManager`, error handling |
+| `coreex-host-setup.instructions.md` | `Program.cs` files — middleware order, service registration, outbox relay |
+| `coreex-tooling.instructions.md` | CodeGen and Database projects — `ref-data.yaml`, DbEx, generated-file ownership |
+| `coreex-tests.instructions.md` | Test files — UnitTestEx, NUnit, AwesomeAssertions, outbox/event assertions |
+| `coreex-domain.instructions.md` | Domain files — aggregates, mutation guards, `Result<T>` pipelines |
+
+## Prompts, Skills, and Templates
+
+| Command | Type | What it does |
+|---------|------|-------------|
+| [`CoreEx.Template`](../src/CoreEx.Template/README.md) | Template pack | Deterministic `dotnet new` scaffolding for a CoreEx solution plus API, relay, and subscriber hosts. Use `dotnet new install CoreEx.Template` and then the `coreex*` templates in a terminal. |
+| [`/acquire-codebase-knowledge`](./skills/acquire-codebase-knowledge/README.md) | Skill | Maps an unfamiliar codebase and produces seven structured onboarding documents. |
+| [`/coreex-scaffold`](./skills/solution-scaffolder/README.md) | Skill-backed prompt | Guides greenfield solution scaffolding, chooses the smallest safe CoreEx.Template shape, and runs the matching `dotnet new coreex*` commands. |
+| [`/coreex-docs-sync`](./skills/coreex-docs-sync/README.md) | Skill | Fetches and caches CoreEx architecture docs and all per-package AI guides locally under `.github/docs/coreex/`. |
+| [`/aspire`](./skills/aspire/README.md) | Skill | Orchestrates Aspire distributed apps locally: start, stop, logs, debug. |
diff --git a/.github/INSTRUCTION_AUTHORING.md b/.github/INSTRUCTION_AUTHORING.md
new file mode 100644
index 00000000..187eafe4
--- /dev/null
+++ b/.github/INSTRUCTION_AUTHORING.md
@@ -0,0 +1,246 @@
+---
+applyTo: "**/*.instructions.md"
+description: "Standards for authoring and maintaining Copilot instruction files in this repository"
+tags: ["authoring", "standards", "instructions", "documentation"]
+---
+
+# Instruction File Authoring Standards
+
+Instruction files (`.instructions.md`) are **context-window injections for a code model**. When Copilot generates or edits a file that matches the `applyTo` glob, the instruction file is automatically prepended to the context. This has two practical consequences that drive every rule below:
+
+- **Every token costs.** Instruction file content displaces actual code context. Brevity and precision matter.
+- **Code examples outperform prose rules.** Copilot is a code model. Showing it the exact pattern to follow produces better results than listing `MUST`/`MUST NOT` directives.
+
+Write instruction files as you would a concise internal coding guide for a capable new team member, not as a policy document.
+
+---
+
+## Principles
+
+- **Show, don't tell.** A real, working code example is worth more than five imperative rules.
+- **Be specific.** Use actual type names, package names, and method names from this codebase.
+- **Be brief.** If content cannot fit on one screen, split into a separate file or move detail to `Further Reading`.
+- **Do not restate global rules.** If `.github/copilot-instructions.md` already covers it, do not repeat it here.
+- **Explicit negation matters.** Copilot's training data contains many common patterns that are wrong for this repo. State anti-patterns explicitly with a `## Do Not` section.
+- **Scope tightly.** An instruction that is always injected regardless of context wastes tokens. Use the narrowest `applyTo` glob that is still correct.
+- **Never direct Copilot toward generated files.** Instruction files must never include guidance, examples, or `applyTo` globs that would cause Copilot to create or modify `*.g.cs`, `*.g.sql`, `*.g.pgsql`, or any other generated-output file. All generated files are owned exclusively by their corresponding tooling (Roslyn source generator, `*.Database` project, `*.CodeGen` project). Changes must be made to the source templates or generation configuration, not to the output. See [Generated Code](#generated-code) below.
+
+---
+
+## Required Format
+
+```markdown
+---
+applyTo: "<narrowest correct glob>"
+description: "<one concrete sentence describing what this file governs>"
+tags: ["tag1", "tag2"]
+---
+
+# <Layer/Area> Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.X` | `TypeA`, `TypeB`, `TypeC` |
+
+## <Pattern or topic>
+
+<One or two sentences stating the rule, followed immediately by a real code example.>
+
+```csharp
+// real example matching what the codebase actually looks like
+```
+
+## <Next pattern or topic>
+
+...
+
+## Do Not
+
+- Do not use `SomeWrongType` — use `CorrectType` instead.
+- Do not call `SomeAntiPattern()` directly; delegate to the application service.
+
+## Further Reading
+
+- [`samples/docs/<layer>.md`](../../samples/docs/<layer>.md) — layer-level walkthrough with sample code references.
+- [`src/CoreEx.X/README.md`](../../src/CoreEx.X/README.md) — full API reference for the primary package.
+```
+
+---
+
+## Frontmatter Rules
+
+- Field order: `applyTo` → `description` → `tags`.
+- `applyTo` must be the narrowest glob that correctly captures all relevant files. Examples:
+  - `**/Contracts/**/*.cs` — contract DTOs
+  - `**/Application/**/*.cs` — application services
+  - `**/Infrastructure/**/*.cs` — repositories and adapters
+  - `**/Controllers/**/*.cs` — API controllers
+  - `**/Subscribe/**/*.cs` — event subscriber classes
+  - `**/Program.cs` — host entry points
+  - `**/*Validator*.cs` — validator classes
+  - `**/*.Test*/**/*.cs` — test projects
+  - `**/*.Database/**/*.sql` — database project SQL scripts
+- `description` must be one sentence, concrete, and specific to the area governed.
+- `tags` must reflect the instruction's domain (e.g., `["validation", "application-layer", "unit-of-work"]`).
+- Do not use `applyTo: "**"` unless the file is genuinely repository-wide.
+
+---
+
+## Section Guidance
+
+### `## NuGet / Project References` — required, always first
+
+List every package the generated code will need, with the key types Copilot should use from each. This is the highest-value, lowest-token section: it anchors imports and prevents Copilot from inventing types.
+
+```markdown
+| Package | Key types provided |
+|---|---|
+| `CoreEx` | `[ScopedService<T>]`, `IUnitOfWork`, `NotFoundException`, `.ThrowIfNull()` |
+| `CoreEx.Validation` | `Validator<T, TSelf>`, `.ValidateAndThrowAsync()` |
+```
+
+### Pattern sections — one section per distinct concept
+
+Name sections after the actual coding concept, not a rule number. Each section should contain one or two orienting sentences followed by a real code example. Avoid long prose; if a concept needs a paragraph of explanation, it belongs in `Further Reading`.
+
+### `## Do Not` — required when anti-patterns exist
+
+List things Copilot must not generate for this area. Be specific: name the wrong type, wrong library, or wrong pattern, and say what to use instead. This section counteracts Copilot's training data for common-but-wrong patterns.
+
+```markdown
+## Do Not
+
+- Do not use `AutoMapper` — use explicit mapping helpers or classes.
+- Do not inject `IUnitOfWork` into controllers — delegate to the application service.
+- Do not inherit from `Controller` — inherit from `ControllerBase`.
+```
+
+### `## Further Reading` — required
+
+Link to the layer-level `samples/docs/` walkthrough and any directly relevant `src/*/README.md` files. Copilot will fetch these when it needs deeper context, keeping the instruction file itself lean.
+
+```markdown
+## Further Reading
+
+- [`samples/docs/application-layer.md`](../../samples/docs/application-layer.md) — application service patterns with sample code.
+- [`src/CoreEx/Results/README.md`](../../src/CoreEx/Results/README.md) — `Result<T>` pipeline API reference.
+```
+
+---
+
+## Conflict Resolution
+
+- `.github/copilot-instructions.md` defines repository-wide defaults. Never restate them in a scoped file.
+- When two instruction files could apply to the same file, the narrower `applyTo` glob wins.
+- If a new file would duplicate policy from an existing one, extend the existing file instead.
+
+## Non-Instruction Files in `.github/instructions/`
+
+Not every file in this folder is an instruction file. `namespace_readme_template.md` is a copy/paste template used by skills and prompts — it has no `applyTo` frontmatter and is never auto-injected by Copilot. Do not add `applyTo` to it or restructure it to follow the instruction file format.
+
+---
+
+## Generated Code
+
+Generated files are owned exclusively by their tooling and must never be touched by Copilot or by hand. There are three distinct generators in this repo, each with its own input and output:
+
+### Roslyn source generator (`CoreEx.Generator`)
+
+Triggered at compile time. Reads classes decorated with `[Contract]` or `[ReferenceData]` and emits companion `.g.cs` files in the same project.
+
+| Output pattern | What to change instead |
+|---|---|
+| `*.g.cs` alongside a `[Contract]` class | The decorated partial class itself (add/remove properties, change attributes) |
+| `*.g.cs` alongside a `[ReferenceData]` class | The decorated partial class itself |
+
+### CoreEx.CodeGen (`*.CodeGen` project)
+
+A development-time console tool. Reads a single `ref-data.yaml` file (validated against `schema/coreex-refdata.json`) and generates a complete reference-data implementation — contract, controller, service, repository interface, repository, and mapper — across four project directories in one run.
+
+| Output pattern | Target layer | What to change instead |
+|---|---|---|
+| `Contracts/**/*.g.cs` | Contracts | `ref-data.yaml` entity/property config |
+| `**/Controllers/**/*.g.cs` | Api | `ref-data.yaml` route/entity config |
+| `**/Services/**/*.g.cs` | Application | `ref-data.yaml` entity config |
+| `**/Repositories/**/*.g.cs` | Infrastructure | `ref-data.yaml` repository/mapper config |
+| `**/Mappers/**/*.g.cs` | Infrastructure | `ref-data.yaml` property config or `excludeMapper: true` |
+
+The entry point is a one-line `Program.cs` in the `*.CodeGen` project. Templates live in `CoreEx.CodeGen/RefData/Templates/` (embedded in the NuGet package) and are the only place structural changes to the generated shape belong.
+
+### DbEx (`*.Database` project)
+
+A development-time migration and generation tool. Reads YAML configuration and SQL migration scripts to produce database schema, outbox infrastructure, and EF Core scaffolding.
+
+| Output pattern | What to change instead |
+|---|---|
+| `*.g.sql`, `*.g.pgsql` | The YAML configuration or SQL migration scripts in the `*.Database` project |
+| `*DbContext.g.cs`, `Persistence/*.g.cs` | The DbEx YAML config in the `*.Database` project |
+
+### Rules for instruction file authors
+
+- Do not write guidance that instructs Copilot to create or modify any `*.g.*` file.
+- Do not include `*.g.*` files in `applyTo` globs — they must never match a generated output.
+- When showing examples that reference generated types (e.g. a persistence model or a ref-data controller), show the YAML or source class that drives generation, not the generated output.
+- If a user asks Copilot to edit a generated file, identify which generator owns it from the table above and redirect to the correct input source.
+
+---
+
+## Worked Example
+
+A well-formed instruction file for API controllers:
+
+```markdown
+---
+applyTo: "**/Controllers/**/*.cs"
+description: "API controller conventions for CoreEx: inheritance, routing, WebApi helper usage, and CQRS separation"
+tags: ["controllers", "api", "routing", "dependency-injection"]
+---
+
+# API Controller Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.AspNetCore` | `WebApi`, `[IdempotencyKey]`, `[ProducesNotFoundProblem]`, `[Query]`, `[Paging]` |
+| `CoreEx.AspNetCore.NSwag` | `[OpenApiTag]` |
+
+## Structure
+
+Inherit from `ControllerBase`. Decorate with `[ApiController]`, `[Route]`, and `[OpenApiTag]`. Inject `WebApi`
+and the relevant service interface via primary constructor, guarded with `.ThrowIfNull()`. Split read and
+write operations into separate controller classes following CQRS conventions.
+
+```csharp
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductController(WebApi webApi, IProductService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IProductService _service = service.ThrowIfNull();
+}
+```
+
+## Action Methods
+
+Return `Task<IActionResult>` via the `WebApi` helper. Do not return typed `ActionResult<T>` directly.
+
+```csharp
+[HttpPost, IdempotencyKey]
+public Task<IActionResult> CreateAsync([FromBody] Product product) =>
+    _webApi.PostAsync(Request, () => _service.CreateAsync(product), statusCode: HttpStatusCode.Created);
+```
+
+## Do Not
+
+- Do not inherit from `Controller` — that pulls in View support; use `ControllerBase`.
+- Do not return `ActionResult<T>` directly — use the `WebApi` helper for consistent error translation.
+- Do not inject `IUnitOfWork` into controllers — it belongs in the application service.
+- Do not put business logic in controllers — delegate immediately to the application service.
+
+## Further Reading
+
+- [`samples/docs/hosts-layer.md`](../../samples/docs/hosts-layer.md) — API host composition and controller patterns.
+- [`src/CoreEx.AspNetCore/README.md`](../../src/CoreEx.AspNetCore/README.md) — `WebApi` helper API reference.
+```
diff --git a/.github/SKILL_AUTHORING.md b/.github/SKILL_AUTHORING.md
new file mode 100644
index 00000000..18653ed8
--- /dev/null
+++ b/.github/SKILL_AUTHORING.md
@@ -0,0 +1,149 @@
+---
+description: "Standards for creating and maintaining SKILL.md files"
+applyTo: "**/.github/skills/**/SKILL.md"
+tags: ["authoring", "standards", "skills", "documentation"]
+---
+
+# Skill File Authoring Standards
+
+When creating or updating any skill (SKILL.md file), follow this organization pattern to keep the main file lean and context-efficient.
+
+## Purpose
+
+Skill files guide AI agents through complex, multi-step tasks. They must be discoverable, brief, and provide clear pointers to detailed workflows rather than embedding all content inline.
+
+## Skill Directory Structure
+
+```
+skills/{skill-name}/
+  SKILL.md                    # Main entry point (lean, <300 lines)
+  references/
+    workflow.md               # Detailed step-by-step workflows
+    checklists.md            # Completion gates, validation criteria
+    patterns.md              # Code patterns, templates, conventions
+    troubleshooting.md       # Known issues and solutions
+  assets/
+    templates/               # Code templates, boilerplate files
+    examples/                # Real working examples from the repo
+```
+
+Each file serves one purpose. Keep files focused and scannable.
+
+## SKILL.md Content Rules
+
+The main SKILL.md must include:
+
+1. **YAML frontmatter** with `name`, `description`, `argument-hint`, `tags`
+2. **One-sentence purpose statement** — what the skill does and when to use it
+3. **"When to Use" section** — bullet points, not prose; concrete triggers
+4. **"When Not to Use" section** — prevents misuse and clarifies boundaries
+5. **Quick reference** — CLI commands, key steps, or summary table (if applicable)
+6. **Pointer to detailed workflows** — "For step-by-step guidance, see `references/workflow.md`"
+7. **Key References** — links to relevant instructions, samples, or external docs
+
+**Maximum: 300 lines** including frontmatter. If you exceed this, move content to `references/`.
+
+## references/ Subdirectory
+
+Detailed, procedural content lives in `references/`:
+
+- **workflow.md** — full step-by-step phases, sub-steps, decision trees; 100–200 lines
+- **checklists.md** — completion gates, validation steps, sign-off criteria; one page
+- **patterns.md** — recurring code patterns, naming conventions, architectural decisions; reference material
+- **troubleshooting.md** — known issues, debugging strategies, error messages and fixes; searchable format
+
+Each file stays focused on one concern. No file should exceed what is readable in one screen scroll without getting lost.
+
+## assets/ Subdirectory
+
+Reusable templates and examples:
+
+- **assets/templates/** — boilerplate code, project structures (copy-and-fill files)
+- **assets/examples/** — concrete working examples from the repo (links only, no duplicates)
+
+**Important**: Never maintain duplicate copies of sample code. Always link to the canonical source in `samples/` or other repository locations.
+
+## Cross-Referencing
+
+When skills reference each other, instructions, or samples:
+
+- **Relative paths**: `../other-skill/references/...` (for other skills)
+- **Absolute workspace paths**: `/.github/instructions/coreex-host-setup.instructions.md`, `/samples/src/Contoso.Products.Api/Program.cs`
+- Always verify links work before committing
+- Prefer workspace-relative links for durability
+
+## Frontmatter Requirements
+
+All SKILL.md files must include:
+
+```yaml
+---
+name: skill-id
+description: "Concise description of when and why to use this skill"
+argument-hint: "What user should provide, e.g. 'Optional: domain name and entities'"
+tags: ["tag1", "tag2", "tag3"]
+---
+```
+
+**Tag guidance**: Reflect the skill's domain and primary use cases. Examples:
+- `["scaffolding", "microservice", "code-generation"]`
+- `["orchestration", "cli", "distributed-apps"]`
+- `["retrofit", "integration", "messaging"]`
+
+## Lean SKILL.md Example
+
+```yaml
+---
+name: coreex-design-review
+description: "Review a proposed CoreEx design against repository conventions and samples"
+argument-hint: "Feature, domain, or host shape to review"
+tags: ["design-review", "architecture", "coreex"]
+---
+
+# CoreEx Design Review
+
+Reviews a proposed feature or service shape against current CoreEx guidance. Focuses on layering, host responsibilities, validation, persistence, and messaging choices.
+
+## When to Use
+
+- Reviewing a proposed API, subscriber, relay, or orchestration shape
+- Comparing multiple implementation options before coding
+- Checking whether a design aligns to existing samples and instructions
+- Creating a small evidence-backed plan for a change
+
+## When Not to Use
+
+- Deterministic project scaffolding — use the `CoreEx.Template` `dotnet new` templates instead
+- Repository onboarding — use `/acquire-codebase-knowledge`
+- Running the local distributed app — use `/aspire`
+
+## Workflow Overview
+
+1. **Inspect Context** — examine the current domain, hosts, and nearby sample
+2. **Identify Shape** — decide API-only, API plus relay, API plus subscriber, or orchestration
+3. **Check Conventions** — validate layering, instructions, and naming expectations
+4. **Assess Risks** — call out migration, compatibility, and operational tradeoffs
+5. **Recommend Next Steps** — provide the smallest safe implementation path
+
+For detailed step-by-step guidance, see [`references/workflow.md`](references/workflow.md).
+
+## Key References
+
+- [Application Services Instructions](/.github/instructions/coreex-application-services.instructions.md)
+- [Contracts Instructions](/.github/instructions/coreex-contracts.instructions.md)
+- [Host Setup Instructions](/.github/instructions/coreex-host-setup.instructions.md)
+- [CoreEx Template Pack](../src/CoreEx.Template/README.md)
+- [CoreEx Capabilities](./docs/capabilities.md)
+```
+
+## Quality Gates
+
+Before completing a skill:
+
+- [ ] SKILL.md is <300 lines (excluding examples)
+- [ ] All `references/` files exist and are linked
+- [ ] All links (relative and absolute) are verified
+- [ ] YAML frontmatter is valid
+- [ ] No inline workflows or checklists in main SKILL.md
+- [ ] Cross-references to instructions are correct
+- [ ] Example links point to real, canonical code locations
diff --git a/.github/agents/README.md b/.github/agents/README.md
new file mode 100644
index 00000000..25a0963e
--- /dev/null
+++ b/.github/agents/README.md
@@ -0,0 +1,131 @@
+# CoreEx Expert Agent
+
+The `coreex-expert` agent gives GitHub Copilot and Claude Code authoritative, CoreEx-idiomatic guidance — architecture decisions, pattern selection, layer design, and implementation advice — all aligned to the Contoso sample implementations.
+
+It is defined once in `coreex-expert.agent.md` and works in both tools from the same file.
+
+| Tool | How to invoke |
+|------|--------------|
+| GitHub Copilot Chat | Switch to **Agent** mode and select **CoreEx Expert** |
+| Claude Code | `@coreex-expert` |
+
+---
+
+## How the agent resolves guidance
+
+The agent relies on a local doc cache rather than making live GitHub fetches on every question. The cache is populated by `/coreex-docs-sync` and stored under `.github/docs/coreex/`.
+
+```
+Developer asks a CoreEx question
+              │
+              ▼
+  Read .github/docs/coreex/.manifest
+              │
+        ┌─────┴─────┐
+        │           │
+   manifest      no manifest
+    present        │
+        │          └──► offer to run /coreex-docs-sync first
+        │                (never runs silently — always asks first)
+        │
+  check staleness
+        │
+   ┌────┴────┐
+   │         │
+ fresh     stale
+   │       (>30 days OR coreex-version in manifest
+   │        differs from version in project files)
+   │         │
+   │         └──► recommend running /coreex-docs-sync
+   │
+   ▼
+Use local cache (always preferred over live GitHub fetches)
+   │
+   ├── .github/docs/coreex/*.md           ← 10 architecture docs
+   │
+   └── .github/docs/coreex/agents/*.md   ← 16 per-package AI guides
+              │
+    read manifest referenced-packages
+    to distinguish:
+      • package already in project  →  guide on current usage
+      • package not yet in project  →  recommend adopting it
+```
+
+The `referenced-packages` field in the manifest lets the agent distinguish between a package the project already uses and one it would need to add — without restricting which guides get synced.
+
+---
+
+## The local doc cache
+
+`/coreex-docs-sync` fetches from the CoreEx GitHub repository and writes two folders:
+
+**`.github/docs/coreex/`** — 10 architecture docs:
+
+| File | Content |
+|------|---------|
+| `layers.md` | Full layer dependency diagram and design-time tooling overview |
+| `patterns.md` | Pattern catalog — every architectural, application, messaging, and testing pattern |
+| `contracts-layer.md` | Generated contracts, `[Contract]`, `[ReferenceData]`, source generation |
+| `domain-layer.md` | Aggregates, mutation guards, integration-event accumulation, `Result<T>` pipelines |
+| `application-layer.md` | Service orchestration, `TransactionAsync`, validators, policies, adapters |
+| `infrastructure-layer.md` | EF Core repositories, mappers, outbox wiring, relay publisher |
+| `hosts-layer.md` | API, Subscribe, and Outbox Relay `Program.cs` shapes, middleware ordering |
+| `testing.md` | Unit, integration, API, Subscribe, and Relay test patterns |
+| `tooling.md` | CodeGen and Database project run order, generated-file ownership |
+| `aspire.md` | Aspire orchestration for local distributed development and E2E testing |
+
+**`.github/docs/coreex/agents/`** — 16 per-package AI usage guides, one per CoreEx NuGet package. All 16 are synced unconditionally so the agent can guide on any package — including ones the project hasn't adopted yet.
+
+**`.github/docs/coreex/.manifest`** — records `synced` date, `coreex-version`, and `referenced-packages`.
+
+### Staleness triggers
+
+| Trigger | Agent action |
+|---------|-------------|
+| Cache absent | Offers to run `/coreex-docs-sync` before the first GitHub fetch |
+| `synced` date > 30 days | Recommends a refresh |
+| `coreex-version` in manifest ≠ version in project files | Recommends a refresh |
+
+---
+
+## Why sync all 16 package guides unconditionally
+
+An earlier design synced only the packages the project already references. This was changed because:
+
+- The agent cannot recommend adopting a package (e.g. `CoreEx.Caching.FusionCache`) if it has no knowledge of what that package offers.
+- All 16 guides are small markdown files — the total download is negligible.
+- Syncing all unconditionally removes the need to re-run after adding a new package.
+- The `referenced-packages` manifest field preserves the "in project vs. not yet" distinction without making it a gate on what gets synced.
+
+---
+
+## Adopting the agent in a consuming project
+
+Copy the following from this repository into any project that references CoreEx NuGet packages:
+
+```
+.github/
+  copilot-instructions.md
+  agents/
+    coreex-expert.agent.md
+  instructions/
+    coreex-conventions.instructions.md
+    coreex-contracts.instructions.md
+    coreex-application-services.instructions.md
+    coreex-validators.instructions.md
+    coreex-repositories.instructions.md
+    coreex-api-controllers.instructions.md
+    coreex-event-subscribers.instructions.md
+    coreex-host-setup.instructions.md
+    coreex-tooling.instructions.md
+    coreex-tests.instructions.md
+    coreex-domain.instructions.md
+  skills/
+    coreex-docs-sync/
+      SKILL.md
+    acquire-codebase-knowledge/ # optional — repo onboarding docs
+```
+
+On first use, run `/coreex-docs-sync` to populate the local cache. Re-run whenever the CoreEx NuGet version is bumped.
+
+For deterministic project scaffolding, use the [CoreEx.Template](../src/CoreEx.Template/README.md) `dotnet new` template pack rather than an agent skill.
diff --git a/.github/agents/coreex-expert.agent.md b/.github/agents/coreex-expert.agent.md
new file mode 100644
index 00000000..7d86786a
--- /dev/null
+++ b/.github/agents/coreex-expert.agent.md
@@ -0,0 +1,120 @@
+---
+name: CoreEx Expert
+description: "Use when you need to explain, understand, or decide how CoreEx works in your project. Triggers: explain CoreEx, how does CoreEx, which pattern, which capability, which shape, plan a feature, review a design, compare samples, architecture guidance, coding patterns, layering, host setup, validation, repository conventions, eventing, outbox relay, subscriber design, sample-aligned decisions."
+tools: [read/readFile, read/problems, search/codebase, search/fileSearch, search/textSearch, search/listDirectory, search/usages, search/changes, web/fetch, web/githubRepo, web/githubTextSearch, edit/editFiles, edit/createFile]
+user-invocable: true
+argument-hint: Ask for CoreEx pattern guidance, architecture decisions, or sample-aligned implementation advice.
+---
+You are the CoreEx Expert.
+
+Your mission:
+- Provide authoritative guidance on CoreEx architecture, patterns, and practices.
+- Prefer CoreEx-native primitives and conventions over generic .NET advice.
+- Keep recommendations aligned with the established layering, sample implementations, and consumer-facing AI guides.
+- Apply equally whether working in the CoreEx repository itself or a consuming project.
+
+## Primary sources of truth
+
+### Locally present
+
+These files are present when the CoreEx AI workflow set has been copied into the project:
+
+- `.github/copilot-instructions.md` — project-wide guidelines, repository shape, key conventions, and house rules.
+- `.github/instructions/coreex-contracts.instructions.md` — entity contracts, `[Contract]`, `[ReferenceData]`, source generation.
+- `.github/instructions/coreex-domain.instructions.md` — DDD aggregates, `Entity<TId,TSelf>`, mutation guards, `Result<T>` pipelines.
+- `.github/instructions/coreex-application-services.instructions.md` — service shape, `TransactionAsync`, validation-before-transaction, event enqueuing.
+- `.github/instructions/coreex-validators.instructions.md` — `Validator<T, TSelf>`, rule chains, `CommonValidator`, `ValidateAndThrowAsync`.
+- `.github/instructions/coreex-repositories.instructions.md` — `EfDbModel`, `IBiDirectionMapper`, `QueryArgsConfig`, paging.
+- `.github/instructions/coreex-api-controllers.instructions.md` — controller shape, `WebApi` helpers, `[IdempotencyKey]`, PATCH.
+- `.github/instructions/coreex-event-subscribers.instructions.md` — subscriber classes, `[Subscribe]`, `SubscribedManager`, error handling.
+- `.github/instructions/coreex-host-setup.instructions.md` — `Program.cs` shape, middleware order, service registration, outbox relay hosts.
+- `.github/instructions/coreex-tooling.instructions.md` — `*.CodeGen` and `*.Database` projects, `ref-data.yaml`, DbEx, generated-file ownership.
+- `.github/instructions/coreex-tests.instructions.md` — `UnitTestEx`, `NUnit`, `AwesomeAssertions`, outbox/event expectations, seed data.
+
+### Per-package AI usage guides
+
+Check `.github/docs/coreex/agents/` for locally cached guides first (see [Local doc cache](#local-doc-cache)). `/coreex-docs-sync` caches guides for **all** CoreEx packages — check the manifest's `referenced-packages` field to distinguish packages already in the project from ones the project would need to add.
+
+If a guide is not cached locally, fetch from GitHub:
+
+- [CoreEx](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/AGENTS.md) — exceptions, `ExecutionContext`, `Result<T>`, entity contracts, `Runtime.UtcNow`, DI attributes.
+- [CoreEx.AspNetCore](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.AspNetCore/AGENTS.md) — `WebApi`, middleware, health checks, idempotency.
+- [CoreEx.AspNetCore.NSwag](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.AspNetCore.NSwag/AGENTS.md) — NSwag/OpenAPI integration.
+- [CoreEx.Azure.Messaging.ServiceBus](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Azure.Messaging.ServiceBus/AGENTS.md) — Service Bus publisher, subscribers, error handling.
+- [CoreEx.Caching.FusionCache](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Caching.FusionCache/AGENTS.md) — `IHybridCache`, Redis backplane, idempotency provider.
+- [CoreEx.CodeGen](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.CodeGen/AGENTS.md) — `CodeGenConsole`, `ref-data.yaml`, generated-file ownership.
+- [CoreEx.Data](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Data/AGENTS.md) — `IUnitOfWork`, `TransactionAsync`, `QueryArgsConfig`, `DataResult`.
+- [CoreEx.Database](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Database/AGENTS.md) — `IDatabase`, `DatabaseCommand`, outbox relay base types.
+- [CoreEx.Database.Postgres](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Database.Postgres/AGENTS.md) — PostgreSQL `IDatabase`, outbox, error-code conventions.
+- [CoreEx.Database.SqlServer](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Database.SqlServer/AGENTS.md) — SQL Server `IDatabase`, session context, outbox, error-code conventions.
+- [CoreEx.DomainDriven](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.DomainDriven/AGENTS.md) — `Entity<TId,TSelf>`, `Aggregate<TId,TSelf>`, `PersistenceState`.
+- [CoreEx.EntityFrameworkCore](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.EntityFrameworkCore/AGENTS.md) — `EfDb<TDbContext>`, `EfDbModel`, dynamic query, `ValueConverterBridge`.
+- [CoreEx.Events](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Events/AGENTS.md) — `EventData`, `IEventFormatter`, `IEventPublisher`, `SubscribedManager`.
+- [CoreEx.RefData](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.RefData/AGENTS.md) — `ReferenceData<TSelf>`, `ReferenceDataHybridCache`, `ReferenceDataOrchestrator`.
+- [CoreEx.UnitTesting](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.UnitTesting/AGENTS.md) — outbox/event expectations, `JsonDataReader`, `AwesomeAssertions`.
+- [CoreEx.Validation](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Validation/AGENTS.md) — `Validator<T, TSelf>`, rule catalogue, `ValidateAndThrowAsync`.
+
+### Sample architecture docs
+
+Check `.github/docs/coreex/` for a local cache first (see [Local doc cache](#local-doc-cache)). If local copies are present, prefer them. Otherwise fetch from GitHub:
+
+- [Local Development Setup](https://github.com/Avanade/CoreEx/blob/main/samples/docs/local-dev.md) — infrastructure services (Docker/Podman), connection strings, Service Bus emulator config, startup sequences, and Aspire E2E guide.
+- [Layer Dependencies](https://github.com/Avanade/CoreEx/blob/main/samples/docs/layers.md) — full layer dependency diagram, design-time tooling overview, dependency rules.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — error handling, railway-oriented flows, outbox, adapters, policies, testing.
+- [Contracts Layer](https://github.com/Avanade/CoreEx/blob/main/samples/docs/contracts-layer.md) — generated contracts, interfaces, reference data code properties.
+- [Domain Layer](https://github.com/Avanade/CoreEx/blob/main/samples/docs/domain-layer.md) — aggregates, mutation guards, integration-event accumulation, `Result<T>` pipelines.
+- [Application Layer](https://github.com/Avanade/CoreEx/blob/main/samples/docs/application-layer.md) — service orchestration, `TransactionAsync`, `IUnitOfWork.Events`, validators, policies, adapters.
+- [Infrastructure Layer](https://github.com/Avanade/CoreEx/blob/main/samples/docs/infrastructure-layer.md) — EF Core repositories, `IBiDirectionMapper`, outbox table wiring, relay publisher.
+- [Hosts Layer](https://github.com/Avanade/CoreEx/blob/main/samples/docs/hosts-layer.md) — API, Subscribe, and Relay `Program.cs` shapes, middleware ordering, Service Bus wiring.
+- [Testing](https://github.com/Avanade/CoreEx/blob/main/samples/docs/testing.md) — unit, integration, API, Subscribe, and Relay test patterns with concrete examples.
+- [Tooling](https://github.com/Avanade/CoreEx/blob/main/samples/docs/tooling.md) — `*.CodeGen` and `*.Database` project run order, generated-file ownership, schema generation.
+- [Aspire](https://github.com/Avanade/CoreEx/blob/main/samples/docs/aspire.md) — Aspire orchestration for local distributed development and E2E testing.
+
+## Local doc cache
+
+`/coreex-docs-sync` populates two local folders. Prefer local copies over GitHub URLs or fetches whenever they are present.
+
+| Folder | Contents |
+|---|---|
+| `.github/docs/coreex/` | 10 sample architecture docs (layers, patterns, each layer walkthrough, testing, tooling, Aspire) |
+| `.github/docs/coreex/agents/` | AI usage guides for **all** CoreEx packages — available for guidance even on packages not yet adopted by this project |
+
+A manifest at `.github/docs/coreex/.manifest` records the sync date, CoreEx version, and which packages are currently referenced in the project.
+
+**When you are about to consult a sample architecture doc or a per-package guide:**
+
+1. Check for the file under `.github/docs/coreex/` or `.github/docs/coreex/agents/` respectively.
+2. If found, use the local copy. Then read `.github/docs/coreex/.manifest` and check:
+   - `synced` date: if older than 30 days, recommend running `/coreex-docs-sync`.
+   - `4.0.0-preview-1`: scan `*.csproj`, `Directory.Packages.props`, and `Directory.Build.props` for the `CoreEx` package version; if it differs from the manifest, recommend running `/coreex-docs-sync`.
+3. If no local cache exists and you are about to fetch a GitHub URL, offer first: *"I can run `/coreex-docs-sync` to cache the CoreEx docs and all package guides locally — this avoids repeated GitHub fetches. Want me to do that first?"*
+
+**At the start of a session involving CoreEx guidance**, read `.github/docs/coreex/.manifest` if it exists. The `referenced-packages` field lists which CoreEx packages this project currently uses — distinguish between guiding on an **already-referenced** package and recommending a **new** one the project would need to add.
+
+Do not set up the local cache silently — always offer and wait for confirmation.
+
+## Operating rules
+
+- Always inspect current code before recommending changes.
+- Give sample-backed guidance where possible; cite the specific doc or file that supports the recommendation.
+- Favor smallest safe change and preserve existing structure.
+- Separate explanation, plan, and implementation guidance clearly.
+- For mutable entities, call out ETag, changelog, validation, and idempotency implications where relevant.
+- For messaging, explicitly distinguish API-only, API plus outbox relay, API plus subscriber, and full orchestration shapes.
+- Never recommend editing `*.g.cs`, `*.g.sql`, or `*.g.pgsql` files — direct the user to the owning generator instead (Roslyn source generator for `*.g.cs`; `*.Database` project for `*.g.sql`/`*.g.pgsql`).
+
+## Decision routing
+
+These skills are part of the CoreEx AI workflow set and live in `.github/skills/`. They can be copied from the [CoreEx repository](https://github.com/Avanade/CoreEx/tree/main/.github/skills) into a consuming project:
+
+- Greenfield domain or host scaffolding → advise using the [CoreEx.Template](../../src/CoreEx.Template/README.md) `dotnet new` templates.
+- Retrofit capability on an existing domain → inspect the current code and recommend the smallest manual changes aligned to the samples and instructions.
+- Repo mapping or onboarding documentation → advise using `/acquire-codebase-knowledge`.
+
+## Response format
+
+1. **Recommendation** — the CoreEx-idiomatic answer.
+2. **Why this fits CoreEx** — pattern or design principle it follows.
+3. **Evidence** — specific file/doc/sample that backs it up.
+4. **Risks and tradeoffs** — anything the user should weigh.
+5. **Minimal next steps** — actionable and ordered.
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000..09c7dea0
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,185 @@
+---
+# applyTo is intentionally omitted — this file is applied globally by VS Copilot convention for copilot-instructions.md.
+description: "Project-wide guidelines and conventions for CoreEx development"
+tags: ["guidelines", "conventions", "comments"]
+---
+
+# Copilot Instructions
+
+## Purpose
+CoreEx is a modular .NET framework for enterprise APIs and distributed services. Favor CoreEx-native primitives, patterns, and extensions over ad-hoc implementations.
+
+## Repository Shape
+- `CoreEx.sln`: main solution for framework + samples.
+- `src\`: reusable CoreEx libraries (AspNetCore, Database, EntityFrameworkCore, Events, Validation, DomainDriven, RefData, Caching, etc.).
+- `gen\CoreEx.Generator\`: Roslyn source generator for contracts.
+- `tests\`: framework-level tests.
+- `samples\src\Contoso.*\`: sample domains split by layer/host.
+- `samples\aspire\AppHost.cs`: orchestration entrypoint.
+- `coreex-starter\`: separate starter template repo — ignore unless user wants starter changes.
+
+## Build, Test, and Run
+- **Build**: `dotnet build CoreEx.sln`
+- **Test**: `dotnet test CoreEx.sln` or target specific projects.
+- **Single test**: `dotnet test <proj> --filter "FullyQualifiedName~<name>"`
+- **Samples**: docker-compose infrastructure + dotnet run for Database projects + Aspire AppHost.
+- **Linting**: No separate `dotnet format`. Build is the lint pass (nullable, LangVersion=preview, TreatWarningsAsErrors in `src\Directory.Build.props`).
+- **Formatting**: 4 spaces for `*.cs`, 2 spaces for `*.json|*.xml|*.yaml|*.props|*.csproj|*.sln|*.sql` per `.editorconfig`.
+
+## Local Development Infrastructure
+
+All sample hosts depend on containerised infrastructure. Start it before running any host or integration test:
+
+```bash
+podman compose -f docker-compose.yml up -d   # Podman preferred; `docker compose` also works
+```
+
+| Service | Port(s) | Purpose |
+|---|---|---|
+| `db-sql-server` | 1433 | Shopping domain database; Service Bus emulator backing store |
+| `db-postgres` | 5432 | Products domain database |
+| `redis-cache` | 6379 | FusionCache Redis backplane (all domains) |
+| `servicebus-emulator` | 5672 AMQP, 5300 mgmt | Azure Service Bus emulator; namespace `sbemulatorns`; topic `contoso` with subscriptions `products` and `shopping` (both session-enabled); config at `servicebus/Config.json` |
+| `dts-emulator` | 8080, 8082 | Azure Durable Task Scheduler emulator; task hubs `default` and `order` |
+| `aspire-dashboard` | 18888 UI, 4317 OTLP | Standalone OpenTelemetry dashboard; usable without running the full Aspire AppHost |
+
+Connection strings for each service in development are in each host's `appsettings.Development.json` under the `Aspire:` configuration key hierarchy. See [`samples/docs/local-dev.md`](../samples/docs/local-dev.md) for full detail, connection string patterns, and startup sequences.
+
+## Architecture
+- **Two roles**: framework packages (`src\`) + sample reference implementations (`samples\`).
+- **Business layers** (strict inward dependency — inner layers have no knowledge of outer): `*.Contracts` → `*.Application` → `*.Domain` (optional) → `*.Infrastructure`.
+- **Host layers** (composition roots, no business logic): `*.Api`, `*.Relay`, `*.Subscribe`.
+- **Design-time tooling** (no runtime presence): `*.CodeGen` (generates reference-data layer from `ref-data.yaml`) and `*.Database` (schema, seeding, outbox infrastructure via DbEx).
+- **Sample flow**: Controllers → `WebApi` helpers → Application services (validate + `IUnitOfWork`) → Infrastructure repositories (EF + explicit mappers) → transactional outbox → relay publishes to Service Bus → subscribers consume.
+- **Polyglot data**: Products uses PostgreSQL (`CoreEx.Database.Postgres` + `CoreEx.EntityFrameworkCore`); Shopping uses SQL Server (`CoreEx.Database.SqlServer` + `CoreEx.EntityFrameworkCore`). Layers above Infrastructure are database-agnostic.
+- **Primary domains**: Products and Shopping complete; Orders WIP. See `samples\README.md` for topology.
+- **Aspire**: orchestrates all sample hosts in `samples\aspire\Contoso.Aspire\AppHost.cs` for local distributed development and E2E testing.
+
+## Key Conventions That Matter in This Repo
+
+### CoreEx-First Patterns
+- Prefer CoreEx primitives before introducing external libraries that overlap with framework capabilities.
+- Prefer CoreEx exception types (`NotFoundException`, `ValidationException`, `BusinessException`, `ConcurrencyException`, etc.) and CoreEx `Result`/`Result<T>` flows over custom error wrappers.
+- Do not introduce AutoMapper in any repository unless the repository maintainer explicitly requests it. Repositories and services use explicit mapping helpers/classes.
+
+### Contracts and Source Generation
+- Contracts are commonly declared as `[Contract] public partial class ...`.
+- Mutable contracts often implement `IIdentifier<T>`, `IETag`, and `IChangeLog`.
+- Use `[ReadOnly(true)]` for server-managed fields and `[ReferenceData<T>]` for reference-data-backed code properties.
+- Canonical casing transformations belong in property setters when already established by the model (for example `Sku` uppercasing in `ProductBase`).
+- Favor the existing source-generation approach; do not hand-write members that are meant to be generated.
+
+### Dependency Injection and Layering
+- Services and repositories commonly self-register with `[ScopedService<...>]`.
+- Hosts use `AddDynamicServicesUsing<T1, T2, ...>()` to discover and register services instead of manually wiring every type.
+- Keep interface/implementation layering intact:
+  - application interfaces live in `Application\Interfaces\`, `Application\Repositories\`, `Application\Adapters\`, or `Application\Policies\`;
+  - infrastructure implementations live in `Infrastructure\`.
+- There are two distinct mapping layers — do not conflate them:
+  - **Application-level** (`Application\Mapping\`): Domain aggregate → Contract, using `Mapper<TSource, TDest, TSelf>`; present only in domains with a Domain layer (e.g. Shopping).
+  - **Infrastructure-level** (`Infrastructure\Mapping\`): Contract ↔ Persistence model, using `BiDirectionMapper<TFrom, TTo, TSelf>`; present in all domains.
+
+### Application-Service Shape
+- Application services follow a repeated pattern:
+  1. guard/normalize inputs;
+  2. validate with CoreEx validators;
+  3. load current state where needed;
+  4. wrap mutations **and** event publication together inside `_unitOfWork.TransactionAsync(...)` — both the database write and the outbox event are committed atomically or not at all;
+  5. add `EventData` to `_unitOfWork.Events` inside that same transactional scope.
+- Use exception-based flows for straightforward CRUD-style services.
+- Use `Result<T>` pipelines for aggregate-oriented flows and multi-step orchestration, especially in Shopping.
+
+### Adapters (Anti-Corruption Layer)
+- When a domain needs to interact with another domain or external service, define an **adapter interface** in `Application\Adapters\`. The Application layer depends on this domain-idiomatic abstraction — never on the remote API's schema or transport directly.
+- Infrastructure implements the adapter using a **typed HTTP client** (`Infrastructure\Clients\`) for the transport concern, keeping client and orchestration in separate focused classes.
+- Two adapter roles appear in Shopping:
+  - **Synchronous adapter** (`IProductAdapter`) — real-time calls (e.g. inventory reservation at checkout); the HTTP client is called live inside the unit of work.
+  - **Sync/replication adapter** (`IProductSyncAdapter`) — event-driven data replication; receives published domain events and maintains a local eventually-consistent copy in the domain's own store.
+- Do not call `HttpClient` directly from services — always go through the adapter interface.
+
+### Policies
+- Policies (`Application\Policies\`) encapsulate **domain-level guard logic** that requires I/O — adapter or repository calls. A policy provides a named, independently testable home for rules that depend on external state and cannot be expressed in a validator alone (synchronous) or in the domain model (no async I/O). Policies return `Result` or `Result<T>` and can be called from any point in service orchestration where the condition needs to be verified.
+- Use a policy when an invariant cannot be expressed in a validator alone (e.g. confirming a referenced entity exists before allowing a mutation).
+- Policies return `Result` or `Result<T>` and compose naturally into `Result<T>` service pipelines via `.GoAsync()` / `.ThenAsAsync()`.
+
+### Host Composition
+- `Program.cs` files follow a predictable CoreEx host shape:
+  - `builder.AddHostSettings();`
+  - `AddExecutionContext()`
+  - `AddMvcWebApi()` and `AddHttpWebApi()`
+  - host-specific SQL Server / Redis / Service Bus / outbox registrations
+  - `PostConfigureAllHealthChecks()`
+  - NSwag/OpenAPI registration
+  - OpenTelemetry wiring
+  - middleware order with `UseCoreExExceptionHandler()`, `UseExecutionContext()`, and host-specific additions such as `UseIdempotencyKey()` or `MapHostedServices()`.
+- API hosts, subscriber hosts, and outbox relay hosts intentionally have different startup shapes. Do not collapse them into one generic startup unless the user explicitly asks for that refactor.
+
+### Controllers and HTTP
+- Use CoreEx `WebApi` helpers (`PostAsync`, `PutAsync`, `PatchAsync`, `DeleteAsync`).
+- PATCH: `application/merge-patch+json`.
+- POST: use `[IdempotencyKey]`.
+- OpenAPI/health endpoints standard in hosts.
+
+### Data and Messaging
+- Transactional outbox + Azure Service Bus are first-class messaging patterns across all domains.
+- **Products** uses PostgreSQL; **Shopping** uses SQL Server. Do not assume SQL Server when working on Products.
+- Shopping: synchronous HTTP inventory reservation + transactional outbox + async event publishing. Preserve this split.
+- Both domains use `CoreEx.Caching.FusionCache` (hybrid in-process + Redis backplane cache) for reference data and idempotency. Register via `AddFusionCache()` / `AddFusionHybridCache()` in `Program.cs`; clear via `Test.ClearFusionCacheAsync()` in test `[OneTimeSetUp]`.
+
+### Testing
+- Framework: UnitTestEx + NUnit + AwesomeAssertions (the `AwesomeAssertions` NuGet package — not FluentAssertions).
+- Sample: `WithGenericTester<EntryPoint>` (unit) or `WithApiTester<Program>` (API/Subscribe/Relay).
+- Integration tests: per-class named seed files `Data\read-data.seed.yaml` / `Data\mutate-data.seed.yaml` (Products), or a single `Data\data.yaml` (Orders/Shopping), in Test.Common + `Resources\` JSON expectations.
+- **Intra-domain dependencies are real; inter-domain dependencies are always mocked.** Own database, cache, and outbox are started and seeded in `[OneTimeSetUp]`. Cross-domain HTTP calls and direct broker publishes are replaced with `MockHttpClientFactory` / `UseExpectedAzureServiceBusPublisher()`.
+- Outbox assertion helpers are database-specific: `UseExpectedPostgresOutboxPublisher()` for Products; `UseExpectedSqlServerOutboxPublisher()` for Shopping. Do not use the SQL Server helper in Products tests.
+- Mock downstream HTTP calls; do not assume live APIs.
+
+### House Rules
+- Code comments end with a period/full stop.
+- Always use `.ConfigureAwait(false)` in service/repository code.
+- `<Nullable>enable</Nullable>` and `<ImplicitUsings>enable</ImplicitUsings>` are set in `Directory.Build.props` — treat nullable warnings as errors, never suppress them with `!` without justification.
+- Every project has a single `GlobalUsing.cs` at the project root. All `using` statements go there — never in individual source files. The code generator (`*.CodeGen`) emits no `using` statements and depends on this.
+- File-scoped namespace declarations only: `namespace Foo.Bar;` — never block-scoped.
+- Single-line `if` bodies do not need braces: `if (x) return;`
+- Use expression-bodied syntax (`=>`) when the entire method or property body is a single expression.
+- Private instance fields are always prefixed with `_`.
+
+### Generated Code
+Never create or edit `*.g.cs`, `*.g.sql`, or `*.g.pgsql` files directly. Each generator owns its outputs:
+
+| File pattern | Generator | Change instead |
+|---|---|---|
+| `*.g.cs` (contracts, ref-data) | Roslyn source generator (`CoreEx.Generator`) | The `[Contract]`- or `[ReferenceData]`-decorated partial class |
+| `*.g.cs` (ref-data layer — controller, service, repository, mapper) | `*.CodeGen` project (CoreEx.CodeGen + `ref-data.yaml`) | `ref-data.yaml` config or the Handlebars templates in `CoreEx.CodeGen/RefData/Templates/` |
+| `*.g.sql`, `*.g.pgsql`, `*DbContext.g.cs`, `Persistence/*.g.cs` | `*.Database` project (DbEx) | DbEx YAML config or SQL migration scripts |
+
+See [INSTRUCTION_AUTHORING.md](INSTRUCTION_AUTHORING.md#generated-code) for full generator ownership detail.
+
+## Key Docs to Read Before Large Changes
+- `README.md` — repo-level positioning and top-level commands.
+- `samples\README.md` — runnable Contoso architecture and local setup.
+- `docs\capabilities.md` — deeper CoreEx capability and pattern explanations.
+- `samples\docs\layers.md` — full layer diagram, dependency rules, and design-time tooling overview.
+- `samples\docs\patterns.md` — pattern catalog with links to layer-specific detail for every architectural, application, messaging, and testing pattern used in the samples.
+- `samples\docs\<layer>.md` — detailed walkthrough for each layer: `contracts-layer.md`, `application-layer.md`, `domain-layer.md`, `infrastructure-layer.md`, `hosts-layer.md`, `testing.md`, `tooling.md`.
+- `.github\instructions\*.instructions.md` — area-specific rules auto-injected when editing matching files (`Program.cs`, contracts, application services, repositories, validators, subscribers, tests).
+
+## Agent Customizations (Prompts, Skills, and Templates)
+
+The following prompts, skills, and templates are available in this repository. Type `/` in chat to invoke prompts and skills. Use `dotnet new` in a terminal for templates.
+
+| Command | Type | When to use |
+|---------|------|-------------|
+| `CoreEx.Template` | Template pack | Deterministic `dotnet new` scaffolding for solution, API, relay, and subscriber shapes. Use `dotnet new install CoreEx.Template` and then run `dotnet new coreex`, `coreex-api`, `coreex-relay`, or `coreex-subscribe` as needed. |
+| `CoreEx Expert` | Agent | Architecture guidance, pattern recommendations, and design review aligned to the samples and repo instructions. |
+| `/init` | Prompt | Initialize a new CoreEx solution or workspace. |
+| `/setup` | Prompt | Configure an existing CoreEx solution with standard tooling and settings. |
+
+## Guidance for Authoring Instructions and Skills
+
+When creating or maintaining Copilot instruction files and skills:
+
+- **Instruction files** (`.instructions.md`) — see [INSTRUCTION_AUTHORING.md](./INSTRUCTION_AUTHORING.md) for standards on YAML frontmatter, section order, and content rules.
+- **Skill files** (`SKILL.md`) — see [SKILL_AUTHORING.md](./SKILL_AUTHORING.md) for the directory structure pattern (`references/`, `assets/`), lean main file rules (<300 lines), and cross-referencing guidelines.
+
+Both documents define durable patterns for creating guidance that is discoverable, maintainable, and context-efficient.
\ No newline at end of file
diff --git a/.github/instructions/coreex-api-controllers.instructions.md b/.github/instructions/coreex-api-controllers.instructions.md
new file mode 100644
index 00000000..e8248f6b
--- /dev/null
+++ b/.github/instructions/coreex-api-controllers.instructions.md
@@ -0,0 +1,330 @@
+---
+applyTo: "**/Controllers/**/*.cs"
+description: "API conventions for CoreEx: MVC ControllerBase and Minimal API approaches, WebApi integration, routing, CQRS separation"
+tags: ["controllers", "api", "routing", "cqrs", "dependency-injection", "minimal-api"]
+---
+
+# API Conventions
+
+> **Precondition — the Api host must exist.** Controllers live in the `*.Api` host, which is **not** part of the base `coreex` solution. Before authoring a controller, confirm an Api host is present (`**/*.Api/*.Api.csproj`); if it is absent, run the scaffolding workflow first (see `coreex-host-setup.instructions.md` → "Scaffolding an API host") — which confirms creation, generates it via the `coreex-api` template using the recorded solution options, and adds the new projects to the solution (`dotnet sln add`) as the final in-session step. Also ensure the entity's application service exists (create per *Service Operations — Confirm Scope* in `coreex-application-services.instructions.md` if not).
+
+> **Maintain the API tests alongside the controller.** When you create or change a controller's operations, **offer to create or update the matching `XxxReadTests` / `XxxMutateTests`** (per-entity, one partial file per operation) in the `*.Test.Api` project — see `coreex-tests.instructions.md` → "API Tests — Structure & Generation". If accepted, co-design the seed data, tests, and `.res.json`/`.req.json` resources together; if declined, proceed but note the coverage gap.
+
+CoreEx.AspNetCore supports two approaches for exposing HTTP endpoints. Choose one per host — they can coexist in the same application when needed.
+
+| Approach | Registration | Returns | Best for |
+|---|---|---|---|
+| **MVC Controllers** | `AddMvcWebApi()` | `IActionResult` | Familiar controller model; NSwag/OpenAPI attributes |
+| **Minimal APIs** | `AddHttpWebApi()` | `IResult` | Lightweight; less ceremony; endpoint groups in `Program.cs` |
+
+Both use the same `WebApi` helper — method names, `WithResult` variants, `ro.WithLocationUri`, `.Required()`, and `.Adjust(...)` are identical in both approaches.
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.AspNetCore` | `WebApi`, `[IdempotencyKey]`, `[Accepts<T>]`, `[ProducesNotFoundProblem]`, `[Query]`, `[Paging]`, `HttpNames`; Minimal API: `.WithQuery()`, `.WithPaging()`, `.Accepts<T>()`, `.ProducesNotFoundProblem()`, `.ProducesNoContent()`, `.ProducesCreated<T>()`, `.WithIdempotencyKey()` |
+| `CoreEx.AspNetCore.NSwag` | `[OpenApiTag]` |
+| `CoreEx` | `.Required()`, `.Adjust(...)` |
+
+---
+
+## MVC Controllers
+
+### Structure
+
+- Inherit from `ControllerBase`. Never inherit from `Controller` (that brings View support).
+- Decorate with `[ApiController]` and `[Route("...")]` on the class.
+- Inject `WebApi` and the relevant service interface via primary constructor. Guard with `.ThrowIfNull()`.
+- **Mirror the service CQRS split:** a **`XxxController`** exposes the **mutating** endpoints (POST/PUT/PATCH/DELETE) and injects `IXxxService`; a **`XxxReadController`** exposes the **read** endpoints (GET/query) and injects `IXxxReadService`.
+- **Unify them in OpenAPI with a shared `[OpenApiTag("Xxx")]`.** Put the **same** tag on both controllers so Swagger/OpenAPI presents one logical "Xxx" group — CQRS is an **internal** structuring concern, not something the external API surface should expose. (A tag may also be placed on an individual action to cross-tag it.)
+
+```csharp
+// Mutating endpoints
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductController(WebApi webApi, IProductService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IProductService _service = service.ThrowIfNull();
+}
+
+// Read endpoints — same route base and same OpenApiTag so they appear as one "Products" group
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductReadController(WebApi webApi, IProductReadService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IProductReadService _service = service.ThrowIfNull();
+}
+```
+
+### Method Signatures
+
+All action methods return `Task<IActionResult>` using the `WebApi` helper. Do not return typed `ActionResult<T>` directly.
+
+**Every action method takes a trailing `CancellationToken cancellationToken = default` and flows it through.** MVC binds it to `HttpContext.RequestAborted` automatically. Pass it to the `WebApi` helper via the named `cancellationToken:` argument, and use the **lambda's** `ct` parameter (`(ro, ct) => …`) when calling the service — never discard it with `(ro, _)`:
+
+```csharp
+public Task<IActionResult> PostAsync(CancellationToken cancellationToken = default) => _webApi.PostAsync<Employee, Employee>(Request, (ro, ct) =>
+{
+    ro.WithLocationUri(e => new Uri($"/api/employees/{e.Id}", UriKind.Relative));
+    return _service.CreateAsync(ro.Value, ct);
+}, cancellationToken: cancellationToken);
+```
+
+This is an instance of the universal rule — **every `async`/`Task`-returning method takes a `CancellationToken` and passes it on** (see `coreex-conventions.instructions.md`). The examples below all follow it.
+
+#### Standard (exception-based services)
+
+| HTTP Verb | WebApi helper | Notes |
+|---|---|---|
+| `GET` / `HEAD` | `_webApi.GetAsync(...)` | Use both attributes together |
+| `POST` | `_webApi.PostAsync<TIn, TOut>(...)` | Add `[IdempotencyKey]` for safe POST |
+| `PUT` | `_webApi.PutAsync<TIn, TOut>(...)` | Include ETag via `IF-MATCH` header |
+| `PATCH` | `_webApi.PatchAsync<T>(...)` | Requires `get:` and `put:` lambdas |
+| `DELETE` | `_webApi.DeleteAsync(...)` | Returns 204 No Content |
+
+#### Result-based (`Result<T>` pipeline services)
+
+When the service returns `Result<T>`, use the `WithResult` variants. The controller code is equally thin.
+
+| HTTP Verb | WebApi helper | Notes |
+|---|---|---|
+| `GET` | `_webApi.GetWithResultAsync(...)` | |
+| `POST` (single out) | `_webApi.PostWithResultAsync<TOut>(...)` | |
+| `POST` (in + out) | `_webApi.PostWithResultAsync<TIn, TOut>(...)` | Use when body maps to a different output type |
+| `PUT` (single out) | `_webApi.PutWithResultAsync<TOut>(...)` | |
+| `PUT` (in + out) | `_webApi.PutWithResultAsync<TIn, TOut>(...)` | |
+| `DELETE` (typed) | `_webApi.DeleteWithResultAsync<T>(...)` | Use when delete returns the deleted resource |
+
+### Route Parameters
+
+Use `.Required()` to validate route parameters at the point of first use. It **returns the value** when non-default, or throws a `ValidationException` when the value is null/default — which the `WebApi` error handler translates to a **400 validation response** (not a 500). This is the correct treatment: a missing or empty route parameter is a caller error, not a programming error.
+
+```csharp
+[HttpGet("{id}"), HttpHead("{id}")]
+public Task<IActionResult> GetAsync(string id, CancellationToken cancellationToken = default) =>
+    _webApi.GetAsync(Request, (_, ct) => _service.GetAsync(id.Required(), ct), cancellationToken: cancellationToken);
+```
+
+Do not use `.ThrowIfNull()` / `.ThrowIfNullOrEmpty()` on route parameters — those throw `ArgumentNullException`, which results in a 500 rather than a 400.
+
+### POST — Create with Location Header
+
+Use `ro.WithLocationUri(...)` to set the `Location` response header:
+
+```csharp
+[HttpPost]
+[Accepts<Product>]
+[ProducesResponseType<Product>(201)]
+[IdempotencyKey]
+public Task<IActionResult> PostAsync(CancellationToken cancellationToken = default) => _webApi.PostAsync<Product, Product>(Request, (ro, ct) =>
+{
+    ro.WithLocationUri(p => new Uri($"/api/products/{p.Id}", UriKind.Relative));
+    return _service.CreateAsync(ro.Value, ct);
+}, cancellationToken: cancellationToken);
+```
+
+> **Agent instruction — confirm idempotency for every POST.** When adding a `POST`, ask whether the operation should be **idempotent** (safe to retry without creating a duplicate). A general **create-style** POST is a strong candidate — default to offering it. If confirmed, decorate the action with **`[IdempotencyKey]`** (MVC) or `.WithIdempotencyKey()` (Minimal API): a retried request carrying the same key then returns the original result instead of creating a second resource. Omit it only when the user confirms the POST is **not** idempotent (e.g. a deliberately non-repeatable command). This applies to `POST` specifically; `PUT`/`PATCH`/`DELETE` are inherently idempotent and do not take the attribute.
+
+For a **full-entity update**, expose **both** endpoints by default — they share the same write `UpdateAsync`:
+- **`PUT`** — full replace.
+- **`PATCH`** — merge-patch (RFC 7396) over the current entity.
+
+Only implement **specialized/partial** update or patch endpoints when the user **explicitly** asks; the default is the PUT + PATCH pair.
+
+```csharp
+[HttpPut("{id}")]
+[Accepts<Product>]
+public Task<IActionResult> UpdateAsync(string id, CancellationToken cancellationToken = default) => _webApi.PutAsync<Product, Product>(Request,
+    (ro, ct) => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id), ct), cancellationToken: cancellationToken);
+```
+
+`PATCH` always supplies both `get:` and `put:` delegates: it **fetches** the current entity, merges the patch document over it, then calls `put`. The fetch uses the write service's own primary `GetAsync` (`XxxService` exposes a by-id `GetAsync` for exactly this), so the mutating controller depends on a **single** service — no need to also inject `IXxxReadService`:
+
+```csharp
+[HttpPatch("{id}")]
+[Accepts<Product>(HttpNames.MergePatchJsonMediaTypeName)]
+public Task<IActionResult> PatchAsync(string id, CancellationToken cancellationToken = default) => _webApi.PatchAsync<Product>(Request,
+    get: (ro, ct) => _service.GetAsync(id.Required(), ct),
+    put: (ro, ct) => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id), ct),
+    cancellationToken: cancellationToken);
+```
+
+Because the **write** service backs the `get:` fetch, **`IXxxService` must declare a by-id `GetAsync`** (alongside the mutators) — and `XxxService` must implement it. This `GetAsync` lives on the **write** interface even though it reads; it is the controller's single dependency for PATCH (and for a write-side `GET` by id). Do **not** route the PATCH fetch through `IXxxReadService`:
+
+```csharp
+public interface IProductService
+{
+    Task<Product?> GetAsync(string id, CancellationToken ct = default);   // ← required by PATCH's get: and the write GET
+    Task<Product> CreateAsync(Product value, CancellationToken ct = default);
+    Task<Product> UpdateAsync(Product value, CancellationToken ct = default);
+    Task DeleteAsync(string id, CancellationToken ct = default);
+}
+```
+
+### Query Endpoints
+
+Expose `QueryArgs` and `PagingArgs` via `[Query]` and `[Paging]` action attributes. Access them via the request options object (`ro`):
+
+```csharp
+[HttpGet]
+[Query(supportsOrderBy: true), Paging(supportsCount: true)]
+public Task<IActionResult> QueryAsync(CancellationToken cancellationToken = default) =>
+    _webApi.GetAsync(Request, (ro, ct) => _service.QueryAsync(ro.QueryArgs, ro.PagingArgs, ct), cancellationToken: cancellationToken);
+```
+
+### Reference Data Endpoints
+
+Delegate to `ReferenceDataOrchestrator.Current.GetWithFilterAsync<T>()`. Support `codes`, `text`, and `isIncludeInactive` filter parameters:
+
+```csharp
+[HttpGet("categories")]
+public Task<IActionResult> GetCategoriesAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default, CancellationToken cancellationToken = default)
+    => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<Category>(codes, text, ro.IsIncludeInactive, ct), cancellationToken: cancellationToken);
+```
+
+### Response Metadata Attributes
+
+Decorate actions with standard response metadata attributes:
+
+- `[ProducesResponseType<T>(statusCode)]` — preferred generic form for new code.
+- `[ProducesResponseType(typeof(T), statusCode)]` — equivalent non-generic form; either is acceptable.
+- `[ProducesNotFoundProblem()]` — shorthand for `[ProducesResponseType(typeof(ProblemDetails), 404)]`; use on GET/PUT/PATCH/DELETE where not-found is expected.
+- `[Accepts<T>]` — documents the consumed media type.
+
+### Query Schema Endpoint
+
+Read controllers that expose a `QueryAsync` should also expose a `$query` schema endpoint. This returns the JSON schema for the supported query/filter parameters:
+
+```csharp
+[HttpGet("$query")]
+[ProducesResponseType(typeof(JsonElement), 200)]
+public Task<IActionResult> QuerySchemaAsync(CancellationToken cancellationToken = default) =>
+    _webApi.GetAsync(Request, (ro, ct) => _service.QuerySchemaAsync(ct), cancellationToken: cancellationToken);
+```
+
+### Result-Based Services
+
+When the service returns `Result<T>`, use the `WithResult` variants:
+
+```csharp
+[HttpPost("{basketId}/checkout")]
+[ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+[ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+public Task<IActionResult> CheckoutAsync(string basketId, CancellationToken cancellationToken = default) =>
+    _webApi.PostWithResultAsync<Basket>(Request, (_, ct) =>
+        _service.CheckoutAsync(basketId.Required(), ct), HttpStatusCode.OK, cancellationToken: cancellationToken);
+
+[HttpPost("{basketId}/items")]
+[IdempotencyKey]
+[Accepts<BasketItemAddRequest>]
+[ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+public Task<IActionResult> ItemAddAsync(string basketId, CancellationToken cancellationToken = default) =>
+    _webApi.PostWithResultAsync<BasketItemAddRequest, Basket>(Request, (ro, ct) =>
+        _service.ItemAddAsync(basketId.Required(), ro.Value, ct), HttpStatusCode.OK, cancellationToken: cancellationToken);
+```
+
+---
+
+## Minimal APIs
+
+Register the HTTP variant in `Program.cs` and map endpoints directly — no controller class required. `WebApi` is injected into the handler lambda alongside the service:
+
+```csharp
+// Program.cs
+builder.Services.AddHttpWebApi(); // or alongside AddMvcWebApi() if both are needed
+```
+
+### Attribute → RouteHandlerBuilder Equivalents
+
+MVC action attributes have direct `RouteHandlerBuilder` extension equivalents — chain them after `app.MapGet/Post/etc.`:
+
+| MVC attribute | Minimal API equivalent |
+|---|---|
+| `[Query(supportsOrderBy: true)]` | `.WithQuery(supportsOrderBy: true)` |
+| `[Paging(supportsCount: true)]` | `.WithPaging(supportsCount: true)` |
+| `[Accepts<T>]` | `.Accepts<T>()` |
+| `[ProducesNotFoundProblem]` | `.ProducesNotFoundProblem()` |
+| `[IdempotencyKey]` | `.WithIdempotencyKey()` |
+
+### Examples
+
+**GET by id:**
+```csharp
+app.MapGet("api/products/{id}",
+    (HttpRequest request, WebApi webApi, IProductReadService service, string id, CancellationToken cancellationToken)
+        => webApi.GetWithResultAsync(request, (_, ct) => service.GetAsync(id.Required(), ct), cancellationToken: cancellationToken))
+    .Produces<Product>().ProducesNotFoundProblem();
+```
+
+**POST — create with Location header:**
+```csharp
+app.MapPost("api/products",
+    (HttpRequest request, WebApi webApi, IProductService service, CancellationToken cancellationToken)
+        => webApi.PostWithResultAsync<Product, Product>(request, async (ro, ct) =>
+        {
+            ro.WithLocationUri(p => new Uri($"api/products/{p.Id}", UriKind.Relative));
+            return await service.CreateAsync(ro.Value, ct).ConfigureAwait(false);
+        }, cancellationToken: cancellationToken))
+    .Accepts<Product>().ProducesCreated<Product>().WithIdempotencyKey();
+```
+
+**PUT:**
+```csharp
+app.MapPut("api/products/{id}",
+    (HttpRequest request, WebApi webApi, IProductService service, string id, CancellationToken cancellationToken)
+        => webApi.PutWithResultAsync<Product, Product>(request, (ro, ct) =>
+            service.UpdateAsync(ro.Value.Adjust(p => p.Id = id), ct), cancellationToken: cancellationToken))
+    .Accepts<Product>().Produces<Product>().ProducesNotFoundProblem();
+```
+
+**PATCH — JSON Merge-Patch:**
+```csharp
+app.MapPatch("api/products/{id}",
+    (HttpRequest request, WebApi webApi, IProductService service, string id, CancellationToken cancellationToken)
+        => webApi.PatchWithResultAsync<Product>(request,
+            get: (_, ct) => service.GetAsync(id.Required(), ct),
+            put: (ro, ct) => service.UpdateAsync(ro.Value.Adjust(p => p.Id = id), ct),
+            cancellationToken: cancellationToken))
+    .Accepts<Product>(HttpNames.MergePatchJsonMediaTypeName).Produces<Product>().ProducesNotFoundProblem();
+```
+
+**DELETE:**
+```csharp
+app.MapDelete("api/products/{id}",
+    (HttpRequest request, WebApi webApi, IProductService service, string id, CancellationToken cancellationToken)
+        => webApi.DeleteWithResultAsync(request, (_, ct) => service.DeleteAsync(id.Required(), ct), cancellationToken: cancellationToken))
+    .ProducesNoContent();
+```
+
+**Query with filtering and paging:**
+```csharp
+app.MapGet("api/products",
+    (HttpRequest request, WebApi webApi, IProductReadService service, CancellationToken cancellationToken)
+        => webApi.GetWithResultAsync(request, (ro, ct) => service.QueryAsync(ro.QueryArgs, ro.PagingArgs, ct), cancellationToken: cancellationToken))
+    .Produces<ProductLite[]>().WithQuery(supportsOrderBy: true).WithPaging(supportsCount: true);
+```
+
+All the same rules apply as for MVC controllers: no business logic in the handler, delegate immediately to the application service, use `.Required()` on route parameters, and **take a `CancellationToken` handler parameter** (ASP.NET injects it) that is passed to the `WebApi` helper (`cancellationToken:`) and on to the service via the lambda's `ct`.
+
+---
+
+## Do Not
+
+- Do not inherit from `Controller` — that pulls in View support; use `ControllerBase`.
+- Do not return `ActionResult<T>` directly — use the `WebApi` helper for consistent error translation and status-code mapping.
+- Do not inject `IUnitOfWork` into controllers or endpoint handlers — it belongs in the application service.
+- Do not put business logic in controllers or endpoint handlers — delegate immediately to the application service.
+- Do not call `HttpClient` or adapters directly from controllers — go through the application service.
+- Do not put mutating and read endpoints in one controller — split into `XxxController` (mutations, `IXxxService`) and `XxxReadController` (reads, `IXxxReadService`).
+- Do not expose the CQRS split externally — give both controllers the **same** `[OpenApiTag("Xxx")]` so they surface as one OpenAPI group; do not use distinct tags/route bases per controller.
+- Do not omit the `PATCH` when exposing a full `PUT` update — offer both by default; add specialized/partial update or patch endpoints only on explicit request.
+- Do not add a `POST` without confirming idempotency — apply `[IdempotencyKey]` (`.WithIdempotencyKey()` for Minimal APIs) when it is idempotent (create-style POSTs almost always are); omit only when the user confirms it is not.
+- Do not omit or discard the `CancellationToken` — **every** action/handler takes `CancellationToken cancellationToken = default` (MVC) or a `CancellationToken` handler parameter (Minimal API), passes it to the `WebApi` helper via `cancellationToken:`, and calls the service with the **lambda's** `ct` (`(ro, ct) => …`). Do not write `(ro, _) => _service.XxxAsync(…)` (drops the token) or call the service without a token argument.
+
+## Further Reading
+
+- [Hosts Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/hosts-layer.md) — API host composition, controller patterns, and `Program.cs` shape.
+- [CoreEx.AspNetCore README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.AspNetCore/README.md) — `WebApi` helper API reference.
+- [CoreEx.AspNetCore Mvc README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.AspNetCore/Mvc/README.md) — MVC `WebApi` (`IActionResult`-returning), action attributes, and controller patterns.
+- [CoreEx.AspNetCore Http README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.AspNetCore/Http/README.md) — Minimal API `WebApi` (`IResult`-returning) and `RouteHandlerBuilder` extensions.
diff --git a/.github/instructions/coreex-application-services.instructions.md b/.github/instructions/coreex-application-services.instructions.md
new file mode 100644
index 00000000..baf88c48
--- /dev/null
+++ b/.github/instructions/coreex-application-services.instructions.md
@@ -0,0 +1,480 @@
+---
+applyTo: "**/Application/**/*.cs"
+description: "Application service conventions: ScopedService registration, dependency injection, validation, unit of work, CQRS, policies, adapters, and Result<T> pipelines"
+tags: ["services", "application-layer", "dependency-injection", "validation", "unit-of-work", "cqrs", "policies", "adapters"]
+---
+
+# Application Service Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx` | `[ScopedService<T>]`, `Runtime`, `NotFoundException`, `BusinessException`, `ValidationException`, `.ThrowIfNull()`, `.ThrowIfNullOrEmpty()`, `QueryArgs`, `PagingArgs`, `ItemsResult<T>`, `Result<T>`, `Result.GoAsync()`, `.ThenAs()`, `.ThenAsAsync()` |
+| `CoreEx.Data` | `IUnitOfWork`, `DataResult<T>` |
+| `CoreEx.Events` | `EventData`, `EventAction` |
+| `CoreEx.Validation` | `Validator<T, TSelf>`, `Validator<T>`, `.ValidateAndThrowAsync()`, `.ValidateWithResultAsync()` |
+| `CoreEx.RefData` | `ReferenceDataOrchestrator` |
+
+## Structure
+
+- Define a public interface (e.g., `IProductService`) in the Application project, typically under an `Interfaces/` sub-folder — not a hard requirement, but a clean convention that keeps the public surface of the Application layer easy to navigate.
+- Implement with `[ScopedService<IInterface>]` attribute so it registers itself via dynamic DI — no manual registration required.
+- Inject dependencies via primary constructor and guard every injected parameter with `.ThrowIfNull()`.
+
+```csharp
+[ScopedService<IProductService>]
+public class ProductService(IUnitOfWork unitOfWork, IProductRepository repository) : IProductService
+{
+    private readonly IUnitOfWork _unitOfWork = unitOfWork.ThrowIfNull();
+    private readonly IProductRepository _repository = repository.ThrowIfNull();
+}
+```
+
+> **Do not inject validators (or mappers/policies) into the service constructor.** A `Validator<T, TSelf>` is invoked via its static `Default` singleton, so it is never a constructor parameter.
+>
+> ```csharp
+> // ❌ Wrong — validator injected
+> public class EmployeeService(IUnitOfWork unitOfWork, IEmployeeRepository repository, EmployeeValidator validator) : IEmployeeService
+>
+> // ✅ Correct — only the unit of work and repository (validator called via EmployeeValidator.Default)
+> public class EmployeeService(IUnitOfWork unitOfWork, IEmployeeRepository repository) : IEmployeeService
+> ```
+
+## Service Operations — Confirm Scope
+
+Before generating a service, confirm which operations it should expose — never silently assume the full set.
+
+> **Agent instruction:**
+> - When asked to create a service **without** specifying the operations, confirm the standard CRUD set with the user — **Get**, **Create**, **Update**, **Delete** — presenting each as **default-selected** so the user can deselect any that are not wanted.
+> - Even when the user asks for "CRUD" (or "the usual"), still confirm the four operations (Get / Create / Update / Delete, each default-selected) rather than assuming all four — they may want only a subset.
+> - **Never add a Query (collection/search) operation unless it is explicitly requested.** Querying needs deliberate, additional design — `QueryArgsConfig` filter/order fields, paging, and a purpose-built read shape (see [CQRS — Read Services](#cqrs--read-services)) — so it must not be inferred from a generic "create a service"/"CRUD" request. If querying is asked for, gather those specifics first.
+
+## Guard Clauses
+
+`.ThrowIfNull()` and `.ThrowIfNullOrEmpty()` **return the guarded value** when the check passes, so they can be used inline at the point of first use rather than as separate pre-checks. This keeps code tight without sacrificing safety:
+
+```csharp
+// Constructor injection — the assignment is the first use; guard inline
+private readonly IProductRepository _repository = repository.ThrowIfNull();
+
+// Inline at point of first use in a method body
+var current = await _repository.GetAsync(product.Id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+
+// Guards chain — each returns the value if it passes, so further checks can follow
+public BasketStatus Status { get; private set => field = value.ThrowIfNull().ThrowIfInactive(); }
+```
+
+Use a top-of-method pre-check (non-inline) only when the value is not immediately consumed:
+
+```csharp
+public async Task<Product> UpdateAsync(Product product, CancellationToken cancellationToken = default)
+{
+    product.ThrowIfNull(); // checked here; not passed anywhere yet
+    await ProductValidator.Default.ValidateAndThrowAsync(product, cancellationToken).ConfigureAwait(false);
+    var current = await _repository.GetAsync(product.Id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+    // ...
+}
+```
+
+## Validation
+
+Validators live in `Application/Validators/` and are **not registered in DI** — they are not injected into services (see [DI Registration Principle](#di-registration-principle) below). Choose the base class based on whether the validator needs injected dependencies:
+
+**`Validator<T, TSelf>`** — use when no constructor injection is required. Exposes a static `Default` singleton; always call via the singleton:
+
+```csharp
+public class ProductValidator : Validator<Contracts.Product, ProductValidator>
+{
+    public ProductValidator()
+    {
+        Property(p => p.Sku).Mandatory().MaximumLength(50);
+        Property(p => p.SubCategory).Mandatory().IsValid();   // typed ref-data nav property, not SubCategoryCode
+        Property(p => p.Price).PrecisionScale(null, 2).GreaterThanOrEqualTo(0, _ => "zero");
+    }
+}
+
+// Call via Default singleton — never use new ProductValidator() at the call site:
+await ProductValidator.Default.ValidateAndThrowAsync(product, cancellationToken);
+```
+
+**Choose the invocation that matches the flow — never bare `ValidateAsync`:**
+
+| Flow | Method | Behaviour |
+|---|---|---|
+| Exception style (non-ROP) | `ValidateAndThrowAsync(value)` | Throws `ValidationException` on failure — stops execution |
+| `Result<T>` pipeline (ROP) | `ValidateWithResultAsync(value)` | Returns a `Result` to compose / short-circuit on |
+
+`ValidateAsync(value)` merely **returns the validation result without throwing** — calling it and ignoring the return *swallows the errors and continues*. Do **not** use it for fail-fast validation. In a non-ROP service use `ValidateAndThrowAsync`; in a `Result<T>` pipeline use `ValidateWithResultAsync`.
+
+```csharp
+// ❌ Wrong — does not throw; the failure is swallowed and execution continues
+await EmployeeValidator.Default.ValidateAsync(employee, cancellationToken).ConfigureAwait(false);
+
+// ✅ Correct (non-ROP) — throws ValidationException on failure
+await EmployeeValidator.Default.ValidateAndThrowAsync(employee, cancellationToken).ConfigureAwait(false);
+```
+
+**`Validator<T>`** — use when constructor injection is required (e.g., a repository for async I/O). No singleton; instantiate directly at the call site using dependencies already in scope in the service:
+
+```csharp
+public class MovementRequestValidator : Validator<MovementRequest>
+{
+    private readonly IProductRepository _repository;
+
+    public MovementRequestValidator(IProductRepository repository)
+    {
+        _repository = repository.ThrowIfNull();
+        Property(x => x.Id).Mandatory().MaximumLength(50);
+        // ... declarative rules
+    }
+
+    protected async override Task OnValidateAsync(ValidationContext<MovementRequest> context, CancellationToken cancellationToken)
+    {
+        if (context.HasErrors) return; // fail fast — skip I/O if declarative phase found errors
+
+        var ids = context.Value.Products!.Select(kvp => kvp.Key).ToArray();
+        var products = await _repository.GetForReservationAsync(ids, cancellationToken).ConfigureAwait(false);
+
+        await context.ValidateFurtherAsync(c => c
+            .HasProperty(x => x.Products, c => c.Dictionary(c => c
+                .WithKeyValidator("Product", k => k
+                    .NotFound().WhenValue(v => !products.ContainsKey(v))))),
+            cancellationToken).ConfigureAwait(false);
+    }
+}
+
+// Instantiate directly — _repository is already injected into the service:
+await new MovementRequestValidator(_repository).ValidateAndThrowAsync(request, cancellationToken);
+```
+
+Both phases apply to both base classes. For `Result<T>` pipelines, use `ValidateWithResultAsync` instead of `ValidateAndThrowAsync`:
+
+```csharp
+var result = await Result.GoAsync(() => MyValidator.Default.ValidateWithResultAsync(value, cancellationToken));
+if (result.IsFailure) return result.AsResult();
+```
+
+## Not Found Handling
+
+After loading an entity, throw immediately if it does not exist:
+
+```csharp
+var current = await _repository.GetAsync(id, cancellationToken).ConfigureAwait(false);
+NotFoundException.ThrowIfDefault(current);
+```
+
+## Business Rule Exceptions
+
+Use `BusinessException` for domain rule violations that are the caller's fault but are not validation errors:
+
+```csharp
+if (!product.IsInactive)
+    throw new BusinessException("A product must first be deactivated before it can be deleted.");
+```
+
+`BusinessException` (and all CoreEx exceptions that extend `ExtendedException`) support optional fluent extension methods that enrich the error with machine-readable context. All methods return the exception so they can be chained directly on the `throw` expression:
+
+| Method | Purpose |
+|---|---|
+| `.WithErrorCode(string)` | Adds a machine-readable code the caller can key on (e.g. `"product-not-inactive"`) |
+| `.WithKey(object)` | Attaches the entity key — surfaces in the problem-details response under `key` |
+| `.WithDetail(string)` | Adds extended human-readable detail beyond the main message |
+| `.WithStatusCode(HttpStatusCode)` | Overrides the default HTTP status code (use sparingly) |
+| `.WithExtension(string, object)` | Adds arbitrary key/value metadata to `extensions` in the problem-details response |
+| `.AsTransient(TimeSpan?)` | Marks the error as transient so retry infrastructure knows it is safe to retry |
+
+```csharp
+// Minimal — message only
+if (!product.IsInactive)
+    throw new BusinessException("A product must first be deactivated before it can be deleted.");
+
+// With machine-readable error code and entity key
+if (!product.IsInactive)
+    throw new BusinessException("A product must first be deactivated before it can be deleted.")
+        .WithErrorCode("product-not-inactive")
+        .WithKey(product.Id);
+
+// With additional detail
+if (basket.HasExpiredItems)
+    throw new BusinessException("Basket cannot be checked out.")
+        .WithErrorCode("basket-has-expired-items")
+        .WithDetail("One or more items in the basket have expired and must be removed before checkout.");
+```
+
+## Assigning the identifier on Create
+
+The **service** assigns the new identifier on `Create` — the database does **not** generate it (the migration scaffold's value-generation default is dropped unless a key is explicitly DB-generated; see the tooling guidance). Set it from the ambient `Runtime` **after validation, before the transaction**, alongside any other server-controlled fields:
+
+```csharp
+public async Task<Product> CreateAsync(Product product, CancellationToken cancellationToken = default)
+{
+    product.ThrowIfNull();
+    await ProductValidator.Default.ValidateAndThrowAsync(product, cancellationToken).ConfigureAwait(false);
+
+    product.Id = Runtime.NewId();           // service-assigned identity — never left to the caller or the DB
+    product.CategoryCode = product.SubCategory!.CategoryCode;   // derive any other server-set fields here
+    product.IsInactive = true;
+
+    return await _unitOfWork.TransactionAsync(async ct =>
+    {
+        var dr = await _repository.CreateAsync(product, ct).ConfigureAwait(false);
+        return dr.WhereMutated(v =>
+            _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+    }, cancellationToken).ConfigureAwait(false);
+}
+```
+
+- **Match the generator to the identifier type:** `string` key → `Runtime.NewId()`; `Guid` key → `Runtime.NewGuid()`. Never use `Guid.NewGuid()` / `Guid.NewGuid().ToString()` directly — always go through `Runtime` so the clock/GUID source stays test-controllable.
+- **Always assign on Create** so the value is deterministic and present before the event is published — don't rely on the caller-supplied `Id` and don't defer to the database.
+- **Exception — DB-generated keys only:** if a key is explicitly an identity/sequence column (the rare, explicitly-requested case), the database assigns it; the service does **not** set `Id` and reads it back from the create result instead.
+
+## Unit of Work and Events
+
+Wrap all side-effectful database operations in `_unitOfWork.TransactionAsync(...)`. Both the database write and the outbox event publication are committed atomically inside this scope — events are only dispatched if the transaction commits successfully.
+
+```csharp
+return await _unitOfWork.TransactionAsync(async ct =>
+{
+    var dr = await _repository.CreateAsync(product, ct).ConfigureAwait(false);
+    return dr.WhereMutated(v =>
+        _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+}, cancellationToken).ConfigureAwait(false);
+```
+
+**When eventing is enabled, every mutating operation must publish its event inside the transaction.** `Create`, `Update`, and `Delete` each add their event (`EventAction.Created` / `Updated` / `Deleted`) via `_unitOfWork.Events.Add(...)` within the `TransactionAsync` scope — a transaction that writes but adds no event is a bug. (Eventing is enabled when the solution was scaffolded with it, or whenever the domain publishes domain events; if a domain is genuinely event-free, omit it.)
+
+```csharp
+// ❌ Wrong — writes inside the transaction but never adds the event
+return await _unitOfWork.TransactionAsync(async ct =>
+{
+    var result = await _repository.CreateAsync(employee, ct).ConfigureAwait(false);
+    return result.Value!;
+}, cancellationToken).ConfigureAwait(false);
+
+// ✅ Correct — event added within the same transaction, only on mutation
+return await _unitOfWork.TransactionAsync(async ct =>
+{
+    var dr = await _repository.CreateAsync(employee, ct).ConfigureAwait(false);
+    return dr.WhereMutated(v =>
+        _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+}, cancellationToken).ConfigureAwait(false);
+```
+
+- `WhereMutated(action)` — executes `action` only when the data result records a mutation; add the event inside this callback. **Mind the overload:** `DataResult<T>` (from `Create`/`Update`) carries the value, so use `WhereMutated(v => ...)`; `DataResult` (from `Delete`) has **no value**, so use the parameterless `WhereMutated(() => ...)` — not `WhereMutated(_ => ...)`.
+- `EventData.CreateEventWith(value, action)` — a typed event **carrying the entity value** (Create/Update only — pass the **real** mutated value `v`). For a **no-value** event (Delete), use `EventData.CreateEvent<T>(action).WithKey(id)` — the type + action + key, **no value**. **Never fabricate a value to feed `CreateEventWith` on a delete** (e.g. `CreateEventWith(new Employee { Id = id }, …)` or `CreateEventWith<T>(default, …)`): a delete event must have **no body** — a synthetic entity wrongly serialises a near-empty value, adds a version suffix that delete events must not have, and buries the id in the body instead of the metadata key. The id belongs in `.WithKey(id)`.
+- `EventAction.Created`, `EventAction.Updated`, `EventAction.Deleted` — use the standard constants.
+
+For delete the `DataResult` has no value, so use the parameterless `WhereMutated(() => ...)` and carry the identity via `.WithKey(id)`:
+
+```csharp
+public async Task DeleteAsync(string id, CancellationToken cancellationToken = default)
+{
+    await _unitOfWork.TransactionAsync(async ct =>
+    {
+        var dr = await _repository.DeleteAsync(id.ThrowIfNullOrEmpty(), ct).ConfigureAwait(false);
+
+        // ❌ Wrong — fabricates a throwaway value to carry the id; attaches a (near-empty) body,
+        //    adds a version suffix delete must not have, and puts the id in the body, not the key.
+        dr.WhereMutated(() =>
+            _unitOfWork.Events.Add(EventData.CreateEventWith(new Contracts.Employee { Id = id }, EventAction.Deleted)));
+
+        // ✅ Correct — no value; type + action + key only.
+        dr.WhereMutated(() =>                                    // () — no value on a delete DataResult
+            _unitOfWork.Events.Add(
+                EventData.CreateEvent<Employee>(EventAction.Deleted).WithKey(id)));
+    }, cancellationToken).ConfigureAwait(false);
+}
+```
+
+## Result&lt;T&gt; Pipeline Style
+
+Using `Result<T>` chains is a developer choice — it is not restricted to DDD aggregate services. It can be applied to any service method where explicit, composable failure propagation is preferred over exceptions. Compose with `Result.GoAsync`, `.ThenAs`, `.ThenAsAsync`. The unit of work is still `TransactionAsync`:
+
+```csharp
+public Task<Result<Basket>> CreateAsync(string customerId, CancellationToken cancellationToken = default)
+{
+    var aggregate = Domain.Basket.CreateNew(customerId.ThrowIfNullOrEmpty());
+
+    return _unitOfWork.TransactionAsync(async ct =>
+    {
+        var br = await _repository.CreateAsync(aggregate, ct).ConfigureAwait(false);
+        return br.ThenAs(b =>
+        {
+            var contract = BasketMapper.Map(b);
+            _unitOfWork.Events.Add(EventData.CreateEventWith(contract, EventAction.Created));
+            return contract;
+        });
+    }, cancellationToken);
+}
+```
+
+For multi-step orchestration with early exit on the first failure:
+
+```csharp
+var pr = await Result.GoAsync(() => SomeValidator.Default.ValidateWithResultAsync(input, cancellationToken))
+    .ThenAsAsync(v => _someAdapter.EnsureExistsAsync(v.Id!, cancellationToken));
+
+if (pr.IsFailure)
+    return pr.AsResult();
+```
+
+#### Operator reference and the `As` / `Async` naming convention
+
+The pipeline operators come in **families**, each with consistent modifier suffixes. **Read the suffix to know what an operator does:**
+
+- **`As`** — the operation **changes the result type** (`Result` → `Result<T>`, `Result<T>` → `Result<U>`, or `Result<T>` → `Result`). The non-`As` form keeps the same type. This is **by design**: you must explicitly opt into a type change, so a `T` flowing through unchanged uses `Then`, while producing a different type uses `ThenAs`. If the compiler complains a delegate returns the "wrong" type, you almost certainly want the `As` variant.
+- **`Async`** — the supplied delegate is asynchronous (returns a `Task`).
+- **`AsAsync`** — both: an async delegate that also changes the type.
+
+| Family | Runs the delegate when… | Same-type / type-changing |
+|---|---|---|
+| `Then` | result is **success** | `Then` / `ThenAs` |
+| `When` | success **and** a condition holds | `When` / `WhenAs` |
+| `Any` | **always** (success or failure) | `Any` / `AnyAs` |
+| `OnFailure` | result is **failure** | `OnFailure` / `OnFailureAs` |
+| `Match` | branches on success vs failure, returning a value | `Match` / `MatchAs` |
+
+Each has `Async` and `AsAsync` variants too (e.g. `ThenAsync`, `ThenAsAsync`). Start a pipeline with `Result.Go(...)` / `Result.GoAsync(...)`; also available: `Bind`, `Combine`, and `.AsResult()` to drop a `Result<T>` to a `Result`.
+
+Failure factories (return a failed result of the matching type): `Result.ValidationError(...)`, `NotFoundError(...)`, `BusinessError(...)`, `ConflictError(...)`, `ConcurrencyError(...)`, `DuplicateError(...)`, `AuthenticationError(...)`, `AuthorizationError(...)`, `TransientError(...)`. Success factories: `Result.Success`, `Result<T>.Ok(value)`. See the [CoreEx Results README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/Results/README.md) for the full set.
+
+## CQRS — Read Services
+
+Split a domain's service operations **by mutation** — this is the convention:
+
+- **Mutating** operations — `Create`, `Update`, `Delete`, and any other state-changing operation — live in **`XxxService`** (`IXxxService`). These own validation, the unit of work, and event publication. `XxxService` **also** exposes a primary by-id `GetAsync(id)` to support its own mutation flows (the PATCH pre-fetch, fetch-then-update, concurrency/not-found checks).
+- **Query and read-model** operations — `QueryAsync` (collections/search) and other purpose-built read shapes — live in **`XxxReadService`** (`IXxxReadService`), which also exposes the by-id `GetAsync` for the read API.
+
+This is the surface expression of CQRS: the write model (mutations + events) and the read model (queries returning purpose-built shapes) are designed and scaled independently. Both interfaces live in `Interfaces/` side by side (`IProductService.cs`, `IProductReadService.cs`); both implementations live together in the service folder.
+
+A primary by-id `GetAsync` therefore appears on **both** services — this is intentional. Each is a single line delegating to the shared `IXxxRepository.GetAsync`, so there is no real logic duplication; having `XxxService` own a `GetAsync` keeps the mutating controller dependent on **one** service (no need to also resolve `IXxxReadService` just for the PATCH fetch). The meaningful divergence — queries and read-optimized shapes — stays exclusive to `XxxReadService`.
+
+```csharp
+[ScopedService<IProductReadService>]
+public class ProductReadService(IProductRepository repository) : IProductReadService
+{
+    private readonly IProductRepository _repository = repository.ThrowIfNull();
+
+    public Task<Product?> GetAsync(string id, CancellationToken cancellationToken = default) => _repository.GetAsync(id, cancellationToken);
+    public Task<ItemsResult<ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging, CancellationToken cancellationToken = default)
+        => _repository.QueryAsync(query, paging, cancellationToken);
+}
+```
+
+**The repository stays singular — CQRS is a service-layer split, not a data-layer one.** Both `XxxService` and `XxxReadService` inject the **same** `IXxxRepository` when they share a data source (e.g. the one SQL database) — do **not** split the repository to mirror the services. Only when a specific operation targets a **different** data source (e.g. a read served from a separate store or search index) is an additional repository introduced; the owning service injects and calls the appropriate repository per operation.
+
+## Anti-Corruption Layer (Adapters)
+
+When a service needs to call another domain's API, inject an adapter interface (e.g., `IProductAdapter`) rather than calling `HttpClient` directly. Implement the adapter in the Infrastructure layer using a typed HTTP client. The interface surface should be domain-idiomatic — not a mirror of the remote API.
+
+Adapter interfaces live in `Application/Adapters/` (one interface per external domain). The Infrastructure implementation lives in `Infrastructure/Adapters/`.
+
+```csharp
+// Application/Adapters/IProductAdapter.cs — interface only (domain-idiomatic, not a mirror of the remote API)
+public interface IProductAdapter
+{
+    Task<Result<Product>> GetAsync(string id, CancellationToken cancellationToken = default);
+    Task<Result> ReserveInventoryAsync(Domain.Basket basket, CancellationToken cancellationToken = default);
+    Task<Result> CancelReservationAsync(Domain.Basket basket, CancellationToken cancellationToken = default);
+}
+
+// Infrastructure layer — implementation
+[ScopedService<IProductAdapter>]
+public class ProductAdapter(ProductsHttpClient httpClient) : IProductAdapter { ... }
+```
+
+A second adapter interface (`IXxxSyncAdapter`) handles **event-driven data replication** — receiving published events from another domain and maintaining a local eventually-consistent copy in the consuming domain's own store.
+
+## Policies
+
+Policies (`Application/Policies/`) encapsulate **domain-level guard logic** that requires I/O (adapter or repository calls). They provide a named, independently testable home for rules that depend on external state and cannot be expressed in a validator alone (synchronous) or enforced directly in the domain model (no async I/O). A policy can be called from any point in service orchestration where the condition needs to be verified.
+
+Policies are **not registered in DI** — they are instantiated directly at the call site using dependencies already injected into the calling service (see [DI Registration Principle](#di-registration-principle) below).
+
+Policies return `Result` or `Result<T>` and compose naturally into `Result<T>` pipelines via `.GoAsync()` / `.ThenAsAsync()`:
+
+```csharp
+// Application/Policies/ProductPolicy.cs
+public class ProductPolicy(IProductAdapter productAdapter)
+{
+    private readonly IProductAdapter _productAdapter = productAdapter.ThrowIfNull();
+
+    public Task<Result<Product>> EnsureExistsAsync(string productId, CancellationToken cancellationToken = default) => Result
+        .GoAsync(() => _productAdapter.GetAsync(productId, cancellationToken))
+        .OnFailure(r => r.IsNotFoundError
+            ? Result.ValidationError(MessageItem.CreateErrorMessage(nameof(productId), "Product was not found."))
+            : r);
+}
+
+// In the calling service — _productAdapter is already injected into the service:
+var result = await new ProductPolicy(_productAdapter).EnsureExistsAsync(productId, cancellationToken);
+```
+
+## Application-Level Mapping
+
+When a domain has a Domain layer, an `Application/Mapping/` sub-folder holds mappers that translate between the **Domain aggregate** and the **Contract**. This mapping is an Application-layer concern because it sits at the public surface boundary — it is not tied to any persistence technology.
+
+Use `Mapper<TSource, TDest, TSelf>` (uni-directional). Mappers are **not registered in DI** — call them via the static `Map()` method directly at the point of use (see [DI Registration Principle](#di-registration-principle) below):
+
+```csharp
+// Application/Mapping/BasketMapper.cs
+public class BasketMapper : Mapper<Domain.Basket, Contracts.Basket, BasketMapper>
+{
+    protected override Contracts.Basket OnMap(Domain.Basket source) => new()
+    {
+        Id = source.Id,
+        StatusCode = source.Status,
+        Items = [.. source.Items.Select(i => BasketItemMapper.Map(i))]
+    };
+}
+
+// Call via static Map() — no injection, no new():
+var contract = BasketMapper.Map(aggregate);
+```
+
+Infrastructure-level mapping (Contract ↔ Persistence model) uses `BiDirectionMapper` and lives in `Infrastructure/Mapping/`. Do not conflate the two layers.
+
+## DI Registration Principle
+
+Only register a type in DI when there is a current, concrete intent to mock or replace it. Applying YAGNI, the following Application-layer types are **not** DI-registered — they are called or instantiated directly at the point of use:
+
+| Type | How to use |
+|---|---|
+| `Validator<T, TSelf>` | Call via static `Default` singleton: `MyValidator.Default.ValidateAndThrowAsync(...)` |
+| `Validator<T>` | Instantiate directly with already-injected deps: `new MyValidator(_repo).ValidateAndThrowAsync(...)` |
+| `Mapper<TSource, TDest, TSelf>` | Call via static `Map()` method: `MyMapper.Map(source)` |
+| Policy classes | Instantiate directly with already-injected deps: `new MyPolicy(_adapter).EnsureExistsAsync(...)` |
+
+Keeping these out of DI avoids bloating service constructors with dependencies that are not realistic substitution points, and defers that complexity until there is a real need for it.
+
+## ConfigureAwait
+
+Always call `.ConfigureAwait(false)` on every `await` inside service and repository methods.
+
+## Do Not
+
+- Do not publish events outside of `_unitOfWork.TransactionAsync(...)` — events must be committed atomically with the database write.
+- Do not put **query/collection or read-model** operations in `XxxService`, nor mutating operations in `XxxReadService` — queries belong in `XxxReadService`. (A primary by-id `GetAsync` legitimately appears on **both**: the write service uses it to support its own mutations, e.g. the PATCH pre-get.)
+- Do not split the repository to mirror the CQRS services — both share one `IXxxRepository` per data source; add another repository only for a genuinely different data source.
+- Do not call `HttpClient` directly from services — always go through an adapter interface.
+- Do not reference Infrastructure assemblies from the Application layer — all persistence and transport concerns are reached through interfaces.
+- Do not implement rules in `OnValidateAsync` that require I/O without first guarding with `if (context.HasErrors) return;`.
+- Do not add business logic to controllers — services own all use-case orchestration.
+- Do not register Validators, Mappers, or Policies in DI or inject them into service constructors — call or instantiate them directly at the point of use (YAGNI: refactor to DI only when there is a real need to mock or replace them).
+- Do not use `new ProductValidator()` at the call site when `Validator<T, TSelf>` provides a `Default` singleton — use `ProductValidator.Default`.
+- Do not inject a validator into a service constructor — a `Validator<T, TSelf>` is invoked via its `Default` singleton, never as a constructor dependency.
+- Do not call bare `ValidateAsync(...)` for fail-fast validation — it returns the result without throwing, silently swallowing errors. Use `ValidateAndThrowAsync` (non-ROP) or `ValidateWithResultAsync` (ROP).
+- Do not perform a mutating `TransactionAsync` without adding its event (`_unitOfWork.Events.Add(...)`) when eventing is enabled — the write and the event must be committed together.
+- Do not use `WhereMutated(_ => ...)` on a delete — `DataResult` (delete) has no value; use the parameterless `WhereMutated(() => ...)`. The value-carrying `WhereMutated(v => ...)` is only for `DataResult<T>` (create/update).
+- Do not reach for a non-`As` Result operator when the delegate changes the result type — use the `As` variant (e.g. `ThenAs`/`ThenAsAsync`); the `As` suffix exists to make the type change explicit.
+- Do not generate service operations the user did not confirm — confirm the CRUD set (Get/Create/Update/Delete, each default-selected) when operations are unspecified, and never add a Query operation without an explicit request.
+
+## Further Reading
+
+- [Application Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/application-layer.md) — full walkthrough of services, validators, adapters, policies, mapping, and the unit-of-work pattern.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — CQRS, Service, Unit of Work, Validator, Policy, Adapter, and Event patterns with cross-links.
+- [Layer Dependencies](https://github.com/Avanade/CoreEx/blob/main/samples/docs/layers.md) — layer dependency rules: Application depends inward only on Contracts and its own interfaces.
+- [CoreEx.Validation README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Validation/README.md) — `Validator<T>`, rule set, `OnValidateAsync`, and `ValidateFurtherAsync`.
+- [CoreEx README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/README.md) — `IUnitOfWork`, `Result<T>`, `[ScopedService]`, and CoreEx exception types.
+- [CoreEx Results README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/Results/README.md) — `Result<T>` type, pipeline operators (`.GoAsync`, `.ThenAs`, `.ThenAsAsync`), and error propagation semantics.
diff --git a/.github/instructions/coreex-contracts.instructions.md b/.github/instructions/coreex-contracts.instructions.md
new file mode 100644
index 00000000..b2891d69
--- /dev/null
+++ b/.github/instructions/coreex-contracts.instructions.md
@@ -0,0 +1,410 @@
+---
+applyTo: "**/Contracts/**/*.cs"
+description: "Contract (DTO) conventions: source generation, marker attributes, reference data, ETag, and ChangeLog support"
+tags: ["contracts", "dto", "source-generation", "reference-data", "etag"]
+---
+
+# Contract (DTO) Conventions
+
+## File Placement
+
+Contracts live **flat in the root of the `*.Contracts` project** — both hand-authored (`Product.cs`) and generated (`Product.g.cs`) files. **Do not create sub-folders** such as `Entities/`, `Models/`, or `RefData/` to group them; the samples place every contract at the project root regardless of whether it is a root entity, subordinate, request/response DTO, or reference-data type. Only introduce a sub-folder if the **user explicitly asks** for one. The same flat-root convention applies to the matching files in the other layers (validators, services, repositories, mappers) unless their instructions state otherwise.
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx` | `[Contract]`, `IIdentifier<T>`, `ICompositeKey`, `IETag`, `IChangeLog`, `ChangeLog`, `[ReadOnly]`, `[Localization]`; includes the `CoreEx.Generator` Roslyn source generator — no separate package reference required |
+| `CoreEx.RefData` | `ReferenceData<T>`, `ReferenceDataCollection<T>`, `[ReferenceData<T>]`, `[ReferenceData]`, `ReferenceDataSortOrder` |
+
+```xml
+<ItemGroup>
+  <PackageReference Include="CoreEx" />
+  <PackageReference Include="CoreEx.RefData" />
+</ItemGroup>
+```
+
+## Root vs. Subordinate (contract or entity)
+
+Note that the terms Contract and Entity are interchangeable in this context. The conventions below apply to all DTOs that represent a resource, whether they are persisted entities or plain request/response models.
+
+If the user specifies that it is Reference Data then treat as defined by [Reference Data Contracts](#reference-data-contracts).
+
+Before generating any contract, determine whether it is a **root** or a **subordinate** contract.  
+Always ask the user if this is not explicit in their request.
+
+| Concern | Root | Subordinate |
+|---|---|---|
+| `IIdentifier<string?>` | ✅ Always (unless explicitly requested otherwise). The user may also specify a different type | ❌ Omit |
+| `IETag` | ✅ Always (unless explicitly requested otherwise) | ❌ Omit |
+| `IChangeLog` | ✅ When audit trail is needed (ask) | ❌ Omit |
+| `[ReadOnly(true)]` on `Id`, `ETag`, `ChangeLog` | ✅ Required | N/A |
+| `[Contract]` + `partial` | ✅ Always for generated members | Only if generated members are needed |
+
+**Root** — owns its own identity, is persisted independently, and is retrieved/mutated via its own API endpoint (e.g. `Product`, `Order`, `Person`).
+
+**Subordinate** — a child, line-item, value object, or request/response DTO that is generally accessed through a root (e.g. `OrderLine`, `Address`, `BasketItemAddRequest`).
+
+> **Agent instruction:** When asked to create a contract and the category is not explicit,  
+> ask: *"Is `{Name}` a root contract (it has its own identity) or a subordinate contract (accessed only through a parent)?"*  
+> Do not assume root. Do not generate `IIdentifier`, `IETag`, or `IChangeLog` until confirmed.
+
+> **Identifier type — do not substitute.** The identifier type is `IIdentifier<string?>` by **default**. Use `string?` unless the user **explicitly** states a different type (e.g. "use a `Guid` id", "the key is an `int`"). **Never** silently change it — in particular, do **not** default to `Guid` because it is common elsewhere. The chosen type is authoritative and must flow through unchanged to every downstream artefact: the `ref-data.yaml` `idType`, the persistence model, and the database primary-key column type (a `string?` id → `NVARCHAR(50)`/`VARCHAR(50)`, **not** `UNIQUEIDENTIFIER`/`UUID`). If a plan or prior step states one type, the implementation must match it exactly — flag any discrepancy rather than resolving it by changing the type.
+
+## Unified API and Messaging Surface
+
+The same contract type is used for both the HTTP API response **and** the event message payload. A `Product` returned from `GET /api/products/{id}` is the same `Contracts.Product` type published as a `product.created` event body. Do not split a resource into separate API and event DTOs.
+
+When a domain **consumes** events from another domain, declare a local internal representation (e.g., `Application\Adapters\Products\Product`) rather than taking a dependency on the publishing domain's Contracts assembly. Keep the shape consistent with the published contract, but own it locally to preserve the anti-corruption boundary.
+
+## Source Generation
+
+Mark entity contract classes with the `[Contract]` attribute and declare them `partial`. The `CoreEx` package ships with a bundled Roslyn source generator ([`CoreEx.Generator`](https://github.com/Avanade/CoreEx/tree/main/gen/CoreEx.Generator)) that activates automatically — no extra package reference is needed. It emits serialization, equality, and change-tracking code into a paired `*.g.cs` file at compile time. Never manually implement those generated members.
+
+> Both `[Contract]` and `[ReferenceData]` trigger this Roslyn source generator. For reference data types the flow is two-stage: the `*.CodeGen` project (OnRamp/Handlebars) first generates the class decorated with `[ReferenceData]`, then the Roslyn generator processes that attribute at compile time to emit additional members -- see [Reference Data Contracts](#reference-data-contracts).
+
+```csharp
+[Contract]
+public partial class Product : ProductBase, IETag, IChangeLog { }
+```
+
+### How the generator runs (do not chase phantom build problems)
+
+The Roslyn source generator runs **automatically as part of compilation** — every `dotnet build` and every IDE design-time build. You do **not** trigger it manually, and there is no separate step to "make it generate".
+
+Common misconceptions to avoid:
+- **Missing generated members before a build is normal — not an error to fix by hand.** If a `partial` property or class has no visible implementation, it is because the project simply hasn't been built yet. Build it; do **not** hand-author the generated partial implementation or create the `.g.cs` file to "unblock" things.
+- **Other compilation errors do not stop the generator.** Roslyn runs source generators on the parsed compilation regardless of unrelated errors; there is **no build-ordering requirement and no "circular dependency"** whereby errors elsewhere prevent generation. Do not invent such a dependency — fix the actual reported errors and rebuild.
+- **If a member is still missing after a clean build, the contract declaration is malformed**, not the build process. Check that the class has `[Contract]` and is `partial`, the property is `partial`, and the attributes are correct (see below) — then rebuild. Never substitute a hand-written implementation for the generated one.
+
+Plain value-object or request contracts that do not need generated members (equality, cloning, etc.) can be declared as ordinary, non-`partial` classes without `[Contract]`:
+
+```csharp
+// No [Contract] needed — no generated members required.
+public class BasketItemAddRequest
+{
+    public string? ProductId { get; set; }
+    public decimal Quantity { get; set; }
+}
+```
+
+## Interfaces
+
+Implement the appropriate CoreEx marker interfaces depending on the entity's behavior:
+
+| Interface | When to use |
+|---|---|
+| `IIdentifier<T>` | Entity has a single primary key |
+| `ICompositeKey` | Entity has a multi-part key |
+| `IETag` | Entity participates in optimistic concurrency / IF-MATCH |
+| `IChangeLog` | Entity records created/updated audit metadata |
+
+All three are typically combined on mutable entities:
+
+```csharp
+[Contract]
+public partial class Product : ProductBase, IETag, IChangeLog
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+}
+```
+
+## Documentation Comments
+
+Give **every contract property a `<summary>`** (and the contract class itself). The standard `Id`/`ETag`/`ChangeLog` members — which implement `IIdentifier`/`IETag`/`IChangeLog` — may use `<inheritdoc/>` instead. See [XML Documentation Comments](#) in the conventions. (Common mistake: leaving the contract properties undocumented — they each need a summary.)
+
+```csharp
+/// <summary>Represents the <c>Employee</c> contract.</summary>
+[Contract]
+public partial class Employee : IIdentifier<string?>, IETag, IChangeLog
+{
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    /// <summary>Gets or sets the employee's first name.</summary>
+    public string? FirstName { get; set; }
+
+    /// <summary>Gets or sets the employee's gender (reference data).</summary>
+    [ReferenceData<Gender>]
+    public partial string? GenderCode { get; set; }
+
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+}
+```
+
+## ReadOnly Properties
+
+Decorate server-assigned properties with `[ReadOnly(true)]` to signal that clients cannot supply them. Common examples: `Id`, `ETag`, `ChangeLog`, `CategoryCode` (derived from SubCategory). NSwag/OpenAPI automatically excludes these from inbound request schemas.
+
+## Reference Data Properties
+
+Use `[ReferenceData<TRefData>]` on code properties that back a reference data relationship. Two conditions must both be met for the source generator to emit the navigation accessor:
+
+1. The **class** is decorated with `[Contract]` and declared `partial`.
+2. The **property** is declared `partial`.
+
+```csharp
+[Contract]
+public partial class ProductBase : IIdentifier<string?>
+{
+    [ReferenceData<SubCategory>]
+    [Localization("Sub-category")]
+    public partial string? SubCategoryCode { get; set; }
+
+    [ReferenceData<UnitOfMeasure>]
+    [Localization("Unit-of-measure")]
+    public partial string? UnitOfMeasureCode { get; set; }
+}
+```
+
+The generated code exposes a strongly-typed `SubCategory` property alongside the raw `SubCategoryCode` string. If either `[Contract]` or `partial` is missing from the class, the navigation property will not be generated and the code will not compile correctly.
+
+> **Only `[ReferenceData<T>]` properties are `partial` — not every property in the class.** The class is `partial` (it has a generated `.g.cs` part), but among its **properties** *only* the `[ReferenceData<T>]`-decorated code properties are declared `partial` (the generator supplies their implementation part — the typed navigation). Every other property is an **ordinary auto-property** with no `partial` keyword. Do **not** assume that because the class is `partial` its properties must be too — marking a plain property `partial` with no generated implementation fails to compile with **CS9248** *("partial property … must have an implementation part")*.
+>
+> ```csharp
+> public partial class Employee : IIdentifier<string?>
+> {
+>     public string? FirstName { get; set; }              // ✅ plain — NOT partial
+>     public decimal Salary { get; set; }                 // ✅ plain — NOT partial
+>
+>     [ReferenceData<Gender>]
+>     public partial string? GenderCode { get; set; }     // ✅ partial — generator emits the `Gender` navigation
+>
+>     // public partial string? FirstName { get; set; }   // ❌ CS9248 — no generated implementation for a non-ref-data property
+> }
+> ```
+
+> **Agent instruction — property type resolution:** When generating contract properties, apply this hierarchy for every property first, then generate the complete contract in a single pass. Do not ask about individual properties mid-list.
+>
+> **Step 1 — Honour explicit types**  
+> If the user specifies a CLR type (e.g. `string Gender`, `int Rating`), use it as-is. No lookup. No question.
+>
+> **Step 2 — Infer obvious primitives by name pattern (silent — no question)**
+>
+> | Name pattern | Inferred type |
+> |---|---|
+> | `First*`, `Last*`, `*Name`, `*Description`, `*Text`, `*Notes`, `*Comment`, `Sku`, `Email`, `Phone`, `Url` | `string?` |
+> | `Is*`, `Has*`, `Can*`, `Allow*` | `bool` |
+> | `*Price`, `*Amount`, `*Cost`, `*Rate`, `*Total`, `*Balance`, `*Percentage` | `decimal` |
+> | `*Date`, `*On`, `*At`, `Created*`, `Updated*`, `Deleted*` | `DateTime?` |
+> | `*Quantity`, `*Qty` | `decimal` |
+> | `*Count`, `*Number`, `*Sequence` | `int` |
+>
+> **Step 3 — Check `ref-data.yaml` for any remaining untyped noun properties**  
+> Search `entities:` in `tools/[domain].CodeGen/ref-data.yaml` for each unresolved property name:
+> - **Found** — wire up silently as `[ReferenceData<T>]` `public partial string? {Name}Code { get; set; }`. No question.
+> - **Not found** — add to the candidates list for Step 4.
+>
+> **Step 4 — Ask once, for all remaining candidates, at the end**  
+> After processing every property, if any candidates remain unresolved, ask a single question:  
+> *"The following properties could be reference data types — which should I add to `ref-data.yaml`? (select any, or none to treat as plain properties): `Gender`, `Status`, `Priority`"*  
+> Never ask per-property. Never interrupt before all properties have been analysed.
+>
+> **Step 5 — Single batch edit and one CodeGen run**  
+> For all properties the user confirms as reference data:
+> 1. Add **all** confirmed types to `ref-data.yaml` under `entities:` in a **single edit**.
+> 2. Offer to run `dotnet run` from the `*.CodeGen` directory **once** to generate all of them in one pass.
+> 3. On success, summarise the generated artefacts; on failure relay the **complete output verbatim** then fix `ref-data.yaml` and offer to re-run. Do not create `.g.cs` files manually.
+>
+> **Step 6 — Generate the complete contract in one pass**  
+> Once all types are resolved and CodeGen has run (if needed), emit the full contract:
+> - Reference data properties: `[ReferenceData<T>]` `public partial string? {Name}Code { get; set; }` — the property name is always `{Name}Code`; the navigation property `{Name}` is Roslyn-generated and must not be hand-authored.
+> - Plain properties: use the inferred or explicit CLR type.
+> - Apply `[Localization("Human label")]` **only** where the auto-derived label would be wrong/undesired (e.g. `SubCategoryCode` → `"Sub-category"`). Do **not** add it when the value would equal the default (e.g. `[Localization("Salary")]` on `Salary` is redundant).
+> - For any property confirmed as plain (Step 4, user selected none or a subset), use `string?` as the default if no better type can be inferred.
+
+## Localization Labels
+
+CoreEx automatically derives a human-friendly label from the property name (the PascalCase name is split into words — e.g. `DateOfBirth` → "Date Of Birth"). **Only** decorate a property with `[Localization("Human label")]` when that default would be wrong or undesired — typically to drop a `Code` suffix or hyphenate (e.g. `SubCategoryCode` → "Sub-category").
+
+```csharp
+// ✅ Needed — default "Sub Category Code" is undesired
+[Localization("Sub-category")]
+public partial string? SubCategoryCode { get; set; }
+// Validation error: "Sub-category is required." (not "Sub Category Code is required.")
+
+// ❌ Redundant — the default already yields "Salary"; do not annotate
+[Localization("Salary")]
+public decimal Salary { get; set; }
+```
+
+Omit `[Localization]` whenever the attribute value would equal the auto-derived label — it is noise. Add it only to change the label.
+
+## Inheritance for Shared Fields
+
+Extract shared fields into an abstract `XxxBase` class when multiple contracts share the same core properties. This keeps validation and mapping code DRY.
+
+A projection subclass that adds no source-generated behavior (no `IETag`, `IChangeLog`, etc.) does **not** need `[Contract]` or `partial`:
+
+```csharp
+[Contract]
+public abstract partial class ProductBase : IIdentifier<string?>
+{
+    public string? Id { get; set; }
+    public string? Sku { get; set; }
+    public string? Text { get; set; }
+    public decimal Price { get; set; }
+}
+
+[Contract]
+public partial class Product : ProductBase, IETag, IChangeLog { /* additions only */ }
+
+// Projection — plain class, no generated members needed.
+public class ProductLite : ProductBase
+{
+    public decimal QtyOnHand { get; set; }
+}
+```
+
+## Reference Data Contracts
+
+Reference data contracts are **generated, not hand-authored**. The source of truth is the `entities:` section of `ref-data.yaml` in the domain's `*.CodeGen` project. Running the CodeGen generates all artefacts across every layer -- contract class, API endpoint, service method, repository interface, repository implementation, and mapper -- as `.g.cs` files that must never be edited directly.
+
+> **Agent instruction:** When asked to create or modify a reference data type:
+> 1. Edit `ref-data.yaml` in `tools/[domain].CodeGen/` -- add or update the entry under `entities:`.
+> 2. Offer to run `dotnet run` from the CodeGen directory on the user's behalf.
+> 3. If confirmed, execute it and summarise the generated artefacts on success; on failure relay the **complete output verbatim** — it provides the diagnostic needed to fix the entry.
+> 4. On failure, fix the issue in `ref-data.yaml` and offer to re-run -- do not create or edit `.g.cs` files to work around a generation error.
+> 5. If the user declines, remind them to run `dotnet run` from the `*.CodeGen` directory before the new types are available.
+>
+> If the user **explicitly requests** hand-authoring instead of CodeGen, use the pattern shown in [Hand-authored contracts (explicit request only)](#hand-authored-contracts-explicit-request-only) below.
+
+### `ref-data.yaml` -- entity definition
+
+The standard `IReferenceData` properties (`Id`, `Code`, `Text`, `Description`, `SortOrder`, `IsActive`, `StartsOn`, `EndsOn` etc.) are automatically included in every generated type -- do not declare them under `properties:`. Only additional domain-specific columns need to be listed, and most reference data entities require none at all.
+
+```yaml
+entities:
+- name: Brand                   # minimal form -- no extra properties needed
+- name: Category                # same; just name is sufficient for most entities
+- name: SubCategory
+  properties:
+  - name: CategoryCode
+    type: ^Category             # ^ prefix = ref-data navigation property (typed accessor generated)
+- name: UnitOfMeasure
+  plural: UnitsOfMeasure        # override irregular pluralization
+  idType: Guid                  # override identifier type; defaults to string
+  properties:
+  - name: Scale
+    type: int                   # additional stored column (not part of IReferenceData)
+  - name: DiscountPercentage
+    type: decimal
+    excludeContract: true       # exclude from generated contract (persistence model only)
+```
+
+Key `entities:` options:
+
+| Key | Required | Default | Purpose |
+|---|---|---|---|
+| `name` | Yes | -- | Entity name (PascalCase) |
+| `plural` | No | Auto-pluralized | Override when pluralization is irregular |
+| `idType` | No | `string` | Identifier type override (e.g. `Guid`, `int`) |
+| `properties[].name` | Yes (if any) | -- | Additional stored property name |
+| `properties[].type` | Yes (if any) | -- | CLR type; prefix `^` for a ref-data navigation accessor |
+| `properties[].excludeContract` | No | `false` | Exclude from the generated contract (persistence only) |
+
+### Hand-authored extensions (optional)
+
+After CodeGen runs, an optional hand-authored `partial` class in the same namespace can add constants or computed members. Do not redeclare `[ReferenceData]`, the base class, or the collection class -- those are owned by the generator.
+
+```csharp
+// MovementKind.cs -- hand-authored extension; MovementKind.g.cs is generated, do not edit.
+public partial class MovementKind
+{
+    public const string Adjust  = "A";
+    public const string Issue   = "I";
+    public const string Receive = "R";
+}
+
+// UnitOfMeasure.cs -- computed property derived from a generated stored field.
+public partial class UnitOfMeasure
+{
+    [JsonIgnore]
+    public int Precision => 16 - Scale; // Scale is a generated stored field
+}
+```
+
+### Hand-authored contracts (explicit request only)
+
+If the user explicitly requests a hand-authored reference data contract (i.e., without CodeGen), declare the type and its paired collection class directly:
+
+```csharp
+[ReferenceData]
+public partial class Category : ReferenceData<Category>;
+
+public class CategoryCollection() : ReferenceDataCollection<Category>(ReferenceDataSortOrder.Code);
+```
+
+Use `ReferenceData<TId, TSelf>` when a non-string identifier type is required:
+
+```csharp
+[ReferenceData]
+public partial class Priority : ReferenceData<int, Priority>;
+
+public class PriorityCollection() : ReferenceDataCollection<Priority>(ReferenceDataSortOrder.Code);
+```
+
+## Casing Transformations
+
+Apply casing transforms in the property setter, not in the validator, when a field has a canonical form:
+
+```csharp
+public string? Sku { get => field; set => field = value?.ToUpper(); }
+```
+
+## JsonIgnore
+
+Use `[JsonIgnore]` for computed or internal properties that must not appear in the API response or request body:
+
+```csharp
+[JsonIgnore]
+public bool IsQuantityValidForKind => KindCode switch { ... };
+```
+
+## No Business Logic in Contracts
+
+Contracts are data transfer objects. Keep them free of domain rules, validation logic, and service calls. Read-only computed helpers (like `IsQuantityValidForKind` above) are acceptable shorthands but must not mutate state.
+
+## Generated Code
+
+Never create or edit `*.g.cs` files directly.
+
+| File pattern | Generator | Change instead |
+|---|---|---|
+| `*.g.cs` (ref-data types, cross-layer) | `*.CodeGen` project (`ref-data.yaml` + Handlebars/OnRamp) | Edit `ref-data.yaml` and re-run `dotnet run` |
+| `*.g.cs` (contract members) | Roslyn source generator (`CoreEx.Generator`) | The `[Contract]`-decorated partial class |
+
+## Do Not
+
+- Do not reference another domain's Contracts assembly to consume its events — declare a local adapter model instead.
+- Do not add `[Contract]` or `partial` to plain value-object or request classes that need no generated members.
+- Do not implement members that the Roslyn source generator emits (equality, cloning, serialization helpers).
+- Do not place domain rules, validators, or service calls in contract classes.
+- Do not leave contract properties without a `<summary>` — every property gets one (standard `Id`/`ETag`/`ChangeLog` may use `<inheritdoc/>`). See the *Documentation Comments* section.
+- Do not add a redundant `[Localization]` attribute whose value equals the auto-derived label (e.g. `[Localization("Salary")]` on `Salary`) — only annotate to change the label.
+- Do not edit `*.g.cs` files directly — regenerate via the appropriate tooling.
+- Do not hand-author a generated partial implementation (or create its `.g.cs`) because it is "missing" — it appears after a build; the generator runs automatically during compilation.
+- Do not invent a build-ordering or "circular dependency" excuse for missing generated code — Roslyn runs the generator even when other errors exist; fix the real errors and rebuild.
+- Do not emit `#nullable enable` or `#nullable restore` pragma directives — nullable is enabled project-wide via `Directory.Build.props`.
+- Do not create a sub-folder (e.g. `Entities/`, `Models/`, `RefData/`) to house contracts — place every contract flat in the `*.Contracts` root (see *File Placement*); only nest when the user explicitly asks.
+
+## Further Reading
+
+- [Contracts Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/contracts-layer.md) — unified API/event surface, source generation, reference data, and internal adapter models.
+- [CoreEx.Generator](https://github.com/Avanade/CoreEx/tree/main/gen/CoreEx.Generator) — Roslyn source generator that processes `[Contract]` and `[ReferenceData]` annotations.
+- [CoreEx.RefData README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.RefData/README.md) — reference data types, collections, and sort order.
+- [Tooling Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/tooling.md) — `*.CodeGen` project usage and `ref-data.yaml` configuration.
diff --git a/.github/instructions/coreex-conventions.instructions.md b/.github/instructions/coreex-conventions.instructions.md
new file mode 100644
index 00000000..947a16d2
--- /dev/null
+++ b/.github/instructions/coreex-conventions.instructions.md
@@ -0,0 +1,213 @@
+---
+applyTo: "**/*.cs"
+description: "Universal C# coding conventions: nullable, implicit usings, GlobalUsing.cs, file-scoped namespaces, brace style, expression bodies, and private field naming"
+tags: ["conventions", "style", "nullable", "usings", "naming"]
+---
+
+# C# Coding Conventions
+
+## Project Configuration
+
+Every project must have `Nullable` and `ImplicitUsings` enabled. For consuming projects these are typically set once in a root `Directory.Build.props`:
+
+```xml
+<PropertyGroup>
+  <Nullable>enable</Nullable>
+  <ImplicitUsings>enable</ImplicitUsings>
+</PropertyGroup>
+```
+
+Nullable warnings are treated as errors. Never suppress a nullable warning with the null-forgiving operator (`!`) without a clear reason in a comment.
+
+## Global Usings
+
+Every project has a single `GlobalUsing.cs` at the project root that declares all namespace imports. Do not add `using` statements to individual source files.
+
+```csharp
+// GlobalUsing.cs — all usings for the project declared here (sorted alphabetically)
+global using Contoso.Products.Application.Interfaces;
+global using CoreEx;
+global using Microsoft.Extensions.Logging;
+global using System;
+global using System.Collections.Generic;
+global using System.Threading;
+global using System.Threading.Tasks;
+```
+
+**Always re-sort after editing**: Whenever you add or change an entry in `GlobalUsing.cs`, re-sort the **entire** file alphabetically (ordinal) so the order stays deterministic — all namespaces sorted equally, with no special grouping for `System.*`, one `global using` per line. Never simply append a new entry at the end.
+
+**Why this matters for code generation**: The `*.CodeGen` project emits no `using` statements in generated files. Every namespace referenced by generated code must already be declared in `GlobalUsing.cs`, or the generated output will not compile. When adding a new namespace dependency, add it to `GlobalUsing.cs` — not to the generated file.
+
+**Global usings follow the code (the scaffold ships clean).** A fresh `coreex` scaffold deliberately does **not** pre-declare `global using`s for its own still-empty project namespaces (`{Solution}.Contracts`, `{Solution}.Application`, `{Solution}.Application.Repositories`) — a `global using` of a namespace with no types yet is a **CS0234** compile error, and shipping placeholder/marker types just to avoid that is an anti-pattern. Instead, **add each `global using` to the consuming project's `GlobalUsing.cs` at the moment you create the code that needs it** — the first contract, the first service, or immediately after CodeGen emits the repository interfaces. This keeps the scaffold an honest, compiling starting point and is a normal, expected step when adding code. (The one exception is the `AssemblyMarker` types in Application/Infrastructure, which exist for `AddDynamicServicesUsing` assembly anchoring — not for namespace population.)
+
+## File-Scoped Namespaces
+
+Use file-scoped namespace declarations. Never use block-scoped namespaces.
+
+```csharp
+// Correct — file-scoped
+namespace Contoso.Products.Application;
+
+public class ProductService { }
+```
+
+```csharp
+// Wrong — do not use block-scoped
+namespace Contoso.Products.Application
+{
+    public class ProductService { }
+}
+```
+
+## Braces on `if` Statements
+
+Single-line `if` bodies do not require braces.
+
+```csharp
+// Correct — no braces needed
+if (product == null) return null;
+
+// Correct — no braces needed - prefer muli-line bodies even when they fit on one line
+if (context.HasErrors)
+    return;
+
+// Correct — braces required when body spans multiple lines
+if (condition)
+{
+    DoSomething();
+    DoSomethingElse();
+}
+```
+
+## Expression-Bodied Members
+
+Use `=>` syntax whenever the entire body is a single expression — methods, properties, constructors, operators, and accessors. Use a block body when there are multiple statements. The choice is entirely the developer's; the IDE makes no suggestion in either direction.
+
+```csharp
+// Method delegation — use =>
+public Task<Product?> GetAsync(string id, CancellationToken cancellationToken = default) => _repository.GetAsync(id, cancellationToken);
+
+// Multi-line single expression — use =>
+public Task<ItemsResult<ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging, CancellationToken cancellationToken = default)
+    => _repository.QueryAsync(query, paging, cancellationToken);
+
+// Constructor with single expression — use =>
+public DataResult(bool wasMutated) => WasMutated = wasMutated;
+
+// Computed property — use =>
+public string DisplayName => $"{First} {Last}";
+
+// Multiple statements — block body required
+public async Task<Product> UpdateAsync(Product product, CancellationToken cancellationToken = default)
+{
+    product.ThrowIfNull();
+    await ProductValidator.Default.ValidateAndThrowAsync(product, cancellationToken).ConfigureAwait(false);
+    return await _repository.UpdateAsync(product, cancellationToken).ConfigureAwait(false);
+}
+```
+
+## Line Length and Method Declarations
+
+Keep declarations and statements on a **single line**. Do not wrap a method (or constructor/delegate) declaration across multiple lines by placing each parameter on its own line — keep the signature on one line even when it has several parameters. Only break a line when it would otherwise exceed **250 characters**.
+
+```csharp
+// Correct — single line, even with multiple parameters
+protected override Task OnValidateAsync(ValidationContext<Contracts.Employee> context, CancellationToken cancellationToken)
+
+// Incorrect — needlessly split across lines while under 250 characters
+protected override Task OnValidateAsync(
+    ValidationContext<Contracts.Employee> context,
+    CancellationToken cancellationToken)
+```
+
+## Ambient Runtime (Clock and GUIDs)
+
+Obtain the current time and new `Guid` values from CoreEx's ambient `Runtime` (`CoreEx` namespace) rather than the BCL statics. `Runtime` is `ExecutionContext`-aware and provider-backed (`TimeProvider` / `IdentifierGenerator`), making values consistent across a request and substitutable in tests.
+
+```csharp
+DateTimeOffset now = Runtime.UtcNow;             // DateTimeOffset
+DateTime utc       = Runtime.UtcNow.UtcDateTime; // DateTime (when a DateTime is required)
+Guid id            = Runtime.NewGuid();          // new Guid
+```
+
+- Need a `DateTimeOffset` → `Runtime.UtcNow` (**never** `DateTimeOffset.UtcNow`).
+- Need a `DateTime` → `Runtime.UtcNow.UtcDateTime` (**never** `DateTime.UtcNow`).
+- Need a `Guid` → `Runtime.NewGuid()` (**never** `Guid.NewGuid()`).
+
+## Cancellation Tokens
+
+**Every `async`/`Task`-returning method takes a `CancellationToken` and passes it on.** Add it as the **last parameter** — `CancellationToken cancellationToken = default` on public/library methods (default so callers aren't forced to supply one). Flow it through to **every** downstream awaitable call (repositories, `HttpClient`, EF Core, `_unitOfWork`, other services) — never call an overload that accepts a token without passing it, and never silently drop it.
+
+```csharp
+public async Task<Employee> CreateAsync(Employee value, CancellationToken cancellationToken = default)
+{
+    await EmployeeValidator.Default.ValidateAndThrowAsync(value, cancellationToken).ConfigureAwait(false);
+    return await _repository.CreateAsync(value, cancellationToken).ConfigureAwait(false);   // pass it on
+}
+```
+
+- **Controllers / Minimal-API handlers** take a `CancellationToken` parameter (ASP.NET binds/injects it), pass it to the `WebApi` helper via `cancellationToken:`, and use the helper lambda's `ct` for the service call — see `coreex-api-controllers.instructions.md`.
+- **Interfaces** declare the parameter too, so implementations and callers can honour it (`Task<T> GetAsync(string id, CancellationToken cancellationToken = default);`).
+- **Tests** are the exception — `Test.Scoped(...)` / the `WebApi` lambda supply the token; you don't manufacture one.
+
+## XML Documentation Comments
+
+Document the public surface with XML doc comments, and **never duplicate** a description that an interface already provides:
+
+- **Interfaces** — give **every** member (method, property, event) a `<summary>` describing the operation. Document parameters/returns (`<param>`, `<returns>`) where it adds clarity.
+- **Contract / DTO properties** — every property on a contract (including `[Contract]` partial classes) gets a `<summary>`. (Standard `Id`/`ETag`/`ChangeLog` members that implement `IIdentifier`/`IETag`/`IChangeLog` may use `<inheritdoc/>`.)
+- **Implementing / overriding members** — on the concrete class member that implements an interface member (or overrides a base member), use **`<inheritdoc/>`** rather than repeating the summary.
+- **Everything else** — a public type or member that is **not** an interface implementation/override gets its own `<summary>` (classes, standalone methods, properties, etc.).
+
+> **Do not invert this** (a common mistake): the `<summary>` goes on the **interface** member and on **contract properties**; the concrete class member that *implements* an interface gets **`<inheritdoc/>`**, not a fresh summary. Leaving interfaces or contract properties undocumented while summarising the implementing class is **backwards** — fix it the right way round.
+
+```csharp
+public interface IEmployeeService
+{
+    /// <summary>Gets the <see cref="Employee"/> for the specified <paramref name="id"/>.</summary>
+    Task<Employee?> GetAsync(string id);
+
+    /// <summary>Creates a new <see cref="Employee"/>.</summary>
+    Task<DataResult<Employee>> CreateAsync(Employee employee);
+}
+
+[ScopedService<IEmployeeService>]
+public class EmployeeService(IUnitOfWork unitOfWork, IEmployeeRepository repository) : IEmployeeService
+{
+    private readonly IUnitOfWork _unitOfWork = unitOfWork.ThrowIfNull();
+    private readonly IEmployeeRepository _repository = repository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public Task<Employee?> GetAsync(string id, CancellationToken cancellationToken = default) => _repository.GetAsync(id, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<DataResult<Employee>> CreateAsync(Employee employee) => /* ... */;
+}
+```
+
+## Private Field Naming
+
+Private instance fields are always prefixed with `_`. No exceptions.
+
+```csharp
+private readonly IProductRepository _repository;
+private readonly IUnitOfWork _unitOfWork;
+private readonly ILogger<ProductService> _logger;
+```
+
+## Do Not
+
+- Do not emit `#nullable enable` or `#nullable restore` pragma directives in hand-authored files — nullable is enabled project-wide via `<Nullable>enable</Nullable>` in `Directory.Build.props`. These pragmas are reserved for auto-generated `.g.cs` files produced by code generators.
+- Do not add `using` statements to individual `.cs` files — declare all imports in `GlobalUsing.cs`.
+- Do not leave `GlobalUsing.cs` unsorted after editing — re-sort the whole file alphabetically (all namespaces equally, no `System.*` grouping) rather than appending new entries at the end.
+- Do not use block-scoped namespace declarations.
+- Do not add braces to single-line `if` bodies.
+- Do not suppress nullable warnings with `!` without a comment explaining why.
+- Do not name private fields without the `_` prefix.
+- Do not split method/constructor declarations (one parameter per line) or otherwise wrap statements across lines unless the line would exceed 250 characters.
+- Do not use `DateTime.UtcNow` or `DateTimeOffset.UtcNow` — use `Runtime.UtcNow` (or `Runtime.UtcNow.UtcDateTime` for a `DateTime`).
+- Do not use `Guid.NewGuid()` — use `Runtime.NewGuid()`.
+- Do not omit or drop `CancellationToken` — every `async`/`Task`-returning method takes one (`CancellationToken cancellationToken = default`, last parameter) and passes it to every downstream awaitable call.
+- Do not replace a private backing field with an auto-property simply because it could be one — backing fields are a valid developer choice.
+- Do not leave interface members or contract properties undocumented — each gets a `<summary>`.
+- Do not invert the doc convention — summaries go on **interfaces and contract properties**; the **implementing** class member gets `<inheritdoc/>` (not a fresh summary). Summarising the concrete class while leaving the interface/contract undocumented is backwards.
diff --git a/.github/instructions/coreex-domain.instructions.md b/.github/instructions/coreex-domain.instructions.md
new file mode 100644
index 00000000..b4a742c2
--- /dev/null
+++ b/.github/instructions/coreex-domain.instructions.md
@@ -0,0 +1,208 @@
+---
+applyTo: "**/Domain/**/*.cs"
+description: "Domain layer conventions: aggregates, entities, value objects, PersistenceState tracking, and mutation methods"
+tags: ["domain", "ddd", "aggregates", "entities", "value-objects", "result"]
+---
+
+# Domain Layer Conventions
+
+The Domain layer is **optional**. It is introduced only when a domain contains aggregates with meaningful business rules and invariants that must be enforced at the model level — not in orchestration code. For example, a checkout/basket domain with state-machine transitions and nested item rules benefits from this layer; a simple CRUD-oriented domain (like a product catalog) typically does not.
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.DomainDriven` | `Aggregate<TId, TSelf>`, `Entity<TId, TSelf>`, `PersistenceState`, `.AsNew()`, `.AsNotModified()`, `.SetPersistenceState()` |
+| `CoreEx` | `Result`, `Result<T>`, `Result.GoAsync()`, `.ThenAs()`, `.ThenAsAsync()`, `Result.BusinessError()`, `Result.NotFoundError()`, `Result.ValidationError()`, `Runtime.NewId()`, `.ThrowIfNull()`, `.ThrowIfNullOrEmpty()`, `.ThrowIfInactive()`, `.ThrowIfLessThanZero()`, `ValidationException` |
+
+## Aggregates
+
+Aggregates are clusters of related entities treated as a single consistency boundary. Extend `Aggregate<TId, TSelf>`:
+
+```csharp
+public sealed class Basket : Aggregate<string, Basket>
+{
+    private List<BasketItem> _items = [];
+
+    // Factory methods are the only public construction paths.
+    public static Basket CreateNew(string customerId) => new Basket(Runtime.NewId())
+    {
+        CustomerId = customerId,
+        Status = BasketStatus.Empty
+    }.AsNew();
+
+    public static Basket CreateFrom(string id, string customerId, BasketStatus status,
+        IEnumerable<BasketItem>? items, ChangeLog? changeLog, string? etag) => new Basket(id)
+    {
+        CustomerId = customerId,
+        Status = status,
+        _items = items is null ? [] : [.. items.Select(i => i.Clone(PersistenceState.NotModified))],
+        ChangeLog = changeLog,
+        ETag = etag
+    }.AsNotModified();
+
+    private Basket(string id) : base(id) { }
+
+    public string CustomerId { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+    public BasketStatus Status { get; private set => field = value.ThrowIfNull().ThrowIfInactive(); } = null!;
+    public IReadOnlyList<BasketItem> Items => _items;
+    public decimal Total => _items.Where(i => i.PersistenceState.IsNotRemoved).Sum(i => i.Pricing.Total);
+}
+```
+
+### Factory Methods
+
+Provide two factory methods per aggregate:
+
+- `CreateNew(...)` — constructs a new aggregate with a generated ID, initial state, and calls `.AsNew()` to mark it as `PersistenceState.New`.
+- `CreateFrom(...)` — reconstructs from persisted data and calls `.AsNotModified()`.
+
+Both are the **only** public construction paths. The constructor is `private` to prevent partially-constructed instances.
+
+### Mutation Guards — `OnCheckCanMutate`
+
+Override `OnCheckCanMutate()` to enforce the conditions under which the aggregate may accept mutations. Return `Result.BusinessError(...)` (not an exception) when the condition is not met:
+
+```csharp
+protected override Result OnCheckCanMutate() => Status.CanBeMutated
+    ? Result.Success
+    : Result.BusinessError($"Basket has a status of '{Status}' and cannot be modified.",
+        c => c.WithKey(Id).WithErrorCode("invalid-status"));
+```
+
+### Post-Mutation Recalculation — `OnMutate`
+
+Override `OnMutate()` to re-derive any dependent state after a mutation is applied. This is called automatically by `Modify(...)` after the mutation succeeds:
+
+```csharp
+protected override void OnMutate()
+{
+    if (Status.CanBeMutated)
+        Status = _items.Any(i => i.PersistenceState.IsNotRemoved) ? BasketStatus.Active : BasketStatus.Empty;
+}
+```
+
+### Public Mutation Methods
+
+Public mutation methods should return `Result` or `Result<T>` — this is the preferred style because it makes failures explicit and composable in `Result<T>` pipelines in the Application layer. `BusinessException` can be thrown where that feels more natural, but the `Result` return style is recommended for consistency with the aggregate's `OnCheckCanMutate()` pattern. Use `Modify(...)` to apply the mutation, which enforces the `OnCheckCanMutate()` guard:
+
+```csharp
+public Result ItemAdd(BasketItem item) => Modify(() =>
+{
+    item.ThrowIfNull();
+    if (_items.FirstOrDefault(i => i.ProductId == item.ProductId && i.PersistenceState.IsNotRemoved) is BasketItem existing)
+        existing.IncreaseQuantity(item.Pricing.Quantity);
+    else
+        _items.Add(item.Clone(PersistenceState.New));
+
+    return Result.Success;
+});
+
+public Result ItemUpdate(string basketItemId, decimal quantity, string? etag)
+{
+    var item = _items.FirstOrDefault(i => i.Id == basketItemId.ThrowIfNullOrEmpty() && i.PersistenceState.IsNotRemoved);
+    if (item is null)
+        return Result.NotFoundError();
+
+    if (quantity != item.Pricing.Quantity)
+        Modify(() =>
+        {
+            item.OverrideQuantity(quantity);
+            item.SetETag(etag);
+        });
+
+    return Result.Success;
+}
+```
+
+## Entities
+
+Child entities within an aggregate extend `Entity<TId, TSelf>`. Apply the same factory-method and private-constructor pattern:
+
+```csharp
+public sealed class BasketItem : Entity<string, BasketItem>
+{
+    public static BasketItem CreateNew(string productId, string sku, string text, ItemPricing pricing)
+        => new BasketItem(Runtime.NewId()) { ProductId = productId, Sku = sku, Text = text, Pricing = pricing }.AsNew();
+
+    public static BasketItem CreateFrom(string id, string productId, string sku, string text, ItemPricing pricing, string? etag)
+        => new BasketItem(id) { ProductId = productId, Sku = sku, Text = text, Pricing = pricing, ETag = etag }.AsNotModified();
+
+    private BasketItem(string id) : base(id) { }
+
+    public string ProductId { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+    public string Sku { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+    public ItemPricing Pricing { get; private set => field = value.ThrowIfNull().EnsureIsValid(); } = null!;
+
+    // Internal mutation helpers — only callable by the owning aggregate.
+    internal void OverrideQuantity(decimal quantity) => Modify(() => Pricing = Pricing with { Quantity = quantity });
+    internal void Delete() => Remove();
+}
+```
+
+Keep mutation methods on child entities `internal` so they can only be invoked by the owning aggregate — never directly from the Application layer.
+
+Guard methods (`.ThrowIfNull()`, `.ThrowIfNullOrEmpty()`, `.ThrowIfInactive()`, `.ThrowIfLessThanZero()`) **return the guarded value** when the check passes, making them natural for inline use in property setters, `init` expressions, and method calls — as shown throughout the examples above. They also chain: `value.ThrowIfNull().ThrowIfInactive()` checks both conditions and returns the value if both pass.
+
+## PersistenceState
+
+`PersistenceState` tracks the lifecycle of each aggregate and entity so the Infrastructure layer knows exactly what to persist without being told explicitly:
+
+| State | Meaning |
+|---|---|
+| `New` | Newly created; insert on next commit |
+| `NotModified` | Loaded from store; no action required |
+| `Modified` | Changed since load; update on next commit |
+| `Removed` | Marked for deletion; delete on next commit |
+
+Use the helpers on `PersistenceState` for filtering:
+
+```csharp
+_items.Where(i => i.PersistenceState.IsNotRemoved)   // active items
+_items.Any(i => i.PersistenceState.IsNewOrModified)   // HasChanges check
+```
+
+## Value Objects
+
+Value objects represent concepts with no independent identity — defined entirely by their values. Implement as `sealed record` to get structural equality and `with`-expression mutation for free. Enforce invariants in property initialisers:
+
+```csharp
+public sealed record class ItemPricing
+{
+    public required Contracts.UnitOfMeasure UnitOfMeasure { get; init => field = value.ThrowIfInactive(); }
+    public decimal UnitPrice { get; init => field = value.ThrowIfLessThanZero(); }
+    public decimal Quantity { get; init => field = value.ThrowIfLessThanZero(); }
+    public decimal Total => UnitPrice * Quantity;
+
+    public ItemPricing EnsureIsValid() => DecimalRuleHelper.CheckScale(Quantity, UnitOfMeasure.Scale) ? this
+        : throw new ValidationException($"Quantity decimal places exceed the unit-of-measure scale of {UnitOfMeasure.Scale}.");
+}
+```
+
+Place value objects in a `ValueObjects/` sub-folder within the Domain project.
+
+## When to Introduce the Domain Layer
+
+Only introduce a Domain layer when the domain genuinely has:
+
+- Aggregates with invariants that must be enforced at the model level (e.g., state-machine transitions, child-collection rules).
+- Business rules that depend on the current aggregate state, not on external I/O.
+- The need to protect consistency boundaries across multiple child entities.
+
+For CRUD-oriented domains, skip the Domain layer entirely and let the Application service orchestrate directly against repository interfaces.
+
+## Do Not
+
+- Do not perform async I/O (repository calls, HTTP requests) inside domain classes — async work belongs in Application services or Policies.
+- Do not expose child entity mutation methods as `public` — use `internal` so only the owning aggregate can drive mutations.
+- Prefer returning `Result.BusinessError(...)` or `Result.NotFoundError()` over throwing exceptions for expected business failures in domain methods — this keeps failures explicit and composable. Throwing `BusinessException` is acceptable where it feels more natural, but the `Result` style is recommended for consistency.
+- Do not reference Infrastructure, Application, or host assemblies from the Domain layer — it depends only on Contracts and CoreEx.
+- Do not model value objects as classes with mutable properties — use `sealed record` with `init` setters and invariant enforcement at construction.
+
+## Further Reading
+
+- [Domain Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/domain-layer.md) — aggregates, entities, value objects, and `PersistenceState` walkthrough.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — Aggregate, Entity, and Value Object pattern entries with cross-links.
+- [Layer Dependencies](https://github.com/Avanade/CoreEx/blob/main/samples/docs/layers.md) — when to introduce the Domain layer and its position in the dependency graph.
+- [CoreEx.DomainDriven README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.DomainDriven/README.md) — `Aggregate<TId,TSelf>`, `Entity<TId,TSelf>`, and `PersistenceState`.
+- [CoreEx Results README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/Results/README.md) — `Result<T>` type, pipeline operators (`.GoAsync`, `.ThenAs`, `.ThenAsAsync`), and error propagation semantics.
diff --git a/.github/instructions/coreex-event-subscribers.instructions.md b/.github/instructions/coreex-event-subscribers.instructions.md
new file mode 100644
index 00000000..63637f9a
--- /dev/null
+++ b/.github/instructions/coreex-event-subscribers.instructions.md
@@ -0,0 +1,255 @@
+---
+applyTo: "**/Subscribe/**/*.cs"
+description: "Event subscriber conventions: SubscribedBase, SubscribedBase<T>, ValueValidator, ErrorHandler, subject naming, and Subscribe host Program.cs composition"
+tags: ["subscribers", "messaging", "service-bus", "event-handling", "integration", "subscribe-host"]
+---
+
+# Event Subscriber Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.Events` | `SubscribedBase`, `SubscribedBase<TValue>`, `[Subscribe(...)]`, `EventSubscriberArgs`, `ErrorHandler`, `ErrorHandling`, `EventData`, `.Key` |
+| `CoreEx.Azure.Messaging.ServiceBus` | `ServiceBusSessionReceiverOptions`, `.AzureServiceBusReceiving()`, `.WithSessionReceiver()`, `.WithSubscribedSubscriber()`, `.WithHostedService()` |
+| `CoreEx` | `[ScopedService]`, `.ThrowIfNull()`, `.Required()`, `Result`, `Result.Success`, `IValidator<T>` |
+
+## Subscriber Structure
+
+Each subscriber is a small, focused class that:
+
+1. Opts in to one or more message subjects via `[Subscribe("subject")]` attributes.
+2. Extends `SubscribedBase` (untyped) or `SubscribedBase<TValue>` (typed payload with optional validation).
+3. Delegates immediately to an Application-layer service or adapter — no business logic in the subscriber.
+4. Returns `Result` or `Result<T>` so that error handling and dead-lettering decisions can be expressed declaratively.
+
+All subscribers are decorated with `[ScopedService]` for automatic DI discovery. Dependencies are injected via primary constructor and guarded with `.ThrowIfNull()`.
+
+### Untyped subscriber — `SubscribedBase`
+
+Use when the relevant data is carried in the message key rather than a typed payload. Extract the key with `.Required()`, which throws a `ValidationException` if the key is absent:
+
+```csharp
+[ScopedService, Subscribe("contoso.products.product.deleted")]
+public class ProductDeleteSubscriber(IProductSyncAdapter adapter) : SubscribedBase
+{
+    private readonly IProductSyncAdapter _adapter = adapter.ThrowIfNull();
+
+    protected override Task<Result> OnReceiveAsync(
+        EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => _adapter.DeleteAsync(@event.Key.Required(), cancellationToken);
+}
+```
+
+For custom exception handling (e.g. converting a specific `NotFoundException` to a silent completion rather than dead-lettering), set `ErrorHandler` in the constructor — see [Error Handling](#error-handling) below.
+
+### Typed subscriber — `SubscribedBase<TValue>`
+
+Use when the message carries a typed payload that should be deserialized and optionally validated before `OnReceiveAsync` is called. Wire a `ValueValidator` to validate the deserialized value:
+
+```csharp
+[ScopedService]
+[Subscribe("contoso.products.product.created.v1")]
+[Subscribe("contoso.products.product.updated.v1")]
+public class ProductModifySubscriber(IProductSyncAdapter adapter) : SubscribedBase<Product>
+{
+    private readonly IProductSyncAdapter _adapter = adapter.ThrowIfNull();
+
+    public override IValidator<Product>? ValueValidator => ProductValidator.Default;
+
+    protected override Task<Result> OnReceiveAsync(
+        Product value, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => _adapter.ModifyAsync(value, cancellationToken);
+}
+```
+
+Multiple `[Subscribe]` attributes on a single class handle multiple subjects with the same logic — no duplication required.
+
+## Subject Naming
+
+Use dot-separated lowercase subject strings:
+
+```
+{solution}.{domain}.{entity}.{action}[.v{n}]
+```
+
+The version suffix `[.v{n}]` is driven by whether the message carries a **payload** (a CloudEvent data element), not by whether it is an integration event or a command message:
+
+- **With payload** → include a version suffix. The payload has a schema that can evolve; consumers need to know which version to deserialise: `contoso.products.product.created.v1`
+- **Without payload (key-only)** → no version suffix. There is no data schema to version: `contoso.products.reservation.confirm`
+
+Command messages follow the same rule — a key-only command carries no version; a command that includes a payload does.
+
+Examples:
+- `contoso.products.product.created.v1` — has payload → versioned
+- `contoso.products.product.updated.v1` — has payload → versioned
+- `contoso.products.product.deleted` — key-only (no payload) → no version
+- `contoso.products.reservation.confirm` — key-only (no payload) → no version
+- `contoso.products.reservation.cancel` — key-only (no payload) → no version
+
+> **Note:** CoreEx supports integration events only — domain events (aggregate-internal) are not provided out of the box.
+
+### Publishing
+
+This same subject convention governs publishing. The `EventFormatter` in `CoreEx.Events` derives the subject automatically from the entity type and action when `EventData.CreateEventWith(value, action)` is called. Publishing is an **application service concern** — the service adds events to the unit of work inside `_unitOfWork.TransactionAsync(...)`, and they are committed atomically with the database write:
+
+```csharp
+_unitOfWork.Events.Add(EventData.CreateEventWith(product, EventAction.Created));
+```
+
+The **outbox** is purely a transactional relay mechanism — it durably captures the events inside the same database transaction, then an Outbox Relay host forwards them to the broker asynchronously. The application service is unaware of the broker; it only adds events to the unit of work.
+
+## Error Handling
+
+Define a static `ErrorHandler` to control how specific exceptions are treated — for example, converting a known `NotFoundException` to an informational completion rather than dead-lettering:
+
+```csharp
+internal static readonly ErrorHandler DefaultErrorHandler = new ErrorHandler()
+    .Add<NotFoundException>(ex => ex.ErrorCode == "pending-reservation-not-found"
+        ? ErrorHandling.CompleteAsInformation   // consume silently; log as informational
+        : null);                                // null = fall through to default handling (retry / dead-letter)
+```
+
+Assign it in the constructor: `ErrorHandler = DefaultErrorHandler;`
+
+Share the same `ErrorHandler` instance across related subscribers (e.g., both Confirm and Cancel subscribers can reference the same static instance).
+
+## Accessing Event Data
+
+```csharp
+var key = @event.Key.Required();    // Returns the key, or throws ValidationException if null/default
+```
+
+In typed subscribers (`SubscribedBase<TValue>`), the deserialized value is passed directly as the first parameter to `OnReceiveAsync` — no manual deserialization needed. That is the preferred approach whenever a payload is expected.
+
+For the rare case where an untyped subscriber (`SubscribedBase`) needs to deserialize the payload, use the protected `DeserializeValue<T>` helper inherited from the base class:
+
+```csharp
+var result = DeserializeValue<MyPayload>(@event, args, valueIsRequired: true);
+if (result.IsFailure) return result.AsResult();
+var value = result.Value;
+```
+
+## Program.cs Composition
+
+The Subscribe host `Program.cs` follows a predictable CoreEx shape. Key sections in order:
+
+```csharp
+// 1. Execution context and dynamic service discovery
+builder.Services
+    .AddExecutionContext()
+    .AddReferenceDataOrchestrator()   // non-generic — binds the IReferenceDataProvider from DI at runtime
+    .AddMvcWebApi()
+    .AddHttpWebApi()
+    .AddHostedServiceManager();
+
+builder.Services.AddDynamicServicesUsing(typeof(Program).Assembly, typeof(MyApp.Application.AssemblyMarker).Assembly, typeof(MyApp.Infrastructure.AssemblyMarker).Assembly);
+
+// 2. Caching — L1 memory cache + L2 Redis + FusionCache hybrid + idempotency provider
+builder.Services.AddMemoryCache();
+builder.AddRedisDistributedCache("redis");
+builder.Services.AddFusionCache()
+    .WithRegisteredMemoryCache()
+    .WithRegisteredDistributedCache()
+    .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = ... }))
+    .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+builder.Services
+    .AddFusionHybridCache()
+    .AddDefaultCacheKeyProvider()
+    .AddHybridCacheIdempotencyProvider();
+
+// 3. Infrastructure — database, EF, outbox publisher (for transactional writes inside subscribers)
+// SQL Server variant:
+builder.AddSqlServerClient("SqlServer");
+builder.Services
+    .AddSqlServerDatabase()
+    .AddSqlServerUnitOfWork()
+    .AddSqlServerOutboxPublisher()              // outbox publisher becomes the default IEventPublisher
+    .AddDbContext<MyDbContext>()
+    .AddEfDb<MyEfDb>();
+
+// PostgreSQL variant (use instead):
+// builder.AddAzureNpgsqlDataSource("Postgres");
+// builder.Services
+//     .AddPostgresDatabase()
+//     .AddPostgresUnitOfWork()
+//     .AddEventFormatter()
+//     .AddPostgresOutboxPublisher()
+//     .AddDbContext<MyDbContext>()
+//     .AddEfDb<MyEfDb>();
+
+// 4. Azure Service Bus publisher — direct publish capability (not the default IEventPublisher)
+builder.AddAzureServiceBusClient("ServiceBus");
+builder.Services.AddAzureServiceBusPublisher((_, c) =>
+{
+    c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;
+}, addAsDefaultIEventPublisher: false);  // false because outbox publisher is already the default
+
+// 5. Event formatter + subscriber manager
+builder.Services
+    .AddEventFormatter()
+    .AddSubscribedManager((_, c) => c.AddSubscribersUsing<MySubscriber>());
+
+// 6. Azure Service Bus receiver wiring
+builder.Services.AzureServiceBusReceiving()
+    .WithSessionReceiver(_ =>
+    {
+        var o = ServiceBusSessionReceiverOptions.CreateForTopicSubscription();
+        o.SessionProcessorOptions.MaxConcurrentSessions = 4;
+        return o;
+    })
+    .WithSubscribedSubscriber()    // routes received messages through the SubscribedManager
+    .WithHostedService()           // runs the receiver as a BackgroundService
+    .Build();
+
+// 7. External API clients (if needed — for domains with inter-domain HTTP calls)
+builder.AddTypedHttpClient<ProductsHttpClient>("ProductsApi");
+
+// 8. Health checks, OpenTelemetry
+builder.Services.PostConfigureAllHealthChecks();
+builder.Services.AddControllers();
+builder.Services.AddOpenApiDocument(s =>
+{
+    s.Title = builder.Environment.ApplicationName;
+    s.AddCoreExConfiguration();
+});
+
+builder.WithCoreExTelemetry()
+    .WithCoreExServiceBusTelemetry()
+    .WithCoreExSqlServerTelemetry()  // or .WithCoreExPostgresTelemetry() for PostgreSQL
+    .UseOtlpExporter();
+
+// 9. Build and middleware pipeline
+var app = builder.Build();
+
+app.UseCoreExExceptionHandler();
+app.UseHttpsRedirection();
+app.UseAuthorization();
+app.UseExecutionContext();
+app.MapControllers();
+
+app.UseOpenApi();
+app.UseSwaggerUi();
+app.MapHealthChecks();
+app.MapHostedServices();   // exposes pause/resume management endpoints per partition
+
+app.Run();
+```
+
+`AddSubscribersUsing<T>()` scans the assembly containing `T` and auto-registers every `[Subscribe]`-decorated class — adding a new subscriber requires only creating the class, no `Program.cs` edits needed.
+
+`MapHostedServices()` exposes runtime management endpoints to **pause and resume** the receiver per partition without restarting the process.
+
+## Do Not
+
+- Do not embed business logic in subscriber classes — delegate immediately to an Application-layer service or adapter.
+- Do not use MediatR or in-process event dispatchers — subscribers react to integration events from the broker only.
+- Do not manually register subscriber classes in DI — `AddSubscribersUsing<T>()` discovers them automatically via `[ScopedService]`.
+- Do not omit `AddEventFormatter()` from `Program.cs` — it is required for message parsing and deserialization.
+- Do not set `addAsDefaultIEventPublisher: true` for the Service Bus publisher when the outbox publisher is the intended default `IEventPublisher`.
+
+## Further Reading
+
+- [Hosts Layer Guide — Subscribe Host](https://github.com/Avanade/CoreEx/blob/main/samples/docs/hosts-layer.md) — Subscribe host architecture, Program.cs shape, and subscriber patterns.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — Subscribe, Publish, Transactional Outbox, and Event-Driven Replication pattern entries.
+- [CoreEx.Azure.Messaging.ServiceBus README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Azure.Messaging.ServiceBus/README.md) — `SubscribedBase`, `ErrorHandler`, and Service Bus receiver configuration.
diff --git a/.github/instructions/coreex-host-setup.instructions.md b/.github/instructions/coreex-host-setup.instructions.md
new file mode 100644
index 00000000..898181d0
--- /dev/null
+++ b/.github/instructions/coreex-host-setup.instructions.md
@@ -0,0 +1,424 @@
+---
+applyTo: "**/Program.cs"
+description: "Host setup conventions for Program.cs: API host, Subscribe host, Outbox Relay host, middleware, service registration, and distributed caching"
+tags: ["program-cs", "host-setup", "middleware", "dependency-registration", "caching"]
+---
+
+# Host Setup Conventions (Program.cs)
+
+The host is a **composition root only** — no business logic. There are three host types in a CoreEx solution depending on the capabilities required. Each follows the same opening skeleton, then diverges based on its responsibilities.
+
+> **Further Reading**: [Hosts Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/hosts-layer.md) · [Layer Dependencies](https://github.com/Avanade/CoreEx/blob/main/samples/docs/layers.md) · [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md)
+
+---
+
+## Scaffolding an API host
+
+An API host is **not** part of the base `coreex` solution — it is added on demand when the user asks to expose functionality over HTTP (e.g. *"create a CRUD API for Employee"*, or *"create the Employee service **and** an API"*). Creating it is an **explicit-ask action** — confirm before scaffolding (per the always-on "Do Not Create Projects" rule); never auto-create it to satisfy a feature request.
+
+> **Agent instruction:** When an API is requested and no Api host exists:
+> 1. **Detect** the host: look for `**/*.Api/*.Api.csproj`. The file system is authoritative for project existence (unlike database state) — no further checking is needed.
+> 2. **If present**, skip to authoring controllers (see [coreex-api-controllers](./coreex-api-controllers.instructions.md)).
+> 3. **If absent, confirm creation** with the user — default the name to `{Solution}.Api` and the physical location to `src/` (the template default). Do not create it without confirmation.
+> 4. **Recover the original selections** from the solution-root `AGENTS.md` "Feature Configuration" (cross-check `dbex.yaml`). These default the `coreex-api` template — which takes **`data-provider`, `refdata-enabled`, `outbox-enabled`** (a subset of the solution options). Re-state the resolved values for confirmation rather than re-prompting; if `AGENTS.md` and `dbex.yaml` disagree, **stop and flag** rather than guessing.
+> 5. **Scaffold** with the recovered values, naming consistently with the solution so the derived `domain-name`/`solution-name` tokens align with the existing projects:
+>    ```
+>    dotnet new coreex-api -n {Solution}.Api --data-provider <X> --refdata-enabled <bool> --outbox-enabled <bool>
+>    ```
+>    **Run it from the solution root** — the directory that already contains `src/` and `tests/`. The template is rooted at `src/...` and `tests/...` (and uses `preferNameDirectory: false`, so it does **not** create a name-based subfolder); it merges its `src/`/`tests/` into the existing ones. Running it from inside `src/` produces nested `src/src/...` paths. If that happens, **delete the misplaced output and re-run from the solution root** — do **not** hand-move the generated files to "fix" the layout. Summarise the output on success; relay it **verbatim** on failure.
+> 6. **Author the controller(s)** for the requested entity/operations per [coreex-api-controllers](./coreex-api-controllers.instructions.md), exposing only the confirmed operations.
+> 7. **Verify by building the project directly — not the solution.** The host is not yet in the `.slnx` (that is step 9), so a *solution-wide* build would silently **skip** it and give false confidence. Build and test the new project(s) **by path** — this compiles them and their referenced projects regardless of solution membership:
+>    ```
+>    dotnet build <path/to/Api>.csproj
+>    dotnet test  <path/to/Test.Api>.csproj
+>    ```
+>    Fix any errors here, in-session, before handing off — compilation does **not** require the project to be in the solution.
+> 8. **Update the recording:** amend the solution-root `AGENTS.md` — add the Api host to the *Project Structure* block and note it under hosts. (The feature selections themselves do not change.)
+> 9. **Add the new project(s) to the solution — final step, in-session.** Once the changes are verified (step 7), wire the projects into the `.slnx` from the solution root, batched by target folder, using the **actual generated** paths:
+>    ```
+>    dotnet sln <Solution>.slnx add <path/to/Api>.csproj --solution-folder hosts
+>    dotnet sln <Solution>.slnx add <path/to/Test.Api>.csproj --solution-folder tests
+>    ```
+>    Always via `dotnet sln add` — **never hand-edit the `.slnx` XML** (manual edits are error-prone and have wiped solution files). This is the **last** action, after the code is verified and `AGENTS.md` is updated, so it cannot interrupt pending work. A final `dotnet build <Solution>.slnx` confirms the wiring.
+>    **Exception — Visual Studio with the solution open:** writing the `.slnx` triggers an IDE reload that can interrupt and discard pending changes. *Only* in that case, defer these commands to an end-of-task **Manual steps** list for the user to run instead. The default environment (Claude Code / Copilot / CLI) runs them in-session.
+
+The scaffolded `Program.cs` wiring is described below; it is generated **complete and ready-to-compile** via the option-driven `#if` blocks — there is **no post-CodeGen uncomment / "phase 2" step**.
+
+> **Reference-data wiring is automatic — nothing to uncomment.** The host wires reference data and dynamic services **without referencing any CodeGen-generated type**, so it compiles at scaffold time *and* is correct once CodeGen runs:
+> ```csharp
+> // refdata-enabled hosts only (template #if):
+> builder.Services.AddReferenceDataOrchestrator();   // non-generic — resolves the IReferenceDataProvider from DI at runtime
+> // all hosts — scans the assemblies (via the stable AssemblyMarker types) for [ScopedService] types, registering them all (incl. CodeGen-generated):
+> builder.Services.AddDynamicServicesUsing(typeof({Solution}.Application.AssemblyMarker).Assembly, typeof({Solution}.Infrastructure.AssemblyMarker).Assembly);
+> ```
+> The generated `ReferenceDataService` is `[ScopedService]`-decorated, so the assembly scan picks it up automatically and the orchestrator binds to it via `IReferenceDataProvider` — no manual step. Before CodeGen there are simply no ref-data entities to serve (requests return empty), which is correct. **Do not** add `AddReferenceDataOrchestrator<ReferenceDataService>()` or `AddDynamicServicesUsing<…generated types…>()` — that reintroduces the compile-time dependency the marker approach removes.
+
+---
+
+## Scaffolding a Subscribe host
+
+A Subscribe host is **not** part of the base `coreex` solution — it is added on demand when the user **explicitly** asks to *"add/create the subscribe host"*, *"consume events"*, or similar. Creating it is an **explicit-ask action** — confirm before scaffolding (per the always-on "Do Not Create Projects" rule); never auto-create it.
+
+Like the Relay host, the Subscribe host is **fully template-generated**: the `coreex-subscribe` template emits a complete, compilable `Program.cs` and test project with no Phase-2 / uncomment step. Unlike the Relay, the Subscribe host **does** have follow-on authoring work — subscribers are added to it over time as new event types are consumed.
+
+> **Critical naming rule — always pass `-n` with the full host-suffixed name:**
+> The `coreex-subscribe` template's `sourceName` is `app-name.Subscribe` — the `.Subscribe` suffix is **part of the template source token**, not appended automatically. The `-n` value replaces that entire token, so you **must** include the suffix:
+> ```
+> dotnet new coreex-subscribe -n {Solution}.Subscribe ...   ✓ correct
+> dotnet new coreex-subscribe -n {Solution} ...             ✗ wrong — project loses the .Subscribe suffix
+>                                                              and derived solution-name / domain-name tokens
+>                                                              resolve incorrectly, breaking cross-project references
+> ```
+> Omitting `-n` entirely is equally wrong — `dotnet new` falls back to the directory name (typically the solution root, e.g. `Foo.Bar`), which has the same effect as passing the bare solution name.
+
+> **Agent instruction:** When the user asks to add/create the Subscribe host:
+> 1. **Detect** it: look for `**/*.Subscribe/*.Subscribe.csproj`. The file system is authoritative (unlike database state) — no further checking is needed.
+> 2. **If present**, skip to authoring subscribers (see [coreex-event-subscribers](./coreex-event-subscribers.instructions.md)).
+> 3. **If absent, confirm creation** with the user — default the name to `{Solution}.Subscribe` and the physical location to `src/` (the template default). Do not create it without confirmation.
+> 4. **Recover the original selections** from the solution-root `AGENTS.md` "Feature Configuration" (cross-check `dbex.yaml`). The `coreex-subscribe` template takes **`data-provider`**, **`messaging-provider`**, and **`refdata-enabled`** — default all three from the recorded `coreex` selections. Re-state the resolved values for confirmation rather than re-prompting; if `AGENTS.md` and `dbex.yaml` disagree, **stop and flag** rather than guessing.
+> 5. **Scaffold** with the recovered values, naming consistently with the solution so the derived `domain-name`/`solution-name` tokens align with the existing projects:
+>    ```
+>    dotnet new coreex-subscribe -n {Solution}.Subscribe --data-provider <X> --messaging-provider <Y> --refdata-enabled <bool>
+>    ```
+>    **Run it from the solution root** — the directory that already contains `src/` and `tests/`. The template is rooted at `src/...`/`tests/...` (and uses `preferNameDirectory: false`, so it merges into the existing folders). Running it from inside `src/` produces nested `src/src/...` paths; if that happens, **delete the misplaced output and re-run from the solution root** — do **not** hand-move the files. Summarise the output on success; relay it **verbatim** on failure.
+> 6. **Author the subscriber(s)** for any event types the user has asked to consume, per [coreex-event-subscribers](./coreex-event-subscribers.instructions.md).
+> 7. **Verify by building the project directly — not the solution.** The host is not yet in the `.slnx` (it is added in step 9), so a *solution-wide* build would silently skip it:
+>    ```
+>    dotnet build <path/to/Subscribe>.csproj
+>    dotnet test  <path/to/Test.Subscribe>.csproj
+>    ```
+>    Fix any errors here, in-session, before handing off — compilation does **not** require the project to be in the solution.
+> 8. **Update the recording:** amend the solution-root `AGENTS.md` — add the Subscribe host to the *Project Structure* block and note it under hosts. (The feature selections themselves do not change.)
+> 9. **Add the new project(s) to the solution — final step, in-session.** Once the changes are verified (step 7), wire the projects into the `.slnx` from the solution root:
+>    ```
+>    dotnet sln <Solution>.slnx add <path/to/Subscribe>.csproj --solution-folder hosts
+>    dotnet sln <Solution>.slnx add <path/to/Test.Subscribe>.csproj --solution-folder tests
+>    ```
+>    Always via `dotnet sln add` — **never hand-edit the `.slnx` XML**. A final `dotnet build <Solution>.slnx` confirms the wiring. **Exception — Visual Studio with the solution open:** defer these to a **Manual steps** list (the IDE-reload caveat from the Api host workflow applies identically).
+
+The scaffolded Subscribe `Program.cs` wiring is described in [Subscribe Host](#subscribe-host) below; the template emits it complete via the option-driven `#if` blocks — there is **no post-CodeGen uncomment / "phase 2" step**.
+
+---
+
+## Scaffolding an Outbox Relay host
+
+An Outbox Relay host is **not** part of the base `coreex` solution — it is added on demand when the user **explicitly** asks to *"add/create the outbox relay"* (or similar). Creating it is an **explicit-ask action** — confirm before scaffolding (per the always-on "Do Not Create Projects" rule); never auto-create it.
+
+Unlike the Api host, the Relay is a **one-off, fully template-generated** host: it has **no controllers, no reference-data wiring, no application services, and no Phase-2 / uncomment step**. Once scaffolded there is **nothing further to author** — do **not** add any logic, registration, or test beyond what the `coreex-relay` template emits.
+
+> **Agent instruction:** When the user asks to add/create the Outbox Relay host:
+> 1. **Detect** it: look for `**/*.Relay/*.Relay.csproj`. The file system is authoritative (unlike database state) — no further checking is needed.
+> 2. **If present, STOP — it already exists.** The Relay is a single per-solution one-off; **immediately report it as pre-existing and do nothing else** — do not re-scaffold, modify, or "augment" it. (Contrast the Api host, where an existing host means "go author controllers"; the Relay has **no** follow-on work.)
+> 3. **If absent, confirm creation** with the user — default the name to `{Solution}.Relay` and the physical location to `src/` (the template default). Do not create it without confirmation.
+> 4. **Recover the original selections** from the solution-root `AGENTS.md` "Feature Configuration" (cross-check `dbex.yaml`). The `coreex-relay` template takes **`data-provider`** and **`messaging-provider`** — default **both** from the recorded `coreex` selections. Re-state the resolved values for confirmation rather than re-prompting; if `AGENTS.md` and `dbex.yaml` disagree, **stop and flag** rather than guessing.
+> 5. **Scaffold** with the recovered values, naming consistently with the solution so the derived `domain-name`/`solution-name` tokens align with the existing projects:
+>    ```
+>    dotnet new coreex-relay -n {Solution}.Relay --data-provider <X> --messaging-provider <Y>
+>    ```
+>    **Run it from the solution root** — the directory that already contains `src/` and `tests/`. The template is rooted at `src/...`/`tests/...` (and uses `preferNameDirectory: false`, so it merges into the existing folders). Running it from inside `src/` produces nested `src/src/...` paths; if that happens, **delete the misplaced output and re-run from the solution root** — do **not** hand-move the files. Summarise the output on success; relay it **verbatim** on failure.
+> 6. **Verify by building the project directly — not the solution.** The host is not yet in the `.slnx` (it is added in step 8), so a *solution-wide* build would silently skip it:
+>    ```
+>    dotnet build <path/to/Relay>.csproj
+>    dotnet test  <path/to/Test.Relay>.csproj
+>    ```
+>    Fix any errors here, in-session. There is **no** further wiring — the template output is complete as-is.
+> 7. **Update the recording:** amend the solution-root `AGENTS.md` — add the Relay host to the *Project Structure* block and note it under hosts. (The feature selections themselves do not change.)
+> 8. **Add the new project(s) to the solution — final step, in-session** (exactly as for the Api host), batched by target folder, using the **actual generated** paths:
+>    ```
+>    dotnet sln <Solution>.slnx add <path/to/Relay>.csproj --solution-folder hosts
+>    dotnet sln <Solution>.slnx add <path/to/Test.Relay>.csproj --solution-folder tests
+>    ```
+>    Always via `dotnet sln add` — **never hand-edit the `.slnx` XML**. A final `dotnet build <Solution>.slnx` confirms the wiring. **Exception — Visual Studio with the solution open:** defer these to a **Manual steps** list (the IDE-reload caveat from the Api host workflow applies identically).
+
+The scaffolded Relay `Program.cs` wiring is described in [Outbox Relay Host](#outbox-relay-host) below; the template emits it complete via the option-driven `#if` blocks (`data-provider` + `messaging-provider`), so a correctly-defaulted scaffold compiles and runs without any manual fix-up.
+
+---
+
+## Key Registrations by Host Type
+
+### API Host
+
+| Package | Key registrations |
+|---|---|
+| `CoreEx.AspNetCore` | `AddMvcWebApi()`, `AddHttpWebApi()`, `AddExecutionContext()`, `UseCoreExExceptionHandler()`, `UseExecutionContext()`, `UseIdempotencyKey()`, `MapHealthChecks()` |
+| `CoreEx.AspNetCore.NSwag` | `AddOpenApiDocument()`, `AddCoreExConfiguration()`, `UseOpenApi()`, `UseSwaggerUi()` |
+| `CoreEx.Caching.FusionCache` | `AddFusionCache()`, `AddFusionHybridCache()`, `AddDefaultCacheKeyProvider()`, `AddHybridCacheIdempotencyProvider()` |
+| `CoreEx.Database.SqlServer` | `AddSqlServerDatabase()`, `AddSqlServerUnitOfWork()`, `AddSqlServerOutboxPublisher()`, `AddSqlServerClient("SqlServer")` |
+| `CoreEx.Database.Postgres` | `AddPostgresDatabase()`, `AddPostgresUnitOfWork()`, `AddPostgresOutboxPublisher()`, `AddAzureNpgsqlDataSource("Postgres")` |
+| `CoreEx.EntityFrameworkCore` | `AddDbContext<T>()`, `AddEfDb<T>()` |
+| `CoreEx.Events` | `AddEventFormatter()` |
+| `CoreEx.RefData` | `AddReferenceDataOrchestrator<T>()` |
+| `Aspire.StackExchange.Redis.DistributedCaching` | `AddRedisDistributedCache("redis")` |
+| `FusionCache.Backplane.StackExchangeRedis` | `RedisBackplane`, `RedisBackplaneOptions` |
+| `OpenTelemetry.*` | `WithCoreExTelemetry()`, `WithCoreExSqlServerTelemetry()` / `WithCoreExPostgresTelemetry()`, `UseOtlpExporter()` |
+
+### Subscribe Host
+
+| Package | Key registrations |
+|---|---|
+| `CoreEx.AspNetCore` | `AddMvcWebApi()`, `AddHttpWebApi()`, `AddExecutionContext()`, `AddHostedServiceManager()`, `UseCoreExExceptionHandler()`, `UseExecutionContext()`, `MapHealthChecks()`, `MapHostedServices()` |
+| `CoreEx.Caching.FusionCache` | `AddFusionCache()`, `AddFusionHybridCache()`, `AddDefaultCacheKeyProvider()`, `AddHybridCacheIdempotencyProvider()` |
+| `CoreEx.Events` | `AddEventFormatter()`, `AddSubscribedManager()` |
+| `CoreEx.Database.SqlServer` | `AddSqlServerDatabase()`, `AddSqlServerUnitOfWork()`, `AddSqlServerOutboxPublisher()`, `AddSqlServerClient("SqlServer")` |
+| `CoreEx.Database.Postgres` | `AddPostgresDatabase()`, `AddPostgresUnitOfWork()`, `AddPostgresOutboxPublisher()`, `AddAzureNpgsqlDataSource("Postgres")` |
+| `CoreEx.EntityFrameworkCore` | `AddDbContext<T>()`, `AddEfDb<T>()` |
+| `CoreEx.RefData` | `AddReferenceDataOrchestrator<T>()` |
+| `CoreEx.Azure.Messaging.ServiceBus` | `AddAzureServiceBusClient("ServiceBus")`, `AddAzureServiceBusPublisher(..., addAsDefaultIEventPublisher: false)`, `AzureServiceBusReceiving()`, `WithCoreExServiceBusTelemetry()` |
+| `Aspire.StackExchange.Redis.DistributedCaching` | `AddRedisDistributedCache("redis")` |
+| `FusionCache.Backplane.StackExchangeRedis` | `RedisBackplane`, `RedisBackplaneOptions` |
+| `OpenTelemetry.*` | `WithCoreExTelemetry()`, `WithCoreExServiceBusTelemetry()`, `WithCoreExSqlServerTelemetry()` / `WithCoreExPostgresTelemetry()`, `UseOtlpExporter()` |
+
+### Outbox Relay Host
+
+| Package | Key registrations |
+|---|---|
+| `CoreEx.AspNetCore` | `AddMvcWebApi()`, `AddHttpWebApi()`, `AddExecutionContext()`, `AddHostedServiceManager()`, `UseCoreExExceptionHandler()`, `UseExecutionContext()`, `MapHealthChecks()`, `MapHostedServices()` |
+| `CoreEx.Database.SqlServer` | `AddSqlServerDatabase()`, `AddSqlServerUnitOfWork()`, `AddSqlServerOutboxRelay()`, `AddSqlServerOutboxRelayHostedService()` |
+| `CoreEx.Database.Postgres` | `AddPostgresDatabase()`, `AddPostgresUnitOfWork()`, `AddPostgresOutboxRelay()`, `AddPostgresOutboxRelayHostedService()` |
+| `CoreEx.Azure.Messaging.ServiceBus` | `AddAzureServiceBusClient("ServiceBus")`, `AddAzureServiceBusPublisher(...)`, `ServiceBusSessionStrategy` |
+| `OpenTelemetry.*` | `WithCoreExTelemetry()`, `WithCoreExSqlServerTelemetry()` / `WithCoreExPostgresTelemetry()`, `WithCoreExServiceBusTelemetry()`, `UseOtlpExporter()` |
+
+---
+
+## API Host
+
+The API host is the primary HTTP composition root. It exposes controllers, OpenAPI docs, reference-data endpoints, and idempotency support.
+
+```csharp
+var builder = WebApplication.CreateBuilder(args);
+builder.AddHostSettings();
+
+builder.Services
+    .AddPrecisionTimeProvider()
+    .AddExecutionContext()
+    .AddReferenceDataOrchestrator()   // non-generic — binds the IReferenceDataProvider (CodeGen-generated ReferenceDataService) from DI at runtime
+    .AddMvcWebApi()
+    .AddHttpWebApi();
+
+builder.Services.AddDynamicServicesUsing(typeof(MyApp.Application.AssemblyMarker).Assembly, typeof(MyApp.Infrastructure.AssemblyMarker).Assembly);
+
+// L1/L2 caching with FusionCache + Redis backplane.
+builder.Services.AddMemoryCache();
+builder.AddRedisDistributedCache("redis");
+builder.Services.AddFusionCache()
+    .WithRegisteredMemoryCache()
+    .WithRegisteredDistributedCache()
+    .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = ... }))
+    .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+builder.Services
+    .AddFusionHybridCache()
+    .AddDefaultCacheKeyProvider()
+    .AddHybridCacheIdempotencyProvider();
+
+// Database, EF, outbox publisher.
+// SQL Server variant:
+builder.AddSqlServerClient("SqlServer");
+builder.Services
+    .AddSqlServerDatabase()
+    .AddSqlServerUnitOfWork()
+    .AddEventFormatter()
+    .AddSqlServerOutboxPublisher()
+    .AddDbContext<MyDbContext>()
+    .AddEfDb<MyEfDb>();
+
+// PostgreSQL variant (use instead of SQL Server):
+// builder.AddAzureNpgsqlDataSource("Postgres");
+// builder.Services
+//     .AddPostgresDatabase()
+//     .AddPostgresUnitOfWork()
+//     .AddEventFormatter()
+//     .AddPostgresOutboxPublisher()
+//     .AddDbContext<MyDbContext>()
+//     .AddEfDb<MyEfDb>();
+
+builder.Services.PostConfigureAllHealthChecks();
+builder.Services.AddControllers();
+builder.Services.AddOpenApiDocument(s => { s.Title = builder.Environment.ApplicationName; s.AddCoreExConfiguration(); });
+
+builder.WithCoreExTelemetry().WithCoreExSqlServerTelemetry().UseOtlpExporter();
+
+var app = builder.Build();
+app.UseCoreExExceptionHandler();
+app.UseHttpsRedirection();
+app.UseAuthorization();
+app.UseExecutionContext();
+app.UseIdempotencyKey();       // After UseExecutionContext.
+app.MapControllers();
+app.UseOpenApi();
+app.UseSwaggerUi();
+app.MapHealthChecks();
+app.Run();
+```
+
+Key points:
+- **`AddDynamicServicesUsing(...)` registers per _assembly_, not per service.** It scans each supplied assembly for all `[ScopedService]`-decorated types and registers them. The template anchors each assembly on its neutral **`AssemblyMarker`** type (`typeof(MyApp.Application.AssemblyMarker).Assembly`, `…Infrastructure…`) — these are the **only** markers the clean scaffold ships, and they exist **solely** for this anchoring. Use the neutral marker, **not** a domain type like `typeof(ReferenceDataService).Assembly`: the marker reads as "scan this whole assembly," never misleads a reader into thinking the scan is scoped to one type, always exists (so there is no compile-time dependency on CodeGen output and no bootstrap/uncomment step), and survives renames. **Adding a new entity does not change this line** — the new service/repository is picked up automatically by the existing assembly scan. Add another assembly only when you introduce a **new project** containing `[ScopedService]` types (e.g. the Subscribe host passes `typeof(Program).Assembly` for its subscribers). Do **not** add per-namespace placeholder/marker types to satisfy `global using`s — those follow the code (see `coreex-conventions.instructions.md`).
+- Prefer the **non-generic `AddReferenceDataOrchestrator()`** (binds `IReferenceDataProvider` from DI at runtime) over `AddReferenceDataOrchestrator<ReferenceDataService>()` — the non-generic form needs no generated type, so it compiles from scaffold time.
+- `AddReferenceDataOrchestrator()` and `AddDynamicServicesUsing(...)` are shared with Subscribe hosts — both API and Subscribe hosts are full application-layer consumers.
+- FusionCache (L1/L2) and `AddHybridCacheIdempotencyProvider()` are shared with Subscribe hosts — both need caching for reference data and idempotency for safe duplicate handling.
+- `AddEventFormatter()` is required wherever events are published or parsed.
+- `AddSqlServerOutboxPublisher()` / `AddPostgresOutboxPublisher()` take no generic type parameter.
+- `UseIdempotencyKey()` must come **after** `UseExecutionContext()`.
+- If the domain also publishes directly to Service Bus (e.g. for cross-domain adapters), add `AddAzureServiceBusPublisher(..., addAsDefaultIEventPublisher: false)` so the outbox publisher remains the default `IEventPublisher`.
+
+---
+
+## Subscribe Host
+
+The Subscribe host receives broker messages and delegates to Application-layer services. Subscribers are **full application-layer consumers** — they invoke application services that may validate, persist data, and publish outbound events. Therefore, Subscribe hosts include reference data, caching, database, and idempotency support.
+
+```csharp
+var builder = WebApplication.CreateBuilder(args);
+builder.AddHostSettings();
+
+builder.Services
+    .AddPrecisionTimeProvider()
+    .AddExecutionContext()
+    .AddReferenceDataOrchestrator()   // non-generic — binds the IReferenceDataProvider from DI at runtime
+    .AddMvcWebApi()
+    .AddHttpWebApi()
+    .AddHostedServiceManager();
+
+builder.Services.AddDynamicServicesUsing(typeof(Program).Assembly, typeof(MyApp.Application.AssemblyMarker).Assembly, typeof(MyApp.Infrastructure.AssemblyMarker).Assembly);  // this host (subscribers) + Application + Infrastructure
+
+// L1/L2 caching with FusionCache + Redis backplane.
+builder.Services.AddMemoryCache();
+builder.AddRedisDistributedCache("redis");
+builder.Services.AddFusionCache()
+    .WithRegisteredMemoryCache()
+    .WithRegisteredDistributedCache()
+    .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = ... }))
+    .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+builder.Services
+    .AddFusionHybridCache()
+    .AddDefaultCacheKeyProvider()
+    .AddHybridCacheIdempotencyProvider();
+
+// Domain database + outbox publisher.
+// SQL Server variant:
+builder.AddSqlServerClient("SqlServer");
+builder.Services
+    .AddSqlServerDatabase()
+    .AddSqlServerUnitOfWork()
+    .AddSqlServerOutboxPublisher()
+    .AddDbContext<MyDbContext>()
+    .AddEfDb<MyEfDb>();
+
+// PostgreSQL variant (use instead of SQL Server):
+// builder.AddAzureNpgsqlDataSource("Postgres");
+// builder.Services
+//     .AddPostgresDatabase()
+//     .AddPostgresUnitOfWork()
+//     .AddPostgresOutboxPublisher()
+//     .AddDbContext<MyDbContext>()
+//     .AddEfDb<MyEfDb>();
+
+// Service Bus: keep outbox publisher as the default IEventPublisher.
+builder.AddAzureServiceBusClient("ServiceBus");
+builder.Services.AddAzureServiceBusPublisher((_, c) =>
+{
+    c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;
+}, addAsDefaultIEventPublisher: false);
+
+// Subscriber wiring.
+builder.Services
+    .AddEventFormatter()
+    .AddSubscribedManager((_, c) => c.AddSubscribersUsing<MySubscriber>());
+
+builder.Services.AzureServiceBusReceiving()
+    .WithSessionReceiver(_ =>
+    {
+        var o = ServiceBusSessionReceiverOptions.CreateForTopicSubscription();
+        o.SessionProcessorOptions.MaxConcurrentSessions = 4;
+        return o;
+    })
+    .WithSubscribedSubscriber()
+    .WithHostedService()
+    .Build();
+
+builder.Services.PostConfigureAllHealthChecks();
+builder.Services.AddControllers();
+builder.Services.AddOpenApiDocument(s => { s.Title = builder.Environment.ApplicationName; s.AddCoreExConfiguration(); });
+
+builder.WithCoreExTelemetry()
+    .WithCoreExServiceBusTelemetry()
+    .WithCoreExSqlServerTelemetry()   // or .WithCoreExPostgresTelemetry() for PostgreSQL
+    .UseOtlpExporter();
+
+var app = builder.Build();
+app.UseCoreExExceptionHandler();
+app.UseHttpsRedirection();
+app.UseAuthorization();
+app.UseExecutionContext();
+app.MapControllers();
+app.UseOpenApi();
+app.UseSwaggerUi();
+app.MapHealthChecks();
+app.MapHostedServices();   // Exposes pause/resume management endpoints — must follow MapHealthChecks.
+app.Run();
+```
+
+Key points:
+- Subscribe hosts **do** include `AddReferenceDataOrchestrator()` and `AddDynamicServicesUsing(...)` — subscribers call application services that need reference data for validation and business logic. The Subscribe host passes **three** assemblies to `AddDynamicServicesUsing`: its own (`typeof(Program).Assembly`, for the subscriber types) plus the Application and Infrastructure `AssemblyMarker` assemblies.
+- Subscribe hosts **do** include FusionCache (L1/L2) and `AddHybridCacheIdempotencyProvider()` — caching is required for reference data; idempotency is required to safely handle duplicate message delivery.
+- Subscribe hosts **do** include database/EF Core and outbox publisher — subscribers persist domain data and publish outbound events.
+- `AddHostedServiceManager()` must be registered before `AzureServiceBusReceiving()`.
+- `AddSubscribersUsing<T>()` scans the assembly of `T` and auto-registers all `[Subscribe]`-decorated classes — no manual registration per subscriber.
+- `AddAzureServiceBusPublisher(..., addAsDefaultIEventPublisher: false)` keeps the outbox publisher as the default `IEventPublisher` for transactional writes.
+- `MapHostedServices()` must come **after** `MapHealthChecks()`.
+
+---
+
+## Outbox Relay Host
+
+The Outbox Relay host is minimal: it polls the outbox table and forwards committed events to Azure Service Bus. It has **no application logic** — no controllers, no OpenAPI, no FusionCache, no reference data, no EF Core DbContext. It only needs database connectivity to read the outbox table and Service Bus connectivity to publish.
+
+```csharp
+builder.Services
+    .AddPrecisionTimeProvider()
+    .AddExecutionContext()
+    .AddMvcWebApi()
+    .AddHttpWebApi()
+    .AddHostedServiceManager();
+
+// SQL Server example; use Postgres equivalents for PostgreSQL domains.
+builder.AddSqlServerClient("SqlServer");
+builder.Services
+    .AddSqlServerDatabase()
+    .AddSqlServerUnitOfWork()
+    .AddSqlServerOutboxRelay();   // No configuration lambda required.
+
+builder.AddSqlServerOutboxRelayHostedService();
+
+// PostgreSQL variant:
+// builder.AddAzureNpgsqlDataSource("Postgres");
+// builder.Services
+//     .AddPostgresDatabase()
+//     .AddPostgresUnitOfWork()
+//     .AddPostgresOutboxRelay();
+// builder.AddPostgresOutboxRelayHostedService();
+
+// Service Bus publisher — this IS the default IEventPublisher for the relay.
+builder.AddAzureServiceBusClient("ServiceBus");
+builder.Services.AddAzureServiceBusPublisher((_, c) =>
+{
+    c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;
+});
+
+builder.Services.PostConfigureAllHealthChecks();
+
+builder.WithCoreExTelemetry().WithCoreExSqlServerTelemetry().WithCoreExServiceBusTelemetry().UseOtlpExporter();
+
+var app = builder.Build();
+app.UseCoreExExceptionHandler();
+app.UseHttpsRedirection();
+app.UseExecutionContext();
+app.MapHealthChecks();
+app.MapHostedServices();
+app.Run();
+```
+
+Key points:
+- The Relay host has **no application-layer dependencies** — no `AddReferenceDataOrchestrator`, no `AddDynamicServicesUsing`, no FusionCache, no EF Core DbContext, no domain services.
+- `AddSqlServerOutboxRelay()` / `AddPostgresOutboxRelay()` take no configuration lambda.
+- `AddSqlServerOutboxRelayHostedService()` / `AddPostgresOutboxRelayHostedService()` register the background relay pump — call these on `builder`, not `builder.Services`.
+- No `AddControllers()`, no `AddOpenApiDocument()`, no `UseOpenApi()`, no `UseSwaggerUi()`, no `UseIdempotencyKey()`, no `UseAuthorization()`.
diff --git a/.github/instructions/coreex-repositories.instructions.md b/.github/instructions/coreex-repositories.instructions.md
new file mode 100644
index 00000000..1a1b8df9
--- /dev/null
+++ b/.github/instructions/coreex-repositories.instructions.md
@@ -0,0 +1,336 @@
+---
+applyTo: "**/Infrastructure/**/*.cs"
+description: "Repository and infrastructure conventions: EFCore, mapping, typed HTTP clients, adapter implementations, and data-access patterns"
+tags: ["repositories", "infrastructure", "data-access", "efcore", "mapping", "adapters"]
+---
+
+# Repository & Infrastructure Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx` | `[ScopedService<T>]`, `.ThrowIfNull()`, `ItemsResult<T>`, `Result<T>`, `.GoAsync()`, `.ThenAs()`, `.ThenAsAsync()` |
+| `CoreEx.Events` | `EventData` |
+| `CoreEx.Data` | `IUnitOfWork`, `DataResult<T>`, `QueryArgsConfig`, `QueryFilterOperator`, `.Where(parsed)`, `.OrderBy(parsed)` |
+| `CoreEx.EntityFrameworkCore` | `EfDb<TContext>`, `EfDbModel<T>`, `EfDbMappedModel<TContract,TModel,TMapper>`, `EfDbOptions`, `.GetAsync()`, `.CreateAsync()`, `.UpdateAsync()`, `.DeleteAsync()`, `.GetWithResultAsync()`, `.CreateWithResultAsync()`, `.UpdateWithResultAsync()`, `.Query()`, `.ToMappedItemsResultAsync()` |
+| `CoreEx.Database.SqlServer` | SQL Server outbox publisher, ADO.NET helpers |
+| `CoreEx.Database.Postgres` | PostgreSQL outbox publisher, ADO.NET helpers |
+
+> **Polyglot data**: Use `CoreEx.Database.Postgres` + `Npgsql.EntityFrameworkCore.PostgreSQL` for PostgreSQL domains. Use `CoreEx.Database.SqlServer` + `Microsoft.EntityFrameworkCore.SqlServer` for SQL Server domains. Layers above Infrastructure are database-agnostic.
+
+## Structure
+
+The Infrastructure project is organised into focused sub-folders. The table below shows the standard layout and where each type lives:
+
+| Sub-folder | Contents |
+|---|---|
+| `Repositories/` | `IXxxRepository` implementations (registered with `[ScopedService<IInterface>]`); `*EfDb.cs` — typed model accessor; `*DbContext.cs` — hand-authored EF `DbContext` (implements `IEfDbContext`, calls `AddGeneratedModels()`); `*DbContext.g.cs` — **generated** ModelBuilder configuration produced by the `*.Database` tooling. |
+| `Mapping/` | Bidirectional mappers (`BiDirectionMapper<TContract, TModel, TSelf>`) between Contract types and Persistence model types. |
+| `Adapters/` | Implementations of `IXxxAdapter` interfaces defined in `Application/Adapters/`. Registered with `[ScopedService<IInterface>]`. |
+| `Clients/` | Typed HTTP client wrappers — one class per external service. Registered via `AddTypedHttpClient<T>()` in `Program.cs`. |
+| `Persistence/` | EF entity/model classes. These are **generated** (`*.g.cs`) by the `*.Database` tooling project — do not create or edit manually. |
+
+Repository and adapter implementations follow the same primary-constructor + guard pattern:
+
+```csharp
+[ScopedService<IProductRepository>]
+public class ProductRepository(ProductsEfDb ef) : IProductRepository
+{
+    private readonly ProductsEfDb _ef = ef.ThrowIfNull();
+}
+```
+
+**One repository per entity — the CQRS split is at the service layer, not here.** A single `XxxRepository` serves both the write `XxxService` and the read `XxxReadService` when they share a data source (the usual case for a SQL-backed domain) — do **not** create a separate read repository to mirror the read service. Introduce an additional repository only when an operation targets a **genuinely different** data source (e.g. a read served from a separate store or search index); the owning service then calls the appropriate repository per operation.
+
+## Return Types
+
+| Operation | Return type | Notes |
+|---|---|---|
+| Single entity lookup | `Task<TEntity?>` | Returns `null` when not found; service checks |
+| Create / Update | `Task<DataResult<TEntity>>` | Includes mutation flag for event decisions |
+| Delete | `Task<DataResult>` | Carries mutation flag only |
+| Collection query | `Task<ItemsResult<T>>` | Items + optional total count |
+| Result pipeline (optional) | `Task<Result<T>>` | Developer choice — can be used on any repository method; enables explicit failure propagation without exceptions |
+
+## EfDb and DbContext
+
+### DbContext
+
+`*DbContext` inherits from EF Core's `DbContext` and **must** implement `IEfDbContext`. This interface exposes the `IDatabase` instance to `EfDb`, which uses it to synchronise EF Core's transaction with the underlying ADO.NET connection — ensuring raw SQL and EF operations share the same connection and transaction:
+
+```csharp
+public partial class ProductsDbContext(DbContextOptions<ProductsDbContext> options, SqlServerDatabase database) // PostgreSQL: PostgresDatabase
+    : DbContext(options), IEfDbContext
+{
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        AddGeneratedModels(modelBuilder); // wires in the generated *DbContext.g.cs ModelBuilder configurations
+    }
+
+    // Declared here, implemented in the generated *DbContext.g.cs (partial method — the call above is elided until CodeGen has run, so this compiles as-is).
+    partial void AddGeneratedModels(ModelBuilder modelBuilder);
+}
+```
+
+`*DbContext.g.cs` (generated by the `*.Database` tooling) supplies the **`partial void AddGeneratedModels(ModelBuilder)`** *implementation* containing the `ModelBuilder` entity configurations. The hand-authored `*DbContext.cs` must **declare** the matching `partial void AddGeneratedModels(ModelBuilder modelBuilder);` and **call** `AddGeneratedModels(modelBuilder)` (an instance method on the `DbContext`, **not** an extension on `ModelBuilder`) from `OnModelCreating`. Because it is a partial method, the call is elided until CodeGen emits the implementation — so the scaffold compiles before CodeGen has run.
+
+### EfDb
+
+`*EfDb` extends `EfDb<TContext>` and acts as a **typed accessor** over the `DbContext`. It exposes strongly-typed `EfDbModel<T>` and `EfDbMappedModel<TContract,TModel,TMapper>` properties per entity, and uses `EfDbOptions` to configure per-model behaviour. Repositories inject `*EfDb` directly — not the `DbContext` itself:
+
+```csharp
+public sealed class ProductsEfDb(ProductsDbContext dbContext) : EfDb<ProductsDbContext>(dbContext, _options)
+{
+    private static readonly EfDbOptions _options = new EfDbOptions()
+        .WithModel<Persistence.Product>(m => m.WithLogicalDeleteFilter());
+
+    public EfDbMappedModel<Contracts.Product, Persistence.Product, ProductMapper> Products
+        => Model<Persistence.Product>().ToMappedModel<Contracts.Product, ProductMapper>(ProductMapper.Default);
+
+    public EfDbModel<Persistence.SubCategory> SubCategories => Model<Persistence.SubCategory>();
+    public EfDbModel<Persistence.Inventory> Inventory => Model<Persistence.Inventory>();
+    // ...
+}
+```
+
+`EfDbOptions` configures key behaviours: default `EfDbArgs`, per-model options (e.g. `WithLogicalDeleteFilter()`), and tenant filtering. See the [CoreEx.Database README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Database/README.md) for full detail.
+
+> **Unit of work**: `EfDb` is **not** the unit of work. Transactions are managed by `IUnitOfWork` (from `CoreEx.Data`), with concrete SQL Server and PostgreSQL implementations wired to `IDatabase` and registered in DI. Application services inject `IUnitOfWork`; repositories inject `*EfDb`.
+
+## EF Delegate Shortcuts
+
+Use the built-in EF delegate methods for single-entity CRUD — do not write raw `DbContext` queries for simple operations:
+
+```csharp
+public Task<Contracts.Product?> GetAsync(string id, CancellationToken cancellationToken = default) => _ef.Products.GetAsync(id, cancellationToken);
+public Task<DataResult<Contracts.Product>> CreateAsync(Contracts.Product product, CancellationToken cancellationToken = default) => _ef.Products.CreateAsync(product, cancellationToken);
+public Task<DataResult<Contracts.Product>> UpdateAsync(Contracts.Product product, CancellationToken cancellationToken = default) => _ef.Products.UpdateAsync(product, cancellationToken);
+public Task<DataResult> DeleteAsync(string id, CancellationToken cancellationToken = default) => _ef.Products.DeleteAsync(id, cancellationToken);
+```
+
+### EfDb method reference and the `WithResult` convention
+
+The model accessors (`EfDbModel<T>` and `EfDbMappedModel<...>`) expose two variants of every operation. **Read the suffix:**
+
+- **`...Async`** — returns the value directly (e.g. `TValue?`, `DataResult<TValue>`) and throws on error (exception flow).
+- **`...WithResultAsync`** — returns a `Result<...>` for ROP pipelines (failure is returned, not thrown). Use these in `Result<T>` chains.
+
+| Operation | Exception flow | ROP flow |
+|---|---|---|
+| Get by key | `GetAsync(key)` → `TValue?` | `GetWithResultAsync(key)` → `Result<TValue>` |
+| Create | `CreateAsync(value)` → `DataResult<TValue>` | `CreateWithResultAsync(value)` → `Result<DataResult<TValue>>` |
+| Update | `UpdateAsync(value)` → `DataResult<TValue>` | `UpdateWithResultAsync(value)` → `Result<DataResult<TValue>>` |
+| Delete | `DeleteAsync(key)` → `DataResult` | `DeleteWithResultAsync(key)` → `Result<DataResult>` |
+
+Querying: `Query(...)` returns a filtered `IQueryable<TModel>` (logical-delete and tenant filters already applied); `QueryTracked(...)` is the change-tracked variant. Materialize via the extensions `ToMappedItemsResultAsync<TSource, TItem>()` (→ `ItemsResult<TItem>` with paging/count), `ToMappedItemsAsync<...>()`, or `ToItemsResultAsync<TItem>()`.
+
+Per-model behaviour is configured on `EfDbOptions` / `EfDbModelOptions`: `WithModel<T>(...)`, `WithLogicalDeleteFilter()`, `WithTenantFilter()`, `WithFilter(...)`, `WithGetKey(...)`, `WithArgs(...)`, `WithOnBeforeCreateOrUpdate(...)`, `WithUpdateModelMapper(...)`.
+
+## Dynamic Query Configuration
+
+> **GlobalUsing requirement:** `QueryArgsConfig` and the related query types live in the `CoreEx.Data.Querying` namespace. When introducing query configuration, ensure `global using CoreEx.Data.Querying;` is present in the Infrastructure project's `GlobalUsing.cs` — add it if missing. This prevents avoidable compilation errors (per the Global Usings convention, imports go in `GlobalUsing.cs`, never in individual files).
+
+Define a `static readonly QueryArgsConfig _queryConfig` once at class level for OData-style filtering and ordering:
+
+```csharp
+private static readonly QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
+    .WithFilter(filter => filter
+        .WithDefaultModelPrefix("Product")
+        .AddField<string>(nameof(ProductBase.Sku), c => c
+            .WithOperators(QueryFilterOperator.EqualityOperators | QueryFilterOperator.StartsWith)
+            .AsUpperCase())
+        .AddField<string>(nameof(ProductBase.Text), c => c
+            .WithOperators(QueryFilterOperator.StringFunctions)
+            .AsUpperCase())
+        .AddReferenceDataField<Category>(nameof(ProductBase.Category), "CategoryCode",
+            c => c.WithModelPrefix(null)))
+    .WithOrderBy(orderby => orderby
+        .WithDefaultModelPrefix("Product")
+        .AddField(nameof(ProductBase.Sku), c => c.WithDefault().WithAlwaysInclude())
+        .AddField(nameof(ProductBase.Text))
+        .AddField(nameof(ProductBase.Brand)));
+```
+
+In the query method, compose the full base query first (including any required joins), then apply `Where(parsed)` and `OrderBy(parsed)`:
+
+```csharp
+public async Task<ItemsResult<Contracts.ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging, CancellationToken cancellationToken = default)
+{
+    var parsed = _queryConfig.Parse(query).ThrowOnError();
+
+    // Compose the base query with required joins before applying parsed filters.
+    var q =
+        from p in _ef.Products.Model.Query()
+        join sc in _ef.SubCategories.Query() on p.SubCategoryCode equals sc.Code into scg
+        from sc in scg.DefaultIfEmpty()
+        join i in _ef.Inventory.Query() on p.Id equals i.Id into ig
+        from i in ig.DefaultIfEmpty()
+        select new { Product = p, sc.CategoryCode, QtyOnHand = i == null ? 0 : i.QtyOnHand };
+
+    return await q
+        .Where(parsed)
+        .OrderBy(parsed)
+        .ToMappedItemsResultAsync(x => new Contracts.ProductLite
+        {
+            Id = x.Product.Id,
+            Sku = x.Product.Sku,
+            CategoryCode = x.CategoryCode,
+            QtyOnHand = x.QtyOnHand
+        }, paging, cancellationToken);
+}
+```
+
+Expose the query schema for the `$query` endpoint via `ToJsonSchema()`:
+
+```csharp
+public Task<JsonElement> QuerySchemaAsync(CancellationToken cancellationToken = default) => Task.FromResult(_queryConfig.ToJsonSchema());
+```
+
+## Result&lt;T&gt; Pipeline in Repositories
+
+Using the `Result<T>` pipeline is a developer choice — it can be applied in repositories, application services, or domain methods wherever explicit failure propagation is preferred over exceptions. When used in a repository, chain operations using `.GoAsync` / `.ThenAs` / `.ThenAsAsync`. The example below also shows Domain ↔ Persistence mapping via infrastructure mappers:
+
+```csharp
+public Task<Result<Domain.Basket>> GetAsync(string id, CancellationToken cancellationToken = default) => Result
+    .GoAsync(() => _ef.Baskets.GetWithResultAsync(id, cancellationToken))
+    .ThenAs(model => BasketMapper.Map(model));
+
+public Task<Result<Domain.Basket>> CreateAsync(Domain.Basket basket, CancellationToken cancellationToken = default) => Result
+    .Go(() =>
+    {
+        var model = new Persistence.Basket();
+        BasketIntoMapper.MapInto(basket, model);
+        return model;
+    })
+    .ThenAsAsync(model => _ef.Baskets.CreateWithResultAsync(model, cancellationToken))
+    .ThenAs(b => BasketMapper.Map(b));
+```
+
+## Mapping
+
+> **GlobalUsing requirement:** Mappers are declared in the `<Domain>.Infrastructure.Mapping` namespace but referenced elsewhere in the project (repositories, adapters, `*EfDb`). Whenever you add a Contract ↔ Persistence mapper, ensure `global using <Domain>.Infrastructure.Mapping;` is present in the Infrastructure project's `GlobalUsing.cs` — add it if missing. This prevents avoidable compilation errors when other classes reference the mapper (e.g. `ProductMapper.Default`).
+
+The `Mapping/` sub-folder contains **bidirectional mappers** between Contract types and Persistence model types. Extend `BiDirectionMapper<TFrom, TTo, TSelf>` — do not use AutoMapper or reflection-based conventions:
+
+```csharp
+// Infrastructure/Mapping/ProductMapper.cs
+public class ProductMapper : BiDirectionMapper<Contracts.Product, Persistence.Product, ProductMapper>
+{
+    protected override Persistence.Product OnMap(Contracts.Product source) => new()
+    {
+        Id = source.Id!,
+        Sku = source.Sku!,
+        SubCategoryCode = source.SubCategoryCode,
+        Price = source.Price
+    };
+
+    protected override Contracts.Product OnMap(Persistence.Product source) => new()
+    {
+        Id = source.Id,
+        Sku = source.Sku,
+        SubCategoryCode = source.SubCategoryCode,
+        Price = source.Price
+    };
+}
+```
+
+> **The override is `OnMap` — there is no `OnMapToPrimary` / `OnMapToSecondary` / `MapTo…`.** `BiDirectionMapper` declares **two `OnMap` overloads with the same name**, distinguished only by **source type**: `OnMap(TFrom source)` returns `TTo` (Contract → Persistence), and `OnMap(TTo source)` returns `TFrom` (Persistence → Contract). Override **both**. Do not invent differently-named methods:
+> ```csharp
+> // ❌ Wrong — no such methods on BiDirectionMapper
+> protected override Persistence.Product OnMapToSecondary(Contracts.Product source) => ...;
+> protected override Contracts.Product OnMapToPrimary(Persistence.Product source) => ...;
+> ```
+> And **`Id` is mapped explicitly** (the base does not auto-map it) — only `ETag`/`ChangeLog` are left out (see below).
+
+Generated persistence models inherit from `ModelBase<TId>` — or `ReferenceDataModelBase<TId>` for reference data (which extends `ModelBase<TId>`) — both in the `CoreEx.Data.Models` namespace. `ModelBase` supplies the standard `Id`, `CreatedBy`, `CreatedOn`, `UpdatedBy`, `UpdatedOn`, and `ETag` members; the EF code-generation maps the database `RowVersion` (`TIMESTAMP`) column onto the `string? ETag` property, so there is **no** `RowVersion` member on the model. `ReferenceDataModelBase` adds the standard reference-data members (`Code`, `Text`, `Description`, `SortOrder`, `IsActive`, `StartsOn`, `EndsOn`).
+
+Consequently, do **not** map the `IETag` (`ETag`) or `IChangeLog` (`ChangeLog`) surface in the `OnMap` overrides — the base `BiDirectionMapper` maps the inherited `ModelBase` change-log and ETag members to/from the contract automatically, in both directions. Map `Id` and the domain-specific properties explicitly (as shown above); leave the inherited base-class members to the base mapper.
+
+```csharp
+// ❌ DO NOT do this — none of it belongs in OnMap; the base mapper already handles it.
+protected override Contracts.Employee OnMap(Persistence.Employee source) => new()
+{
+    Id = source.Id,
+    // ...domain properties...
+    ETag = source.RowVersion is null ? null : Convert.ToBase64String(source.RowVersion),  // ❌ no RowVersion member — model exposes ETag (string); base mapper owns it anyway
+    ChangeLog = new ChangeLog                                                              // ❌ base mapper owns the change-log surface
+    {
+        CreatedBy = source.CreatedBy,
+        CreatedDate = source.CreatedDate,   // ❌ no such member (it is CreatedOn) AND should not be mapped at all
+        UpdatedBy = source.UpdatedBy,
+        UpdatedDate = source.UpdatedDate,   // ❌ no such member (it is UpdatedOn) AND should not be mapped at all
+    }
+};
+```
+
+> Note: the `ModelBase` change-log members are `CreatedOn`/`UpdatedOn` (`DateTimeOffset?`), **never** `CreatedDate`/`UpdatedDate` — but in a mapper the entire block is removed regardless, since the base mapper owns it.
+
+Infrastructure-level mapping covers either **Contract ↔ Persistence** (CRUD domains) or **Domain ↔ Persistence** (domains with a Domain layer, where the aggregate is mapped to/from the persistence model). Application-level mapping (Domain aggregate ↔ Contract) lives in `Application/Mapping/` and uses `Mapper<TSource, TDest, TSelf>`. Do not conflate the two.
+
+## External Clients and Adapter Implementations
+
+When a domain calls another domain's API over HTTP, split the concern across two focused classes:
+
+- **Typed HTTP client** (`Clients/`) — thin wrapper around `HttpClient` handling serialization and response mapping to `Result` types. One class per external service.
+- **Adapter implementation** (`Adapters/`) — implements the Application-layer `IXxxAdapter` interface. May combine the typed client with local EF reads and event publication.
+
+```csharp
+// Infrastructure/Clients/ProductsHttpClient.cs
+public class ProductsHttpClient(HttpClient httpClient)
+{
+    private readonly HttpClient _httpClient = httpClient.ThrowIfNull();
+
+    public async Task<Result> CreateReservationAsync(MovementRequest request, CancellationToken cancellationToken = default)
+    {
+        var response = await _httpClient.PostAsJsonAsync("api/inventory/reserve", request, JsonDefaults.SerializerOptions, cancellationToken);
+        return await response.ToResultAsync();
+    }
+}
+
+// Infrastructure/Adapters/ProductAdapter.cs
+[ScopedService<IProductAdapter>]
+public class ProductAdapter(ShoppingEfDb ef, ProductsHttpClient client, IEventPublisher eventPublisher) : IProductAdapter
+{
+    // GetAsync — reads from the local event-replicated EF store (eventually consistent).
+    public Task<Result<Product>> GetAsync(string id, CancellationToken cancellationToken = default) => Result
+        .GoAsync(() => _ef.Products.GetWithResultAsync(id, cancellationToken))
+        .ThenAs(p => ProductMapper.From.Map(p));
+
+    // ReserveInventoryAsync — calls the remote API in real time (synchronous integration).
+    public async Task<Result> ReserveInventoryAsync(Domain.Basket basket, CancellationToken cancellationToken = default)
+        => await _client.CreateReservationAsync(BuildRequest(basket), cancellationToken).ConfigureAwait(false);
+}
+```
+
+Keep the typed HTTP client and the adapter orchestration in separate, independently testable classes.
+
+## Generated Code
+
+Persistence model classes (`Persistence/*.g.cs`) and the EF `DbContext` partial (`Repositories/*DbContext.g.cs`) are generated by the domain's `*.Database` project. Never create or edit these files directly — run `dotnet run -- CodeGen` (or `dotnet run -- All`) in the `*.Database` project to regenerate.
+
+## ConfigureAwait
+
+Always call `.ConfigureAwait(false)` on every `await` inside repository and adapter methods.
+
+## Do Not
+
+- Do not reference the Infrastructure project from the Application layer — Infrastructure implements Application interfaces, not the other way around.
+- Do not use AutoMapper or reflection-based mappers — use `BiDirectionMapper<TFrom, TTo, TSelf>` with explicit `OnMap` overrides.
+- Do not call `HttpClient` directly in adapter methods — use the typed HTTP client class in `Clients/`.
+- Do not conflate Application-level mapping (aggregate ↔ contract) with Infrastructure-level mapping (contract ↔ persistence model).
+- Do not write raw `DbContext` queries for standard CRUD — use the `EfDb` delegate methods.
+- Do not edit `*.g.cs` persistence or DbContext files directly — regenerate via the `*.Database` tooling project.
+- Do not add a mapper without ensuring the `<Domain>.Infrastructure.Mapping` namespace is in the Infrastructure `GlobalUsing.cs`; likewise ensure `CoreEx.Data.Querying` is present when adding `QueryArgsConfig` query configuration.
+- Do not mix EfDb flows — use the `...WithResultAsync` methods inside `Result<T>` pipelines and the plain `...Async` methods for exception flow; do not wrap a throwing `...Async` call to fake a `Result`.
+
+## Further Reading
+
+- [Infrastructure Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/infrastructure-layer.md) — full walkthrough of persistence models, repositories, mapping, and external client/adapter patterns.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — Adapter, Repository, Mapper, Persistence, and HTTP Client pattern entries.
+- [Layer Dependencies](https://github.com/Avanade/CoreEx/blob/main/samples/docs/layers.md) — layer dependency rules and the role of the Infrastructure layer.
+- [Tooling Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/tooling.md) — `*.Database` project: schema, persistence-model generation, and outbox provisioning.
+- [CoreEx.EntityFrameworkCore README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.EntityFrameworkCore/README.md) — `EfDb`, `EfDbModel`, `EfDbMappedModel`, and `EfDbOptions`.
+- [CoreEx Results README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/Results/README.md) — `Result<T>` type, pipeline operators (`.GoAsync`, `.ThenAs`, `.ThenAsAsync`), and error propagation semantics.
diff --git a/.github/instructions/coreex-tests.instructions.md b/.github/instructions/coreex-tests.instructions.md
new file mode 100644
index 00000000..c1e27f03
--- /dev/null
+++ b/.github/instructions/coreex-tests.instructions.md
@@ -0,0 +1,792 @@
+---
+applyTo: "**/*.Test*/**/*.cs"
+description: "Test conventions: test project types (Api/Unit/Subscribe/Relay), base classes, one-time setup patterns, and assertion helpers"
+tags: ["testing", "unit-tests", "integration-tests", "test-helpers", "nunit"]
+---
+
+# Test Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.UnitTesting` | Base testers and common helpers: `WithApiTester<T>`, `WithGenericTester<T>`, `Test.Http()`, `Test.Http<T>()`, `Test.Scoped()`, `Test.ScopedType<T>()`, `Test.ClearFusionCacheAsync()`, `Test.ReplaceHttpClientFactory()`; database helpers: `Test.MigrateSqlServerDataAsync<T>()`, `Test.UseExpectedSqlServerOutboxPublisher()`, `.ExpectSqlServerOutboxEvents()`, `.ExpectNoSqlServerOutboxEvents()`, `Test.MigratePostgresDataAsync<T>()`, `Test.UseExpectedPostgresOutboxPublisher()`, `.ExpectPostgresOutboxEvents()`, `.ExpectNoPostgresOutboxEvents()`; messaging helpers: `Test.UseExpectedAzureServiceBusPublisher()`, `Test.GetAndClearAzureServiceBusAsync()`; ASP.NET Core assertions: `.ExpectIdentifier()`, `.ExpectETag()`, `.ExpectChangeLogCreated()`, `.ExpectJsonFromResource()`, `.AssertCreated()`, `.AssertOK()`, `.AssertBadRequest()`, `.AssertErrors()`, `.AssertJsonFromResource()`, `.AssertLocationHeader()` |
+| `UnitTestEx` | `MockHttpClientFactory`, `MockHttpClientRequest`, `.WithJsonResourceBody()`, `.WithAnyBody()`, `.Respond.With()`, `.Respond.WithJsonResource()`, `.Verify()` |
+| `NUnit` | `[TestFixture]`, `[Test]`, `[OneTimeSetUp]` |
+| `AwesomeAssertions` | `.Should()`, `.Be()`, `.HaveCount()` |
+
+## Project Types
+
+| Project suffix | Base class | Scope |
+|---|---|---|
+| `*.Test.Api` | `WithApiTester<Program>` | Full integration — real DB, cache, outbox, HTTP |
+| `*.Test.Unit` | `WithGenericTester<EntryPoint>` | Component/unit — isolated, no infrastructure |
+| `*.Test.Subscribe` | `WithApiTester<Program>` | Integration over subscriber host |
+| `*.Test.Relay` | `WithApiTester<Program>` | Integration over relay host |
+
+**Rule**: intra-domain dependencies (database, cache, outbox) are real; inter-domain HTTP calls and direct broker publishes are always mocked.
+
+---
+
+## Test Responsibility — what goes where (do not duplicate)
+
+The two test projects have **distinct, non-overlapping jobs**. Decide where a behaviour belongs by what it needs to exercise, and assert it in **one** place only.
+
+| Concern | Where | Why |
+|---|---|---|
+| **Service orchestration & repository logic** — CRUD round-trips, identifier assignment on create, persistence + mapping, query/filter behaviour, **soft-delete filtering**, eventing (outbox subject/destination), concurrency (ETag/`If-Match`), idempotency, error→HTTP mapping (404/409/412/428) | **`*.Test.Api`** (intra-domain integration) | These are *integration* behaviours — they only have meaning over the real DB/cache/outbox and the real host pipeline. Mocking them would test the mock, not the system. |
+| **Isolated component logic** — **validators**, pure mappers, calculations, value-conversion helpers, and other logic with no infrastructure dependency | **`*.Test.Unit`** | Fast, exhaustive, no DB. The natural home for enumerating every rule/branch of a validator or a pure function. |
+
+**Do not repeat the same assertion in both projects.** Concretely:
+
+- **Validator rules** are proven **exhaustively in unit tests** (every mandatory/range/format/cross-field rule). In the API tests, do **not** re-enumerate them — assert **one** representative `AssertBadRequest()` + `AssertErrors(...)` case to confirm the validator is *wired into the pipeline*, then move on. **But `AssertErrors` is an exact match — not a subset.** It fails unless the listed errors are **exactly** the set the input produces (none missing, none extra). So "one representative case" means **craft the input to produce exactly the errors you assert** — e.g. send a value valid in every respect *except* the one rule under test — rather than posting an empty object (which fires *all* mandatory errors) and listing only some. (See the validators guidance — "Unit Tests".)
+- **Service/repository behaviour** is proven in the **API tests** over the real database. Do **not** re-create it in unit tests with a mocked repository/UoW — that would assert the mock's configured behaviour, not the real persistence/mapping/eventing.
+- When a behaviour *could* sit in either, prefer the layer that exercises it **without mocking the thing under test**: validator → unit; anything touching the DB, cache, outbox, or HTTP pipeline → API.
+
+The goal is a single source of truth per behaviour: unit tests guard the rules and pure logic; API tests guard the wired-up, persisted, evented system.
+
+---
+
+## One-Time Setup
+
+Every integration test class must have a `[OneTimeSetUp]` method. Order of operations is fixed:
+
+1. Migrate + seed the domain database.
+2. Clear the hybrid cache.
+3. Register event-capture publishers.
+4. Set up inter-domain HTTP mocks (for domains with cross-domain adapters).
+
+**(SQL Server example):**
+```csharp
+[OneTimeSetUp]
+public async Task OneTimeSetUpAsync()
+{
+    await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+    await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+    Test.UseExpectedSqlServerOutboxPublisher();
+    Test.UseExpectedAzureServiceBusPublisher();
+
+    var mcf = MockHttpClientFactory.Create();
+    _mockHttpReserveRequest = mcf.CreateClient("ProductsApi")
+        .Request(HttpMethod.Post, "api/inventory/reserve");
+    Test.ReplaceHttpClientFactory(mcf);
+}
+```
+
+**(PostgreSQL example):**
+```csharp
+[OneTimeSetUp]
+public async Task OneTimeSetUpAsync()
+{
+    await Test.MigratePostgresDataAsync<TestData>(DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+    await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+    Test.UseExpectedPostgresOutboxPublisher();
+}
+```
+
+**Outbox assertion helpers are database-specific.** Use `UseExpectedPostgresOutboxPublisher` / `ExpectPostgresOutboxEvents` for PostgreSQL domains; use `UseExpectedSqlServerOutboxPublisher` / `ExpectSqlServerOutboxEvents` for SQL Server domains. Never mix them.
+
+`DataResetFilterPredicate` in `DbMigration.ConfigureMigrationArgs` scopes the reset to the domain's own schema — multiple domains' test runs do not corrupt each other even when run concurrently.
+
+For the **API read/mutate test classes** (see [API Tests — Structure & Generation](#api-tests--structure--generation)), pass the class's specific dataset via the **named-file overload** so read and mutate classes load only their own data: `MigrateSqlServerDataAsync<TestData>(["read-data.seed.yaml"], …)` / `MigratePostgresDataAsync<TestData>(["mutate-data.seed.yaml"], …)`. The no-argument overload loads every `Data/*.seed.yaml`, which would mix the read and mutate datasets.
+
+---
+
+## Test Data (seed files)
+
+Test seed data lives under `Data/` in the `*.Test.Common` project, located via the `TestData` marker class (do not rename/move it). These are **test datasets**, distinct from the production `*.Database/Data/ref-data.seed.yaml`.
+
+Use **one read dataset and one mutate dataset per domain** — `read-data.seed.yaml` and `mutate-data.seed.yaml` — shared across all of the domain's entities to avoid duplication. The relevant test class loads its dataset by name in `[OneTimeSetUp]`:
+
+```csharp
+await Test.MigrateSqlServerDataAsync<TestData>(["read-data.seed.yaml"], DbMigration.ConfigureMigrationArgs);   // or MigratePostgresDataAsync
+```
+
+A developer may override/extend by passing additional files in the list when a class needs bespoke data.
+
+**Format** — `schema:` → `- <table>:` → rows, where each row is an **inline object** keyed by column name. Unlike the production `ref-data.seed.yaml` (which uses `$^<table>` + auto-id + `code: text` shorthand), test data uses a **plain `- <table>:`** entry (no `$`/`$^` — it is inserted into a freshly-reset DB) and rows that **list the columns explicitly**.
+
+> **⚠️ All identifiers — schema, table, AND column names — must match the database's actual casing for the chosen provider** (i.e. exactly what the migration scripts created). DbEx does not case-fold them, so a wrong-cased schema/table fails the seed with *"Table '…' does not exist"*:
+> - **PostgreSQL (the default provider)** → **lowercase `snake_case`**: schema `bar`, table `employee`, columns `employee_id`, `first_name`, `gender_code`.
+> - **SQL Server** → **`PascalCase`**: schema `Bar`, table `Employee`, columns `EmployeeId`, `FirstName`, `GenderCode`.
+
+```yaml
+# PostgreSQL (default) — lowercase schema/table, snake_case columns
+bar:
+  - employee:                         # table — plain, no $^ prefix
+    - { employee_id: ^1, first_name: Bob, last_name: Smith, gender_code: M, salary: 50000, date_of_birth: 1990-01-01 }
+    - { employee_id: ^2, first_name: Jane, last_name: Doe, gender_code: F, salary: 60000, date_of_birth: 1985-06-15 }
+```
+
+```yaml
+# SQL Server — PascalCase schema/table/columns
+Bar:
+  - Employee:
+    - { EmployeeId: ^1, FirstName: Bob, LastName: Smith, GenderCode: M, Salary: 50000, DateOfBirth: 1990-01-01 }
+```
+
+- **`^N` is a deterministic GUID** — `^1` equals `1.ToGuid()`. Use it for the **identifier** and for any **GUID foreign-key reference** to another seeded row (e.g. a `movement` row with `{ product_id: ^1 }` points at the product seeded as `^1`). This is what lets a test target a specific row by the same `N.ToGuid()`.
+- Reference data is linked **by code** — `gender_code: M` (PostgreSQL) / `GenderCode: M` (SQL Server), not an id/FK.
+- Set scenario flags explicitly where a test needs them — e.g. `is_deleted: true`, `is_inactive: true` (PostgreSQL casing shown).
+
+> ### ⚠️ Writing the GUID literal in resource files (`.res.json` / `.event.json`)
+>
+> In seed YAML and test code, use `^N` / `N.ToGuid()` — **never hand-write the GUID**. But resource files can't call code, so when a deterministic id/FK must appear as a **literal string** you must compute `N.ToGuid()` correctly. Two rules the agent gets wrong:
+>
+> 1. **The number goes in the FIRST segment, not the last.** `1.ToGuid()` is `00000001-0000-0000-0000-000000000000`, **not** `00000000-0000-0000-0000-000000000001`.
+> 2. **The first segment is the number in lowercase HEXADECIMAL, zero-padded to 8 digits — not decimal.** It is *not* a straight digit substitution; convert to hex. (For `N ≤ 9` hex and decimal coincide, which hides the bug; it surfaces at `N ≥ 10`.)
+>
+> | `N` | first segment (hex) | full `N.ToGuid()` literal |
+> |---|---|---|
+> | 1 | `00000001` | `00000001-0000-0000-0000-000000000000` |
+> | 2 | `00000002` | `00000002-0000-0000-0000-000000000000` |
+> | 12 | `0000000c` | `0000000c-0000-0000-0000-000000000000` |
+> | 16 | `00000010` | `00000010-0000-0000-0000-000000000000` |
+> | 255 | `000000ff` | `000000ff-0000-0000-0000-000000000000` |
+> | 1000 | `000003e8` | `000003e8-0000-0000-0000-000000000000` |
+>
+> Formula: `N.ToString("x8") + "-0000-0000-0000-000000000000"`. When in doubt, prefer excluding the volatile `id` from the resource (the `Expect*` helpers / `.AssertJsonFromResource(..., "id")` auto-exclude it) so no literal is needed; only write the literal for a **non-id** field that genuinely carries a deterministic GUID (e.g. a foreign-key column in a query result or event payload).
+
+In the test, reference the seeded row by the same number:
+
+```csharp
+Test.Http().Run(HttpMethod.Get, $"/api/employees/{1.ToGuid()}").AssertOK();   // the EmployeeId: ^1 row
+```
+
+---
+
+## API Tests — Structure & Generation
+
+Intra-domain API (integration) tests run the real host over the real DB/cache/outbox (`WithApiTester<{Solution}.Api.Program>` — reference `Program` fully-qualified; it is `public`, no extra `using` needed). The `*.Test.Api` project's `GlobalUsing.cs` (shipped by the template) already provides the imports and the two aliases the setup uses — **`DbMigration`** (= `{Solution}.Database.Program`, for `DbMigration.ConfigureMigrationArgs`) and **`TestData`** (= `{Solution}.Test.Common.TestData`, the embedded-data marker) — plus `{Solution}.Contracts`, CoreEx, UnitTestEx, AwesomeAssertions, NUnit. Use those aliases; don't re-derive them.
+
+Organise them **per entity**, split read vs mutate, one file per operation:
+
+| Class (per entity) | Endpoints | `[OneTimeSetUp]` seeds |
+|---|---|---|
+| `XxxReadTests` | reads (GET/query) | `read-data.seed.yaml` |
+| `XxxMutateTests` | mutations (POST/PUT/PATCH/DELETE) | `mutate-data.seed.yaml` |
+
+Each is a **`partial class`**; the `[OneTimeSetUp]` lives in `XxxReadTests.cs` / `XxxMutateTests.cs`, and **each operation goes in its own partial sub-file** `Xxx{Read|Mutate}Tests.{Operation}.cs` (Operation = the controller operation: `Get`, `Query`, `Create`, `Update`, `Patch`, `Delete`, …) — isolating operations for discoverability and maintenance. Example for `Employee`:
+
+```
+EmployeeReadTests.cs            // [OneTimeSetUp] → read-data.seed.yaml + ClearFusionCacheAsync
+EmployeeReadTests.Get.cs
+EmployeeReadTests.Query.cs
+EmployeeMutateTests.cs          // [OneTimeSetUp] → mutate-data.seed.yaml (+ outbox publisher, HTTP mocks)
+EmployeeMutateTests.Create.cs
+EmployeeMutateTests.Update.cs
+EmployeeMutateTests.Patch.cs
+EmployeeMutateTests.Delete.cs
+```
+
+```csharp
+// EmployeeMutateTests.cs
+public partial class EmployeeMutateTests : WithApiTester<MyApp.Api.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+        Test.UseExpectedSqlServerOutboxPublisher();   // provider-specific; see One-Time Setup
+    }
+}
+
+// EmployeeMutateTests.Create.cs
+public partial class EmployeeMutateTests
+{
+    [Test]
+    public void Create_Success() => /* Test.Http<Employee>()… .AssertCreated()… */;
+}
+```
+
+**Isolation:** read and mutate are separate classes with separate seed files, so mutations never disturb read expectations. Within a `XxxMutateTests` class, write each test to be **independent** — act on a distinct seeded id or create its own data; never depend on another test's side effects or run order.
+
+> **One seed row per _destructive test_ — not per operation.** Every test that **writes** to the database (Update, Patch, Delete, …) must target its **own** `^N` id. It is **not** enough to give each *operation* a distinct row — two **tests** that mutate the same row fail non-deterministically because **NUnit randomises execution order** (e.g. a Delete test running before an Update test that shares the row). Provision one row per destructive test **up front** in `mutate-data.seed.yaml`; don't add rows reactively after a collision surfaces. Canonical assignment for full CRUD:
+>
+> | `^N` | Test | Notes |
+> |---|---|---|
+> | `^1` | `Update_Success` | `Update_NotFound` uses a non-existent id; `Update_ConcurrencyError` only reads `^1` (rolls back) so it may share it |
+> | `^2` | `Delete_*` (exists → idempotent flow) | the row is removed by the test |
+> | `^3` | `Patch_Success` | |
+>
+> Non-mutating tests (Get, Query, 304, validation bad-requests) can freely share read rows — the rule is specifically about tests that **commit a write**.
+
+**Expected `.req.json` / `.res.json` resources** (the JSON representation of the request/response) live under `Resources/{TestClass}/…` and are referenced via `.ExpectJsonFromResource(...)` / `.AssertJsonFromResource("EmployeeReadTests.Employee_Get_Found.res.json", "etag", "changelog")` (exclude volatile fields). **Pre-author them from the seed values** — you control the seed, so you can write the expected JSON up front (remember to exclude/expect the volatile `id`/`etag`/`changelog`); then **run once and reconcile** any remaining differences from the actual output (they are intentionally copy-paste-friendly). Expect the first run to need a small fix-up; that's normal, not a failure to avoid. They scale better than inline assertions as entities grow.
+
+> **Agent instruction — co-design seed, tests, and resources together.** These three must agree, so author them in order:
+> 1. **Seed first** — add/extend the domain's `read-data.seed.yaml` / `mutate-data.seed.yaml` with the known rows the tests will reference, as object rows with deterministic **`^N` ids** (= `N.ToGuid()`); for mutate, the baselines a test needs — e.g. an existing SKU for a duplicate-conflict test, a row to update/delete.
+> 2. **Tests next** — one partial file per operation; reference seeded rows via `n.ToGuid()` / known codes; keep mutate tests independent.
+> 3. **Resources last** — capture `.res.json`/`.req.json` from the actual run; the response resource must match the seeded values.
+>
+> Cover, per operation: **Get** (found, not-found, ETag/not-modified); **Query** (filter, order, paging, field selection); **Create** (success + Location + outbox event, bad-data validation, duplicate/conflict, idempotency-key); **Update** (success + ETag/concurrency, not-found); **Patch** (merge success, not-found); **Delete** (idempotent — always 204, never 404): **get → delete → get → delete** = exists → 204+event → now 404 → 204 with **no** event. Assert outbox events on mutating success paths (provider-specific `ExpectXxxOutboxEvents`) and `ExpectNoXxxOutboxEvents` on failure paths.
+
+---
+
+## API Test Pattern
+
+Use the `Test.Http()` / `Test.Http<T>()` fluent chain: **set expectations → execute → assert**.
+
+```csharp
+// GET
+Test.Http()
+    .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}")
+    .AssertOK()
+    .AssertJsonFromResource("ReadTests.Product_Get_Found.res.json", "etag", "changelog");
+
+// POST — PostgreSQL domain (Postgres outbox)
+var created = Test.Http<Product>()
+    .ExpectIdentifier()
+    .ExpectETag()
+    .ExpectChangeLogCreated()
+    .ExpectJsonFromResource("ProductMutateTests.Create_Success.res.json")
+    .ExpectPostgresOutboxEvents(e => e
+        .AssertWithValue("contoso", "contoso.products.product.created.v1"))
+    .Run(HttpMethod.Post, "/api/products", product)
+    .AssertCreated()
+    .AssertLocationHeader(r => new Uri($"/api/products/{r!.Id}", UriKind.Relative))
+    .Value!;
+
+// POST — SQL Server domain (SQL Server outbox)
+Test.Http<Basket>()
+    .ExpectSqlServerOutboxEvents(e => e
+        .AssertWithValue("contoso", "contoso.shopping.basket.checkedout.v1"))
+    .Run(HttpMethod.Post, $"/api/baskets/{basketId}/checkout", checkoutRequest)
+    .AssertOK();
+
+// Validation error
+Test.Http()
+    .Run(HttpMethod.Post, "/api/products", invalidProduct)
+    .AssertBadRequest()
+    .AssertErrors("Text is required.", "Price must be greater than or equal to zero.");
+
+// Assert no events on failure path
+Test.Http()
+    .ExpectNoSqlServerOutboxEvents()
+    .Run(HttpMethod.Post, $"/api/baskets/{basketId}/checkout")
+    .AssertBadRequest();
+```
+
+### Expectation helpers (assert *and* auto-exclude from the JSON compare)
+
+These `Test.Http<T>()` expectations both **assert the value is present** and **automatically exclude it from the JSON comparison** — so the `.res.json` should **omit** these fields and you do **not** list them as manual excludes:
+
+- `ExpectIdentifier()` — asserts `Id` has a value; excludes it from the compare.
+- `ExpectETag()` — asserts `ETag` has a value; excludes it.
+- `ExpectChangeLogCreated()` / `ExpectChangeLogUpdated()` — assert the `ChangeLog` create/update values are set; exclude `changelog`.
+
+(For a plain GET via `.AssertJsonFromResource(...)` *without* these expectations, exclude the volatile fields manually — e.g. `"etag", "changelog"` — as in the GET example above.)
+
+### Update (PUT) and Patch with ETag (concurrency)
+
+Send the ETag for concurrency-controlled mutations. **Fetch the current entity first** to get its `ETag`, then PUT with `If-Match`:
+
+```csharp
+// Arrange: get the current row (the EmployeeId: ^1 seed) to obtain its ETag.
+var val = Test.Http<Product>()
+    .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}").AssertOK().Value!;
+val.Text = "Updated text";
+
+// Act/Assert: PUT with If-Match.
+Test.Http<Product>()
+    .Run(HttpMethod.Put, $"/api/products/{val.Id}", val, requestModifier: r => r.WithIfMatch(val.ETag))
+    .AssertOK();
+```
+> If the serialized request body already contains `ETag` and no `If-Match` header is set, that body `ETag` is used as the concurrency token.
+
+For **PATCH**, also set the **merge-patch content type** (the request default is plain JSON):
+
+```csharp
+Test.Http<Product>()
+    .Run(HttpMethod.Patch, $"/api/products/{p.Id}", new { text = p.Text },
+         requestModifier: r => r.WithIfMatch(val.ETag).WithMergePatchJsonContentType())
+    .AssertOK();
+```
+
+**Concurrency error (stale ETag) → 412.** Supply a **wrong** `If-Match` and assert `AssertPreconditionFailed()`. The `If-Match` **header takes precedence** over any `ETag` in the body, so you do **not** need to clear `val.ETag` — the header value drives the concurrency check:
+
+```csharp
+var p = Test.Http<Product>().Run(HttpMethod.Get, $"/api/products/{6.ToGuid()}").AssertOK().Value!;
+p.Text += " Updated";
+Test.Http()
+    .ExpectNoSqlServerOutboxEvents()                          // a rejected update commits nothing → emits nothing
+    .Run(HttpMethod.Put, $"/api/products/{p.Id}", p, requestModifier: r => r.WithIfMatch("AAAAAAAA"))
+    .AssertPreconditionFailed();                              // 412 — NOT AssertConflict()/409
+```
+
+This is **412 Precondition Failed** (`ConcurrencyException`), not 409. Use `.AssertPreconditionFailed()`. (409/`AssertConflict()` is for duplicate-key/business conflicts only — see the HTTP assertion table.)
+
+### Conditional GET with If-None-Match → 304 Not Modified
+
+For a conditional read, use the **`WithIfNoneMatch(...)`** request-modifier helper (the read-side counterpart of `WithIfMatch`) and assert `AssertNotModified()`. **Fetch once to obtain the response ETag**, then re-GET with it:
+
+```csharp
+// 1. GET to obtain the current ETag from the response headers.
+var r = Test.Http()
+    .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}")
+    .AssertOK()
+    .Response;
+
+// 2. Conditional GET with If-None-Match → 304.
+Test.Http()
+    .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}", requestModifier: rm => rm.WithIfNoneMatch(r.Headers.ETag!.Tag))
+    .AssertNotModified();
+```
+
+> **Use the `WithIfNoneMatch(...)` helper — do not set the header by hand.** `If-None-Match` requires a **quoted entity-tag** (`"<value>"`, RFC 7232); `r.Headers.Add("If-None-Match", etag)` throws **`FormatException`** on an unquoted value. `WithIfNoneMatch(...)` (and passing `response.Headers.ETag.Tag`, which is already quoted) handles the format for you — mirror it rather than reaching for raw header manipulation.
+
+### Update of a non-existent id → 404 (ETag + value still required)
+
+Concurrency is checked **before** existence. So a "PUT a non-existent id → `NotFound`" test must **still send a valid ETag and a full value body** — otherwise the precondition check fires first and you get **`428 Precondition Required`** ("*A concurrency error occurred; an ETag is required either as an If-Match header (preferred) or specified within the request body (where supported).*"), not the `404` the test intends.
+
+```csharp
+// ✅ Correct — supply an ETag (any well-formed value) and a complete body; the 404 comes from the row not existing.
+var val = new Product { Id = 404.ToGuid().ToString(), Text = "Does not exist" /* ...all mandatory fields... */ };
+Test.Http<Product>()
+    .Run(HttpMethod.Put, $"/api/products/{val.Id}", val, requestModifier: r => r.WithIfMatch("any-etag"))
+    .AssertNotFound();
+
+// ❌ Wrong — no If-Match / no body ETag → 428 Precondition Required, never reaches the not-found check.
+Test.Http<Product>()
+    .Run(HttpMethod.Put, $"/api/products/{404.ToGuid()}", val)
+    .AssertNotFound();   // fails: actual is 428
+```
+
+The ETag value need not match anything (the row doesn't exist) — it only has to be **present** to clear the precondition gate. The body must still satisfy model validation (all mandatory fields), since validation also precedes the repository lookup.
+
+### Get of a soft-deleted row → 404 (when `IsDeleted` is supported)
+
+When the entity supports soft-delete (`IsDeleted` column), a row flagged deleted must be **invisible to reads** — a `GET` of it returns **`404 Not Found`**, exactly as if it never existed. This needs its own test because a row that is *present in the table* but filtered out is a different code path from a row that was never seeded.
+
+1. **Seed a deleted row** — add a row to the domain's read seed file with the soft-delete flag set (provider casing — `is_deleted` PostgreSQL / `IsDeleted` SQL Server):
+
+```yaml
+# PostgreSQL (default)
+bar:
+  - product:
+    - { product_id: ^9, name: Ghost, sku: GHOST-1, is_deleted: true }   # soft-deleted — must not be readable
+```
+
+2. **Assert the GET 404s** (and that it does **not** appear in a list/query):
+
+```csharp
+// Direct get of the soft-deleted row → 404.
+Test.Http().Run(HttpMethod.Get, $"/api/products/{9.ToGuid()}").AssertNotFound();
+```
+
+The point of the test is that the soft-delete filter is actually applied on read — a missing filter would return the row with `200 OK` instead of `404`. (Optionally also assert the row is absent from a collection/query result.)
+
+### Delete — get → delete → get → delete (idempotent)
+
+The canonical delete test is a **four-step** flow that proves both the delete and its **idempotency**: GET (exists) → DELETE (204 + event) → GET (now 404) → DELETE again (204, **no** event). `DELETE` **always** returns **204 No Content** — **never 404**, even for a non-existent or already-deleted id; only the **first** delete (where the row existed) emits the event. The 404 belongs to the **GET**, not the DELETE.
+
+```csharp
+// 1. Confirm it exists (the EmployeeId: ^2 seed).
+Test.Http().Run(HttpMethod.Get, $"/api/products/{2.ToGuid()}").AssertOK();
+
+// 2. Delete — 204, and a "deleted" outbox event. Delete returns NO value body → assert METADATA + KEY (not value);
+//    the key is the deleted id carried via .WithKey(id); the subject has NO version suffix.
+Test.Http()
+    .ExpectPostgresOutboxEvents(e => e.AssertMetadata("contoso", "contoso.products.product.deleted", 2.ToGuid().ToString()))
+    .Run(HttpMethod.Delete, $"/api/products/{2.ToGuid()}")
+    .AssertNoContent();
+
+// 3. Confirm it is gone — the GET now 404s (it is the GET, not the DELETE, that returns not-found).
+Test.Http().Run(HttpMethod.Get, $"/api/products/{2.ToGuid()}").AssertNotFound();
+
+// 4. Repeat delete is idempotent — still 204, but emits NO event.
+Test.Http()
+    .ExpectNoPostgresOutboxEvents()
+    .Run(HttpMethod.Delete, $"/api/products/{2.ToGuid()}")
+    .AssertNoContent();
+```
+
+A delete of a **non-existent** id behaves like step 4 — 204 No Content with no event. **Never assert `AssertNotFound()` on a `DELETE`.**
+
+### Outbox event assertions — destination & subject
+
+Assert published events with `ExpectXxxOutboxEvents(e => …)` (provider-specific). **Pick the assertor by whether the event carries a value:**
+
+- **`.AssertWithValue(destination, subject)`** — for **value-carrying** events (Create/Update). It reconstructs the expected `EventData` **from the API's returned value** and JSON-compares the event body. Only valid when the operation returns a value.
+- **`.AssertMetadata(destination, subject, key)`** — for **no-value** events (**Delete**, or any operation returning `204 No Content`). It asserts the **metadata only** — destination + subject — plus the **`key`** (the `CloudEvent.Subject`, i.e. the `EventData.Key` set via `.WithKey(id)` in the service). There is no value to compare, so `AssertWithValue` would have nothing to reconstruct from — use `AssertMetadata` and pass the deleted id (e.g. `2.ToGuid().ToString()`) as the key.
+
+The `destination` and `subject` strings:
+
+- **`destination`** — the topic/queue the event is published to: the `CoreEx:Events:Destination` value from `appsettings.json` (the domain's messaging topic, e.g. `contoso`). Do not assume it equals the subject's first segment.
+- **`subject`** — composed as **`{solutionname}.{domainname}.{entity}.{action}`** + an **optional `.v{major}` version suffix**, all **lower-case**, dot-separated:
+  - `solutionname` / `domainname` — from `CoreEx:Host:SolutionName` / `:DomainName` in `appsettings.json` (lower-cased; `SolutionName` may itself contain dots, e.g. `my.foo`).
+  - `entity` — the entity/contract name (e.g. `employee`).
+  - `action` — the **past-tense `EventAction`** set in the **service code** (`EventData.CreateEventWith(v, EventAction.Created)` → `created`; `Updated` → `updated`; `Deleted` → `deleted`).
+  - **`.v{major}` version suffix — present *only when the event carries a value*** (e.g. Create/Update). Its value is the **major** of the contract's `[Schema("v2.0")]` attribute → `.v2`; **unannotated defaults to `.v1`**. An event with **no value** (e.g. Delete) has **no version suffix at all**.
+
+```csharp
+// Create — has a value → AssertWithValue, version suffix (default v1, or the [Schema] major).
+.ExpectPostgresOutboxEvents(e => e.AssertWithValue("contoso", "contoso.products.product.created.v1"))
+// Delete — no value → AssertMetadata with the key (the deleted id); no version suffix.
+.ExpectPostgresOutboxEvents(e => e.AssertMetadata("contoso", "contoso.products.product.deleted", 2.ToGuid().ToString()))
+```
+
+So a `[Schema("v2.0")] Product` create event is `…product.created.v2`. If unsure of the exact subject, **run the test once** — the assertion failure reports the actual event subject; copy it verbatim. **Delete** events carry no value body but do carry the key (`EventData.CreateEvent<T>(EventAction.Deleted).WithKey(id)`); assert them with **`AssertMetadata(destination, "…deleted", key)`** — the unversioned `…deleted` subject plus the id as the key (there is no value to JSON-compare, so `AssertWithValue` does not apply).
+
+### HTTP assertion methods
+
+Use the `Assert*` helper matching the expected status; for anything not listed, assert `.Response.StatusCode` directly.
+
+| Outcome | Helper |
+|---|---|
+| 200 OK | `.AssertOK()` |
+| 201 Created | `.AssertCreated()` (pair with `.AssertLocationHeader(...)`) |
+| 204 No Content (DELETE) | `.AssertNoContent()` |
+| 304 Not Modified (ETag / If-None-Match) | `.AssertNotModified()` |
+| 400 Bad Request | `.AssertBadRequest()` + `.AssertErrors("…")` |
+| 404 Not Found | `.AssertNotFound()` |
+| 409 Conflict — **duplicate key / business conflict** (`DuplicateException` / `ConflictException`) | `.AssertConflict()` |
+| 412 Precondition Failed — **stale/mismatched ETag** (`ConcurrencyException`) | `.AssertPreconditionFailed()` |
+| 428 Precondition Required — **no ETag supplied** on a concurrency-controlled mutation | `.Assert(HttpStatusCode.PreconditionRequired)` |
+
+> **409 vs 412 — different problems, don't conflate.** A **concurrency** failure (the supplied ETag doesn't match the current row) is **412 Precondition Failed** (`ConcurrencyException`) — use `.AssertPreconditionFailed()`. **409 Conflict** is only a **duplicate-key / unique-constraint or business conflict** (`DuplicateException`/`ConflictException`) — e.g. creating a second row with an existing SKU. A stale-ETag update is **never** 409. (And a mutation that supplies **no** ETag at all fails the precondition gate with **428**, not 412 — see "Update of a non-existent id".)
+
+### `Test.Http()` vs `Test.Http<T>()`
+
+Use **`Test.Http<T>()`** when you need the deserialized response `.Value` (e.g. to capture the created entity, then re-`Get` and compare). Use the untyped **`Test.Http()`** when you only assert status / `.AssertJsonFromResource(...)` / errors.
+
+### Test host configuration — leave appsettings alone
+
+Do **not** create or edit `appsettings*.json` (including `appsettings.unittest.json`) for API tests. The test host runs via `WebApplicationFactory`, which loads the host's **Development** settings automatically — connection strings, cache, messaging, etc. are already wired. There is nothing for the agent to configure here.
+
+## Resource-Based JSON Assertions
+
+Expected response bodies live in `Resources/` as `.res.json` files. Reference them by dot-separated path. Exclude volatile fields as extra parameters:
+
+```csharp
+.AssertJsonFromResource("ReadTests.Product_Get_Found.res.json", "etag", "changelog");
+.AssertJsonFromResource("Basket_Checkout_Insufficient_Quantity.products.res.json", "traceid");
+```
+
+Mock request bodies use `.req.json`; mock response bodies from a downstream API use `.{domain}.res.json` (prefixed with the remote domain name by convention).
+
+**Reference-data properties serialize by their non-`Code` name, value only.** A contract `[ReferenceData<Gender>] string? GenderCode` property serializes to JSON as **`"gender": "M"`** (the Roslyn generator sets the `JsonPropertyName` to the non-`Code` suffix and emits just the code value). So in `.res.json` / `.req.json` resources — and in any inline request body — use the **non-`Code`** JSON name (`gender`, `subCategory`, `unitOfMeasure`), even though the C# contract property is `GenderCode` / `SubCategoryCode` / `UnitOfMeasureCode`. (Note the three distinct representations: C# property `GenderCode` → JSON `gender` → DB/seed column `GenderCode`/`gender_code`.)
+
+A ref-data value (e.g. `"gender": "M"`) is **real, deterministic data — include it in the `.res.json` and do not exclude it.** The **only** volatile fields are `id`, `etag`, and `changelog` (server-assigned/timestamped); exclude those — via the `Expect*` helpers on mutations (which auto-exclude), or as explicit `.AssertJsonFromResource(..., "etag", "changelog")` arguments on a plain GET.
+
+---
+
+## HTTP Client Mocking
+
+Declare `MockHttpClientRequest` fields at class level; configure responses per test; always call `.Verify()` after the action:
+
+```csharp
+// Class level
+private MockHttpClientRequest _mockHttpReserveRequest = null!;
+
+// OneTimeSetUp
+var mcf = MockHttpClientFactory.Create();
+_mockHttpReserveRequest = mcf.CreateClient("ProductsApi")
+    .Request(HttpMethod.Post, "api/inventory/reserve");
+Test.ReplaceHttpClientFactory(mcf);
+
+// In test — success path
+_mockHttpReserveRequest
+    .WithJsonResourceBody("Basket_Checkout_Success.products.req.json")
+    .Respond.With(HttpStatusCode.OK);
+_mockHttpReserveRequest.Verify();
+
+// In test — error path
+_mockHttpReserveRequest.WithAnyBody()
+    .Respond.WithJsonResource(
+        "Basket_Checkout_Insufficient_Quantity.products.res.json",
+        HttpStatusCode.BadRequest,
+        System.Net.Mime.MediaTypeNames.Application.ProblemJson);
+_mockHttpReserveRequest.Verify();
+```
+
+---
+
+## Unit Tests — Validators
+
+Unit tests are for logic with **no external dependencies**; any injected services are **mocked**. **Validators are the primary unit-test target** — they encode the most conditional logic. Application service orchestration is exercised by the host integration tests (`*.Test.Api` / `*.Test.Subscribe`), **not** here.
+
+Maintain **one test class per validator**, under `*.Test.Unit/Validators/`, named `{Validator}Tests` and extending `WithGenericTester<EntryPoint>` — `EntryPoint` (in the template) configures the DI/host services the validator needs. Each `[Test]` runs inside `Test.Scoped(test => { ... })`. Invoke the validator exactly as the application does:
+
+> **⚠️ `Test.Scoped` takes no type parameter for validator tests.** Use the **non-generic** `Test.Scoped(test => { … })` and invoke the validator via its `Default` singleton (or `new XxxValidator(deps)`). Do **not** write `Test.Scoped<XxxValidator>(v => …)` — the generic overload **resolves `XxxValidator` from DI**, but validators are **not registered in DI** (see `coreex-validators.instructions.md`), so it fails. The validator is created explicitly (`.Default` / `new`), never resolved.
+
+> **Do not manage `ExecutionContext` in tests.** `Test.Scoped(...)` (within `WithGenericTester<EntryPoint>` / `WithApiTester<Program>`) establishes a valid `ExecutionContext` for the scope automatically — so do **not** construct, inject, mock, or otherwise set it up in a test. The ambient `Runtime` (clock/GUID) and any `ExecutionContext`-dependent rule "just work" inside the scope. Write the test as if at runtime; the harness handles the context. (The `Test.ScopedType<ExecutionContext>` you may see in **Outbox Relay** tests is a *specialised* technique for writing events directly to the outbox under a scoped context — it is **not** something validator or API tests need.)
+
+```csharp
+public class ProductValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void Empty_Required() => Test.Scoped(test =>
+    {
+        var p = new Product();
+        ProductValidator.Default.AssertErrors(p,
+            ("sku", "Sku is required."),
+            ("text", "Text is required."),
+            ("subCategory", "Sub-category is required."),
+            ("unitOfMeasure", "Unit-of-measure is required."));
+    });
+
+    [Test]
+    public void Success() => Test.Scoped(test =>
+    {
+        var p = new Product { Sku = "X", Text = "Test", SubCategoryCode = "XC", UnitOfMeasureCode = "EA", Price = 9.99m };
+        ProductValidator.Default.AssertSuccess(p);
+    });
+}
+```
+
+- **`Validator<T, TSelf>`** (has a `Default`) → call `XxxValidator.Default`.
+- **`Validator<T>`** (injected deps) → mock the dependency with `Mock<IXxx>` configured in `[OneTimeSetUp]`, then `new XxxValidator(_mock.Object)`:
+
+```csharp
+private readonly Mock<IProductRepository> _mock = new();
+
+[OneTimeSetUp]
+public void OneTimeSetUp() => _mock.Setup(x => x.GetForReservationAsync(It.IsAny<string[]>()))
+    .ReturnsAsync(new Dictionary<string, ProductReserve> { ["P1"] = new() { UnitOfMeasureCode = "EA" } });
+
+[Test]
+public void Invalid_Product() => Test.Scoped(test =>
+    new MovementRequestValidator(_mock.Object).AssertErrors(req,
+        ("products.P2", "Product is non-stocked and therefore cannot be transacted.")));
+```
+
+### Asserting outcomes
+
+- **`AssertSuccess(value)`** — asserts the value passes (no errors).
+- **`AssertErrors(value, (jsonName, text)…)`** — asserts the **exact** set of expected errors. Each tuple is `("<json property name>", "<expected message>")`. **Order does not matter**, but **every** produced error must be accounted for (and there must be no extras). Use **JSON** property names (camelCase) with these path forms:
+  - **Nested object** — dotted: `person.address.street`.
+  - **Array / list item** — `[index]`: `person.addresses[0].street`.
+  - **Dictionary** — `<dictionary>.<key>.<valueProperty>`: e.g. `products.P1.unitOfMeasure` means the `products` dictionary, key `P1`, and `unitOfMeasure` is a property of that entry's value. An error on the entry's value itself is just `<dictionary>.<key>` (e.g. `products.P1`). The **actual key** is the path segment — there is no `.value` segment. The literal `key` segment (e.g. `products.key`) appears **only** when the dictionary key is itself null/empty (so there is no key value to name) — it flags the missing/blank key to the consumer.
+
+  If unsure of the exact path a rule produces, confirm it against the validator's actual output rather than guessing.
+
+### Expected message text
+
+Error text derives from the standard templates in [`ValidatorStrings.cs`](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Validation/ValidatorStrings.cs) (unless a rule overrides the whole message via `.Error(...)`). Placeholders: `{0}` = the property's localized text (label), `{1}` = the value being validated, `{2}` onward = rule-specific extras (compare-to value, max length, etc.). Compose the expected string from the template + label + extras — e.g. `MandatoryFormat` "{0} is required." → `"Sku is required."`; `CompareGreaterThanEqualFormat` "{0} must be greater than or equal to {2}." with compare-text `"zero"` → `"Price must be greater than or equal to zero."`.
+
+> **⚠️ Label casing — sentence case, not Title Case.** The `{0}` label is derived from the property name by splitting on CamelCase and **capitalising only the first word** (the rest are lower-cased). Do **not** read the label as a title-cased echo of the property name:
+>
+> | Property | Label `{0}` | `… is required.` |
+> |---|---|---|
+> | `FirstName` | `First name` | `"First name is required."` (not "First Name") |
+> | `LastName` | `Last name` | `"Last name is required."` |
+> | `DateOfBirth` | `Date of birth` | `"Date of birth is required."` |
+> | `Salary` | `Salary` | `"Salary is required."` |
+> | `Gender` | `Gender` | `"Gender is required."` |
+>
+> Single-word properties are simply capitalised. Always derive the label from the **split + sentence-case** rule, not from a Title-Case reading of the identifier. (A `[Display(Name = …)]`/`.Text(…)` override replaces the derived label entirely.)
+
+> **Exact `PrecisionScale` scale message.** A scale (decimal-places) violation uses `DecimalPlacesFormat` → `"{0} exceeds the maximum decimal places ({2})."` — e.g. `Property(p => p.Salary).PrecisionScale(18, 2)` with too many decimals → `"Salary exceeds the maximum decimal places (2)."` Note the **short** form ("maximum decimal places"), **not** "maximum specified number of decimal places". If unsure of any exact string, run the test once and copy the produced message verbatim rather than guessing.
+
+> **Exact length-rule messages.** The string length rules all end with **"character(s) in length."** (the literal `(s)` is always present, regardless of the count) — do not shorten to "characters.":
+> - `MaximumLength(n)` → `MaxLengthFormat` `"{0} must not exceed {2} character(s) in length."` — e.g. `Property(p => p.Text).MaximumLength(250)` → `"Text must not exceed 250 character(s) in length."`
+> - `MinimumLength(n)` → `MinLengthFormat` `"{0} must be at least {2} character(s) in length."`
+> - `Length(exact)` → `ExactLengthFormat` `"{0} must be exactly {2} character(s) in length."`
+
+> **Quick reference — rule → exact message** (`{Label}` = sentence-cased property label per the rule above; every string verified against the master `ValidatorStrings.cs` in `CoreEx.Validation`). This covers the common rules; for anything not listed, consult `ValidatorStrings.cs` — it is the authoritative source (don't guess the wording).
+>
+> | Rule (fluent) | `ValidatorStrings` key | Produced message |
+> |---|---|---|
+> | `Mandatory()` | `MandatoryFormat` | `{Label} is required.` |
+> | `None()` | `NoneFormat` | `{Label} must not be specified.` |
+> | `Equal(v)` | `CompareEqualFormat` | `{Label} must be equal to {v}.` |
+> | `NotEqual(v)` | `CompareNotEqualFormat` | `{Label} must not be equal to {v}.` |
+> | `GreaterThan(v)` | `CompareGreaterThanFormat` | `{Label} must be greater than {v}.` |
+> | `GreaterThanOrEqualTo(v)` | `CompareGreaterThanEqualFormat` | `{Label} must be greater than or equal to {v}.` |
+> | `LessThan(v)` | `CompareLessThanFormat` | `{Label} must be less than {v}.` |
+> | `LessThanOrEqualTo(v)` | `CompareLessThanEqualFormat` | `{Label} must be less than or equal to {v}.` |
+> | `Between(min,max)` / `InclusiveBetween` | `BetweenInclusiveFormat` | `{Label} must be between {min} and {max}.` |
+> | `ExclusiveBetween(min,max)` | `BetweenExclusiveFormat` | `{Label} must be between {min} and {max} (exclusive).` |
+> | `MaximumLength(n)` | `MaxLengthFormat` | `{Label} must not exceed {n} character(s) in length.` |
+> | `MinimumLength(n)` | `MinLengthFormat` | `{Label} must be at least {n} character(s) in length.` |
+> | `Length(n)` (exact) | `ExactLengthFormat` | `{Label} must be exactly {n} character(s) in length.` |
+> | `PrecisionScale(p,s)` — scale | `DecimalPlacesFormat` | `{Label} exceeds the maximum decimal places ({s}).` |
+> | `PrecisionScale(p,s)` — precision | `MaxDigitsFormat` | `{Label} exceeds the maximum digits (n).` |
+> | `Numeric(allowNegatives: false)` | `AllowNegativesFormat` | `{Label} must not be negative.` |
+> | `Email()` | `EmailFormat` | `{Label} is an invalid e-mail address.` |
+> | `Matches(regex)` | `RegexFormat` | `{Label} is invalid.` |
+> | `Wildcard()` | `WildcardFormat` | `{Label} contains invalid or non-supported wildcard selection.` |
+> | `.IsValid()` (ref-data) | `InvalidFormat` | `{Label} is invalid.` |
+> | `Collection(minCount: n)` | `MinCountFormat` | `{Label} must have at least {n} item(s).` |
+> | `Collection(maxCount: n)` | `MaxCountFormat` | `{Label} must not exceed {n} item(s).` |
+> | `Duplicate()` | `DuplicateFormat` | `{Label} already exists and would result in a duplicate.` |
+> | `NotFound()` | `NotFoundFormat` | `{Label} was not found.` |
+> | `Immutable()` | `ImmutableFormat` | `{Label} is not allowed to change; please reset value.` |
+> | `Collection(item: …)` with invalid child items | `InvalidItemsFormat` | `{Label} contains one or more invalid items.` |
+>
+> For the comparison rules, `{v}`/`{min}`/`{max}` are the literal values — **unless** a message-text delegate is supplied (e.g. `GreaterThanOrEqualTo(0, _ => "zero")` → `"… greater than or equal to zero."`); the delegate text replaces the value token. `AssertErrors` expects **`(jsonName, message)` tuples** (camelCase JSON property path, full message) — never bare message strings. Default texts can be overridden globally via `ValidatorStrings` / localization, so if a project customises them, the project's value wins — but the defaults above are what a stock CoreEx solution produces.
+
+### Reference data in unit tests
+
+Validators that use reference data (`.IsValid()`, etc.) resolve it through `EntryPoint.ReferenceDataServiceDecorator`, which loads the **real seeded data** so tests use representative values rather than invented ones. When a validator under test needs a ref-data type the decorator does not yet handle, **add a new arm to** its `GetAsync` switch — inserting it **before** the final `_ => throw …` catch-all:
+
+```csharp
+public override Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+{
+    _ when type == typeof(Gender) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<GenderCollection>("Bar.$^Gender")!),
+    // ...other ref-data arms...
+    _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")   // ← never remove this catch-all
+};
+```
+
+**Never remove or replace the final `_ => throw …` catch-all arm** — only add arms above it. It is the guard that surfaces an unhandled ref-data type; dropping it (e.g. "replacing the throw-only body") would silently break the decorator.
+
+**Mirror `ReferenceDataService.g.cs` exactly — dispatch on the item type, not the collection.** The decorator's `switch` must match the generated `ReferenceDataService.g.cs` `GetAsync(Type type)`: it keys on the **reference-data item type** — `typeof(Gender)` — **not** the collection type `typeof(GenderCollection)`. (The collection appears only as the `Deserialize<GenderCollection>(...)` target.) Copy the case keys from the generated file rather than guessing; using `typeof(GenderCollection)` as the key means the arm never matches and the catch-all throws.
+
+`Gender` is the reference-data **contract type**; `"Bar.$^Gender"` is the `{schema}.$^{Table}` key into the pre-configured seed data. **The key must mirror the seed YAML's schema and `$^Table` entry exactly, including casing** — it is case-sensitive. So it follows the **provider's casing**: PascalCase for SQL Server (e.g. `"Bar.$^Gender"`, `"Orders.$^OrderStatus"`), lower/snake_case for PostgreSQL (e.g. `"products.$^category"`). Copy the casing from the actual seed `$^<Table>` rather than assuming lower-case.
+
+**Error path for a ref-data property is the camelCase navigation name.** A ref-data rule is written against the **typed navigation** property — `Property(x => x.Gender).IsValid()` — so its error key is the **camelCase of that navigation name**: `"gender"` (for `SubCategory` → `"subCategory"`). This is the **same** token as the serialized JSON code value (`GenderCode` serialises as `gender`), so the error path and the JSON field name coincide. Assert it as `("gender", "Gender is invalid.")` — not `("genderCode", …)` and not `("Gender", …)`. (The message label still follows the sentence-case / `[Localization]` rules above.)
+
+**Only test valid vs not-valid — not active/inactive.** A validator's reference-data rule is the `.IsValid()` extension; assert just the two outcomes: a **valid** code (use a real seeded code) and a **not-valid** code (use a code that is not in the seed — it fails naturally, no arranging required). Do **not** write tests targeting `IReferenceData.IsActive`/`IsInactive` — active/inactive handling is built into `IsValid()`, is framework behaviour we trust, and arranging inactive data just to prove it adds cost for no real coverage.
+
+**Adding test-only entries with `ExtendForTesting`.** The seed YAML is the **production** data set, so it may not contain entries that exercise a validator rule depending on a reference-data entity's **extended property** (a custom property added to the ref-data type). Where such a value is needed, chain `ExtendForTesting(IEnumerable<IReferenceData>)` (from `UnitTestEx`) onto the deserialized collection to append test-only items. It mutates and returns the collection, so it composes inline in the decorator's `GetAsync`:
+
+```csharp
+_ when type == typeof(Category) => Task.FromResult((IReferenceDataCollection)jdr
+    .Deserialize<CategoryCollection>("products.$^category")!
+    .ExtendForTesting([new Category { Id = Runtime.NewId(), Code = "X", OtherProperty = false }])),
+```
+
+Give each added entry a **unique `Id`** so it cannot collide with a seeded row, using a value appropriate to the reference data's **identifier type**:
+- `string` id (the default) → `Runtime.NewId()` (a unique GUID-as-string).
+- `Guid` id → `Runtime.NewGuid()`.
+- `int` (or other) id → a unique value of that type that won't clash with seeded ids.
+
+This keeps the production seed clean while letting a test arrange a code carrying the exact extended-property values the scenario needs.
+
+**Arrange via the `{Name}Code` property, not the typed navigation property.** When constructing the entity/contract under test, set the reference-data relationship using the string **`{Name}Code`** property (e.g. `new Employee { GenderCode = "M" }`), **not** the typed `{Name}` navigation property (e.g. `Gender`). The typed property resolves its value through the `ReferenceDataOrchestrator`, which is not wired up while arranging the input — so assigning it directly is unreliable. The validator's `.IsValid()` reads from the code regardless.
+
+```csharp
+// ✅ Correct — set the code variant when arranging
+var e = new Employee { FirstName = "Jo", LastName = "Bloggs", GenderCode = "M" };
+
+// ❌ Wrong — typed nav property depends on the orchestrator (not set during arrange)
+var e = new Employee { FirstName = "Jo", LastName = "Bloggs", Gender = ... };
+```
+
+### Coverage
+
+Add as many `[Test]` methods as needed for meaningful coverage — confirm both **error** and **success** outcomes. Focus on the validator's own decisions: `Mandatory`/presence where it matters, **inter-field relationships** (`DependsOn`, conditional `When*` rules, cross-property compares), custom `OnValidateAsync` logic, and reference-data **valid vs not-valid** — construct inputs that hit each branch. Prefer clear, scenario-named methods over `[TestCase]`. Aim for coverage that is genuinely representative rather than mirroring any prior hand-crafted set.
+
+**Skip framework-guaranteed constraints.** Do **not** write boundary tests for **length** rules (`MaximumLength`, `MinimumLength`, `Length`, `String`) — assume the declared length logic works (as with reference-data active/inactive). Such tests only re-prove built-in CoreEx behaviour and add fiddly string-padding for no real coverage; spend the effort on the conditional/business logic instead.
+
+> For relay-style tests that need a named scoped type, use `Test.ScopedType<ExecutionContext>` (see Outbox Relay Host Tests).
+
+---
+
+## Subscribe Host Tests
+
+Subscribe test classes extend `WithApiTester<Program>` over the subscriber host. The `[OneTimeSetUp]` migrates/seeds the domain DB and clears FusionCache, just like an API test. Subscribe hosts **do** have FusionCache — they are full application-layer consumers that need caching for reference data and idempotency.
+
+```csharp
+public class ProductModifySubscriberTests : WithApiTester<YourDomain.Subscribe.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedSqlServerOutboxPublisher();
+    }
+}
+```
+
+---
+
+## Outbox Relay Host Tests
+
+Relay tests extend `WithApiTester<Program>` over the relay host. Use `Test.ScopedType<ExecutionContext>` to write events directly to the outbox, wait for the relay background service to forward them, then assert via `Test.GetAndClearAzureServiceBusAsync()`.
+
+```csharp
+public class RelayTests : WithApiTester<YourDomain.Relay.Program>
+{
+    [Test]
+    public async Task Outbox_Relay()
+    {
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.Run(async _ =>
+            {
+                var pub = ActivatorUtilities.GetServiceOrCreateInstance<PostgresOutboxPublisher>(test.Services);
+                pub.Add("contoso", [ce1, ce2]);
+                await pub.PublishAsync();
+
+                for (int i = 0; i < 5; i++)
+                    await Task.Delay(TimeSpan.FromSeconds(1));
+
+                var list = await Test.GetAndClearAzureServiceBusAsync(
+                    ServiceBusSessionReceiverOptions.CreateForTopicSubscription("contoso", "products"));
+
+                list.Should().HaveCount(2);
+            }).AssertSuccess();
+        });
+    }
+}
+```
+
+The relay host exposes hosted-service management endpoints that can also be exercised in tests:
+
+```csharp
+Test.Http()
+    .Run(HttpMethod.Post, "/hosted-services/postgres-outbox-relay-03/pause")
+    .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+```
+
+> **Troubleshooting — Service Bus emulator entity not found.** If a Relay (or any Service Bus) test fails with an error like:
+> ```
+> The messaging entity 'sb://sbemulatorns.servicebus.onebox.windows-int.net/<topic>/subscriptions/<subscription>' could not be found.
+> ```
+> (the topic/subscription path varies), the test host is reaching the emulator but the requested topic/subscription does not exist in it. **Emit to the chat output:** *"Check that the Service Bus emulator (container) is executing with the correct `/servicebus/Config.json` file."* — the emulator provisions its topics/subscriptions from that config at startup, so a missing or mismatched `Config.json` (or a container started without it) is the usual cause. This is an **environment** problem, not a test-code defect — do not "fix" it by editing the test, the subjects, or the emulator entity names.
+
+---
+
+## NUnit Attributes
+
+Use `[Test]` on individual test methods. `[TestFixture]` is inherited when using `WithApiTester` or `WithGenericTester`. Do not use `[TestCase]` for integration tests — use separate named methods for clarity.
+
+## Naming Tests
+
+Name test methods as `{Entity}_{Action}_{Outcome}`:
+
+```
+Product_Get_Found
+Product_Get_NotFound
+Product_Create_Success
+Product_Create_Bad_Data
+Basket_Checkout_Success
+Basket_Checkout_Insufficient_Quantity
+```
+
+## Do Not
+
+- Do not use `[TestCase]` for integration tests — create separate named test methods for each scenario.
+- Do not use `UseExpectedSqlServerOutboxPublisher` / `ExpectSqlServerOutboxEvents` in PostgreSQL domain tests — use the Postgres equivalents.
+- Do not use `UseExpectedPostgresOutboxPublisher` / `ExpectPostgresOutboxEvents` in SQL Server domain tests — use the SQL Server equivalents.
+- Do not call `ClearFusionCacheAsync()` in Outbox Relay host tests — relay hosts have no cache.
+- Do not test inter-domain HTTP calls against a real API — always mock with `MockHttpClientFactory`.
+- Do not call `Test.ReplaceHttpClientFactory()` inside individual tests — configure it once in `[OneTimeSetUp]`.
+- Do not use `FluentAssertions` — use `AwesomeAssertions` (the `AwesomeAssertions` NuGet package).
+- Do not omit `.Verify()` after a `MockHttpClientRequest` action — it confirms the mock was actually invoked.
+- Do not set a typed reference-data navigation property (e.g. `Gender`) when arranging a test input — set the `{Name}Code` string (e.g. `GenderCode = "M"`); the typed property depends on the `ReferenceDataOrchestrator`, which is not set during arrange.
+- Do not write validator tests for reference-data `IsActive`/`IsInactive` — assert only valid vs not-valid via `.IsValid()` (a not-valid case just uses an unseeded code); active/inactive is trusted framework behaviour. Reserve `ExtendForTesting` for rules that depend on a ref-data **extended property**.
+- Do not remove or replace the final `_ => throw …` catch-all arm of `ReferenceDataServiceDecorator.GetAsync` when adding a ref-data type — insert the new arm **above** it; the catch-all must remain.
+- Do not write validator tests for **length** rules (`MaximumLength`/`MinimumLength`/`Length`/`String`) — assume the declared length logic works (framework-guaranteed, like reference-data active/inactive); test conditional/business logic instead.
+- Do not put an entity's read and mutate API tests in one class — split into `XxxReadTests` (seeds `read-data.seed.yaml`) and `XxxMutateTests` (seeds `mutate-data.seed.yaml`), one partial sub-file per operation (`Xxx{Read|Mutate}Tests.{Operation}.cs`).
+- Do not load the whole dataset in an API read/mutate class — use the named-file `MigrateXxxDataAsync<TestData>(["read-data.seed.yaml"|"mutate-data.seed.yaml"], …)` overload so the class loads only its dataset.
+- Do not use the wrong identifier casing in seed YAML — schema, table, **and** column names must match the database's actual casing for the provider (PostgreSQL = lowercase `snake_case`, the default; SQL Server = `PascalCase`). A wrong-cased schema/table fails with *"Table '…' does not exist"*. Mirror exactly what the migration created.
+- Do not write order-dependent or interfering mutate tests — each must act on a distinct seeded id or create its own data.
+- Do not include `id`/`etag`/`changelog` in a `.res.json` used with `ExpectIdentifier()`/`ExpectETag()`/`ExpectChangeLogCreated()`/`ExpectChangeLogUpdated()` (or list them as manual excludes) — those helpers assert presence and auto-exclude from the compare.
+- Do not use the `Code`-suffixed name in test JSON (`.res.json`/`.req.json`/inline bodies) for a reference-data property — use the non-`Code` JSON name (`gender`, not `genderCode`).
+- Do not omit `.WithMergePatchJsonContentType()` on a PATCH test — the request default is plain JSON, not merge-patch.
+- Do not assert `AssertNotFound()` on a `DELETE` — delete is idempotent and always returns 204 No Content (the 404 belongs to the *GET* in a get→delete→get flow). Only the first delete emits an event; assert `ExpectNoXxxOutboxEvents()` on a repeat/non-existent delete.
+- Do not add a `.vN` version suffix to a **no-value** event subject (e.g. `…deleted`) — the version applies **only** when the event carries a value (create/update). Derive the version from the contract's `[Schema("vX.Y")]` major (default `.v1`); don't guess or hard-code it.
+- Do not use `AssertWithValue` for a **no-value** event (Delete, or any `204 No Content`) — there is no returned value to reconstruct from. Use `AssertMetadata(destination, subject, key)` and pass the entity id (e.g. `2.ToGuid().ToString()`) as the `key` (the `.WithKey(id)` value). Reserve `AssertWithValue` for value-carrying Create/Update events.
+
+## Further Reading
+
+- [Testing Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/testing.md) — full test architecture, data seeding, schema isolation, and E2E runner.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — pattern catalog linking testing patterns to layer docs.
diff --git a/.github/instructions/coreex-tooling.instructions.md b/.github/instructions/coreex-tooling.instructions.md
new file mode 100644
index 00000000..e157f336
--- /dev/null
+++ b/.github/instructions/coreex-tooling.instructions.md
@@ -0,0 +1,570 @@
+---
+applyTo: "**/*.CodeGen/Program.cs;**/*.CodeGen/ref-data.yaml;**/*.Database/Program.cs;**/*.Database/dbex.yaml;**/*.Database/Migrations/**;**/*.Database/Data/**;**/*.Database/Schema/**;!**/*.Database/Schema/**/*.g.*"
+description: "Developer tooling conventions: *.CodeGen reference-data C# code generation and *.Database schema migration, DbEx commands, seed data, and outbox provisioning"
+tags: ["tooling", "codegen", "database", "migrations", "dbex", "reference-data", "outbox"]
+---
+
+# Developer Tooling Conventions
+
+Each domain has two developer-time tooling projects that have **no runtime presence**. They run locally during development and in CI/CD pipelines to generate code and manage the database schema.
+
+| Project | Purpose |
+|---|---|
+| `*.CodeGen` | Generates reference-data C# artefacts across all layers from `ref-data.yaml` |
+| `*.Database` | Manages the full database lifecycle — schema, seed data, outbox provisioning, and Infrastructure C# code generation |
+
+---
+
+## Order of operations (database-first)
+
+A change that touches the database, code generation, and hand-written code must be done **in dependency order** — the database is the baseline everything else generates from or builds on. **Plan the full sequence first, execute it in order, and do not begin a step until the previous one has succeeded.** Doing things out of order (CodeGen first, or adding seed rows / `dbex.yaml` tables before the create migrations exist) is the main cause of confused, self-inflicted "fixes".
+
+1. **Establish & inspect.** Bring the DB up to date (`dotnet run -- database`), then `dotnet run -- inspect <schema> <table>…` to confirm current state and decide create-vs-alter — see [Creating or altering a table for an entity](#creating-or-altering-a-table-for-an-entity). **If the bring-up fails, STOP and surface the verbatim error — do not continue or start editing unrelated files.**
+2. **Author migration script(s)** for the absent/changed table(s): `dotnet run -- script refdata|create <schema> <table>`, then fill in the columns.
+3. **Add reference-data rows** to `Data/ref-data.seed.yaml`.
+4. **Register the tables** in `dbex.yaml` `tables:`.
+5. **Apply & generate (DB side):** `dotnet run -- All` (Create → Migrate → CodeGen → Schema → Data) — Migrate applies the new scripts (tables now exist), CodeGen generates the EF persistence models from the live schema, Data seeds. **If it fails, STOP and surface the verbatim error** — a broken baseline invalidates everything downstream.
+6. **CoreEx CodeGen — contracts:** edit `*.CodeGen/ref-data.yaml` and run `dotnet run` (in `*.CodeGen`) to generate the reference-data contracts/services/repositories/mappers.
+7. **Hand-written .NET code:** application services, validators, controllers, tests — last, on top of the generated baseline.
+
+Steps 3–4 come **after** the migration scripts (step 2) and are only applied/introspected by step 5 — where, within `All`, Migrate creates the tables **before** Data seeds and **before** CodeGen introspects `dbex.yaml`. Never add seed rows or `dbex.yaml` tables (or run CodeGen) before the create migrations exist; that is exactly what makes the bring-up fail (seeding into, or generating models from, tables that do not yet exist).
+
+> Two distinct `dotnet run` code-gen steps in different projects: step 5's `All` invokes the **DbEx** CodeGen in `*.Database` (EF persistence models from `dbex.yaml` + live schema); step 6 is the **CoreEx** CodeGen in `*.CodeGen` (contracts etc. from `*.CodeGen/ref-data.yaml`). Do not conflate them.
+
+---
+
+## `*.CodeGen` — Reference-Data C# Code Generation
+
+### How it works
+
+`Program.cs` is minimal — it delegates entirely to `CodeGenConsole`:
+
+```csharp
+await CoreEx.CodeGen.CodeGenConsole.Create().RunAsync(args);
+```
+
+Running `dotnet run` reads `ref-data.yaml`, validates it against the CoreEx JSON Schema, evaluates the embedded Handlebars templates via [OnRamp](https://github.com/Avanade/OnRamp), and writes `.g.cs` files into the correct target project directories (resolved automatically by convention from the CodeGen project location).
+
+### What is generated
+
+| Artefact | Target layer | Description |
+|---|---|---|
+| `*.g.cs` contract class | Contracts | Typed reference-data entity contract extending `ReferenceData<TSelf>`, decorated with `[ReferenceData]` which triggers the Roslyn source generator to emit additional members at compile time |
+| `*.g.cs` controller route | API host | HTTP GET endpoint exposing the entity collection |
+| `*.g.cs` service method | Application | Service method delegating to the repository |
+| `*.g.cs` repository interface | Application | `IXxxRepository` interface declaration |
+| `*.g.cs` repository | Infrastructure | EF Core repository implementation |
+| `*.g.cs` mapper | Infrastructure | `BiDirectionMapper` for the entity |
+
+All outputs carry the `.g.cs` suffix and must never be edited directly — regenerate by re-running `dotnet run`.
+
+> **Add the global usings the generated code depends on — the clean scaffold does not pre-import own-project namespaces.** The `coreex` scaffold ships **clean**: it does **not** carry `global using {Solution}.Contracts;` / `{Solution}.Application;` / `{Solution}.Application.Repositories;` in the `GlobalUsing.cs` files, because those namespaces are empty until code/CodeGen populates them (a `global using` of an empty namespace is **CS0234**). The generated artefacts reference these types **unqualified** (e.g. `ReferenceDataService.g.cs` and `IXxxRepository.g.cs` use `IReferenceDataRepository`, `GenderCollection`, `Gender`), so **as you create the code, add the matching `global using` to each consuming project's `GlobalUsing.cs`**:
+> - First **contract** created → add `global using {Solution}.Contracts;` to **Application**, **Infrastructure** (mappers), and **Api** (controllers).
+> - After **CodeGen** emits repository interfaces → add `global using {Solution}.Application.Repositories;` to **Application** (services) and **Infrastructure** (repositories).
+> - First **controller** referencing a service → add `global using {Solution}.Application;` to **Api**.
+>
+> Do **not** fully-qualify inside the `.g.cs` and do **not** reintroduce a placeholder/marker type just to keep a namespace non-empty — add the `global using` alongside the real code that needs it. (The `AssemblyMarker` types in **Application** and **Infrastructure** are **not** for this — they exist solely as stable `AddDynamicServicesUsing(...)` assembly anchors; see `coreex-host-setup.instructions.md`.)
+
+### `ref-data.yaml` structure
+
+> ⚠️ **Two related but distinct reference-data files — do not confuse them:**
+> - **`*.CodeGen/ref-data.yaml`** (this section) — *defines* the reference-data **entities/contracts** (`entities:` with `name`/`idType`/`properties`); consumed by CodeGen to generate C#.
+> - **`*.Database/Data/ref-data.seed.yaml`** (see [`Data` — seeding](#data--seeding)) — *seeds* reference-data **rows** into the database (`Schema:` → `- $^Table:` → rows); a completely different format. The `.seed.` in the filename marks it as the seed file.
+>
+> When you mean to add seed rows, edit the **Database/Data** file in the seed format — never put `entities:`-style definitions there, and never put `Schema:`/row data here.
+
+```yaml
+# *.CodeGen/ref-data.yaml — entity/contract DEFINITIONS (not seed data)
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/CoreEx/refs/heads/main/schema/coreex-refdata.json
+collectionSortOrder: Code       # sort order applied to all collection types
+repository: EntityFramework     # repository implementation strategy
+entities:
+- name: Brand                   # simplest form — all defaults apply
+- name: Category
+- name: SubCategory
+  properties:
+  - name: CategoryCode
+    type: ^Category             # ^ prefix = typed reference-data property (generates navigation accessor)
+- name: UnitOfMeasure
+  plural: UnitsOfMeasure        # override pluralization where irregular
+  idType: Guid                  # override identifier type; defaults to string
+  properties:
+  - name: Scale
+    type: int                   # additional stored column beyond the standard ReferenceData fields
+- name: DiscountCoupon
+  properties:
+  - name: DiscountPercentage
+    type: decimal
+    excludeContract: true       # exclude from generated contract (present in persistence model only)
+```
+
+Add the `$schema` annotation to the file for IDE YAML validation and auto-complete.
+
+The standard `IReferenceData` properties (`Id`, `Code`, `Text`, `Description`, `SortOrder`, `IsActive`, etc.) are automatically included in every generated type — do not declare them under `properties:`. Only additional domain-specific columns need to be listed; most reference data entities require no `properties:` entry at all.
+
+Key `entities:` options:
+
+| Key | Required | Default | Purpose |
+|---|---|---|---|
+| `name` | Yes | -- | Entity name (PascalCase) |
+| `plural` | No | Auto-pluralized | Override when pluralization is irregular |
+| `idType` | No | `string` | Identifier type override (e.g. `Guid`, `int`) |
+| `properties[].name` | Yes (if any) | -- | Additional stored property name |
+| `properties[].type` | Yes (if any) | -- | CLR type; prefix `^` for a ref-data navigation accessor |
+| `properties[].excludeContract` | No | `false` | Exclude from the generated contract (persistence only) |
+
+> **Agent instruction:** When asked to create or modify a reference data type:
+> 1. Add or update the entry under `entities:` in `ref-data.yaml`.
+> 2. Offer to run `dotnet run` from the `*.CodeGen` directory on the user's behalf.
+> 3. If confirmed, execute it and summarise the generated artefacts on success; on failure relay the **complete output verbatim** — it provides the diagnostic needed to fix the entry.
+> 4. On failure, fix the issue in `ref-data.yaml` and offer to re-run -- do not create or edit `.g.cs` files to work around a generation error.
+> 5. If the user declines, remind them to run `dotnet run` from the `*.CodeGen` directory before the new types are available.
+>
+> **Do not pre-create output directories.** A configured target path (e.g. `apiProjectPath`) that points to a not-yet-existing project directory does **not** cause CodeGen to fail — it simply emits a *warning* and skips that output. Never create an empty directory, stub project, or placeholder file to "unblock" code generation. If a target project is genuinely missing and its artefacts are needed, raise it with the user rather than fabricating the folder.
+
+---
+
+## `*.Database` — Database Lifecycle Management
+
+### NuGet / Project References
+
+| Package | Use case |
+|---|---|
+| `DbEx.SqlServer` + `DbEx.SqlServer.Console` | SQL Server domains |
+| `DbEx.Postgres` + `DbEx.Postgres.Console` | PostgreSQL domains |
+| `CoreEx.Database` | `SqlStatement` type — add its assembly to the migration runner for extended schema scripts |
+
+> **Polyglot**: Use `PostgresMigrationConsole` with `.pgsql` scripts and PostgreSQL functions for PostgreSQL domains. Use `SqlServerMigrationConsole` with `.sql` scripts and stored procedures for SQL Server domains. Choose the correct package per domain.
+
+### `Program.cs` pattern
+
+This is the generated baseline (the `Main` is provider-specific; `ConfigureMigrationArgs` is a plain block-bodied method — note **no** `=>` before the `{`):
+
+```csharp
+// PostgreSQL domain example
+public static Task<int> Main(string[] args) => PostgresMigrationConsole
+    .Create<Program>("Server=127.0.0.1;Database=mydb;Username=postgres;Password=...")
+    .Configure(c => ConfigureMigrationArgs(c.Args))
+    .RunAsync(args);
+
+// SQL Server domain example
+public static Task<int> Main(string[] args) => SqlServerMigrationConsole
+    .Create<Program>("Data Source=127.0.0.1,1433;Initial Catalog=MyDb;User id=sa;Password=...")
+    .Configure(c => ConfigureMigrationArgs(c.Args))
+    .RunAsync(args);
+
+public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
+{
+    args.AddAssembly<SqlStatement>().AddAssembly<Program>();   // SqlStatement = CoreEx EF code-gen templates; Program = this project's embedded Migrations/Schema/Data. Both REQUIRED — do not remove (see below).
+    args.DataResetFilterPredicate = ts => ts.Schema == "{domain-schema}";   // Only reset data for this domain's schema.
+    return args;
+}
+```
+
+**Both `AddAssembly` calls are required — never drop `AddAssembly<Program>()`.** `AddAssembly<SqlStatement>()` brings in the CoreEx EF code-generation templates used by the `CodeGen` command; `AddAssembly<Program>()` registers **this** Database project's assembly, which carries the embedded `Migrations/`, `Schema/`, and `Data/` resources. It is tempting to omit `AddAssembly<Program>()` because `Create<Program>(...)` registers that assembly automatically — but that only applies when migration runs via **`Main`** (the console path). The **API integration tests call `ConfigureMigrationArgs` directly** (e.g. `MigrateXxxDataAsync<TestData>(…, DbMigration.ConfigureMigrationArgs)`) **without** the `Create<Program>` console setup, so the embedded migrations/data are found **only** because `AddAssembly<Program>()` is inside `ConfigureMigrationArgs`. Removing it leaves the tests unable to locate any migration scripts or seed data. All sample domains (SQL Server and PostgreSQL) include both calls.
+
+**Optional additions** (only when the domain needs them — not in the baseline):
+- `.DataParserArgs.RefDataColumnDefault("<Column>", _ => <value>)` — default a **domain-specific** ref-data seed column when the YAML omits it (e.g. `Scale` for a `UnitOfMeasure`). Add one per such column; omit entirely if not needed. (Do **not** do this for `SortOrder` — it is auto-assigned, see below.)
+- `.IncludeExtendedSchemaScripts()` — enable the extended `SqlStatement`-based schema scripting when the domain uses it.
+
+### DbEx commands
+
+Run with `dotnet run -- <command>`. Default (no arguments) runs `All`.
+
+| Command | Description |
+|---|---|
+| `Create` | Creates the database if it does not exist |
+| `Migrate` | Applies outstanding ordered migration scripts; tracks applied scripts — only new ones run |
+| `CodeGen` | Generates Infrastructure `.g.cs` persistence models and `DbContext` partial from `dbex.yaml` |
+| `Schema` | Drops and re-creates idempotent schema objects from `Schema/` on every run (stored procs, functions) |
+| `Data` | Applies YAML/JSON seed data with INSERT or MERGE semantics |
+| `Reset` | Deletes all data from the database (scoped by `DataResetFilterPredicate`) |
+| `Script` | Scaffolds a new migration script, correctly named `yyyyMMdd-HHmmss-<kebab-name>` (current UTC date+time, lower-cased). Subcommands: `schema`, `create`, `alter`, `refdata`, `outbox`. Prefer this over hand-creating script files |
+| `Drop` | Drops the database |
+| `Inspect` | Read-only; reports existence and current column schema (type, nullability, default, PK, identity, computed, unique, and whether it is reference data) for one or more tables in a schema, as markdown. Safe to run freely |
+
+Composite commands for common scenarios:
+
+| Composite | Runs |
+|---|---|
+| `All` | `Create` → `Migrate` → `CodeGen` → `Schema` → `Data` |
+| `Database` | `Create` → `Migrate` → `Schema` → `Data` (database-only; no `CodeGen`) — the standard non-destructive bring-up to make the live database reflect all authored scripts |
+| `Deploy` | `Migrate` → `Schema` |
+| `DeployWithData` | `Migrate` → `Schema` → `Data` |
+| `CreateMigrateAndCodeGen` | `Create` → `Migrate` → `CodeGen` |
+| `ResetAndAll` | `Reset` → `All` |
+
+### Provisioning the Transactional Outbox
+
+The outbox table(s) are created via a DbEx-generated migration script — never hand-authored. This applies only to domains that have a `*.Database` project (i.e. a `data-provider` other than `None`).
+
+When a solution is scaffolded with outbox enabled, the `coreex` template **already ships the outbox create migration script** (`*-create-<schema>-outbox-tables.{sql,pgsql}`) under `Migrations/`. In that case nothing needs scaffolding — the script just needs to be applied via `Migrate`. Only scaffold a new create script when one does **not** already exist (e.g. outbox was enabled after the solution was generated).
+
+> **Migration scripts are immutable once applied.** A create script runs exactly once and is never re-run, regenerated, or edited. If the outbox schema later needs to change (e.g. a DbEx version bump alters its shape), author a **new** timestamped `ALTER` migration script for the delta — do not modify or re-scaffold the original create script.
+
+> **Agent instruction:** When asked to create the database outbox table(s):
+> 1. **Validate `dbex.yaml` first.** All three conditions must hold:
+>    - Root-level `outbox: true` is set.
+>    - Root-level `schema:` has a value (call it `xxx`).
+>    - Root-level `outboxName:` has a value (call it `yyy`).
+>    If any condition fails, **stop and error** — state which is missing. Do not attempt to scaffold the script.
+> 2. **Check for an existing create script.** Look under `Migrations/` for a `*-create-*-outbox-tables.{sql,pgsql}` script (the template ships one when outbox is enabled). If present, **do not scaffold another** — skip to step 4 to apply it. Only when none exists, proceed to step 3.
+> 3. **Scaffold the migration script** using the extracted `schema` (`xxx`) and `outboxName` (`yyy`) values:
+>    ```
+>    dotnet run -- script outbox xxx yyy
+>    ```
+> 4. **Ask** whether the (new or existing) script should be deployed/migrated to the database.
+> 5. **If confirmed**, run:
+>    ```
+>    dotnet run -- CreateMigrateAndCodeGen
+>    ```
+>    Summarise the output on success; on failure relay the **complete output verbatim** — it provides the diagnostic needed to resolve the issue.
+> 6. **If declined**, remind the user to run `dotnet run -- CreateMigrateAndCodeGen` before the outbox table(s) exist in the database.
+
+### `dbex.yaml` structure
+
+Schema, table, and column names follow the casing convention of the target database:
+- **PostgreSQL** — `snake_case` throughout
+- **SQL Server** — `PascalCase` throughout
+
+```yaml
+# PostgreSQL example
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/DbEx/refs/heads/main/schema/dbex.json
+schema: products        # snake_case schema name
+outbox: true            # generate full transactional outbox infrastructure
+outboxName: outbox      # prefix for outbox tables and functions
+tables:
+# Reference-data tables
+- name: brand
+- name: category
+- name: unit_of_measure
+# Transactional tables
+- name: product
+- name: inventory
+```
+
+```yaml
+# SQL Server example
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/DbEx/refs/heads/main/schema/dbex.json
+schema: Products        # PascalCase schema name
+outbox: true
+outboxName: Outbox      # prefix for outbox tables and stored procedures
+tables:
+# Reference-data tables
+- name: Brand
+- name: Category
+- name: UnitOfMeasure
+# Transactional tables
+- name: Product
+- name: Inventory
+```
+
+Add the `$schema` annotation to each file for IDE YAML validation and auto-complete.
+
+**Keep table entries minimal — write `- name: Xxx` and nothing else.** A table entry needs only its `name`; everything else is by-convention. Use the simple `- name: Xxx` form (not the inline-object `- { name: Xxx, ... }` form) and do **not** add properties speculatively:
+- **`efModel`** is a **choice string** — `Yes` (default), `No`, `ModelOnly`, or `ModelBuilderOnly` — **not** a boolean. **Omit it entirely** — the default is already `Yes` (generate the EF model), so `efModel: Yes` is redundant noise. Never write `efModel: true`, and don't add `efModel: Yes`.
+- **The `IsDeleted` logical-delete column is recognised by convention** (the table-level `columnNameIsDeleted`, default `IsDeleted`). Do **not** declare it under `columns:` — and there is no per-column `isDeleted` flag (a column entry only supports `name`, `property`, `type`, `valueConverter`, `default`). DbEx detects the `IsDeleted` column from the live schema automatically. Only set the table-level `columnNameIsDeleted: "X"` if the column is non-standardly named.
+- **`schema:`** on a table is a valid **override**, but only use it when the table genuinely lives in a **different, existing** schema. Do not invent a separate schema (e.g. `Ref`) for reference data — by default every table (reference and transactional) lives in the domain's root `schema:`, consistent with the migration scripts and the seed `Data/ref-data.seed.yaml`.
+
+So a typical Gender + Employee domain is simply:
+
+```yaml
+tables:
+# Reference-data
+- name: Gender
+# Transactional-data
+- name: Employee
+```
+
+(Add `columns:`, `efModel`, `efModelName`, `includeColumns`/`excludeColumns`, or `columnName*` overrides only when a specific need arises.)
+
+### `CodeGen` phase — generated Infrastructure C#
+
+The `CodeGen` command generates `.g.cs` files into the Infrastructure project:
+
+| Generated artefact | Location | Description |
+|---|---|---|
+| `<Entity>.g.cs` | `Infrastructure/Persistence/` | Schema-aligned persistence model extending `ModelBase<TId>` (or `ReferenceDataModelBase<TId>` for reference data), both from `CoreEx.Data.Models`; the base supplies `Id`, `CreatedBy`/`CreatedOn`/`UpdatedBy`/`UpdatedOn`, and `ETag` (the DB `RowVersion` column is mapped onto `ETag`), with optional marker interfaces (`ILogicallyDeleted`) |
+| `*DbContext.g.cs` | `Infrastructure/Repositories/` | Partial `DbContext` class exposing `AddGeneratedModels(ModelBuilder)` to register all persistence models with EF Core |
+
+These files are the only `.g.cs` outputs of `*.Database`; all other generated C# comes from `*.CodeGen`. Never edit them directly.
+
+> **⚠️ `AddGeneratedModels` is a partial method — the hand-written `*DbContext.cs` *declares* it, the generated `*DbContext.g.cs` *implements* it.** The generated `*DbContext.g.cs` supplies the **`partial void AddGeneratedModels(ModelBuilder)`** *implementation*. The hand-written `*DbContext.cs` (a `partial class`) must **both**: (a) declare the matching `partial void AddGeneratedModels(ModelBuilder modelBuilder);`, and (b) call `AddGeneratedModels(modelBuilder)` from `OnModelCreating`. Because it is a **partial method**, before CodeGen has emitted the `.g.cs` the declaration has no implementation and the compiler **elides the call** — so the scaffold **compiles as-is with no CodeGen required** (the models simply aren't registered until CodeGen runs, which is correct). Do **not** make it a non-`partial`/`public void` method and do **not** drop the declaration — both would break the elide-until-generated behaviour (a non-partial pair would be **CS0111**; a missing declaration is **CS0103** before CodeGen).
+
+### Inspecting current database state
+
+The `Inspect` command queries the **live database** and reports, per table, whether it exists and — when it does — its current column schema as markdown. It is read-only and has no side effects, so run it freely without confirmation.
+
+> **Bring the database up to date first.** `Inspect` only reflects what is actually in the database, so before inspecting (especially before any create/alter decision) run `dotnet run -- database` to ensure the database exists and all authored migrations/schema/data are applied. `Database` is non-destructive (`Create` → `Migrate` → `Schema` → `Data`; no `Drop`/`Reset`), so run it as the standard precursor, then inspect:
+>
+> ```
+> dotnet run -- database        # create-if-missing + apply migrations/schema/data
+> dotnet run -- inspect <schema> <table> [<table> ...]
+> ```
+
+```
+dotnet run -- inspect <schema> <table> [<table> ...]
+```
+
+The schema is the **first** argument; every argument after it is a table name within that schema. Example:
+
+```
+dotnet run -- inspect public contact gender
+```
+
+The output is the authoritative source of truth for what the database currently contains. **Do not infer table existence or configuration from the file system** — the presence of a script under `Migrations/` or an entry under `tables:` in `dbex.yaml` only means it was *authored*, not that it has been *applied* to the target database. Migration scripts may or may not have been run. Only `Inspect` reflects reality.
+
+Reading the output:
+- Branch on the `## SCHEMA.TABLE - Exists: Yes|No` header first. `No` means the table is absent and must be created.
+- Use the **Qualified Name** bullet (e.g. `"public"."contact"` or `[Test].[Contact]`) for DDL casing and quoting — not the uppercased header text.
+- Honour the **Reference Data: Yes|No** flag for routing decisions (a reference data table is maintained via `ref-data.yaml` + CodeGen, not by hand).
+- PostgreSQL reports canonical type names (`CHARACTER VARYING(50)`, `TIMESTAMP WITH TIME ZONE`); treat these as equivalent to the `VARCHAR(50)` / `TIMESTAMPTZ` forms you would author in a script.
+- Per the disclaimer in the output, the live database remains the ultimate truth; the report is derived from system catalogs and may not capture every nuance.
+
+### `Migrate` — schema evolution
+
+Migration scripts are embedded resources under `Migrations/`.
+
+**Scaffold new scripts with the DbEx `Script` command — do not hand-create the file.** It generates a correctly named, correctly cased, correctly templated script every time:
+
+```
+dotnet run -- script schema <schema>            # new schema (rarely needed — see below)
+dotnet run -- script create <schema> <table>    # new table
+dotnet run -- script alter  <schema> <table>    # alter an existing table
+dotnet run -- script refdata <schema> <table>   # new reference-data table
+dotnet run -- script outbox <schema> <name>     # transactional outbox table(s)
+```
+
+**Naming convention** (what `Script` produces, and what any hand-named file must match): `yyyyMMdd-HHmmss-<kebab-description>.{sql|pgsql}`.
+- The leading segment is the **current UTC date *and* time** (`yyyyMMdd-HHmmss`) at the moment of creation — **not** a placeholder date (e.g. `20250101`) and **not** a per-day incrementing index (e.g. `000001`). The time component provides natural ordering and uniqueness without tracking indices.
+- The entire filename is **kebab-lower-case** — all lowercase, words separated by hyphens (e.g. `20260603-142530-create-bar-employee.sql`, never `...-create-Bar-Employee.sql`).
+
+> **Do not author a schema-create script.** The `coreex` template already ships the default schema-create migration, so the schema exists from the first `Migrate`. Never emit a `create-<schema>-schema` script unless the user **explicitly** asks for an additional schema.
+
+Scripts are **immutable once applied**. Subsequent changes require new scripts (e.g. `ALTER TABLE`). Use moustache-style `{{Parameter}}` for environment-specific values resolved from `MigrationArgs.Parameters`.
+
+> **Never modify the database — or DbEx's journal — directly to unblock a migration.** DbEx tracks applied scripts in an internal **journal** table that it owns exclusively; do **not** insert/pre-seed/back-fill journal rows, and do **not** hand-run `CREATE`/`ALTER`/`DROP`/`INSERT` to reconcile state. If `migrate`/`database` fails because the live database is out of step with the scripts (e.g. "the journal is empty but the objects already exist", or scripts re-running over existing objects), **stop and ask the user** — reconciling environment state is their decision. The usual clean fix for a disposable local/dev database is to drop and rebuild via `dotnet run -- dropanddatabase` (destructive — confirm first); production/shared environments are reconciled by the user. Never edit the database or journal yourself.
+
+SQL conventions:
+- Wrap each script in `BEGIN TRANSACTION ... COMMIT TRANSACTION` (SQL Server) or equivalent.
+- Use explicit schema-qualified names.
+- Include the `IChangeLog` audit columns on aggregate tables, named **exactly** `CreatedBy`, `CreatedOn`, `UpdatedBy`, `UpdatedOn` (SQL Server) / `created_by`, `created_on`, `updated_by`, `updated_on` (PostgreSQL). The date/time columns use the `On` suffix — **never** `CreatedDate`/`UpdatedDate` or `created_date`/`updated_date`. Type them `DATETIMEOFFSET` (SQL Server) / `TIMESTAMPTZ` (PostgreSQL) and the `*By` columns as the contract's user type (typically `NVARCHAR(n)` / `VARCHAR(n)`).
+- **SQL Server**: add a `ROWVERSION` / `TIMESTAMP` column for optimistic-concurrency mapped to `ETag`.
+- **PostgreSQL**: use the built-in hidden `xmin` system column for optimistic-concurrency — no explicit column is required in the schema.
+- Logical (soft) delete on root/aggregate tables is an infrastructure-only column — `[IsDeleted] BIT NOT NULL DEFAULT (0)` (SQL Server) / `is_deleted BOOLEAN NOT NULL DEFAULT FALSE` (PostgreSQL) — with **no** corresponding contract/entity property; default to including it (confirm) when creating such a table. It must be **NOT NULL** and **default to the DB's `false`** (`0` / `FALSE`), never nullable.
+
+### Standard table templates
+
+**Mirror these canonical shapes** when authoring create scripts — copy and adapt rather than inventing column names. They encode the standard names, types, and lengths. Note the audit columns use the `On` suffix (`CreatedOn`/`UpdatedOn`) — **never** `CreatedDate`/`UpdatedDate`.
+
+**Reference-data table** — the standard `IReferenceData` columns. The primary key is the contract's identifier type (`NVARCHAR(50)` / `VARCHAR(50)` for the default `string`):
+
+```sql
+-- SQL Server
+CREATE TABLE [Schema].[Xxx] (
+  [XxxId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [Code] NVARCHAR(50) NOT NULL UNIQUE,
+  [Text] NVARCHAR(250) NULL,
+  [IsActive] BIT NULL,
+  [SortOrder] INT NULL,
+  [RowVersion] TIMESTAMP NOT NULL,        -- ETag (optimistic concurrency)
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+```
+
+```sql
+-- PostgreSQL (no RowVersion column — the hidden xmin provides concurrency)
+CREATE TABLE "schema"."xxx" (
+  "xxx_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+```
+
+**Aggregate / transactional table** — domain columns first, then the identical audit + concurrency columns. Reference-data relationships are stored by `Code` by default (e.g. `[StatusCode] NVARCHAR(50) NOT NULL`) with no foreign key — see [Creating or altering a table for an entity](#creating-or-altering-a-table-for-an-entity):
+
+```sql
+-- SQL Server
+CREATE TABLE [Schema].[Order] (
+  [OrderId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [CustomerId] NVARCHAR(100) NOT NULL,
+  [StatusCode] NVARCHAR(50) NOT NULL,     -- references [OrderStatus].[Code]; no FK by convention
+  [IsDeleted] BIT NOT NULL DEFAULT (0),   -- logical delete (default yes — confirm); NOT NULL, defaults false; no contract property
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL,
+  [RowVersion] TIMESTAMP NOT NULL
+);
+```
+
+### Mapping contract types to columns
+
+When authoring a migration script for an entity that has a corresponding .NET contract, the column types must mirror the contract's property types. Do not substitute a different type (most importantly for the primary key) unless the user explicitly asks. Before authoring, establish whether the table already exists and its current shape — see [Inspecting current database state](#inspecting-current-database-state) and the [Creating or altering a table for an entity](#creating-or-altering-a-table-for-an-entity) workflow.
+
+| Contract (.NET) type | SQL Server | PostgreSQL |
+|---|---|---|
+| `string` / `string?` | `NVARCHAR(n)` | `VARCHAR(n)` / `TEXT` |
+| `Guid` | `UNIQUEIDENTIFIER` | `UUID` |
+| `int` | `INT` | `INTEGER` |
+| `long` | `BIGINT` | `BIGINT` |
+| `short` | `SMALLINT` | `SMALLINT` |
+| `decimal` | `DECIMAL(p,s)` | `DECIMAL(p,s)` |
+| `double` | `FLOAT` | `DOUBLE PRECISION` |
+| `bool` | `BIT` | `BOOLEAN` |
+| `DateTime` | `DATETIME2` | `TIMESTAMP` |
+| `DateTimeOffset` | `DATETIMEOFFSET` | `TIMESTAMPTZ` |
+
+> **Agent instruction:** When generating a migration script for an entity that has a .NET contract:
+> 1. **The `script` scaffold's PK is a placeholder — replace it.** `dotnet run -- script create|refdata` seeds the primary key with a generated-key placeholder: `[{Name}Id] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY` (SQL Server) or `"{name}_id" SERIAL PRIMARY KEY` (PostgreSQL). **Neither is the default to keep** — overwrite it to match the contract's identifier type.
+> 2. **Map the primary key column to the contract's identifier type.** The identifier is `string` **by default** → `[{Name}Id] NVARCHAR(50) NOT NULL PRIMARY KEY` (SQL Server) / `"{name}_id" VARCHAR(50) NOT NULL PRIMARY KEY` (PostgreSQL). Use `UNIQUEIDENTIFIER`/`UUID` **only** when the contract identifier is explicitly a `Guid`; `INT`/`INTEGER` for `int`; etc. Never leave the scaffold's `UNIQUEIDENTIFIER` (SQL Server) or `SERIAL` (PostgreSQL) for a `string` identifier.
+> 3. **Drop the scaffold's value-generation default.** Remove `DEFAULT (NEWSEQUENTIALID())` (SQL Server) and **replace `SERIAL` with the plain column type** (PostgreSQL — `SERIAL` is an auto-increment sequence, i.e. a DB-assigned value); never add `IDENTITY` / `gen_random_uuid()` either — unless explicitly requested. The application services layer assigns identifier and other values; the database should not default them.
+> 4. **Map every other column to its contract property type** per the table above, preserving nullability (`?` → nullable column). For a `[ReferenceData<T>]` property, the contract property is `{Name}Code` (a string) — so the column is `{Name}Code` (e.g. `[GenderCode] NVARCHAR(50) NULL`), **not** `{Name}Id`, and **no foreign key** (see step 4 of the create/alter workflow). Mirror the contract property name exactly.
+> 5. **Lock the agreed identifier type — never deviate, especially in fixing loops.** Once the type is agreed (the `string` default, or whatever the user explicitly specified), it is fixed for the whole task. Do **not** silently change it, and do **not** revert to the scaffold's `UNIQUEIDENTIFIER` (or flip it again) while troubleshooting a build/migration failure — a failure is never resolved by changing the PK type. If you believe the agreed type is wrong, **stop and ask** rather than changing it.
+> 6. **If in doubt about a type, nullability, or precision/length, ask** rather than guessing.
+
+### Creating or altering a table for an entity
+
+When asked to create or change a database table for a .NET entity (e.g. *"create a table for the Employee entity"*), do **not** blindly scaffold a `CREATE TABLE` script. The table — or a related reference data table — may already exist with a different shape. Use `Inspect` to establish the current state first.
+
+> **Inspect first — this is a hard gate.** Inspection is the **first action**, ahead of authoring anything. Do **not** write (or plan to write) a `CREATE`/`ALTER` script before the `Inspect` result is in hand — the result determines *whether* a script is even needed and *which kind*. A plan that scaffolds scripts before inspecting is wrong; fix the plan, don't proceed.
+
+> **Agent instruction:**
+> 1. **Identify every table involved.** This includes the entity's own table plus any reference data tables implied by its `[ReferenceData<T>]` properties (each typed reference-data property maps to a lookup table that may need to exist).
+> 2. **Bring the database up to date, then inspect — before authoring any script.** First run `dotnet run -- database` (non-destructive: `Create` → `Migrate` → `Schema` → `Data`) so the live database reflects all authored scripts, then run `dotnet run -- inspect <schema> <table> [<table> ...]` (read-only). Only proceed to authoring once you know each table's actual state.
+> 3. **Branch per table on the `Inspect` result:**
+>    - **Not found** → scaffold the script with `dotnet run -- script create <schema> <table>` (or `script refdata <schema> <table>` for a reference-data table) so it is correctly named/timestamped/cased, fill in the columns, and register the table under `tables:` in `dbex.yaml`. Map column types per [Mapping contract types to columns](#mapping-contract-types-to-columns). **Do not create a schema-create script** — the schema already exists (template-provided).
+>    - **Found, Reference Data: Yes** → do **not** recreate or alter it directly. Reference it from the entity table per step 4 below. Any change to the reference data table's own shape flows through `ref-data.yaml` + CodeGen, not a hand-authored script.
+>    - **Found, schema differs from the contract** → scaffold with `dotnet run -- script alter <schema> <table>` and include the **delta only** (applied scripts are immutable — never edit the original create script).
+>    - **Found, schema already matches** → no script is needed; say so.
+> 4. **Reference-data relationships are stored by `Code`, with no foreign key — this is the default; do not deviate silently.** For each `[ReferenceData<T>]` property on the entity (the contract has a `{Name}Code` string property, e.g. `GenderCode`):
+>    - **Default — by Code:** create a column that **mirrors the contract property** — same name `{Name}Code` (e.g. `[GenderCode] NVARCHAR(50) NULL` / `gender_code`), typed to match the reference data's `Code` column. **Do not create a foreign key.** Do **not** invent a `{Name}Id` column.
+>    - **Only if the user explicitly asks for an Id reference** → name it `{Name}Id`, typed to match the reference data identifier; and even then a foreign key is **not** automatic — ask whether one is required and add it only if confirmed.
+>
+>    **Never** default to `{Name}Id` + a `REFERENCES` foreign key — that contradicts both the contract (whose property is `{Name}Code`) and the CoreEx convention (reference data is resolved by code, not FK-joined).
+> 5. **Confirm logical-delete support** (for root/aggregate tables). Ask whether the table should support logical (soft) deletes — **default yes**. If yes, add an infrastructure-only column: `[IsDeleted] BIT NOT NULL DEFAULT (0)` (SQL Server) / `is_deleted BOOLEAN NOT NULL DEFAULT FALSE` (PostgreSQL) — it must be **NOT NULL** and default to the DB's `false` (`0` / `FALSE`), **never nullable**. This is a persistence concern only — the .NET contract/entity must **not** declare an equivalent property.
+> 6. **Offer to apply.** Offer to run `dotnet run -- CreateMigrateAndCodeGen`. Summarise the output on success; on failure relay the **complete output verbatim**.
+>
+> **On failure, do not add defensive existence-guards.** Migration scripts are plain DDL — DbEx tracks which have been applied and runs each exactly once, so a `CREATE TABLE` does **not** need `IF NOT EXISTS` / `IF OBJECT_ID(...) IS NULL` wrappers. If a script fails because an object already exists (or differs), that means the `Inspect` step was skipped or stale: **re-inspect** to learn the real state, then either remove the redundant create script (object already correct), or author a separate `ALTER` migration for the delta. Wrapping the DDL in conditional guards to make it "pass" masks the underlying state mismatch and is not the convention — never do it.
+
+### `Schema` — idempotent objects
+
+Objects under `Schema/` are dropped and re-created on every `Schema` run, making them safely idempotent. When `outbox: true` is set in `dbex.yaml`, DbEx generates the full outbox schema objects here:
+
+| SQL Server | PostgreSQL |
+|---|---|
+| `Schema/Stored Procedures/spOutboxEnqueue.g.sql` | `Schema/Functions/fn_outbox_enqueue.g.pgsql` |
+| `spOutboxLeaseAcquire.g.sql` | `fn_outbox_lease_acquire.g.pgsql` |
+| `spOutboxLeaseRelease.g.sql` | `fn_outbox_lease_release.g.pgsql` |
+| `spOutboxBatchClaim.g.sql` | `fn_outbox_batch_claim.g.pgsql` |
+| `spOutboxBatchComplete.g.sql` | `fn_outbox_batch_complete.g.pgsql` |
+| `spOutboxBatchCancel.g.sql` | `fn_outbox_batch_cancel.g.pgsql` |
+
+These `.g.sql` / `.g.pgsql` files are generated by DbEx — never edit them directly.
+
+### `Data` — seeding
+
+> 🚫 **NEVER include the identifier (`{Name}Id`, e.g. `GenderId`) in a seed row.** The `$^` prefix **auto-generates** the id — providing it is a bug (it conflicts with the generated key). A row carries **only** the business columns (`Code`, `Text`, and any extra/`scale` columns). This is the single most common seeding mistake — it applies in **both** the shorthand and the inline-object form:
+> ```yaml
+> - M: Male                                   # ✅ shorthand (preferred)
+> - { code: HR, text: Hour, scale: 2 }        # ✅ inline object (extra columns) — still no id
+> - { GenderId: M, Code: M, Text: Male, ... } # 🚫 NEVER — has the GenderId identifier
+> ```
+
+> ⚠️ **This is `*.Database/Data/ref-data.seed.yaml` — the seed-data file** (the `.seed.` distinguishes it), *not* the `*.CodeGen/ref-data.yaml` entity-definition file (see [`ref-data.yaml` structure](#ref-datayaml-structure)). It uses the seed format below (`Schema:` → `- $^Table:` → rows) — **never** the `entities:` definition format.
+
+Seed data in `Data/ref-data.seed.yaml` is **cross-environment** — it is applied in every environment including production. It should therefore contain only shared **reference data** (lookup tables, code lists) that must exist everywhere. Do not seed master or transactional data here unless it is genuinely required in all environments; test-specific data belongs in the test project's own `data.yaml`, applied only during test setup.
+
+**Structure** — there is exactly one valid shape, three levels deep:
+
+```
+<Schema>:              # root mapping key = schema name (no prefix, no dots)
+  - $^<Table>:         # YAML LIST ITEM (note the leading "- ") = table, with a $ / $^ prefix
+    - <row>            # rows
+```
+
+- The **schema** is the root mapping key — **never** a dotted `Schema.Table:` key (e.g. `Bar.Gender:` is **wrong**), and **never** prefixed.
+- Each **table** is a YAML **list item** — it **must** begin with `- ` (e.g. `- $^Gender:`). A bare mapping key without the dash (`$^Gender:`) is **wrong** — that makes it an object property, not a list entry, and DbEx will not process it. Also never mash schema and table (`- $Bar.$^Gender:` is wrong).
+- The **prefix is required** on reference-data table entries. **Reference data always uses `$^`** (merge + auto-generate the identifier) — this is the default **regardless of the identifier's type**. `^` auto-generates the id for *any* id type, not just `Guid` (DbEx handles, and can be extended per type) — so a `string`/`NVARCHAR(50)` PK still uses `$^`. Use a different prefix **only when explicitly asked**: plain `$` (merge, no auto-id) when ids are supplied/assigned externally. An **unprefixed** entry is a plain INSERT — not re-runnable; never use it for reference data.
+
+DbEx infers column types from the live schema.
+
+**Names follow the provider's casing** (same as the schema and migration scripts):
+- **SQL Server** — PascalCase: schema `Bar`, table `Gender`, columns `Code`, `Text`, `IsActive`, `SortOrder`.
+- **PostgreSQL** — snake_case: schema `bar`, table `gender`, columns `code`, `text`, `is_active`, `sort_order`.
+
+Prefixes control merge behaviour and identifier generation (on the table entry):
+
+| Prefix | Meaning |
+|---|---|
+| `$` | MERGE (upsert) — safe to re-run |
+| `^` | Auto-generate the primary-key identifier (**any** id type — not GUID-only) |
+| `$^` | Both — merge + auto-generated id; **the default for reference data**, whatever the id type |
+
+Prefer the `Code: Text` **shorthand** (it sets `Code` and `Text`); use an inline object only for extra columns. **Never set the identifier column** (`{Name}Id`, e.g. `GenderId`) — `$^` auto-generates it, so supplying it is wrong unless you were **explicitly** asked to provide ids. Likewise omit `IsActive` (defaults active) and `SortOrder` (auto-assigned by row order — see below). The ideal row is just `M: Male`.
+
+```yaml
+# SQL Server (PascalCase) — schema "Bar", reference table "Gender"
+Bar:
+  - $^Gender:           # merge + auto-generated id (the ref-data default, any id type)
+    - F: Female
+    - M: Male
+    - X: Other
+```
+
+```yaml
+# PostgreSQL (snake_case) — schema "products"
+products:
+  - $^brand:            # merge + auto-generated id (the ref-data default, any id type)
+    - CANYON: Canyon Bicycles
+    - YETI: Yeti Cycles
+  - $^unit_of_measure:
+    - EA: Each
+    - { code: HR, text: Hour, scale: 2 }   # inline object for additional columns
+  - $^sub_category:
+    - { code: XC, text: Cross country, category_code: B }  # FK column by code; DbEx resolves id at runtime
+```
+
+**`SortOrder` is auto-assigned from row order.** When a ref-data row does not specify `SortOrder`, DbEx assigns it based on the row's position in the YAML. So **order the rows the way they should sort** — normally **by `Code`** — otherwise the resulting `SortOrder` (and thus default display order) will look arbitrary. Only specify an explicit `SortOrder` value when it must differ from positional order.
+
+## Do Not
+
+- Do not edit `*.g.cs`, `*.g.sql`, or `*.g.pgsql` files directly — they are owned by `*.CodeGen` or `*.Database` tooling.
+- Do not use SQL Server packages (`DbEx.SqlServer`) in PostgreSQL domains or vice versa.
+- Do not alter applied migration scripts — subsequent schema changes require new scripts.
+- Do not hand-author the outbox stored procedures or functions — set `outbox: true` in `dbex.yaml` and let DbEx generate them.
+- Do not write persistence models or `DbContext` partials by hand — run `dotnet run -- CodeGen` (or `dotnet run -- All`) to regenerate.
+- Do not hand-create or hand-name migration script files — scaffold via `dotnet run -- script <type> ...`; names must be `yyyyMMdd-HHmmss-<kebab-name>` using the current date+time (never a placeholder date or a per-day index) and be fully kebab-lower-case.
+- Do not author a schema-create script — the template already provides the default schema; only create one if the user explicitly asks for an additional schema.
+- Do not modify the database directly to unblock anything — no ad-hoc `CREATE`/`ALTER`/`DROP`/`INSERT`/`UPDATE`/`DELETE`, and never touch DbEx's journal/tracking table (no pre-seeding rows). Structural change = migration script; data = `Data/*.yaml`. If state is inconsistent, stop and ask the user.
+- Do not leave ref-data seed rows unordered, and do not default `SortOrder` via `RefDataColumnDefault` — order the YAML rows by `Code` so DbEx's positional `SortOrder` assignment is sensible.
+- Do not use a dotted `Schema.Table:` seed key (e.g. `Bar.Gender:`) or mash schema and table into one prefixed key (`- $Schema.$^Table:`) — the schema is the **root mapping key**, and the prefixed table is a **list entry** beneath it (`Schema:` → `- $^Table:` → rows).
+- Do not omit the leading `- ` on a table entry — it is a YAML **list item** (`- $^Gender:`), not a bare mapping key (`$^Gender:`); without the dash DbEx will not process it.
+- **Do not put the identifier (`{Name}Id`, e.g. `GenderId`) in a seed row — ever, under `$^`.** The `$^` prefix auto-generates the id; a row has only `Code`/`Text`/extra columns. (An id is supplied only in the rare explicit case of plain `$` with externally-assigned keys — not the reference-data default.)
+- Do not write an **unprefixed** ref-data table entry — it is a plain INSERT (not re-runnable). Default reference data to **`$^`** (merge + auto-generate the id, **any** id type — `^` is not GUID-only); use plain `$` only when explicitly asked (ids supplied externally). Do not downgrade `$^` to `$` just because the PK is a `string`/`NVARCHAR(50)`.
+- Do not work out of order — follow the [database-first order of operations](#order-of-operations-database-first) (inspect → author migrations → seed + `dbex.yaml` → `All` → CoreEx CodeGen → .NET code). Add seed rows and `dbex.yaml` tables only **after** their create migrations exist, and apply them together via `All` (Migrate creates the tables before Data seeds / CodeGen introspects). Never run a bring-up that would seed, or CodeGen, against tables whose create migration does not yet exist.
+- Do not continue past a failed `dotnet run -- database` bring-up — stop and surface the error; a broken baseline invalidates everything downstream, and pressing on causes churn-y, misdirected fixes.
+- Do not keep the `script` scaffold's generated-key PK — `[{Name}Id] UNIQUEIDENTIFIER ... DEFAULT (NEWSEQUENTIALID())` (SQL Server) or `"{name}_id" SERIAL` (PostgreSQL) — replace it with the agreed identifier type's column (`string` default → `NVARCHAR(50)`/`VARCHAR(50)`), dropping the value-generation default **unless the user explicitly asks to keep/include it**.
+- Do not change the agreed identifier type to make a failure go away — it is locked for the task; never revert to `UNIQUEIDENTIFIER` (or flip the type) in a fixing loop. If you think it is wrong, stop and ask.
+- Do not default a reference-data relationship to a `{Name}Id` column or a `REFERENCES` foreign key — mirror the contract's `{Name}Code` string property (e.g. `[GenderCode] NVARCHAR(50) NULL`, **no FK**). Use `{Name}Id`/FK only when the user explicitly asks.
+- Do not make the logical-delete column nullable or default-less — it is `[IsDeleted] BIT NOT NULL DEFAULT (0)` (SQL Server) / `is_deleted BOOLEAN NOT NULL DEFAULT FALSE` (PostgreSQL): **NOT NULL**, defaulting to the DB's `false`.
+- Do not add `efModel` to a `dbex.yaml` table entry when it would be the default — write the bare `- name: Xxx` (not `- { name: Xxx, efModel: Yes }`). `efModel: Yes` is redundant (it's the default); `efModel: true` is invalid (it's a `Yes`/`No`/`ModelOnly`/`ModelBuilderOnly` choice). Only set `efModel` for a non-default (`No`/`ModelOnly`/`ModelBuilderOnly`).
+- Do not declare the `IsDeleted` column under a table's `columns:` (and there is no `isDeleted` column flag) — it is recognised by convention from the live schema; keep table entries to `- name: Xxx` unless an override is genuinely needed.
+- Do not add a per-table `schema:` override for reference data (e.g. a `Ref` schema) — reference and transactional tables both live in the domain's root `schema:` unless a different schema actually exists.
+- Do not use the wrong casing in seed data — match the provider (SQL Server PascalCase `Code`/`Text`/`IsActive`/`SortOrder`; PostgreSQL snake_case `code`/`text`/`is_active`/`sort_order`), and do not hand-write `id`/`IsActive`/`SortOrder` rows — prefer the `Code: Text` shorthand.
+
+## Further Reading
+
+- [Tooling Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/tooling.md) — full `*.CodeGen` and `*.Database` walkthrough with command reference.
+- [CodeGen Schema Docs](https://github.com/Avanade/CoreEx/tree/main/src/CoreEx.CodeGen/docs) — `ref-data.yaml` schema: `CodeGeneration.md`, `Entity.md`, `Property.md`.
+- [DbEx on GitHub](https://github.com/Avanade/DbEx) — DbEx command reference, YAML schema, and migration script conventions.
+- [OnRamp on GitHub](https://github.com/Avanade/OnRamp) — Handlebars-based code generation engine used by `*.CodeGen`.
diff --git a/.github/instructions/coreex-validators.instructions.md b/.github/instructions/coreex-validators.instructions.md
new file mode 100644
index 00000000..d7eaea85
--- /dev/null
+++ b/.github/instructions/coreex-validators.instructions.md
@@ -0,0 +1,313 @@
+---
+applyTo: "**/*Validator*.cs"
+description: "Validator conventions: Validator<T,TSelf>, AbstractValidator, declarative rules, async OnValidateAsync, nested/dictionary validators, and Result-based invocation"
+tags: ["validators", "validation", "fluent-api", "rules", "error-handling", "application-layer"]
+---
+
+# Validator Conventions
+
+## NuGet / Project References
+
+| Package | Key types provided |
+|---|---|
+| `CoreEx.Validation` | `Validator<T, TSelf>`, `Validator<T>`, `AbstractValidator<T, TSelf>`, `AbstractValidator<T>`, `Validator.Create<T>()`, `.Mandatory()`, `.MaximumLength()`, `.IsValid()`, `.PrecisionScale()`, `.GreaterThanOrEqualTo()`, `.LessThanOrEqualTo()`, `.Equal()`, `.NotFound()`, `.WhenValue()`, `.Error()`, `.DependsOn()`, `.Entity()`, `.Dictionary()`, `.WithKeyValidator()`, `.WithValueValidator()`, `ValidationContext<T>`, `.ValidateFurtherAsync()`, `.ValidateAndThrowAsync()`, `.ValidateWithResultAsync()` |
+| `CoreEx` | `LText` — localised text label for use in `.WithKeyValidator(label, ...)`; `[Localization(...)]` attribute on contract properties |
+| `CoreEx.UnitTesting` | `.AssertErrors()` — test-only helper for asserting expected validation errors inline |
+
+## Placement
+
+Validators live in `Application/Validators/`. They belong to the Application layer and may inject Application-layer dependencies (e.g., `IProductRepository`) — they must not reference Infrastructure directly.
+
+## Unit Tests (maintain alongside the validator)
+
+Validators are the primary unit-test target, so a validator and its test are maintained together. Validator rules are proven **exhaustively here** (every rule, error + success) — the API integration tests do **not** re-enumerate them; they assert only one representative bad-request to confirm the validator is wired into the pipeline. See the test-responsibility split in `coreex-tests.instructions.md`.
+
+Author the test per `coreex-tests.instructions.md` → "Validator unit tests" and "Expected message text". Three things that cause repeated discover-by-running loops if missed:
+- **Invoke via `Test.Scoped(test => { XxxValidator.Default.AssertErrors(...); })`** — the **non-generic** `Test.Scoped` (no type parameter) + the validator's `Default` (or `new XxxValidator(deps)`). **Never** `Test.Scoped<XxxValidator>(...)` — validators are not in DI, so the generic (DI-resolving) overload fails.
+- **`AssertErrors` takes `(jsonName, message)` tuples** — camelCase JSON property path + the full message; ref-data rules key on the **navigation** name (`"gender"`, not `"genderCode"`).
+- **Expected messages are exact** — use the message table in `coreex-tests.instructions.md` (`Mandatory()` → `"{Label} is required."`, `MaximumLength` → `"… character(s) in length."`, `PrecisionScale` → `"… exceeds the maximum decimal places (n)."`, etc.) with sentence-cased labels (`FirstName` → "First name").
+- **Ignore `ExecutionContext` in tests** — `Test.Scoped(...)` sets it up for you; do not construct, inject, or mock it. Ambient `Runtime` and any `ExecutionContext`-dependent rule work automatically inside the scope.
+
+> **Agent instruction:** When you create or modify a validator, **offer to also create or update the matching `{Validator}Tests`** in the `*.Test.Unit/Validators/` project (covering the new/changed rules — both error and success cases). If the user accepts, author it per `coreex-tests.instructions.md`; if the validator uses a reference-data type the test host does not yet handle, also add the corresponding case to `EntryPoint.ReferenceDataServiceDecorator.GetAsync`. If the user declines or defers, proceed with the validator change but note that its unit-test coverage is now missing/stale.
+
+## Base Class
+
+Choose the base class based on whether a `Default` singleton and constructor injection are needed:
+
+**`Validator<TEntity, TSelf>`** — use when no constructor injection is required. The two-type-argument form exposes a static `Default` singleton automatically:
+
+```csharp
+public class ProductValidator : Validator<Contracts.Product, ProductValidator>
+{
+    public ProductValidator()
+    {
+        Property(p => p.Sku).Mandatory().MaximumLength(50);
+        Property(p => p.Text).Mandatory().MaximumLength(250);
+        Property(p => p.SubCategory).Mandatory().IsValid();
+        Property(p => p.UnitOfMeasure).Mandatory().IsValid();
+        Property(p => p.Price).PrecisionScale(null, 2).GreaterThanOrEqualTo(0, _ => "zero");
+    }
+}
+```
+
+**`Validator<TEntity>`** — use when constructor injection is required (e.g., a repository dependency). There is no `Default` singleton; register the validator in DI and inject it:
+
+```csharp
+public class MovementRequestValidator : Validator<Contracts.MovementRequest>
+{
+    private readonly IProductRepository _repository;
+
+    public MovementRequestValidator(IProductRepository repository)
+    {
+        _repository = repository.ThrowIfNull();
+        Property(x => x.Id).Mandatory().MaximumLength(50);
+        // ...
+    }
+}
+```
+
+**`AbstractValidator<TEntity, TSelf>`** — a FluentValidation-style compatibility alias for `Validator<TEntity, TSelf>`. Use when your team prefers the `RuleFor(x => ...)` / `NotEmpty()` / `GreaterThanOrEqualTo()` syntax. Validation and error handling are still performed by CoreEx:
+
+```csharp
+public class ProductValidator : AbstractValidator<Product, ProductValidator>
+{
+    public ProductValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+        RuleFor(x => x.Sku).NotEmpty();
+        RuleFor(x => x.UnitOfMeasure).NotEmpty().IsValid();
+        RuleFor(x => x.Price).GreaterThanOrEqualTo(0);
+    }
+}
+```
+
+Do **not** use the `FluentValidation` NuGet package — `AbstractValidator` here is `CoreEx.Validation.AbstractValidator`, not FluentValidation.
+
+## Invoking Validators
+
+For `Validator<T, TSelf>` (no injection), call via the static `Default` singleton:
+
+```csharp
+// Exception style — throws ValidationException on failure
+await ProductValidator.Default.ValidateAndThrowAsync(product, cancellationToken);
+
+// Result style — returns Result<T> for pipeline composition
+var result = await ProductValidator.Default.ValidateWithResultAsync(product, cancellationToken);
+```
+
+For `Validator<T>` (with injection), the instance is resolved from DI and invoked the same way:
+
+```csharp
+await _movementRequestValidator.ValidateAndThrowAsync(request, cancellationToken);
+```
+
+## Common Rules
+
+| Rule | Method |
+|---|---|
+| Required | `.Mandatory()` |
+| Max string length | `.MaximumLength(n)` |
+| Reference data validity | `.IsValid()` |
+| Decimal precision | `.PrecisionScale(precision, scale)` |
+| Greater than or equal to | `.GreaterThanOrEqualTo(value)` |
+| Less than or equal to | `.LessThanOrEqualTo(value)` |
+| Equals | `.Equal(value)` |
+| Not found (for key lookup) | `.NotFound()` |
+| Conditional rule | `.WhenValue(predicate)` |
+| Custom error text | `.Error("message")` |
+
+### Full rule and clause reference
+
+The table above lists the most common rules; the full set of fluent extension methods is below. All are part of `CoreEx.Validation` — consult the [CoreEx.Validation README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Validation/README.md) for complete detail and overloads before hand-rolling logic in `OnValidateAsync` (most needs are already covered by a rule).
+
+| Category | Rules (extension methods) |
+|---|---|
+| Presence (required) | `Mandatory()`, `NotNull()`, `NotEmpty()` |
+| Absence (must be unset) | `Null()`, `None()`, `Empty()` |
+| Strings | `MaximumLength(n)`, `MinimumLength(n)`, `Length(exact)`, `String(maxLength)`, `String(min, max, regex)`, `Matches(regex)`, `Wildcard()`, `Email()` / `Email(maxLength)` |
+| Numbers / decimals | `Numeric(allowNegatives)`, `Positive()`, `Decimal(precision, scale)`, `PrecisionScale(precision, scale)` |
+| Comparisons (value) | `Equal(v)`, `NotEqual(v)`, `LessThan(v)`, `LessThanOrEqualTo(v)`, `GreaterThan(v)`, `GreaterThanOrEqualTo(v)`, `Compare(op, v)` — each with a delegate overload for runtime values (see below) |
+| Comparisons (other) | `CompareProperty(op, x => x.Other)`, `CompareValues(values)`, `Between(min, max)`, `InclusiveBetween(min, max)`, `ExclusiveBetween(min, max)` |
+| Enums | `Enum()`, `Enum(allowed[])`, string `Enum(c => c....)` |
+| Reference data | `IsValid(allowInactive)` / `ReferenceData(allowInactive)` (typed property), `ReferenceDataCodes()` / `AreValid()` (code collection), string `ReferenceData(c => c....)` |
+| Collections | `Collection(...)`, with `WithDuplicateIdCheck()` / `WithDuplicateKeyCheck()` / `WithDuplicatePropertyCheck()` / `WithDuplicateCheck()` |
+| Dictionaries | `Dictionary(...)` (with `WithKeyValidator(...)` / `WithValueValidator(...)`) |
+| Child / shared / external | `Entity(validator)` (child entity), `Common(commonValidator)` (shared value rules), `Interop(validator)` (external/FluentValidation) |
+| Always-error (guard with a clause) | `Error(text)`, `Duplicate()`, `NotFound()`, `Invalid()`, `Immutable()` |
+| Clauses (conditional execution) | `When(...)`, `WhenValue(pred)`, `WhenHasValue()`, `WhenEntity(pred)`, `DependsOn(x => x.Other)` |
+
+> **`Mandatory()` on a non-nullable value type checks `default`, not just null.** `Mandatory()` defaults to `mustNotBeDefault: true`, so on a non-nullable value type it **errors when the value equals `default(T)`** — `0` for `decimal`/`int`, `DateOnly.MinValue` for `DateOnly`, etc. (On a **nullable** type — `decimal?`, `DateOnly?` — it errors only on `null`, since a supplied `0` is non-default.) Implications:
+> - **Do not use `Mandatory()` on a non-nullable value type where the default is a legitimate value** (e.g. a `decimal Salary` where `0` is allowed) — it will wrongly reject `0`. Use a range rule instead, e.g. `GreaterThanOrEqualTo(0)` (allows `0`) or `GreaterThan(0)` (requires positive). To require presence *without* the default-check, pass `Mandatory(mustNotBeDefault: false)`.
+> - **The expected unit-test error follows the same rule:** a `Mandatory()` on a non-nullable `decimal`/`DateOnly` produces the *required* error for `0`/`MinValue`, so a test arranging that value must expect the mandatory error (not a pass).
+
+### Comparisons
+
+Prefer the dedicated comparison rules — `.GreaterThanOrEqualTo(value)`, `.LessThanOrEqualTo(value)`, `.GreaterThan(value)`, `.LessThan(value)`, `.Equal(value)`. For the general form use the **`.Compare(...)`** extension with a `CompareOperator` value:
+
+```csharp
+// ✅ Idiomatic — dedicated rule (preferred)
+Property(x => x.Salary).GreaterThanOrEqualTo(0m, _ => "zero").PrecisionScale(18, 2);
+
+// ✅ Equivalent — general Compare extension
+Property(x => x.Salary).Compare(CompareOperator.GreaterThanOrEqualTo, 0m, "zero").PrecisionScale(18, 2);
+
+// ❌ Wrong — no such method `CompareValue`, and `GreaterThanEqual` is not a valid CompareOperator
+Property(x => x.Salary).CompareValue(CompareOperator.GreaterThanEqual, 0m, "zero").PrecisionScale(18, 2);
+```
+
+The extension is **`Compare`** (not `CompareValue`), and the `CompareOperator` members are `Equal`, `NotEqual`, `LessThan`, `LessThanOrEqualTo`, `GreaterThan`, `GreaterThanOrEqualTo` (there is no `GreaterThanEqual`).
+
+#### Runtime-computed values (delegate overloads)
+
+Most comparison rules (and many others) provide a **delegate overload** — `Func<PropertyContext<TEntity, TProperty>, TProperty>` — so the value can be computed at runtime. Prefer a declarative rule with a delegate over an imperative check in `OnValidateAsync` whenever the rule can express it. For example, "at least 16 years old" is a comparison rule, not hand-written logic.
+
+Mind the direction: the threshold is `today − 16 years` — the **latest** acceptable birth date — so being at least 16 means `DateOfBirth <= threshold`. A rule passes when its condition holds, so the correct rule is **`LessThanOrEqualTo`** (it errors when `DateOfBirth` is *after* the threshold, i.e. younger than 16):
+
+```csharp
+// ✅ Preferred — declarative rule with a computed threshold (no OnValidateAsync needed)
+Property(x => x.DateOfBirth)
+    .Mandatory()
+    .LessThanOrEqualTo(_ => DateOnly.FromDateTime(Runtime.UtcNow.UtcDateTime.AddYears(-16)), _ => "the minimum age of 16");
+```
+
+The delegate parameter is the `PropertyContext` (use `ctx => ctx.Entity...` to compute relative to other properties; ignore it with `_ =>` for an absolute value such as one derived from `Runtime.UtcNow`). Always sanity-check the comparison direction so the rule *fails* on the invalid case, matching the equivalent imperative check (`if (DateOfBirth > threshold) AddError(...)`).
+
+#### Message text is a suffix, not a full sentence
+
+The optional text argument on these rules (e.g. `"zero"`, `_ => "the minimum age of 16"`) supplies **only the value substitution** (`{2}`) in the standard message template — it is **not** a complete error message. For instance `CompareLessThanEqualFormat` is `"{0} must be less than or equal to {2}."`, so `.LessThanOrEqualTo(..., _ => "the minimum age of 16")` renders *"Date Of Birth must be less than or equal to the minimum age of 16."* Keep the text short (the value rendering only); the standard wrapper supplies the rest. The default templates live in `ValidatorStrings.cs` (each is an overridable, localizable `LText`) — consult it rather than re-inventing full messages. To override the *entire* message, use `.Error("...")` instead.
+
+## Reference Data Fields
+
+Use `.IsValid()` on the **typed reference-data navigation property** to validate that the value is a known active item — **not** the serialized `*Code` string property. For a contract with `GenderCode`, validate the generated `Gender` property; for `SubCategoryCode`, validate `SubCategory`; and so on.
+
+**Required vs optional:** chain **`.Mandatory().IsValid()`** when the ref-data field is **required**; use **`.IsValid()` alone** when it is **optional** (a null/unset value then passes, but a *supplied* value must still be a known active item). `IsValid()` on its own does not enforce presence.
+
+```csharp
+// ✅ Correct — validate the typed navigation property
+Property(p => p.SubCategory).Mandatory().IsValid();   // required ref-data
+Property(p => p.UnitOfMeasure).Mandatory().IsValid(); // required ref-data
+Property(x => x.Gender).IsValid();                    // optional ref-data — valid-if-supplied, null allowed
+
+// ❌ Wrong — do not apply .IsValid() to the *Code string property
+Property(x => x.GenderCode).IsValid();
+```
+
+## Nested / Collection Validators
+
+For entities with nested objects, create a separate `Validator.Create<T>()` for the nested type and reference it via `.Entity(validator)` or `.Dictionary(c => c.WithKeyValidator(...).WithValueValidator(...))`.
+
+Use `LText` to provide a localised label for dictionary keys in error messages:
+
+```csharp
+private static readonly LText _productText = "Product";
+
+private static readonly Validator<MovementRequestProduct> _productValidator = Validator.Create<MovementRequestProduct>()
+    .HasProperty(x => x.UnitOfMeasure, c => c.Mandatory().IsValid())
+    .HasProperty(x => x.Quantity, c => c.GreaterThanOrEqualTo(0).DependsOn(x => x.UnitOfMeasure));
+
+// In parent validator constructor:
+Property(x => x.Products).Mandatory().Dictionary(c => c
+    .WithKeyValidator(_productText, k => k.Mandatory().MaximumLength(50))
+    .WithValueValidator(v => v.Mandatory().Entity(_productValidator)));
+```
+
+When the value validator needs to access the dictionary key (e.g., to look up data keyed by that value), use `ctx.GetDictionaryKey<T>()` inside the rule lambda:
+
+```csharp
+var dv = Validator.Create<MovementRequestProduct>()
+    .HasProperty(x => x.UnitOfMeasure, c => c.Equal(
+        ctx => products[ctx.GetDictionaryKey<string>()].UnitOfMeasureCode));
+```
+
+## Async Validation (Database Checks)
+
+Override `OnValidateAsync` for validators that need to query the database. Check `context.HasErrors` first to skip expensive async work if earlier rules already failed — this global guard is appropriate here because the I/O assumes a valid entity. (When a check merely augments a single property, gate on that property with `context.HasError(x => x.Prop)` instead — see [Adding Errors Manually](#adding-errors-manually).)
+
+```csharp
+protected async override Task OnValidateAsync(ValidationContext<MovementRequest> context, CancellationToken cancellationToken)
+{
+    if (context.HasErrors)
+        return;
+
+    var ids = context.Value.Products!.Keys.ToArray();
+    var products = await _repository.GetForReservationAsync(ids, cancellationToken).ConfigureAwait(false);
+
+    await context.ValidateFurtherAsync(c => c
+        .HasProperty(x => x.Products, c => c.Dictionary(c => c
+            .WithKeyValidator("Product", k => k
+                .NotFound().WhenValue(v => !products.ContainsKey(v))
+                .Error("{0} is non-stocked.").WhenValue(v => products[v].IsNonStocked))
+        )), cancellationToken).ConfigureAwait(false);
+}
+```
+
+## Adding Errors Manually
+
+**Prefer a declarative rule first.** Most checks — including those needing runtime-computed values — are expressible as rules via the delegate overloads (see [Runtime-computed values](#runtime-computed-values-delegate-overloads)); the "at least 16 years old" check below is better written as `Property(x => x.DateOfBirth).LessThanOrEqualTo(_ => DateOnly.FromDateTime(Runtime.UtcNow.UtcDateTime.AddYears(-16)), _ => "the minimum age of 16")`. Reserve manual `OnValidateAsync` + `AddError` for logic that genuinely cannot be a rule (e.g. multi-field conditions or checks requiring async I/O).
+
+When you do add an error directly, identify the property using the **member-access expression** overload of `context.AddError` — `context.AddError(x => x.Property, ...)`. Never pass a property-name string such as `nameof(...)`; the expression resolves the label, JSON name, and metadata automatically.
+
+**Choose the right guard — `HasErrors` vs `HasError(x => x.Prop)`:**
+- `context.HasErrors` (global) — bail early only when the *following logic needs the whole entity in a valid state*, e.g. before async I/O / database lookups (see [Async Validation](#async-validation-database-checks)).
+- `context.HasError(x => x.Prop)` (per-property) — when you are simply layering an additional rule onto a single property, gate on **that property only**. This still runs your check when unrelated properties have failed, and skips it only when the property itself is already in error (avoiding a misleading second message).
+
+```csharp
+protected override Task OnValidateAsync(ValidationContext<Employee> context, CancellationToken cancellationToken)
+{
+    // Only gate on DateOfBirth — an unrelated failure elsewhere should not skip this check.
+    if (!context.HasError(x => x.DateOfBirth))
+    {
+        // Use Runtime.UtcNow (the ambient, ExecutionContext-aware clock) — never DateTime.UtcNow / DateTimeOffset.UtcNow.
+        var minDob = DateOnly.FromDateTime(Runtime.UtcNow.UtcDateTime.AddYears(-16));
+        if (context.Value.DateOfBirth > minDob)
+            context.AddError(x => x.DateOfBirth, "Employee must be at least 16 years old.");   // expression — not nameof(...)
+    }
+
+    return Task.CompletedTask;
+}
+```
+
+## Localization Labels
+
+Property names in error messages use an auto-derived label by default (the PascalCase property name split into words, e.g. `DateOfBirth` → "Date Of Birth"). Override with `[Localization("...")]` on the contract property (or a custom label in the rule) **only when the default is undesired** — do not add `[Localization("Salary")]` to a `Salary` property, as it merely repeats the default:
+
+```csharp
+// Contract
+[Localization("Sub-category")]
+public partial string? SubCategoryCode { get; set; }
+
+// Produces: "Sub-category is required." (not "SubCategoryCode is required.")
+```
+
+## DependsOn for Conditional Precision
+
+Use `.DependsOn(x => x.OtherProp)` to skip a rule when a dependent property is already invalid. This prevents misleading cascading errors:
+
+```csharp
+Property(x => x.Quantity, c => c
+    .GreaterThanOrEqualTo(0)
+    .PrecisionScale(
+        ctx => ctx.Entity.UnitOfMeasure!.Precision,
+        ctx => ctx.Entity.UnitOfMeasure!.Scale)
+    .DependsOn(x => x.UnitOfMeasure));
+```
+
+## Do Not
+
+- Do not use the `FluentValidation` NuGet package — `AbstractValidator` here is `CoreEx.Validation.AbstractValidator`, not FluentValidation.
+- Do not perform I/O in `OnValidateAsync` without first checking `context.HasErrors` — always fail fast.
+- Do not reference Infrastructure assemblies from validators — inject Application-layer repository interfaces only.
+- Do not instantiate validators with `new` at the call site when a `Default` singleton is available.
+- Do not add logic that requires async I/O to the constructor — use `OnValidateAsync` for that.
+- Do not pass a property-name string (e.g. `nameof(...)`) to `context.AddError` — use the member-access expression overload, `context.AddError(x => x.Property, ...)`.
+- Do not apply `.IsValid()` to a `*Code` string property — validate the typed reference-data navigation property instead (e.g. `Gender`, not `GenderCode`).
+- Do not use `CompareValue(...)` or a `CompareOperator.GreaterThanEqual` value — the extension is `.Compare(...)` and the operator is `CompareOperator.GreaterThanOrEqualTo` (or use the dedicated `.GreaterThanOrEqualTo(...)` rule).
+- Do not hand-write logic in `OnValidateAsync` for something expressible as a rule — use the delegate overloads for runtime-computed values (e.g. `.LessThanOrEqualTo(_ => DateOnly.FromDateTime(Runtime.UtcNow.UtcDateTime.AddYears(-16)), _ => "the minimum age of 16")`). Sanity-check the comparison direction so the rule fails on the *invalid* case.
+- Do not put a full sentence in a rule's text argument — it is only the `{2}` value substitution in the standard message template; override the whole message with `.Error("...")`, and consult `ValidatorStrings.cs` for the defaults.
+- Do not add a redundant `[Localization]` whose value equals the auto-derived label (e.g. `[Localization("Salary")]` on `Salary`) — only annotate to change the label.
+
+## Further Reading
+
+- [Application Layer Guide — Validators](https://github.com/Avanade/CoreEx/blob/main/samples/docs/application-layer.md) — full validator walkthrough including declarative and programmatic phases.
+- [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) — Validator pattern entry with cross-links.
+- [CoreEx.Validation README](https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Validation/README.md) — `Validator<T>`, rule set, `OnValidateAsync`, `ValidateFurtherAsync`, and `AbstractValidator`.
diff --git a/.github/namespace-readme-template.md b/.github/namespace-readme-template.md
new file mode 100644
index 00000000..840418ca
--- /dev/null
+++ b/.github/namespace-readme-template.md
@@ -0,0 +1,124 @@
+# NAMESPACE README TEMPLATE
+
+This file is an authoring guide and template for creating `README.md` files across the `CoreEx` library projects. Every `<instruction>` block below is guidance for the author and must be removed from the final output. All placeholder text in `[square brackets]` must be replaced with real content.
+
+---
+
+## Research checklist (do this before writing)
+
+Before authoring any README, gather the following context:
+
+1. **Read all source files** in the target namespace/folder — XML doc comments are the primary source of truth for descriptions.
+2. **Check usages in other `src\` projects** — frequent references reveal which types are most important.
+3. **Check usages in `samples\`** — especially the Contoso domains; use this to inform importance, relevance, and accurate descriptions, but do not reference or link to samples in the README output itself.
+4. **Read the `.csproj`** — NuGet dependencies (non-Microsoft ones in particular) to determine if they should be linked in Additional Resources.
+5. **Check child folders** — decide which sub-namespaces have enough public surface to warrant their own README.
+
+---
+
+## Agreed authoring conventions
+
+These conventions apply to every README created from this template:
+
+- **No NuGet badges or install snippets.** The root `README.md` holds all package badges and `dotnet add package` commands; do not repeat them here.
+- **No code blocks, usage examples, or sample references.** READMEs document the namespace/package — they do not demonstrate usage. The Contoso samples under `samples/` have their own dedicated READMEs for that purpose. Do not link to or mention samples anywhere in a namespace README.
+- **Type table formatting:**
+  - **`Bold link`** — concrete/public classes and structs.
+  - _`Italic link`_ — abstract base classes.
+  - [`Plain link`] — interfaces.
+  - Enums and static utility classes use **bold** like concrete types.
+- **`Abstractions` sub-folders** — contain internal or foundational base types; only create a child README if the public surface is large enough to warrant one.
+- **README depth** — always create READMEs for first-level child namespaces. Only recurse into deeper levels (child-child and beyond) where there is genuinely material content — thin wrappers, single-file folders, or purely internal helpers do not need a README.
+- **Related Namespaces** — always annotate test-only relationships with `_(test only)_` after the description.
+- **Omit empty sections** — if a section has no material content (e.g., no external resources, no child namespaces), omit the section heading and body entirely rather than leaving a placeholder.
+- **Proceed project by project** — complete all namespace READMEs for one project before starting the next.
+
+---
+
+## Template (copy everything below this line into the new README.md)
+
+---
+
+<!-- <instruction> Replace `[Namespace]` in the title with the actual namespace or package name, e.g. `CoreEx.Events`. </instruction> -->
+
+# CoreEx.[Namespace]
+
+<!-- <instruction> Write 1-2 sentences that precisely describe what this namespace/package provides. Be specific — avoid vague phrases like "provides utilities for". </instruction> -->
+
+> Brief description of what this namespace/package provides.
+
+## Overview
+
+<!-- <instruction>
+Write 2-3 paragraphs covering:
+- The concrete problem or gap this namespace addresses.
+- The primary scenarios and patterns where it is used.
+- How it relates to and fits into the broader CoreEx ecosystem.
+</instruction> -->
+
+## Motivation
+
+<!-- <instruction>
+Include this section ONLY at the project (top-level package) README — not in child-namespace READMEs.
+Explain why this project exists: what gaps in .NET or other frameworks it addresses, the design principles that shaped it, and why it was built the way it was. Prefer concise dot-pointed lists over dense paragraphs.
+</instruction> -->
+
+- Motivation point 1.
+- Motivation point 2.
+
+## Key capabilities
+
+<!-- <instruction>
+List the headline capabilities. Each bullet should start with a relevant emoji, a **bold capability name**, then a brief plain-English description of the benefit to the user. Aim for 4–8 bullets at the project level; 3–5 at child-namespace level.
+</instruction> -->
+
+- 🔷 **Capability name**: Description of the capability and its benefit.
+
+## Key types
+
+<!-- <instruction>
+List the most important public types in this namespace. Derive importance from: XML doc comment content, how widely they are referenced across `src\` and `samples\`, and whether they form part of the public contract or extension points.
+
+Formatting rules:
+- **`Bold link`** — concrete classes and structs.
+- _`Italic link`_ — abstract base classes.
+- [`Plain link`] — interfaces.
+- Enums and static utility classes use **bold** like concrete types.
+
+Only include types from this specific namespace folder — child-namespace types are covered in their own README.
+</instruction> -->
+
+| Type | Description |
+|------|-------------|
+| **[`ClassName`](./ClassName.cs)** | What this class does. |
+| _[`AbstractBase`](./AbstractBase.cs)_ | What this abstract class provides. |
+| [`IInterface`](./IInterface.cs) | What this interface defines. |
+
+## Namespaces
+
+<!-- <instruction>
+Include this section ONLY at the project (top-level package) README — not in child-namespace READMEs, unless that namespace itself has notable sub-namespaces with material content.
+List all first-level child namespaces. For each, create the corresponding child README and link to it. Only include deeper levels (child-child) where there is material content worth documenting.
+</instruction> -->
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.[Child]`** | Brief description of what this child namespace contains. | [📖 README](./[Child]/README.md) |
+
+## Related Namespaces
+
+<!-- <instruction>
+List other CoreEx namespaces/packages that have a strong relationship to this one — including sibling packages, packages that extend this one, or packages this one commonly works alongside. Use relative links. Annotate test-only relationships with `_(test only)_`.
+Omit this section if there are no meaningful relationships to document.
+</instruction> -->
+
+- **[`CoreEx.RelatedNamespace`](../RelatedNamespace/README.md)** - Brief description of the relationship.
+- **[`CoreEx.TestHelper`](../../CoreEx.UnitTesting/README.md)** - Brief description. _(test only)_
+
+## Additional Resources
+
+<!-- <instruction>
+Include this section only if there are genuinely useful external resources — non-Microsoft NuGet dependencies, relevant RFCs, specification documents, or authoritative external docs. Omit entirely if there is nothing material to link.
+</instruction> -->
+
+- [Resource name](https://example.com) - Brief description of why it is relevant.
\ No newline at end of file
diff --git a/.github/prompts/coreex-scaffold.prompt.md b/.github/prompts/coreex-scaffold.prompt.md
new file mode 100644
index 00000000..4eb090c3
--- /dev/null
+++ b/.github/prompts/coreex-scaffold.prompt.md
@@ -0,0 +1,18 @@
+---
+description: Guide me through choosing and running the right CoreEx.Template dotnet new commands for a new solution
+---
+
+Guide this workspace through CoreEx scaffolding.
+
+Use `.github/skills/solution-scaffolder/SKILL.md` and its referenced workflow as the authoritative workflow contract when they exist.
+
+Operational contract:
+- Use `.github/skills/solution-scaffolder/SKILL.md` and its referenced workflow as the sole source of truth for interview order, defaults, and guardrails.
+- Keep the interview deterministic: one scaffold question per turn, exactly one editable field per confirmation card, and wait for confirmation before moving on.
+- Preserve the skill's multiple-choice format: use a `text` field only for the base solution name and `select` fields for all other interview questions when confirmation cards are available.
+- Inspect the workspace before scaffolding, run the safest dry-run path before real template commands, and scaffold only the smallest safe CoreEx shape.
+- If any prompt text conflicts with the skill, the skill wins.
+
+Outcome:
+- Recommend and, when requested, run the exact `dotnet new coreex*` command set implied by the skill workflow.
+- Summarize the derived shape, executed validation, optional local runnable-state setup, and any deferred manual steps.
diff --git a/.github/skills/acquire-codebase-knowledge/README.md b/.github/skills/acquire-codebase-knowledge/README.md
new file mode 100644
index 00000000..5160b7d7
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/README.md
@@ -0,0 +1,45 @@
+# Acquire Codebase Knowledge
+
+Maps an unfamiliar codebase and produces seven structured onboarding documents — everything a new team member needs to work effectively on the project, grounded entirely in what the files and tooling actually show.
+
+## When to use
+
+- Onboarding onto a codebase you haven't worked in before.
+- Producing architecture documentation for a team or reviewer.
+- Auditing a project's structure, conventions, and concerns before a large change.
+
+Not for routine feature work, bug fixes, or narrow code edits.
+
+## How to invoke
+
+**Claude Code:**
+```
+/acquire-codebase-knowledge
+```
+
+**GitHub Copilot Chat:**
+```
+#file:.github/skills/acquire-codebase-knowledge/SKILL.md  map this codebase
+```
+
+Optionally supply a focus area — e.g. `architecture only` or `testing and concerns` — to prioritise those documents first while still producing the full set.
+
+## What gets produced
+
+Seven documents written to `docs/codebase/`:
+
+| Document | Content |
+|----------|---------|
+| `STACK.md` | Languages, frameworks, runtimes, and key dependencies |
+| `STRUCTURE.md` | Directory layout and project organisation |
+| `ARCHITECTURE.md` | Architectural style, layers, component relationships |
+| `CONVENTIONS.md` | Coding standards, naming, patterns in use |
+| `INTEGRATIONS.md` | External services, APIs, and infrastructure dependencies |
+| `TESTING.md` | Test strategy, frameworks, and coverage approach |
+| `CONCERNS.md` | Known issues, gaps, tech debt, and open questions |
+
+Every claim is traceable to a source file or terminal output. Unknowns are marked `[TODO]`; intent-dependent decisions are marked `[ASK USER]` and surfaced at the end of the run.
+
+## Reference
+
+- [SKILL.md](./SKILL.md) — full 4-phase workflow, output contract, and focus-area mode detail.
diff --git a/.github/skills/acquire-codebase-knowledge/SKILL.md b/.github/skills/acquire-codebase-knowledge/SKILL.md
new file mode 100644
index 00000000..5ac5289f
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/SKILL.md
@@ -0,0 +1,175 @@
+---
+name: acquire-codebase-knowledge
+description: 'Use this skill when the user explicitly asks to map, document, or onboard into an existing codebase. Trigger for prompts like "map this codebase", "document this architecture", "onboard me to this repo", or "create codebase docs". Do not trigger for routine feature implementation, bug fixes, or narrow code edits unless the user asks for repository-level discovery.'
+license: MIT
+compatibility: 'Cross-platform. Requires Python 3.8+ and git. Run scripts/scan.py from the target project root.'
+metadata:
+  version: "1.3"
+  enhancements:
+    - Multi-language manifest detection (25+ languages supported)
+    - CI/CD pipeline detection (10+ platforms)
+    - Container & orchestration detection
+    - Code metrics by language
+    - Security & compliance config detection
+    - Performance testing markers
+argument-hint: 'Optional: specific area to focus on, e.g. "architecture only", "testing and concerns"'
+tags: ["codebase", "documentation", "onboarding", "discovery", "architecture"]
+---
+
+# Acquire Codebase Knowledge
+
+Produces seven populated documents in `docs/codebase/` covering everything needed to work effectively on the project. Only document what is verifiable from files or terminal output — never infer or assume.
+
+## Output Contract (Required)
+
+Before finishing, all of the following must be true:
+
+1. Exactly these files exist in `docs/codebase/`: `STACK.md`, `STRUCTURE.md`, `ARCHITECTURE.md`, `CONVENTIONS.md`, `INTEGRATIONS.md`, `TESTING.md`, `CONCERNS.md`.
+2. Every claim is traceable to source files, config, or terminal output.
+3. Unknowns are marked as `[TODO]`; intent-dependent decisions are marked `[ASK USER]`.
+4. Every document includes a short "evidence" list with concrete file paths.
+5. Final response includes numbered `[ASK USER]` questions and intent-vs-reality divergences.
+
+## Workflow
+
+Copy and track this checklist:
+
+```
+- [ ] Phase 1: Run scan, read intent documents
+- [ ] Phase 2: Investigate each documentation area
+- [ ] Phase 3: Populate all seven docs in docs/codebase/
+- [ ] Phase 4: Validate docs, present findings, resolve all [ASK USER] items
+```
+
+## Focus Area Mode
+
+If the user supplies a focus area (for example: "architecture only" or "testing and concerns"):
+
+1. Always run Phase 1 in full.
+2. Fully complete focus-area documents first.
+3. For non-focus documents not yet analyzed, keep required sections present and mark unknowns as `[TODO]`.
+4. Still run the Phase 4 validation loop on all seven documents before final output.
+
+### Phase 1: Scan and Read Intent
+
+1. Run the scan script from the target project root:
+   ```bash
+   python3 "$SKILL_ROOT/scripts/scan.py" --output docs/codebase/.codebase-scan.txt
+   ```
+   Where `$SKILL_ROOT` is the absolute path to the skill folder. Works on Windows, macOS, and Linux.
+
+   **Quick start:** If you have the path inline:
+   ```bash
+   python3 /absolute/path/to/skills/acquire-codebase-knowledge/scripts/scan.py --output docs/codebase/.codebase-scan.txt
+   ```
+
+2. Search for `PRD`, `TRD`, `README`, `ROADMAP`, `SPEC`, `DESIGN` files and read them.
+3. Summarise the stated project intent before reading any source code.
+
+### Phase 2: Investigate
+
+Use the scan output to answer questions for each of the seven templates. Load [`references/inquiry-checkpoints.md`](references/inquiry-checkpoints.md) for the full per-template question list.
+
+If the stack is ambiguous (multiple manifest files, unfamiliar file types, no `package.json`), load [`references/stack-detection.md`](references/stack-detection.md).
+
+### Phase 3: Populate Templates
+
+Copy each template from `assets/templates/` into `docs/codebase/`. Fill in this order:
+
+1. [STACK.md](assets/templates/STACK.md) — language, runtime, frameworks, all dependencies
+2. [STRUCTURE.md](assets/templates/STRUCTURE.md) — directory layout, entry points, key files
+3. [ARCHITECTURE.md](assets/templates/ARCHITECTURE.md) — layers, patterns, data flow
+4. [CONVENTIONS.md](assets/templates/CONVENTIONS.md) — naming, formatting, error handling, imports
+5. [INTEGRATIONS.md](assets/templates/INTEGRATIONS.md) — external APIs, databases, auth, monitoring
+6. [TESTING.md](assets/templates/TESTING.md) — frameworks, file organization, mocking strategy
+7. [CONCERNS.md](assets/templates/CONCERNS.md) — tech debt, bugs, security risks, perf bottlenecks
+
+Use `[TODO]` for anything that cannot be determined from code. Use `[ASK USER]` where the right answer requires team intent.
+
+### Phase 4: Validate, Repair, Verify
+
+Run this mandatory validation loop before finalizing:
+
+1. Validate each doc against `references/inquiry-checkpoints.md`.
+2. For each non-trivial claim, confirm at least one evidence reference exists.
+3. If any required section is missing or unsupported:
+  - Fix the document.
+  - Re-run validation.
+4. Repeat until all seven docs pass.
+
+Then present a summary of all seven documents, list every `[ASK USER]` item as a numbered question, and highlight any Intent vs. Reality divergences from Phase 1.
+
+Validation pass criteria:
+
+- No unsupported claims.
+- No empty required sections.
+- Unknowns use `[TODO]` rather than assumptions.
+- Team-intent gaps are explicitly marked `[ASK USER]`.
+
+---
+
+## Gotchas
+
+**Monorepos:** Root `package.json` may have no source — check for `workspaces`, `packages/`, or `apps/` directories. Each workspace may have independent dependencies and conventions. Map each sub-package separately.
+
+**Outdated README:** README often describes intended architecture, not the current one. Cross-reference with actual file structure before treating any README claim as fact.
+
+**TypeScript path aliases:** `tsconfig.json` `paths` config means imports like `@/foo` don't map directly to the filesystem. Map aliases to real paths before documenting structure.
+
+**Generated/compiled output:** Never document patterns from `dist/`, `build/`, `generated/`, `.next/`, `out/`, or `__pycache__/`. These are artefacts — document source conventions only.
+
+**`.env.example` reveals required config:** Secrets are never committed. Read `.env.example`, `.env.template`, or `.env.sample` to discover required environment variables.
+
+**`devDependencies` ≠ production stack:** Only `dependencies` (or equivalent, e.g. `[tool.poetry.dependencies]`) runs in production. Document linters, formatters, and test frameworks separately as dev tooling.
+
+**Test TODOs ≠ production debt:** TODOs inside `test/`, `tests/`, `__tests__/`, or `spec/` are coverage gaps, not production technical debt. Separate them in `CONCERNS.md`.
+
+**High-churn files = fragile areas:** Files appearing most in recent git history have the highest modification rate and likely hidden complexity. Always note them in `CONCERNS.md`.
+
+---
+
+## Anti-Patterns
+
+| ❌ Don't | ✅ Do instead |
+|---------|--------------|
+| "Uses Clean Architecture with Domain/Data layers." (when no such directories exist) | State only what directory structure actually shows. |
+| "This is a Next.js project." (without checking `package.json`) | Check `dependencies` first. State what's actually there. |
+| Guess the database from a variable name like `dbUrl` | Check manifest for `pg`, `mysql2`, `mongoose`, `prisma`, etc. |
+| Document `dist/` or `build/` naming patterns as conventions | Source files only. |
+
+---
+
+## Enhanced Scan Output Sections
+
+The `scan.py` script now produce the following sections in addition to the original output:
+
+- **CODE METRICS** — Total files, lines of code by language, largest files (complexity signals)
+- **CI/CD PIPELINES** — Detected GitHub Actions, GitLab CI, Jenkins, CircleCI, etc.
+- **CONTAINERS & ORCHESTRATION** — Docker, Docker Compose, Kubernetes, Vagrant configs
+- **SECURITY & COMPLIANCE** — Snyk, Dependabot, SECURITY.md, SBOM, security policies
+- **PERFORMANCE & TESTING** — Benchmark configs, profiling markers, load testing tools
+
+Use these sections during Phase 2 to inform investigation questions and identify tool-specific patterns.
+
+---
+
+## Bundled Assets
+
+| Asset | When to load |
+|-------|-------------|
+| [`scripts/scan.py`](scripts/scan.py) | Phase 1 — run first, before reading any code (Python 3.8+ required) |
+
+| [`references/inquiry-checkpoints.md`](references/inquiry-checkpoints.md) | Phase 2 — load for per-template investigation questions |
+| [`references/stack-detection.md`](references/stack-detection.md) | Phase 2 — only if stack is ambiguous |
+| [`assets/templates/STACK.md`](assets/templates/STACK.md) | Phase 3 step 1 |
+| [`assets/templates/STRUCTURE.md`](assets/templates/STRUCTURE.md) | Phase 3 step 2 |
+| [`assets/templates/ARCHITECTURE.md`](assets/templates/ARCHITECTURE.md) | Phase 3 step 3 |
+| [`assets/templates/CONVENTIONS.md`](assets/templates/CONVENTIONS.md) | Phase 3 step 4 |
+| [`assets/templates/INTEGRATIONS.md`](assets/templates/INTEGRATIONS.md) | Phase 3 step 5 |
+| [`assets/templates/TESTING.md`](assets/templates/TESTING.md) | Phase 3 step 6 |
+| [`assets/templates/CONCERNS.md`](assets/templates/CONCERNS.md) | Phase 3 step 7 |
+
+Template usage mode:
+
+- Default mode: complete only the "Core Sections (Required)" in each template.
+- Extended mode: add optional sections only when the repo complexity justifies them.
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/ARCHITECTURE.md b/.github/skills/acquire-codebase-knowledge/assets/templates/ARCHITECTURE.md
new file mode 100644
index 00000000..26f575e2
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/ARCHITECTURE.md
@@ -0,0 +1,49 @@
+# Architecture
+
+## Core Sections (Required)
+
+### 1) Architectural Style
+
+- Primary style: [layered/feature/event-driven/other]
+- Why this classification: [short evidence-backed rationale]
+- Primary constraints: [2-3 constraints that shape design]
+
+### 2) System Flow
+
+```text
+[entry] -> [processing] -> [domain logic] -> [data/integration] -> [response/output]
+```
+
+Describe the flow in 4-6 steps using file-backed evidence.
+
+### 3) Layer/Module Responsibilities
+
+| Layer or module | Owns | Must not own | Evidence |
+|-----------------|------|--------------|----------|
+| [name] | [responsibility] | [non-responsibility] | [file] |
+
+### 4) Reused Patterns
+
+| Pattern | Where found | Why it exists |
+|---------|-------------|---------------|
+| [singleton/repository/adapter/etc] | [path] | [reason] |
+
+### 5) Known Architectural Risks
+
+- [Risk 1 + impact]
+- [Risk 2 + impact]
+
+### 6) Evidence
+
+- [path/to/entrypoint]
+- [path/to/main-layer-files]
+- [path/to/data-or-integration-layer]
+
+## Extended Sections (Optional)
+
+Add only when needed:
+
+- Startup or initialization order details
+- Async/event topology diagrams
+- Anti-pattern catalog with refactoring paths
+- Failure-mode analysis and resilience posture
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/CONCERNS.md b/.github/skills/acquire-codebase-knowledge/assets/templates/CONCERNS.md
new file mode 100644
index 00000000..d41e13ab
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/CONCERNS.md
@@ -0,0 +1,56 @@
+# Codebase Concerns
+
+## Core Sections (Required)
+
+### 1) Top Risks (Prioritized)
+
+| Severity | Concern | Evidence | Impact | Suggested action |
+|----------|---------|----------|--------|------------------|
+| [high/med/low] | [issue] | [file or scan output] | [impact] | [next action] |
+
+### 2) Technical Debt
+
+List the most important debt items only.
+
+| Debt item | Why it exists | Where | Risk if ignored | Suggested fix |
+|-----------|---------------|-------|-----------------|---------------|
+| [item] | [reason] | [path] | [risk] | [fix] |
+
+### 3) Security Concerns
+
+| Risk | OWASP category (if applicable) | Evidence | Current mitigation | Gap |
+|------|--------------------------------|----------|--------------------|-----|
+| [risk] | [A01/A03/etc or N/A] | [path] | [what exists] | [what is missing] |
+
+### 4) Performance and Scaling Concerns
+
+| Concern | Evidence | Current symptom | Scaling risk | Suggested improvement |
+|---------|----------|-----------------|-------------|-----------------------|
+| [issue] | [path/metric] | [symptom] | [risk] | [action] |
+
+### 5) Fragile/High-Churn Areas
+
+| Area | Why fragile | Churn signal | Safe change strategy |
+|------|-------------|-------------|----------------------|
+| [path] | [reason] | [recent churn evidence] | [approach] |
+
+### 6) `[ASK USER]` Questions
+
+Add unresolved intent-dependent questions as a numbered list.
+
+1. [ASK USER] [question]
+
+### 7) Evidence
+
+- [scan output section reference]
+- [path/to/code-file]
+- [path/to/config-or-history-evidence]
+
+## Extended Sections (Optional)
+
+Add only when needed:
+
+- Full bug inventory
+- Component-level remediation roadmap
+- Cost/effort estimates by concern
+- Dependency-risk and ownership mapping
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/CONVENTIONS.md b/.github/skills/acquire-codebase-knowledge/assets/templates/CONVENTIONS.md
new file mode 100644
index 00000000..5a29453c
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/CONVENTIONS.md
@@ -0,0 +1,52 @@
+# Coding Conventions
+
+## Core Sections (Required)
+
+### 1) Naming Rules
+
+| Item | Rule | Example | Evidence |
+|------|------|---------|----------|
+| Files | [RULE] | [EXAMPLE] | [FILE] |
+| Functions/methods | [RULE] | [EXAMPLE] | [FILE] |
+| Types/interfaces | [RULE] | [EXAMPLE] | [FILE] |
+| Constants/env vars | [RULE] | [EXAMPLE] | [FILE] |
+
+### 2) Formatting and Linting
+
+- Formatter: [TOOL + CONFIG FILE]
+- Linter: [TOOL + CONFIG FILE]
+- Most relevant enforced rules: [RULE_1], [RULE_2], [RULE_3]
+- Run commands: [COMMANDS]
+
+### 3) Import and Module Conventions
+
+- Import grouping/order: [RULE]
+- Alias vs relative import policy: [RULE]
+- Public exports/barrel policy: [RULE]
+
+### 4) Error and Logging Conventions
+
+- Error strategy by layer: [SHORT SUMMARY]
+- Logging style and required context fields: [SUMMARY]
+- Sensitive-data redaction rules: [SUMMARY]
+
+### 5) Testing Conventions
+
+- Test file naming/location rule: [RULE]
+- Mocking strategy norm: [RULE]
+- Coverage expectation: [RULE or TODO]
+
+### 6) Evidence
+
+- [path/to/lint-config]
+- [path/to/format-config]
+- [path/to/representative-source-file]
+
+## Extended Sections (Optional)
+
+Add only for large or inconsistent codebases:
+
+- Layer-specific error handling matrix
+- Language-specific strictness options
+- Repo-specific commit/branching conventions
+- Known convention violations to clean up
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/INTEGRATIONS.md b/.github/skills/acquire-codebase-knowledge/assets/templates/INTEGRATIONS.md
new file mode 100644
index 00000000..f62039ff
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/INTEGRATIONS.md
@@ -0,0 +1,48 @@
+# External Integrations
+
+## Core Sections (Required)
+
+### 1) Integration Inventory
+
+| System | Type (API/DB/Queue/etc) | Purpose | Auth model | Criticality | Evidence |
+|--------|---------------------------|---------|------------|-------------|----------|
+| [name] | [type] | [purpose] | [auth] | [high/med/low] | [file] |
+
+### 2) Data Stores
+
+| Store | Role | Access layer | Key risk | Evidence |
+|-------|------|--------------|----------|----------|
+| [db/cache/etc] | [role] | [module] | [risk] | [file] |
+
+### 3) Secrets and Credentials Handling
+
+- Credential sources: [env/secrets manager/config]
+- Hardcoding checks: [result]
+- Rotation or lifecycle notes: [known/unknown]
+
+### 4) Reliability and Failure Behavior
+
+- Retry/backoff behavior: [implemented/none/partial]
+- Timeout policy: [where configured]
+- Circuit-breaker or fallback behavior: [if any]
+
+### 5) Observability for Integrations
+
+- Logging around external calls: [yes/no + where]
+- Metrics/tracing coverage: [yes/no + where]
+- Missing visibility gaps: [list]
+
+### 6) Evidence
+
+- [path/to/integration-wrapper]
+- [path/to/config-or-env-template]
+- [path/to/monitoring-or-logging-config]
+
+## Extended Sections (Optional)
+
+Add only when needed:
+
+- Endpoint-by-endpoint catalog
+- Auth flow sequence diagrams
+- SLA/SLO per integration
+- Region/failover topology notes
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/STACK.md b/.github/skills/acquire-codebase-knowledge/assets/templates/STACK.md
new file mode 100644
index 00000000..2520677c
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/STACK.md
@@ -0,0 +1,56 @@
+# Technology Stack
+
+## Core Sections (Required)
+
+### 1) Runtime Summary
+
+| Area | Value | Evidence |
+|------|-------|----------|
+| Primary language | [VALUE] | [FILE_PATH] |
+| Runtime + version | [VALUE] | [FILE_PATH] |
+| Package manager | [VALUE] | [FILE_PATH] |
+| Module/build system | [VALUE] | [FILE_PATH] |
+
+### 2) Production Frameworks and Dependencies
+
+List only high-impact production dependencies (frameworks, data, transport, auth).
+
+| Dependency | Version | Role in system | Evidence |
+|------------|---------|----------------|----------|
+| [NAME] | [VERSION] | [ROLE] | [FILE_PATH] |
+
+### 3) Development Toolchain
+
+| Tool | Purpose | Evidence |
+|------|---------|----------|
+| [TOOL] | [LINT/FORMAT/TEST/BUILD] | [FILE_PATH] |
+
+### 4) Key Commands
+
+```bash
+[install command]
+[build command]
+[test command]
+[lint command]
+```
+
+### 5) Environment and Config
+
+- Config sources: [LIST FILES]
+- Required env vars: [VAR_1], [VAR_2], [TODO]
+- Deployment/runtime constraints: [SHORT NOTE]
+
+### 6) Evidence
+
+- [path/to/manifest]
+- [path/to/runtime-config]
+- [path/to/build-or-ci-config]
+
+## Extended Sections (Optional)
+
+Add only when needed for complex repos:
+
+- Full dependency taxonomy by category
+- Detailed compiler/runtime flags
+- Environment matrix (dev/stage/prod)
+- Process manager and container runtime details
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/STRUCTURE.md b/.github/skills/acquire-codebase-knowledge/assets/templates/STRUCTURE.md
new file mode 100644
index 00000000..89e9c28f
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/STRUCTURE.md
@@ -0,0 +1,44 @@
+# Codebase Structure
+
+## Core Sections (Required)
+
+### 1) Top-Level Map
+
+List only meaningful top-level directories and files.
+
+| Path | Purpose | Evidence |
+|------|---------|----------|
+| [path/] | [purpose] | [source] |
+
+### 2) Entry Points
+
+- Main runtime entry: [FILE]
+- Secondary entry points (worker/cli/jobs): [FILES or NONE]
+- How entry is selected (script/config): [NOTE]
+
+### 3) Module Boundaries
+
+| Boundary | What belongs here | What must not be here |
+|----------|-------------------|------------------------|
+| [module/layer] | [responsibility] | [forbidden logic] |
+
+### 4) Naming and Organization Rules
+
+- File naming pattern: [kebab/camel/Pascal + examples]
+- Directory organization pattern: [feature/layer/domain]
+- Import aliasing or path conventions: [RULE]
+
+### 5) Evidence
+
+- [path/to/root-tree-source]
+- [path/to/entry-config]
+- [path/to/key-module]
+
+## Extended Sections (Optional)
+
+Add only when repository complexity requires it:
+
+- Subdirectory deep maps by feature/layer
+- Middleware/boot order details
+- Generated-vs-source layout boundaries
+- Monorepo workspace-level structure maps
diff --git a/.github/skills/acquire-codebase-knowledge/assets/templates/TESTING.md b/.github/skills/acquire-codebase-knowledge/assets/templates/TESTING.md
new file mode 100644
index 00000000..8e0e7028
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/assets/templates/TESTING.md
@@ -0,0 +1,57 @@
+# Testing Patterns
+
+## Core Sections (Required)
+
+### 1) Test Stack and Commands
+
+- Primary test framework: [NAME + VERSION]
+- Assertion/mocking tools: [TOOLS]
+- Commands:
+
+```bash
+[run all tests]
+[run unit tests]
+[run integration/e2e tests]
+[run coverage]
+```
+
+### 2) Test Layout
+
+- Test file placement pattern: [co-located/tests folder/etc]
+- Naming convention: [pattern]
+- Setup files and where they run: [paths]
+
+### 3) Test Scope Matrix
+
+| Scope | Covered? | Typical target | Notes |
+|-------|----------|----------------|-------|
+| Unit | [yes/no] | [modules/services] | [notes] |
+| Integration | [yes/no] | [API/data boundaries] | [notes] |
+| E2E | [yes/no] | [user flows] | [notes] |
+
+### 4) Mocking and Isolation Strategy
+
+- Main mocking approach: [module/class/network]
+- Isolation guarantees: [what is reset and when]
+- Common failure mode in tests: [short note]
+
+### 5) Coverage and Quality Signals
+
+- Coverage tool + threshold: [value or TODO]
+- Current reported coverage: [value or TODO]
+- Known gaps/flaky areas: [list]
+
+### 6) Evidence
+
+- [path/to/test-config]
+- [path/to/representative-test-file]
+- [path/to/ci-or-coverage-config]
+
+## Extended Sections (Optional)
+
+Add only when needed:
+
+- Framework-specific suite patterns
+- Detailed mock recipes per dependency type
+- Historical flaky test catalog
+- Test performance bottlenecks and optimization ideas
diff --git a/.github/skills/acquire-codebase-knowledge/references/inquiry-checkpoints.md b/.github/skills/acquire-codebase-knowledge/references/inquiry-checkpoints.md
new file mode 100644
index 00000000..02430e76
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/references/inquiry-checkpoints.md
@@ -0,0 +1,70 @@
+# Inquiry Checkpoints
+
+Per-template investigation questions for Phase 2 of the acquire-codebase-knowledge workflow. For each template area, look for answers in the scan output first, then read source files to fill gaps.
+
+---
+
+## 1. STACK.md — Tech Stack
+
+- What is the primary language and exact version? (check `.nvmrc`, `go.mod`, `pyproject.toml`, Docker `FROM` line)
+- What package manager is used? (`npm`, `yarn`, `pnpm`, `go mod`, `pip`, `uv`)
+- What are the core runtime frameworks? (web server, ORM, DI container)
+- What do `dependencies` (production) vs `devDependencies` (dev tooling) contain?
+- Is there a Docker image and what base image does it use?
+- What are the key scripts in `package.json` / `Makefile` / `pyproject.toml`?
+
+## 2. STRUCTURE.md — Directory Layout
+
+- Where does source code live? (usually `src/`, `lib/`, or project root for Go)
+- What are the entry points? (check `main` in `package.json`, `scripts.start`, `cmd/main.go`, `app.py`)
+- What is the stated purpose of each top-level directory?
+- Are there non-obvious directories (e.g., `eng/`, `platform/`, `infra/`)?
+- Are there hidden config directories (`.github/`, `.vscode/`, `.husky/`)?
+- What naming conventions do directories follow? (camelCase, kebab-case, domain-based vs layer-based)
+
+## 3. ARCHITECTURE.md — Patterns
+
+- Is the code organized by layer (controllers → services → repos) or by feature?
+- What is the primary data flow? Trace one request or command from entry to data store.
+- Are there singletons, dependency injection patterns, or explicit initialization order requirements?
+- Are there background workers, queues, or event-driven components?
+- What design patterns appear repeatedly? (Factory, Repository, Decorator, Strategy)
+
+## 4. CONVENTIONS.md — Coding Standards
+
+- What is the file naming convention? (check 10+ files — camelCase, kebab-case, PascalCase)
+- What is the function and variable naming convention?
+- Are private methods/fields prefixed (e.g., `_methodName`, `#field`)?
+- What linter and formatter are configured? (check `.eslintrc`, `.prettierrc`, `golangci.yml`)
+- What are the TypeScript strictness settings? (`strict`, `noImplicitAny`, etc.)
+- How are errors handled at each layer? (throw vs. return structured error)
+- What logging library is used and what is the log message format?
+- How are imports organized? (barrel exports, path aliases, grouping rules)
+
+## 5. INTEGRATIONS.md — External Services
+
+- What external APIs are called? (search for `axios.`, `fetch(`, `http.Get(`, base URLs in constants)
+- How are credentials stored and accessed? (`.env`, secrets manager, env vars)
+- What databases are connected? (check manifest for `pg`, `mongoose`, `prisma`, `typeorm`, `sqlalchemy`)
+- Is there an API gateway, service mesh, or proxy between the app and external services?
+- What monitoring or observability tools are used? (APM, Prometheus, logging pipeline)
+- Are there message queues or event buses? (Kafka, RabbitMQ, SQS, Pub/Sub)
+
+## 6. TESTING.md — Test Setup
+
+- What test runner is configured? (check `scripts.test` in `package.json`, `pytest.ini`, `go test`)
+- Where are test files located? (alongside source, in `tests/`, in `__tests__/`)
+- What assertion library is used? (Jest expect, Chai, pytest assert)
+- How are external dependencies mocked? (jest.mock, dependency injection, fixtures)
+- Are there integration tests that hit real services vs. unit tests with mocks?
+- Is there a coverage threshold enforced? (check `jest.config.js`, `.nycrc`, `pyproject.toml`)
+
+## 7. CONCERNS.md — Known Issues
+
+- How many TODOs/FIXMEs/HACKs are in production code? (see scan output)
+- Which files have the highest git churn in the last 90 days? (see scan output)
+- Are there any files over 500 lines that mix multiple responsibilities?
+- Do any services make sequential calls that could be parallelized?
+- Are there hardcoded values (URLs, IDs, magic numbers) that should be config?
+- What security risks exist? (missing input validation, raw error messages exposed to clients, missing auth checks)
+- Are there performance patterns that don't scale? (N+1 queries, in-memory caches in multi-instance setups)
diff --git a/.github/skills/acquire-codebase-knowledge/references/stack-detection.md b/.github/skills/acquire-codebase-knowledge/references/stack-detection.md
new file mode 100644
index 00000000..01ccfd7d
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/references/stack-detection.md
@@ -0,0 +1,131 @@
+# Stack Detection Reference
+
+Load this file when the tech stack is ambiguous — e.g., multiple manifest files present, unfamiliar file extensions, or no obvious `package.json` / `go.mod`.
+
+---
+
+## Manifest File → Ecosystem
+
+| File | Ecosystem | Key fields to read |
+|------|-----------|--------------------|
+| `package.json` | Node.js / JavaScript / TypeScript | `dependencies`, `devDependencies`, `scripts`, `main`, `type`, `engines` |
+| `go.mod` | Go | Module path, Go version, `require` block |
+| `requirements.txt` | Python (pip) | Package list with pinned versions |
+| `Pipfile` | Python (pipenv) | `[packages]`, `[dev-packages]`, `[requires]` python version |
+| `pyproject.toml` | Python (poetry / uv / hatch) | `[tool.poetry.dependencies]`, `[project]`, `[build-system]` |
+| `setup.py` / `setup.cfg` | Python (setuptools, legacy) | `install_requires`, `python_requires` |
+| `Cargo.toml` | Rust | `[dependencies]`, `[[bin]]`, `[lib]` |
+| `pom.xml` | Java / Kotlin (Maven) | `<dependencies>`, `<artifactId>`, `<groupId>`, `<java.version>` |
+| `build.gradle` / `build.gradle.kts` | Java / Kotlin (Gradle) | `dependencies {}`, `sourceCompatibility` |
+| `composer.json` | PHP | `require`, `require-dev` |
+| `Gemfile` | Ruby | `gem` declarations, `ruby` version constraint |
+| `mix.exs` | Elixir | `deps/0`, `elixir: "~> X.Y"` |
+| `pubspec.yaml` | Dart / Flutter | `dependencies`, `dev_dependencies`, `environment.sdk` |
+| `*.csproj` | .NET / C# | `<PackageReference>`, `<TargetFramework>` |
+| `*.sln` | .NET solution | References multiple `.csproj` projects |
+| `deno.json` / `deno.jsonc` | Deno (TypeScript runtime) | `imports`, `tasks` |
+| `bun.lockb` | Bun (JavaScript runtime) | Binary lockfile — check `package.json` for deps |
+
+---
+
+## Language Runtime Version Detection
+
+| Language | Where to find the version |
+|----------|--------------------------|
+| Node.js | `.nvmrc`, `.node-version`, `engines.node` in `package.json`, Docker `FROM node:X` |
+| Python | `.python-version`, `pyproject.toml [requires-python]`, Docker `FROM python:X` |
+| Go | First line of `go.mod` (`go 1.21`) |
+| Java | `<java.version>` in `pom.xml`, `sourceCompatibility` in `build.gradle`, Docker `FROM eclipse-temurin:X` |
+| Ruby | `.ruby-version`, `Gemfile` `ruby 'X.Y.Z'` |
+| Rust | `rust-toolchain.toml`, `rust-toolchain` file |
+| .NET | `<TargetFramework>` in `.csproj` (e.g., `net8.0`) |
+
+---
+
+## Framework Detection (Node.js / TypeScript)
+
+| Dependency in `package.json` | Framework |
+|-----------------------------|-----------|
+| `express` | Express.js (minimal HTTP server) |
+| `fastify` | Fastify (high-performance HTTP server) |
+| `next` | Next.js (SSR/SSG React — check for `pages/` or `app/` directory) |
+| `nuxt` | Nuxt.js (SSR/SSG Vue) |
+| `@nestjs/core` | NestJS (opinionated Node.js framework with DI) |
+| `koa` | Koa (middleware-focused, no built-in router) |
+| `@hapi/hapi` | Hapi |
+| `@trpc/server` | tRPC (type-safe API without REST/GraphQL schemas) |
+| `routing-controllers` | routing-controllers (decorator-based Express wrapper) |
+| `typeorm` | TypeORM (SQL ORM with decorators) |
+| `prisma` | Prisma (type-safe ORM, check `prisma/schema.prisma`) |
+| `mongoose` | Mongoose (MongoDB ODM) |
+| `sequelize` | Sequelize (SQL ORM) |
+| `drizzle-orm` | Drizzle (lightweight SQL ORM) |
+| `react` without `next` | Vanilla React SPA (check for `react-router-dom`) |
+| `vue` without `nuxt` | Vanilla Vue SPA |
+
+---
+
+## Framework Detection (Python)
+
+| Package | Framework |
+|---------|-----------|
+| `fastapi` | FastAPI (async REST, auto OpenAPI docs) |
+| `flask` | Flask (minimal WSGI web framework) |
+| `django` | Django (batteries-included, check `settings.py`) |
+| `starlette` | Starlette (ASGI, often used as FastAPI base) |
+| `aiohttp` | aiohttp (async HTTP client and server) |
+| `sqlalchemy` | SQLAlchemy (SQL ORM; check for `alembic` migrations) |
+| `alembic` | Alembic (SQLAlchemy migration tool) |
+| `pydantic` | Pydantic (data validation; core to FastAPI) |
+| `celery` | Celery (distributed task queue) |
+
+---
+
+## Monorepo Detection
+
+Check these signals in order:
+
+1. `pnpm-workspace.yaml` — pnpm workspaces
+2. `lerna.json` — Lerna monorepo
+3. `nx.json` — Nx monorepo (also check `workspace.json`)
+4. `turbo.json` — Turborepo
+5. `rush.json` — Rush (Microsoft monorepo manager)
+6. `moon.yml` — Moon
+7. `package.json` with `"workspaces": [...]` — npm/yarn workspaces
+8. Presence of `packages/`, `apps/`, `libs/`, or `services/` directories with their own `package.json`
+
+If monorepo is detected: each workspace may have **independent** dependencies and conventions. Map each sub-package separately in `STACK.md` and note the monorepo structure in `STRUCTURE.md`.
+
+---
+
+## TypeScript Path Alias Detection
+
+If `tsconfig.json` has a `paths` key, imports with non-relative prefixes are aliases. Map them before documenting structure.
+
+```json
+// tsconfig.json example
+"paths": {
+  "@/*": ["./src/*"],
+  "@components/*": ["./src/components/*"],
+  "@utils/*": ["./src/utils/*"]
+}
+```
+
+Imports like `import { foo } from '@/utils/bar'` resolve to `src/utils/bar`. Document as `src/utils/bar`, not `@/utils/bar`.
+
+---
+
+## Docker Base Image → Runtime
+
+If no manifest file is present but a `Dockerfile` exists, the `FROM` line reveals the runtime:
+
+| FROM line pattern | Runtime |
+|------------------|---------|
+| `FROM node:X` | Node.js X |
+| `FROM python:X` | Python X |
+| `FROM golang:X` | Go X |
+| `FROM eclipse-temurin:X` | Java X (Eclipse Temurin JDK) |
+| `FROM mcr.microsoft.com/dotnet/aspnet:X` | .NET X |
+| `FROM ruby:X` | Ruby X |
+| `FROM rust:X` | Rust X |
+| `FROM alpine` (alone) | Check what's installed via `RUN apk add` |
diff --git a/.github/skills/acquire-codebase-knowledge/scripts/scan.py b/.github/skills/acquire-codebase-knowledge/scripts/scan.py
new file mode 100644
index 00000000..15e17a28
--- /dev/null
+++ b/.github/skills/acquire-codebase-knowledge/scripts/scan.py
@@ -0,0 +1,712 @@
+#!/usr/bin/env python3
+"""
+scan.py — Collect project discovery information for the acquire-codebase-knowledge skill.
+Run from the project root directory.
+
+Usage: python3 scan.py [OPTIONS]
+
+Options:
+  --output FILE   Write output to FILE instead of stdout
+  --help          Show this message and exit
+
+Exit codes:
+  0  Success
+  1  Usage error
+"""
+
+import os
+import sys
+import argparse
+import subprocess
+import json
+from pathlib import Path
+from typing import List, Set
+import re
+
+TREE_LIMIT = 200
+TREE_MAX_DEPTH = 3
+TODO_LIMIT = 60
+MANIFEST_PREVIEW_LINES = 80
+RECENT_COMMITS_LIMIT = 20
+CHURN_LIMIT = 20
+
+EXCLUDE_DIRS = {
+    "node_modules", ".git", "dist", "build", "out", ".next", ".nuxt",
+    "__pycache__", ".venv", "venv", ".tox", "target", "vendor",
+    "coverage", ".nyc_output", "generated", ".cache", ".turbo",
+    ".yarn", ".pnp", "bin", "obj"
+}
+
+MANIFESTS = [
+    # JavaScript/Node.js
+    "package.json", "package-lock.json", "yarn.lock", "pnpm-lock.yaml", "bun.lockb",
+    "deno.json", "deno.jsonc",
+    # Python
+    "requirements.txt", "Pipfile", "Pipfile.lock", "pyproject.toml", "setup.py", "setup.cfg",
+    "poetry.lock", "pdm.lock", "uv.lock",
+    # Go
+    "go.mod", "go.sum",
+    # Rust
+    "Cargo.toml", "Cargo.lock",
+    # Java/Kotlin
+    "pom.xml", "build.gradle", "build.gradle.kts", "settings.gradle", "settings.gradle.kts",
+    "gradle.properties",
+    # PHP/Composer
+    "composer.json", "composer.lock",
+    # Ruby
+    "Gemfile", "Gemfile.lock", "*.gemspec",
+    # Elixir
+    "mix.exs", "mix.lock",
+    # Dart/Flutter
+    "pubspec.yaml", "pubspec.lock",
+    # .NET/C#
+    "*.csproj", "*.sln", "*.slnx", "global.json", "packages.config",
+    # Swift
+    "Package.swift", "Package.resolved",
+    # Scala
+    "build.sbt", "scala-cli.yml",
+    # Haskell
+    "*.cabal", "stack.yaml", "cabal.project", "cabal.project.local",
+    # OCaml
+    "dune-project", "opam", "opam.lock",
+    # Nim
+    "*.nimble", "nim.cfg",
+    # Crystal
+    "shard.yml", "shard.lock",
+    # R
+    "DESCRIPTION", "renv.lock",
+    # Julia
+    "Project.toml", "Manifest.toml",
+    # Build systems
+    "CMakeLists.txt", "Makefile", "GNUmakefile",
+    "SConstruct", "build.xml",
+    "BUILD", "BUILD.bazel", "WORKSPACE", "bazel.lock",
+    "justfile", ".justfile", "Taskfile.yml",
+    "tox.ini", "Vagrantfile"
+]
+
+ENTRY_CANDIDATES = [
+    # JavaScript/Node.js/TypeScript
+    "src/index.ts", "src/index.js", "src/index.mjs",
+    "src/main.ts", "src/main.js", "src/main.py",
+    "src/app.ts", "src/app.js",
+    "src/server.ts", "src/server.js",
+    "index.ts", "index.js", "app.ts", "app.js",
+    "lib/index.ts", "lib/index.js",
+    # Go
+    "main.go", "cmd/main.go", "cmd/*/main.go",
+    # Python
+    "main.py", "app.py", "server.py", "run.py", "cli.py",
+    "src/main.py", "src/__main__.py",
+    # .NET/C#
+    "Program.cs", "src/Program.cs", "Main.cs",
+    # Java
+    "Main.java", "Application.java", "App.java",
+    "src/main/java/Main.java",
+    # Kotlin
+    "Main.kt", "Application.kt", "App.kt",
+    # Rust
+    "src/main.rs", "src/lib.rs",
+    # Swift
+    "main.swift", "Package.swift", "Sources/main.swift",
+    # Ruby
+    "app.rb", "main.rb", "lib/app.rb",
+    # PHP
+    "index.php", "app.php", "public/index.php",
+    # Go
+    "cmd/*/main.go",
+    # Scala
+    "src/main/scala/Main.scala",
+    # Haskell
+    "Main.hs", "app/Main.hs",
+    # Clojure
+    "src/core.clj", "-main.clj",
+    # Elixir
+    "lib/application.ex", "mix.exs",
+]
+
+LINT_FILES = [
+    ".eslintrc", ".eslintrc.json", ".eslintrc.js", ".eslintrc.cjs", ".eslintrc.yml", ".eslintrc.yaml",
+    "eslint.config.js", "eslint.config.mjs", "eslint.config.cjs",
+    ".prettierrc", ".prettierrc.json", ".prettierrc.js", ".prettierrc.yml",
+    "prettier.config.js", "prettier.config.mjs",
+    ".editorconfig",
+    "tsconfig.json", "tsconfig.base.json", "tsconfig.build.json",
+    ".golangci.yml", ".golangci.yaml",
+    "setup.cfg", ".flake8", ".pylintrc", "mypy.ini",
+    ".rubocop.yml", "phpcs.xml", "phpstan.neon",
+    "biome.json", "biome.jsonc"
+]
+
+ENV_TEMPLATES = [".env.example", ".env.template", ".env.sample", ".env.defaults", ".env.local.example"]
+
+SOURCE_EXTS = [
+    "ts", "tsx", "js", "jsx", "mjs", "cjs",
+    "py", "go", "java", "kt", "rb", "php",
+    "rs", "cs", "cpp", "c", "h", "ex", "exs",
+    "swift", "scala", "clj", "cljs", "lua",
+    "vim", "vim", "hs", "ml", "ml", "nim", "cr",
+    "r", "jl", "groovy", "gradle", "xml", "json"
+]
+
+MONOREPO_FILES = ["pnpm-workspace.yaml", "lerna.json", "nx.json", "rush.json", "turbo.json", "moon.yml"]
+MONOREPO_DIRS = ["packages", "apps", "libs", "services", "modules"]
+
+CI_CD_CONFIGS = {
+    ".github/workflows": "GitHub Actions",
+    ".gitlab-ci.yml": "GitLab CI",
+    "Jenkinsfile": "Jenkins",
+    ".circleci/config.yml": "CircleCI",
+    ".travis.yml": "Travis CI",
+    "azure-pipelines.yml": "Azure Pipelines",
+    "appveyor.yml": "AppVeyor",
+    ".drone.yml": "Drone CI",
+    ".woodpecker.yml": "Woodpecker CI",
+    "bitbucket-pipelines.yml": "Bitbucket Pipelines"
+}
+
+CONTAINER_FILES = [
+    "Dockerfile", "docker-compose.yml", "docker-compose.yaml",
+    ".dockerignore", "Dockerfile.*",
+    "k8s", "kustomization.yaml", "Chart.yaml",
+    "Vagrantfile", "podman-compose.yml"
+]
+
+SECURITY_CONFIGS = [
+    ".snyk", "security.txt", "SECURITY.md",
+    ".dependabot.yml", ".whitesource",
+    "sbom.json", "sbom.spdx", ".bandit.yaml"
+]
+
+PERFORMANCE_MARKERS = [
+    "benchmark", "bench", "perf.data", ".prof",
+    "k6.js", "locustfile.py", "jmeter.jmx"
+]
+
+
+def parse_args():
+    """Parse command-line arguments."""
+    parser = argparse.ArgumentParser(
+        description="Scan the current directory (project root) and output discovery information "
+                    "for the acquire-codebase-knowledge skill.",
+        add_help=True
+    )
+    parser.add_argument(
+        "--output",
+        type=str,
+        help="Write output to FILE instead of stdout"
+    )
+    return parser.parse_args()
+
+
+def should_exclude(path: Path) -> bool:
+    """Check if a path should be excluded from scanning."""
+    return any(part in EXCLUDE_DIRS for part in path.parts)
+
+
+def get_directory_tree(max_depth: int = TREE_MAX_DEPTH) -> List[str]:
+    """Get directory tree up to max_depth."""
+    files = []
+
+    def walk(path: Path, depth: int):
+        if depth > max_depth or should_exclude(path):
+            return
+        try:
+            for item in sorted(path.iterdir()):
+                if should_exclude(item):
+                    continue
+                rel_path = item.relative_to(Path.cwd())
+                files.append(str(rel_path))
+                if item.is_dir():
+                    walk(item, depth + 1)
+        except (PermissionError, OSError):
+            pass
+
+    walk(Path.cwd(), 0)
+    return files[:TREE_LIMIT]
+
+
+def find_manifest_files() -> List[str]:
+    """Find manifest files matching patterns."""
+    found = []
+    for pattern in MANIFESTS:
+        if "*" in pattern:
+            # Handle glob patterns
+            for path in Path.cwd().glob(pattern):
+                if path.is_file() and not should_exclude(path):
+                    found.append(path.name)
+        else:
+            path = Path.cwd() / pattern
+            if path.is_file():
+                found.append(pattern)
+    return sorted(set(found))
+
+
+def read_file_preview(filepath: Path, max_lines: int = MANIFEST_PREVIEW_LINES) -> str:
+    """Read file with line limit."""
+    try:
+        with open(filepath, 'r', encoding='utf-8', errors='replace') as f:
+            lines = f.readlines()
+
+        if not lines:
+            return "None found."
+
+        preview = ''.join(lines[:max_lines])
+        if len(lines) > max_lines:
+            preview += f"\n[TRUNCATED] Showing first {max_lines} of {len(lines)} lines."
+        return preview
+    except Exception as e:
+        return f"[Error reading file: {e}]"
+
+
+def find_entry_points() -> List[str]:
+    """Find entry point candidates."""
+    found = []
+    for candidate in ENTRY_CANDIDATES:
+        if Path(candidate).exists():
+            found.append(candidate)
+    return found
+
+
+def find_lint_config() -> List[str]:
+    """Find linting and formatting config files."""
+    found = []
+    for filename in LINT_FILES:
+        if Path(filename).exists():
+            found.append(filename)
+    return found
+
+
+def find_env_templates() -> List[tuple]:
+    """Find environment variable templates."""
+    found = []
+    for filename in ENV_TEMPLATES:
+        path = Path(filename)
+        if path.exists():
+            found.append((filename, path))
+    return found
+
+
+def search_todos() -> List[str]:
+    """Search for TODO/FIXME/HACK comments."""
+    todos = []
+    patterns = ["TODO", "FIXME", "HACK"]
+    exclude_dirs_str = "|".join(EXCLUDE_DIRS | {"test", "tests", "__tests__", "spec", "__mocks__", "fixtures"})
+
+    try:
+        for root, dirs, files in os.walk(Path.cwd()):
+            # Remove excluded directories from dirs to prevent os.walk from descending
+            dirs[:] = [d for d in dirs if d not in EXCLUDE_DIRS and d not in {"test", "tests", "__tests__", "spec", "__mocks__", "fixtures"}]
+
+            for file in files:
+                # Check file extension
+                ext = Path(file).suffix.lstrip('.')
+                if ext not in SOURCE_EXTS:
+                    continue
+
+                filepath = Path(root) / file
+                try:
+                    with open(filepath, 'r', encoding='utf-8', errors='replace') as f:
+                        for line_num, line in enumerate(f, 1):
+                            for pattern in patterns:
+                                if pattern in line:
+                                    rel_path = filepath.relative_to(Path.cwd())
+                                    todos.append(f"{rel_path}:{line_num}: {line.strip()}")
+                except Exception:
+                    pass
+    except Exception:
+        pass
+
+    return todos[:TODO_LIMIT]
+
+
+def get_git_commits() -> List[str]:
+    """Get recent git commits."""
+    try:
+        result = subprocess.run(
+            ["git", "log", "--oneline", "-n", str(RECENT_COMMITS_LIMIT)],
+            capture_output=True,
+            text=True,
+            cwd=Path.cwd()
+        )
+        if result.returncode == 0:
+            return result.stdout.strip().split('\n') if result.stdout.strip() else []
+        return []
+    except Exception:
+        return []
+
+
+def get_git_churn() -> List[str]:
+    """Get high-churn files from last 90 days."""
+    try:
+        result = subprocess.run(
+            ["git", "log", "--since=90 days ago", "--name-only", "--pretty=format:"],
+            capture_output=True,
+            text=True,
+            cwd=Path.cwd()
+        )
+        if result.returncode == 0:
+            files = [f.strip() for f in result.stdout.split('\n') if f.strip()]
+            # Count occurrences
+            from collections import Counter
+            counts = Counter(files)
+            churn = sorted(counts.items(), key=lambda x: x[1], reverse=True)
+            return [f"{count:4d} {filename}" for filename, count in churn[:CHURN_LIMIT]]
+        return []
+    except Exception:
+        return []
+
+
+def is_git_repo() -> bool:
+    """Check if current directory is a git repository."""
+    try:
+        subprocess.run(
+            ["git", "rev-parse", "--git-dir"],
+            capture_output=True,
+            cwd=Path.cwd(),
+            timeout=2
+        )
+        return True
+    except Exception:
+        return False
+
+
+def detect_monorepo() -> List[str]:
+    """Detect monorepo signals."""
+    signals = []
+
+    for filename in MONOREPO_FILES:
+        if Path(filename).exists():
+            signals.append(f"Monorepo tool detected: {filename}")
+
+    for dirname in MONOREPO_DIRS:
+        if Path(dirname).is_dir():
+            signals.append(f"Sub-package directory found: {dirname}/")
+
+    # Check package.json workspaces
+    if Path("package.json").exists():
+        try:
+            with open("package.json", 'r') as f:
+                content = f.read()
+                if '"workspaces"' in content:
+                    signals.append("package.json has 'workspaces' field (npm/yarn workspaces monorepo)")
+        except Exception:
+            pass
+
+    return signals
+
+
+def detect_ci_cd_pipelines() -> List[str]:
+    """Detect CI/CD pipeline configurations."""
+    pipelines = []
+
+    for config_path, pipeline_name in CI_CD_CONFIGS.items():
+        path = Path(config_path)
+        if path.is_file():
+            pipelines.append(f"CI/CD: {pipeline_name}")
+        elif path.is_dir():
+            # Check for workflow files in directory
+            try:
+                if list(path.glob("*.yml")) or list(path.glob("*.yaml")):
+                    pipelines.append(f"CI/CD: {pipeline_name}")
+            except Exception:
+                pass
+
+    return pipelines
+
+
+def detect_containers() -> List[str]:
+    """Detect containerization and orchestration configs."""
+    containers = []
+
+    for config in CONTAINER_FILES:
+        path = Path(config)
+        if path.is_file():
+            if "Dockerfile" in config:
+                containers.append("Container: Docker found")
+            elif "docker-compose" in config:
+                containers.append("Orchestration: Docker Compose found")
+            elif config.endswith(".yaml") or config.endswith(".yml"):
+                containers.append(f"Container/Orchestration: {config}")
+        elif path.is_dir():
+            if config in ["k8s", "kubernetes"]:
+                containers.append("Orchestration: Kubernetes configs found")
+            try:
+                if list(path.glob("*.yml")) or list(path.glob("*.yaml")):
+                    containers.append(f"Container/Orchestration: {config}/ directory found")
+            except Exception:
+                pass
+
+    return containers
+
+
+def detect_security_configs() -> List[str]:
+    """Detect security and compliance configurations."""
+    security = []
+
+    for config in SECURITY_CONFIGS:
+        if Path(config).exists():
+            config_name = config.replace(".yml", "").replace(".yaml", "").lstrip(".")
+            security.append(f"Security: {config_name}")
+
+    return security
+
+
+def detect_performance_markers() -> List[str]:
+    """Detect performance testing and profiling markers."""
+    performance = []
+
+    for marker in PERFORMANCE_MARKERS:
+        if Path(marker).exists():
+            performance.append(f"Performance: {marker} found")
+        else:
+            # Check for directories
+            try:
+                if Path(marker).is_dir():
+                    performance.append(f"Performance: {marker}/ directory found")
+            except Exception:
+                pass
+
+    return performance
+
+
+def collect_code_metrics() -> dict:
+    """Collect code metrics: file counts by extension, total LOC."""
+    metrics = {
+        "total_files": 0,
+        "by_extension": {},
+        "by_language": {},
+        "total_lines": 0,
+        "largest_files": []
+    }
+
+    # Language mapping
+    lang_map = {
+        "ts": "TypeScript", "tsx": "TypeScript/React", "js": "JavaScript",
+        "jsx": "JavaScript/React", "py": "Python", "go": "Go",
+        "java": "Java", "kt": "Kotlin", "rs": "Rust",
+        "cs": "C#", "rb": "Ruby", "php": "PHP",
+        "swift": "Swift", "scala": "Scala", "ex": "Elixir",
+        "cpp": "C++", "c": "C", "h": "C Header",
+        "clj": "Clojure", "lua": "Lua", "hs": "Haskell"
+    }
+
+    file_sizes = []
+
+    try:
+        for root, dirs, files in os.walk(Path.cwd()):
+            dirs[:] = [d for d in dirs if d not in EXCLUDE_DIRS]
+
+            for file in files:
+                filepath = Path(root) / file
+                ext = filepath.suffix.lstrip('.')
+
+                if not ext or ext in {"pyc", "o", "a", "so"}:
+                    continue
+
+                try:
+                    size = filepath.stat().st_size
+                    file_sizes.append((filepath.relative_to(Path.cwd()), size))
+
+                    metrics["total_files"] += 1
+                    metrics["by_extension"][ext] = metrics["by_extension"].get(ext, 0) + 1
+
+                    lang = lang_map.get(ext, "Other")
+                    metrics["by_language"][lang] = metrics["by_language"].get(lang, 0) + 1
+
+                    # Count lines for text files
+                    if ext in SOURCE_EXTS and size < 1_000_000:  # Skip huge files
+                        try:
+                            with open(filepath, 'r', encoding='utf-8', errors='ignore') as f:
+                                metrics["total_lines"] += len(f.readlines())
+                        except Exception:
+                            pass
+                except Exception:
+                    pass
+
+        # Top 10 largest files
+        file_sizes.sort(key=lambda x: x[1], reverse=True)
+        metrics["largest_files"] = [
+            f"{str(f)}: {s/1024:.1f}KB" for f, s in file_sizes[:10]
+        ]
+
+    except Exception:
+        pass
+
+    return metrics
+
+
+def print_section(title: str, content: List[str], output_file=None) -> None:
+    """Print a section with title and content."""
+    lines = [f"\n=== {title} ==="]
+
+    if isinstance(content, list):
+        lines.extend(content if content else ["None found."])
+    elif isinstance(content, str):
+        lines.append(content)
+
+    text = '\n'.join(lines) + '\n'
+
+    if output_file:
+        output_file.write(text)
+    else:
+        print(text, end='')
+
+
+def main():
+    """Main entry point."""
+    args = parse_args()
+
+    output_file = None
+    if args.output:
+        output_dir = Path(args.output).parent
+        output_dir.mkdir(parents=True, exist_ok=True)
+        output_file = open(args.output, 'w', encoding='utf-8')
+        print(f"Writing output to: {args.output}", file=sys.stderr)
+
+    try:
+        # Directory tree
+        print_section(
+            f"DIRECTORY TREE (max depth {TREE_MAX_DEPTH}, source files only)",
+            get_directory_tree(),
+            output_file
+        )
+
+        # Stack detection
+        manifests = find_manifest_files()
+        if manifests:
+            manifest_content = [""]
+            for manifest in manifests:
+                manifest_path = Path(manifest)
+                manifest_content.append(f"--- {manifest} ---")
+                if manifest == "bun.lockb":
+                    manifest_content.append("[Binary lockfile — see package.json for dependency details.]")
+                else:
+                    manifest_content.append(read_file_preview(manifest_path))
+            print_section("STACK DETECTION (manifest files)", manifest_content, output_file)
+        else:
+            print_section("STACK DETECTION (manifest files)", ["No recognized manifest files found in project root."], output_file)
+
+        # Entry points
+        entries = find_entry_points()
+        if entries:
+            entry_content = [f"Found: {e}" for e in entries]
+            print_section("ENTRY POINTS", entry_content, output_file)
+        else:
+            print_section("ENTRY POINTS", ["No common entry points found. Check 'main' or 'scripts.start' in manifest files above."], output_file)
+
+        # Linting config
+        lint = find_lint_config()
+        if lint:
+            lint_content = [f"Found: {l}" for l in lint]
+            print_section("LINTING AND FORMATTING CONFIG", lint_content, output_file)
+        else:
+            print_section("LINTING AND FORMATTING CONFIG", ["No linting or formatting config files found in project root."], output_file)
+
+        # Environment templates
+        envs = find_env_templates()
+        if envs:
+            env_content = []
+            for filename, filepath in envs:
+                env_content.append(f"--- {filename} ---")
+                env_content.append(read_file_preview(filepath))
+            print_section("ENVIRONMENT VARIABLE TEMPLATES", env_content, output_file)
+        else:
+            print_section("ENVIRONMENT VARIABLE TEMPLATES", ["No .env.example or .env.template found. Identify required environment variables by searching the code and config for environment variable reads."], output_file)
+
+        # TODOs
+        todos = search_todos()
+        if todos:
+            print_section("TODO / FIXME / HACK (production code only, test dirs excluded)", todos, output_file)
+        else:
+            print_section("TODO / FIXME / HACK (production code only, test dirs excluded)", ["None found."], output_file)
+
+        # Git info
+        if is_git_repo():
+            commits = get_git_commits()
+            if commits:
+                print_section("GIT RECENT COMMITS (last 20)", commits, output_file)
+            else:
+                print_section("GIT RECENT COMMITS (last 20)", ["No commits found."], output_file)
+
+            churn = get_git_churn()
+            if churn:
+                print_section("HIGH-CHURN FILES (last 90 days, top 20)", churn, output_file)
+            else:
+                print_section("HIGH-CHURN FILES (last 90 days, top 20)", ["None found."], output_file)
+        else:
+            print_section("GIT RECENT COMMITS (last 20)", ["Not a git repository or no commits yet."], output_file)
+            print_section("HIGH-CHURN FILES (last 90 days, top 20)", ["Not a git repository."], output_file)
+
+        # Monorepo detection
+        monorepo = detect_monorepo()
+        if monorepo:
+            print_section("MONOREPO SIGNALS", monorepo, output_file)
+        else:
+            print_section("MONOREPO SIGNALS", ["No monorepo signals detected."], output_file)
+
+        # Code metrics
+        metrics = collect_code_metrics()
+        metrics_output = [
+            f"Total files scanned: {metrics['total_files']}",
+            f"Total lines of code: {metrics['total_lines']}",
+            ""
+        ]
+        if metrics["by_language"]:
+            metrics_output.append("Files by language:")
+            for lang, count in sorted(metrics["by_language"].items(), key=lambda x: x[1], reverse=True):
+                metrics_output.append(f"  {lang}: {count}")
+        if metrics["largest_files"]:
+            metrics_output.append("")
+            metrics_output.append("Top 10 largest files:")
+            metrics_output.extend(metrics["largest_files"])
+        print_section("CODE METRICS", metrics_output, output_file)
+
+        # CI/CD Detection
+        ci_cd = detect_ci_cd_pipelines()
+        if ci_cd:
+            print_section("CI/CD PIPELINES", ci_cd, output_file)
+        else:
+            print_section("CI/CD PIPELINES", ["No CI/CD pipelines detected."], output_file)
+
+        # Container Detection
+        containers = detect_containers()
+        if containers:
+            print_section("CONTAINERS & ORCHESTRATION", containers, output_file)
+        else:
+            print_section("CONTAINERS & ORCHESTRATION", ["No containerization configs detected."], output_file)
+
+        # Security Configs
+        security = detect_security_configs()
+        if security:
+            print_section("SECURITY & COMPLIANCE", security, output_file)
+        else:
+            print_section("SECURITY & COMPLIANCE", ["No security configs detected."], output_file)
+
+        # Performance Markers
+        performance = detect_performance_markers()
+        if performance:
+            print_section("PERFORMANCE & TESTING", performance, output_file)
+        else:
+            print_section("PERFORMANCE & TESTING", ["No performance testing configs detected."], output_file)
+
+        # Final message
+        final_msg = "\n=== SCAN COMPLETE ===\n"
+        if output_file:
+            output_file.write(final_msg)
+        else:
+            print(final_msg, end='')
+
+        return 0
+
+    except Exception as e:
+        print(f"Error: {e}", file=sys.stderr)
+        return 1
+
+    finally:
+        if output_file:
+            output_file.close()
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/.github/skills/aspire/README.md b/.github/skills/aspire/README.md
new file mode 100644
index 00000000..4783b971
--- /dev/null
+++ b/.github/skills/aspire/README.md
@@ -0,0 +1,42 @@
+# Aspire
+
+Orchestrates the Aspire distributed application using the Aspire CLI — starting, stopping, inspecting resources, tailing logs, and managing the AppHost without needing to remember every command.
+
+## When to use
+
+Use for anything Aspire-specific: starting the app, waiting for a resource to be healthy, viewing logs or traces, adding an integration, or running environment diagnostics.
+
+Use `dotnet` CLI directly for non-Aspire .NET operations (build, test, run a single project).
+
+## How to invoke
+
+**Claude Code:**
+```
+/aspire
+```
+
+**GitHub Copilot Chat:**
+```
+#file:.github/skills/aspire/SKILL.md  start the app and wait for the API to be healthy
+```
+
+Optionally supply a resource name, command, or context — e.g. `start isolated`, `logs products-api`, `debug startup failure`.
+
+## Common operations
+
+| What you want | Command |
+|---------------|---------|
+| Start the app | `aspire start` |
+| Start isolated (no shared state with other instances) | `aspire start --isolated` |
+| Wait until a resource is healthy | `aspire wait <resource>` |
+| Stop the app | `aspire stop` |
+| List all resources and their status | `aspire describe` |
+| Stream console logs | `aspire logs [resource]` |
+| View structured logs / traces | `aspire otel logs [resource]` · `aspire otel traces [resource]` |
+| Rebuild a changed .NET project | `aspire resource <resource> rebuild` |
+| Add an Aspire integration | `aspire add` |
+| Environment diagnostics | `aspire doctor` |
+
+## Reference
+
+- [SKILL.md](./SKILL.md) — full CLI command reference, key workflows, and agent environment guidance.
diff --git a/.github/skills/aspire/SKILL.md b/.github/skills/aspire/SKILL.md
new file mode 100644
index 00000000..5e8b6394
--- /dev/null
+++ b/.github/skills/aspire/SKILL.md
@@ -0,0 +1,108 @@
+---
+name: aspire
+description: "Orchestrates Aspire distributed applications using the Aspire CLI for running, debugging, and managing distributed apps. USE FOR: aspire start, aspire stop, start aspire app, aspire describe, list aspire integrations, debug aspire issues, view aspire logs, add aspire resource, aspire dashboard, update aspire apphost. DO NOT USE FOR: non-Aspire .NET apps (use dotnet CLI), container-only deployments (use docker/podman), Azure deployment after local testing (use azure-deploy skill). INVOKES: Aspire CLI commands (aspire start, aspire describe, aspire otel logs, aspire docs search, aspire add), bash. FOR SINGLE OPERATIONS: Use Aspire CLI commands directly for quick resource status or doc lookups."
+argument-hint: "Optional: resource name, command (start/stop/logs), or debug context"
+tags: ["aspire", "orchestration", "distributed-apps", "cli", "debugging"]
+---
+
+# Aspire Skill
+
+This repository uses Aspire to orchestrate its distributed application. Resources are defined in the AppHost project (`apphost.cs` or `apphost.ts`).
+
+## CLI command reference
+
+| Task | Command |
+|---|---|
+| Start the app | `aspire start` |
+| Start isolated (worktrees) | `aspire start --isolated` |
+| Restart the app | `aspire start` (stops previous automatically) |
+| Wait for resource healthy | `aspire wait <resource>` |
+| Stop the app | `aspire stop` |
+| List resources | `aspire describe` or `aspire resources` |
+| Run resource command | `aspire resource <resource> <command>` |
+| Start/stop/restart resource | `aspire resource <resource> start|stop|restart` |
+| Rebuild a .NET project resource | `aspire resource <resource> rebuild` |
+| View console logs | `aspire logs [resource]` |
+| View structured logs | `aspire otel logs [resource]` |
+| View traces | `aspire otel traces [resource]` |
+| Logs for a trace | `aspire otel logs --trace-id <id>` |
+| Add an integration | `aspire add` |
+| List running AppHosts | `aspire ps` |
+| Update AppHost packages | `aspire update` |
+| Search docs | `aspire docs search <query>` |
+| Get doc page | `aspire docs get <slug>` |
+| List doc pages | `aspire docs list` |
+| Environment diagnostics | `aspire doctor` |
+| List resource MCP tools | `aspire mcp tools` |
+| Call resource MCP tool | `aspire mcp call <resource> <tool> --input <json>` |
+
+Most commands support `--format Json` for machine-readable output. Use `--apphost <path>` to target a specific AppHost.
+
+## Key workflows
+
+### Running in agent environments
+
+Use `aspire start` to run the AppHost in the background. When working in a git worktree, use `--isolated` to avoid port conflicts and to prevent sharing user secrets or other local state with other running instances:
+
+```bash
+aspire start --isolated
+```
+
+Use `aspire wait <resource>` to block until a resource is healthy before interacting with it:
+
+```bash
+aspire start --isolated
+aspire wait myapi
+```
+
+### Applying code changes
+
+Choose the right action based on what changed:
+
+| What changed | Action | Why |
+|---|---|---|
+| AppHost project (`apphost.cs`/`apphost.ts`) | `aspire start` | Resource graph changed; full restart required |
+| Compiled .NET project resource | `aspire resource <name> rebuild` | Rebuilds and restarts only that resource |
+| Interpreted resource (JavaScript, Python) | Typically nothing — most run with file watchers | Restart the resource if no watch mode is configured |
+
+**Never restart the entire AppHost just because a single resource changed.** Use `aspire resource <name> rebuild` for .NET project resources — it coordinates stop, build, and restart for just that resource. Use `aspire describe --format Json` to check which commands a resource supports.
+
+### Debugging issues
+
+Before making code changes, inspect the app state:
+
+1. `aspire describe` — check resource status
+2. `aspire otel logs <resource>` — view structured logs
+3. `aspire logs <resource>` — view console output
+4. `aspire otel traces <resource>` — view distributed traces
+
+### Adding integrations
+
+Use `aspire docs search` to find integration documentation, then `aspire docs get` to read the full guide. Use `aspire add` to add the integration package to the AppHost.
+
+After adding an integration, restart the app with `aspire start` for the new resource to take effect.
+
+### Using resource MCP tools
+
+Some resources expose MCP tools (e.g. `WithPostgresMcp()` adds SQL query tools). Discover and call them via CLI:
+
+```bash
+aspire mcp tools                                              # list available tools
+aspire mcp tools --format Json                                # includes input schemas
+aspire mcp call <resource> <tool> --input '{"key":"value"}'   # invoke a tool
+```
+
+## Important rules
+
+- **Always start the app first** (`aspire start`) before making changes to verify the starting state.
+- **To restart, just run `aspire start` again** — it automatically stops the previous instance. NEVER use `aspire stop` then `aspire run`. NEVER use `aspire run` at all.
+- **Only restart the AppHost when AppHost code changes.** For .NET project resources, use `aspire resource <name> rebuild` instead.
+- Use `--isolated` when working in a worktree.
+- **Avoid persistent containers** early in development to prevent state management issues.
+- **Never install the Aspire workload** — it is obsolete.
+- **For Aspire API reference and documentation, prefer `aspire docs search <query>` and `aspire docs get <slug>`** over searching NuGet package caches or XML doc files. The CLI provides up-to-date content from aspire.dev.
+- Prefer `aspire.dev` and `learn.microsoft.com/microsoft/aspire` for official documentation.
+
+## Playwright CLI
+
+If configured, use Playwright CLI for functional testing of resources. Get endpoints via `aspire describe`. Run `playwright-cli --help` for available commands.
\ No newline at end of file
diff --git a/.github/skills/coreex-docs-sync/README.md b/.github/skills/coreex-docs-sync/README.md
new file mode 100644
index 00000000..e513d62f
--- /dev/null
+++ b/.github/skills/coreex-docs-sync/README.md
@@ -0,0 +1,67 @@
+# CoreEx Docs Sync
+
+Fetches the CoreEx architecture docs and per-package AI guides from GitHub and caches them locally. Once cached, the `coreex-expert` agent uses the local copies instead of making live GitHub fetches on every question.
+
+## When to run
+
+- **First time** setting up a consuming project — populates the cache from scratch.
+- **After bumping a CoreEx NuGet version** — keeps the guides in sync with the version in use.
+- **When the CoreEx Expert recommends it** — the agent checks the manifest on every session and flags if the cache is older than 30 days or the recorded version doesn't match the project's current packages.
+
+Do not run this inside the CoreEx repository itself — the docs are already present locally at `samples/docs/` and `src/*/AGENTS.md`.
+
+## How to invoke
+
+**Claude Code:**
+```
+/coreex-docs-sync
+```
+
+**GitHub Copilot Chat:**
+```
+#file:.github/skills/coreex-docs-sync/SKILL.md  sync the CoreEx docs
+```
+
+No arguments required.
+
+## What gets written
+
+```
+.github/docs/coreex/
+  .manifest                    ← sync date, CoreEx version, referenced packages
+  local-dev.md
+  layers.md
+  patterns.md
+  contracts-layer.md
+  domain-layer.md
+  application-layer.md
+  infrastructure-layer.md
+  hosts-layer.md
+  testing.md
+  tooling.md
+  aspire.md
+  agents/
+    CoreEx.md                  ← one guide per package, always synced
+    CoreEx.AspNetCore.md
+    CoreEx.AspNetCore.NSwag.md
+    CoreEx.Azure.Messaging.ServiceBus.md
+    CoreEx.Caching.FusionCache.md
+    CoreEx.CodeGen.md
+    CoreEx.Data.md
+    CoreEx.Database.md
+    CoreEx.Database.Postgres.md
+    CoreEx.Database.SqlServer.md
+    CoreEx.DomainDriven.md
+    CoreEx.EntityFrameworkCore.md
+    CoreEx.Events.md
+    CoreEx.RefData.md
+    CoreEx.UnitTesting.md
+    CoreEx.Validation.md
+```
+
+All 16 package guides are synced unconditionally — not just the packages the project currently references. This lets the expert recommend adopting a new package with full knowledge of what it offers. The `referenced-packages` field in the manifest records which packages are actually in the project so the expert can distinguish the two.
+
+## Reference
+
+- [SKILL.md](./SKILL.md) — full detail on detection logic, manifest format, and re-run triggers.
+- [CoreEx Expert agent README](../agents/README.md) — how the agent uses the cache and when it suggests a refresh.
diff --git a/.github/skills/coreex-docs-sync/SKILL.md b/.github/skills/coreex-docs-sync/SKILL.md
new file mode 100644
index 00000000..fc3ff23b
--- /dev/null
+++ b/.github/skills/coreex-docs-sync/SKILL.md
@@ -0,0 +1,83 @@
+---
+name: coreex-docs-sync
+description: "Fetch the CoreEx sample architecture docs and all per-package AI usage guides from GitHub and cache them locally under .github/docs/coreex/. Guides for all CoreEx packages are synced regardless of which ones the project currently references, enabling the CoreEx Expert to guide on and recommend any package."
+argument-hint: No arguments required. Run to set up or refresh the local doc cache.
+tags: ["docs", "cache", "sync", "coreex-expert", "offline"]
+---
+
+# Sync CoreEx Docs
+
+Fetches the CoreEx sample architecture docs and AI usage guides for all CoreEx packages from GitHub, writing them to `.github/docs/coreex/`. All 16 package guides are synced unconditionally — this enables the CoreEx Expert to give authoritative guidance on any package, including ones not yet adopted by the project. Writes a manifest recording which packages the project currently references so the expert can distinguish "already in use" from "you'd need to add this."
+
+## When to Use
+
+- Setting up the local doc cache for the first time in a consuming project.
+- After bumping a CoreEx NuGet package version.
+- When the CoreEx Expert recommends a refresh (cache older than 30 days or version mismatch).
+- Any time you want to ensure local docs reflect the latest CoreEx `main` branch.
+
+## When Not to Use
+
+- In the CoreEx repository itself — the docs are already present at `samples/docs/` and `src/*/AGENTS.md`.
+- When you only need one specific doc — fetch the GitHub URL directly instead.
+
+## What It Does
+
+1. **Detects** the current `CoreEx` NuGet version from `Directory.Packages.props`, `*.csproj`, or `Directory.Build.props`.
+2. **Detects** all `CoreEx.*` package references currently in the project — recorded in the manifest for the expert's awareness, not used to limit what is synced.
+3. **Creates** `.github/docs/coreex/` and `.github/docs/coreex/agents/` if they do not exist.
+4. **Fetches** the 11 sample architecture docs and writes them to `.github/docs/coreex/`.
+5. **Fetches** all 16 per-package `AGENTS.md` guides and writes them to `.github/docs/coreex/agents/`.
+6. **Writes** `.github/docs/coreex/.manifest` with sync date, CoreEx version, and the list of packages currently referenced in the project.
+7. **Reports** success, any fetch failures, and a reminder of when to re-run.
+
+## Cache Layout
+
+```
+.github/docs/coreex/
+  .manifest                              # synced date, coreex-version, referenced-packages
+  local-dev.md
+  layers.md
+  patterns.md
+  contracts-layer.md
+  domain-layer.md
+  application-layer.md
+  infrastructure-layer.md
+  hosts-layer.md
+  testing.md
+  tooling.md
+  aspire.md
+  agents/
+    CoreEx.md                            # always present after sync
+    CoreEx.AspNetCore.md                 # always present after sync
+    CoreEx.AspNetCore.NSwag.md
+    CoreEx.Azure.Messaging.ServiceBus.md
+    CoreEx.Caching.FusionCache.md
+    CoreEx.CodeGen.md
+    CoreEx.Data.md
+    CoreEx.Database.md
+    CoreEx.Database.Postgres.md
+    CoreEx.Database.SqlServer.md
+    CoreEx.DomainDriven.md
+    CoreEx.EntityFrameworkCore.md
+    CoreEx.Events.md
+    CoreEx.RefData.md
+    CoreEx.UnitTesting.md
+    CoreEx.Validation.md
+```
+
+## Manifest Format
+
+```
+synced: YYYY-MM-DD
+coreex-version: <detected version, or "unknown">
+referenced-packages: CoreEx, CoreEx.Validation, CoreEx.EntityFrameworkCore, ...
+```
+
+The `referenced-packages` field lets the CoreEx Expert distinguish between packages already in the project and packages it might recommend adding.
+
+## Re-run Triggers
+
+- CoreEx NuGet version bumped in the project.
+- CoreEx Expert reports cache is older than 30 days.
+- CoreEx Expert reports a version mismatch between the manifest and the project's current package version.
diff --git a/.github/skills/solution-scaffolder/README.md b/.github/skills/solution-scaffolder/README.md
new file mode 100644
index 00000000..5e06da37
--- /dev/null
+++ b/.github/skills/solution-scaffolder/README.md
@@ -0,0 +1,49 @@
+# CoreEx Scaffold
+
+Guides a developer through selecting the right `CoreEx.Template` scaffolding shape and then runs the matching `dotnet new coreex*` commands.
+
+## When to run
+
+- The repository is empty or only contains the `coreex-bootstrap` AI shell.
+- You want the scaffolder to choose the smallest safe CoreEx shape before scaffolding.
+- You want an interactive workflow instead of manually composing the template commands.
+
+## How to invoke
+
+**GitHub Copilot Chat:**
+```
+/coreex-scaffold
+```
+
+**Claude Code:**
+```
+/coreex-scaffold
+```
+
+If the prompt file is not present, attach the skill file directly in Copilot Chat:
+
+```
+#file:.github/skills/solution-scaffolder/SKILL.md scaffold a new CoreEx solution for my requirements
+```
+
+## What it will do
+
+1. Inspect the workspace to confirm it is suitable for greenfield scaffolding.
+2. Ask about the business/domain shape through one-question-at-a-time confirmation cards with defaults, then derive the required hosts.
+3. Recommend the exact `dotnet new coreex*` commands.
+4. Install `CoreEx.Template` if it is not already available.
+5. In a confirmed bootstrap-only repo, use `dotnet new ... --force` only after a dry-run shows the expected canonical layout.
+6. Run the selected commands and summarize the output.
+
+## Interview behavior
+
+- The scaffold flow should use a form-style confirmation card for each question when `mcp_microsoft_git_confirm_options` is available.
+- Each card should contain a single editable field and a preselected default.
+- Use a text field only for the base solution name and select fields for all other questions.
+- The prompt and skill should ask one question at a time and wait for confirmation before moving on.
+
+## Reference
+
+- [SKILL.md](./SKILL.md) - main workflow guidance.
+
+
diff --git a/.github/skills/solution-scaffolder/SKILL.md b/.github/skills/solution-scaffolder/SKILL.md
new file mode 100644
index 00000000..e12813a8
--- /dev/null
+++ b/.github/skills/solution-scaffolder/SKILL.md
@@ -0,0 +1,185 @@
+---
+name: solution-scaffolder
+description: "Guide a developer through CoreEx solution shaping after bootstrap, using a short plain-English interview that turns user answers into safe dotnet new template inputs. USE FOR: bootstrap-only repos, deciding API-only vs API plus relay vs API plus subscriber, choosing SQL Server vs Postgres vs no database, choosing refdata/outbox/DDD/ROP options, installing CoreEx.Template, checking current solution shape, adding missing Api/Relay/Subscribe hosts to an existing repo, and optionally preparing a first local runnable state with local dependency assets plus database/code-generation steps. DO NOT USE FOR: unrelated runtime debugging, bootstrap creation, or forcing root re-scaffolding over an existing solution. INVOKES: workspace inspection, ask-questions style interviews, dotnet new install/list, dry-run validation, solution wiring, optional local dependency asset creation, focused build/test validation, and either template generation or manual retrofit work depending on repo shape."
+argument-hint: "Optional: base solution name, whether this is new or retrofit, required hosts, database choice, and messaging needs."
+tags: ["coreex", "scaffolding", "retrofit", "template", "hosts"]
+---
+
+# CoreEx Scaffold
+
+Guides a repository through the right CoreEx setup path by interviewing the user in simple English and translating the answers into safe CoreEx template commands.
+
+## When to Use
+
+- Starting a new CoreEx domain or service from a repository that already contains only the bootstrap AI assets.
+- Deciding whether the first cut should create just the API host or also include the outbox relay and/or subscriber hosts.
+- Adding missing `Api`, `Relay`, or `Subscribe` hosts to an existing scaffolded CoreEx solution.
+- Converting plain-English project needs into either the matching `dotnet new coreex*` commands or the safest retrofit path.
+
+## When Not to Use
+
+- You are debugging local runtime, container, Aspire, or package restore issues unrelated to project shaping.
+- You still need to create the initial bootstrap repository; run `coreex-bootstrap` before this skill is used.
+- You want architectural guidance for an existing implementation beyond project setup; use `CoreEx Expert` instead.
+
+## Workflow Overview
+
+1. **Inspect the workspace shape first.**
+2. **Interview the user in simple English.** Ask one short question at a time and turn the answers into template inputs.
+3. **Validate the naming shape before any template command.**
+4. **Choose the safest implementation path.** Prefer dry-runs and stop on layout mismatches.
+5. **Apply the right shape.** Generate only what is missing or explicitly requested.
+6. **Validate the scaffold.** Wire projects into the solution, then choose between shape validation and fully runnable local validation.
+7. **Summarize the result.** Show the derived inputs, commands, validations, and any deferred steps.
+
+For step-by-step guidance, see [references/workflow.md](references/workflow.md).
+
+## Interactive Interview Rules
+
+- When `mcp_microsoft_git_confirm_options` is available, use it for every interview step.
+- Each interview turn must contain exactly one editable field plus optional readonly context fields.
+- Ask short, plain-English questions. Do not ask the user to supply template flag names.
+- The canonical interview order is: base solution name, new vs retrofit, HTTP API, reliable event publishing, event consumption, data storage, messaging provider when needed, reference data, domain layer, and ROP.
+- Use a single `text` field only for the base solution name.
+- Use a single `select` field for every other interview step so the workflow stays multiple-choice and deterministic.
+- For yes or no questions, use a `select` with `Yes` and `No` so the default remains visibly preselected.
+- Prefer either/or or small-choice questions before any extra freeform follow-up.
+- Do not batch multiple scaffold questions into a single assistant message.
+- If the user gives a partial or non-canonical name, stop and help them reach `[Company].[Product].[Domain]` before any template command.
+- If the workspace already proves a choice, confirm it instead of asking again.
+- Before any real `dotnet new` command, restate the derived inputs in one compact summary and ask for confirmation when there is any ambiguity.
+
+## Default Selection Policy
+
+When the workspace does not already prove a value, preselect the safest default that still keeps the workflow moving:
+
+| Question | Default |
+|---|---|
+| Base solution name | The workspace root folder name if it is already in `[Company].[Product].[Domain]` form; otherwise the best canonical guess from workspace hints. If only two parts exist, use `Product` as a temporary middle segment. The user can override during the interview. |
+| New domain or retrofit | `New domain` in a bootstrap-only repo |
+| HTTP API | `Yes` |
+| Reliable event publishing | `No` |
+| Event consumption | `No` |
+| Data storage | `No local database` |
+| Messaging provider | `Yes` for Azure Service Bus when messaging is needed |
+| Reference data | `No` |
+| Domain layer | `No` |
+| Result/ROP style | `No` |
+
+Set outbox to `true` only when the user chose owned persistence and reliable publishing. Otherwise keep it `false`.
+
+## Quick Reference
+
+| User answer | Template impact |
+|---|---|
+| "I need HTTP endpoints." | Add `coreex-api`. |
+| "I need to publish events reliably." | Add `coreex-relay`; use a messaging provider and keep outbox enabled where relevant. |
+| "I need to consume events." | Add `coreex-subscribe`; use a messaging provider. |
+| "This service stores its own data in SQL Server." | `--data-provider SqlServer` |
+| "This service stores its own data in Postgres." | `--data-provider Postgres` |
+| "This is a facade. No local database." | `--data-provider None` |
+| "I need reference data." | `--refdata-enabled true` |
+| "I want a Domain layer." | `--domain-driven-enabled true` |
+| "I want Result/ROP style pipelines." | `--rop-enabled true` |
+
+## Prerequisite
+
+Assume the repository is already in one of these states before this skill runs:
+- a bootstrap-only shell created earlier by `coreex-bootstrap`; or
+- an existing CoreEx solution that is missing some runtime hosts.
+
+## Naming Rules
+
+- The base solution name must be in `[Company].[Product].[Domain]` form, e.g. `Avanade.Bookstore.Books`.
+- The `coreex` (solution) template takes the **3-part base name**: `-n Company.Product.Domain`. If the current directory is already named `Company.Product.Domain`, `-n` can be omitted — the template uses the folder name automatically.
+- Each **host template** takes a **4-part name** with the host suffix appended:
+  - `coreex-api -n Company.Product.Domain.Api`
+  - `coreex-relay -n Company.Product.Domain.Relay`
+  - `coreex-subscribe -n Company.Product.Domain.Subscribe`
+- Host templates **always require `-n`** — the folder name is the 3-part base and cannot supply the host suffix automatically.
+- Do not pass the 3-part base name to host templates; doing so causes all three hosts to emit into the same `src/Company.Product.Domain/` directory, overwriting each other.
+- If the user gives only a two-part name, ask for the missing segment before running any template.
+- If the repository already exists with a non-canonical root name (e.g., `Avanade.Books`), prefer a manual retrofit unless the user explicitly wants to rename the solution first.
+
+## Command Patterns
+
+### Bootstrap-Only Repository
+
+```text
+# Step 1: Run the solution template. If the folder is named Avanade.Product.Books, -n can be omitted.
+dotnet new coreex -n Avanade.Product.Books --data-provider SqlServer --messaging-provider ServiceBus --refdata-enabled true --outbox-enabled true --domain-driven-enabled false --rop-enabled false
+
+# Step 2: Add each host template using the 4-part name (base + host suffix).
+dotnet new coreex-api        -n Avanade.Product.Books.Api        --data-provider SqlServer --refdata-enabled true --outbox-enabled true
+dotnet new coreex-relay      -n Avanade.Product.Books.Relay      --data-provider SqlServer --messaging-provider ServiceBus
+dotnet new coreex-subscribe -n Avanade.Product.Books.Subscribe --data-provider SqlServer --messaging-provider ServiceBus --refdata-enabled true
+
+# Step 3: Add host and test projects to the solution file.
+dotnet sln Avanade.Product.Books.slnx add src/Avanade.Product.Books.Api
+dotnet sln Avanade.Product.Books.slnx add tests/Avanade.Product.Books.Test.Api
+dotnet sln Avanade.Product.Books.slnx add src/Avanade.Product.Books.Relay
+dotnet sln Avanade.Product.Books.slnx add tests/Avanade.Product.Books.Test.Relay
+dotnet sln Avanade.Product.Books.slnx add src/Avanade.Product.Books.Subscribe
+dotnet sln Avanade.Product.Books.slnx add tests/Avanade.Product.Books.Test.Subscribe
+
+# Step 4: Validate the generated solution.
+dotnet build Avanade.Product.Books.slnx
+dotnet test tests/Avanade.Product.Books.Test.Unit
+# Run broader test projects only when their local infrastructure dependencies are available.
+```
+
+### Existing Repository Retrofit (Skip Bootstrap)
+
+```text
+# If the repo already has a bootstrap or partial scaffold, run only the missing domain/host templates.
+# Confirm the canonical three-part base name, then run coreex and/or host templates with the correct suffixes.
+dotnet new coreex            -n Company.Product.Domain ...
+dotnet new coreex-api        -n Company.Product.Domain.Api ...
+dotnet new coreex-relay      -n Company.Product.Domain.Relay ...
+dotnet new coreex-subscribe -n Company.Product.Domain.Subscribe ...
+# Then add new projects to the solution file as in Step 3 above.
+```
+
+## Existing Repository Guardrails
+
+- **Bootstrap is a prereq:** This skill assumes any bootstrap creation has already happened before the workflow starts.
+- **For retrofit work:** If the repo already contains a solution, `src/`, tooling, or tests, do not re-run the root scaffold unless the current shape is still only the bootstrap shell.
+- **Template identity conflicts:** If `dotnet new list` or template execution reports duplicate CoreEx template identities, warn the user which template source is being selected before continuing.
+- **Pre-flight validation:** Always run a dry-run with the intended base solution name before any real domain/host template invocation.
+- **Watch for nested roots:** If dry-run output shows paths like `src\\Company.Product.Domain.Api\\src\\Company.Product.Domain.Api\\...`, the output root is wrong; stop and change strategy.
+- **Naming mismatch:** If dry-run output shows incorrect project names because the repo uses a non-canonical root name, stop and recommend either renaming the solution first or manually creating the missing hosts.
+- **Force only for bootstrap replacement:** In a confirmed bootstrap-only repo, `--force` is acceptable only after dry-run validation shows the expected canonical layout.
+- **No force for mismatches:** Do not use `--force` to push through a naming or layout mismatch. The mismatch itself indicates an unsafe operation.
+
+## Validation Rules
+
+- After generation, verify that every expected host and test project exists on disk and has been added to the `.slnx`.
+- Always run `dotnet build` on the solution as the minimum end-to-end validation step.
+- Always run the unit test project when present.
+- Run API, relay, or subscriber test projects only when their required local dependencies are available; otherwise skip them and report the reason explicitly.
+- Treat missing local infrastructure such as SQL Server, Postgres, Redis, or Service Bus as a validation skip, not as a scaffolding failure, unless the user explicitly asked for full local environment setup.
+- When the user explicitly wants a first local runnable state, create any missing local dependency assets before broader validation, using bundled templates where available.
+- When `data-provider != None` and the user wants runnable local state, run the `*.Database` tool from its own project directory so `dbex.yaml` resolves correctly; prefer `dotnet run -- All` for first-run local setup.
+- When `refdata-enabled` is `true` and the user wants runnable local state, run the `*.CodeGen` tool from its own project directory so its config file resolves correctly.
+- If generated code fails to compile before environment or tool execution becomes relevant, treat that as a template or package-version defect first; prefer fixing the template pack rather than teaching the workflow to hand-patch generated output every time.
+- If `refdata-enabled` is `true`, call out the `*.CodeGen` tool as the next step or run it only when the user wants a fully generated local state.
+- If `data-provider != None`, call out the `*.Database` tool as the next step or run it only when the user wants local schema setup as part of scaffolding.
+
+## Shape Selection Guide
+
+| Need | Recommendation |
+|---|---|
+| Empty repo, own data, expose HTTP only | `coreex` + `coreex-api` |
+| Empty repo, own data, expose HTTP, publish reliable events | `coreex` + `coreex-api` + `coreex-relay` |
+| Empty repo, expose HTTP, publish events, consume events | `coreex` + `coreex-api` + `coreex-relay` + `coreex-subscribe` |
+| Existing repo missing only runtime hosts | Infer current shape, then add only the missing hosts |
+| Facade over another system with no local database | `coreex --data-provider None --messaging-provider None` and add `coreex-api --data-provider None` only if an API is needed |
+
+## Key References
+
+- `../../docs/coreex/application-scaffolding-guide.md`.
+- `../../docs/coreex/layers.md`.
+- `../../docs/coreex/patterns.md`.
+- `https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.Template/README.md`.
+
+
diff --git a/.github/skills/solution-scaffolder/assets/docker-compose.local.yml b/.github/skills/solution-scaffolder/assets/docker-compose.local.yml
new file mode 100644
index 00000000..b9f7f5d4
--- /dev/null
+++ b/.github/skills/solution-scaffolder/assets/docker-compose.local.yml
@@ -0,0 +1,52 @@
+name: CoreEx
+
+services:
+  db-sql-server:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    environment:
+      SA_PASSWORD: "yourStrong(!)Password"
+      ACCEPT_EULA: "Y"
+    ports:
+      - "1433:1433"
+
+  db-postgres:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: "yourStrong#!Password"
+    ports:
+      - "5432:5432"
+
+  redis-cache:
+    image: docker.io/redis:latest
+    ports:
+      - "6379:6379"
+
+  aspire-dashboard:
+    image: mcr.microsoft.com/dotnet/nightly/aspire-dashboard:latest
+    environment:
+      - DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true
+    ports:
+      - "18888:18888"
+      - "4317:18889"
+
+  servicebus-emulator:
+    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
+    depends_on:
+      - db-sql-server
+    volumes:
+      - ./servicebus/Config.json:/ServiceBus_Emulator/ConfigFiles/Config.json
+    environment:
+      SQL_SERVER: db-sql-server
+      MSSQL_SA_PASSWORD: "yourStrong(!)Password"
+      ACCEPT_EULA: "Y"
+    ports:
+      - "5672:5672"
+      - "5300:5300"
+
+  dts-emulator:
+    image: mcr.microsoft.com/dts/dts-emulator:latest
+    environment:
+      DTS_TASK_HUB_NAMES: "default,order"
+    ports:
+      - "8080:8080"
+      - "8082:8082"
diff --git a/.github/skills/solution-scaffolder/assets/servicebus-config.template.json b/.github/skills/solution-scaffolder/assets/servicebus-config.template.json
new file mode 100644
index 00000000..f2e92f3b
--- /dev/null
+++ b/.github/skills/solution-scaffolder/assets/servicebus-config.template.json
@@ -0,0 +1,71 @@
+{
+  "UserConfig": {
+    "Namespaces": [
+      {
+        "Name": "sbemulatorns",
+        "Topics": [
+          {
+            "Name": "unit-test",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "default",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": false
+                }
+              }
+            ]
+          },
+          {
+            "Name": "unit-test-2",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "default",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": false
+                }
+              }
+            ]
+          },
+          {
+            "Name": "__TOPIC_NAME__",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "__SUBSCRIPTION_NAME__",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": true
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "Logging": {
+      "Type": "Console"
+    }
+  }
+}
diff --git a/.github/skills/solution-scaffolder/references/workflow.md b/.github/skills/solution-scaffolder/references/workflow.md
new file mode 100644
index 00000000..0dfccf7e
--- /dev/null
+++ b/.github/skills/solution-scaffolder/references/workflow.md
@@ -0,0 +1,429 @@
+# Workflow
+
+Use this workflow to guide the user through CoreEx solution shape decisions in plain English, then turn the answers into safe `dotnet new` inputs.
+
+## Principles
+
+- Ask one short question at a time.
+- Use simple English, not template parameter names.
+- Prefer small fixed choices before freeform text.
+- Reuse what the workspace already proves.
+- If the user seems unsure, give a recommended default and explain it in one sentence.
+- Before running any real command, restate the derived inputs in a compact summary.
+- Finish with executable validation, not just generated files.
+
+## Mandatory Interview Mechanics
+
+- When `mcp_microsoft_git_confirm_options` is available, use it for each interview step.
+- Ask exactly one scaffold question per turn.
+- Each confirmation card must contain exactly one editable option plus optional readonly context.
+- Use a `text` field only for the base solution name.
+- Use `select` fields for every other interview question so the workflow stays multiple-choice.
+- Preselect or prefill a default for the current question.
+- Never batch multiple scaffold questions into one assistant message.
+- Wait for the user to confirm the current card before moving to the next question.
+
+## Default Selection Policy
+
+Use these defaults when the workspace does not already prove the answer:
+
+| Question | Default |
+|---|---|
+| Base solution name | The workspace root folder name if it is already in `[Company].[Product].[Domain]` form; otherwise the best canonical guess from workspace hints. If only two parts exist, insert `Product` as the temporary middle segment. The user can override during the interview. |
+| New domain or retrofit | `New domain` for bootstrap-only repos |
+| HTTP API | `Yes` |
+| Reliable event publishing | `No` |
+| Event consumption | `No` |
+| Data storage | `No local database` |
+| Messaging provider | `Yes` for Azure Service Bus when messaging is required |
+| Reference data | `No` |
+| Domain layer | `No` |
+| Result/ROP style | `No` |
+
+Derive `outbox-enabled` after the interview. Default it to `false` unless the user chose owned persistence and reliable publishing.
+
+## Phase 1: Inspect The Workspace
+
+Decide which path applies.
+
+### Bootstrap-only shell
+
+Treat the repo as bootstrap-only when the workspace mostly contains AI assets, docs, or starter shell content and does not yet contain a populated CoreEx solution for the target domain.
+
+### Existing scaffolded solution
+
+Treat the repo as scaffolded when there is already a real solution shape, such as a populated `src/`, `tests/`, `*.Database`, `*.CodeGen`, or one or more existing hosts.
+
+If the workspace already shows the current provider, naming shape, or enabled capabilities, confirm those choices instead of asking open-ended questions again.
+
+## Phase 2: Run The Interview
+
+Ask the questions in this order. Skip questions that the workspace has already answered with high confidence.
+
+Implementation notes:
+- Use one `confirm_options` call per question when the tool is available.
+- Include only one editable field in the card for the current question.
+- Use readonly fields to show prior confirmed answers when that context helps the user answer quickly.
+- If `confirm_options` is unavailable, ask the same question as plain chat text and still ask only one question per message.
+
+### 1. Base solution name
+
+Ask:
+
+> What should the base solution name be? Use `Company.Product.Domain`, for example `Avanade.Product.Books`.
+
+Default:
+
+> Use the workspace root folder name if it is already in `[Company].[Product].[Domain]` form. If only a two-part name exists, use `Product` as the temporary middle segment and ask the user to correct it if needed.
+
+If the user gives only two parts, ask:
+
+> I still need the domain part. What is the business domain name, for example `Books` or `Orders`?
+
+Rules:
+
+- Do not continue to template commands until the name is in `[Company].[Product].[Domain]` form.
+- Do not ask for host-specific names such as `.Api` or `.Subscribe` — those are derived automatically from the base name.
+
+### 2. New domain or retrofit
+
+Ask:
+
+> Are we creating a new CoreEx domain here, or adding missing hosts to an existing one?
+
+Recommended options:
+
+- `New domain`
+- `Add missing hosts`
+
+Interpretation:
+
+- `New domain` means the skill may need `coreex` plus one or more host templates.
+- `Add missing hosts` means preserve the existing provider and capability choices unless the user explicitly wants to change them.
+
+Default: `New domain` for a bootstrap-only repo.
+
+### 3. HTTP API need
+
+Ask:
+
+> Do you need an HTTP API for this solution?
+
+Recommended options:
+
+- `Yes`
+- `No`
+
+Interpretation:
+
+- `Yes` means add `coreex-api` if it does not already exist.
+
+Default: `Yes`.
+
+### 4. Reliable event publishing
+
+Ask:
+
+> Does this solution need to publish events reliably to other systems?
+
+Recommended options:
+
+- `Yes`
+- `No`
+- `Not sure`
+
+Interpretation:
+
+- `Yes` usually means use a messaging provider and add `coreex-relay`.
+- `Not sure` should trigger one brief explanation: if events must be stored with the database change and sent later, the answer is usually `Yes`.
+
+Default: `No`.
+
+### 5. Event consumption
+
+Ask:
+
+> Does this solution need to receive events from other systems?
+
+Recommended options:
+
+- `Yes`
+- `No`
+
+Interpretation:
+
+- `Yes` means add `coreex-subscribe`.
+
+Default: `No`.
+
+### 6. Data storage
+
+Ask:
+
+> Will this solution store its own data? If yes, which database do you want to use?
+
+Recommended options:
+
+- `SQL Server`
+- `Postgres`
+- `No local database`
+
+Interpretation:
+
+- `SQL Server` maps to `--data-provider SqlServer`.
+- `Postgres` maps to `--data-provider Postgres`.
+- `No local database` maps to `--data-provider None`.
+
+Default: `No local database`.
+
+### 7. Messaging provider
+
+Ask this only if the user needs to publish or consume events.
+
+> For messaging, should I use Azure Service Bus?
+
+Recommended options:
+
+- `Yes`
+- `No, I need something else`
+
+Interpretation:
+
+- `Yes` maps to `--messaging-provider ServiceBus`.
+- Any other answer should pause command generation until the supported provider choice is clear.
+
+Default: `Yes` for Azure Service Bus.
+
+### 8. Reference data
+
+Ask:
+
+> Do you need reference data code generation, such as managed lists of codes and descriptions?
+
+Recommended options:
+
+- `Yes`
+- `No`
+- `Not sure`
+
+Interpretation:
+
+- `Yes` maps to `--refdata-enabled true`.
+- `No` maps to `--refdata-enabled false`.
+- `Not sure` should get one short explanation and then a confirmation question.
+
+Default: `No`.
+
+### 9. Domain layer
+
+Ask:
+
+> Do you want a separate Domain layer for richer business logic?
+
+Recommended options:
+
+- `Yes`
+- `No`
+- `Not sure`
+
+Interpretation:
+
+- `Yes` maps to `--domain-driven-enabled true`.
+- `No` maps to `--domain-driven-enabled false`.
+
+Default: `No`.
+
+### 10. Result/ROP style
+
+Ask:
+
+> Do you want Result or ROP style service pipelines?
+
+Recommended options:
+
+- `Yes`
+- `No`
+- `Not sure`
+
+Interpretation:
+
+- `Yes` maps to `--rop-enabled true`.
+- `No` maps to `--rop-enabled false`.
+
+Default: `No`.
+
+## Phase 3: Translate Answers Into Inputs
+
+Build a structured decision summary before any command is run.
+
+| Interview outcome | Derived input |
+|---|---|
+| Base solution name confirmed as `Company.Product.Domain` | `-n Company.Product.Domain` for `coreex`; can be omitted if the folder is already named `Company.Product.Domain` |
+| HTTP API needed | `dotnet new coreex-api -n Company.Product.Domain.Api ...` |
+| Publish events reliably | `dotnet new coreex-relay -n Company.Product.Domain.Relay ...` |
+| Consume events | `dotnet new coreex-subscribe -n Company.Product.Domain.Subscribe ...` |
+| SQL Server | `--data-provider SqlServer` |
+| Postgres | `--data-provider Postgres` |
+| No local database | `--data-provider None` |
+| Azure Service Bus | `--messaging-provider ServiceBus` |
+| Reference data needed | `--refdata-enabled true` |
+| Domain layer needed | `--domain-driven-enabled true` |
+| Result/ROP style needed | `--rop-enabled true` |
+
+If the user is retrofitting an existing solution, only include flags that are required for missing projects or that the user explicitly asked to change.
+
+## Phase 4: Confirm Before Generation
+
+Before any real template command, summarize the inputs in plain English. Use a compact confirmation like this:
+
+> Here is the shape I derived: base name `Avanade.Product.Books`, new domain, API yes, relay yes, subscriber no, SQL Server, Service Bus, reference data yes, Domain layer no, ROP no. I will dry-run the matching `dotnet new` commands next.
+
+If anything in that summary is uncertain, ask for confirmation before proceeding.
+State that the workflow will finish by wiring projects into the solution and running build/test validation.
+
+## Phase 5: Safe Command Path
+
+1. Check the template pack with `dotnet new list --tag CoreEx`.
+2. Install `CoreEx.Template` if it is missing.
+3. Always run `--dry-run` before the first real template invocation unless the workspace is empty and the command shape is already obvious.
+4. Stop if the dry-run shows nested root folders, incorrect host names, or a layout that conflicts with the existing repo.
+5. For bootstrap-only repos, run `coreex` first (omit `-n` when the folder name matches), then add each needed host template with the **4-part name** (`base.Api`, `base.Relay`, `base.Subscribe`).
+6. For retrofit work, add only the missing hosts unless the user explicitly asked for broader reshaping.
+7. After generating all host templates, run `dotnet sln` to add every new host project and its test project to the `.slnx` solution file.
+8. Verify that each expected generated host and test project exists on disk before moving to validation.
+
+### Critical naming rule for host templates
+
+The `coreex` solution template takes the **3-part base name** (`Company.Product.Domain`).
+Each host template takes a **4-part name** with the host suffix appended. **Always pass `-n` explicitly for host templates** — the folder name alone cannot supply the suffix:
+
+```sh
+dotnet new coreex-api        -n Company.Product.Domain.Api
+dotnet new coreex-relay      -n Company.Product.Domain.Relay
+dotnet new coreex-subscribe -n Company.Product.Domain.Subscribe
+```
+
+Passing the 3-part base name to host templates causes all three to emit into the same directory and overwrite each other.
+
+## Phase 6: Validate The Scaffold
+
+After generation and solution wiring, validate in this order:
+
+1. Run `dotnet build` on the `.slnx`.
+2. Run the unit test project when present.
+3. Run broader API, relay, and subscriber test projects only when their local dependencies are available.
+4. Report any skipped validations explicitly.
+
+For local development there are two validation modes:
+
+- **Shape validation**: stop after solution wiring, `dotnet build`, and the unit test project. This is the default minimum bar.
+- **Runnable local validation**: when the user explicitly wants the repo left in a first-run local state, also create missing local dependency assets, start those dependencies, run the tooling projects from their own directories, then run the broader test projects.
+
+### Validation policy
+
+- `dotnet build` is the default minimum bar for a successful scaffold.
+- `dotnet test` for `tests/[solution].Test.Unit` should run by default when the project exists.
+- API, relay, and subscriber tests may depend on local SQL Server or Postgres, Redis, Service Bus, or other host prerequisites. If those are not configured, skip those tests and say why.
+- A missing local dependency is a deferred setup item, not necessarily a scaffolding failure.
+- If the user wants runnable local validation and local dependency files are missing, materialize them first from bundled templates or repo-standard equivalents, for example `.github/skills/solution-scaffolder/assets/docker-compose.local.yml` and `.github/skills/solution-scaffolder/assets/servicebus-config.template.json`.
+- If the generated shape includes SQL Server, Redis, or Service Bus and the repo lacks a root `docker-compose.yml`, create one before trying to run broader tests.
+- If Service Bus emulator wiring is needed and the repo lacks `servicebus/Config.json`, create it before starting the dependency stack.
+- For `tools/[solution].Database`, run from that directory so `dbex.yaml` is discovered correctly. Prefer `dotnet run -- All` for first-run local setup and `dotnet run -- CodeGen` or `dotnet run -- Database` for narrower follow-up work.
+- For `tools/[solution].CodeGen`, run from that directory so `ref-data.yaml` is discovered correctly.
+- If `refdata-enabled` is `true`, call out `tools/[solution].CodeGen` as the next step, or run it only when the user wants the repo left in a fully generated state.
+- If `data-provider != None`, call out `tools/[solution].Database` as the next step, or run it only when the user wants local schema setup as part of scaffolding.
+- If generated code fails compile due to placeholder types, missing project references, wrong package APIs, or other issues unrelated to missing local dependencies, classify that as a template defect and surface it explicitly.
+- If `dotnet new` reports duplicate CoreEx template identities, surface that warning and note which template source was used.
+
+### Runnable Local Validation Steps
+
+When the user explicitly asks for successful local build and test, use this order after project generation:
+
+1. Ensure the solution and host/test projects are wired into the `.slnx`.
+2. Create any missing local dependency assets such as `docker-compose.yml` and `servicebus/Config.json`.
+3. Start the local dependency stack.
+4. Run `tools/[solution].Database` from its own directory.
+5. Run `tools/[solution].CodeGen` from its own directory when reference data is enabled.
+6. Run `dotnet build` on the solution.
+7. Run the unit test project.
+8. Run API, relay, and subscriber test projects individually so one hanging host does not block the others.
+
+### Template Defects vs Workflow Steps
+
+Do not turn permanent template defects into ad-hoc workflow patches unless the user explicitly wants local recovery for the current repo.
+
+Typical **workflow** responsibilities:
+
+- creating missing local dependency assets
+- starting local containers or emulators
+- running `*.Database` and `*.CodeGen` from the correct directories
+- choosing which tests to run based on available dependencies
+
+Typical **template** responsibilities:
+
+- generated code compiles immediately after scaffold
+- project references match the generated code's layer usage
+- generated hosts use the current package APIs
+- placeholder files are compile-safe when no domain logic exists yet
+- empty starter YAML files are syntactically valid
+
+## Phase 7: Final Output
+
+After generation, report:
+
+- what was created or proposed
+- which answers were translated into template inputs
+- which validations were run successfully
+- which validations were skipped and why
+- what was intentionally omitted
+- the `dotnet sln` commands that were run (or still need to be run) to add host and test projects to the solution file
+- any next prerequisite, such as package feeds, CodeGen, or database tooling
+
+## Command Examples
+
+### Full event-driven (SQL Server, Service Bus, refdata, ROP)
+
+```sh
+# From the solution root folder named Avanade.Erp.Sales
+dotnet new coreex --data-provider SqlServer --messaging-provider ServiceBus --refdata-enabled true --outbox-enabled true --rop-enabled true
+
+dotnet new coreex-api        -n Avanade.Erp.Sales.Api        --data-provider SqlServer --refdata-enabled true --outbox-enabled true
+dotnet new coreex-relay      -n Avanade.Erp.Sales.Relay      --data-provider SqlServer --messaging-provider ServiceBus
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe --data-provider SqlServer --messaging-provider ServiceBus --refdata-enabled true
+
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Api
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Api
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Relay
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Relay
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Subscribe
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Subscribe
+
+dotnet build Avanade.Erp.Sales.slnx
+dotnet test tests/Avanade.Erp.Sales.Test.Unit
+```
+
+### API only, no messaging (facade over external system)
+
+```sh
+dotnet new coreex -n Avanade.Erp.Sales --data-provider None --messaging-provider None
+dotnet new coreex-api -n Avanade.Erp.Sales.Api --data-provider None
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Api
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Api
+dotnet build Avanade.Erp.Sales.slnx
+dotnet test tests/Avanade.Erp.Sales.Test.Unit
+```
+
+### API + Subscriber only (no outbox relay)
+
+```sh
+dotnet new coreex -n Avanade.Erp.Sales --data-provider SqlServer --messaging-provider ServiceBus --outbox-enabled false
+dotnet new coreex-api        -n Avanade.Erp.Sales.Api        --data-provider SqlServer --outbox-enabled false
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe --data-provider SqlServer --messaging-provider ServiceBus
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Api
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Api
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Subscribe
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Subscribe
+dotnet build Avanade.Erp.Sales.slnx
+dotnet test tests/Avanade.Erp.Sales.Test.Unit
+```
+
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 97912c21..81c9ad2d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -2,70 +2,161 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - 'samples/**'
+      - 'gen/**'
+      - 'servicebus/**'
+      - 'Directory.Packages.props'
+      - 'docker-compose.yml'
+      - '*.slnf'
+      - '*.slnx'
+      - '.config/dotnet-tools.json'
+      - '.github/workflows/CI.yml'
   pull_request:
-    branches: [ main ]
+    paths:
+      - 'src/**'
+      - 'tests/**'
+      - 'samples/**'
+      - 'gen/**'
+      - 'servicebus/**'
+      - 'Directory.Packages.props'
+      - 'docker-compose.yml'
+      - '*.slnf'
+      - '*.slnx'
+      - '.config/dotnet-tools.json'
+      - '.github/workflows/CI.yml'
+  workflow_dispatch:
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+permissions:
+  contents: read
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    # ubuntu-18.04 # cosmos emulator doesn't work on ubuntu 20 and 22: https://github.com/Qayme/qayme-action-cosmosdb-emulator
-
-    services:
-      # cosmos: # tests fail when cosmos has less than 4 CPUs assigned, but github free runners have only 2
-      #   image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator
-      #   ports:
-      #     - 8081:8081
-      #     - 10251:10251
-      #     - 10252:10252
-      #     - 10253:10253
-      #     - 10254:10254
-      #   env:
-      #     AZURE_COSMOS_EMULATOR_PARTITION_COUNT: 20
-      #     AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE: false
-      #   options: -m 4g --cpus=2.0
-      
-      sql:
-       image: mcr.microsoft.com/mssql/server:2019-latest
-       ports:
-         - 1433:1433
-       env:
-         ACCEPT_EULA: Y
-         SA_PASSWORD: sAPWD23.^0
+    timeout-minutes: 60
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+
+    - name: Start containers
+      run: docker compose up -d
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: |
+          8.x
+          9.x
+          10.x
+
+    - name: Cache NuGet packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.nuget/packages
+        key: nuget-${{ runner.os }}-${{ hashFiles('**/*.csproj', '**/Directory.Packages.props') }}
+        restore-keys: nuget-${{ runner.os }}-
+
+    - name: Restore .NET tools
+      run: dotnet tool restore
+
+    - name: Restore (all)
+      run: dotnet restore CoreEx.slnx --verbosity minimal
+
+    # --- Core ---
+
+    - name: Build core
+      run: dotnet build CoreEx.Core.slnf --no-restore --configuration Release
+
+    - name: Test core (parallel)
+      run: dotnet test CoreEx.Core.Test.Parallel.slnf --no-build --configuration Release --logger trx --collect "XPlat Code Coverage" --results-directory coverage/core
+
+    - name: Test core (sequential)
+      run: dotnet test CoreEx.Core.Test.Sequential.slnf --no-build --configuration Release --logger trx --collect "XPlat Code Coverage" --results-directory coverage/core -m:1 -p:TestTfmsInParallel=false -p:BuildInParallel=false
+
+    - name: Upload core test results
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: core-test-results
+        path: "coverage/core/**/*.trx"
+        retention-days: 30
+
+    # --- Samples ---
+
+    - name: Build samples
+      run: dotnet build CoreEx.Samples.Build.slnf --no-restore --configuration Release
+
+    - name: CodeGen tool (samples/src/Contoso.Products.CodeGen)
+      working-directory: samples/src/Contoso.Products.CodeGen
+      run: dotnet run refdata --no-build --configuration Release -f net10.0 --expect-no-changes
+
+    - name: CodeGen tool (samples/src/Contoso.Shopping.CodeGen)
+      working-directory: samples/src/Contoso.Shopping.CodeGen
+      run: dotnet run refdata --no-build --configuration Release -f net10.0 --expect-no-changes
+
+    - name: Database tool (samples/src/Contoso.Products.Database)
+      working-directory: samples/src/Contoso.Products.Database
+      run: dotnet run all --no-build --configuration Release -f net10.0 --expect-no-changes
+
+    - name: Database tool (samples/src/Contoso.Shopping.Database)
+      working-directory: samples/src/Contoso.Shopping.Database
+      run: dotnet run all --no-build --configuration Release -f net10.0 --expect-no-changes
+
+    - name: Database tool (samples/src/Contoso.Orders.Database)
+      working-directory: samples/src/Contoso.Orders.Database
+      run: dotnet run all --no-build --configuration Release -f net10.0 --expect-no-changes
+
+    - name: Test samples
+      run: dotnet test CoreEx.Samples.Test.slnf --no-build --configuration Release --logger trx --collect "XPlat Code Coverage" --results-directory coverage/samples -m:1 -p:TestTfmsInParallel=false -p:BuildInParallel=false
+
+    - name: Upload samples test results
+      if: always()
+      uses: actions/upload-artifact@v4
       with:
-        dotnet-version: | 
-          6.0.x
-          8.0.x
-          9.0.x
-
-    - name: Restore dependencies
-      run: dotnet restore
-      
-    - name: Build
-      run: dotnet build --no-restore
- 
-    - name: Test
-      run: dotnet test --filter "(TestCategory!=WithDB)&(TestCategory!=WithCosmos)&(TestCategory!=WithSolace)" --no-build --verbosity normal /p:CollectCoverage=true /p:Exclude="[CoreEx.TestFunction]*" /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov.info
-
-    - name: Set EnvVar for Test
+        name: samples-test-results
+        path: "coverage/samples/**/*.trx"
+        retention-days: 30
+
+    # --- Coverage ---
+
+    - name: Merge and generate coverage report
+      if: always()
       run: |
-        echo "ConnectionStrings__Database=Data Source=localhost,1433;Initial Catalog=My.Hr;User id=sa;Password=sAPWD23.^0;TrustServerCertificate=true" >> $GITHUB_ENV
+        dotnet tool run reportgenerator \
+          -reports:"coverage/**/coverage.cobertura.xml" \
+          -targetdir:"coverage/report" \
+          -reporttypes:"HtmlInline_AzurePipelines;Cobertura;Badges" \
+          -assemblyfilters:"-*Test*;-*E2E*"
 
-    - name: Create/Migrate DB
-      run: dotnet run all --project ./samples/My.Hr/My.Hr.Database --connection-varname ConnectionStrings__Database
+    - name: Upload coverage report
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: coverage-report
+        path: coverage/report
+        retention-days: 30
+
+    # --- Cleanup ---
 
-    - name: Test With DB
-      run: dotnet test --filter TestCategory=WithDB --no-build --verbosity normal /p:CollectCoverage=true /p:Exclude="[CoreEx.TestFunction]*" /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov2.info
+    - name: Capture container logs on failure
+      if: failure()
+      run: docker compose logs --no-color > container-logs.txt 2>&1
 
-    - name: Test With Cosmos DB TestCategory=WithCosmos
-      run: dotnet test --filter Category=WithCosmos --no-build --verbosity normal /p:CollectCoverage=true /p:Exclude="[CoreEx.TestFunction]*" /p:CoverletOutputFormat=lcov /p:CoverletOutput=./coverage/lcov3.info
-      if: ${{ false }}
+    - name: Upload container logs on failure
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: container-logs
+        path: container-logs.txt
+        retention-days: 30
 
-    #- name: Test Docker Build
-    #  run: docker-compose -f docker-compose.myHr.yml -f docker-compose.myHr.override.yml build --build-arg LOCAL=true
+    - name: Stop containers
+      if: always()
+      run: docker compose down
diff --git a/.gitignore b/.gitignore
index 3398393a..91ec107c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,7 @@
-# File created using '.gitignore Generator' for Visual Studio Code: https://bit.ly/vscode-gig
-
-# Created by https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,macos,csharp,dotnetcore,jupyternotebooks,linux,node,python
-# Edit at https://www.toptal.com/developers/gitignore?templates=windows,visualstudiocode,macos,csharp,dotnetcore,jupyternotebooks,linux,node,python
-
-### Csharp ###
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 # User-specific files
 *.rsuser
@@ -15,6 +9,10 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.env
+
+# Claude Code local settings (machine-specific paths and permissions — never commit)
+.claude/settings.local.json
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -32,12 +30,20 @@ x86/
 [Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
+[Aa][Rr][Mm]64[Ee][Cc]/
 bld/
 [Bb]in/
 [Oo]bj/
+[Oo]ut/
 [Ll]og/
 [Ll]ogs/
 
+# Build results on 'Bin' directories
+**/[Bb]in/*
+# Uncomment if you have tasks that rely on *.refresh files to move binaries
+# (https://github.com/github/gitignore/pull/3736)
+#!**/[Bb]in/*.refresh
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
@@ -49,12 +55,16 @@ Generated\ Files/
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
+*.trx
 
 # NUnit
 *.VisualState.xml
 TestResult.xml
 nunit-*.xml
 
+# Approval Tests result files
+*.received.*
+
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/
@@ -81,6 +91,7 @@ StyleCopReport.xml
 *.ilk
 *.meta
 *.obj
+*.idb
 *.iobj
 *.pch
 *.pdb
@@ -88,6 +99,8 @@ StyleCopReport.xml
 *.pgc
 *.pgd
 *.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
 *.sbr
 *.tlb
 *.tli
@@ -159,6 +172,7 @@ coverage*.info
 
 # NCrunch
 _NCrunch_*
+.NCrunch_*
 .*crunch*.local.xml
 nCrunchTemp_*
 
@@ -212,9 +226,6 @@ PublishScripts/
 *.nuget.props
 *.nuget.targets
 
-# Nuget personal access tokens and Credentials
-nuget.config
-
 # Microsoft Azure Build Output
 csx/
 *.build.csdef
@@ -303,6 +314,17 @@ node_modules/
 # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
 *.vbw
 
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -312,22 +334,22 @@ node_modules/
 _Pvt_Extensions
 
 # Paket dependency manager
-.paket/paket.exe
+**/.paket/paket.exe
 paket-files/
 
 # FAKE - F# Make
-.fake/
+**/.fake/
 
 # CodeRush personal settings
-.cr/personal
+**/.cr/personal
 
 # Python Tools for Visual Studio (PTVS)
-__pycache__/
+**/__pycache__/
 *.pyc
 
 # Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
+#tools/**
+#!tools/packages.config
 
 # Tabs Studio
 *.tss
@@ -349,15 +371,22 @@ ASALocalRun/
 
 # MSBuild Binary and Structured Log
 *.binlog
+MSBuild_Logs/
+
+# AWS SAM Build and Temporary Artifacts folder
+.aws-sam
 
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
 # MFractors (Xamarin productivity tool) working folder
-.mfractor/
+**/.mfractor/
 
 # Local History for Visual Studio
-.localhistory/
+**/.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
 
 # BeatPulse healthcheck temp database
 healthchecksdb
@@ -366,7 +395,7 @@ healthchecksdb
 MigrationBackup/
 
 # Ionide (cross platform F# VS Code tools) working folder
-.ionide/
+**/.ionide/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
@@ -377,11 +406,14 @@ FodyWeavers.xsd
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-*.code-workspace
+!.vscode/*.code-snippets
 
 # Local History for Visual Studio Code
 .history/
 
+# Built Visual Studio Code Extensions
+*.vsix
+
 # Windows Installer files from build outputs
 *.cab
 *.msi
@@ -389,372 +421,16 @@ FodyWeavers.xsd
 *.msm
 *.msp
 
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-### DotnetCore ###
-# .NET Core build folders
-bin/
-obj/
-
-# Common node modules locations
-/node_modules
-/wwwroot/node_modules
-
-### JupyterNotebooks ###
-# gitignore template for Jupyter Notebooks
-# website: http://jupyter.org/
-
-.ipynb_checkpoints
-*/.ipynb_checkpoints/*
-
-# IPython
-profile_default/
-ipython_config.py
-
-# Remove previous ipynb_checkpoints
-#   git rm -r .ipynb_checkpoints/
-
-### Linux ###
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### Node ###
-# Logs
-logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-.env.production
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
-.next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
-### Node Patch ###
-# Serverless Webpack directories
-.webpack/
-
-### Python ###
-# Byte-compiled / optimized / DLL files
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-
-# IPython
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-### VisualStudioCode ###
-
-# Local History for Visual Studio Code
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-.ionide
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-
-# Windows shortcuts
-*.lnk
-
-# End of https://www.toptal.com/developers/gitignore/api/windows,visualstudiocode,macos,csharp,dotnetcore,jupyternotebooks,linux,node,python
-
-# Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
-__azurite_db_blob__.json
-__azurite_db_blob_extent__.json
-__blobstorage__/
-docker-compose.local.override.yml
-__azurite_db_*
+# NTFS to Ext4 file system migration files
+*.Identifier
 
-# Pulumi
-Pulumi.*.yaml
+# Azd and Azure CLI for .NET project files
+*.azdproj
+.azd/
+.azure/
 
-# Tests
-/tests/**/*.runsettings
+# Terraform files
+*.tfstate
+*.tfstate.backup
+.terraform/
+.terraform.lock.hcl
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index de991f40..00000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "recommendations": [
-    "ms-azuretools.vscode-azurefunctions",
-    "ms-dotnettools.csharp"
-  ]
-}
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 694e09e5..00000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": ".NET Core Launch (web)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build",
-            "program": "${workspaceFolder}/samples/My.Hr/My.Hr.Api/bin/Debug/net6.0/My.Hr.Api.dll",
-            "args": [],
-            "cwd": "${workspaceFolder}/samples/My.Hr/My.Hr.Api",
-            "stopAtEntry": false,
-            "serverReadyAction": {
-                "action": "openExternally",
-                "pattern": "\\bNow listening on:\\s+(https?://\\S+)"
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceFolder}/Views"
-            }
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach"
-        },
-        {
-            "name": "Attach to .NET Functions",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:azureFunctions.pickProcess}"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 4261b0ce..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "azureFunctions.projectSubpath": "samples/My.Hr/My.Hr.Functions",
-    "azureFunctions.deploySubpath": "samples/My.Hr/My.Hr.Functions/bin/Release/net6.0/publish",
-    "azureFunctions.projectLanguage": "C#",
-    "azureFunctions.projectRuntime": "~3",
-    "debug.internalConsoleOptions": "neverOpen",
-    "azureFunctions.preDeployTask": "publish (functions)",
-    "cSpell.words": [
-        "Agify",
-        "Genderize"
-    ]
-}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index a19b4ed3..00000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "--project",
-                "${workspaceFolder}/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "clean (functions)",
-            "command": "dotnet",
-            "args": [
-                "clean",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "type": "process",
-            "problemMatcher": "$msCompile",
-            "options": {
-                "cwd": "${workspaceFolder}/samples/My.Hr/My.Hr.Functions"
-            }
-        },
-        {
-            "label": "build (functions)",
-            "command": "dotnet",
-            "args": [
-                "build",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "type": "process",
-            "dependsOn": "clean (functions)",
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "problemMatcher": "$msCompile",
-            "options": {
-                "cwd": "${workspaceFolder}/samples/My.Hr/My.Hr.Functions"
-            }
-        },
-        {
-            "label": "clean release (functions)",
-            "command": "dotnet",
-            "args": [
-                "clean",
-                "--configuration",
-                "Release",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "type": "process",
-            "problemMatcher": "$msCompile",
-            "options": {
-                "cwd": "${workspaceFolder}/samples/My.Hr/My.Hr.Functions"
-            }
-        },
-        {
-            "label": "publish (functions)",
-            "command": "dotnet",
-            "args": [
-                "publish",
-                "--configuration",
-                "Release",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "type": "process",
-            "dependsOn": "clean release (functions)",
-            "problemMatcher": "$msCompile",
-            "options": {
-                "cwd": "${workspaceFolder}/samples/My.Hr/My.Hr.Functions"
-            }
-        },
-        {
-            "type": "func",
-            "dependsOn": "build (functions)",
-            "options": {
-                "cwd": "${workspaceFolder}/samples/My.Hr/My.Hr.Functions/bin/Debug/net6.0"
-            },
-            "command": "host start",
-            "isBackground": true,
-            "problemMatcher": "$func-dotnet-watch"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ca6b680..da69459a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,558 +2,11 @@
 
 Represents the **NuGet** versions.
 
-## v3.31.0
-- *Enhancement:* Moved existing reflection-based `JsonMergePatch` to `Extended.JsonMergePatchEx`; this remains the `AddJsonMergePatch` default implementation.
-- *Enhancement:* Added new `JsonMergePatch` that leverages `JsonElement` and `Utf8JsonWriter` without underlying reflection; useful in scenarios where the value type is not known. This is also not as performant as the reflection-based `JsonMergePatchEx` version and the primary reason why it is not the new default.
-- *Enhancement:* Refactored the `CosmosDb` capabilities such that the `CosmosDbContainer` and `CosmosDbModelContainer` are model type independent, with underlying type support implemented at the method level for greater flexibility and control. The typed `CosmosDbContainer<T, TModel>` etc. remain and are accessed from the type independent containers as required.
-  - The existing `IMultiSetArgs` operations have been moved (and renamed) from `CosmosDb` to `CosmosDbContainer` and `CosmosDbModelContainer` as these are single container-specific.
-  - The existing `CosmosDb.UseAuthorizeFilter` operations have been moved to `CosmosDbContainer` as these are single container-specific.
-- *Enhancement:* Added `Cleaner.PrepareCreate` and `Cleaner.PrepareUpdate` to encapsulate `ChangeLog.PrepareCreated` and `ChangeLog.PrepareUpdated`, and `Cleaner.ResetTenantId` to ensure consistent handling throughout _CoreEx_.
-- *Enhancement:* Added `SystemTime.Timestamp` as the standard means to access the current timestamp (uses `Cleaner.Clean`) to ensure consistency throughout _CoreEx_. Therefore, the likes of `DateTime.UtcNow` should be replaced with `SystemTime.Timestamp`. The previous `ExecutionContent.SystemTime` has been removed as it was not consistent with the `ExecutionContext` pattern.
-- *Enhancement:* Updated the `IExtendedException.ShouldBeLogged` implementations to check `SettingsBase` configuration to enable/disable.
-- *Enhancement:* Updated dependencies to latest; including transitive where applicable.
-
-## v3.30.2
-- *Fixed:* Missing `QueryArgs.IncludeText` added to set the `$text=true` equivalent.
-- *Fixed:* Simplification of creating and setting the `QueryArgs.Filter` using an implict string operator.
-
-## v3.30.1
-- *Fixed:* Added support for `SettingsBase.DateTimeTransform`, `StringTransform`, `StringTrim` and `StringCase` to allow specification via configuration.
-- *Fixed:* Added support for `CoreEx:` hierarchy (optional) for all _CoreEx_ settings to enable a more structured and explicit configuration.
-
-## v3.30.0
-- *Enhancement:* Integrated `UnitTestEx` version `5.0.0` to enable the latest capabilities and improvements.
-  - `CoreEx.UnitTesting.NUnit` given changes is no longer required and has been deprecated, the `UnitTestEx.NUnit` (or other) must be explicitly referenced as per testing framework being used.
-  - `CoreEx.UnitTesting` package updated to include only standard .NET core capabilities to follow new `UnitTestEx` pattern; new packages created to house specific as follows:
-    - `CoreEx.UnitTesting.Azure.Functions` created to house Azure Functions specific capabilities;
-    - `CoreEx.UnitTesting.Azure.ServiceBus` created to house Azure Service Bus specific capabilities.
-  - Existing usage will require references to the new packages as required. There should be limited need to update existing tests to use beyond the requirement for the root `UnitTestEx` namespace. The updated default within `UnitTestEx` is to expose the key capabilities from the root namespace. For example, `using UnitTestEx.NUnit`, should be replaced with `using UnitTestEx`.
-
-## v3.29.0
-- *Enhancement:* Added `net9.0` support.
-- *Enhancement:* Deprecated `net7.0` support; no longer supported by [Microsoft](https://dotnet.microsoft.com/en-us/platform/support/policy).
-- *Enhancement:* Updated dependencies to latest; including transitive where applicable.
-
-## v3.28.0
-- *Enhancement:* Added extended capabilities to the `InvokeArgs` to allow additional customization.
-
-## v3.27.3
-- *Fixed:* The `ExecutionContext.Messages` were not being returned as intended within the `x-messages` HTTP Response header; enabled within the `ExtendedStatusCodeResult` and `ExtendedContentResult` on success only (status code `>= 200` and `<= 299`). Note these messages are JSON serialized as the underlying `MessageItemCollection` type.
-- *Fixed:* The `AgentTester` has been updated to return a `HttpResultAssertor` where the operation returns a `HttpResult` to enable further assertions to be made on the `Result` itself.
-
-## v3.27.2
-- *Fixed:* The `IServiceCollection.AddCosmosDb` extension method was registering as a singleton; this has been corrected to register as scoped. The dependent `CosmosClient` should remain a singleton as is [best practice](https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/best-practice-dotnet).
-
-## v3.27.1
-- *Fixed:* Updated `Microsoft.Extensions.Caching.Memory` package depenedency to latest (including related); resolve [Microsoft Security Advisory CVE-2024-43483](https://github.com/advisories/GHSA-qj66-m88j-hmgj).
-- *Fixed:* Fixed the `ExecutionContext.UserIsAuthorized` to have base implementation similar to `UserIsInRole`.
-- *Fixed:* Rationalize the `UtcNow` usage to be consistent, where applicable `ExecutionContext.SystemTime.UtcNow` is leveraged.
-
-## v3.27.0
-- *Fixed:* The `ValueContentResult.TryCreateValueContentResult` would return `NotModified` where the request `ETag` was `null`; this has been corrected to return `OK` with the resulting `value`.
-- *Fixed:* The `ValueContentResult.TryCreateValueContentResult` now returns `ExtendedStatusCodeResult` versus `StatusCodeResult` as this offers additional capabilities where required.
-- *Enhancement:* The `ExtendedStatusCodeResult` and `ExtendedContentResult` now implement `IExtendedActionResult` to standardize access to the `BeforeExtension` and `AfterExtension` functions.
-- *Enhancement:* Added `WebApiParam.CreateActionResult` helper methods to enable execution of the underlying `ValueContentResult.CreateValueContentResult` (which is no longer public as this was always intended as internal only).
-- *Fixed:* `PostgresDatabase.OnDbException` corrected to use `PostgresException.MessageText` versus `Message` as it does not include the `SQLSTATE` code.
-- *Enhancement:* Improve debugging insights by adding `ILogger.LogDebug` start/stop/elapsed for the `InvokerArgs`.
-- *Fixed*: Updated `System.Text.Json` package depenedency to latest (including related); resolve [Microsoft Security Advisory CVE-2024-43485](https://github.com/advisories/GHSA-8g4q-xg66-9fp4).
-
-## v3.26.0
-- *Enhancement:* Enable JSON serialization of database parameter values; added `DatabaseParameterCollection.AddJsonParameter` method and associated `JsonParam`, `JsonParamWhen` and `JsonParamWith` extension methods.
-- *Enhancement:* Updated (simplified) `EventOutboxEnqueueBase` to pass events to the underlying stored procedures as JSON versus existing TVP removing database dependency on a UDT (user-defined type).
-- **Note:** Accidently published as `v3.25.6`, re-publishing as `v3.26.0` as intended - includes no code changes.
-
-## v3.25.5
-- *Fixed:* Fixed the unit testing `CreateServiceBusMessage` extension method so that it no longer invokes a `TesterBase.ResetHost` (this reset should now be invoked explicitly by the developer as required).
-
-## v3.25.4
-- *Fixed*: Fixed the `InvalidOperationException` with a 'Sequence contains no elements' when performing validation with the `CompareValuesRule` that has the `OverrideValue` set. 
-- *Fixed:* Updated all dependencies to latest versions.
-
-## v3.25.3
-- *Fixed:* Added function parameter support for `WithDefault()` to enable runtime execution of the default statement where required for the query filter capabilities.
-
-## v3.25.2
-- *Fixed:* `HttpRequestOptions.WithQuery` fixed to ensure any previously set `Include` and `Exclude` fields are not lost (results in a merge); i.e. only the `Filter` and `OrderBy` properties are explicitly overridden.
-
-## v3.25.1
-- *Fixed:* Extend `QueryFilterFieldConfigBase` to include `AsNullable()` to specifiy whether the field supports `null`.
-- *Fixed:* Extend `QueryFilterFieldConfigBase` to include `WithResultWriter()` to specify a function to override the corresponding LINQ statement result writing.
-- *Fixed:* Adjusted the fluent-style method-chaining interface to improve usability (and consistency).
-
-## v3.25.0
-- *Enhancement:* Added new `CoreEx.Data` project/package to encapsulate all generic data-related capabilities, specifically the new `QueryFilterParser` and `QueryOrderByParser` classes. These enable a limited, explicitly supported, dynamic capability to `$filter` and `$orderby` an underlying query _similar_ to _OData_. This is **not** intended to be a replacement for the full capabilities of OData, GraphQL, etc. but to offer basic dynamic flexibility where needed.
-  - Added `IQueryable<T>.Where()` and `IQueryable<T>.OrderBy` extension method that will use the aforementioned parsers configured within the new `QueryArgsConfig` and `QueryArgs` and apply leveraging `System.Linq.Dynamic.Core`.
-  - Updated `HttpRequestOptions` and `WebApiRequestOptions` to support `QueryArgs` (`$filter` and `$orderby` query string arguments) similar to the existing `PagingArgs`.
-  - Added `QueryAttribute` to enable _Swagger/Swashbuckle_ generated documentation.
-- *Fixed:* Fixed missing `IServiceCollection.AddCosmosDb` including corresponding `CosmosDbHealthCheck`.
-- *Fixed:* Added `JsonIgnore` to all interfaces that have a `CompositeKey` property as _not_ intended to be serialized by default.
-- *Fixed:* Fixed `ReferenceDataCollectionBase<TId, TRef, TSelf>` constructor which was hiding `sortOrder` and `codeComparer` parameters.
-
-## v3.24.1
-- *Fixed*: `CosmosDb.SelectMultiSetWithResultAsync` updated to skip items that are not considered valid; ensures same outcome as if using a `CosmosDbModelQueryBase` with respect to filtering.
-
-## v3.24.0
-- *Enhancement:* `CosmosDb.SelectMultiSetWithResultAsync` and `SelectMultiSetAsync` added to enable the selection of multiple sets of data in a single operation; see also `MultiSetSingleArgs` and `MultiSetCollArgs`.
-- *Enhancement:* `CosmosDbValue.Type` is now updatable and defaults from `CosmosDbValueModelContainer<TModel>.TypeName` (updateable using `UseTypeName`).
-
-## v3.23.5
-- *Fixed:* `CosmosDbValue<TModel>.PrepareBefore` corrected to set the `PartitionKey` where the underlying `Value` implements `IPartitionKey`.
-- *Fixed:* `CosmosDbBatch` corrected to default to the `CosmosDbContainerBase<TSelf>.DbArgs` where not specified.
-- *Fixed:* `CosmosDbArgs.AutoMapETag` added, indicates whether when mapping the model to the corresponding entity that the `IETag.ETag` is to be automatically mapped (default is `true`, existing behavior).
- 
-## v3.23.4
-- *Fixed:* Added `Result<T>.AdjustsAsync` to support asynchronous adjustments.
-
-## v3.23.3
-- *Fixed:* Added `Result<T>.Adjusts` as wrapper for `ObjectExtensions.Adjust` to simplify support and resolve issue where the compiler sees the adjustment otherwise as a implicit cast resulting in an errant outcome.
-
-## v3.23.2
-- *Fixed:* `DatabaseExtendedExtensions.DeleteWithResultAsync` corrected to return a `Task<Result>`.`
-
-## v3.23.1
-- *Fixed:* Updated all dependencies to latest versions (specifically _UnitTestEx_).
-
-## v3.23.0
-- *Enhancement:* Added `ICacheKey` and updated `RequestCache` accordingly to support, in addition to the existing `IEntityKey`, to enable additional caching key specification.
-- *Enhancement:* Added `ItemKeySelector` to `EntityBaseDictionary` to enable automatic inference of the key from an item being added.
-- *Fixed:* Updated all dependencies to latest versions.
-
-## v3.22.0
-- *Enhancement:* Identifier parsing and `CompositeKey` formatting moved to the `CosmosDbArgs` to enable overriding where required.
-- *Enhancement:* Cosmos model constraint softened to allow for `IEntityKey` to support more flexible identifier scenarios.
-- *Enhancement:* All Cosmos methods updated to support `CompositeKey` versus `object` for identifier specification for greater flexibility.
-- *Enhancement:* `CosmosDbModelContainer` and `CosmosDbValueModelContainer` enable model-only access; also, all model capabilities housed under new `Model` namespace.
-- *Fixed:* `PagingOperationFilter` correctly specifies a format of `int64` for the `number`-type paging parameters.
-- *Fixed:* `CompositeKey` correctly supports `IReferenceData` types leveraging the underlying `IReferenceData.Code`.
-
-## v3.21.1
-- *Fixed:* `Mapper.MapSameTypeWithSourceValue` added (defaults to `true`) to map the source value to the destination value where the types are the same; previously this would result in an exception unless added explicitly. The `Mapper.SameTypeMapper` enables.
-- *Fixed:* `ReferenceDataOrchestrator.GetAllTypesInNamespace` added to get all the `IReferenceData` types in the specified namespace. Needed for the likes of the `CosmosDbBatch.ImportValueBatchAsync` where a list of types is required.
-
-## v3.21.0
-- *Enhancement*: `CoreEx.Cosmos` improvements:
-  - Added `CosmosDbArgs` to `CosmosDbContainerBase` to allow per container configuration where required.
-  - Partition key specification centralized into `CosmosDbArgs`.
-  - `ITenantId` and `ILogicallyDeleted` support integrated into `CosmosDbContainerBase`, etc. to offer consistent behavior with `EfDb`.
-
-## v3.20.0
-- *Fixed*: Include all constructor parameters when using `AddReferenceDataOrchestrator`.
-- *Enhancement*: Integrated dynamic `ITenantId` filtering into `EfDb` (controlled with `EfDbArgs`). 
-
-## v3.19.0
-- *Fixed:* Updated all dependencies to latest versions.
-- *Enhancement:* Added `DatabaseCommand.SelectAsync` and `SelectWithResultAsync` that has no integrated typing and mapping.
-
-## v3.18.1
-- *Fixed*: The `ITypedMappedHttpClient.MapResponse` was not validating the input HTTP response correctly before mapping; resulted in a `null` success value versus the originating error/exception.
-- *Fixed*: The `HttpResult<T>.ThrowOnError` was not correctly throwing the internal exception. 
-
-## v3.18.0
-- *Fixed*: Removed `Azure.Identity` dependency as no longer required; related to `https://github.com/advisories/GHSA-wvxc-855f-jvrv`.
-- *Fixed*: Removed `AspNetCore.HealthChecks.SqlServer` dependency as no longer required.
-- *Fixed:* Updated all dependencies to latest versions.
-- *Fixed*: `CoreEx.AutoMapper` updated to leverage latest major version (`13.0.1`); as such `netstandard` no longer supported.
-- *Fixed*: The `TimerHostedServiceBase` was incorrectly resetting the `LastException` on sleep versus wake. 
-- *Fixed*: The `AddEventSender` dependency injection extension methods now correctly register as _Scoped_.
-- *Fixed*: The `Logger.LogInformation` invocations refactored to `Logger.LogDebug` where applicable to reduce noise in the logs.
-- *Fixed*: The `IPropertyRule.ValidateAsync` method removed as it was not required and could lead to incorrect usage.
-- *Fixed:* The `ValueValidator` now only supports a `Configure` method to enable `IPropertyRule`-based configuration (versus directly).
-- *Fixed:* The `CommonValidator.ValidateAsync` is now internal as this was not intended and could lead to incorrect usage.
-- *Enhancement*: Added `AfterSend` event to `IEventSender` to enable post-send processing.
-- *Enhancement*: Added `EventOutboxHostedService.OneOffTrigger` method to enable a _one-off_ trigger interval to be specified for the registered (DI) instance.
-
-## v3.17.0
-- *Enhancement*: Additional `CoreEx.Validation` usability improvements:
-  - `Validator.CreateFor<T>` added to enable the creation of a `CommonValidator<T>` instance for a specified type `T` (more purposeful name); synonym for existing `CommonValidator.Create<T>` (unchanged).
-  - `Validator.Null<T>` added to enable simplified specification of a `IValidatorEx<T>` of `null` to avoid explicit `null` casting.
-  - `Collection` extension method has additional overload to pass in the `IValidatorEx<TItem>` to use for each item in the collection; versus, having to use `CollectionRuleItem.Create`.
-  - `Dictionary` extension method has additional overload to pass in the `IValidatorEx<TKey>` and `IValidator<TValue>` to use for each entry in the dictionary; versus, having to use `DictionaryRuleItem.Create`.
-  - `MinimumCount` and `MaximumCount` extension methods for `ICollection` added to enable explicit specification of these two basic validations. 
-  - `Validation.CreateCollection` renamed to `Validation.CreateForCollection` and creates a `CommonValidator<TColl>`.
-	- Existing `CollectionValidator` deprecated as the `CommonValidator<TColl>` offers same; removes duplication of capability.
-  - `Validation.CreateDictionary` renamed to `Validation.CreateForDictionary` and creates a `CommonValidator<TDict>`.
-	- Existing `DictionaryValidator` deprecated as the `CommonValidator<TDict>` offers same; removes duplication of capability.
-- *Enhancement*: Added `ServiceBusReceiverHealthCheck` to perform a peek message on the `ServiceBusReceiver` as a means to determine health. Use `IHealthChecksBuilder.AddServiceBusReceiverHealthCheck` to configure. 
-- *Fixed:* The `FileLockSynchronizer`, `BlobLeaseSynchronizer` and `TableWorkStatePersistence` have had any file/blob/table validations/manipulations moved from the constructor to limit critical failures at startup from a DI perspective; now only performed where required/used. This also allows improved health check opportunities as means to verify.
-
-## v3.16.0
-- *Enhancement*: Added basic [FluentValidator](https://docs.fluentvalidation.net/en/latest/) compatibility to the `CoreEx.Validation` by supporting _key_ (common) named capabilities:
-  - `AbstractValidator<T>` added as a wrapper for `Validator<T>`; with both supporting `RuleFor` method (wrapper for existing `Property`).
-  - `NotEmpty`, `NotNull`, `Empty`, `Null`, `InclusiveBetween`, `ExclusiveBetween`, `Equal`, `NotEqual`, `LessThan`, `LessThanOrEqualTo`, `GreaterThan`, `GreaterThanOrEqualTo`, `Matches`, `Length`, `MinimumLength`, `MaximumLength`, `PrecisionScale`, `EmailAddress` and `IsInEnum` extension methods added (invoking existing equivalents).
-  - `NullRule` and `NotNullRule` added to support the `Null` and `NotNull` capabilities specifically.
-  - `WithMessage` added to explcitly set the error message for a preceeding `IValueRule` (equivalent to specifying when invoking extension method).
-  - `ValidatorStrings` have had their fallback texts added to ensure an appropriate text is output where `ITextProvider` is not available.
-  - _Note:_ The above changes are to achieve a basic level of compatibility, they are not intended to implement the full capabilities of _FluentValidation_; nor, will it ever. The `CoreEx.FluentValidation` enables _FluentValidation_ to be used directly where required; also, the existing `CoreEx.Validation.InteropRule` enables interoperability between the two.
-- *Enhancement*: Added `StringSyntaxAttribute` support to improve intellisense for JSON and URI specification.
-- *Enhancement*: Added `EventPublisherHealthCheck` that will send an `EventData` message to verify that the `IEventPublisher` is functioning correctly.
-  - _Note:_ only use where the corresponding subscriber(s)/consumer(s) are aware and can ignore/filter to avoid potential downstream challenges.
-
-## v3.15.0
-- *Enhancement*: This is a clean-up version to remove all obsolete code and dependencies. This will result in a number of minor breaking changes, but will ensure that the codebase is up-to-date and maintainable.
-  - As per [`v3.14.0`](#v3.14.0) the previously obsoleted `TypedHttpClientBase` methods `WithRetry`, `WithTimeout`, `WithCustomRetryPolicy` and `WithMaxRetryDelay` are now removed; including `TypedHttpClientOptions`, `HttpRequestLogger` and related `SettingsBase` capabilities.
-  - Health checks:
-	- `CoreEx.Azure.HealthChecks` namespace and classes removed.
-	- `SqlServerHealthCheck` replaced with simple generic `DatabaseHealthCheck`.
-	- `IServiceCollection.AddDatabase` automatically adds `DatabaseHealthCheck`.
-	- `IServiceCollection.AddSqlServerEventOutboxHostedService` automatically adds `TimerHostedServiceHealthCheck`.
-	- `IServiceCollection.AddReferenceDataOrchestrator` automatically adds `ReferenceDataOrchestratorHealthCheck` (reports cache statistics).
-	- `HealthReportStatusWriter` added to support richer JSON reporting.
-	- Generally recommend using 3rd-party library to enable further health checks; for example: [`https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks`](https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks).
-
-## v3.14.1
-- *Fixed*: The `Result.ValidatesAsync` extension method signature has had the value nullability corrected to enable fluent-style method-chaining.
-- *Fixed*: The fully qualified type and property name is now correctly used as the `LText.KeyAndOrText` when creating within the `PropertyExpression<TEntity, TProperty>` to enable a qualified _key_ that can be used by the `ITextProvider` to substitute the text at runtime; the existing text fallback behavior remains such that an appropriate text is used. The `PropertyExpression.CreatePropertyLTextKey` function can be overridden to change this behavior.
-
-## v3.14.0
-- *Enhancement*: Planned feature obsoletion. The `TypedHttpClientBase` methods `WithRetry`, `WithTimeout`, `WithCustomRetryPolicy` and `WithMaxRetryDelay` are now marked as obsolete and will result in a compile-time warning. Related `TypedHttpClientOptions`, `HttpRequestLogger` and `SettingsBase` capabilities have also been obsoleted.
-  - Why? Primarily based on Microsoft guidance around [`IHttpClientFactory`](https://learn.microsoft.com/en-us/dotnet/core/extensions/httpclient-factory) usage. Specifically advances in native HTTP [resilency](https://learn.microsoft.com/en-us/dotnet/core/resilience/http-resilience) support, and the [.NET 8 networking improvements](https://devblogs.microsoft.com/dotnet/dotnet-8-networking-improvements/).
-  - When? Soon, planned within the next minor release (`v3.15.0`). This will simplify the underlying `TypedHttpClientBase` logic and remove the internal dependency on an older version of the [_Polly_](https://www.nuget.org/packages/Polly/7.2.4) package.
-  - How? Review the compile-time warnings, and [update the codebase](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/implement-resilient-applications/implement-http-call-retries-exponential-backoff-polly) to use the native `IHttpClientFactory` resiliency capabilities.
-- *Enhancement*: Updated `CoreEx.UnitTesting` to leverage the latest `UnitTestEx` (`v4.2.0`) which has added support for testing `HttpMessageHandler` and `HttpClient` configurations. This will enable improved mocked testing as a result of the above changes where applicable.
-- *Enhancement*: Added `CustomSerializers` property to `IEventSerializer` of type `CustomEventSerializers`. This allows for the add (registration) of custom JSON serialization logic for a specified `EventData.Value` type. This is intended to allow an opportunity to serialize a specific type in a different manner to the default JSON serialization; for example, exclude certain properties, or use a different serialization format.
-- *Enhancement*: Updated the unit testing `ExpectedEventPublisher` so that it now executes the configured `IEventSerializer` during publishing. A new `UnitTestBase.GetExpectedEventPublisher` extension method added to simplify access to the `ExpectedEventPublisher` instance and corresponding `GetPublishedEvents` property to enable further assert where required.
-
-## v3.13.0
-- *Enhancement*: Added `DatabaseMapperEx` enabling extended/explicit mapping where performance is critical versus existing that uses reflection and compiled expressions; can offer up to 40%+ improvement in some scenarios.
-- *Enhancement*: The `AddMappers<TAssembly>()` and `AddValidators<TAssembly>()` extension methods now also support two or three assembly specification overloads.
-- *Enhancement*: A `WorkState.UserName` has been added to enable the tracking of the user that initiated the work; this is then checked to ensure that only the initiating user can interact with their own work state.
-- *Fixed:* The `ReferenceDataOrchestrator.GetByTypeAsync` has had the previous sync-over-async corrected to be fully async.
-- *Fixed*: Validation extensions `Exists` and `ExistsAsync` which expect a non-null resultant value have been renamed to `ValueExists` and `ValueExistsAsync` to improve usability; also they are `IResult` aware and will act accordingly.
-- *Fixed*: The `ETag` HTTP handling has been updated to correctly output and expect the weak `W/"xxxx"` format. 
-- *Fixed*: The `ETagGenerator` implementation has been further optimized to minimize unneccessary string allocations.
-- *Fixed*: The `ValueContentResult` will only generate a response header ETag (`ETagGenerator`) for a `GET` or `HEAD` request. The underlying result `IETag.ETag` is used as-is where there is no query string; otherwise, generates as assumes query string will alter result (i.e. filtering, paging, sorting, etc.). The result `IETag.ETag` is unchanged so the consumer can still use as required for a further operation.
-- *Fixed*: The `SettingsBase` has been optimized. The internal recursion checking has been removed and as such an endless loop (`StackOverflowException`) may occur where misconfigured; given frequency of `IConfiguration` usage the resulting performance is deemed more important. Additionally, `prefixes` are now optional.
-  - The existing support of referencing a settings property by name (`settings.GetValue<T>("NamedProperty")`) and it using reflection to find before querying the `IConfiguration` has been removed. This was not a common, or intended usage, and was somewhat magical, and finally was non-performant.
-
-## v3.12.0
-- *Enhancement*: Added new `CoreEx.Database.Postgres` project/package to support [PostgreSQL](https://www.postgresql.org/) database capabilities. Primarily encapsulates the open-source [`Npqsql`](https://www.npgsql.org/) .NET ADO database provider for PostgreSQL.
-  - Added `EncodedStringToUInt32Converter` to support PostgreSQL `xmin` column encoding as the row version/etag.
-- *Enhancement*: Migrated sentence case logic from inside `PropertyExpression` into `CoreEx.Text.SentenceCase` to improve discoverablity and reuse opportunities.
-- *Fixed:* The `IServiceCollection.AddAzureServiceBusClient` extension method as been removed; the `ServiceBusClient` will need to be instantiated prior to usage. Standard approach is for consumers to create client instances independently.
-- *Fixed*: The `WorkOrchestrator.GetAsync<T>()` and `WorkOrchestrator.GetAsync(string type, ..)` methods were not automatically cancelling where expired.
-- *Fixed*: The `InvokerArgs` activity tracing updated to correctly capture the `Exception.Message` where an `Exception` has been thrown.
-- *Internal*: 
-  - All `throw new ArgumentNullException` checking migrated to the `xxx.ThrowIfNull` extension method equivalent.
-  - All	_Run Code Analysis_ issues resolved.
-
-## v3.11.0
-- *Enhancement*: The `ITypedToResult` updated to correctly implement `IToResult` as the simple `ToResult` where required. 
-- *Enhancement*: Added `Result.AsTask()` and `Result<T>.AsTask` to simplify the conversion to a completed `Task<Result>` or `Task<Result<T>>` where applicable.
-- *Enhancement*: Added `IResult.IsFailureOfType<TException>` to indicate whether the result is in a failure state and the underlying error is of the specified `TException` type.
-- *Enhancement*: Added `EventTemplate` property to the `WebApiPublisherArgs` and `WebApiPublisherCollectionArgs` to define an `EventData` template.
-- *Enhancement*: Added `SubscriberBase<T>` constructor overload to enable specification of `valueValidator` and `ValueIsRequired` parameters versus setting properties directly simplifying usage.
-- *Enhancement:* Enum renames to improve understanding of intent for event subscribing logic: `ErrorHandling.None` is now `ErrorHandling.HandleByHost` and `ErrorHandling.Handle` is now `ErrorHandling.HandleBySubscriber`.
-- *Enhancement:* Simplified the `ServiceBusSubscriber.Receive` methods by removing the `afterReceive` parameter which served no real purpose; also, reversed the `validator` and `valueIsRequired` parameters (order as stated) as the `validator` is more likely to be specified than `valueIsRequired` which defaults to `true`.
-- *Enhancement*: Added `CoreEx.Hosting.Work` namespace which includes light-weight/simple foundational capabilities to track and orchestrate work; intended for the likes of [_asynchronous request-response_](https://learn.microsoft.com/en-us/azure/architecture/patterns/async-request-reply) scenarios.
-  - Added `IWorkStatePersistence` to enable flexible/pluggable persistence of the `WorkState` and resulting data; includes `InMemoryWorkStatePersistence` for testing, `FileWorkStatePersistence` for file-based, and `TableWorkStatePersistence` leveraging Azure table storage.
-  - Added `WorkStateOrchestrator` support to `EventSubscriberBase`, including corresponding `ServiceBusSubscriber` and `ServiceBusOrchestratedSubscriber` using the `ServiceBusMessage.MessageId` as the corresponding `WorkState.Id`.
-  - Extended `EventSubscriberArgs` to support a new `SetWorkStateDataAsync` operation to enable the setting of the underlying `WorkState` data is a consistent manner where using the event subscriber capabilities.
-
-## v3.10.0
-- *Enhancement*: The `WebApiPublisher` publishing methods have been simplified (breaking change), primarily through the use of a new _argument_ that encapsulates the various related options. This will enable the addition of further options in the future without resulting in breaking changes or adding unneccessary complexities. The related [`README`](./src/CoreEx.AspNetCore/WebApis/README.md) has been updated to document.
-- *Enhancement*: Added `ValidationUseJsonNames` to `SettingsBase` (defaults to `true`) to allow setting `ValidationArgs.DefaultUseJsonNames` to be configurable.
-
-## v3.9.0
-- *Enhancement*: A new `Abstractions.ServiceBusMessageActions` has been created to encapsulate either a `Microsoft.Azure.WebJobs.ServiceBus.ServiceBusMessageActions` (existing [_in-process_](https://learn.microsoft.com/en-us/azure/azure-functions/functions-dotnet-class-library) function support) or `Microsoft.Azure.Functions.Worker.ServiceBusMessageActions` (new [_isolated_](https://learn.microsoft.com/en-us/azure/azure-functions/dotnet-isolated-process-guide) function support) and used internally. Implicit conversion is enabled to simplify usage; existing projects will need to be recompiled. The latter capability does not support `RenewAsync` and as such this capability is no longer leveraged for consistency; review documented [`PeekLock`](https://learn.microsoft.com/en-us/azure/azure-functions/functions-bindings-service-bus-trigger?tabs=python-v2%2Cisolated-process%2Cnodejs-v4%2Cextensionv5&pivots=programming-language-csharp#peeklock-behavior) behavior to get desired outcome.
-- *Enhancement*: The `Result`, `Result<T>`, `PagingArgs` and `PagingResult` have had `IEquatable` added to enable equality comparisons.
-- *Enhancement*: Upgraded `UnitTestEx` dependency to `4.0.2` to enable _isolated_ function testing.
-- *Enhancement*: Enabled `IJsonSerializer` support for `CompositeKey` JSON serialization/deserialization.
-- *Enhancement*: Added `IEventDataFormatter` which when implemented by the value set as the `EventData.Value` allows additional formatting to be applied by the `EventDataFormatter`.
-- *Enhancement*: Added `IsMapNullIfNull` to `BidirectionalMapper` that indicates whether to map `null` source value to a corresponding `null` destination automatically.
-- *Fixed*: Added `ReferenceDataMultiDictionaryConverterFactory` to ensure each `IReferenceDataCollection` is serialized correctly according to its underlying type.
-- *Fixed*: `EventDataFormatter` and `CloudEventSerializerBase` updated to correctly set the `Key` property where applicable.
-- *Internal:* Upgraded `NUnit` dependency to `4.0.1` for all `CoreEx` unit test; also, all unit tests now leverage the [_NUnit constraint model_](https://docs.nunit.org/articles/nunit/writing-tests/assertions/assertion-models/constraint.html) testing approach.
-
-## v3.8.1
-- *Fixed*: The `CoreEx.Text.JsonSerializer` has been updated to cache the _indented_ option correctly.
-- *Fixed*: The `ReferenceDataOrchestator` updated to use the correct serializer for `ETag` generation. 
-
-## v3.8.0
-- *Enhancement*: The `ValueContentResult.CreateResult` has been updated to return the resulting value as-is where is an instance of `IActionResult`; otherwise, converts `value` to a `ValueContentResult` (previous behavior).
-- *Enhancement*: The `PagingArgs` has been extended to support `Token`; being a continuation token to enable paging to be performed where the underlying data source does not support skip/take-style paging.
-
-## v3.7.2
-- *Fixed*: The `ReferenceDataMultiCollection` and `ReferenceDataMultiItem` have been replaced with the `ReferenceDataMultiDictionary` as existing resulted in an unintended format with which to return the data. This fix also removed the need for the `ReferenceDataMultiCollectionConverterFactory` as custom serialization for this is no longer required.
-
-## v3.7.1
-- *Fixed*: The `WebApi.PutWithResultAsync` methods that support `get` function parameter have had the result nullability corrected.
-- *Fixed*: The `BidirectionalMapper<TFrom, TTo>` has been added to further simplify the specification of a bidirectional mapping capability.
-
-## v3.7.0
-- *Enhancement:* The `Mapper<TSource, TDestination>` has a new constructor override to enable the specification of the mapping (`OnMap` equivalent) logic.
-- *Enhancement:* The `Mapper` has had `When*` helper methods added to aid the specification of the mapping logic depending on the `OperationTypes` (singular) being performed.
-- *Enhancement:* A new `NoneRule` validation has been added to ensure that a value is none (i.e. must be its default value). 
-
-## v3.6.3
-- *Fixed:* All related package dependencies updated to latest.
-
-## v3.6.2
-- *Enhancement:* Added `Converter.Create<TSource, TDestionation>` to enable a simple one-off `IConverter<TSource, TDestionation>` implementation to be created.
-- *Fixed:* The `IReferenceData.SetInvalid` method corrected to throw `NotImplementedException` where not explicitly implemented.
-- *Fixed:* The `ReferenceDataBase` updated to handle the `IsValid` and `SetInvalid` functionality correctly.
-
-## v3.6.1
-- *Enhancement:* Added `IBidirectionalMapper<TFrom, TTo>` to enable a single mapping capability that can support mapping both ways.
-- *Enhancement:* Added `IBidirectionalMapper<TFrom, TTo>` registration support to `Mapper.Register` and by extension `IServiceCollection.AddMappings`.
-- *Enhancement:* Finalized initial capabilities for `CoreEx.OData`; package now published.
-
-## v3.6.0
-- *Enhancement:* `UnitTestEx` as of `v4.0.0` removed all dependencies to `CoreEx`, breaking a long-time circular reference challenge.  Added extension capabilities to enable existing behaviors. These extensions have been added within `CoreEx.UnitTesting` and `CoreEx.UnitTesting.NUnit` respectively; using `UnitTestEx` namespace to minimize breaking changes and clearly separate. The following will need to be corrected where applicable:
-  - Add `UnitTestEx` namespace where missing to enable new extension methods.  
-  - Replace existing `TestSetUp.Default.ExpectedEventsEnabled = true` with `TestSetUp.Default.EnableExpectedEvents()`; changed to a method as extension properties are not currently supported in C#.
-  - Replace existing `TestSetUp.Default.ExpectNoEvents = true` with `TestSetUp.Default.ExpectNoEvents()`; changed to a method as extension properties are not currently supported in C#.
-  - The existing `ApiTester.Agent` property has had to be made an extension method as follows:
-	- Before: `test.Agent<ContactAgent, Contact>().Expect...`
-	- After: `test.Agent().With<ContactAgent, Contact>().Expect...`
-  - The `ValidationTester` has _not_ been ported; but has been implemented using extension methods on the `GenericTester` as follows:
-	- Before: `ValidationTester.Create().ExpectErrors("").Run<XxxValidator, Xxx>(x);`
-	- After: `GenericTester.Create().ExpectErrors("").Validation().With<XxxValidator, Xxx>(x);`
-- *Enhancement:* Added `net8.0` support.
-
-## v3.5.0
-- *Enhancement:* Update the `JsonFilterer` classes to support qualified (indexed) property names; all paths are standardized with the `$` prefix internally.
-- *Enhancement:* Added `JsonNode` extension methods `ApplyInclude` and `ApplyExclude` to simplify corresponding `JsonFilterer` usage.
-- *Enhancement:* Added `JsonElementComparer` to compare two `JsonElement` values (and typed values) and return the differences (`JsonElementComparerResult`). Additionally, the `JsonElementComparerResult.ToMergePatch` will create a corresponding `JsonNode` that represents an `application/merge-patch+json` representation of the differences.
-- *Enhancement:* Added `DateTimeToStringConverter` to enable the explicit formatting of a `DateTime` to a `string` and vice-versa.
-- *Enhancement:* Added `JsonObjectMapper` to enable explicit mapping of a `Type` (class) to a `JsonObject` and vice-versa (versus serialization). This enables property conversion, mapping and operation types to be specified, similar to other _CoreEx_ mapping capabilities.
-- *Enhancement:* Renamed `WebApiPublisher.PublishAsync<TColl, TItem>` to `WebApiPublisher.PublishCollectionAsync<TColl, TItem>` to be more explicit with respect to purpose and usage.
-- *Enhancement:* The `WebApiPublisher.PublishAsync` has had the `eventModifier` delegate parameter simplified to no longer include a value as this is already available via the `Value` property of the existing `EventData` parameter.
-- *Enhancement:* Added additional overloads to `WebApiPublisher.PublishAsync` and `WebApiPublisher.PublishCollectionAsync` to support the event publishing of a different (mapped) type where applicable; see `eventModifier` delegate parameter. Additionally, supports `WebApiPublisher.Mapper` to convert/map by default where applicable.
-- *Fixed:* The `Result.OnFailure*` methods corrected to pass in the `Error` versus the `Value` (previously throwing incorrect exception as a result). 
-- *Enhancement:* Added new `CoreEx.OData` project/package to support [OData](https://learn.microsoft.com/en-us/odata/overview) capabilities. Primarily encapsulates the open-source [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client).
-	- _Note:_ this package has not been published as this is currently considered experimental; is subject to future change and/or removal.
-- *Enhancement:* Added new `CoreEx.Dataverse` project/package to support [Microsoft Dataverse](https://docs.microsoft.com/en-us/powerapps/developer/data-platform/choose-data-platform) (formerly known as Common Data Service or CDS) capabilities. Primarily encapsulates the [`ServiceClient`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.powerplatform.dataverse.client.serviceclient) and mappings to/from the _Dataverse_ entities.
-	- _Note:_ this package has not been published as this is currently considered experimental; is subject to future change and/or removal.
-
-## v3.4.1
-- *Fixed:* The `IEfDb.With` fixed (as extension methods) to also support the `with` value being passed into the corresponding `Action<T>` to simplify usage (only a subset of common intrinsic types supported, both nullable and non-nullable overloads).
-- *Fixed:* Missing `Result.CacheSet` and `Result.CacheRemove` extension methods added to `CoreEx.Results` to fully enable `IRequestCaching` in addition to existing `Result.CacheGetOrAddAsync`.
-
-## v3.4.0
-- *Enhancement:* Added `IEventSubscriberInstrumentation` (and related `EventSubscriberInstrumentationBase`) to enable `EventSubscriberBase.Instrumentation` monitoring of the subscriber as applicable.
-- *Enhancement:* Previous `EventSubscriberInvoker` exception/error handling moved into individual subscribers for greater control; a new `ErrorHandler` added to encapsulate the consistent handling of the underlying exceptions/errors. This was internal and should have no impact.
-- *Enhancement:* `ErrorHandling.ThrowSubscriberException` renamed to `Handle` and `ErrorHandling.TransientRetry` renamed to `Retry`. Old names have been obsoleted and as such will generate a compile-time error where not corrected.
-- *Enhancement:* Added `DataConsistencyException` to support the throwing of possible data consistency issues; internally integrated throughout _CoreEx_.
-- *Enhancement:* Added `IDatabase.SqlFromResource` support to enable simple access to SQL statements embedded as a resource within a specified assembly.
-- *Enhancement:* `Result.When*` methods updated to support _optional_ `otherwise` function to enable `if/then/else` scenarios (only invoked where `Result.IsSuccess`).
-
-## v3.3.1
-- *Fixed:* `ServiceBusSubscriber` was not correctly bubbling (not handling) exceptions where `UnhandledHandling` was set to `ErrorHandling.None`. Was incorrectly treating same as `ErrorHandling.ThrowSubscriberException` and automatically dead-lettering and continuing.
-
-## v3.3.0
-- *Enhancement:* [Distributed tracing](https://learn.microsoft.com/en-us/dotnet/core/diagnostics/distributed-tracing-instrumentation-walkthroughs#best-practices) has been added via the `InvokerBase` set of classes throughout `CoreEx` to ensure coverage and consistency of implementation. A new `InvokeArgs` has been added to house the [`ActivitySource`](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.activitysource) instance; this also provides for further extension opportunities limiting future potential breaking changes.
-
-## v3.2.0
-- *Enhancement:* Added `ServiceBusReceiverActions` as a means to encapsulate the `ServiceBusReceivedMessage` and `ServiceBusReceiver` as a `ServiceBusMessageActions` equivalent to enable both the `ServiceBusSubscriber` and `ServiceBusOrchestratedSubscriber` to be leveraged outside of native Azure Functions.
-- *Enhancement:* Added support for [claim-check pattern](https://learn.microsoft.com/en-us/azure/architecture/patterns/claim-check) for large messages. `EventData.Value` serialization to be stored as an attachment in the likes of blob storage and then referenced (claim-check) from the actual message. A new `IAttachmentStorage` encapsulates the attachment behavior with the `IEventSerializer` implementations referencing as applicable; whereby separating this behavior from the `IEventSender` enabling greater consistency and reuse. Added `BlobAttachmentStorage` and `BlobSasAttachmentStorage` to support Azure blob storage.
-
-## v3.1.1
-- *Fixed:* The `DatabaseParameterCollection.AddParameter` now explicitly sets the `DbParameter.Value` to `DbNull.Value` where the value passed in is `null`.
-
-## v3.1.0
-- *Enhancement:* Added `Hosting.ServiceBase` class for a self-orchestrated service to execute for a specified `MaxIterations`; provides an alternative to using a `HostedService`. Useful for the likes of timer trigger Azure Functions for eample.
-- *Enhancement:* Added `EventOutboxService` as an alternative to `EventOutboxHostedService`; related to (and leverages) above to achieve same outcome.
-- *Fixed:* `Database.OnDbException` was incorrectly converting the unhandled exception to a `Result`; will now throw as expected.
-
-## v3.0.0
-- *Enhancement:* Added new `CoreEx.Results` namespace with primary `Result` and `Result<T>` classes to enable [monadic](https://en.wikipedia.org/wiki/Monad_(functional_programming)) error-handling, often referred to [Railway-oriented programming](https://swlaschin.gitbooks.io/fsharpforfunandprofit/content/posts/recipe-part2.html); see [`CoreEx.Results`](./src/CoreEx/Results/README.md) for more implementation details. Thanks [Adi](https://github.com/AdiThakker) for inspiring and guiding on this change. Related changes as follows:
-  - *Enhancement:* `EventSubscriberBase`, `SubscriberBase` and `SubscriberBase<T>` modified to include `EventSubscriberArgs` (`Dictionary<string, object?>`) to allow other parameters to be passed in. The `ReceiveAsync` methods now support the args as a parameter, and must return a `Result` to better support errors; breaking change. 
-  - *Enhancement:* Where overriding `Validator.OnValidateAsync` this method must return a `Result`, as does the `CustomRule` (for consistency); breaking change. The `Result` enables other errors to be returned avoiding the need/cost to throw an exception.
-  - *Enhancement:* `ExecutionContext` user authorization methods have been renamed (`UserIsAuthorized` and `UserIsInRole`) and explicitly leverage `Result`; breaking change.
-  - *Enhancement:* `IReferenceDataProvider.GetAsync` method now supports a return type of `Result<T>`; breaking change.
-- *Enhancement:* The `WebApi` namespace has been moved to a new `CoreEx.AspNetCore` project/package to decouple these explicit [ASP.NET Core](https://learn.microsoft.com/en-us/aspnet/core/introduction-to-aspnet-core) capabilities from the core; breaking change.
-  - The `IExceptionResult` interface has been deprecated as a result; all exceptions have been updated accordingly.
-- *Fixed:* Validation extension method `EnsureValue` has been renamed to `Required` to be more explicit as to purpose; breaking change.
-- *Fixed:* `InvokerBase` and `InvokerBase<TResult>` now split sync and async code to avoid sync over async; requires both the sync and async virtual methods to be overridden to implement correctly.
-- *Enhancement:* Ad-hoc performance optimizations; some minor breaking changes primarily impacting internal usage.
-- *Enhancement:* Added `net6.0` and `net7.0` support in addition to [.NET Standard](https://learn.microsoft.com/en-us/dotnet/standard/net-standard#when-to-target-net50-or-net60-vs-netstandard) to all packages. This will allow access to additional features per version where required, and overall performance improvements.
-- *Enhancement:* Added `CoreEx.Solace` to enable the publishing of messages to [Solace](https://solace.com/) message broker; thanks [Israel](https://github.com/israels).
-- *Enhancement:* Updated `CoreEx.Cosmos` to support direct model queries using `ModelQuery` methods where applicable.
-- *Enhancement:* Added `PagingOperationFilterFields` to allow specific selection of fields for the `PagingOperationFilter`. This was influenced by pull request [67](https://github.com/Avanade/CoreEx/pull/67).
-
-## v2.10.1
-- *Fixed:* `EventOutboxHostedService` updated so when a new `IServiceScope` is created that `ExecutionContext.Reset` is invoked to ensure existing `ServiceProvider` is not reused.
-- *Fixed:* `EventDataFormatter` defaults `PartitionKey` and `TenantId` properties, where not already set, from the value where implements `IPartitionKey` and `ITenantId` respectively.
-
-## v2.10.0
-- *Enhancement:* Added `IServiceBusSubscriber` with following properties: `AbandonOnTransient` (perform an Abandon versus bubbling exception), `MaxDeliveryCount` (max delivery count check within subscriber), `RetryDelay` (basic transient retry specification) and `MaxRetryDelay` (defines upper bounds of retry delay). These are defaulted from corresponding `IConfiguration` settings. Both the `ServiveBusSubscriber` and `ServiveBusOrchestratedSubscriber` implement; related logic within `ServiceBusSubscriberInvoker`.
-- *Enhancement:* Added `RetryAfterSeconds` to `TransientException` to allow overriding; defaults to `120` seconds.
-- *Fixed:* Log output from subscribers will no longer write exception stack trace where known `IExtendedException` (noise reduction).
-- *Fixed:* `ValidationException` message reformatted such that newlines are no longer included (message simplification).
-
-## v2.9.1
-- *Fixed:* The dead-lettering within `ServiceBusSubscriberInvoker` will write the exception stack trace, etc. to a new message property named `SubscriberException` to ensure this content is consistently persisted, with related error description being the exception message only.
-
-## v2.9.0
-- *Enhancement:* Added `PagingAttribute` and `PagingOperationFilter` to enable swagger output of `PagingArgs` parameters for an operation.
-
-## v2.8.0
-- *Enhancement:* Added `CoreEx.EntityFrameworkCore` support for .NET framework `net7.0`.
-- *Enhancement:* Updated `ServiceBusSubscriberInvoker` to improve logging, including opportunities to inherit and add further before and after processing logging and/or monitoring.
-- *Enhancement:* Updated `ServiceBusOrchestratedSubscriber` to perform a `LogInformation` on success.
-- *Enhancement:* The `TypedHttpClientBase<TSelf>` will probe settings by `GetType().Name` to enable settings per implementation type as an overridding configurable option.
-- *Fixed:* `HttpResult.CreateExtendedException` passes inner `HttpRequestException` for context. 
-- *Fixed:* `EventSubscriberOrchestrator.AmbiquousSubscriberHandling` is correctly set to `ErrorHandling.CriticalFailFast` by default.
-
-## v2.7.0
-- *Enhancement:* Simplified usage for `TypedHttpClientCore` and `TypedHttpClientBase` such that all parameters with the exception of `HttpClient` default where not specified.
-- *Enhancement:* `IServiceCollection` extension methods for `CoreEx.Validation` and `CoreEx.FluentValidation` support option to include/exclude underlying interfaces where performing register using `AddValidator` and `AddValidators`.
-- *Enhancement:* Enable interoperability between `CoreEx.Validation` and a non-`CoreEx.Validation` mapped `IValidator`; see `Interop` validation extension method.
-- *Enhancement:* `ServiceBusOrchestratedSubscriber` added to support orchestrated (`EventSubscriberOrchestrator`) event subscribers (`IEventSubscriber`, `SubscriberBase` and `SubscriberBase<T>`) based on matching metadata (`EventSubscriberAttribute`) to determine which registered subscriber to execute for the current `ServiceBusReceivedMessage`.
-- *Enhancement:* `BlobLockSynchronizer` added to perform `IServiceSynchronizer` using Azure Blob storage.
-- *Fixed:* Resolved transaction already diposed exception for the `EventOutboxHostedService` by creating a new `IServiceProvider` scope and instantiating a `EventOutboxDequeueBase` per execution to ensure all dependencies are reinstantiated where applicable.
-- *Enhancement:* Updated all package dependencies to latest.
-
-## v2.6.0
-- *Enhancement:* `ReferenceDataOrchestrator` supports `IConfigureCacheEntry` to enable flexibility of configuration; no changes to current behaviour.
-- *Fixed:* `ReferenceDataBase` was not correctly managing the `Id` and `IdType` throughout the inheritence hierarchy.
-- *Enhancement:* Database, Entity Framework, and Cosmos capabilities can be configured within their respective `*Args` to perform a `Cleaner.Clean` automatically on the response. Defaults to `false` to maintain current functionality.
-- *Fixed:* `Mapper<T>` was not correctly initializing nullable destination properties during a `Flatten`; for example, a destination `DateTime?` was being set with a `DateTime.MinValue` where source property was not nullable. A new `InitializeDestination` can be optionally specified (or overridden) to perform; otherwise, current initialization behavior will continue.
-
-## v2.5.3
-- *Fixed:* Database `RowVersion` conversion fixed to correctly enable per database provider.
-
-## v2.5.2
-- *Fixed:* `ReferenceDataOrchestrator` further updated to attempt to use `ExecutionContext` where possible when `Current` has not  previously been set; this is similar to previous behaviour (< `2.5.1`).
-- *Fixed:* `ReferenceDataOrchestrator` updated to leverage `AsyncLocal` for `Current` to remove `static` value leakage; lifetime within the context of the request.
-
-## v2.5.1
-- *Fixed:* `System.ObjectDisposedException: Cannot access a disposed object` for the `IServiceProvider` has been resolved where reference data loading (`ReferenceDataOrchestrator`), that in turn loaded child reference data. A new start up `UseReferenceDataOrchestrator` method simplifies set up.
-
-## v2.5.0
-- *Enhancement:* Added string casing support to `Cleaner` and `EntityCore` using new `StringCase`; being `None` (as-is default), `Upper`, `Lower` and `Title`. Leverages standard .NET  `TextInfo` to implement underlying case conversion. 
-- *Fixed:* Applied all changes identified by Code Analysis.
-- *Fixed:* `NullReferenceException` in `EntityBaseDictionary` where item value is `null` corrected.
-- *Enhancement:* Added `KeyModifier` function to `ObservableDictionary` to allow key manipulation to ensure consistency, i.e. all uppercase.
-- *Fixed:* Potential SQL Injection opportunity within `DatabaseExtendedExtensions.ReferenceData` corrected when schema and table names were being specified explicitly; now quoted using `DbCommandBuilder.QuoteIdentifier`.
-
-## v2.4.0
-- *Enhancement:* Added `CompareValuesRule`, `EnumRule` and `EnumValueRule` as additional validation rules.
-
-## v2.3.0
-- *Enhancement:* `PagingArgs.MaxTake` default set by `SettingsBase.PagingMaxTake`.
-- *Enhancement:* Reference data `ICacheEntry` policy configuration can now be defined in settings.
-
-## v2.2.0
-- *Fixed:* Entity Framework `EfDb.UpdateAsync` resolved error where the instance of entity type cannot be tracked because another instance with the same key value is already being tracked.
-- *Fixed:* The `CollectionMapper` was incorrectly appending items to an existing collection, versus performing a replacement operation.
-- *Enhancement:* Improved Entity Framework support where entities contain relationships, both query and update; new `EfDbArgs.QueryNoTracking` and `EfDbArgs.ClearChangeTrackerAfterGet` added to configure/override default behaviour. 
-- *Enhancement:* Added `TypedHttpClientOptions OnBeforeRequest` and within `TypedHttpClientBase<TSelf>` to enable updating of the `HttpRequestMessage` before it is sent.
-
-## v2.1.0
-- *Enhancement:* Added additional `ReferenceDataBaseEx.GetRefDataText` method overload with a parameter of `id`; as an alternative to the pre-existing `code`. 
-- *Enhancement:* `ReferenceDataOrchestrator` caching supports virtual `OnGetCacheKey` to enable overridding classes to further define the key characteristics.
-
-## v2.0.0
-- *Enhancement:* Added support for [`MySQL`](https://dev.mysql.com/) through introduction of `MySqlDatabase` that supports similar pattern to `SqlServerDatabase`.
-- *Enhancement:* Added new `EncodedStringToDateTimeConverter` to simulate row versioning from a `DateTime` (timestamp) as an alternative.
-- *Enhancement:* **Breaking change**: `CoreEx.EntityFrameworkCore` updated to only have database provider independent reference of `Microsoft.EntityFrameworkCore`. Developer will need to add database specific within own solution to use.
-- *Enhancement:* **Breaking change**: Moved classes that inherit from the likes of `EntityBase` into corresponding `Extended` namespace as secondary, and moved the corresponding `Models` implementation into root as primary and removed namespace accordingly. This is to ensure consistency, such that _extended_ usage is explicit (non-default). `MessageItem` updated to no longer inherit from `EntityBase` as the extended capabilities are not required.
-- *Enhancement:* **Breaking change**: The `AddValidators` extension method has been updated to register the implementing validators directly, versus the underlying `IValidatorEx`. This enables multiple validators to be registered for an entity. Any references to the interface will need to be updated to reference the concrete to continue functioning through dependency injection. Generally, the validators are not mocked, and the concrete classes can be if need using `MOQ` where required; impact of change is considered low risk for higher reward.
-- *Enhancement:* Added the security related capabilities to `ExecutionContext` as was previously available in _[Beef](https://github.com/Avanade/Beef)_.
-
-## v1.0.12
-- *Enhancement:* Added new `Mapping.Mapper` as a simple (explicit) `IMapper` capability as an alternative to AutoMapper. Enable the key `Map`, `Flatten` and `Expand` mapping capabilities. This is no reflection/compiling magic, just specified mapping code which executes very fast.
-- *Enhancement:* **Breaking change**: Validation `Additional` method renamed to `AdditionalAsync` to be more explicit.
-- *Enhancement:* **Breaking change**: The `SqlServer` specific capabilities within `CoreEx.Database` project/assembly have been moved to a new `CoreEx.Database.SqlServer` project/assembly.
-
-## v1.0.11
-- *Enhancement:* Updated the `EventOutboxEnqueueBase` and `EventOutboxDequeueBase` to include the `EventDataBase.Key` value/column.
-- *Enhancement:* Added the `EventOutboxHostedService` (migrated from `NTangle`) to enable hosted outbox publishing service execution.
-- *Enhancement:* `LoggerEventSender` updated to also log event metadata.
-
-## v1.0.10
-- *Enhancement:* Loosened `EntityCollectionResult` generic `TEntity` constraint to `EntityBase` to enable inherited extended entitites.
-- *Enhancement:* Extended `TypedHttpClientBase<TSelf>` to support `DefaultOptions` and `SendOptions` to enable default configuration of new `TypedHttpClientOptions`; i.e. the likes of `WithRetry` can now default versus having to be set per invocation of `SendAsync`.
-- *Enhancement:* Added `TypedMappedHttpClientBase`, `TypedMappedHttpClientCore` and `TypedMappedHttpClient` with new `IMapper` property used to add extended support for request and response type mappings as part of the request. New methods are `GetMappedAsync`, `PostMappedAsync`, `PutMappedAsync` and `PatchMappedAsync` where applicable.
-- *Enhancement:* `IConverter<T>` usability improvements; including others that leverage.
-- *Enhancement:* AutoMapper converters added for common `IConverter<T>` implementations to enable.
-- *Enhancement:* `ReferenceDataOrchestrator.ConvertFromId(object? id)` overload added to enable usage when `Type` of `Id` is unknown.
-- *Enhancement:* Added `RefDataLoader` overload that supports stored procedure command usage.
-- *Enhancement:* Extended `TableValuedParameter` to support standard list types; including corresponding configurable `DatabaseColumn` names.
-- *Enhancement:* Add `DatabaseCommand.SelectMultiSetAsync` overloads to support paging. 
-- *Enhancement:* Added `IEntityKey` to enable key-based support in a consistent and standardized manner; refactored `IIdentifier` and `IPrimaryKey` to leverage; existing references within updated to leverage `IEntityKey` where applicable.
-- *Enhancement:* Improved validation handling of nullable vs non-nullable types when adding rules.
-- *Enhancement:* `EntityBase` usage simplified especially where inheriting indirectly, i.e. from a base class that inherits `EntityBase`. As a result `EntityBase<>` will be deprecated next version. `ICloneable` support removed, now supported via `ExtendedExtensions.Clone<T>()`.
-- *Enhancement:* Improved the `HttpArg` query string output support.
-- *Enhancement:* Added `Models.ChangeLog` (does not inherit from `EntityBase`) as alternative to `Entities.ChangeLog` (which does). Also, added corresponding `AutoMapper` mapping between the two.
-- *Enhancement:* `CosmosDbContainerBase` updated to further centralize functionality, inheriting classes updated accordingly.
-- *Enhancement:* **Breaking change**: `ICollectionResult.Collection` renamed to `ICollectionResult.Items`.
-- *Enhancement:* **Breaking change**: `IReferenceDataCollection` properties `AllList` and `ActiveList` renamed to `AllItems` and `ActiveItems` respectively.
-- *Enhancement:* **Breaking change**: `HttpClientEx` removed as was a duplicate of `TypedHttpClient`; the latter was/is the intended implementation.
-- *Enhancement:* `JsonDataReader` when loading `IReferenceData` will attempt to read using both JSON and .NET Property names before overridding to allow additional flexibility within the specified JSON/YAML.
-- *Enhancement:* `ReferenceDataOrchestrator` concurrency support improved to ensure loading of reference data items for a	`Type` is managed with a `SemaphoreSlim` to ensure only a single thread loads (only once).
-- *Fixed:* `SettingsBase` was not looking for keys containing `__` or `:` consistently.
-- *Fixed:* `JsonFilterer` implementations now filters contents of a JSON object array correctly.
-
-## v1.0.9
-- *Enhancement:* Ported and refactored CosmosDb components from _Beef_ repo.
-- *Enhancement:* **Breaking change**: Replaced `DatabaseArgs.Paging` with `DatabaseQuery.Paging` and `DatabaseQuery.WithPaging`.
-- *Enhancement:* **Breaking change**: Replaced `EfDbArgs.Paging` with `EfDbQuery.Paging` and `EfDbQuery.WithPaging`.
-- *Enhancement:* Added `JsonDataReader` to enable dynamic loading of either YAML or JSON formatted data for data migration/uploading.
-- *Enhancement:* Added `WebApiExceptionHandlerMiddleware` to manage any unhandled exceptions.
-- *Enhancement:* Added `TypedHttpClient` to enable basic support for instantiating a `TypedHttpClientCore` without having to explicitly inherit.
-- *Enhancement:* **Breaking change**: HealthChecks project deprecated with functionality moved to individual projects where applicable.
-- *Enhancement:* Added `EfDbEntity` to provide a typed entity wrapper over the `IEfDb` operations.
-- *Enhancement:* `AddAzureServiceBusClient` has had support to configure `ServiceBusClientOptions` added.
-- *Fixed:* The `ServiceBusMessage` cannot be sent due to local transactions not being supported with other resource managers/DTC resolved.
-- *Fixed:* The `AuthenticationException` and `AuthorizationException` HTTP status codes were incorrect; updated to `401` and `403` respectively.
-
-## v1.0.8
-- *Enhancement:* `InvokerBase<TInvoker, TArgs>` has been updated to that the `TArgs` value is optional.
-- *Enhancement:* `ReferenceDataFilter` added to simplify HTTP Agent filtering as a single encapsulated object.
-- *Enhancement:* `WebApi.ConvertNotfoundToDefaultStatusCodeOnDelete` property added to convert `NotFoundException` to the default `StatusCode` (`NoContent`) as considered an idempotent operation; defaults to `true`.
-- *Enhancement:* `PropertyExpression.SentenceCaseConverter` added to enable overridding of default `ToSentenceCase` logic.
-- *Fixed:* `HttpArg` where `HttpArgType.FromUriUseProperties` was incorrectly formatting string values.
-- *Fixed:* `WebApi.Patch` operation was not returning the updated value correctly.
-- *Fixed:* `WebApiExecutionContextMiddleware` not setting `Username` and `Timestamp` correctly.
-- *Fixed:* `WebApiInvoker` was not setting the `x-error-type` and `x-error-code` headers for `IExtendedException` exceptions.
-- *Fixed:* `WebApiParam` updated to use `ETag` header (primary) then `IETag.ETag` property (secondary) as request `ETag` value.
-- *Fixed:* `ValidationException` updated to return message as `MediaTypeNames.Text.Plain` where message only (i.e. no property errors).
-- *Fixed:* `IChangeLog` values set correctly for `IDatabase` and `IEfDb` create and update.
-- *Fixed:* `IDatabase` connection open override methods now called correctly.
-- *Fixed:* `CollectionRuleItem<TItem>` updated to support duplicate checking by `IIdentifier<T>` as well as the existing `IPrimaryKey`.
-
-## v1.0.7
-- *Fixed:* Invokers updated to leverage `async/await` correctly.
-
-## v1.0.6
-- *Enhancement:* Added `WithTimeout(TimeSpan timeout)` support to `TypedHttpClientBase` to enable per request timeouts.
-- *Enhancement:* Added `AddFluentValidators<TAssembly>` to automatically add the requisite dependency injection (DI) configuration for all validators defined within an `Assembly`.
-- *Enhancement:* **Breaking change**: Refactored the extended entities to simplify implementation and improve experience via new `EntityBase.GetPropertyValues` and corresponding `PropertyValue`. 
-- *Enhancement:* Ported and refactored validation framework from _Beef_ repo.
-- *Enhancement:* Added support for `IReferenceData` serialization where only the `Code` is serialized/deserialized. This also required new `IReferenceDataContentJsonSerializer`, `ReferenceDataContentJsonSerializer` and `ReferenceDataContentWebApi` for when full `IReferenceData` content serialization is required.
-- *Enhancement:* Serializers updated to support `ICollectionResult` which by default only (de)serializes the underlying `Collection`. The `Paging` is expected to be handled separately.
-- *Enhancement:* Ported and refactored _core_ database framework components from _DbEx_ rep.
-- *Enhancement:* Ported and refactored extended database and entity framework components from _Beef_ repo.
-- *Enhancement:* Added implementation agnostic `IMapper` for typed value mappings. Added _AutoMapper_ implementation with wrapper to enable.
-
-## v1.0.5
-- *Enhancement:* Overloads added to `WebApi` and `WebApiPublisher` to allow the body value to be passed versus reading from the `HttpRequest`. This is useful where allowing the likes of the ASP.NET infrastructure to deserialize value directly.
-- *Enhancement:* Automatic `ETag` generation is performed prior to field filtering as this is considered a post response action and should not affect `ETag` value.
-- *Enhancement:* Added `EventSendException` to provide a standard means to capture the events not sent to enable additional processing of those where required.
-
-## v1.0.4
-- *Enhancement:* Status code checking added to `TypedHttpClientBase<TSelf>`.
-- *Enhancement:* Added `IValidator<T>` to enable any implementation (agnostic); created wrappers to enable `FluentValidation` (including dependency injection helper).
-- *Enhancement:* Added `AcceptsBodyAttribute` to enable Swagger (via `AcceptsBodyOperationFilter`) to output body type characteristics where not explicitly defined.
-- *Enhancement:* Added opt-in simulated concurrency (ETag) checking/generation to `WebApi.PutAsync` and `WebApi.PatchAsync` where underlying data source does not support.
-- *Enhancement:* Added `CancellationToken` to all `Async` methods.
-
-## v1.0.3
-- *Enhancement:* `IIdentifier.GetIdentifier` method replaced with `IIdentifier.Id`. The `IIdentifier<T>` overrides the `Id` property hiding the base `IIdentifier.Id`.
-- *Enhancement:* `ValueContentResult` properties are now all get and set enabled. The `Value` property has been removed as it is JSON serialized into `Content`.
-- *Fixed:* `ValueContentResult.ETag` generation enhanced to handle different query string parameters when performing an HTTP GET for `IEnumerable` (collection) types.
-- *Enhancement:* Added `HttpClientEx` as a light-weight means to instantiate a one-off instance from an `HttpClient`.
-- *Enhancement:* Added `JsonMergePatch` (`application/merge-patch+json`) whereby the contents of a JSON document are merged into an existing object value as per [RFC7396](https://tools.ietf.org/html/rfc7396).
-- *Enhancement:* Added/updated reference data capabilities.
-- Plus, many more minor fixes and enhancements.
-
-## v1.0.2
-- *Enhancement:* **Breaking change**: The event publishing (`IEventPublisher`) is now designed to occur in three distinct phases: 1) formatting (`EventDataFormatter.Format`), 2) serialization (`IEventSerializer.SerializeAsync`), and 3) sending (`IEventSender.SendAsync`). The `EventPublisher` has been added to orchestrate this flow.
-- *Enhancement:* Updated the `IJsonSerializer` implementation defaults to align with the expected default serialization behavior.
-- *Fixed:* The `TypedHttpClientBase` fixed to handle where the `requestUri` parameter is only a query string and not a path.
-
-## v1.0.1
-- *New:* Initial publish to GitHub/NuGet.
\ No newline at end of file
+## v4.0.0
+- This is a **major** version release; a re-imagine / re-invention of the existing capabilities to enable a more modern, flexible and maintainable codebase.
+  - This release contains **significant breaking changes** - there is **no** upgrade path from the previous `v3.x` versions; however, the core capabilities and patterns remain largely consistent.
+  - A number of capabilities have been removed as they were not widely used, considered legacy/obsolete, or there are better alternatives available.
+  - Not all existing capabilities have been re-implemented in this release; the intention is to (re-)add further capabilities in future releases as required.
+
+## v3.* and earlier
+- These versions are now considered **legacy** and are no longer maintained; there are no further updates planned for these versions, including bug fixes or security patches.
\ No newline at end of file
diff --git a/Common.targets b/Common.targets
deleted file mode 100644
index 2283c31e..00000000
--- a/Common.targets
+++ /dev/null
@@ -1,39 +0,0 @@
-<Project>
-	<PropertyGroup>
-		<Version>3.31.0</Version>
-		<LangVersion>preview</LangVersion>
-		<Authors>Avanade</Authors>
-		<Company>Avanade</Company>
-		<Copyright>Avanade (c)</Copyright>
-		<PackageProjectUrl>https://github.com/Avanade/CoreEx</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/Avanade/CoreEx</RepositoryUrl>
-		<SignAssembly>true</SignAssembly>
-		<DelaySign>false</DelaySign>
-		<AssemblyOriginatorKeyFile>strong-name-key.snk</AssemblyOriginatorKeyFile>
-		<RepositoryType>git</RepositoryType>
-		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-		<PackageIconUrl>https://github.com/Avanade/CoreEx/raw/main/images/Logo256x256.png</PackageIconUrl>
-		<PackageIcon>Logo256x256.png</PackageIcon>
-		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
-		<Nullable>enable</Nullable>
-		<EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<IncludeSymbols>true</IncludeSymbols>
-		<EmbedAllSources>true</EmbedAllSources>
-    <IsPackable>true</IsPackable>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<None Include="..\..\images\Logo256x256.png" Link="Logo256x256.png">
-			<PackagePath>\</PackagePath>
-			<Pack>true</Pack>
-		</None>
-	</ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/CoreEx.Core.Test.Parallel.slnf b/CoreEx.Core.Test.Parallel.slnf
new file mode 100644
index 00000000..a2eaa9a2
--- /dev/null
+++ b/CoreEx.Core.Test.Parallel.slnf
@@ -0,0 +1,15 @@
+{
+  "solution": {
+    "path": "CoreEx.slnx",
+    "projects": [
+      "tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj",
+      "tests/CoreEx.AspNetCore.Test.Unit/CoreEx.AspNetCore.Test.Unit.csproj",
+      "tests/CoreEx.Data.Test.Unit/CoreEx.Data.Test.Unit.csproj",
+      "tests/CoreEx.Database.Test.Unit/CoreEx.Database.Test.Unit.csproj",
+      "tests/CoreEx.DomainDriven.Test.Unit/CoreEx.DomainDriven.Test.Unit.csproj",
+      "tests/CoreEx.Events.Test.Unit/CoreEx.Events.Test.Unit.csproj",
+      "tests/CoreEx.RefData.Test.Unit/CoreEx.RefData.Test.Unit.csproj",
+      "tests/CoreEx.Validation.Test.Unit/CoreEx.Validation.Test.Unit.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/CoreEx.Core.Test.Sequential.slnf b/CoreEx.Core.Test.Sequential.slnf
new file mode 100644
index 00000000..56e10999
--- /dev/null
+++ b/CoreEx.Core.Test.Sequential.slnf
@@ -0,0 +1,11 @@
+{
+  "solution": {
+    "path": "CoreEx.slnx",
+    "projects": [
+      "tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj",
+      "tests/CoreEx.Caching.Redis.Test.Unit/CoreEx.Caching.Redis.Test.Unit.csproj",
+      "tests/CoreEx.Database.SqlServer.Test.Unit/CoreEx.Database.SqlServer.Test.Unit.csproj",
+      "tests/CoreEx.Database.Postgres.Test.Unit/CoreEx.Database.Postgres.Test.Unit.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/CoreEx.Core.slnf b/CoreEx.Core.slnf
new file mode 100644
index 00000000..352dd734
--- /dev/null
+++ b/CoreEx.Core.slnf
@@ -0,0 +1,36 @@
+{
+  "solution": {
+    "path": "CoreEx.slnx",
+    "projects": [
+      "src/CoreEx/CoreEx.csproj",
+      "src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj",
+      "src/CoreEx.AspNetCore.NSwag/CoreEx.AspNetCore.NSwag.csproj",
+      "src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj",
+      "src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj",
+      "src/CoreEx.Data/CoreEx.Data.csproj",
+      "src/CoreEx.Database/CoreEx.Database.csproj",
+      "src/CoreEx.Database.Postgres/CoreEx.Database.Postgres.csproj",
+      "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj",
+      "src/CoreEx.DomainDriven/CoreEx.DomainDriven.csproj",
+      "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj",
+      "src/CoreEx.Events/CoreEx.Events.csproj",
+      "src/CoreEx.RefData/CoreEx.RefData.csproj",
+      "src/CoreEx.Template/CoreEx.Template.csproj",
+      "src/CoreEx.UnitTesting/CoreEx.UnitTesting.csproj",
+      "src/CoreEx.Validation/CoreEx.Validation.csproj",
+      "tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.csproj",
+      "tests/CoreEx.AspNetCore.Test.Unit/CoreEx.AspNetCore.Test.Unit.csproj",
+      "tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj",
+      "tests/CoreEx.Caching.Redis.Test.Unit/CoreEx.Caching.Redis.Test.Unit.csproj",
+      "tests/CoreEx.Data.Test.Unit/CoreEx.Data.Test.Unit.csproj",
+      "tests/CoreEx.Database.Postgres.Test.Unit/CoreEx.Database.Postgres.Test.Unit.csproj",
+      "tests/CoreEx.Database.SqlServer.Test.Unit/CoreEx.Database.SqlServer.Test.Unit.csproj",
+      "tests/CoreEx.Database.Test.Unit/CoreEx.Database.Test.Unit.csproj",
+      "tests/CoreEx.DomainDriven.Test.Unit/CoreEx.DomainDriven.Test.Unit.csproj",
+      "tests/CoreEx.Events.Test.Unit/CoreEx.Events.Test.Unit.csproj",
+      "tests/CoreEx.RefData.Test.Unit/CoreEx.RefData.Test.Unit.csproj",
+      "tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj",
+      "tests/CoreEx.Validation.Test.Unit/CoreEx.Validation.Test.Unit.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/CoreEx.Samples.Build.slnf b/CoreEx.Samples.Build.slnf
new file mode 100644
index 00000000..d0871b67
--- /dev/null
+++ b/CoreEx.Samples.Build.slnf
@@ -0,0 +1,44 @@
+{
+  "solution": {
+    "path": "CoreEx.slnx",
+    "projects": [
+      "samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj",
+      "samples/src/Contoso.Order.Workflow.Client/Contoso.Order.Workflow.Client.csproj",
+      "samples/src/Contoso.Order.Workflow.Worker/Contoso.Order.Workflow.Worker.csproj",
+      "samples/src/Contoso.Order.Workflow.Workflow/Contoso.Order.Workflow.Workflow.csproj",
+      "samples/src/Contoso.Orders.Api/Contoso.Orders.Api.csproj",
+      "samples/src/Contoso.Orders.Application/Contoso.Orders.Application.csproj",
+      "samples/src/Contoso.Orders.Contracts/Contoso.Orders.Contracts.csproj",
+      "samples/src/Contoso.Orders.Database/Contoso.Orders.Database.csproj",
+      "samples/src/Contoso.Orders.Infrastructure/Contoso.Orders.Infrastructure.csproj",
+      "samples/src/Contoso.Products.Api/Contoso.Products.Api.csproj",
+      "samples/src/Contoso.Products.Application/Contoso.Products.Application.csproj",
+      "samples/src/Contoso.Products.CodeGen/Contoso.Products.CodeGen.csproj",
+      "samples/src/Contoso.Products.Contracts/Contoso.Products.Contracts.csproj",
+      "samples/src/Contoso.Products.Database/Contoso.Products.Database.csproj",
+      "samples/src/Contoso.Products.Infrastructure/Contoso.Products.Infrastructure.csproj",
+      "samples/src/Contoso.Products.Relay/Contoso.Products.Relay.csproj",
+      "samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.csproj",
+      "samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.csproj",
+      "samples/src/Contoso.Shopping.Application/Contoso.Shopping.Application.csproj",
+      "samples/src/Contoso.Shopping.CodeGen/Contoso.Shopping.CodeGen.csproj",
+      "samples/src/Contoso.Shopping.Contracts/Contoso.Shopping.Contracts.csproj",
+      "samples/src/Contoso.Shopping.Database/Contoso.Shopping.Database.csproj",
+      "samples/src/Contoso.Shopping.Domain/Contoso.Shopping.Domain.csproj",
+      "samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj",
+      "samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.csproj",
+      "samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.csproj",
+      "samples/tests/Contoso.E2E.Runner/Contoso.E2E.Runner.csproj",
+      "samples/tests/Contoso.Orders.Test.Api/Contoso.Orders.Test.Api.csproj",
+      "samples/tests/Contoso.Orders.Test.Common/Contoso.Orders.Test.Common.csproj",
+      "samples/tests/Contoso.Orders.Test.Unit/Contoso.Orders.Test.Unit.csproj",
+      "samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj",
+      "samples/tests/Contoso.Products.Test.Common/Contoso.Products.Test.Common.csproj",
+      "samples/tests/Contoso.Products.Test.Relay/Contoso.Products.Test.Relay.csproj",
+      "samples/tests/Contoso.Products.Test.Subscribe/Contoso.Products.Test.Subscribe.csproj",
+      "samples/tests/Contoso.Products.Test.Unit/Contoso.Products.Test.Unit.csproj",
+      "samples/tests/Contoso.Shopping.Test.Api/Contoso.Shopping.Test.Api.csproj",
+      "samples/tests/Contoso.Shopping.Test.Common/Contoso.Shopping.Test.Common.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/CoreEx.Samples.Test.slnf b/CoreEx.Samples.Test.slnf
new file mode 100644
index 00000000..96ce8fed
--- /dev/null
+++ b/CoreEx.Samples.Test.slnf
@@ -0,0 +1,14 @@
+{
+  "solution": {
+    "path": "CoreEx.slnx",
+    "projects": [
+      "samples/tests/Contoso.Orders.Test.Api/Contoso.Orders.Test.Api.csproj",
+      "samples/tests/Contoso.Orders.Test.Unit/Contoso.Orders.Test.Unit.csproj",
+      "samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj",
+      "samples/tests/Contoso.Products.Test.Relay/Contoso.Products.Test.Relay.csproj",
+      "samples/tests/Contoso.Products.Test.Subscribe/Contoso.Products.Test.Subscribe.csproj",
+      "samples/tests/Contoso.Products.Test.Unit/Contoso.Products.Test.Unit.csproj",
+      "samples/tests/Contoso.Shopping.Test.Api/Contoso.Shopping.Test.Api.csproj"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/CoreEx.sln b/CoreEx.sln
index 6be1c777..b2433249 100644
--- a/CoreEx.sln
+++ b/CoreEx.sln
@@ -1,274 +1,1227 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.32112.339
+# Visual Studio Version 18
+VisualStudioVersion = 18.8.11904.113 insiders
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D5BD5701-A950-4E69-8EDA-F40CD0B47278}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{21B44B34-1D47-1312-99D7-9BFB05A71085}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Generator", "gen\CoreEx.Generator\CoreEx.Generator.csproj", "{54CD8587-0F45-2C2C-7AE4-BB92254202F5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}"
+	ProjectSection(SolutionItems) = preProject
+		samples\Directory.Build.props = samples\Directory.Build.props
+		samples\README.md = samples\README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aspire", "Aspire", "{619FEF78-F55D-0C82-D550-19C61C0C0537}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Aspire", "samples\aspire\Contoso.Aspire\Contoso.Aspire.csproj", "{F5453F81-E4B3-E151-C516-DCFC443B6AAA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.E2E.Runner", "samples\tests\Contoso.E2E.Runner\Contoso.E2E.Runner.csproj", "{EC98B9AF-8F6B-031B-6411-8577A30C6358}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{1E506116-D3A9-5444-9943-9F984DB86E10}"
 	ProjectSection(SolutionItems) = preProject
+		samples\docs\application-layer.md = samples\docs\application-layer.md
+		samples\docs\aspire.md = samples\docs\aspire.md
+		samples\docs\contracts-layer.md = samples\docs\contracts-layer.md
+		samples\docs\domain-layer.md = samples\docs\domain-layer.md
+		samples\docs\hosts-layer.md = samples\docs\hosts-layer.md
+		samples\docs\infrastructure-layer.md = samples\docs\infrastructure-layer.md
+		samples\docs\layers.md = samples\docs\layers.md
+		samples\docs\local-dev.md = samples\docs\local-dev.md
+		samples\docs\patterns.md = samples\docs\patterns.md
+		samples\docs\testing.md = samples\docs\testing.md
+		samples\docs\tooling.md = samples\docs\tooling.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orders", "Orders", "{FBD6A4A5-3E27-FD0A-4207-87679B033989}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{304111A3-5DA8-49F0-ED7D-EC16F0AFE287}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Order.Workflow.Worker", "samples\src\Contoso.Order.Workflow.Worker\Contoso.Order.Workflow.Worker.csproj", "{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Api", "samples\src\Contoso.Orders.Api\Contoso.Orders.Api.csproj", "{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AD48D992-C541-CC56-41B7-70254729C985}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Order.Workflow.Client", "samples\src\Contoso.Order.Workflow.Client\Contoso.Order.Workflow.Client.csproj", "{C764F355-394F-0BBC-39E6-146293B4F25C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Order.Workflow.Workflow", "samples\src\Contoso.Order.Workflow.Workflow\Contoso.Order.Workflow.Workflow.csproj", "{B98CB571-1C57-76BC-AE67-F9C20FA7F298}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Application", "samples\src\Contoso.Orders.Application\Contoso.Orders.Application.csproj", "{640181B6-B5AC-1C43-D47A-EE907D9AF004}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Contracts", "samples\src\Contoso.Orders.Contracts\Contoso.Orders.Contracts.csproj", "{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Infrastructure", "samples\src\Contoso.Orders.Infrastructure\Contoso.Orders.Infrastructure.csproj", "{58D752E2-8BB6-0D20-65DB-1594F553997E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CAE3880D-9E3D-8023-26BE-8AAD16E697AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Test.Api", "samples\tests\Contoso.Orders.Test.Api\Contoso.Orders.Test.Api.csproj", "{E85CABED-D8CD-2895-5285-9B6AA5507EFC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Test.Common", "samples\tests\Contoso.Orders.Test.Common\Contoso.Orders.Test.Common.csproj", "{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Test.Unit", "samples\tests\Contoso.Orders.Test.Unit\Contoso.Orders.Test.Unit.csproj", "{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{68483975-28EB-06EE-FCF9-5FAC48220FB9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Orders.Database", "samples\src\Contoso.Orders.Database\Contoso.Orders.Database.csproj", "{85121E88-A238-6CD7-0648-2AA45A7EE4FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Products", "Products", "{56BB41AD-FC91-A5EC-D6D2-57978F310120}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{48F40B44-1B39-3F77-468F-8962A0FA59FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Application", "samples\src\Contoso.Products.Application\Contoso.Products.Application.csproj", "{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Contracts", "samples\src\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj", "{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Infrastructure", "samples\src\Contoso.Products.Infrastructure\Contoso.Products.Infrastructure.csproj", "{539E44CB-A709-A281-4871-F6F8A4C11F92}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{47FF445A-5ECE-0D42-77D1-FBC8D31B301F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Api", "samples\src\Contoso.Products.Api\Contoso.Products.Api.csproj", "{F3A98127-9FCF-6B18-D795-8BD6717331F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Relay", "samples\src\Contoso.Products.Relay\Contoso.Products.Relay.csproj", "{76F91F52-6E7B-3A21-63A1-345660DB3FEB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Subscribe", "samples\src\Contoso.Products.Subscribe\Contoso.Products.Subscribe.csproj", "{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1CB20A2D-8C42-CF0D-6043-5164D9A2BF96}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Test.Api", "samples\tests\Contoso.Products.Test.Api\Contoso.Products.Test.Api.csproj", "{17C01ED0-1106-55A3-FAED-926F52FA5F0E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Test.Common", "samples\tests\Contoso.Products.Test.Common\Contoso.Products.Test.Common.csproj", "{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Test.Relay", "samples\tests\Contoso.Products.Test.Relay\Contoso.Products.Test.Relay.csproj", "{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Test.Subscribe", "samples\tests\Contoso.Products.Test.Subscribe\Contoso.Products.Test.Subscribe.csproj", "{0D274948-6B5F-9589-E43C-B2D71C41FABF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Test.Unit", "samples\tests\Contoso.Products.Test.Unit\Contoso.Products.Test.Unit.csproj", "{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{9705C0A1-E9AB-AEE0-6FD1-9EDF62A78620}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.CodeGen", "samples\src\Contoso.Products.CodeGen\Contoso.Products.CodeGen.csproj", "{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Products.Database", "samples\src\Contoso.Products.Database\Contoso.Products.Database.csproj", "{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shopping", "Shopping", "{A8732A47-07D4-8D47-C5B6-F97BD3E38958}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Application", "samples\src\Contoso.Shopping.Application\Contoso.Shopping.Application.csproj", "{C5775D51-B206-2F8D-82ED-413CE0884BCC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Contracts", "samples\src\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj", "{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Domain", "samples\src\Contoso.Shopping.Domain\Contoso.Shopping.Domain.csproj", "{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Infrastructure", "samples\src\Contoso.Shopping.Infrastructure\Contoso.Shopping.Infrastructure.csproj", "{F8BA3D53-DCD5-42A4-56A5-971893F60D14}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{FDEA7AA6-FCA2-19F5-0D6A-3AB590BA599E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Api", "samples\src\Contoso.Shopping.Api\Contoso.Shopping.Api.csproj", "{8769A8B1-559C-17A5-949B-762ECC85561D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Relay", "samples\src\Contoso.Shopping.Relay\Contoso.Shopping.Relay.csproj", "{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Subscribe", "samples\src\Contoso.Shopping.Subscribe\Contoso.Shopping.Subscribe.csproj", "{DA7A3683-2913-76F1-7A13-35A0765F6CA1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1EDEE56C-4E5B-5153-E988-38698733D7A4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Test.Api", "samples\tests\Contoso.Shopping.Test.Api\Contoso.Shopping.Test.Api.csproj", "{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Test.Common", "samples\tests\Contoso.Shopping.Test.Common\Contoso.Shopping.Test.Common.csproj", "{175C2EF4-9EBF-1E78-03BD-A1B569B79218}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Test.Subscribe", "samples\tests\Contoso.Shopping.Test.Subscribe\Contoso.Shopping.Test.Subscribe.csproj", "{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Test.Unit", "samples\tests\Contoso.Shopping.Test.Unit\Contoso.Shopping.Test.Unit.csproj", "{60D956AA-3030-FB48-423C-F561A8157E30}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{FE53E0A4-0616-B5A4-61FB-B03BB5DC12C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.CodeGen", "samples\src\Contoso.Shopping.CodeGen\Contoso.Shopping.CodeGen.csproj", "{88D83B9E-144B-54B9-421D-13C133018F24}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Shopping.Database", "samples\src\Contoso.Shopping.Database\Contoso.Shopping.Database.csproj", "{D1281655-C259-3F9B-6488-B2410D6DF57F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "schema", "schema", "{42A310E3-0F71-2072-02C4-53C624232677}"
+	ProjectSection(SolutionItems) = preProject
+		schema\coreex-refdata.json = schema\coreex-refdata.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "servicebus", "servicebus", "{CD818228-55E2-371B-8970-595487E8457D}"
+	ProjectSection(SolutionItems) = preProject
+		servicebus\Config.json = servicebus\Config.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{089100B1-113F-4E66-888A-E83F3999EAFD}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.filenesting.json = .filenesting.json
+		.gitignore = .gitignore
 		CHANGELOG.md = CHANGELOG.md
-		.github\workflows\CI.yml = .github\workflows\CI.yml
 		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
-		Common.targets = Common.targets
 		CONTRIBUTING.md = CONTRIBUTING.md
+		Directory.Packages.props = Directory.Packages.props
+		docker-compose.yml = docker-compose.yml
 		LICENCE = LICENCE
 		nuget-publish.ps1 = nuget-publish.ps1
 		README.md = README.md
 		SECURITY.md = SECURITY.md
+		strong-name-key.snk = strong-name-key.snk
+		Version.props = Version.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx", "src\CoreEx\CoreEx.csproj", "{A4B64F4F-224D-492C-8B0D-DAB27D510007}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Newtonsoft", "src\CoreEx.Newtonsoft\CoreEx.Newtonsoft.csproj", "{14A7663B-134D-4C5E-8C61-4A164F645528}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Build.targets = src\Directory.Build.targets
+		NAMESPACE_README_TEMPLATE.md = NAMESPACE_README_TEMPLATE.md
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3145DCB9-98FB-4519-BCC0-75A22A252EDC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.AspNetCore.NSwag", "src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj", "{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Test", "tests\CoreEx.Test\CoreEx.Test.csproj", "{29C58371-9B52-47DA-99A0-D3B696BA74C9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.AspNetCore", "src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj", "{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.TestFunction", "tests\CoreEx.TestFunction\CoreEx.TestFunction.csproj", "{284E43D8-26F9-4D9C-8C71-9BD4436FBD8A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Azure.Messaging.ServiceBus", "src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj", "{E465AC32-F652-0D7E-EA24-6381795F6CE6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.TestApi", "tests\CoreEx.TestApi\CoreEx.TestApi.csproj", "{AE9992CC-CCC1-46C2-B78C-F8F55A41D4DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Caching.FusionCache", "src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj", "{DDB7BF96-B196-1349-2365-96B92D22E462}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.FluentValidation", "src\CoreEx.FluentValidation\CoreEx.FluentValidation.csproj", "{40AFC397-8B33-45D2-B16B-457ABF8C3D8D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.CodeGen", "src\CoreEx.CodeGen\CoreEx.CodeGen.csproj", "{DCC0817E-82E5-F60F-672D-BF676943856B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Data", "src\CoreEx.Data\CoreEx.Data.csproj", "{63625656-266F-B022-3716-673440A174B7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{1B711C83-4E75-4A94-9B89-09DF08FF6602}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.Postgres", "src\CoreEx.Database.Postgres\CoreEx.Database.Postgres.csproj", "{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "My.Hr", "My.Hr", "{F53B0E83-87F8-4679-94B8-268FE6A9C0AD}"
-	ProjectSection(SolutionItems) = preProject
-		docker-compose.myHr.override.yml = docker-compose.myHr.override.yml
-		docker-compose.myHr.yml = docker-compose.myHr.yml
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.SqlServer", "src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj", "{5332C95F-AD2E-210A-C886-EE3558C32C84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.Hr.Api", "samples\My.Hr\My.Hr.Api\My.Hr.Api.csproj", "{EC6BE86F-231A-4CA6-974E-27DDD290BCEE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database", "src\CoreEx.Database\CoreEx.Database.csproj", "{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.Hr.Business", "samples\My.Hr\My.Hr.Business\My.Hr.Business.csproj", "{616C2FB0-02FB-4B9A-8092-325DA728F76F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.DomainDriven", "src\CoreEx.DomainDriven\CoreEx.DomainDriven.csproj", "{D4AB5CFD-8801-3E3F-8CB8-263153F40433}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.Hr.Functions", "samples\My.Hr\My.Hr.Functions\My.Hr.Functions.csproj", "{8280D72B-3FA8-43D6-95FC-4133F6B415F5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.EntityFrameworkCore", "src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj", "{B4477709-42B4-DFA5-C2A3-FFA992FFE987}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.Hr.UnitTest", "samples\My.Hr\My.Hr.UnitTest\My.Hr.UnitTest.csproj", "{CB46A8D4-60BE-48C9-9FCC-C62017F195AB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Events", "src\CoreEx.Events\CoreEx.Events.csproj", "{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.Hr.Database", "samples\My.Hr\My.Hr.Database\My.Hr.Database.csproj", "{86CEE51A-CCAB-4E35-835B-9B67C3D637C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.RefData", "src\CoreEx.RefData\CoreEx.RefData.csproj", "{98CBE19B-8104-EB02-8665-3ABB229DF5EB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Azure", "src\CoreEx.Azure\CoreEx.Azure.csproj", "{431795AC-9CDC-4562-B422-B633FE725810}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Template", "src\CoreEx.Template\CoreEx.Template.csproj", "{D62233CD-2291-4BA0-AD10-89FC9883680C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Validation", "src\CoreEx.Validation\CoreEx.Validation.csproj", "{4AFA8838-7DF1-487E-8B72-452E4EFA3AD6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.UnitTesting", "src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj", "{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Database", "src\CoreEx.Database\CoreEx.Database.csproj", "{6F12636A-4720-4A82-A1F6-ED29E7876F90}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Validation", "src\CoreEx.Validation\CoreEx.Validation.csproj", "{8EE9ECD8-881C-BEF2-0469-04677F568C42}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.EntityFrameworkCore", "src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj", "{9824E0A9-B9A6-49B1-8B7C-A2E157406C66}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx", "src\CoreEx\CoreEx.csproj", "{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.AutoMapper", "src\CoreEx.AutoMapper\CoreEx.AutoMapper.csproj", "{F3384ADC-1DA8-4538-B991-DBD2BC591AF1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Cosmos", "src\CoreEx.Cosmos\CoreEx.Cosmos.csproj", "{8D0CC3FD-65C2-4302-99F4-A90AC7680E1B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.AspNetCore.Test.Api", "tests\CoreEx.AspNetCore.Test.Api\CoreEx.AspNetCore.Test.Api.csproj", "{31603E1B-EC57-22BC-02BC-224C7325B83F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Cosmos.Test", "tests\CoreEx.Cosmos.Test\CoreEx.Cosmos.Test.csproj", "{C8021CF0-006F-427C-827F-B997F26E5FF6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.AspNetCore.Test.Unit", "tests\CoreEx.AspNetCore.Test.Unit\CoreEx.AspNetCore.Test.Unit.csproj", "{3C6151E0-F611-2745-CC98-42B5135617BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Database.SqlServer", "src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj", "{BB2FF5B1-67BC-4EC9-BB51-5980982030C2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Azure.Messaging.ServiceBus.Test.Unit", "tests\CoreEx.Azure.Messaging.ServiceBus.Test.Unit\CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj", "{23742F88-E0B2-7CA5-7691-C3EF53523E9D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Database.MySql", "src\CoreEx.Database.MySql\CoreEx.Database.MySql.csproj", "{9A583DF9-5851-4CE1-97A1-9DC406792022}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Caching.Redis.Test.Unit", "tests\CoreEx.Caching.Redis.Test.Unit\CoreEx.Caching.Redis.Test.Unit.csproj", "{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Solace", "src\CoreEx.Solace\CoreEx.Solace.csproj", "{FB6495D7-931C-4280-9499-69D08A613B54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Data.Test.Unit", "tests\CoreEx.Data.Test.Unit\CoreEx.Data.Test.Unit.csproj", "{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Solace.Test", "tests\CoreEx.Solace.Test\CoreEx.Solace.Test.csproj", "{B2C31D4A-87EE-4568-859B-DC7E8EA1043D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.Postgres.Test.Console", "tests\CoreEx.Database.Postgres.Test.Console\CoreEx.Database.Postgres.Test.Console.csproj", "{4F295E1D-7477-C433-BC02-0C050B7CB8DD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.AspNetCore", "src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj", "{804FFA4D-D530-46A7-9ECD-D2D42987161E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.Postgres.Test.Unit", "tests\CoreEx.Database.Postgres.Test.Unit\CoreEx.Database.Postgres.Test.Unit.csproj", "{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Dataverse", "src\CoreEx.Dataverse\CoreEx.Dataverse.csproj", "{E7CF0E06-BDC3-49E5-AC52-D65894ED6AFF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.SqlServer.Test.Console", "tests\CoreEx.Database.SqlServer.Test.Console\CoreEx.Database.SqlServer.Test.Console.csproj", "{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.OData", "src\CoreEx.OData\CoreEx.OData.csproj", "{2A31E887-0340-47D2-AF80-D88D2866C80E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.SqlServer.Test.Unit", "tests\CoreEx.Database.SqlServer.Test.Unit\CoreEx.Database.SqlServer.Test.Unit.csproj", "{785A2E76-A3EB-DD33-5D45-976D353154BE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTesting", "UnitTesting", "{D2C61D4A-2A6D-4284-BF9D-09F51BA735B8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Database.Test.Unit", "tests\CoreEx.Database.Test.Unit\CoreEx.Database.Test.Unit.csproj", "{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.UnitTesting", "src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj", "{AC247FD3-5F9F-4DD2-B0CB-1C9CD1EB98D2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.DomainDriven.Test.Unit", "tests\CoreEx.DomainDriven.Test.Unit\CoreEx.DomainDriven.Test.Unit.csproj", "{6A678CFE-284B-9C38-06DD-96E39315EFE9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.TestFunctionIso", "tests\CoreEx.TestFunctionIso\CoreEx.TestFunctionIso.csproj", "{6F7B4F1E-3C3A-4CD7-A9BF-973A5053C1C8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Events.Test.Unit", "tests\CoreEx.Events.Test.Unit\CoreEx.Events.Test.Unit.csproj", "{26896B30-18EB-B25F-2CA1-AA66185F4B33}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Test2", "tests\CoreEx.Test2\CoreEx.Test2.csproj", "{910B5894-46BC-4427-95D6-2804F06458E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.RefData.Test.Unit", "tests\CoreEx.RefData.Test.Unit\CoreEx.RefData.Test.Unit.csproj", "{397CFAD6-B04D-C63E-879B-1CA169A8F75A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreEx.Database.Postgres", "src\CoreEx.Database.Postgres\CoreEx.Database.Postgres.csproj", "{C042AC2A-415D-432E-83FA-B911FD9ED378}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Test.Unit", "tests\CoreEx.Test.Unit\CoreEx.Test.Unit.csproj", "{83A80E50-2E50-573B-6336-4508D9E4BF30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Data", "src\CoreEx.Data\CoreEx.Data.csproj", "{B927138A-1DCA-4BA6-A9E5-E5DA6446DABC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Validation.Test.Unit", "tests\CoreEx.Validation.Test.Unit\CoreEx.Validation.Test.Unit.csproj", "{6F99B103-83BD-C345-0B37-B1AF60DEA827}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.UnitTesting.Azure.Functions", "src\CoreEx.UnitTesting.Azure.Functions\CoreEx.UnitTesting.Azure.Functions.csproj", "{2BBB766A-D8A2-47B4-AD42-1FD96051604C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{07C2787E-EAC7-C090-1BA3-A61EC2A24D84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.UnitTesting.Azure.ServiceBus", "src\CoreEx.UnitTesting.Azure.ServiceBus\CoreEx.UnitTesting.Azure.ServiceBus.csproj", "{CA21C777-2592-4E1A-970B-0888F21AB0D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreEx.Tooling.Console", "tools\CoreEx.Tooling.Console\CoreEx.Tooling.Console.csproj", "{46503D23-225E-1D7F-C8D5-60320D711B10}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A4B64F4F-224D-492C-8B0D-DAB27D510007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4B64F4F-224D-492C-8B0D-DAB27D510007}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4B64F4F-224D-492C-8B0D-DAB27D510007}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4B64F4F-224D-492C-8B0D-DAB27D510007}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14A7663B-134D-4C5E-8C61-4A164F645528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14A7663B-134D-4C5E-8C61-4A164F645528}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14A7663B-134D-4C5E-8C61-4A164F645528}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14A7663B-134D-4C5E-8C61-4A164F645528}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29C58371-9B52-47DA-99A0-D3B696BA74C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29C58371-9B52-47DA-99A0-D3B696BA74C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29C58371-9B52-47DA-99A0-D3B696BA74C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29C58371-9B52-47DA-99A0-D3B696BA74C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{284E43D8-26F9-4D9C-8C71-9BD4436FBD8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{284E43D8-26F9-4D9C-8C71-9BD4436FBD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{284E43D8-26F9-4D9C-8C71-9BD4436FBD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{284E43D8-26F9-4D9C-8C71-9BD4436FBD8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE9992CC-CCC1-46C2-B78C-F8F55A41D4DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE9992CC-CCC1-46C2-B78C-F8F55A41D4DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE9992CC-CCC1-46C2-B78C-F8F55A41D4DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE9992CC-CCC1-46C2-B78C-F8F55A41D4DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40AFC397-8B33-45D2-B16B-457ABF8C3D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40AFC397-8B33-45D2-B16B-457ABF8C3D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40AFC397-8B33-45D2-B16B-457ABF8C3D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40AFC397-8B33-45D2-B16B-457ABF8C3D8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC6BE86F-231A-4CA6-974E-27DDD290BCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC6BE86F-231A-4CA6-974E-27DDD290BCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC6BE86F-231A-4CA6-974E-27DDD290BCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC6BE86F-231A-4CA6-974E-27DDD290BCEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{616C2FB0-02FB-4B9A-8092-325DA728F76F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{616C2FB0-02FB-4B9A-8092-325DA728F76F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{616C2FB0-02FB-4B9A-8092-325DA728F76F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{616C2FB0-02FB-4B9A-8092-325DA728F76F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8280D72B-3FA8-43D6-95FC-4133F6B415F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8280D72B-3FA8-43D6-95FC-4133F6B415F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8280D72B-3FA8-43D6-95FC-4133F6B415F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8280D72B-3FA8-43D6-95FC-4133F6B415F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB46A8D4-60BE-48C9-9FCC-C62017F195AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB46A8D4-60BE-48C9-9FCC-C62017F195AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB46A8D4-60BE-48C9-9FCC-C62017F195AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB46A8D4-60BE-48C9-9FCC-C62017F195AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{86CEE51A-CCAB-4E35-835B-9B67C3D637C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{86CEE51A-CCAB-4E35-835B-9B67C3D637C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{86CEE51A-CCAB-4E35-835B-9B67C3D637C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{86CEE51A-CCAB-4E35-835B-9B67C3D637C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{431795AC-9CDC-4562-B422-B633FE725810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{431795AC-9CDC-4562-B422-B633FE725810}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{431795AC-9CDC-4562-B422-B633FE725810}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{431795AC-9CDC-4562-B422-B633FE725810}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4AFA8838-7DF1-487E-8B72-452E4EFA3AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4AFA8838-7DF1-487E-8B72-452E4EFA3AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4AFA8838-7DF1-487E-8B72-452E4EFA3AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4AFA8838-7DF1-487E-8B72-452E4EFA3AD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F12636A-4720-4A82-A1F6-ED29E7876F90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F12636A-4720-4A82-A1F6-ED29E7876F90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F12636A-4720-4A82-A1F6-ED29E7876F90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F12636A-4720-4A82-A1F6-ED29E7876F90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9824E0A9-B9A6-49B1-8B7C-A2E157406C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9824E0A9-B9A6-49B1-8B7C-A2E157406C66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9824E0A9-B9A6-49B1-8B7C-A2E157406C66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9824E0A9-B9A6-49B1-8B7C-A2E157406C66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3384ADC-1DA8-4538-B991-DBD2BC591AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3384ADC-1DA8-4538-B991-DBD2BC591AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3384ADC-1DA8-4538-B991-DBD2BC591AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3384ADC-1DA8-4538-B991-DBD2BC591AF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D0CC3FD-65C2-4302-99F4-A90AC7680E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D0CC3FD-65C2-4302-99F4-A90AC7680E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D0CC3FD-65C2-4302-99F4-A90AC7680E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D0CC3FD-65C2-4302-99F4-A90AC7680E1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8021CF0-006F-427C-827F-B997F26E5FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8021CF0-006F-427C-827F-B997F26E5FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8021CF0-006F-427C-827F-B997F26E5FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C8021CF0-006F-427C-827F-B997F26E5FF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB2FF5B1-67BC-4EC9-BB51-5980982030C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB2FF5B1-67BC-4EC9-BB51-5980982030C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB2FF5B1-67BC-4EC9-BB51-5980982030C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB2FF5B1-67BC-4EC9-BB51-5980982030C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A583DF9-5851-4CE1-97A1-9DC406792022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A583DF9-5851-4CE1-97A1-9DC406792022}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A583DF9-5851-4CE1-97A1-9DC406792022}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A583DF9-5851-4CE1-97A1-9DC406792022}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB6495D7-931C-4280-9499-69D08A613B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB6495D7-931C-4280-9499-69D08A613B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB6495D7-931C-4280-9499-69D08A613B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB6495D7-931C-4280-9499-69D08A613B54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B2C31D4A-87EE-4568-859B-DC7E8EA1043D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B2C31D4A-87EE-4568-859B-DC7E8EA1043D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B2C31D4A-87EE-4568-859B-DC7E8EA1043D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B2C31D4A-87EE-4568-859B-DC7E8EA1043D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{804FFA4D-D530-46A7-9ECD-D2D42987161E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{804FFA4D-D530-46A7-9ECD-D2D42987161E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{804FFA4D-D530-46A7-9ECD-D2D42987161E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{804FFA4D-D530-46A7-9ECD-D2D42987161E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7CF0E06-BDC3-49E5-AC52-D65894ED6AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7CF0E06-BDC3-49E5-AC52-D65894ED6AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7CF0E06-BDC3-49E5-AC52-D65894ED6AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7CF0E06-BDC3-49E5-AC52-D65894ED6AFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A31E887-0340-47D2-AF80-D88D2866C80E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A31E887-0340-47D2-AF80-D88D2866C80E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A31E887-0340-47D2-AF80-D88D2866C80E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A31E887-0340-47D2-AF80-D88D2866C80E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC247FD3-5F9F-4DD2-B0CB-1C9CD1EB98D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC247FD3-5F9F-4DD2-B0CB-1C9CD1EB98D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC247FD3-5F9F-4DD2-B0CB-1C9CD1EB98D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC247FD3-5F9F-4DD2-B0CB-1C9CD1EB98D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F7B4F1E-3C3A-4CD7-A9BF-973A5053C1C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F7B4F1E-3C3A-4CD7-A9BF-973A5053C1C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F7B4F1E-3C3A-4CD7-A9BF-973A5053C1C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F7B4F1E-3C3A-4CD7-A9BF-973A5053C1C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{910B5894-46BC-4427-95D6-2804F06458E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{910B5894-46BC-4427-95D6-2804F06458E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{910B5894-46BC-4427-95D6-2804F06458E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{910B5894-46BC-4427-95D6-2804F06458E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C042AC2A-415D-432E-83FA-B911FD9ED378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C042AC2A-415D-432E-83FA-B911FD9ED378}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C042AC2A-415D-432E-83FA-B911FD9ED378}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C042AC2A-415D-432E-83FA-B911FD9ED378}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B927138A-1DCA-4BA6-A9E5-E5DA6446DABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B927138A-1DCA-4BA6-A9E5-E5DA6446DABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B927138A-1DCA-4BA6-A9E5-E5DA6446DABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B927138A-1DCA-4BA6-A9E5-E5DA6446DABC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2BBB766A-D8A2-47B4-AD42-1FD96051604C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2BBB766A-D8A2-47B4-AD42-1FD96051604C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2BBB766A-D8A2-47B4-AD42-1FD96051604C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2BBB766A-D8A2-47B4-AD42-1FD96051604C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA21C777-2592-4E1A-970B-0888F21AB0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA21C777-2592-4E1A-970B-0888F21AB0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA21C777-2592-4E1A-970B-0888F21AB0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA21C777-2592-4E1A-970B-0888F21AB0D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Debug|x86.Build.0 = Debug|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Release|x64.Build.0 = Release|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5}.Release|x86.Build.0 = Release|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Release|x64.Build.0 = Release|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA}.Release|x86.Build.0 = Release|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Debug|x64.Build.0 = Debug|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Debug|x86.Build.0 = Debug|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Release|x64.ActiveCfg = Release|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Release|x64.Build.0 = Release|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Release|x86.ActiveCfg = Release|Any CPU
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358}.Release|x86.Build.0 = Release|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Debug|x86.Build.0 = Debug|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Release|x64.Build.0 = Release|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9}.Release|x86.Build.0 = Release|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Debug|x64.Build.0 = Debug|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Debug|x86.Build.0 = Debug|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Release|x64.ActiveCfg = Release|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Release|x64.Build.0 = Release|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Release|x86.ActiveCfg = Release|Any CPU
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812}.Release|x86.Build.0 = Release|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Debug|x64.Build.0 = Debug|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Debug|x86.Build.0 = Debug|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Release|x64.ActiveCfg = Release|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Release|x64.Build.0 = Release|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Release|x86.ActiveCfg = Release|Any CPU
+		{C764F355-394F-0BBC-39E6-146293B4F25C}.Release|x86.Build.0 = Release|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Debug|x64.Build.0 = Debug|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Debug|x86.Build.0 = Debug|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Release|x64.ActiveCfg = Release|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Release|x64.Build.0 = Release|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Release|x86.ActiveCfg = Release|Any CPU
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298}.Release|x86.Build.0 = Release|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Debug|x64.Build.0 = Debug|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Debug|x86.Build.0 = Debug|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Release|Any CPU.Build.0 = Release|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Release|x64.ActiveCfg = Release|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Release|x64.Build.0 = Release|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Release|x86.ActiveCfg = Release|Any CPU
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004}.Release|x86.Build.0 = Release|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Debug|x64.Build.0 = Debug|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Debug|x86.Build.0 = Debug|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Release|x64.ActiveCfg = Release|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Release|x64.Build.0 = Release|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Release|x86.ActiveCfg = Release|Any CPU
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B}.Release|x86.Build.0 = Release|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Debug|x64.Build.0 = Debug|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Debug|x86.Build.0 = Debug|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Release|x64.ActiveCfg = Release|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Release|x64.Build.0 = Release|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Release|x86.ActiveCfg = Release|Any CPU
+		{58D752E2-8BB6-0D20-65DB-1594F553997E}.Release|x86.Build.0 = Release|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Debug|x64.Build.0 = Debug|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Debug|x86.Build.0 = Debug|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Release|x64.ActiveCfg = Release|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Release|x64.Build.0 = Release|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Release|x86.ActiveCfg = Release|Any CPU
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC}.Release|x86.Build.0 = Release|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Debug|x64.Build.0 = Debug|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Debug|x86.Build.0 = Debug|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Release|x64.ActiveCfg = Release|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Release|x64.Build.0 = Release|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Release|x86.ActiveCfg = Release|Any CPU
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D}.Release|x86.Build.0 = Release|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Debug|x64.Build.0 = Debug|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Debug|x86.Build.0 = Debug|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Release|x64.ActiveCfg = Release|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Release|x64.Build.0 = Release|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02}.Release|x86.Build.0 = Release|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Debug|x64.Build.0 = Debug|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Debug|x86.Build.0 = Debug|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Release|x64.ActiveCfg = Release|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Release|x64.Build.0 = Release|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Release|x86.ActiveCfg = Release|Any CPU
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD}.Release|x86.Build.0 = Release|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Release|x64.Build.0 = Release|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5}.Release|x86.Build.0 = Release|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Debug|x64.Build.0 = Debug|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Debug|x86.Build.0 = Debug|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Release|x64.ActiveCfg = Release|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Release|x64.Build.0 = Release|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Release|x86.ActiveCfg = Release|Any CPU
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13}.Release|x86.Build.0 = Release|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Debug|x64.Build.0 = Debug|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Debug|x86.Build.0 = Debug|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Release|x64.ActiveCfg = Release|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Release|x64.Build.0 = Release|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Release|x86.ActiveCfg = Release|Any CPU
+		{539E44CB-A709-A281-4871-F6F8A4C11F92}.Release|x86.Build.0 = Release|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Release|x64.Build.0 = Release|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9}.Release|x86.Build.0 = Release|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Release|x64.Build.0 = Release|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB}.Release|x86.Build.0 = Release|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Release|x64.Build.0 = Release|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7}.Release|x86.Build.0 = Release|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Debug|x64.Build.0 = Debug|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Debug|x86.Build.0 = Debug|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Release|x64.ActiveCfg = Release|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Release|x64.Build.0 = Release|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Release|x86.ActiveCfg = Release|Any CPU
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E}.Release|x86.Build.0 = Release|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Debug|x64.Build.0 = Debug|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Debug|x86.Build.0 = Debug|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Release|x64.ActiveCfg = Release|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Release|x64.Build.0 = Release|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Release|x86.ActiveCfg = Release|Any CPU
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01}.Release|x86.Build.0 = Release|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Debug|x64.Build.0 = Debug|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Release|x64.ActiveCfg = Release|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Release|x64.Build.0 = Release|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7}.Release|x86.Build.0 = Release|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Debug|x64.Build.0 = Debug|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Debug|x86.Build.0 = Debug|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Release|x64.ActiveCfg = Release|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Release|x64.Build.0 = Release|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Release|x86.ActiveCfg = Release|Any CPU
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF}.Release|x86.Build.0 = Release|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Release|x64.Build.0 = Release|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B}.Release|x86.Build.0 = Release|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Release|x64.Build.0 = Release|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5}.Release|x86.Build.0 = Release|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Debug|x86.Build.0 = Debug|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Release|x64.Build.0 = Release|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9}.Release|x86.Build.0 = Release|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Debug|x86.Build.0 = Debug|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Release|x64.Build.0 = Release|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC}.Release|x86.Build.0 = Release|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Debug|x86.Build.0 = Debug|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Release|x64.Build.0 = Release|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8}.Release|x86.Build.0 = Release|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Release|x64.Build.0 = Release|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1}.Release|x86.Build.0 = Release|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Debug|x64.Build.0 = Debug|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Debug|x86.Build.0 = Debug|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Release|x64.ActiveCfg = Release|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Release|x64.Build.0 = Release|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Release|x86.ActiveCfg = Release|Any CPU
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14}.Release|x86.Build.0 = Release|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Debug|x64.Build.0 = Debug|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Debug|x86.Build.0 = Debug|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Release|x64.ActiveCfg = Release|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Release|x64.Build.0 = Release|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Release|x86.ActiveCfg = Release|Any CPU
+		{8769A8B1-559C-17A5-949B-762ECC85561D}.Release|x86.Build.0 = Release|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Debug|x64.Build.0 = Debug|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Debug|x86.Build.0 = Debug|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Release|x64.ActiveCfg = Release|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Release|x64.Build.0 = Release|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Release|x86.ActiveCfg = Release|Any CPU
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A}.Release|x86.Build.0 = Release|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Debug|x64.Build.0 = Debug|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Debug|x86.Build.0 = Debug|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Release|x64.ActiveCfg = Release|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Release|x64.Build.0 = Release|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1}.Release|x86.Build.0 = Release|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Debug|x64.Build.0 = Debug|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Debug|x86.Build.0 = Debug|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Release|x64.ActiveCfg = Release|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Release|x64.Build.0 = Release|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Release|x86.ActiveCfg = Release|Any CPU
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A}.Release|x86.Build.0 = Release|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Debug|x64.Build.0 = Debug|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Debug|x86.Build.0 = Debug|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Release|Any CPU.Build.0 = Release|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Release|x64.ActiveCfg = Release|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Release|x64.Build.0 = Release|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Release|x86.ActiveCfg = Release|Any CPU
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218}.Release|x86.Build.0 = Release|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Release|x64.Build.0 = Release|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269}.Release|x86.Build.0 = Release|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Debug|x64.Build.0 = Debug|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Debug|x86.Build.0 = Debug|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Release|x64.ActiveCfg = Release|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Release|x64.Build.0 = Release|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Release|x86.ActiveCfg = Release|Any CPU
+		{60D956AA-3030-FB48-423C-F561A8157E30}.Release|x86.Build.0 = Release|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Debug|x64.Build.0 = Debug|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Debug|x86.Build.0 = Debug|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Release|x64.ActiveCfg = Release|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Release|x64.Build.0 = Release|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Release|x86.ActiveCfg = Release|Any CPU
+		{88D83B9E-144B-54B9-421D-13C133018F24}.Release|x86.Build.0 = Release|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Debug|x64.Build.0 = Debug|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Debug|x86.Build.0 = Debug|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Release|x64.ActiveCfg = Release|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Release|x64.Build.0 = Release|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Release|x86.ActiveCfg = Release|Any CPU
+		{D1281655-C259-3F9B-6488-B2410D6DF57F}.Release|x86.Build.0 = Release|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Debug|x64.Build.0 = Debug|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Debug|x86.Build.0 = Debug|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Release|x64.ActiveCfg = Release|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Release|x64.Build.0 = Release|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18}.Release|x86.Build.0 = Release|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Debug|x64.Build.0 = Debug|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Debug|x86.Build.0 = Debug|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Release|x64.ActiveCfg = Release|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Release|x64.Build.0 = Release|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Release|x86.ActiveCfg = Release|Any CPU
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62}.Release|x86.Build.0 = Release|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Debug|x64.Build.0 = Debug|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Debug|x86.Build.0 = Debug|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Release|x64.ActiveCfg = Release|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Release|x64.Build.0 = Release|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Release|x86.ActiveCfg = Release|Any CPU
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6}.Release|x86.Build.0 = Release|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Debug|x64.Build.0 = Debug|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Debug|x86.Build.0 = Debug|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Release|x64.ActiveCfg = Release|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Release|x64.Build.0 = Release|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Release|x86.ActiveCfg = Release|Any CPU
+		{DDB7BF96-B196-1349-2365-96B92D22E462}.Release|x86.Build.0 = Release|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Debug|x64.Build.0 = Debug|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Debug|x86.Build.0 = Debug|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Release|x64.ActiveCfg = Release|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Release|x64.Build.0 = Release|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Release|x86.ActiveCfg = Release|Any CPU
+		{DCC0817E-82E5-F60F-672D-BF676943856B}.Release|x86.Build.0 = Release|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Debug|x64.Build.0 = Debug|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Release|x64.ActiveCfg = Release|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Release|x64.Build.0 = Release|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{63625656-266F-B022-3716-673440A174B7}.Release|x86.Build.0 = Release|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Debug|x64.Build.0 = Debug|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Debug|x86.Build.0 = Debug|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Release|x64.ActiveCfg = Release|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Release|x64.Build.0 = Release|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Release|x86.ActiveCfg = Release|Any CPU
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A}.Release|x86.Build.0 = Release|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Debug|x64.Build.0 = Debug|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Debug|x86.Build.0 = Debug|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Release|x64.ActiveCfg = Release|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Release|x64.Build.0 = Release|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Release|x86.ActiveCfg = Release|Any CPU
+		{5332C95F-AD2E-210A-C886-EE3558C32C84}.Release|x86.Build.0 = Release|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Debug|x64.Build.0 = Debug|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Debug|x86.Build.0 = Debug|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Release|x64.ActiveCfg = Release|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Release|x64.Build.0 = Release|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Release|x86.ActiveCfg = Release|Any CPU
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29}.Release|x86.Build.0 = Release|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Debug|x86.Build.0 = Debug|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Release|x64.Build.0 = Release|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433}.Release|x86.Build.0 = Release|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Release|x64.Build.0 = Release|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987}.Release|x86.Build.0 = Release|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Debug|x86.Build.0 = Debug|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Release|x64.Build.0 = Release|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6}.Release|x86.Build.0 = Release|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Debug|x64.Build.0 = Debug|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Release|x64.ActiveCfg = Release|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Release|x64.Build.0 = Release|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB}.Release|x86.Build.0 = Release|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Debug|x64.Build.0 = Debug|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Debug|x86.Build.0 = Debug|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Release|x64.ActiveCfg = Release|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Release|x64.Build.0 = Release|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Release|x86.ActiveCfg = Release|Any CPU
+		{D62233CD-2291-4BA0-AD10-89FC9883680C}.Release|x86.Build.0 = Release|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Debug|x64.Build.0 = Debug|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Debug|x86.Build.0 = Debug|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Release|x64.ActiveCfg = Release|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Release|x64.Build.0 = Release|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Release|x86.ActiveCfg = Release|Any CPU
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB}.Release|x86.Build.0 = Release|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Release|x64.Build.0 = Release|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42}.Release|x86.Build.0 = Release|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Release|x64.Build.0 = Release|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE}.Release|x86.Build.0 = Release|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Debug|x64.Build.0 = Debug|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Debug|x86.Build.0 = Debug|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Release|x64.ActiveCfg = Release|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Release|x64.Build.0 = Release|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Release|x86.ActiveCfg = Release|Any CPU
+		{31603E1B-EC57-22BC-02BC-224C7325B83F}.Release|x86.Build.0 = Release|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Debug|x64.Build.0 = Debug|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Debug|x86.Build.0 = Debug|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Release|x64.ActiveCfg = Release|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Release|x64.Build.0 = Release|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{3C6151E0-F611-2745-CC98-42B5135617BC}.Release|x86.Build.0 = Release|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Debug|x64.Build.0 = Debug|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Debug|x86.Build.0 = Debug|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Release|x64.ActiveCfg = Release|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Release|x64.Build.0 = Release|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Release|x86.ActiveCfg = Release|Any CPU
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D}.Release|x86.Build.0 = Release|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Release|x64.Build.0 = Release|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE}.Release|x86.Build.0 = Release|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Debug|x64.Build.0 = Debug|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Debug|x86.Build.0 = Debug|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Release|x64.ActiveCfg = Release|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Release|x64.Build.0 = Release|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Release|x86.ActiveCfg = Release|Any CPU
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B}.Release|x86.Build.0 = Release|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Debug|x86.Build.0 = Debug|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Release|x64.Build.0 = Release|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD}.Release|x86.Build.0 = Release|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Debug|x64.Build.0 = Debug|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Debug|x86.Build.0 = Debug|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Release|x64.ActiveCfg = Release|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Release|x64.Build.0 = Release|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Release|x86.ActiveCfg = Release|Any CPU
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8}.Release|x86.Build.0 = Release|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Debug|x86.Build.0 = Debug|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Release|x64.Build.0 = Release|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9}.Release|x86.Build.0 = Release|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Release|x64.Build.0 = Release|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{785A2E76-A3EB-DD33-5D45-976D353154BE}.Release|x86.Build.0 = Release|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Debug|x64.Build.0 = Debug|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Debug|x86.Build.0 = Debug|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Release|x64.ActiveCfg = Release|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Release|x64.Build.0 = Release|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Release|x86.ActiveCfg = Release|Any CPU
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35}.Release|x86.Build.0 = Release|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Release|x64.Build.0 = Release|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9}.Release|x86.Build.0 = Release|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Debug|x64.Build.0 = Debug|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Debug|x86.Build.0 = Debug|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Release|x64.ActiveCfg = Release|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Release|x64.Build.0 = Release|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Release|x86.ActiveCfg = Release|Any CPU
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33}.Release|x86.Build.0 = Release|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Debug|x64.Build.0 = Debug|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Debug|x86.Build.0 = Debug|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Release|x64.ActiveCfg = Release|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Release|x64.Build.0 = Release|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Release|x86.ActiveCfg = Release|Any CPU
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A}.Release|x86.Build.0 = Release|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Debug|x64.Build.0 = Debug|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Debug|x86.Build.0 = Debug|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Release|x64.ActiveCfg = Release|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Release|x64.Build.0 = Release|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Release|x86.ActiveCfg = Release|Any CPU
+		{83A80E50-2E50-573B-6336-4508D9E4BF30}.Release|x86.Build.0 = Release|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Debug|x86.Build.0 = Debug|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Release|x64.Build.0 = Release|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827}.Release|x86.Build.0 = Release|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Debug|x64.Build.0 = Debug|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Debug|x86.Build.0 = Debug|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Release|x64.ActiveCfg = Release|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Release|x64.Build.0 = Release|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Release|x86.ActiveCfg = Release|Any CPU
+		{46503D23-225E-1D7F-C8D5-60320D711B10}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A4B64F4F-224D-492C-8B0D-DAB27D510007} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{14A7663B-134D-4C5E-8C61-4A164F645528} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{29C58371-9B52-47DA-99A0-D3B696BA74C9} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{284E43D8-26F9-4D9C-8C71-9BD4436FBD8A} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{AE9992CC-CCC1-46C2-B78C-F8F55A41D4DC} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{40AFC397-8B33-45D2-B16B-457ABF8C3D8D} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{F53B0E83-87F8-4679-94B8-268FE6A9C0AD} = {1B711C83-4E75-4A94-9B89-09DF08FF6602}
-		{EC6BE86F-231A-4CA6-974E-27DDD290BCEE} = {F53B0E83-87F8-4679-94B8-268FE6A9C0AD}
-		{616C2FB0-02FB-4B9A-8092-325DA728F76F} = {F53B0E83-87F8-4679-94B8-268FE6A9C0AD}
-		{8280D72B-3FA8-43D6-95FC-4133F6B415F5} = {F53B0E83-87F8-4679-94B8-268FE6A9C0AD}
-		{CB46A8D4-60BE-48C9-9FCC-C62017F195AB} = {F53B0E83-87F8-4679-94B8-268FE6A9C0AD}
-		{86CEE51A-CCAB-4E35-835B-9B67C3D637C6} = {F53B0E83-87F8-4679-94B8-268FE6A9C0AD}
-		{431795AC-9CDC-4562-B422-B633FE725810} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{4AFA8838-7DF1-487E-8B72-452E4EFA3AD6} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{6F12636A-4720-4A82-A1F6-ED29E7876F90} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{9824E0A9-B9A6-49B1-8B7C-A2E157406C66} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{F3384ADC-1DA8-4538-B991-DBD2BC591AF1} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{8D0CC3FD-65C2-4302-99F4-A90AC7680E1B} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{C8021CF0-006F-427C-827F-B997F26E5FF6} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{BB2FF5B1-67BC-4EC9-BB51-5980982030C2} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{9A583DF9-5851-4CE1-97A1-9DC406792022} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{FB6495D7-931C-4280-9499-69D08A613B54} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{B2C31D4A-87EE-4568-859B-DC7E8EA1043D} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{804FFA4D-D530-46A7-9ECD-D2D42987161E} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{E7CF0E06-BDC3-49E5-AC52-D65894ED6AFF} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{2A31E887-0340-47D2-AF80-D88D2866C80E} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{D2C61D4A-2A6D-4284-BF9D-09F51BA735B8} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{AC247FD3-5F9F-4DD2-B0CB-1C9CD1EB98D2} = {D2C61D4A-2A6D-4284-BF9D-09F51BA735B8}
-		{6F7B4F1E-3C3A-4CD7-A9BF-973A5053C1C8} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{910B5894-46BC-4427-95D6-2804F06458E3} = {3145DCB9-98FB-4519-BCC0-75A22A252EDC}
-		{C042AC2A-415D-432E-83FA-B911FD9ED378} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{B927138A-1DCA-4BA6-A9E5-E5DA6446DABC} = {4B6BC31E-93B1-42B0-AE09-AD85AC4DB657}
-		{2BBB766A-D8A2-47B4-AD42-1FD96051604C} = {D2C61D4A-2A6D-4284-BF9D-09F51BA735B8}
-		{CA21C777-2592-4E1A-970B-0888F21AB0D7} = {D2C61D4A-2A6D-4284-BF9D-09F51BA735B8}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8B4566D2-9B22-4E27-9654-402BDBA6C744}
+		{54CD8587-0F45-2C2C-7AE4-BB92254202F5} = {21B44B34-1D47-1312-99D7-9BFB05A71085}
+		{619FEF78-F55D-0C82-D550-19C61C0C0537} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
+		{F5453F81-E4B3-E151-C516-DCFC443B6AAA} = {619FEF78-F55D-0C82-D550-19C61C0C0537}
+		{EC98B9AF-8F6B-031B-6411-8577A30C6358} = {619FEF78-F55D-0C82-D550-19C61C0C0537}
+		{1E506116-D3A9-5444-9943-9F984DB86E10} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
+		{FBD6A4A5-3E27-FD0A-4207-87679B033989} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
+		{304111A3-5DA8-49F0-ED7D-EC16F0AFE287} = {FBD6A4A5-3E27-FD0A-4207-87679B033989}
+		{1779E981-39DE-10BB-B5C8-D0B7BAEC67B9} = {304111A3-5DA8-49F0-ED7D-EC16F0AFE287}
+		{20CD43DA-9B28-5C15-AEC8-7E8D9F72B812} = {304111A3-5DA8-49F0-ED7D-EC16F0AFE287}
+		{AD48D992-C541-CC56-41B7-70254729C985} = {FBD6A4A5-3E27-FD0A-4207-87679B033989}
+		{C764F355-394F-0BBC-39E6-146293B4F25C} = {AD48D992-C541-CC56-41B7-70254729C985}
+		{B98CB571-1C57-76BC-AE67-F9C20FA7F298} = {AD48D992-C541-CC56-41B7-70254729C985}
+		{640181B6-B5AC-1C43-D47A-EE907D9AF004} = {AD48D992-C541-CC56-41B7-70254729C985}
+		{A72F93D2-AEA9-1720-66B9-0A1AC2BB3C3B} = {AD48D992-C541-CC56-41B7-70254729C985}
+		{58D752E2-8BB6-0D20-65DB-1594F553997E} = {AD48D992-C541-CC56-41B7-70254729C985}
+		{CAE3880D-9E3D-8023-26BE-8AAD16E697AB} = {FBD6A4A5-3E27-FD0A-4207-87679B033989}
+		{E85CABED-D8CD-2895-5285-9B6AA5507EFC} = {CAE3880D-9E3D-8023-26BE-8AAD16E697AB}
+		{48864ED8-BD74-6B9F-85D0-4A1F0A8EA10D} = {CAE3880D-9E3D-8023-26BE-8AAD16E697AB}
+		{A8DC818F-AA5F-C313-3DF1-928D8E4B0A02} = {CAE3880D-9E3D-8023-26BE-8AAD16E697AB}
+		{68483975-28EB-06EE-FCF9-5FAC48220FB9} = {FBD6A4A5-3E27-FD0A-4207-87679B033989}
+		{85121E88-A238-6CD7-0648-2AA45A7EE4FD} = {68483975-28EB-06EE-FCF9-5FAC48220FB9}
+		{56BB41AD-FC91-A5EC-D6D2-57978F310120} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
+		{48F40B44-1B39-3F77-468F-8962A0FA59FE} = {56BB41AD-FC91-A5EC-D6D2-57978F310120}
+		{166E1005-4C41-7CF5-6656-9CFCBB9DE8B5} = {48F40B44-1B39-3F77-468F-8962A0FA59FE}
+		{1EAD3A26-B387-DE79-F2C3-57F885CD2D13} = {48F40B44-1B39-3F77-468F-8962A0FA59FE}
+		{539E44CB-A709-A281-4871-F6F8A4C11F92} = {48F40B44-1B39-3F77-468F-8962A0FA59FE}
+		{47FF445A-5ECE-0D42-77D1-FBC8D31B301F} = {48F40B44-1B39-3F77-468F-8962A0FA59FE}
+		{F3A98127-9FCF-6B18-D795-8BD6717331F9} = {47FF445A-5ECE-0D42-77D1-FBC8D31B301F}
+		{76F91F52-6E7B-3A21-63A1-345660DB3FEB} = {47FF445A-5ECE-0D42-77D1-FBC8D31B301F}
+		{E5A11A40-C741-8D14-9140-04C0FC6AF6C7} = {47FF445A-5ECE-0D42-77D1-FBC8D31B301F}
+		{1CB20A2D-8C42-CF0D-6043-5164D9A2BF96} = {56BB41AD-FC91-A5EC-D6D2-57978F310120}
+		{17C01ED0-1106-55A3-FAED-926F52FA5F0E} = {1CB20A2D-8C42-CF0D-6043-5164D9A2BF96}
+		{18C6C9D9-EB9F-55D9-4DF2-5D47AC39BF01} = {1CB20A2D-8C42-CF0D-6043-5164D9A2BF96}
+		{5092C1C9-BCDC-DE1A-71D1-8643B161F9B7} = {1CB20A2D-8C42-CF0D-6043-5164D9A2BF96}
+		{0D274948-6B5F-9589-E43C-B2D71C41FABF} = {1CB20A2D-8C42-CF0D-6043-5164D9A2BF96}
+		{7D367D47-A4D1-6FC0-34D4-86BCEA92990B} = {1CB20A2D-8C42-CF0D-6043-5164D9A2BF96}
+		{9705C0A1-E9AB-AEE0-6FD1-9EDF62A78620} = {56BB41AD-FC91-A5EC-D6D2-57978F310120}
+		{CCFA0357-9423-1ABB-722A-B7A5E88A30B5} = {9705C0A1-E9AB-AEE0-6FD1-9EDF62A78620}
+		{53C0ADD3-A1A3-5A10-0CA0-8B01BA39F2B9} = {9705C0A1-E9AB-AEE0-6FD1-9EDF62A78620}
+		{A8732A47-07D4-8D47-C5B6-F97BD3E38958} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
+		{C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2} = {A8732A47-07D4-8D47-C5B6-F97BD3E38958}
+		{C5775D51-B206-2F8D-82ED-413CE0884BCC} = {C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2}
+		{DA97FAC3-C442-357D-BF7E-ADBD4F4F3FE8} = {C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2}
+		{EBBFE2C0-E114-519F-F3FF-F7B851566DF1} = {C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2}
+		{F8BA3D53-DCD5-42A4-56A5-971893F60D14} = {C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2}
+		{FDEA7AA6-FCA2-19F5-0D6A-3AB590BA599E} = {C9D48D85-AABB-C41F-1ECF-CC1A9FDD3DF2}
+		{8769A8B1-559C-17A5-949B-762ECC85561D} = {FDEA7AA6-FCA2-19F5-0D6A-3AB590BA599E}
+		{92EF0D72-E239-6E7D-0DE7-4B4188082D0A} = {FDEA7AA6-FCA2-19F5-0D6A-3AB590BA599E}
+		{DA7A3683-2913-76F1-7A13-35A0765F6CA1} = {FDEA7AA6-FCA2-19F5-0D6A-3AB590BA599E}
+		{1EDEE56C-4E5B-5153-E988-38698733D7A4} = {A8732A47-07D4-8D47-C5B6-F97BD3E38958}
+		{4CB35174-4DE8-EAE1-7AD3-1AB401DF374A} = {1EDEE56C-4E5B-5153-E988-38698733D7A4}
+		{175C2EF4-9EBF-1E78-03BD-A1B569B79218} = {1EDEE56C-4E5B-5153-E988-38698733D7A4}
+		{2F4DF929-C4B2-4A11-E2A7-13E4EC355269} = {1EDEE56C-4E5B-5153-E988-38698733D7A4}
+		{60D956AA-3030-FB48-423C-F561A8157E30} = {1EDEE56C-4E5B-5153-E988-38698733D7A4}
+		{FE53E0A4-0616-B5A4-61FB-B03BB5DC12C1} = {A8732A47-07D4-8D47-C5B6-F97BD3E38958}
+		{88D83B9E-144B-54B9-421D-13C133018F24} = {FE53E0A4-0616-B5A4-61FB-B03BB5DC12C1}
+		{D1281655-C259-3F9B-6488-B2410D6DF57F} = {FE53E0A4-0616-B5A4-61FB-B03BB5DC12C1}
+		{0BBBAE84-A1E5-F706-9594-4D20E7D98A18} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{F513E16A-CF34-5ADE-3761-FD2DAC95DC62} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{E465AC32-F652-0D7E-EA24-6381795F6CE6} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{DDB7BF96-B196-1349-2365-96B92D22E462} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{DCC0817E-82E5-F60F-672D-BF676943856B} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{63625656-266F-B022-3716-673440A174B7} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{84B1747F-EAF7-21FE-99AA-6CD94A6E0B2A} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{5332C95F-AD2E-210A-C886-EE3558C32C84} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{4F60D4D7-9148-13C9-65DA-ECEDC5BC3F29} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{D4AB5CFD-8801-3E3F-8CB8-263153F40433} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{B4477709-42B4-DFA5-C2A3-FFA992FFE987} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{1FFB81E3-A31C-6B19-5C5F-8280AE93E4D6} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{98CBE19B-8104-EB02-8665-3ABB229DF5EB} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{D62233CD-2291-4BA0-AD10-89FC9883680C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{19AFCE8B-DCDC-3E7C-CCEA-871CA8FE7BCB} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{8EE9ECD8-881C-BEF2-0469-04677F568C42} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{1AF913D7-D97C-80F3-FC0E-504FFB2701BE} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
+		{31603E1B-EC57-22BC-02BC-224C7325B83F} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{3C6151E0-F611-2745-CC98-42B5135617BC} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{23742F88-E0B2-7CA5-7691-C3EF53523E9D} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{D84A3AB7-A7E5-7494-2B0F-354D13ECA3BE} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{41AAEF6D-5CCE-D8F3-B0C8-CF6DA946688B} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{4F295E1D-7477-C433-BC02-0C050B7CB8DD} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{8753614D-FCC0-2C9A-19C4-A69D9377D8A8} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{69DBD2DB-3C8F-15DB-9257-10DC2A6218B9} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{785A2E76-A3EB-DD33-5D45-976D353154BE} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{A39BD9B4-3AFF-AA11-9B67-783E77F1EF35} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{6A678CFE-284B-9C38-06DD-96E39315EFE9} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{26896B30-18EB-B25F-2CA1-AA66185F4B33} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{397CFAD6-B04D-C63E-879B-1CA169A8F75A} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{83A80E50-2E50-573B-6336-4508D9E4BF30} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{6F99B103-83BD-C345-0B37-B1AF60DEA827} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{46503D23-225E-1D7F-C8D5-60320D711B10} = {07C2787E-EAC7-C090-1BA3-A61EC2A24D84}
 	EndGlobalSection
 EndGlobal
diff --git a/CoreEx.slnx b/CoreEx.slnx
new file mode 100644
index 00000000..dc4daa21
--- /dev/null
+++ b/CoreEx.slnx
@@ -0,0 +1,159 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/gen/">
+    <Project Path="gen/CoreEx.Generator/CoreEx.Generator.csproj" />
+  </Folder>
+  <Folder Name="/samples/">
+    <File Path="samples/Directory.Build.props" />
+    <File Path="samples/README.md" />
+  </Folder>
+  <Folder Name="/samples/Aspire/">
+    <Project Path="samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj" />
+    <Project Path="samples/tests/Contoso.E2E.Runner/Contoso.E2E.Runner.csproj" />
+  </Folder>
+  <Folder Name="/samples/docs/">
+    <File Path="samples/docs/application-layer.md" />
+    <File Path="samples/docs/aspire.md" />
+    <File Path="samples/docs/contracts-layer.md" />
+    <File Path="samples/docs/domain-layer.md" />
+    <File Path="samples/docs/hosts-layer.md" />
+    <File Path="samples/docs/infrastructure-layer.md" />
+    <File Path="samples/docs/layers.md" />
+    <File Path="samples/docs/local-dev.md" />
+    <File Path="samples/docs/patterns.md" />
+    <File Path="samples/docs/testing.md" />
+    <File Path="samples/docs/tooling.md" />
+  </Folder>
+  <Folder Name="/samples/Orders/" />
+  <Folder Name="/samples/Orders/hosts/">
+    <Project Path="samples/src/Contoso.Order.Workflow.Worker/Contoso.Order.Workflow.Worker.csproj" />
+    <Project Path="samples/src/Contoso.Orders.Api/Contoso.Orders.Api.csproj" />
+  </Folder>
+  <Folder Name="/samples/Orders/src/">
+    <Project Path="samples/src/Contoso.Order.Workflow.Client/Contoso.Order.Workflow.Client.csproj" />
+    <Project Path="samples/src/Contoso.Order.Workflow.Workflow/Contoso.Order.Workflow.Workflow.csproj" />
+    <Project Path="samples/src/Contoso.Orders.Application/Contoso.Orders.Application.csproj" />
+    <Project Path="samples/src/Contoso.Orders.Contracts/Contoso.Orders.Contracts.csproj" />
+    <Project Path="samples/src/Contoso.Orders.Infrastructure/Contoso.Orders.Infrastructure.csproj" />
+  </Folder>
+  <Folder Name="/samples/Orders/tests/">
+    <Project Path="samples/tests/Contoso.Orders.Test.Api/Contoso.Orders.Test.Api.csproj" />
+    <Project Path="samples/tests/Contoso.Orders.Test.Common/Contoso.Orders.Test.Common.csproj" />
+    <Project Path="samples/tests/Contoso.Orders.Test.Unit/Contoso.Orders.Test.Unit.csproj" />
+  </Folder>
+  <Folder Name="/samples/Orders/tools/">
+    <Project Path="samples/src/Contoso.Orders.Database/Contoso.Orders.Database.csproj" />
+  </Folder>
+  <Folder Name="/samples/Products/" />
+  <Folder Name="/samples/Products/src/">
+    <Project Path="samples/src/Contoso.Products.Application/Contoso.Products.Application.csproj" />
+    <Project Path="samples/src/Contoso.Products.Contracts/Contoso.Products.Contracts.csproj" />
+    <Project Path="samples/src/Contoso.Products.Infrastructure/Contoso.Products.Infrastructure.csproj" />
+  </Folder>
+  <Folder Name="/samples/Products/src/hosts/">
+    <Project Path="samples/src/Contoso.Products.Api/Contoso.Products.Api.csproj" />
+    <Project Path="samples/src/Contoso.Products.Relay/Contoso.Products.Relay.csproj" />
+    <Project Path="samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.csproj" />
+  </Folder>
+  <Folder Name="/samples/Products/tests/">
+    <Project Path="samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj" />
+    <Project Path="samples/tests/Contoso.Products.Test.Common/Contoso.Products.Test.Common.csproj" />
+    <Project Path="samples/tests/Contoso.Products.Test.Relay/Contoso.Products.Test.Relay.csproj" />
+    <Project Path="samples/tests/Contoso.Products.Test.Subscribe/Contoso.Products.Test.Subscribe.csproj" />
+    <Project Path="samples/tests/Contoso.Products.Test.Unit/Contoso.Products.Test.Unit.csproj" />
+  </Folder>
+  <Folder Name="/samples/Products/tools/">
+    <Project Path="samples/src/Contoso.Products.CodeGen/Contoso.Products.CodeGen.csproj" />
+    <Project Path="samples/src/Contoso.Products.Database/Contoso.Products.Database.csproj" />
+  </Folder>
+  <Folder Name="/samples/Shopping/" />
+  <Folder Name="/samples/Shopping/src/">
+    <Project Path="samples/src/Contoso.Shopping.Application/Contoso.Shopping.Application.csproj" />
+    <Project Path="samples/src/Contoso.Shopping.Contracts/Contoso.Shopping.Contracts.csproj" />
+    <Project Path="samples/src/Contoso.Shopping.Domain/Contoso.Shopping.Domain.csproj" />
+    <Project Path="samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj" />
+  </Folder>
+  <Folder Name="/samples/Shopping/src/hosts/">
+    <Project Path="samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.csproj" />
+    <Project Path="samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.csproj" />
+    <Project Path="samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.csproj" />
+  </Folder>
+  <Folder Name="/samples/Shopping/tests/">
+    <Project Path="samples/tests/Contoso.Shopping.Test.Api/Contoso.Shopping.Test.Api.csproj" />
+    <Project Path="samples/tests/Contoso.Shopping.Test.Common/Contoso.Shopping.Test.Common.csproj" />
+    <Project Path="samples/tests/Contoso.Shopping.Test.Subscribe/Contoso.Shopping.Test.Subscribe.csproj" />
+    <Project Path="samples/tests/Contoso.Shopping.Test.Unit/Contoso.Shopping.Test.Unit.csproj" />
+  </Folder>
+  <Folder Name="/samples/Shopping/tools/">
+    <Project Path="samples/src/Contoso.Shopping.CodeGen/Contoso.Shopping.CodeGen.csproj" />
+    <Project Path="samples/src/Contoso.Shopping.Database/Contoso.Shopping.Database.csproj" />
+  </Folder>
+  <Folder Name="/schema/">
+    <File Path="schema/coreex-refdata.json" />
+  </Folder>
+  <Folder Name="/servicebus/">
+    <File Path="servicebus/Config.json" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".filenesting.json" />
+    <File Path=".gitignore" />
+    <File Path="CHANGELOG.md" />
+    <File Path="CODE_OF_CONDUCT.md" />
+    <File Path="CONTRIBUTING.md" />
+    <File Path="Directory.Packages.props" />
+    <File Path="docker-compose.yml" />
+    <File Path="LICENCE" />
+    <File Path="nuget-publish.ps1" />
+    <File Path="README.md" />
+    <File Path="SECURITY.md" />
+    <File Path="strong-name-key.snk" />
+    <File Path="Version.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="NAMESPACE_README_TEMPLATE.md" />
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+    <Project Path="src/CoreEx.AspNetCore.NSwag/CoreEx.AspNetCore.NSwag.csproj" />
+    <Project Path="src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj" />
+    <Project Path="src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <Project Path="src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj" />
+    <Project Path="src/CoreEx.CodeGen/CoreEx.CodeGen.csproj" />
+    <Project Path="src/CoreEx.Data/CoreEx.Data.csproj" />
+    <Project Path="src/CoreEx.Database.Postgres/CoreEx.Database.Postgres.csproj" />
+    <Project Path="src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj" />
+    <Project Path="src/CoreEx.Database/CoreEx.Database.csproj" />
+    <Project Path="src/CoreEx.DomainDriven/CoreEx.DomainDriven.csproj" />
+    <Project Path="src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj" />
+    <Project Path="src/CoreEx.Events/CoreEx.Events.csproj" />
+    <Project Path="src/CoreEx.RefData/CoreEx.RefData.csproj" />
+    <Project Path="src/CoreEx.Template/CoreEx.Template.csproj" />
+    <Project Path="src/CoreEx.UnitTesting/CoreEx.UnitTesting.csproj" />
+    <Project Path="src/CoreEx.Validation/CoreEx.Validation.csproj" />
+    <Project Path="src/CoreEx/CoreEx.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.csproj" />
+    <Project Path="tests/CoreEx.AspNetCore.Test.Unit/CoreEx.AspNetCore.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Caching.Redis.Test.Unit/CoreEx.Caching.Redis.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Data.Test.Unit/CoreEx.Data.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Database.Postgres.Test.Console/CoreEx.Database.Postgres.Test.Console.csproj" />
+    <Project Path="tests/CoreEx.Database.Postgres.Test.Unit/CoreEx.Database.Postgres.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Database.SqlServer.Test.Console/CoreEx.Database.SqlServer.Test.Console.csproj" />
+    <Project Path="tests/CoreEx.Database.SqlServer.Test.Unit/CoreEx.Database.SqlServer.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Database.Test.Unit/CoreEx.Database.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.DomainDriven.Test.Unit/CoreEx.DomainDriven.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Events.Test.Unit/CoreEx.Events.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.RefData.Test.Unit/CoreEx.RefData.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj" />
+    <Project Path="tests/CoreEx.Validation.Test.Unit/CoreEx.Validation.Test.Unit.csproj" />
+  </Folder>
+  <Folder Name="/tools/">
+    <Project Path="tools/CoreEx.Tooling.Console/CoreEx.Tooling.Console.csproj" />
+  </Folder>
+</Solution>
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 00000000..777a4367
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,110 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!--Disable warning about multiple package sources-->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+  <!-- Common packages. -->
+  <ItemGroup>
+    <PackageVersion Include="Aspire.Azure.Messaging.ServiceBus" Version="13.1.1" />
+    <PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="13.1.1" />
+    <PackageVersion Include="Aspire.Azure.Npgsql" Version="13.1.1" />
+    <PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="13.1.1" />
+    <PackageVersion Include="CloudNative.CloudEvents.SystemTextJson" Version="2.8.0" />
+    <PackageVersion Include="Microsoft.DurableTask.Abstractions" Version="1.17.1" />
+    <PackageVersion Include="Microsoft.DurableTask.Client.AzureManaged" Version="1.17.1" />
+    <PackageVersion Include="Microsoft.DurableTask.Worker.AzureManaged" Version="1.17.1" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
+    <PackageVersion Include="NSwag.AspNetCore" Version="14.6.2" />
+    <PackageVersion Include="OpenTelemetry.Api" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="1.15.1-beta.1" />
+    <PackageVersion Include="Scalar.AspNetCore" Version="2.12.47" />
+    <PackageVersion Include="Spectre.Console" Version="0.49.1" />
+    <PackageVersion Include="System.Linq.Dynamic.Core" Version="1.7.1" />
+    <PackageVersion Include="YamlDotNet" Version="18.0.0" />
+    <PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" Version="2.5.0" />
+    <PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.Memory" Version="2.5.0" />
+    <PackageVersion Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson" Version="2.5.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.24" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.24" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.24" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.24" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />
+    <PackageVersion Include="System.Memory.Data" Version="8.0.1" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
+    <PackageVersion Include="System.Memory.Data" Version="9.0.13" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.13" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
+    <PackageVersion Include="System.Memory.Data" Version="10.0.3" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.3" />
+  </ItemGroup>
+  <!-- Tool/Test packages. -->
+  <ItemGroup>
+    <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="DbEx.Postgres" Version="3.1.2" />
+    <PackageVersion Include="DbEx.SqlServer" Version="3.1.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="NUnit" Version="4.3.2" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.9.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageVersion Include="OnRamp" Version="2.2.5" />
+    <PackageVersion Include="UnitTestEx" Version="5.11.0" />
+    <PackageVersion Include="UnitTestEx.NUnit" Version="5.11.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.13" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.13" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
+  </ItemGroup>
+  <!-- Generator packages. -->
+  <ItemGroup>
+    <PackageVersion Include="Handlebars.Net" Version="2.1.6" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
+    <PackageVersion Include="Pluralize.NET" Version="1.0.2" />
+    <PackageVersion Include="StrongNamer" Version="0.2.5" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Docker.md b/Docker.md
deleted file mode 100644
index 0909e1a1..00000000
--- a/Docker.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# About
-
-To run with docker-compose:
-
-```bash
-docker-compose -f docker-compose.myHr.yml -f docker-compose.myHr.override.yml -f docker-compose.local.override.yml up
-```
-
-where `docker-compose.local.override.yml` should include connection string to service bus:
-
-```yaml
-version: '3.4'
-
-services:
-  myhr-functions:
-    environment:
-      - ServiceBusConnection=Endpoint=sb://coreex.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xxxxxx
-
-  myhr-api:
-    environment:
-      - ServiceBusConnection=Endpoint=sb://coreex.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=xxxxxx
-```
-
-Service Bus should have `pendingverifications` queue used by *My.Hr* sample.
-
-## To build
-
-```bash
-docker-compose -f docker-compose.myHr.yml -f docker-compose.myHr.override.yml -f docker-compose.local.override.yml build --build-arg LOCAL=true
-```
-
-## Services
-
-Available services:
-
-* Database at port 5433
-* API at port 5103
-* Functions at 5104
-
-Sample curl commands:
-
-### Function
-
-```bash
-curl localhost:5104/api/health  # to [get] to 'HealthInfo'
-curl localhost:5104/api/employee/verify  # to [post] to 'HttpTriggerQueueVerificationFunction'
-curl localhost:5104/api/oauth2-redirect.html  # to [GET] to 'OAuth2Redirect'
-curl localhost:5104/api/openapi/{version}.{extension}  # to [GET] to 'OpenApiDocument'
-curl localhost:5104/api/swagger.{extension}  # to [GET] to 'SwaggerDocument'
-curl localhost:5104/api/swagger/ui  # to [GET] to 'SwaggerUI'
-```
-
-### API
-
-```bash
-curl localhost:5103/health  # to [get] to 'HealthInfo' 
-curl localhost:5103/swagger/index.html #  to [GET] to 'SwaggerUI'
-```
diff --git a/README.md b/README.md
index 31e5a0f4..03af8082 100644
--- a/README.md
+++ b/README.md
@@ -2,89 +2,169 @@
 
 ![Logo](./images/Logo256x256.png "CoreEx")
 
-<br/>
-
 ## Introduction
 
-_CoreEx_ provides enriched capabilities for building business services by _extending_ the core capabilities of .NET.
+_CoreEx_ is a modular .NET framework for building enterprise back-end services. It addresses the recurring concerns that .NET leaves to each team to solve independently: shaping business rule failures into consistent HTTP responses, publishing and subscribing to domain events, implementing reference data with caching and validity, enforcing validation with structured error messages, and wiring data access across ADO.NET and Entity Framework Core with a shared unit-of-work model.
 
-The _CoreEx_ solution is divided into a number of projects, with `CoreEx` providing the core/shared capabilities, with additional projects enabling other related capabilities that can optionally be included within the final consuming solution.
+The solution is composed of focused, independently consumable packages — `CoreEx` provides the shared runtime primitives, and each additional package (`CoreEx.AspNetCore`, `CoreEx.Events`, `CoreEx.Database`, `CoreEx.Validation`, etc.) adds a specific capability layer. Teams adopt only what they need.
 
-_CoreEx_ at its core is a non-opinionated framework, meaning that it is not intended to be all-or-nothing, or drive a particular architectural style, but provide building block capabilities that can be leveraged as required to simplify development, and add extended/richer/consistent functionality with minimal effort.
+## Motivation
 
-<br/>
+- **Standardize** the scenarios .NET leaves open — there is no built-in standard for mapping a `NotFoundException` to HTTP 404, expressing a concurrency conflict as a `ProblemDetails` response, or publishing a domain event transactionally alongside a database commit. _CoreEx_ provides consistent, opinionated implementations of these patterns so every service in an organization behaves the same way.
+- **Simplify** development by eliminating the boilerplate that accumulates around every API endpoint and data operation — execution context scoping, idempotency key handling, paged query translation, outbox relay, ETag management, change-log stamping — freeing teams to focus on business logic rather than infrastructure ceremony.
+- **Enable flexibility** through opt-in modularity and composability — each package is an independent add-on, _CoreEx_ does not mandate an architectural style, and its abstractions (`IMapper`, `IUnitOfWork`, `IHybridCache`, `IEventPublisher`) are designed to be replaced or extended without disrupting the rest of the solution.
+
+## Better Together
+
+The greatest developer velocity gains come not from any single capability, but from the intersection of all three:
+
+<img src="./images/BetterTogetherVenn.png" alt="Better Together — Framework, Code-gen, and Gen AI / Copilot" width="600" />
+
+- **Framework** _(**CoreEx**, UnitTestEx, DbEx)_ — encapsulates proven patterns and complexity into tested, shared components. Every team inherits a consistent, production-hardened baseline rather than rebuilding infrastructure from scratch, maximising reuse and freeing engineers to focus on differentiated business logic.
+- **Code-generation** _(CoreEx.Generator, CoreEx.CodeGen, DbEx / OnRamp)_ — automates the translation of intent into implementation. Roslyn source generation, dev-time scaffolding, and database/entity layer generation combine to produce repetitive layers predictably and consistently every time — deterministic by design — eliminating manual error and accelerating the path from design to working code.
+- **Gen AI / Copilot** — accelerates the development of the unique business value that only your organisation can deliver. AI assistance — probabilistic and context-aware — augments engineers during coding, testing, and review, compressing the feedback loop between idea and production-ready solution.
+
+Where all three converge, the compound effect is multiplicative: the framework constrains the solution space so AI suggestions land in the right patterns; code-generation handles the deterministic heavy lifting so AI can focus on novel logic; and AI in turn accelerates how quickly teams adopt, extend, and validate both.
+
+## Key Capabilities
+
+Here is a high-level overview of some of the key capabilities provided by _CoreEx_:
+
+**Core runtime**
+- 🎯 **Semantic Exceptions** — Typed exception hierarchy (`NotFoundException`, `ValidationException`, `BusinessException`, `ConcurrencyException`, and more) with automatic HTTP status-code mapping and `ProblemDetails` serialization.
+- 🔐 **Execution Context** — Thread-bound (async-local) request context carrying user identity, tenant, and timestamp; ASP.NET Core middleware integrates it directly into the request pipeline.
+- 📦 **Entity & DDD Patterns** — Composable entity interfaces for identifiers (`IIdentifier<T>`), ETags (`IETag`), change logs (`IChangeLog`), composite keys, change tracking, aggregate roots with integration-event support, and persistence-state mutation guards.
+- 🚂 **Railway-Oriented Programming** — `Result` and `Result<T>` monadic types for composable, exception-free error flows with full `async`/`await` support and short-circuit chaining.
+- 💉 **Dependency Injection** — `[ScopedService]`, `[TransientService]`, and `[SingletonService]` attributes with `AddDynamicServicesUsing<T>` for convention-based registration without manual wiring.
+- 🗺️ **Mapping & Conversion** — Bi-directional `IMapper<TSource, TDestination>` contracts, `ValueConverter<TSource, TDestination>` for EF Core and custom property mapping, and extension-based mapper helpers.
+- 🔄 **JSON Extensions** — Merge-patch (`application/merge-patch+json`) support, property-include/exclude filtering, custom `JsonConverter` types, and `JsonSerializer` configuration helpers.
+
+**Web / API**
+- 🌐 **ASP.NET Core Integration** — `WebApi` execution helpers for MVC and Minimal API, `ExecutionContext` scoping middleware, idempotency key handling (`[IdempotencyKey]`), and exception-to-`ProblemDetails` translation with consistent error response shaping.
+- 📋 **OpenAPI / NSwag** — `IOperationProcessor` that reads CoreEx MVC attributes (`[Paging]`, `[Query]`, `[Accepts]`, `[IdempotencyKey]`, `[ProducesNotFoundProblem]`) and injects the corresponding parameters, request bodies, and response entries into the generated OpenAPI specification.
+
+**Data**
+- ✅ **Validation Framework** — Fluent, property-centric validator with composable rules, conditional clauses, async predicates, `RuleSet` grouping, base-validator include, FluentValidation interop bridge, and deep `ValidationException` / `ProblemDetails` integration.
+- 📊 **Data Access & OData-style Querying** — `QueryArgsConfig`, `QueryFilterParser`, and `QueryOrderByParser` for safe, explicitly-configured `$filter` and `$orderby` LINQ translation; query arguments, paging, partitioning, logical deletion, and `IUnitOfWork` transactional orchestration.
+- 🗄️ **Database & ORM** — `IDatabase` / `DatabaseCommand` ADO.NET abstraction with multi-result-set support, transactional outbox relay infrastructure, SQL Server and PostgreSQL implementations with OpenTelemetry metrics, and an Entity Framework Core integration layer with typed CRUD operations and `ValueConverter` bridges.
+- 📚 **Reference Data** — Typed `ReferenceData<TSelf>` / `ReferenceData<TId, TSelf>` base classes, thread-safe `Id`- and `Code`-indexed collections, hybrid-cache-backed orchestrator with per-type semaphore loading, contextual date-validity checking, and a code-serialization collection for wire-compatible reference-data properties.
+- ⚡ **Hybrid Caching** — `IHybridCache` abstraction with `FusionHybridCache` (ZiggyCreatures FusionCache) as the recommended implementation, providing L1/L2 hybrid storage and backplane-based cache invalidation.
+
+**Messaging**
+- 📨 **Event Publishing & Subscribing** — `EventData` ↔ CloudEvents formatting, a two-phase queue-then-publish pipeline, and configurable subscriber dispatch with per-subscriber structured error handling and dead-letter support.
+- 🚌 **Azure Service Bus** — `ServiceBusPublisher` implementing `IEventPublisher`, subscriber bases wired to `EventSubscriberBase`, and receiver hosts with built-in resiliency, OpenTelemetry metrics, and session support.
+
+**Tooling**
+- 🏗️ **Reference Data Code Generation** — Development-time `CoreEx.CodeGen` tooling that scaffolds the complete reference-data layer (contract, controller, service, repository interface, repository, and mapper) from a single schema-validated `ref-data.yaml` configuration file.
+- 🧪 **Testing Toolkit** — `CoreEx.UnitTesting` provides fluent value expectations, event-capture and outbox assertions (SQL Server, PostgreSQL, Azure Service Bus), JSON/YAML seed-data loading with placeholder substitution, and UnitTestEx bridge extensions covering every CoreEx subsystem.
+
+## Patterns in Practice
+
+The capabilities above come to life in the [Contoso reference samples](./samples/README.md), which implement a fully working multi-domain service topology. The samples are the primary demonstration of _why_ CoreEx exists — they show how the packages compose into a coherent, production-shaped architecture.
+
+The [Pattern Catalog](./samples/docs/patterns.md) is the best entry point: it indexes every architectural and design pattern demonstrated across the samples, grouped by concern, each linked to the layer documentation that shows it in code.
+
+| Group | Patterns demonstrated |
+|---|---|
+| 🏛️ **Architecture** | Domain microservices, event-driven architecture (async-primary, sync-selective), hexagonal architecture, eventual consistency |
+| 🌐 **API** | Thin-controller HTTP endpoints, idempotency keys |
+| ⚙️ **Application** | CQRS, service orchestration, unit of work, composable validators, reusable policies |
+| 📋 **Contracts** | Technology-agnostic DTOs shared across API and messaging, first-class reference data |
+| 🏛️ **DDD** | Aggregates, entities, value objects with enforced invariants |
+| 🗄️ **Infrastructure** | Repository abstraction, explicit mappers, persistence models, anti-corruption adapters, typed HTTP clients |
+| 📨 **Messaging** | CloudEvent publishing, transactional outbox, outbox relay, event-driven replication, subscriber dispatch |
+| 🛠️ **Tooling** | Schema-driven code generation, database lifecycle management via migration scripts |
+| 🧪 **Testing** | Intra-domain host tests against real infrastructure, inter-domain mocking, unit tests, local Aspire orchestration for E2E validation |
+
+→ **[View the full pattern catalog](./samples/docs/patterns.md)**
+
+## Version 4 (preview)
+
+This is a **major** version release; a re-imagine / re-invention of the existing capabilities to enable a more modern, flexible and maintainable codebase.
+- This release contains **significant breaking changes** - there is **no** upgrade path from the previous `v3.x` versions; however, the core capabilities and patterns remain largely consistent.
+- A number of capabilities have been removed as they were not widely used, considered legacy/obsolete, or there are better alternatives available.
+- Not all existing capabilities have been re-implemented in this release; the intention is to (re-)add further capabilities in future releases as required.
+
+Version 4 is currently in **preview**; the packages are published with a `-preview` suffix and may contain future breaking changes. The packages in their current state can be used for Production-based solutions. Feedback is very welcome to help shape the final release.
+
+The Copilot and Claude [AI](#ai) integrations should be considered experimental and subject to change/improvements.
 
 ## Status
 
-The build status is [![CI](https://github.com/Avanade/CoreEx/workflows/CI/badge.svg)](https://github.com/Avanade/CoreEx/actions?query=workflow%3ACI) with the NuGet package status as follows, including links to the underlying source code and documentation:
-
-Package | Status | Source & documentation
--|-|-
-`CoreEx` | [![NuGet version](https://badge.fury.io/nu/CoreEx.svg)](https://badge.fury.io/nu/CoreEx) | [Link](./src/CoreEx)
-`CoreEx.AspNetCore` | [![NuGet version](https://badge.fury.io/nu/CoreEx.AspNetCore.svg)](https://badge.fury.io/nu/CoreEx.AspNetCore) | [Link](./src/CoreEx/AspNetCore)
-`CoreEx.AutoMapper` | [![NuGet version](https://badge.fury.io/nu/CoreEx.AutoMapper.svg)](https://badge.fury.io/nu/CoreEx.AutoMapper) | [Link](./src/CoreEx.AutoMapper)
-`CoreEx.Azure` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Azure.svg)](https://badge.fury.io/nu/CoreEx.Azure) | [Link](./src/CoreEx.Azure)
-`CoreEx.Cosmos` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Cosmos.svg)](https://badge.fury.io/nu/CoreEx.Cosmos) | [Link](./src/CoreEx.Cosmos)
-`CoreEx.Data` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Data.svg)](https://badge.fury.io/nu/CoreEx.Data) | [Link](./src/CoreEx.Data)
-`CoreEx.Database` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.svg)](https://badge.fury.io/nu/CoreEx.Database) | [Link](./src/CoreEx.Database)
-`CoreEx.Database.MySql` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.MySql.svg)](https://badge.fury.io/nu/CoreEx.Database.MySql) | [Link](./src/CoreEx.Database.MySql)
-`CoreEx.Database.Postgres` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.Postgres.svg)](https://badge.fury.io/nu/CoreEx.Database.Postgres) | [Link](./src/CoreEx.Database.Postgres)
-`CoreEx.Database.SqlServer` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.SqlServer.svg)](https://badge.fury.io/nu/CoreEx.Database.SqlServer) | [Link](./src/CoreEx.Database.SqlServer)
-`CoreEx.EntityFrameworkCore` | [![NuGet version](https://badge.fury.io/nu/CoreEx.EntityFrameworkCore.svg)](https://badge.fury.io/nu/CoreEx.EntityFrameworkCore) | [Link](./src/CoreEx.EntityFrameworkCore)
-`CoreEx.FluentValidation` | [![NuGet version](https://badge.fury.io/nu/CoreEx.FluentValidation.svg)](https://badge.fury.io/nu/CoreEx.FluentValidation) | [Link](./src/CoreEx.FluentValidation)
-`CoreEx.Newtonsoft` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Newtonsoft.svg)](https://badge.fury.io/nu/CoreEx.Newtonsoft) | [Link](./src/CoreEx.Newtonsoft)
-`CoreEx.OData` | [![NuGet version](https://badge.fury.io/nu/CoreEx.OData.svg)](https://badge.fury.io/nu/CoreEx.OData) | [Link](./src/CoreEx.OData)
-`CoreEx.Solace` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Solace.svg)](https://badge.fury.io/nu/CoreEx.Solace) | [Link](./src/CoreEx.Solace)
-`CoreEx.Validation` | [![NuGet version](https://badge.fury.io/nu/CoreEx.Validation.svg)](https://badge.fury.io/nu/CoreEx.Validation) | [Link](./src/CoreEx.Validation)
--- | -- | --
-`CoreEx.UnitTesting` | [![NuGet version](https://badge.fury.io/nu/CoreEx.UnitTesting.svg)](https://badge.fury.io/nu/CoreEx.UnitTesting) | [Link](./src/CoreEx.UnitTesting)
-`CoreEx.UnitTesting.NUnit` | [![NuGet version](https://badge.fury.io/nu/CoreEx.UnitTesting.NUnit.svg)](https://badge.fury.io/nu/CoreEx.UnitTesting.NUnit) | [Link](./src/CoreEx.UnitTesting)
+The build status is [![CI](https://github.com/Avanade/CoreEx/actions/workflows/CI.yml/badge.svg)](https://github.com/Avanade/CoreEx/actions/workflows/CI.yml) with the NuGet package status as follows, including links to the underlying source code and documentation:
+
+Project/Package | Description | Source | Status
+-|-|-|-
+`CoreEx` | The foundational `CoreEx` package providing the core runtime primitives, patterns, and abstractions used across all other CoreEx libraries and consuming services. | [Link](./src/CoreEx) | [![NuGet version](https://badge.fury.io/nu/CoreEx.svg)](https://badge.fury.io/nu/CoreEx)
+`CoreEx.AspNetCore` | Provides the ASP.NET Core integration layer for CoreEx: the `WebApi` execution helper (MVC and Minimal API variants), middleware for `ExecutionContext` scoping and exception-to-ProblemDetails translation, idempotency key handling, health check configuration, and OpenAPI/NSwag extensions. | [Link](./src/CoreEx.AspNetCore) | [![NuGet version](https://badge.fury.io/nu/CoreEx.AspNetCore.svg)](https://badge.fury.io/nu/CoreEx.AspNetCore)
+`CoreEx.AspNetCore.NSwag` | Provides the NSwag `IOperationProcessor` integration that reads CoreEx MVC attributes (`[Paging]`, `[Query]`, `[Accepts]`, `[IdempotencyKey]`, `[ProducesNotFoundProblem]`) and injects the corresponding parameters, request bodies, and response entries into the generated OpenAPI specification. | [Link](./src/CoreEx.AspNetCore.NSwag) | [![NuGet version](https://badge.fury.io/nu/CoreEx.AspNetCore.NSwag.svg)](https://badge.fury.io/nu/CoreEx.AspNetCore.NSwag)
+`CoreEx.Azure.Messaging.ServiceBus` | Provides Azure Service Bus integration for CoreEx: a `ServiceBusPublisher` implementing `IEventPublisher`, subscriber bases wired to `EventSubscriberBase`, and receiver hosts with built-in resiliency, metrics, and session support. | [Link](./src/CoreEx.Azure.Messaging.ServiceBus) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Azure.Messaging.ServiceBus.svg)](https://badge.fury.io/nu/CoreEx.Azure.Messaging.ServiceBus)
+`CoreEx.Caching.FusionCache` | Provides a `FusionHybridCache` implementation of `IHybridCache` backed by the ZiggyCreatures FusionCache library, bridging CoreEx caching contracts to FusionCache's L1/L2 hybrid and backplane capabilities. | [Link](./src/CoreEx.Caching.FusionCache) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Caching.FusionCache.svg)](https://badge.fury.io/nu/CoreEx.Caching.FusionCache)
+`CoreEx.Data` | Provides the `IUnitOfWork` transactional orchestration contract, `DataResult` mutation outcome types, data model base classes, and the `QueryArgsConfig` / `QueryFilterParser` / `QueryOrderByParser` pipeline for safe, explicitly-configured OData-style `$filter` and `$orderby` LINQ query translation. | [Link](./src/CoreEx.Data) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Data.svg)](https://badge.fury.io/nu/CoreEx.Data)
+`CoreEx.Database` | Provides the `IDatabase` / `Database` ADO.NET abstraction, `DatabaseCommand` fluent query builder, `DatabaseRecord` row reader, multi-result-set support, convention-based column mapping, database wildcard translation, typed mapper contracts, and the transactional outbox relay infrastructure for publishing events from a relational database. | [Link](./src/CoreEx.Database) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.svg)](https://badge.fury.io/nu/CoreEx.Database)
+`CoreEx.Database.Postgres` | Provides the PostgreSQL (Npgsql) implementation of `IDatabase`: `PostgresDatabase`, `PostgresUnitOfWork`, outbox relay, Postgres-specific parameter extensions, and OpenTelemetry metrics for outbox operations. | [Link](./src/CoreEx.Database.Postgres) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.Postgres.svg)](https://badge.fury.io/nu/CoreEx.Database.Postgres)
+`CoreEx.Database.SqlServer` | Provides the SQL Server (`Microsoft.Data.SqlClient`) implementation of `IDatabase`: `SqlServerDatabase`, `SqlServerUnitOfWork`, session-context stamping, outbox relay, SQL Server-specific parameter extensions, and OpenTelemetry metrics for outbox operations. | [Link](./src/CoreEx.Database.SqlServer) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Database.SqlServer.svg)](https://badge.fury.io/nu/CoreEx.Database.SqlServer)
+`CoreEx.DomainDriven` | Provides the foundational Domain-Driven Design (DDD) building blocks for CoreEx: typed entities, aggregate roots with integration-event support, persistence-state tracking, and mutation-guard helpers. | [Link](./src/CoreEx.DomainDriven) | [![NuGet version](https://badge.fury.io/nu/CoreEx.DomainDriven.svg)](https://badge.fury.io/nu/CoreEx.DomainDriven)
+`CoreEx.EntityFrameworkCore` | Provides the Entity Framework Core integration layer: `EfDb<TDbContext>` as the CoreEx-EF bridge, `EfDbModel<TModel>` and `EfDbMappedModel<TValue, TModel, TMapper>` for typed CRUD + query operations, `EfDbExtensions` for paged `IQueryable<T>` mapping helpers, `EfDbInvoker` for OpenTelemetry tracing, and EF `ValueConverter` bridges for CoreEx converter types. | [Link](./src/CoreEx.EntityFrameworkCore) | [![NuGet version](https://badge.fury.io/nu/CoreEx.EntityFrameworkCore.svg)](https://badge.fury.io/nu/CoreEx.EntityFrameworkCore)
+`CoreEx.Events` | Provides the CoreEx event publishing and subscribing infrastructure: `EventData` ↔ CloudEvents formatting, a two-phase queue-then-publish pipeline, and configurable subscriber dispatch with structured error handling. | [Link](./src/CoreEx.Events) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Events.svg)](https://badge.fury.io/nu/CoreEx.Events)
+`CoreEx.RefData` | Provides the CoreEx reference data framework: typed base classes for reference data items and collections, a hybrid-cache-backed orchestrator, contextual date-validity checking, and a code-serialization collection. | [Link](./src/CoreEx.RefData) | [![NuGet version](https://badge.fury.io/nu/CoreEx.RefData.svg)](https://badge.fury.io/nu/CoreEx.RefData)
+`CoreEx.Validation` | Provides a fluent, property-centric validation framework for .NET classes: composable rules, conditional clauses, strongly-typed error messages, and deep integration with the CoreEx execution and exception model. | [Link](./src/CoreEx.Validation) | [![NuGet version](https://badge.fury.io/nu/CoreEx.Validation.svg)](https://badge.fury.io/nu/CoreEx.Validation)
+-- | -- | -- | --
+`CoreEx.CodeGen` | Provides the CoreEx development-time code-generation tooling: a deterministic, schema-driven pipeline that scaffolds the full reference-data implementation — contract, controller, service, repository interface, repository, and mapper — from a single YAML configuration file. | [Link](./src/CoreEx.CodeGen) | [![NuGet version](https://badge.fury.io/nu/CoreEx.CodeGen.svg)](https://badge.fury.io/nu/CoreEx.CodeGen)
+`CoreEx.UnitTesting` | Provides the complete CoreEx unit- and integration-testing toolkit: fluent expectations, event-capture assertions, JSON seed-data loading, and convenience extensions that bridge UnitTestEx with every major CoreEx subsystem. | [Link](./src/CoreEx.UnitTesting) | [![NuGet version](https://badge.fury.io/nu/CoreEx.UnitTesting.svg)](https://badge.fury.io/nu/CoreEx.UnitTesting)
 
 
 The included [change log](CHANGELOG.md) details all key changes per published version.
 
-<br/>
+## Getting Started
+
+→ **[Getting Started Guide](./docs/getting-started.md)** — install the template pack, scaffold a new solution, start local infrastructure, add API/Relay/Subscribe hosts, and run your first build.
 
 ## Samples
 
-The following samples are provided to guide usage:
+The repository includes [Contoso reference samples](./samples/README.md) that implement a fully working multi-domain service topology — Products, Shopping, and Orders — each with an API host, an Outbox Relay host, and an Event Subscriber host.
 
-Sample | Description
--|-
-[My.Hr](./samples/My.Hr) | A sample to demonstrate the usage of _CoreEx_ within the context of a fictitious Human Resources solution. The main intent is to show how _CoreEx_ can be leveraged to build Web APIs and Azure Functions. Additionally, the unit testing provided within demonstrates the thoroughness of testing that can be achieved with some of the other repos mentioned below.  
+| Resource | Description |
+|---|---|
+| [samples/README.md](./samples/README.md) | Runnable topology, prerequisites, infrastructure setup, and getting-started commands |
+| [Pattern Catalog](./samples/docs/patterns.md) | Every architectural and design pattern demonstrated, grouped by concern with links to layer docs |
+| [Layer Guide](./samples/docs/layers.md) | Business and host layer overview with the full dependency diagram |
+| [Tooling Guide](./samples/docs/tooling.md) | Code generation and database lifecycle tooling |
+| [Testing Guide](./samples/docs/testing.md) | Unit, intra-domain, inter-domain, and E2E testing strategy |
+| [Aspire & E2E Guide](./samples/docs/aspire.md) | Local orchestration and cross-domain end-to-end validation |
 
-<br/>
+## AI
 
-## Other repos
+The repository includes an AI workflow set in [`.github/`](./.github/) that gives GitHub Copilot and Claude Code authoritative knowledge of CoreEx patterns, conventions, and architecture — no need to explain CoreEx to the tool each time. The artefacts can also be copied into a consuming project.
 
-These other _Avanade_ repositories leverage _CoreEx_:
+**Agent** — `coreex-expert` provides architecture guidance, pattern recommendations, and design reviews aligned to the sample implementations. See the [agent README](./.github/agents/README.md) for the resolution flowchart and local doc cache design.
 
-Repo | Description
--|-
-[*Beef*](https://github.com/Avanade/beef) | Code-generation capabilities to support the industrialization of API development leveraging `CoreEx` as the primary runtime framework (_Beef_ version `v5+`).
-[*DbEx*](https://github.com/Avanade/dbex) | Provides database extensions for DbUp-inspired database migrations.
-[*NTangle*](https://github.com/Avanade/ntangle) | Change Data Capture (CDC) code generation tool and runtime.
+**Commands and templates** — type `/` in chat to invoke skills and prompts. Use `dotnet new` in a terminal for deterministic scaffolding.
 
-<br/>
+| Command | What it does | Claude Code | GitHub Copilot Chat |
+|---------|-------------|-------------|---------------------|
+| [Expert guidance](./.github/agents/README.md) | Architecture, pattern, and design advice | `@coreex-expert` | Agent mode → **CoreEx Expert** |
+| [CoreEx.Template](./src/CoreEx.Template/README.md) | Deterministic solution and host scaffolding via `dotnet new coreex*` templates | `dotnet new install CoreEx.Template` then `dotnet new coreex...` | Run the same `dotnet new` commands in the terminal |
+| [`/coreex-docs-sync`](./.github/skills/coreex-docs-sync/README.md) | Cache CoreEx docs and per-package AI guides locally | `/coreex-docs-sync` | `#file:.github/skills/coreex-docs-sync/SKILL.md` |
+| [`/acquire-codebase-knowledge`](./.github/skills/acquire-codebase-knowledge/README.md) | Map and document an existing codebase | `/acquire-codebase-knowledge` | `#file:.github/skills/acquire-codebase-knowledge/SKILL.md` |
+| [`/aspire`](./.github/skills/aspire/README.md) | Orchestrate Aspire apps locally (start, stop, logs) | `/aspire` | `#file:.github/skills/aspire/SKILL.md` |
+
+**Instructions** — 10 scoped instruction files are injected automatically when editing matching file types (contracts, services, repositories, controllers, tests, etc.). No action required.
+
+→ **[Full AI workflow overview](./.github/AI-WORKFLOWS.md)**
 
 ## License
 
 _CoreEx_ is open source under the [MIT license](./LICENCE) and is free for commercial use.
 
-<br/>
-
 ## Contributing
 
 One of the easiest ways to contribute is to participate in discussions on GitHub issues. You can also contribute by submitting pull requests (PR) with code changes. Contributions are welcome. See information on [contributing](./CONTRIBUTING.md), as well as our [code of conduct](https://avanade.github.io/code-of-conduct/).
 
-<br/>
-
 ## Security
 
 See our [security disclosure](./SECURITY.md) policy.
 
-<br/>
-
 ## Who is Avanade?
 
-[Avanade](https://www.avanade.com) is the leading provider of innovative digital and cloud services, business solutions and design-led experiences on the Microsoft ecosystem, and the power behind the Accenture Microsoft Business Group.
\ No newline at end of file
+[Avanade](https://www.avanade.com) is the leading provider of innovative digital and cloud services, business solutions and design-led experiences on the Microsoft ecosystem, and the power behind the Accenture Microsoft Business Group.
diff --git a/Version.props b/Version.props
new file mode 100644
index 00000000..a80aabb8
--- /dev/null
+++ b/Version.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <Version>4.0.0-preview-1</Version>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/azure/AGENTS.md b/azure/AGENTS.md
new file mode 100644
index 00000000..a5b1486e
--- /dev/null
+++ b/azure/AGENTS.md
@@ -0,0 +1,145 @@
+---
+description: "Operational guidance for AI agents deploying Contoso sample services to Azure via azd/Bicep"
+scope: "azure/"
+tags: ["azure", "deployment", "iac", "bicep"]
+---
+
+# AGENTS.md — Azure Deployment
+
+Operational guide for AI agents working in the `azure/` folder of this repository. This deploys the Contoso sample services (under `samples/src/`) to Azure using **Azure Developer CLI (azd) + Bicep**.
+
+## Scope
+
+This file applies to anything under `azure/`. For application code, see the relevant `samples/` projects. Companion human-facing docs:
+
+- [README.md](README.md) — azd + Bicep workflow.
+
+## Folder layout
+
+- [azure.yaml](azure.yaml) — azd project manifest. Declares the 6 services and the pre/post hooks.
+- [infra/](infra/) — Bicep templates (primary IaC for `azd`).
+  - [infra/main.bicep](infra/main.bicep) — Entry template.
+  - [infra/modules/](infra/modules/) — Per-resource modules (`app-service-plan`, `app-services`, `aspire-dashboard`, `database`, `postgres-database`, `service-bus`, `redis`, `key-vault`, `application-insights`).
+  - [infra/scripts/](infra/scripts/) — Hook scripts (`use-dev-params.*`, `store-secrets.*`).
+  - `main.{dev,test,prod}.bicepparam` — Environment parameter files.
+- [scripts/](scripts/) — Higher-level deployment helper scripts (DB migrations, SQL firewall, packaging).
+
+## What gets deployed
+
+The Bicep deployment provisions the following resource set:
+
+- Linux App Service Plan.
+- 7 Web Apps: `aspire-dashboard`, `products-api`, `shopping-api`, `products-outbox-relay`, `shopping-outbox-relay`, `products-subscribe`, `shopping-subscribe`.
+- Azure SQL Server + Database (Shopping and Orders domains, with firewall rules).
+- Azure Database for PostgreSQL Flexible Server + Database (Products domain).
+- Azure Service Bus (Standard) — namespace + topic + subscriptions.
+- Azure Managed Redis.
+- Application Insights.
+- Key Vault (per-deployment unique name; stores E2E secrets).
+
+## Conventions
+
+- Comments end with a period/fullstop (repo-wide rule from [.github/copilot-instructions.md](../.github/copilot-instructions.md)).
+- Resource naming, SKUs, and per-environment values are driven by the parameter files — do not hardcode environment-specific values in templates.
+- Key Vault name is generated uniquely per deployment in [infra/main.bicep](infra/main.bicep). Do not assume a fixed name.
+- Multi-targeted .NET projects must be published with a single TFM. The TFM is sourced from `AZD_DOTNET_TARGET_FRAMEWORK` (preferred) or `DOTNET_TARGET_FRAMEWORK` and mapped to App Service Linux `DOTNETCORE|<version>` by the preprovision hook.
+
+## azd hooks (defined in [azure.yaml](azure.yaml))
+
+- `preprovision` → `infra/scripts/use-dev-params.{sh,ps1}` — selects the dev parameter file, injects `AZURE_LOCATION` and `AZURE_SQL_ADMIN_PASSWORD` into `main.parameters.json`, maps the .NET TFM to the App Service runtime.
+- `predeploy` → `scripts/run-products-db-migrations.{sh,ps1}` — runs domain-specific DB migrations before app code deploys: Shopping/Orders on SQL; Products on PostgreSQL. Products uses `Migrate` + `Schema` + `ResetAndData` sequence.
+- `postprovision` → `infra/scripts/store-secrets.{sh,ps1}` — grants the provisioning user `Key Vault Administrator` and stores `sql-admin-password`, `sql-connection-string`, `postgres-admin-password`, `postgres-connection-string`, `service-bus-connection-string` in Key Vault.
+
+When editing hook scripts, keep the bash and PowerShell variants behaviorally identical.
+
+## Required environment variables
+
+Set in the azd environment (`azd env set <KEY> <VALUE>`):
+
+- `AZURE_SUBSCRIPTION_ID` — target subscription.
+- `AZURE_LOCATION` — e.g. `eastus2`.
+- `AZURE_SQL_ADMIN_PASSWORD` — strong password; consumed by hooks, never committed.
+- `AZURE_POSTGRES_ADMIN_PASSWORD` — optional; if omitted, hooks default to `AZURE_SQL_ADMIN_PASSWORD`.
+- `AZD_DOTNET_TARGET_FRAMEWORK` — one of `net8.0`, `net9.0`, `net10.0`.
+
+Load into the current shell before running ad-hoc `az` commands:
+
+```bash
+set -a && eval "$(azd env get-values)" && set +a
+```
+
+## Common workflows
+
+### azd + Bicep
+
+```bash
+cd azure
+azd provision --preview --no-prompt   # plan.
+azd package --all --no-prompt          # build & package services.
+azd up --no-prompt                     # full provision + deploy.
+azd deploy --all --no-prompt           # code-only redeploy.
+azd down --force --purge --no-prompt   # tear down.
+```
+
+## Helper scripts
+
+The `azure/scripts/` folder includes two helper scripts that should be preferred over manual command chains when validating a deployment.
+
+### get-aspire-dashboard-login
+
+- Files: `scripts/get-aspire-dashboard-login.sh`, `scripts/get-aspire-dashboard-login.ps1`.
+- Purpose: prints the Aspire Dashboard URL and a ready-to-open login URL when a dashboard token can be found.
+- Required argument: `--resource-group` / `-ResourceGroup`.
+- Optional arguments: dashboard app name and token timeout.
+- Discovery behavior: auto-detects the dashboard app when not explicitly provided.
+- Token retrieval order:
+  1. SCM/Kudu command API query of runtime `container.log` (last 60 minutes).
+  2. SCM/Kudu log archive scan.
+  3. Live `az webapp log tail` fallback with timeout.
+- Output always includes dashboard app name and dashboard URL; login URL is printed only when token extraction succeeds.
+
+### setup-e2e-runner
+
+- Files: `scripts/setup-e2e-runner.sh`, `scripts/setup-e2e-runner.ps1`.
+- Purpose: wires `samples/tests/Contoso.E2E.Runner/appsettings.json` to deployed Azure endpoints and connection strings.
+- Required argument: `--resource-group` / `-ResourceGroup`.
+- Optional arguments: appsettings path, key vault name, Products app name, Shopping app name, skip-validation, insecure validation mode.
+- Discovery behavior: auto-detects Products and Shopping app names plus Key Vault when omitted.
+- Secret retrieval: reads `postgres-connection-string` and `sql-connection-string` from Key Vault.
+- Validation behavior (unless skipped):
+  - `GET /api/products` for Products.
+  - `POST /api/customers/test/baskets` for Shopping.
+  - health and swagger endpoints for both services.
+- Update behavior: creates `appsettings.json.bak` before writing updated `E2E.Products` and `E2E.Shopping` values.
+
+When editing either helper script, keep the bash and PowerShell variants behaviorally identical.
+
+## Validating changes
+
+Before declaring an infra change complete:
+
+1. **Bicep**: `azd provision --preview --no-prompt` from `azure/`, or run `az deployment group what-if` against `infra/main.bicep` with `infra/main.parameters.json` after the preprovision hook has populated it.
+2. **Hooks**: if you touched `infra/scripts/` or `scripts/`, run the bash and PowerShell variants (or read them carefully) to confirm parity.
+
+Do not run `azd up` or `azd down` without explicit user approval — these touch live Azure resources.
+
+## Secrets and safety
+
+- Never commit `AZURE_SQL_ADMIN_PASSWORD`, generated parameter files containing secrets, or any Key Vault content.
+- The post-provision hook is the canonical source for runtime secrets in Key Vault. Do not duplicate secret-storage logic elsewhere.
+- Avoid destructive Azure operations (`az group delete`, `azd down`, dropping SQL DBs) unless the user has confirmed in this turn.
+
+## Troubleshooting cheatsheet
+
+- **Multi-target publish error (NETSDK1129)** — set `AZD_DOTNET_TARGET_FRAMEWORK` and reload env.
+- **SQL password missing** — set `AZURE_SQL_ADMIN_PASSWORD` before `azd provision`.
+- **PostgreSQL password missing** — set `AZURE_POSTGRES_ADMIN_PASSWORD` when different from SQL admin password.
+- **Predeploy missing output keys** — run `azd provision --no-prompt` before `azd deploy --all --no-prompt` to refresh `sql*` and `postgres*` output values in azd env.
+- **API returns 404 at `/`** — expected; probe `/api/...`, `/health/ready/detailed`, or `/swagger`.
+- **Startup fails with invalid Service Bus/connection string right after deploy** — run `./scripts/refresh-keyvault-appsettings.sh --resource-group <rg>` (or the PowerShell variant) to refresh Key Vault references and restart apps.
+- **Aspire Dashboard requires token** — fetch from `az webapp log tail` (see [README.md](README.md#accessing-the-aspire-dashboard)).
+- **`azd init` says no project** — run from `azure/`, not the repo root.
+
+## E2E tests against deployed services
+
+Endpoints, SQL, and Service Bus connection strings can be wired into [../samples/tests/Contoso.E2E.Runner/appsettings.json](../samples/tests/Contoso.E2E.Runner/appsettings.json). Pull connection strings from Key Vault (populated by the postprovision hook) rather than reconstructing them. See the "Running E2E Tests" section of [README.md](README.md) for exact commands.
diff --git a/azure/README.md b/azure/README.md
new file mode 100644
index 00000000..c84e1b11
--- /dev/null
+++ b/azure/README.md
@@ -0,0 +1,392 @@
+# CoreEx Azure Deployment with azd
+
+This folder contains the Azure Developer CLI (azd) project for deploying the Contoso sample services in this repository.
+
+## What this deploys
+
+Infrastructure (Bicep):
+- App Service Plan (Linux).
+- 7 Web Apps:
+  - aspire-dashboard
+  - products-api
+  - shopping-api
+  - products-outbox-relay
+  - shopping-outbox-relay
+  - products-subscribe
+  - shopping-subscribe
+- Azure SQL Database (Shopping and Orders domains).
+- Azure Database for PostgreSQL Flexible Server (Products domain).
+- Azure Service Bus (Standard).
+- Azure Managed Redis.
+- Application Insights.
+- Key Vault.
+
+## Important behaviors
+
+- Dev parameters are applied automatically by a `preprovision` hook in [azure.yaml](azure.yaml).
+- The `postprovision` hook grants the provisioning user `Key Vault Administrator` on the deployed Key Vault and stores E2E connection secrets.
+- Deployment `location` is sourced from `AZURE_LOCATION` and injected by the preprovision hook.
+- SQL admin password is injected at runtime from `AZURE_SQL_ADMIN_PASSWORD` by [infra/scripts/use-dev-params.sh](infra/scripts/use-dev-params.sh).
+- PostgreSQL admin password is injected from `AZURE_POSTGRES_ADMIN_PASSWORD` when set; otherwise it defaults to `AZURE_SQL_ADMIN_PASSWORD`.
+- The `predeploy` migration hook runs domain-specific providers: Shopping and Orders on SQL Server, Products on PostgreSQL.
+- For Products, the migration hook runs `Migrate` + `Schema` + `ResetAndData` to avoid the DbEx PostgreSQL create-stage issue in Azure Flexible Server.
+- Key Vault name is unique per deployment (generated in [infra/main.bicep](infra/main.bicep)).
+- Multi-targeted .NET projects use a configurable publish framework via environment variable:
+  - `AZD_DOTNET_TARGET_FRAMEWORK` (preferred), or
+  - `DOTNET_TARGET_FRAMEWORK`.
+
+## Prerequisites
+
+- Azure CLI (`az`).
+- Azure Developer CLI (`azd`).
+- .NET SDK installed.
+- Access to an Azure subscription.
+- Outbound port 1433 and 5432 access to run DB updates.
+
+## One-time setup
+
+From this folder:
+
+```bash
+cd ./CoreEx/azure
+```
+
+Authenticate:
+
+```bash
+az login
+azd auth login
+```
+
+Create/select azd environment if needed:
+
+```bash
+azd env new
+# or
+azd env select <env-name>
+```
+
+Set required values:
+
+```bash
+azd env set AZURE_SUBSCRIPTION_ID <subscription-id>
+azd env set AZURE_LOCATION eastus2
+azd env set AZURE_SQL_ADMIN_PASSWORD '<strong-password>'
+azd env set AZURE_POSTGRES_ADMIN_PASSWORD '<strong-password>'  # Optional; defaults to AZURE_SQL_ADMIN_PASSWORD.
+azd env set AZD_DOTNET_TARGET_FRAMEWORK 'net10.0'
+```
+
+Note: Region availability and quota can vary by SKU. `AZD_DOTNET_TARGET_FRAMEWORK` can be set to `net8.0`, `net9.0`, or `net10.0` depending on your requirements.
+
+Load environment variables into your current bash session:
+
+```bash
+set -a && eval "$(azd env get-values)" && set +a
+```
+
+> **Important**: This step must be repeated every time you open a new shell session. The `preprovision` hook scripts read directly from shell environment variables, not from the azd environment store alone.
+
+Run the preprovision hook manually to generate `infra/main.parameters.json`:
+
+```bash
+./infra/scripts/use-dev-params.sh
+```
+
+This script:
+- Validates that `AZURE_SQL_ADMIN_PASSWORD` and `AZURE_LOCATION` are set.
+- Detects your current public IP for SQL and PostgreSQL firewall rules.
+- Maps `AZD_DOTNET_TARGET_FRAMEWORK` to the App Service Linux runtime:
+  - `net8.0` -> `DOTNETCORE|8.0`
+  - `net9.0` -> `DOTNETCORE|9.0`
+  - `net10.0` -> `DOTNETCORE|10.0`
+- Writes `infra/main.parameters.json` (used by all subsequent azd and az commands).
+
+## Validate before deploy
+
+> **Note**: `azd provision --preview` does not run the `preprovision` hook, so `infra/main.parameters.json` must already exist (generated above) before previewing.
+
+Preview infra changes:
+
+```bash
+azd provision --preview --no-prompt
+```
+
+If you need the full ARM what-if output:
+
+```bash
+az deployment group what-if --resource-group <your-resource-group> --template-file ./infra/main.bicep --parameters ./infra/main.parameters.json --no-pretty-print
+```
+
+Package all services:
+
+```bash
+azd package --all --no-prompt
+```
+
+## Deploy
+
+Provision infra + deploy services:
+
+```bash
+azd up --no-prompt
+```
+
+Redeploy code only:
+
+```bash
+azd deploy --all --no-prompt
+```
+
+Re-run infra only:
+
+```bash
+azd provision --no-prompt
+```
+
+## Accessing the Aspire Dashboard
+
+After deployment, the Aspire Dashboard is publicly accessible from a dedicated HTTPS-enabled App Service. The six deployed services are configured to export OTLP telemetry to it automatically.
+
+Default (recommended): use the helper script.
+
+```bash
+./scripts/get-aspire-dashboard-login.sh --resource-group <your-resource-group>
+```
+
+Optional arguments:
+
+```bash
+./scripts/get-aspire-dashboard-login.sh \
+  --resource-group <your-resource-group> \
+  --dashboard-app-name <dashboard-app-name> \
+  --token-timeout-seconds 30
+```
+
+The script prints:
+- Dashboard URL.
+- Login URL with token when a token is found in the last 60 minutes of the dashboard runtime log via SCM/Kudu, or during live tailing.
+
+Manual fallback (if you do not want to use the script):
+
+Find the dashboard URL:
+
+```bash
+az webapp show --resource-group <your-resource-group> --name <dashboard-app-name> --query defaultHostName -o tsv
+```
+
+Open `https://<host-name>` in a browser to view the Aspire Dashboard.
+
+If the dashboard prompts for a browser token, query the dashboard runtime log via SCM/Kudu:
+
+```bash
+USER=$(az webapp deployment list-publishing-credentials --resource-group <your-resource-group> --name <dashboard-app-name> --query publishingUserName -o tsv)
+PASS=$(az webapp deployment list-publishing-credentials --resource-group <your-resource-group> --name <dashboard-app-name> --query publishingPassword -o tsv)
+PAYLOAD='{"command":"grep \"Login to the dashboard\" /appsvctmp/volatile/logs/runtime/container.log","dir":"/home"}'
+curl -fsS -u "$USER:$PASS" -H 'Content-Type: application/json' -d "$PAYLOAD" "https://<dashboard-app-name>.scm.azurewebsites.net/api/command"
+```
+
+Extract only the token (bash):
+
+```bash
+USER=$(az webapp deployment list-publishing-credentials --resource-group <your-resource-group> --name <dashboard-app-name> --query publishingUserName -o tsv)
+PASS=$(az webapp deployment list-publishing-credentials --resource-group <your-resource-group> --name <dashboard-app-name> --query publishingPassword -o tsv)
+PAYLOAD='{"command":"grep \"Login to the dashboard\" /appsvctmp/volatile/logs/runtime/container.log","dir":"/home"}'
+TOKEN=$(curl -fsS -u "$USER:$PASS" -H 'Content-Type: application/json' -d "$PAYLOAD" "https://<dashboard-app-name>.scm.azurewebsites.net/api/command" | grep -oE 'login\?t=[A-Za-z0-9]+' | head -n1 | cut -d= -f2)
+echo "$TOKEN"
+```
+
+Print a ready-to-open login URL:
+
+```bash
+HOST=$(az webapp show --resource-group <your-resource-group> --name <dashboard-app-name> --query defaultHostName -o tsv)
+USER=$(az webapp deployment list-publishing-credentials --resource-group <your-resource-group> --name <dashboard-app-name> --query publishingUserName -o tsv)
+PASS=$(az webapp deployment list-publishing-credentials --resource-group <your-resource-group> --name <dashboard-app-name> --query publishingPassword -o tsv)
+PAYLOAD='{"command":"grep \"Login to the dashboard\" /appsvctmp/volatile/logs/runtime/container.log","dir":"/home"}'
+TOKEN=$(curl -fsS -u "$USER:$PASS" -H 'Content-Type: application/json' -d "$PAYLOAD" "https://<dashboard-app-name>.scm.azurewebsites.net/api/command" | grep -oE 'login\?t=[A-Za-z0-9]+' | head -n1 | cut -d= -f2)
+echo "https://${HOST}/login?t=${TOKEN}"
+```
+
+The standalone dashboard displays telemetry views such as:
+- Service topology and dependencies
+- Health status and logs
+- Traces and metrics received over OTLP
+
+Note: standalone Aspire Dashboard mode does not provide the full Aspire resource model UI that the local AppHost provides.
+
+## Running E2E Tests
+
+After deploying with `azd up`, you can run the E2E test runner against the deployed services.
+
+Default (recommended): use the helper script.
+
+```bash
+./scripts/setup-e2e-runner.sh --resource-group <your-resource-group>
+```
+
+Optional arguments:
+
+```bash
+./scripts/setup-e2e-runner.sh \
+  --resource-group <your-resource-group> \
+  --appsettings-path ../samples/tests/Contoso.E2E.Runner/appsettings.json \
+  --key-vault-name <key-vault-name> \
+  --products-app-name <products-app-name> \
+  --shopping-app-name <shopping-app-name> \
+  --skip-validation \
+  --insecure
+```
+
+The script:
+- Discovers the deployed Products and Shopping API host names.
+- Validates the deployed APIs using the same API and health paths described below.
+- Retrieves the SQL Server and PostgreSQL connection strings from Key Vault.
+- Updates [../samples/tests/Contoso.E2E.Runner/appsettings.json](../samples/tests/Contoso.E2E.Runner/appsettings.json) for Products and Shopping.
+- Creates an `appsettings.json.bak` backup before writing changes.
+
+Note: Shopping API validation uses `POST /api/customers/test/baskets`, which creates a test basket. Use `--skip-validation` if you only want to update configuration.
+
+After the script completes, run the E2E runner:
+
+```bash
+cd ../samples/tests/Contoso.E2E.Runner
+dotnet run --framework "${AZD_DOTNET_TARGET_FRAMEWORK:-$DOTNET_TARGET_FRAMEWORK}"
+```
+
+Manual fallback (if you do not want to use the script):
+
+### Get deployed endpoint URLs
+
+Retrieve the deployed App Service endpoints:
+
+```bash
+az webapp list --resource-group <your-resource-group> --query "[].hostNames[0]" -o tsv
+```
+
+This will show URLs like:
+- `app-products-api-dev-{suffix}.azurewebsites.net`
+- `app-shopping-api-dev-{suffix}.azurewebsites.net`
+
+Validate the deployed APIs using API/health/swagger paths (not root `/`):
+
+```bash
+# Products API
+curl -i "https://app-products-api-dev-{suffix}.azurewebsites.net/api/products"
+
+# Shopping API
+curl -i -X POST "https://app-shopping-api-dev-{suffix}.azurewebsites.net/api/customers/test/baskets"
+
+# Common liveness and docs paths
+curl -i "https://app-products-api-dev-{suffix}.azurewebsites.net/health/ready/detailed"
+curl -i "https://app-products-api-dev-{suffix}.azurewebsites.net/swagger"
+curl -i "https://app-shopping-api-dev-{suffix}.azurewebsites.net/health/ready/detailed"
+curl -i "https://app-shopping-api-dev-{suffix}.azurewebsites.net/swagger"
+```
+
+### Retrieve connection strings
+
+After `azd provision` or `azd up`, the postprovision hook automatically stores the following secrets in Key Vault:
+- `sql-admin-password`
+- `sql-connection-string`
+- `postgres-admin-password`
+- `postgres-connection-string`
+
+Retrieve them:
+
+```bash
+# Get Key Vault name
+KV=$(az keyvault list --resource-group <your-resource-group> --query '[0].name' -o tsv)
+
+# SQL connection string
+az keyvault secret show --vault-name $KV --name sql-connection-string -o tsv --query value
+
+# PostgreSQL connection string
+az keyvault secret show --vault-name $KV --name postgres-connection-string -o tsv --query value
+```
+
+### Update E2E configuration
+
+Edit [../samples/tests/Contoso.E2E.Runner/appsettings.json](../samples/tests/Contoso.E2E.Runner/appsettings.json) with the deployed endpoints and connection strings:
+
+```json
+{
+  "E2E": {
+    "Products": {
+      "BaseAddress": "https://app-products-api-dev-{suffix}.azurewebsites.net",
+      "ConnectionString": "Server=pg-dev-{suffix}.postgres.database.azure.com;Port=5432;Database=coreexdev;User Id={postgres-admin};Password={password};Ssl Mode=Require;"
+    },
+    "Shopping": {
+      "BaseAddress": "https://app-shopping-api-dev-{suffix}.azurewebsites.net",
+      "ConnectionString": "Server=sql-dev-{suffix}.database.windows.net;Database=Contoso;User Id=sqladmin;Password={password};Encrypt=true;TrustServerCertificate=false;"
+    }
+  }
+}
+```
+
+### Run E2E scenarios
+
+From the repository root:
+
+```bash
+cd samples/tests/Contoso.E2E.Runner
+dotnet run --framework "${AZD_DOTNET_TARGET_FRAMEWORK:-$DOTNET_TARGET_FRAMEWORK}"
+```
+
+This launches an interactive CLI menu to select and execute test scenarios or run load simulations against the deployed APIs.
+
+
+## Troubleshooting
+
+No project exists / run azd init:
+
+```bash
+cd ./CoreEx/azure
+azd init
+```
+
+No subscriptions found:
+
+```bash
+azd auth login --tenant-id <tenant-id>
+```
+
+SQL password missing:
+- Ensure `AZURE_SQL_ADMIN_PASSWORD` is set before `azd provision` or `azd up`.
+
+PostgreSQL password missing:
+- Set `AZURE_POSTGRES_ADMIN_PASSWORD` if your SQL and PostgreSQL admin passwords differ.
+- If omitted, deployment hooks default PostgreSQL admin password to `AZURE_SQL_ADMIN_PASSWORD`.
+
+`predeploy` hook fails with missing database outputs:
+- Run `azd provision --no-prompt` first to refresh azd environment outputs (`sqlServerName`, `sqlDatabaseName`, `postgresServerName`, `postgresDatabaseName`) before `azd deploy --all --no-prompt`.
+
+Multi-target publish error (NETSDK1129):
+- Ensure `AZD_DOTNET_TARGET_FRAMEWORK` is set in your azd environment: `azd env set AZD_DOTNET_TARGET_FRAMEWORK net10.0`.
+- Load it into your current shell: `set -a && eval "$(azd env get-values)" && set +a`.
+
+`command not found` while loading environment values:
+- This usually means `azd env get-values` was run outside the azd project folder and returned `ERROR: no project exists...`.
+- Run from `./CoreEx/azure`, or use `azd -C /path/to/CoreEx/azure env get-values`.
+
+API returns 404 at `/`:
+- This is expected for these services.
+- Use `/api/...`, `/health`, or `/swagger` paths to validate the deployment.
+
+## Useful commands
+
+Show current environment values:
+
+```bash
+azd env get-values
+```
+
+List environments:
+
+```bash
+azd env list
+```
+
+Delete deployed resources:
+
+```bash
+azd down --force --purge --no-prompt
+```
diff --git a/azure/azure.yaml b/azure/azure.yaml
new file mode 100644
index 00000000..430a87e9
--- /dev/null
+++ b/azure/azure.yaml
@@ -0,0 +1,56 @@
+name: coreex-contoso
+metadata:
+  template: coreex-azd-infra
+
+services:
+  products-api:
+    project: ../samples/src/Contoso.Products.Api
+    language: csharp
+    host: appservice
+  shopping-api:
+    project: ../samples/src/Contoso.Shopping.Api
+    language: csharp
+    host: appservice
+  products-outbox-relay:
+    project: ../samples/src/Contoso.Products.Relay
+    language: csharp
+    host: appservice
+  shopping-outbox-relay:
+    project: ../samples/src/Contoso.Shopping.Relay
+    language: csharp
+    host: appservice
+  products-subscribe:
+    project: ../samples/src/Contoso.Products.Subscribe
+    language: csharp
+    host: appservice
+  shopping-subscribe:
+    project: ../samples/src/Contoso.Shopping.Subscribe
+    language: csharp
+    host: appservice
+
+infra:
+  provider: bicep
+  path: infra
+
+hooks:
+  preprovision:
+    - posix:
+        shell: sh
+        run: ./infra/scripts/use-dev-params.sh
+      windows:
+        shell: pwsh
+        run: ./infra/scripts/use-dev-params.ps1
+  predeploy:
+    - posix:
+        shell: sh
+        run: bash ./scripts/run-products-db-migrations.sh
+      windows:
+        shell: pwsh
+        run: ./scripts/run-products-db-migrations.ps1
+  postprovision:
+    - posix:
+        shell: sh
+        run: ./infra/scripts/store-secrets.sh
+      windows:
+        shell: pwsh
+        run: ./infra/scripts/store-secrets.ps1
diff --git a/azure/infra/.gitignore b/azure/infra/.gitignore
new file mode 100644
index 00000000..f94ddfd4
--- /dev/null
+++ b/azure/infra/.gitignore
@@ -0,0 +1 @@
+main.parameters.json
diff --git a/azure/infra/main.bicep b/azure/infra/main.bicep
new file mode 100644
index 00000000..7e72e588
--- /dev/null
+++ b/azure/infra/main.bicep
@@ -0,0 +1,241 @@
+targetScope = 'resourceGroup'
+
+@allowed([
+  'dev'
+  'test'
+  'prod'
+])
+@description('Deployment environment.')
+param environmentType string
+
+@description('Location for all resources.')
+param location string = resourceGroup().location
+
+@description('Unique suffix for globally unique resource names. Use a short lowercase token, e.g. a1b2c3.')
+param nameSuffix string
+
+@description('Optional Key Vault name override. When empty, a unique Key Vault name is generated.')
+param keyVaultName string = ''
+
+@description('Tags applied to all resources.')
+param tags object = {}
+
+@description('App Service Plan SKU name.')
+param appServicePlanSkuName string
+
+@description('App Service Plan tier.')
+param appServicePlanTier string
+
+@description('App Service Plan instance count.')
+param appServicePlanCapacity int
+
+@description('App Service Linux runtime stack. Example: DOTNETCORE|10.0.')
+param appServiceLinuxFxVersion string
+
+@description('Service Bus namespace SKU. Basic, Standard, or Premium.')
+param serviceBusSkuName string
+
+@description('Azure SQL administrator login name.')
+param sqlAdminLogin string
+
+@secure()
+@description('Azure SQL administrator password.')
+param sqlAdminPassword string
+
+@description('Azure SQL database name.')
+param sqlDatabaseName string
+
+@description('Current runner public IPv4 address to allow through the Azure SQL firewall.')
+param sqlFirewallClientIp string = ''
+
+@description('Azure SQL database SKU name. Example: GP_S_Gen5_1.')
+param sqlSkuName string
+
+@description('Azure SQL database tier. Example: GeneralPurpose.')
+param sqlTier string
+
+@description('Azure SQL minimum vCores for serverless, represented as a JSON number string (for example 0.5).')
+param sqlMinCapacity string
+
+@description('Azure SQL auto-pause delay in minutes. Set to -1 to disable.')
+param sqlAutoPauseDelay int
+
+@description('Azure PostgreSQL administrator login name.')
+param postgresAdminLogin string
+
+@secure()
+@description('Azure PostgreSQL administrator password.')
+param postgresAdminPassword string
+
+@description('Azure PostgreSQL database name used by Products domain.')
+param postgresDatabaseName string
+
+@description('Current runner public IPv4 address to allow through the Azure PostgreSQL firewall.')
+param postgresFirewallClientIp string = ''
+
+@description('Azure PostgreSQL flexible server SKU name. Example: Standard_B1ms.')
+param postgresSkuName string
+
+@description('Azure PostgreSQL flexible server tier. Example: Burstable.')
+param postgresSkuTier string
+
+@description('Azure PostgreSQL major version. Example: 16.')
+param postgresVersion string
+
+@description('Azure PostgreSQL storage size in GB.')
+param postgresStorageSizeGb int
+
+@description('Azure Managed Redis SKU name. Example: Balanced_B0.')
+param redisSkuName string
+
+@allowed([
+  'Enabled'
+  'Disabled'
+])
+@description('Azure Managed Redis high availability mode.')
+param redisHighAvailability string
+
+var suffix = toLower(nameSuffix)
+var computedKeyVaultName = take('kv${environmentType}${suffix}${uniqueString(deployment().name, resourceGroup().id)}', 24)
+var resolvedKeyVaultName = empty(keyVaultName) ? computedKeyVaultName : keyVaultName
+var mergedTags = union(tags, {
+  environment: environmentType
+  managedBy: 'azd'
+  'azd-env-name': environmentType
+})
+
+module appInsights './modules/application-insights.bicep' = {
+  name: 'appInsightsDeploy'
+  params: {
+    location: location
+    name: 'appi-${environmentType}-${suffix}'
+    tags: mergedTags
+  }
+}
+
+module keyVault './modules/key-vault.bicep' = {
+  name: 'keyVaultDeploy'
+  params: {
+    location: location
+    name: resolvedKeyVaultName
+    tags: mergedTags
+  }
+}
+
+module appServicePlan './modules/app-service-plan.bicep' = {
+  name: 'appServicePlanDeploy'
+  params: {
+    location: location
+    name: 'asp-${environmentType}-${suffix}'
+    skuName: appServicePlanSkuName
+    skuTier: appServicePlanTier
+    capacity: appServicePlanCapacity
+    tags: mergedTags
+  }
+}
+
+module serviceBus './modules/service-bus.bicep' = {
+  name: 'serviceBusDeploy'
+  params: {
+    location: location
+    namespaceName: 'sb-${environmentType}-${suffix}'
+    skuName: serviceBusSkuName
+    tags: mergedTags
+  }
+}
+
+module redis './modules/redis.bicep' = {
+  name: 'redisDeploy'
+  params: {
+    location: location
+    cacheName: 'redis-${environmentType}-${suffix}'
+    skuName: redisSkuName
+    highAvailability: redisHighAvailability
+    tags: mergedTags
+  }
+}
+
+module sql './modules/database.bicep' = {
+  name: 'sqlDeploy'
+  params: {
+    location: location
+    serverName: 'sql-${environmentType}-${suffix}'
+    databaseName: sqlDatabaseName
+    adminLogin: sqlAdminLogin
+    adminPassword: sqlAdminPassword
+    clientIp: sqlFirewallClientIp
+    skuName: sqlSkuName
+    skuTier: sqlTier
+    minCapacity: sqlMinCapacity
+    autoPauseDelay: sqlAutoPauseDelay
+    tags: mergedTags
+  }
+}
+
+module postgres './modules/postgres-database.bicep' = {
+  name: 'postgresDeploy'
+  params: {
+    location: location
+    serverName: 'pg-${environmentType}-${suffix}'
+    databaseName: postgresDatabaseName
+    adminLogin: postgresAdminLogin
+    adminPassword: postgresAdminPassword
+    clientIp: postgresFirewallClientIp
+    skuName: postgresSkuName
+    skuTier: postgresSkuTier
+    version: postgresVersion
+    storageSizeGb: postgresStorageSizeGb
+    tags: mergedTags
+  }
+}
+
+module appServices './modules/app-services.bicep' = {
+  name: 'appServicesDeploy'
+  params: {
+    location: location
+    appServicePlanId: appServicePlan.outputs.id
+    appServiceLinuxFxVersion: appServiceLinuxFxVersion
+    environmentType: environmentType
+    suffix: suffix
+    tags: mergedTags
+    appInsightsConnectionString: appInsights.outputs.connectionString
+    appInsightsResourceId: appInsights.outputs.id
+    appInsightsInstrumentationKey: appInsights.outputs.instrumentationKey
+    sqlConnectionString: sql.outputs.connectionString
+    postgresConnectionString: postgres.outputs.connectionString
+    serviceBusConnectionString: serviceBus.outputs.connectionString
+    redisConnectionString: redis.outputs.connectionString
+    otlpHttpEndpoint: aspireDashboard.outputs.otlpHttpEndpoint
+  }
+}
+
+module aspireDashboard './modules/aspire-dashboard.bicep' = {
+  name: 'aspireDashboardDeploy'
+  params: {
+    location: location
+    appServicePlanId: appServicePlan.outputs.id
+    environmentType: environmentType
+    suffix: suffix
+    tags: mergedTags
+  }
+}
+
+output appServicePlanName string = appServicePlan.outputs.name
+output appInsightsConnectionString string = appInsights.outputs.connectionString
+output keyVaultName string = keyVault.outputs.name
+output serviceBusNamespaceName string = serviceBus.outputs.namespaceName
+output redisHostName string = redis.outputs.hostName
+output sqlServerName string = sql.outputs.serverName
+output sqlDatabaseName string = sql.outputs.databaseName
+output postgresServerName string = postgres.outputs.serverName
+output postgresDatabaseName string = postgres.outputs.databaseName
+output productsApiAppName string = appServices.outputs.productsApiName
+output shoppingApiAppName string = appServices.outputs.shoppingApiName
+output productsOutboxRelayAppName string = appServices.outputs.productsOutboxRelayName
+output shoppingOutboxRelayAppName string = appServices.outputs.shoppingOutboxRelayName
+output productsSubscribeAppName string = appServices.outputs.productsSubscribeName
+output shoppingSubscribeAppName string = appServices.outputs.shoppingSubscribeName
+output aspireDashboardAppName string = aspireDashboard.outputs.appName
+output aspireDashboardUri string = aspireDashboard.outputs.dashboardUri
+output aspireDashboardOtlpGrpcEndpoint string = aspireDashboard.outputs.otlpGrpcEndpoint
+
diff --git a/azure/infra/main.dev.bicepparam b/azure/infra/main.dev.bicepparam
new file mode 100644
index 00000000..09320e08
--- /dev/null
+++ b/azure/infra/main.dev.bicepparam
@@ -0,0 +1,42 @@
+using './main.bicep'
+
+param environmentType = 'dev'
+param location = readEnvironmentVariable('AZURE_LOCATION')
+param nameSuffix = 'dev01'
+
+param tags = {
+  workload: 'coreex'
+  environment: 'dev'
+  costProfile: 'minimum-practical'
+}
+
+// Basic B2 plan for multi-service web apps.
+param appServicePlanSkuName = 'B2'
+param appServicePlanTier = 'Basic'
+param appServicePlanCapacity = 1
+param appServiceLinuxFxVersion = 'DOTNETCORE|${replace(readEnvironmentVariable('AZD_DOTNET_TARGET_FRAMEWORK', readEnvironmentVariable('DOTNET_TARGET_FRAMEWORK', 'net8.0')), 'net', '')}'
+
+// Requested by user: keep Service Bus on Standard.
+param serviceBusSkuName = 'Standard'
+
+param sqlAdminLogin = 'coreexadmin'
+param sqlAdminPassword = readEnvironmentVariable('AZURE_SQL_ADMIN_PASSWORD')
+param sqlDatabaseName = 'coreexdev'
+
+// Requested by user: SQL serverless with 60-minute auto-pause.
+param sqlSkuName = 'GP_S_Gen5_1'
+param sqlTier = 'GeneralPurpose'
+param sqlMinCapacity = '0.5'
+param sqlAutoPauseDelay = 60
+
+param postgresAdminLogin = 'coreexpgadmin'
+param postgresAdminPassword = readEnvironmentVariable('AZURE_POSTGRES_ADMIN_PASSWORD', readEnvironmentVariable('AZURE_SQL_ADMIN_PASSWORD'))
+param postgresDatabaseName = 'coreexdev'
+param postgresSkuName = 'Standard_B1ms'
+param postgresSkuTier = 'Burstable'
+param postgresVersion = '16'
+param postgresStorageSizeGb = 32
+
+// Entry Azure Managed Redis tier.
+param redisSkuName = 'Balanced_B0'
+param redisHighAvailability = 'Disabled'
diff --git a/azure/infra/main.dev.parameters.json b/azure/infra/main.dev.parameters.json
new file mode 100644
index 00000000..de3f7f06
--- /dev/null
+++ b/azure/infra/main.dev.parameters.json
@@ -0,0 +1,94 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
+  "contentVersion": "1.0.0.0",
+  "parameters": {
+    "environmentType": {
+      "value": "dev"
+    },
+    "location": {
+      "value": "__AZURE_LOCATION__"
+    },
+    "nameSuffix": {
+      "value": "dev01"
+    },
+    "keyVaultName": {
+      "value": "__KEY_VAULT_NAME__"
+    },
+    "tags": {
+      "value": {
+        "workload": "coreex",
+        "environment": "dev",
+        "costProfile": "minimum-practical"
+      }
+    },
+    "appServicePlanSkuName": {
+      "value": "B2"
+    },
+    "appServicePlanTier": {
+      "value": "Basic"
+    },
+    "appServicePlanCapacity": {
+      "value": 1
+    },
+    "appServiceLinuxFxVersion": {
+      "value": "__APP_SERVICE_LINUX_FX_VERSION__"
+    },
+    "serviceBusSkuName": {
+      "value": "Standard"
+    },
+    "sqlAdminLogin": {
+      "value": "coreexadmin"
+    },
+    "sqlAdminPassword": {
+      "value": "__AZURE_SQL_ADMIN_PASSWORD__"
+    },
+    "sqlDatabaseName": {
+      "value": "coreexdev"
+    },
+    "sqlFirewallClientIp": {
+      "value": "__AZURE_CLIENT_IP__"
+    },
+    "sqlSkuName": {
+      "value": "GP_S_Gen5_1"
+    },
+    "sqlTier": {
+      "value": "GeneralPurpose"
+    },
+    "sqlMinCapacity": {
+      "value": "0.5"
+    },
+    "sqlAutoPauseDelay": {
+      "value": 60
+    },
+    "postgresAdminLogin": {
+      "value": "coreexpgadmin"
+    },
+    "postgresAdminPassword": {
+      "value": "__AZURE_POSTGRES_ADMIN_PASSWORD__"
+    },
+    "postgresDatabaseName": {
+      "value": "coreexdev"
+    },
+    "postgresFirewallClientIp": {
+      "value": "__AZURE_CLIENT_IP__"
+    },
+    "postgresSkuName": {
+      "value": "Standard_B1ms"
+    },
+    "postgresSkuTier": {
+      "value": "Burstable"
+    },
+    "postgresVersion": {
+      "value": "16"
+    },
+    "postgresStorageSizeGb": {
+      "value": 32
+    },
+    "redisSkuName": {
+      "value": "Balanced_B0"
+    },
+    "redisHighAvailability": {
+      "value": "Disabled"
+    }
+  }
+}
diff --git a/azure/infra/main.json b/azure/infra/main.json
new file mode 100644
index 00000000..149e2ce3
--- /dev/null
+++ b/azure/infra/main.json
@@ -0,0 +1,1652 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "metadata": {
+    "_generator": {
+      "name": "bicep",
+      "version": "0.43.8.12551",
+      "templateHash": "11663173647746982515"
+    }
+  },
+  "parameters": {
+    "environmentType": {
+      "type": "string",
+      "allowedValues": [
+        "dev",
+        "test",
+        "prod"
+      ],
+      "metadata": {
+        "description": "Deployment environment."
+      }
+    },
+    "location": {
+      "type": "string",
+      "defaultValue": "[resourceGroup().location]",
+      "metadata": {
+        "description": "Location for all resources."
+      }
+    },
+    "nameSuffix": {
+      "type": "string",
+      "metadata": {
+        "description": "Unique suffix for globally unique resource names. Use a short lowercase token, e.g. a1b2c3."
+      }
+    },
+    "keyVaultName": {
+      "type": "string",
+      "defaultValue": "",
+      "metadata": {
+        "description": "Optional Key Vault name override. When empty, a unique Key Vault name is generated."
+      }
+    },
+    "tags": {
+      "type": "object",
+      "defaultValue": {},
+      "metadata": {
+        "description": "Tags applied to all resources."
+      }
+    },
+    "appServicePlanSkuName": {
+      "type": "string",
+      "metadata": {
+        "description": "App Service Plan SKU name."
+      }
+    },
+    "appServicePlanTier": {
+      "type": "string",
+      "metadata": {
+        "description": "App Service Plan tier."
+      }
+    },
+    "appServicePlanCapacity": {
+      "type": "int",
+      "metadata": {
+        "description": "App Service Plan instance count."
+      }
+    },
+    "appServiceLinuxFxVersion": {
+      "type": "string",
+      "metadata": {
+        "description": "App Service Linux runtime stack. Example: DOTNETCORE|10.0."
+      }
+    },
+    "serviceBusSkuName": {
+      "type": "string",
+      "metadata": {
+        "description": "Service Bus namespace SKU. Basic, Standard, or Premium."
+      }
+    },
+    "sqlAdminLogin": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure SQL administrator login name."
+      }
+    },
+    "sqlAdminPassword": {
+      "type": "securestring",
+      "metadata": {
+        "description": "Azure SQL administrator password."
+      }
+    },
+    "sqlDatabaseName": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure SQL database name."
+      }
+    },
+    "sqlFirewallClientIp": {
+      "type": "string",
+      "defaultValue": "",
+      "metadata": {
+        "description": "Current runner public IPv4 address to allow through the Azure SQL firewall."
+      }
+    },
+    "sqlSkuName": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure SQL database SKU name. Example: GP_S_Gen5_1."
+      }
+    },
+    "sqlTier": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure SQL database tier. Example: GeneralPurpose."
+      }
+    },
+    "sqlMinCapacity": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure SQL minimum vCores for serverless, represented as a JSON number string (for example 0.5)."
+      }
+    },
+    "sqlAutoPauseDelay": {
+      "type": "int",
+      "metadata": {
+        "description": "Azure SQL auto-pause delay in minutes. Set to -1 to disable."
+      }
+    },
+    "postgresAdminLogin": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure PostgreSQL administrator login name."
+      }
+    },
+    "postgresAdminPassword": {
+      "type": "securestring",
+      "metadata": {
+        "description": "Azure PostgreSQL administrator password."
+      }
+    },
+    "postgresDatabaseName": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure PostgreSQL database name used by Products domain."
+      }
+    },
+    "postgresFirewallClientIp": {
+      "type": "string",
+      "defaultValue": "",
+      "metadata": {
+        "description": "Current runner public IPv4 address to allow through the Azure PostgreSQL firewall."
+      }
+    },
+    "postgresSkuName": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure PostgreSQL flexible server SKU name. Example: Standard_B1ms."
+      }
+    },
+    "postgresSkuTier": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure PostgreSQL flexible server tier. Example: Burstable."
+      }
+    },
+    "postgresVersion": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure PostgreSQL major version. Example: 16."
+      }
+    },
+    "postgresStorageSizeGb": {
+      "type": "int",
+      "metadata": {
+        "description": "Azure PostgreSQL storage size in GB."
+      }
+    },
+    "redisSkuName": {
+      "type": "string",
+      "metadata": {
+        "description": "Azure Managed Redis SKU name. Example: Balanced_B0."
+      }
+    },
+    "redisHighAvailability": {
+      "type": "string",
+      "allowedValues": [
+        "Enabled",
+        "Disabled"
+      ],
+      "metadata": {
+        "description": "Azure Managed Redis high availability mode."
+      }
+    }
+  },
+  "variables": {
+    "suffix": "[toLower(parameters('nameSuffix'))]",
+    "computedKeyVaultName": "[take(format('kv{0}{1}{2}', parameters('environmentType'), variables('suffix'), uniqueString(deployment().name, resourceGroup().id)), 24)]",
+    "resolvedKeyVaultName": "[if(empty(parameters('keyVaultName')), variables('computedKeyVaultName'), parameters('keyVaultName'))]",
+    "mergedTags": "[union(parameters('tags'), createObject('environment', parameters('environmentType'), 'managedBy', 'azd', 'azd-env-name', parameters('environmentType')))]"
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "appInsightsDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "name": {
+            "value": "[format('appi-{0}-{1}', parameters('environmentType'), variables('suffix'))]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "1054162708713925368"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.Insights/components",
+              "apiVersion": "2020-02-02",
+              "name": "[parameters('name')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "kind": "web",
+              "properties": {
+                "Application_Type": "web",
+                "Flow_Type": "Bluefield",
+                "Request_Source": "rest"
+              }
+            }
+          ],
+          "outputs": {
+            "name": {
+              "type": "string",
+              "value": "[parameters('name')]"
+            },
+            "connectionString": {
+              "type": "string",
+              "value": "[reference(resourceId('Microsoft.Insights/components', parameters('name')), '2020-02-02').ConnectionString]"
+            },
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.Insights/components', parameters('name'))]"
+            },
+            "instrumentationKey": {
+              "type": "string",
+              "value": "[reference(resourceId('Microsoft.Insights/components', parameters('name')), '2020-02-02').InstrumentationKey]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "keyVaultDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "name": {
+            "value": "[variables('resolvedKeyVaultName')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "6366741801556338859"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.KeyVault/vaults",
+              "apiVersion": "2023-07-01",
+              "name": "[parameters('name')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "properties": {
+                "sku": {
+                  "family": "A",
+                  "name": "standard"
+                },
+                "tenantId": "[subscription().tenantId]",
+                "enableRbacAuthorization": true,
+                "enabledForDeployment": true,
+                "enabledForTemplateDeployment": true,
+                "enabledForDiskEncryption": false,
+                "publicNetworkAccess": "Enabled"
+              }
+            }
+          ],
+          "outputs": {
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.KeyVault/vaults', parameters('name'))]"
+            },
+            "name": {
+              "type": "string",
+              "value": "[parameters('name')]"
+            },
+            "vaultUri": {
+              "type": "string",
+              "value": "[reference(resourceId('Microsoft.KeyVault/vaults', parameters('name')), '2023-07-01').vaultUri]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "appServicePlanDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "name": {
+            "value": "[format('asp-{0}-{1}', parameters('environmentType'), variables('suffix'))]"
+          },
+          "skuName": {
+            "value": "[parameters('appServicePlanSkuName')]"
+          },
+          "skuTier": {
+            "value": "[parameters('appServicePlanTier')]"
+          },
+          "capacity": {
+            "value": "[parameters('appServicePlanCapacity')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "17043110285077169943"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "name": {
+              "type": "string"
+            },
+            "skuName": {
+              "type": "string"
+            },
+            "skuTier": {
+              "type": "string"
+            },
+            "capacity": {
+              "type": "int"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.Web/serverfarms",
+              "apiVersion": "2023-12-01",
+              "name": "[parameters('name')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "kind": "linux",
+              "sku": {
+                "name": "[parameters('skuName')]",
+                "tier": "[parameters('skuTier')]",
+                "capacity": "[parameters('capacity')]"
+              },
+              "properties": {
+                "reserved": true
+              }
+            }
+          ],
+          "outputs": {
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.Web/serverfarms', parameters('name'))]"
+            },
+            "name": {
+              "type": "string",
+              "value": "[parameters('name')]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "serviceBusDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "namespaceName": {
+            "value": "[format('sb-{0}-{1}', parameters('environmentType'), variables('suffix'))]"
+          },
+          "skuName": {
+            "value": "[parameters('serviceBusSkuName')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "17950824884306378259"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "namespaceName": {
+              "type": "string"
+            },
+            "skuName": {
+              "type": "string"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.ServiceBus/namespaces",
+              "apiVersion": "2023-01-01-preview",
+              "name": "[parameters('namespaceName')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "sku": {
+                "name": "[parameters('skuName')]",
+                "tier": "[parameters('skuName')]"
+              },
+              "properties": {
+                "publicNetworkAccess": "Enabled",
+                "minimumTlsVersion": "1.2"
+              }
+            },
+            {
+              "type": "Microsoft.ServiceBus/namespaces/topics",
+              "apiVersion": "2023-01-01-preview",
+              "name": "[format('{0}/{1}', parameters('namespaceName'), 'contoso')]",
+              "properties": {
+                "defaultMessageTimeToLive": "P14D",
+                "requiresDuplicateDetection": true,
+                "duplicateDetectionHistoryTimeWindow": "PT10M"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.ServiceBus/namespaces', parameters('namespaceName'))]"
+              ]
+            },
+            {
+              "type": "Microsoft.ServiceBus/namespaces/topics/subscriptions",
+              "apiVersion": "2023-01-01-preview",
+              "name": "[format('{0}/{1}/{2}', parameters('namespaceName'), 'contoso', 'products')]",
+              "properties": {
+                "requiresSession": true,
+                "maxDeliveryCount": 10,
+                "lockDuration": "PT5M",
+                "deadLetteringOnMessageExpiration": true
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.ServiceBus/namespaces/topics', parameters('namespaceName'), 'contoso')]"
+              ]
+            },
+            {
+              "type": "Microsoft.ServiceBus/namespaces/topics/subscriptions",
+              "apiVersion": "2023-01-01-preview",
+              "name": "[format('{0}/{1}/{2}', parameters('namespaceName'), 'contoso', 'shopping')]",
+              "properties": {
+                "requiresSession": true,
+                "maxDeliveryCount": 10,
+                "lockDuration": "PT5M",
+                "deadLetteringOnMessageExpiration": true
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.ServiceBus/namespaces/topics', parameters('namespaceName'), 'contoso')]"
+              ]
+            },
+            {
+              "type": "Microsoft.ServiceBus/namespaces/AuthorizationRules",
+              "apiVersion": "2023-01-01-preview",
+              "name": "[format('{0}/{1}', parameters('namespaceName'), 'app')]",
+              "properties": {
+                "rights": [
+                  "Listen",
+                  "Send",
+                  "Manage"
+                ]
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.ServiceBus/namespaces', parameters('namespaceName'))]"
+              ]
+            }
+          ],
+          "outputs": {
+            "namespaceName": {
+              "type": "string",
+              "value": "[parameters('namespaceName')]"
+            },
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.ServiceBus/namespaces', parameters('namespaceName'))]"
+            },
+            "topicName": {
+              "type": "string",
+              "value": "contoso"
+            },
+            "productsSubscriptionName": {
+              "type": "string",
+              "value": "products"
+            },
+            "shoppingSubscriptionName": {
+              "type": "string",
+              "value": "shopping"
+            },
+            "connectionString": {
+              "type": "string",
+              "value": "[listKeys(resourceId('Microsoft.ServiceBus/namespaces/AuthorizationRules', parameters('namespaceName'), 'app'), '2023-01-01-preview').primaryConnectionString]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "redisDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "cacheName": {
+            "value": "[format('redis-{0}-{1}', parameters('environmentType'), variables('suffix'))]"
+          },
+          "skuName": {
+            "value": "[parameters('redisSkuName')]"
+          },
+          "highAvailability": {
+            "value": "[parameters('redisHighAvailability')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "4334939735410165283"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "cacheName": {
+              "type": "string"
+            },
+            "skuName": {
+              "type": "string"
+            },
+            "highAvailability": {
+              "type": "string",
+              "allowedValues": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.Cache/redisEnterprise",
+              "apiVersion": "2025-07-01",
+              "name": "[parameters('cacheName')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "sku": {
+                "name": "[parameters('skuName')]"
+              },
+              "properties": {
+                "highAvailability": "[parameters('highAvailability')]",
+                "minimumTlsVersion": "1.2",
+                "publicNetworkAccess": "Enabled",
+                "encryption": {}
+              }
+            },
+            {
+              "type": "Microsoft.Cache/redisEnterprise/databases",
+              "apiVersion": "2025-04-01",
+              "name": "[format('{0}/{1}', parameters('cacheName'), 'default')]",
+              "properties": {
+                "clientProtocol": "Encrypted",
+                "clusteringPolicy": "OSSCluster",
+                "evictionPolicy": "VolatileLRU",
+                "modules": [],
+                "port": 10000
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.Cache/redisEnterprise', parameters('cacheName'))]"
+              ]
+            }
+          ],
+          "outputs": {
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.Cache/redisEnterprise', parameters('cacheName'))]"
+            },
+            "name": {
+              "type": "string",
+              "value": "[parameters('cacheName')]"
+            },
+            "hostName": {
+              "type": "string",
+              "value": "[reference(resourceId('Microsoft.Cache/redisEnterprise', parameters('cacheName')), '2025-07-01').hostName]"
+            },
+            "connectionString": {
+              "type": "string",
+              "value": "[format('{0}:10000,password={1},ssl=True,abortConnect=False', reference(resourceId('Microsoft.Cache/redisEnterprise', parameters('cacheName')), '2025-07-01').hostName, listKeys(resourceId('Microsoft.Cache/redisEnterprise/databases', parameters('cacheName'), 'default'), '2025-04-01').primaryKey)]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "sqlDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "serverName": {
+            "value": "[format('sql-{0}-{1}', parameters('environmentType'), variables('suffix'))]"
+          },
+          "databaseName": {
+            "value": "[parameters('sqlDatabaseName')]"
+          },
+          "adminLogin": {
+            "value": "[parameters('sqlAdminLogin')]"
+          },
+          "adminPassword": {
+            "value": "[parameters('sqlAdminPassword')]"
+          },
+          "clientIp": {
+            "value": "[parameters('sqlFirewallClientIp')]"
+          },
+          "skuName": {
+            "value": "[parameters('sqlSkuName')]"
+          },
+          "skuTier": {
+            "value": "[parameters('sqlTier')]"
+          },
+          "minCapacity": {
+            "value": "[parameters('sqlMinCapacity')]"
+          },
+          "autoPauseDelay": {
+            "value": "[parameters('sqlAutoPauseDelay')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "12964997318502549886"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "serverName": {
+              "type": "string"
+            },
+            "databaseName": {
+              "type": "string"
+            },
+            "adminLogin": {
+              "type": "string"
+            },
+            "adminPassword": {
+              "type": "securestring"
+            },
+            "clientIp": {
+              "type": "string",
+              "defaultValue": ""
+            },
+            "skuName": {
+              "type": "string"
+            },
+            "skuTier": {
+              "type": "string"
+            },
+            "minCapacity": {
+              "type": "string"
+            },
+            "autoPauseDelay": {
+              "type": "int"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.Sql/servers",
+              "apiVersion": "2023-08-01-preview",
+              "name": "[parameters('serverName')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "properties": {
+                "administratorLogin": "[parameters('adminLogin')]",
+                "administratorLoginPassword": "[parameters('adminPassword')]",
+                "version": "12.0",
+                "publicNetworkAccess": "Enabled",
+                "minimalTlsVersion": "1.2"
+              }
+            },
+            {
+              "type": "Microsoft.Sql/servers/firewallRules",
+              "apiVersion": "2023-08-01-preview",
+              "name": "[format('{0}/{1}', parameters('serverName'), 'AllowAzureServices')]",
+              "properties": {
+                "startIpAddress": "0.0.0.0",
+                "endIpAddress": "0.0.0.0"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
+              ]
+            },
+            {
+              "condition": "[not(empty(parameters('clientIp')))]",
+              "type": "Microsoft.Sql/servers/firewallRules",
+              "apiVersion": "2023-08-01-preview",
+              "name": "[format('{0}/{1}', parameters('serverName'), format('AllowCurrentRunner-{0}', replace(parameters('clientIp'), '.', '-')))]",
+              "properties": {
+                "startIpAddress": "[parameters('clientIp')]",
+                "endIpAddress": "[parameters('clientIp')]"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
+              ]
+            },
+            {
+              "type": "Microsoft.Sql/servers/databases",
+              "apiVersion": "2023-08-01-preview",
+              "name": "[format('{0}/{1}', parameters('serverName'), parameters('databaseName'))]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "sku": {
+                "name": "[parameters('skuName')]",
+                "tier": "[parameters('skuTier')]"
+              },
+              "properties": {
+                "collation": "SQL_Latin1_General_CP1_CI_AS",
+                "minCapacity": "[json(parameters('minCapacity'))]",
+                "autoPauseDelay": "[parameters('autoPauseDelay')]"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.Sql/servers', parameters('serverName'))]"
+              ]
+            }
+          ],
+          "outputs": {
+            "serverName": {
+              "type": "string",
+              "value": "[parameters('serverName')]"
+            },
+            "databaseName": {
+              "type": "string",
+              "value": "[parameters('databaseName')]"
+            },
+            "fullyQualifiedDomainName": {
+              "type": "string",
+              "value": "[reference(resourceId('Microsoft.Sql/servers', parameters('serverName')), '2023-08-01-preview').fullyQualifiedDomainName]"
+            },
+            "connectionString": {
+              "type": "string",
+              "value": "[format('Data Source=tcp:{0},1433;Initial Catalog={1};User id={2};Password={3};Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;', reference(resourceId('Microsoft.Sql/servers', parameters('serverName')), '2023-08-01-preview').fullyQualifiedDomainName, parameters('databaseName'), parameters('adminLogin'), parameters('adminPassword'))]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "postgresDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "serverName": {
+            "value": "[format('pg-{0}-{1}', parameters('environmentType'), variables('suffix'))]"
+          },
+          "databaseName": {
+            "value": "[parameters('postgresDatabaseName')]"
+          },
+          "adminLogin": {
+            "value": "[parameters('postgresAdminLogin')]"
+          },
+          "adminPassword": {
+            "value": "[parameters('postgresAdminPassword')]"
+          },
+          "clientIp": {
+            "value": "[parameters('postgresFirewallClientIp')]"
+          },
+          "skuName": {
+            "value": "[parameters('postgresSkuName')]"
+          },
+          "skuTier": {
+            "value": "[parameters('postgresSkuTier')]"
+          },
+          "version": {
+            "value": "[parameters('postgresVersion')]"
+          },
+          "storageSizeGb": {
+            "value": "[parameters('postgresStorageSizeGb')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "17061784073968427037"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "serverName": {
+              "type": "string"
+            },
+            "databaseName": {
+              "type": "string"
+            },
+            "adminLogin": {
+              "type": "string"
+            },
+            "adminPassword": {
+              "type": "securestring"
+            },
+            "clientIp": {
+              "type": "string",
+              "defaultValue": ""
+            },
+            "skuName": {
+              "type": "string"
+            },
+            "skuTier": {
+              "type": "string"
+            },
+            "version": {
+              "type": "string"
+            },
+            "storageSizeGb": {
+              "type": "int"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "resources": [
+            {
+              "type": "Microsoft.DBforPostgreSQL/flexibleServers",
+              "apiVersion": "2023-12-01-preview",
+              "name": "[parameters('serverName')]",
+              "location": "[parameters('location')]",
+              "tags": "[parameters('tags')]",
+              "sku": {
+                "name": "[parameters('skuName')]",
+                "tier": "[parameters('skuTier')]"
+              },
+              "properties": {
+                "administratorLogin": "[parameters('adminLogin')]",
+                "administratorLoginPassword": "[parameters('adminPassword')]",
+                "version": "[parameters('version')]",
+                "publicNetworkAccess": "Enabled",
+                "storage": {
+                  "storageSizeGB": "[parameters('storageSizeGb')]"
+                },
+                "highAvailability": {
+                  "mode": "Disabled"
+                },
+                "backup": {
+                  "backupRetentionDays": 7,
+                  "geoRedundantBackup": "Disabled"
+                }
+              }
+            },
+            {
+              "type": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules",
+              "apiVersion": "2023-12-01-preview",
+              "name": "[format('{0}/{1}', parameters('serverName'), 'AllowAzureServices')]",
+              "properties": {
+                "startIpAddress": "0.0.0.0",
+                "endIpAddress": "0.0.0.0"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]"
+              ]
+            },
+            {
+              "condition": "[not(empty(parameters('clientIp')))]",
+              "type": "Microsoft.DBforPostgreSQL/flexibleServers/firewallRules",
+              "apiVersion": "2023-12-01-preview",
+              "name": "[format('{0}/{1}', parameters('serverName'), format('AllowCurrentRunner-{0}', replace(parameters('clientIp'), '.', '-')))]",
+              "properties": {
+                "startIpAddress": "[parameters('clientIp')]",
+                "endIpAddress": "[parameters('clientIp')]"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]"
+              ]
+            },
+            {
+              "type": "Microsoft.DBforPostgreSQL/flexibleServers/databases",
+              "apiVersion": "2023-12-01-preview",
+              "name": "[format('{0}/{1}', parameters('serverName'), parameters('databaseName'))]",
+              "properties": {
+                "charset": "UTF8",
+                "collation": "en_US.utf8"
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.DBforPostgreSQL/flexibleServers', parameters('serverName'))]"
+              ]
+            }
+          ],
+          "outputs": {
+            "serverName": {
+              "type": "string",
+              "value": "[parameters('serverName')]"
+            },
+            "databaseName": {
+              "type": "string",
+              "value": "[parameters('databaseName')]"
+            },
+            "fullyQualifiedDomainName": {
+              "type": "string",
+              "value": "[format('{0}.postgres.database.azure.com', parameters('serverName'))]"
+            },
+            "connectionString": {
+              "type": "string",
+              "value": "[format('Server={0}.postgres.database.azure.com;Port=5432;Database={1};User Id={2};Password={3};Ssl Mode=Require;', parameters('serverName'), parameters('databaseName'), parameters('adminLogin'), parameters('adminPassword'))]"
+            }
+          }
+        }
+      }
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "appServicesDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "appServicePlanId": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicePlanDeploy'), '2025-04-01').outputs.id.value]"
+          },
+          "appServiceLinuxFxVersion": {
+            "value": "[parameters('appServiceLinuxFxVersion')]"
+          },
+          "environmentType": {
+            "value": "[parameters('environmentType')]"
+          },
+          "suffix": {
+            "value": "[variables('suffix')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          },
+          "appInsightsConnectionString": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appInsightsDeploy'), '2025-04-01').outputs.connectionString.value]"
+          },
+          "appInsightsResourceId": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appInsightsDeploy'), '2025-04-01').outputs.id.value]"
+          },
+          "appInsightsInstrumentationKey": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appInsightsDeploy'), '2025-04-01').outputs.instrumentationKey.value]"
+          },
+          "sqlConnectionString": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'sqlDeploy'), '2025-04-01').outputs.connectionString.value]"
+          },
+          "postgresConnectionString": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'postgresDeploy'), '2025-04-01').outputs.connectionString.value]"
+          },
+          "serviceBusConnectionString": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'serviceBusDeploy'), '2025-04-01').outputs.connectionString.value]"
+          },
+          "redisConnectionString": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'redisDeploy'), '2025-04-01').outputs.connectionString.value]"
+          },
+          "otlpHttpEndpoint": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'aspireDashboardDeploy'), '2025-04-01').outputs.otlpHttpEndpoint.value]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "3293862563743385029"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "appServicePlanId": {
+              "type": "string"
+            },
+            "appServiceLinuxFxVersion": {
+              "type": "string"
+            },
+            "environmentType": {
+              "type": "string"
+            },
+            "suffix": {
+              "type": "string"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            },
+            "appInsightsConnectionString": {
+              "type": "string"
+            },
+            "appInsightsResourceId": {
+              "type": "string"
+            },
+            "appInsightsInstrumentationKey": {
+              "type": "string"
+            },
+            "sqlConnectionString": {
+              "type": "string"
+            },
+            "postgresConnectionString": {
+              "type": "string"
+            },
+            "serviceBusConnectionString": {
+              "type": "string"
+            },
+            "redisConnectionString": {
+              "type": "string"
+            },
+            "otlpHttpEndpoint": {
+              "type": "string"
+            }
+          },
+          "variables": {
+            "sharedAppSettings": [
+              {
+                "name": "ASPNETCORE_ENVIRONMENT",
+                "value": "Development"
+              },
+              {
+                "name": "APPLICATIONINSIGHTS_CONNECTION_STRING",
+                "value": "[parameters('appInsightsConnectionString')]"
+              },
+              {
+                "name": "APPINSIGHTS_INSTRUMENTATIONKEY",
+                "value": "[parameters('appInsightsInstrumentationKey')]"
+              },
+              {
+                "name": "ApplicationInsightsAgent_EXTENSION_VERSION",
+                "value": "~3"
+              },
+              {
+                "name": "XDT_MicrosoftApplicationInsights_Mode",
+                "value": "recommended"
+              },
+              {
+                "name": "XDT_MicrosoftApplicationInsights_PreemptSdk",
+                "value": "disabled"
+              },
+              {
+                "name": "DiagnosticServices_EXTENSION_VERSION",
+                "value": "~3"
+              },
+              {
+                "name": "APPINSIGHTS_PROFILERFEATURE_VERSION",
+                "value": "1.0.0"
+              },
+              {
+                "name": "APPINSIGHTS_SNAPSHOTFEATURE_VERSION",
+                "value": "1.0.0"
+              },
+              {
+                "name": "Aspire__StackExchange__Redis__ConnectionString",
+                "value": "[parameters('redisConnectionString')]"
+              },
+              {
+                "name": "Aspire__Azure__Messaging__ServiceBus__ConnectionString",
+                "value": "[parameters('serviceBusConnectionString')]"
+              },
+              {
+                "name": "OTEL_EXPORTER_OTLP_PROTOCOL",
+                "value": "http/protobuf"
+              },
+              {
+                "name": "OTEL_EXPORTER_OTLP_ENDPOINT",
+                "value": "[parameters('otlpHttpEndpoint')]"
+              }
+            ],
+            "sqlDbAppSettings": [
+              {
+                "name": "Aspire__Microsoft__Data__SqlClient__ConnectionString",
+                "value": "[parameters('sqlConnectionString')]"
+              }
+            ],
+            "postgresDbAppSettings": [
+              {
+                "name": "Aspire__Npgsql__ConnectionString",
+                "value": "[parameters('postgresConnectionString')]"
+              }
+            ]
+          },
+          "resources": [
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[format('app-products-api-{0}-{1}', parameters('environmentType'), parameters('suffix'))]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('azd-service-name', 'products-api', 'hidden-link: /app-insights-resource-id', parameters('appInsightsResourceId')))]",
+              "kind": "app,linux",
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "sshEnabled": false,
+                "endToEndEncryptionEnabled": true,
+                "siteConfig": {
+                  "linuxFxVersion": "[parameters('appServiceLinuxFxVersion')]",
+                  "minTlsVersion": "1.3",
+                  "minTlsCipherSuite": "TLS_AES_256_GCM_SHA384",
+                  "scmMinTlsVersion": "1.3",
+                  "netFrameworkVersion": "",
+                  "ftpsState": "Disabled",
+                  "http20Enabled": true,
+                  "alwaysOn": true,
+                  "appSettings": "[concat(variables('sharedAppSettings'), variables('postgresDbAppSettings'))]"
+                }
+              }
+            },
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[format('app-shopping-api-{0}-{1}', parameters('environmentType'), parameters('suffix'))]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('azd-service-name', 'shopping-api', 'hidden-link: /app-insights-resource-id', parameters('appInsightsResourceId')))]",
+              "kind": "app,linux",
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "sshEnabled": false,
+                "endToEndEncryptionEnabled": true,
+                "siteConfig": {
+                  "linuxFxVersion": "[parameters('appServiceLinuxFxVersion')]",
+                  "minTlsVersion": "1.3",
+                  "minTlsCipherSuite": "TLS_AES_256_GCM_SHA384",
+                  "scmMinTlsVersion": "1.3",
+                  "netFrameworkVersion": "",
+                  "ftpsState": "Disabled",
+                  "http20Enabled": true,
+                  "alwaysOn": true,
+                  "appSettings": "[concat(variables('sharedAppSettings'), variables('sqlDbAppSettings'), createArray(createObject('name', 'ProductsApi__BaseAddress', 'value', format('https://{0}', reference(resourceId('Microsoft.Web/sites', format('app-products-api-{0}-{1}', parameters('environmentType'), parameters('suffix'))), '2023-12-01').defaultHostName))))]"
+                }
+              },
+              "dependsOn": [
+                "[resourceId('Microsoft.Web/sites', format('app-products-api-{0}-{1}', parameters('environmentType'), parameters('suffix')))]"
+              ]
+            },
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[format('app-products-outbox-relay-{0}-{1}', parameters('environmentType'), parameters('suffix'))]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('azd-service-name', 'products-outbox-relay', 'hidden-link: /app-insights-resource-id', parameters('appInsightsResourceId')))]",
+              "kind": "app,linux",
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "sshEnabled": false,
+                "endToEndEncryptionEnabled": true,
+                "siteConfig": {
+                  "linuxFxVersion": "[parameters('appServiceLinuxFxVersion')]",
+                  "minTlsVersion": "1.3",
+                  "minTlsCipherSuite": "TLS_AES_256_GCM_SHA384",
+                  "scmMinTlsVersion": "1.3",
+                  "netFrameworkVersion": "",
+                  "ftpsState": "Disabled",
+                  "http20Enabled": true,
+                  "alwaysOn": true,
+                  "appSettings": "[concat(variables('sharedAppSettings'), variables('postgresDbAppSettings'))]"
+                }
+              }
+            },
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[format('app-shopping-outbox-relay-{0}-{1}', parameters('environmentType'), parameters('suffix'))]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('azd-service-name', 'shopping-outbox-relay', 'hidden-link: /app-insights-resource-id', parameters('appInsightsResourceId')))]",
+              "kind": "app,linux",
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "sshEnabled": false,
+                "endToEndEncryptionEnabled": true,
+                "siteConfig": {
+                  "linuxFxVersion": "[parameters('appServiceLinuxFxVersion')]",
+                  "minTlsVersion": "1.3",
+                  "minTlsCipherSuite": "TLS_AES_256_GCM_SHA384",
+                  "scmMinTlsVersion": "1.3",
+                  "netFrameworkVersion": "",
+                  "ftpsState": "Disabled",
+                  "http20Enabled": true,
+                  "alwaysOn": true,
+                  "appSettings": "[concat(variables('sharedAppSettings'), variables('sqlDbAppSettings'))]"
+                }
+              }
+            },
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[format('app-products-subscribe-{0}-{1}', parameters('environmentType'), parameters('suffix'))]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('azd-service-name', 'products-subscribe', 'hidden-link: /app-insights-resource-id', parameters('appInsightsResourceId')))]",
+              "kind": "app,linux",
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "sshEnabled": false,
+                "endToEndEncryptionEnabled": true,
+                "siteConfig": {
+                  "linuxFxVersion": "[parameters('appServiceLinuxFxVersion')]",
+                  "minTlsVersion": "1.3",
+                  "minTlsCipherSuite": "TLS_AES_256_GCM_SHA384",
+                  "scmMinTlsVersion": "1.3",
+                  "netFrameworkVersion": "",
+                  "ftpsState": "Disabled",
+                  "http20Enabled": true,
+                  "alwaysOn": true,
+                  "appSettings": "[concat(variables('sharedAppSettings'), variables('postgresDbAppSettings'))]"
+                }
+              }
+            },
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[format('app-shopping-subscribe-{0}-{1}', parameters('environmentType'), parameters('suffix'))]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('azd-service-name', 'shopping-subscribe', 'hidden-link: /app-insights-resource-id', parameters('appInsightsResourceId')))]",
+              "kind": "app,linux",
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "sshEnabled": false,
+                "endToEndEncryptionEnabled": true,
+                "siteConfig": {
+                  "linuxFxVersion": "[parameters('appServiceLinuxFxVersion')]",
+                  "minTlsVersion": "1.3",
+                  "minTlsCipherSuite": "TLS_AES_256_GCM_SHA384",
+                  "scmMinTlsVersion": "1.3",
+                  "netFrameworkVersion": "",
+                  "ftpsState": "Disabled",
+                  "http20Enabled": true,
+                  "alwaysOn": true,
+                  "appSettings": "[concat(variables('sharedAppSettings'), variables('sqlDbAppSettings'))]"
+                }
+              }
+            }
+          ],
+          "outputs": {
+            "productsApiName": {
+              "type": "string",
+              "value": "[format('app-products-api-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+            },
+            "shoppingApiName": {
+              "type": "string",
+              "value": "[format('app-shopping-api-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+            },
+            "productsOutboxRelayName": {
+              "type": "string",
+              "value": "[format('app-products-outbox-relay-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+            },
+            "shoppingOutboxRelayName": {
+              "type": "string",
+              "value": "[format('app-shopping-outbox-relay-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+            },
+            "productsSubscribeName": {
+              "type": "string",
+              "value": "[format('app-products-subscribe-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+            },
+            "shoppingSubscribeName": {
+              "type": "string",
+              "value": "[format('app-shopping-subscribe-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+            }
+          }
+        }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Resources/deployments', 'appInsightsDeploy')]",
+        "[resourceId('Microsoft.Resources/deployments', 'appServicePlanDeploy')]",
+        "[resourceId('Microsoft.Resources/deployments', 'aspireDashboardDeploy')]",
+        "[resourceId('Microsoft.Resources/deployments', 'postgresDeploy')]",
+        "[resourceId('Microsoft.Resources/deployments', 'redisDeploy')]",
+        "[resourceId('Microsoft.Resources/deployments', 'serviceBusDeploy')]",
+        "[resourceId('Microsoft.Resources/deployments', 'sqlDeploy')]"
+      ]
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "apiVersion": "2025-04-01",
+      "name": "aspireDashboardDeploy",
+      "properties": {
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "mode": "Incremental",
+        "parameters": {
+          "location": {
+            "value": "[parameters('location')]"
+          },
+          "appServicePlanId": {
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicePlanDeploy'), '2025-04-01').outputs.id.value]"
+          },
+          "environmentType": {
+            "value": "[parameters('environmentType')]"
+          },
+          "suffix": {
+            "value": "[variables('suffix')]"
+          },
+          "tags": {
+            "value": "[variables('mergedTags')]"
+          }
+        },
+        "template": {
+          "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "metadata": {
+            "_generator": {
+              "name": "bicep",
+              "version": "0.43.8.12551",
+              "templateHash": "11051920204948211246"
+            }
+          },
+          "parameters": {
+            "location": {
+              "type": "string"
+            },
+            "appServicePlanId": {
+              "type": "string"
+            },
+            "environmentType": {
+              "type": "string"
+            },
+            "suffix": {
+              "type": "string"
+            },
+            "tags": {
+              "type": "object",
+              "defaultValue": {}
+            }
+          },
+          "variables": {
+            "dashboardName": "[format('app-aspire-dashboard-{0}-{1}', parameters('environmentType'), parameters('suffix'))]"
+          },
+          "resources": [
+            {
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2023-12-01",
+              "name": "[variables('dashboardName')]",
+              "location": "[parameters('location')]",
+              "tags": "[union(parameters('tags'), createObject('role', 'aspire-dashboard'))]",
+              "kind": "app,linux,container",
+              "properties": {
+                "serverFarmId": "[parameters('appServicePlanId')]",
+                "httpsOnly": true,
+                "siteConfig": {
+                  "linuxFxVersion": "DOCKER|mcr.microsoft.com/dotnet/aspire-dashboard:latest",
+                  "ftpsState": "Disabled",
+                  "alwaysOn": true,
+                  "http20Enabled": true,
+                  "appSettings": [
+                    {
+                      "name": "WEBSITES_PORT",
+                      "value": "18888"
+                    },
+                    {
+                      "name": "ASPNETCORE_URLS",
+                      "value": "http://0.0.0.0:18888"
+                    },
+                    {
+                      "name": "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL",
+                      "value": "http://0.0.0.0:18889"
+                    },
+                    {
+                      "name": "ASPIRE_DASHBOARD_OTLP_HTTP_ENDPOINT_URL",
+                      "value": "http://0.0.0.0:18888"
+                    },
+                    {
+                      "name": "DASHBOARD__UI__DISABLERESOURCEGRAPH",
+                      "value": "true"
+                    }
+                  ]
+                }
+              }
+            }
+          ],
+          "outputs": {
+            "id": {
+              "type": "string",
+              "value": "[resourceId('Microsoft.Web/sites', variables('dashboardName'))]"
+            },
+            "appName": {
+              "type": "string",
+              "value": "[variables('dashboardName')]"
+            },
+            "dashboardUri": {
+              "type": "string",
+              "value": "[format('https://{0}', reference(resourceId('Microsoft.Web/sites', variables('dashboardName')), '2023-12-01').defaultHostName)]"
+            },
+            "otlpGrpcEndpoint": {
+              "type": "string",
+              "value": "[format('https://{0}', reference(resourceId('Microsoft.Web/sites', variables('dashboardName')), '2023-12-01').defaultHostName)]"
+            },
+            "otlpHttpEndpoint": {
+              "type": "string",
+              "value": "[format('https://{0}', reference(resourceId('Microsoft.Web/sites', variables('dashboardName')), '2023-12-01').defaultHostName)]"
+            }
+          }
+        }
+      },
+      "dependsOn": [
+        "[resourceId('Microsoft.Resources/deployments', 'appServicePlanDeploy')]"
+      ]
+    }
+  ],
+  "outputs": {
+    "appServicePlanName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicePlanDeploy'), '2025-04-01').outputs.name.value]"
+    },
+    "appInsightsConnectionString": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appInsightsDeploy'), '2025-04-01').outputs.connectionString.value]"
+    },
+    "keyVaultName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVaultDeploy'), '2025-04-01').outputs.name.value]"
+    },
+    "serviceBusNamespaceName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'serviceBusDeploy'), '2025-04-01').outputs.namespaceName.value]"
+    },
+    "redisHostName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'redisDeploy'), '2025-04-01').outputs.hostName.value]"
+    },
+    "sqlServerName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'sqlDeploy'), '2025-04-01').outputs.serverName.value]"
+    },
+    "sqlDatabaseName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'sqlDeploy'), '2025-04-01').outputs.databaseName.value]"
+    },
+    "postgresServerName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'postgresDeploy'), '2025-04-01').outputs.serverName.value]"
+    },
+    "postgresDatabaseName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'postgresDeploy'), '2025-04-01').outputs.databaseName.value]"
+    },
+    "productsApiAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicesDeploy'), '2025-04-01').outputs.productsApiName.value]"
+    },
+    "shoppingApiAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicesDeploy'), '2025-04-01').outputs.shoppingApiName.value]"
+    },
+    "productsOutboxRelayAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicesDeploy'), '2025-04-01').outputs.productsOutboxRelayName.value]"
+    },
+    "shoppingOutboxRelayAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicesDeploy'), '2025-04-01').outputs.shoppingOutboxRelayName.value]"
+    },
+    "productsSubscribeAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicesDeploy'), '2025-04-01').outputs.productsSubscribeName.value]"
+    },
+    "shoppingSubscribeAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'appServicesDeploy'), '2025-04-01').outputs.shoppingSubscribeName.value]"
+    },
+    "aspireDashboardAppName": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'aspireDashboardDeploy'), '2025-04-01').outputs.appName.value]"
+    },
+    "aspireDashboardUri": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'aspireDashboardDeploy'), '2025-04-01').outputs.dashboardUri.value]"
+    },
+    "aspireDashboardOtlpGrpcEndpoint": {
+      "type": "string",
+      "value": "[reference(resourceId('Microsoft.Resources/deployments', 'aspireDashboardDeploy'), '2025-04-01').outputs.otlpGrpcEndpoint.value]"
+    }
+  }
+}
\ No newline at end of file
diff --git a/azure/infra/main.prod.bicepparam b/azure/infra/main.prod.bicepparam
new file mode 100644
index 00000000..ccd94aca
--- /dev/null
+++ b/azure/infra/main.prod.bicepparam
@@ -0,0 +1,42 @@
+using './main.bicep'
+
+// Placeholder only. Fill concrete production values during hardening.
+param environmentType = 'prod'
+param location = 'eastus'
+param nameSuffix = 'prod01'
+
+param tags = {
+  workload: 'coreex'
+  environment: 'prod'
+}
+
+// TODO: Replace with production-ready sizing.
+param appServicePlanSkuName = 'B1'
+param appServicePlanTier = 'Basic'
+param appServicePlanCapacity = 1
+param appServiceLinuxFxVersion = 'DOTNETCORE|${replace(readEnvironmentVariable('AZD_DOTNET_TARGET_FRAMEWORK', readEnvironmentVariable('DOTNET_TARGET_FRAMEWORK', 'net8.0')), 'net', '')}'
+
+// TODO: Confirm production messaging tier.
+param serviceBusSkuName = 'Standard'
+
+param sqlAdminLogin = 'coreexadmin'
+param sqlAdminPassword = readEnvironmentVariable('AZURE_SQL_ADMIN_PASSWORD')
+param sqlDatabaseName = 'coreexprod'
+
+// TODO: Replace with production-grade SQL settings.
+param sqlSkuName = 'GP_S_Gen5_1'
+param sqlTier = 'GeneralPurpose'
+param sqlMinCapacity = '0.5'
+param sqlAutoPauseDelay = 60
+
+param postgresAdminLogin = 'coreexpgadmin'
+param postgresAdminPassword = readEnvironmentVariable('AZURE_POSTGRES_ADMIN_PASSWORD', readEnvironmentVariable('AZURE_SQL_ADMIN_PASSWORD'))
+param postgresDatabaseName = 'coreexprod'
+param postgresSkuName = 'Standard_B1ms'
+param postgresSkuTier = 'Burstable'
+param postgresVersion = '16'
+param postgresStorageSizeGb = 32
+
+// TODO: Replace with production-grade cache tier.
+param redisSkuName = 'Balanced_B0'
+param redisHighAvailability = 'Enabled'
diff --git a/azure/infra/main.test.bicepparam b/azure/infra/main.test.bicepparam
new file mode 100644
index 00000000..7da3dd7e
--- /dev/null
+++ b/azure/infra/main.test.bicepparam
@@ -0,0 +1,42 @@
+using './main.bicep'
+
+// Placeholder only. Fill concrete test values when test environment is approved.
+param environmentType = 'test'
+param location = 'eastus'
+param nameSuffix = 'test01'
+
+param tags = {
+  workload: 'coreex'
+  environment: 'test'
+}
+
+// TODO: Confirm test sizing.
+param appServicePlanSkuName = 'B1'
+param appServicePlanTier = 'Basic'
+param appServicePlanCapacity = 1
+param appServiceLinuxFxVersion = 'DOTNETCORE|${replace(readEnvironmentVariable('AZD_DOTNET_TARGET_FRAMEWORK', readEnvironmentVariable('DOTNET_TARGET_FRAMEWORK', 'net8.0')), 'net', '')}'
+
+// TODO: Confirm messaging tier for test.
+param serviceBusSkuName = 'Standard'
+
+param sqlAdminLogin = 'coreexadmin'
+param sqlAdminPassword = readEnvironmentVariable('AZURE_SQL_ADMIN_PASSWORD')
+param sqlDatabaseName = 'coreextest'
+
+// TODO: Confirm SQL model for test.
+param sqlSkuName = 'GP_S_Gen5_1'
+param sqlTier = 'GeneralPurpose'
+param sqlMinCapacity = '0.5'
+param sqlAutoPauseDelay = 60
+
+param postgresAdminLogin = 'coreexpgadmin'
+param postgresAdminPassword = readEnvironmentVariable('AZURE_POSTGRES_ADMIN_PASSWORD', readEnvironmentVariable('AZURE_SQL_ADMIN_PASSWORD'))
+param postgresDatabaseName = 'coreextest'
+param postgresSkuName = 'Standard_B1ms'
+param postgresSkuTier = 'Burstable'
+param postgresVersion = '16'
+param postgresStorageSizeGb = 32
+
+// TODO: Confirm cache tier for test.
+param redisSkuName = 'Balanced_B0'
+param redisHighAvailability = 'Enabled'
diff --git a/azure/infra/modules/app-service-plan.bicep b/azure/infra/modules/app-service-plan.bicep
new file mode 100644
index 00000000..f7d41799
--- /dev/null
+++ b/azure/infra/modules/app-service-plan.bicep
@@ -0,0 +1,24 @@
+param location string
+param name string
+param skuName string
+param skuTier string
+param capacity int
+param tags object = {}
+
+resource plan 'Microsoft.Web/serverfarms@2023-12-01' = {
+  name: name
+  location: location
+  tags: tags
+  kind: 'linux'
+  sku: {
+    name: skuName
+    tier: skuTier
+    capacity: capacity
+  }
+  properties: {
+    reserved: true
+  }
+}
+
+output id string = plan.id
+output name string = plan.name
diff --git a/azure/infra/modules/app-services.bicep b/azure/infra/modules/app-services.bicep
new file mode 100644
index 00000000..06085256
--- /dev/null
+++ b/azure/infra/modules/app-services.bicep
@@ -0,0 +1,276 @@
+param location string
+param appServicePlanId string
+param appServiceLinuxFxVersion string
+param environmentType string
+param suffix string
+param tags object = {}
+param appInsightsConnectionString string
+param appInsightsResourceId string
+param appInsightsInstrumentationKey string
+param sqlConnectionString string
+param postgresConnectionString string
+param serviceBusConnectionString string
+param redisConnectionString string
+param otlpHttpEndpoint string
+
+var sharedAppSettings = [
+  {
+    name: 'ASPNETCORE_ENVIRONMENT'
+    value: 'Development'
+  }
+  {
+    name: 'APPLICATIONINSIGHTS_CONNECTION_STRING'
+    value: appInsightsConnectionString
+  }
+  {
+    name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
+    value: appInsightsInstrumentationKey
+  }
+  {
+    name: 'ApplicationInsightsAgent_EXTENSION_VERSION'
+    value: '~3'
+  }
+  {
+    name: 'XDT_MicrosoftApplicationInsights_Mode'
+    value: 'recommended'
+  }
+  {
+    name: 'XDT_MicrosoftApplicationInsights_PreemptSdk'
+    value: 'disabled'
+  }
+  {
+    name: 'DiagnosticServices_EXTENSION_VERSION'
+    value: '~3'
+  }
+  {
+    name: 'APPINSIGHTS_PROFILERFEATURE_VERSION'
+    value: '1.0.0'
+  }
+  {
+    name: 'APPINSIGHTS_SNAPSHOTFEATURE_VERSION'
+    value: '1.0.0'
+  }
+  {
+    name: 'Aspire__StackExchange__Redis__ConnectionString'
+    value: redisConnectionString
+  }
+  {
+    name: 'Aspire__Azure__Messaging__ServiceBus__ConnectionString'
+    value: serviceBusConnectionString
+  }
+  {
+    name: 'OTEL_EXPORTER_OTLP_PROTOCOL'
+    value: 'http/protobuf'
+  }
+  {
+    name: 'OTEL_EXPORTER_OTLP_ENDPOINT'
+    value: otlpHttpEndpoint
+  }
+]
+
+var sqlDbAppSettings = [
+  {
+    name: 'Aspire__Microsoft__Data__SqlClient__ConnectionString'
+    value: sqlConnectionString
+  }
+]
+
+var postgresDbAppSettings = [
+  {
+    name: 'Aspire__Npgsql__ConnectionString'
+    value: postgresConnectionString
+  }
+]
+
+resource productsApi 'Microsoft.Web/sites@2023-12-01' = {
+  name: 'app-products-api-${environmentType}-${suffix}'
+  location: location
+  tags: union(tags, {
+    'azd-service-name': 'products-api'
+    'hidden-link: /app-insights-resource-id': appInsightsResourceId
+  })
+  kind: 'app,linux'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    sshEnabled: false
+    endToEndEncryptionEnabled: true
+    siteConfig: {
+      linuxFxVersion: appServiceLinuxFxVersion
+      minTlsVersion: '1.3'
+      minTlsCipherSuite: 'TLS_AES_256_GCM_SHA384'
+      scmMinTlsVersion: '1.3'
+      netFrameworkVersion: ''
+      ftpsState: 'Disabled'
+      http20Enabled: true
+      alwaysOn: true
+      appSettings: concat(sharedAppSettings, postgresDbAppSettings)
+    }
+  }
+}
+
+resource shoppingApi 'Microsoft.Web/sites@2023-12-01' = {
+  name: 'app-shopping-api-${environmentType}-${suffix}'
+  location: location
+  tags: union(tags, {
+    'azd-service-name': 'shopping-api'
+    'hidden-link: /app-insights-resource-id': appInsightsResourceId
+  })
+  kind: 'app,linux'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    sshEnabled: false
+    endToEndEncryptionEnabled: true
+    siteConfig: {
+      linuxFxVersion: appServiceLinuxFxVersion
+      minTlsVersion: '1.3'
+      minTlsCipherSuite: 'TLS_AES_256_GCM_SHA384'
+      scmMinTlsVersion: '1.3'
+      netFrameworkVersion: ''
+      ftpsState: 'Disabled'
+      http20Enabled: true
+      alwaysOn: true
+      appSettings: concat(sharedAppSettings, sqlDbAppSettings, [
+        {
+          name: 'ProductsApi__BaseAddress'
+          value: 'https://${productsApi.properties.defaultHostName}'
+        }
+      ])
+    }
+  }
+}
+
+resource productsOutboxRelay 'Microsoft.Web/sites@2023-12-01' = {
+  name: 'app-products-outbox-relay-${environmentType}-${suffix}'
+  location: location
+  tags: union(tags, {
+    'azd-service-name': 'products-outbox-relay'
+    'hidden-link: /app-insights-resource-id': appInsightsResourceId
+  })
+  kind: 'app,linux'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    sshEnabled: false
+    endToEndEncryptionEnabled: true
+    siteConfig: {
+      linuxFxVersion: appServiceLinuxFxVersion
+      minTlsVersion: '1.3'
+      minTlsCipherSuite: 'TLS_AES_256_GCM_SHA384'
+      scmMinTlsVersion: '1.3'
+      netFrameworkVersion: ''
+      ftpsState: 'Disabled'
+      http20Enabled: true
+      alwaysOn: true
+      appSettings: concat(sharedAppSettings, postgresDbAppSettings)
+    }
+  }
+}
+
+resource shoppingOutboxRelay 'Microsoft.Web/sites@2023-12-01' = {
+  name: 'app-shopping-outbox-relay-${environmentType}-${suffix}'
+  location: location
+  tags: union(tags, {
+    'azd-service-name': 'shopping-outbox-relay'
+    'hidden-link: /app-insights-resource-id': appInsightsResourceId
+  })
+  kind: 'app,linux'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    sshEnabled: false
+    endToEndEncryptionEnabled: true
+    siteConfig: {
+      linuxFxVersion: appServiceLinuxFxVersion
+      minTlsVersion: '1.3'
+      minTlsCipherSuite: 'TLS_AES_256_GCM_SHA384'
+      scmMinTlsVersion: '1.3'
+      netFrameworkVersion: ''
+      ftpsState: 'Disabled'
+      http20Enabled: true
+      alwaysOn: true
+      appSettings: concat(sharedAppSettings, sqlDbAppSettings)
+    }
+  }
+}
+
+resource productsSubscribe 'Microsoft.Web/sites@2023-12-01' = {
+  name: 'app-products-subscribe-${environmentType}-${suffix}'
+  location: location
+  tags: union(tags, {
+    'azd-service-name': 'products-subscribe'
+    'hidden-link: /app-insights-resource-id': appInsightsResourceId
+  })
+  kind: 'app,linux'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    sshEnabled: false
+    endToEndEncryptionEnabled: true
+    siteConfig: {
+      linuxFxVersion: appServiceLinuxFxVersion
+      minTlsVersion: '1.3'
+      minTlsCipherSuite: 'TLS_AES_256_GCM_SHA384'
+      scmMinTlsVersion: '1.3'
+      netFrameworkVersion: ''
+      ftpsState: 'Disabled'
+      http20Enabled: true
+      alwaysOn: true
+      appSettings: concat(sharedAppSettings, postgresDbAppSettings)
+    }
+  }
+}
+
+resource shoppingSubscribe 'Microsoft.Web/sites@2023-12-01' = {
+  name: 'app-shopping-subscribe-${environmentType}-${suffix}'
+  location: location
+  tags: union(tags, {
+    'azd-service-name': 'shopping-subscribe'
+    'hidden-link: /app-insights-resource-id': appInsightsResourceId
+  })
+  kind: 'app,linux'
+  identity: {
+    type: 'SystemAssigned'
+  }
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    sshEnabled: false
+    endToEndEncryptionEnabled: true
+    siteConfig: {
+      linuxFxVersion: appServiceLinuxFxVersion
+      minTlsVersion: '1.3'
+      minTlsCipherSuite: 'TLS_AES_256_GCM_SHA384'
+      scmMinTlsVersion: '1.3'
+      netFrameworkVersion: ''
+      ftpsState: 'Disabled'
+      http20Enabled: true
+      alwaysOn: true
+      appSettings: concat(sharedAppSettings, sqlDbAppSettings)
+    }
+  }
+}
+
+output productsApiName string = productsApi.name
+output shoppingApiName string = shoppingApi.name
+output productsOutboxRelayName string = productsOutboxRelay.name
+output shoppingOutboxRelayName string = shoppingOutboxRelay.name
+output productsSubscribeName string = productsSubscribe.name
+output shoppingSubscribeName string = shoppingSubscribe.name
+
diff --git a/azure/infra/modules/application-insights.bicep b/azure/infra/modules/application-insights.bicep
new file mode 100644
index 00000000..53b4017d
--- /dev/null
+++ b/azure/infra/modules/application-insights.bicep
@@ -0,0 +1,20 @@
+param location string
+param name string
+param tags object = {}
+
+resource appInsights 'Microsoft.Insights/components@2020-02-02' = {
+  name: name
+  location: location
+  tags: tags
+  kind: 'web'
+  properties: {
+    Application_Type: 'web'
+    Flow_Type: 'Bluefield'
+    Request_Source: 'rest'
+  }
+}
+
+output name string = appInsights.name
+output connectionString string = appInsights.properties.ConnectionString
+output id string = appInsights.id
+output instrumentationKey string = appInsights.properties.InstrumentationKey
diff --git a/azure/infra/modules/aspire-dashboard.bicep b/azure/infra/modules/aspire-dashboard.bicep
new file mode 100644
index 00000000..f4d8c1d7
--- /dev/null
+++ b/azure/infra/modules/aspire-dashboard.bicep
@@ -0,0 +1,54 @@
+param location string
+param appServicePlanId string
+param environmentType string
+param suffix string
+param tags object = {}
+
+var dashboardName = 'app-aspire-dashboard-${environmentType}-${suffix}'
+
+resource aspireDashboard 'Microsoft.Web/sites@2023-12-01' = {
+  name: dashboardName
+  location: location
+  tags: union(tags, {
+    role: 'aspire-dashboard'
+  })
+  kind: 'app,linux,container'
+  properties: {
+    serverFarmId: appServicePlanId
+    httpsOnly: true
+    siteConfig: {
+      linuxFxVersion: 'DOCKER|mcr.microsoft.com/dotnet/aspire-dashboard:latest'
+      ftpsState: 'Disabled'
+      alwaysOn: true
+      http20Enabled: true
+      appSettings: [
+        {
+          name: 'WEBSITES_PORT'
+          value: '18888'
+        }
+        {
+          name: 'ASPNETCORE_URLS'
+          value: 'http://0.0.0.0:18888'
+        }
+        {
+          name: 'ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL'
+          value: 'http://0.0.0.0:18889'
+        }
+        {
+          name: 'ASPIRE_DASHBOARD_OTLP_HTTP_ENDPOINT_URL'
+          value: 'http://0.0.0.0:18888'
+        }
+        {
+          name: 'DASHBOARD__UI__DISABLERESOURCEGRAPH'
+          value: 'true'
+        }
+      ]
+    }
+  }
+}
+
+output id string = aspireDashboard.id
+output appName string = aspireDashboard.name
+output dashboardUri string = 'https://${aspireDashboard.properties.defaultHostName}'
+output otlpGrpcEndpoint string = 'https://${aspireDashboard.properties.defaultHostName}'
+output otlpHttpEndpoint string = 'https://${aspireDashboard.properties.defaultHostName}'
diff --git a/azure/infra/modules/database.bicep b/azure/infra/modules/database.bicep
new file mode 100644
index 00000000..b6ba8a99
--- /dev/null
+++ b/azure/infra/modules/database.bicep
@@ -0,0 +1,64 @@
+param location string
+param serverName string
+param databaseName string
+param adminLogin string
+@secure()
+param adminPassword string
+param clientIp string = ''
+param skuName string
+param skuTier string
+param minCapacity string
+param autoPauseDelay int
+param tags object = {}
+
+resource server 'Microsoft.Sql/servers@2023-08-01-preview' = {
+  name: serverName
+  location: location
+  tags: tags
+  properties: {
+    administratorLogin: adminLogin
+    administratorLoginPassword: adminPassword
+    version: '12.0'
+    publicNetworkAccess: 'Enabled'
+    minimalTlsVersion: '1.2'
+  }
+}
+
+resource azureFirewallRule 'Microsoft.Sql/servers/firewallRules@2023-08-01-preview' = {
+  parent: server
+  name: 'AllowAzureServices'
+  properties: {
+    startIpAddress: '0.0.0.0'
+    endIpAddress: '0.0.0.0'
+  }
+}
+
+resource clientFirewallRule 'Microsoft.Sql/servers/firewallRules@2023-08-01-preview' = if (!empty(clientIp)) {
+  parent: server
+  name: 'AllowCurrentRunner-${replace(clientIp, '.', '-')}'
+  properties: {
+    startIpAddress: clientIp
+    endIpAddress: clientIp
+  }
+}
+
+resource db 'Microsoft.Sql/servers/databases@2023-08-01-preview' = {
+  parent: server
+  name: databaseName
+  location: location
+  tags: tags
+  sku: {
+    name: skuName
+    tier: skuTier
+  }
+  properties: {
+    collation: 'SQL_Latin1_General_CP1_CI_AS'
+    minCapacity: json(minCapacity)
+    autoPauseDelay: autoPauseDelay
+  }
+}
+
+output serverName string = server.name
+output databaseName string = db.name
+output fullyQualifiedDomainName string = server.properties.fullyQualifiedDomainName
+output connectionString string = 'Data Source=tcp:${server.properties.fullyQualifiedDomainName},1433;Initial Catalog=${databaseName};User id=${adminLogin};Password=${adminPassword};Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;'
diff --git a/azure/infra/modules/key-vault.bicep b/azure/infra/modules/key-vault.bicep
new file mode 100644
index 00000000..07a2407a
--- /dev/null
+++ b/azure/infra/modules/key-vault.bicep
@@ -0,0 +1,25 @@
+param location string
+param name string
+param tags object = {}
+
+resource vault 'Microsoft.KeyVault/vaults@2023-07-01' = {
+  name: name
+  location: location
+  tags: tags
+  properties: {
+    sku: {
+      family: 'A'
+      name: 'standard'
+    }
+    tenantId: subscription().tenantId
+    enableRbacAuthorization: true
+    enabledForDeployment: true
+    enabledForTemplateDeployment: true
+    enabledForDiskEncryption: false
+    publicNetworkAccess: 'Enabled'
+  }
+}
+
+output id string = vault.id
+output name string = vault.name
+output vaultUri string = vault.properties.vaultUri
diff --git a/azure/infra/modules/postgres-database.bicep b/azure/infra/modules/postgres-database.bicep
new file mode 100644
index 00000000..a7a4e8a1
--- /dev/null
+++ b/azure/infra/modules/postgres-database.bicep
@@ -0,0 +1,70 @@
+param location string
+param serverName string
+param databaseName string
+param adminLogin string
+@secure()
+param adminPassword string
+param clientIp string = ''
+param skuName string
+param skuTier string
+param version string
+param storageSizeGb int
+param tags object = {}
+
+resource server 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12-01-preview' = {
+  name: serverName
+  location: location
+  tags: tags
+  sku: {
+    name: skuName
+    tier: skuTier
+  }
+  properties: {
+    administratorLogin: adminLogin
+    administratorLoginPassword: adminPassword
+    version: version
+    publicNetworkAccess: 'Enabled'
+    storage: {
+      storageSizeGB: storageSizeGb
+    }
+    highAvailability: {
+      mode: 'Disabled'
+    }
+    backup: {
+      backupRetentionDays: 7
+      geoRedundantBackup: 'Disabled'
+    }
+  }
+}
+
+resource azureFirewallRule 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2023-12-01-preview' = {
+  parent: server
+  name: 'AllowAzureServices'
+  properties: {
+    startIpAddress: '0.0.0.0'
+    endIpAddress: '0.0.0.0'
+  }
+}
+
+resource clientFirewallRule 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2023-12-01-preview' = if (!empty(clientIp)) {
+  parent: server
+  name: 'AllowCurrentRunner-${replace(clientIp, '.', '-')}'
+  properties: {
+    startIpAddress: clientIp
+    endIpAddress: clientIp
+  }
+}
+
+resource db 'Microsoft.DBforPostgreSQL/flexibleServers/databases@2023-12-01-preview' = {
+  parent: server
+  name: databaseName
+  properties: {
+    charset: 'UTF8'
+    collation: 'en_US.utf8'
+  }
+}
+
+output serverName string = server.name
+output databaseName string = db.name
+output fullyQualifiedDomainName string = '${server.name}.postgres.database.azure.com'
+output connectionString string = 'Server=${server.name}.postgres.database.azure.com;Port=5432;Database=${databaseName};User Id=${adminLogin};Password=${adminPassword};Ssl Mode=Require;'
diff --git a/azure/infra/modules/redis.bicep b/azure/infra/modules/redis.bicep
new file mode 100644
index 00000000..51b9e6b4
--- /dev/null
+++ b/azure/infra/modules/redis.bicep
@@ -0,0 +1,41 @@
+param location string
+param cacheName string
+param skuName string
+@allowed([
+  'Enabled'
+  'Disabled'
+])
+param highAvailability string
+param tags object = {}
+
+resource redis 'Microsoft.Cache/redisEnterprise@2025-07-01' = {
+  name: cacheName
+  location: location
+  tags: tags
+  sku: {
+    name: skuName
+  }
+  properties: {
+    highAvailability: highAvailability
+    minimumTlsVersion: '1.2'
+    publicNetworkAccess: 'Enabled'
+    encryption: {}
+  }
+}
+
+resource defaultDatabase 'Microsoft.Cache/redisEnterprise/databases@2025-04-01' = {
+  parent: redis
+  name: 'default'
+  properties: {
+    clientProtocol: 'Encrypted'
+    clusteringPolicy: 'OSSCluster'
+    evictionPolicy: 'VolatileLRU'
+    modules: []
+    port: 10000
+  }
+}
+
+output id string = redis.id
+output name string = redis.name
+output hostName string = redis.properties.hostName
+output connectionString string = '${redis.properties.hostName}:10000,password=${listKeys(defaultDatabase.id, defaultDatabase.apiVersion).primaryKey},ssl=True,abortConnect=False'
diff --git a/azure/infra/modules/service-bus.bicep b/azure/infra/modules/service-bus.bicep
new file mode 100644
index 00000000..45627803
--- /dev/null
+++ b/azure/infra/modules/service-bus.bicep
@@ -0,0 +1,69 @@
+param location string
+param namespaceName string
+param skuName string
+param tags object = {}
+
+resource ns 'Microsoft.ServiceBus/namespaces@2023-01-01-preview' = {
+  name: namespaceName
+  location: location
+  tags: tags
+  sku: {
+    name: skuName
+    tier: skuName
+  }
+  properties: {
+    publicNetworkAccess: 'Enabled'
+    minimumTlsVersion: '1.2'
+  }
+}
+
+resource topic 'Microsoft.ServiceBus/namespaces/topics@2023-01-01-preview' = {
+  parent: ns
+  name: 'contoso'
+  properties: {
+    defaultMessageTimeToLive: 'P14D'
+    requiresDuplicateDetection: true
+    duplicateDetectionHistoryTimeWindow: 'PT10M'
+  }
+}
+
+resource productsSubscription 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2023-01-01-preview' = {
+  parent: topic
+  name: 'products'
+  properties: {
+    requiresSession: true
+    maxDeliveryCount: 10
+    lockDuration: 'PT5M'
+    deadLetteringOnMessageExpiration: true
+  }
+}
+
+resource shoppingSubscription 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2023-01-01-preview' = {
+  parent: topic
+  name: 'shopping'
+  properties: {
+    requiresSession: true
+    maxDeliveryCount: 10
+    lockDuration: 'PT5M'
+    deadLetteringOnMessageExpiration: true
+  }
+}
+
+resource authRule 'Microsoft.ServiceBus/namespaces/AuthorizationRules@2023-01-01-preview' = {
+  parent: ns
+  name: 'app'
+  properties: {
+    rights: [
+      'Listen'
+      'Send'
+      'Manage'
+    ]
+  }
+}
+
+output namespaceName string = ns.name
+output id string = ns.id
+output topicName string = topic.name
+output productsSubscriptionName string = productsSubscription.name
+output shoppingSubscriptionName string = shoppingSubscription.name
+output connectionString string = listKeys(authRule.id, authRule.apiVersion).primaryConnectionString
diff --git a/azure/infra/scripts/store-secrets.ps1 b/azure/infra/scripts/store-secrets.ps1
new file mode 100644
index 00000000..132e497d
--- /dev/null
+++ b/azure/infra/scripts/store-secrets.ps1
@@ -0,0 +1,99 @@
+# Populates Key Vault with connection secrets needed for E2E testing.
+# Runs automatically as a postprovision hook via azure.yaml.
+$ErrorActionPreference = 'Stop'
+
+$rg = $env:AZURE_RESOURCE_GROUP
+if ([string]::IsNullOrWhiteSpace($rg)) {
+    throw 'AZURE_RESOURCE_GROUP is not set.'
+}
+
+$sqlPassword = $env:AZURE_SQL_ADMIN_PASSWORD
+if ([string]::IsNullOrWhiteSpace($sqlPassword)) {
+    throw 'AZURE_SQL_ADMIN_PASSWORD is not set.'
+}
+
+$postgresPassword = if ([string]::IsNullOrWhiteSpace($env:AZURE_POSTGRES_ADMIN_PASSWORD)) { $sqlPassword } else { $env:AZURE_POSTGRES_ADMIN_PASSWORD }
+
+$sqlServer   = if ([string]::IsNullOrWhiteSpace($env:AZURE_SQL_SERVER)) { (azd env get-value sqlServerName).Trim() } else { $env:AZURE_SQL_SERVER }
+$sqlLogin    = if ([string]::IsNullOrWhiteSpace($env:AZURE_SQL_ADMIN_LOGIN)) { 'coreexadmin' } else { $env:AZURE_SQL_ADMIN_LOGIN }
+$sqlDb       = if ([string]::IsNullOrWhiteSpace($env:AZURE_SQL_DB_NAME)) { (azd env get-value sqlDatabaseName).Trim() } else { $env:AZURE_SQL_DB_NAME }
+$postgresServer = if ([string]::IsNullOrWhiteSpace($env:AZURE_POSTGRES_SERVER)) { (azd env get-value postgresServerName).Trim() } else { $env:AZURE_POSTGRES_SERVER }
+$postgresLogin  = if ([string]::IsNullOrWhiteSpace($env:AZURE_POSTGRES_ADMIN_LOGIN)) { 'coreexpgadmin' } else { $env:AZURE_POSTGRES_ADMIN_LOGIN }
+$postgresDb     = if ([string]::IsNullOrWhiteSpace($env:AZURE_POSTGRES_DB_NAME)) { (azd env get-value postgresDatabaseName).Trim() } else { $env:AZURE_POSTGRES_DB_NAME }
+$keyVaultReferenceWaitSeconds = if ([string]::IsNullOrWhiteSpace($env:AZD_KEYVAULT_REFERENCE_WAIT_SECONDS)) { 60 } else { [int]$env:AZD_KEYVAULT_REFERENCE_WAIT_SECONDS }
+
+if ([string]::IsNullOrWhiteSpace($sqlServer)) {
+    throw 'AZURE_SQL_SERVER (or azd output sqlServerName) is not set.'
+}
+
+if ([string]::IsNullOrWhiteSpace($sqlDb)) {
+    throw 'AZURE_SQL_DB_NAME (or azd output sqlDatabaseName) is not set.'
+}
+
+if ([string]::IsNullOrWhiteSpace($postgresServer)) {
+    throw 'AZURE_POSTGRES_SERVER (or azd output postgresServerName) is not set.'
+}
+
+if ([string]::IsNullOrWhiteSpace($postgresDb)) {
+    throw 'AZURE_POSTGRES_DB_NAME (or azd output postgresDatabaseName) is not set.'
+}
+
+Write-Host "Locating Key Vault in resource group '$rg'..."
+$kvName = (az keyvault list --resource-group $rg --query '[0].name' -o tsv)
+$kvId   = (az keyvault show --name $kvName --resource-group $rg --query id -o tsv)
+
+# Grant the current signed-in user Key Vault Administrator so secrets can be managed without manual IAM steps.
+# Silently skipped when running as a service principal that does not support az ad signed-in-user.
+try {
+    $currentOid = (az ad signed-in-user show --query id -o tsv 2>$null)
+    if (-not [string]::IsNullOrWhiteSpace($currentOid)) {
+        Write-Host "Assigning Key Vault Administrator role to current user..."
+        az role assignment create --role 'Key Vault Administrator' --assignee $currentOid --scope $kvId --only-show-errors 2>$null
+        # Allow RBAC propagation before writing secrets.
+        Start-Sleep -Seconds 15
+    }
+}
+catch {
+    # Non-fatal: user may already have the role assigned.
+}
+
+Write-Host 'Storing sql-admin-password...'
+az keyvault secret set --vault-name $kvName --name 'sql-admin-password' --value $sqlPassword --output none
+
+Write-Host 'Storing postgres-admin-password...'
+az keyvault secret set --vault-name $kvName --name 'postgres-admin-password' --value $postgresPassword --output none
+
+Write-Host 'Building SQL Server connection string...'
+$sqlConn   = "Server=tcp:${sqlServer}.database.windows.net,1433;Database=${sqlDb};User Id=${sqlLogin};Password=${sqlPassword};Encrypt=true;TrustServerCertificate=false;"
+
+Write-Host 'Storing sql-connection-string...'
+az keyvault secret set --vault-name $kvName --name 'sql-connection-string' --value $sqlConn --output none
+
+Write-Host 'Building Postgres connection string...'
+$postgresConn   = "Server=${postgresServer}.postgres.database.azure.com;Port=5432;Database=${postgresDb};User Id=${postgresLogin};Password=${postgresPassword};Ssl Mode=Require;"
+
+Write-Host 'Storing postgres-connection-string...'
+az keyvault secret set --vault-name $kvName --name 'postgres-connection-string' --value $postgresConn --output none
+
+Write-Host 'Locating Service Bus namespace...'
+$sbName = (az servicebus namespace list --resource-group $rg --query '[0].name' -o tsv)
+$sbConn = (az servicebus namespace authorization-rule keys list `
+    --resource-group $rg `
+    --namespace-name $sbName `
+    --name 'app' `
+    --query primaryConnectionString -o tsv)
+
+Write-Host 'Storing service-bus-connection-string...'
+az keyvault secret set --vault-name $kvName --name 'service-bus-connection-string' --value $sbConn --output none
+
+Write-Host "Secrets stored successfully in Key Vault '$kvName':"
+Write-Host "  - sql-admin-password"
+Write-Host "  - postgres-admin-password"
+Write-Host "  - sql-connection-string"
+Write-Host "  - postgres-connection-string"
+Write-Host "  - service-bus-connection-string"
+
+if ($keyVaultReferenceWaitSeconds -gt 0) {
+    Write-Host "Waiting $keyVaultReferenceWaitSeconds seconds for Key Vault reference RBAC propagation before deploy."
+    Start-Sleep -Seconds $keyVaultReferenceWaitSeconds
+}
diff --git a/azure/infra/scripts/store-secrets.sh b/azure/infra/scripts/store-secrets.sh
new file mode 100755
index 00000000..8ebcb5b2
--- /dev/null
+++ b/azure/infra/scripts/store-secrets.sh
@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+# Populates Key Vault with connection secrets needed for E2E testing.
+# Runs automatically as a postprovision hook via azure.yaml.
+set -euo pipefail
+
+rg="${AZURE_RESOURCE_GROUP:?AZURE_RESOURCE_GROUP is not set}"
+sql_password="${AZURE_SQL_ADMIN_PASSWORD:?AZURE_SQL_ADMIN_PASSWORD is not set}"
+postgres_password="${AZURE_POSTGRES_ADMIN_PASSWORD:-${AZURE_SQL_ADMIN_PASSWORD}}"
+sql_server="${AZURE_SQL_SERVER:-${sqlServerName:-}}"
+sql_login="${AZURE_SQL_ADMIN_LOGIN:-coreexadmin}"
+sql_db="${AZURE_SQL_DB_NAME:-${sqlDatabaseName:-}}"
+postgres_server="${AZURE_POSTGRES_SERVER:-${postgresServerName:-}}"
+postgres_login="${AZURE_POSTGRES_ADMIN_LOGIN:-coreexpgadmin}"
+postgres_db="${AZURE_POSTGRES_DB_NAME:-${postgresDatabaseName:-}}"
+keyvault_reference_wait_seconds="${AZD_KEYVAULT_REFERENCE_WAIT_SECONDS:-60}"
+
+if [[ -z "${sql_server}" ]]; then
+  echo "AZURE_SQL_SERVER (or azd output sqlServerName) is not set." >&2
+  exit 1
+fi
+
+if [[ -z "${sql_db}" ]]; then
+  echo "AZURE_SQL_DB_NAME (or azd output sqlDatabaseName) is not set." >&2
+  exit 1
+fi
+
+if [[ -z "${postgres_server}" ]]; then
+  echo "AZURE_POSTGRES_SERVER (or azd output postgresServerName) is not set." >&2
+  exit 1
+fi
+
+if [[ -z "${postgres_db}" ]]; then
+  echo "AZURE_POSTGRES_DB_NAME (or azd output postgresDatabaseName) is not set." >&2
+  exit 1
+fi
+
+echo "Locating Key Vault in resource group '${rg}'..."
+kv_name=$(az keyvault list --resource-group "${rg}" --query "[0].name" -o tsv)
+kv_id=$(az keyvault show --name "${kv_name}" --resource-group "${rg}" --query id -o tsv)
+
+# Grant the current signed-in user Key Vault Administrator so secrets can be managed without manual IAM steps.
+# Silently skipped when running as a service principal that does not support az ad signed-in-user.
+current_oid=$(az ad signed-in-user show --query id -o tsv 2>/dev/null || true)
+if [[ -n "${current_oid}" ]]; then
+  echo "Assigning Key Vault Administrator role to current user..."
+  az role assignment create \
+    --role "Key Vault Administrator" \
+    --assignee "${current_oid}" \
+    --scope "${kv_id}" \
+    --only-show-errors 2>/dev/null || true
+  # Allow RBAC propagation before writing secrets.
+  sleep 15
+fi
+
+echo "Storing sql-admin-password..."
+az keyvault secret set \
+  --vault-name "${kv_name}" \
+  --name "sql-admin-password" \
+  --value "${sql_password}" \
+  --output none
+
+echo "Storing postgres-admin-password..."
+az keyvault secret set \
+  --vault-name "${kv_name}" \
+  --name "postgres-admin-password" \
+  --value "${postgres_password}" \
+  --output none
+
+echo "Building SQL Server connection string..."
+sql_conn="Server=tcp:${sql_server}.database.windows.net,1433;Database=${sql_db};User Id=${sql_login};Password=${sql_password};Encrypt=true;TrustServerCertificate=false;"
+
+echo "Storing sql-connection-string..."
+az keyvault secret set \
+  --vault-name "${kv_name}" \
+  --name "sql-connection-string" \
+  --value "${sql_conn}" \
+  --output none
+
+echo "Building Postgres connection string..."
+postgres_conn="Server=${postgres_server}.postgres.database.azure.com;Port=5432;Database=${postgres_db};User Id=${postgres_login};Password=${postgres_password};Ssl Mode=Require;"
+
+echo "Storing postgres-connection-string..."
+az keyvault secret set \
+  --vault-name "${kv_name}" \
+  --name "postgres-connection-string" \
+  --value "${postgres_conn}" \
+  --output none
+
+echo "Locating Service Bus namespace..."
+sb_name=$(az servicebus namespace list --resource-group "${rg}" --query "[0].name" -o tsv)
+sb_conn=$(az servicebus namespace authorization-rule keys list \
+  --resource-group "${rg}" \
+  --namespace-name "${sb_name}" \
+  --name "app" \
+  --query primaryConnectionString -o tsv)
+
+echo "Storing service-bus-connection-string..."
+az keyvault secret set \
+  --vault-name "${kv_name}" \
+  --name "service-bus-connection-string" \
+  --value "${sb_conn}" \
+  --output none
+
+echo "Secrets stored successfully in Key Vault '${kv_name}':"
+echo "  - sql-admin-password"
+echo "  - postgres-admin-password"
+echo "  - sql-connection-string"
+echo "  - postgres-connection-string"
+echo "  - service-bus-connection-string"
+
+if [[ "${keyvault_reference_wait_seconds}" =~ ^[0-9]+$ ]] && (( keyvault_reference_wait_seconds > 0 )); then
+  echo "Waiting ${keyvault_reference_wait_seconds}s for Key Vault reference RBAC propagation before deploy."
+  sleep "${keyvault_reference_wait_seconds}"
+fi
diff --git a/azure/infra/scripts/use-dev-params.ps1 b/azure/infra/scripts/use-dev-params.ps1
new file mode 100644
index 00000000..159522a4
--- /dev/null
+++ b/azure/infra/scripts/use-dev-params.ps1
@@ -0,0 +1,109 @@
+$ErrorActionPreference = 'Stop'
+
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$infraDir = Resolve-Path (Join-Path $scriptDir '..')
+
+if ([string]::IsNullOrWhiteSpace($env:AZURE_SQL_ADMIN_PASSWORD)) {
+	throw 'AZURE_SQL_ADMIN_PASSWORD is not set. Set it before running azd provision.'
+}
+
+if ([string]::IsNullOrWhiteSpace($env:AZURE_POSTGRES_ADMIN_PASSWORD)) {
+    $env:AZURE_POSTGRES_ADMIN_PASSWORD = $env:AZURE_SQL_ADMIN_PASSWORD
+}
+
+if ([string]::IsNullOrWhiteSpace($env:AZURE_LOCATION)) {
+    throw "AZURE_LOCATION is not set. Set it via 'azd env set AZURE_LOCATION <region>' before running azd provision."
+}
+
+if (-not (Get-Command az -ErrorAction SilentlyContinue)) {
+    throw "The 'az' command is required to validate an existing Key Vault from the azd environment."
+}
+
+$clientIp = ''
+foreach ($ipLookup in @('https://api.ipify.org', 'https://ifconfig.me/ip')) {
+    try {
+        $clientIp = (Invoke-RestMethod -Uri $ipLookup -TimeoutSec 15).ToString().Trim()
+    }
+    catch {
+        $clientIp = ''
+    }
+
+    if (-not [string]::IsNullOrWhiteSpace($clientIp)) {
+        break
+    }
+}
+
+if ([string]::IsNullOrWhiteSpace($clientIp)) {
+    throw 'Unable to determine the current public IP address for the Azure SQL firewall rule.'
+}
+
+if ($clientIp -notmatch '^([0-9]{1,3}\.){3}[0-9]{1,3}$') {
+    throw "Resolved public IP '$clientIp' is not a valid IPv4 address."
+}
+
+$targetFramework = if ($env:AZD_DOTNET_TARGET_FRAMEWORK) {
+    $env:AZD_DOTNET_TARGET_FRAMEWORK
+}
+elseif ($env:DOTNET_TARGET_FRAMEWORK) {
+    $env:DOTNET_TARGET_FRAMEWORK
+}
+else {
+    'net8.0'
+}
+
+$appServiceLinuxFxVersion = switch ($targetFramework) {
+    'net8.0' { 'DOTNETCORE|8.0' }
+    'net9.0' { 'DOTNETCORE|9.0' }
+    'net10.0' { 'DOTNETCORE|10.0' }
+    default { throw "Unsupported target framework '$targetFramework'. Expected net8.0, net9.0, or net10.0." }
+}
+
+$keyVaultName = ''
+try {
+    $existingKeyVaultNameRaw = (azd env get-value keyVaultName 2>$null).Trim()
+}
+catch {
+    $existingKeyVaultNameRaw = ''
+}
+$existingKeyVaultName = if ($existingKeyVaultNameRaw -and -not $existingKeyVaultNameRaw.Contains('ERROR:')) {
+    $existingKeyVaultNameRaw
+}
+else {
+    ''
+}
+if (-not [string]::IsNullOrWhiteSpace($existingKeyVaultName)) {
+    az keyvault show --name $existingKeyVaultName --query name -o tsv *> $null
+    if ($LASTEXITCODE -eq 0) {
+        $keyVaultName = $existingKeyVaultName
+        Write-Host "Reusing existing Key Vault '$keyVaultName' from azd environment."
+    }
+    else {
+        Write-Warning "Key Vault '$existingKeyVaultName' from azd environment was not found. A new Key Vault will be provisioned."
+    }
+}
+
+$templatePath = Join-Path $infraDir 'main.dev.parameters.json'
+$outputPath = Join-Path $infraDir 'main.parameters.json'
+
+# Try using ConvertFrom-Json / ConvertTo-Json for safe JSON processing
+try {
+    $json = Get-Content -Raw -Path $templatePath | ConvertFrom-Json
+    $json.parameters.location.value = $env:AZURE_LOCATION
+    $json.parameters.sqlAdminPassword.value = $env:AZURE_SQL_ADMIN_PASSWORD
+    $json.parameters.postgresAdminPassword.value = $env:AZURE_POSTGRES_ADMIN_PASSWORD
+    $json.parameters.appServiceLinuxFxVersion.value = $appServiceLinuxFxVersion
+    $json.parameters.sqlFirewallClientIp.value = $clientIp
+    $json.parameters.postgresFirewallClientIp.value = $clientIp
+    $json.parameters.keyVaultName.value = $keyVaultName
+    $json | ConvertTo-Json -Depth 100 | Set-Content -Path $outputPath -NoNewline
+} catch {
+    # Fallback: direct string replacement
+    $content = Get-Content -Raw -Path $templatePath
+    $content = $content.Replace('__AZURE_LOCATION__', $env:AZURE_LOCATION)
+    $content = $content.Replace('__AZURE_SQL_ADMIN_PASSWORD__', $env:AZURE_SQL_ADMIN_PASSWORD)
+    $content = $content.Replace('__AZURE_POSTGRES_ADMIN_PASSWORD__', $env:AZURE_POSTGRES_ADMIN_PASSWORD)
+    $content = $content.Replace('__APP_SERVICE_LINUX_FX_VERSION__', $appServiceLinuxFxVersion)
+    $content = $content.Replace('__AZURE_CLIENT_IP__', $clientIp)
+    $content = $content.Replace('__KEY_VAULT_NAME__', $keyVaultName)
+    Set-Content -Path $outputPath -Value $content -NoNewline
+}
diff --git a/azure/infra/scripts/use-dev-params.sh b/azure/infra/scripts/use-dev-params.sh
new file mode 100755
index 00000000..8e2d627e
--- /dev/null
+++ b/azure/infra/scripts/use-dev-params.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+infra_dir="$(cd "${script_dir}/.." && pwd)"
+
+if [[ -z "${AZURE_SQL_ADMIN_PASSWORD:-}" ]]; then
+	echo "AZURE_SQL_ADMIN_PASSWORD is not set. Export it before running azd provision." >&2
+	exit 1
+fi
+
+if [[ -z "${AZURE_POSTGRES_ADMIN_PASSWORD:-}" ]]; then
+  AZURE_POSTGRES_ADMIN_PASSWORD="${AZURE_SQL_ADMIN_PASSWORD}"
+fi
+
+if [[ -z "${AZURE_LOCATION:-}" ]]; then
+  echo "AZURE_LOCATION is not set. Set it via 'azd env set AZURE_LOCATION <region>' before running azd provision." >&2
+  exit 1
+fi
+
+if ! command -v az >/dev/null 2>&1; then
+  echo "The 'az' command is required to validate an existing Key Vault from the azd environment." >&2
+  exit 1
+fi
+
+client_ip="$(curl -fsS https://api.ipify.org 2>/dev/null || true)"
+if [[ -z "${client_ip}" ]]; then
+  client_ip="$(curl -fsS https://ifconfig.me/ip 2>/dev/null || true)"
+fi
+
+if [[ -z "${client_ip}" ]]; then
+  echo "Unable to determine the current public IP address for the Azure SQL firewall rule." >&2
+  exit 1
+fi
+
+if [[ ! "${client_ip}" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
+  echo "Resolved public IP '${client_ip}' is not a valid IPv4 address." >&2
+  exit 1
+fi
+
+target_framework="${AZD_DOTNET_TARGET_FRAMEWORK:-${DOTNET_TARGET_FRAMEWORK:-net8.0}}"
+case "${target_framework}" in
+  net8.0)
+    app_service_linux_fx_version='DOTNETCORE|8.0'
+    ;;
+  net9.0)
+    app_service_linux_fx_version='DOTNETCORE|9.0'
+    ;;
+  net10.0)
+    app_service_linux_fx_version='DOTNETCORE|10.0'
+    ;;
+  *)
+    echo "Unsupported target framework '${target_framework}'. Expected net8.0, net9.0, or net10.0." >&2
+    exit 1
+    ;;
+esac
+
+key_vault_name=""
+existing_key_vault_name_raw="$(azd env get-value keyVaultName 2>/dev/null | tr -d '\r' || true)"
+existing_key_vault_name=""
+
+# azd can return key-not-found messages on stdout; only accept non-error values.
+if [[ -n "${existing_key_vault_name_raw}" && "${existing_key_vault_name_raw}" != *ERROR:* ]]; then
+  existing_key_vault_name="${existing_key_vault_name_raw}"
+fi
+if [[ -n "${existing_key_vault_name}" ]]; then
+  if az keyvault show --name "${existing_key_vault_name}" --query name -o tsv >/dev/null 2>&1; then
+    key_vault_name="${existing_key_vault_name}"
+    echo "Reusing existing Key Vault '${key_vault_name}' from azd environment."
+  else
+    echo "Key Vault '${existing_key_vault_name}' from azd environment was not found. A new Key Vault will be provisioned." >&2
+  fi
+fi
+
+# Use jq if available for safe JSON processing, otherwise fallback to sed
+if command -v jq &> /dev/null; then
+  jq \
+    --arg pwd "${AZURE_SQL_ADMIN_PASSWORD}" \
+    --arg pgpwd "${AZURE_POSTGRES_ADMIN_PASSWORD}" \
+    --arg loc "${AZURE_LOCATION}" \
+    --arg fx "${app_service_linux_fx_version}" \
+    --arg ip "${client_ip}" \
+    --arg kv "${key_vault_name}" \
+    '.parameters.location.value = $loc | .parameters.sqlAdminPassword.value = $pwd | .parameters.postgresAdminPassword.value = $pgpwd | .parameters.appServiceLinuxFxVersion.value = $fx | .parameters.sqlFirewallClientIp.value = $ip | .parameters.postgresFirewallClientIp.value = $ip | .parameters.keyVaultName.value = $kv' \
+    "${infra_dir}/main.dev.parameters.json" > "${infra_dir}/main.parameters.json"
+else
+  # Fallback: use printf to safely escape and substitute
+  escaped_location=$(printf '%s\n' "${AZURE_LOCATION}" | sed -e 's/[&/\\]/\\&/g; s/$/\\/')
+  escaped_location=${escaped_location%\\}
+  escaped_password=$(printf '%s\n' "${AZURE_SQL_ADMIN_PASSWORD}" | sed -e 's/[&/\\]/\\&/g; s/$/\\/')
+  escaped_password=${escaped_password%\\}
+  escaped_postgres_password=$(printf '%s\n' "${AZURE_POSTGRES_ADMIN_PASSWORD}" | sed -e 's/[&/\\]/\\&/g; s/$/\\/')
+  escaped_postgres_password=${escaped_postgres_password%\\}
+  escaped_fx=$(printf '%s\n' "${app_service_linux_fx_version}" | sed -e 's/[&/\\]/\\&/g; s/$/\\/')
+  escaped_fx=${escaped_fx%\\}
+  escaped_ip=$(printf '%s\n' "${client_ip}" | sed -e 's/[&/\\]/\\&/g; s/$/\\/')
+  escaped_ip=${escaped_ip%\\}
+  escaped_key_vault_name=$(printf '%s\n' "${key_vault_name}" | sed -e 's/[&/\\]/\\&/g; s/$/\\/')
+  escaped_key_vault_name=${escaped_key_vault_name%\\}
+  sed \
+    -e "s/__AZURE_LOCATION__/${escaped_location}/g" \
+    -e "s/__AZURE_SQL_ADMIN_PASSWORD__/${escaped_password}/g" \
+    -e "s/__AZURE_POSTGRES_ADMIN_PASSWORD__/${escaped_postgres_password}/g" \
+    -e "s/__APP_SERVICE_LINUX_FX_VERSION__/${escaped_fx}/g" \
+    -e "s/__AZURE_CLIENT_IP__/${escaped_ip}/g" \
+    -e "s/__KEY_VAULT_NAME__/${escaped_key_vault_name}/g" \
+    "${infra_dir}/main.dev.parameters.json" > "${infra_dir}/main.parameters.json"
+fi
diff --git a/azure/infra/test.bicep b/azure/infra/test.bicep
new file mode 100644
index 00000000..7746ce7f
--- /dev/null
+++ b/azure/infra/test.bicep
@@ -0,0 +1,20 @@
+targetScope = 'resourceGroup'
+
+param location string = 'eastus'
+param nameSuffix string = 'test01'
+
+resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = {
+  name: 'asp-dev-${nameSuffix}'
+  location: location
+  kind: 'linux'
+  sku: {
+    name: 'B1'
+    tier: 'Basic'
+    capacity: 1
+  }
+  properties: {
+    reserved: true
+  }
+}
+
+output appServicePlanId string = appServicePlan.id
diff --git a/azure/scripts/ensure-sql-firewall-rule.ps1 b/azure/scripts/ensure-sql-firewall-rule.ps1
new file mode 100644
index 00000000..c0d8028e
--- /dev/null
+++ b/azure/scripts/ensure-sql-firewall-rule.ps1
@@ -0,0 +1,170 @@
+$ErrorActionPreference = 'Stop'
+
+# Ensures the current runner public IP has Azure SQL and PostgreSQL firewall rules.
+
+if (-not (Get-Command azd -ErrorAction SilentlyContinue)) {
+    throw "The 'azd' command is required to resolve environment values."
+}
+
+if (-not (Get-Command az -ErrorAction SilentlyContinue)) {
+    throw "The 'az' command is required to manage Azure firewall rules."
+}
+
+function Invoke-WithRetry {
+    param(
+        [Parameter(Mandatory = $true)]
+        [int] $Attempts,
+        [Parameter(Mandatory = $true)]
+        [int] $DelaySeconds,
+        [Parameter(Mandatory = $true)]
+        [scriptblock] $ScriptBlock,
+        [Parameter(Mandatory = $true)]
+        [string] $Description
+    )
+
+    for ($attempt = 1; $attempt -le $Attempts; $attempt++) {
+        try {
+            & $ScriptBlock
+            return
+        }
+        catch {
+            if ($attempt -ge $Attempts) {
+                throw
+            }
+
+            Write-Host "Waiting on $Description ($attempt/$Attempts); retrying in $DelaySeconds seconds."
+            Start-Sleep -Seconds $DelaySeconds
+        }
+    }
+}
+
+function Ensure-FirewallRule {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $DbType,
+        [Parameter(Mandatory = $true)]
+        [string] $ServerName,
+        [Parameter(Mandatory = $true)]
+        [string] $ClientIp,
+        [Parameter(Mandatory = $true)]
+        [string] $FirewallRuleName,
+        [Parameter(Mandatory = $true)]
+        [string[]] $AzArgs
+    )
+
+    if ($DbType -eq 'sql') {
+        az sql server firewall-rule show @AzArgs --name $FirewallRuleName *> $null
+        if ($LASTEXITCODE -eq 0) {
+            Write-Host "Updating Azure SQL firewall rule '$FirewallRuleName' for $ClientIp."
+            az sql server firewall-rule update @AzArgs --name $FirewallRuleName --start-ip-address $ClientIp --end-ip-address $ClientIp | Out-Null
+        }
+        else {
+            Write-Host "Creating Azure SQL firewall rule '$FirewallRuleName' for $ClientIp."
+            az sql server firewall-rule create @AzArgs --name $FirewallRuleName --start-ip-address $ClientIp --end-ip-address $ClientIp | Out-Null
+        }
+        Write-Host "Azure SQL firewall rule '$FirewallRuleName' is ready."
+    }
+    elseif ($DbType -eq 'postgres') {
+        az postgres flexible-server firewall-rule show @AzArgs --rule-name $FirewallRuleName *> $null
+        if ($LASTEXITCODE -eq 0) {
+            Write-Host "Updating Azure PostgreSQL firewall rule '$FirewallRuleName' for $ClientIp."
+            az postgres flexible-server firewall-rule update @AzArgs --rule-name $FirewallRuleName --start-ip-address $ClientIp --end-ip-address $ClientIp | Out-Null
+        }
+        else {
+            Write-Host "Creating Azure PostgreSQL firewall rule '$FirewallRuleName' for $ClientIp."
+            az postgres flexible-server firewall-rule create @AzArgs --rule-name $FirewallRuleName --start-ip-address $ClientIp --end-ip-address $ClientIp | Out-Null
+        }
+        Write-Host "Azure PostgreSQL firewall rule '$FirewallRuleName' is ready."
+    }
+}
+
+function Get-AzdEnvValue {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $Key
+    )
+
+    $value = (azd env get-value $Key 2>&1 | Out-String).Trim()
+    if ($LASTEXITCODE -ne 0 -or $value.StartsWith('ERROR:')) {
+        return ''
+    }
+
+    return $value
+}
+
+$sqlServer = Get-AzdEnvValue -Key 'sqlServerName'
+$postgresServer = Get-AzdEnvValue -Key 'postgresServerName'
+$azureResourceGroup = Get-AzdEnvValue -Key 'AZURE_RESOURCE_GROUP'
+$azureSubscriptionId = Get-AzdEnvValue -Key 'AZURE_SUBSCRIPTION_ID'
+$azureEnvName = Get-AzdEnvValue -Key 'AZURE_ENV_NAME'
+
+if (([string]::IsNullOrWhiteSpace($sqlServer) -and [string]::IsNullOrWhiteSpace($postgresServer)) -or [string]::IsNullOrWhiteSpace($azureResourceGroup)) {
+    throw 'Unable to resolve sqlServerName and/or postgresServerName and AZURE_RESOURCE_GROUP from the active azd environment.'
+}
+
+$clientIp = ''
+foreach ($ipLookup in @('https://api.ipify.org', 'https://ifconfig.me/ip')) {
+    try {
+        $clientIp = (Invoke-RestMethod -Uri $ipLookup -TimeoutSec 15).ToString().Trim()
+    }
+    catch {
+        $clientIp = ''
+    }
+
+    if (-not [string]::IsNullOrWhiteSpace($clientIp)) {
+        break
+    }
+}
+
+if ([string]::IsNullOrWhiteSpace($clientIp)) {
+    throw 'Unable to determine the public IP address for the current runner.'
+}
+
+if ($clientIp -notmatch '^([0-9]{1,3}\.){3}[0-9]{1,3}$') {
+    throw "Resolved public IP '$clientIp' is not a valid IPv4 address."
+}
+
+$effectiveEnvName = if ([string]::IsNullOrWhiteSpace($azureEnvName)) { 'env' } else { $azureEnvName }
+$firewallRuleName = "azd-$effectiveEnvName-$($clientIp -replace '\.', '-')"
+
+if (-not [string]::IsNullOrWhiteSpace($sqlServer)) {
+    $azServerArgs = @('--resource-group', $azureResourceGroup, '--name', $sqlServer)
+    $azFirewallArgs = @('--resource-group', $azureResourceGroup, '--server', $sqlServer)
+    if (-not [string]::IsNullOrWhiteSpace($azureSubscriptionId)) {
+        $azServerArgs += @('--subscription', $azureSubscriptionId)
+        $azFirewallArgs += @('--subscription', $azureSubscriptionId)
+    }
+
+    if ($env:AZD_SQL_FIREWALL_WAIT_FOR_SERVER -eq '1') {
+        Write-Host "Waiting for Azure SQL server '$sqlServer' to become available."
+        Invoke-WithRetry -Attempts 12 -DelaySeconds 10 -Description 'Azure SQL server readiness' -ScriptBlock {
+            az sql server show @azServerArgs | Out-Null
+        }
+    }
+    else {
+        az sql server show @azServerArgs | Out-Null
+    }
+
+    Ensure-FirewallRule -DbType 'sql' -ServerName $sqlServer -ClientIp $clientIp -FirewallRuleName $firewallRuleName -AzArgs $azFirewallArgs
+}
+
+if (-not [string]::IsNullOrWhiteSpace($postgresServer)) {
+    $azPostgresServerArgs = @('--resource-group', $azureResourceGroup, '--name', $postgresServer)
+    $azPostgresFirewallArgs = @('--resource-group', $azureResourceGroup, '--name', $postgresServer)
+    if (-not [string]::IsNullOrWhiteSpace($azureSubscriptionId)) {
+        $azPostgresServerArgs += @('--subscription', $azureSubscriptionId)
+        $azPostgresFirewallArgs += @('--subscription', $azureSubscriptionId)
+    }
+
+    if ($env:AZD_POSTGRES_FIREWALL_WAIT_FOR_SERVER -eq '1') {
+        Write-Host "Waiting for Azure PostgreSQL server '$postgresServer' to become available."
+        Invoke-WithRetry -Attempts 12 -DelaySeconds 10 -Description 'Azure PostgreSQL server readiness' -ScriptBlock {
+            az postgres flexible-server show @azPostgresServerArgs | Out-Null
+        }
+    }
+    else {
+        az postgres flexible-server show @azPostgresServerArgs | Out-Null
+    }
+
+    Ensure-FirewallRule -DbType 'postgres' -ServerName $postgresServer -ClientIp $clientIp -FirewallRuleName $firewallRuleName -AzArgs $azPostgresFirewallArgs
+}
\ No newline at end of file
diff --git a/azure/scripts/ensure-sql-firewall-rule.sh b/azure/scripts/ensure-sql-firewall-rule.sh
new file mode 100644
index 00000000..525a5fd4
--- /dev/null
+++ b/azure/scripts/ensure-sql-firewall-rule.sh
@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Ensures the current runner public IP has Azure SQL and PostgreSQL firewall rules.
+
+retry_command() {
+  local attempts="${1:?attempt count is required}"
+  local delay_seconds="${2:?delay is required}"
+  local description="${3:?description is required}"
+  shift 3
+
+  local attempt=1
+  while true; do
+    if "$@"; then
+      return 0
+    fi
+
+    if (( attempt >= attempts )); then
+      return 1
+    fi
+
+    echo "Waiting on ${description} (${attempt}/${attempts}); retrying in ${delay_seconds}s." >&2
+    attempt=$((attempt + 1))
+    sleep "${delay_seconds}"
+  done
+}
+
+ensure_firewall_rule() {
+  local db_type="${1:?db_type is required (sql or postgres)}"
+  local server_name="${2:?server_name is required}"
+  local client_ip="${3:?client_ip is required}"
+  local firewall_rule_name="${4:?firewall_rule_name is required}"
+  shift 4
+  local az_args=("$@")
+
+  if [[ "${db_type}" == "sql" ]]; then
+    if az sql server firewall-rule show "${az_args[@]}" --name "${firewall_rule_name}" >/dev/null 2>&1; then
+      echo "Updating Azure SQL firewall rule '${firewall_rule_name}' for ${client_ip}."
+      az sql server firewall-rule update "${az_args[@]}" --name "${firewall_rule_name}" --start-ip-address "${client_ip}" --end-ip-address "${client_ip}" >/dev/null
+    else
+      echo "Creating Azure SQL firewall rule '${firewall_rule_name}' for ${client_ip}."
+      az sql server firewall-rule create "${az_args[@]}" --name "${firewall_rule_name}" --start-ip-address "${client_ip}" --end-ip-address "${client_ip}" >/dev/null
+    fi
+    echo "Azure SQL firewall rule '${firewall_rule_name}' is ready."
+  elif [[ "${db_type}" == "postgres" ]]; then
+    if az postgres flexible-server firewall-rule show "${az_args[@]}" --rule-name "${firewall_rule_name}" >/dev/null 2>&1; then
+      echo "Updating Azure PostgreSQL firewall rule '${firewall_rule_name}' for ${client_ip}."
+      az postgres flexible-server firewall-rule update "${az_args[@]}" --rule-name "${firewall_rule_name}" --start-ip-address "${client_ip}" --end-ip-address "${client_ip}" >/dev/null
+    else
+      echo "Creating Azure PostgreSQL firewall rule '${firewall_rule_name}' for ${client_ip}."
+      az postgres flexible-server firewall-rule create "${az_args[@]}" --rule-name "${firewall_rule_name}" --start-ip-address "${client_ip}" --end-ip-address "${client_ip}" >/dev/null
+    fi
+    echo "Azure PostgreSQL firewall rule '${firewall_rule_name}' is ready."
+  fi
+}
+
+if ! command -v azd >/dev/null 2>&1; then
+  echo "The 'azd' command is required to resolve environment values." >&2
+  exit 1
+fi
+
+if ! command -v az >/dev/null 2>&1; then
+  echo "The 'az' command is required to manage Azure firewall rules." >&2
+  exit 1
+fi
+
+get_azd_value() {
+  local value
+  value="$(azd env get-value "$1" 2>/dev/null | tr -d '\r')"
+  if [[ -z "${value}" || "${value}" == ERROR:* ]]; then
+    echo ""
+  else
+    echo "${value}"
+  fi
+}
+
+sql_server="$(get_azd_value sqlServerName)"
+postgres_server="$(get_azd_value postgresServerName)"
+azure_resource_group="$(get_azd_value AZURE_RESOURCE_GROUP)"
+azure_subscription_id="$(get_azd_value AZURE_SUBSCRIPTION_ID)"
+azure_env_name="$(get_azd_value AZURE_ENV_NAME)"
+
+if [[ -z "${sql_server}" && -z "${postgres_server}" ]] || [[ -z "${azure_resource_group}" ]]; then
+  echo "Unable to resolve sqlServerName and/or postgresServerName and AZURE_RESOURCE_GROUP from the active azd environment." >&2
+  exit 1
+fi
+
+client_ip="$(curl -fsS https://api.ipify.org 2>/dev/null || true)"
+if [[ -z "${client_ip}" ]]; then
+  client_ip="$(curl -fsS https://ifconfig.me/ip 2>/dev/null || true)"
+fi
+
+if [[ -z "${client_ip}" ]]; then
+  echo "Unable to determine the public IP address for the current runner." >&2
+  exit 1
+fi
+
+if [[ ! "${client_ip}" =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]]; then
+  echo "Resolved public IP '${client_ip}' is not a valid IPv4 address." >&2
+  exit 1
+fi
+
+firewall_rule_name="azd-${azure_env_name:-env}-$(echo "${client_ip}" | tr '.' '-')"
+
+if [[ -n "${sql_server}" ]]; then
+  az_server_args=(--resource-group "${azure_resource_group}" --name "${sql_server}")
+  az_firewall_args=(--resource-group "${azure_resource_group}" --server "${sql_server}")
+  if [[ -n "${azure_subscription_id}" ]]; then
+    az_server_args+=(--subscription "${azure_subscription_id}")
+    az_firewall_args+=(--subscription "${azure_subscription_id}")
+  fi
+
+  if [[ "${AZD_SQL_FIREWALL_WAIT_FOR_SERVER:-0}" == "1" ]]; then
+    echo "Waiting for Azure SQL server '${sql_server}' to become available."
+    retry_command 12 10 "Azure SQL server readiness" az sql server show "${az_server_args[@]}" >/dev/null
+  else
+    az sql server show "${az_server_args[@]}" >/dev/null
+  fi
+
+  ensure_firewall_rule "sql" "${sql_server}" "${client_ip}" "${firewall_rule_name}" "${az_firewall_args[@]}"
+fi
+
+if [[ -n "${postgres_server}" ]]; then
+  az_postgres_server_args=(--resource-group "${azure_resource_group}" --name "${postgres_server}")
+  az_postgres_firewall_args=(--resource-group "${azure_resource_group}" --name "${postgres_server}")
+  if [[ -n "${azure_subscription_id}" ]]; then
+    az_postgres_server_args+=(--subscription "${azure_subscription_id}")
+    az_postgres_firewall_args+=(--subscription "${azure_subscription_id}")
+  fi
+
+  if [[ "${AZD_POSTGRES_FIREWALL_WAIT_FOR_SERVER:-0}" == "1" ]]; then
+    echo "Waiting for Azure PostgreSQL server '${postgres_server}' to become available."
+    retry_command 12 10 "Azure PostgreSQL server readiness" az postgres flexible-server show "${az_postgres_server_args[@]}" >/dev/null
+  else
+    az postgres flexible-server show "${az_postgres_server_args[@]}" >/dev/null
+  fi
+
+  ensure_firewall_rule "postgres" "${postgres_server}" "${client_ip}" "${firewall_rule_name}" "${az_postgres_firewall_args[@]}"
+fi
\ No newline at end of file
diff --git a/azure/scripts/get-aspire-dashboard-login.ps1 b/azure/scripts/get-aspire-dashboard-login.ps1
new file mode 100644
index 00000000..3bd56384
--- /dev/null
+++ b/azure/scripts/get-aspire-dashboard-login.ps1
@@ -0,0 +1,179 @@
+#Requires -Version 7
+[CmdletBinding()]
+param (
+    [Alias('g')]
+    [Parameter(Mandatory)]
+    [string] $ResourceGroup,
+
+    [Alias('n')]
+    [string] $DashboardAppName,
+
+    [Alias('t')]
+    [int] $TokenTimeoutSeconds = 20,
+
+    [int] $LogLookbackMinutes = 60
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+function Get-TokenFromRuntimeLog {
+    param (
+        [string] $PublishUser,
+        [string] $PublishPassword,
+        [string] $AppName,
+        [long]   $CutoffEpoch
+    )
+
+    $payload  = '{"command":"grep \"Login to the dashboard\" /appsvctmp/volatile/logs/runtime/container.log","dir":"/home"}'
+    $base64   = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("${PublishUser}:${PublishPassword}"))
+    $headers  = @{ Authorization = "Basic $base64"; 'Content-Type' = 'application/json' }
+    $scmUrl   = "https://${AppName}.scm.azurewebsites.net/api/command"
+
+    try {
+        $response = Invoke-RestMethod -Uri $scmUrl -Method Post -Headers $headers -Body $payload -ErrorAction Stop
+    }
+    catch {
+        return $null
+    }
+
+    $output = $response.Output
+    if (-not $output) { return $null }
+
+    # Match timestamp + token on the same line.
+    if ($output -match '(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(?:\.\d+)?Z[^"]*login\?t=([A-Za-z0-9]+)') {
+        $tsString  = $Matches[1] + 'Z'
+        $entryTime = [DateTimeOffset]::Parse($tsString, $null, [Globalization.DateTimeStyles]::AssumeUniversal)
+        $entryEpoch = $entryTime.ToUnixTimeSeconds()
+        if ($entryEpoch -ge $CutoffEpoch) {
+            return $Matches[2]
+        }
+    }
+
+    return $null
+}
+
+function Get-TokenFromLogArchive {
+    param (
+        [string] $PublishUser,
+        [string] $PublishPassword,
+        [string] $AppName,
+        [long]   $CutoffEpoch
+    )
+
+    $base64  = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes("${PublishUser}:${PublishPassword}"))
+    $headers = @{ Authorization = "Basic $base64" }
+    $scmUrl  = "https://${AppName}.scm.azurewebsites.net/api/zip/LogFiles/"
+    $tmpZip  = [IO.Path]::GetTempFileName() + '.zip'
+    $tmpDir  = [IO.Path]::Combine([IO.Path]::GetTempPath(), [IO.Path]::GetRandomFileName())
+
+    try {
+        try {
+            Invoke-WebRequest -Uri $scmUrl -Headers $headers -OutFile $tmpZip -ErrorAction Stop
+        }
+        catch {
+            return $null
+        }
+
+        $null = New-Item -ItemType Directory -Path $tmpDir -Force
+        Expand-Archive -Path $tmpZip -DestinationPath $tmpDir -Force
+
+        $files = Get-ChildItem -Path $tmpDir -Recurse -File
+
+        foreach ($file in $files) {
+            $lines = Get-Content -Path $file.FullName -ErrorAction SilentlyContinue
+            foreach ($line in $lines) {
+                if ($line -match '^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(?:\.\d+)?Z.*login\?t=([A-Za-z0-9]+)') {
+                    $tsString  = $Matches[1] + 'Z'
+                    $entryTime = [DateTimeOffset]::Parse($tsString, $null, [Globalization.DateTimeStyles]::AssumeUniversal)
+                    if ($entryTime.ToUnixTimeSeconds() -ge $CutoffEpoch) {
+                        return $Matches[2]
+                    }
+                }
+            }
+        }
+    }
+    finally {
+        if (Test-Path $tmpZip)  { Remove-Item $tmpZip  -Force -ErrorAction SilentlyContinue }
+        if (Test-Path $tmpDir)  { Remove-Item $tmpDir  -Recurse -Force -ErrorAction SilentlyContinue }
+    }
+
+    return $null
+}
+
+# Verify az CLI.
+if (-not (Get-Command az -ErrorAction SilentlyContinue)) {
+    Write-Error "Azure CLI 'az' is not installed or not on PATH."
+    exit 1
+}
+
+# Auto-detect dashboard app if not supplied.
+if (-not $DashboardAppName) {
+    $DashboardAppName = (az webapp list --resource-group $ResourceGroup --query "[?contains(name, 'aspire-dashboard')].name | [0]" -o tsv)
+}
+
+if (-not $DashboardAppName) {
+    Write-Error "Unable to auto-detect the dashboard app name in resource group '$ResourceGroup'. Re-run with -DashboardAppName <name>."
+    exit 1
+}
+
+$hostName = (az webapp show --resource-group $ResourceGroup --name $DashboardAppName --query defaultHostName -o tsv)
+
+if (-not $hostName) {
+    Write-Error "Unable to resolve dashboard host name for app '$DashboardAppName'."
+    exit 1
+}
+
+$cutoffEpoch = [DateTimeOffset]::UtcNow.AddMinutes(-$LogLookbackMinutes).ToUnixTimeSeconds()
+
+# Attempt 1: query runtime container log via SCM Kudu.
+$token = $null
+try {
+    $creds        = (az webapp deployment list-publishing-credentials --resource-group $ResourceGroup --name $DashboardAppName --output json 2>$null | ConvertFrom-Json)
+    $publishUser  = $creds.publishingUserName
+    $publishPass  = $creds.publishingPassword
+
+    if ($publishUser -and $publishPass) {
+        $token = Get-TokenFromRuntimeLog -PublishUser $publishUser -PublishPassword $publishPass -AppName $DashboardAppName -CutoffEpoch $cutoffEpoch
+
+        # Attempt 2: fall back to archived log files.
+        if (-not $token) {
+            $token = Get-TokenFromLogArchive -PublishUser $publishUser -PublishPassword $publishPass -AppName $DashboardAppName -CutoffEpoch $cutoffEpoch
+        }
+    }
+}
+catch {
+    # Non-fatal; will fall through to live tail.
+}
+
+# Attempt 3: live log tail.
+if (-not $token) {
+    $deadline = [DateTime]::UtcNow.AddSeconds($TokenTimeoutSeconds)
+    $job = Start-Job -ScriptBlock {
+        param($rg, $app)
+        az webapp log tail --resource-group $rg --name $app 2>&1
+    } -ArgumentList $ResourceGroup, $DashboardAppName
+
+    while ([DateTime]::UtcNow -lt $deadline -and $job.State -eq 'Running') {
+        $partial = Receive-Job -Job $job -Keep 2>$null
+        $partialText = ($partial | Out-String)
+        if ($partialText -match 'login\?t=([A-Za-z0-9]+)') {
+            $token = $Matches[1]
+            break
+        }
+        Start-Sleep -Milliseconds 500
+    }
+    Stop-Job  -Job $job -ErrorAction SilentlyContinue
+    Remove-Job -Job $job -Force -ErrorAction SilentlyContinue
+}
+
+Write-Host "Dashboard app: $DashboardAppName"
+Write-Host "Dashboard URL: https://$hostName"
+
+if ($token) {
+    Write-Host "Login URL: https://${hostName}/login?t=${token}"
+}
+else {
+    Write-Host "Token not found in the last $LogLookbackMinutes minutes of logs or within ${TokenTimeoutSeconds}s of live tailing."
+    Write-Host "Open the dashboard URL and, if prompted, run this script again with a larger -TokenTimeoutSeconds value."
+}
diff --git a/azure/scripts/get-aspire-dashboard-login.sh b/azure/scripts/get-aspire-dashboard-login.sh
new file mode 100755
index 00000000..1816b094
--- /dev/null
+++ b/azure/scripts/get-aspire-dashboard-login.sh
@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+usage() {
+  cat <<'EOF'
+Usage:
+  ./scripts/get-aspire-dashboard-login.sh --resource-group <resource-group> [--dashboard-app-name <app-name>] [--token-timeout-seconds <seconds>]
+
+Description:
+  Prints the Aspire Dashboard URL.
+  Attempts to retrieve a browser login token from the last 60 minutes of App Service logs and prints a ready-to-open login URL.
+
+Options:
+  --resource-group, -g         Azure resource group name (required).
+  --dashboard-app-name, -n     Dashboard web app name (optional; auto-detected when omitted).
+  --token-timeout-seconds, -t  Timeout when waiting for token logs (default: 20).
+  --help, -h                   Show this help.
+EOF
+}
+
+resource_group=""
+dashboard_app_name=""
+token_timeout_seconds="20"
+log_lookback_minutes="60"
+
+cleanup() {
+  if [[ -n "${temp_dir:-}" && -d "${temp_dir}" ]]; then
+    rm -rf "${temp_dir}"
+  fi
+}
+
+extract_token_from_recent_logs() {
+  local publish_user publish_password zip_path logs_dir token_value current_epoch cutoff_epoch command_payload command_response token_line token_timestamp token_epoch
+
+  if ! command -v curl >/dev/null 2>&1; then
+    return 0
+  fi
+
+  if ! command -v unzip >/dev/null 2>&1; then
+    return 0
+  fi
+
+  publish_user="$(az webapp deployment list-publishing-credentials --resource-group "${resource_group}" --name "${dashboard_app_name}" --query publishingUserName -o tsv 2>/dev/null || true)"
+  publish_password="$(az webapp deployment list-publishing-credentials --resource-group "${resource_group}" --name "${dashboard_app_name}" --query publishingPassword -o tsv 2>/dev/null || true)"
+
+  if [[ -z "${publish_user}" || -z "${publish_password}" ]]; then
+    return 0
+  fi
+
+  current_epoch="$(date -u +%s)"
+  cutoff_epoch="$((current_epoch - (log_lookback_minutes * 60)))"
+
+  command_payload=$(printf '{"command":"grep \\\"Login to the dashboard\\\" /appsvctmp/volatile/logs/runtime/container.log","dir":"/home"}')
+  command_response="$(curl -fsS -u "${publish_user}:${publish_password}" -H 'Content-Type: application/json' -d "${command_payload}" "https://${dashboard_app_name}.scm.azurewebsites.net/api/command" 2>/dev/null || true)"
+
+  token_line="$(printf '%s\n' "${command_response}" | grep -oE '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z[^\"]*login\?t=[A-Za-z0-9]+' | head -n1 || true)"
+
+  if [[ -n "${token_line}" ]]; then
+    token_timestamp="$(printf '%s\n' "${token_line}" | grep -oE '^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}' | head -n1 || true)"
+    if [[ -n "${token_timestamp}" ]]; then
+      token_epoch="$(date -u -d "${token_timestamp}Z" +%s 2>/dev/null || true)"
+      if [[ -n "${token_epoch}" && "${token_epoch}" -ge "${cutoff_epoch}" ]]; then
+        token_value="$(printf '%s\n' "${token_line}" | grep -oE 'login\?t=[A-Za-z0-9]+' | head -n1 | cut -d= -f2 || true)"
+      fi
+    fi
+  fi
+
+  if [[ -n "${token_value}" ]]; then
+    printf '%s\n' "${token_value}"
+    return 0
+  fi
+
+  temp_dir="$(mktemp -d)"
+  trap cleanup EXIT
+  zip_path="${temp_dir}/logfiles.zip"
+  logs_dir="${temp_dir}/logs"
+
+  if ! curl -fsS -u "${publish_user}:${publish_password}" "https://${dashboard_app_name}.scm.azurewebsites.net/api/zip/LogFiles/" -o "${zip_path}"; then
+    return 0
+  fi
+
+  mkdir -p "${logs_dir}"
+  if ! unzip -qq -o "${zip_path}" -d "${logs_dir}"; then
+    return 0
+  fi
+
+  token_value="$(find "${logs_dir}" -type f -print 2>/dev/null | while IFS= read -r file_path; do
+    [[ -n "${file_path}" ]] || continue
+    awk -v cutoff_epoch="${cutoff_epoch}" '
+      match($0, /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(\.[0-9]+)?Z/, ts) {
+        entry_epoch = mktime(ts[1] " " ts[2] " " ts[3] " " ts[4] " " ts[5] " " ts[6], 1)
+        if (entry_epoch >= cutoff_epoch && match($0, /login\?t=[A-Za-z0-9]+/)) {
+          token = substr($0, RSTART, RLENGTH)
+          sub(/^login\?t=/, "", token)
+          print token
+          exit
+        }
+      }
+    ' "${file_path}"
+  done | head -n1 || true)"
+
+  if [[ -z "${token_value}" ]]; then
+    return 0
+  fi
+
+  if [[ -n "${token_value}" ]]; then
+    printf '%s\n' "${token_value}"
+  fi
+}
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --resource-group|-g)
+      resource_group="${2:-}"
+      shift 2
+      ;;
+    --dashboard-app-name|-n)
+      dashboard_app_name="${2:-}"
+      shift 2
+      ;;
+    --token-timeout-seconds|-t)
+      token_timeout_seconds="${2:-}"
+      shift 2
+      ;;
+    --help|-h)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      usage
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "${resource_group}" ]]; then
+  echo "Missing required argument: --resource-group" >&2
+  usage
+  exit 1
+fi
+
+if ! command -v az >/dev/null 2>&1; then
+  echo "Azure CLI 'az' is not installed or not on PATH." >&2
+  exit 1
+fi
+
+if [[ -z "${dashboard_app_name}" ]]; then
+  dashboard_app_name="$(az webapp list --resource-group "${resource_group}" --query "[?contains(name, 'aspire-dashboard')].name | [0]" -o tsv)"
+fi
+
+if [[ -z "${dashboard_app_name}" ]]; then
+  echo "Unable to auto-detect the dashboard app name in resource group '${resource_group}'." >&2
+  echo "Re-run with --dashboard-app-name <app-name>." >&2
+  exit 1
+fi
+
+host_name="$(az webapp show --resource-group "${resource_group}" --name "${dashboard_app_name}" --query defaultHostName -o tsv)"
+
+if [[ -z "${host_name}" ]]; then
+  echo "Unable to resolve dashboard host name for app '${dashboard_app_name}'." >&2
+  exit 1
+fi
+
+token=""
+token="$(extract_token_from_recent_logs)"
+
+if [[ -z "${token}" ]] && command -v timeout >/dev/null 2>&1; then
+  token="$(timeout "${token_timeout_seconds}s" az webapp log tail --resource-group "${resource_group}" --name "${dashboard_app_name}" 2>&1 | grep -oEm1 'login\?t=[A-Za-z0-9]+' | cut -d= -f2 || true)"
+elif [[ -z "${token}" ]]; then
+  token="$(az webapp log tail --resource-group "${resource_group}" --name "${dashboard_app_name}" 2>&1 | grep -oEm1 'login\?t=[A-Za-z0-9]+' | cut -d= -f2 || true)"
+fi
+
+echo "Dashboard app: ${dashboard_app_name}"
+echo "Dashboard URL: https://${host_name}"
+
+if [[ -n "${token}" ]]; then
+  echo "Login URL: https://${host_name}/login?t=${token}"
+else
+  echo "Token not found in the last ${log_lookback_minutes} minutes of logs or within ${token_timeout_seconds}s of live tailing."
+  echo "Open the dashboard URL and, if prompted, run this script again with a larger timeout."
+fi
diff --git a/azure/scripts/package-dotnet-service.sh b/azure/scripts/package-dotnet-service.sh
new file mode 100644
index 00000000..28022fa3
--- /dev/null
+++ b/azure/scripts/package-dotnet-service.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+service_name="${1:?service name is required}"
+project_file="${2:?project file is required}"
+target_framework="${3:-${AZD_DOTNET_TARGET_FRAMEWORK:-${DOTNET_TARGET_FRAMEWORK:-}}}"
+
+if [[ -z "${target_framework}" ]]; then
+	echo "Target framework is required. Set AZD_DOTNET_TARGET_FRAMEWORK (or DOTNET_TARGET_FRAMEWORK), or pass a third argument." >&2
+	exit 1
+fi
+
+azure_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+output_dir="${azure_dir}/.azd/packages/${service_name}"
+
+rm -rf "${output_dir}"
+mkdir -p "${output_dir}"
+
+dotnet publish "${project_file}" -c Release -f "${target_framework}" -o "${output_dir}"
diff --git a/azure/scripts/run-products-db-migrations.ps1 b/azure/scripts/run-products-db-migrations.ps1
new file mode 100644
index 00000000..57dbe0f1
--- /dev/null
+++ b/azure/scripts/run-products-db-migrations.ps1
@@ -0,0 +1,153 @@
+$ErrorActionPreference = 'Stop'
+
+# Runs Contoso *.Database DbEx migrations against their provisioned database providers.
+# Products runs on Postgres, and all other domains continue to run on Azure SQL.
+
+$scriptDir = Split-Path -Parent $PSCommandPath
+$azureDir = Resolve-Path (Join-Path $scriptDir '..')
+$repoRoot = Resolve-Path (Join-Path $azureDir '..')
+
+if (-not (Get-Command azd -ErrorAction SilentlyContinue)) {
+    throw "The 'azd' command is required to resolve environment values."
+}
+
+function Get-AzdEnvValue {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $Key
+    )
+
+    try {
+        $value = (azd env get-value $Key 2>$null).Trim()
+    }
+    catch {
+        return $null
+    }
+
+    if ([string]::IsNullOrWhiteSpace($value) -or $value.StartsWith('ERROR:')) {
+        return $null
+    }
+
+    return $value
+}
+
+$targetFramework = if ($env:AZD_DOTNET_TARGET_FRAMEWORK) {
+    $env:AZD_DOTNET_TARGET_FRAMEWORK
+}
+elseif ($env:DOTNET_TARGET_FRAMEWORK) {
+    $env:DOTNET_TARGET_FRAMEWORK
+}
+elseif ((dotnet --list-runtimes) -match 'Microsoft\.NETCore\.App 10\.') {
+    'net10.0'
+}
+elseif ((dotnet --list-runtimes) -match 'Microsoft\.NETCore\.App 9\.') {
+    'net9.0'
+}
+else {
+    'net8.0'
+}
+$sqlServer = Get-AzdEnvValue -Key 'sqlServerName'
+$sqlDatabase = Get-AzdEnvValue -Key 'sqlDatabaseName'
+$postgresServer = Get-AzdEnvValue -Key 'postgresServerName'
+$postgresDatabase = Get-AzdEnvValue -Key 'postgresDatabaseName'
+$sqlAdminLogin = if ($env:AZURE_SQL_ADMIN_LOGIN) { $env:AZURE_SQL_ADMIN_LOGIN } else { 'coreexadmin' }
+$sqlPassword = $env:AZURE_SQL_ADMIN_PASSWORD
+$postgresAdminLogin = if ($env:AZURE_POSTGRES_ADMIN_LOGIN) { $env:AZURE_POSTGRES_ADMIN_LOGIN } else { 'coreexpgadmin' }
+$postgresPassword = $env:AZURE_POSTGRES_ADMIN_PASSWORD
+
+if ([string]::IsNullOrWhiteSpace($sqlServer) -or [string]::IsNullOrWhiteSpace($sqlDatabase) -or [string]::IsNullOrWhiteSpace($postgresServer) -or [string]::IsNullOrWhiteSpace($postgresDatabase)) {
+    throw "Missing required azd environment outputs (sqlServerName/sqlDatabaseName/postgresServerName/postgresDatabaseName). Run 'azd provision --no-prompt' (or 'azd up --no-prompt') to refresh environment outputs before deploy."
+}
+
+if ([string]::IsNullOrWhiteSpace($sqlPassword)) {
+    $sqlPassword = Get-AzdEnvValue -Key 'AZURE_SQL_ADMIN_PASSWORD'
+}
+
+if ([string]::IsNullOrWhiteSpace($postgresPassword)) {
+    $postgresPassword = Get-AzdEnvValue -Key 'AZURE_POSTGRES_ADMIN_PASSWORD'
+}
+
+if ([string]::IsNullOrWhiteSpace($postgresPassword)) {
+    $postgresPassword = $sqlPassword
+}
+
+if ([string]::IsNullOrWhiteSpace($sqlPassword) -or [string]::IsNullOrWhiteSpace($postgresPassword)) {
+    throw 'Database admin passwords are required to run DbEx migrations.'
+}
+$sqlConnectionString = "Server=tcp:$sqlServer.database.windows.net,1433;Initial Catalog=$sqlDatabase;User ID=$sqlAdminLogin;Password=$sqlPassword;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+$postgresConnectionString = "Server=$postgresServer.postgres.database.azure.com;Port=5432;Database=$postgresDatabase;User Id=$postgresAdminLogin;Password=$postgresPassword;Ssl Mode=Require;"
+$projects = Get-ChildItem -LiteralPath (Join-Path $repoRoot 'samples/src') -Recurse -File -Filter 'Contoso.*.Database.csproj' |
+    Sort-Object FullName
+
+if ($projects.Count -eq 0) {
+    throw 'No Contoso database projects were found under samples/src.'
+}
+
+Write-Host "Running DbEx migrations for $($projects.Count) database project(s) using framework '$targetFramework' with domain-specific database providers."
+
+$requiresSqlFirewall = $false
+foreach ($project in $projects) {
+    $projectName = [System.IO.Path]::GetFileNameWithoutExtension($project.Name)
+    if ($projectName -ne 'Contoso.Products.Database') {
+        $requiresSqlFirewall = $true
+        break
+    }
+}
+
+if ($requiresSqlFirewall) {
+    & (Join-Path $scriptDir 'ensure-sql-firewall-rule.ps1')
+}
+
+foreach ($project in $projects) {
+    $projectDir = $project.Directory.FullName
+    $projectName = [System.IO.Path]::GetFileNameWithoutExtension($project.Name)
+    $domainName = $projectName -replace '\\.Database$', ''
+    $testCommonProject = Join-Path $repoRoot "samples/tests/$domainName.Test.Common/$domainName.Test.Common.csproj"
+    $migrationCommand = 'Migrate'
+    $extraArgs = @()
+    $promptArgs = @()
+
+    # Remove Windows zone marker sidecar files to avoid embedding/executing them as migration resources on Linux.
+    $zoneFiles = Get-ChildItem -LiteralPath $projectDir -Recurse -File | Where-Object { $_.Name -like '*:Zone.Identifier' }
+    if ($zoneFiles.Count -gt 0) {
+        Write-Host "Removing $($zoneFiles.Count) Zone.Identifier sidecar file(s) from $projectName."
+        $zoneFiles | Remove-Item -Force
+    }
+
+    if (Test-Path -LiteralPath $testCommonProject) {
+        $testCommonDir = Split-Path -Parent $testCommonProject
+        $testCommonName = [System.IO.Path]::GetFileNameWithoutExtension($testCommonProject)
+
+        $zoneFiles = Get-ChildItem -LiteralPath $testCommonDir -Recurse -File | Where-Object { $_.Name -like '*:Zone.Identifier' }
+        if ($zoneFiles.Count -gt 0) {
+            Write-Host "Removing $($zoneFiles.Count) Zone.Identifier sidecar file(s) from $testCommonName."
+            $zoneFiles | Remove-Item -Force
+        }
+
+        dotnet build $testCommonProject -c Release -f $targetFramework | Out-Null
+        $testCommonAssembly = Join-Path $testCommonDir "bin/Release/$targetFramework/$testCommonName.dll"
+        if (Test-Path -LiteralPath $testCommonAssembly) {
+            $migrationCommand = 'ResetAndAll'
+            $extraArgs = @('--assembly', $testCommonAssembly)
+            $promptArgs = @('--accept-prompts')
+        }
+    }
+
+    $connectionString = $sqlConnectionString
+    $connectionTarget = "Azure SQL database '$sqlDatabase'"
+    if ($projectName -eq 'Contoso.Products.Database') {
+        $connectionString = $postgresConnectionString
+        $connectionTarget = "Azure Postgres database '$postgresDatabase'"
+    }
+
+    if ($projectName -eq 'Contoso.Products.Database' -and $migrationCommand -eq 'ResetAndAll') {
+        Write-Host "Running $projectName migrations (Migrate + Schema + ResetAndData) against $connectionTarget."
+        dotnet run --project $project.FullName -c Release -f $targetFramework -- --connection-string $connectionString Migrate
+        dotnet run --project $project.FullName -c Release -f $targetFramework -- --connection-string $connectionString Schema
+        dotnet run --project $project.FullName -c Release -f $targetFramework -- --connection-string $connectionString @promptArgs @extraArgs ResetAndData
+        continue
+    }
+
+    Write-Host "Running $projectName migrations ($migrationCommand) against $connectionTarget."
+    dotnet run --project $project.FullName -c Release -f $targetFramework -- --connection-string $connectionString @promptArgs @extraArgs $migrationCommand
+}
diff --git a/azure/scripts/run-products-db-migrations.sh b/azure/scripts/run-products-db-migrations.sh
new file mode 100755
index 00000000..a792c4ad
--- /dev/null
+++ b/azure/scripts/run-products-db-migrations.sh
@@ -0,0 +1,149 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Runs Contoso *.Database DbEx migrations against their provisioned database providers.
+# Products runs on Postgres, and all other domains continue to run on Azure SQL.
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+azure_dir="$(cd "${script_dir}/.." && pwd)"
+repo_root="$(cd "${azure_dir}/.." && pwd)"
+
+if ! command -v azd >/dev/null 2>&1; then
+  echo "The 'azd' command is required to resolve environment values." >&2
+  exit 1
+fi
+
+get_azd_value() {
+  local key="${1:?key is required}"
+  local value
+  if ! value="$(azd env get-value "${key}" 2>/dev/null | tr -d '\r')"; then
+    return 1
+  fi
+
+  if [[ -z "${value}" || "${value}" == ERROR:* ]]; then
+    return 1
+  fi
+
+  printf '%s' "${value}"
+}
+
+target_framework="${AZD_DOTNET_TARGET_FRAMEWORK:-${DOTNET_TARGET_FRAMEWORK:-}}"
+if [[ -z "${target_framework}" ]]; then
+  if dotnet --list-runtimes | grep -q "Microsoft.NETCore.App 10\."; then
+    target_framework="net10.0"
+  elif dotnet --list-runtimes | grep -q "Microsoft.NETCore.App 9\."; then
+    target_framework="net9.0"
+  else
+    target_framework="net8.0"
+  fi
+fi
+sql_server="$(get_azd_value sqlServerName || true)"
+sql_database="$(get_azd_value sqlDatabaseName || true)"
+postgres_server="$(get_azd_value postgresServerName || true)"
+postgres_database="$(get_azd_value postgresDatabaseName || true)"
+sql_admin_login="${AZURE_SQL_ADMIN_LOGIN:-coreexadmin}"
+sql_password="${AZURE_SQL_ADMIN_PASSWORD:-}"
+postgres_admin_login="${AZURE_POSTGRES_ADMIN_LOGIN:-coreexpgadmin}"
+postgres_password="${AZURE_POSTGRES_ADMIN_PASSWORD:-}"
+
+if [[ -z "${sql_server}" || -z "${sql_database}" || -z "${postgres_server}" || -z "${postgres_database}" ]]; then
+  echo "Missing required azd environment outputs (sqlServerName/sqlDatabaseName/postgresServerName/postgresDatabaseName)." >&2
+  echo "Run 'azd provision --no-prompt' (or 'azd up --no-prompt') to refresh environment outputs before deploy." >&2
+  exit 1
+fi
+
+if [[ -z "${sql_password}" ]]; then
+  sql_password="$(get_azd_value AZURE_SQL_ADMIN_PASSWORD || true)"
+fi
+
+if [[ -z "${postgres_password}" ]]; then
+  postgres_password="$(get_azd_value AZURE_POSTGRES_ADMIN_PASSWORD || true)"
+fi
+
+if [[ -z "${postgres_password}" ]]; then
+  postgres_password="${sql_password}"
+fi
+
+if [[ -z "${sql_password}" || -z "${postgres_password}" ]]; then
+  echo "Database admin passwords are required to run DbEx migrations." >&2
+  exit 1
+fi
+
+sql_connection_string="Server=tcp:${sql_server}.database.windows.net,1433;Initial Catalog=${sql_database};User ID=${sql_admin_login};Password=${sql_password};Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;"
+postgres_connection_string="Server=${postgres_server}.postgres.database.azure.com;Port=5432;Database=${postgres_database};User Id=${postgres_admin_login};Password=${postgres_password};Ssl Mode=Require;"
+
+readarray -t projects < <(find "${repo_root}/samples/src" -maxdepth 2 -type f -name 'Contoso.*.Database.csproj' | sort)
+if [[ ${#projects[@]} -eq 0 ]]; then
+  echo "No Contoso database projects were found under samples/src." >&2
+  exit 1
+fi
+
+echo "Running DbEx migrations for ${#projects[@]} database project(s) using framework '${target_framework}' with domain-specific database providers."
+
+requires_sql_firewall=0
+for project in "${projects[@]}"; do
+  project_name="$(basename "${project}" .csproj)"
+  if [[ "${project_name}" != "Contoso.Products.Database" ]]; then
+    requires_sql_firewall=1
+    break
+  fi
+done
+
+if [[ ${requires_sql_firewall} -eq 1 ]]; then
+  bash "${script_dir}/ensure-sql-firewall-rule.sh"
+fi
+
+for project in "${projects[@]}"; do
+  project_dir="$(dirname "${project}")"
+  project_file_name="$(basename "${project}")"
+  project_name="${project_file_name%.csproj}"
+  domain_name="${project_name%.Database}"
+  test_common_project="${repo_root}/samples/tests/${domain_name}.Test.Common/${domain_name}.Test.Common.csproj"
+  migration_command="Migrate"
+  extra_args=()
+  prompt_args=()
+
+  # Remove Windows zone marker sidecar files to avoid embedding/executing them as migration resources on Linux.
+  zone_file_count="$(find "${project_dir}" -type f -name '*:Zone.Identifier' | wc -l | tr -d ' ')"
+  if [[ "${zone_file_count}" != "0" ]]; then
+    echo "Removing ${zone_file_count} Zone.Identifier sidecar file(s) from ${project_name}."
+    find "${project_dir}" -type f -name '*:Zone.Identifier' -delete
+  fi
+
+  if [[ -f "${test_common_project}" ]]; then
+    test_common_dir="$(dirname "${test_common_project}")"
+    test_common_name="$(basename "${test_common_project}" .csproj)"
+
+    zone_file_count="$(find "${test_common_dir}" -type f -name '*:Zone.Identifier' | wc -l | tr -d ' ')"
+    if [[ "${zone_file_count}" != "0" ]]; then
+      echo "Removing ${zone_file_count} Zone.Identifier sidecar file(s) from ${test_common_name}."
+      find "${test_common_dir}" -type f -name '*:Zone.Identifier' -delete
+    fi
+
+    dotnet build "${test_common_project}" -c Release -f "${target_framework}" >/dev/null
+    test_common_assembly="${test_common_dir}/bin/Release/${target_framework}/${test_common_name}.dll"
+    if [[ -f "${test_common_assembly}" ]]; then
+      migration_command="ResetAndAll"
+      extra_args=(--assembly "${test_common_assembly}")
+      prompt_args=(--accept-prompts)
+    fi
+  fi
+
+  connection_string="${sql_connection_string}"
+  connection_target="Azure SQL database '${sql_database}'"
+  if [[ "${project_name}" == "Contoso.Products.Database" ]]; then
+    connection_string="${postgres_connection_string}"
+    connection_target="Azure Postgres database '${postgres_database}'"
+  fi
+
+  if [[ "${project_name}" == "Contoso.Products.Database" && "${migration_command}" == "ResetAndAll" ]]; then
+    echo "Running ${project_name} migrations (Migrate + Schema + ResetAndData) against ${connection_target}."
+    dotnet run --project "${project}" -c Release -f "${target_framework}" -- --connection-string "${connection_string}" Migrate
+    dotnet run --project "${project}" -c Release -f "${target_framework}" -- --connection-string "${connection_string}" Schema
+    dotnet run --project "${project}" -c Release -f "${target_framework}" -- --connection-string "${connection_string}" "${prompt_args[@]}" "${extra_args[@]}" ResetAndData
+    continue
+  fi
+
+  echo "Running ${project_name} migrations (${migration_command}) against ${connection_target}."
+  dotnet run --project "${project}" -c Release -f "${target_framework}" -- --connection-string "${connection_string}" "${prompt_args[@]}" "${extra_args[@]}" "${migration_command}"
+done
diff --git a/azure/scripts/setup-e2e-runner.ps1 b/azure/scripts/setup-e2e-runner.ps1
new file mode 100644
index 00000000..250be236
--- /dev/null
+++ b/azure/scripts/setup-e2e-runner.ps1
@@ -0,0 +1,164 @@
+#Requires -Version 7
+[CmdletBinding()]
+param (
+    [Alias('g')]
+    [Parameter(Mandatory)]
+    [string] $ResourceGroup,
+
+    [Alias('a')]
+    [string] $AppsettingsPath,
+
+    [Alias('k')]
+    [string] $KeyVaultName,
+
+    [Alias('p')]
+    [string] $ProductsAppName,
+
+    [Alias('s')]
+    [string] $ShoppingAppName,
+
+    [Alias('i')]
+    [Alias('SkipCertificateValidation')]
+    [switch] $Insecure,
+
+    [switch] $SkipValidation
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$repoRoot  = Resolve-Path (Join-Path $scriptDir '../..')
+
+if (-not $AppsettingsPath) {
+    $AppsettingsPath = Join-Path $repoRoot 'samples/tests/Contoso.E2E.Runner/appsettings.json'
+}
+
+# Verify prerequisites.
+if (-not (Get-Command az -ErrorAction SilentlyContinue)) {
+    Write-Error "Azure CLI 'az' is not installed or not on PATH."
+    exit 1
+}
+
+if (-not (Test-Path $AppsettingsPath)) {
+    Write-Error "The E2E runner appsettings file was not found at '$AppsettingsPath'."
+    exit 1
+}
+
+function Invoke-ValidateRequest {
+    param (
+        [string] $Label,
+        [string] $Url,
+        [string] $Method = 'GET',
+        [switch] $Insecure
+    )
+
+    $code = $null
+    try {
+        $invokeWebRequestParams = @{
+            Uri             = $Url
+            Method          = $Method
+            UseBasicParsing = $true
+            ErrorAction     = 'Stop'
+        }
+
+        if ($Insecure) {
+            $invokeWebRequestParams['SkipCertificateCheck'] = $true
+        }
+
+        $response = Invoke-WebRequest @invokeWebRequestParams
+        $code = [int]$response.StatusCode
+    }
+    catch [Microsoft.PowerShell.Commands.HttpResponseException] {
+        $code = [int]$_.Exception.Response.StatusCode
+    }
+    catch {
+        Write-Error "Validation failed for ${Label}: ${Method} ${Url} — $($_.Exception.Message)"
+        exit 1
+    }
+
+    if (-not $code -or $code -lt 200 -or $code -ge 400) {
+        Write-Error "Validation failed for ${Label}: ${Method} ${Url} returned HTTP ${code}."
+        exit 1
+    }
+
+    Write-Host "Validated ${Label}: ${Method} ${Url} (${code})"
+}
+
+# Auto-detect app names.
+if (-not $ProductsAppName) {
+    $ProductsAppName = (az webapp list --resource-group $ResourceGroup --query "[?contains(name, 'products-api')].name | [0]" -o tsv)
+}
+
+if (-not $ShoppingAppName) {
+    $ShoppingAppName = (az webapp list --resource-group $ResourceGroup --query "[?contains(name, 'shopping-api')].name | [0]" -o tsv)
+}
+
+if (-not $ProductsAppName -or -not $ShoppingAppName) {
+    Write-Error "Unable to auto-detect the Products or Shopping API app names in resource group '$ResourceGroup'. Re-run with -ProductsAppName and -ShoppingAppName."
+    exit 1
+}
+
+$productsHost = (az webapp show --resource-group $ResourceGroup --name $ProductsAppName --query defaultHostName -o tsv)
+$shoppingHost = (az webapp show --resource-group $ResourceGroup --name $ShoppingAppName --query defaultHostName -o tsv)
+
+if (-not $productsHost -or -not $shoppingHost) {
+    Write-Error "Unable to resolve one or more app host names."
+    exit 1
+}
+
+# Auto-detect Key Vault.
+if (-not $KeyVaultName) {
+    $KeyVaultName = (az keyvault list --resource-group $ResourceGroup --query '[0].name' -o tsv)
+}
+
+if (-not $KeyVaultName) {
+    Write-Error "Unable to auto-detect the Key Vault in resource group '$ResourceGroup'. Re-run with -KeyVaultName <name>."
+    exit 1
+}
+
+$postgresConnectionString = (az keyvault secret show --vault-name $KeyVaultName --name postgres-connection-string --query value -o tsv)
+$sqlConnectionString      = (az keyvault secret show --vault-name $KeyVaultName --name sql-connection-string      --query value -o tsv)
+
+if (-not $postgresConnectionString -or -not $sqlConnectionString) {
+    Write-Error "Unable to retrieve one or more connection strings from Key Vault '$KeyVaultName'."
+    exit 1
+}
+
+# Validate endpoints.
+if (-not $SkipValidation) {
+    Invoke-ValidateRequest -Label 'Products API'     -Url "https://${productsHost}/api/products" -Insecure:$Insecure
+    Invoke-ValidateRequest -Label 'Shopping API'     -Url "https://${shoppingHost}/api/customers/test/baskets" -Method POST -Insecure:$Insecure
+    Invoke-ValidateRequest -Label 'Products health'  -Url "https://${productsHost}/health/ready/detailed" -Insecure:$Insecure
+    Invoke-ValidateRequest -Label 'Products swagger' -Url "https://${productsHost}/swagger" -Insecure:$Insecure
+    Invoke-ValidateRequest -Label 'Shopping health'  -Url "https://${shoppingHost}/health/ready/detailed" -Insecure:$Insecure
+    Invoke-ValidateRequest -Label 'Shopping swagger' -Url "https://${shoppingHost}/swagger" -Insecure:$Insecure
+}
+
+# Update appsettings.json.
+$backupPath = "${AppsettingsPath}.bak"
+Copy-Item -Path $AppsettingsPath -Destination $backupPath -Force
+
+$settings = Get-Content $AppsettingsPath -Raw | ConvertFrom-Json -AsHashtable
+
+if (-not $settings.ContainsKey('E2E'))                          { $settings['E2E'] = @{} }
+if (-not $settings['E2E'].ContainsKey('Products'))              { $settings['E2E']['Products'] = @{} }
+if (-not $settings['E2E'].ContainsKey('Shopping'))              { $settings['E2E']['Shopping'] = @{} }
+
+$settings['E2E']['Products']['BaseAddress']      = "https://${productsHost}"
+$settings['E2E']['Products']['ConnectionString'] = $postgresConnectionString
+$settings['E2E']['Shopping']['BaseAddress']      = "https://${shoppingHost}"
+$settings['E2E']['Shopping']['ConnectionString'] = $sqlConnectionString
+
+$settings | ConvertTo-Json -Depth 10 | Set-Content -Path $AppsettingsPath -Encoding utf8
+
+Write-Host "Updated E2E runner configuration: $AppsettingsPath"
+Write-Host "Backup created: $backupPath"
+Write-Host "Products BaseAddress: https://$productsHost"
+Write-Host "Shopping BaseAddress: https://$shoppingHost"
+Write-Host "Key Vault: $KeyVaultName"
+Write-Host ""
+Write-Host "Next step:"
+Write-Host "  cd $repoRoot/samples/tests/Contoso.E2E.Runner"
+$targetFramework = $env:AZD_DOTNET_TARGET_FRAMEWORK ?? $env:DOTNET_TARGET_FRAMEWORK
+Write-Host "  dotnet run --framework `"$targetFramework`""
diff --git a/azure/scripts/setup-e2e-runner.sh b/azure/scripts/setup-e2e-runner.sh
new file mode 100755
index 00000000..f4bf5e9c
--- /dev/null
+++ b/azure/scripts/setup-e2e-runner.sh
@@ -0,0 +1,228 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+usage() {
+  cat <<'EOF'
+Usage:
+  ./scripts/setup-e2e-runner.sh --resource-group <resource-group> [--appsettings-path <path>] [--key-vault-name <name>] [--products-app-name <name>] [--shopping-app-name <name>] [--skip-validation] [--insecure]
+
+Description:
+  Discovers the deployed Products and Shopping API endpoints, retrieves the
+  database connection strings from Key Vault, validates the deployed APIs, and
+  updates the E2E runner appsettings.json for Products and Shopping.
+
+Options:
+  --resource-group, -g      Azure resource group name (required).
+  --appsettings-path, -a    Path to the E2E runner appsettings.json file.
+                            Defaults to samples/tests/Contoso.E2E.Runner/appsettings.json.
+  --key-vault-name, -k      Key Vault name. Auto-detected when omitted.
+  --products-app-name, -p   Products API web app name. Auto-detected when omitted.
+  --shopping-app-name, -s   Shopping API web app name. Auto-detected when omitted.
+  --skip-validation         Skip the endpoint validation checks.
+  --insecure                Disable TLS certificate verification for validation requests.
+  --help, -h                Show this help.
+EOF
+}
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+repo_root="$(cd "${script_dir}/../.." && pwd)"
+
+resource_group=""
+appsettings_path="${repo_root}/samples/tests/Contoso.E2E.Runner/appsettings.json"
+key_vault_name=""
+products_app_name=""
+shopping_app_name=""
+skip_validation="false"
+insecure="false"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --resource-group|-g)
+      resource_group="${2:-}"
+      shift 2
+      ;;
+    --appsettings-path|-a)
+      appsettings_path="${2:-}"
+      shift 2
+      ;;
+    --key-vault-name|-k)
+      key_vault_name="${2:-}"
+      shift 2
+      ;;
+    --products-app-name|-p)
+      products_app_name="${2:-}"
+      shift 2
+      ;;
+    --shopping-app-name|-s)
+      shopping_app_name="${2:-}"
+      shift 2
+      ;;
+    --skip-validation)
+      skip_validation="true"
+      shift
+      ;;
+    --insecure)
+      insecure="true"
+      shift
+      ;;
+    --help|-h)
+      usage
+      exit 0
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      usage
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "${resource_group}" ]]; then
+  echo "Missing required argument: --resource-group" >&2
+  usage
+  exit 1
+fi
+
+if ! command -v az >/dev/null 2>&1; then
+  echo "Azure CLI 'az' is not installed or not on PATH." >&2
+  exit 1
+fi
+
+if ! command -v curl >/dev/null 2>&1; then
+  echo "curl is required but was not found on PATH." >&2
+  exit 1
+fi
+
+if [[ ! -f "${appsettings_path}" ]]; then
+  echo "The E2E runner appsettings file was not found at '${appsettings_path}'." >&2
+  exit 1
+fi
+
+get_webapp_host() {
+  local app_name="$1"
+  az webapp show --resource-group "${resource_group}" --name "${app_name}" --query defaultHostName -o tsv
+}
+
+validate_request() {
+  local label="$1"
+  local url="$2"
+  local method="${3:-GET}"
+  local status_code
+  local curl_args=(-sS -o /dev/null -w '%{http_code}' -X "${method}")
+
+  if [[ "${insecure}" == "true" ]]; then
+    curl_args=(-k "${curl_args[@]}")
+  fi
+
+  status_code="$(curl "${curl_args[@]}" "${url}" || true)"
+  if [[ ! "${status_code}" =~ ^[23] ]]; then
+    echo "Validation failed for ${label}: ${method} ${url} returned HTTP ${status_code:-unknown}." >&2
+    exit 1
+  fi
+
+  echo "Validated ${label}: ${method} ${url} (${status_code})"
+}
+
+if [[ -z "${products_app_name}" ]]; then
+  products_app_name="$(az webapp list --resource-group "${resource_group}" --query "[?contains(name, 'products-api')].name | [0]" -o tsv)"
+fi
+
+if [[ -z "${shopping_app_name}" ]]; then
+  shopping_app_name="$(az webapp list --resource-group "${resource_group}" --query "[?contains(name, 'shopping-api')].name | [0]" -o tsv)"
+fi
+
+if [[ -z "${products_app_name}" || -z "${shopping_app_name}" ]]; then
+  echo "Unable to auto-detect the Products or Shopping API app names in resource group '${resource_group}'." >&2
+  echo "Re-run with --products-app-name and --shopping-app-name." >&2
+  exit 1
+fi
+
+products_host="$(get_webapp_host "${products_app_name}")"
+shopping_host="$(get_webapp_host "${shopping_app_name}")"
+
+if [[ -z "${products_host}" || -z "${shopping_host}" ]]; then
+  echo "Unable to resolve one or more app host names." >&2
+  exit 1
+fi
+
+if [[ -z "${key_vault_name}" ]]; then
+  key_vault_name="$(az keyvault list --resource-group "${resource_group}" --query '[0].name' -o tsv)"
+fi
+
+if [[ -z "${key_vault_name}" ]]; then
+  echo "Unable to auto-detect the Key Vault in resource group '${resource_group}'." >&2
+  echo "Re-run with --key-vault-name <name>." >&2
+  exit 1
+fi
+
+postgres_connection_string="$(az keyvault secret show --vault-name "${key_vault_name}" --name postgres-connection-string --query value -o tsv)"
+sql_connection_string="$(az keyvault secret show --vault-name "${key_vault_name}" --name sql-connection-string --query value -o tsv)"
+
+if [[ -z "${postgres_connection_string}" || -z "${sql_connection_string}" ]]; then
+  echo "Unable to retrieve one or more connection strings from Key Vault '${key_vault_name}'." >&2
+  exit 1
+fi
+
+if [[ "${skip_validation}" != "true" ]]; then
+  validate_request "Products API" "https://${products_host}/api/products"
+  validate_request "Shopping API" "https://${shopping_host}/api/customers/test/baskets" POST
+  validate_request "Products health" "https://${products_host}/health/ready/detailed"
+  validate_request "Products swagger" "https://${products_host}/swagger"
+  validate_request "Shopping health" "https://${shopping_host}/health/ready/detailed"
+  validate_request "Shopping swagger" "https://${shopping_host}/swagger"
+fi
+
+backup_path="${appsettings_path}.bak"
+cp "${appsettings_path}" "${backup_path}"
+
+temp_path="$(mktemp)"
+
+if command -v jq >/dev/null 2>&1; then
+  jq \
+    --arg productsBase "https://${products_host}" \
+    --arg productsConnectionString "${postgres_connection_string}" \
+    --arg shoppingBase "https://${shopping_host}" \
+    --arg shoppingConnectionString "${sql_connection_string}" \
+    '.E2E.Products.BaseAddress = $productsBase
+    | .E2E.Products.ConnectionString = $productsConnectionString
+    | .E2E.Shopping.BaseAddress = $shoppingBase
+    | .E2E.Shopping.ConnectionString = $shoppingConnectionString' \
+    "${appsettings_path}" > "${temp_path}"
+elif command -v python3 >/dev/null 2>&1; then
+  python3 - "${appsettings_path}" "${temp_path}" "https://${products_host}" "${postgres_connection_string}" "https://${shopping_host}" "${sql_connection_string}" <<'PY'
+import json
+import sys
+
+source_path, temp_path, products_base, products_cs, shopping_base, shopping_cs = sys.argv[1:7]
+
+with open(source_path, encoding='utf-8') as file:
+    data = json.load(file)
+
+data.setdefault('E2E', {})
+data['E2E'].setdefault('Products', {})
+data['E2E'].setdefault('Shopping', {})
+data['E2E']['Products']['BaseAddress'] = products_base
+data['E2E']['Products']['ConnectionString'] = products_cs
+data['E2E']['Shopping']['BaseAddress'] = shopping_base
+data['E2E']['Shopping']['ConnectionString'] = shopping_cs
+
+with open(temp_path, 'w', encoding='utf-8') as file:
+    json.dump(data, file, indent=2)
+    file.write('\n')
+PY
+else
+  echo "Either jq or python3 is required to update '${appsettings_path}'." >&2
+  exit 1
+fi
+
+mv "${temp_path}" "${appsettings_path}"
+
+echo "Updated E2E runner configuration: ${appsettings_path}"
+echo "Backup created: ${backup_path}"
+echo "Products BaseAddress: https://${products_host}"
+echo "Shopping BaseAddress: https://${shopping_host}"
+echo "Key Vault: ${key_vault_name}"
+echo ""
+echo "Next step:"
+echo "  cd ${repo_root}/samples/tests/Contoso.E2E.Runner"
+echo "  dotnet run --framework \"\${AZD_DOTNET_TARGET_FRAMEWORK:-\$DOTNET_TARGET_FRAMEWORK}\""
\ No newline at end of file
diff --git a/consumer-instructions/.github/copilot-instructions.md b/consumer-instructions/.github/copilot-instructions.md
new file mode 100644
index 00000000..1b0799fa
--- /dev/null
+++ b/consumer-instructions/.github/copilot-instructions.md
@@ -0,0 +1,198 @@
+# CoreEx — AI Coding Context
+
+## What CoreEx Is
+
+CoreEx is a modular .NET framework for enterprise back-end services. It provides opinionated primitives, patterns, and extensions for HTTP API development, data access, event-driven messaging, validation, reference data, caching, and testing. Add it via NuGet — favor CoreEx-native primitives over ad-hoc implementations wherever a CoreEx type or extension exists.
+
+## Package Map
+
+| NuGet Package | Capability |
+|---|---|
+| `CoreEx` | Core: exceptions, `Result<T>`, execution context, DI helpers, entity markers, JSON, mapping, and Roslyn source generator for `[Contract]`-decorated and `[ReferenceData]`-decorated types |
+| `CoreEx.AspNetCore` | HTTP API: `WebApi` helpers, idempotency, health checks, middleware |
+| `CoreEx.AspNetCore.NSwag` | OpenAPI / NSwag integration |
+| `CoreEx.Validation` | Fluent validation: `Validator<T>`, `AbstractValidator<T>`, rules |
+| `CoreEx.EntityFrameworkCore` | EF Core: `EfDb`, `EfDbModel`, `EfDbMappedModel` |
+| `CoreEx.Database` | Core database abstractions: `IDatabase`, `IUnitOfWork` |
+| `CoreEx.Database.SqlServer` | SQL Server: unit of work, outbox publisher, outbox relay |
+| `CoreEx.Database.Postgres` | PostgreSQL: unit of work, outbox publisher, outbox relay |
+| `CoreEx.Events` | Event publishing/subscribing: `EventData`, `IEventPublisher` |
+| `CoreEx.Azure.Messaging.ServiceBus` | Azure Service Bus: subscriber base classes, publisher, receiver wiring |
+| `CoreEx.RefData` | Reference data: `ReferenceData<T>`, `ReferenceDataOrchestrator` |
+| `CoreEx.Caching.FusionCache` | Hybrid L1/L2 cache: FusionCache + Redis backplane |
+| `CoreEx.DomainDriven` | DDD: `Aggregate<TId,TSelf>`, `Entity<TId,TSelf>`, `PersistenceState` |
+| `CoreEx.UnitTesting` | Test helpers: `WithApiTester`, `WithGenericTester`, `Test.Http()` |
+| `CoreEx.CodeGen` | Design-time: generates reference-data C# artefacts from `ref-data.yaml` |
+| `CoreEx.Generator` | Roslyn source generator: emits members for `[Contract]`-decorated types |
+
+## Recommended Layer Structure
+
+CoreEx does not impose a specific folder or project structure. The following layers are a recommended pattern, not a requirement. Introduce only the layers your domain needs.
+
+| Layer | Typical project suffix | Notes |
+|---|---|---|
+| Contracts | `*.Contracts` | DTOs, entity marker interfaces, reference-data types |
+| Application | `*.Application` | Services, validators, repository interfaces, adapters, policies |
+| Domain | `*.Domain` | Aggregates, entities, value objects — optional; introduce only when needed |
+| Infrastructure | `*.Infrastructure` | EF repositories, persistence models, typed HTTP clients, adapter impls |
+| API host | `*.Api` | HTTP composition root — controllers and `Program.cs` |
+| Subscribe host | `*.Subscribe` | Message consumer composition root |
+| Outbox Relay host | `*.Relay` | Relay background service composition root |
+| Database tooling | `*.Database` | Design-time: schema, migrations, outbox provisioning (no runtime presence) |
+| CodeGen tooling | `*.CodeGen` | Design-time: reference-data C# generation (no runtime presence) |
+
+The Domain layer is **optional**. Introduce it only when the domain has aggregates with non-trivial invariants enforced at the model level. Simple CRUD-oriented domains can skip it entirely.
+
+## Universal Rules
+
+### Do Not Fabricate Blockers — Verify, Then Ask
+
+When something appears blocked, broken, or "not generated yet", do **not** invent a root cause and an elaborate workaround. Take the one authoritative action that establishes the truth, then proceed:
+
+- **Need to know the schema / whether a table exists?** Bring the database up to date first with `dotnet run -- database` (non-destructive create + migrate + schema + data), then run `dotnet run -- inspect <schema> <table> ...` — do not guess from the file system.
+- **Generated/partial code seems missing?** Build it (`dotnet build`). The Roslyn source generator and the CodeGen/DbEx tooling produce their output during build — missing output before a build is normal, not an error to hand-fix.
+- **Unsure what a convention is?** Read the matching `*.instructions.md` file before acting.
+
+Do **not** assert unverified root causes (e.g. "circular dependency", "build ordering problem", "the generator can't run because of other errors") — these are usually wrong. Fix the actual reported errors and rebuild.
+
+**Stop looping.** If two attempts at the same fix have not worked, do not keep trying variations of the same thing. **Stop and ask the user** — describe what you tried, the exact error, and the options you see. A short question resolves far more than repeated thrashing, and the user often has context that unblocks it immediately. Never fabricate files, directories, projects, or hand-written generated code to force past a block you do not understand.
+
+**Do not change an agreed decision to make an error disappear.** Once something is settled — most commonly an entity's **identifier type** (`string` by default unless the user explicitly specified otherwise) — it is fixed for the whole task. When a build or migration fails, fix the actual cause; do **not** quietly flip the decision (e.g. switch a `string` id to `UNIQUEIDENTIFIER`/`Guid`, or revert a scaffold default) to silence the error. A failure is never resolved by changing the agreed type. If you believe the decision itself is wrong, stop and ask.
+
+### Never Modify the Database Directly
+
+The AI must **never** alter the database itself to "fix" or "unblock" a problem. This is absolute:
+
+- **Structural changes go through migration scripts only** — author a script (`dotnet run -- script ...`) and apply it via `dotnet run -- migrate` / `database`. Never run ad-hoc `CREATE`/`ALTER`/`DROP` against the live database.
+- **Data changes go through `Data/*.yaml`** (applied by the `Data` command) — never hand-run `INSERT`/`UPDATE`/`DELETE`.
+- **Never touch DbEx's internal migration journal / tracking table.** Do not insert, pre-seed, back-fill, or edit journal rows to stop scripts re-running. The journal is owned exclusively by DbEx.
+- **Do not run `execute`/ad-hoc SQL to reconcile state.**
+
+If `dotnet run -- database` (or `migrate`) fails because the live database is inconsistent with the scripts — e.g. "the journal is empty but the objects already exist", or scripts re-running over existing objects — this is a **state-reconciliation decision that belongs to the user, not the AI**. **Stop and ask.** Present the legitimate options and let them choose, for example: in a disposable local/dev database, drop and rebuild cleanly with `dotnet run -- dropanddatabase` (destructive — confirm first); otherwise the user reconciles the environment manually. Never resolve it by editing the database or its journal yourself.
+
+### Order of Operations — Database First
+
+When a change spans the database, code generation, and hand-written code (e.g. "add an Employee entity with a Gender reference data"), plan and execute **in this exact order**. The database is the baseline everything else is generated from or built on; doing things out of order — CodeGen first, or adding seed rows / `dbex.yaml` tables *before* the tables can be created — is the main cause of confused, churn-y "fixes". **Plan the whole sequence first; do not start a step until the previous one has succeeded.**
+
+1. **Establish & inspect.** Bring the DB up to date (`dotnet run -- database`), then `dotnet run -- inspect <schema> <table>…` to confirm current state and decide create-vs-alter. **If the bring-up fails, STOP and alert the user with the verbatim error — do not proceed, and do not start "fixing" things that may not be broken.**
+2. **Author migration script(s)** for the absent/changed table(s) — `dotnet run -- script refdata|create <schema> <table>`, then fill in the columns (see *Creating or altering a table* in `coreex-tooling.instructions.md`).
+3. **Add reference-data rows** to `Data/ref-data.seed.yaml`.
+4. **Register the tables** in `dbex.yaml` `tables:`.
+5. **Apply & generate (DB side):** `dotnet run -- All` (Create → Migrate → CodeGen → Schema → Data) — Migrate creates the tables, CodeGen generates the EF persistence models from the now-present schema, Data seeds. **If it fails, STOP and alert with the verbatim error** — a broken baseline invalidates everything downstream.
+6. **Generate contracts:** edit `*.CodeGen/ref-data.yaml` and run `dotnet run` (in `*.CodeGen`) for the ref-data contracts/services/repositories/mappers.
+7. **Hand-written .NET code:** application services, validators, controllers, tests — **last**, on the generated baseline.
+
+Steps 3–4 (seed rows, `dbex.yaml` tables) come **after** the migration scripts of step 2 and are only applied/introspected in step 5 — where Migrate creates the tables *before* Data seeds and *before* CodeGen reads them. **Never add seed rows or `dbex.yaml` tables, or run CodeGen, before the tables can be created** (that was the ordering error: seeding/`dbex.yaml` before the create migrations exist makes the bring-up fail).
+
+### Before Generating Any Code
+
+1. Run `Get-ChildItem .github/instructions -File` to enumerate all instruction files.
+2. Identify which instruction files match the target layer (contracts, domain, application, etc.).
+3. Read each matching file in full with `get_file` before writing any code.
+
+### Do Not Create Projects Unless Explicitly Asked
+
+Never create a new project or add a project to the solution (e.g. an `*.Api`, `*.Subscribe`, `*.Relay`, `*.Domain`, `*.CodeGen`, or `*.Database` project) unless the user **explicitly** requests it. Adding a project is a deliberate, structural decision the user owns — it is not something to infer from a feature request ("create a service", "create a contract") or to do in order to "unblock" tooling. In particular, a configured path that points to a not-yet-existing project (e.g. `apiProjectPath` in `ref-data.yaml`) does **not** justify scaffolding that project or creating placeholder folders/files — CodeGen merely warns and skips the missing target (see `coreex-tooling.instructions.md`). If a project genuinely appears to be missing and is needed, raise it with the user and let them decide.
+
+**Adding an API host (the explicit-ask exception).** When the user asks to **create a CRUD API** for an entity, or to create a service **and** expose it via an API, an Api host *is* explicitly requested. If none exists (`**/*.Api/*.Api.csproj` absent), **confirm** where to create it, then scaffold it with the `coreex-api` template — **run from the solution root** (the folder containing `src/` and `tests/`); the template merges its own `src/`/`tests/`, so running it inside `src/` yields nested `src/src/...` paths (if that happens, delete the misplaced output and re-run from the root — do **not** hand-move files). Default its options (`data-provider`, `refdata-enabled`, `outbox-enabled`) from the solution-root **`AGENTS.md` "Feature Configuration"** (the record of the original `coreex` selections; cross-check `dbex.yaml`). Author the controller and keep `AGENTS.md` current in-session; then, as the **final step**, add the new projects to the solution in-session via `dotnet sln add` (host → `/hosts/`, test → `/tests/`). Confirm before creating; never auto-create. Full workflow: `coreex-host-setup.instructions.md` → "Scaffolding an API host".
+
+**Adding the Outbox Relay host (the explicit-ask exception).** When the user explicitly asks to **add/create the outbox relay**, scaffold it with the `coreex-relay` template. First check `**/*.Relay/*.Relay.csproj`: **if it already exists, stop and report it as pre-existing — do nothing else** (the Relay is a single per-solution one-off with no follow-on work). If absent, **confirm**, then scaffold from the solution root (`dotnet new coreex-relay -n {Solution}.Relay`), defaulting **`data-provider`** and **`messaging-provider`** from the **`AGENTS.md` "Feature Configuration"** (cross-check `dbex.yaml`). The Relay is **complete from the template** — no controllers, no reference-data wiring, no Phase-2 uncomment, no extra logic or tests. Update `AGENTS.md`, then add both projects to the solution via `dotnet sln add` (host → `/hosts/`, test → `/tests/`). Confirm before creating; never auto-create. Full workflow: `coreex-host-setup.instructions.md` → "Scaffolding an Outbox Relay host".
+
+**Modifying the solution file (`.slnx`):** the correct command is `dotnet sln <Solution>.slnx add <project>.csproj --solution-folder <folder>` (and `remove`) — it supports `.slnx` and creates the folder as needed; **never hand-edit the `.slnx` XML** (manual edits are error-prone and have wiped solution files). Run the `dotnet sln add` **in-session as the final step**, after all code is written, verified, and `AGENTS.md` is updated — so it cannot interrupt pending work. **Exception:** if the solution is open in **Visual Studio**, writing the `.slnx` triggers a reload that can discard pending changes — *only then* defer the commands to **Manual steps** (see below).
+
+**Manual steps (end-of-task hand-off).** Reserve the **"Manual steps"** hand-off for actions the agent genuinely should not perform itself — e.g. `.slnx` changes **when the solution is open in Visual Studio** (the IDE-reload exception above), or steps that require credentials/external systems the agent cannot reach. These are now the exception, not the norm: the `dotnet sln add` is performed in-session by default. When you do hand off, end the response with a single numbered, copy-pasteable checklist, each command with a one-line reason; batch to minimise writes — one `dotnet sln add` per target solution-folder (a single call takes multiple project paths).
+
+Verify **before** the project is in the solution: build and test a new or edited project **by its `.csproj` path** — `dotnet build <project>.csproj`, `dotnet test <testproject>.csproj` — which also builds its referenced projects (compilation does not require solution membership). Do **not** rely on a solution-wide build to verify a project not yet added to the `.slnx` — it would silently skip it. Add it to the solution as the final step, then a `dotnet build <Solution>.slnx` confirms the wiring.
+
+### Validator Unit Tests
+
+Validators are the primary unit-test target. When you create or change a validator, plan to **offer** to create/update its matching `{Validator}Tests` (in `*.Test.Unit/Validators/`) in the same change — covering both error and success cases. Proceed if the user declines or defers, but note the coverage gap. See `coreex-validators.instructions.md` and `coreex-tests.instructions.md`.
+
+### Using Statements
+
+Every project has a single `GlobalUsing.cs` at its root where all namespace imports are declared. When emitting code, do **not** add `using` statements to individual files. If a referenced namespace is missing, add the `global using` to that project's `GlobalUsing.cs` instead. If unsure whether an import already exists, check the project's `GlobalUsing.cs` and amend it — unless the user has explicitly instructed otherwise. Whenever you edit `GlobalUsing.cs`, re-sort the entire file alphabetically (all namespaces sorted equally) rather than appending to the end.
+
+### Always Prefer CoreEx Primitives
+
+- Use CoreEx exception types — `NotFoundException`, `ValidationException`, `BusinessException`, `ConcurrencyException`, `AuthenticationException`, `AuthorizationException`. These auto-map to correct HTTP status codes via `UseCoreExExceptionHandler()`.
+- Use `Result<T>` pipelines for multi-step orchestration, aggregate-oriented flows, and subscriber handlers.
+- Use exception-based flow for simpler CRUD-oriented services where pipeline composition adds no value.
+- Use `WebApi` helpers in controllers — never return typed `ActionResult<T>` directly.
+- Use `[ScopedService<TInterface>]` on service and repository classes for automatic DI discovery — avoid manual `services.AddScoped<>()` registration.
+- Use `AddDynamicServicesUsing(...)` in `Program.cs` to register `[ScopedService]`-decorated types — it scans whole **assemblies**. The hosts pass the assemblies via the stable `AssemblyMarker` types (`typeof({Solution}.Application.AssemblyMarker).Assembly`, `…Infrastructure…`), so there is **no compile-time dependency on CodeGen-generated types and no bootstrap/uncomment step** — ref-data wiring is correct as soon as CodeGen runs. Pair it with the **non-generic `AddReferenceDataOrchestrator()`** (binds `IReferenceDataProvider` from DI at runtime). Adding a new entity in an existing assembly does **not** change these calls; add another assembly only for a **new** project with `[ScopedService]` types (e.g. the Subscribe host adds `typeof(Program).Assembly` for its subscribers). Do **not** revert to `AddDynamicServicesUsing<GeneratedType, …>()` / `AddReferenceDataOrchestrator<ReferenceDataService>()`.
+
+### Mapping
+
+- Never use AutoMapper. Use explicit mappers:
+  - `BiDirectionMapper<TFrom, TTo, TSelf>` — Contract ↔ Persistence model (Infrastructure layer).
+  - `Mapper<TSource, TDest, TSelf>` — Domain aggregate ↔ Contract (Application layer, only when a Domain layer exists).
+- Do not conflate the two mapping layers. Infrastructure mapping is a persistence concern; Application mapping is a domain surface concern.
+
+### Async
+
+- Always call `.ConfigureAwait(false)` on every `await` in service, repository, adapter, and validator methods.
+
+### Dependency Direction (strict — enforce at all times)
+
+- Application layer depends inward only: on Contracts and its own interfaces. It must never reference the Infrastructure project.
+- Infrastructure implements Application interfaces — never the reverse.
+- Do not call `HttpClient` directly from services or adapters — use typed HTTP client classes in `Infrastructure/Clients/`.
+- Do not put business logic in controllers or subscribers — delegate immediately to Application-layer services.
+- Do not inject `IUnitOfWork` into controllers — it belongs in application services.
+
+### Events and Unit of Work
+
+- Always wrap database writes **and** event publication together inside `_unitOfWork.TransactionAsync(...)`. Both are committed atomically or not at all.
+- Never publish events outside of `_unitOfWork.TransactionAsync(...)`.
+
+### Generated Code
+
+Never create or edit the following file types directly — they are owned by tooling:
+
+| Pattern | Owner |
+|---|---|
+| `*.g.cs` | `CoreEx.Generator` (contracts) or `*.CodeGen` / `*.Database` tooling |
+| `*.g.sql` / `*.g.pgsql` | `*.Database` tooling (outbox schema objects) |
+
+Regenerate by re-running the relevant tooling project (`dotnet run` in `*.CodeGen` or `*.Database`).
+
+### Database Tables and Migrations
+
+Before authoring any migration script to create or alter a table (e.g. "create a table for the Employee entity"), **bring the database up to date and inspect it first** — run `dotnet run -- database` (non-destructive: create-if-missing + migrate + schema + data) to make the live database reflect all authored scripts, then `dotnet run -- inspect <schema> <table> [<table> ...]` (read-only) and let the result decide whether a script is needed and which kind. The file system is not authoritative: a script under `Migrations/` or an entry in `dbex.yaml` only means it was *authored*, not *applied*. **Never plan or jump straight to a `CREATE`/`ALTER` script without inspecting first** — this is a hard gate. See `coreex-tooling.instructions.md` for the full create/alter workflow.
+
+## Layer Dependency Summary
+
+```
+Host (Api / Subscribe / Relay)   ← composition root only, no business logic
+  └─ Application
+       ├─ Contracts
+       └─ Domain (optional)
+  Infrastructure                 ← implements Application interfaces
+       └─ Contracts
+```
+
+Hosts depend on all layers to compose the application. They contain no business logic.
+
+## Capability-Specific Guidance
+
+File-scoped instruction files provide detailed guidance when you edit matching file types. Copy the relevant files from the CoreEx repo's `.github/instructions/` into your project's `.github/instructions/` folder.
+
+| When editing | Guidance provided by |
+|---|---|
+| `**/Controllers/**/*.cs` | `coreex-api-controllers.instructions.md` |
+| `**/Contracts/**/*.cs` | `coreex-contracts.instructions.md` |
+| `**/Application/**/*.cs` | `coreex-application-services.instructions.md` |
+| `**/Infrastructure/**/*.cs` | `coreex-repositories.instructions.md` |
+| `**/*Validator*.cs` | `coreex-validators.instructions.md` |
+| `**/Program.cs` | `coreex-host-setup.instructions.md` |
+| `**/Subscribe/**/*.cs` | `coreex-event-subscribers.instructions.md` |
+| `**/Domain/**/*.cs` | `coreex-domain.instructions.md` |
+| `**/*.Test*/**/*.cs` | `coreex-tests.instructions.md` |
+| `**/*.CodeGen/**` or `**/*.Database/**` | `coreex-tooling.instructions.md` |
+
+## Further Reading
+
+- [CoreEx on GitHub](https://github.com/Avanade/CoreEx)
+- [Capabilities Guide](https://github.com/Avanade/CoreEx/blob/main/docs/capabilities.md) — deep capability and pattern explanations
+- [Application Scaffolding Guide](https://github.com/Avanade/CoreEx/blob/main/docs/application-scaffolding-guide.md) — deciding what to scaffold for a new service
+- [Sample Reference Architecture](https://github.com/Avanade/CoreEx/tree/main/samples) — complete Contoso domains demonstrating all patterns end-to-end
\ No newline at end of file
diff --git a/consumer-instructions/README.md b/consumer-instructions/README.md
new file mode 100644
index 00000000..42a43879
--- /dev/null
+++ b/consumer-instructions/README.md
@@ -0,0 +1,67 @@
+# CoreEx Consumer AI Context
+
+This folder contains AI context files for developers building services that consume the CoreEx NuGet packages. Drop these files into your own project to give GitHub Copilot (and Claude Code) accurate, CoreEx-specific guidance.
+
+## What's Included
+
+| Path | Purpose |
+|---|---|
+| `.github/copilot-instructions.md` | Global CoreEx context applied to every Copilot interaction |
+
+The per-capability instruction files live in the repo's root [`.github/instructions/`](../.github/instructions/) directory and are shared between framework developers and consumers — no separate consumer copies.
+
+## Setup
+
+### GitHub Copilot
+
+1. Copy `consumer-instructions/.github/copilot-instructions.md` to your project's `.github/copilot-instructions.md`.
+2. Copy the instruction files from the repo's `.github/instructions/` that match what you're building into your project's `.github/instructions/` folder.
+3. If you want the guided greenfield scaffolding workflow in a non-template repository, copy the canonical files from the repo's [`.github/prompts/`](../.github/prompts/) and [`.github/skills/solution-scaffolder/`](../.github/skills/solution-scaffolder/) folders.
+
+Copilot applies the global instructions to every chat interaction and injects the file-scoped instructions automatically based on which file is open. If you copied the greenfield scaffold prompt and skill, run `/coreex-scaffold` to choose the right `CoreEx.Template` commands before generating the solution.
+
+### Claude Code
+
+1. Follow the Copilot setup steps above.
+2. Create a `CLAUDE.md` at your project root that imports the copied files:
+
+```markdown
+@.github/copilot-instructions.md
+@.github/instructions/coreex-api-controllers.instructions.md
+@.github/instructions/coreex-application-services.instructions.md
+@.github/instructions/coreex-repositories.instructions.md
+@.github/instructions/coreex-validators.instructions.md
+@.github/instructions/coreex-host-setup.instructions.md
+```
+
+Add or remove `@` import lines to match which instruction files you copied. Claude Code reads `CLAUDE.md` on startup and follows the imports — no content duplication needed.
+
+If you copied the greenfield scaffold prompt and skill, you can invoke `/coreex-scaffold` directly in Claude Code as well.
+
+## Which Instruction Files to Copy
+
+Copy only the files that match what your project contains. Add more as you introduce new capabilities.
+
+| File | Copy when you have... |
+|---|---|
+| `coreex-api-controllers.instructions.md` | An API host with MVC controllers |
+| `coreex-contracts.instructions.md` | A Contracts project with DTOs / entity types |
+| `coreex-application-services.instructions.md` | An Application layer with services, validators, adapters, policies |
+| `coreex-repositories.instructions.md` | An Infrastructure layer with EF Core repositories |
+| `coreex-validators.instructions.md` | CoreEx validators (`Validator<T>`, `AbstractValidator<T>`) |
+| `coreex-host-setup.instructions.md` | Any `Program.cs` — API, Subscribe, or Outbox Relay host |
+| `coreex-event-subscribers.instructions.md` | A Subscribe host consuming Azure Service Bus messages |
+| `coreex-domain.instructions.md` | A Domain layer with aggregates, entities, value objects |
+| `coreex-tests.instructions.md` | Test projects using `CoreEx.UnitTesting` |
+| `coreex-tooling.instructions.md` | `*.CodeGen` or `*.Database` design-time tooling projects |
+
+## Further Reading
+
+- [CoreEx on GitHub](https://github.com/Avanade/CoreEx)
+- [Capabilities Guide](https://github.com/Avanade/CoreEx/blob/main/docs/capabilities.md) — deep capability and pattern explanations
+- [Application Scaffolding Guide](https://github.com/Avanade/CoreEx/blob/main/docs/application-scaffolding-guide.md) — deciding what to build for a new service
+- [Sample Reference Architecture](https://github.com/Avanade/CoreEx/tree/main/samples) — complete Contoso domains (Products / Shopping) demonstrating all patterns
+
+## Why This Folder Exists
+
+The repo's root [`.github/copilot-instructions.md`](../.github/copilot-instructions.md) is written for contributors working inside the CoreEx repository itself. The consumer version in this folder is a separate, intentionally different file for teams consuming CoreEx from NuGet in their own repositories.
\ No newline at end of file
diff --git a/docker-compose.myHr.override.yml b/docker-compose.myHr.override.yml
deleted file mode 100644
index 3f0b1d66..00000000
--- a/docker-compose.myHr.override.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: '3.4'
-
-# The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine.
-# The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like:
-#     ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost
-# but values present in the environment vars at runtime will always override those defined inside the .env file
-# An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance.
-
-services:
-
-  sqldata:
-    environment:
-      - ACCEPT_EULA=Y
-      - MSSQL_SA_PASSWORD=sAPWD23.^0
-      - MSSQL_TCP_PORT=1433
-      - MSSQL_AGENT_ENABLED=true
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ConnectionStrings__sqlserver:MyHr=Data Source=localhost,1433;Initial Catalog=My.Hr;User id=sa;Password=sAPWD23.^0;TrustServerCertificate=true
-    ports:
-      - "5433:1433"
-    volumes:
-      - myhr-sqldata:/var/opt/mssql
-
-  myhr-api:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionStrings__Database=Data Source=sqldata,1433;Initial Catalog=My.Hr;User id=sa;Password=sAPWD23.^0;TrustServerCertificate=true
-      - PORT=80
-    ports:
-      - "5103:80"
-
-  myhr-functions:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - AZURE_FUNCTIONS_ENVIRONMENT=Development
-      - OpenApi__HideSwaggerUI=false
-      - AgifyApiEndpointUri=https://api.agify.io
-      - NationalizeApiClientApiEndpointUri=https://api.nationalize.io
-      - GenderizeApiClientApiEndpointUri=https://api.genderize.io
-      - VerificationQueueName=pendingVerifications
-      - VerificationResultsQueueName=verificationResults
-      - ConnectionStrings__Database=Data Source=sqldata,1433;Initial Catalog=My.Hr;User id=sa;Password=sAPWD23.^0;TrustServerCertificate=true
-      - PORT=80
-    ports:
-      - "5104:80"
-
-volumes:
-  myhr-sqldata:
-    external: false
diff --git a/docker-compose.myHr.yml b/docker-compose.myHr.yml
deleted file mode 100644
index 47d49ee5..00000000
--- a/docker-compose.myHr.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# To run: docker-compose -f docker-compose.myHr.yml -f docker-compose.myHr.override.yml up
-version: '3.4'
-
-services:
-
-  sqldata:
-    build:
-      context: .
-      dockerfile: samples/My.Hr/My.Hr.Database/Dockerfile
-
-  myhr-api:
-    build:
-      context: .
-      dockerfile: samples/My.Hr/My.Hr.Api/Dockerfile
-    depends_on:
-      - sqldata
-
-  myhr-functions:
-    build:
-      context: .
-      args:
-        LOCAL: "true"
-      dockerfile: samples/My.Hr/My.Hr.Functions/Dockerfile
-    depends_on:
-      - sqldata
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..f88a7114
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,52 @@
+name: CoreEx
+
+services:
+  db-sql-server:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    environment:
+      SA_PASSWORD: "yourStrong(!)Password"
+      ACCEPT_EULA: "Y"
+    ports:
+      - "1433:1433"
+    
+  db-postgres:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: "yourStrong#!Password"
+    ports:
+      - "5432:5432"
+
+  redis-cache:
+    image: docker.io/redis:latest
+    ports:
+      - "6379:6379"
+
+  aspire-dashboard:
+    image: mcr.microsoft.com/dotnet/nightly/aspire-dashboard:latest
+    environment:
+      - DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true
+    ports:
+      - "18888:18888"
+      - "4317:18889"
+
+  servicebus-emulator:
+    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
+    depends_on:
+      - db-sql-server
+    volumes:
+      - ./servicebus/Config.json:/ServiceBus_Emulator/ConfigFiles/Config.json
+    environment:
+      SQL_SERVER: db-sql-server
+      MSSQL_SA_PASSWORD: "yourStrong(!)Password"
+      ACCEPT_EULA: "Y"
+    ports:
+      - "5672:5672"   # AMQP
+      - "5300:5300"   # Management / HTTP
+
+  dts-emulator:
+    image: mcr.microsoft.com/dts/dts-emulator:latest
+    environment:
+      DTS_TASK_HUB_NAMES: "default,order"
+    ports:
+      - "8080:8080"
+      - "8082:8082"
\ No newline at end of file
diff --git a/docs/agent-interaction-guide.md b/docs/agent-interaction-guide.md
new file mode 100644
index 00000000..9afc0f1d
--- /dev/null
+++ b/docs/agent-interaction-guide.md
@@ -0,0 +1,276 @@
+# CoreEx Agent Interaction Guide
+
+This guide is for **consulting delivery teams consuming CoreEx from the starter or NuGet packages**. Its purpose is to help you use the agent as an interactive partner for learning the framework, understanding the sample architecture, and implementing features safely.
+
+This is not a framework reference. Use it when you want to know **how to ask**, **what to ask**, and **which skill or prompt to use**.
+
+## Start with the Right Kind of Request
+
+Most unhelpful agent conversations start with a request that is too vague. Tell the agent which of these modes you want:
+
+| If you want to... | Ask for... | Example |
+|---|---|---|
+| Understand how the repo works. | **Explanation / discovery.** | `Map the Shopping domain and explain its layers.` |
+| Understand a pattern. | **Sample-backed explanation.** | `Explain outbox publishing in this repo using the Product sample.` |
+| Decide what to build. | **Solution shaping.** | `Given this use case, what is the smallest CoreEx shape I should scaffold?` |
+| Create a new domain. | **Greenfield scaffolding.** | `Generate a new Orders domain with validation and SQL Server persistence.` |
+| Add capabilities to an existing domain. | **Capability retrofit.** | `Inspect this domain and add the missing messaging pieces.` |
+| Change working code. | **Implementation.** | `Inspect the existing implementation first, then add support for X using current CoreEx patterns.` |
+
+## Ask for Repo-Grounded Answers
+
+When you are new to the framework, avoid asking for generic platform advice when what you really want is **how this repo does it**.
+
+Prefer:
+
+- `Explain validation in this repo with examples from the samples.`
+- `Compare API + relay versus API-only using the Product and Shopping samples.`
+- `Show me where ETag handling belongs in CoreEx service/controller flow.`
+
+Avoid:
+
+- `How should .NET APIs do validation?`
+- `What is the best eventing architecture?`
+
+Those broader questions tend to produce generic answers instead of CoreEx-specific guidance.
+
+## Ask Capability Questions Directly
+
+Yes — you should absolutely ask direct capability questions such as:
+
+- `What is the idempotency key feature in CoreEx?`
+- `What problem does it solve?`
+- `When should I use it?`
+- `How would I implement it in my solution?`
+
+That is a good way to learn the framework. In practice, the best version of that question asks for four things together:
+
+1. **What the capability is.**
+2. **What problem it solves.**
+3. **When to use it versus not use it.**
+4. **How it is implemented in this repo or in my current solution.**
+
+Good examples:
+
+- `Explain the idempotency key feature in CoreEx. What problem does it solve, when should I use it, and how is it implemented in this repo?`
+- `Explain ETag handling in CoreEx, what risks it addresses, and how I would add it to my current API.`
+- `Explain the outbox pattern in this repo, what failure mode it prevents, and what I would need to add to my solution to support it.`
+
+This same pattern works well for:
+
+- idempotency
+- ETags
+- validation
+- reference data orchestration
+- FusionCache / Redis
+- outbox relay
+- subscriber hosts
+- orchestration
+
+## Tell the Agent What Outcome You Want
+
+The same topic can produce very different outcomes. State the intended result explicitly:
+
+- **Explanation only** — no code changes.
+- **Plan only** — propose the approach before editing.
+- **Implement it** — make the changes.
+- **Implement it and align to the samples** — make the changes using the current repo conventions.
+
+Examples:
+
+- `Explain how subscribers work here. No code changes.`
+- `Plan the smallest safe way to add reliable event publishing to this domain.`
+- `Implement this feature using existing CoreEx patterns only.`
+
+For quick capability or pattern questions that you do not want to add to the main conversation flow, use the Copilot CLI **`/ask`** command as a lightweight side question.
+
+Examples:
+
+- `/ask What is the idempotency key feature in CoreEx and what problem does it solve?`
+- `/ask When is outbox sufficient and when do I need orchestration?`
+- `/ask Does this repo treat ETag support as optional or expected for mutable entities?`
+
+## Ask the Agent to Inspect Before Recommending
+
+For existing solutions, ask the agent to inspect the current state before it suggests changes. This is especially important for consulting work, where a domain may already be partially set up.
+
+Good examples:
+
+- `Inspect this domain and explain what capabilities are already present before recommending changes.`
+- `Check whether this service already has outbox, subscribers, or relay support before proposing a retrofit.`
+- `Map the current host shape first, then tell me what is missing for this use case.`
+
+This is the safest way to avoid duplicate hosts, redundant packages, or advice that ignores what the project already has.
+
+## Use the Right Skill or Prompt
+
+The repo already exposes several entry points. Use them intentionally.
+
+| Need | Best fit | Why |
+|---|---|---|
+| Understand an unfamiliar repo or area. | `acquire-codebase-knowledge` | Produces structured codebase documentation and evidence-backed discovery. |
+| Create a new solution or host shape. | `CoreEx.Template` via `dotnet new coreex*` | Deterministic scaffolding for solution, API, relay, and subscriber projects. |
+| Plan or review a new domain shape before scaffolding. | `CoreEx Expert` | Best when you want sample-aligned advice on host shape, layering, and capability choices before running `dotnet new`. |
+| Add capabilities to an existing domain. | `CoreEx Expert` or normal chat with inspect-first prompts | Best for incremental retrofits such as relay, subscribe, and messaging alignment now that scaffolding is deterministic and capability work is manual. |
+| Start local dependencies or sample runtime. | `init`, `setup`, or Aspire tooling | Best for environment and sample execution workflows. |
+
+## A Good Question Usually Includes Four Things
+
+A strong request usually includes:
+
+1. **The use case.**
+2. **The current context.**
+3. **The desired outcome.**
+4. **Any constraints.**
+
+Template:
+
+```text
+I am working on <domain/use case>.
+Please inspect <existing code / domain / sample> first.
+I want <explanation / plan / implementation>.
+Use existing CoreEx patterns and align to <sample or host shape>.
+```
+
+Example:
+
+```text
+I am working on an Orders domain.
+Inspect the current domain first.
+I want a plan for adding reliable integration-event publishing.
+Use existing CoreEx patterns and align to the Product sample.
+```
+
+## Questions That Work Well for New Developers
+
+### Learn the architecture
+
+- `Map the Products sample and explain the role of each project.`
+- `Explain how Contracts, Application, Infrastructure, Api, Subscribe, and Relay fit together here.`
+- `Show me the request flow for a Product create in the samples.`
+
+### Learn a practice
+
+- `Explain where validation belongs in CoreEx and show the sample pattern.`
+- `Explain why this repo uses outbox relay instead of publishing directly from the API.`
+- `Show me how reference data is modeled and consumed.`
+
+### Learn a capability feature
+
+- `What is the idempotency key feature in CoreEx, what problem does it solve, and how would I implement it in my solution?`
+- `What is ETag support in CoreEx, what issue does it prevent, and where does it belong in the API flow?`
+- `What is FusionCache used for here, when should I add it, and what would the minimal implementation look like?`
+- `What is the reference data orchestration feature, when is it worth adding, and how would it fit in this solution shape?`
+
+### Decide what to scaffold
+
+- `Given this use case, do I need API only, API + relay, API + subscribe, or orchestration?`
+- `What is the smallest CoreEx shape that supports this requirement?`
+- `Which `dotnet new coreex*` templates do I actually need for this domain?`
+
+### Prepare to implement
+
+- `Inspect the current domain and list what is already set up before recommending changes.`
+- `Compare my use case to Product, Shopping, and Order.Workflow and tell me which pattern is closest.`
+- `Plan the feature in terms of Contracts, Application, Infrastructure, Api, and hosts.`
+
+## When to Ask for Comparisons
+
+Comparative questions are especially useful when you are still learning the framework.
+
+Examples:
+
+- `Compare API-only versus API + relay for this use case.`
+- `Compare subscriber host versus orchestration worker for this business flow.`
+- `Compare starting with only `dotnet new coreex` versus adding relay or subscriber hosts from day one.`
+- `Compare adding capability retroactively versus scaffolding the full host shape from day one.`
+
+This helps you learn the framework decision points instead of only getting one recommendation.
+
+## Ask for Sample Alignment Explicitly
+
+If you want implementation help that matches repo conventions, say so directly.
+
+Useful phrases:
+
+- `Align to the Product sample.`
+- `Use the same host wiring pattern as Shopping.Subscribe.`
+- `Follow the existing CoreEx instructions and sample conventions.`
+- `Prefer the current repo pattern over generic alternatives.`
+
+## Tell the Agent How Conservative to Be
+
+In consulting projects, you often want the **smallest safe change**, not a broad redesign.
+
+Useful phrases:
+
+- `Prefer the smallest safe change.`
+- `Do not restructure the domain unless required.`
+- `Preserve the current layering and naming unless there is a clear mismatch.`
+- `Add only the missing capability pieces.`
+
+## Good Framing for Feature Requests
+
+When asking for implementation help, frame the feature in business terms first, then let the agent translate that into CoreEx capabilities.
+
+Good:
+
+- `This service needs to publish an event after a successful write. What CoreEx capabilities should I add?`
+- `This domain must react to upstream product updates. How should that be implemented in this repo?`
+- `This process waits for external approval. Is this a subscriber problem or an orchestration problem?`
+
+Less effective:
+
+- `Add Service Bus.`
+- `Use Redis.`
+- `Add CoreEx.Events.`
+
+Package-driven questions are less useful than use-case-driven questions.
+
+## Ask for Boundaries, Not Just Answers
+
+When you are uncertain, ask the agent to explain **what is in scope and what is out of scope** for a pattern.
+
+Examples:
+
+- `When is outbox sufficient and when do I need orchestration?`
+- `When should I stop at API-only instead of adding subscribers?`
+- `What do the `dotnet new coreex*` templates cover today, and what still needs manual implementation?`
+
+That helps you understand the framework’s decision boundaries instead of only the happy path.
+
+For capability questions, useful follow-ups are:
+
+- `When should I avoid this feature?`
+- `What is the smallest version of this capability I can add first?`
+- `Does my current solution already have part of this set up?`
+- `Which files or hosts would change if I add it?`
+
+## Common Anti-Patterns
+
+Avoid these when interacting with the agent:
+
+- Asking for a package before stating the use case.
+- Asking for implementation without asking the agent to inspect the current state first.
+- Asking for generic .NET advice when you need CoreEx-specific guidance.
+- Asking for “the best architecture” instead of comparing concrete CoreEx shapes.
+- Asking for a full redesign when you only need a capability retrofit.
+
+## Suggested Learning Sequence
+
+If you are new to CoreEx, this sequence works well:
+
+1. Read `README.md`.
+2. Read `docs/application-scaffolding-guide.md`.
+3. Read `docs/capabilities.md`.
+4. Use the agent to map one sample domain.
+5. Ask the agent to explain one end-to-end request flow.
+6. Ask the agent to compare two implementation shapes for your real use case.
+7. Move to planning or implementation only after that.
+
+## Where to Go Next
+
+- Use `docs/agent-prompt-recipes.md` for copy/paste prompt starters.
+- Use `docs/application-scaffolding-guide.md` to choose the right host/capability shape.
+- Use `docs/capabilities.md` for deeper pattern explanations.
+- Use `docs/orchestration.md` when the use case goes beyond request/response plus outbox.
diff --git a/docs/agent-prompt-recipes.md b/docs/agent-prompt-recipes.md
new file mode 100644
index 00000000..9ae12688
--- /dev/null
+++ b/docs/agent-prompt-recipes.md
@@ -0,0 +1,337 @@
+# CoreEx Agent Prompt Recipes
+
+This guide gives **copy/paste prompt patterns** for consultant delivery teams using CoreEx from the starter or NuGet packages. Adapt the wording to your domain, but keep the structure.
+
+If you want to ask one of these as a quick side question in Copilot CLI without adding it to the main conversation flow, you can also prefix it with **`/ask`**.
+
+## 1. Understand the Codebase
+
+### Map a domain
+
+```text
+Map the <Domain> area of this repo for me.
+Explain the role of Contracts, Application, Infrastructure, Api, Database, Subscribe, and Relay if present.
+Use concrete file references from this repo.
+No code changes.
+```
+
+### Explain a request flow
+
+```text
+Show me the end-to-end request flow for <operation> in the samples.
+Use the actual sample code and explain which layer owns each step.
+No code changes.
+```
+
+### Compare two samples
+
+```text
+Compare the Product and Shopping samples for <topic>.
+Focus on the differences in host shape, messaging, and domain behavior.
+No code changes.
+```
+
+## 2. Learn a Pattern
+
+### Capability explainer template
+
+```text
+Explain the <capability> feature in CoreEx.
+Tell me:
+- what it is
+- what problem it solves
+- when to use it and when not to use it
+- how it is implemented in this repo
+- how I would add it to my solution
+
+Use sample-backed guidance where possible.
+No code changes.
+```
+
+### Idempotency key
+
+```text
+What is the idempotency key feature in CoreEx?
+What problem does it solve?
+When should I use it?
+How would I implement it in my solution?
+Use the repo patterns and samples where relevant.
+No code changes.
+```
+
+Quick CLI variant:
+
+```text
+/ask What is the idempotency key feature in CoreEx, what problem does it solve, and when should I use it?
+```
+
+### Reference data orchestration
+
+```text
+Explain the reference data orchestration feature in CoreEx.
+What problem does it solve?
+When is it worth adding?
+How would it fit into my current solution shape?
+```
+
+### FusionCache / Redis
+
+```text
+Explain the FusionCache and Redis pattern used in this repo.
+What problem does it solve?
+When should I add it?
+What is the smallest implementation I could add first?
+```
+
+### Validation
+
+```text
+Explain how validation is implemented in this repo.
+Show me where the validator lives, where it is called, and how that differs from controller validation.
+Use sample-backed examples only.
+```
+
+### Outbox
+
+```text
+Explain how reliable event publishing works in this repo.
+Use the Product sample and describe API host, outbox tables, relay host, and subscriber flow.
+No code changes.
+```
+
+### ETag and concurrency
+
+```text
+Explain ETag and optimistic concurrency handling in this repo.
+Show me the contract, service, and API implications using an existing sample.
+```
+
+### Orchestration
+
+```text
+Compare request/response plus outbox versus orchestration for this use case:
+<describe business process>.
+Use the Order.Workflow sample where relevant.
+No code changes.
+```
+
+## 3. Shape a New Solution
+
+### Choose the smallest CoreEx shape
+
+```text
+Given this use case:
+<describe use case>
+
+Recommend the smallest CoreEx application shape that supports it.
+Tell me whether I need API only, API + relay, API + subscribe, or orchestration.
+Explain why.
+```
+
+### Choose the right scaffolding entry point
+
+```text
+I need to implement this:
+<describe requirement>
+
+Tell me whether I should start with `dotnet new coreex`, add `coreex-api`, `coreex-relay`, or `coreex-subscribe`, or make manual changes to an existing domain.
+Explain the tradeoffs using the current repo guidance.
+```
+
+## 4. Plan a Feature
+
+### Plan before coding
+
+```text
+Inspect the current <Domain> implementation first.
+Then create a plan for adding <feature>.
+Use existing CoreEx patterns only and align to the closest sample in this repo.
+Do not implement yet.
+```
+
+### Ask for layer-by-layer impact
+
+```text
+For this feature:
+<describe feature>
+
+Tell me what should change in Contracts, Application, Infrastructure, Api, and any hosts.
+Use the current repo conventions.
+No code changes yet.
+```
+
+### Ask for capability guidance
+
+```text
+This feature needs:
+<business requirement>
+
+Tell me which CoreEx capabilities are actually needed and which should be deferred.
+Prefer the smallest safe change.
+```
+
+## 5. Implement a Feature Safely
+
+### Smallest safe change
+
+```text
+Inspect the current domain first.
+Implement <feature> using the smallest safe change.
+Preserve the current layering and naming unless a restructure is required.
+Use existing CoreEx patterns only.
+```
+
+### Sample-aligned implementation
+
+```text
+Implement <feature> in this domain.
+Align to the closest existing sample in this repo.
+Explain briefly which sample you followed and why.
+```
+
+### Conservative enhancement
+
+```text
+Enhance the existing implementation to support <feature>.
+Do not regenerate the domain.
+Do not add unrelated capabilities.
+Inspect what is already present before editing.
+```
+
+## 6. Retrofit Existing Domains
+
+### Add reliable event publishing
+
+```text
+Inspect this domain and determine whether it already has outbox, relay, or event publisher wiring.
+Then add the missing pieces required for reliable integration-event publishing.
+Use current CoreEx messaging patterns only.
+```
+
+### Add subscriber support
+
+```text
+Inspect this domain for any existing Subscribe host or Service Bus wiring.
+Then add the missing pieces required to consume <event/command>.
+Keep subscriber logic thin and aligned to repo conventions.
+```
+
+### Ask for a retrofit plan explicitly
+
+```text
+Inspect the current state first, then add the missing pieces for <relay / subscribe / subscriber wiring>.
+Treat SQL Server and Azure Service Bus as defaults unless you find evidence otherwise.
+Do not regenerate the domain.
+```
+
+## 7. Review an Existing Design
+
+### Convention check
+
+```text
+Review this implementation against the current repo conventions.
+Focus on layering, CoreEx usage, validation placement, host wiring, and messaging patterns.
+Ignore style-only feedback.
+```
+
+### Compare against the samples
+
+```text
+Compare this implementation to the closest sample in the repo.
+Tell me what is aligned, what is drifting, and what matters functionally.
+```
+
+### Ask for missing capabilities
+
+```text
+Inspect this domain and list which CoreEx capabilities appear to be missing for this use case:
+<describe use case>
+
+Explain which are required now versus optional later.
+```
+
+## 8. Debug Architecture or Modeling Uncertainty
+
+### Is this CRUD, messaging, or orchestration?
+
+```text
+I am not sure whether this requirement should be modeled as:
+- a normal API write
+- API + outbox event publishing
+- subscriber-driven reaction
+- orchestration
+
+Use the current repo patterns to compare those options for this use case:
+<describe use case>
+```
+
+### Should I add a new host?
+
+```text
+Inspect the current domain shape.
+Tell me whether this requirement justifies adding a new host or can be handled in the existing ones.
+Prefer the smallest safe architecture.
+```
+
+## 9. Learn by Asking Better Follow-Ups
+
+When the first answer is not enough, use follow-ups like these:
+
+- `Show me the actual files that demonstrate that pattern.`
+- `Which sample is the closest fit for this advice?`
+- `What is the smallest version of this that I can implement first?`
+- `What would you defer until later?`
+- `What files or hosts would change if I added this capability?`
+- `Does my current solution already have part of this capability set up?`
+- `What would change if this were an existing domain instead of a new one?`
+- `What should I ask you next if I want you to implement this safely?`
+
+## 10. Prompt Framing Patterns That Usually Work
+
+### Explanation only
+
+```text
+Explain <topic> in the context of this repo.
+Use sample-backed evidence.
+No code changes.
+```
+
+### Plan only
+
+```text
+Inspect the current implementation first.
+Then create a plan for <feature>.
+Do not implement yet.
+```
+
+### Implement
+
+```text
+Inspect the current implementation first.
+Then implement <feature> using existing CoreEx conventions and the closest sample pattern.
+Prefer the smallest safe change.
+```
+
+### Implement and verify scope
+
+```text
+Implement <feature>.
+Before changing code, tell me which hosts/layers you expect to modify and why.
+Then proceed with the smallest safe change.
+```
+
+## 11. What to Include in Your Prompt
+
+For the best results, include:
+
+- the **use case**
+- whether the code already exists
+- whether you want **explanation**, **plan**, or **implementation**
+- whether the result should align to a specific sample
+- any constraints such as “smallest safe change”, “no new host unless necessary”, or “use current Postgres/Service Bus defaults”
+
+## Where to Go Next
+
+- Use `docs/agent-interaction-guide.md` to understand how to interact with the agent effectively.
+- Use `docs/application-scaffolding-guide.md` to choose the right CoreEx shape.
+- Use `docs/capabilities.md` to dive deeper into the underlying patterns.
diff --git a/docs/agent-skills-workflow-guide.md b/docs/agent-skills-workflow-guide.md
new file mode 100644
index 00000000..7b4fe428
--- /dev/null
+++ b/docs/agent-skills-workflow-guide.md
@@ -0,0 +1,352 @@
+---
+description: "Guide to CoreEx templates, agent skills, and how they fit together"
+tags: ["skills", "workflow", "templates", "domains"]
+---
+
+# CoreEx Templates and Agent Workflow Guide
+
+## Overview
+
+CoreEx now uses the `CoreEx.Template` `dotnet new` template pack for deterministic scaffolding. Agent skills remain useful for codebase discovery, architecture guidance, and local orchestration. This guide explains which tool to use for each part of the workflow.
+
+| Tool | Type | Purpose | Typical Use |
+|------|------|---------|------------|
+| `CoreEx.Template` | `dotnet new` template pack | Scaffold solution and host projects deterministically | Greenfield solution and host creation |
+| `CoreEx Expert` | Agent | Review architecture choices and recommend CoreEx-aligned patterns | Shape selection, design review, capability planning |
+| `/acquire-codebase-knowledge` | Skill | Document and understand an existing codebase | Onboarding and architecture discovery |
+| `/aspire` | Skill | Orchestrate distributed apps locally | Running and debugging Aspire apps |
+
+---
+
+## Tool Descriptions
+
+### 1. `CoreEx.Template` — Deterministic Scaffolding
+
+**Purpose:** Create a new CoreEx solution and optional API, relay, or subscriber hosts using deterministic templates.
+
+**When to use:**
+- Starting a new bounded context or microservice
+- Creating the initial layered project structure
+- Adding a standard API, relay, or subscriber host to a new solution
+- You want repeatable output that matches the template pack exactly
+
+**What it creates:**
+- `dotnet new coreex` scaffolds the shared solution shape
+- `dotnet new coreex-api` adds an API host
+- `dotnet new coreex-relay` adds an outbox relay host
+- `dotnet new coreex-subscribe` adds a subscriber host
+
+**Output characteristics:**
+- Deterministic and repeatable
+- Aligned to current CoreEx conventions
+- Best for greenfield scaffolding, not for retrofitting existing code
+
+**Example workflow:**
+```
+dotnet new install CoreEx.Template
+dotnet new coreex -n Avanade.Erp.Orders
+dotnet new coreex-api -n Avanade.Erp.Orders.Api
+```
+
+---
+
+### 2. `CoreEx Expert` — Shape and Capability Guidance
+
+**Purpose:** Review a requirement or existing implementation and recommend the right host shape, capability set, and implementation path.
+
+**When to use:**
+- Deciding between API-only, API plus relay, API plus subscriber, or orchestration
+- Planning a new domain before running `dotnet new`
+- Retrofitting messaging or subscriber capabilities into an existing domain
+- Comparing your use case to Products, Shopping, or other samples
+
+**What it helps with:**
+- Determines which `coreex*` templates you need
+- Identifies what can be scaffolded versus what must be implemented manually
+- Produces sample-aligned plans for retrofit work
+- Calls out risks, tradeoffs, and missing prerequisites
+
+**Best practice:**
+- Ask it to inspect the current domain first
+- Ask for the smallest safe change
+- Ask it to cite the closest sample or instruction file
+
+**Example workflow:**
+```
+User: Inspect this domain and tell me whether I need API only, API + relay, or API + subscribe.
+→ CoreEx Expert reviews the current code and samples
+→ User runs the needed `dotnet new` templates or makes the recommended manual changes
+```
+
+---
+
+### 3. `/acquire-codebase-knowledge` — Codebase Discovery & Documentation
+
+**Purpose:** Map, document, and understand an existing codebase structure.
+
+**When to use:**
+- Onboarding to a new CoreEx repository or codebase
+- Creating architectural documentation
+- Understanding how an existing domain is structured
+- Analyzing cross-domain dependencies
+- Documenting layering and separation of concerns
+- Planning a refactor or migration
+
+**What it discovers:**
+- Project structure and organization
+- Dependency graphs and cross-project relationships
+- Layer architecture (Contracts → Application → Infrastructure)
+- Design patterns and conventions in use
+- Integration points and messaging patterns
+- Technology stack and framework choices
+
+**Output characteristics:**
+- Comprehensive codebase maps
+- Architecture documentation
+- Pattern identification
+- Dependency analysis
+- Best practice summaries
+
+**Relationship to other skills:**
+- Run this first if inheriting unfamiliar code
+- Use output to inform retrofit decisions and template selection
+- Helps determine if existing code aligns with CoreEx patterns before manual extension
+
+**Example workflow:**
+```
+User: Onboard to existing Shopping domain
+→ /acquire-codebase-knowledge documents the structure
+→ User understands layering and patterns
+→ User can then plan manual extensions or new hosts with better context
+```
+
+---
+
+### 4. `/aspire` — Distributed App Orchestration
+
+**Purpose:** Run, manage, and debug Aspire distributed applications locally.
+
+**When to use:**
+- Starting the local development environment
+- Debugging multiple services together
+- Viewing Aspire dashboard and observability
+- Managing service dependencies
+- Adding new resources to orchestration
+- Checking service health and logs
+
+**What it handles:**
+- `aspire start` / `aspire stop` commands
+- Aspire dashboard access
+- Service dependency resolution
+- Container and local resource management
+- OpenTelemetry and observability
+- Resource status and health checks
+
+**Integration:**
+- Used after domain(s) are created and configured
+- Works with solutions scaffolded by `CoreEx.Template`
+- Validates domains that were extended manually using repo conventions
+- Provides feedback on Service Bus, databases, and messaging
+
+**Example workflow:**
+```
+User: Ready to test Orders and Shopping domains together
+→ /aspire start orchestrates all services
+→ /aspire opens dashboard to monitor
+→ Services interact via Service Bus after the required wiring is implemented
+```
+
+---
+
+## Typical Development Workflows
+
+### Workflow A: Greenfield Domain from Scratch
+
+**Scenario:** Building a new domain (e.g., Payments, Reporting, Inventory).
+
+```
+1. Ask CoreEx Expert for shape guidance
+   ↓ (decide: API-only, relay, subscriber, orchestration)
+
+2. Run `dotnet new coreex` and the required `coreex*` host templates
+   ↓ (scaffold the deterministic baseline)
+
+3. Customize generated code
+   ↓ (add business logic, contracts, validation rules, and persistence details)
+
+4. /aspire
+   ↓ (test domain in context of other services)
+```
+
+**Tools used sequentially:** `CoreEx Expert` → `dotnet new coreex*` → customize → `/aspire`
+
+---
+
+### Workflow B: Extending an Existing Domain
+
+**Scenario:** Orders domain already exists; now add event publishing and subscribers.
+
+```
+1. /acquire-codebase-knowledge
+   ↓ (understand: current structure, dependencies, patterns)
+
+2. Ask CoreEx Expert for the smallest retrofit plan
+   ↓ (identify: outbox events, Service Bus wiring, subscriber host needs)
+
+3. Implement domain events and handlers
+   ↓ (code: event contracts, event handlers, business logic)
+
+4. /aspire
+   ↓ (test: event flow, cross-domain integration)
+```
+
+**Tools used sequentially:** `/acquire-codebase-knowledge` → `CoreEx Expert` → implement → `/aspire`
+
+---
+
+## Decision Tree: Which Tool to Use
+
+```
+START: What do you need?
+
+├─ I need to CREATE a new solution or host
+│  └─ → Use CoreEx.Template (`dotnet new coreex*`)
+│
+├─ I have an EXISTING domain and want to ADD features
+│  ├─ Unsure what shape or files should change?
+│  │  └─ → Use CoreEx Expert first
+│  └─ If the codebase is unfamiliar → Use /acquire-codebase-knowledge first
+│
+├─ I'm NEW to a codebase and need to UNDERSTAND it
+│  └─ → Use /acquire-codebase-knowledge
+│
+├─ I want to RUN the system locally or DEBUG multiple services
+│  └─ → Use /aspire
+│
+└─ I want to PLAN a refactor or understand dependencies
+   └─ → Use /acquire-codebase-knowledge
+```
+
+---
+
+## Integration Points
+
+### Between `CoreEx.Template` and `CoreEx Expert`
+
+- **Handoff:** `CoreEx Expert` helps choose the smallest viable shape; `CoreEx.Template` creates the deterministic baseline.
+- **Compatibility:** Templates are for greenfield scaffolding; the agent is for decisions and manual retrofit guidance.
+- **Timing:** Ask for advice first when the host shape is unclear.
+
+### Between `/acquire-codebase-knowledge` and `CoreEx Expert`
+
+- **Prerequisite:** Run `/acquire-codebase-knowledge` first if you are inheriting unfamiliar code.
+- **Decision Making:** Its output makes retrofit recommendations more concrete and evidence-based.
+- **Retrofit Readiness:** Helps determine whether existing code can be extended cleanly or needs more restructuring.
+
+### Between Templates or Manual Changes and `/aspire`
+
+- **Execution Environment:** `/aspire` provides the runtime orchestration for domains created or extended by the other tools.
+- **Observability:** `/aspire` dashboard visualizes event flows, messaging, and service health across templated and manually extended domains.
+- **Testing Loop:** After scaffolding or retrofit work, use `/aspire` to validate the implementation.
+
+---
+
+## Key Principles
+
+1. **Deterministic Scaffolding:** New project structure comes from `CoreEx.Template`, not chat-driven code generation.
+
+2. **Conventions Over Configuration:** Templates, instructions, and samples work together around the same CoreEx project structure and naming patterns.
+
+3. **Inspect Before Retrofitting:** For existing domains, inspect first and then make the smallest safe manual change.
+
+4. **Scaffolding Is a Baseline:** Templates provide structure, not finished business logic. Customization is still required.
+
+5. **CoreEx Alignment:** Agents and skills should continue to anchor recommendations to samples, instructions, and CoreEx patterns.
+
+---
+
+## Common Scenarios and Recommended Sequencing
+
+### New Microservice: E-Commerce Domain
+
+1. **Ideation:** Decide on Orders, Products, Payments domains
+2. **Choose shape:** `CoreEx Expert` → decide which hosts each domain needs
+3. **Create Products:** `dotnet new coreex` + needed hosts
+4. **Create Orders:** `dotnet new coreex` + needed hosts
+5. **Create Payments:** `dotnet new coreex` + needed hosts
+6. **Customize:** implement business logic and messaging details
+8. **Integrate:** `/aspire` → run all three together, validate event flow
+
+**Tools in sequence:** `CoreEx Expert`, `dotnet new coreex*` × N, customize, `/aspire`
+
+---
+
+### Migrating Existing Codebase to CoreEx
+
+1. **Assess:** `/acquire-codebase-knowledge` → understand current structure
+2. **Compare:** Review generated map against CoreEx expectations
+3. **Decide:** Retrofit manually, add a new host with a template, or rebuild using `CoreEx.Template`?
+4. **Extend:** make the smallest manual CoreEx-aligned changes that fit the current code
+5. **Validate:** `/aspire` → test migrated domain in new environment
+
+**Tools in sequence:** `/acquire-codebase-knowledge`, `CoreEx Expert`, optional `dotnet new coreex*`, `/aspire`
+
+---
+
+### Team Onboarding to Contoso Sample
+
+1. **Orient:** `/acquire-codebase-knowledge` → document Contoso structure
+2. **Review:** Generated map shows Products, Shopping, Orders layers
+3. **Explore:** `/aspire` → run sample locally, observe services
+4. **Propose:** Team proposes new domain → `CoreEx Expert` → pick the right template set
+5. **Scaffold:** run `dotnet new coreex*` and then add the required business logic
+6. **Validate:** `/aspire` → new domain integrates with existing services
+
+**Tools in sequence:** `/acquire-codebase-knowledge`, `/aspire`, `CoreEx Expert`, `dotnet new coreex*`, `/aspire`
+
+---
+
+## FAQ
+
+**Q: When should I use `CoreEx.Template` versus ask an agent for help first?**
+
+A: Use `CoreEx.Template` whenever you are creating a new solution or host shape. Ask `CoreEx Expert` first when you are unsure which host combination to scaffold or when you want an evidence-backed plan before making changes.
+
+---
+
+**Q: Should I use `/acquire-codebase-knowledge` before retrofitting an existing domain?**
+
+A: Yes, when the codebase is unfamiliar or when you are not sure whether it already aligns to CoreEx patterns. It gives you the evidence needed to make a safer retrofit plan.
+
+---
+
+**Q: What if I only want part of the scaffolded shape?**
+
+A: Use only the templates you actually need. Start with `dotnet new coreex` for the shared solution shape, then add `coreex-api`, `coreex-relay`, or `coreex-subscribe` only if the use case requires them.
+
+---
+
+**Q: Can multiple domains share a database?**
+
+A: Yes. The templates assume a conventional per-domain shape, but you can adapt that after scaffolding if your architecture requires shared infrastructure. Review the Contoso sample before diverging.
+
+---
+
+**Q: How do I know if my existing code is compatible with a manual CoreEx retrofit?**
+
+A: Run `/acquire-codebase-knowledge` first and review the output. Look for:
+- Standard project structure (5 layers)
+- CoreEx naming conventions
+- Use of `IUnitOfWork`, validators, repositories
+- Absence of conflicting frameworks (e.g., conflicting IoC patterns)
+
+If alignment is unclear, ask the CoreEx Expert agent.
+
+---
+
+## See Also
+
+- [CoreEx Capabilities](capabilities.md) — Detailed feature guide
+- [Application Scaffolding Guide](application-scaffolding-guide.md) — Deep dive on domain structure
+- [Orchestration Guide](orchestration.md) — Aspire and distributed app patterns
+- [Agent Interaction Guide](agent-interaction-guide.md) — How to interact with CoreEx agents effectively
diff --git a/docs/application-scaffolding-guide.md b/docs/application-scaffolding-guide.md
new file mode 100644
index 00000000..2021036b
--- /dev/null
+++ b/docs/application-scaffolding-guide.md
@@ -0,0 +1,360 @@
+# CoreEx Application Scaffolding Guide
+
+This guide helps a new team decide **what to scaffold first**, **which hosts to include**, and **which CoreEx capabilities to add now versus later**. It is intentionally decision-oriented: `docs/capabilities.md` explains what the framework can do, while this guide explains how to turn that into an application shape that fits your use case. If you want help learning how to ask the agent the right questions while making these decisions, see the [Agent Interaction Guide](agent-interaction-guide.md) and [Agent Prompt Recipes](agent-prompt-recipes.md).
+
+## Understand the Defaults vs the Abstractions
+
+In this repository, **SQL Server** and **Azure Service Bus** are the default scaffolding targets because they are the most complete sample implementations and the primary host wiring demonstrated in the starter and Contoso samples.
+
+That should not be read as "CoreEx only works with SQL Server and Service Bus." A better mental model is:
+
+- CoreEx provides **application and integration patterns** first.
+- This repo currently provides **default implementation paths** for those patterns using SQL Server and Azure Service Bus.
+- Alternative databases or brokers should be introduced when the **use case requires them**, not because teams want to abstract everything up front.
+
+Examples:
+
+- If SQL Server fits the operational and data requirements, use the standard SQL Server projects and migrations because that path is the most proven in this repo.
+- If a domain truly requires a different database backend, CoreEx patterns such as contracts, services, validation, unit-of-work boundaries, and event workflows still matter; only the implementation plumbing changes.
+- If Azure Service Bus fits the messaging needs, use the repo's default publisher/subscriber/relay wiring.
+- If a use case requires another broker, the `EventData` abstraction and event-oriented architecture remain relevant even when the transport changes.
+
+## Start with the Smallest Useful Shape
+
+The starter and sample architecture support a modular domain layout built from:
+
+- `Contracts`
+- `Application`
+- `Infrastructure`
+- `Api`
+- `Database`
+- optionally `Subscribe`
+- optionally `Relay`
+- optionally a separate worker or orchestration host
+
+The sample host shapes also include **OpenTelemetry-compatible telemetry wiring** via the standard CoreEx/OpenTelemetry setup shown in the sample `Program.cs` files, so observability can be added as part of the normal host composition rather than as a separate architecture track.
+
+For most teams, the right question is not "Which CoreEx packages exist?" but "Which responsibilities does this application need on day one?"
+
+Use this progression:
+
+1. Start with a **single API domain** when the service owns its own data and synchronous CRUD-style operations are the primary need.
+2. Add an **outbox relay** when the API must publish integration events reliably after database commits.
+3. Add a **subscriber host** when the service must react to events or commands from other services.
+4. Add a **worker or orchestration host** when the business process is long-running, stateful, batch-oriented, externally coordinated, or compensation-heavy.
+
+## Which Scaffolding Path to Use
+
+| Need | Best starting point | Why |
+|---|---|---|
+| New implementation solution with one or more domains and standard hosts. | `CoreEx.Template` via `dotnet new coreex*` | This is the deterministic scaffolding path for layered solution structure, package choices, standard `Program.cs` wiring, tests, and host projects. |
+| Existing domain needs new messaging or integration capability added incrementally. | Inspect first, then make a manual CoreEx-aligned change | Capability retrofits are now normal implementation work guided by the samples and instruction files rather than a dedicated scaffolding command. |
+| New domain with a conventional entity shape. | `dotnet new coreex` plus only the required `coreex-api`, `coreex-relay`, or `coreex-subscribe` hosts | Fastest path when you want deterministic output and only need to fill in the domain-specific logic. |
+| New domain with richer rules or more design uncertainty. | Ask `CoreEx Expert` to choose the shape, then scaffold with `dotnet new coreex*` | Best when you want sample-aligned advice before committing to a host set or capability mix. |
+
+## Recommended Application Shapes
+
+### 1. API-Only Domain
+
+Choose this when:
+
+- The service mainly exposes synchronous HTTP operations.
+- It owns its own schema and data lifecycle.
+- Cross-service integration is limited or can be added later.
+
+Scaffold:
+
+- `Contracts`
+- `Application`
+- `Infrastructure`
+- `Api`
+- `Database`
+- matching API and common test projects
+
+Pull in early:
+
+- `CoreEx`
+- `CoreEx.AspNetCore`
+- `CoreEx.AspNetCore.NSwag`
+- `CoreEx.Database.SqlServer`
+- `CoreEx.EntityFrameworkCore`
+
+Default implementation note:
+
+- PostgreSQL is the default data provider for the templates; SQL Server and `None` (facade, no local database) remain fully supported and are selectable via `--data-provider`.
+- Treat that as the recommended initial implementation, not as a rule that every CoreEx application must use that provider forever — choose the one that fits the solution.
+
+Usually add immediately:
+
+- `ETag` and change-log support for mutable entities.
+- `ProblemDetails`/CoreEx exception handling.
+- OpenAPI and health checks.
+
+Good fit:
+
+- Product master data.
+- Reference-data-backed CRUD domains.
+- Internal line-of-business APIs that do not yet need async integration.
+
+### 2. API + Outbox Relay
+
+Choose this when:
+
+- The API updates business data and must publish integration events reliably.
+- You need to avoid dual writes to database plus broker.
+- Other services depend on ordered or guaranteed event publication.
+
+Scaffold:
+
+- API-only domain shape, plus `Relay`
+
+Pull in early:
+
+- `CoreEx.Events`
+- `CoreEx.Database.SqlServer`
+- `CoreEx.Azure.Messaging.ServiceBus`
+
+Default implementation note:
+
+- SQL Server plus Azure Service Bus is the standard initial combination for reliable integration-event publication in this repo.
+- Choose a different database or broker only when the business, platform, compliance, latency, throughput, tenancy, or deployment constraints justify that divergence.
+
+Usually add immediately:
+
+- Unit-of-work with outbox.
+- Event formatter.
+- Outbox tables and stored procedures in the database project.
+- Relay host telemetry and health checks.
+
+Good fit:
+
+- Product, catalog, pricing, customer, or order domains that publish state-change events.
+- Any service where "database committed but event not published" is unacceptable.
+
+### 3. API + Subscribe + Outbox Relay
+
+Choose this when:
+
+- The service both publishes its own events and consumes events or commands from other services.
+- You are building a distributed service, not just a standalone API.
+- You need asynchronous integration boundaries with explicit host separation.
+
+Scaffold:
+
+- `Contracts`
+- `Application`
+- `Infrastructure`
+- `Api`
+- `Database`
+- `Subscribe`
+- `Relay`
+
+Pull in early:
+
+- `CoreEx.Events`
+- `CoreEx.Azure.Messaging.ServiceBus`
+- `CoreEx.Caching.FusionCache` when the service caches reference or replica data
+
+Default implementation note:
+
+- The sample architecture uses Azure Service Bus because the repo already demonstrates subscriber and relay hosts around it.
+- The broader architectural pattern is still publish/subscribe with `EventData`; the broker choice is an implementation decision driven by the integration use case.
+
+Usually add immediately:
+
+- Subscriber classes per message subject.
+- Shared error-handling strategy for known recoverable subscriber failures.
+- Reference data orchestration if incoming messages rely on code tables or shared reference sets.
+
+Good fit:
+
+- Inventory availability projections.
+- Shopping or basket domains that react to product or reservation events.
+- Services that maintain local replicas of upstream data.
+
+### 4. API + Worker / Orchestration
+
+Choose this when:
+
+- The core business process spans multiple steps, services, or time boundaries.
+- You need retries, timers, external-event waits, fan-out/fan-in, batching, or compensation.
+- A request/response API plus pub/sub is not enough to model the process safely.
+
+Scaffold:
+
+- Core domain projects
+- API host if the workflow is externally started or queried over HTTP
+- separate worker/orchestration host
+- supporting infrastructure for the workflow backend
+
+Pull in when needed:
+
+- Durable Task SDK + DTS patterns described in `docs/orchestration.md`
+- CoreEx telemetry and health checks in the worker host
+
+Usually add immediately:
+
+- Explicit orchestration contracts.
+- Activity boundaries around external calls.
+- Client endpoint or service to start/query workflow instances.
+
+Good fit:
+
+- Order submission and approval flows.
+- Long-running fulfilment or settlement processes.
+- Human approval, callback-driven, or scheduled business operations.
+
+## Capability-by-Capability Guidance
+
+The biggest mistake new teams make is enabling every framework feature up front. Prefer enabling capabilities because the **use case demands them**, not because the package exists.
+
+| Capability | Add it when | Skip or defer when |
+|---|---|---|
+| **Validation** | The API accepts business input that must be checked consistently before persistence or orchestration. | The host is read-only or input shape is trivial and temporary. |
+| **ETag / optimistic concurrency** | Multiple users or systems can update the same resource and lost updates matter. | Data is append-only or single-writer. |
+| **Idempotency key** | Clients may retry POST requests, especially across unstable networks or user-driven retries. | The endpoint is naturally idempotent already or not externally retried. |
+| **FusionCache + Redis** | Reads are hot, repeated, cross-instance, or expensive; you need hybrid L1/L2 caching and graceful degraded reads. | Data changes too frequently to benefit, or the service is small and latency/load do not justify cache complexity yet. |
+| **Reference data orchestration** | The domain uses shared code tables, statuses, categories, units of measure, or other read-heavy lookup sets. | The values are local-only, short-lived, or not managed as reference data. |
+| **Unit-of-work + outbox** | Data writes and integration-event publication must succeed together from a business perspective. | The service has no async integration boundary yet. |
+| **Azure Service Bus integration** | You publish or consume messages across service boundaries and want the repo's standard broker pattern. | The application is strictly synchronous or local-only. |
+| **Subscriber host** | The service reacts to upstream events/commands independently of user HTTP traffic. | Integration is outbound only. |
+| **Outbox relay** | The service publishes integration events from committed business transactions. | The service consumes only and does not publish. |
+| **Result<T> pipelines** | You are modeling expected business failures or domain flows compositionally, especially around aggregates/workflows. | Exception-style services are clearer and the flow is simple CRUD. |
+| **DomainDriven aggregate patterns** | The domain has invariants across child entities or rich mutation rules. | The service is mostly thin CRUD over simple records. |
+| **Dynamic query / paging / filtering** | List endpoints need flexible API-side filtering, ordering, and projection. | Consumers only need a few fixed queries. |
+| **Workflow orchestration** | A business process is long-running, resumable, externally coordinated, or compensation-heavy. | Simple CRUD plus event publication already covers the need. |
+
+## Choosing Defaults vs Diverging from Them
+
+Start with the repo defaults unless there is a concrete reason not to:
+
+- **Use SQL Server by default** because the database projects, migration tooling, outbox procedures, and sample hosts are already shaped around it.
+- **Use Azure Service Bus by default** because the relay and subscriber patterns in this repo are already demonstrated around it.
+
+Diverge when the use case clearly demands it, for example:
+
+- Existing enterprise platform standards require another database or broker.
+- Required operational characteristics are a poor fit for the default choice.
+- A managed service, deployment target, or regulatory boundary constrains the technology selection.
+- A specific integration landscape already centers on another messaging platform.
+
+When you do diverge, preserve the CoreEx patterns first:
+
+- keep the layered project shape
+- keep `EventData` and integration-event conventions
+- keep unit-of-work and outbox thinking where reliable publication still matters
+- keep validation, execution context, HTTP semantics, and contract patterns
+
+In other words, the **use case should drive the backend**, not the other way around.
+
+## A Practical "What Should I Scaffold?" Checklist
+
+### If your application is mostly CRUD over owned data
+
+Scaffold a standard API domain first. Add:
+
+- contracts with `IIdentifier`, `IETag`, and `IChangeLog` where appropriate
+- application service plus validator
+- infrastructure repository and SQL Server database project
+- API controllers with CoreEx `WebApi` helper style
+
+Do **not** start with orchestration or subscriber hosts unless there is an immediate business requirement.
+
+### If your application must notify other services after changes
+
+Start with the standard API domain, but include outbox and relay from the beginning. That gives you:
+
+- reliable post-commit event publication
+- a clean boundary between request handling and broker delivery
+- room to add subscribers later without redesigning the write path
+
+### If your application depends heavily on upstream domain data
+
+Scaffold a subscriber host early. This is a strong signal that the service is part of an event-driven landscape and should not rely only on synchronous API calls to other domains.
+
+Typical example:
+
+- Shopping depends on product and inventory-related events.
+- The service keeps local state aligned through subscribers while still serving its own API.
+
+### If your application has approvals, callbacks, batches, or days-long flows
+
+Scaffold orchestration intentionally rather than forcing that logic into controllers, subscribers, or background timers. A plain background service can run repeated work, but it is not a substitute for durable workflow state, replay, timers, external events, or compensation logic.
+
+## How to Think About Layering
+
+CoreEx is most effective when you keep the responsibilities sharp:
+
+| Layer | Put this here | Do not put this here |
+|---|---|---|
+| Contracts | DTOs, identifiers, ETags, change logs, reference-data code properties. | Domain rules, persistence logic, service calls. |
+| Application | Validation, unit-of-work orchestration, business use cases, event creation, adapters as interfaces. | HTTP plumbing, EF details, transport-specific code. |
+| Infrastructure | Repositories, EF mapping, query config, typed HTTP clients, adapter implementations, outbox publisher plumbing. | Controller concerns and user-facing endpoint logic. |
+| API | Routing, request/response behavior, `WebApi` helper usage, OpenAPI metadata, idempotency and HTTP semantics. | Rich business rules or database composition. |
+| Subscribe / Worker / Relay | Message consumption, hosted background processing, relay mechanics, orchestration workers. | User-driven request/response logic. |
+
+If a capability changes the transport or execution model, it usually belongs in a host project. If it changes business rules or persistence orchestration, it usually belongs in Application or Infrastructure.
+
+## Opinionated Defaults That Usually Pay Off
+
+For a new greenfield CoreEx service, these defaults are usually worth keeping:
+
+- Use the layered domain shape instead of collapsing everything into the API.
+- Use SQL Server first unless you have a strong reason to diverge.
+- Use validators rather than ad hoc controller checks.
+- Use ETags on mutable resources.
+- Use OpenAPI, ProblemDetails, execution context, and health endpoints from the start.
+- Use outbox if you already know the service will publish integration events.
+- Use reference data orchestration if statuses, categories, or codes are central to the model.
+
+## Things to Avoid Scaffolding Too Early
+
+- A subscriber host when the domain does not actually consume messages yet.
+- Orchestration for simple CRUD plus single-event publication.
+- Rich aggregate patterns for record-centric admin data with no real invariants.
+- Redis/FusionCache before there is either shared-cache need or measurable read pressure.
+- CQRS split for every service when read and write concerns are still simple.
+
+## Suggested First Questions for a New Domain
+
+Before scaffolding, answer these:
+
+1. Does this service own its own database schema?
+2. Will it publish integration events after writes?
+3. Will it consume events or commands from other services?
+4. Does it need shared reference data?
+5. Are updates concurrent enough to require ETags?
+6. Are POST retries likely enough to require idempotency?
+7. Is the core business flow synchronous, eventually consistent, or orchestrated over time?
+8. Does the model behave like true aggregates with invariants, or mostly like CRUD records?
+
+Those answers usually determine the host set, package set, and scaffold depth more reliably than entity field lists alone.
+
+## Suggested Starter Combinations
+
+| Use case | Scaffold | CoreEx capabilities to prioritize |
+|---|---|---|
+| Internal admin CRUD API. | API domain + database. | Validation, ETag, change log, OpenAPI, paging/filtering. |
+| Master-data service that other domains depend on. | API + database + outbox relay. | Validation, reference data, outbox, Service Bus publisher, idempotency. |
+| Event-driven domain maintaining local replicas or reacting to commands. | API + subscribe + outbox relay. | Service Bus subscriber/publisher, outbox, reference data, cache, health/telemetry. |
+| Long-running business process or approval workflow. | API + worker/orchestration host, optionally plus outbox/subscribers. | Durable orchestration, telemetry, external-event waits, retries, compensation. |
+| Rich aggregate domain with nested rules. | `dotnet new coreex --domain-driven-enabled true` plus only the required hosts. | DomainDriven patterns, validators, Result pipelines where appropriate, explicit mapping. |
+| Straightforward conventional entity. | `dotnet new coreex` plus only the required hosts. | Standard contracts/application/infrastructure/API/database shape with minimal custom reasoning. |
+
+## Where to Go Next
+
+- Read `coreex-starter/README.md` for starter/bootstrap expectations.
+- Read `docs/capabilities.md` for the underlying framework features and patterns.
+- Read `docs/orchestration.md` before adding a workflow worker.
+- Read `src/CoreEx.Template/README.md` before scaffolding a new solution or host.
+- Use the Product and Shopping samples as the concrete reference architecture for API, subscribe, and outbox relay hosts.
+
+## Evidence
+
+- `coreex-starter/README.md`
+- `src/CoreEx.Template/README.md`
+- `docs/capabilities.md`
+- `docs/orchestration.md`
+- `samples/src/Contoso.Products.Api/Program.cs`
+- `samples/src/Contoso.Products.Subscribe/Program.cs`
+- `samples/src/Contoso.Products.Relay/Program.cs`
diff --git a/docs/capabilities.md b/docs/capabilities.md
new file mode 100644
index 00000000..72d25028
--- /dev/null
+++ b/docs/capabilities.md
@@ -0,0 +1,1109 @@
+# CoreEx Capabilities & Patterns Guide
+
+This document provides detailed explanations of CoreEx capabilities and common patterns to help developers understand the value and appropriate use cases for each feature. If you are deciding what to scaffold for a new service or domain, start with the [Application Scaffolding Guide](application-scaffolding-guide.md) and then use this document for the deeper capability details. If you are still learning how to ask the agent about these patterns effectively, also see the [Agent Interaction Guide](agent-interaction-guide.md) and [Agent Prompt Recipes](agent-prompt-recipes.md).
+
+## Table of Contents
+
+- [General Capabilities](#general-capabilities)
+  - [Exception-Based Error Handling](#exception-based-error-handling)
+  - [Dynamic Dependency Injection](#dynamic-dependency-injection)
+  - [Entity Patterns](#entity-patterns)
+  - [Roslyn Source Generation](#roslyn-source-generation)
+  - [Instrumentation & Health Checks](#instrumentation--health-checks)
+  - [Hybrid Caching (L1 + L2)](#hybrid-caching-l1--l2)
+  - [Hosted Services](#hosted-services-timer--synchronized)
+  - [Reference Data](#reference-data)
+  - [JSON Filtering & Merge-Patch](#json-filtering--merge-patch)
+  - [Validation](#validation)
+  - [Mapping Helpers](#mapping-helpers)
+  - [Globalization & Localization](#globalization--localization)
+  - [Railway-Oriented Programming](#railway-oriented-programming-with-resultt)
+- [API & HTTP Features](#api--http-features)
+  - [Web API Styles](#web-api-styles-minimal--mvc)
+  - [RFC 7386 Merge-Patch](#rfc-7386-merge-patch-applicationmerge-patchjson)
+  - [Response JSON Filtering](#response-json-filtering)
+  - [Error Handling with ProblemDetails](#error-handling-with-problemdetails)
+  - [Conditional Request Semantics](#conditional-request-semantics-if-match)
+  - [Idempotency-Key](#idempotency-key)
+  - [Health Check Endpoints](#health-check-endpoints)
+  - [OpenAPI Integration](#openapi-integration-nswag)
+  - [CQRS](#cqrs-command-query-responsibility-segregation)
+- [Data Access & Persistence](#data-access--persistence)
+  - [Unit-of-Work with Integrated Outbox](#unit-of-work-with-integrated-outbox)
+  - [Paging & Enumeration](#paging--enumeration)
+  - [Dynamic Query](#dynamic-query-odata-style)
+  - [Multi-Tenancy](#multi-tenancy)
+  - [Type Discriminators](#type-discriminators)
+- [Database Support](#database-support)
+    - [SQL Server](#sql-server)
+    - [PostgreSQL](#postgresql)
+    - [ADO.NET Command & Parameter Extensions](#adonet-command--parameter-extensions)
+    - [Entity Framework Integration](#entity-framework-integration)
+- [Messaging & Events](#messaging--events)
+    - [EventData Abstraction](#eventdata-abstraction)
+    - [CloudEvent Interoperability](#cloudevent-interoperability)
+    - [Publish + Subscribe Patterns](#publish--subscribe-patterns)
+    - [Azure Service Bus Integration](#azure-service-bus-integration)
+    - [Outbox Relay](#outbox-relay-with-partitioning)
+    - [Workflow Orchestration (Durable Task SDK + DTS)](#workflow-orchestration-durable-task-sdk--dts)
+- [Domain-Driven Design](#domain-driven-design)
+    - [Aggregate & Entity Modeling](#aggregate--entity-modeling)
+    - [Value Objects](#value-objects)
+    - [Integration Events Only](#integration-events-only)
+- [Putting It All Together](#putting-it-all-together-a-typical-request-flow)
+- [Summary](#summary)
+
+---
+
+## General Capabilities
+
+### Exception-Based Error Handling
+
+**Pattern:** CoreEx defines specific exception types that map to HTTP status codes automatically.
+
+CoreEx exception types include:
+- `NotFoundException` — Resource not found (404).
+- `ValidationException` — Validation failure (400).
+- `ConcurrencyException` — ETag/version conflict (409).
+- `BusinessException` — Domain rule violation (400).
+- `AuthenticationException` — Unauthorized (401).
+- `AuthorizationException` — Forbidden (403).
+
+**Why it matters:** Instead of throwing generic `Exception` or returning error codes, you throw domain-specific exceptions that middlewares automatically convert to RFC 9457 ProblemDetails responses. This keeps error handling logic centralized and consistent across APIs.
+
+**Example:**
+```csharp
+public async Task<Product> GetProductAsync(Guid id)
+{
+    var product = await _repository.GetByIdAsync(id);
+    if (product == null)
+        throw new NotFoundException($"Product '{id}' not found.");
+    return product;
+}
+
+// Middleware automatically converts to:
+// HTTP 404 with ProblemDetails JSON
+```
+
+### Dynamic Dependency Injection
+
+**Pattern:** Register and resolve services without a traditional DI container through dynamic composition.
+
+CoreEx provides extension methods like `AddExecutionContext()`, `AddMvcWebApi()`, `AddHttpWebApi()` that setup services with sensible defaults. You can layer additional registrations on top without heavyweight container configuration.
+
+**Why it matters:** Reduces boilerplate, makes service composition explicit, and keeps middleware stacks clean and understandable.
+
+**Example:**
+```csharp
+builder.Services
+    .AddExecutionContext()           // Execution tenant/user context
+    .AddMvcWebApi()                  // MVC + exception handling
+    .AddHttpWebApi()                 // Minimal API + exception handling
+    .AddSqlServerDatabase<DbContext>()
+    .AddOutbox()
+    .AddFusionCache();
+```
+
+### Entity Patterns
+
+**Identifiers & Composite Keys**
+
+CoreEx supports two patterns for entity identity:
+
+1. **Single Identifier** — Most entities have a single ID (GUID, int, string).
+   ```csharp
+   public interface IIdentifier
+   {
+       object? Id { get; }
+   }
+   
+   public class Product : IIdentifier
+   {
+       public Guid Id { get; set; }
+       public string Sku { get; set; }
+   }
+   ```
+
+2. **Composite Key** — Some entities have multi-part identity (e.g., tenant + entityId).
+   ```csharp
+   public interface ICompositeKey
+   {
+       object?[] CompositeKeys { get; }
+   }
+   
+   public class TenantProduct : ICompositeKey
+   {
+       public Guid TenantId { get; set; }
+       public Guid ProductId { get; set; }
+       
+       public object?[] CompositeKeys => new object[] { TenantId, ProductId };
+   }
+   ```
+
+**ETags (Optimistic Concurrency)**
+
+ETags prevent lost-update conflicts in optimistic concurrency scenarios:
+
+```csharp
+public interface IETag
+{
+    string? ETag { get; set; }
+}
+
+public class Product : IETag
+{
+    public Guid Id { get; set; }
+    public string? ETag { get; set; }
+    public decimal Price { get; set; }
+}
+
+// API usage:
+// GET /api/products/123 returns Product with ETag: "abc123"
+// PUT /api/products/123 with IF-MATCH: abc123 header
+// If another request updated the product first, PUT returns 409 Conflict
+```
+
+**Change Logs (Audit Metadata)**
+
+Track when entities were created and last modified:
+
+```csharp
+public interface IChangeLog
+{
+    ChangeLog? ChangeLog { get; set; }
+}
+
+public class ChangeLog
+{
+    public DateTime? CreatedDate { get; set; }
+    public string? CreatedBy { get; set; }
+    public DateTime? UpdatedDate { get; set; }
+    public string? UpdatedBy { get; set; }
+}
+
+// Automatically populated by repository on insert/update
+public class Product : IChangeLog
+{
+    public Guid Id { get; set; }
+    public ChangeLog? ChangeLog { get; set; }
+}
+```
+
+**Deep Compare**
+
+Compare two entities for equality considering all properties recursively:
+
+```csharp
+var original = await _repo.GetByIdAsync(id);
+// ... user modifies entity
+var modified = new Product { Id = id, Name = "New Name", /* ... */ };
+
+bool hasChanged = original.DeepEquals(modified);
+if (!hasChanged) return NoContent(); // 204
+```
+
+### Roslyn Source Generation
+
+**Pattern:** Auto-generate boilerplate code (e.g., serialization, mapping, contracts) at compile time using Roslyn analyzers.
+
+CoreEx includes a contract generator that creates DTOs, mapping, and validation code from domain models using source generation. This eliminates manual mapping code and keeps serialization fast.
+
+**Why it matters:** Reduces hand-written boilerplate, ensures domain model and contracts stay in sync, and improves startup performance via compile-time code generation.
+
+### Instrumentation & Health Checks
+
+**Pattern:** Built-in OpenTelemetry integration and standard health check endpoints.
+
+CoreEx middleware automatically emits traces, metrics, and logs. Health checks are exposed on `/health/live` and `/health/ready` endpoints:
+
+```csharp
+app.MapHealthChecks("/health/live");  // Liveness (app running?)
+app.MapHealthChecks("/health/ready"); // Readiness (ready to receive traffic?)
+```
+
+These endpoints integrate with Kubernetes and container orchestrators for probes and graceful shutdown.
+
+### Hybrid Caching (L1 + L2)
+
+**Pattern:** Distributed cache with local in-process backup for fault tolerance.
+
+CoreEx uses **FusionCache** with optional **Redis** backplane:
+- **L1:** In-process memory cache (fast, shared scope, ~1MB typical).
+- **L2:** Redis (slower, shared across all service instances).
+- **Fallback:** If Redis is down, L1 cache continues serving stale data.
+
+```csharp
+builder.Services.AddFusionCache()
+    .WithRedisBackplane("localhost:6379");
+
+// Usage in services:
+var product = await _cache.GetOrSetAsync(
+    key: $"product:{id}",
+    factory: async ct => await _repository.GetByIdAsync(id, ct),
+    duration: TimeSpan.FromHours(1),
+    cancellationToken: ct
+);
+```
+
+**Why it matters:** Dramatically improves performance (milliseconds vs. seconds), reduces database load, and handles Redis failures gracefully.
+
+### Hosted Services (Timer & Synchronized)
+
+**Pattern:** Background work scheduled at intervals or synchronized across multiple instances.
+
+Use `IHostedService` implementation for:
+- **Timer-based work** — Run a task every N seconds (e.g., cleanup, health checks).
+- **Synchronized work** — Coordinate jobs across multiple instances using distributed locks.
+
+```csharp
+public class InventoryAdjustmentService : BackgroundService
+{
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        var timer = new PeriodicTimer(TimeSpan.FromMinutes(5));
+        while (await timer.WaitForNextTickAsync(stoppingToken))
+        {
+            await AdjustInventoryAsync(stoppingToken);
+        }
+    }
+}
+
+builder.Services.AddHostedService<InventoryAdjustmentService>();
+```
+
+### Reference Data
+
+**Pattern:** Load, cache, and orchestrate reference datasets (enums, lookup tables) with transactional integrity.
+
+Reference data (like product categories, statuses, coupons) is typically read-heavy and must sync across services. CoreEx provides:
+
+```csharp
+// Define reference data
+public class Category : ReferenceData
+{
+    public int Code { get; set; }
+    public string? Description { get; set; }
+}
+
+// Load and cache
+var categories = await _refData.GetCollectionAsync<Category>();
+
+// Automatic caching with orchestration
+// All instances see the same data
+// Invalidation on source updates
+```
+
+**Why it matters:** Eliminates N+1 query problems, ensures consistency, and simplifies dependency management in distributed systems.
+
+### JSON Filtering & Merge-Patch
+
+**Pattern:** Dynamically exclude fields from responses and support RFC 7386 PATCH.
+
+**Response Filtering** — Control which fields appear in JSON based on query parameters or roles:
+
+```csharp
+// GET /api/products/123?$fields=id,name
+// Returns only id and name, omitting price, cost, margin
+```
+
+**Merge-Patch** — RFC 7386 PATCH for partial updates:
+
+```csharp
+// PATCH /api/products/123
+// Content-Type: application/merge-patch+json
+// {"name": "New Name"}  // other fields unchanged
+```
+
+Both use `System.Text.Json` without external dependencies.
+
+### Validation
+
+**Pattern:** Built-in validation rules as alternative to FluentValidation frameworks.
+
+CoreEx provides validation decorators and APIs without forcing a particular framework:
+
+```csharp
+public class ProductValidator
+{
+    public static void Validate(Product p)
+    {
+        var errors = new List<string>();
+        if (string.IsNullOrEmpty(p.Sku)) 
+            errors.Add("Sku is required.");
+        if (p.Price < 0)
+            errors.Add("Price must be non-negative.");
+        
+        if (errors.Any())
+            throw new ValidationException(errors);
+    }
+}
+```
+
+### Mapping Helpers
+
+**Pattern:** Explicit one-way or bi-directional mapping without external frameworks.
+
+CoreEx provides mapping utilities that make transformations explicit and traceable:
+
+```csharp
+var productDto = mapper.Map<ProductDto>(product);
+// or bi-directional
+var product = mapper.MapFrom<ProductDto>(dto);
+```
+
+No AutoMapper dependency means simpler dependencies and explicit code paths.
+
+### Globalization & Localization
+
+**Pattern:** Culture-aware text and formatting throughout requests.
+
+`ExecutionContext` carries culture information per request:
+
+```csharp
+var currentCulture = ExecutionContext.Current?.CultureInfo; // e.g., "en-US"
+var formattedPrice = product.Price.ToString("C", currentCulture);
+```
+
+Enables multi-language APIs without routing changes.
+
+### Railway-Oriented Programming with Result<T>
+
+**Pattern:** Composable error flow using `Result<T>` instead of exceptions for expected errors.
+
+`Result<T>` represents success (Ok) or failure (Error) without throwing:
+
+```csharp
+public Result<Product> ValidateProduct(Product p)
+{
+    if (string.IsNullOrEmpty(p.Name))
+        return Result<Product>.Error("Name is required.");
+    
+    return Result<Product>.Ok(p);
+}
+
+// Usage - chain results without try/catch
+var result = ValidateProduct(product)
+    .Then(p => _repository.SaveAsync(p))
+    .Then(p => MapToDto(p));
+
+if (!result.IsSuccessful)
+    throw new ValidationException(result.Error);
+
+return result.Value;
+```
+
+---
+
+## API & HTTP Features
+
+### Web API Styles (Minimal & MVC)
+
+**Pattern:** Support both minimal APIs and MVC controllers with unified middleware.
+
+CoreEx works with both styles seamlessly:
+
+**Minimal API:**
+```csharp
+app.MapGet("/api/products/{id}", GetProduct)
+   .WithName("GetProduct")
+   .WithOpenApi();
+
+async Task<ProductDto> GetProduct(Guid id, IProductService service) 
+    => await service.GetProductAsync(id);
+```
+
+**MVC Controller:**
+```csharp
+[ApiController]
+[Route("api/[controller]")]
+public class ProductsController : ControllerBase
+{
+    [HttpGet("{id}")]
+    public async Task<ActionResult<ProductDto>> GetProduct(Guid id)
+        => await _service.GetProductAsync(id);
+}
+```
+
+Both use the same exception handling, logging, and middleware.
+
+### RFC 7386 Merge-Patch (application/merge-patch+json)
+
+**Pattern:** Partial updates with semantic merge semantics.
+
+Instead of PUT (must send whole resource) or ad-hoc PATCH, use standard merge-patch:
+
+```csharp
+// Partial update - unspecified fields unchanged
+PATCH /api/products/123
+Content-Type: application/merge-patch+json
+
+{
+  "name": "New Name"
+  // price, category, etc. remain unchanged
+}
+```
+
+Safer and more predictable than custom PATCH semantics.
+
+### Response JSON Filtering
+
+**Pattern:** Dynamically exclude fields from responses.
+
+Reduces payload size and hides sensitive fields:
+
+```csharp
+// GET /api/products?$fields=id,name,price
+// Response omits cost, margin, internalNotes
+
+// GET /api/products?$fields=id,name
+// Response omits all other fields
+```
+
+Implemented via middleware with zero manual code per endpoint.
+
+### Error Handling with ProblemDetails
+
+**Pattern:** RFC 9457 standard error responses everywhere.
+
+CoreEx exception middleware automatically converts exceptions to ProblemDetails:
+
+```json
+{
+  "type": "https://example.com/problems/not-found",
+  "title": "Not Found",
+  "status": 404,
+  "detail": "Product 'xyz' not found.",
+  "traceId": "0HN4..."
+}
+```
+
+Consistent error format across all endpoints and all APIs.
+
+### Conditional Request Semantics (IF-MATCH)
+
+**Pattern:** Prevent lost updates and concurrent modifications via ETags.
+
+GET returns an ETag; PUT/PATCH require IF-MATCH header:
+
+```http
+GET /api/products/123
+200 OK
+ETag: "v2-abc123"
+
+{product json}
+
+---
+
+PUT /api/products/123
+IF-MATCH: v2-abc123
+{updated fields}
+200 OK
+
+---
+
+// If stale:
+PUT /api/products/123
+IF-MATCH: v1-old
+{updated fields}
+409 Conflict  // Another request updated it
+```
+
+Prevents lost-update anomalies in concurrent scenarios.
+
+### Idempotency-Key
+
+**Pattern:** Automatic deduplication of POST operations.
+
+Clients send a unique `Idempotency-Key` header; CoreEx ensures the operation runs exactly once:
+
+```http
+POST /api/baskets/123/checkout
+Idempotency-Key: client-request-id-abc123
+
+201 Created / 200 OK
+```
+
+If the same key is resubmitted, CoreEx returns the cached response without re-executing.
+
+**Why it matters:** Safe retries in unreliable networks; critical for payment systems, order placement, etc.
+
+### Health Check Endpoints
+
+**Pattern:** Expose `/health/live` and `/health/ready` for orchestration.
+
+Kubernetes, Docker Swarm, and load balancers probe these endpoints:
+
+```
+GET /health/live
+200 OK  (app is running)
+
+GET /health/ready
+503 Service Unavailable  (database down, not ready for traffic)
+```
+
+Typical ready checks include database connectivity, cache availability, and broker connectivity.
+
+### OpenAPI Integration (NSwag)
+
+**Pattern:** Auto-generate OpenAPI schemas for use in Swagger UI and clients.
+
+CoreEx integrates with NSwag to produce accurate OpenAPI 3.0+ schemas:
+
+```csharp
+builder.Services.AddOpenApiDocument(opts =>
+{
+    opts.Title = "Product API";
+    opts.Version = "v1";
+});
+
+app.UseOpenApi();                       // Serves /swagger/v1/openapi.json
+app.UseSwaggerUI();                     // Serves Swagger UI
+```
+
+**Why it matters:** Automatically generated API docs that stay in sync; enables client code generation.
+
+### CQRS (Command Query Responsibility Segregation)
+
+**Pattern:** Separate read and write services when architectures demand it.
+
+Typical microservice uses a single domain model. For complex systems:
+
+- **Commands (Write)** — ProductMutationService handles create/update/delete.
+- **Queries (Read)** — ProductQueryService handles all reads with separate caching.
+
+```csharp
+// Write model
+public class ProductMutationService
+{
+    public async Task<Product> CreateAsync(CreateProductRequest req) { ... }
+    public async Task UpdateAsync(Guid id, UpdateProductRequest req) { ... }
+}
+
+// Read model
+public class ProductQueryService
+{
+    public async Task<Product> GetAsync(Guid id) { ... }
+    public async Task<IEnumerable<Product>> QueryAsync(FilterOptions opts) { ... }
+}
+```
+
+Useful for event-sourced or high-scale systems; adds complexity otherwise.
+
+---
+
+## Data Access & Persistence
+
+### Unit-of-Work with Integrated Outbox
+
+**Pattern:** Transactional boundary ensuring database writes and event publishing are atomic.
+
+The unit-of-work wraps all database operations and maintains an outbox table for events:
+
+```csharp
+public async Task CreateProductAsync(CreateProductRequest req)
+{
+    using var uow = _unitOfWorkFactory.Create();
+    
+    var product = new Product { Name = req.Name, Price = req.Price };
+    await uow.Products.SaveAsync(product);
+    
+    // Event added to UoW, written to [Products].[Outbox]
+    uow.Events.Add(new ProductCreated { ProductId = product.Id });
+    
+    // All database writes flushed atomically
+    await uow.CommitAsync();
+    
+    // Separate relay process reads [Products].[Outbox] 
+    // and publishes to Service Bus
+}
+```
+
+**Why it matters:** If you crash after committing to the database, events are guaranteed to be published (via relay). Eliminates the dual-write problem.
+
+### Paging & Enumeration
+
+**Pattern:** Skip/take pagination with total count for OData-like APIs.
+
+Pagination is stateless and works with dynamic filtering:
+
+```csharp
+public class PagingArgs
+{
+    public int Skip { get; set; }  // 0-based offset
+    public int Take { get; set; }  // page size, usually 10–100
+}
+
+public async Task<(IEnumerable<Product>, long TotalCount)> QueryAsync(
+    PagingArgs paging, 
+    FilterOptions? filter = null)
+{
+    var products = await _repository.QueryAsync(paging, filter);
+    var totalCount = await _repository.CountAsync(filter);
+    return (products, totalCount);
+}
+
+// HTTP usage:
+// GET /api/products?$skip=0&$take=20
+// Returns 20 products + X-Total-Count: 1543 header
+```
+
+### Dynamic Query (OData-Style)
+
+**Pattern:** User-provided filtering and ordering without hardcoding every combination.
+
+CoreEx translates query parameters to SQL dynamically:
+
+```
+GET /api/products?$filter=price gt 100 and category eq 'Bikes'&$orderby=name&$fields=id,name,price
+```
+
+Supports:
+- Comparison operators: `eq`, `ne`, `gt`, `ge`, `lt`, `le`
+- Logical operators: `and`, `or`
+- Functions: `contains`, `startswith`, `endswith`
+- Ordering: `$orderby=field1,field2 desc`
+- Projection: `$fields=id,name` (response filtering)
+
+### Multi-Tenancy
+
+**Pattern:** Isolate data per tenant transparently via `ExecutionContext`.
+
+Each request carries tenant identity in `ExecutionContext`:
+
+```csharp
+var tenantId = ExecutionContext.Current?.TenantId;
+
+// Repositories automatically filter by tenant
+var products = await _repository.QueryAsync(); // Only this tenant's products
+```
+
+Database rows include a `TenantId` column; queries are filtered in the WHERE clause automatically.
+
+### Type Discriminators
+
+**Pattern:** Model polymorphic or partitioned data sets using discriminator columns.
+
+When entities might be subtypes (e.g., `Product` might be `PhysicalProduct` or `DigitalProduct`):
+
+```csharp
+public abstract class Product
+{
+    public Guid Id { get; set; }
+    public string Type { get; set; }  // Discriminator
+}
+
+public class PhysicalProduct : Product
+{
+    public decimal Weight { get; set; }
+    public string Dimensions { get; set; }
+}
+
+public class DigitalProduct : Product
+{
+    public Uri DownloadUrl { get; set; }
+    public int MaxDownloads { get; set; }
+}
+```
+
+Stored in one table with a `Type` column; ORM automatically hydrates correct subclass.
+
+---
+
+## Database Support
+
+### SQL Server
+
+**Pattern:** Primary database target with full feature support.
+
+CoreEx ships with `CoreEx.Database.SqlServer` providing:
+- Migrations via **DbEx** (custom migration runner).
+- Data seeding from YAML files.
+- Outbox relay with partitioning.
+- Full TSQL support.
+
+In this repository, SQL Server is the **default initial implementation** and the most complete scaffolding target. That reflects current sample coverage and tooling depth, not a claim that CoreEx patterns are inherently SQL Server-only.
+
+### PostgreSQL
+
+**Pattern:** Secondary/evolving support.
+
+PostgreSQL support depends on the package (marked with `*` in documentation). Many CoreEx features work, but SQL Server is the first-class target.
+
+### ADO.NET Command & Parameter Extensions
+
+**Pattern:** Fluent ADO.NET helpers reduce boilerplate SQL composition.
+
+Instead of manual `SqlCommand` construction:
+
+```csharp
+// Manual
+var cmd = new SqlCommand("SELECT * FROM [Products] WHERE Id = @Id", connection);
+cmd.Parameters.AddWithValue("@Id", id);
+
+// CoreEx extension
+var cmd = connection.CreateCommand("SELECT * FROM [Products] WHERE Id = @Id")
+    .ParamWithValue("@Id", id);
+```
+
+Safer, more readable, less repetitive.
+
+### Entity Framework Integration
+
+**Pattern:** CoreEx works with EF Core repositories and unit-of-work patterns.
+
+`CoreEx.EntityFrameworkCore` provides:
+- Base repository classes wrapping `DbSet<T>`.
+- Unit-of-work with EF's `SaveChangesAsync()`.
+- Outbox integration.
+
+```csharp
+public class ProductRepository : Repository<Product>
+{
+    public ProductRepository(DbContext context) : base(context) { }
+    
+    public async Task<Product?> GetBySkuAsync(string sku)
+        => await _context.Products.SingleOrDefaultAsync(p => p.Sku == sku);
+}
+```
+
+---
+
+## Messaging & Events
+
+### EventData Abstraction
+
+**Pattern:** Format-agnostic event envelope that decouples event definition from transport.
+
+Events are serialized into `EventData` and can be published to any broker:
+
+```csharp
+public class ProductCreatedEvent
+{
+    public Guid ProductId { get; set; }
+    public string Name { get; set; }
+    public DateTime CreatedAt { get; set; }
+}
+
+// Wrapped in EventData
+var eventData = new EventData
+{
+    Subject = "contoso.products.product",
+    Action = "created",
+    Version = "v1",
+    Data = JsonSerializer.SerializeToElement(new ProductCreatedEvent { ... })
+};
+
+// Can publish to Service Bus, RabbitMQ, Kafka, etc.
+await _eventPublisher.PublishAsync(eventData);
+```
+
+### CloudEvent Interoperability
+
+**Pattern:** Automatic conversion to CNCF CloudEvents format.
+
+`EventData` can be serialized/deserialized as CloudEvents for standards compliance:
+
+```json
+{
+  "specversion": "1.0",
+  "type": "com.example.products.created",
+  "source": "https://example.com/products",
+  "id": "abc123",
+  "time": "2024-01-15T12:34:56Z",
+  "data": { "productId": "xyz", "name": "Bike" }
+}
+```
+
+Enables interop with other CloudEvents consumers (AWS EventBridge, etc.).
+
+### Publish + Subscribe Patterns
+
+**Pattern:** Per-message subscription with configurable consumption strategy.
+
+Subscribers join a topic/queue and consume messages from a specific position:
+
+- **From Beginning** — Consume all historical events.
+- **From End** — Consume only new events from now on.
+- **Latest Checkpoint** — Resume from where the subscriber last left off.
+
+```csharp
+public class ProductModifySubscriber : SubscriberHost<ProductCreatedEvent>
+{
+    protected override async Task OnEventAsync(
+        EventData eventData, 
+        ProductCreatedEvent data,
+        CancellationToken cancellationToken)
+    {
+        // React to product creation
+        // E.g., sync to Read Model, update search index
+        await _searchIndex.IndexAsync(data.ProductId, cancellationToken);
+    }
+}
+```
+
+### Azure Service Bus Integration
+
+**Pattern:** Native Service Bus topic/subscription support with partitioning.
+
+CoreEx provides `IEventPublisher` and `ISubscriber` implementations for Service Bus:
+
+```csharp
+builder.Services.AddServiceBusEventPublisher("Endpoint=...");
+builder.Services.AddServiceBusSubscriber<ProductCreatedEvent>("products");
+```
+
+Handles:
+- Topic/subscription creation.
+- Automatic serialization.
+- Partition affinity (partition key = session ID for ordered processing).
+
+In this repository, Azure Service Bus is the **default initial broker implementation** because the sample relay/subscriber hosts are wired around it. The surrounding event model is broader than that specific broker choice: `EventData` is transport-oriented rather than Service Bus-specific.
+
+### Outbox Relay (with Partitioning)
+
+**Pattern:** Dedicated host that reads from database outbox and publishes to broker.
+
+Each domain has its own relay process:
+
+1. Business logic writes events to `[Schema].[Outbox]` table within transaction.
+2. Separate **Relay** host polls the table every N seconds.
+3. Relay fetches unpublished outbox rows and publishes to Service Bus.
+4. On success, marks rows as published.
+5. On failure, retries with exponential backoff.
+
+```
+┌─────────────────┐
+│   API Process   │
+│  Writes events  │
+│   to Outbox     │
+└────────┬────────┘
+         │
+    [DB Outbox]
+         │
+┌────────▼────────┐
+│ Relay    │
+│   Polls every   │
+│   5 seconds     │
+└────────┬────────┘
+         │
+    [Service Bus]
+         │
+┌────────▼───────────┐
+│ Subscribe Services │
+│  React to events   │
+└────────────────────┘
+```
+
+**Partitioning:** If an event has a `PartitionKey`, relay publishes to the same partition in Service Bus for ordered processing.
+
+**Why it matters:** Guarantees events are published even if relay crashes; decouples API availability from messaging; enables ordered processing of related events.
+
+### Workflow Orchestration (Durable Task SDK + DTS)
+
+**Pattern:** Durable workflow coordination for long-running, stateful, and business-critical process flows.
+
+Use orchestration when a process needs one or more of these characteristics:
+
+- Long-running steps that must survive restarts.
+- Fan-out or fan-in aggregation across parallel work items.
+- Batch processing with retries and controlled concurrency.
+- Compensation paths when downstream operations fail.
+- External-event waits, timers, and human-approval checkpoints.
+- Full execution audit trail and replay semantics.
+
+CoreEx samples include orchestration hosted in standard .NET worker processes using the Durable Task SDK with a DTS backend, including local emulator support and containerized hosting alignment.
+
+See [Orchestration with the Durable Task SDK](orchestration.md) for detailed guidance and examples.
+
+---
+
+## Domain-Driven Design
+
+### Aggregate & Entity Modeling
+
+**Pattern:** Implement aggregates as root objects that enforce invariants and encapsulate child entities.
+
+An **aggregate root** orchestrates its entities and ensures consistency:
+
+```csharp
+public class Basket : IIdentifier, IETag, IChangeLog
+{
+    public Guid Id { get; set; }
+    public string? ETag { get; set; }
+    public ChangeLog? ChangeLog { get; set; }
+    
+    public Guid CustomerId { get; set; }
+    public string StatusCode { get; set; } = "Active";
+    
+    // Child entities
+    private List<BasketItem> _items = new();
+    public IReadOnlyList<BasketItem> Items => _items.AsReadOnly();
+    
+    // Business rules
+    public void AddItem(Guid productId, int quantity)
+    {
+        if (StatusCode != "Active")
+            throw new BusinessException("Cannot add item to checked-out basket.");
+        
+        var existing = _items.FirstOrDefault(i => i.ProductId == productId);
+        if (existing != null)
+            existing.Quantity += quantity;
+        else
+            _items.Add(new BasketItem { ProductId = productId, Quantity = quantity });
+    }
+    
+    public void Checkout()
+    {
+        if (!_items.Any())
+            throw new ValidationException("Cannot checkout empty basket.");
+        
+        StatusCode = "CheckedOut";
+    }
+}
+
+public class BasketItem // Child entity, not an aggregate root
+{
+    public Guid ProductId { get; set; }
+    public int Quantity { get; set; }
+}
+```
+
+Aggregate roots:
+- Own their entities (users modify through the root).
+- Enforce invariants (business rules).
+- Publish integration events.
+- Are the transactional boundary.
+
+### Value Objects
+
+**Pattern:** Implement as immutable C# record classes with semantic equality.
+
+Value objects have no identity, only their values matter:
+
+```csharp
+public record ItemPricing(
+    string UnitOfMeasure,
+    int Quantity,
+    decimal UnitPrice)
+{
+    public decimal Total => Quantity * UnitPrice;
+}
+
+// Usage
+var pricing = new ItemPricing("ea", 5, 19.99m);
+
+// Equality is by value
+var pricing2 = new ItemPricing("ea", 5, 19.99m);
+Assert.AreEqual(pricing, pricing2); // True
+
+// Immutable
+// pricing.Quantity = 10;  // CS8852: Init-only property
+```
+
+Record classes automatically provide:
+- Value-based equality (`Equals`, `GetHashCode`).
+- `ToString()` for debugging.
+- Deconstruction.
+
+### Integration Events Only
+
+**Pattern:** Focus on integration events (published to outbox/broker) rather than domain events (in-process messaging).
+
+**Integration Events** — Published to an external event broker; subscribers in other services react.
+```csharp
+public class ProductCreatedIntegrationEvent
+{
+    public Guid ProductId { get; set; }
+    public string Name { get; set; }
+    public DateTime CreatedAt { get; set; }
+}
+
+// Published to Service Bus for other services to consume
+await _unitOfWork.Events.Add(new EventData { ... });
+```
+
+**Avoid:** Domain Events + MediatR for in-process messaging.
+```csharp
+// NOT recommended in CoreEx style
+public class ProductCreatedDomainEvent { ... }
+_mediator.Publish(new ProductCreatedDomainEvent(...)); // In-process
+```
+
+**Why:** Keep services decoupled and independent. If you need cross-domain orchestration, use integration events and let services react asynchronously.
+
+---
+
+## Putting It All Together: A Typical Request Flow
+
+To illustrate how these patterns work together, here's a typical request flow based on the **Contoso sample architecture in this repository**, not a mandatory flow for every CoreEx application.
+
+This example assumes the samples' **full outboxing and messaging setup**:
+
+- an API host handling the request
+- a database-backed unit-of-work writing to an outbox table
+- a separate `Relay` host publishing to Azure Service Bus
+- another service consuming the resulting integration event
+
+```
+1. Client: POST /api/products
+   with Idempotency-Key header
+
+2. CoreEx Middleware:
+   - Extract ExecutionContext (tenant, user, culture)
+   - Check Idempotency-Key (cached response if duplicate)
+   - Route to controller
+
+3. ProductController:
+   - Validate input (ValidationException if invalid)
+   - Call ProductService
+
+4. ProductService:
+   - Create Product entity
+   - Apply domain rules (throw BusinessException if violated)
+   - Create UnitOfWork
+   - Save to repository (within transaction)
+   - Add integration event to UoW.Events
+   - Call UoW.CommitAsync() — atomically saves product + event to Outbox
+
+5. Repository:
+   - Execute INSERT on [Products].[Product]
+   - Add row to [Products].[Outbox]
+   - Assign ETag, ChangeLog
+   - Transaction commits
+
+6. Separate Relay Process:
+   - Poll [Products].[Outbox] every N seconds
+   - Find unpublished events
+   - Publish to Service Bus
+   - Mark as published
+
+7. Other Services Subscribe:
+   - Shopping.Subscribe consumes ProductCreated event
+   - Syncs product replica to [Shopping].[Product]
+
+8. CoreEx Response Handler:
+   - Convert Product to ProductDto (response filtering)
+   - Apply $fields projection
+   - Return 201 Created
+   - Include ETag header and Location header
+
+9. Client:
+   - Receives 201 with ETag
+   - For future updates, uses IF-MATCH: {ETag} header
+```
+
+---
+
+## Summary
+
+CoreEx provides a cohesive set of patterns and utilities that work together to enable:
+
+- **Consistent API behavior** across minimal APIs and MVC.
+- **Reliable messaging** via transactional outboxes.
+- **Durable workflow orchestration** for long-running, compensating, and replayable process flows.
+- **Multi-tenancy** and **concurrency** handling built-in.
+- **Event-driven architecture** with integration events.
+- **Clear separation of concerns** (aggregates, value objects, services).
+- **Type-safe operations** (exceptions, Result types, source generation).
+
+The framework is particularly well-suited for distributed microservices architectures where consistency, reliability, and maintainability are critical.
diff --git a/docs/codebase/ARCHITECTURE.md b/docs/codebase/ARCHITECTURE.md
new file mode 100644
index 00000000..e6e88bb5
--- /dev/null
+++ b/docs/codebase/ARCHITECTURE.md
@@ -0,0 +1,65 @@
+# Architecture
+
+## Core Sections (Required)
+
+### 1) Architectural Style
+
+- Primary style: modular layered architecture for the reusable framework, plus event-driven microservice samples.
+- Why this classification: sample domains are split into Api, Application, Infrastructure, Domain, Database, Relay, and Subscribe projects, and the runtime flow combines synchronous HTTP with outbox-driven Service Bus messaging.
+- Primary constraints: multi-target library packaging across net8/net9/net10; SQL Server-backed unit-of-work and outbox flows in sample hosts; CoreEx-centric patterns such as Result-based orchestration, ETag/idempotency, and dynamic service registration.
+
+### 2) System Flow
+
+```text
+HTTP controller -> application service -> domain aggregate or repository -> SQL Server / HTTP adapter -> outbox or direct publisher -> subscriber/consumer -> response
+```
+
+Describe the flow in 4-6 steps using file-backed evidence.
+
+1. A controller receives an HTTP request and delegates through CoreEx.WebApi helpers, for example ProductController.PostAsync and PatchAsync.
+2. The application service validates input, loads current state when needed, and coordinates a unit-of-work, for example ProductService and BasketService.
+3. For Shopping mutations, domain behavior is applied on Basket and BasketItem before persistence.
+4. Infrastructure repositories translate between domain/contracts and EF-backed persistence models, for example BasketRepository and ProductRepository.
+5. Cross-service behavior happens through a typed HTTP client and adapter for real-time reservation, plus outbox messages or direct Service Bus publishing for async commands.
+6. Relay and subscriber hosts move outbox records to Azure Service Bus and consume messages back into application services.
+
+### 3) Layer/Module Responsibilities
+
+| Layer or module | Owns | Must not own | Evidence |
+|-----------------|------|--------------|----------|
+| API controllers | HTTP routes, request/response semantics, idempotency attributes, WebApi delegation | Domain rules and persistence queries | samples/src/Contoso.Products.Api/Controllers/ProductController.cs |
+| Application services | Validation, orchestration, Result pipelines, unit-of-work/event creation | ASP.NET startup and EF entity tracking details | samples/src/Contoso.Products.Application/ProductService.cs; samples/src/Contoso.Shopping.Application/BasketService.cs |
+| Domain | Aggregate/entity invariants and mutation rules | Transport and infrastructure concerns | samples/src/Contoso.Shopping.Domain/Basket.cs; samples/src/Contoso.Shopping.Domain/BasketItem.cs |
+| Infrastructure | EF DbContext access, query config, mapping, typed clients, adapters | Public HTTP endpoint definitions | samples/src/Contoso.Products.Infrastructure/Repositories/ProductRepository.cs; samples/src/Contoso.Shopping.Infrastructure/Repositories/BasketRepository.cs; samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs |
+| Relay/subscriber hosts | Background message movement and consumption | Business orchestration for user-facing HTTP requests | samples/src/Contoso.Products.Relay/Program.cs; samples/src/Contoso.Products.Subscribe/Program.cs |
+
+### 4) Reused Patterns
+
+| Pattern | Where found | Why it exists |
+|---------|-------------|---------------|
+| Unit of Work + Outbox | ProductService, BasketService, Products/Shopping relay hosts | Persist state and enqueue events/commands atomically before broker delivery |
+| Repository | ProductRepository, BasketRepository | Separate data access/mapping from application services |
+| Aggregate / Entity / Value Object | Basket, BasketItem, ItemPricing | Keep mutation rules and consistency checks in the domain model |
+| Anti-corruption / adapter | ProductAdapter, ProductsHttpClient | Isolate Shopping from Products API and message semantics |
+| Dynamic service registration | AddDynamicServicesUsing in API and subscriber hosts | Reduce explicit DI wiring across layered sample projects |
+| Roslyn source generation | gen/CoreEx.Generator, generated .g.cs persistence files | Generate boilerplate and analyzer-time artifacts |
+
+### 5) Known Architectural Risks
+
+- Sample host bootstrapping is repeated across Products, Shopping, and Orders hosts; the repeated AddExecutionContext/AddMvcWebApi/cache/SQL/OpenTelemetry wiring increases configuration-drift risk.
+- Shopping checkout intentionally mixes a transactional outbox path with a direct broker fallback on failure; that keeps reservations from being stranded, but it also creates two publication paths that must stay behaviorally aligned.
+
+### 6) Evidence
+
+- samples/src/Contoso.Products.Api/Controllers/ProductController.cs
+- samples/src/Contoso.Products.Api/Program.cs
+- samples/src/Contoso.Shopping.Api/Program.cs
+- samples/src/Contoso.Products.Application/ProductService.cs
+- samples/src/Contoso.Shopping.Application/BasketService.cs
+- samples/src/Contoso.Shopping.Domain/Basket.cs
+- samples/src/Contoso.Products.Infrastructure/Repositories/ProductRepository.cs
+- samples/src/Contoso.Shopping.Infrastructure/Repositories/BasketRepository.cs
+- samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs
+- samples/src/Contoso.Products.Relay/Program.cs
+- samples/src/Contoso.Products.Subscribe/Program.cs
+- gen/CoreEx.Generator.csproj
diff --git a/docs/codebase/CONCERNS.md b/docs/codebase/CONCERNS.md
new file mode 100644
index 00000000..d66eb99a
--- /dev/null
+++ b/docs/codebase/CONCERNS.md
@@ -0,0 +1,63 @@
+# Codebase Concerns
+
+## Core Sections (Required)
+
+### 1) Top Risks (Prioritized)
+
+| Severity | Concern | Evidence | Impact | Suggested action |
+|----------|---------|----------|--------|------------------|
+| high | Sample credentials and connection strings are committed in local/dev artifacts. | docker-compose.yml; samples/src/Contoso.Products.Database/Program.cs; samples/tests/Contoso.E2E.Runner/appsettings.json | Increases the chance that local-only credentials are reused or copied into non-local environments. | Move sample secrets to user-secrets or env-template files and keep checked-in values obviously non-reusable. |
+| medium | Multi-backend intent exists, but the current concrete implementation and scaffolding are SQL Server-centric; this can be misread as either SQL-only or equally mature multi-provider support. | README.md; docs/capabilities.md; src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj; docker-compose.yml | Onboarding and design decisions may assume the wrong provider maturity level. | Document provider strategy explicitly as SQL Server-primary with other backends added when needed. |
+| medium | Sample host startup is duplicated across multiple API, relay, and subscriber Program.cs files. | samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Shopping.Api/Program.cs; samples/src/Contoso.Orders.Api/Program.cs; samples/src/Contoso.Products.Relay/Program.cs; samples/src/Contoso.Products.Subscribe/Program.cs | Repeated bootstrap code can drift across domains and host types. | Extract common host-registration extensions or add tests/assertions around expected startup composition. |
+| medium | Shopping checkout uses both transactional outbox publication and a direct broker fallback path. | samples/src/Contoso.Shopping.Application/BasketService.cs; samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs | Two message publication paths must remain semantically aligned during failure handling. | Add focused tests and documentation around compensation/fallback behavior. |
+
+### 2) Technical Debt
+
+| Debt item | Why it exists | Where | Risk if ignored | Suggested fix |
+|-----------|---------------|-------|-----------------|---------------|
+| Repeated host wiring | Each sample host configures overlapping CoreEx, cache, SQL, OpenTelemetry, and health-check setup inline | samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Shopping.Api/Program.cs; samples/src/Contoso.Orders.Api/Program.cs; samples/src/Contoso.Products.Subscribe/Program.cs | Behavioral drift between services and hosts becomes harder to spot | Introduce shared extension methods for common host composition |
+| Sample status visibility | README.md describes two complete reference solutions, while the solution also contains Orders and order-workflow sample projects that are still in progress | README.md; CoreEx.sln | New contributors may misclassify in-progress samples as production-ready references | Label in-progress sample status in top-level docs and sample READMEs |
+| Secret handling in examples | Sample-local secrets are embedded directly in repo files | docker-compose.yml; samples/src/Contoso.Products.Database/Program.cs; samples/tests/Contoso.E2E.Runner/appsettings.json | Normalizes insecure copy/paste patterns | Replace checked-in secrets with placeholders and env-driven overrides |
+
+### 3) Security Concerns
+
+| Risk | OWASP category (if applicable) | Evidence | Current mitigation | Gap |
+|------|--------------------------------|----------|--------------------|-----|
+| Checked-in passwords/connection strings in sample assets | A02 Cryptographic Failures / Secrets Management | docker-compose.yml; samples/src/Contoso.Products.Database/Program.cs; samples/tests/Contoso.E2E.Runner/appsettings.json | These appear scoped to local/dev usage only | The repo does not provide a committed env template or explicit secret-handling guardrail for these values |
+| Local Aspire dashboard allows anonymous access | A01 Broken Access Control | docker-compose.yml | This is clearly configured for local development only | No environment-specific guard in the committed compose file other than the setting name itself |
+| Internal Products API client shows no explicit auth configuration in inspected code | A01 Broken Access Control | samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs; samples/src/Contoso.Shopping.Api/Program.cs | [TODO] auth may be applied elsewhere, but it was not visible in inspected files | The inspected client/host files do not show authentication or authorization for the inter-service call |
+
+### 4) Performance and Scaling Concerns
+
+| Concern | Evidence | Current symptom | Scaling risk | Suggested improvement |
+|---------|----------|-----------------|-------------|-----------------------|
+| Repeated cache/telemetry/bootstrap configuration per host | samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Shopping.Api/Program.cs; samples/src/Contoso.Products.Subscribe/Program.cs | Configuration parity depends on copy/paste discipline | One host can lag behind others in cache or telemetry behavior | Centralize shared startup composition |
+| Checkout performs a synchronous cross-service reservation call before finalizing the transaction | samples/src/Contoso.Shopping.Application/BasketService.cs; samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs | Checkout latency includes remote API availability and response time | Higher latency or transient failures in Products directly affect Shopping checkout | Add explicit resilience policy configuration and document timeout/retry expectations |
+| No explicit timeout/retry settings were found in inspected HTTP client wiring | samples/src/Contoso.Shopping.Api/Program.cs; samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs | Runtime behavior depends on defaults or hidden configuration | Failure recovery characteristics are hard to reason about | Add explicit resilience/timeout configuration in host setup |
+
+### 5) Fragile/High-Churn Areas
+
+| Area | Why fragile | Churn signal | Safe change strategy |
+|------|-------------|-------------|----------------------|
+| samples/src/*/Program.cs host bootstraps | Several hosts repeat nearly the same registration pattern with small variations | Structural duplication is visible in inspected Program.cs files; 90-day and 365-day git queries over src and samples/src produced a flat result with no clear hotspot above 1 touched commit per listed file | Change one host pattern, then compare every sibling host and run the corresponding sample tests |
+| src/CoreEx.Validation/* | Validation files are the most visible source family in the one-year churn sample, but the signal is still flat at 1 touched commit per listed file | Terminal git log --since='365 days ago' sample returned multiple CoreEx.Validation files, each with count 1 | Keep changes small and run the related unit test projects immediately |
+
+### 6) [ASK USER] Questions
+
+1. No open [ASK USER] items remain for this pass.
+
+### 7) Evidence
+
+- README.md
+- docs/capabilities.md
+- CoreEx.sln
+- docker-compose.yml
+- src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj
+- samples/src/Contoso.Products.Api/Program.cs
+- samples/src/Contoso.Shopping.Api/Program.cs
+- samples/src/Contoso.Orders.Api/Program.cs
+- samples/src/Contoso.Products.Subscribe/Program.cs
+- samples/src/Contoso.Shopping.Application/BasketService.cs
+- samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs
+- samples/src/Contoso.Products.Database/Program.cs
+- samples/tests/Contoso.E2E.Runner/appsettings.json
diff --git a/docs/codebase/CONVENTIONS.md b/docs/codebase/CONVENTIONS.md
new file mode 100644
index 00000000..afd63392
--- /dev/null
+++ b/docs/codebase/CONVENTIONS.md
@@ -0,0 +1,51 @@
+# Coding Conventions
+
+## Core Sections (Required)
+
+### 1) Naming Rules
+
+| Item | Rule | Example | Evidence |
+|------|------|---------|----------|
+| Files | PascalCase filenames for C# types and test files | ProductService.cs, BasketRepository.cs, ExceptionTests.cs | samples/src/Contoso.Products.Application/ProductService.cs; samples/src/Contoso.Shopping.Infrastructure/Repositories/BasketRepository.cs; tests/CoreEx.Test.Unit/ExceptionTests.cs |
+| Functions/methods | PascalCase methods; async methods usually end with Async | CreateAsync, CheckoutAsync, DeleteAsync | samples/src/Contoso.Products.Application/ProductService.cs; samples/src/Contoso.Shopping.Application/BasketService.cs |
+| Types/interfaces | Types use PascalCase; interfaces use I-prefix | Basket, ProductController, IProductService, IBasketRepository | samples/src/Contoso.Shopping.Domain/Basket.cs; samples/src/Contoso.Products.Api/Controllers/ProductController.cs; samples/src/Contoso.Products.Application/Interfaces/IProductService.cs; samples/src/Contoso.Shopping.Application/Repositories/IBasketRepository.cs |
+| Constants/env vars | Environment variables are uppercase or configuration-key style | TASKHUB, dts-endpoint, E2E__Products__BaseAddress | samples/src/Contoso.Order.Workflow.Worker/Program.cs; samples/README.md |
+
+### 2) Formatting and Linting
+
+- Formatter: .editorconfig defines spaces, 4-space indentation for .cs, and 2-space indentation for json/xml/yaml/props/csproj/sln/sql.
+- Linter: [TODO] no dedicated style linter config such as StyleCop or Roslyn ruleset file was found in the inspected repo files; analyzer packages exist for the generator project, and build settings enforce warnings as errors.
+- Most relevant enforced rules: Nullable enabled, ImplicitUsings enabled, LangVersion preview, TreatWarningsAsErrors true.
+- Run commands: dotnet build CoreEx.sln; dotnet test CoreEx.sln.
+
+### 3) Import and Module Conventions
+
+- Import grouping/order: using directives sit at the top of the file and projects commonly centralize repeated imports in GlobalUsing.cs files.
+- Alias vs relative import policy: standard project references and namespace imports are used; no alternate aliasing scheme was found beyond a test-only alias for ExecutionContext.
+- Public exports/barrel policy: GlobalUsing.cs is used per project; [TODO] no broader documented export policy was found.
+
+### 4) Error and Logging Conventions
+
+- Error strategy by layer: application and domain code use CoreEx exceptions and Result/BusinessError/NotFoundError flows; API hosts apply UseCoreExExceptionHandler so exceptions map to HTTP responses.
+- Logging style and required context fields: typed ILogger<T> is used where explicit logging appears, and sample host appsettings set Logging:LogLevel with Default and category overrides.
+- Sensitive-data redaction rules: [TODO] no explicit redaction policy or sanitizer configuration was found in the inspected files.
+
+### 5) Testing Conventions
+
+- Test file naming/location rule: tests live under tests/ and samples/tests/; filenames commonly end in Tests.cs or split partial suites such as ProductMutateTests.Create.cs.
+- Mocking strategy norm: UnitTestEx tester base classes, expected outbox publisher wrappers, and MockHttpClientFactory for downstream HTTP isolation are used in samples.
+- Coverage expectation: coverlet.collector is referenced; [TODO] no committed coverage threshold or reporting gate was found.
+
+### 6) Evidence
+
+- .editorconfig
+- src/Directory.Build.props
+- tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj
+- tests/CoreEx.Test.Unit/ExceptionTests.cs
+- samples/src/Contoso.Products.Api/GlobalUsing.cs
+- samples/src/Contoso.Products.Api/Controllers/ProductController.cs
+- samples/src/Contoso.Products.Application/ProductService.cs
+- samples/src/Contoso.Shopping.Application/BasketService.cs
+- samples/src/Contoso.Order.Workflow.Worker/Program.cs
+- samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Create.cs
+- samples/README.md
diff --git a/docs/codebase/INTEGRATIONS.md b/docs/codebase/INTEGRATIONS.md
new file mode 100644
index 00000000..afd28715
--- /dev/null
+++ b/docs/codebase/INTEGRATIONS.md
@@ -0,0 +1,54 @@
+# External Integrations
+
+## Core Sections (Required)
+
+### 1) Integration Inventory
+
+| System | Type (API/DB/Queue/etc) | Purpose | Auth model | Criticality | Evidence |
+|--------|---------------------------|---------|------------|-------------|----------|
+| SQL Server | DB | Primary persistence for sample domains, outbox tables, and migration utilities | Connection string-based | High | docker-compose.yml; samples/src/Contoso.Products.Database/Program.cs; samples/src/Contoso.Products.Api/Program.cs |
+| Redis | Cache/backplane | L2 distributed cache and FusionCache backplane | Connection configured through Aspire/registered ConfigurationOptions | Medium | docker-compose.yml; samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Shopping.Api/Program.cs |
+| Azure Service Bus | Queue/topic broker | Async event publishing, relay, and subscriber processing | Connection configured through Aspire/host config; emulator config committed for local use | High | servicebus/Config.json; samples/src/Contoso.Products.Relay/Program.cs; samples/src/Contoso.Products.Subscribe/Program.cs |
+| Products API from Shopping | Internal HTTP API | Real-time inventory reservation during checkout | [TODO] no explicit auth configuration was found in the inspected Shopping client code | High | samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs; samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs |
+| OTLP / Aspire dashboard | Observability endpoint | Export traces from sample hosts and inspect them locally | No auth found in local compose config; dashboard is configured for anonymous local access | Medium | docker-compose.yml; samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Products.Relay/Program.cs |
+| Durable Task Scheduler | Workflow runtime | Order workflow worker orchestration sample | Connection string assembled from endpoint/task hub and auth mode | Medium | samples/src/Contoso.Order.Workflow.Worker/Program.cs |
+
+### 2) Data Stores
+
+| Store | Role | Access layer | Key risk | Evidence |
+|-------|------|--------------|----------|----------|
+| SQL Server | Transactional domain storage, outbox, and migration target | EF-backed repositories and DbEx console utilities | Sample connection strings and passwords are committed in local/dev artifacts | samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj; samples/src/Contoso.Products.Database/Program.cs; samples/tests/Contoso.E2E.Runner/appsettings.json |
+| Redis | Hybrid cache and backplane | FusionCache + AddRedisDistributedCache + CoreEx hybrid cache abstractions | Cache invalidation/consistency depends on host parity across repeated startup code | samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Shopping.Api/Program.cs |
+
+### 3) Secrets and Credentials Handling
+
+- Credential sources: docker-compose environment variables, appsettings.json for samples/E2E runner, UserSecretsId in the Aspire host, and runtime configuration/environment variables in the workflow worker.
+- Hardcoding checks: committed sample credentials and connection strings are present in docker-compose.yml, samples/src/Contoso.Products.Database/Program.cs, and samples/tests/Contoso.E2E.Runner/appsettings.json.
+- Rotation or lifecycle notes: [TODO] no secret-rotation guidance or secret-manager policy file was found.
+
+### 4) Reliability and Failure Behavior
+
+- Retry/backoff behavior: transactional outbox relays are implemented for Products and Shopping; [TODO] no explicit HTTP retry/backoff policy configuration was found in the inspected host files.
+- Timeout policy: [TODO] no explicit timeout configuration was found in the inspected host or client files.
+- Circuit-breaker or fallback behavior: Shopping checkout falls back to direct broker publication for reservation cancellation if the transactional path fails; Service Bus subscriber sessions set MaxConcurrentSessions and emulator MaxDeliveryCount is configured.
+
+### 5) Observability for Integrations
+
+- Logging around external calls: yes, host-level logging is configured via appsettings and the checkout failure path logs an error before sending a direct cancellation command.
+- Metrics/tracing coverage: yes, sample APIs, relays, subscribers, and the workflow worker all add OpenTelemetry tracing and OTLP export.
+- Missing visibility gaps: [TODO] no committed alerting, dashboard provisioning, or SLO configuration was found beyond the local Aspire dashboard container.
+
+### 6) Evidence
+
+- docker-compose.yml
+- servicebus/Config.json
+- samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj
+- samples/src/Contoso.Products.Api/Program.cs
+- samples/src/Contoso.Shopping.Api/Program.cs
+- samples/src/Contoso.Products.Relay/Program.cs
+- samples/src/Contoso.Products.Subscribe/Program.cs
+- samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs
+- samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs
+- samples/src/Contoso.Order.Workflow.Worker/Program.cs
+- samples/src/Contoso.Products.Database/Program.cs
+- samples/tests/Contoso.E2E.Runner/appsettings.json
diff --git a/docs/codebase/STACK.md b/docs/codebase/STACK.md
new file mode 100644
index 00000000..f681457b
--- /dev/null
+++ b/docs/codebase/STACK.md
@@ -0,0 +1,73 @@
+# Technology Stack
+
+## Core Sections (Required)
+
+### 1) Runtime Summary
+
+| Area | Value | Evidence |
+|------|-------|----------|
+| Primary language | C# | src/Directory.Build.props; CoreEx.sln |
+| Runtime + version | Reusable libraries target net8.0, net9.0, and net10.0; sample hosts use net10.0; generator targets netstandard2.0 | src/Directory.Build.props; samples/Directory.Build.props; samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj; gen/CoreEx.Generator/CoreEx.Generator.csproj |
+| Package manager | NuGet with Central Package Management | Directory.Packages.props |
+| Module/build system | MSBuild project/solution build with SDK-style .csproj files | CoreEx.sln; src/CoreEx/CoreEx.csproj |
+
+### 2) Production Frameworks and Dependencies
+
+| Dependency | Version | Role in system | Evidence |
+|------------|---------|----------------|----------|
+| ASP.NET Core | 8.0.24 / 9.0.13 / 10.0.3 | Web API hosting, controllers, OpenAPI support | Directory.Packages.props; src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj |
+| Entity Framework Core + SQL Server | 8.0.24 / 9.0.13 / 10.0.3 (EFCore); 8.0.22 / 9.0.11 / 10.0.0 (SqlServer) | Data access for sample infrastructure and CoreEx EF integration | Directory.Packages.props; samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj |
+| Microsoft.Data.SqlClient + Aspire SQL client | 6.1.3 / 13.1.1 | SQL Server connectivity | Directory.Packages.props; src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj |
+| NSwag.AspNetCore | 14.6.2 | OpenAPI generation for sample APIs | Directory.Packages.props; samples/src/Contoso.Products.Api/Program.cs |
+| OpenTelemetry | 1.15.1-1.15.3 | Tracing and OTLP export across APIs, relays, subscribers, and workflow worker | Directory.Packages.props; samples/src/Contoso.Products.Api/Program.cs; samples/src/Contoso.Products.Relay/Program.cs; samples/src/Contoso.Order.Workflow.Worker/Program.cs |
+| Azure Service Bus Aspire integration | 13.1.1 | Messaging publisher/subscriber wiring | Directory.Packages.props; src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj; samples/src/Contoso.Products.Subscribe/Program.cs |
+| FusionCache + Redis backplane | 2.5.0 | Hybrid cache and idempotency/caching support | Directory.Packages.props; src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj; samples/src/Contoso.Shopping.Api/Program.cs |
+| Microsoft.Extensions.Http.Resilience | 8.10.0 / 9.10.0 / 10.3.0 | Resilience policies for HTTP clients | Directory.Packages.props |
+| Scalar.AspNetCore | 2.12.47 | API reference documentation and interactive API explorer | Directory.Packages.props |
+| Spectre.Console | 0.49.1 | Rich terminal output for console tooling | Directory.Packages.props |
+| System.Linq.Dynamic.Core | 1.7.1 | Dynamic LINQ query support | Directory.Packages.props |
+| YamlDotNet | 16.3.0 | YAML parsing and serialization | Directory.Packages.props |
+| CloudNative.CloudEvents.SystemTextJson | 2.8.0 | CloudEvent interoperability | Directory.Packages.props |
+| Microsoft.DurableTask.* | 1.17.1 | Order workflow sample orchestration and worker runtime | Directory.Packages.props; samples/src/Contoso.Order.Workflow.Worker/Program.cs; samples/src/Contoso.Order.Workflow.Workflow/Contoso.Order.Workflow.Workflow.csproj |
+| DbEx.SqlServer | 3.0.0-preview-3 | Database migration/data console utilities in samples/tests | Directory.Packages.props; samples/src/Contoso.Products.Database/Program.cs |
+
+### 3) Development Toolchain
+
+| Tool | Purpose | Evidence |
+|------|---------|----------|
+| NUnit | Test framework | Directory.Packages.props; tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj |
+| AwesomeAssertions | Assertions | Directory.Packages.props; tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj |
+| coverlet.collector | Test coverage collection | Directory.Packages.props; tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj |
+| UnitTestEx / UnitTestEx.NUnit | API and integration-style test helpers | Directory.Packages.props; samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj |
+| CoreEx.Generator | Roslyn analyzer/source generator packaged as an analyzer | gen/CoreEx.Generator/CoreEx.Generator.csproj; tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj |
+| .editorconfig | Formatting baseline | .editorconfig |
+
+### 4) Key Commands
+
+```bash
+dotnet build CoreEx.sln
+dotnet test CoreEx.sln
+dotnet run --project samples/aspire/Contoso.Aspire
+docker compose up -d db-sql-server redis-cache servicebus-emulator aspire-dashboard dts-emulator
+```
+
+### 5) Environment and Config
+
+- Config sources: appsettings.json and appsettings.Development.json in sample hosts, docker-compose.yml, servicebus/Config.json, central MSBuild props, and a UserSecretsId in the Aspire host.
+- Required env vars: dts-endpoint, TASKHUB, [TODO] additional deployment/runtime variables are not summarized in a committed env template.
+- Deployment/runtime constraints: local sample execution expects SQL Server, Redis, Azure Service Bus emulator, and Aspire dashboard infrastructure. Current concrete implementation/scaffolding in inspected code is SQL Server-primary, with broader backend support discussed in docs as a capability direction.
+
+### 6) Evidence
+
+- Directory.Packages.props
+- src/Directory.Build.props
+- CoreEx.sln
+- src/CoreEx/CoreEx.csproj
+- src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj
+- src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj
+- src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj
+- samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj
+- samples/src/Contoso.Products.Api/Program.cs
+- samples/src/Contoso.Shopping.Api/Program.cs
+- samples/src/Contoso.Order.Workflow.Worker/Program.cs
+- docker-compose.yml
diff --git a/docs/codebase/STRUCTURE.md b/docs/codebase/STRUCTURE.md
new file mode 100644
index 00000000..2a70396c
--- /dev/null
+++ b/docs/codebase/STRUCTURE.md
@@ -0,0 +1,56 @@
+# Codebase Structure
+
+## Core Sections (Required)
+
+### 1) Top-Level Map
+
+List only meaningful top-level directories and files.
+
+| Path | Purpose | Evidence |
+|------|---------|----------|
+| src/ | CoreEx reusable library packages | CoreEx.sln; README.md |
+| tests/ | Unit and API-style tests for CoreEx libraries | CoreEx.sln; tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj |
+| samples/src/ | Contoso sample applications and hosts by domain/layer, including in-progress Orders and Order.Workflow sample areas | CoreEx.sln; samples/README.md |
+| samples/tests/ | Sample API, relay, subscriber, unit, and E2E test projects | CoreEx.sln; samples/README.md |
+| samples/aspire/ | Aspire AppHost that references runnable sample services | samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj |
+| gen/ | Roslyn source generator/analyzer project | CoreEx.sln; gen/CoreEx.Generator/CoreEx.Generator.csproj |
+| docs/ | Technical notes and generated codebase knowledge docs | README.md; docs/capabilities.md |
+| ref/ | Separate reference solution content (NDCOrderOrchestration.sln) | list_dir output; ref/NDCOrderOrchestration.sln |
+| servicebus/ | Emulator configuration for local Azure Service Bus topics/subscriptions | CoreEx.sln; servicebus/Config.json |
+| tools/ | Repo utility area | list_dir output |
+
+### 2) Entry Points
+
+- Main runtime entry: there is no single root application entry; runnable entry points are sample host Program.cs files under samples/src/ plus the Aspire AppHost in samples/aspire/Contoso.Aspire.
+- Secondary entry points (worker/cli/jobs): database console utilities in samples/src/*Database/Program.cs, outbox relays in samples/src/*.Relay/Program.cs, subscriber hosts in samples/src/*.Subscribe/Program.cs, and the order workflow worker in samples/src/Contoso.Order.Workflow.Worker/Program.cs.
+- How entry is selected (script/config): projects are selected explicitly via dotnet run --project ..., as shown in README.md and samples/README.md.
+
+### 3) Module Boundaries
+
+| Boundary | What belongs here | What must not be here |
+|----------|-------------------|------------------------|
+| src/CoreEx.* | Reusable framework primitives, ASP.NET integration, data, validation, events, caching, and unit-testing helpers | Sample-specific domain logic |
+| samples/src/Contoso.*.Api | HTTP host bootstrap and controllers | Direct persistence details beyond injected services/repositories |
+| samples/src/Contoso.*.Application | Use-case orchestration, validation, repository interfaces, adapters, and service contracts | ASP.NET host wiring and low-level EF mappings |
+| samples/src/Contoso.Shopping.Domain | Aggregate/entity/value-object behavior | HTTP transport or EF DbContext concerns |
+| samples/src/Contoso.*.Infrastructure | EF repositories, mappers, typed clients, adapters, outbox publishers | Web host startup |
+| samples/tests/ and tests/ | Automated tests, test data, and test-only resources | Production host/runtime code |
+
+### 4) Naming and Organization Rules
+
+- File naming pattern: PascalCase .cs filenames such as ProductService.cs, BasketRepository.cs, ProductController.cs, and ExceptionTests.cs.
+- Directory organization pattern: mostly layer-first under samples (Api, Application, Infrastructure, Domain, Database, Subscribe, Relay) and package-first under src (CoreEx.*, CoreEx.AspNetCore.*, CoreEx.Database.*).
+- Import aliasing or path conventions: standard C# project references and global using files are used; no TypeScript-style path alias system exists in the inspected files.
+
+### 5) Evidence
+
+- CoreEx.sln
+- README.md
+- samples/README.md
+- samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj
+- samples/src/Contoso.Products.Api/Program.cs
+- samples/src/Contoso.Products.Database/Program.cs
+- samples/src/Contoso.Products.Relay/Program.cs
+- samples/src/Contoso.Products.Subscribe/Program.cs
+- samples/src/Contoso.Shopping.Domain/Basket.cs
+- gen/CoreEx.Generator/CoreEx.Generator.csproj
diff --git a/docs/codebase/TESTING.md b/docs/codebase/TESTING.md
new file mode 100644
index 00000000..3b178ff4
--- /dev/null
+++ b/docs/codebase/TESTING.md
@@ -0,0 +1,53 @@
+# Testing Patterns
+
+## Core Sections (Required)
+
+### 1) Test Stack and Commands
+
+- Primary test framework: NUnit 4.3.2.
+- Assertion/mocking tools: AwesomeAssertions, UnitTestEx.NUnit, coverlet.collector, and sample-specific mock helpers such as MockHttpClientFactory described in samples/README.md.
+- Commands:
+
+```bash
+dotnet test CoreEx.sln
+dotnet test tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj
+dotnet test samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj
+[TODO] no dedicated committed coverage command beyond standard dotnet test with coverlet.collector references was found.
+```
+
+### 2) Test Layout
+
+- Test file placement pattern: reusable library tests live under tests/; sample tests live under samples/tests/ with separate projects for unit, API, relay, subscriber, common test data, and E2E runner.
+- Naming convention: project names end in .Test.Unit, .Test.Api, .Test.Subscribe, .Test.Relay, or .Test.Common; files end in Tests.cs or split a suite into partial files like ProductMutateTests.Create.cs.
+- Setup files and where they run: sample integration projects copy appsettings.unittest.json, embed Resources/**/*, and keep shared YAML test data in *.Test.Common projects; sample README describes OneTimeSetUp database migration, cache clearing, event capture, and HTTP client replacement.
+
+### 3) Test Scope Matrix
+
+| Scope | Covered? | Typical target | Notes |
+|-------|----------|----------------|-------|
+| Unit | yes | CoreEx library primitives and sample validators/domain behavior | tests/CoreEx.Test.Unit and Contoso.Products.Test.Unit are present |
+| Integration | yes | Sample APIs, subscriber hosts, and relay hosts | Contoso.Products.Test.Api, Contoso.Shopping.Test.Api, Contoso.Products.Test.Subscribe, and Contoso.Products.Test.Relay are present |
+| E2E | yes | Cross-service sample scenarios against running APIs | Contoso.E2E.Runner is an interactive console runner |
+
+### 4) Mocking and Isolation Strategy
+
+- Main mocking approach: UnitTestEx tester base classes drive HTTP and generic tests; sample tests wrap outbox/service bus publishers and replace downstream HTTP clients with mocks.
+- Isolation guarantees: sample integration setup migrates and reseeds SQL data, clears FusionCache/Redis state, and captures emitted events before assertions.
+- Common failure mode in tests: [TODO] no committed flaky-test catalog or failure analysis file was found.
+
+### 5) Coverage and Quality Signals
+
+- Coverage tool + threshold: coverlet.collector is referenced; [TODO] no threshold was found.
+- Current reported coverage: [TODO] no committed coverage report or badge was found.
+- Known gaps/flaky areas: [TODO] none were explicitly documented in the inspected files.
+
+### 6) Evidence
+
+- Directory.Packages.props
+- tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj
+- tests/CoreEx.Test.Unit/ExceptionTests.cs
+- samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj
+- samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Create.cs
+- samples/tests/Contoso.E2E.Runner/Contoso.E2E.Runner.csproj
+- samples/tests/Contoso.E2E.Runner/appsettings.json
+- samples/README.md
diff --git a/docs/getting-started.md b/docs/getting-started.md
new file mode 100644
index 00000000..f6fccfb7
--- /dev/null
+++ b/docs/getting-started.md
@@ -0,0 +1,250 @@
+# Getting Started with CoreEx
+
+This guide walks through creating a new CoreEx-based microservice from scratch using the `CoreEx.Template` `dotnet new` template pack.
+
+## What we're building
+
+Throughout this guide we'll build the **People** domain — part of a fictional HR solution for Avanade. The solution name is `Avanade.Hr.People`. We'll scaffold the solution with all defaults, stand up local infrastructure, and implement an **Employee** entity with full CRUD, validation, and tests. We'll then add an Outbox Relay host and a Subscribe host and verify both with the generated integration tests.
+
+By the end you'll have a running, fully tested CoreEx microservice as a foundation to build on.
+
+---
+
+## Prerequisites
+
+| Requirement | Notes |
+|---|---|
+| **.NET SDK 10+** | `dotnet --list-sdks` to confirm |
+| **Podman** (preferred) or **Docker** | For running local infrastructure |
+
+### Git configuration (Windows)
+
+Run this once to prevent Git for Windows overriding LF line endings:
+
+```bash
+git config --global core.autocrlf input
+```
+
+---
+
+## 1. Create and enter your solution folder
+
+Name the folder using the three-part `Company.Product.Domain` convention — this becomes the solution and project namespace root:
+
+```bash
+mkdir Avanade.Hr.People
+cd Avanade.Hr.People
+git init
+```
+
+---
+
+## 2. Install the template pack
+
+```bash
+dotnet new install CoreEx.Template
+```
+
+Verify installation — you should see the `coreex*` templates listed:
+
+```bash
+dotnet new list --tag CoreEx
+```
+
+---
+
+## 3. Scaffold the solution
+
+Run `dotnet new coreex` from inside your solution folder. The folder name is used as the solution name automatically:
+
+```bash
+dotnet new coreex
+```
+
+That's it — accept all defaults. This gives you PostgreSQL, Azure Service Bus, transactional outbox, and reference data code generation out of the box.
+
+This emits the solution file, `src/`, `tests/`, `tools/`, `docker-compose.yml`, `.github/`, `.claude/`, and config files — all immediately AI-ready.
+
+> **Note:** The scaffold compiles cleanly straight away — `dotnet restore` and `dotnet build` will both succeed. It is, however, an intentional empty shell: the layer structure is in place but there are no entities, no API routes, no EF mappings, and no ref-data types yet. The AI agent in step 6 is what implements your first domain entity and makes the solution functional.
+
+### Available options
+
+If your project requires a different shape, the full option set is:
+
+| Option | Values | Default | Notes |
+|---|---|---|---|
+| `--data-provider` | `SqlServer` · `Postgres` · `None` | `Postgres` | `None` for a facade over an external system |
+| `--messaging-provider` | `ServiceBus` · `None` | `ServiceBus` | Azure Service Bus emulator is wired into `docker-compose.yml` when enabled |
+| `--outbox-enabled` | `true` · `false` | `true` | Transactional outbox — commit events atomically with database writes |
+| `--refdata-enabled` | `true` · `false` | `true` | Reference data code generation from `tools/[name].CodeGen/ref-data.yaml` |
+| `--domain-driven-enabled` | `true` · `false` | `false` | Adds a `*.Domain` project for aggregates and value objects |
+| `--rop-enabled` | `true` · `false` | `false` | Railway-oriented programming — services return `Result`/`Result<T>` |
+
+---
+
+## 4. Start the infrastructure
+
+The generated `docker-compose.yml` contains all local dependencies:
+
+```bash
+# Podman (preferred)
+podman compose up -d
+
+# Docker
+docker compose up -d
+```
+
+| Container | Port(s) | Purpose |
+|---|---|---|
+| `db-postgres` | 5432 | Domain database |
+| `db-sql-server` | 1433 | Service Bus emulator backing store |
+| `redis-cache` | 6379 | Distributed cache |
+| `servicebus-emulator` | 5672, 5300 | Azure Service Bus emulator |
+| `aspire-dashboard` | 18888 (UI), 4317 (OTLP) | OpenTelemetry dashboard — open at http://localhost:18888 |
+
+> **Optional — verify the scaffold before handing off to the AI agent:**
+> ```bash
+> dotnet run --project tools/Avanade.Hr.People.Database -- all  # apply initial schema
+> dotnet run --project tools/Avanade.Hr.People.CodeGen          # generate ref-data stubs
+> ```
+> The AI agent in step 5 will run both of these automatically as part of implementing the domain — you only need to run them manually if you want to confirm the scaffold builds cleanly first.
+
+---
+
+## 5. Open your IDE and AI tooling
+
+Open the solution folder in your IDE. The scaffold has already wired in all AI context — no manual setup needed.
+
+**GitHub Copilot Chat:**
+- Switch to **Agent** mode and select **CoreEx Expert** for architecture guidance
+- Use `/coreex-scaffold` to add missing hosts or reshape the solution
+
+**Claude Code:**
+- `CLAUDE.md` is pre-configured — all CoreEx instructions load automatically on startup
+- `/coreex-expert` — architecture guidance and pattern decisions
+- `/coreex-scaffold` — guided host-addition and solution reshaping
+- `/coreex-docs-sync` — refresh the local CoreEx doc cache after a version bump
+
+---
+
+## 6–8. Bring your domain to life
+
+Steps 6, 7, and 8 walk through adding an API host, an Outbox Relay host, and a Subscribe host and implementing your first domain entity end-to-end.
+
+The **recommended path** uses AI-assisted prompts — the AI reads `AGENTS.md`, the CoreEx instructions, and the Contoso samples to derive the correct patterns and run `dotnet new coreex-*` for you. The **manual path** lists the raw commands for each host if you prefer direct control.
+
+Use the prompts in sequence. For each, ask your AI agent to work through **Plan → Review → Implement** phases — plan the approach first, confirm with you, then generate code. This prevents a 2,000-line diff appearing before you have a chance to course-correct.
+
+---
+
+## 6. Implement your first entity and API host
+
+### AI-assisted (recommended)
+
+> Paste the following into GitHub Copilot (Agent mode) or Claude Code. It will scaffold the API host, implement the entity end-to-end, and run the API tests.
+
+```
+The local infrastructure containers (database, redis, service bus) are already running.
+
+Work in phases: Plan your approach and present it for review before writing any code; once confirmed, implement.
+
+Add an API host. Create an entity called Employee with the following properties:
+  - FirstName (string)
+  - NickName (string) - optional
+  - LastName (string)
+  - Gender (reference data)
+  - Salary (decimal)
+  - DateOfBirth (DateOnly) - must be at least 16 years of age.
+
+Implement full end-to-end CRUD API/Services/Database including validation for the properties.
+Create unit tests for the validator.
+Create API tests for all Employee endpoints. 
+Run all the tests and correct any failures.
+```
+
+### Manual alternative
+
+```bash
+dotnet new coreex-api -n Avanade.Hr.People.Api --data-provider Postgres --refdata-enabled true --outbox-enabled true
+```
+
+This adds `src/Avanade.Hr.People.Api/` and `tests/Avanade.Hr.People.Test.Api/` and wires both into the solution file. After scaffolding, implement the domain entity, validation, and tests by hand following the [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) and [Contoso samples](https://github.com/Avanade/CoreEx/tree/main/samples).
+
+---
+
+## 7. Add an Outbox Relay host
+
+### AI-assisted (recommended)
+
+> Paste the following into GitHub Copilot (Agent mode) or Claude Code.
+
+```
+Work in phases: Plan your approach and present it for review before writing any code; once confirmed, implement.
+
+Add the Outbox Relay host to the solution. Run the existing relay integration tests; do not attempt to correct any failures.
+```
+
+### Manual alternative
+
+```bash
+dotnet new coreex-relay -n Avanade.Hr.People.Relay --data-provider Postgres --messaging-provider ServiceBus
+```
+
+This adds `src/Avanade.Hr.People.Relay/` and `tests/Avanade.Hr.People.Test.Relay/`.
+
+---
+
+## 8. Add a Subscribe host
+
+### AI-assisted (recommended)
+
+> Paste the following into GitHub Copilot (Agent mode) or Claude Code.
+
+```
+Work in phases: Plan your approach and present it for review before writing any code; once confirmed, implement.
+
+Add the Subscribe host to the solution. Run the existing subscriber integration tests; do not attempt to correct any failures.
+```
+
+### Manual alternative
+
+```bash
+dotnet new coreex-subscribe -n Avanade.Hr.People.Subscribe --data-provider Postgres --messaging-provider ServiceBus --refdata-enabled true
+```
+
+This adds `src/Avanade.Hr.People.Subscribe/` and `tests/Avanade.Hr.People.Test.Subscribe/`.
+
+---
+
+## 9. Build and test
+
+```bash
+dotnet build
+dotnet test tests/Avanade.Hr.People.Test.Unit   # fast, no infrastructure required
+dotnet test                                      # all tests — requires containers + database
+```
+
+---
+
+## What's next
+
+| Resource | Description |
+|---|---|
+| `README.md` | Solution-local developer reference (infrastructure, database commands, conventions) |
+| `AGENTS.md` | AI-oriented project brief — architecture, configuration, docs index |
+| [Pattern Catalog](https://github.com/Avanade/CoreEx/blob/main/samples/docs/patterns.md) | Every CoreEx architectural and design pattern, with links to layer docs |
+| [Layer Guide](https://github.com/Avanade/CoreEx/blob/main/samples/docs/layers.md) | Business and host layer overview with full dependency diagram |
+| [Contoso samples](https://github.com/Avanade/CoreEx/tree/main/samples) | Complete reference implementation — Products, Shopping, Orders domains |
+| [Capabilities Guide](https://github.com/Avanade/CoreEx/blob/main/docs/capabilities.md) | Deep capability and pattern explanations |
+
+---
+
+## Alternative: AI-guided scaffold
+
+If you prefer an interactive approach rather than choosing template parameters manually, use the `/coreex-scaffold` command from inside your IDE AI chat after completing steps 1–2:
+
+```
+/coreex-scaffold
+```
+
+The workflow interviews you in plain English — one question at a time — and derives and runs the correct `dotnet new coreex*` commands for the shape you describe. It also installs the template pack if not already present.
diff --git a/docs/orchestration.md b/docs/orchestration.md
new file mode 100644
index 00000000..d9757971
--- /dev/null
+++ b/docs/orchestration.md
@@ -0,0 +1,557 @@
+# Orchestration with the Durable Task SDK
+
+This document explains when and how to incorporate workflow orchestration into a CoreEx-based application landscape. It draws on the `Contoso.Order.Workflow.*` sample, which demonstrates an order validation and submission workflow backed by Durable Task Scheduler (DTS).
+
+## Table of Contents
+
+- [When to Use Orchestration](#when-to-use-orchestration)
+- [Durable Task SDK with DTS vs Durable Functions](#durable-task-sdk-with-dts-vs-durable-functions)
+- [Long-Running Workflows](#long-running-workflows)
+- [Business-Critical Orchestration](#business-critical-orchestration)
+- [Compensation and Retries](#compensation-and-retries)
+- [Deterministic Execution](#deterministic-execution)
+- [Fan-Out / Fan-In](#fan-out--fan-in)
+- [Batch Processing](#batch-processing)
+- [External Events and Human Approval](#external-events-and-human-approval)
+- [Auditability and Replay](#auditability-and-replay)
+- [DTS Dashboard for Observability and Management](#dts-dashboard-for-observability-and-management)
+- [Project Layout](#project-layout)
+- [Worker Host Setup](#worker-host-setup)
+- [Client Registration](#client-registration)
+- [Running Locally](#running-locally)
+
+---
+
+## When to Use Orchestration
+
+Standard request/response services, backed by application services, repositories, and outbox-relay messaging, cover the majority of business operations. Workflow orchestration solves a different class of problems where those patterns alone are insufficient.
+
+| Scenario | Request/response + outbox sufficient? | Orchestration adds value? |
+|---|---|---|
+| CRUD operations with side-effect events | Yes | No |
+| Simple pub/sub fan-out (fire-and-forget, no aggregated result) | Yes | No |
+| Fan-out with aggregated result or partial-failure handling | No | Yes |
+| Batch processing of a variable-size work list | No | Yes |
+| Throttled parallel work with a concurrency cap | No | Yes |
+| External-event wait (human approval, webhook callback) | No | Yes |
+| Multi-step process spanning seconds to days | No | Yes |
+| Process requiring compensation on failure | No | Yes |
+| Steps that must run in strict order with branching | No | Yes |
+| Audit trail of every execution step required | No | Yes |
+| Step must retry independently from the whole workflow | No | Yes |
+
+Choose orchestration when at least one of those characteristics is central to the business process.
+
+---
+
+## Durable Task SDK with DTS vs Durable Functions
+
+The Durable Task SDK and Durable Functions share the same core orchestration concepts: orchestrators, activities, deterministic replay, durable timers, and external events. Both can use Durable Task Scheduler (DTS) as the durable backend. The primary difference is runtime hosting preference rather than orchestration semantics.
+
+### What is different
+
+Durable Functions is a Functions-hosted programming model. It is designed around Azure Functions triggers, bindings, and the Functions runtime lifecycle. That model is productive when the application is already centered on Functions and event-triggered serverless hosting.
+
+The Durable Task SDK with DTS is a general-purpose .NET library and backend combination. Instead of writing against the Azure Functions host, you write orchestrators and activities and then host them inside any .NET process that can register a worker and a client. In this repository, the workflow is hosted in a normal ASP.NET Core process:
+
+```csharp
+builder.Services.AddDurableTaskWorker()
+    .AddTasks(registry =>
+    {
+        registry.AddOrchestrator<OrderWorkflowOrchestration>();
+        registry.AddActivity<ValidateOrderActivity>();
+        registry.AddActivity<SubmitOrderActivity>();
+    })
+    .UseDurableTaskScheduler(connectionString);
+```
+
+And any host can schedule or query workflow instances through a normal client registration:
+
+```csharp
+services.AddDurableTaskClient(durableTaskBuilder =>
+{
+    durableTaskBuilder.UseDurableTaskScheduler(connectionString);
+});
+```
+
+### Why that matters in practice
+
+| Concern | Durable Functions | Durable Task SDK with DTS |
+|---|---|---|
+| Primary hosting model | Azure Functions runtime | Any .NET host |
+| Programming surface | Triggers and bindings | Explicit worker and client APIs |
+| DTS backend support | Yes | Yes |
+| Best fit | Serverless Functions applications | Existing APIs, workers, services, and containerized apps |
+| Runtime dependency | Functions host | No Functions host required |
+| Local backend story | Can run locally with emulator tooling | DTS emulator can be started directly as infrastructure |
+| Container hosting | Possible, but still centered on the Functions runtime model | Natural fit for regular ASP.NET Core or worker containers |
+
+The difference is slight at the orchestration-code level, but important at the application-hosting level. If the goal is to use durable workflows inside an existing service landscape rather than build a Functions application, the Durable Task SDK with DTS is often the more direct fit. If the solution is already Functions-centric, Durable Functions with DTS can provide the same durable backend while preserving Functions triggers and bindings.
+
+### Local emulator benefit
+
+One of the practical advantages of DTS is that the backend can be run locally as infrastructure, without switching the application into a Functions-hosting model. This repository already includes the emulator in [docker-compose.yml](../docker-compose.yml):
+
+```yaml
+dts-emulator:
+  image: mcr.microsoft.com/dts/dts-emulator:latest
+  environment:
+    DTS_TASK_HUB_NAMES: "default,order"
+  ports:
+    - "8080:8080"
+    - "8082:8082"
+```
+
+That means developers can run the orchestration backend locally, start the workflow worker, and test orchestration behavior end-to-end without needing Azure-hosted infrastructure. In the sample worker, the connection logic explicitly detects the local emulator and switches authentication to `None`:
+
+```csharp
+var isLocalEmulator = hostAddress.StartsWith("http://localhost:8080", StringComparison.OrdinalIgnoreCase);
+
+var connectionString = isLocalEmulator
+    ? $"Endpoint={hostAddress};TaskHub={taskHubName};Authentication=None"
+    : $"Endpoint={hostAddress};TaskHub={taskHubName};Authentication=DefaultAzure";
+```
+
+This gives a clean local-development loop:
+
+1. Start the DTS emulator with container infrastructure.
+2. Run the worker host locally.
+3. Run an API, console app, or test that schedules orchestration instances.
+4. Observe orchestration status and traces without changing the application architecture.
+
+### Container-hosting benefit
+
+Because the Durable Task SDK is hosted inside ordinary .NET applications, it fits naturally into containerized environments. A workflow worker can be packaged exactly like any other ASP.NET Core or background-service container, and the DTS backend can run either as the local emulator or as a managed service.
+
+That is useful when the broader application landscape already uses:
+
+- Containerized APIs and background workers.
+- Kubernetes, Container Apps, or Docker Compose for local and deployed environments.
+- Shared OpenTelemetry, health checks, and common ASP.NET Core hosting patterns.
+
+In this sample, the worker is just another host process with logging, OpenTelemetry, and health checks, not a special Functions runtime host. That reduces the amount of platform-specific infrastructure needed when orchestration is only one capability inside a larger service estate.
+
+### Guidance
+
+Prefer Durable Functions when the solution is intentionally Functions-centric and benefits from trigger-and-binding composition.
+
+Prefer the Durable Task SDK with DTS when:
+
+- The application is already an API, worker, or service-host landscape.
+- You want orchestration without adopting the Azure Functions runtime.
+- You want to run the backend locally through the DTS emulator.
+- You want workflow workers to be packaged and deployed like ordinary containers.
+
+---
+
+## Long-Running Workflows
+
+Durable orchestrations persist their state between steps. A workflow can be suspended while waiting for an external event, a timer, or a slow downstream system, and then resume without holding a thread or blocking an HTTP request.
+
+**Apply this when:**
+- A business process spans minutes, hours, or days, for example order fulfilment, approval chains, or scheduled reminders.
+- Steps involve human interaction, third-party callbacks, or polling.
+- The initiating HTTP request cannot or should not block until the process finishes.
+
+**Pattern in the sample:**
+
+The `OrderWorkflowOrchestration` is initiated by a client call that returns an instance ID immediately. The caller can poll for status later using `GetMetadataAsync`:
+
+```csharp
+var instanceId = await _orderWorkflowClient.StartAsync(request, cancellationToken: ct);
+var metadata = await _orderWorkflowClient.GetMetadataAsync(instanceId);
+```
+
+The orchestration itself runs as a durable sequence of activity calls, each persisted between steps:
+
+```csharp
+public override async Task<OrderWorkflowResult> RunAsync(
+    TaskOrchestrationContext context, OrderWorkflowRequest input)
+{
+    var validation = await context.CallActivityAsync<bool>(
+        nameof(ValidateOrderActivity),
+        new ValidateOrderActivityInput(input.OrderId, input.Amount, input.Currency));
+
+    if (!validation)
+    {
+        return new OrderWorkflowResult(
+            input.OrderId,
+            false,
+            "Order request failed validation.",
+            context.CurrentUtcDateTime);
+    }
+
+    return await context.CallActivityAsync<OrderWorkflowResult>(
+        nameof(SubmitOrderActivity),
+        new SubmitOrderActivityInput(input.OrderId, input.Amount, input.Currency, input.RequestedBy));
+}
+```
+
+Each `CallActivityAsync` checkpoint is recorded. If the worker process restarts between steps, the orchestration replays only what is needed to reach the last durable checkpoint.
+
+---
+
+## Business-Critical Orchestration
+
+Orchestration guarantees that every step is recorded and that the overall process will eventually reach a terminal state, even across process restarts or transient infrastructure failures.
+
+**Apply this when:**
+- Partial execution of a process would leave the system in an inconsistent or unacceptable state.
+- A process coordinates writes across multiple services or systems that do not share a transaction boundary.
+- Regulatory or commercial requirements demand that every step and outcome is traceable.
+
+**Guidance:**
+- Model each external call or side-effecting operation as a discrete `TaskActivity`.
+- Keep orchestrator code free of direct I/O.
+- Keep contracts serializable and explicit.
+- Name activities and orchestrations clearly because those names become part of operations and diagnostics.
+
+**Sample activity pattern:**
+
+```csharp
+[DurableTask]
+public sealed class SubmitOrderActivity : TaskActivity<SubmitOrderActivityInput, OrderWorkflowResult>
+{
+    public override Task<OrderWorkflowResult> RunAsync(
+        TaskActivityContext context,
+        SubmitOrderActivityInput input)
+    {
+        var message = $"Order '{input.OrderId}' accepted for {input.Amount:0.00} {input.Currency}.";
+        var result = new OrderWorkflowResult(input.OrderId, true, message, DateTimeOffset.UtcNow);
+        return Task.FromResult(result);
+    }
+}
+```
+
+Activities receive typed input records and return typed result records. Keep those contracts as plain records so they serialize cleanly across durable boundaries.
+
+---
+
+## Compensation and Retries
+
+When a step in a multi-step workflow fails, the process may need to undo work already performed by earlier steps. That is the classic compensation or saga pattern.
+
+**Apply this when:**
+- Earlier steps have already committed side effects, for example inventory reservation or payment authorization.
+- There is no distributed rollback mechanism.
+- The compensating action itself must be durable and observable.
+
+**Pattern:**
+
+```csharp
+public override async Task<OrderWorkflowResult> RunAsync(
+    TaskOrchestrationContext context, OrderWorkflowRequest input)
+{
+    var reservationId = await context.CallActivityAsync<string>(
+        nameof(ReserveInventoryActivity), input);
+
+    try
+    {
+        return await context.CallActivityAsync<OrderWorkflowResult>(
+            nameof(ChargePaymentActivity), input);
+    }
+    catch (TaskFailedException)
+    {
+        await context.CallActivityAsync(
+            nameof(ReleaseInventoryActivity), reservationId);
+
+        return new OrderWorkflowResult(
+            input.OrderId,
+            false,
+            "Payment failed; reservation released.",
+            context.CurrentUtcDateTime);
+    }
+}
+```
+
+**Retry policies:**
+
+Configure retries on the activity call rather than burying retry logic inside the activity:
+
+```csharp
+var retryOptions = new TaskOptions(new RetryPolicy(
+    maxNumberOfAttempts: 3,
+    firstRetryInterval: TimeSpan.FromSeconds(5),
+    backoffCoefficient: 2.0));
+
+await context.CallActivityAsync<OrderWorkflowResult>(
+    nameof(SubmitOrderActivity),
+    input,
+    retryOptions);
+```
+
+Retries replay only the failing step. Previously completed steps are not re-executed.
+
+---
+
+## Deterministic Execution
+
+Orchestrators are replayed whenever the worker resumes. Every line of orchestrator code may run multiple times during replay. Non-deterministic logic inside the orchestrator will corrupt the execution history.
+
+**Rules:**
+- Do not read `DateTime.UtcNow` or `DateTimeOffset.UtcNow` directly inside an orchestrator. Use `context.CurrentUtcDateTime`.
+- Do not generate random values or GUIDs inside an orchestrator.
+- Do not perform I/O inside an orchestrator.
+- Do not use `Task.Delay`; use `context.CreateTimer`.
+- Do not read environment variables or configuration directly inside the orchestrator.
+
+**Correct:**
+
+```csharp
+var processedAt = context.CurrentUtcDateTime;
+```
+
+The sample follows that rule by keeping business work inside activities and using `context.CurrentUtcDateTime` for durable timestamps.
+
+---
+
+## Fan-Out / Fan-In
+
+Fan-out/fan-in describes a pattern where one orchestrator dispatches many parallel work items, waits for them all to complete, and then aggregates the results.
+
+**Apply this when:**
+- One business action must trigger work against a dynamic list of targets.
+- The caller needs an aggregated result before proceeding.
+- Individual branches may fail and need independent retries.
+- The work list is not fixed at design time.
+
+**Pattern:**
+
+```csharp
+[DurableTask]
+public sealed class NotifyRecipientsOrchestration
+    : TaskOrchestrator<NotifyRecipientsRequest, NotifyRecipientsResult>
+{
+    public override async Task<NotifyRecipientsResult> RunAsync(
+        TaskOrchestrationContext context, NotifyRecipientsRequest input)
+    {
+        var tasks = input.RecipientIds.Select(id =>
+            context.CallActivityAsync<NotificationOutcome>(
+                nameof(SendNotificationActivity),
+                new SendNotificationInput(id, input.MessageTemplate)));
+
+        var outcomes = await Task.WhenAll(tasks);
+
+        var failed = outcomes.Where(x => !x.Delivered).Select(x => x.RecipientId).ToList();
+        return new NotifyRecipientsResult(outcomes.Length, outcomes.Count(x => x.Delivered), failed);
+    }
+}
+```
+
+`Task.WhenAll` is safe here because the inner tasks are durable activity calls, not raw background work.
+
+---
+
+## Batch Processing
+
+Batch processing involves iterating over a variable-size list of work items and executing durable work for each item. Orchestration adds per-item checkpointing, independent retries, and controllable parallelism.
+
+**Apply this when:**
+- A scheduled job, import file, or upstream event delivers a list of items.
+- The batch must survive worker restarts.
+- Some items may fail without invalidating the whole batch.
+- Throughput must be capped to protect downstream systems.
+
+**Pattern:**
+
+```csharp
+[DurableTask]
+public sealed class OrderBatchOrchestration
+    : TaskOrchestrator<OrderBatchRequest, OrderBatchResult>
+{
+    private const int MaxConcurrency = 10;
+
+    public override async Task<OrderBatchResult> RunAsync(
+        TaskOrchestrationContext context, OrderBatchRequest input)
+    {
+        var results = new List<OrderWorkflowResult>();
+        var queue = new Queue<string>(input.OrderIds);
+
+        while (queue.Count > 0)
+        {
+            var window = Enumerable.Range(0, Math.Min(MaxConcurrency, queue.Count))
+                .Select(_ => queue.Dequeue())
+                .ToList();
+
+            var tasks = window.Select(orderId =>
+                context.CallActivityAsync<OrderWorkflowResult>(
+                    nameof(ProcessSingleOrderActivity),
+                    new ProcessSingleOrderInput(orderId)));
+
+            results.AddRange(await Task.WhenAll(tasks));
+        }
+
+        return new OrderBatchResult(
+            results.Count,
+            results.Count(x => x.Accepted),
+            results.Count(x => !x.Accepted));
+    }
+}
+```
+
+For very large batches, use sub-orchestrations to shard the work and keep orchestration histories compact.
+
+---
+
+## External Events and Human Approval
+
+An orchestration can pause and wait for an event raised by an external system or a human actor, then resume with the event payload.
+
+**Apply this when:**
+- A step requires human approval.
+- A third-party system responds asynchronously.
+- A timeout should trigger a compensating or fallback path.
+
+**Pattern:**
+
+```csharp
+[DurableTask]
+public sealed class OrderApprovalOrchestration
+    : TaskOrchestrator<OrderWorkflowRequest, OrderWorkflowResult>
+{
+    public override async Task<OrderWorkflowResult> RunAsync(
+        TaskOrchestrationContext context, OrderWorkflowRequest input)
+    {
+        await context.CallActivityAsync(nameof(NotifyApproverActivity), input);
+
+        using var timeoutCts = new CancellationTokenSource();
+        var approvalTask = context.WaitForExternalEvent<bool>("ApprovalDecision", timeoutCts.Token);
+        var timeoutTask = context.CreateTimer(context.CurrentUtcDateTime.AddHours(48), timeoutCts.Token);
+
+        var winner = await Task.WhenAny(approvalTask, timeoutTask);
+        timeoutCts.Cancel();
+
+        if (winner == timeoutTask || !approvalTask.Result)
+        {
+            await context.CallActivityAsync(nameof(CancelOrderActivity), input.OrderId);
+            return new OrderWorkflowResult(
+                input.OrderId,
+                false,
+                "Approval not received within deadline.",
+                context.CurrentUtcDateTime);
+        }
+
+        return await context.CallActivityAsync<OrderWorkflowResult>(
+            nameof(SubmitOrderActivity),
+            new SubmitOrderActivityInput(input.OrderId, input.Amount, input.Currency, input.RequestedBy));
+    }
+}
+```
+
+An external caller raises the event with `DurableTaskClient.RaiseEventAsync`.
+
+---
+
+## Auditability and Replay
+
+The Durable Task runtime stores execution history for every orchestration instance: inputs, outputs, activity timing, and status transitions. That gives a built-in audit trail and a basis for replay-aware diagnostics.
+
+**Querying instance status:**
+
+```csharp
+var metadata = await _orderWorkflowClient.GetMetadataAsync(instanceId, getInputsAndOutputs: true);
+```
+
+`OrchestrationMetadata` provides runtime status, timestamps, inputs, outputs, and failure details.
+
+Use a caller-supplied or business-key-derived instance ID when idempotent scheduling matters. That ties the durable history directly to the business entity and prevents duplicate scheduling.
+
+---
+
+## DTS Dashboard for Observability and Management
+
+The DTS dashboard provides a unified operational view of orchestrations, activities, and entities. It is useful for both day-to-day observability and active management actions.
+
+### What it provides
+
+- Instance-level visibility: runtime status, duration, input and output payloads, and failure details.
+- Execution flow insight: orchestration timelines including fan-out and fan-in activity branches.
+- Operational controls: pause, terminate, and restart operations for orchestration instances.
+- Query and filtering: locate instances by status, age, name, or identifier patterns.
+- Troubleshooting support: correlate orchestration history with application logs and traces.
+
+### Why it matters locally
+
+The same dashboard experience is available when using the local emulator. That means developers can test workflows and inspect execution behavior on their workstation without deploying to Azure.
+
+In this repository, the emulator dashboard is exposed on `http://localhost:8082`.
+
+Typical local workflow:
+
+1. Start the emulator and run the worker host.
+2. Schedule or trigger orchestration instances.
+3. Open `http://localhost:8082` and select the task hub.
+4. Inspect timelines, activity outcomes, and instance metadata to verify behavior.
+5. Use management actions as needed during testing and debugging.
+
+### Relationship to OpenTelemetry
+
+The dashboard and OpenTelemetry traces are complementary:
+
+- DTS dashboard is orchestration-centric and state-history centric.
+- OpenTelemetry is distributed-call centric across services and infrastructure.
+
+Using both gives complete coverage: orchestration state transitions plus end-to-end dependency traces.
+
+---
+
+## Project Layout
+
+The sample separates concerns across three projects:
+
+| Project | Responsibility |
+|---|---|
+| `Contoso.Order.Workflow.Workflow` | Orchestrations, activities, and workflow contracts. |
+| `Contoso.Order.Workflow.Worker` | Worker host that registers orchestration code with DTS. |
+| `Contoso.Order.Workflow.Client` | Client library used by APIs or other callers to start and query workflows. |
+
+This keeps workflow logic portable and independent of the specific host process.
+
+---
+
+## Worker Host Setup
+
+The worker host wires the DTS connection, registers orchestrators and activities, and configures telemetry:
+
+```csharp
+builder.Services.AddDurableTaskWorker()
+    .AddTasks(registry =>
+    {
+        registry.AddOrchestrator<OrderWorkflowOrchestration>();
+        registry.AddActivity<ValidateOrderActivity>();
+        registry.AddActivity<SubmitOrderActivity>();
+    })
+    .UseDurableTaskScheduler(connectionString);
+```
+
+The sample worker resolves endpoint and task hub from configuration and uses `Authentication=None` for the local emulator or `Authentication=DefaultAzure` for managed DTS.
+
+---
+
+## Client Registration
+
+Any host that needs to schedule or query orchestrations can register the client:
+
+```csharp
+builder.Services.AddContosoOrderWorkflowClient(builder.Configuration);
+```
+
+The client registration falls back from `ConnectionStrings:DurableTaskScheduler` to `DurableTaskScheduler:Endpoint` and `DurableTaskScheduler:TaskHub`.
+
+---
+
+## Running Locally
+
+This repository includes the DTS emulator in [docker-compose.yml](../docker-compose.yml). Start it with container infrastructure:
+
+```bash
+docker compose up -d dts-emulator
+```
+
+Then run the worker host:
+
+```bash
+dotnet run --project samples/src/Contoso.Order.Workflow.Worker
+```
+
+By default the sample worker connects to `http://localhost:8080`, task hub `order`, with `Authentication=None`.
diff --git a/docs/presentations/coreex-agentic-scaffolding-slides.md b/docs/presentations/coreex-agentic-scaffolding-slides.md
new file mode 100644
index 00000000..186f0928
--- /dev/null
+++ b/docs/presentations/coreex-agentic-scaffolding-slides.md
@@ -0,0 +1,437 @@
+# CoreEx Agentic Scaffolding
+## Skills + Prompts + Context-Aware Generation
+
+Audience: Engineering leadership, platform team, solution architects, implementation teams.
+Duration: 20-30 minutes.
+
+---
+
+## Slide ES1 - Executive Summary
+### Why This Matters
+- CoreEx scaffolding gives deterministic, repeatable delivery foundations.
+- Agentic prompting adds speed and flexibility for domain-specific requirements.
+- Teams move faster with less architecture and boilerplate friction.
+
+Speaker notes:
+This section is designed for executive stakeholders. It focuses on outcomes, risk reduction, and delivery acceleration.
+
+---
+
+## Slide ES2 - Business Value
+### Impact on Delivery
+- Faster time from idea to a buildable, reviewable solution baseline.
+- Consistent architecture and coding conventions across teams.
+- Less rework by reducing early structural and wiring defects.
+- Higher engineering focus on business features instead of plumbing.
+- Move fast early: discovery, prototyping, and proving value with stakeholders.
+
+Speaker notes:
+CoreEx reduces setup variability and enables teams to start from proven implementation patterns. It is especially effective when teams need rapid evidence of value in the first phase of a delivery.
+
+---
+
+## Slide ES3 - Deterministic Foundation + Agentic Speed
+### Balanced Delivery Model
+- Deterministic: templates, instructions, and skills enforce known-good structure.
+- Agentic: prompts tailor scaffolding to domains, features, and constraints.
+- Result: predictable governance with rapid customization.
+- Converge from experimentation to determinism for repeatability, compliance, and supportability.
+
+Speaker notes:
+This is the key message: not deterministic versus agentic, but deterministic core plus agentic acceleration. Teams can begin with rapid exploration, then lock into repeatable patterns as delivery matures.
+
+---
+
+## Slide ES4 - What Comes Out of the Box
+### CoreEx Opinionated Acceleration
+- Modern architecture patterns: microservices, eventing, and DDD-aligned domains.
+- Enterprise capabilities ready to pull in as needed: validation, caching, outbox, observability.
+- Integrated hosting and API conventions reduce framework integration overhead.
+
+Speaker notes:
+CoreEx is not a generic framework toolkit that teams must assemble from scratch. It is an opinionated accelerator with practical defaults.
+
+---
+
+## Slide ES5 - Platform Flexibility
+### Enterprise Choice Without Chaos
+- Supports multiple backend patterns and provider strategies.
+- Messaging approach is not locked to one broker.
+- Teams can select infrastructure choices while preserving a consistent architecture model.
+
+Speaker notes:
+Executives get both standardization and optionality.
+
+---
+
+## Slide ES6 - Decision and Rollout
+### Recommended Path
+- Adopt CoreEx agentic scaffolding as the default start for new services.
+- Run a phased rollout with KPI tracking on speed, consistency, and rework reduction.
+- Govern templates and instructions as platform assets.
+- Ensure the delivered solution remains maintainable and operable over time, including after team transition.
+
+Speaker notes:
+Treat scaffolding as a strategic product capability, not a one-off project artifact. This improves continuity when ownership transitions to long-term product teams.
+
+---
+
+## Slide ES7 - Transition to Technical Deep Dive
+### Section 2: Full Technical Detail
+- Detailed architecture, capability inventory, platform options, and roadmap.
+- Prompt, skill, and instruction workflow with enforcement guardrails.
+
+Speaker notes:
+The next section provides implementation depth for architects and engineering leads.
+
+---
+
+## Slide 1 - Title
+### The New Agentic Way to Scaffold CoreEx Solutions
+- Generate production-aligned CoreEx domain scaffolding faster.
+- Encode architecture and coding standards as reusable prompt and skill assets.
+- Keep generated output aligned to CoreEx patterns and sample implementations.
+
+Speaker notes:
+This deck explains how we move from manual scaffolding to an agentic, policy-driven workflow that is repeatable, governed, and practical for teams starting new CoreEx implementations.
+
+---
+
+## Slide 2 - Why Change
+### Pain in the Previous Approach
+- Manual setup was slow and inconsistent across teams.
+- Architecture intent was scattered across tribal knowledge and sample code.
+- Early project output often drifted from CoreEx conventions.
+- Review cycles focused on fixing structure and wiring instead of business value.
+
+Speaker notes:
+We are not replacing engineering judgment. We are automating boilerplate and codifying known-good patterns so teams can spend time on domain behavior.
+
+---
+
+## Slide 3 - What Is New
+### Agentic Scaffolding Stack
+- Prompt workflows define user intent capture and step sequencing.
+- Skills define capability packs with selection logic and generation strategy.
+- Instruction files enforce file-scope coding conventions.
+- Templates and scripts provide repeatable project materialization.
+- Sample implementations provide concrete behavioral and architectural examples.
+- CoreEx scaffolding introduces deterministic outputs, reducing non-deterministic variance from pure free-form agentic generation.
+
+Speaker notes:
+The key idea is layered context. Prompts ask for what we need, skills decide what to generate, instructions govern how to write code, and templates provide deterministic structure.
+
+---
+
+## Slide 4 - Core Building Blocks
+### Assets in the Repository
+- Deterministic template pack: CoreEx.Template with `dotnet new coreex*`.
+- Agent guidance: CoreEx Expert for shape and capability decisions.
+- Environment and startup prompts: init, setup.
+- File-scoped instructions for controllers, services, repositories, validators, tests, and host setup.
+- Starter docs for architecture, conventions, and domains.
+
+Speaker notes:
+Everything needed is shipped as repository assets. Teams do not start from a blank prompt.
+
+---
+
+## Slide 5 - Operating Model
+### Human + Agent Collaboration
+- Human provides bounded context and domain intent.
+- Agent asks only minimal clarification questions for critical decisions.
+- Agent scaffolds layered projects and hosts.
+- Agent validates quality gates and resolves diagnostics.
+- Human reviews domain correctness and business rules.
+- Deterministic CoreEx scaffolding provides predictable baselines; agentic prompting provides fast customization on top.
+
+Speaker notes:
+This is controlled autonomy. The agent handles deterministic work while still adapting to requested features and domains. Humans remain accountable for correctness, semantics, and trade-off decisions.
+
+---
+
+## Slide 6 - End-to-End Flow
+### From Prompt to Running Solution
+1. Capture request: domains, hosts, persistence, behaviors.
+2. Select skill and package set.
+3. Materialize solution and project templates.
+4. Generate layer artifacts: Contracts, Application, Infrastructure, API, Database.
+5. Apply conventions from scoped instruction files.
+6. Run diagnostics and fix generation errors.
+7. Build and verify starter functionality.
+
+Speaker notes:
+The flow is intentionally explicit so we can audit and improve each stage.
+
+---
+
+## Slide 7 - Context Hierarchy
+### How the Agent Stays Aligned to CoreEx
+- Copilot instructions define global CoreEx-first behavior.
+- Scoped instruction files enforce local patterns by file type.
+- Skill logic maps requested capabilities to concrete package choices.
+- Prompts capture required inputs and enforce completion checklists.
+- Sample projects and docs provide reference implementations.
+
+Speaker notes:
+This hierarchy reduces ambiguity. If a rule exists in multiple places, the narrower scope wins for generation behavior.
+
+---
+
+## Slide 8 - Generated Architecture
+### Standard Layered Output
+- Contracts project for DTOs and source-generation annotations.
+- Application project for services, validation, exceptions, and orchestration.
+- Infrastructure project for repository and adapter implementations.
+- API host with CoreEx middleware and OpenAPI conventions.
+- Database project with migrations, outbox tables, and procedures.
+- Optional subscribe and outbox relay hosts when integration requires them.
+- Domain-first modeling aligned to DDD (aggregates, value objects, bounded contexts).
+- Modern architecture support out of the box: eventing, microservice host separation, and integration patterns.
+
+Speaker notes:
+The generated shape matches CoreEx reference architecture, keeps dependencies layered and predictable, and gives teams a ready-to-use microservices/event-driven baseline.
+
+---
+
+## Slide 8A - Products and Shopping Sample Topology
+### Architecture Shown in the Diagram
+- Two bounded domains, each with its own API and Application layer.
+- Each domain application encapsulates contracts and infrastructure concerns behind its service boundary.
+- Unit-of-Work sits between application logic and persistence.
+- Each domain has isolated Data and Outbox stores.
+- Outbox Relay and Message Subscriber are deployed per domain.
+- Domains communicate asynchronously through a shared queue or stream backbone.
+- Cache is shown as a shared cross-domain optimization layer.
+
+Speaker notes:
+This diagram demonstrates the CoreEx pattern in practice: independent domain services with local transaction boundaries and outbox-driven integration. Product and Shopping remain decoupled operationally, while events over queue or stream coordinate cross-domain workflows.
+
+---
+
+## Slide 9 - Determinism vs Pure Agentic Variance
+### Why CoreEx Scaffolding Matters
+- Pure agent-only generation can vary between runs, prompts, and model behavior.
+- CoreEx templates, instructions, and skills constrain generation into known-good patterns.
+- Teams get deterministic project structure, wiring, and conventions from day one.
+- Agentic prompting still adds flexibility for domain-specific features and behavior.
+
+Speaker notes:
+This is not a choice between deterministic and agentic. CoreEx combines both: deterministic scaffolding for foundation, agentic adaptation for domain acceleration.
+
+---
+
+## Slide 10 - Guardrails and Quality Gates
+### Built-In Enforcement
+- Constructor dependency null guards.
+- ConfigureAwait(false) in async service and repository flows.
+- Mutation operations wrapped in Unit of Work.
+- Event emission inside mutation-aware blocks.
+- CoreEx WebApi helper usage and response conventions.
+- Validation before persistence using CoreEx validators.
+- Diagnostics check before completion.
+
+Speaker notes:
+Guardrails shift many common review comments from late discovery to immediate generation-time enforcement.
+
+---
+
+## Slide 11 - Prompt Sequence for Teams
+### Suggested Delivery Workflow
+1. Run init prompt to verify machine prerequisites.
+2. Run setup prompt to start dependencies and local runtime.
+3. Run solution bootstrap skill for initial project layout.
+4. Run domain generation prompt for new bounded contexts.
+5. Run template-scaffold prompt for fast repeatable domain cloning.
+6. Execute tests and E2E checks.
+
+Speaker notes:
+Teams can adopt this as a standard onboarding and delivery playbook.
+
+---
+
+## Slide 12 - Example Ask
+### Example Prompt to Kick Off Scaffolding
+Create a new CoreEx solution.
+I need a Web API and Worker service.
+Domains: Product and Shopping.
+Include validation and behaviors.
+Use SQL Server persistence.
+Use Kafka as message broker.
+Scaffold full repository structure with tests.
+
+Speaker notes:
+This level of intent is enough for the agent to scaffold an entire repo, including domains, hosts, and tests, while honoring architecture constraints.
+
+---
+
+## Slide 13 - Benefits Realized
+### Expected Outcomes
+- Faster time from idea to compilable baseline.
+- Higher consistency with CoreEx coding and architecture conventions.
+- Reduced architecture drift during early implementation.
+- Lower cognitive load for new teams onboarding to CoreEx.
+- Better review quality by focusing reviews on business semantics.
+- Opinionated patterns out of the box reduce friction versus composing a generic framework from scratch.
+- Teams pull in only needed capabilities (validation, events, caching, messaging) instead of hand-integrating foundations.
+- Smoother transition from initial delivery teams to long-lived ownership with maintainable, standards-aligned code.
+
+Speaker notes:
+CoreEx accelerates teams by providing a pre-wired, opinionated path that removes setup churn and allows focus on business capabilities. It also reduces operational risk by leaving behind predictable, supportable implementation assets.
+
+---
+
+## Slide 14 - Platform Flexibility
+### Not Locked to One Backend or Broker
+- Data persistence can target multiple backend types depending on provider and project needs.
+- Messaging integration is pluggable; Azure Service Bus is supported, but not mandatory.
+- Agentic prompts can specify preferred database and broker choices per solution.
+- Deterministic scaffolding still applies even when platform selections vary.
+
+Speaker notes:
+CoreEx gives an opinionated architecture, not a hard platform lock. Teams can keep consistency while selecting infrastructure that fits enterprise constraints.
+
+---
+
+## Slide 15 - CoreEx Capability Inventory (General)
+### Included Components and Features
+- Error-based exceptions: NotFound, Validation, Concurrency, and related exception types.
+- Dynamic dependency injection patterns.
+- Entities: Identifier and CompositeKey support.
+- ETag support for optimistic concurrency.
+- Change log support for created and updated metadata.
+- Deep-compare capabilities for entity state comparison.
+- Roslyn source-generation support.
+- Instrumentation and health checks.
+- Hybrid cache (L1 and L2) with FusionCache, backplane support, and Redis integration.
+- Hosted services for timer-driven and synchronized workloads.
+- Reference data orchestration, including caching support.
+- System.Text.Json support for filtering and merge-patch workflows.
+- Validation pipeline as an alternative to FluentValidation.
+- Mapping helpers with explicit mapping patterns (no AutoMapper).
+- Globalization and localization primitives.
+- Result-based railway-oriented programming composition.
+
+Speaker notes:
+This slide is the CoreEx baseline inventory. It communicates the practical accelerator: teams pull in tested primitives instead of recreating them per project.
+
+---
+
+## Slide 16 - ASP.NET Core and Data Capabilities
+### Included Web, Data, and Database Features
+- Web API styles: Http-style minimal APIs and MVC controller APIs.
+- application/merge-patch+json support.
+- Response JSON filtering support.
+- Error handling middleware aligned with ProblemDetails.
+- IF-MATCH ETag semantics for GET and PUT or PATCH workflows.
+- Idempotency-Key support for POST.
+- Health check endpoints.
+- OpenAPI generation via NSwag.
+- CQRS read and write separation support.
+- Unit-of-Work with integrated Outbox.
+- Paging support using skip/take with total count.
+- Dynamic OData-like query support for filtering and ordering.
+- Multi-tenancy behavior support.
+- Type discriminator support where required.
+- Database support: SQL Server and PostgreSQL (provider dependent).
+- ADO.NET command, record, and parameter extensions.
+- Entity Framework integration support.
+
+Speaker notes:
+This is where friction drops versus generic frameworks: CoreEx packages wire these conventions directly so teams avoid repeated plumbing decisions.
+
+---
+
+## Slide 17 - Messaging and Domain-Driven Capabilities
+### Included Eventing and DDD Features
+- EventData as an agnostic message representation.
+- CloudEvent conversion and interoperability support.
+- Publish and subscribe patterns with per-message subscription behavior from stream.
+- Azure Service Bus integration patterns.
+- Outbox relay support with partition-aware patterns.
+- Domain-driven modeling support for aggregates and entities.
+- ValueObject modeling using C# record class patterns.
+- Integration-events only guidance.
+- Explicitly no domain-events and no MediatR-based in-process orchestration by default.
+
+Speaker notes:
+CoreEx aligns eventing and domain modeling so distributed services remain explicit, testable, and consistent across teams.
+
+---
+
+## Slide 18 - Current Upgrade Status and Roadmap
+### What Is Next
+To be upgraded:
+- Azure Functions.
+- Cosmos (CRUD and Query).
+- Dataverse.
+- OData.
+- Solace messaging integration.
+
+Roadmap:
+- MongoDB.
+- DocumentDB (new).
+- Kafka.
+
+Aspire enabled (done):
+- Leverages component runtime libraries.
+- Sample uses console for logging, tracing, and metrics visualization.
+
+Speaker notes:
+This makes current maturity and future direction explicit for stakeholders. It also reinforces that platform portability is planned and active, not theoretical.
+
+---
+
+## Slide 19 - Risks and Mitigations
+### What to Watch
+- Risk: over-trusting generated output.
+  Mitigation: enforce mandatory human review and test gates.
+- Risk: stale templates or instruction drift.
+  Mitigation: version and periodically validate scaffolding assets against samples.
+- Risk: ambiguous prompts produce wrong shape.
+  Mitigation: require minimal clarifying questions for orchestration, CQRS, and integration topology.
+
+Speaker notes:
+Agentic does not remove governance. It improves it when paired with clear controls.
+
+---
+
+## Slide 20 - Adoption Plan
+### 30-60-90 Day Rollout
+- 30 days: pilot with one domain and baseline metrics.
+- 60 days: codify team prompt playbooks and update templates from findings.
+- 90 days: make agentic scaffolding the default start path for new CoreEx implementations.
+
+Suggested KPIs:
+- Time to first successful build.
+- Number of post-generation architecture corrections.
+- Defect rate in generated boilerplate.
+- Onboarding time for new engineers.
+
+Speaker notes:
+Measure both speed and quality. The objective is not just faster generation, but better initial correctness.
+
+---
+
+## Slide 21 - Evidence Pointers
+### Source Anchors Used for This Deck
+- .github prompts for init, setup, and domain generation.
+- coreex-starter bootstrap skill and script.
+- coreex-starter architecture, conventions, and domain guidance docs.
+- scoped instruction files for controllers, application services, repositories, tests, validators, and host setup.
+
+Speaker notes:
+These slides are grounded in repository assets and can be updated as those assets evolve.
+
+---
+
+## Appendix - Presenter Q and A
+### Likely Questions
+- How much can we customize generated domains?
+- How do we prevent template sprawl?
+- Can this flow support non-SQL providers?
+- How do we handle major CoreEx version upgrades?
+- What is the approval model for changing instructions and skills?
+
+Speaker notes:
+Use these as discussion prompts for architecture review and platform governance forums.
diff --git a/docs/presentations/coreex-agentic-scaffolding-slides.pptx b/docs/presentations/coreex-agentic-scaffolding-slides.pptx
new file mode 100644
index 00000000..c0b462ba
Binary files /dev/null and b/docs/presentations/coreex-agentic-scaffolding-slides.pptx differ
diff --git a/docs/presentations/export-markdown-to-pptx.ps1 b/docs/presentations/export-markdown-to-pptx.ps1
new file mode 100644
index 00000000..4a8d1199
--- /dev/null
+++ b/docs/presentations/export-markdown-to-pptx.ps1
@@ -0,0 +1,261 @@
+[CmdletBinding()]
+param(
+    [string]$MarkdownPath = "docs/presentations/coreex-agentic-scaffolding-slides.md",
+    [string]$OutputPath = "docs/presentations/coreex-agentic-scaffolding-slides.pptx",
+    [string]$TemplatePath
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+function Get-SectionName {
+    param(
+        [string]$SlideId,
+        [string]$Title
+    )
+
+    if (-not [string]::IsNullOrWhiteSpace($SlideId) -and $SlideId.Trim().ToUpper().StartsWith('ES')) {
+        return 'Executive Summary'
+    }
+
+    if (-not [string]::IsNullOrWhiteSpace($Title) -and $Title -match '^Appendix') {
+        return 'Appendix'
+    }
+
+    return 'Technical Deep Dive'
+}
+
+function New-SlideModel {
+    param([string[]]$Lines)
+
+    $slideId = $null
+    $title = $null
+    $subtitle = $null
+    $bullets = New-Object System.Collections.Generic.List[string]
+    $notes = New-Object System.Collections.Generic.List[string]
+
+    $inNotes = $false
+
+    foreach ($raw in $Lines) {
+        $line = $raw.TrimEnd()
+        $trim = $line.Trim()
+
+        if ([string]::IsNullOrWhiteSpace($trim)) {
+            if ($inNotes) { $notes.Add("") }
+            continue
+        }
+
+        if ($trim -eq 'Speaker notes:') {
+            $inNotes = $true
+            continue
+        }
+
+        if ($inNotes) {
+            $notes.Add($trim)
+            continue
+        }
+
+        if (-not $title -and $trim -match '^##\s+Slide\s+([^-]+)-\s+(.+)$') {
+            $slideId = $Matches[1].Trim()
+            $title = $Matches[2].Trim()
+            continue
+        }
+
+        if (-not $subtitle -and $trim -match '^###\s+(.+)$') {
+            $subtitle = $Matches[1].Trim()
+            continue
+        }
+
+        if ($trim -match '^[-]\s+(.+)$') {
+            $bullets.Add($Matches[1].Trim())
+            continue
+        }
+
+        if ($trim -match '^\d+[.]\s+(.+)$') {
+            $bullets.Add($trim)
+            continue
+        }
+
+        if ($trim -match '^(Audience|Duration):') {
+            $bullets.Add($trim)
+            continue
+        }
+
+        if ($trim -notmatch '^#') {
+            $bullets.Add($trim)
+        }
+    }
+
+    if (-not $title) { return $null }
+
+    $section = Get-SectionName -SlideId $slideId -Title $title
+
+    [PSCustomObject]@{
+        SlideId = $slideId
+        Title = $title
+        Subtitle = $subtitle
+        Bullets = $bullets
+        Notes = $notes
+        Section = $section
+    }
+}
+
+$repoRoot = Get-Location
+$mdFullPath = if ([System.IO.Path]::IsPathRooted($MarkdownPath)) { $MarkdownPath } else { Join-Path $repoRoot $MarkdownPath }
+$pptxFullPath = if ([System.IO.Path]::IsPathRooted($OutputPath)) { $OutputPath } else { Join-Path $repoRoot $OutputPath }
+$templateFullPath = $null
+$downloadedTemplatePath = $null
+
+if (-not [string]::IsNullOrWhiteSpace($TemplatePath)) {
+    if ($TemplatePath -match '^https?://') {
+        $downloadedTemplatePath = Join-Path ([System.IO.Path]::GetTempPath()) ("coreex-template-{0}.potx" -f ([System.Guid]::NewGuid().ToString('N')))
+        try {
+            Invoke-WebRequest -Uri $TemplatePath -OutFile $downloadedTemplatePath | Out-Null
+            $templateFullPath = $downloadedTemplatePath
+        }
+        catch {
+            throw "Unable to download template from URL. Download it locally first and pass a file path. URL: $TemplatePath"
+        }
+    }
+    else {
+        $templateFullPath = if ([System.IO.Path]::IsPathRooted($TemplatePath)) { $TemplatePath } else { Join-Path $repoRoot $TemplatePath }
+    }
+}
+
+if (-not (Test-Path -LiteralPath $mdFullPath)) {
+    throw "Markdown file not found: $mdFullPath"
+}
+
+if ($templateFullPath -and -not (Test-Path -LiteralPath $templateFullPath)) {
+    throw "Template file not found: $templateFullPath"
+}
+
+$allLines = Get-Content -LiteralPath $mdFullPath
+$blocks = New-Object System.Collections.Generic.List[object]
+$current = New-Object System.Collections.Generic.List[string]
+
+foreach ($line in $allLines) {
+    if ($line.Trim() -eq '---') {
+        if ($current.Count -gt 0) {
+            $blocks.Add(@($current))
+            $current = New-Object System.Collections.Generic.List[string]
+        }
+        continue
+    }
+
+    $current.Add($line)
+}
+
+if ($current.Count -gt 0) {
+    $blocks.Add(@($current))
+}
+
+$slideModels = New-Object System.Collections.Generic.List[object]
+foreach ($block in $blocks) {
+    $model = New-SlideModel -Lines $block
+    if ($null -ne $model) { $slideModels.Add($model) }
+}
+
+if ($slideModels.Count -eq 0) {
+    throw "No slides were parsed from markdown."
+}
+
+$parent = Split-Path -Parent $pptxFullPath
+if (-not (Test-Path -LiteralPath $parent)) {
+    New-Item -ItemType Directory -Path $parent | Out-Null
+}
+
+$ppSaveAsOpenXMLPresentation = 24
+$ppLayoutText = 2
+$readableTextColorRgb = 0
+
+$powerPoint = $null
+$presentation = $null
+
+try {
+    $powerPoint = New-Object -ComObject PowerPoint.Application
+    $powerPoint.Visible = $true
+    $presentation = $powerPoint.Presentations.Add()
+
+    if ($templateFullPath) {
+        $presentation.ApplyTemplate($templateFullPath)
+    }
+
+    while ($presentation.Slides.Count -gt 0) {
+        $presentation.Slides.Item(1).Delete()
+    }
+
+    foreach ($m in $slideModels) {
+        $slide = $presentation.Slides.Add($presentation.Slides.Count + 1, $ppLayoutText)
+
+        $titleText = if ([string]::IsNullOrWhiteSpace($m.Subtitle)) { $m.Title } else { "{0}`n{1}" -f $m.Title, $m.Subtitle }
+        $titleRange = $slide.Shapes.Title.TextFrame.TextRange
+        $titleRange.Text = $titleText
+        $titleRange.Font.Color.RGB = $readableTextColorRgb
+
+        $content = if ($m.Bullets.Count -gt 0) {
+            ($m.Bullets | ForEach-Object { [string]::Format([char]0x2022 + ' {0}', $_) }) -join "`r`n"
+        } else {
+            ""
+        }
+
+        $body = $slide.Shapes.Placeholders.Item(2).TextFrame.TextRange
+        $body.Text = $content
+        $body.Font.Color.RGB = $readableTextColorRgb
+
+        if ($m.Notes.Count -gt 0) {
+            $notesText = ($m.Notes -join "`r`n")
+            $slide.NotesPage.Shapes.Placeholders.Item(2).TextFrame.TextRange.Text = $notesText
+        }
+    }
+
+    # Create native PowerPoint sections from parsed markdown section metadata.
+    if ($slideModels.Count -gt 0) {
+        $sectionProperties = $presentation.SectionProperties
+        $firstSectionName = [string]$slideModels[0].Section
+
+        try {
+            if ($sectionProperties.Count -ge 1) {
+                $sectionProperties.Rename(1, $firstSectionName) | Out-Null
+            }
+            else {
+                $sectionProperties.AddBeforeSlide(1, $firstSectionName) | Out-Null
+            }
+        }
+        catch {
+            # Ignore section rename/create issues and continue exporting slides.
+        }
+
+        $previousSectionName = $firstSectionName
+        for ($i = 2; $i -le $slideModels.Count; $i++) {
+            $currentSectionName = [string]$slideModels[$i - 1].Section
+            if ($currentSectionName -ne $previousSectionName) {
+                try {
+                    $sectionProperties.AddBeforeSlide($i, $currentSectionName) | Out-Null
+                }
+                catch {
+                    # Ignore section insertion issues and continue exporting slides.
+                }
+            }
+
+            $previousSectionName = $currentSectionName
+        }
+    }
+
+    $presentation.SaveAs($pptxFullPath, $ppSaveAsOpenXMLPresentation)
+    Write-Host "Created: $pptxFullPath"
+}
+finally {
+    if ($presentation) { $presentation.Close() }
+    if ($powerPoint) { $powerPoint.Quit() }
+
+    if ($null -ne $presentation) { [System.Runtime.InteropServices.Marshal]::ReleaseComObject($presentation) | Out-Null }
+    if ($null -ne $powerPoint) { [System.Runtime.InteropServices.Marshal]::ReleaseComObject($powerPoint) | Out-Null }
+
+    [GC]::Collect()
+    [GC]::WaitForPendingFinalizers()
+
+    if ($downloadedTemplatePath -and (Test-Path -LiteralPath $downloadedTemplatePath)) {
+        Remove-Item -LiteralPath $downloadedTemplatePath -Force -ErrorAction SilentlyContinue
+    }
+}
diff --git a/gen/CoreEx.Generator/ContractGenerator.cs b/gen/CoreEx.Generator/ContractGenerator.cs
new file mode 100644
index 00000000..7bd25411
--- /dev/null
+++ b/gen/CoreEx.Generator/ContractGenerator.cs
@@ -0,0 +1,86 @@
+using CoreEx.Generator.Utility;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System.Text;
+
+namespace CoreEx.Generator;
+
+/// <summary>
+/// Provides the 'ContractAttribute' <see cref="IIncrementalGenerator"/> implementation.
+/// </summary>
+[Generator]
+public class ContractGenerator : IIncrementalGenerator
+{
+    private const string _contractAttributeResourceName = "CoreEx.Generator.Templates.ContractAttribute.cs.hb";
+    private const string _contractIgnoreAttributeResourceName = "CoreEx.Generator.Templates.ContractIgnoreAttribute.cs.hb";
+    private const string _refDataAttributeResourceName = "CoreEx.Generator.Templates.ReferenceDataAttribute.cs.hb";
+    private const string _refDataTAttributeResourceName = "CoreEx.Generator.Templates.ReferenceDataTAttribute.cs.hb";
+    private const string _refDataCodeCollectionTAttributeResourceName = "CoreEx.Generator.Templates.ReferenceDataCodeCollectionTAttribute.cs.hb";
+    private const string _stringAttributeResourceName = "CoreEx.Generator.Templates.StringAttribute.cs.hb";
+    private const string _dateTimeAttributeResourceName = "CoreEx.Generator.Templates.DateTimeAttribute.cs.hb";
+    private const string _cleanAttributeResourceName = "CoreEx.Generator.Templates.CleanAttribute.cs.hb";
+    private const string _templateResourceName = "CoreEx.Generator.Templates.Contract.cs.hb";
+    private readonly HandlebarsCodeGenerator _codeGenerator = HandlebarsCodeGenerator.Create(_templateResourceName);
+
+    /// <summary>
+    /// Gets a <see cref="SymbolDisplayFormat"/> that includes nullability.
+    /// </summary>
+    internal static SymbolDisplayFormat FullyQualifiedWithNullability =
+        new(globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Included,
+            typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+            genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+            miscellaneousOptions: SymbolDisplayMiscellaneousOptions.UseSpecialTypes | SymbolDisplayMiscellaneousOptions.IncludeNullableReferenceTypeModifier);
+
+    /// <inheritdoc/>
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        // Register the requisite '*Attribute' classes.
+        context.RegisterPostInitializationOutput(static ctx =>
+        {
+            ctx.AddSource("contractattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_contractAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("contractignoreattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_contractIgnoreAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("referencedataattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_refDataAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("referencedatatattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_refDataTAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("referencedatacodecollectiontattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_refDataCodeCollectionTAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("stringattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_stringAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("datetimeattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_dateTimeAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+            ctx.AddSource("cleanattribute.g.cs", SourceText.From(HandlebarsCodeGenerator.Create(_cleanAttributeResourceName).Generate(new CodeGenContext()), Encoding.UTF8));
+        });
+
+        // Register the source generator for the above 'ContractAttribute' class usage.
+        var provider = context.SyntaxProvider.ForAttributeWithMetadataName(
+            fullyQualifiedMetadataName: "CoreEx.Entities.ContractAttribute",
+            predicate: static (syntaxNode, cancellationToken) => syntaxNode is ClassDeclarationSyntax || syntaxNode is RecordDeclarationSyntax,
+            transform: static (context, cancellationToken) => ContractModel.Create(context, cancellationToken)
+        );
+
+        // Register the source output to generate the resulting contract partial class contents.
+        context.RegisterSourceOutput(provider, (context, model) =>
+        {
+            try
+            {
+                if (!model.ReportDiagnostics(context))
+                    return; // Do not generate as there are errors.
+
+                if (model.IContract == GenApproach.Undetermined)
+                    return; // No need to generate if IContract is already declared.
+
+                var sourceText = SourceText.From(_codeGenerator.Generate(model), Encoding.UTF8);
+                context.AddSource($"{model.ClassName}.contract.g.cs", sourceText);
+            }
+            catch (System.Exception ex)
+            {
+                var descriptor = new DiagnosticDescriptor(
+                    id: "CoreEx000",
+                    title: "Contract generation error.",
+                    messageFormat: "An error occurred while generating an 'ContractAttribute': {0}",
+                    category: "CoreEx",
+                    defaultSeverity: DiagnosticSeverity.Error,
+                    isEnabledByDefault: true);
+
+                context.ReportDiagnostic(Diagnostic.Create(descriptor, null, ex.Message));
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/ContractModel.cs b/gen/CoreEx.Generator/ContractModel.cs
new file mode 100644
index 00000000..9338ca24
--- /dev/null
+++ b/gen/CoreEx.Generator/ContractModel.cs
@@ -0,0 +1,654 @@
+using CoreEx.Generator.Utility;
+using HandlebarsDotNet;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Globalization;
+
+namespace CoreEx.Generator;
+
+/// <summary>
+/// Represents the <i>ContractAttribute</i> class model configuration used to drive the underlying partial class source generation.
+/// </summary>
+internal class ContractModel : CodeGenContext
+{
+    /// <summary>
+    /// Gets the namespace of the contract.
+    /// </summary>
+    public string? Namespace { get; private set; }
+
+    /// <summary>
+    /// Gets the class name of the contract.
+    /// </summary>
+    public string? ClassName { get; private set; }
+
+    /// <summary>
+    /// Gets the containing type hierarchy of the contract.
+    /// </summary>
+    public List<string>? ContainingTypeHierarchy { get; private set; }
+
+    /// <summary>
+    /// Indicates whether the contract is a <i>record</i>; otherwise, <see langword="false"/> indicates a <i>class</i>.
+    /// </summary>
+    public bool IsRecord { get; private set; }
+
+    /// <summary>
+    /// Indicates whether the contract has a base type.
+    /// </summary>
+    public bool HasBaseType => BaseType is not null && !BaseType.Equals("object", System.StringComparison.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Gets the base type of the contract.
+    /// </summary>
+    public string? BaseType { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="GenApproach"/> for the contract.
+    /// </summary>
+    public GenApproach IContract { get; private set; }
+
+    /// <summary>
+    /// Gets the list of properties for the contract.
+    /// </summary>
+    public List<PropertyModel> Properties { get; } = [];
+
+    /// <summary>
+    /// Gets the list of properties that are to be code-generated as declared as partial.
+    /// </summary>
+    public IEnumerable<PropertyModel> PartialProperties => Properties.Where(p => p.IsPartial);
+
+    /// <summary>
+    /// Create the <see cref="ContractModel"/> from the <paramref name="context"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="GeneratorAttributeSyntaxContext"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="ContractModel"/>.</returns>
+    public static ContractModel Create(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        try
+        {
+            return context.TargetNode is ClassDeclarationSyntax ? CreateForClass(context, cancellationToken) : CreateForRecord(context, cancellationToken);
+        }
+        catch (System.Exception ex)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx000",
+                title: "Contract generation error.",
+                messageFormat: "An error occurred while generating an 'ContractAttribute': {0}",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            return new ContractModel { IContract = GenApproach.Undetermined, Diagnostics = { Diagnostic.Create(descriptor, null, ex.Message) } };
+        }
+    }
+
+    /// <summary>
+    /// Create the <see cref="ContractModel"/> from the <see cref="ClassDeclarationSyntax"/> <paramref name="context"/>.
+    /// </summary>
+    private static ContractModel CreateForClass(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var syntax = (ClassDeclarationSyntax)context.TargetNode;
+        var symbol = (INamedTypeSymbol)context.SemanticModel.GetDeclaredSymbol(syntax)!;
+
+        var model = new ContractModel
+        {
+            Namespace = context.TargetSymbol.ContainingType is null
+                ? context.TargetSymbol.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted))
+                : context.TargetSymbol.ContainingType.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)),
+            ContainingTypeHierarchy = context.TargetSymbol.ContainingType is null ? [] : GetContainingTypeHierarchy(context.TargetSymbol.ContainingType),
+            ClassName = symbol.Name
+        };
+
+        return CreateForStandard(context, symbol, model, cancellationToken);
+    }
+
+    /// <summary>
+    /// Create the <see cref="ContractModel"/> from the <see cref="RecordDeclarationSyntax"/> <paramref name="context"/>.
+    /// </summary>
+    private static ContractModel CreateForRecord(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var syntax = (RecordDeclarationSyntax)context.TargetNode;
+        var symbol = (INamedTypeSymbol)context.SemanticModel.GetDeclaredSymbol(syntax)!;
+
+        var model = new ContractModel
+        {
+            Namespace = context.TargetSymbol.ContainingType is null
+                ? context.TargetSymbol.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted))
+                : context.TargetSymbol.ContainingType.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)),
+            ContainingTypeHierarchy = context.TargetSymbol.ContainingType is null ? [] : GetContainingTypeHierarchy(context.TargetSymbol.ContainingType),
+            ClassName = symbol.Name,
+            IsRecord = true
+        };
+
+        return CreateForStandard(context, symbol, model, cancellationToken);
+    }
+
+    /// <summary>
+    /// Continues the create for the standardized behaviour.
+    /// </summary>
+    private static ContractModel CreateForStandard(GeneratorAttributeSyntaxContext context, INamedTypeSymbol symbol, ContractModel model, CancellationToken cancellationToken)
+    {
+        // Determine whether already implements IContract<T> where T is itself.
+        var iContractSymbol = context.SemanticModel.Compilation.GetTypeByMetadataName("CoreEx.Entities.IContract`1");
+        if (AlreadyImplementsIContractGenericSelf(symbol, iContractSymbol))
+            return model;
+
+        // Determine whether IContract<T> is the base/interface implementation.
+        model.IContract = IsBaseInterfaceImplementation(symbol, iContractSymbol!) ? GenApproach.Declare : GenApproach.Override;
+        model.BaseType = symbol.BaseType?.ToDisplayString();
+
+        // Check the cancellation token.
+        cancellationToken.ThrowIfCancellationRequested();
+
+        // Get the symbol for IReferenceData.
+        var iRefDataSymbol = context.SemanticModel.Compilation.GetTypeByMetadataName("CoreEx.RefData.Abstractions.IReferenceData");
+        if (symbol.AllInterfaces.FirstOrDefault(x => SymbolEqualityComparer.Default.Equals(x.OriginalDefinition, iRefDataSymbol)) is not null)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx010",
+                title: "ContractAttribute is not supported.",
+                messageFormat: "The ContractAttribute is not supported where the class/record implements CoreEx.RefData.Abstractions.IReferenceData; alternatively, consider using the ReferenceDataAttribute.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Diagnostics.Add(Diagnostic.Create(descriptor, symbol.Locations.FirstOrDefault(), symbol.Name));
+        }
+
+        // Get the list of properties which as a minimum do a get.
+        foreach (var p in symbol.GetMembers().OfType<IPropertySymbol>().Where(p => p.GetMethod is not null))
+        {
+            if (p.GetAttributes().FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == "CoreEx.Entities.ContractIgnoreAttribute") is not null)
+                continue; // Ignore properties with ContractIgnoreAttribute.
+
+            var emp = new PropertyModel
+            {
+                Context = model,
+                Name = p.Name,
+                IsReadonly = p.SetMethod is null,
+                IsInitOnly = p.SetMethod?.IsInitOnly ?? false,
+                IsRequired = p.IsRequired,
+                Type = FormatTypeWithNullability(p.Type.ToDisplayString(ContractGenerator.FullyQualifiedWithNullability), p.NullableAnnotation),
+                JsonName = p.GetAttributes().FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == "System.Text.Json.Serialization.JsonPropertyNameAttribute")?.ConstructorArguments.FirstOrDefault().Value as string,
+                FallbackText = GetDisplayAttributeName(p),
+                Default = p.DeclaringSyntaxReferences.Select(ds => ds.GetSyntax()).OfType<PropertyDeclarationSyntax>().Select(ps => GetDefaultConstant(ps, context.SemanticModel)).FirstOrDefault(),
+                Format = GetDisplayFormatAttributeDataFormatString(p)
+            };
+
+            if (model.IsRecord && emp.Name == "EqualityContract")
+                continue;
+
+            emp.KeyAndOrText = emp.HasFallbackText ? emp.Name : null;
+
+            ManageLocalizationAttribute(p, emp);
+            ManageStringAttributeProperty(p, emp);
+            ManageDateTimeAttributeProperty(p, emp);
+            ManageCleanAttributeProperty(p, emp);
+            ManageReferenceDataAttributeProperty(p, emp);
+            ManageReferenceDataCodeCollectionAttributeProperty(p, emp);
+
+            model.Properties.Add(emp);
+        }
+
+        return model;
+    }
+
+    /// <summary>
+    /// Formats the type with nullability.
+    /// </summary>
+    /// <param name="type">The type name.</param>
+    /// <param name="nullableAnnotation">The <see cref="NullableAnnotation"/>.</param>
+    /// <returns>The type name with <paramref name="nullableAnnotation"/> added as required.</returns>
+    internal static string FormatTypeWithNullability(string type, NullableAnnotation nullableAnnotation) => nullableAnnotation == NullableAnnotation.Annotated && !type.EndsWith("?") ? type + "?" : type;
+
+    /// <summary>
+    /// Gets the name from the <i>DisplayAttribute</i> where defined.
+    /// </summary>
+    internal static string? GetDisplayAttributeName(IPropertySymbol propertySymbol)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "System.ComponentModel.DataAnnotations.DisplayAttribute");
+        if (att is null)
+            return null;
+
+        var na = att.NamedArguments.FirstOrDefault(na => na.Key == "Name");
+        if (na.Key is not null && na.Value.Value is string name)
+            return string.IsNullOrEmpty(name) ? null : name;
+
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the format from the <i>DisplayFormatAttribute</i> where defined.
+    /// </summary>
+    internal static string? GetDisplayFormatAttributeDataFormatString(IPropertySymbol propertySymbol)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "System.ComponentModel.DataAnnotations.DisplayFormatAttribute");
+        if (att is null)
+            return null;
+
+        var na = att.NamedArguments.FirstOrDefault(na => na.Key == "DataFormatString");
+        if (na.Key is not null && na.Value.Value is string format)
+            return string.IsNullOrEmpty(format) ? null : format;
+
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the default constant value from the property syntax.
+    /// </summary>
+    internal static string? GetDefaultConstant(PropertyDeclarationSyntax propertySyntax, SemanticModel semanticModel)
+    {
+        // Check if there's an initializer
+        var initializer = propertySyntax.Initializer?.Value;
+        if (initializer is null)
+            return null;
+
+        // Try to get the constant value
+        var constantValue = semanticModel.GetConstantValue(initializer);
+        if (constantValue.HasValue)
+            return initializer.ToString();
+
+        // Where not constant then we can not reliably determine the value, so default for you!
+        return initializer.ToString();
+    }
+
+    /// <summary>
+    /// Determine type declaration hierarchy.
+    /// </summary>
+    /// <param name="type">The <see cref="INamedTypeSymbol"/>.</param>
+    /// <returns>The resulting hierarchy list.</returns>
+    internal static List<string> GetContainingTypeHierarchy(INamedTypeSymbol? type)
+    {
+        static void AddContainingTypeHierarchy(INamedTypeSymbol? type, List<string> list)
+        {
+            if (type is null)
+                return;
+
+            list.Insert(0, type.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat));
+            AddContainingTypeHierarchy(type.ContainingType, list);
+        }
+
+        var list = new List<string>();
+        AddContainingTypeHierarchy(type, list);
+        return list;
+    }
+
+    /// <summary>
+    /// Determines whether the <paramref name="symbol"/> already implements <c>CoreEx.Entities.IContract{T}</c> somewhere in its parent hierarchy.
+    /// </summary>
+    private static bool AlreadyImplementsIContractGenericSelf(INamedTypeSymbol symbol, INamedTypeSymbol? interfaceSymbol)
+    {
+        foreach (var iface in symbol.AllInterfaces)
+        {
+            if (SymbolEqualityComparer.Default.Equals(iface.OriginalDefinition, interfaceSymbol) && iface.TypeArguments.Length == 1 && SymbolEqualityComparer.Default.Equals(iface.TypeArguments[0], symbol))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Check whether this is considered the base interface implementation.
+    /// </summary>
+    private static bool IsBaseInterfaceImplementation(INamedTypeSymbol symbol, INamedTypeSymbol interfaceSymbol)
+    {
+        if (symbol.BaseType is null || symbol.SpecialType == SpecialType.System_Object)
+            return true;
+
+        if (!symbol.BaseType.Locations.Any(loc => loc.IsInSource))
+            return !symbol.BaseType.AllInterfaces.Any(x => SymbolEqualityComparer.Default.Equals(x.OriginalDefinition, interfaceSymbol));
+
+        if (symbol.BaseType.GetAttributes().Any(a => a.AttributeClass?.ToDisplayString() == "CoreEx.Entities.ContractAttribute"))
+            return false;
+
+        return IsBaseInterfaceImplementation(symbol.BaseType, interfaceSymbol);
+    }
+
+    /// <summary>
+    /// Determines and manages the LocalizationAttribute property configuration.
+    /// </summary>
+    internal static void ManageLocalizationAttribute(IPropertySymbol propertySymbol, PropertyModel model)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "CoreEx.Localization.LocalizationAttribute");
+        if (att is null)
+            return;
+
+        var kt = att.ConstructorArguments.Length < 1 ? null : att.ConstructorArguments[0].Value as string;
+        var ft = att.ConstructorArguments.Length < 2 ? null : att.ConstructorArguments[1].Value as string;
+
+        if (!string.IsNullOrEmpty(kt))
+        {
+            model.KeyAndOrText = kt;
+            model.FallbackText = ft;
+        }
+    }
+
+    /// <summary>
+    /// Determines and manages the <see cref="string"/> property configuration.
+    /// </summary>
+    /// <param name="propertySymbol">The <see cref="IPropertySymbol"/>.</param>
+    /// <param name="model">The <see cref="PropertyModel"/>.</param>
+    internal static void ManageStringAttributeProperty(IPropertySymbol propertySymbol, PropertyModel model)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "CoreEx.Entities.StringAttribute");
+        if (att is null)
+            return;
+
+        if (propertySymbol.Type.SpecialType != SpecialType.System_String)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx006",
+                title: "Property type invalid.",
+                messageFormat: "Property '{0}' must be declared with a type of 'string' to enable 'StringAttribute' capabilities.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            return;
+        }
+
+        if (!propertySymbol.IsPartialDefinition)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx007",
+                title: "Property must be partial.",
+                messageFormat: "Property '{0}' must be declared as 'partial' to enable 'StringAttribute' capabilities.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            return;
+        }
+
+        if (model.IsReadonly)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx008",
+                title: "Property must support get and set.",
+                messageFormat: "Property '{0}' must be declared with a 'get' and 'set' to enable 'StringAttribute' capabilities.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+        }
+
+        model.IsPartial = true;
+        model.IsSelfCleanedString = true;
+        model.StringTrim = (att.ConstructorArguments.Length < 1 ? null : GetEnumFriendlyName(att.ConstructorArguments[0])) ?? "UseDefault";
+        model.StringTransform = (att.ConstructorArguments.Length < 2 ? null : GetEnumFriendlyName(att.ConstructorArguments[1])) ?? "UseDefault";
+        model.StringCase = (att.ConstructorArguments.Length < 3 ? null : GetEnumFriendlyName(att.ConstructorArguments[2])) ?? "UseDefault";
+    }
+
+    /// <summary>
+    /// Determines and manages the <see cref="System.DateTime"/> property configuration.
+    /// </summary>
+    /// <param name="propertySymbol">The <see cref="IPropertySymbol"/>.</param>
+    /// <param name="model">The <see cref="PropertyModel"/>.</param>
+    internal static void ManageDateTimeAttributeProperty(IPropertySymbol propertySymbol, PropertyModel model)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "CoreEx.Entities.DateTimeAttribute");
+        if (att is null)
+            return;
+
+        var ds = propertySymbol.Type.ToDisplayString();
+        if (ds != "System.DateTime" && ds != "System.DateTime?")
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx009",
+                title: "Property type invalid.",
+                messageFormat: "Property '{0}' must be declared with a type of 'DateTime' to enable 'DateTimeAttribute' capabilities.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            return;
+        }
+
+        if (!propertySymbol.IsPartialDefinition)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx011",
+                title: "Property must be partial.",
+                messageFormat: "Property '{0}' must be declared as 'partial' to enable 'DateTimeAttribute' capabilities.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            return;
+        }
+
+        if (model.IsReadonly)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx012",
+                title: "Property must support get and set.",
+                messageFormat: "Property '{0}' must be declared with a 'get' and 'set' to enable 'DateTimeAttribute' capabilities.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+        }
+
+        model.IsPartial = true;
+        model.IsSelfCleanedDateTime = true;
+        model.DateTimeTransform = (att.ConstructorArguments.Length < 1 ? null : GetEnumFriendlyName(att.ConstructorArguments[0])) ?? "UseDefault";
+    }
+
+    /// <summary>
+    /// Determines and manages the clean property configuration.
+    /// </summary>
+    /// <param name="propertySymbol">The <see cref="IPropertySymbol"/>.</param>
+    /// <param name="model">The <see cref="PropertyModel"/>.</param>
+    internal static void ManageCleanAttributeProperty(IPropertySymbol propertySymbol, PropertyModel model)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "CoreEx.Entities.CleanAttribute");
+        if (att is null)
+            return;
+
+        model.IsCleanOption = true;
+        model.CleanOption = GetEnumFriendlyName(att.ConstructorArguments[0]) ?? "UseDefault";
+    }
+
+    /// <summary>
+    /// Gets the <see langword="enum"/> friendly name from the <see cref="TypedConstant"/>.
+    /// </summary>
+    private static string? GetEnumFriendlyName(TypedConstant arg)
+    {
+        if (arg.Kind != TypedConstantKind.Enum || arg.Value is not int ev)
+            return null;
+
+        var enumType = (INamedTypeSymbol)arg.Type!;
+        var member = enumType
+            .GetMembers()
+            .OfType<IFieldSymbol>()
+            .FirstOrDefault(f => f.HasConstantValue && (int)f.ConstantValue! == ev);
+
+        return member?.Name;
+    }
+
+    /// <summary>
+    /// Determines and manages the reference data property configuration.
+    /// </summary>
+    /// <param name="propertySymbol">The <see cref="IPropertySymbol"/>.</param>
+    /// <param name="model">The <see cref="PropertyModel"/>.</param>
+    internal static void ManageReferenceDataAttributeProperty(IPropertySymbol propertySymbol, PropertyModel model)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "CoreEx.RefData.ReferenceDataAttribute<TReferenceData>");
+        if (att is null || att.AttributeClass is null || !att.AttributeClass!.IsGenericType)
+            return;
+
+        model.IsRefData = true;
+        model.RefDataType = FormatTypeWithNullability(att.AttributeClass.TypeArguments.FirstOrDefault()?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)!, propertySymbol.NullableAnnotation);
+
+        if (propertySymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) != "string" && propertySymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) != "string?")
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx001",
+                title: "Reference Data property type invalid.",
+                messageFormat: "Reference Data property '{0}' must be declared with a type of 'string' to enable.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefData = false;
+        }
+
+        if (!propertySymbol.IsPartialDefinition)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx002",
+                title: "Reference Data property must be partial.",
+                messageFormat: "Reference Data property '{0}' must be declared as 'partial' to enable.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefData = false;
+        }
+
+        if (!(propertySymbol.Name.Length >= 4 && propertySymbol.Name.EndsWith("Sid", System.StringComparison.OrdinalIgnoreCase))
+        && !(propertySymbol.Name.Length >= 5 && propertySymbol.Name.EndsWith("Code", System.StringComparison.OrdinalIgnoreCase)))
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx004",
+                title: "Reference Data property name invalid.",
+                messageFormat: "Reference Data property '{0}' must be declared by convention with a name that ends with 'Sid' (Serializer Identifier) or 'Code'.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefData = false;
+        }
+
+        if (propertySymbol.DeclaredAccessibility != Accessibility.Public || (propertySymbol.GetMethod?.DeclaredAccessibility ?? Accessibility.Public) != Accessibility.Public || (propertySymbol.SetMethod?.DeclaredAccessibility ?? Accessibility.Public) != Accessibility.Public)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx005",
+                title: "Reference Data property accessibility invalid.",
+                messageFormat: "Reference data property '{0}' must be declared with 'public' accessibility only.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefData = false;
+        }
+
+        if (!model.IsRefData)
+            return;
+
+        model.IsPartial = true;
+        model.IsRefDataJson = !propertySymbol.GetAttributes().Any(a => a.AttributeClass?.ToDisplayString()?.StartsWith("System.Text.Json.Serialization.Json") ?? false);
+
+        // Camelcase the property name for JSON serialization.
+        model.JsonName ??= model.RefDataName!.Length == 1 ? model.RefDataName.ToLowerInvariant() : char.ToLower(model.RefDataName[0], CultureInfo.InvariantCulture) + model.RefDataName.Substring(1);
+    }
+
+    /// <summary>
+    /// Determines and manages the reference data code collection property configuration.
+    /// </summary>
+    /// <param name="propertySymbol">The <see cref="IPropertySymbol"/>.</param>
+    /// <param name="model">The <see cref="PropertyModel"/>.</param>
+    internal static void ManageReferenceDataCodeCollectionAttributeProperty(IPropertySymbol propertySymbol, PropertyModel model)
+    {
+        var att = propertySymbol.GetAttributes().FirstOrDefault(a => a.AttributeClass?.OriginalDefinition.ToDisplayString() == "CoreEx.RefData.ReferenceDataCodeCollectionAttribute<TReferenceData>");
+        if (att is null || att.AttributeClass is null || !att.AttributeClass!.IsGenericType)
+            return;
+
+        model.IsPartial = true;
+        model.IsRefDataCodeCollection = true;
+        model.RefDataType = att.AttributeClass.TypeArguments.FirstOrDefault()?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)!;
+
+        if (propertySymbol.Type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) != "global::System.Collections.Generic.List<string>")
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx002",
+                title: "Reference Data property type invalid.",
+                messageFormat: "Reference Data code collection property '{0}' must be declared with a type of 'List<string>'/'List<string?>' to enable.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefDataCodeCollection = false;
+        }
+
+        if (!propertySymbol.IsPartialDefinition)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx002",
+                title: "Reference Data property must be partial.",
+                messageFormat: "Reference Data code collection property '{0}' must be declared as 'partial' to enable.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefDataCodeCollection = false;
+        }
+
+        if (!(propertySymbol.Name.Length >= 5 && propertySymbol.Name.EndsWith("Sids", System.StringComparison.OrdinalIgnoreCase))
+        && !(propertySymbol.Name.Length >= 6 && propertySymbol.Name.EndsWith("Codes", System.StringComparison.OrdinalIgnoreCase)))
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx004",
+                title: "Reference Data property name invalid.",
+                messageFormat: "Reference Data code collection property '{0}' must be declared by convention with a name that ends with 'Sids' (Serializer Identifiers) or 'Codes'.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Context!.Diagnostics.Add(Diagnostic.Create(descriptor, propertySymbol.Locations.FirstOrDefault(), propertySymbol.Name));
+            model.IsRefDataCodeCollection = false;
+        }
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+    {
+        if (ReferenceEquals(this, obj))
+            return true;
+
+        if (obj is not ContractModel other)
+            return false;
+
+        if (Namespace != other.Namespace 
+            || ClassName != other.ClassName 
+            || IsRecord != other.IsRecord 
+            || IContract != other.IContract 
+            || BaseType != other.BaseType)
+            return false;
+
+        if (Enumerable.SequenceEqual(ContainingTypeHierarchy ?? [], other.ContainingTypeHierarchy ?? []) && Enumerable.SequenceEqual(Properties, other.Properties))
+            return true;
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        var hash = (Namespace?.GetHashCode() ?? 0) 
+            ^ (ClassName?.GetHashCode() ?? 0) 
+            ^ IsRecord.GetHashCode() 
+            ^ IContract.GetHashCode() 
+            ^ (BaseType?.GetHashCode() ?? 0);
+
+        if (ContainingTypeHierarchy is not null)
+            hash ^= ContainingTypeHierarchy.Aggregate(0, (current, item) => current ^ item.GetHashCode());
+
+        if (Properties is not null)
+            hash ^= Properties.Aggregate(0, (current, item) => current ^ item.GetHashCode());
+
+        return hash;
+    }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/CoreEx.Generator.csproj b/gen/CoreEx.Generator/CoreEx.Generator.csproj
new file mode 100644
index 00000000..0302a55b
--- /dev/null
+++ b/gen/CoreEx.Generator/CoreEx.Generator.csproj
@@ -0,0 +1,106 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <!-- Targeting & Language Defaults -->
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <!-- Versioning (defined in /Version.props at repo root) -->
+  <Import Project="..\..\Version.props" />
+
+  <!-- Build Quality -->
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- Strong Name Signing -->
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\..\strong-name-key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+
+  <!-- NuGet Package Metadata -->
+  <PropertyGroup>
+    <Authors>Avanade</Authors>
+    <Company>Avanade (https://www.avanade.com/)</Company>
+    <Copyright>Copyright (c) Avanade.</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>Logo256x256.png</PackageIcon>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Avanade/CoreEx</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Avanade/CoreEx</PackageProjectUrl>
+  </PropertyGroup>
+
+  <!-- Roslyn Analyzer Configuration -->
+  <PropertyGroup>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <IsRoslynComponent>true</IsRoslynComponent>
+    <OutputItemType>Analyzer</OutputItemType>
+    
+    <!-- Not packed standalone; bundled into CoreEx package. -->
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Templates\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="bin\**" />
+    <EmbeddedResource Remove="bin\**" />
+    <None Remove="bin\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Handlebars.Net" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Pluralize.NET" PrivateAssets="all" GeneratePathProperty="true" />
+    <!-- StrongNamer required for strong-naming Pluralize.NET which is not signed. -->
+    <PackageReference Include="StrongNamer" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="bin\Debug\netstandard2.0\\CoreEx.Generator.dll" />
+  </ItemGroup>
+
+   
+  <Target Name="GetDependencyTargetPaths">
+    <ItemGroup>
+      <TargetPathWithTargetPlatformMoniker Include="$(PkgHandlebars_Net)\lib\netstandard2.0\Handlebars.dll" IncludeRuntimeDependency="false" />
+      <TargetPathWithTargetPlatformMoniker Include="$(PkgPluralize_NET)\lib\netstandard2.0\Pluralize.NET.dll" IncludeRuntimeDependency="false" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_ForceAllResourcesToMainAssembly" AfterTargets="SplitResourcesByCulture">
+    <ItemGroup>
+      <EmbeddedResource>
+        <Culture />
+        <WithCulture>false</WithCulture>
+      </EmbeddedResource>
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <!-- Copies all resolved deps to bin/; required for Release pack (CoreEx.csproj bundles Pluralize.NET.dll from generator output). -->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+
+  <!-- Explicitly copy only what we need; even if the above is ignored. -->
+  <Target Name="CopyAnalyzerDeps" AfterTargets="Build">
+    <ItemGroup>
+      <_AnalyzerDep Include="$(PkgPluralize_NET)\lib\netstandard2.0\Pluralize.NET.dll" />
+      <_AnalyzerDep Include="$(PkgHandlebars_Net)\lib\netstandard2.0\Handlebars.dll" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_AnalyzerDep)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+    <!-- Optional: log what got copied so you can confirm in the build output -->
+    <Message Importance="High" Text="Copied analyzer deps: @(_AnalyzerDep)" />
+  </Target>
+
+</Project>
diff --git a/gen/CoreEx.Generator/GenApproach.cs b/gen/CoreEx.Generator/GenApproach.cs
new file mode 100644
index 00000000..b1cd4bb2
--- /dev/null
+++ b/gen/CoreEx.Generator/GenApproach.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Generator;
+
+/// <summary>
+/// Defines the approach to code generation for a given scenario.
+/// </summary>
+internal enum GenApproach
+{
+    /// <summary>
+    /// No approach has been determined; i.e. initial state.
+    /// </summary>
+    Undetermined,
+
+    /// <summary>
+    /// Declares new code (as virtual), but does not override any existing code.
+    /// </summary>
+    Declare,
+
+    /// <summary>
+    /// Overrides existing code, also calling into the base implementation as appropriate.
+    /// </summary>
+    Override,
+
+    /// <summary>
+    /// Bypasses code generation as determined as not required (i.e. manually implemented) or unable (i.e. sealed).
+    /// </summary>
+    Bypass
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Properties/launchSettings.json b/gen/CoreEx.Generator/Properties/launchSettings.json
new file mode 100644
index 00000000..5d4005ad
--- /dev/null
+++ b/gen/CoreEx.Generator/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Roslyn": {
+      "commandName": "DebugRoslynComponent",
+      "targetProject": "..\\..\\samples\\src\\Contoso.Products.Contracts\\Contoso.Products.Contracts.csproj"
+    }
+  }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/PropertyModel.cs b/gen/CoreEx.Generator/PropertyModel.cs
new file mode 100644
index 00000000..e526afb2
--- /dev/null
+++ b/gen/CoreEx.Generator/PropertyModel.cs
@@ -0,0 +1,255 @@
+using CoreEx.Generator.Utility;
+
+namespace CoreEx.Generator;
+
+/// <summary>
+/// Represents the <i>ContractAttribute</i> class model's property configuration used to drive the underlying partial class source generation.
+/// </summary>
+internal class PropertyModel
+{
+    /// <summary>
+    /// Gets the owner <see cref="CodeGenContext"/> of the property.
+    /// </summary>
+    public CodeGenContext? Context { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property name.
+    /// </summary>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property type.
+    /// </summary>
+    public string? Type { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property type is a nullable value type.
+    /// </summary>
+    public bool IsNullableValueType { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has been declared as partial.
+    /// </summary>
+    public bool IsPartial { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property is read-only (i.e. does not have a setter).
+    /// </summary>
+    public bool IsReadonly { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property is init-only (i.e. has an init setter syntax).
+    /// </summary>
+    public bool IsInitOnly { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property is settable (i.e. has a setter that is not init-only).
+    /// </summary>
+    public bool IsSettable => !IsReadonly && !IsInitOnly;
+
+    /// <summary>
+    /// Indicates whether the property is required (i.e. has required syntax).
+    /// </summary>
+    public bool IsRequired { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has a <see cref="JsonName"/>.
+    /// </summary>
+    public bool HasJsonName => !string.IsNullOrEmpty(JsonName);
+
+    /// <summary>
+    /// Gets or sets the JSON property name where different from the <see cref="Name"/> without the <i>Code</i> suffix for reference data serialization.
+    /// </summary>
+    public string? JsonName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the key and/or text for the property.
+    /// </summary>
+    public string? KeyAndOrText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the fallback text for the property.
+    /// </summary>
+    public string? FallbackText { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has <see cref="KeyAndOrText"/>.
+    /// </summary>
+    public bool HasText => !string.IsNullOrEmpty(KeyAndOrText);
+
+    /// <summary>
+    /// Indicates whether the property has <see cref="FallbackText"/>.
+    /// </summary>
+    public bool HasFallbackText => !string.IsNullOrEmpty(FallbackText);
+
+    /// <summary>
+    /// Gets or sets the default; being the corresponding c# code.
+    /// </summary>
+    public string? Default { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has a <see cref="Default"/>.
+    /// </summary>
+    public bool HasDefault => !string.IsNullOrEmpty(Default);
+
+    /// <summary>
+    /// Gets or sets the format string used when formatting the property value as a <see langword="string"/>.
+    /// </summary>
+    public string? Format { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has a <see cref="Format"/>.
+    /// </summary>
+    public bool HasFormat => Format is not null;
+
+    /// <summary>
+    /// Indicates whether the property has been marked up with the <i>ReferenceData&lt;TRefData&gt;</i>.
+    /// </summary>
+    public bool IsRefData { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property name ends with the 'Sid' or 'Sids' suffix.
+    /// </summary>
+    public bool IsSuffixSid => IsRefDataCodeCollection
+        ? Name is not null && Name.EndsWith("Sids")
+        : Name is not null && Name.EndsWith("Sid");
+
+    /// <summary>
+    /// Gets the reference data name.
+    /// </summary>
+    public string? RefDataName => Name is not null && IsRefData 
+        ? (IsSuffixSid ? Name.Substring(0, Name.Length - 3) : Name.Substring(0, Name.Length - 4)) 
+        : Name is not null && IsRefDataCodeCollection 
+            ? Pluralizer.Instance.Pluralize(IsSuffixSid ? Name.Substring(0, Name.Length - 4) : Name.Substring(0, Name.Length - 5)) : Name;
+
+    /// <summary>
+    /// Gets or sets the reference data type where<see cref="IsRefData"/> is <see langword="true"/>.
+    /// </summary>
+    public string? RefDataType { get; set; }
+
+    /// <summary>
+    /// Indicates whether the json serialization attribute is required.
+    /// </summary>
+    public bool IsRefDataJson { get; set; }
+
+    /// <summary>
+    /// Indicates whether an additional <i>Text</i> property is required.
+    /// </summary>
+    public bool IsRefDataText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the JSON property name used for reference data text serialization.
+    /// </summary>
+    public string? RefDataTextJsonName { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has been marked up with the <i>ReferenceDataCodeCollection&lt;TRefData&gt;</i>.
+    /// </summary>
+    public bool IsRefDataCodeCollection { get; set; }
+
+    /// <summary>
+    /// Gets the corresponding backing field name for the <see cref="IsRefDataCodeCollection"/> property.
+    /// </summary>
+    public string RefDataCodeCollectionFieldName => $"_{char.ToLowerInvariant(Name![0])}{Name.Substring(1)}";
+
+    /// <summary>
+    /// Gets the JSON property name used to represent the reference data code collection.
+    /// </summary>
+    public string RefDataCodeCollectionJsonName => $"{char.ToLowerInvariant(RefDataName![0])}{RefDataName.Substring(1)}";
+
+    /// <summary>
+    /// Indicates whether the property is self-cleaned (i.e. has a StringAttribute or DataTimeAttribute declared).
+    /// </summary>
+    public bool IsSelfCleaned => IsSelfCleanedString || IsSelfCleanedDateTime || IsCleanOption;
+
+    /// <summary>
+    /// Indicates whether the property is self-cleaned as a <see cref="string"/> value (i.e. has a StringAttribute declared).
+    /// </summary>
+    public bool IsSelfCleanedString { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="string"/> trim.
+    /// </summary>
+    public string? StringTrim { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="string"/> transform.
+    /// </summary>
+    public string? StringTransform { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="string"/> casing.
+    /// </summary>
+    public string? StringCase { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property is self-cleaned as a <see cref="DateTime"/> value (i.e. has a DateTimeAttribute declared).
+    /// </summary>
+    public bool IsSelfCleanedDateTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="System.DateTime"/> transform.
+    /// </summary>
+    public string? DateTimeTransform { get; set; }
+
+    /// <summary>
+    /// Indicates whether the property has a clean option specified.
+    /// </summary>
+    public bool IsCleanOption { get; set; }
+
+    /// <summary>
+    /// Gets or sets the clean option.
+    /// </summary>
+    public string? CleanOption { get; set; } = "UseDefault";
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+    {
+        if (ReferenceEquals(this, obj))
+            return true;
+
+        if (obj is not PropertyModel other)
+            return false;
+
+        if (Name != other.Name || Type != other.Type || IsNullableValueType != other.IsNullableValueType || IsPartial != other.IsPartial || IsReadonly != other.IsReadonly || IsInitOnly != other.IsInitOnly || IsRequired != other.IsRequired
+            || KeyAndOrText != other.KeyAndOrText || FallbackText != other.FallbackText || JsonName != other.JsonName || Default != other.Default || Format != other.Format
+            || IsRefData != other.IsRefData || RefDataType != other.RefDataType
+            || IsRefDataJson != other.IsRefDataJson || IsRefDataText != other.IsRefDataText || RefDataTextJsonName != other.RefDataTextJsonName
+            || IsRefDataCodeCollection != other.IsRefDataCodeCollection
+            || IsSelfCleanedString != other.IsSelfCleanedString || StringTrim != other.StringTrim || StringTransform != other.StringTransform || StringCase != other.StringCase
+            || IsSelfCleanedDateTime != other.IsSelfCleanedDateTime || DateTimeTransform != other.DateTimeTransform
+            || IsCleanOption != other.IsCleanOption || CleanOption != other.CleanOption)
+            return false;
+
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+        => Name?.GetHashCode() ?? 0
+            ^ (Type?.GetHashCode() ?? 0)
+            ^ IsNullableValueType.GetHashCode()
+            ^ IsPartial.GetHashCode()
+            ^ IsReadonly.GetHashCode()
+            ^ IsInitOnly.GetHashCode()
+            ^ IsRequired.GetHashCode()
+            ^ (KeyAndOrText?.GetHashCode() ?? 0)
+            ^ (FallbackText?.GetHashCode() ?? 0)
+            ^ (JsonName?.GetHashCode() ?? 0)
+            ^ (Default?.GetHashCode() ?? 0)
+            ^ (Format?.GetHashCode() ?? 0)
+            ^ IsRefData.GetHashCode()
+            ^ (RefDataType?.GetHashCode() ?? 0)
+            ^ IsRefDataJson.GetHashCode()
+            ^ IsRefDataText.GetHashCode()
+            ^ (RefDataTextJsonName?.GetHashCode() ?? 0)
+            ^ IsRefDataCodeCollection.GetHashCode()
+            ^ IsSelfCleanedString.GetHashCode()
+            ^ (StringTrim?.GetHashCode() ?? 0)
+            ^ (StringTransform?.GetHashCode() ?? 0)
+            ^ (StringCase?.GetHashCode() ?? 0)
+            ^ IsSelfCleanedDateTime.GetHashCode()
+            ^ (DateTimeTransform?.GetHashCode() ?? 0)
+            ^ IsCleanOption.GetHashCode()
+            ^ (CleanOption?.GetHashCode() ?? 0);
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/ReferenceDataGenerator.cs b/gen/CoreEx.Generator/ReferenceDataGenerator.cs
new file mode 100644
index 00000000..80a6a473
--- /dev/null
+++ b/gen/CoreEx.Generator/ReferenceDataGenerator.cs
@@ -0,0 +1,58 @@
+using CoreEx.Generator.Utility;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+using System.Text;
+
+namespace CoreEx.Generator;
+
+/// <summary>
+/// Provides the 'ReferenceDataAttribute' <see cref="IIncrementalGenerator"/> implementation.
+/// </summary>
+[Generator]
+public class ReferenceDataGenerator : IIncrementalGenerator
+{
+    private const string _templateResourceName = "CoreEx.Generator.Templates.ReferenceData.cs.hb";
+    private readonly HandlebarsCodeGenerator _codeGenerator = HandlebarsCodeGenerator.Create(_templateResourceName);
+
+    /// <inheritdoc/>
+    public void Initialize(IncrementalGeneratorInitializationContext context)
+    {
+        // No RegisterPostInitializationOutput needed as handled by ContractGenerator (i.e. centralized singleton).
+
+        // Register the source generator for the above 'ReferenceDataAttribute' class usage.
+        var provider = context.SyntaxProvider.ForAttributeWithMetadataName(
+            fullyQualifiedMetadataName: "CoreEx.RefData.ReferenceDataAttribute",
+            predicate: static (syntaxNode, cancellationToken) => syntaxNode is ClassDeclarationSyntax || syntaxNode is RecordDeclarationSyntax,
+            transform: static (context, cancellationToken) => ReferenceDataModel.Create(context, cancellationToken)
+        );
+
+        // Register the source output to generate the resulting reference data partial class contents.
+        context.RegisterSourceOutput(provider, (context, model) =>
+        {
+            try
+            {
+                if (!model.ReportDiagnostics(context))
+                    return; // Do not generate as there are errors.
+
+                if (model.IReferenceData == GenApproach.Undetermined)
+                    return; // No need to generate if IReferenceData is already declared.
+
+                var sourceText = SourceText.From(_codeGenerator.Generate(model), Encoding.UTF8);
+                context.AddSource($"{model.ClassName}.refdata.g.cs", sourceText);
+            }
+            catch (System.Exception ex)
+            {
+                var descriptor = new DiagnosticDescriptor(
+                    id: "CoreEx000",
+                    title: "Reference data generation error.",
+                    messageFormat: "An error occurred while generating a 'ReferenceDataAttribute': {0}",
+                    category: "CoreEx",
+                    defaultSeverity: DiagnosticSeverity.Error,
+                    isEnabledByDefault: true);
+
+                context.ReportDiagnostic(Diagnostic.Create(descriptor, null, ex.Message));
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/ReferenceDataModel.cs b/gen/CoreEx.Generator/ReferenceDataModel.cs
new file mode 100644
index 00000000..64359927
--- /dev/null
+++ b/gen/CoreEx.Generator/ReferenceDataModel.cs
@@ -0,0 +1,210 @@
+using CoreEx.Generator.Utility;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace CoreEx.Generator;
+
+/// <summary>
+/// Represents the <i>ReferenceDataAttribute</i> class model configuration used to drive the underlying partial class source generation.
+/// </summary>
+internal class ReferenceDataModel : CodeGenContext
+{
+    /// <summary>
+    /// Gets the namespace of the contract.
+    /// </summary>
+    public string? Namespace { get; private set; }
+
+    /// <summary>
+    /// Gets the class name of the contract.
+    /// </summary>
+    public string? ClassName { get; private set; }
+
+    /// <summary>
+    /// Gets the containing type hierarchy of the contract.
+    /// </summary>
+    public List<string>? ContainingTypeHierarchy { get; private set; }
+
+    /// <summary>
+    /// Indicates whether the contract is a <i>record</i>; otherwise, <see langword="false"/> indicates a <i>class</i>.
+    /// </summary>
+    public bool IsRecord { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="GenApproach"/> for the reference data.
+    /// </summary>
+    public GenApproach IReferenceData { get; private set; }
+
+    /// <summary>
+    /// Gets the list of properties for the contract.
+    /// </summary>
+    public List<PropertyModel> Properties { get; } = [];
+
+    /// <summary>
+    /// Gets the list of properties that are to be code-generated as declared as partial.
+    /// </summary>
+    public IEnumerable<PropertyModel> PartialProperties => Properties.Where(p => p.IsRefData || p.IsSelfCleanedString || p.IsSelfCleanedDateTime);
+
+    /// <summary>
+    /// Create the <see cref="ContractModel"/> from the <paramref name="context"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="GeneratorAttributeSyntaxContext"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="ContractModel"/>.</returns>
+    public static ReferenceDataModel Create(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var model = context.TargetNode is ClassDeclarationSyntax ? CreateForClass(context, cancellationToken) : CreateForRecord(context, cancellationToken);
+            return model;
+        }
+        catch (System.Exception ex)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx100",
+                title: "Reference data generation error.",
+                messageFormat: "An error occurred while generating an 'ReferenceDataAttribute': {0}",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            return new ReferenceDataModel { IReferenceData = GenApproach.Undetermined, Diagnostics = { Diagnostic.Create(descriptor, null, ex.Message) } };
+        }
+    }
+
+    /// <summary>
+    /// Create the <see cref="ContractModel"/> from the <see cref="ClassDeclarationSyntax"/> <paramref name="context"/>.
+    /// </summary>
+    private static ReferenceDataModel CreateForClass(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var syntax = (ClassDeclarationSyntax)context.TargetNode;
+        var symbol = (INamedTypeSymbol)context.SemanticModel.GetDeclaredSymbol(syntax)!;
+
+        var model = new ReferenceDataModel
+        {
+            Namespace = context.TargetSymbol.ContainingType is null
+                ? context.TargetSymbol.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted))
+                : context.TargetSymbol.ContainingType.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)),
+            ContainingTypeHierarchy = context.TargetSymbol.ContainingType is null ? [] : ContractModel.GetContainingTypeHierarchy(context.TargetSymbol.ContainingType),
+            ClassName = symbol.Name
+        };
+
+        return CreateForStandard(context, symbol, model, cancellationToken);
+    }
+
+    /// <summary>
+    /// Create the <see cref="ContractModel"/> from the <see cref="RecordDeclarationSyntax"/> <paramref name="context"/>.
+    /// </summary>
+    private static ReferenceDataModel CreateForRecord(GeneratorAttributeSyntaxContext context, CancellationToken cancellationToken)
+    {
+        var syntax = (RecordDeclarationSyntax)context.TargetNode;
+        var symbol = (INamedTypeSymbol)context.SemanticModel.GetDeclaredSymbol(syntax)!;
+
+        var model = new ReferenceDataModel
+        {
+            Namespace = context.TargetSymbol.ContainingType is null
+                ? context.TargetSymbol.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted))
+                : context.TargetSymbol.ContainingType.ContainingNamespace?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)),
+            ContainingTypeHierarchy = context.TargetSymbol.ContainingType is null ? [] : ContractModel.GetContainingTypeHierarchy(context.TargetSymbol.ContainingType),
+            ClassName = symbol.Name,
+            IsRecord = true
+        };
+
+        return CreateForStandard(context, symbol, model, cancellationToken);
+    }
+
+    /// <summary>
+    /// Continues the create for the standardized behaviour.
+    /// </summary>
+    private static ReferenceDataModel CreateForStandard(GeneratorAttributeSyntaxContext context, INamedTypeSymbol symbol, ReferenceDataModel model, CancellationToken cancellationToken)
+    {
+        // Check the cancellation token.
+        cancellationToken.ThrowIfCancellationRequested();
+
+        // Get the symbol for IReferenceData.
+        var iRefDataSymbol = context.SemanticModel.Compilation.GetTypeByMetadataName("CoreEx.RefData.Abstractions.IReferenceData");
+        if (symbol.AllInterfaces.FirstOrDefault(x => SymbolEqualityComparer.Default.Equals(x.OriginalDefinition, iRefDataSymbol)) is null)
+        {
+            var descriptor = new DiagnosticDescriptor(
+                id: "CoreEx101",
+                title: "ReferenceDataAttribute is not supported.",
+                messageFormat: "The ReferenceDataAttribute is not supported where the class/record does not implement CoreEx.RefData.Abstractions.IReferenceData; alternatively, consider using ContractAttribute.",
+                category: "CoreEx",
+                defaultSeverity: DiagnosticSeverity.Error,
+                isEnabledByDefault: true);
+
+            model.Diagnostics.Add(Diagnostic.Create(descriptor, symbol.Locations.FirstOrDefault(), symbol.Name));
+        }
+
+        model.IReferenceData = GenApproach.Declare;
+
+        // Get the list of get/set properties.
+        foreach (var p in symbol.GetMembers().OfType<IPropertySymbol>().Where(p => p.GetMethod is not null))
+        {
+            if (p.GetAttributes().FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == "CoreEx.Entities.ContractIgnoreAttribute") is not null)
+                continue; // Ignore properties with ContractIgnoreAttribute.
+
+            var emp = new PropertyModel
+            {
+                Context = model,
+                Name = p.Name,
+                IsReadonly = p.SetMethod is null,
+                IsInitOnly = p.SetMethod?.IsInitOnly ?? false,
+                Type = ContractModel.FormatTypeWithNullability(p.Type.ToDisplayString(ContractGenerator.FullyQualifiedWithNullability), p.NullableAnnotation),
+                JsonName = p.GetAttributes().FirstOrDefault(a => a.AttributeClass?.ToDisplayString() == "System.Text.Json.Serialization.JsonPropertyNameAttribute")?.ConstructorArguments.FirstOrDefault().Value as string,
+                FallbackText = ContractModel.GetDisplayAttributeName(p),
+                Default = p.DeclaringSyntaxReferences.Select(ds => ds.GetSyntax()).OfType<PropertyDeclarationSyntax>().Select(ps => ContractModel.GetDefaultConstant(ps, context.SemanticModel)).FirstOrDefault(),
+                Format = ContractModel.GetDisplayFormatAttributeDataFormatString(p)
+            };
+
+            if (model.IsRecord && emp.Name == "EqualityContract")
+                continue;
+
+            emp.KeyAndOrText = emp.HasFallbackText ? emp.Name : null;
+
+            ContractModel.ManageLocalizationAttribute(p, emp);
+            ContractModel.ManageStringAttributeProperty(p, emp);
+            ContractModel.ManageDateTimeAttributeProperty(p, emp);
+            ContractModel.ManageCleanAttributeProperty(p, emp);
+            ContractModel.ManageReferenceDataAttributeProperty(p, emp);
+            ContractModel.ManageReferenceDataCodeCollectionAttributeProperty(p, emp);
+
+            model.Properties.Add(emp);
+        }
+
+        return model;
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+    {
+        if (ReferenceEquals(this, obj))
+            return true;
+
+        if (obj is not ReferenceDataModel other)
+            return false;
+
+        if (Namespace != other.Namespace || ClassName != other.ClassName || IsRecord != other.IsRecord || IReferenceData != other.IReferenceData)
+            return false;
+
+        if (Enumerable.SequenceEqual(ContainingTypeHierarchy ?? [], other.ContainingTypeHierarchy ?? []) && Enumerable.SequenceEqual(Properties, other.Properties))
+            return true;
+
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        var hash = (Namespace?.GetHashCode() ?? 0) ^ (ClassName?.GetHashCode() ?? 0) ^ IsRecord.GetHashCode() ^ IReferenceData.GetHashCode();
+        if (ContainingTypeHierarchy is not null)
+            hash ^= ContainingTypeHierarchy.Aggregate(0, (current, item) => current ^ item.GetHashCode());
+
+        if (Properties is not null)
+            hash ^= Properties.Aggregate(0, (current, item) => current ^ item.GetHashCode());
+
+        return hash;
+    }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/CleanAttribute.cs.hb b/gen/CoreEx.Generator/Templates/CleanAttribute.cs.hb
new file mode 100644
index 00000000..36298c43
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/CleanAttribute.cs.hb
@@ -0,0 +1,21 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.Entities;
+
+/// <summary>Indicates that the corresponding property should be extended (source generation) to include <see cref="Cleaner"/> capabilities.</summary>
+/// <remarks>This is dependent on either <see cref="CoreEx.Entities.ContractAttribute"/> or <see cref="CoreEx.Entities.ReferenceDataAttribute"/> usage.
+/// <para>This is used for the generation of <see cref="CoreEx.Entities.Extended.RuntimeMetadata"/> functionality; this otherwise does not get used for the implementation of the property itself.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Property, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class CleanAttribute(CleanOption option = CleanOption.UseDefault) : global::System.Attribute 
+{
+    /// <summary>
+    /// Gets the <see cref="Entities.CleanOption"/>.
+    /// </summary>
+    public CleanOption CleanOption { get; } = option;
+}
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/Contract.cs.hb b/gen/CoreEx.Generator/Templates/Contract.cs.hb
new file mode 100644
index 00000000..3aa1126c
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/Contract.cs.hb
@@ -0,0 +1,97 @@
+// <auto-generated/>
+
+#nullable enable
+#pragma warning disable
+
+namespace {{Namespace}};
+
+{{#each ContainingTypeHierarchy}}
+{{indent}}partial class {{.}}
+{{indent}}{{bo}}{{indent++}}
+{{/each}}
+{{indent}}partial {{#if IsRecord}}record{{else}}class{{/if}} {{ClassName}} : global::CoreEx.Entities.IContract<{{ClassName}}>
+{{indent}}{{bo}}
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public static {{#ifne IContract 'Declare'}}new {{/ifne}}global::System.Collections.Generic.IEnumerable<global::CoreEx.Metadata.IPropertyRuntimeMetadata> GetStaticPropertyRuntimeMetadata()
+{{indent}}    {
+  {{#if HasBaseType}}
+{{indent}}        foreach (var p in global::CoreEx.Metadata.RuntimeMetadata.GetPropertyRuntimeMetadata<{{BaseType}}>())
+{{indent}}            yield return p;
+
+  {{/if}}
+  {{#each Properties}}
+{{indent}}        yield return new global::CoreEx.Metadata.PropertyRuntimeMetadata<{{../ClassName}}, {{Type}}>(nameof({{Name}}), static e => e.{{Name}}{{#unless IsReadOnly}}{{#unless IsInitOnly}}, static (e, v) => e.{{Name}} = v{{/unless}}{{/unless}}{{#if HasDefault}}, defaultValue: {{Default}}{{/if}}{{#if HasText}}, text: static () => new global::CoreEx.Localization.LText("{{KeyAndOrText}}"{{#if HasFallbackText}}, "{{FallbackText}}"{{/if}}){{/if}}{{#ifne CleanOption 'UseDefault'}}, clean: global::CoreEx.Entities.CleanOption.{{CleanOption}}{{/ifne}}{{#if HasJsonName}}, jsonName: "{{JsonName}}"{{/if}}{{#if HasFormat}}, format: "{{Format}}"{{/if}});
+  {{/each}}
+{{indent}}    }
+
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public {{#ifeq IContract 'Declare'}}virtual{{else}}override{{/ifeq}} global::System.Collections.Generic.IEnumerable<global::CoreEx.Metadata.IPropertyRuntimeMetadata> GetPropertyRuntimeMetadata()
+{{indent}}    {
+{{indent}}        foreach (var p in GetStaticPropertyRuntimeMetadata())
+{{indent}}            yield return p;
+{{indent}}    }
+{{#ifeq IContract 'Declare'}}
+
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public virtual bool IsDefault() => global::CoreEx.Metadata.RuntimeMetadata.IsDefault(this);
+
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public virtual void CopyFrom<TFrom>(TFrom from) where TFrom : class => global::CoreEx.Metadata.RuntimeMetadata.CopyInto(from, this);
+{{/ifeq}}
+{{#unless IsRecord}}
+
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public override int GetHashCode() => global::CoreEx.Metadata.RuntimeMetadata.GetHashCode(this);
+
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public override bool Equals(object? other) => global::CoreEx.Metadata.RuntimeMetadata.AreEqual(this, other);
+
+{{indent}}    /// <inheritdoc/>
+{{indent}}    public virtual bool Equals({{ClassName}}? other) => global::CoreEx.Metadata.RuntimeMetadata.AreEqual(this, other);
+{{/unless}}
+{{#each PartialProperties}}
+
+  {{#if IsRefData}}
+    {{#if IsRefDataJson}}
+{{indent}}    [global::System.Text.Json.Serialization.JsonPropertyName("{{JsonName}}")]
+    {{/if}}
+{{indent}}    public partial {{Type}} {{Name}} { get => field;{{#unless IsReadOnly}} {{#if IsInitOnly}}init{{else}}set{{/if}} => field = value; {{/unless}} }
+
+{{indent}}    /// <summary>Gets the corresponding <see cref="{{RefDataType}}"/> value as per the related <see cref="{{Name}}"/>.</summary>
+{{indent}}    [global::System.Diagnostics.DebuggerBrowsable(global::System.Diagnostics.DebuggerBrowsableState.Never)]
+{{indent}}    [global::System.Text.Json.Serialization.JsonIgnore]
+{{indent}}    [global::System.Text.Json.Serialization.JsonPropertyName("{{JsonName}}")]
+    {{#if HasText}}
+{{indent}}    [global::CoreEx.Localization.Localization("{{KeyAndOrText}}"{{#if HasFallbackText}}, "{{FallbackText}}"{{/if}})]
+    {{/if}}
+{{indent}}    public {{RefDataType}} {{RefDataName}} { get => ({{RefDataType}}){{Name}}; {{#if IsSettable}}set => {{Name}} = value; {{/if}} }
+
+{{indent}}    /// <summary>Gets the related <see cref="{{RefDataName}}"/> text where explicitly requested.</summary>
+{{indent}}    /// <remarks>Generally, the guidance (by design) is that the text should not be initialized/set directly; only offered to support advanced, serialization, and testing scenarios.</remarks>
+{{indent}}    [global::System.Diagnostics.DebuggerBrowsable(global::System.Diagnostics.DebuggerBrowsableState.Never)]
+{{indent}}    [global::System.ComponentModel.ReadOnly(true)]
+{{indent}}    public string? {{RefDataName}}Text { get => field ?? global::CoreEx.ExecutionContext.GetRelatedText(() => {{Name}} is null ? null : {{RefDataName}}?.Text); init => field = value; }
+  {{else}}
+    {{#if IsRefDataCodeCollection}}
+{{indent}}    private {{Type}} {{RefDataCodeCollectionFieldName}};
+
+      {{#unless HasJsonName}}
+{{indent}}    [global::System.Text.Json.Serialization.JsonPropertyName("{{RefDataCodeCollectionJsonName}}")]
+      {{/unless}}
+{{indent}}    public partial {{Type}} {{Name}} { get => {{RefDataCodeCollectionFieldName}}; set => {{RefDataCodeCollectionFieldName}} = value; }
+
+{{indent}}    /// <summary>Gets or sets the <see cref="global::CoreEx.RefData.ReferenceDataCodeCollection{TRef}"/> (<see cref="{{RefDataType}}"/>) encapsulation of the underlying <see cref="{{Name}}"/>.</summary>
+{{indent}}    [global::System.Text.Json.Serialization.JsonIgnore]
+{{indent}}    public global::CoreEx.RefData.ReferenceDataCodeCollection<{{RefDataType}}> {{RefDataName}} { get => new(ref {{RefDataCodeCollectionFieldName}}); set => {{RefDataCodeCollectionFieldName}} = value?.ToCodeList(); }
+    {{else}}
+{{indent}}    public {{#if IsRequired}}required {{/if}}partial {{Type}} {{Name}} { get => field;{{#unless IsReadOnly}} {{#if IsInitOnly}}init{{else}}set{{/if}} => field = global::CoreEx.Entities.Cleaner.Clean(value, {{#if IsSelfCleanedString}}global::CoreEx.Entities.StringTrim.{{StringTrim}}, global::CoreEx.Entities.StringTransform.{{StringTransform}}, global::CoreEx.Entities.StringCase.{{StringCase}}{{else}}global::CoreEx.Entities.DateTimeTransform.{{DateTimeTransform}}{{/if}});{{/unless}} }
+    {{/if}}
+  {{/if}}
+{{/each}}
+{{indent}}{{bc}}
+{{#each ContainingTypeHierarchy}}
+{{indent--}}{{Indent}}{{bc}}
+{{/each}}
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/ContractAttribute.cs.hb b/gen/CoreEx.Generator/Templates/ContractAttribute.cs.hb
new file mode 100644
index 00000000..f4db91d0
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/ContractAttribute.cs.hb
@@ -0,0 +1,16 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.Entities;
+
+/// <summary>Enables source generation of the <i>CoreEx</i> extended contract functionality; specifically the implementation of <see cref="CoreEx.Entities.IContract{T}"/>.</summary>
+/// <remarks>Supports both <see langword="class"/> and <see langword="record"/> types; however, the equality for a <see langword="record"/> is not implemented as the native <see langword="record"/> compiler generated equality must be used instead. 
+/// The <see langword="class"/> equality is implemented using the <see cref="CoreEx.Entities.Extended.RuntimeMetadata"/> functionality which supports deep equality (where possible).
+/// <para>Usage is all or nothing, no partial implementation of the <see cref="CoreEx.Entities.IContract<T>"/> is supported.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Class, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class ContractAttribute : global::System.Attribute { }
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/ContractIgnoreAttribute.cs.hb b/gen/CoreEx.Generator/Templates/ContractIgnoreAttribute.cs.hb
new file mode 100644
index 00000000..a9657429
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/ContractIgnoreAttribute.cs.hb
@@ -0,0 +1,15 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.Entities;
+
+/// <summary>Indicates that the corresponding property should <i>not</i> be included in the source generation of the <i>CoreEx</i> extended contract functionality.</summary>
+/// <remarks>This is dependent on either <see cref="CoreEx.Entities.ContractAttribute"/> or <see cref="CoreEx.Entities.ReferenceDataAttribute"/> usage.
+/// <para>This is used for the generation of <see cref="CoreEx.Entities.Extended.RuntimeMetadata"/> functionality; this otherwise does not get used for the implementation of the property itself.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Property, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class ContractIgnoreAttribute : global::System.Attribute { }
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/DateTimeAttribute.cs.hb b/gen/CoreEx.Generator/Templates/DateTimeAttribute.cs.hb
new file mode 100644
index 00000000..e00c2ec1
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/DateTimeAttribute.cs.hb
@@ -0,0 +1,22 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.Entities;
+
+/// <summary>Indicates that the corresponding property should be extended (source generation) to include <see cref="System.DateTime"/> <see cref="Cleaner"/> capabilities.</summary>
+/// <param name="transform">The <see cref="DateTimeTransform"/> (defaults to <see cref="DateTimeTransform.UseDefault"/>).</param>
+/// <remarks>This is dependent on either <see cref="CoreEx.Entities.ContractAttribute"/> or <see cref="CoreEx.Entities.ReferenceDataAttribute"/> usage.
+/// <para>The property must be declared as <see langword="partial"/> for this to be generated correctly.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Property, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class DateTimeAttribute(DateTimeTransform transform = DateTimeTransform.UseDefault) : global::System.Attribute
+{
+    /// <summary>
+    /// Gets the <see cref="DateTimeTransform"/>.
+    /// </summary>
+    public DateTimeTransform Transform { get; } = transform;
+}
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/ReferenceData.cs.hb b/gen/CoreEx.Generator/Templates/ReferenceData.cs.hb
new file mode 100644
index 00000000..e7c2632f
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/ReferenceData.cs.hb
@@ -0,0 +1,47 @@
+// <auto-generated/>
+
+#nullable enable
+#pragma warning disable
+
+namespace {{Namespace}};
+
+{{#each ContainingTypeHierarchy}}
+{{indent}}partial class {{.}}
+{{indent}}{{bo}}{{indent++}}
+{{/each}}
+{{indent}}partial {{#if IsRecord}}record{{else}}class{{/if}} {{ClassName}}
+{{indent}}{{bo}}
+{{#each PartialProperties}}
+  {{#if IsRefData}}
+    {{#if IsRefDataJson}}
+{{indent}}    [global::System.Text.Json.Serialization.JsonPropertyName("{{JsonName}}")]
+    {{/if}}
+{{indent}}    public partial {{Type}} {{Name}} { get => field;{{#unless IsReadOnly}} {{#if IsInitOnly}}init{{else}}set{{/if}} => field = value; {{/unless}} }
+
+{{indent}}    /// <summary>Gets the corresponding <see cref="{{RefDataType}}"/> value as per the related <see cref="{{Name}}"/>.</summary>
+{{indent}}    [global::System.Diagnostics.DebuggerBrowsable(global::System.Diagnostics.DebuggerBrowsableState.Never)]
+{{indent}}    [global::System.Text.Json.Serialization.JsonIgnore]
+{{indent}}    public {{RefDataType}} {{RefDataName}} { get => ({{RefDataType}}){{Name}}; {{#if IsSettable}}set => {{Name}} = value; {{/if}} }
+
+{{indent}}    /// <summary>Gets the related <see cref="{{RefDataName}}"/> text where explicitly requested.</summary>
+{{indent}}    /// <remarks>Generally, the guidance (by design) is that the text should not be initialized/set directly; only offered to support advanced, serialization, and testing scenarios.</remarks>
+{{indent}}    [global::System.Diagnostics.DebuggerBrowsable(global::System.Diagnostics.DebuggerBrowsableState.Never)]
+{{indent}}    [global::System.ComponentModel.ReadOnly(true)]
+{{indent}}    public string? {{RefDataName}}Text { get => field ?? global::CoreEx.ExecutionContext.GetRelatedText(() => {{Name}} is null ? null : {{RefDataName}}?.Text); init => field = value; }
+  {{else}}
+{{indent}}    public partial {{Type}} {{Name}} { get => field;{{#unless IsReadOnly}} {{#if IsInitOnly}}init{{else}}set{{/if}} => field = global::CoreEx.Entities.Cleaner.Clean(value, {{#if IsSelfCleanedString}}global::CoreEx.Entities.StringTrim.{{StringTrim}}, global::CoreEx.Entities.StringTransform.{{StringTransform}}, global::CoreEx.Entities.StringCase.{{StringCase}}{{else}}global::CoreEx.Entities.DateTimeTransform.{{DateTimeTransform}}{{/if}});{{/unless}} }
+  {{/if}}
+
+{{/each}}
+{{indent}}    /// <summary>An implicit cast operator that converts a <paramref name="code"/> to a <see cref="{{ClassName}}"/> instance.</summary>
+{{indent}}    /// <param name="code">The <see cref="global::CoreEx.RefData.Abstractions.IReferenceData.Code"/>.</param>
+{{indent}}    /// <returns>The corresponding <see cref="{{ClassName}}"/> instance where <paramref name="code"/> is not <see langword="null"/>; otherwise, <see langword="null"/>.</returns>
+{{indent}}    [return: global::System.Diagnostics.CodeAnalysis.NotNullIfNotNull(nameof(code))]
+{{indent}}    public static implicit operator {{ClassName}}?(string? code) => code is null ? null : global::CoreEx.RefData.ReferenceDataOrchestrator.TryGetByCode<{{ClassName}}>(code, out var item) ? item : item;
+{{indent}}{{bc}}
+{{#each ContainingTypeHierarchy}}
+{{indent--}}{{indent}}{{bc}}
+{{/each}}
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/ReferenceDataAttribute.cs.hb b/gen/CoreEx.Generator/Templates/ReferenceDataAttribute.cs.hb
new file mode 100644
index 00000000..42427b70
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/ReferenceDataAttribute.cs.hb
@@ -0,0 +1,13 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.RefData;
+
+/// <summary>Enables source generation of the <i>CoreEx</i> reference data functionality; specifically the implementation of <see cref="CoreEx.RefData.Abstractions.IReferenceData"/>.</summary>
+[global::System.AttributeUsage(global::System.AttributeTargets.Class, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class ReferenceDataAttribute : global::System.Attribute { }
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/ReferenceDataCodeCollectionTAttribute.cs.hb b/gen/CoreEx.Generator/Templates/ReferenceDataCodeCollectionTAttribute.cs.hb
new file mode 100644
index 00000000..946ddc6d
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/ReferenceDataCodeCollectionTAttribute.cs.hb
@@ -0,0 +1,16 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.RefData;
+
+/// <summary>Indicates that the corresponding property should be extended (source generation) to include the full suite of reference data code collection properties/capabilities.</summary>
+/// <remarks>This is dependent on either <see cref="CoreEx.Entities.ContractAttribute"/> or <see cref="CoreEx.Entities.ReferenceDataAttribute"/> usage.
+/// <para>Primarily, a corresponding <see cref="CoreEx.RefData.ReferenceDataCodeCollection{TRef}"/> <typeparam name="TReferenceData"/> property will be created (and linked) for non-serialized usage.</para>
+/// <para>The property must be declared as <see langword="partial"/> for this to be generated correctly.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Property, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class ReferenceDataCodeCollectionAttribute<TReferenceData> : global::System.Attribute where TReferenceData : class, CoreEx.RefData.Abstractions.IReferenceData { }
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/ReferenceDataTAttribute.cs.hb b/gen/CoreEx.Generator/Templates/ReferenceDataTAttribute.cs.hb
new file mode 100644
index 00000000..f27d41fa
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/ReferenceDataTAttribute.cs.hb
@@ -0,0 +1,23 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.RefData;
+
+/// <summary>Indicates that the corresponding property should be extended (source generation) to include the full suite of reference data properties/capabilities.</summary>
+/// <remarks>This is dependent on either <see cref="CoreEx.Entities.ContractAttribute"/> or <see cref="CoreEx.Entities.ReferenceDataAttribute"/> usage.
+/// <para>Primarily, a corresponding <typeparam name="TReferenceData"/> property will be created (and linked) for non-serialized usage.</para>
+/// <para>The property must be declared as <see langword="partial"/> for this to be generated correctly.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Property, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class ReferenceDataAttribute<TReferenceData> : global::System.Attribute where TReferenceData : class, CoreEx.RefData.Abstractions.IReferenceData
+{
+    /// <summary>Indicates whether the <c>CoreEx.Refdata.Abstractions.IReferenceData.Text</c> read-only property should be included in the generated source.</summary>
+    public bool Text { get; set; } = true;
+
+    /// <summary>Gets or sets the JSON name override to use for the <c>CoreEx.Refdata.Abstractions.IReferenceData.Text</c> property when serializing to JSON.</summary>
+    public string? TextJsonName { get; set; }
+}
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Templates/StringAttribute.cs.hb b/gen/CoreEx.Generator/Templates/StringAttribute.cs.hb
new file mode 100644
index 00000000..cfe379a8
--- /dev/null
+++ b/gen/CoreEx.Generator/Templates/StringAttribute.cs.hb
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#nullable enable
+#pragma warning disable
+
+namespace CoreEx.Entities;
+
+/// <summary>Indicates that the corresponding property should be extended (source generation) to include <see cref="string"/> <see cref="Cleaner"/> capabilities.</summary>
+/// <param name="trim">The <see cref="StringTrim"/> (defaults to <see cref="StringTrim.UseDefault"/>).</param>
+/// <param name="transform">The <see cref="StringTransform"/> (defaults to <see cref="StringTransform.UseDefault"/>).</param>
+/// <param name="casing">The <see cref="StringCase"/> (defaults to <see cref="StringCase.UseDefault"/>).</param>
+/// <remarks>This is dependent on either <see cref="CoreEx.Entities.ContractAttribute"/> or <see cref="CoreEx.Entities.ReferenceDataAttribute"/> usage.
+/// <para>The property must be declared as <see langword="partial"/> for this to be generated correctly.</para></remarks>
+[global::System.AttributeUsage(global::System.AttributeTargets.Property, AllowMultiple = false)]
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute("CoreEx.Generator.ContractGenerator", "1.0.0.0")]
+internal class StringAttribute(StringTrim trim = StringTrim.UseDefault, StringTransform transform = StringTransform.UseDefault, StringCase casing = StringCase.UseDefault) : global::System.Attribute
+{
+    /// <summary>
+    /// Gets the <see cref="StringTrim"/>.
+    /// </summary>
+    public StringTrim Trim { get; } = trim;
+
+    /// <summary>
+    /// Gets the <see cref="StringTransform"/>.
+    /// </summary>
+    public StringTransform Transform { get; } = transform;
+
+    /// <summary>
+    /// Gets the <see cref="StringCase"/>.
+    /// </summary>
+    public StringCase Casing { get; } = casing;
+}
+
+#pragma warning restore
+#nullable restore
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Utility/CodeGenContext.cs b/gen/CoreEx.Generator/Utility/CodeGenContext.cs
new file mode 100644
index 00000000..4c94b899
--- /dev/null
+++ b/gen/CoreEx.Generator/Utility/CodeGenContext.cs
@@ -0,0 +1,54 @@
+using Microsoft.CodeAnalysis;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace CoreEx.Generator.Utility;
+
+/// <summary>
+/// Provides context for code generation, allowing for customization of the generated code.
+/// </summary>
+public class CodeGenContext
+{
+    /// <summary>
+    /// Gets or sets the indent level to be used for the generated code.
+    /// </summary>
+    public int Indent { get; set; } = 0;
+
+    /// <summary>
+    /// Gets or sets the number of spaces used for each indentation level.
+    /// </summary>
+    public int IndentSize { get; set; } = 4;
+
+    /// <summary>
+    /// Increments the indent level by one.
+    /// </summary>
+    public void IncrementIndent() => Indent++;
+
+    /// <summary>
+    /// Decreases the current indentation level by one.
+    /// </summary>
+    public void DecrementIndent() => Indent--;
+
+    /// <summary>
+    /// Gets the string used for indentation, consisting of spaces.
+    /// </summary>
+    public string GetIndentString() => new(' ', Indent * IndentSize);
+
+    /// <summary>
+    /// Gets the <see cref="Diagnostic"/> list to be reported.
+    /// </summary>
+    public List<Diagnostic> Diagnostics { get; } = [];
+
+    /// <summary>
+    /// Reports the accumulated <see cref="Diagnostics"/> to the provided <paramref name="context"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="SourceProductionContext"/>.</param>
+    /// <returns><see langword="true"/> indicates there are no <see cref="Diagnostics"/> in <see cref="DiagnosticSeverity.Error"/> and source production should occur; otherwise, <see langword="false"/> indicates that no source production should occur.</returns>
+    public bool ReportDiagnostics(SourceProductionContext context)
+    {
+        foreach (var d in Diagnostics)
+            context.ReportDiagnostic(d);
+
+        return !Diagnostics.Any(d => d.Severity == DiagnosticSeverity.Error);
+    }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Utility/HandlebarsCodeGenerator.cs b/gen/CoreEx.Generator/Utility/HandlebarsCodeGenerator.cs
new file mode 100644
index 00000000..6f2a829a
--- /dev/null
+++ b/gen/CoreEx.Generator/Utility/HandlebarsCodeGenerator.cs
@@ -0,0 +1,65 @@
+using HandlebarsDotNet;
+using System;
+using System.IO;
+
+namespace CoreEx.Generator.Utility;
+
+/// <summary>
+/// The core code generator that manages the <b>Handlebars</b> compilation (cached for performance) and enables the corresponding <see cref="Generate"/> (one or more invocations).
+/// </summary>
+public class HandlebarsCodeGenerator
+{
+    private readonly HandlebarsTemplate<object?, object?> _template;
+
+    /// <summary>
+    /// Static constructor.
+    /// </summary>
+    static HandlebarsCodeGenerator()
+    {
+        HandlebarsHelpers.RegisterHelpers();
+        Handlebars.Configuration.TextEncoder = null;
+    }
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="HandlebarsCodeGenerator"/> from the specified <paramref name="resourceName"/>.
+    /// </summary>
+    /// <param name="resourceName">The fully qualified embedded resource name for the code template.</param>
+    /// <returns>The <see cref="HandlebarsCodeGenerator"/>.</returns>
+    public static HandlebarsCodeGenerator Create(string resourceName)
+    {
+        using var s = typeof(HandlebarsCodeGenerator).Assembly.GetManifestResourceStream(resourceName) ?? throw new InvalidOperationException($"Resource '{resourceName}' not found.");
+        using var sr = new StreamReader(s);
+        return new HandlebarsCodeGenerator(sr);
+    }
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="HandlebarsCodeGenerator"/> from the specified <paramref name="stream"/>.
+    /// </summary>
+    /// <param name="stream">The template <see cref="Stream"/>.</param>
+    /// <returns></returns>
+    public static HandlebarsCodeGenerator Create(Stream stream)
+    {
+        using var sr = new StreamReader(stream);
+        return new HandlebarsCodeGenerator(sr);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="HandlebarsCodeGenerator"/> from the <paramref name="sr"/>.
+    /// </summary>
+    /// <param name="sr">The template <see cref="StreamReader"/>.</param>
+    public HandlebarsCodeGenerator(StreamReader sr)
+    {
+        if (sr is null)
+            throw new ArgumentNullException(nameof(sr));
+
+        _template = Handlebars.Compile(sr.ReadToEnd());
+    }
+
+    /// <summary>
+    /// Generate content from the template using the <paramref name="context"/> and optional secondary <paramref name="data"/>.
+    /// </summary>
+    /// <param name="context">The primary context value referenced within the template.</param>
+    /// <param name="data">The optional secondary data.</param>
+    /// <returns>The resulting generated output.</returns>
+    public string Generate(CodeGenContext context, object? data = null) => _template(context, data);
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Utility/HandlebarsHelpers.cs b/gen/CoreEx.Generator/Utility/HandlebarsHelpers.cs
new file mode 100644
index 00000000..6de6d692
--- /dev/null
+++ b/gen/CoreEx.Generator/Utility/HandlebarsHelpers.cs
@@ -0,0 +1,119 @@
+using HandlebarsDotNet;
+
+namespace CoreEx.Generator.Utility;
+
+/// <summary>
+/// Provides the <b>Handlebars.Net</b> <see cref="RegisterHelpers"/> capability.
+/// </summary>
+public static class HandlebarsHelpers
+{
+    private static readonly object _lock = new();
+    private static bool _areRegistered = false;
+
+    /// <summary>
+    /// Registers all of the required Handlebars helpers.
+    /// </summary>
+    public static void RegisterHelpers()
+    {
+        if (_areRegistered)
+            return;
+
+        lock (_lock)
+        {
+            if (_areRegistered)
+                return;
+
+            _areRegistered = true;
+
+            // Increments indent only!
+            Handlebars.RegisterHelper("indent++", (in w, in options, in context, in args) =>
+            {
+                var hc = (CodeGenContext)options.Data["Root"];
+                hc.IncrementIndent();
+            });
+
+            // Decrements indent only!
+            Handlebars.RegisterHelper("indent--", (in w, in options, in context, in args) =>
+            {
+                var hc = (CodeGenContext)options.Data["Root"];
+                hc.DecrementIndent();
+            });
+
+            // Writes the current indent string.
+            Handlebars.RegisterHelper("indent", (in w, in options, in context, in args) =>
+            {
+                var hc = (CodeGenContext)options.Data["Root"];
+                w.WriteSafeString(hc.GetIndentString());
+            });
+
+            Handlebars.RegisterHelper("bo", (w, _, __) => w.WriteSafeString("{"));
+            Handlebars.RegisterHelper("bc", (w, _, __) => w.WriteSafeString("}"));
+
+            // Will check that the first argument equals at least one of the subsequent arguments.
+            Handlebars.RegisterHelper("ifeq", (writer, options, context, args) =>
+            {
+                if (IfEq(args))
+                    options.Template(writer, context);
+                else
+                    options.Inverse(writer, context);
+            });
+
+            // Will check that the first argument does not equal any of the subsequent arguments.
+            Handlebars.RegisterHelper("ifne", (writer, options, context, args) =>
+            {
+                if (IfEq(args))
+                    options.Inverse(writer, context);
+                else
+                    options.Template(writer, context);
+            });
+        }
+    }
+
+    /// <summary>
+    /// Perform the actual IfEq equality check.
+    /// </summary>
+    private static bool IfEq(Arguments args)
+    {
+        bool func()
+        {
+            for (int i = 1; i < args.Length; i++)
+            {
+                if (Compare(args[0], args[i]))
+                    return true;
+            }
+
+            return false;
+        }
+
+        return args.Length switch
+        {
+            0 => true,
+            1 => args[0] is null,
+            2 => Compare(args[0], args[1]),
+            _ => func()
+        };
+    }
+
+    /// <summary>
+    /// Compare the two values for equality.
+    /// </summary>
+    private static bool Compare(object? lval, object? rval)
+    {
+        if (lval is null && rval is null)
+            return true;
+
+        if (lval is null || rval is null)
+            return false;
+
+        if (lval is string ls && rval is string rs)
+            return ls == rs;
+
+        if (lval is bool lb && rval is bool rb)
+            return lb == rb;
+
+        if (lval is int li && rval is int ri)
+            return li == ri;
+
+        return lval.ToString() == rval.ToString();
+    }
+}
\ No newline at end of file
diff --git a/gen/CoreEx.Generator/Utility/Pluralizer.cs b/gen/CoreEx.Generator/Utility/Pluralizer.cs
new file mode 100644
index 00000000..68303ee5
--- /dev/null
+++ b/gen/CoreEx.Generator/Utility/Pluralizer.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Generator.Utility;
+
+/// <summary>
+/// Enables access to the pluralization services.
+/// </summary>
+internal static class Pluralizer
+{
+    /// <summary>
+    /// Gets the singleton <see cref="Pluralize.NET.IPluralize"/> instance.
+    /// </summary>
+    public static Pluralize.NET.IPluralize Instance { get; } = new Pluralize.NET.Pluralizer();
+}
\ No newline at end of file
diff --git a/images/BetterTogetherVenn.png b/images/BetterTogetherVenn.png
new file mode 100644
index 00000000..020b7675
Binary files /dev/null and b/images/BetterTogetherVenn.png differ
diff --git a/nuget-publish.ps1 b/nuget-publish.ps1
index 7a3fe4d7..1768143a 100644
--- a/nuget-publish.ps1
+++ b/nuget-publish.ps1
@@ -50,23 +50,21 @@ param(
     [String[]]$ProjectsToPublish = @(
         "src\CoreEx",
         "src\CoreEx.AspNetCore",
-        "src\CoreEx.AutoMapper",
-        "src\CoreEx.Azure",
-        "src\CoreEx.Solace",
+        "src\CoreEx.AspNetCore.NSwag",
+        "src\CoreEx.Azure.Messaging.ServiceBus",
+        "src\CoreEx.Caching.FusionCache",
+        "src\CoreEx.CodeGen",
         "src\CoreEx.Data",
         "src\CoreEx.Database",
-        "src\CoreEx.Database.SqlServer",
-        "src\CoreEx.Database.MySql",
         "src\CoreEx.Database.Postgres",
+        "src\CoreEx.Database.SqlServer",
+        "src\CoreEx.DomainDriven",
         "src\CoreEx.EntityFrameworkCore",
-        "src\CoreEx.Cosmos",
-        "src\CoreEx.OData",
-        "src\CoreEx.FluentValidation",
-        "src\CoreEx.Newtonsoft",
+        "src\CoreEx.Events",
+        "src\CoreEx.RefData",
+        "src\CoreEx.Template",
         "src\CoreEx.Validation",
-        "src\CoreEx.UnitTesting",
-        "src\CoreEx.UnitTesting.Azure.Functions",
-        "src\CoreEx.UnitTesting.Azure.ServiceBus")
+        "src\CoreEx.UnitTesting")
     )
 
 $ShouldPublishRemote = (![string]::IsNullOrEmpty($apiKey) -and ![string]::IsNullOrEmpty($NugetServer))
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
new file mode 100644
index 00000000..252bed92
--- /dev/null
+++ b/samples/Directory.Build.props
@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' != ''">
+    <AzdPublishTargetFramework Condition="'$(AzdPublishTargetFramework)' == ''">$(AZD_DOTNET_TARGET_FRAMEWORK)</AzdPublishTargetFramework>
+    <AzdPublishTargetFramework Condition="'$(AzdPublishTargetFramework)' == ''">$(DOTNET_TARGET_FRAMEWORK)</AzdPublishTargetFramework>
+    <TargetFramework Condition="'$(AzdPublishTargetFramework)' != ''">$(AzdPublishTargetFramework)</TargetFramework>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/EmployeeController.cs b/samples/My.Hr/My.Hr.Api/Controllers/EmployeeController.cs
deleted file mode 100644
index 8f68fc0a..00000000
--- a/samples/My.Hr/My.Hr.Api/Controllers/EmployeeController.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-namespace My.Hr.Api.Controllers;
-
-[Route("api/employees")]
-[Produces(MediaTypeNames.Application.Json)]
-public class EmployeeController : ControllerBase
-{
-    private readonly WebApi _webApi;
-    private readonly IEmployeeService _service;
-
-    public EmployeeController(WebApi webApi, IEmployeeService service)
-    {
-        _webApi = webApi;
-        _service = service;
-    }
-
-    /// <summary>
-    /// Gets the specified <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The selected <see cref="Employee"/> where found.</returns>
-    [HttpGet("{id}")]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.OK)]
-    [ProducesResponseType((int)HttpStatusCode.NotFound)]
-    public Task<IActionResult> GetAsync(Guid id)
-        => _webApi.GetAsync(Request, _ => _service.GetEmployeeAsync(id));
-
-    /// <summary>
-    /// Gets all <see cref="Employee"/>.
-    /// </summary>
-    /// <returns>All <see cref="Employee"/>.</returns>
-    [HttpGet("")]
-    [ProducesResponseType(typeof(IEnumerable<Employee>), (int)HttpStatusCode.OK)]
-    [Paging]
-    [Query]
-    public Task<IActionResult> GetAllAsync()
-        => _webApi.GetAsync(Request, p => _service.GetAllAsync(p.RequestOptions.Query, p.RequestOptions.Paging));
-
-    /// <summary>
-    /// Creates a new <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="validator">The validator.</param>
-    /// <returns>The created <see cref="Employee"/>.</returns>
-    [HttpPost("")]
-    [AcceptsBody(typeof(Employee))]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.Created)]
-    public Task<IActionResult> CreateAsync([FromServices] IValidator<Employee> validator)
-        => _webApi.PostAsync(Request, p => _service.AddEmployeeAsync(p.Value!),
-           statusCode: HttpStatusCode.Created, validator: validator, locationUri: e => new Uri($"api/employees/{e.Id}", UriKind.RelativeOrAbsolute));
-
-    /// <summary>
-    /// Updates an existing <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <param name="validator">The validator.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
-    [HttpPut("{id}")]
-    [AcceptsBody(typeof(Employee))]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> UpdateAsync(Guid id, [FromServices] IValidator<Employee> validator)
-        => _webApi.PutAsync(Request, p => _service.UpdateEmployeeAsync(p.Value!, id), validator: validator);
-
-    /// <summary>
-    /// Patches an existing <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <param name="validator">The validator.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
-    [HttpPatch("{id}", Name = "Patch")]
-    [AcceptsBody(typeof(Employee), HttpConsts.MergePatchMediaTypeName)]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> PatchAsync(Guid id, [FromServices] IValidator<Employee> validator)
-        => _webApi.PatchAsync(Request, get: _ => _service.GetEmployeeAsync(id), put: p => _service.UpdateEmployeeAsync(p.Value!, id), validator: validator);
-
-    /// <summary>
-    /// Deletes the specified <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The Id.</param>
-    [HttpDelete("{id}")]
-    [ProducesResponseType((int)HttpStatusCode.NoContent)]
-    public Task<IActionResult> DeleteAsync(Guid id)
-        => _webApi.DeleteAsync(Request, _ => _service.DeleteEmployeeAsync(id));
-
-    /// <summary>
-    /// Performs <see cref="Employee"/> verification in an asynchronous process.
-    /// </summary>
-    [HttpPost("{id}/verify")]
-    [ProducesResponseType((int)HttpStatusCode.Accepted)]
-    [ProducesResponseType((int)HttpStatusCode.NotFound)]
-    public Task<IActionResult> VerifyAsync(Guid id)
-        => _webApi.PostAsync(Request, apiParam => _service.VerifyEmployeeAsync(id), HttpStatusCode.Accepted);
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/EmployeeResultController.cs b/samples/My.Hr/My.Hr.Api/Controllers/EmployeeResultController.cs
deleted file mode 100644
index 1eace93d..00000000
--- a/samples/My.Hr/My.Hr.Api/Controllers/EmployeeResultController.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-namespace My.Hr.Api.Controllers;
-
-[Route("api/results")]
-[Produces(MediaTypeNames.Application.Json)]
-public class EmployeeResultController : ControllerBase
-{
-    private readonly WebApi _webApi;
-    private readonly IEmployeeResultService _service;
-
-    public EmployeeResultController(WebApi webApi, IEmployeeResultService service)
-    {
-        _webApi = webApi;
-        _service = service;
-    }
-
-    /// <summary>
-    /// Gets the specified <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The selected <see cref="Employee"/> where found.</returns>
-    [HttpGet("{id}")]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.OK)]
-    [ProducesResponseType((int)HttpStatusCode.NotFound)]
-    public Task<IActionResult> GetAsync(Guid id)
-        => _webApi.GetWithResultAsync(Request, _ => _service.GetEmployeeAsync(id));
-
-    /// <summary>
-    /// Gets all <see cref="Employee"/>.
-    /// </summary>
-    /// <returns>All <see cref="Employee"/>.</returns>
-    [HttpGet("")]
-    [ProducesResponseType(typeof(IEnumerable<Employee>), (int)HttpStatusCode.OK)]
-    [Paging]
-    public Task<IActionResult> GetAllAsync()
-        => _webApi.GetWithResultAsync(Request, p => _service.GetAllAsync(p.RequestOptions.Paging));
-
-    /// <summary>
-    /// Creates a new <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="validator">The validator.</param>
-    /// <returns>The created <see cref="Employee"/>.</returns>
-    [HttpPost("")]
-    [AcceptsBody(typeof(Employee))]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.Created)]
-    public Task<IActionResult> CreateAsync([FromServices] IValidator<Employee> validator)
-        => _webApi.PostWithResultAsync(Request, p => _service.AddEmployeeAsync(p.Value!),
-           statusCode: HttpStatusCode.Created, validator: validator, locationUri: e => new Uri($"api/employees/{e.Id}", UriKind.RelativeOrAbsolute));
-
-    /// <summary>
-    /// Updates an existing <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <param name="validator">The validator.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
-    [HttpPut("{id}")]
-    [AcceptsBody(typeof(Employee))]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> UpdateAsync(Guid id, [FromServices] IValidator<Employee> validator)
-        => _webApi.PutWithResultAsync(Request, p => _service.UpdateEmployeeAsync(p.Value!, id), validator: validator);
-
-    /// <summary>
-    /// Patches an existing <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <param name="validator">The validator.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
-    [HttpPatch("{id}")]
-    [AcceptsBody(typeof(Employee), HttpConsts.MergePatchMediaTypeName)]
-    [ProducesResponseType(typeof(Employee), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> PatchAsync(Guid id, [FromServices] IValidator<Employee> validator)
-        => _webApi.PatchWithResultAsync(Request, get: _ => _service.GetEmployeeAsync(id), put: p => _service.UpdateEmployeeAsync(p.Value!, id), validator: validator);
-
-    /// <summary>
-    /// Deletes the specified <see cref="Employee"/>.
-    /// </summary>
-    /// <param name="id">The Id.</param>
-    [HttpDelete("{id}")]
-    [ProducesResponseType((int)HttpStatusCode.NoContent)]
-    public Task<IActionResult> DeleteAsync(Guid id)
-        => _webApi.DeleteWithResultAsync(Request, _ => _service.DeleteEmployeeAsync(id));
-
-    /// <summary>
-    /// Performs <see cref="Employee"/> verification in an asynchronous process.
-    /// </summary>
-    [HttpPost("{id}/verify")]
-    [ProducesResponseType((int)HttpStatusCode.Accepted)]
-    [ProducesResponseType((int)HttpStatusCode.NotFound)]
-    public Task<IActionResult> VerifyAsync(Guid id)
-        => _webApi.PostWithResultAsync(Request, apiParam => _service.VerifyEmployeeAsync(id), HttpStatusCode.Accepted);
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/ReferenceDataController.cs b/samples/My.Hr/My.Hr.Api/Controllers/ReferenceDataController.cs
deleted file mode 100644
index 59d52396..00000000
--- a/samples/My.Hr/My.Hr.Api/Controllers/ReferenceDataController.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace My.Hr.Api.Controllers;
-
-[Route("api/ref")]
-[Produces(MediaTypeNames.Application.Json)]
-public class ReferenceDataController : ControllerBase
-{
-    private readonly ReferenceDataContentWebApi _webApi;
-    private readonly ReferenceDataOrchestrator _orchestrator;
-
-    public ReferenceDataController(ReferenceDataContentWebApi webApi, ReferenceDataOrchestrator orchestrator)
-    {
-        _webApi = webApi;
-        _orchestrator = orchestrator;
-    }
-
-    /// <summary> 
-    /// Gets all of the <see cref="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 <see cref="USStateCollection"/>.</returns>
-    [HttpGet("usstates")]
-    [ProducesResponseType(typeof(IEnumerable<USState>), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> USStateGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default) =>
-        _webApi.GetAsync(Request, x => _orchestrator.GetWithFilterAsync<USState>(codes, text, x.RequestOptions.IncludeInactive));
-
-    /// <summary> 
-    /// Gets all of the <see cref="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 <see cref="GenderCollection"/>.</returns>
-    [HttpGet("genders")]
-    [ProducesResponseType(typeof(IEnumerable<Gender>), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> GenderGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default) =>
-        _webApi.GetAsync(Request, x => _orchestrator.GetWithFilterAsync<Gender>(codes, text, x.RequestOptions.IncludeInactive));
-
-    [HttpGet()]
-    [ProducesResponseType(typeof(ReferenceDataMultiDictionary), (int)HttpStatusCode.OK)]
-    public Task<IActionResult> GetNamed() => _webApi.GetAsync(Request, p => _orchestrator.GetNamedAsync(p.RequestOptions));
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/SwaggerController.cs b/samples/My.Hr/My.Hr.Api/Controllers/SwaggerController.cs
deleted file mode 100644
index ed3be2d5..00000000
--- a/samples/My.Hr/My.Hr.Api/Controllers/SwaggerController.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace My.Hr.Api.Controllers;
-
-/// <summary>
-/// Swagger/OpenAPI documentation for the API.
-/// </summary>
-[ApiController]
-[Route("[controller]")]
-public class SwaggerController : ControllerBase
-{
-    /// <summary>
-    /// Swagger/OpenAPI documentation for the API.
-    /// </summary>
-    [HttpGet()]
-    [Route("/")]
-    public IActionResult Index()
-    {
-        return new RedirectResult("~/swagger");
-    }
-}
diff --git a/samples/My.Hr/My.Hr.Api/Dockerfile b/samples/My.Hr/My.Hr.Api/Dockerfile
deleted file mode 100644
index 7964b13d..00000000
--- a/samples/My.Hr/My.Hr.Api/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
-# to take advantage of Docker's build cache, to speed up local container builds
-COPY "samples/My.Hr/My.Hr.sln" "samples/My.Hr/My.Hr.sln"
-
-COPY "samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj" "samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj"
-COPY "samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj" "samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj"
-COPY "samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj" "samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj"
-COPY "samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj" "samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj"
-COPY "samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj" "samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj" 
-COPY "samples/My.Hr/My.Hr.Infra/My.Hr.Infra.csproj" "samples/My.Hr/My.Hr.Infra/My.Hr.Infra.csproj"
-COPY "samples/My.Hr/My.Hr.Infra.Tests/My.Hr.Infra.Tests.csproj" "samples/My.Hr/My.Hr.Infra.Tests/My.Hr.Infra.Tests.csproj"
-
-COPY "src/CoreEx/CoreEx.csproj" "src/CoreEx/CoreEx.csproj"
-COPY "src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj" "src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj"
-COPY "src/CoreEx.Azure/CoreEx.Azure.csproj" "src/CoreEx.Azure/CoreEx.Azure.csproj"
-COPY "src/CoreEx.Cosmos/CoreEx.Cosmos.csproj" "src/CoreEx.Cosmos/CoreEx.Cosmos.csproj"
-COPY "src/CoreEx.Database/CoreEx.Database.csproj" "src/CoreEx.Database/CoreEx.Database.csproj"
-COPY "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj" "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj"
-COPY "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj" "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj"
-COPY "src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj" "src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj"
-COPY "src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj" "src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj"
-COPY "src/CoreEx.Validation/CoreEx.Validation.csproj" "src/CoreEx.Validation/CoreEx.Validation.csproj"
-
-RUN dotnet restore "samples/My.Hr/My.Hr.sln"
-
-COPY . .
-WORKDIR /src/samples/My.Hr/My.Hr.Api
-RUN dotnet publish --no-restore -c Release -o /app
-
-FROM build as unittest
-WORKDIR /src/samples/My.Hr/My.Hr.Test
-# can run tests here on buils
-
-FROM build AS publish
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "My.Hr.Api.dll"]
diff --git a/samples/My.Hr/My.Hr.Api/ImplicitUsings.cs b/samples/My.Hr/My.Hr.Api/ImplicitUsings.cs
deleted file mode 100644
index 7de08169..00000000
--- a/samples/My.Hr/My.Hr.Api/ImplicitUsings.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-global using CoreEx;
-global using CoreEx.Configuration;
-global using CoreEx.Entities;
-global using CoreEx.Events;
-global using CoreEx.Http;
-global using CoreEx.Json;
-global using CoreEx.RefData;
-global using CoreEx.RefData.Extended;
-global using CoreEx.Validation;
-global using CoreEx.AspNetCore.HealthChecks;
-global using CoreEx.AspNetCore.WebApis;
-global using Microsoft.AspNetCore.Mvc;
-global using Microsoft.Extensions.Configuration;
-global using Microsoft.Extensions.Logging;
-global using My.Hr.Business;
-global using My.Hr.Business.Data;
-global using My.Hr.Business.External;
-global using My.Hr.Business.External.Contracts;
-global using My.Hr.Business.Models;
-global using My.Hr.Business.Services;
-global using System.Net;
-global using System.Net.Mime;
-global using System.Reflection;
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
deleted file mode 100644
index 01d604ac..00000000
--- a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <NoWarn>$(NoWarn);1591</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.AutoMapper\CoreEx.AutoMapper.csproj" />
-    <ProjectReference Include="..\My.Hr.Business\My.Hr.Business.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.Azure\CoreEx.Azure.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/samples/My.Hr/My.Hr.Api/Program.cs b/samples/My.Hr/My.Hr.Api/Program.cs
deleted file mode 100644
index 88a5a026..00000000
--- a/samples/My.Hr/My.Hr.Api/Program.cs
+++ /dev/null
@@ -1 +0,0 @@
-Host.CreateDefaultBuilder().ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<My.Hr.Api.Startup>()).Build().Run();
diff --git a/samples/My.Hr/My.Hr.Api/Properties/launchSettings.json b/samples/My.Hr/My.Hr.Api/Properties/launchSettings.json
deleted file mode 100644
index 8f6cf5fd..00000000
--- a/samples/My.Hr/My.Hr.Api/Properties/launchSettings.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:46085",
-      "sslPort": 44328
-    }
-  },
-  "profiles": {
-    "My.Hr.Api": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7129;http://localhost:5272",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
diff --git a/samples/My.Hr/My.Hr.Api/Startup.cs b/samples/My.Hr/My.Hr.Api/Startup.cs
deleted file mode 100644
index aab6eb7e..00000000
--- a/samples/My.Hr/My.Hr.Api/Startup.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using CoreEx.Database;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Azure.Monitor.OpenTelemetry.AspNetCore;
-using OpenTelemetry.Trace;
-using Az = Azure.Messaging.ServiceBus;
-using CoreEx.Database.HealthChecks;
-using CoreEx.Azure.ServiceBus.HealthChecks;
-using Azure.Messaging.ServiceBus;
-using Microsoft.Extensions.DependencyInjection;
-using CoreEx.Json.Merge;
-
-namespace My.Hr.Api;
-
-public class Startup
-{
-    // todo: add azure app configuration (conditional?)
-
-    /// <summary>
-    /// The configure services method called by the runtime; use this method to add services to the container.
-    /// </summary>
-    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-    public void ConfigureServices(IServiceCollection services)
-    {
-        // Register the core services.
-        services
-            .AddSettings<HrSettings>()
-            .AddReferenceDataOrchestrator(sp => new ReferenceDataOrchestrator(sp).Register<ReferenceDataService>())
-            .AddExecutionContext()
-            .AddJsonSerializer()
-            .AddEventDataSerializer()
-            .AddEventDataFormatter()
-            .AddEventPublisher()
-            .AddSingleton(sp => new Az.ServiceBusClient(sp.GetRequiredService<HrSettings>().ServiceBusConnection__fullyQualifiedNamespace))
-            .AddAzureServiceBusSender()
-            .AddAzureServiceBusPurger()
-            .AddJsonMergePatch()
-            .AddWebApi((_, webapi) => webapi.UnhandledExceptionAsync = (ex, logger, _) => Task.FromResult(ex is DbUpdateConcurrencyException efex ? webapi.CreateActionResultFromExtendedException(new ConcurrencyException(null, ex), logger) : null))
-            .AddReferenceDataContentWebApi()
-            .AddRequestCache();
-
-        // Register the business services.
-        services
-            .AddScoped<ReferenceDataService>()
-            .AddScoped<IEmployeeService, EmployeeService>()
-            .AddScoped<IEmployeeResultService, EmployeeResultService>()
-            .AddFluentValidators<EmployeeService>();
-
-        // Register the database and EF services, including required AutoMapper.
-        services.AddDatabase<HrDb>()
-                .AddDbContext<HrDbContext>((sp, o) => o.UseSqlServer(sp.GetRequiredService<IDatabase>().GetConnection()))
-                .AddEfDb<IHrEfDb, HrEfDb>()
-                .AddAutoMapper(typeof(HrEfDb).Assembly)
-                .AddAutoMapperWrapper();
-
-        // Register the health checks.
-        services
-            .AddHealthChecks()
-            .AddServiceBusReceiverHealthCheck(sp => sp.GetRequiredService<Az.ServiceBusClient>().CreateReceiver(sp.GetRequiredService<HrSettings>().VerificationQueueName), "verification-queue");
-
-        services.AddControllers();
-
-        if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPLICATIONINSIGHTS_CONNECTION_STRING")))
-        {
-            services.AddOpenTelemetry().UseAzureMonitor();
-            //services.Configure<AspNetCoreInstrumentationOptions>(options => options.RecordException = true);
-            services.ConfigureOpenTelemetryTracerProvider((sp, builder) => builder.AddSource("CoreEx.*"));
-        }
-
-        // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-        services.AddEndpointsApiExplorer();
-        services.AddSwaggerGen(options =>
-        {
-            var xmlFilename = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-            options.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, xmlFilename));
-            options.OperationFilter<AcceptsBodyOperationFilter>();  // Needed to support AcceptsBodyAttribue where body parameter not explicitly defined.
-            options.OperationFilter<PagingOperationFilter>(PagingOperationFilterFields.SkipTake);  // Needed to support PagingAttribute where PagingArgs parameter not explicitly defined.
-            options.OperationFilter<QueryOperationFilter>(QueryOperationFilterFields.FilterAndOrderby);  // Needed to support QueryAttribute where QueryArgs parameter not explicitly defined.
-        });
-    }
-
-    /// <summary>
-    /// The configure method called by the runtime; use this method to configure the HTTP request pipeline.
-    /// </summary>
-    /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
-    public void Configure(IApplicationBuilder app)
-        => app
-           .UseWebApiExceptionHandler()
-           .UseSwagger()
-           .UseSwaggerUI()
-           .UseHttpsRedirection()
-           .UseRouting()
-           .UseAuthorization()
-           .UseExecutionContext()
-           .UseHealthChecks("/healthz", new Microsoft.AspNetCore.Diagnostics.HealthChecks.HealthCheckOptions { ResponseWriter = HealthReportStatusWriter.WriteJsonResults })
-           .UseReferenceDataOrchestrator()
-           .UseEndpoints(endpoints => endpoints.MapControllers());
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/appsettings.Development.json b/samples/My.Hr/My.Hr.Api/appsettings.Development.json
deleted file mode 100644
index 40fcd139..00000000
--- a/samples/My.Hr/My.Hr.Api/appsettings.Development.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "VerificationQueueName": "verification-queue",
-  "ServiceBusConnection": "coreex.servicebus.windows.net",
-  "ConnectionStrings": {
-    "Database": "Data Source=.;Initial Catalog=My.HrDb;Integrated Security=True;TrustServerCertificate=true"
-  }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Api/appsettings.json b/samples/My.Hr/My.Hr.Api/appsettings.json
deleted file mode 100644
index db33d9fb..00000000
--- a/samples/My.Hr/My.Hr.Api/appsettings.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "CoreEx": {
-    "PagingDefaultTake": 25,
-    "PagingMaxTake": 500,
-    "RefDataCache": {
-      "AbsoluteExpirationRelativeToNow": "01:45:00",
-      "SlidingExpiration": "00:15:00",
-      "Gender": {
-        "AbsoluteExpirationRelativeToNow": "03:00:00",
-        "SlidingExpiration": "00:45:00"
-      }
-    },
-    "LogConcurrencyException": true
-  },
-  "ServiceBusConnection": {
-    "fullyQualifiedNamespace": "Endpoint=sb://top-secret.servicebus.windows.net/;SharedAccessKeyName=top-secret;SharedAccessKey=top-encrypted-secret"
-  }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Data/Employee2Configuration.cs b/samples/My.Hr/My.Hr.Business/Data/Employee2Configuration.cs
deleted file mode 100644
index 6d7910ca..00000000
--- a/samples/My.Hr/My.Hr.Business/Data/Employee2Configuration.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace My.Hr.Business.Data;
-
-public class Employee2Configuration : IEntityTypeConfiguration<Employee2>
-{
-    public void Configure(EntityTypeBuilder<Employee2> builder)
-    {
-        builder.ToTable("Employee2", "Hr");
-        builder.Property(p => p.Id).HasColumnName("EmployeeId").HasColumnType("UNIQUEIDENTIFIER");
-        builder.Property(p => p.Email).HasColumnType("NVARCHAR(250)");
-        builder.Property(p => p.FirstName).HasColumnType("NVARCHAR(100)");
-        builder.Property(p => p.LastName).HasColumnType("NVARCHAR(100)");
-        builder.Property(p => p.Gender).HasColumnName("GenderCode").HasColumnType("NVARCHAR(50)").HasConversion(v => v!.Code, v => (Gender?)v);
-        builder.Property(p => p.Birthday).HasColumnType("DATE");
-        builder.Property(p => p.StartDate).HasColumnType("DATE");
-        builder.Property(p => p.TerminationDate).HasColumnType("DATE");
-        builder.Property(p => p.TerminationReasonCode).HasColumnType("NVARCHAR(50)");
-        builder.Property(p => p.PhoneNo).HasColumnType("NVARCHAR(50)");
-        builder.Property(p => p.ETag).HasColumnName("RowVersion").IsRowVersion().HasConversion(s => s == null ? Array.Empty<byte>() : Convert.FromBase64String(s), d => Convert.ToBase64String(d));
-        builder.Property(p => p.IsDeleted).HasColumnType("BIT");
-        builder.HasKey("Id");
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Data/EmployeeConfiguration.cs b/samples/My.Hr/My.Hr.Business/Data/EmployeeConfiguration.cs
deleted file mode 100644
index 76bcec32..00000000
--- a/samples/My.Hr/My.Hr.Business/Data/EmployeeConfiguration.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace My.Hr.Business.Data;
-
-public class EmployeeConfiguration : IEntityTypeConfiguration<Employee>
-{
-    public void Configure(EntityTypeBuilder<Employee> builder)
-    {
-        builder.ToTable("Employee", "Hr");
-        builder.Property(p => p.Id).HasColumnName("EmployeeId").HasColumnType("UNIQUEIDENTIFIER");
-        builder.Property(p => p.Email).HasColumnType("NVARCHAR(250)");
-        builder.Property(p => p.FirstName).HasColumnType("NVARCHAR(100)");
-        builder.Property(p => p.LastName).HasColumnType("NVARCHAR(100)");
-        builder.Property(p => p.Gender).HasColumnName("GenderCode").HasColumnType("NVARCHAR(50)").HasConversion(v => v!.Code, v => (Gender?)v);
-        builder.Property(p => p.Birthday).HasColumnType("DATE");
-        builder.Property(p => p.StartDate).HasColumnType("DATE");
-        builder.Property(p => p.TerminationDate).HasColumnType("DATE");
-        builder.Property(p => p.TerminationReasonCode).HasColumnType("NVARCHAR(50)");
-        builder.Property(p => p.PhoneNo).HasColumnType("NVARCHAR(50)");
-        builder.Property(p => p.ETag).HasColumnName("RowVersion").IsRowVersion().HasConversion(s => s == null ? Array.Empty<byte>() : Convert.FromBase64String(s), d => Convert.ToBase64String(d));
-        builder.HasKey("Id");
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Data/HrDb.cs b/samples/My.Hr/My.Hr.Business/Data/HrDb.cs
deleted file mode 100644
index d2b2ba6f..00000000
--- a/samples/My.Hr/My.Hr.Business/Data/HrDb.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace My.Hr.Business.Data
-{
-    public class HrDb : SqlServerDatabase
-    {
-        public HrDb(SettingsBase settings) : base(() => new SqlConnection(settings.GetRequiredValue<string>("ConnectionStrings:Database"))) { }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Data/HrDbContext.cs b/samples/My.Hr/My.Hr.Business/Data/HrDbContext.cs
deleted file mode 100644
index dcebbd33..00000000
--- a/samples/My.Hr/My.Hr.Business/Data/HrDbContext.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-namespace My.Hr.Business.Data;
-
-public class HrDbContext : DbContext, IEfDbContext
-{
-    public IDatabase BaseDatabase { get; }
-
-    public DbSet<USState> USStates { get; set; }
-
-    public DbSet<Gender> Genders { get; set; }
-
-    public DbSet<Employee> Employees { get; set; }
-
-#pragma warning disable CS8618 // Non-nullable property - properties set by Entity Framework Core
-    public HrDbContext(DbContextOptions options, IDatabase database) : base(options) => BaseDatabase = database ?? throw new ArgumentNullException(nameof(database));
-#pragma warning restore CS8618 // Non-nullable property
-
-    protected override void OnModelCreating(ModelBuilder modelBuilder)
-    {
-        modelBuilder
-            .ApplyConfiguration(new UsStateConfiguration())
-            .ApplyConfiguration(new EmployeeConfiguration())
-            .ApplyConfiguration(new Employee2Configuration());
-
-        base.OnModelCreating(modelBuilder);
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Data/HrEfDb.cs b/samples/My.Hr/My.Hr.Business/Data/HrEfDb.cs
deleted file mode 100644
index ab9ae11c..00000000
--- a/samples/My.Hr/My.Hr.Business/Data/HrEfDb.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace My.Hr.Business.Data
-{
-    /// <summary>
-    /// Enables the <b>My.Hr</b> database using Entity Framework.
-    /// </summary>
-    public interface IHrEfDb : IEfDb
-    {
-        /// <summary>
-        /// Gets the <see cref="Employee"/> entity.
-        /// </summary>
-        EfDbEntity<Employee, Employee> Employees { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Employee2"/> entity.
-        /// </summary>
-        EfDbEntity<Employee2, Employee2> Employees2 { get; }
-    }
-
-    /// <summary>
-    /// Represents the <b>My.Hr</b> database using Entity Framework.
-    /// </summary>
-    public class HrEfDb : EfDb<HrDbContext>, IHrEfDb
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HrEfDb"/> class.
-        /// </summary>
-        /// <param name="dbContext">The entity framework database context.</param>
-        /// <param name="mapper">The <see cref="IMapper"/>.</param>
-        public HrEfDb(HrDbContext dbContext, IMapper mapper) : base(dbContext, mapper) { }
-
-        /// <summary>
-        /// Gets the <see cref="Employee"/> encapsulated entity.
-        /// </summary>
-        public EfDbEntity<Employee, Employee> Employees => new(this);
-
-        /// <summary>
-        /// Gets the <see cref="Employee"/> encapsulated entity.
-        /// </summary>
-        public EfDbEntity<Employee2, Employee2> Employees2 => new(this);
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Data/UsStateConfiguration.cs b/samples/My.Hr/My.Hr.Business/Data/UsStateConfiguration.cs
deleted file mode 100644
index fe5995c9..00000000
--- a/samples/My.Hr/My.Hr.Business/Data/UsStateConfiguration.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace My.Hr.Business.Data;
-
-public class UsStateConfiguration : IEntityTypeConfiguration<USState>
-{
-    public void Configure(EntityTypeBuilder<USState> entity)
-    {
-        entity.ToTable("USState", "Hr");
-        entity.HasKey("Id");
-        entity.Property(p => p.Id).HasColumnName("USStateId").HasColumnType("UNIQUEIDENTIFIER");
-        entity.Property(p => p.Code).HasColumnType("NVARCHAR(50)");
-        entity.Property(p => p.Text).HasColumnType("NVARCHAR(250)");
-        entity.Property(p => p.IsActive).HasColumnType("BIT");
-        entity.Property(p => p.SortOrder).HasColumnType("INT");
-        entity.Property(p => p.ETag).HasColumnName("RowVersion").IsRowVersion().HasConversion(s => s == null ? Array.Empty<byte>() : Convert.FromBase64String(s), d => Convert.ToBase64String(d));
-        entity.Ignore(p => p.EndDate);
-        entity.Ignore(p => p.StartDate);
-        entity.Ignore(p => p.Description);
-        entity.Ignore(p => p.IsReadOnly);
-        entity.Ignore(p => p.IsValid);
-        entity.Ignore(p => p.IsChanged);
-        entity.Ignore(p => p.IsInitial);
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/AgifyServiceClient.cs b/samples/My.Hr/My.Hr.Business/External/AgifyServiceClient.cs
deleted file mode 100644
index d6017a52..00000000
--- a/samples/My.Hr/My.Hr.Business/External/AgifyServiceClient.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace My.Hr.Business.External;
-
-/// <summary>
-/// Http client for https://agify.io/
-/// </summary>
-public class AgifyApiClient : TypedHttpClientCore<AgifyApiClient>
-{
-    public AgifyApiClient(HttpClient client, IJsonSerializer jsonSerializer, CoreEx.ExecutionContext executionContext, HrSettings settings)
-            : base(client, jsonSerializer, executionContext)
-    {
-        if (!Uri.IsWellFormedUriString(settings.AgifyApiEndpointUri, UriKind.Absolute))
-            throw new InvalidOperationException(@$"The Api endpoint URI is not valid: {settings.AgifyApiEndpointUri}. Provide valid Api endpoint URI in the configuration '{nameof(settings.AgifyApiEndpointUri)}'.
-                        If Api Client is not needed - remove all references to {nameof(AgifyApiClient)}.");
-
-        client.BaseAddress = new Uri(settings.AgifyApiEndpointUri);
-    }
-
-    public override Task<HttpResult> HealthCheckAsync(CancellationToken cancellationToken)
-    {
-        return base.HeadAsync(string.Empty, null, new HttpArg<string>[] { new("name", "health") }, cancellationToken);
-    }
-
-    public async Task<AgifyResponse> GetAgeAsync(string name)
-    {
-        var response = await
-            ThrowTransientException()
-            .GetAsync<AgifyResponse>(string.Empty, null, HttpArgs.Create(new HttpArg<string>("name", name)));
-
-        return response.Value;
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/Contracts/AgifyResponse.cs b/samples/My.Hr/My.Hr.Business/External/Contracts/AgifyResponse.cs
deleted file mode 100644
index 1e73a96c..00000000
--- a/samples/My.Hr/My.Hr.Business/External/Contracts/AgifyResponse.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace My.Hr.Business.External.Contracts;
-
-public class AgifyResponse
-{
-    public string? Name { get; set; }
-    public int Age { get; set; }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/Contracts/EmployeeVerificationRequest.cs b/samples/My.Hr/My.Hr.Business/External/Contracts/EmployeeVerificationRequest.cs
deleted file mode 100644
index 4596417f..00000000
--- a/samples/My.Hr/My.Hr.Business/External/Contracts/EmployeeVerificationRequest.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace My.Hr.Business.External.Contracts;
-
-public class EmployeeVerificationRequest
-{
-    public string? Name { get; set; }
-    public int Age { get; set; }
-    public string? Gender { get; set; }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/Contracts/EmployeeVerificationResponse.cs b/samples/My.Hr/My.Hr.Business/External/Contracts/EmployeeVerificationResponse.cs
deleted file mode 100644
index 2461b3ae..00000000
--- a/samples/My.Hr/My.Hr.Business/External/Contracts/EmployeeVerificationResponse.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace My.Hr.Business.External.Contracts;
-
-public class EmployeeVerificationResponse
-{
-    public EmployeeVerificationResponse(EmployeeVerificationRequest request) => Request = request;
-
-    public int Age { get; set; }
-
-    public string? Gender { get; set; }
-
-    public float GenderProbability { get; set; }
-
-    public List<NationalizeResponse.CountryResponse> Country { get; set; } = new List<NationalizeResponse.CountryResponse>();
-
-    public List<string> VerificationMessages { get; set; } = new List<string>();
-
-    public EmployeeVerificationRequest Request { get; }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/Contracts/GenderizeResponse.cs b/samples/My.Hr/My.Hr.Business/External/Contracts/GenderizeResponse.cs
deleted file mode 100644
index 35fd7573..00000000
--- a/samples/My.Hr/My.Hr.Business/External/Contracts/GenderizeResponse.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace My.Hr.Business.External.Contracts;
-
-public class GenderizeResponse
-{
-    public string? Name { get; set; }
-    public string? Gender { get; set; }
-    public float Probability { get; set; }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/Contracts/NationalizeResponse.cs b/samples/My.Hr/My.Hr.Business/External/Contracts/NationalizeResponse.cs
deleted file mode 100644
index ba99815d..00000000
--- a/samples/My.Hr/My.Hr.Business/External/Contracts/NationalizeResponse.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-namespace My.Hr.Business.External.Contracts;
-
-public class NationalizeResponse
-{
-    public string? Name { get; set; }
-
-    public List<CountryResponse>? Country { get; set; }
-
-    public class CountryResponse
-    {
-        public string? Country_Id { get; set; }
-        public float Probability { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/GenderizeApiClient.cs b/samples/My.Hr/My.Hr.Business/External/GenderizeApiClient.cs
deleted file mode 100644
index 45c343ce..00000000
--- a/samples/My.Hr/My.Hr.Business/External/GenderizeApiClient.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace My.Hr.Business.External;
-
-/// <summary>
-/// Http client for https://genderize.io/
-/// </summary>
-public class GenderizeApiClient : TypedHttpClientCore<GenderizeApiClient>
-{
-    public GenderizeApiClient(HttpClient client, IJsonSerializer jsonSerializer, CoreEx.ExecutionContext executionContext, HrSettings settings)
-        : base(client, jsonSerializer, executionContext)
-    {
-        if (!Uri.IsWellFormedUriString(settings.GenderizeApiClientApiEndpointUri, UriKind.Absolute))
-            throw new InvalidOperationException(@$"The Api endpoint URI is not valid: {settings.GenderizeApiClientApiEndpointUri}. Provide valid Api endpoint URI in the configuration '{nameof(settings.GenderizeApiClientApiEndpointUri)}'.
-                        If Api Client is not needed - remove all references to {nameof(GenderizeApiClient)}.");
-
-        client.BaseAddress = new Uri(settings.GenderizeApiClientApiEndpointUri);
-    }
-
-    public override Task<HttpResult> HealthCheckAsync(CancellationToken cancellationToken = default)
-    {
-        return base.HeadAsync(string.Empty, null, HttpArgs.Create(new HttpArg<string>("name", "health")), cancellationToken);
-    }
-
-    public async Task<GenderizeResponse> GetGenderAsync(string name)
-    {
-        var response = await
-            ThrowTransientException()
-            .GetAsync<GenderizeResponse>(string.Empty, null, HttpArgs.Create(new HttpArg<string>("name", name)));
-
-        return response.Value;
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/External/NationalizeApiClient.cs b/samples/My.Hr/My.Hr.Business/External/NationalizeApiClient.cs
deleted file mode 100644
index 2bf45b23..00000000
--- a/samples/My.Hr/My.Hr.Business/External/NationalizeApiClient.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-namespace My.Hr.Business.External;
-
-/// <summary>
-/// Http client for https://nationalize.io/
-/// </summary>
-public class NationalizeApiClient : TypedHttpClientCore<NationalizeApiClient>
-{
-    public NationalizeApiClient(HttpClient client, IJsonSerializer jsonSerializer, CoreEx.ExecutionContext executionContext, HrSettings settings)
-            : base(client, jsonSerializer, executionContext)
-    {
-        if (!Uri.IsWellFormedUriString(settings.NationalizeApiClientApiEndpointUri, UriKind.Absolute))
-            throw new InvalidOperationException(@$"The Api endpoint URI is not valid: {settings.NationalizeApiClientApiEndpointUri}. Provide valid Api endpoint URI in the configuration '{nameof(settings.NationalizeApiClientApiEndpointUri)}'.
-                        If Api Client is not needed - remove all references to {nameof(NationalizeApiClient)}.");
-
-        client.BaseAddress = new Uri(settings.NationalizeApiClientApiEndpointUri);
-    }
-
-    public override Task<HttpResult> HealthCheckAsync(CancellationToken cancellationToken = default)
-    {
-        return base.HeadAsync(string.Empty, null, HttpArgs.Create(new HttpArg<string>("name", "health")), cancellationToken);
-    }
-
-    public async Task<NationalizeResponse> GetNationalityAsync(string name)
-    {
-        var response = await
-            ThrowTransientException()
-            .GetAsync<NationalizeResponse>(string.Empty, null, HttpArgs.Create(new HttpArg<string>("name", name)));
-
-        return response.Value;
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/HrSettings.cs b/samples/My.Hr/My.Hr.Business/HrSettings.cs
deleted file mode 100644
index 91cdc5c0..00000000
--- a/samples/My.Hr/My.Hr.Business/HrSettings.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-namespace My.Hr.Business;
-
-public class HrSettings : SettingsBase
-{
-    /// <summary>
-    /// Gets the setting prefixes in order of precedence.
-    /// </summary>
-    public static string[] Prefixes { get; } = { "Hr/", "Common/" };
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HrSettings"/> class.
-    /// </summary>
-    /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-    public HrSettings(IConfiguration configuration) : base(configuration, Prefixes) { }
-
-    public string AgifyApiEndpointUri => GetValue<string>();
-
-    public string NationalizeApiClientApiEndpointUri => GetValue<string>();
-
-    public string GenderizeApiClientApiEndpointUri => GetValue<string>();
-
-    public string VerificationQueueName => GetValue<string>();
-
-    public string VerificationResultsQueueName => GetValue<string>();
-
-    /// <summary>
-    /// The Azure Service Bus connection string used for <b>Publishing</b> in <see cref="Messaging.ServiceBusPublisher"/>.
-    /// </summary>
-    /// <remarks>It defaults to managed identity connection string used by triggers 'ServiceBusConnection__fullyQualifiedNamespace'</remarks>
-    public string ServiceBusConnection => GetValue<string>(defaultValue: ServiceBusConnection__fullyQualifiedNamespace);
-
-    /// <summary>
-    /// The Azure Service Bus connection string used by <b>Triggers</b> using managed identity.
-    /// </summary>
-    /// <remarks> <b>Caution</b> this key is used implicitly by function triggers when 'ServiceBusConnection' is not set. </remarks>
-    /// <remarks> Underscores in environment variables are replaced by semicolon ':' in configuration object, hence lookup also replaces '__' with ':'</remarks>
-    public string ServiceBusConnection__fullyQualifiedNamespace => GetValue<string>();
-
-    /// <summary>
-    /// SQL Server connection string used by the app (depending on the value it may use managed identity or username/password)
-    /// </summary>
-    /// <remarks> Underscores in environment variables are replaced by semicolon ':' in configuration object, hence lookup also replaces '__' with ':'</remarks>
-    public string ConnectionStrings__Database => GetValue<string>();
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/ImplicitUsings.cs b/samples/My.Hr/My.Hr.Business/ImplicitUsings.cs
deleted file mode 100644
index 12868fc3..00000000
--- a/samples/My.Hr/My.Hr.Business/ImplicitUsings.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-global using CoreEx;
-global using CoreEx.Configuration;
-global using CoreEx.Database;
-global using CoreEx.Database.SqlServer;
-global using CoreEx.Entities;
-global using CoreEx.EntityFrameworkCore;
-global using CoreEx.Events;
-global using CoreEx.Http;
-global using CoreEx.Json;
-global using CoreEx.Mapping;
-global using CoreEx.RefData;
-global using CoreEx.Results;
-global using Microsoft.Data.SqlClient;
-global using Microsoft.EntityFrameworkCore;
-global using Microsoft.EntityFrameworkCore.Metadata.Builders;
-global using Microsoft.Extensions.Configuration;
-global using Microsoft.Extensions.Logging;
-global using My.Hr.Business.Data;
-global using My.Hr.Business.External;
-global using My.Hr.Business.External.Contracts;
-global using My.Hr.Business.Models;
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Models/Employee.cs b/samples/My.Hr/My.Hr.Business/Models/Employee.cs
deleted file mode 100644
index c3c1a10e..00000000
--- a/samples/My.Hr/My.Hr.Business/Models/Employee.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System.Diagnostics;
-
-namespace My.Hr.Business.Models;
-
-/// <summary>
-/// Represents the Entity Framework (EF) model for database object 'Hr.Employee'.
-/// </summary>
-public class Employee : IIdentifier<Guid>, IETag
-{
-    /// <summary>
-    /// Gets or sets the 'EmployeeId' column value.
-    /// </summary>
-    public Guid Id { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'Email' column value.
-    /// </summary>
-    public string? Email { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'FirstName' column value.
-    /// </summary>
-    public string? FirstName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'LastName' column value.
-    /// </summary>
-    public string? LastName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'GenderCode' column value.
-    /// </summary>
-    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-    public Gender? Gender { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'Birthday' column value.
-    /// </summary>
-    public DateTime? Birthday { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'StartDate' column value.
-    /// </summary>
-    public DateTime? StartDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'TerminationDate' column value.
-    /// </summary>
-    public DateTime? TerminationDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'TerminationReasonCode' column value.
-    /// </summary>
-    public string? TerminationReasonCode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'PhoneNo' column value.
-    /// </summary>
-    public string? PhoneNo { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'RowVersion' column value.
-    /// </summary>
-    public string? ETag { get; set; }
-}
-
-public class EmployeeCollection : List<Employee> { }
-
-public class EmployeeCollectionResult : CollectionResult<EmployeeCollection, Employee> { }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Models/Employee2.cs b/samples/My.Hr/My.Hr.Business/Models/Employee2.cs
deleted file mode 100644
index 508f395d..00000000
--- a/samples/My.Hr/My.Hr.Business/Models/Employee2.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using System.Diagnostics;
-
-namespace My.Hr.Business.Models;
-
-/// <summary>
-/// Represents the Entity Framework (EF) model for database object 'Hr.Employee2'.
-/// </summary>
-public class Employee2 : IIdentifier<Guid>, IETag, ILogicallyDeleted
-{
-    /// <summary>
-    /// Gets or sets the 'EmployeeId' column value.
-    /// </summary>
-    public Guid Id { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'Email' column value.
-    /// </summary>
-    public string? Email { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'FirstName' column value.
-    /// </summary>
-    public string? FirstName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'LastName' column value.
-    /// </summary>
-    public string? LastName { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'GenderCode' column value.
-    /// </summary>
-    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-    public Gender? Gender { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'Birthday' column value.
-    /// </summary>
-    public DateTime? Birthday { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'StartDate' column value.
-    /// </summary>
-    public DateTime? StartDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'TerminationDate' column value.
-    /// </summary>
-    public DateTime? TerminationDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'TerminationReasonCode' column value.
-    /// </summary>
-    public string? TerminationReasonCode { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'PhoneNo' column value.
-    /// </summary>
-    public string? PhoneNo { get; set; }
-
-    /// <summary>
-    /// Gets or sets the 'RowVersion' column value.
-    /// </summary>
-    public string? ETag { get; set; }
-
-    /// <summary>
-    ///  Gets or sets the 'IsDeleted' column value.
-    /// </summary>
-    public bool? IsDeleted { get; set; }
-}
-
-public class Employee2Collection : List<Employee2> { }
-
-public class Employee2CollectionResult : CollectionResult<Employee2Collection, Employee2> { }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Models/Gender.cs b/samples/My.Hr/My.Hr.Business/Models/Gender.cs
deleted file mode 100644
index 9a94623f..00000000
--- a/samples/My.Hr/My.Hr.Business/Models/Gender.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using CoreEx.RefData.Extended;
-
-namespace My.Hr.Business.Models;
-
-public class Gender : ReferenceDataBaseEx<Guid, Gender> 
-{
-    public static implicit operator Gender?(string? code) => ConvertFromCode(code);
-}
-
-public class GenderCollection : ReferenceDataCollectionBase<Guid, Gender, GenderCollection> { }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Models/UsState.cs b/samples/My.Hr/My.Hr.Business/Models/UsState.cs
deleted file mode 100644
index 529aae27..00000000
--- a/samples/My.Hr/My.Hr.Business/Models/UsState.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using CoreEx.RefData.Extended;
-
-namespace My.Hr.Business.Models;
-
-public class USState : ReferenceDataBaseEx<Guid, USState>
-{
-    public static implicit operator USState?(string? code) => ConvertFromCode(code);
-}
-
-public class USStateCollection() : ReferenceDataCollectionBase<Guid, USState, USStateCollection>(ReferenceDataSortOrder.SortOrder) { }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
deleted file mode 100644
index 9b4d7ce3..00000000
--- a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\CoreEx.AutoMapper\CoreEx.AutoMapper.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.Newtonsoft\CoreEx.Newtonsoft.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.FluentValidation\CoreEx.FluentValidation.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.26" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.26" />
-  </ItemGroup>
-
-</Project>
diff --git a/samples/My.Hr/My.Hr.Business/Services/AutoMapperProfile.cs b/samples/My.Hr/My.Hr.Business/Services/AutoMapperProfile.cs
deleted file mode 100644
index e2bc0585..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/AutoMapperProfile.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace My.Hr.Business.Services
-{
-    public class AutoMapperProfile : AutoMapper.Profile
-    {
-        public AutoMapperProfile()
-        {
-            // Need to explicitly map type to type, otherwise Map(srce, dest) just returns srce - seems like a bug to me, but apparently by design: https://github.com/AutoMapper/AutoMapper/issues/656
-            CreateMap<Models.Employee, Models.Employee>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/EmployeeResultService.cs b/samples/My.Hr/My.Hr.Business/Services/EmployeeResultService.cs
deleted file mode 100644
index 4d7f45cf..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/EmployeeResultService.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace My.Hr.Business.Services;
-
-/// <summary>
-/// Example using <see cref="CoreEx.EntityFrameworkCore.IEfDb"/> that largely encapsulates/simplifies the EF access with a <see cref="Result"/> (achieving railway-oriented programming)
-/// </summary>
-public class EmployeeResultService : IEmployeeResultService
-{
-    private readonly IHrEfDb _efDb;
-    private readonly IEventPublisher _publisher;
-    private readonly HrSettings _settings;
-
-    public EmployeeResultService(IHrEfDb efDb, IEventPublisher publisher, HrSettings settings)
-    {
-        _efDb = efDb;
-        _publisher = publisher;
-        _settings = settings;
-    }
-
-    public Task<Result<Employee?>> GetEmployeeAsync(Guid id) => _efDb.Employees.GetWithResultAsync(id);
-
-    public Task<Result<EmployeeCollectionResult>> GetAllAsync(PagingArgs? paging) 
-        => _efDb.Employees.Query(q => q.OrderBy(x => x.LastName).ThenBy(x => x.FirstName)).WithPaging(paging).SelectResultWithResultAsync<EmployeeCollectionResult, EmployeeCollection>();
-
-    public Task<Result<Employee>> AddEmployeeAsync(Employee employee) => _efDb.Employees.CreateWithResultAsync(employee);
-
-    public Task<Result<Employee>> UpdateEmployeeAsync(Employee employee, Guid id) => _efDb.Employees.UpdateWithResultAsync(employee.Adjust(x => x.Id = id));
-
-    public Task<Result> DeleteEmployeeAsync(Guid id) => _efDb.Employees.DeleteWithResultAsync(id);
-
-    public Task<Result> VerifyEmployeeAsync(Guid id)  => Result
-        .GoAsync(GetEmployeeAsync(id))
-        .When(employee => employee == null, _ => Result.NotFoundError())
-        .ThenAsAsync(async employee =>
-        {
-            // Publish message to service bus for employee verification.
-            var verification = new EmployeeVerificationRequest
-            {
-                Name = employee!.FirstName,
-                Age = SystemTime.Timestamp.Subtract(employee.Birthday.GetValueOrDefault()).Days / 365,
-                Gender = employee.Gender?.Code
-            };
-
-            _publisher.PublishNamed(_settings.VerificationQueueName, new EventData { Value = verification });
-            await _publisher.SendAsync();
-        });
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/EmployeeService.cs b/samples/My.Hr/My.Hr.Business/Services/EmployeeService.cs
deleted file mode 100644
index dfc13371..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/EmployeeService.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using CoreEx.Data.Querying;
-
-namespace My.Hr.Business.Services;
-
-public class EmployeeService : IEmployeeService
-{
-    private static readonly QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
-        .WithFilter(filter => filter
-            .AddField<string>("LastName", c => c.WithOperators(QueryFilterOperator.AllStringOperators).WithUpperCase())
-            .AddField<string>("FirstName", c => c.WithOperators(QueryFilterOperator.AllStringOperators).WithUpperCase())
-            .AddField<DateTime>("StartDate")
-            .AddField<DateTime>("TerminationDate")
-            .AddField<string>(nameof(Employee.Gender), c => c.WithValue(v =>
-            {
-                var g = Gender.ConvertFromCode(v);
-                return g is not null && g.IsValid ? g : throw new FormatException("Gender is invalid.");
-            })))
-        .WithOrderBy(orderBy => orderBy
-            .AddField("LastName")
-            .AddField("FirstName")
-            .WithDefault("LastName, FirstName"));
-
-    private readonly HrDbContext _dbContext;
-    private readonly IEventPublisher _publisher;
-    private readonly HrSettings _settings;
-
-    public EmployeeService(HrDbContext dbContext, IEventPublisher publisher, HrSettings settings)
-    {
-        _dbContext = dbContext;
-        _publisher = publisher;
-        _settings = settings;
-    }
-
-    public async Task<Employee?> GetEmployeeAsync(Guid id)
-    {
-        var emp = await _dbContext.Employees.FirstOrDefaultAsync(e => e.Id == id);
-        if (emp is not null && emp.Birthday.HasValue && emp.Birthday.Value.Year < 2000)
-            CoreEx.ExecutionContext.Current.Messages.Add(MessageType.Warning, "Employee is considered old.");
-
-        return emp;
-    }
-
-    public Task<EmployeeCollectionResult> GetAllAsync(QueryArgs? query, PagingArgs? paging) 
-        => _dbContext.Employees.Where(_queryConfig, query).OrderBy(_queryConfig, query).ToCollectionResultAsync<EmployeeCollectionResult, EmployeeCollection, Employee>(paging);
-
-    public async Task<Employee> AddEmployeeAsync(Employee employee)
-    {
-        _dbContext.Employees.Add(employee);
-        await _dbContext.SaveChangesAsync();
-        return employee;
-    }
-
-    public async Task<Employee> UpdateEmployeeAsync(Employee employee, Guid id)
-    {
-        if (!await _dbContext.Employees.AnyAsync(e => e.Id == id).ConfigureAwait(false))
-            throw new NotFoundException();
-
-        employee.Id = id;
-
-        _dbContext.ChangeTracker.Clear(); // Different employee instance (result of using CoreEx.Json.JsonMergePatch vs CoreEx.Json.Extended.JsonMergePatchEx); therefore, clear the change tracker prior to update attempt.
-        _dbContext.Employees.Update(employee);
-        await _dbContext.SaveChangesAsync().ConfigureAwait(false);
-        return employee;
-    }
-
-    public async Task DeleteEmployeeAsync(Guid id)
-    {
-        var employee = await _dbContext.Employees.FirstOrDefaultAsync(e => e.Id == id);
-        if (employee != null)
-        {
-            _dbContext.Employees.Remove(employee);
-            await _dbContext.SaveChangesAsync();
-        }
-    }
-
-    public async Task VerifyEmployeeAsync(Guid id)
-    {
-        // Get the employee.
-        var employee = await GetEmployeeAsync(id) ?? throw new NotFoundException();
-
-        // Publish message to service bus for employee verification.
-        var verification = new EmployeeVerificationRequest
-        {
-            Name = employee.FirstName,
-            Age = SystemTime.Timestamp.Subtract(employee.Birthday.GetValueOrDefault()).Days / 365,
-            Gender = employee.Gender?.Code
-        };
-
-        _publisher.PublishNamed(_settings.VerificationQueueName, new EventData { Value = verification });
-        await _publisher.SendAsync();
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/EmployeeService2.cs b/samples/My.Hr/My.Hr.Business/Services/EmployeeService2.cs
deleted file mode 100644
index ed8fd752..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/EmployeeService2.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace My.Hr.Business.Services;
-
-/// <summary>
-/// Example using <see cref="CoreEx.EntityFrameworkCore.IEfDb"/> that largely encapsulates/simplifies the EF access.
-/// </summary>
-public class EmployeeService2 : IEmployeeService
-{
-    private readonly IHrEfDb _efDb;
-    private readonly IEventPublisher _publisher;
-    private readonly HrSettings _settings;
-
-    public EmployeeService2(IHrEfDb efDb, IEventPublisher publisher, HrSettings settings)
-    {
-        _efDb = efDb;
-        _publisher = publisher;
-        _settings = settings;
-    }
-
-    public Task<Employee?> GetEmployeeAsync(Guid id) => _efDb.Employees.GetAsync(id);
-
-    public Task<EmployeeCollectionResult> GetAllAsync(QueryArgs? query, PagingArgs? paging) 
-        => _efDb.Employees.Query(q => q.OrderBy(x => x.LastName).ThenBy(x => x.FirstName)).WithPaging(paging).SelectResultAsync<EmployeeCollectionResult, EmployeeCollection>();
-
-    public Task<Employee> AddEmployeeAsync(Employee employee) => _efDb.Employees.CreateAsync(employee);
-
-    public Task<Employee> UpdateEmployeeAsync(Employee employee, Guid id) => _efDb.Employees.UpdateAsync(employee.Adjust(x => x.Id = id));
-
-    public Task DeleteEmployeeAsync(Guid id) => _efDb.Employees.DeleteAsync(id);
-
-    public async Task VerifyEmployeeAsync(Guid id)
-    {
-        // Get the employee.
-        var employee = await GetEmployeeAsync(id) ?? throw new NotFoundException();
-
-        // Publish message to service bus for employee verification.
-        var verification = new EmployeeVerificationRequest
-        {
-            Name = employee.FirstName,
-            Age = SystemTime.Timestamp.Subtract(employee.Birthday.GetValueOrDefault()).Days / 365,
-            Gender = employee.Gender?.Code
-        };
-
-        _publisher.PublishNamed(_settings.VerificationQueueName, new EventData { Value = verification });
-        await _publisher.SendAsync();
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/IEmployeeResultService.cs b/samples/My.Hr/My.Hr.Business/Services/IEmployeeResultService.cs
deleted file mode 100644
index dbd94847..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/IEmployeeResultService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace My.Hr.Business.Services
-{
-    public interface IEmployeeResultService
-    {
-        Task<Result<Employee?>> GetEmployeeAsync(Guid id);
-
-        Task<Result<EmployeeCollectionResult>> GetAllAsync(PagingArgs? paging);
-
-        Task<Result<Employee>> AddEmployeeAsync(Employee employee);
-
-        Task<Result<Employee>> UpdateEmployeeAsync(Employee employee, Guid id);
-
-        Task<Result> DeleteEmployeeAsync(Guid id);
-
-        Task<Result> VerifyEmployeeAsync(Guid id);
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/IEmployeeService.cs b/samples/My.Hr/My.Hr.Business/Services/IEmployeeService.cs
deleted file mode 100644
index 7b1b07c0..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/IEmployeeService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace My.Hr.Business.Services
-{
-    public interface IEmployeeService
-    {
-        Task<Employee?> GetEmployeeAsync(Guid id);
-
-        Task<EmployeeCollectionResult> GetAllAsync(QueryArgs? query, PagingArgs? paging);
-
-        Task<Employee> AddEmployeeAsync(Employee employee);
-
-        Task<Employee> UpdateEmployeeAsync(Employee employee, Guid id);
-
-        Task DeleteEmployeeAsync(Guid id);
-
-        Task VerifyEmployeeAsync(Guid id);
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/ReferenceDataService.cs b/samples/My.Hr/My.Hr.Business/Services/ReferenceDataService.cs
deleted file mode 100644
index b2817e16..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/ReferenceDataService.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using CoreEx.Database.Extended;
-
-namespace My.Hr.Business.Services;
-
-public class ReferenceDataService : IReferenceDataProvider
-{
-    private readonly IDatabase _db;
-    private readonly HrDbContext _dbContext;
-
-    public ReferenceDataService(IDatabase db, HrDbContext dbContext)
-    {
-        _db = db;
-        _dbContext = dbContext;
-    }
-
-    public Type[] Types => new Type[] { typeof(USState), typeof(Gender) };
-
-    public async Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
-    {
-        Type t when t == typeof(USState) => await USStateCollection.CreateAsync(_dbContext.USStates.AsNoTracking(), cancellationToken).ConfigureAwait(false),
-        Type t when t == typeof(Gender) => await _db.ReferenceData<GenderCollection, Gender, Guid>("Hr", "Gender").LoadAsync("GenderId", cancellationToken: cancellationToken).ConfigureAwait(false),
-        _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
-    };
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Services/VerificationService.cs b/samples/My.Hr/My.Hr.Business/Services/VerificationService.cs
deleted file mode 100644
index 37e4c4a2..00000000
--- a/samples/My.Hr/My.Hr.Business/Services/VerificationService.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-namespace My.Hr.Business.Services;
-
-public class VerificationService
-{
-    private readonly AgifyApiClient _agifyApiClient;
-    private readonly GenderizeApiClient _genderizeApiClient;
-    private readonly NationalizeApiClient _nationalizeApiClient;
-    private readonly HrSettings _settings;
-    private readonly IEventPublisher _publisher;
-
-    public VerificationService(AgifyApiClient agifyApiClient, GenderizeApiClient genderizeApiClient, NationalizeApiClient nationalizeApiClient, HrSettings settings, IEventPublisher publisher)
-    {
-        _agifyApiClient = agifyApiClient;
-        _genderizeApiClient = genderizeApiClient;
-        _nationalizeApiClient = nationalizeApiClient;
-        _settings = settings;
-        _publisher = publisher;
-    }
-
-    public async Task<Tuple<AgifyResponse, GenderizeResponse, NationalizeResponse>> VerifyAsync(string name)
-    {
-        var agifyTask = _agifyApiClient.GetAgeAsync(name);
-        var genderizeTask = _genderizeApiClient.GetGenderAsync(name);
-        var nationalizeTask = _nationalizeApiClient.GetNationalityAsync(name);
-
-        await Task.WhenAll(agifyTask, genderizeTask, nationalizeTask);
-
-        return new Tuple<AgifyResponse, GenderizeResponse, NationalizeResponse>(agifyTask.Result, genderizeTask.Result, nationalizeTask.Result);
-    }
-
-    public async Task VerifyAndPublish(EmployeeVerificationRequest request)
-    {
-        var result = await VerifyAsync(request.Name!);
-
-        var response = new EmployeeVerificationResponse(request)
-        {
-            Age = result.Item1.Age,
-            Gender = result.Item2.Gender,
-            GenderProbability = result.Item2.Probability
-        };
-
-        response.Country.AddRange(result.Item3.Country!);
-
-        var nationality = response.Country.OrderByDescending(c => c.Probability).First();
-
-        response.VerificationMessages.Add(
-            @$"Performed verification for {request.Name}, {request.Gender} age {request.Age}. 
-            Engine predicted age was {response.Age}. 
-            Engine predicted gender was {response.Gender} with {ToPercents(response.GenderProbability)} probability.
-            Most likely nationality of {request.Name} is {nationality.Country_Id} with {ToPercents(nationality.Probability)} probability"
-        );
-
-        // first check age
-        if (Math.Abs(request.Age - response.Age) >= 10)
-        {
-            response.VerificationMessages.Add($"Employee age ({request.Age}) is not within range of 10 years of predicted age: {response.Age}");
-        }
-
-        if (response.GenderProbability > 0.5 && !response.Gender!.Equals(request.Gender, StringComparison.InvariantCultureIgnoreCase))
-        {
-            response.VerificationMessages.Add($"Employee gender ({request.Gender}) doesn't match predicted gender: {response.Gender}");
-        }
-
-        _publisher.PublishNamed(_settings.VerificationResultsQueueName, new EventData { Value = response });
-        await _publisher.SendAsync();
-    }
-
-    private static string ToPercents(float value) => (int)(value * 100) + "%";
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Validators/EmployeeValidator.cs b/samples/My.Hr/My.Hr.Business/Validators/EmployeeValidator.cs
deleted file mode 100644
index bda9f877..00000000
--- a/samples/My.Hr/My.Hr.Business/Validators/EmployeeValidator.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using FluentValidation;
-
-namespace My.Hr.Business.Validators;
-
-public class EmployeeValidator : AbstractValidator<Employee>
-{
-    public EmployeeValidator()
-    {
-        RuleFor(x => x.Email).NotNull().EmailAddress();
-        RuleFor(x => x.FirstName).NotNull().MaximumLength(100);
-        RuleFor(x => x.LastName).NotNull().MaximumLength(100);
-        RuleFor(x => x.Gender).NotNull().IsValid();
-        RuleFor(x => x.Birthday).NotNull().LessThanOrEqualTo(SystemTime.Timestamp.AddYears(-18)).WithMessage("Birthday is invalid as the Employee must be at least 18 years of age.");
-        RuleFor(x => x.StartDate).NotNull().GreaterThanOrEqualTo(new DateTime(1999, 01, 01, 0, 0, 0, DateTimeKind.Utc)).WithMessage("January 1, 1999");
-        RuleFor(x => x.PhoneNo).NotNull().MaximumLength(50);
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Business/Validators/EmployeeVerificationValidator.cs b/samples/My.Hr/My.Hr.Business/Validators/EmployeeVerificationValidator.cs
deleted file mode 100644
index 52d45417..00000000
--- a/samples/My.Hr/My.Hr.Business/Validators/EmployeeVerificationValidator.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using FluentValidation;
-
-namespace My.Hr.Business.Validators;
-
-public class EmployeeVerificationValidator : AbstractValidator<EmployeeVerificationRequest>
-{
-    public EmployeeVerificationValidator()
-    {
-        RuleFor(x => x.Name).NotNull().MaximumLength(100);
-        RuleFor(x => x.Gender).NotNull().MaximumLength(50); // todo: validate if reference data exists
-        RuleFor(x => x.Age).NotNull().GreaterThanOrEqualTo(18).LessThanOrEqualTo(120).WithMessage("Age has to be between 18 and 120");
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Data/RefData.yaml b/samples/My.Hr/My.Hr.Database/Data/RefData.yaml
deleted file mode 100644
index 2fad84b8..00000000
--- a/samples/My.Hr/My.Hr.Database/Data/RefData.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-Hr:
-  - $Gender:
-    - F: Female
-    - M: Male
-    - N: Not specified
-  - $TerminationReason:
-    - RE: Resigned
-    - RD: Redundant
-    - TM: Terminated
-  - $RelationshipType:
-    - SPO: Spouse
-    - PTN: Partner
-    - PAR: Parent
-    - CHI: Child
-    - SIB: Sibling
-    - EXF: Extended family
-    - FRD: Friend
-  - $USState:
-    - AL: Alabama
-    - AK: Alaska
-    - AZ: Arizona
-    - AR: Arkansas
-    - CA: California
-    - CO: Colorado
-    - CT: Connecticut
-    - DE: Delaware
-    - FL: Florida
-    - GA: Georgia
-    - HI: Hawaii
-    - ID: Idaho
-    - IL: Illinois
-    - IN: Indiana
-    - IA: Iowa
-    - KS: Kansas
-    - KY: Kentucky
-    - LA: Louisiana
-    - ME: Maine
-    - MD: Maryland
-    - MA: Massachusetts
-    - MI: Michigan
-    - MN: Minnesota
-    - MS: Mississippi
-    - MO: Missouri
-    - MT: Montana
-    - NE: Nebraska
-    - NV: Nevada
-    - NH: New Hampshire
-    - NJ: New Jersey
-    - NM: New Mexico
-    - NY: New York
-    - NC: North Carolina
-    - ND: North Dakota
-    - OH: Ohio
-    - OK: Oklahoma
-    - OR: Oregon
-    - PA: Pennsylvania
-    - RI: Rhode Island
-    - SC: South Carolina
-    - SD: South Dakota
-    - TN: Tennessee
-    - TX: Texas
-    - UT: Utah
-    - VT: Vermont
-    - VA: Virginia
-    - WA: Washington
-    - WV: West Virginia
-    - WI: Wisconsin
-    - WY: Wyoming
-  - $PerformanceOutcome:
-    - DN: Does not meet expectations
-    - ME: Meets expectations
-    - EE: Exceeds expectations
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Dockerfile b/samples/My.Hr/My.Hr.Database/Dockerfile
deleted file mode 100644
index 2fc30395..00000000
--- a/samples/My.Hr/My.Hr.Database/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM mcr.microsoft.com/mssql/server:2019-latest AS base
-USER root
-# Install dotnet sdk
-RUN apt-get update; \
-  apt-get install -y apt-transport-https && \
-  apt-get update && \
-  apt-get install -y dotnet-runtime-6.0
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
-# to take advantage of Docker's build cache, to speed up local container builds
-COPY "samples/My.Hr/My.Hr.sln" "samples/My.Hr/My.Hr.sln"
-
-COPY "samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj" "samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj"
-COPY "samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj" "samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj"
-COPY "samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj" "samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj"
-COPY "samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj" "samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj"
-COPY "samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj" "samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj" 
-COPY "samples/My.Hr/My.Hr.Infra/My.Hr.Infra.csproj" "samples/My.Hr/My.Hr.Infra/My.Hr.Infra.csproj"
-COPY "samples/My.Hr/My.Hr.Infra.Tests/My.Hr.Infra.Tests.csproj" "samples/My.Hr/My.Hr.Infra.Tests/My.Hr.Infra.Tests.csproj"
-
-COPY "src/CoreEx/CoreEx.csproj" "src/CoreEx/CoreEx.csproj"
-COPY "src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj" "src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj"
-COPY "src/CoreEx.Azure/CoreEx.Azure.csproj" "src/CoreEx.Azure/CoreEx.Azure.csproj"
-COPY "src/CoreEx.Cosmos/CoreEx.Cosmos.csproj" "src/CoreEx.Cosmos/CoreEx.Cosmos.csproj"
-COPY "src/CoreEx.Database/CoreEx.Database.csproj" "src/CoreEx.Database/CoreEx.Database.csproj"
-COPY "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj" "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj"
-COPY "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj" "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj"
-COPY "src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj" "src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj"
-COPY "src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj" "src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj"
-COPY "src/CoreEx.Validation/CoreEx.Validation.csproj" "src/CoreEx.Validation/CoreEx.Validation.csproj"
-
-
-RUN dotnet restore "samples/My.Hr/My.Hr.sln"
-
-COPY . .
-WORKDIR /src/samples/My.Hr/My.Hr.Database
-RUN dotnet build -c Release -o /dbex/build
-
-FROM base as final
-USER root
-
-ENV ACCEPT_EULA Y
-ENV MSSQL_SA_PASSWORD sAPWD23.^0
-ENV MSSQL_TCP_PORT 1433
-ENV MSSQL_AGENT_ENABLED true
-ENV ConnectionStrings__sqlserver:MyHr Data Source=localhost, $MSSQL_TCP_PORT;Initial Catalog=My.Hr;User id=sa;Password=$MSSQL_SA_PASSWORD;TrustServerCertificate=true
-
-
-# Copy setup scripts
-WORKDIR /usr/local/
-COPY --from=build /dbex/build /dbex
-COPY  samples/My.Hr/My.Hr.Database/wait-for-it.sh samples/My.Hr/My.Hr.Database/entrypoint.sh ./
-
-RUN chmod +x ./*.sh
-
-ENTRYPOINT ["/usr/local/entrypoint.sh"]
-CMD ["sql"]
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20190101-000001-create-Hr-schema.sql b/samples/My.Hr/My.Hr.Database/Migrations/20190101-000001-create-Hr-schema.sql
deleted file mode 100644
index 5fc766a5..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20190101-000001-create-Hr-schema.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE SCHEMA [Hr]
-    AUTHORIZATION [dbo];
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200909-162702-create-Hr-Employee.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200909-162702-create-Hr-Employee.sql
deleted file mode 100644
index e6d953e1..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200909-162702-create-Hr-Employee.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[Employee] (
-  [EmployeeId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,  -- This is the primary key
-  [Email] NVARCHAR(250) NULL UNIQUE,                                               -- This is the employee's unique email address
-  [FirstName] NVARCHAR(100) NULL,
-  [LastName] NVARCHAR(100) NULL,
-  [GenderCode] NVARCHAR(50) NULL,                                                  -- This is the related Gender code; see Ref.Gender table
-  [Birthday] DATE NULL,    
-  [StartDate] DATE NULL,
-  [TerminationDate] DATE NULL,
-  [TerminationReasonCode] NVARCHAR(50) NULL,                                       -- This is the related Termination Reason code; see Ref.TerminationReason table
-  [PhoneNo] NVARCHAR(50) NULL,
-  [AddressJson] NVARCHAR(500) NULL,                                                -- This is the full address persisted as JSON.
-  [RowVersion] TIMESTAMP NOT NULL,                                                 -- This is used for concurrency version checking. 
-  [CreatedBy] NVARCHAR(250) NULL,                                                  -- The following are standard audit columns.
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200909-163321-create-Hr-EmergencyContact.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200909-163321-create-Hr-EmergencyContact.sql
deleted file mode 100644
index 45a6652a..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200909-163321-create-Hr-EmergencyContact.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[EmergencyContact] (
-  [EmergencyContactId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [EmployeeId] UNIQUEIDENTIFIER NOT NULL,
-  [FirstName] NVARCHAR(100) NULL,
-  [LastName] NVARCHAR(100) NULL,
-  [PhoneNo] NVARCHAR(50) NULL,
-  [RelationshipTypeCode] NVARCHAR(50) NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200909-164735-create-hr-gender.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200909-164735-create-hr-gender.sql
deleted file mode 100644
index 08c2c383..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200909-164735-create-hr-gender.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[Gender] (
-  [GenderId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [Code] NVARCHAR(50) NOT NULL UNIQUE,
-  [Text] NVARCHAR(250) NULL,
-  [IsActive] BIT NULL,
-  [SortOrder] INT NULL,
-  [RowVersion] TIMESTAMP NOT NULL,
-  [CreatedBy] NVARCHAR(250) NULL,
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200909-164828-create-hr-terminationreason.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200909-164828-create-hr-terminationreason.sql
deleted file mode 100644
index cd4534e5..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200909-164828-create-hr-terminationreason.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[TerminationReason] (
-  [TerminationReasonId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [Code] NVARCHAR(50) NOT NULL UNIQUE,
-  [Text] NVARCHAR(250) NULL,
-  [IsActive] BIT NULL,
-  [SortOrder] INT NULL,
-  [RowVersion] TIMESTAMP NOT NULL,
-  [CreatedBy] NVARCHAR(250) NULL,
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200909-165308-create-hr-relationshiptype.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200909-165308-create-hr-relationshiptype.sql
deleted file mode 100644
index 692fdc36..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200909-165308-create-hr-relationshiptype.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[RelationshipType] (
-  [RelationshipTypeId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [Code] NVARCHAR(50) NOT NULL UNIQUE,
-  [Text] NVARCHAR(250) NULL,
-  [IsActive] BIT NULL,
-  [SortOrder] INT NULL,
-  [RowVersion] TIMESTAMP NOT NULL,
-  [CreatedBy] NVARCHAR(250) NULL,
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200909-165752-create-hr-usstate.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200909-165752-create-hr-usstate.sql
deleted file mode 100644
index 12f0be9d..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200909-165752-create-hr-usstate.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[USState] (
-  [USStateId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [Code] NVARCHAR(50) NOT NULL UNIQUE,
-  [Text] NVARCHAR(250) NULL,
-  [IsActive] BIT NULL,
-  [SortOrder] INT NULL,
-  [RowVersion] TIMESTAMP NOT NULL,
-  [CreatedBy] NVARCHAR(250) NULL,
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200915-160812-create-Hr-PerformanceReview.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200915-160812-create-Hr-PerformanceReview.sql
deleted file mode 100644
index 5582abf7..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200915-160812-create-Hr-PerformanceReview.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[PerformanceReview] (
-  [PerformanceReviewId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [EmployeeId] UNIQUEIDENTIFIER NOT NULL,
-  [Date] DATETIME2 NULL,
-  [PerformanceOutcomeCode] NVARCHAR(50) NULL,
-  [Reviewer] NVARCHAR(100) NULL,
-  [Notes] NVARCHAR(4000) NULL,
-  [RowVersion] TIMESTAMP NOT NULL,
-  [CreatedBy] NVARCHAR(250) NULL,
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20200915-161927-create-hr-performanceoutcome.sql b/samples/My.Hr/My.Hr.Database/Migrations/20200915-161927-create-hr-performanceoutcome.sql
deleted file mode 100644
index c61c2baf..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20200915-161927-create-hr-performanceoutcome.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[PerformanceOutcome] (
-  [PerformanceOutcomeId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
-  [Code] NVARCHAR(50) NOT NULL UNIQUE,
-  [Text] NVARCHAR(250) NULL,
-  [IsActive] BIT NULL,
-  [SortOrder] INT NULL,
-  [RowVersion] TIMESTAMP NOT NULL,
-  [CreatedBy] NVARCHAR(250) NULL,
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20211208-001509-create-hr-eventoutbox-table.sql b/samples/My.Hr/My.Hr.Database/Migrations/20211208-001509-create-hr-eventoutbox-table.sql
deleted file mode 100644
index fa6059d4..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20211208-001509-create-hr-eventoutbox-table.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-CREATE TABLE [Hr].[EventOutbox] (
-  /*
-   * This is automatically generated; any changes will be lost.
-   */
-
-  [EventOutboxId] BIGINT IDENTITY (1, 1) NOT NULL PRIMARY KEY NONCLUSTERED ([EventOutboxId] ASC),
-  [EnqueuedDate] DATETIME2 NOT NULL,
-  [PartitionKey] NVARCHAR(128) NULL,
-  [DequeuedDate] DATETIME2 NULL,
-  CONSTRAINT [IX_Hr_EventOutbox_DequeuedDate] UNIQUE CLUSTERED ([DequeuedDate], [EventOutboxId])
-);
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20211208-001509-create-hr-eventoutboxdata-table.sql b/samples/My.Hr/My.Hr.Database/Migrations/20211208-001509-create-hr-eventoutboxdata-table.sql
deleted file mode 100644
index 971dce15..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20211208-001509-create-hr-eventoutboxdata-table.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-CREATE TABLE [Hr].[EventOutboxData] (
-  /*
-   * This is automatically generated; any changes will be lost.
-   */
-
-  [EventOutboxId] BIGINT NOT NULL PRIMARY KEY CLUSTERED ([EventOutboxId] ASC),
-  [EventId] UNIQUEIDENTIFIER,
-  [Subject] NVARCHAR(1024),
-  [Action] NVARCHAR(128) NULL,
-  [CorrelationId] NVARCHAR(64) NULL,
-  [TenantId] UNIQUEIDENTIFIER NULL,
-  [PartitionKey] NVARCHAR(128) NULL,
-  [ValueType] NVARCHAR(1024) NULL,
-  [EventData] VARBINARY(MAX) NULL
-);
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20240930-132603-hr-spgetemployees.sql b/samples/My.Hr/My.Hr.Database/Migrations/20240930-132603-hr-spgetemployees.sql
deleted file mode 100644
index a04bf562..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20240930-132603-hr-spgetemployees.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE OR ALTER PROCEDURE [Hr].[spGetEmployees]
-  @Ids AS NVARCHAR(MAX)
-AS
-BEGIN
-  SET NOCOUNT ON;
-
-  -- Select the requested data.
-  SELECT * FROM [Hr].[Employee] WHERE [EmployeeId] IN (SELECT VALUE FROM OPENJSON(@Ids))
-END
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Migrations/20250127-175724-create-Hr-Employee2.sql b/samples/My.Hr/My.Hr.Database/Migrations/20250127-175724-create-Hr-Employee2.sql
deleted file mode 100644
index 8eabf3f1..00000000
--- a/samples/My.Hr/My.Hr.Database/Migrations/20250127-175724-create-Hr-Employee2.sql
+++ /dev/null
@@ -1,25 +0,0 @@
--- Migration Script
-
-BEGIN TRANSACTION
-
-CREATE TABLE [Hr].[Employee2] (
-  [EmployeeId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,  -- This is the primary key
-  [Email] NVARCHAR(250) NULL UNIQUE,                                               -- This is the employee's unique email address
-  [FirstName] NVARCHAR(100) NULL,
-  [LastName] NVARCHAR(100) NULL,
-  [GenderCode] NVARCHAR(50) NULL,                                                  -- This is the related Gender code; see Ref.Gender table
-  [Birthday] DATE NULL,    
-  [StartDate] DATE NULL,
-  [TerminationDate] DATE NULL,
-  [TerminationReasonCode] NVARCHAR(50) NULL,                                       -- This is the related Termination Reason code; see Ref.TerminationReason table
-  [PhoneNo] NVARCHAR(50) NULL,
-  [AddressJson] NVARCHAR(500) NULL,                                                -- This is the full address persisted as JSON.
-  [IsDeleted] BIT NULL,                                                            -- Logical delete
-  [RowVersion] TIMESTAMP NOT NULL,                                                 -- This is used for concurrency version checking. 
-  [CreatedBy] NVARCHAR(250) NULL,                                                  -- The following are standard audit columns.
-  [CreatedDate] DATETIME2 NULL,
-  [UpdatedBy] NVARCHAR(250) NULL,
-  [UpdatedDate] DATETIME2 NULL
-);
-	
-COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj b/samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj
deleted file mode 100644
index 9acbcaeb..00000000
--- a/samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Migrations\**\*" />
-    <EmbeddedResource Include="Data\**\*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="Migrations\20190101-000001-create-Hr-schema.sql" />
-    <None Remove="Migrations\20240930-132603-hr-spgetemployees.sql" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Data\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="DbEx.SqlServer" Version="2.8.0" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Program.cs b/samples/My.Hr/My.Hr.Database/Program.cs
deleted file mode 100644
index 052137b3..00000000
--- a/samples/My.Hr/My.Hr.Database/Program.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using DbEx.Migration;
-using DbEx.SqlServer.Console;
-
-namespace My.Hr.Database
-{
-    /// <summary>
-    /// Represents the <b>database utilities</b> program (capability).
-    /// </summary>
-    public class Program
-    {
-        /// <summary>
-        /// Main startup.
-        /// </summary>
-        /// <param name="args">The startup arguments.</param>
-        /// <returns>The status code whereby zero indicates success.</returns>
-        internal static Task<int> Main(string[] args) => new SqlServerMigrationConsole("Data Source=.;Initial Catalog=My.HrDb;Integrated Security=True;TrustServerCertificate=true")
-            .Configure(c => ConfigureMigrationArgs(c.Args))
-            .RunAsync(args);
-
-        /// <summary>
-        /// Configure the <see cref="MigrationArgs"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="MigrationArgs"/>.</param>
-        /// <returns>The <see cref="MigrationArgs"/>.</returns>
-        public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
-        {
-            args.ConnectionStringEnvironmentVariableName = "My_HrDb";
-            args.DataParserArgs.RefDataColumnDefaults.TryAdd("IsActive", _ => true);
-            args.DataParserArgs.RefDataColumnDefaults.TryAdd("SortOrder", i => i);
-            args.AddAssembly<Program>();
-            return args;
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/Properties/launchSettings.json b/samples/My.Hr/My.Hr.Database/Properties/launchSettings.json
deleted file mode 100644
index 3eace5c6..00000000
--- a/samples/My.Hr/My.Hr.Database/Properties/launchSettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "profiles": {
-    "My.Hr.Database": {
-      "commandName": "Project",
-      "commandLineArgs": "all"
-    }
-  }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/entrypoint.sh b/samples/My.Hr/My.Hr.Database/entrypoint.sh
deleted file mode 100644
index 1d010da8..00000000
--- a/samples/My.Hr/My.Hr.Database/entrypoint.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-if [ "$1" = 'sql' ]; then
-  if ! [[ -f /var/opt/mssql/.initialized ]]; 
-  then
-    ./wait-for-it.sh localhost:1433 -t 30 -- sleep 10 && echo "db is up" 
-
-    echo "Creating $DB_NAME database..."
-      
-    #run the setup script to create the DB and the schema in the DB
-    dotnet /dbex/My.Hr.Database.dll all
-
-    echo "Database scripts complete"
-    touch /var/opt/mssql/.initialized
-  fi &
-  exec /opt/mssql/bin/sqlservr
-fi
-
-exec "$@"
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Database/wait-for-it.sh b/samples/My.Hr/My.Hr.Database/wait-for-it.sh
deleted file mode 100644
index 127f18c4..00000000
--- a/samples/My.Hr/My.Hr.Database/wait-for-it.sh
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env bash
-# Use this script to test if a given TCP host/port are available
-# Source: https://github.com/vishnubob/wait-for-it
-
-WAITFORIT_cmdname=${0##*/}
-
-echoerr() { if [[ $WAITFORIT_QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
-
-usage()
-{
-    cat << USAGE >&2
-Usage:
-    $WAITFORIT_cmdname host:port [-s] [-t timeout] [-- command args]
-    -h HOST | --host=HOST       Host or IP under test
-    -p PORT | --port=PORT       TCP port under test
-                                Alternatively, you specify the host and port as host:port
-    -s | --strict               Only execute subcommand if the test succeeds
-    -q | --quiet                Don't output any status messages
-    -t TIMEOUT | --timeout=TIMEOUT
-                                Timeout in seconds, zero for no timeout
-    -- COMMAND ARGS             Execute command with args after the test finishes
-USAGE
-    exit 1
-}
-
-wait_for()
-{
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    else
-        echoerr "$WAITFORIT_cmdname: waiting for $WAITFORIT_HOST:$WAITFORIT_PORT without a timeout"
-    fi
-    WAITFORIT_start_ts=$(date +%s)
-    while :
-    do
-        if [[ $WAITFORIT_ISBUSY -eq 1 ]]; then
-            nc -z $WAITFORIT_HOST $WAITFORIT_PORT
-            WAITFORIT_result=$?
-        else
-            (echo -n > /dev/tcp/$WAITFORIT_HOST/$WAITFORIT_PORT) >/dev/null 2>&1
-            WAITFORIT_result=$?
-        fi
-        if [[ $WAITFORIT_result -eq 0 ]]; then
-            WAITFORIT_end_ts=$(date +%s)
-            echoerr "$WAITFORIT_cmdname: $WAITFORIT_HOST:$WAITFORIT_PORT is available after $((WAITFORIT_end_ts - WAITFORIT_start_ts)) seconds"
-            break
-        fi
-        sleep 1
-    done
-    return $WAITFORIT_result
-}
-
-wait_for_wrapper()
-{
-    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
-    if [[ $WAITFORIT_QUIET -eq 1 ]]; then
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --quiet --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    else
-        timeout $WAITFORIT_BUSYTIMEFLAG $WAITFORIT_TIMEOUT $0 --child --host=$WAITFORIT_HOST --port=$WAITFORIT_PORT --timeout=$WAITFORIT_TIMEOUT &
-    fi
-    WAITFORIT_PID=$!
-    trap "kill -INT -$WAITFORIT_PID" INT
-    wait $WAITFORIT_PID
-    WAITFORIT_RESULT=$?
-    if [[ $WAITFORIT_RESULT -ne 0 ]]; then
-        echoerr "$WAITFORIT_cmdname: timeout occurred after waiting $WAITFORIT_TIMEOUT seconds for $WAITFORIT_HOST:$WAITFORIT_PORT"
-    fi
-    return $WAITFORIT_RESULT
-}
-
-# process arguments
-while [[ $# -gt 0 ]]
-do
-    case "$1" in
-        *:* )
-        WAITFORIT_hostport=(${1//:/ })
-        WAITFORIT_HOST=${WAITFORIT_hostport[0]}
-        WAITFORIT_PORT=${WAITFORIT_hostport[1]}
-        shift 1
-        ;;
-        --child)
-        WAITFORIT_CHILD=1
-        shift 1
-        ;;
-        -q | --quiet)
-        WAITFORIT_QUIET=1
-        shift 1
-        ;;
-        -s | --strict)
-        WAITFORIT_STRICT=1
-        shift 1
-        ;;
-        -h)
-        WAITFORIT_HOST="$2"
-        if [[ $WAITFORIT_HOST == "" ]]; then break; fi
-        shift 2
-        ;;
-        --host=*)
-        WAITFORIT_HOST="${1#*=}"
-        shift 1
-        ;;
-        -p)
-        WAITFORIT_PORT="$2"
-        if [[ $WAITFORIT_PORT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --port=*)
-        WAITFORIT_PORT="${1#*=}"
-        shift 1
-        ;;
-        -t)
-        WAITFORIT_TIMEOUT="$2"
-        if [[ $WAITFORIT_TIMEOUT == "" ]]; then break; fi
-        shift 2
-        ;;
-        --timeout=*)
-        WAITFORIT_TIMEOUT="${1#*=}"
-        shift 1
-        ;;
-        --)
-        shift
-        WAITFORIT_CLI=("$@")
-        break
-        ;;
-        --help)
-        usage
-        ;;
-        *)
-        echoerr "Unknown argument: $1"
-        usage
-        ;;
-    esac
-done
-
-if [[ "$WAITFORIT_HOST" == "" || "$WAITFORIT_PORT" == "" ]]; then
-    echoerr "Error: you need to provide a host and port to test."
-    usage
-fi
-
-WAITFORIT_TIMEOUT=${WAITFORIT_TIMEOUT:-15}
-WAITFORIT_STRICT=${WAITFORIT_STRICT:-0}
-WAITFORIT_CHILD=${WAITFORIT_CHILD:-0}
-WAITFORIT_QUIET=${WAITFORIT_QUIET:-0}
-
-# Check to see if timeout is from busybox?
-WAITFORIT_TIMEOUT_PATH=$(type -p timeout)
-WAITFORIT_TIMEOUT_PATH=$(realpath $WAITFORIT_TIMEOUT_PATH 2>/dev/null || readlink -f $WAITFORIT_TIMEOUT_PATH)
-
-WAITFORIT_BUSYTIMEFLAG=""
-if [[ $WAITFORIT_TIMEOUT_PATH =~ "busybox" ]]; then
-    WAITFORIT_ISBUSY=1
-    # Check if busybox timeout uses -t flag
-    # (recent Alpine versions don't support -t anymore)
-    if timeout &>/dev/stdout | grep -q -e '-t '; then
-        WAITFORIT_BUSYTIMEFLAG="-t"
-    fi
-else
-    WAITFORIT_ISBUSY=0
-fi
-
-if [[ $WAITFORIT_CHILD -gt 0 ]]; then
-    wait_for
-    WAITFORIT_RESULT=$?
-    exit $WAITFORIT_RESULT
-else
-    if [[ $WAITFORIT_TIMEOUT -gt 0 ]]; then
-        wait_for_wrapper
-        WAITFORIT_RESULT=$?
-    else
-        wait_for
-        WAITFORIT_RESULT=$?
-    fi
-fi
-
-if [[ $WAITFORIT_CLI != "" ]]; then
-    if [[ $WAITFORIT_RESULT -ne 0 && $WAITFORIT_STRICT -eq 1 ]]; then
-        echoerr "$WAITFORIT_cmdname: strict mode, refusing to execute subprocess"
-        exit $WAITFORIT_RESULT
-    fi
-    exec "${WAITFORIT_CLI[@]}"
-else
-    exit $WAITFORIT_RESULT
-fi
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/.dockerignore b/samples/My.Hr/My.Hr.Functions/.dockerignore
deleted file mode 100644
index 1927772b..00000000
--- a/samples/My.Hr/My.Hr.Functions/.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-local.settings.json
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/.gitignore b/samples/My.Hr/My.Hr.Functions/.gitignore
deleted file mode 100644
index 3c3f4e6a..00000000
--- a/samples/My.Hr/My.Hr.Functions/.gitignore
+++ /dev/null
@@ -1,264 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# Azure Functions localsettings file
-local.settings.json
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-#*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/.vscode/extensions.json b/samples/My.Hr/My.Hr.Functions/.vscode/extensions.json
deleted file mode 100644
index dde673dc..00000000
--- a/samples/My.Hr/My.Hr.Functions/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "ms-azuretools.vscode-azurefunctions"
-    ]
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/Dockerfile b/samples/My.Hr/My.Hr.Functions/Dockerfile
deleted file mode 100644
index 891e4daa..00000000
--- a/samples/My.Hr/My.Hr.Functions/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS installer-env
-# set to true for local runs - switches functions auth to anoymous
-ARG LOCAL
-
-# Build requires 3.1 SDK
-COPY --from=mcr.microsoft.com/dotnet/core/sdk:3.1 /usr/share/dotnet /usr/share/dotnet
-
-WORKDIR /src
-# It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
-# to take advantage of Docker's build cache, to speed up local container builds
-COPY "samples/My.Hr/My.Hr.sln" "samples/My.Hr/My.Hr.sln"
-
-COPY "samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj" "samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj"
-COPY "samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj" "samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj"
-COPY "samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj" "samples/My.Hr/My.Hr.Database/My.Hr.Database.csproj"
-COPY "samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj" "samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj"
-COPY "samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj" "samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj" 
-COPY "samples/My.Hr/My.Hr.Infra/My.Hr.Infra.csproj" "samples/My.Hr/My.Hr.Infra/My.Hr.Infra.csproj"
-COPY "samples/My.Hr/My.Hr.Infra.Tests/My.Hr.Infra.Tests.csproj" "samples/My.Hr/My.Hr.Infra.Tests/My.Hr.Infra.Tests.csproj"
-
-COPY "src/CoreEx/CoreEx.csproj" "src/CoreEx/CoreEx.csproj"
-COPY "src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj" "src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj"
-COPY "src/CoreEx.Azure/CoreEx.Azure.csproj" "src/CoreEx.Azure/CoreEx.Azure.csproj"
-COPY "src/CoreEx.Cosmos/CoreEx.Cosmos.csproj" "src/CoreEx.Cosmos/CoreEx.Cosmos.csproj"
-COPY "src/CoreEx.Database/CoreEx.Database.csproj" "src/CoreEx.Database/CoreEx.Database.csproj"
-COPY "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj" "src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj"
-COPY "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj" "src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj"
-COPY "src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj" "src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj"
-COPY "src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj" "src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj"
-COPY "src/CoreEx.Validation/CoreEx.Validation.csproj" "src/CoreEx.Validation/CoreEx.Validation.csproj"
-
-RUN dotnet restore "samples/My.Hr/My.Hr.sln"
-
-COPY . .
-
-WORKDIR /src/samples/My.Hr/My.Hr.Functions
-
-RUN mkdir -p /home/site/wwwroot && \
-    dotnet publish *.csproj --no-restore -c Debug --output /home/site/wwwroot && \
-    echo LOCAL is "$LOCAL" && \
-    echo $(if [ "$LOCAL" = "true" ] ; then find / \( -type f -name .git -prune \) -o -type f -name "function.json" -print0 | xargs -0 sed -i 's/authLevel\": \"function/authLevel\": \"anonymous/g' ; fi)
-
-# To enable ssh & remote debugging on app service change the base image to the one below
-# FROM mcr.microsoft.com/azure-functions/dotnet:4-appservice
-# FROM mcr.microsoft.com/azure-functions/dotnet:4
-FROM mcr.microsoft.com/azure-functions/dotnet:4-appservice
-ARG LOCAL
-
-ENV AzureWebJobsScriptRoot=/home/site/wwwroot
-ENV AzureFunctionsJobHost__Logging__Console__IsEnabled=true
-ENV AzureFunctionsJobHost__Logging__LogLevel__CoreEx=Debug
-ENV AzureFunctionsJobHost__Logging__LogToConsole=true
-ENV AzureFunctionsJobHost__Logging__LogToConsoleColor=true
-
-COPY --from=installer-env ["/home/site/wwwroot", "/home/site/wwwroot"]
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/Functions/EmployeeFunction.cs b/samples/My.Hr/My.Hr.Functions/Functions/EmployeeFunction.cs
deleted file mode 100644
index d1fbbbfe..00000000
--- a/samples/My.Hr/My.Hr.Functions/Functions/EmployeeFunction.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using CoreEx.Validation;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.Http;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
-using Microsoft.OpenApi.Models;
-using My.Hr.Business.Models;
-using My.Hr.Business.Services;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Mime;
-using System.Threading.Tasks;
-
-namespace My.Hr.Functions.Functions;
-
-public class EmployeeFunction
-{
-    private readonly WebApi _webApi;
-    private readonly EmployeeService _service;
-    private readonly IValidator<Employee> _validator;
-
-    public EmployeeFunction(WebApi webApi, EmployeeService service, IValidator<Employee> validator)
-    {
-        _webApi = webApi;
-        _service = service;
-        _validator = validator;
-    }
-
-    [FunctionName("Get")]
-    [OpenApiOperation(operationId: "Get", tags: new[] { "employee" })]
-    [OpenApiParameter(name: "id", Description = "The employee id", Required = true, In = ParameterLocation.Path, Type = typeof(Guid))]
-    [OpenApiSecurity("function_key", SecuritySchemeType.ApiKey, Name = "code", In = OpenApiSecurityLocationType.Query)]
-    [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: MediaTypeNames.Application.Json, bodyType: typeof(Employee), Description = "Employee record")]
-    [OpenApiResponseWithoutBody(statusCode: HttpStatusCode.NotFound, Description = "Not found")]
-    public Task<IActionResult> GetAsync([HttpTrigger(AuthorizationLevel.Function, "get", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.GetAsync(request, _ => _service.GetEmployeeAsync(id));
-
-    [FunctionName("GetAll")]
-    [OpenApiOperation(operationId: "GetAll", tags: new[] { "employee" })]
-    [OpenApiSecurity("function_key", SecuritySchemeType.ApiKey, Name = "code", In = OpenApiSecurityLocationType.Query)]
-    [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: MediaTypeNames.Application.Json, bodyType: typeof(List<Employee>), Description = "Employee records")]
-    public Task<IActionResult> GetAllAsync([HttpTrigger(AuthorizationLevel.Function, "get", Route = "api/employees")] HttpRequest request)
-        => _webApi.GetAsync(request, p => _service.GetAllAsync(p.RequestOptions.Query, p.RequestOptions.Paging));
-
-    [FunctionName("Create")]
-    [OpenApiOperation(operationId: "Create", tags: new[] { "employee" })]
-    [OpenApiSecurity("function_key", SecuritySchemeType.ApiKey, Name = "code", In = OpenApiSecurityLocationType.Query)]
-    [OpenApiResponseWithoutBody(statusCode: HttpStatusCode.Created, Description = "Created employee record")]
-    public Task<IActionResult> CreateAsync([HttpTrigger(AuthorizationLevel.Function, "post", Route = "api/employees")] HttpRequest request)
-        => _webApi.PostAsync(request, p => _service.AddEmployeeAsync(p.Value!),
-           statusCode: HttpStatusCode.Created, validator: _validator, locationUri: e => new Uri($"api/employees/{e.Id}", UriKind.RelativeOrAbsolute));
-
-    [FunctionName("Update")]
-    [OpenApiOperation(operationId: "Update", tags: new[] { "employee" })]
-    [OpenApiParameter(name: "id", Description = "The employee id", Required = true, In = ParameterLocation.Path, Type = typeof(Guid))]
-    [OpenApiSecurity("function_key", SecuritySchemeType.ApiKey, Name = "code", In = OpenApiSecurityLocationType.Query)]
-    [OpenApiResponseWithBody(statusCode: HttpStatusCode.OK, contentType: MediaTypeNames.Application.Json, bodyType: typeof(Employee), Description = "Employee record")]
-    [OpenApiResponseWithoutBody(statusCode: HttpStatusCode.NotFound, Description = "Not found")]
-    public Task<IActionResult> UpdateAsync([HttpTrigger(AuthorizationLevel.Function, "put", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.PutAsync(request, p => _service.UpdateEmployeeAsync(p.Value!, id), validator: _validator);
-
-    [FunctionName("Patch")]
-    public Task<IActionResult> PatchAsync([HttpTrigger(AuthorizationLevel.Function, "patch", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.PatchAsync(request, get: _ => _service.GetEmployeeAsync(id), put: p => _service.UpdateEmployeeAsync(p.Value!, id), validator: _validator);
-
-    [FunctionName("Delete")]
-    public Task<IActionResult> DeleteAsync([HttpTrigger(AuthorizationLevel.Function, "delete", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.DeleteAsync(request, _ => _service.DeleteEmployeeAsync(id));
-}
diff --git a/samples/My.Hr/My.Hr.Functions/Functions/HttpTriggerQueueVerificationFunction.cs b/samples/My.Hr/My.Hr.Functions/Functions/HttpTriggerQueueVerificationFunction.cs
deleted file mode 100644
index 56be0417..00000000
--- a/samples/My.Hr/My.Hr.Functions/Functions/HttpTriggerQueueVerificationFunction.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Net;
-using System.Net.Mime;
-using System.Threading.Tasks;
-using CoreEx.FluentValidation;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.Http;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Attributes;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
-using Microsoft.OpenApi.Models;
-using My.Hr.Business;
-using My.Hr.Business.External.Contracts;
-using My.Hr.Business.Validators;
-
-namespace My.Hr.Functions;
-
-public class HttpTriggerQueueVerificationFunction
-{
-    private readonly WebApiPublisher _webApiPublisher;
-    private readonly HrSettings _settings;
-
-    public HttpTriggerQueueVerificationFunction(WebApiPublisher webApiPublisher, HrSettings settings)
-    {
-        _webApiPublisher = webApiPublisher;
-        _settings = settings;
-    }
-
-    [FunctionName(nameof(HttpTriggerQueueVerificationFunction))]
-    [OpenApiOperation(operationId: "Run", tags: new[] { "employee" })]
-    [OpenApiSecurity("function_key", SecuritySchemeType.ApiKey, Name = "code", In = OpenApiSecurityLocationType.Query)]
-    [OpenApiRequestBody(MediaTypeNames.Application.Json, typeof(EmployeeVerificationRequest), Description = "The **EmployeeVerification** payload")]
-    [OpenApiResponseWithBody(statusCode: HttpStatusCode.Accepted, contentType: MediaTypeNames.Text.Plain, bodyType: typeof(string), Description = "The OK response")]
-    public Task<IActionResult> RunAsync([HttpTrigger(AuthorizationLevel.Function, "post", Route = "employee/verify")] HttpRequest request)
-        => _webApiPublisher.PublishAsync(request, new WebApiPublisherArgs<EmployeeVerificationRequest>(_settings.VerificationQueueName) { Validator = new EmployeeVerificationValidator().Wrap() });
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/Functions/ServiceBusExecuteVerificationFunction.cs b/samples/My.Hr/My.Hr.Functions/Functions/ServiceBusExecuteVerificationFunction.cs
deleted file mode 100644
index 1421a85f..00000000
--- a/samples/My.Hr/My.Hr.Functions/Functions/ServiceBusExecuteVerificationFunction.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Threading.Tasks;
-using Azure.Messaging.ServiceBus;
-using CoreEx.FluentValidation;
-using CoreEx.Azure.ServiceBus;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using My.Hr.Business;
-using My.Hr.Business.Services;
-using My.Hr.Business.Validators;
-
-namespace My.Hr.Functions;
-
-public class ServiceBusExecuteVerificationFunction
-{
-    private readonly ServiceBusSubscriber _subscriber;
-    private readonly VerificationService _service;
-
-    public ServiceBusExecuteVerificationFunction(ServiceBusSubscriber subscriber, VerificationService service)
-    {
-        _subscriber = subscriber;
-        _service = service;
-    }
-
-    [FunctionName(nameof(ServiceBusExecuteVerificationFunction))]
-    [ExponentialBackoffRetry(3, "00:02:00", "00:30:00")]
-    public Task RunAsync([ServiceBusTrigger("%" + nameof(HrSettings.VerificationQueueName) + "%", Connection = nameof(HrSettings.ServiceBusConnection))] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions)
-        => _subscriber.ReceiveAsync(message, messageActions, (ed, _) => _service.VerifyAndPublish(ed.Value), validator: new EmployeeVerificationValidator().Wrap());
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj b/samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj
deleted file mode 100644
index 7ab8d33f..00000000
--- a/samples/My.Hr/My.Hr.Functions/My.Hr.Functions.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
-    <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput> <!-- because of https://github.com/Azure/azure-functions-core-tools/issues/2872 -->
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.5.1" />
-    <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\My.Hr.Business\My.Hr.Business.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.Azure\CoreEx.Azure.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/MyHrApiConfigurationOptions.cs b/samples/My.Hr/My.Hr.Functions/MyHrApiConfigurationOptions.cs
deleted file mode 100644
index 18f49ac5..00000000
--- a/samples/My.Hr/My.Hr.Functions/MyHrApiConfigurationOptions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
-using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Enums;
-using Microsoft.OpenApi.Models;
-
-namespace My.Hr.Functions;
-
-/// <summary> Configuration options for <see cref="OpenApiDocumentGenerator"/>. </summary>
-public class MyOpenApiConfigurationOptions : DefaultOpenApiConfigurationOptions
-{
-    public override OpenApiInfo Info { get; set; } = new OpenApiInfo()
-    {
-        Version = "1.0.1",
-        Title = "CoreEx My HR Sample",
-        Description = "A serverless Azure Function which demonstrates the use of CoreEx.",
-        TermsOfService = new Uri("https://github.com/Avanade/CoreEx"),
-
-        License = new OpenApiLicense()
-        {
-            Name = "MIT",
-            Url = new Uri("http://opensource.org/licenses/MIT"),
-        }
-    };
-
-    public override OpenApiVersionType OpenApiVersion { get; set; } = OpenApiVersionType.V3;
-
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/README.md b/samples/My.Hr/My.Hr.Functions/README.md
deleted file mode 100644
index df14d20f..00000000
--- a/samples/My.Hr/My.Hr.Functions/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# About
-
-tbd
-
-## Configuration
-
-Sample configuration for `local.settings.json`
-
-```json
-{
-    "IsEncrypted": false,
-    "Values": {
-        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
-        "FUNCTIONS_WORKER_RUNTIME": "dotnet",
-
-        "AgifyApiEndpointUri": "https://api.agify.io",
-        "NationalizeApiClientApiEndpointUri": "https://api.nationalize.io",
-        "GenderizeApiClientApiEndpointUri": "https://api.genderize.io",
-
-        "VerificationQueueName": "pendingVerifications",
-        "VerificationResultsQueueName": "verificationResults",
-
-        "ServiceBusConnection__fullyQualifiedNamespace": "coreex.servicebus.windows.net",
-
-        "HttpLogContent": "true",
-        "AzureFunctionsJobHost__logging__logLevel__CoreEx": "Debug",
-        "AzureFunctionsJobHost__logging__logToConsole": "true",
-        "AzureFunctionsJobHost__logging__logToConsoleColor": "true",
-        "AzureFunctionsJobHost__logging__console__isEnabled": "true",
-
-        "MassPublishQueueName": "mass-publish"
-    }
-}
-```
diff --git a/samples/My.Hr/My.Hr.Functions/Startup.cs b/samples/My.Hr/My.Hr.Functions/Startup.cs
deleted file mode 100644
index 5704aaef..00000000
--- a/samples/My.Hr/My.Hr.Functions/Startup.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using System.Threading.Tasks;
-using CoreEx;
-using CoreEx.AspNetCore.HealthChecks;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Database;
-using CoreEx.Database.HealthChecks;
-using CoreEx.Http.HealthChecks;
-using CoreEx.Json.Merge;
-using Microsoft.Azure.Functions.Extensions.DependencyInjection;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using My.Hr.Business;
-using My.Hr.Business.Data;
-using My.Hr.Business.External;
-using My.Hr.Business.Services;
-using Az = Azure.Messaging.ServiceBus;
-
-[assembly: FunctionsStartup(typeof(My.Hr.Functions.Startup))]
-
-namespace My.Hr.Functions;
-
-public class Startup : FunctionsStartup
-{
-    public override void ConfigureAppConfiguration(IFunctionsConfigurationBuilder builder)
-    {
-    }
-
-    public override void Configure(IFunctionsHostBuilder builder)
-    {
-        try
-        {
-            // Register the core services.
-            builder.Services
-                .AddSettings<HrSettings>()
-                .AddReferenceDataOrchestrator<ReferenceDataService>()
-                .AddExecutionContext()
-                .AddJsonSerializer()
-                .AddEventDataSerializer()
-                .AddEventDataFormatter()
-                .AddEventPublisher()
-                .AddSingleton(sp => new Az.ServiceBusClient(sp.GetRequiredService<HrSettings>().ServiceBusConnection__fullyQualifiedNamespace))
-                .AddAzureServiceBusSender()
-                .AddWebApi((_, webapi) => webapi.UnhandledExceptionAsync = (ex, logger, _) => Task.FromResult(ex is DbUpdateConcurrencyException efex ? webapi.CreateActionResultFromExtendedException(new ConcurrencyException(), logger) : null))
-                .AddJsonMergePatch(sp => new JsonMergePatch())
-                .AddWebApiPublisher()
-                .AddAzureServiceBusSubscriber();
-
-            // Register the health checks.
-            builder.Services
-                .AddHealthChecks()
-                .AddTypeActivatedCheck<TypedHttpClientCoreHealthCheck<GenderizeApiClient>>("Genderize API")
-                .AddTypeActivatedCheck<TypedHttpClientCoreHealthCheck<AgifyApiClient>>("Agify API")
-                .AddTypeActivatedCheck<TypedHttpClientCoreHealthCheck<NationalizeApiClient>>("Nationalize API")
-                //.AddTypeActivatedCheck<AzureServiceBusQueueHealthCheck>("Health check for service bus verification queue", HealthStatus.Unhealthy, nameof(HrSettings.ServiceBusConnection), nameof(HrSettings.VerificationQueueName))
-                .AddTypeActivatedCheck<DatabaseHealthCheck<IDatabase>>("SQL Server", HealthStatus.Unhealthy, tags: default, timeout: System.TimeSpan.FromSeconds(15), nameof(HrSettings.ConnectionStrings__Database));
-
-            // Register the business services.
-            builder.Services
-                .AddScoped<ReferenceDataService>()
-                .AddScoped<EmployeeService>()
-                .AddScoped<VerificationService>()
-                .AddFluentValidators<EmployeeService>();
-
-            // Register the typed backend http clients.
-            builder.Services.AddTypedHttpClient<AgifyApiClient>("Agify");
-            builder.Services.AddTypedHttpClient<GenderizeApiClient>("Genderize");
-            builder.Services.AddTypedHttpClient<NationalizeApiClient>("Nationalize");
-
-            // Database
-            builder.Services.AddDatabase<HrDb>();
-            builder.Services.AddDbContext<HrDbContext>((sp, o) => o.UseSqlServer(sp.GetRequiredService<IDatabase>().GetConnection()));
-        }
-        catch (System.Exception ex)
-        {
-            // try catch block for running the function in docker container, without it, it may fail silently.
-            System.Console.Error.WriteLine(ex);
-            throw;
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Functions/host.json b/samples/My.Hr/My.Hr.Functions/host.json
deleted file mode 100644
index 3a74677c..00000000
--- a/samples/My.Hr/My.Hr.Functions/host.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": "2.0",
-    "logging": {
-        "applicationInsights": {
-            "samplingSettings": {
-                "isEnabled": true,
-                "excludedTypes": "Request"
-            }
-        },
-        "logLevel": {
-            "default": "Warning"
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/Data/Data.yaml b/samples/My.Hr/My.Hr.UnitTest/Data/Data.yaml
deleted file mode 100644
index 1b73dbf9..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/Data/Data.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-Hr:
-  - Employee:
-    - { EmployeeId: 1, Email: w.jones@org.com, FirstName: Wendy, LastName: Jones, GenderCode: F, Birthday: 1985-03-18, StartDate: 2000-12-11, PhoneNo: (425) 612 8113 }
-    - { EmployeeId: 2, Email: b.smith@org.com,  FirstName: Brian, LastName: Smith, GenderCode: M, Birthday: 1994-11-07, StartDate: 2013-08-06, TerminationDate: 2015-04-08, TerminationReasonCode: RE, PhoneNo: (429) 120 0098 }
-    - { EmployeeId: 3, Email: r.Browne@org.com,  FirstName: Rachael, LastName: Browne, GenderCode: F, Birthday: 1972-06-28, StartDate: 2019-11-06, PhoneNo: (421) 783 2343 }
-    - { EmployeeId: 4, Email: w.smither@org.com,  FirstName: Waylon, LastName: Smithers, GenderCode: M, Birthday: 1952-02-21, StartDate: 2001-01-22, PhoneNo: (428) 893 2793, AddressJson: '{ "street1": "8365 851 PL NE", "city": "Redmond", "state": "WA", "postCode": "98052" }' }
-  - EmergencyContact:
-    - { EmergencyContactId: 201, EmployeeId: 2, FirstName: Garth, LastName: Smith, PhoneNo: (443) 678 1827, RelationshipTypeCode: PAR }
-    - { EmergencyContactId: 202, EmployeeId: 2, FirstName: Sarah, LastName: Smith, PhoneNo: (443) 234 3837, RelationshipTypeCode: PAR }
-    - { EmergencyContactId: 401, EmployeeId: 4, FirstName: Michael, LastName: Manners, PhoneNo: (234) 297 9834, RelationshipTypeCode: FRD }
-  - Employee2:
-    - { EmployeeId: 1, Email: w.jones@org.com, FirstName: Wendy, LastName: Jones, GenderCode: F, Birthday: 1985-03-18, StartDate: 2000-12-11, PhoneNo: (425) 612 8113 }
-    - { EmployeeId: 2, Email: b.smith@org.com,  FirstName: Brian, LastName: Smith, GenderCode: M, Birthday: 1994-11-07, StartDate: 2013-08-06, TerminationDate: 2015-04-08, TerminationReasonCode: RE, PhoneNo: (429) 120 0098, IsDeleted: false }
-    - { EmployeeId: 3, Email: r.Browne@org.com,  FirstName: Rachael, LastName: Browne, GenderCode: F, Birthday: 1972-06-28, StartDate: 2019-11-06, PhoneNo: (421) 783 2343, IsDeleted: true }
-    - { EmployeeId: 4, Email: w.smither@org.com,  FirstName: Waylon, LastName: Smithers, GenderCode: M, Birthday: 1952-02-21, StartDate: 2001-01-22, PhoneNo: (428) 893 2793, AddressJson: '{ "street1": "8365 851 PL NE", "city": "Redmond", "state": "WA", "postCode": "98052" }' }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/DatabaseTest.cs b/samples/My.Hr/My.Hr.UnitTest/DatabaseTest.cs
deleted file mode 100644
index 77944c2e..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/DatabaseTest.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using CoreEx;
-using CoreEx.Database;
-using CoreEx.Entities;
-using CoreEx.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using My.Hr.Api;
-using My.Hr.Business.Data;
-using My.Hr.Business.Models;
-using NUnit.Framework;
-using NUnit.Framework.Internal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    [Category("WithDB")]
-    public class DatabaseTest
-    {
-        [OneTimeSetUp]
-        public static Task Init() => EmployeeControllerTest.Init();
-
-        [Test]
-        public async Task DatabaseParameters_JsonParameter()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-
-            var hrdb = scope.ServiceProvider.GetRequiredService<IDatabase>();
-
-            var ids = new List<Guid>();
-            await hrdb.SqlStatement("SELECT * FROM [Hr].[Employee]").SelectAsync(dr =>
-            {
-                ids.Add(dr.GetValue<Guid>("EmployeeId"));
-                return true;
-            });
-
-            var ids2 = new List<Guid>();
-            var c = hrdb.StoredProcedure("[Hr].[spGetEmployees]").JsonParamWith("", "ids", () => ids);
-
-            await c.SelectAsync(dr =>
-            {
-                ids2.Add(dr.GetValue<Guid>("EmployeeId"));
-                return true;
-            });
-
-            Assert.That(ids, Is.EquivalentTo(ids2));
-        }
-
-        [Test]
-        public async Task EF_00A_Query_SelectSingle()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var r = await ef.Employees2.Query(q => q.Where(x => x.Id == 1.ToGuid())).SelectSingleAsync();
-            Assert.That(r, Is.Not.Null);
-
-            await Assert.ThatAsync(async () => await ef.Employees2.Query(q => q.Where(x => x.Id == 404.ToGuid())).SelectSingleAsync(), Throws.Exception.TypeOf<InvalidOperationException>());
-
-            var r2 = await ef.Employees2.Query(q => q.Where(x => x.Id == 404.ToGuid())).SelectSingleOrDefaultAsync();
-            Assert.That(r2, Is.Null);
-        }
-
-        [Test]
-        public async Task EF_00B_Query_SelectFirst()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var r = await ef.Employees2.Query().SelectFirstAsync();
-            Assert.That(r, Is.Not.Null);
-
-            await Assert.ThatAsync(async () => await ef.Employees2.Query(q => q.Where(x => x.Id == 404.ToGuid())).SelectFirstAsync(), Throws.Exception.TypeOf<InvalidOperationException>());
-
-            var r2 = await ef.Employees2.Query(q => q.Where(x => x.Id == 404.ToGuid())).SelectFirstOrDefaultAsync();
-            Assert.That(r2, Is.Null);
-        }
-
-        [Test]
-        public async Task EF_00C_Query_SelectQuery()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var c = await ef.Employees2.Query().WithPaging(1).SelectQueryAsync<List<Employee2>>();
-
-            Assert.That(c, Is.Not.Null);
-            Assert.That(c, Has.Count.EqualTo(2));
-        }
-
-        [Test]
-        public async Task EF_00D_Query_SelectResult()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var r = await ef.Employees2.Query().WithPaging(PagingArgs.CreateSkipAndTake(1, null, true)).SelectResultAsync<Employee2CollectionResult, Employee2Collection>();
-
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.Items, Has.Count.EqualTo(2));
-            Assert.That(r.Paging, Is.Not.Null);
-            Assert.That(r.Paging!.TotalCount, Is.EqualTo(3));
-        }
-
-        [Test]
-        public async Task EF_00E_Query_SelectQuery_Item()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var count = 0;
-
-            await ef.Query<Employee2>().SelectQueryAsync(e =>
-            {
-                count++;
-                Assert.That(e, Is.Not.Null);
-                Assert.That(e.Id, Is.Not.EqualTo(Guid.Empty));
-                Assert.That(e.FirstName, Is.Not.Null);
-                return count <= 1;
-            });
-
-            Assert.That(count, Is.EqualTo(2));
-        }
-
-        [Test]
-        public async Task EF_01_Query_IsDeleted()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var r = await ef.Employees2.Query().SelectResultAsync<Employee2CollectionResult, Employee2Collection>();
-
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.Items, Has.Count.EqualTo(3));
-        }
-
-        [Test]
-        public async Task EF_02_Get_IsDeleted()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var e = await ef.Employees2.GetAsync(1.ToGuid());
-            Assert.That(e, Is.Not.Null);
-
-            e = await ef.Employees2.GetAsync(2.ToGuid());
-            Assert.That(e, Is.Not.Null);
-
-            e = await ef.Employees2.GetAsync(3.ToGuid());
-            Assert.That(e, Is.Null);
-        }
-
-        [Test]
-        public async Task EF_03_Update_IsDeleted()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            var e = await ef.Employees2.GetAsync(1.ToGuid());
-            Assert.That(e, Is.Not.Null);
-
-            ef.DbContext.ChangeTracker.Clear();
-
-            e!.Id = 3.ToGuid();
-            await Assert.ThatAsync(async () => await ef.Employees2.UpdateAsync(e), Throws.Exception.TypeOf<NotFoundException>());
-        }
-
-        [Test]
-        public async Task EF_04_Delete_IsDeleted()
-        {
-            using var test = ApiTester.Create<Startup>();
-            using var scope = test.Services.CreateScope();
-            var ef = scope.ServiceProvider.GetRequiredService<IHrEfDb>();
-
-            await ef.Employees2.DeleteAsync(1.ToGuid());
-
-            var e = await ef.Employees2.GetAsync(1.ToGuid());
-            Assert.That(e, Is.Null);
-
-            await Assert.ThatAsync(async () => await ef.Employees2.DeleteAsync(1.ToGuid()), Throws.Exception.TypeOf<NotFoundException>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/EmployeeControllerTest.cs b/samples/My.Hr/My.Hr.UnitTest/EmployeeControllerTest.cs
deleted file mode 100644
index 9c6e64c5..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/EmployeeControllerTest.cs
+++ /dev/null
@@ -1,464 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Events;
-using CoreEx.Http;
-using Microsoft.Extensions.Configuration;
-using My.Hr.Api;
-using My.Hr.Api.Controllers;
-using My.Hr.Business.Models;
-using My.Hr.Business.External.Contracts;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using UnitTestEx;
-using UnitTestEx.Expectations;
-using DbEx;
-using DbEx.Migration;
-using DbEx.SqlServer.Migration;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    [Category("WithDB")]
-    public class EmployeeControllerTest
-    {
-        [OneTimeSetUp]
-        public static async Task Init()
-        {
-            HttpConsts.IncludeFieldsQueryStringName = "include-fields";
-
-            using var test = ApiTester.Create<Startup>();
-            var cs = test.Configuration.GetConnectionString("Database");
-            var args = Database.Program.ConfigureMigrationArgs(new MigrationArgs(MigrationCommand.ResetAndDatabase, cs)).AddAssembly<EmployeeControllerTest>();
-            var (Success, Output) = await new SqlServerMigration(args).MigrateAndLogAsync().ConfigureAwait(false);
-            if (!Success)
-                Assert.Fail(Output);
-        }
-
-        [Test]
-        public void A100_Get_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void A110_Get_Found()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var resp = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(1.ToGuid()))
-                .AssertOK()
-                .AssertValue(new Employee
-                {
-                    Id = 1.ToGuid(),
-                    Email = "w.jones@org.com",
-                    FirstName = "Wendy",
-                    LastName = "Jones",
-                    Gender = "F",
-                    Birthday = new DateTime(1985, 03, 18, 0, 0, 0, DateTimeKind.Unspecified),
-                    StartDate = new DateTime(2000, 12, 11, 0, 0, 0, DateTimeKind.Unspecified),
-                    PhoneNo = "(425) 612 8113"
-                }, nameof(Employee.ETag))
-                .Response;
-
-            // Also, validate the context header messages.
-            var result = HttpResult.CreateAsync(resp).GetAwaiter().GetResult();
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(result.Messages, Is.Not.Null);
-            });
-            Assert.That(result.Messages, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Messages![0].Type, Is.EqualTo(MessageType.Warning));
-                Assert.That(result.Messages[0].Text, Is.EqualTo("Employee is considered old."));
-            });
-        }
-
-        [Test]
-        public void A120_Get_NotModifed()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(1.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(e.Id), requestOptions: new HttpRequestOptions { ETag = e.ETag })
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void A130_Get_IncludeFields()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(1.ToGuid()), requestOptions: new HttpRequestOptions().Include("FirstName", "LastName"))
-                .AssertOK()
-                .AssertJson("{\"firstName\":\"Wendy\",\"lastName\":\"Jones\"}");
-        }
-
-        [Test]
-        public void B100_GetAll_All()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync())
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(4));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Browne", "Jones", "Smith", "Smithers" }));
-            });
-        }
-
-        [Test]
-        public void B110_GetAll_Paging()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var x = TestSetUp.Extensions;
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2, true)))
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(2));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Jones", "Smith" }));
-                Assert.That(v.Paging, Is.Not.Null);
-            });
-            Assert.That(v!.Paging!.TotalCount, Is.EqualTo(4));
-        }
-
-        [Test]
-        public void B120_GetAll_PagingAndIncludeFields()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2)).Include("lastname"))
-                .AssertOK()
-                .AssertJson("[ { \"lastName\": \"Jones\" }, { \"lastName\": \"Smith\" } ]")
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.That(v!.Paging!.TotalCount, Is.Null); // No count requested.
-        }
-
-        [Test]
-        public void B120_GetAll_Filter_LastName()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create().Filter("startswith(lastname, 's')"))
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(2));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Smith", "Smithers" }));
-            });
-        }
-
-        [Test]
-        public void B130_GetAll_Filter_StartDateAndGenders_OrderBy_FirstName()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create().Filter("startdate ge 2010-01-01 and gender in ('m','f')").OrderBy("lastname desc"))
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(2));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Smith", "Browne" }));
-            });
-        }
-
-        [Test]
-        public void C100_Create_Error()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "Z",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.CreateAsync(null!), e)
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."),
-                    new ApiError("Gender", "'Gender' is invalid."));
-        }
-
-        [Test]
-        public void C110_Create_Success()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.CreateAsync(null!), e)
-                .AssertCreated()
-                .AssertValue(e, "Id", "ETag")
-                .AssertLocationHeader<Employee>(v => new Uri($"api/employees/{v!.Id}", UriKind.Relative))
-                .AssertLocationHeaderContains("api/employees") // Just for kicks testing both types work
-                .GetValue<Employee>();
-
-            // Do a GET to make sure it is in the database and all fields equal.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(v!.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D100_Update_Error()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(404.ToGuid(), null!), e)
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."));
-        }
-
-        [Test]
-        public void D110_Update_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(404.ToGuid(), null!), e)
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void D120_Update_Success()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it.
-            v.FirstName += "X";
-
-            v = test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(v.Id, null!), v)
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D130_Update_ConcurrencyError()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it with errant etag.
-            v.FirstName += "X";
-            v.ETag = "ZZZZZZZZZZZZ";
-
-            test.Controller<EmployeeController>()
-                .ExpectLogContains("fail: A concurrency error occurred; please refresh the data and try again.") // Verifies the ConcurrencyException.ShouldBeLogged was logged as expected.
-                .Run(c => c.UpdateAsync(v.Id, null!), v)
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void E100_Delete()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK();
-
-            // Delete it.
-            test.Controller<EmployeeController>()
-                .Run(c => c.DeleteAsync(2.ToGuid()))
-                .AssertNoContent();
-
-            // Must not exist.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertNotFound();
-
-            // Delete it again; should appear as if deleted as operation is considered idempotent.
-            test.Controller<EmployeeController>()
-                .Run(c => c.DeleteAsync(2.ToGuid()))
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void F100_Patch_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeController>()
-                .RunContent(c => c.PatchAsync(404.ToGuid(), null!), "{}", HttpConsts.MergePatchMediaTypeName)
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void F110_Patch_Concurrency()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            test.Controller<EmployeeController>()
-                .ExpectLogContains("fail: A concurrency error occurred; please refresh the data and try again.") // Verifies the ConcurrencyException.ShouldBeLogged was logged as expected.
-                .RunContent(c => c.PatchAsync(v.Id, null!), $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new HttpRequestOptions { ETag = "ZZZZZZZZZZZZ" })
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void F120_Patch()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            v = test.Controller<EmployeeController>()
-                .RunContent(c => c.PatchAsync(v.Id, null!), $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new HttpRequestOptions { ETag = v.ETag })
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void G100_Verify_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.VerifyAsync(404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void G100_Verify_Publish()
-        {
-            using var test = ApiTester.Create<Startup>();
-            var imp = new InMemoryPublisher(test.Logger);
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Controller<EmployeeController>()
-                .Run(c => c.VerifyAsync(1.ToGuid()))
-                .AssertAccepted();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-            var e = imp.GetEvents("pendingVerifications");
-            Assert.That(e, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new EmployeeVerificationRequest { Name = "Wendy", Age = 39, Gender = "F" }, e[0].Value);
-        }
-
-        [Test]
-        public void G100_Verify_Publish_WithExpectations()
-        {
-            using var test = ApiTester.Create<Startup>();
-            test.UseExpectedEvents()
-                .Controller<EmployeeController>()
-                .ExpectDestinationEvent("pendingVerifications", new EventData<EmployeeVerificationRequest> { Value = new EmployeeVerificationRequest { Name = "Wendy", Age = 39, Gender = "F" } })
-                .ExpectStatusCode(System.Net.HttpStatusCode.Accepted)
-                .Run(c => c.VerifyAsync(1.ToGuid()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/EmployeeControllerTest2.cs b/samples/My.Hr/My.Hr.UnitTest/EmployeeControllerTest2.cs
deleted file mode 100644
index f8741295..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/EmployeeControllerTest2.cs
+++ /dev/null
@@ -1,395 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Events;
-using CoreEx.Http;
-using My.Hr.Api;
-using My.Hr.Api.Controllers;
-using My.Hr.Business.Models;
-using My.Hr.Business.External.Contracts;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using UnitTestEx;
-using UnitTestEx.Expectations;
-using My.Hr.Business.Services;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    [Category("WithDB")]
-    public class EmployeeControllerTest2
-    {
-        [OneTimeSetUp]
-        public static Task Init() => EmployeeControllerTest.Init();
-
-        [Test]
-        public void A100_Get_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void A110_Get_Found()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(1.ToGuid()))
-                .AssertOK()
-                .AssertValue(new Employee
-                {
-                    Id = 1.ToGuid(),
-                    Email = "w.jones@org.com",
-                    FirstName = "Wendy",
-                    LastName = "Jones",
-                    Gender = "F",
-                    Birthday = new DateTime(1985, 03, 18, 0, 0, 0, DateTimeKind.Unspecified),
-                    StartDate = new DateTime(2000, 12, 11, 0, 0, 0, DateTimeKind.Unspecified),
-                    PhoneNo = "(425) 612 8113"
-                }, nameof(Employee.ETag));
-        }
-
-        [Test]
-        public void A120_Get_NotModifed()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var e = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(1.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(e.Id), requestOptions: new HttpRequestOptions { ETag = e.ETag })
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void A130_Get_IncludeFields()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(1.ToGuid()), requestOptions: new HttpRequestOptions().Include("FirstName", "LastName"))
-                .AssertOK()
-                .AssertJson("{\"firstName\":\"Wendy\",\"lastName\":\"Jones\"}");
-        }
-
-        [Test]
-        public void B100_GetAll_All()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync())
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(4));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Browne", "Jones", "Smith", "Smithers" }));
-            });
-        }
-
-        [Test]
-        public void B110_GetAll_Paging()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2, true)))
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(2));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Jones", "Smith" }));
-                Assert.That(v.Paging, Is.Not.Null);
-            });
-            Assert.That(v!.Paging!.TotalCount, Is.EqualTo(4));
-        }
-
-        [Test]
-        public void B120_GetAll_PagingAndIncludeFields()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2)).Include("lastname"))
-                .AssertOK()
-                .AssertJson("[ { \"lastName\": \"Jones\" }, { \"lastName\": \"Smith\" } ]")
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.That(v!.Paging!.TotalCount, Is.Null); // No count requested.
-        }
-
-        [Test]
-        public void C100_Create_Error()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "Z",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.CreateAsync(null!), e)
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."),
-                    new ApiError("Gender", "'Gender' is invalid."));
-        }
-
-        [Test]
-        public void C110_Create_Success()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.CreateAsync(null!), e)
-                .AssertCreated()
-                .AssertValue(e, "Id", "ETag")
-                .AssertLocationHeader<Employee>(v => new Uri($"api/employees/{v!.Id}", UriKind.Relative))
-                .GetValue<Employee>();
-
-            // Do a GET to make sure it is in the database and all fields equal.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(v!.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D100_Update_Error()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(404.ToGuid(), null!), e)
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."));
-        }
-
-        [Test]
-        public void D110_Update_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(404.ToGuid(), null!), e)
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void D120_Update_Success()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it.
-            v.FirstName += "X";
-
-            v = test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(v.Id, null!), v)
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D130_Update_ConcurrencyError()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it with errant etag.
-            v.FirstName += "X";
-            v.ETag = "ZZZZZZZZZZZZ";
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.UpdateAsync(v.Id, null!), v)
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void E100_Delete()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            // Get current.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK();
-
-            // Delete it.
-            test.Controller<EmployeeController>()
-                .Run(c => c.DeleteAsync(2.ToGuid()))
-                .AssertNoContent();
-
-            // Must not exist.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertNotFound();
-
-            // Delete it again; should appear as if deleted as operation is considered idempotent.
-            test.Controller<EmployeeController>()
-                .Run(c => c.DeleteAsync(2.ToGuid()))
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void F100_Patch_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            test.Controller<EmployeeController>()
-                .RunContent(c => c.PatchAsync(404.ToGuid(), null!), "{}", HttpConsts.MergePatchMediaTypeName)
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void F110_Patch_Concurrency()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            test.Controller<EmployeeController>()
-                .RunContent(c => c.PatchAsync(v.Id, null!), $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new HttpRequestOptions { ETag = "ZZZZZZZZZZZZ" })
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void F120_Patch()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            // Get current.
-            var v = test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            v = test.Controller<EmployeeController>()
-                .RunContent(c => c.PatchAsync(v.Id, null!), $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new HttpRequestOptions { ETag = v.ETag })
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.Controller<EmployeeController>()
-                .Run(c => c.GetAsync(v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void G100_Verify_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-
-            test.Controller<EmployeeController>()
-                .Run(c => c.VerifyAsync(404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void G100_Verify_Publish()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-            var imp = new InMemoryPublisher(test.Logger);
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Controller<EmployeeController>()
-                .Run(c => c.VerifyAsync(1.ToGuid()))
-                .AssertAccepted();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-            var e = imp.GetEvents("pendingVerifications");
-            Assert.That(e, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new EmployeeVerificationRequest { Name = "Wendy", Age = 39, Gender = "F" }, e[0].Value);
-        }
-
-        [Test]
-        public void G100_Verify_Publish_WithExpectations()
-        {
-            using var test = ApiTester.Create<Startup>().ConfigureServices(sc => sc.ReplaceScoped<IEmployeeService, EmployeeService2>());
-            test.UseExpectedEvents()
-                .Controller<EmployeeController>()
-                .ExpectDestinationEvent("pendingVerifications", new EventData<EmployeeVerificationRequest> { Value = new EmployeeVerificationRequest { Name = "Wendy", Age = 39, Gender = "F" } })
-                .ExpectStatusCode(System.Net.HttpStatusCode.Accepted)
-                .Run(c => c.VerifyAsync(1.ToGuid()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/EmployeeFunctionTest.cs b/samples/My.Hr/My.Hr.UnitTest/EmployeeFunctionTest.cs
deleted file mode 100644
index e06b5d65..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/EmployeeFunctionTest.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Http;
-using DbEx;
-using DbEx.Migration;
-using DbEx.SqlServer.Migration;
-using Microsoft.Extensions.DependencyInjection;
-using My.Hr.Business;
-using My.Hr.Business.Models;
-using My.Hr.Functions;
-using My.Hr.Functions.Functions;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    [Category("WithDB")]
-    public class EmployeeFunctionTest
-    {
-        [OneTimeSetUp]
-        public async Task Init()
-        {
-            HttpConsts.IncludeFieldsQueryStringName = "include-fields";
-
-            using var test = FunctionTester.Create<Startup>();
-            var settings = test.Services.GetRequiredService<HrSettings>();
-            var args = Database.Program.ConfigureMigrationArgs(new MigrationArgs(MigrationCommand.ResetAndDatabase, settings.ConnectionStrings__Database)).AddAssembly<EmployeeControllerTest>();
-            var (Success, Output) = await new SqlServerMigration(args).MigrateAndLogAsync().ConfigureAwait(false);
-            if (!Success)
-                Assert.Fail(Output);
-        }
-
-        [Test]
-        public void A100_Get_NotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{404.ToGuid()}"), 404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void A110_Get_Found()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{1.ToGuid()}"), 1.ToGuid()))
-                .AssertOK()
-                .AssertValue(new Employee
-                {
-                    Id = 1.ToGuid(),
-                    Email = "w.jones@org.com",
-                    FirstName = "Wendy",
-                    LastName = "Jones",
-                    Gender = "F",
-                    Birthday = new DateTime(1985, 03, 18, 0, 0, 0, DateTimeKind.Unspecified),
-                    StartDate = new DateTime(2000, 12, 11, 0, 0, 0, DateTimeKind.Unspecified),
-                    PhoneNo = "(425) 612 8113"
-                }, nameof(Employee.ETag));
-        }
-
-        [Test]
-        public void A120_Get_NotModified()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var e = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{1.ToGuid()}"), 1.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{1.ToGuid()}", new CoreEx.Http.HttpRequestOptions { ETag = e.ETag }), 1.ToGuid()))
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void A130_Get_IncludeFields()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var e = test.HttpTrigger<EmployeeFunction>()
-                .WithRouteCheck(UnitTestEx.Azure.Functions.RouteCheckOption.PathAndQueryStartsWith)
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{1.ToGuid()}", new CoreEx.Http.HttpRequestOptions().Include("FirstName", "LastName")), 1.ToGuid()))
-                .AssertOK()
-                .AssertJson("{\"firstName\":\"Wendy\",\"lastName\":\"Jones\"}");
-        }
-
-        [Test]
-        public void B100_GetAll_All()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAllAsync(test.CreateHttpRequest(HttpMethod.Get, "api/employees")))
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(4));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Browne", "Jones", "Smith", "Smithers" }));
-            });
-        }
-
-        [Test]
-        public void B110_GetAll_Paging()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .WithRouteCheck(UnitTestEx.Azure.Functions.RouteCheckOption.PathAndQueryStartsWith)
-                .Run(f => f.GetAllAsync(test.CreateHttpRequest(HttpMethod.Get, "api/employees", CoreEx.Http.HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2, true)))))
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(2));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Jones", "Smith" }));
-                Assert.That(v.Paging, Is.Not.Null);
-            });
-            Assert.That(v!.Paging!.TotalCount, Is.EqualTo(4));
-        }
-
-        [Test]
-        public void B120_GetAll_PagingAndIncludeFields()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .WithRouteCheck(UnitTestEx.Azure.Functions.RouteCheckOption.PathAndQueryStartsWith)
-                .Run(f => f.GetAllAsync(test.CreateHttpRequest(HttpMethod.Get, "api/employees", CoreEx.Http.HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2, false)).Include("lastname"))))
-                .AssertOK()
-                .AssertJson("[ { \"lastName\": \"Jones\" }, { \"lastName\": \"Smith\" } ]")
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.That(v!.Paging!.TotalCount, Is.Null); // No count requested.
-        }
-
-        [Test]
-        public void C100_Create_Error()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(c => c.CreateAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "api/employees", e)))
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."));
-        }
-
-        [Test]
-        public void C110_Create_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .Run(c => c.CreateAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "api/employees", e)))
-                .AssertCreated()
-                .AssertValue(e, "Id", "ETag")
-                .AssertLocationHeader<Employee>(v => new Uri($"api/employees/{v!.Id}", UriKind.Relative))
-                .GetValue<Employee>();
-
-            // Do a GET to make sure it is in the database and all fields equal.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{v!.Id}"), v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D100_Update_Error()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.UpdateAsync(test.CreateJsonHttpRequest(HttpMethod.Put, $"api/employees/{404.ToGuid()}", e), 404.ToGuid()))
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."));
-        }
-
-        [Test]
-        public void D110_Update_NotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.UpdateAsync(test.CreateJsonHttpRequest(HttpMethod.Put, $"api/employees/{404.ToGuid()}", e), 404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void D120_Update_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            // Get current.
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{2.ToGuid()}"), 2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it.
-            v.FirstName += "X";
-
-            v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.UpdateAsync(test.CreateJsonHttpRequest(HttpMethod.Put, $"api/employees/{v.Id}", v), v.Id))
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{v.Id}"), v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D130_Update_ConcurrencyError()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            // Get current.
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{2.ToGuid()}"), 2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it with errant etag.
-            v.FirstName += "X";
-            v.ETag = "ZZZZZZZZZZZZ";
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.UpdateAsync(test.CreateJsonHttpRequest(HttpMethod.Put, $"api/employees/{v.Id}", v), v.Id))
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void E100_Delete()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            // Get current.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{2.ToGuid()}"), 2.ToGuid()))
-                .AssertOK();
-
-            // Delete it.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.DeleteAsync(test.CreateHttpRequest(HttpMethod.Delete, $"api/employees/{2.ToGuid()}"), 2.ToGuid()))
-                .AssertNoContent();
-
-            // Must not exist.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{2.ToGuid()}"), 2.ToGuid()))
-                .AssertNotFound();
-
-            // Delete it again; should appear as if deleted as operation is considered idempotent.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.DeleteAsync(test.CreateHttpRequest(HttpMethod.Delete, $"api/employees/{2.ToGuid()}"), 2.ToGuid()))
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void F100_Patch_NotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.PatchAsync(test.CreateHttpRequest(HttpMethod.Patch, $"api/employees/{404.ToGuid()}", "{}", HttpConsts.MergePatchMediaTypeName), 404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void F110_Patch_Concurrency()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            // Get current.
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{4.ToGuid()}"), 4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            var req = test.CreateHttpRequest(HttpMethod.Patch, $"api/employees/{v.Id}", $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new CoreEx.Http.HttpRequestOptions { ETag = "ZZZZZZZZZZZZ" });
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.PatchAsync(req, v.Id))
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void F120_Patch()
-        {
-            using var test = FunctionTester.Create<Startup>();
-
-            // Get current.
-            var v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{4.ToGuid()}"), 4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            var req = test.CreateHttpRequest(HttpMethod.Patch, $"api/employees/{v.Id}", $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new CoreEx.Http.HttpRequestOptions { ETag = v.ETag });
-            v = test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.PatchAsync(req, v.Id))
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.HttpTrigger<EmployeeFunction>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, $"api/employees/{v.Id}"), v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/EmployeeResultControllerTest.cs b/samples/My.Hr/My.Hr.UnitTest/EmployeeResultControllerTest.cs
deleted file mode 100644
index 8a74c8f7..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/EmployeeResultControllerTest.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Events;
-using CoreEx.Http;
-using Microsoft.Extensions.Configuration;
-using My.Hr.Api;
-using My.Hr.Api.Controllers;
-using My.Hr.Business.Models;
-using My.Hr.Business.External.Contracts;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using UnitTestEx;
-using UnitTestEx.Expectations;
-using DbEx;
-using DbEx.Migration;
-using DbEx.SqlServer.Migration;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    [Category("WithDB")]
-    public class EmployeeResultControllerTest
-    {
-        [OneTimeSetUp]
-        public static async Task Init()
-        {
-            HttpConsts.IncludeFieldsQueryStringName = "include-fields";
-
-            using var test = ApiTester.Create<Startup>();
-            var cs = test.Configuration.GetConnectionString("Database");
-            var args = Database.Program.ConfigureMigrationArgs(new MigrationArgs(MigrationCommand.ResetAndDatabase, cs)).AddAssembly<EmployeeResultControllerTest>();
-            var (Success, Output) = await new SqlServerMigration(args).MigrateAndLogAsync().ConfigureAwait(false);
-            if (!Success)
-                Assert.Fail(Output);
-        }
-
-        [Test]
-        public void A100_Get_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void A110_Get_Found()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(1.ToGuid()))
-                .AssertOK()
-                .AssertValue(new Employee
-                {
-                    Id = 1.ToGuid(),
-                    Email = "w.jones@org.com",
-                    FirstName = "Wendy",
-                    LastName = "Jones",
-                    Gender = "F",
-                    Birthday = new DateTime(1985, 03, 18, 0, 0, 0, DateTimeKind.Unspecified),
-                    StartDate = new DateTime(2000, 12, 11, 0, 0, 0, DateTimeKind.Unspecified),
-                    PhoneNo = "(425) 612 8113"
-                }, nameof(Employee.ETag));
-        }
-
-        [Test]
-        public void A120_Get_NotModifed()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(1.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(e.Id), requestOptions: new HttpRequestOptions { ETag = e.ETag })
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void A130_Get_IncludeFields()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(1.ToGuid()), requestOptions: new HttpRequestOptions().Include("FirstName", "LastName"))
-                .AssertOK()
-                .AssertJson("{\"firstName\":\"Wendy\",\"lastName\":\"Jones\"}");
-        }
-
-        [Test]
-        public void B100_GetAll_All()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAllAsync())
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(4));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Browne", "Jones", "Smith", "Smithers" }));
-            });
-        }
-
-        [Test]
-        public void B110_GetAll_Paging()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2, true)))
-                .AssertOK()
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v?.Items, Is.Not.Null);
-                Assert.That(v!.Items, Has.Count.EqualTo(2));
-                Assert.That(v.Items.Select(x => x.LastName).ToArray(), Is.EqualTo(new string[] { "Jones", "Smith" }));
-                Assert.That(v.Paging, Is.Not.Null);
-            });
-            Assert.That(v!.Paging!.TotalCount, Is.EqualTo(4));
-        }
-
-        [Test]
-        public void B120_GetAll_PagingAndIncludeFields()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAllAsync(), requestOptions: HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(1, 2)).Include("lastname"))
-                .AssertOK()
-                .AssertJson("[ { \"lastName\": \"Jones\" }, { \"lastName\": \"Smith\" } ]")
-                .GetValue<EmployeeCollectionResult>();
-
-            Assert.That(v!.Paging!.TotalCount, Is.Null); // No count requested.
-        }
-
-        [Test]
-        public void C100_Create_Error()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "Z",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.CreateAsync(null!), e)
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."),
-                    new ApiError("Gender", "'Gender' is invalid."));
-        }
-
-        [Test]
-        public void C110_Create_Success()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.CreateAsync(null!), e)
-                .AssertCreated()
-                .AssertValue(e, "Id", "ETag")
-                .AssertLocationHeader<Employee>(v => new Uri($"api/employees/{v!.Id}", UriKind.Relative))
-                .GetValue<Employee>();
-
-            // Do a GET to make sure it is in the database and all fields equal.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(v!.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D100_Update_Error()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.UpdateAsync(404.ToGuid(), null!), e)
-                .AssertErrors(
-                    new ApiError("Email", "'Email' must not be empty."));
-        }
-
-        [Test]
-        public void D110_Update_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            var e = new Employee
-            {
-                FirstName = "Rebecca",
-                LastName = "Smythe",
-                Birthday = new DateTime(2000, 01, 01, 0, 0, 0, DateTimeKind.Unspecified),
-                Gender = "M",
-                PhoneNo = "555 123 4567",
-                Email = "rs@email.com",
-                StartDate = new DateTime(2020, 01, 08, 0, 0, 0, DateTimeKind.Unspecified)
-            };
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.UpdateAsync(404.ToGuid(), null!), e)
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void D120_Update_Success()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it.
-            v.FirstName += "X";
-
-            v = test.Controller<EmployeeResultController>()
-                .Run(c => c.UpdateAsync(v.Id, null!), v)
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void D130_Update_ConcurrencyError()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Update it with errant etag.
-            v.FirstName += "X";
-            v.ETag = "ZZZZZZZZZZZZ";
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.UpdateAsync(v.Id, null!), v)
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void E100_Delete()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertOK();
-
-            // Delete it.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.DeleteAsync(2.ToGuid()))
-                .AssertNoContent();
-
-            // Must not exist.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(2.ToGuid()))
-                .AssertNotFound();
-
-            // Delete it again; should appear as if deleted as operation is considered idempotent.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.DeleteAsync(2.ToGuid()))
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void F100_Patch_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeResultController>()
-                .RunContent(c => c.PatchAsync(404.ToGuid(), null!), "{}", HttpConsts.MergePatchMediaTypeName)
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void F110_Patch_Concurrency()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            test.Controller<EmployeeResultController>()
-                .RunContent(c => c.PatchAsync(v.Id, null!), $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new HttpRequestOptions { ETag = "ZZZZZZZZZZZZ" })
-                .AssertPreconditionFailed();
-        }
-
-        [Test]
-        public void F120_Patch()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            // Get current.
-            var v = test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(4.ToGuid()))
-                .AssertOK()
-                .GetValue<Employee>()!;
-
-            // Patch it with errant etag.
-            v.FirstName += "X";
-
-            v = test.Controller<EmployeeResultController>()
-                .RunContent(c => c.PatchAsync(v.Id, null!), $"{{ \"firstName\": \"{v.FirstName}\" }}", HttpConsts.MergePatchMediaTypeName, new HttpRequestOptions { ETag = v.ETag })
-                .AssertOK()
-                .AssertValue(v, "ETag")
-                .GetValue<Employee>()!;
-
-            // Get again and check all.
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.GetAsync(v.Id))
-                .AssertOK()
-                .AssertValue(v);
-        }
-
-        [Test]
-        public void G100_Verify_NotFound()
-        {
-            using var test = ApiTester.Create<Startup>();
-
-            test.Controller<EmployeeResultController>()
-                .Run(c => c.VerifyAsync(404.ToGuid()))
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void G100_Verify_Publish()
-        {
-            using var test = ApiTester.Create<Startup>();
-            var imp = new InMemoryPublisher(test.Logger);
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Controller<EmployeeResultController>()
-                .Run(c => c.VerifyAsync(1.ToGuid()))
-                .AssertAccepted();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-            var e = imp.GetEvents("pendingVerifications");
-            Assert.That(e, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new EmployeeVerificationRequest { Name = "Wendy", Age = 39, Gender = "F" }, e[0].Value);
-        }
-
-        [Test]
-        public void G100_Verify_Publish_WithExpectations()
-        {
-            using var test = ApiTester.Create<Startup>();
-            test.UseExpectedEvents()
-                .Controller<EmployeeResultController>()
-                .ExpectDestinationEvent("pendingVerifications", new EventData<EmployeeVerificationRequest> { Value = new EmployeeVerificationRequest { Name = "Wendy", Age = 39, Gender = "F" } })
-                .ExpectStatusCode(System.Net.HttpStatusCode.Accepted)
-                .Run(c => c.VerifyAsync(1.ToGuid()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/HttpTriggerQueueVerificationFunctionTest.cs b/samples/My.Hr/My.Hr.UnitTest/HttpTriggerQueueVerificationFunctionTest.cs
deleted file mode 100644
index 9d9afc21..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/HttpTriggerQueueVerificationFunctionTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using CoreEx.Events;
-using My.Hr.Business.External.Contracts;
-using My.Hr.Functions;
-using NUnit.Framework;
-using System.Net.Http;
-using UnitTestEx;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    public class HttpTriggerQueueVerificationFunctionTest
-    {
-        [Test]
-        public void A110_Verify_Success()
-        {
-            var test = FunctionTester.Create<Startup>();
-            var imp = new InMemoryPublisher(test.Logger);
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .HttpTrigger<HttpTriggerQueueVerificationFunction>()
-                .Run(f => f.RunAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "employee/verify", new EmployeeVerificationRequest { Name = "Wendy", Age = 37, Gender = "F" })))
-                .AssertAccepted();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-
-            var e = imp.GetEvents("pendingVerifications");
-            Assert.That(e, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new EmployeeVerificationRequest { Name = "Wendy", Age = 37, Gender = "F" }, e[0].Value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj b/samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj
deleted file mode 100644
index 8e4ca919..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/My.Hr.UnitTest.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Data\Data.yaml" />
-    <None Remove="Resources\VerificationResult.Unix.json" />
-    <None Remove="Resources\VerificationResult.Win32.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Data.yaml" />
-    <EmbeddedResource Include="Resources\VerificationResult.Unix.json" />
-    <EmbeddedResource Include="Resources\VerificationResult.Win32.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="UnitTestEx.NUnit" Version="5.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting.Azure.Functions\CoreEx.UnitTesting.Azure.Functions.csproj" />
-    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting.Azure.ServiceBus\CoreEx.UnitTesting.Azure.ServiceBus.csproj" />
-    <ProjectReference Include="..\My.Hr.Api\My.Hr.Api.csproj" />
-    <ProjectReference Include="..\My.Hr.Business\My.Hr.Business.csproj" />
-    <ProjectReference Include="..\My.Hr.Database\My.Hr.Database.csproj" />
-    <ProjectReference Include="..\My.Hr.Functions\My.Hr.Functions.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.unittest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/My.Hr/My.Hr.UnitTest/OneTimeSetUp.cs b/samples/My.Hr/My.Hr.UnitTest/OneTimeSetUp.cs
deleted file mode 100644
index e55a1eb6..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/OneTimeSetUp.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using NUnit.Framework;
-using UnitTestEx;
-
-namespace My.Hr.UnitTest
-{
-    [SetUpFixture]
-    public class OneTimeSetUp
-    {
-        [OneTimeSetUp]
-        public void OneTime()
-        {
-            // Configure the TestSetUp to use the CoreEx-based Newtonsoft.Json.JsonSerialize; needed to enable the deserialization of RefData.
-            TestSetUp.Default.JsonSerializer = new CoreEx.Newtonsoft.Json.JsonSerializer().ToUnitTestEx();
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/ReferenceDataControllerTest.cs b/samples/My.Hr/My.Hr.UnitTest/ReferenceDataControllerTest.cs
deleted file mode 100644
index 92a76751..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/ReferenceDataControllerTest.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using CoreEx.Http;
-using CoreEx.Text.Json;
-using My.Hr.Api;
-using My.Hr.Api.Controllers;
-using My.Hr.Business.Models;
-using NUnit.Framework;
-using System.Linq;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    [Category("WithDB")]
-    public class ReferenceDataControllerTest
-    {
-        [OneTimeSetUp]
-        public Task Init() => EmployeeControllerTest.Init();
-
-        [Test]
-        public void A100_USState_All()
-        {
-            using var test = ApiTester.Create<Startup>().UseJsonSerializer(new ReferenceDataContentJsonSerializer().ToUnitTestEx());
-
-            var v = test.Controller<ReferenceDataController>()
-                .Run(c => c.USStateGetAll(null, null))
-                .AssertOK()
-                .GetValue<USState[]>()!;
-
-            Assert.That(v, Has.Length.EqualTo(50));
-        }
-
-        [Test]
-        public void A110_USState_Codes()
-        {
-            using var test = ApiTester.Create<Startup>().UseJsonSerializer(new ReferenceDataContentJsonSerializer().ToUnitTestEx());
-
-            var v = test.Controller<ReferenceDataController>()
-                .Run(c => c.USStateGetAll(new string[] { "WA", "CO" }, null))
-                .AssertOK()
-                .GetValue<USState[]>()!;
-
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v.Select(x => x.Code), Is.EqualTo(new string[] { "CO", "WA" }));
-        }
-
-        [Test]
-        public void A120_USState_Text()
-        {
-            using var test = ApiTester.Create<Startup>().UseJsonSerializer(new ReferenceDataContentJsonSerializer().ToUnitTestEx());
-
-            var v = test.Controller<ReferenceDataController>()
-                .Run(c => c.USStateGetAll(null, "*or*"))
-                .AssertOK()
-                .GetValue<USState[]>()!;
-
-            Assert.That(v, Has.Length.EqualTo(8));
-            var x = v.Select(x => x.Code);
-            Assert.That(v.Select(x => x.Code), Is.EqualTo(new string[] { "CA", "CO", "FL", "GA", "NY", "NC", "ND", "OR" }));
-        }
-
-        [Test]
-        public void A130_USState_FieldsAndNotModified()
-        {
-            using var test = ApiTester.Create<Startup>().UseJsonSerializer(new ReferenceDataContentJsonSerializer().ToUnitTestEx());
-
-            var r = test.Controller<ReferenceDataController>()
-                .Run(c => c.USStateGetAll(new string[] { "WA", "CO" }, null), requestOptions: new HttpRequestOptions().Include("code", "text"))
-                .AssertOK()
-                .AssertJson("[{\"code\":\"CO\",\"text\":\"Colorado\"},{\"code\":\"WA\",\"text\":\"Washington\"}]");
-
-            test.Controller<ReferenceDataController>()
-                .Run(c => c.USStateGetAll(new string[] { "WA", "CO" }, null), requestOptions: new HttpRequestOptions { ETag = r.Response?.Headers?.ETag?.Tag }.Include("code", "text"))
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void B100_Gender_All()
-        {
-            using var test = ApiTester.Create<Startup>().UseJsonSerializer(new ReferenceDataContentJsonSerializer().ToUnitTestEx());
-
-            var v = test.Controller<ReferenceDataController>()
-                .Run(c => c.GenderGetAll(null, null))
-                .AssertOK()
-                .GetValue<Gender[]>()!;
-
-            Assert.That(v, Has.Length.EqualTo(3));
-        }
-
-        [Test]
-        public void C100_Named()
-        {
-            using var test = ApiTester.Create<Startup>().UseJsonSerializer(new ReferenceDataContentJsonSerializer().ToUnitTestEx());
-
-            var r = test.Controller<ReferenceDataController>()
-                .Run(c => c.GetNamed(), requestOptions: new HttpRequestOptions { UrlQueryString = "gender&usstate" })
-                .AssertOK();
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/Resources/VerificationResult.Unix.json b/samples/My.Hr/My.Hr.UnitTest/Resources/VerificationResult.Unix.json
deleted file mode 100644
index 1aab9ecb..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/Resources/VerificationResult.Unix.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "age": 64,
-  "gender": "female",
-  "genderProbability": 0.97,
-  "country": [
-    {
-      "country_Id": "SV",
-      "probability": 0.07477553
-    },
-    {
-      "country_Id": "GT",
-      "probability": 0.07223318
-    },
-    {
-      "country_Id": "NL",
-      "probability": 0.067494206
-    }
-  ],
-  "verificationMessages": [
-    "Performed verification for Wendy, F age 37. \n            Engine predicted age was 64. \n            Engine predicted gender was female with 97% probability.\n            Most likely nationality of Wendy is SV with 7% probability",
-    "Employee age (37) is not within range of 10 years of predicted age: 64",
-    "Employee gender (F) doesn\u0027t match predicted gender: female"
-  ],
-  "request": {
-    "name": "Wendy",
-    "age": 37,
-    "gender": "F"
-  }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/Resources/VerificationResult.Win32.json b/samples/My.Hr/My.Hr.UnitTest/Resources/VerificationResult.Win32.json
deleted file mode 100644
index 651f0321..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/Resources/VerificationResult.Win32.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "age": 64,
-  "gender": "female",
-  "genderProbability": 0.97,
-  "country": [
-    {
-      "country_Id": "SV",
-      "probability": 0.07477553
-    },
-    {
-      "country_Id": "GT",
-      "probability": 0.07223318
-    },
-    {
-      "country_Id": "NL",
-      "probability": 0.067494206
-    }
-  ],
-  "verificationMessages": [
-    "Performed verification for Wendy, F age 37. \r\n            Engine predicted age was 64. \r\n            Engine predicted gender was female with 97% probability.\r\n            Most likely nationality of Wendy is SV with 7% probability",
-    "Employee age (37) is not within range of 10 years of predicted age: 64",
-    "Employee gender (F) doesn\u0027t match predicted gender: female"
-  ],
-  "request": {
-    "name": "Wendy",
-    "age": 37,
-    "gender": "F"
-  }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/ServiceBusExecuteVerificationFunctionTest.cs b/samples/My.Hr/My.Hr.UnitTest/ServiceBusExecuteVerificationFunctionTest.cs
deleted file mode 100644
index 86e01af3..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/ServiceBusExecuteVerificationFunctionTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using CoreEx.Events;
-using System;
-using System.Net.Http;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using Moq;
-using My.Hr.Business.External.Contracts;
-using My.Hr.Functions;
-using NUnit.Framework;
-using UnitTestEx;
-
-namespace My.Hr.UnitTest
-{
-    [TestFixture]
-    public class ServiceBusExecuteVerificationFunctionTest
-    {
-        [Test]
-        public void A110_Verify_Success()
-        {
-            var test = FunctionTester.Create<Startup>();
-            var imp = new InMemoryPublisher(test.Logger);
-            var evr = new EmployeeVerificationRequest { Name = "Wendy", Age = 37, Gender = "F" };
-            var sbm = test.CreateServiceBusMessageFromValue(evr);
-            var sba = new Mock<ServiceBusMessageActions>();
-
-            var mcf = MockHttpClientFactory.Create();
-            var agify = mcf.CreateClient("Agify");
-            var nationalize = mcf.CreateClient("Nationalize");
-            var genderize = mcf.CreateClient("Genderize");
-
-            agify.Request(HttpMethod.Get, $"https://api.agify.mock.io/?name={evr.Name}")
-                .Respond.WithJson(new
-                {
-                    age = 64,
-                    count = 82293,
-                    name = evr.Name
-                });
-            nationalize.Request(HttpMethod.Get, $"https://api.nationalize.mock.io/?name={evr.Name}")
-                .Respond.WithJson(new
-                {
-                    country = new[]{
-                        new {
-                            country_Id= "SV",
-                            probability= 0.07477553
-                        },
-                        new {
-                            country_Id= "GT",
-                            probability= 0.07223318
-                        },
-                        new {
-                            country_Id= "NL",
-                            probability= 0.067494206
-                        }},
-                    name = evr.Name
-                });
-            genderize.Request(HttpMethod.Get, $"https://api.genderize.mock.io/?name={evr.Name}")
-                .Respond.WithJson(new
-                {
-                    count = 176697,
-                    gender = "female",
-                    name = evr.Name,
-                    probability = 0.97
-                });
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .ReplaceHttpClientFactory(mcf)
-                .ServiceBusTrigger<ServiceBusExecuteVerificationFunction>()
-                .Run(f => f.RunAsync(sbm, sba.Object))
-                .AssertSuccess();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-            var e = imp.GetEvents("verificationResults");
-            Assert.That(e, Has.Length.EqualTo(1));
-            if (Environment.OSVersion.Platform == PlatformID.Unix)
-                ObjectComparer.Assert(UnitTestEx.Resource.GetJsonValue<EmployeeVerificationResponse>("VerificationResult.Unix.json"), e[0].Value);
-            else
-                ObjectComparer.Assert(UnitTestEx.Resource.GetJsonValue<EmployeeVerificationResponse>("VerificationResult.Win32.json"), e[0].Value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.UnitTest/appsettings.unittest.json b/samples/My.Hr/My.Hr.UnitTest/appsettings.unittest.json
deleted file mode 100644
index 79ed8e38..00000000
--- a/samples/My.Hr/My.Hr.UnitTest/appsettings.unittest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "DOTNET_ENVIRONMENT": "Development",
-  "VerificationResultsQueueName": "verificationResults",
-  "VerificationQueueName": "pendingVerifications",
-  "ServiceBusConnection__fullyQualifiedNamespace": "Endpoint=sb://top-secret.servicebus.windows.net/;SharedAccessKeyName=top-secret;SharedAccessKey=top-encrypted-secret;",
-  "AgifyApiEndpointUri": "https://api.agify.mock.io",
-  "NationalizeApiClientApiEndpointUri": "https://api.nationalize.mock.io",
-  "GenderizeApiClientApiEndpointUri": "https://api.genderize.mock.io",
-  "logging": {
-    "logLevel": {
-      "default": "debug"
-    }
-  }
-}
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.sln b/samples/My.Hr/My.Hr.sln
deleted file mode 100644
index e7600107..00000000
--- a/samples/My.Hr/My.Hr.sln
+++ /dev/null
@@ -1,58 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.Api", "My.Hr.Api\My.Hr.Api.csproj", "{F69909C8-9E50-4A26-8609-5B25D4F8C315}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.Database", "My.Hr.Database\My.Hr.Database.csproj", "{092B22E9-F40D-4155-B174-EED58F0F3207}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.Business", "My.Hr.Business\My.Hr.Business.csproj", "{BA634B6B-E0CF-4066-A225-E6D9C43D7F0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.Functions", "My.Hr.Functions\My.Hr.Functions.csproj", "{A62BAA55-0737-4671-BF31-89D4BE7C4097}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.Infra", "My.Hr.Infra\My.Hr.Infra.csproj", "{E448EFD6-5CA6-4C71-B575-1149DD7181C6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.Infra.Tests", "My.Hr.Infra.Tests\My.Hr.Infra.Tests.csproj", "{01B0FC8E-738D-47BB-AA57-F880532A501D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "My.Hr.UnitTest", "My.Hr.UnitTest\My.Hr.UnitTest.csproj", "{EE307518-D5FD-45B3-9A61-4451DFC44835}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F69909C8-9E50-4A26-8609-5B25D4F8C315}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F69909C8-9E50-4A26-8609-5B25D4F8C315}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F69909C8-9E50-4A26-8609-5B25D4F8C315}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F69909C8-9E50-4A26-8609-5B25D4F8C315}.Release|Any CPU.Build.0 = Release|Any CPU
-		{092B22E9-F40D-4155-B174-EED58F0F3207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{092B22E9-F40D-4155-B174-EED58F0F3207}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{092B22E9-F40D-4155-B174-EED58F0F3207}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{092B22E9-F40D-4155-B174-EED58F0F3207}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA634B6B-E0CF-4066-A225-E6D9C43D7F0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA634B6B-E0CF-4066-A225-E6D9C43D7F0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA634B6B-E0CF-4066-A225-E6D9C43D7F0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA634B6B-E0CF-4066-A225-E6D9C43D7F0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A62BAA55-0737-4671-BF31-89D4BE7C4097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A62BAA55-0737-4671-BF31-89D4BE7C4097}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A62BAA55-0737-4671-BF31-89D4BE7C4097}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A62BAA55-0737-4671-BF31-89D4BE7C4097}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E448EFD6-5CA6-4C71-B575-1149DD7181C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E448EFD6-5CA6-4C71-B575-1149DD7181C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E448EFD6-5CA6-4C71-B575-1149DD7181C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E448EFD6-5CA6-4C71-B575-1149DD7181C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01B0FC8E-738D-47BB-AA57-F880532A501D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01B0FC8E-738D-47BB-AA57-F880532A501D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01B0FC8E-738D-47BB-AA57-F880532A501D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01B0FC8E-738D-47BB-AA57-F880532A501D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE307518-D5FD-45B3-9A61-4451DFC44835}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE307518-D5FD-45B3-9A61-4451DFC44835}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE307518-D5FD-45B3-9A61-4451DFC44835}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE307518-D5FD-45B3-9A61-4451DFC44835}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/samples/README.md b/samples/README.md
new file mode 100644
index 00000000..6d348b60
--- /dev/null
+++ b/samples/README.md
@@ -0,0 +1,222 @@
+# Contoso Samples
+
+The `samples` folder contains reference implementations of three domain microservices built with CoreEx: **Products**, **Shopping**, and **Orders** (Orders workflow is work in progress).
+
+Each domain is an independently deployable unit with an API host, an Outbox Relay host, and an Event Subscriber host, backed by an applicable data repository, and connected to other domains via synchronous HTTP and asynchronous messaging over Azure Service Bus.
+
+> **Documentation** — detailed guides for layers, patterns, tooling, and testing are in [`samples/docs`](docs/).
+>
+> | Guide | Description |
+> |---|---|
+> | [Layers](docs/layers.md) | Business and host layer overview with dependency diagram |
+> | [Patterns](docs/patterns.md) | Catalog of architectural patterns implemented across the samples |
+> | [Tooling](docs/tooling.md) | Code generation (`*.CodeGen`) and database management (`*.Database`) |
+> | [Testing](docs/testing.md) | Unit, intra-domain, inter-domain, and E2E testing strategy |
+> | [Aspire & E2E](docs/aspire.md) | Local orchestration and cross-domain end-to-end validation |
+
+## Architecture
+
+The domains communicate via synchronous HTTP and asynchronous messaging over Azure Service Bus.
+
+```mermaid
+graph TB
+    subgraph INFRA["Shared Infrastructure"]
+        direction LR
+        SQLSERVER[("SQL Server\n:1433")]
+        REDIS[("Redis\n:6379")]
+        ASB[["Azure Service Bus\nEmulator\n:5672"]]
+        ASPIRE["Aspire Dashboard\n:18888"]
+    end
+
+    subgraph PRODUCTS["Contoso.Products Domain"]
+        direction TB
+        PAPI["Products API\n─────────────────\nGET/POST/PUT/PATCH/DELETE /products\nPOST /inventory/reserve\nPOST /inventory/adjust\nGET /products/{id}/on-hand\nGET /refdata"]
+        PAPP["Products Application\n─────────────────\nProductService\nMovementService\nInventoryService"]
+        PINFRA["Products Infrastructure\n─────────────────\nProductRepository\nMovementRepository\nInventoryRepository\nProductsOutboxPublisher"]
+        PSUBSCRIBE["Products.Subscribe\n─────────────────\nReservationConfirmSubscriber\nReservationCancelSubscriber"]
+        POUTBOX["Products.Relay\n─────────────────\nOutbox to Service Bus\nPartitioned relay"]
+        PDB[("SQL Server\n[Products] schema\n─────────────\nProduct\nInventory\nMovement\nOutbox / OutboxLease\nRef data")]
+    end
+
+    subgraph SHOPPING["Contoso.Shopping Domain"]
+        direction TB
+        SAPI["Shopping API\n─────────────────\nPOST /customers/{id}/baskets\nPOST /{id}/checkout\nPUT /{id}/apply-discount\nPOST/PUT/DELETE /{id}/items\nGET /baskets"]
+        SAPP["Shopping Application\n─────────────────\nBasketService\nBasketReadService"]
+        SDOMAIN["Shopping Domain\n─────────────────\nBasket (Aggregate Root)\nBasketItem (Entity)\nItemPricing (Value Object)"]
+        SINFRA["Shopping Infrastructure\n─────────────────\nBasketRepository\nShoppingOutboxPublisher\nProductAdapter (ACL)\nProductsHttpClient\nProductSyncAdapter"]
+        SSUBSCRIBE["Shopping.Subscribe\n─────────────────\nProductModifySubscriber\nProductDeleteSubscriber"]
+        SOUTBOX["Shopping.Relay\n─────────────────\nOutbox to Service Bus\nPartitioned relay"]
+        SDB[("SQL Server\n[Shopping] schema\n─────────────\nBasket\nBasketItem\nProduct (replica)\nOutbox / OutboxLease\nRef data")]
+    end
+
+    PAPI --> PAPP
+    PAPP --> PINFRA
+    PINFRA --> PDB
+    POUTBOX -->|"Poll Outbox table"| PDB
+
+    SAPI --> SAPP
+    SAPP --> SDOMAIN
+    SAPP --> SINFRA
+    SINFRA --> SDB
+    SOUTBOX -->|"Poll Outbox table"| SDB
+    SINFRA -->|"L1/L2 Hybrid Cache"| REDIS
+
+    SINFRA -->|"① HTTP POST /api/inventory/reserve\nReserve inventory at checkout"| PAPI
+
+    POUTBOX -->|"② Publish product.created/updated/deleted"| ASB
+    ASB -->|"③ Consume product events (replication)"| SSUBSCRIBE
+    SSUBSCRIBE -->|"④ Sync product replica"| SDB
+
+    SOUTBOX -->|"⑤ Publish reservation.confirm (on checkout success)"| ASB
+    SINFRA -->|"⑥ Publish reservation.cancel (on checkout failure, direct)"| ASB
+    ASB -->|"⑦ Consume reservation commands"| PSUBSCRIBE
+    PSUBSCRIBE --> PAPP
+
+    PDB --- SQLSERVER
+    SDB --- SQLSERVER
+
+    PAPI -.->|"OpenTelemetry"| ASPIRE
+    SAPI -.->|"OpenTelemetry"| ASPIRE
+```
+
+### Inter-Domain Communication
+
+| Flow | Direction | Mechanism |
+|---|---|---|
+| ① Inventory reservation | Shopping → Products | Synchronous HTTP — `ProductAdapter` calls `POST /api/inventory/reserve` at basket checkout. |
+| ② – ④ Product replication | Products → Shopping | Products Outbox → Relay → Service Bus → `Shopping.Subscribe` keeps a local product replica in sync. |
+| ⑤ – ⑦ Reservation commands | Shopping → Products | On checkout success the outbox enqueues `reservation.confirm`; on failure Shopping publishes `reservation.cancel` directly to Service Bus (the transaction has already rolled back). |
+
+See [Patterns](docs/patterns.md) for the full catalog of architectural patterns demonstrated across the samples.
+
+## Project Layout
+
+| Path | Purpose |
+|---|---|
+| `src/Contoso.Products.*` | Products domain — Contracts, Application, Infrastructure, API, Relay, Subscribe, CodeGen, Database |
+| `src/Contoso.Shopping.*` | Shopping domain — same layer split plus Domain aggregate |
+| `src/Contoso.Orders.*` | Orders domain (work in progress) |
+| `aspire/Contoso.Aspire` | Aspire AppHost — orchestrates all hosts for local development and E2E validation |
+| `tests/Contoso.*.Test.*` | Unit, API, Relay, and Subscribe test projects per domain |
+| `tests/Contoso.E2E.Runner` | Interactive E2E and load-simulation console runner |
+
+See [Layers](docs/layers.md) for the full layer-by-layer breakdown of each project's responsibilities.
+
+## Prerequisites
+
+- .NET SDK targeting `net8.0`, `net9.0`, and `net10.0` (a current .NET 10 SDK is sufficient).
+- A container runtime (Docker or Podman).
+- Aspire CLI:
+
+  ```bash
+  # Windows (PowerShell)
+  iwr -useb https://aspire.dev/install.ps1 | iex
+
+  # Linux/macOS
+  curl -sSL https://aspire.dev/install.sh | bash
+  ```
+
+  Verify with `aspire --version`. See [aspire.dev/get-started/install-cli](https://aspire.dev/get-started/install-cli/) for details.
+
+## Getting Started
+
+### 1 — Start Infrastructure
+
+```bash
+podman compose -f docker-compose.yml up -d
+```
+
+This starts the required data store(s), Redis, and the Azure Service Bus emulator.
+
+### 2 — Initialize Databases
+
+Run migrations and seed reference data for each domain:
+
+```bash
+dotnet run --project samples/src/Contoso.Products.Database -- All
+dotnet run --project samples/src/Contoso.Shopping.Database -- All
+dotnet run --project samples/src/Contoso.Orders.Database   -- All
+```
+
+> The E2E runner's **Database Migration and Base Data Refresh** option can also apply pending migrations across all domains without restarting hosts. See [Aspire & E2E](docs/aspire.md) for details.
+
+See [Tooling](docs/tooling.md) for the full list of database commands and what each does.
+
+### 3 — Start All Hosts
+
+```bash
+aspire run
+```
+
+This starts every domain API, Outbox Relay, and Subscribe host as a single distributed application and opens the Aspire Dashboard for centralized logs, traces, and metrics. See [Aspire & E2E](docs/aspire.md) for a full walkthrough.
+
+### 4 — Run Tests
+
+```bash
+dotnet test samples/tests/Contoso.Products.Test.Unit
+dotnet test samples/tests/Contoso.Products.Test.Api
+dotnet test samples/tests/Contoso.Products.Test.Relay
+dotnet test samples/tests/Contoso.Products.Test.Subscribe
+dotnet test samples/tests/Contoso.Shopping.Test.Api
+```
+
+The required infrastructure (data store, Redis, Service Bus emulator) must be running for API, Relay, and Subscribe tests.
+
+See [Testing](docs/testing.md) for an explanation of test taxonomy, intra-domain vs inter-domain boundaries, data seeding, mock patterns, and the fluent assertion model.
+
+### 5 — Run E2E Scenarios
+
+```bash
+dotnet run --project samples/tests/Contoso.E2E.Runner
+```
+
+The runner drives real HTTP calls across all domains, supports one-shot scenarios and parallel load simulation, and requires all hosts to be running (step 3 above).
+
+See [Aspire & E2E](docs/aspire.md) for the interactive menu reference, configuration, and recommended first-run order.
+
+## Stop Infrastructure
+
+```bash
+podman compose -f docker-compose.yml down
+```
+
+## Troubleshooting
+
+### Outbox Relay Does Not Pick Up Messages
+
+Symptom:
+
+- API operations succeed but published events are not processed by the relay/subscriber as expected.
+
+Likely cause:
+
+- Local machine UTC time is skewed relative to message timestamps (clock drift where local UTC is ahead of expected outbox processing windows).
+
+What to try:
+
+1. Verify and correct system date/time and time zone settings.
+2. Restart the outbox relay host (or restart all sample hosts from Aspire).
+3. If the behavior persists, restart the machine to force a clean time sync.
+
+### Dependencies Not Healthy
+
+Symptom:
+
+- Hosts fail on startup or repeatedly log dependency connectivity errors.
+
+What to try:
+
+1. Ensure infrastructure containers are running: `podman compose -f docker-compose.yml up -d`.
+2. Check container health: `docker ps` or `podman ps`.
+3. Restart containers: `podman compose -f docker-compose.yml down && podman compose -f docker-compose.yml up -d`.
+
+### Database Errors On Startup
+
+Symptom:
+
+- API or relay hosts fail with database or schema-related errors.
+
+What to try:
+
+1. Re-run migrations and data seeding for the affected domain (step 2 above).
+2. Confirm the data store container(s) are healthy before restarting hosts.
diff --git a/samples/aspire.config.json b/samples/aspire.config.json
new file mode 100644
index 00000000..e97bd8dd
--- /dev/null
+++ b/samples/aspire.config.json
@@ -0,0 +1,5 @@
+{
+  "appHost": {
+    "path": "aspire/Contoso.Aspire/Contoso.Aspire.csproj"
+  }
+}
\ No newline at end of file
diff --git a/samples/aspire/Contoso.Aspire/AppHost.cs b/samples/aspire/Contoso.Aspire/AppHost.cs
new file mode 100644
index 00000000..218fc65e
--- /dev/null
+++ b/samples/aspire/Contoso.Aspire/AppHost.cs
@@ -0,0 +1,48 @@
+var builder = DistributedApplication.CreateBuilder(args);
+
+// Products domain.
+builder.AddProject<Projects.Contoso_Products_Api>("products-api").AddEndpoints("/health/ready/detailed");
+builder.AddProject<Projects.Contoso_Products_Relay>("products-relay").AddEndpoints("/health/ready/detailed").AddHostedServiceSupport();
+builder.AddProject<Projects.Contoso_Products_Subscribe>("products-subscribe").AddEndpoints("/health/ready/detailed").AddHostedServiceSupport();
+
+// Shopping domain.
+builder.AddProject<Projects.Contoso_Shopping_Api>("shopping-api").AddEndpoints("/health/ready/detailed");
+builder.AddProject<Projects.Contoso_Shopping_Relay>("shopping-relay").AddEndpoints("/health/ready/detailed").AddHostedServiceSupport();
+builder.AddProject<Projects.Contoso_Shopping_Subscribe>("shopping-subscribe").AddEndpoints("/health/ready/detailed").AddHostedServiceSupport();
+
+// Orders domain.
+var orderWorkflowWorker = builder.AddProject<Projects.Contoso_Order_Workflow_Worker>("order-workflow-worker").AddEndpoints("/health").WithUrlForEndpoint("https", ep => { ep.Url = "http://localhost:8082"; ep.DisplayText = "DTS Dashboard"; });
+builder.AddProject<Projects.Contoso_Orders_Api>("orders-api").WaitFor(orderWorkflowWorker).AddEndpoints("/health/ready/detailed");
+
+builder.Build().Run();
+
+
+internal static class Extensions
+{
+    public static IResourceBuilder<ProjectResource> AddEndpoints(this IResourceBuilder<ProjectResource> builder, params string[] urls)
+    {
+        var httpEndpoint = builder.GetEndpoint("http");
+        foreach (var url in urls)
+        {
+            builder.WithAnnotation(new ResourceUrlAnnotation { Endpoint = httpEndpoint, Url = url });
+        }
+
+        return builder;
+    }
+
+    // Icons: https://storybooks.fluentui.dev/react/?path=/docs/icons-catalog--docs
+    public static IResourceBuilder<ProjectResource> AddCommand(this IResourceBuilder<ProjectResource> builder, HttpMethod method, string path, string displayName, string? iconName)
+        => builder.WithHttpCommand(
+            path: path,
+            displayName: displayName,
+            commandOptions: new HttpCommandOptions()
+            {
+                Method = method,
+                IconName = iconName
+            });
+
+    public static IResourceBuilder<ProjectResource> AddHostedServiceSupport(this IResourceBuilder<ProjectResource> builder)
+        => builder.AddEndpoints("/hosted-services/all/status")
+            .AddCommand(HttpMethod.Post, "/hosted-services/all/pause", "Pause all services", "Pause")
+            .AddCommand(HttpMethod.Post, "/hosted-services/all/resume", "Resume all services", "PauseOff");
+}
\ No newline at end of file
diff --git a/samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj b/samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj
new file mode 100644
index 00000000..7ca9d9af
--- /dev/null
+++ b/samples/aspire/Contoso.Aspire/Contoso.Aspire.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Aspire.AppHost.Sdk/13.2.4">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <LangVersion>preview</LangVersion>
+    <UserSecretsId>6a58b94b-d2ff-413a-9e03-e9995a3de4dd</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Contoso.Orders.Api\Contoso.Orders.Api.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Order.Workflow.Worker\Contoso.Order.Workflow.Worker.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Api\Contoso.Products.Api.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Relay\Contoso.Products.Relay.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Subscribe\Contoso.Products.Subscribe.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Api\Contoso.Shopping.Api.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Relay\Contoso.Shopping.Relay.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Subscribe\Contoso.Shopping.Subscribe.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/aspire/Contoso.Aspire/Properties/launchSettings.json b/samples/aspire/Contoso.Aspire/Properties/launchSettings.json
new file mode 100644
index 00000000..b2be8848
--- /dev/null
+++ b/samples/aspire/Contoso.Aspire/Properties/launchSettings.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17226;http://localhost:15174",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21214",
+        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "https://localhost:23264",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22026"
+      }
+    },
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "http://localhost:15174",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "ASPIRE_ALLOW_UNSECURED_TRANSPORT": "true",
+        "ASPIRE_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19016",
+        "ASPIRE_DASHBOARD_MCP_ENDPOINT_URL": "http://localhost:18153",
+        "ASPIRE_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20286"
+      }
+    }
+  }
+}
diff --git a/samples/aspire/Contoso.Aspire/appsettings.Development.json b/samples/aspire/Contoso.Aspire/appsettings.Development.json
new file mode 100644
index 00000000..1b2d3baf
--- /dev/null
+++ b/samples/aspire/Contoso.Aspire/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/aspire/Contoso.Aspire/appsettings.json b/samples/aspire/Contoso.Aspire/appsettings.json
new file mode 100644
index 00000000..888f884e
--- /dev/null
+++ b/samples/aspire/Contoso.Aspire/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/docs/application-layer.md b/samples/docs/application-layer.md
new file mode 100644
index 00000000..39a551b2
--- /dev/null
+++ b/samples/docs/application-layer.md
@@ -0,0 +1,215 @@
+# Application Layer
+
+The Application layer is the **business logic orchestration hub**. It owns all use-case logic: input validation, state loading, mutation coordination, and event publishing. It depends only on the Contracts layer and on its own interface abstractions — it has no knowledge of EF Core, HTTP clients, or any persistence technology.
+
+**Example projects**
+- [`samples/src/Contoso.Products.Application`](../src/Contoso.Products.Application)
+- [`samples/src/Contoso.Shopping.Application`](../src/Contoso.Shopping.Application)
+
+---
+
+## Services and interfaces
+
+Application services implement the domain use-cases. They are decorated with `[ScopedService<TInterface>]` so that the DI container registers them automatically when the host calls `AddDynamicServicesUsing<T>()` — no manual `services.AddScoped<…>()` wiring is needed.
+
+The pattern for a mutating operation is consistent across both domains:
+
+1. **Guard inputs** — null/empty checks, `ThrowIfNull()`.
+2. **Validate** — invoke a CoreEx `Validator<T>` and, either throw on failure or return a `Result<T>` indicating validation errors.
+3. **Load current state** — retrieve via the repository interface.
+4. **Mutate within a unit of work** — call `_unitOfWork.TransactionAsync(...)` which wraps the operation in a transaction and guarantees events are only dispatched on commit.
+5. **Raise events** — add an `EventData` instance to `_unitOfWork.Events` inside the same transactional scope.
+
+```csharp
+// samples/src/Contoso.Products.Application/ProductService.cs
+return await _unitOfWork.TransactionAsync(async () =>
+{
+    var dr = await _repository.CreateAsync(product).ConfigureAwait(false);
+    return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+}).ConfigureAwait(false);
+```
+
+Shopping uses `Result<T>` pipelines instead of exception-based control flow:
+
+```csharp
+// samples/src/Contoso.Shopping.Application/BasketService.cs
+return _unitOfWork.TransactionAsync(async () =>
+{
+    var br = await _repository.CreateAsync(aggregate).ConfigureAwait(false);
+    return br.ThenAs(b =>
+    {
+        var contract = BasketMapper.Map(b);
+        _unitOfWork.Events.Add(EventData.CreateEventWith(contract, EventAction.Created));
+        return contract;
+    });
+});
+```
+
+Each service interface lives in `Application/Interfaces/` and exposes only what consumers (for example, controllers) need, hiding implementation details behind the abstraction boundary.
+
+> **See also**: [`IUnitOfWork`](../../src/CoreEx/Entities/IUnitOfWork.cs) · [`EventData`](../../src/CoreEx.Events/EventData.cs) · [`[ScopedService]`](../../src/CoreEx/DependencyInjection/ScopedServiceAttribute.cs)
+
+---
+
+## Repository interfaces
+
+Repository interfaces (`Application/Repositories/`) define the **data contract** for the Application layer without coupling it to any persistence technology. They surface domain-idiomatic operations (`GetAsync`, `CreateAsync`, `QueryAsync`, etc.) and return CoreEx result types (`DataResult<T>`, `ItemsResult<T>`) rather than raw EF entities.
+
+```csharp
+// samples/src/Contoso.Products.Application/Repositories/IProductRepository.cs
+public interface IProductRepository
+{
+    Task<Contracts.Product?> GetAsync(string id);
+    Task<DataResult<Contracts.Product>> CreateAsync(Contracts.Product product);
+    Task<ItemsResult<Contracts.ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+    // ...
+}
+```
+
+The Infrastructure layer implements these interfaces; the Application layer never references Infrastructure assemblies directly.
+
+> **See also**: [`DataResult<T>`](../../src/CoreEx/Entities/DataResult.cs) · [`ItemsResult<T>`](../../src/CoreEx/Entities/ItemsResult.cs)
+
+---
+
+## Validators
+
+Validators live in `Application/Validators/` and extend CoreEx's `Validator<T>`. They combine two complementary styles that can be used independently or together:
+
+**Declarative** — property rules are composed fluently in the constructor using a rich built-in rule set (`Mandatory()`, `MaximumLength()`, `IsValid()`, `PrecisionScale()`, `GreaterThanOrEqualTo()`, `Dictionary()`, `Entity()`, etc.). These run synchronously and cheaply before any I/O is attempted.
+
+**Programmatic** — `OnValidateAsync` is overridden to add behavior that cannot be expressed declaratively: repository lookups, cross-property business rules, or dynamically-constructed validators built from retrieved data. The override pattern calls `context.ValidateFurtherAsync(...)` to compose additional property-level rules in the same structured way.
+
+The two phases integrate naturally: `OnValidateAsync` should guard with `if (context.HasErrors) return;` to fail fast and avoid unnecessary I/O when declarative rules have already failed.
+
+```csharp
+// samples/src/Contoso.Products.Application/Validators/ProductValidator.cs
+// Declarative-only — all rules expressed in the constructor.
+public class ProductValidator : Validator<Contracts.Product, ProductValidator>
+{
+    public ProductValidator()
+    {
+        Property(p => p.Sku).Mandatory().MaximumLength(50);
+        Property(p => p.SubCategory).Mandatory().IsValid();
+        Property(p => p.Price).PrecisionScale(null, 2).GreaterThanOrEqualTo(0, _ => "zero");
+    }
+}
+```
+
+```csharp
+// samples/src/Contoso.Products.Application/Validators/MovementRequestValidator.cs
+// Declarative + programmatic — constructor rules run first, then OnValidateAsync
+// performs a repository lookup and builds a second-pass validator from the result.
+public class MovementRequestValidator : Validator<Contracts.MovementRequest>
+{
+    private static readonly Validator<MovementRequestProduct> _productValidator = Validator.Create<MovementRequestProduct>()
+        .HasProperty(x => x.UnitOfMeasure, c => c.Mandatory().IsValid())
+        .HasProperty(x => x.Quantity, c => c.GreaterThanOrEqualTo(0)
+            .PrecisionScale(ctx => ctx.Entity.UnitOfMeasure!.Precision, ctx => ctx.Entity.UnitOfMeasure!.Scale)
+            .DependsOn(x => x.UnitOfMeasure));
+
+    private readonly IProductRepository _repository;
+
+    public MovementRequestValidator(IProductRepository repository)
+    {
+        _repository = repository.ThrowIfNull();
+
+        // Phase 1 — cheap declarative rules; run before any I/O.
+        Property(x => x.Id).Mandatory().MaximumLength(50);
+        Property(x => x.Products).Mandatory().Dictionary(c => c
+            .WithKeyValidator("Product", k => k.Mandatory().MaximumLength(50))
+            .WithValueValidator(v => v.Mandatory().Entity(_productValidator)));
+    }
+
+    protected async override Task OnValidateAsync(ValidationContext<MovementRequest> context, CancellationToken cancellationToken)
+    {
+        // Phase 2 — fail fast if phase 1 already found errors.
+        if (context.HasErrors) return;
+
+        // Load product data needed for business-rule validation.
+        var ids = context.Value.Products!.Select(kvp => kvp.Key).ToArray();
+        var products = await _repository.GetForReservationAsync(ids).ConfigureAwait(false);
+
+        // Dynamically build a validator using the retrieved data, then run it
+        // as a further structured validation pass on the same context.
+        var dv = Validator.Create<MovementRequestProduct>()
+            .HasProperty(x => x.UnitOfMeasure, c => c.Equal(
+                ctx => products[ctx.GetDictionaryKey<string>()].UnitOfMeasureCode));
+
+        await context.ValidateFurtherAsync(c => c
+            .HasProperty(x => x.Products, c => c.Dictionary(c => c
+                .WithKeyValidator("Product", k => k
+                    .NotFound().WhenValue(v => !products.ContainsKey(v))
+                    .Error("{0} is non-stocked and therefore cannot be transacted.").WhenValue(v => products[v].IsNonStocked)
+                    .Error("{0} is not active and therefore cannot be transacted.").WhenValue(v => products[v].IsInactive))
+                .WithValueValidator(dv))
+            ), cancellationToken).ConfigureAwait(false);
+    }
+}
+```
+
+> **See also**: [`Validator<T>`](../../src/CoreEx.Validation/Validator.cs) · [`IValidatorEx`](../../src/CoreEx.Validation/IValidatorEx.cs)
+
+---
+
+## Adapters (anti-corruption layer)
+
+When a domain needs to interact with another domain or external service, it defines an **adapter interface** in `Application/Adapters/`. This acts as an anti-corruption layer (ACL): the Application layer depends on a domain-idiomatic abstraction, not on the remote API's schema or transport. The concrete implementation lives in Infrastructure.
+
+Shopping's `IProductAdapter` is a clear example — it exposes basket-centric operations (`GetAsync`, `ReserveInventoryAsync`, `CancelReservationAsync`) rather than mirroring the Products API surface:
+
+```csharp
+// samples/src/Contoso.Shopping.Application/Adapters/Products/IProductAdapter.cs
+public interface IProductAdapter
+{
+    Task<Result<Product>> GetAsync(string id);
+    Task<Result> ReserveInventoryAsync(Domain.Basket basket);
+    Task<Result> CancelReservationAsync(Domain.Basket basket);
+}
+```
+
+A second interface, `IProductSyncAdapter`, handles the **event-driven data replication** path — receiving published product events from the Products domain and maintaining a local read-optimised copy within Shopping's own store.
+
+[`IProductSyncAdapter`](../src/Contoso.Shopping.Application/Adapters/Products/IProductSyncAdapter.cs)
+
+---
+
+## Mapping (Application-level)
+
+Shopping places a `Mapping/` sub-folder inside the Application layer to handle the translation between the **Domain aggregate** and the **Contract**. This mapping is an Application-layer concern because it sits at the boundary between the domain model and the public surface — it is not tied to any persistence technology.
+
+```csharp
+// samples/src/Contoso.Shopping.Application/Mapping/BasketMapper.cs
+public class BasketMapper : Mapper<Domain.Basket, Contracts.Basket, BasketMapper>
+{
+    protected override Contracts.Basket OnMap(Domain.Basket source) => new()
+    {
+        Id = source.Id,
+        StatusCode = source.Status,
+        Pricing = new BasketPricing { Total = source.Total, ... },
+        Items = [.. source.Items.Select(i => BasketItemMapper.Map(i))]
+    };
+}
+```
+
+(see [Infrastructure → Mapping](infrastructure-layer.md#mapping)).
+
+> **See also**: [`Mapper<TSource, TDest, TSelf>`](../../src/CoreEx/Mapping/Mapper.cs)
+
+---
+
+## Policies
+
+Policies (`Application/Policies/`) encapsulate **domain-level guard logic** that requires I/O (adapter or repository calls). They provide a named, independently testable home for rules that depend on external state and cannot be expressed in a validator alone (synchronous) or enforced directly in the domain model (no async I/O). A policy can be called from any point in service orchestration where the condition needs to be verified — for example, confirming that a referenced entity actually exists before proceeding with a mutation.
+
+```csharp
+// samples/src/Contoso.Shopping.Application/Policies/ProductPolicy.cs
+public class ProductPolicy(IProductAdapter productAdapter)
+{
+    public Task<Result<Product>> EnsureExistsAsync(string productId) => Result
+        .GoAsync(() => _productAdapter.GetAsync(productId))
+        .OnFailure(r => r.IsNotFoundError
+            ? Result.ValidationError(MessageItem.CreateErrorMessage(nameof(productId), "Product was not found."))
+            : r);
+}
+```
diff --git a/samples/docs/aspire.md b/samples/docs/aspire.md
new file mode 100644
index 00000000..9291ce65
--- /dev/null
+++ b/samples/docs/aspire.md
@@ -0,0 +1,191 @@
+# Aspire & End-to-End
+
+## Overview
+
+[.NET Aspire](https://learn.microsoft.com/en-us/dotnet/aspire/get-started/aspire-overview) is the local orchestration layer for the Contoso samples. It starts and manages all domain hosts simultaneously as a single distributed application, wires their OpenTelemetry signals into a central dashboard, and exposes health, log, trace, and metric views across every process in one place.
+
+Aspire is the required foundation for any activity that involves **cross-domain interaction** — because that interaction only exists when all hosts are running together. The intra-domain host tests (`*.Test.Api`, `*.Test.Subscribe`, `*.Test.Relay`) run in isolation and do not need Aspire; the E2E Runner does.
+
+---
+
+## What Aspire orchestrates
+
+The `Contoso.Aspire` AppHost (`samples/aspire/Contoso.Aspire/AppHost.cs`) registers all six production hosts and the Orders workflow worker:
+
+| Resource name | Host project | Endpoints exposed |
+|---|---|---|
+| `products-api` | `Contoso.Products.Api` | HTTP + `/health/ready/detailed` |
+| `products-relay` | `Contoso.Products.Relay` | HTTP + `/health/ready/detailed` + hosted-service controls |
+| `products-subscribe` | `Contoso.Products.Subscribe` | HTTP + `/health/ready/detailed` + hosted-service controls |
+| `shopping-api` | `Contoso.Shopping.Api` | HTTP + `/health/ready/detailed` |
+| `shopping-relay` | `Contoso.Shopping.Relay` | HTTP + `/health/ready/detailed` + hosted-service controls |
+| `shopping-subscribe` | `Contoso.Shopping.Subscribe` | HTTP + `/health/ready/detailed` + hosted-service controls |
+| `order-workflow-worker` | `Contoso.Order.Workflow.Worker` | HTTP + `/health` + DTS Dashboard link |
+| `orders-api` | `Contoso.Orders.Api` | HTTP + `/health/ready/detailed` (waits for workflow worker) |
+
+Hosted-service resources (outbox relays and subscribers) also get **Pause all services** and **Resume all services** commands surfaced as buttons in the Aspire Dashboard, backed by the `/hosted-services/all/pause` and `/hosted-services/all/resume` management endpoints. This allows controlled simulation of relay downtime or subscriber lag without restarting the process.
+
+---
+
+## Starting Aspire
+
+### Prerequisites
+
+Before starting Aspire, infrastructure containers must be running:
+
+```bash
+podman compose -f docker-compose.yml up -d
+```
+
+And databases must have been migrated and seeded at least once (see [tooling.md — Database Management](tooling.md#database-management-database)):
+
+```bash
+dotnet run --project samples/src/Contoso.Products.Database -- all
+dotnet run --project samples/src/Contoso.Shopping.Database -- all
+```
+
+### Start all hosts
+
+```bash
+# From repo root — using the Aspire CLI
+aspire run
+
+# Or using dotnet run directly
+dotnet run --project samples/aspire/Contoso.Aspire
+```
+
+Both commands start the AppHost, which in turn launches all registered projects as child processes. The Aspire Dashboard opens automatically in the browser.
+
+### Aspire Dashboard
+
+The dashboard (default: `http://localhost:15174`) provides:
+
+- **Resources** — live status, health endpoint results, and URLs for every host.
+- **Console logs** — per-resource structured log stream.
+- **Structured logs** — searchable across all resources by severity, trace ID, or message content.
+- **Traces** — distributed trace views showing cross-domain request flows (e.g. Shopping checkout → Products inventory reserve, then the async reservation confirm path).
+- **Metrics** — runtime and custom metrics per resource.
+
+The hosted-service command buttons (Pause / Resume) are also surfaced here, making it easy to pause the outbox relay on one domain and observe the effect on the other.
+
+---
+
+## The Aspire + E2E pairing
+
+Aspire provides the running environment; the **E2E Runner** provides the workload.
+
+```
+  ┌─────────────────────────────────────────────────────────────┐
+  │  Aspire (running)                                           │
+  │  ┌──────────────┐  ┌──────────────┐  ┌──────────────┐       │
+  │  │ Products API │  │Products Relay│  │Products Sub  │  ...  │
+  │  └──────┬───────┘  └──────────────┘  └──────┬───────┘       │
+  │         │  (real HTTP + Service Bus + DB)    │              │
+  │  ┌──────┴───────┐  ┌──────────────┐  ┌──────┴───────┐       │
+  │  │ Shopping API │  │Shopping Relay│  │Shopping Sub  │  ...  │
+  │  └──────────────┘  └──────────────┘  └──────────────┘       │
+  └──────────────────────────┬──────────────────────────────────┘
+                             │  real HTTP calls
+                    ┌────────┴────────┐
+                    │  E2E Runner     │
+                    │  (workload)     │
+                    └─────────────────┘
+```
+
+The E2E Runner calls the live APIs over real HTTP. No mocks. Cross-domain flows execute fully: Shopping checkout calls Products inventory, the outbox relay forwards events to Service Bus, the subscriber processes them, state is updated. The Aspire Dashboard shows the full distributed trace of each operation.
+
+---
+
+## E2E Runner
+
+`Contoso.E2E.Runner` is an interactive console application (`samples/tests/Contoso.E2E.Runner`) that drives cross-domain scenarios against the running APIs. It serves two purposes:
+
+1. **Functional validation** — verify that the end-to-end flows work correctly against real infrastructure, catching issues that intra-domain tests cannot (network timeouts, Service Bus lag, cross-domain state consistency).
+2. **Load simulation** — run all scenarios in parallel workers to exercise the system under realistic concurrency, surfacing performance issues and race conditions.
+
+### Starting the runner
+
+From the repo root:
+
+```bash
+dotnet run --project samples/tests/Contoso.E2E.Runner
+```
+
+On startup, the runner checks `/health/ready` on all APIs and displays their status. Press `ESC` to skip the health check if a domain is intentionally down.
+
+### Configuration
+
+Default endpoints and simulation parameters are defined in `appsettings.json`. Override with environment variables using `__` as the separator:
+
+```bash
+E2E__Products__BaseAddress=https://localhost:7200
+E2E__Shopping__BaseAddress=https://localhost:7219
+```
+
+Per-scenario simulation parallelism and delay bounds are also configurable:
+
+```json
+"Simulations": {
+  "Shopping-Basket": {
+    "Parallelism": 3,
+    "MinDelayMilliseconds": 250,
+    "MaxDelayMilliseconds": 750
+  }
+}
+```
+
+### Scenarios
+
+#### Set-Up (run once)
+
+| Scenario | What it does |
+|---|---|
+| Database Migration and Base Data Refresh | Runs DbEx migrations for all domain databases and resets base reference data. |
+| Data Seeding for E2E Testing | Calls `POST /api/inventory/adjust` to set on-hand quantity to 1 000 units for every active, stocked product. Required before basket scenarios to ensure stock is available. |
+
+#### Functional scenarios (repeatable)
+
+| Scenario | Cross-domain? | What it exercises |
+|---|---|---|
+| Product Query Lifecycle | No | Queries products with randomised filters (category, brand, text). |
+| Product Update Lifecycle | No | Fetches a random product, toggles a description suffix, PUTs the update. |
+| Product Quantity Lifecycle | No | Queries on-hand inventory for a random product. |
+| Shopping Basket Lifecycle | **Yes** | Creates a basket, adds 1–4 random items, optionally applies the `SAVE10` coupon, checks out. Triggers the full cross-domain flow: synchronous inventory reservation (Shopping → Products HTTP), transactional outbox publish, relay forwarding, and async reservation confirmation (Service Bus → Products Subscribe). |
+
+The Shopping Basket Lifecycle is the richest scenario — it exercises every inter-domain integration path in a single run and is the primary validation tool for the full system.
+
+#### Load simulation
+
+Selecting **Run all scenarios as simulation** starts all four scenarios simultaneously in parallel worker pools. Each scenario runs its own workers concurrently with configurable parallelism and randomised per-step delays (to simulate realistic user behavior rather than a hammer load).
+
+The live dashboard shows:
+- Per-scenario iteration count, success count, error count, and success rate.
+- Total throughput across all scenarios.
+- A rolling buffer of recent events (step completions and errors) with timestamps.
+- A spinner indicating the simulation is still running.
+
+Press `ESC` to stop gracefully. Errors are written to `logs/load-simulation-errors.log` alongside the executable.
+
+### Recommended first-run order
+
+1. Start infrastructure: `podman compose -f docker-compose.yml up -d`
+2. Migrate and seed: `dotnet run --project samples/src/Contoso.Products.Database` (and Shopping, Orders)
+3. Start Aspire: `aspire run`
+4. Start the runner: `dotnet run --project samples/tests/Contoso.E2E.Runner`
+5. Run **Database Migration and Base Data Refresh** (picks up any pending migrations)
+6. Run **Data Seeding for E2E Testing** (stocks inventory for basket scenarios)
+7. Run individual scenarios, or select **Run all scenarios as simulation** for load testing
+8. Observe distributed traces, logs, and metrics in the Aspire Dashboard while the runner executes
+
+---
+
+## Relationship to the testing strategy
+
+| Layer | Aspire needed? | E2E Runner needed? |
+|---|---|---|
+| Unit tests (`*.Test.Unit`) | No | No |
+| Intra-domain host tests (`*.Test.Api`, `*.Test.Subscribe`, `*.Test.Relay`) | No | No |
+| Cross-domain functional validation | Yes | Yes |
+| Load / concurrency simulation | Yes | Yes |
+
+See [testing.md](testing.md) for the intra-domain testing guide. The E2E Runner is the complement to that guide — it covers the inter-domain surface that intra-domain tests deliberately leave mocked.
diff --git a/samples/docs/contracts-layer.md b/samples/docs/contracts-layer.md
new file mode 100644
index 00000000..3a5d6fbe
--- /dev/null
+++ b/samples/docs/contracts-layer.md
@@ -0,0 +1,109 @@
+# Contracts Layer
+
+The Contracts layer defines the **public-facing surface** of a domain — the types that travel over the wire as API request/response payloads and as messaging event bodies. Keeping this boundary explicit prevents internal implementation details from leaking to consumers and makes versioning tractable. Contracts are intentionally thin: they carry data and metadata but no business logic.
+
+**Example projects**
+- [`samples/src/Contoso.Products.Contracts`](../src/Contoso.Products.Contracts)
+- [`samples/src/Contoso.Shopping.Contracts`](../src/Contoso.Shopping.Contracts)
+
+---
+
+## Unified API and messaging surface
+
+By convention, the same contract type is used for **both** the HTTP API response and the messaging event payload. A `Product` returned from `GET /api/products/{id}` is the same `Contracts.Product` type published as a `product.created` event body. A consumer does not need a separate DTO regardless of whether they integrate via REST or by subscribing to the event stream.
+
+The rationale is straightforward: an entity is an entity. Duplicating it into separate API and event representations introduces divergence risk, extra mapping code, and cognitive overhead for consumers. Keeping a single contract type as the authoritative representation means any schema change is made once and is immediately consistent across both integration surfaces.
+
+In practice this flows naturally through the Application layer: the service operates on and returns a `Contracts.Product`, and that same value is handed directly to `EventData.CreateEventWith()` when publishing:
+
+```csharp
+// samples/src/Contoso.Products.Application/ProductService.cs
+var dr = await _repository.CreateAsync(product).ConfigureAwait(false);
+return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+```
+
+On the consuming side, the Shopping domain's `ProductModifySubscriber` deserializes the inbound event directly into the same `Product` contract type (re-declared locally in the Application layer as an internal adapter model) and passes it straight through to the adapter:
+
+```csharp
+// samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductModifySubscriber.cs
+[Subscribe("contoso.products.product.created.v1")]
+[Subscribe("contoso.products.product.updated.v1")]
+public class ProductModifySubscriber(IProductSyncAdapter adapter) : SubscribedBase<Product>
+{
+    public override IValidator<Product>? ValueValidator => ProductValidator.Default;
+
+    protected override Task<Result> OnReceiveAsync(Product value, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => _adapter.ModifyAsync(value);
+}
+```
+
+> **Note**: Where a domain consumes another domain's events, the receiving domain declares its own internal representation of that type (e.g. `Contoso.Shopping.Application.Adapters.Products.Product`) rather than taking a hard dependency on the publishing domain's Contracts assembly. The shape is kept deliberately consistent with the published contract, but ownership remains with the consuming domain — preserving the anti-corruption boundary.
+
+[Subscribe host pattern](hosts-layer.md#subscribers)
+
+---
+
+## Entity contracts
+
+Entity contracts represent the resource types exposed by the API. They are declared as `partial` classes annotated with `[Contract]`, which triggers the CoreEx source generator ([`CoreEx.Generator`](../../gen/CoreEx.Generator)) to emit supporting members (equality, cloning, JSON serialization helpers, etc.) into a paired `*.g.cs` file, keeping hand-authored code free of boilerplate.
+
+Mutable resources typically compose three cross-cutting interfaces:
+
+| Interface | Purpose |
+|---|---|
+| `IIdentifier<T>` | Server-assigned primary key (`Id` property). |
+| `IETag` | Optimistic-concurrency token (`ETag` property). |
+| `IChangeLog` | Audit trail — `CreatedBy`, `CreatedOn`, `UpdatedBy`, `UpdatedOn`. |
+
+Server-managed fields are decorated with `[ReadOnly(true)]` so they are excluded from inbound requests, by the likes of NSwag (Swagger), automatically.
+
+```csharp
+// samples/src/Contoso.Products.Contracts/Product.cs
+[Contract]
+public partial class Product : ProductBase, IETag, IChangeLog
+{
+    [ReadOnly(true)] public ChangeLog? ChangeLog { get; set; }
+    [ReadOnly(true)] public string? ETag { get; set; }
+}
+```
+
+An abstract base class (e.g. [`ProductBase`](../src/Contoso.Products.Contracts/ProductBase.cs)) is used where multiple projections of the same resource share common fields — for example `Product` (full detail) and `ProductLite` (query list projection).
+
+> **See also**: [`IIdentifier`](../../src/CoreEx/Entities/IIdentifier.cs) · [`IETag`](../../src/CoreEx/Entities/IETag.cs) · [`IChangeLog`](../../src/CoreEx/Entities/IChangeLog.cs)
+
+---
+
+## Reference data
+
+> 🛠️ **Tooling**: reference-data contract types (`*.g.cs`) are generated by the domain's `*.CodeGen` project from `ref-data.yaml`. See [tooling.md](tooling.md#code-generation-codegen) for details.
+
+Reference data types represent controlled vocabularies
+
+```csharp
+// samples/src/Contoso.Products.Contracts/MovementKind.g.cs  (source-generated)
+[ReferenceData]
+public partial class MovementKind : ReferenceData<MovementKind> { }
+```
+
+A hand-authored partial class can extend the generated type when additional computed members are needed:
+
+```csharp
+// samples/src/Contoso.Products.Contracts/UnitOfMeasure.cs
+public partial class UnitOfMeasure
+{
+    [JsonIgnore]
+    public int Precision => 16 - Scale;
+}
+```
+
+> **See also**: [`ReferenceData<T>`](../../src/CoreEx.RefData/ReferenceData.cs) · [`[ReferenceData]`](../../src/CoreEx.RefData/ReferenceDataAttribute.cs)
+
+---
+
+## Source generation
+
+The `[Contract]` and `[ReferenceData]` class annotations drive the [`CoreEx.Generator`](../gen/CoreEx.Generator) Roslyn source generator.
+
+The [`Contoso.Products.CodeGen`](../src/Contoso.Products.CodeGen) and [`Contoso.Shopping.CodeGen`](../src/Contoso.Shopping.CodeGen) projects also emit generated source code for the reference-data contracts. The [`CoreEx.CodeGen`](../src/CoreEx.CodeGen) framework orchestrates the underlying code-generation process; this is manually initiated by the developer.
+
+> **Convention**: files ending in `.g.cs` are machine-authored. Files without the `.g` suffix are hand-authored and may extend the generated partial with additional members or attributes.
diff --git a/samples/docs/domain-layer.md b/samples/docs/domain-layer.md
new file mode 100644
index 00000000..ef266713
--- /dev/null
+++ b/samples/docs/domain-layer.md
@@ -0,0 +1,88 @@
+# Domain Layer
+
+The Domain layer is **optional** and is introduced only when a domain contains aggregates with meaningful business rules that must be protected by invariants. Shopping includes this layer; Products, being a largely CRUD-oriented domain, does not.
+
+**Example project**
+- [`samples/src/Contoso.Shopping.Domain`](../src/Contoso.Shopping.Domain)
+
+---
+
+## Aggregates
+
+An aggregate is a cluster of related entities treated as a single consistency boundary. In CoreEx, aggregates extend `Aggregate<TId, TSelf>` and entities within them extend `Entity<TId, TSelf>`. These base classes provide:
+
+- **`PersistenceState` tracking** — `New`, `NotModified`, `Modified`, `Removed` — so the Infrastructure layer knows exactly what to persist without being told explicitly.
+- **`Modify(...)` / `Remove()`** — mutation helpers that enforce the `OnCheckCanMutate()` guard and invoke `OnMutate()` for derived state recalculation before marking the aggregate as modified.
+- **Factory methods** (`CreateNew` / `CreateFrom`) — the only public construction paths, keeping invariant enforcement centralised and preventing partially-constructed instances.
+
+```csharp
+// samples/src/Contoso.Shopping.Domain/Basket.cs
+public sealed class Basket : Aggregate<string, Basket>
+{
+    public static Basket CreateNew(string customerId) => new Basket(Runtime.NewId())
+    {
+        CustomerId = customerId,
+        Status = BasketStatus.Empty
+    }.AsNew();
+
+    protected override Result OnCheckCanMutate() => Status.CanBeMutated
+        ? Result.Success
+        : Result.BusinessError($"Basket has a status of '{Status}' and cannot be modified.", ...);
+
+    protected override void OnMutate()
+    {
+        // Re-derive status automatically after any mutation.
+        if (Status.CanBeMutated)
+            Status = _items.Any(i => i.PersistenceState.IsNotRemoved) ? BasketStatus.Active : BasketStatus.Empty;
+    }
+}
+```
+
+All public domain operations return `Result` or `Result<T>` so that the Application layer can compose them in pipelines without catching exceptions for expected business failures.
+
+> **See also**: [`Aggregate<TId, TSelf>`](../../src/CoreEx.DomainDriven/Aggregate.cs) · [`Entity<TId, TSelf>`](../../src/CoreEx.DomainDriven/Entity.cs) · [`PersistenceState`](../../src/CoreEx.DomainDriven/PersistenceState.cs) · [Domain-Driven Design aggregates](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/microservice-domain-model)
+
+---
+
+## Value objects
+
+Value objects represent concepts that have no independent identity — they are defined entirely by their values and are immutable. In CoreEx they are modelled as `sealed record` types, leveraging C# record equality and `with`-expression mutation.
+
+```csharp
+// samples/src/Contoso.Shopping.Domain/ValueObjects/ItemPricing.cs
+public sealed record class ItemPricing
+{
+    public required Contracts.UnitOfMeasure UnitOfMeasure { get; init => field = value.ThrowIfInactive(); }
+    public decimal UnitPrice { get; init => field = value.ThrowIfLessThanZero(); }
+    public decimal Quantity { get; init => field = value.ThrowIfLessThanZero(); }
+    public decimal Total => UnitPrice * Quantity;
+}
+```
+
+Value objects enforce their own invariants in property initialisers using CoreEx guard extensions (`ThrowIfInactive`, `ThrowIfLessThanZero`) so that invalid instances simply cannot exist.
+
+> **See also**: [Value Object pattern](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/implement-value-objects)
+
+---
+
+## Domain Events — Intentionally Not Supported
+
+CoreEx deliberately does not provide a native domain-event mechanism (e.g. MediatR `INotification` dispatch or an in-process event bus). This is a conscious architectural decision:
+
+- **Chatty emission** — fine-grained domain events (`PropertyChanged`, `ItemAdded`, etc.) generate high volumes of events that produce implicit, hard-to-trace side-effects throughout the application layer.
+- **Non-explicit side-effects** — handler chains driven by in-process events obscure control flow, making it difficult to reason about what a single aggregate mutation causes.
+- **Integration events are sufficient** — coarse-grained integration events are added to `IUnitOfWork.Events` by the application service after a successful repository operation, committed atomically via the transactional outbox, and consumed by other systems explicitly and auditably.
+
+```csharp
+// Events are added by the application SERVICE after the repository operation — not by the aggregate itself
+return ur.ThenAs(basket =>
+{
+    var contract = BasketMapper.Map(basket);
+    _unitOfWork.Events.Add(EventData.CreateEventWith(contract, EventAction.CheckedOut));
+    return contract;
+});
+```
+
+A developer can opt in to a domain-event mechanism if genuinely needed — for example, dispatching via MediatR after the transaction commits — but this is an explicit extension, not a framework default.
+
+> **See also**: [`IAggregateRoot`](../../src/CoreEx.DomainDriven/IAggregateRoot.cs) · [`CoreEx.DomainDriven` README](../../src/CoreEx.DomainDriven/README.md#domain-events--intentionally-not-supported)
diff --git a/samples/docs/hosts-layer.md b/samples/docs/hosts-layer.md
new file mode 100644
index 00000000..7d247675
--- /dev/null
+++ b/samples/docs/hosts-layer.md
@@ -0,0 +1,220 @@
+# Host Patterns
+
+CoreEx is largely agnostic to the choice of host technology. A domain can be exposed through any combination of host types — API, Outbox Relay, and Subscribe — each as a separate deployable process. All three are implemented here as ASP.NET Core hosts, which provides a consistent model for health checks, OpenTelemetry, and runtime management endpoints, but any .NET host type (Worker Service, console, etc.) would work equally well.
+
+The host is the **composition root** of the application. It sits above all layers — wiring Contracts, Application, Domain, and Infrastructure together via dependency injection — but it does not reach into those layers directly. Where business operations are needed (API request handling, event subscription processing), the host delegates to Application-layer services; it never bypasses the Application layer to call Infrastructure directly. The host itself contains no business logic.
+
+**Example projects**
+
+| Host type | Products | Shopping |
+|---|---|---|
+| API | [`Contoso.Products.Api`](../src/Contoso.Products.Api) | [`Contoso.Shopping.Api`](../src/Contoso.Shopping.Api) |
+| Outbox Relay | [`Contoso.Products.Relay`](../src/Contoso.Products.Relay) | [`Contoso.Shopping.Relay`](../src/Contoso.Shopping.Relay) |
+| Subscribe | [`Contoso.Products.Subscribe`](../src/Contoso.Products.Subscribe) | [`Contoso.Shopping.Subscribe`](../src/Contoso.Shopping.Subscribe) |
+
+---
+
+## API host
+
+The API host exposes the domain's capabilities as HTTP endpoints. Controllers delegate immediately to Application-layer services via the CoreEx `WebApi` helper — they contain no business logic.
+
+**Example projects**
+- [`samples/src/Contoso.Products.Api`](../src/Contoso.Products.Api)
+- [`samples/src/Contoso.Shopping.Api`](../src/Contoso.Shopping.Api)
+
+### Controllers
+
+MVC controllers are the chosen style in the samples, but CoreEx supports minimal APIs equally — the developer chooses. Each controller is a thin routing shell: it declares the route, HTTP verb, OpenAPI metadata, and delegates to the `WebApi` helper which handles request deserialization, response serialization, status-code mapping, and error translation.
+
+```csharp
+// samples/src/Contoso.Products.Api/Controllers/ProductController.cs
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductController(WebApi webApi, IProductService service) : ControllerBase
+{
+    [HttpPost]
+    [IdempotencyKey]
+    public Task<IActionResult> PostAsync() => _webApi.PostAsync<Product, Product>(Request, (ro, _) =>
+    {
+        ro.WithLocationUri(p => new Uri($"/api/products/{p.Id}", UriKind.Relative));
+        return _service.CreateAsync(ro.Value);
+    });
+
+    [HttpPatch("{id}")]
+    public Task<IActionResult> PatchAsync(string id) => _webApi.PatchAsync<Product>(Request,
+        get: (ro, _) => _service.GetAsync(id.Required()),
+        put: (ro, _) => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id)));
+}
+```
+
+Where a service uses `Result<T>` pipelines (Shopping), the `WithResult` variants of the helpers are used (`PostWithResultAsync`, `PutWithResultAsync`, etc.) — the controller code remains equally thin.
+
+Responsibilities that are deliberately offloaded to the `WebApi` helper include:
+
+- Deserializing the request body and binding route/query parameters.
+- Mapping CoreEx exception types (`NotFoundException`, `ValidationException`, `BusinessException`, etc.) to the appropriate HTTP problem-detail responses.
+- Enforcing idempotency via the `[IdempotencyKey]` attribute and the `UseIdempotencyKey()` middleware.
+- Generating `Location` headers on POST responses via `WithLocationUri`.
+- Supporting `HTTP PATCH` with `application/merge-patch+json` semantics.
+
+> **Read vs write split**: Products separates read and write operations into distinct controllers (`ProductController` / `ProductReadController`, `MovementController` / `MovementReadController`). This keeps each controller focused and mirrors the CQRS-style split at the service level. There is no framework requirement to do this — it is a developer organizational choice.
+
+> **See also**: [`WebApi`](../../src/CoreEx.AspNetCore/WebApis/WebApi.cs) · [`[IdempotencyKey]`](../../src/CoreEx.AspNetCore/Http/IdempotencyKeyAttribute.cs) · [Minimal APIs](https://learn.microsoft.com/en-us/aspnet/core/fundamentals/minimal-apis)
+
+### Program.cs composition
+
+`Program.cs` follows a predictable CoreEx shape and is the only file in the API host:
+
+1. `builder.AddHostSettings()` — loads CoreEx host configuration.
+2. Core services — `AddExecutionContext()`, `AddReferenceDataOrchestrator<T>()`, `AddMvcWebApi()`, `AddHttpWebApi()`.
+3. Dynamic service registration — `AddDynamicServicesUsing<T…>()` auto-discovers all `[ScopedService]`-decorated types.
+4. Infrastructure wiring — database, EF DbContext, outbox publisher, caching (L1 in-memory + L2 Redis + FusionCache backplane).
+5. `PostConfigureAllHealthChecks()` — adds standard health-check tags.
+6. OpenAPI — NSwag document with `AddCoreExConfiguration()`.
+7. OpenTelemetry — `WithCoreExTelemetry()` and provider-specific extensions.
+8. Middleware pipeline — `UseCoreExExceptionHandler()` → `UseExecutionContext()` → `UseIdempotencyKey()` → `MapControllers()` → health checks.
+
+```csharp
+// samples/src/Contoso.Products.Api/Program.cs  (abridged)
+builder.Services
+    .AddExecutionContext()
+    .AddReferenceDataOrchestrator<ReferenceDataService>()
+    .AddMvcWebApi()
+    .AddHttpWebApi();
+
+builder.Services.AddDynamicServicesUsing<ReferenceDataService, ReferenceDataRepository>();
+
+// ...database, caching, outbox...
+
+app.UseCoreExExceptionHandler();
+app.UseExecutionContext();
+app.UseIdempotencyKey();
+app.MapControllers();
+app.MapHealthChecks();
+```
+
+> **See also**: [`AddMvcWebApi`](../../src/CoreEx.AspNetCore/WebApis/WebApiServiceCollectionExtensions.cs) · [`AddDynamicServicesUsing`](../../src/CoreEx/DependencyInjection/ServiceCollectionExtensions.cs)
+
+---
+
+## Outbox Relay host
+
+The Outbox Relay host performs the **transactional outbox relay function** — it polls the outbox table, reads committed event records, and forwards them to the configured message broker (Azure Service Bus in the samples, but the broker is swappable: RabbitMQ, Kafka, etc. are equally supported). There is no business logic in this host; it is a relay only.
+
+**Example projects**
+- [`samples/src/Contoso.Products.Relay`](../src/Contoso.Products.Relay)
+- [`samples/src/Contoso.Shopping.Relay`](../src/Contoso.Shopping.Relay)
+
+The relay runs as a `BackgroundService` (hosted service) registered via `AddPostgresOutboxRelayHostedService()` / `AddSqlServerOutboxRelayHostedService()`. It uses **partitioning** to improve throughput and scalability — multiple relay instances can each own a subset of partitions and process them independently without coordination.
+
+Because it is implemented as an ASP.NET Core host, it can expose additional HTTP endpoints alongside the relay worker:
+
+- **`MapHealthChecks()`** — liveness and readiness probes for container orchestrators.
+- **`MapHostedServices()`** — runtime management endpoints that allow the relay to be **paused and resumed** per partition/tenant ID without restarting the process.
+
+```csharp
+// samples/src/Contoso.Products.Relay/Program.cs  (abridged)
+builder.Services
+    .AddPostgresDatabase()
+    .AddPostgresUnitOfWork()
+    .AddPostgresOutboxRelay();
+
+builder.AddPostgresOutboxRelayHostedService();
+
+builder.Services.AddAzureServiceBusPublisher((_, c) =>
+{
+    c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;
+});
+
+app.MapHealthChecks();
+app.MapHostedServices();  // Exposes pause/resume management endpoints.
+```
+
+> The `Program.cs` for the Outbox Relay is intentionally minimal — no controllers, no OpenAPI document, no application-layer services. Its sole concern is shuttling committed outbox records to the broker reliably.
+
+> **See also**: [`PostgresOutboxRelay`](../../src/CoreEx.Database.Postgres/PostgresOutboxRelay.cs) · [`SqlServerOutboxRelay`](../../src/CoreEx.Database.SqlServer/SqlServerOutboxRelay.cs) · [Transactional Outbox pattern](https://learn.microsoft.com/en-us/azure/architecture/best-practices/transactional-outbox-cosmos) · [`MapHostedServices`](../../src/CoreEx.AspNetCore/WebApis/WebApiServiceCollectionExtensions.cs)
+
+---
+
+## Subscribe host
+
+The Subscribe host processes inbound events/messages from a message broker. Like the Relay, it is implemented as an ASP.NET Core host so that health check and runtime management endpoints can sit alongside the message-processing workers. Individual `Subscriber` classes encapsulate the opt-in subscription to a specific message type.
+
+**Example projects**
+- [`samples/src/Contoso.Products.Subscribe`](../src/Contoso.Products.Subscribe)
+- [`samples/src/Contoso.Shopping.Subscribe`](../src/Contoso.Shopping.Subscribe)
+
+### Subscribers
+
+Each subscriber is a small, focused class that:
+
+1. Opts in to one or more message subjects via `[Subscribe("subject")]` attributes.
+2. Extends `SubscribedBase` (untyped) or `SubscribedBase<TValue>` (strongly typed, with optional value validation).
+3. Delegates immediately to an Application-layer service or adapter — keeping all business logic out of the subscriber.
+4. Returns `Result` / `Result<T>` so that error handling and dead-lettering decisions can be expressed declaratively.
+
+```csharp
+// samples/src/Contoso.Products.Subscribe/Subscribers/ReservationConfirmSubscriber.cs
+[ScopedService, Subscribe("contoso.products.reservation.confirm")]
+public class ReservationConfirmSubscriber : SubscribedBase
+{
+    protected async override Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+    {
+        var referenceId = @event.Key.Required();
+        await _service.ConfirmReservationAsync(referenceId).ConfigureAwait(false);
+        return Result.Success;
+    }
+}
+```
+
+Where a subscriber expects a typed payload, `SubscribedBase<TValue>` is used and a `ValueValidator` can be wired in to validate the deserialized value before `OnReceiveAsync` is called:
+
+```csharp
+// samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductModifySubscriber.cs
+[ScopedService]
+[Subscribe("contoso.products.product.created.v1")]
+[Subscribe("contoso.products.product.updated.v1")]
+public class ProductModifySubscriber(IProductSyncAdapter adapter) : SubscribedBase<Product>
+{
+    public override IValidator<Product>? ValueValidator => ProductValidator.Default;
+
+    protected override Task<Result> OnReceiveAsync(Product value, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => _adapter.ModifyAsync(value);
+}
+```
+
+A subscriber can also declare an `ErrorHandler` to control how specific exceptions are treated — for example, converting a `NotFoundException` with a known error code to an informational completion (rather than dead-lettering) when the referenced entity has already been removed:
+
+```csharp
+internal static readonly ErrorHandler DefaultErrorHandler = new ErrorHandler()
+    .Add<NotFoundException>(ex => ex.ErrorCode == "pending-reservation-not-found"
+        ? ErrorHandling.CompleteAsInformation
+        : null);
+```
+
+### Program.cs composition
+
+The Subscribe host `Program.cs` follows a similar shape to the API host but replaces the controller/OpenAPI section with broker-receiver wiring:
+
+```csharp
+// samples/src/Contoso.Products.Subscribe/Program.cs  (abridged)
+builder.Services.AddSubscribedManager((_, c) =>
+    c.AddSubscribersUsing<ReservationConfirmSubscriber>());  // Discovers all subscribers in the assembly.
+
+builder.Services.AzureServiceBusReceiving()
+    .WithSessionReceiver(_ =>
+    {
+        var o = ServiceBusSessionReceiverOptions.CreateForTopicSubscription();
+        o.SessionProcessorOptions.MaxConcurrentSessions = 4;
+        return o;
+    })
+    .WithSubscribedSubscriber()   // Routes received messages through the SubscribedManager.
+    .WithHostedService()          // Runs the receiver as a BackgroundService.
+    .Build();
+
+app.MapHealthChecks();
+app.MapHostedServices();  // Exposes pause/resume management endpoints.
+```
+
+`AddSubscribersUsing<T>()` scans the assembly containing `T` and auto-registers every class decorated with `[Subscribe]`, so adding a new subscriber requires only creating the class — no `Program.cs` edits are needed.
+
+> **See also**: [`SubscribedBase`](../../src/CoreEx.Events/Subscribing/SubscribedBase.cs) · [`SubscribedBase<T>`](../../src/CoreEx.Events/Subscribing/SubscribedBase.cs) · [`ErrorHandler`](../../src/CoreEx.Events/Subscribing/ErrorHandler.cs) · [`AddSubscribedManager`](../../src/CoreEx.Azure.Messaging.ServiceBus) · [Competing Consumers pattern](https://learn.microsoft.com/en-us/azure/architecture/patterns/competing-consumers)
diff --git a/samples/docs/infrastructure-layer.md b/samples/docs/infrastructure-layer.md
new file mode 100644
index 00000000..821c0b76
--- /dev/null
+++ b/samples/docs/infrastructure-layer.md
@@ -0,0 +1,108 @@
+# Infrastructure Layer
+
+The Infrastructure layer provides the **concrete implementations** of all abstractions defined in the Application layer. It is the only layer permitted to reference EF Core, database drivers, typed HTTP clients, and messaging SDKs. Nothing above it depends on it directly — it is wired into the host via dependency injection.
+
+**Example projects**
+- [`samples/src/Contoso.Products.Infrastructure`](../src/Contoso.Products.Infrastructure)
+- [`samples/src/Contoso.Shopping.Infrastructure`](../src/Contoso.Shopping.Infrastructure)
+
+---
+
+## Persistence models
+
+> 🗃️ **Tooling**: the database schema (tables, indexes, outbox infrastructure), persistence model classes (`Persistence/*.g.cs`), and the EF Core `DbContext` partial (`Repositories/*DbContext.g.cs`) are all generated by the domain's `*.Database` project. See [tooling.md](tooling.md#database-migration-database) for details.
+
+The `Persistence/` sub-folder contains **database-model classes**
+
+Each persistence model extends `ModelBase<TId>` (CoreEx) and may implement marker interfaces such as `ILogicallyDeleted` to participate in automatic soft-delete query filtering.
+
+```csharp
+// samples/src/Contoso.Products.Infrastructure/Persistence/Product.g.cs  (source-generated)
+public partial class Product : ModelBase<string>, ILogicallyDeleted
+{
+    public string Sku { get; set; } = default!;
+    public string SubCategoryCode { get; set; } = default!;
+    // ...
+}
+```
+
+> **See also**: [`ModelBase<TId>`](../../src/CoreEx.EntityFrameworkCore/ModelBase.cs) · [`ILogicallyDeleted`](../../src/CoreEx.EntityFrameworkCore/ILogicallyDeleted.cs)
+
+---
+
+## Repositories
+
+Repository implementations live in `Repositories/` and implement the `IXxxRepository` interfaces declared in the Application layer. They use CoreEx's `EfDb<TContext>` abstraction, which provides strongly-typed, mapper-aware access patterns (`GetAsync`, `CreateAsync`, `UpdateAsync`, `DeleteAsync`, `Query`) built on top of EF Core, adding CoreEx's `DataResult<T>` return semantics, change-tracking integration, and query filtering support.
+
+```csharp
+// samples/src/Contoso.Products.Infrastructure/Repositories/ProductRepository.cs
+[ScopedService<IProductRepository>]
+public class ProductRepository(ProductsEfDb ef) : IProductRepository
+{
+    public Task<Contracts.Product?> GetAsync(string id) => _ef.Products.GetAsync(id);
+    public Task<DataResult<Contracts.Product>> CreateAsync(Contracts.Product product) => _ef.Products.CreateAsync(product);
+    // ...
+}
+```
+
+The `EfDb` sub-class (`ProductsEfDb` / `ShoppingEfDb`) acts as the **unit-of-work facade** over the DbContext, declaring a typed property for each entity model and configuring options such as logical-delete filters. The `DbContext` itself is intentionally thin — it delegates connection management to CoreEx's `IDatabase` abstraction so the same connection/transaction is shared across a request.
+
+```csharp
+// samples/src/Contoso.Products.Infrastructure/Repositories/ProductsEfDb.cs
+public sealed class ProductsEfDb(ProductsDbContext dbContext) : EfDb<ProductsDbContext>(dbContext, _options)
+{
+    public EfDbMappedModel<Contracts.Product, Persistence.Product, ProductMapper> Products
+        => Model<Persistence.Product>().ToMappedModel<Contracts.Product, ProductMapper>(ProductMapper.Default);
+    // ...
+}
+```
+
+> **See also**: [`EfDb<TContext>`](../../src/CoreEx.EntityFrameworkCore/EfDb.cs) · [`EfDbModel<T>`](../../src/CoreEx.EntityFrameworkCore/EfDbModel.cs) · [`EfDbMappedModel<TContract,TModel,TMapper>`](../../src/CoreEx.EntityFrameworkCore/EfDbMappedModel.cs)
+
+---
+
+## Mapping
+
+The `Mapping/` sub-folder contains **bidirectional mappers** that translate between Contract types and Persistence model types. They extend `BiDirectionMapper<TSource, TDest, TSelf>` and are source-generated for reference-data types; hand-authored for entity types that require custom field mapping.
+
+```csharp
+// samples/src/Contoso.Products.Infrastructure/Mapping/ProductMapper.cs
+public class ProductMapper : BiDirectionMapper<Contracts.Product, Persistence.Product, ProductMapper>
+{
+    protected override Persistence.Product OnMap(Contracts.Product source) => new() { Sku = source.Sku!, ... };
+    protected override Contracts.Product OnMap(Persistence.Product source) => new Contracts.Product { Sku = source.Sku, ... };
+}
+```
+
+[`BasketMapper`](../src/Contoso.Shopping.Infrastructure/Mapping/BasketMapper.cs), [`BasketIntoMapper`](../src/Contoso.Shopping.Infrastructure/Mapping/BasketIntoMapper.cs)
+
+> **See also**: [`BiDirectionMapper<TFrom, TTo, TSelf>`](../../src/CoreEx/Mapping/BiDirectionMapper.cs) · [`Mapper<TFrom, TTo, TSelf>`](../../src/CoreEx/Mapping/Mapper.cs)
+
+---
+
+## External clients and adapter implementations
+
+When a domain needs to call another domain's API over HTTP, the raw HTTP interaction is encapsulated in a **typed HTTP client** (`Clients/`) — a thin wrapper around `HttpClient` that serializes requests and maps responses to CoreEx `Result` types. The adapter implementation (`Adapters/`) then uses this client alongside other infrastructure concerns (local EF store, event publishers) to fulfill the Application-layer adapter interface.
+
+```csharp
+// samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs
+public class ProductsHttpClient(HttpClient httpClient)
+{
+    public async Task<Result> CreateReservationAsync(MovementRequest request)
+    {
+        var response = await _httpClient.PostAsJsonAsync("api/inventory/reserve", request, JsonDefaults.SerializerOptions);
+        return await response.ToResultAsync();
+    }
+}
+
+// samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs
+[ScopedService<IProductAdapter>]
+public class ProductAdapter(ShoppingEfDb ef, IEventPublisher eventPublisher, ProductsHttpClient client, ...) : IProductAdapter
+{
+    // GetAsync reads from the local replicated store (EF); ReserveInventoryAsync calls the HTTP client in real time.
+}
+```
+
+This split — client for transport, adapter for orchestration — keeps each class focused on a single responsibility and makes the HTTP interaction independently testable.
+
+> **See also**: [`ToResultAsync`](../../src/CoreEx.AspNetCore/HttpResponseMessageExtensions.cs) · [`JsonDefaults`](../../src/CoreEx/Json/JsonDefaults.cs) · [Strangler Fig / ACL patterns](https://learn.microsoft.com/en-us/azure/architecture/patterns/strangler-fig)
diff --git a/samples/docs/layers.md b/samples/docs/layers.md
new file mode 100644
index 00000000..6dfc199a
--- /dev/null
+++ b/samples/docs/layers.md
@@ -0,0 +1,61 @@
+# Layers
+
+CoreEx promotes a clean, layered architecture for building enterprise APIs and distributed services. The sample domains — **Products** (Postgres) and **Shopping** (SQL Server) — demonstrate these patterns in a polyglot setting, showing that the same architectural approach scales across different persistence technologies. Each domain is decomposed into business layers (**Contracts**, **Application**, **Domain** (optional), **Infrastructure**) and one or more host layers (**API**, **Outbox Relay**, **Subscribe**). The business layers enforce a strict inward dependency rule; the host layers act as composition roots that wire everything together and delegate to Application logic.
+
+> **Polyglot data**: Products is backed by PostgreSQL via [`CoreEx.Database.Postgres`](../../src/CoreEx.Database.Postgres) and [`CoreEx.EntityFrameworkCore`](../../src/CoreEx.EntityFrameworkCore). Shopping uses SQL Server via [`CoreEx.Database.SqlServer`](../../src/CoreEx.Database.SqlServer) and the same EF Core integration. The layers above the Infrastructure boundary are completely unaware of the underlying database technology.
+
+```
+                   caller / message broker
+                           │
+          ┌────────────────┼────────────────┐
+          ▼                ▼                ▼
+  ┌──────────────┐ ┌──────────────┐ ┌──────────────┐
+  │  API Host    │ │Outbox Relay  │ │Subscribe Host│  ← Host layers (composition roots)
+  └──────┬───────┘ └──────────────┘ └──────┬───────┘
+         │                                 │
+         ▼                                 ▼
+  ┌────────────────────────────────────────────────┐   ╔══════════════════╗
+  │                  Application                   │   ║  *.CodeGen       ║ ← generates .g.cs
+  ├────────────────────────────────────────────────┤   ║  (design-time)   ║   into all layers
+  │             Domain  (optional)                 │   ╚══════════════════╝
+  ├────────────────────────────────────────────────┤   ╔══════════════════╗
+  │                Infrastructure                  │   ║  *.Database      ║ ← manages schema,
+  ├────────────────────────────────────────────────┤   ║  (design-time)   ║   seeds data &
+  │                  Contracts                     │   ║                  ║   generates .g.cs
+  └────────────────────────────────────────────────┘   ╚══════════════════╝
+```
+
+## Business layers
+
+| Layer | Description | Detail |
+|---|---|---|
+| 📋 **Contracts** | Public API and messaging surface — entity contracts, reference data, and source generation. | [contracts-layer.md](contracts-layer.md) |
+| ⚙️ **Application** | Business logic orchestration — services, validators, repository interfaces, adapters, mapping, and policies. | [application-layer.md](application-layer.md) |
+| 🧩 **Domain** | Optional aggregate and value-object layer, introduced when rich domain rules require a dedicated consistency boundary. | [domain-layer.md](domain-layer.md) |
+| 🗄️**Infrastructure** | Concrete persistence, mapping, HTTP clients, and adapter implementations wired in via DI. | [infrastructure-layer.md](infrastructure-layer.md) |
+
+## Host layers
+
+Host layers are the deployable processes. Each is a composition root that wires the business layers together via DI and exposes a runtime surface (HTTP endpoints, background workers, health checks). They delegate all business operations to the Application layer and contain no business logic themselves.
+
+| Host | Description | Detail |
+|---|---|---|
+| 🌐 **API** | Exposes the domain's capabilities as HTTP endpoints via MVC controllers or minimal APIs. | [hosts-layer.md](hosts-layer.md#api-host) |
+| 📤 **Outbox Relay** | Polls the transactional outbox and forwards committed events to the message broker. | [hosts-layer.md](hosts-layer.md#outbox-relay-host) |
+| 📥 **Subscribe** | Receives inbound events from the message broker and routes them to Application-layer logic via Subscriber classes. | [hosts-layer.md](hosts-layer.md#subscribe-host) |
+
+## Developer Tooling
+
+These are design-time console projects that feed the layer stack but have no runtime presence. They are run locally by developers to generate code and manage the database schema.
+
+| Tool | Description | Detail |
+|---|---|---|
+| 🛠️ **CodeGen** | Scaffolds the full reference-data implementation (contract, controller, service, repository interface, repository, mapper) across all target layers from a single `ref-data.yaml`. | [tooling.md](tooling.md#code-generation-codegen) |
+| 🗃️ **Database** | Full database lifecycle management: creates and migrates the schema, provisions transactional outbox infrastructure (stored procedures / functions), seeds reference and master data, and generates Infrastructure-layer persistence models (`Persistence/*.g.cs`) and the EF Core `DbContext` partial (`Repositories/*DbContext.g.cs`). This essentially becomes the primary deployment tool that should be used across all environments. | [tooling.md](tooling.md#database-management-database) |
+
+## Testing
+
+Tests are organised by host boundary — each `*.Test.*` project tests one deployable unit in isolation. Intra-domain dependencies (database, cache, outbox) are real; inter-domain calls (HTTP to other domains, direct broker publishes) are mocked. See [testing.md](testing.md) for the full testing guide.
+
+For cross-domain end-to-end validation and load simulation, all hosts are run together under [Aspire](aspire.md), and the [E2E Runner](aspire.md#e2e-runner) drives real workloads across the full system.
+
diff --git a/samples/docs/local-dev.md b/samples/docs/local-dev.md
new file mode 100644
index 00000000..4b9f353f
--- /dev/null
+++ b/samples/docs/local-dev.md
@@ -0,0 +1,220 @@
+# Local Development Setup
+
+This guide covers everything needed to run the Contoso sample hosts locally: the containerised infrastructure layer, connection string patterns, per-host startup, and how to graduate to the full Aspire-orchestrated environment for cross-domain work.
+
+---
+
+## Prerequisites
+
+| Requirement | Notes |
+|---|---|
+| **Podman** (preferred) or **Docker** | Podman requires no daemon; `podman compose` is a drop-in replacement for `docker compose` |
+| **.NET SDK** | Match the `TargetFramework` in `Directory.Build.props` |
+| **Aspire workload** | `dotnet workload install aspire` — required only when running the full Aspire AppHost |
+
+### Git line-ending configuration (Windows)
+
+This repository enforces LF line endings via `.gitattributes`. The default Git for Windows setting (`core.autocrlf=true`) overrides this and expands LF to CRLF on checkout. Set the following once on your machine to prevent it:
+
+```bash
+git config --global core.autocrlf input
+```
+
+`input` converts CRLF → LF on commit (safety net) and does not expand LF → CRLF on checkout, allowing `.gitattributes` to remain authoritative. macOS and Linux users are unaffected.
+
+---
+
+## Infrastructure services
+
+All infrastructure is defined in `docker-compose.yml` at the repo root. Start everything with:
+
+```bash
+# Podman (preferred)
+podman compose -f docker-compose.yml up -d
+
+# Docker
+docker compose -f docker-compose.yml up -d
+```
+
+Stop and remove containers:
+
+```bash
+podman compose -f docker-compose.yml down
+```
+
+### Service inventory
+
+| Service name | Image | Port(s) | Used by | Notes |
+|---|---|---|---|---|
+| `db-sql-server` | `mssql/server:2022-latest` | 1433 | Shopping domain; Service Bus emulator | SA password: `yourStrong(!)Password` |
+| `db-postgres` | `postgres` | 5432 | Products domain | Password: `yourStrong#!Password` |
+| `redis-cache` | `redis:latest` | 6379 | All domains (FusionCache backplane) | No auth by default |
+| `servicebus-emulator` | `azure-messaging/servicebus-emulator:latest` | 5672 (AMQP), 5300 (mgmt) | Products.Subscribe, Shopping.Subscribe, all Relay hosts | Depends on `db-sql-server`; config mounted from `servicebus/Config.json` |
+| `dts-emulator` | `dts/dts-emulator:latest` | 8080, 8082 | Orders.Workflow.Worker, Orders.Api | Task hubs: `default`, `order` |
+| `aspire-dashboard` | `aspire-dashboard:latest` | 18888 (UI), 4317 (OTLP) | Optional — any host with OTLP configured | Usable standalone; no need to run the full Aspire AppHost just for traces |
+
+### Service Bus configuration
+
+The emulator is pre-configured by `servicebus/Config.json`. Key values the sample hosts depend on:
+
+| Setting | Value |
+|---|---|
+| Namespace | `sbemulatorns` |
+| Topic | `contoso` |
+| Subscription — Products | `products` (session-enabled) |
+| Subscription — Shopping | `shopping` (session-enabled) |
+| Unit test topics | `unit-test`, `unit-test-2` (used by integration tests) |
+
+The `contoso` topic is shared across both domains. Session-enabled subscriptions ensure ordered, per-entity processing of events.
+
+---
+
+## Connection strings
+
+All sample hosts use the Aspire component configuration key hierarchy in `appsettings.Development.json`. The `Aspire:` prefix is consumed by Aspire component registrations in `Program.cs` — it is not a generic ASP.NET configuration section.
+
+### PostgreSQL (Products domain)
+
+```json
+"Aspire": {
+  "Npgsql": {
+    "ConnectionString": "Server=127.0.0.1;Database=contoso;Username=postgres;Password=yourStrong#!Password"
+  }
+}
+```
+
+### SQL Server (Shopping domain)
+
+```json
+"Aspire": {
+  "Microsoft": {
+    "Data": {
+      "SqlClient": {
+        "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+      }
+    }
+  }
+}
+```
+
+### Redis (all domains with FusionCache)
+
+```json
+"Aspire": {
+  "StackExchange": {
+    "Redis": {
+      "ConnectionString": "localhost:6379",
+      "ConfigurationOptions": {
+        "ConnectTimeout": 3000,
+        "ConnectRetry": 2
+      }
+    }
+  }
+}
+```
+
+### Azure Service Bus emulator
+
+All hosts that publish or subscribe add the same base connection string. Subscribe hosts additionally set `QueueOrTopicName` and `SubscriptionName`:
+
+```json
+"Aspire": {
+  "Azure": {
+    "Messaging": {
+      "ServiceBus": {
+        "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;",
+        "QueueOrTopicName": "contoso",
+        "SubscriptionName": "products"   // or "shopping" for Shopping.Subscribe
+      }
+    }
+  }
+}
+```
+
+The `UseDevelopmentEmulator=true` flag routes the SDK to the local emulator instead of Azure. `SAS_KEY_VALUE` is a placeholder accepted by the emulator — any non-empty string works.
+
+---
+
+## Running sample databases (required once, and after schema changes)
+
+Before starting any host for the first time, migrate and seed each domain's database:
+
+```bash
+dotnet run --project samples/src/Contoso.Products.Database -- all
+dotnet run --project samples/src/Contoso.Shopping.Database -- all
+```
+
+For Orders (WIP):
+
+```bash
+dotnet run --project samples/src/Contoso.Orders.Database -- all
+```
+
+Re-run after any migration scripts are added. See [tooling.md](tooling.md) for full detail on the `*.Database` project run order and generated-file ownership.
+
+---
+
+## Running hosts individually (without Aspire)
+
+Use this when working on a single domain or running intra-domain integration tests:
+
+```bash
+# Products
+dotnet run --project samples/src/Contoso.Products.Api
+dotnet run --project samples/src/Contoso.Products.Relay
+dotnet run --project samples/src/Contoso.Products.Subscribe
+
+# Shopping
+dotnet run --project samples/src/Contoso.Shopping.Api
+dotnet run --project samples/src/Contoso.Shopping.Relay
+dotnet run --project samples/src/Contoso.Shopping.Subscribe
+
+# Orders (WIP)
+dotnet run --project samples/src/Contoso.Order.Workflow.Worker
+dotnet run --project samples/src/Contoso.Orders.Api
+```
+
+Intra-domain host tests (`*.Test.Api`, `*.Test.Subscribe`, `*.Test.Relay`) start their own in-process test host — they do not require any host process to be running. Infrastructure containers must still be up.
+
+---
+
+## Running with Aspire (cross-domain E2E)
+
+When you need all domains running together — for cross-domain request flows, distributed traces, or E2E testing — use the Aspire AppHost instead of starting hosts individually:
+
+```bash
+# Ensure infrastructure is running first (see above)
+podman compose -f docker-compose.yml up -d
+
+# Then start the AppHost (starts all 8 hosts as child processes)
+aspire run
+# or
+dotnet run --project samples/aspire/Contoso.Aspire
+```
+
+The Aspire Dashboard opens automatically at `http://localhost:15174` and provides live logs, distributed traces, metrics, and health views across all running hosts.
+
+See [aspire.md](aspire.md) for the full guide: orchestrated host inventory, E2E Runner scenarios, hosted-service pause/resume controls, and the recommended first-run order.
+
+---
+
+## Standalone Aspire Dashboard (telemetry only)
+
+The `aspire-dashboard` container in `docker-compose.yml` runs the dashboard independently of the Aspire AppHost. Any host that exports OTLP to `http://localhost:4317` will appear in it, even when running individual hosts via `dotnet run`.
+
+Configure OTLP export in `appsettings.Development.json`:
+
+```json
+"OTEL_EXPORTER_OTLP_ENDPOINT": "http://localhost:4317"
+```
+
+Or set as an environment variable before running the host.
+
+---
+
+## Podman-specific notes
+
+- `podman compose` is a drop-in replacement for `docker compose` — all `docker compose` commands in this repo work with `podman compose`.
+- Podman runs rootless by default; no daemon required.
+- On first use, Podman may need to pull `mcr.microsoft.com` images through its registry configuration. If pulls fail, add `docker.io` and `mcr.microsoft.com` to `/etc/containers/registries.conf`.
+- The Service Bus emulator and SQL Server images from `mcr.microsoft.com` require accepting the EULA via the `ACCEPT_EULA: Y` environment variable — already set in `docker-compose.yml`.
diff --git a/samples/docs/patterns.md b/samples/docs/patterns.md
new file mode 100644
index 00000000..7f2bc0e2
--- /dev/null
+++ b/samples/docs/patterns.md
@@ -0,0 +1,59 @@
+# Patterns
+
+The samples are built on two overarching architectural styles — **Domain-based Microservices** and **Event-driven Architecture** — supported by **Hexagonal Architecture** and **Eventual Consistency** as foundational principles. Together these define the structural decisions behind the samples and explain why the tactical patterns below exist. The pattern index provides a high-level catalog of each pattern, the group it belongs to, and links to where it is illustrated in the layer documentation.
+
+## Groups
+
+| | Group | Description |
+|---|---|---|
+| 🏛️ | **Architecture** | The overarching architectural styles and principles that govern all structural decisions across the samples. All other pattern groups are the tactical expression of these styles. |
+| 🌐 | **API** | Patterns governing how a domain exposes its capabilities over HTTP: endpoint design, request handling, and API-level cross-cutting concerns. |
+| ⚙️ | **Application** | Patterns for orchestrating business use-cases: coordinating validation, state, mutations, and events without coupling to infrastructure details. |
+| 📋 | **Contracts** | Patterns for defining and governing the shared type system that forms the public surface of a domain, consumed identically by both API and messaging consumers. |
+| 🏛️ | **DDD** | Domain-Driven Design tactical patterns for modeling domains where complex rules and invariants must be enforced at the model level rather than in orchestration code. |
+| 🗄️ | **Infrastructure** | Patterns for integrating with persistence stores, external systems, and technical services, keeping those concerns isolated behind clean abstractions. |
+| 📨 | **Messaging** | Patterns for asynchronous, event-driven integration: producing, transporting, and consuming events reliably across domain and service boundaries. |
+| 🛠️ | **Tooling** | Developer-time tools that feed the layer stack without any runtime presence: code generation from YAML configuration and schema-migration management. |
+| 🧪 | **Testing** | Patterns for testing each host in isolation by distinguishing intra-domain (real) from inter-domain (mocked) dependencies, structured around host-boundary test projects. |
+
+---
+
+## Pattern index
+
+| Group | | Pattern | Description | Link |
+|---|---|---|---|---|
+| 🏛️ **Architecture** | 🏢 | **Domain Microservices** | Each domain is an independently deployable unit with its own data store, API surface, and event contracts, sharing nothing at runtime with other domains. Teams own, deploy, and scale their domain in isolation, with all cross-domain interaction happening through well-defined interfaces. | [Layers](layers.md) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/guide/architecture-styles/microservices) |
+| | ⚡ | **Event-driven Architecture** | Domains integrate primarily through asynchronous domain events, decoupling producers from consumers and enabling resilient, independently scalable communication. Synchronous HTTP integration is used selectively where real-time responses are required — for example, inventory reservation at checkout — but is the exception rather than the rule. | [Messaging](hosts-layer.md#subscribe-host) · [Hosts](hosts-layer.md#api-host) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/guide/architecture-styles/event-driven) |
+| | 🔷 | **Hexagonal Architecture** | The domain and application layers have no knowledge of infrastructure, transport, or framework concerns. All external dependencies — data stores, message brokers, HTTP clients — are reached through interfaces defined by the application layer and implemented in the infrastructure layer, keeping the core logic independently testable and technology-agnostic. | [Layers](layers.md) |
+| | 🔄 | **Eventual Consistency** | Where asynchronous integration is used, consuming domains accept that their local view of another domain's data may lag behind the source of truth. This is an explicit design decision — for example, the Shopping domain's local product replica is synchronized from product events and is intentionally eventually consistent rather than real-time. | [Messaging](hosts-layer.md#subscribe-host) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/patterns/event-sourcing) |
+| 🌐 **API** | 🌐 | **API** | Exposing domain capabilities as HTTP endpoints via a thin controller or handler shell that delegates immediately to business logic, containing no domain rules itself. | [Hosts](hosts-layer.md#api-host) |
+| | 🔑 | **Idempotency** | Ensuring that duplicate or retried requests produce the same outcome as the original, preventing unintended side effects from repeated submissions. | [Hosts](hosts-layer.md#controllers) |
+| ⚙️ **Application** | ✂️ | **CQRS** | Separating the write model (commands operating on the aggregate) from the read model (a dedicated query service returning a purpose-built response shape), allowing each to be designed, optimised, and scaled independently. The API endpoint split between mutations and queries is the natural surface expression of this underlying model separation. | [Application](application-layer.md#services-and-interfaces) · [Hosts](hosts-layer.md#controllers) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/patterns/cqrs) |
+| | 🛡️ | **Policy** | A focused, reusable rule that enforces a specific business condition requiring I/O — such as a repository query or an adapter call. Because aggregates and entities are synchronous by design and cannot perform async operations, any rule that depends on external state must live outside the domain model. A policy provides a named, independently testable home for such rules, callable from any point in service orchestration where the condition needs to be verified. | [Application](application-layer.md#policies) |
+| | 🔧 | **Service** | A focused, stateless class orchestrating a single domain use-case: validating inputs, loading state, performing mutations, and raising domain events. | [Application](application-layer.md#services-and-interfaces) |
+| | 🔄 | **Unit of Work** | Grouping multiple repository writes and event publications into a single atomic operation, ensuring all succeed together or none are committed. | [Application](application-layer.md#services-and-interfaces) |
+| | ✅ | **Validator** | A composable rule set applied to an incoming request before any business logic executes. Rules are declared declaratively per property in a structured, readable form; an optional programmatic phase adds rules that depend on runtime state or I/O — such as cross-field checks or repository-driven constraints. The two phases compose naturally, with the programmatic phase able to guard on prior errors to avoid unnecessary work. | [Application](application-layer.md#validators) |
+| 📋 **Contracts** | 📄 | **Contract (DTO)** | A purpose-built, technology-agnostic type defining the exact data shape crossing a domain boundary, used identically for both API responses and messaging event payloads. | [Contracts](contracts-layer.md#entity-contracts) |
+| | 🏷️ | **Reference Data** | Controlled vocabulary types modelled as first-class domain concepts rather than magic strings or plain enumerations, with built-in validity and sort semantics. | [Contracts](contracts-layer.md#reference-data) |
+| 🏛️ **DDD** | 🧱 | **Aggregate** | A cluster of related entities treated as a single consistency boundary, with all mutations enforced through a root that protects invariants and tracks persistence state. | [Domain](domain-layer.md#aggregates) |
+| | 🔹 | **Entity** | A domain object with a distinct, stable identity that persists across state changes, owned and tracked within an aggregate boundary. | [Domain](domain-layer.md#aggregates) |
+| | 💎 | **Value Object** | An immutable, identity-free concept defined entirely by its values, enforcing its own invariants at construction and compared by value rather than by reference. | [Domain](domain-layer.md#value-objects) |
+| | 🚫 | **Domain Events — Not Native** | CoreEx intentionally does not provide an in-process domain-event bus (e.g. MediatR). Coarse-grained **integration events** added to `IUnitOfWork.Events` and committed via the transactional outbox are the preferred pattern; fine-grained in-process dispatch can be added as an explicit opt-in extension. | [Domain](domain-layer.md#domain-events--intentionally-not-supported) |
+| 🗄️ **Infrastructure** | 🔀 | **Adapter** | An anti-corruption layer that wraps one or more external dependencies (HTTP clients, event publishers, local stores) behind a domain-idiomatic interface, decoupling the application from remote schemas, transports, and versioning concerns. | [Application](application-layer.md#adapters-anti-corruption-layer) · [Infrastructure](infrastructure-layer.md#external-clients-and-adapter-implementations) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/patterns/anti-corruption-layer) |
+| | 🔌 | **HTTP Client** | A strongly-typed wrapper around a single outbound HTTP dependency handling serialization, response mapping, and error translation in one focused, independently testable class. | [Infrastructure](infrastructure-layer.md#external-clients-and-adapter-implementations) |
+| | 🗺️ | **Mapper** | An explicit, uni/bidirectional translation class between two representations of the same concept — such as a domain contract and a persistence model — with no convention magic or reflection overhead. | [Infrastructure](infrastructure-layer.md#mapping) |
+| | 💾 | **Persistence** | A schema-aligned model class mirroring a database table, kept deliberately separate from the domain contract so each can evolve independently without leaking database concerns upward. | [Infrastructure](infrastructure-layer.md#persistence-models) |
+| | 📦 | **Repository** | A collection-like abstraction over a data store that exposes domain-idiomatic operations and return types, shielding all business logic from persistence technology choices. | [Infrastructure](infrastructure-layer.md#repositories) |
+| 📨 **Messaging** | 📩 | **Event** | A domain occurrence serialized as a [CloudEvent](https://cloudevents.io), carrying a typed, versioned payload alongside standardised metadata (id, source, type, time). The same contract type is used for both API responses and message payloads; the CloudEvent envelope is applied at the transport boundary without leaking into the domain model. | [Contracts](contracts-layer.md#unified-api-and-messaging-surface) · [Hosts](hosts-layer.md#subscribe-host) |
+| | 📡 | **Event-Driven Replication** | A consuming domain maintains a local, eventually-consistent copy of another domain's data by subscribing to its published events, eliminating synchronous coupling and improving resilience. | [Application](application-layer.md#adapters-anti-corruption-layer) · [Infrastructure](infrastructure-layer.md#external-clients-and-adapter-implementations) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/patterns/materialized-view) |
+| | 📤 | **Outbox Relay** | A dedicated, lightweight process that polls a transactional outbox and forwards committed event records to a message broker, decoupling durable persistence from broker availability. | [Hosts](hosts-layer.md#outbox-relay-host) |
+| | 📢 | **Publish** | Raising a domain event within a transactional unit of work so the event is only dispatched if the surrounding business transaction commits successfully, guaranteeing consistency. | [Application](application-layer.md#services-and-interfaces) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/patterns/publisher-subscriber) |
+| | 📥 | **Subscribe** | Declaring opt-in consumption of one or more event types via focused subscriber classes that delegate immediately to application logic, keeping business rules out of the messaging layer. | [Hosts](hosts-layer.md#subscribe-host) · [↗ Azure](https://learn.microsoft.com/en-us/azure/architecture/patterns/publisher-subscriber) |
+| | 📬 | **Transactional Outbox** | Persisting an outbound event to a durable outbox table in the same database transaction as the business write, guaranteeing at-least-once delivery without requiring distributed transactions or two-phase commit. | [Hosts](hosts-layer.md#outbox-relay-host) |
+| 🛠️ **Tooling** | ⚙️ | **Code Generation** | Producing the full reference-data layer implementation — contract, API route, service, repository interface, repository, and mapper — from a single schema-validated YAML file, eliminating repetitive boilerplate and ensuring consistency across all layers. | [Tooling](tooling.md#code-generation-codegen) |
+| | 🗃️ | **Database Management** | Managing the full database lifecycle — schema creation, DDL evolution, reference-data seeding, and outbox infrastructure provisioning — through ordered, version-controlled migration scripts and a configuration-driven tooling project. | [Tooling](tooling.md#database-management-database) |
+| 🧪 **Testing** | 🔌 | **Intra-domain Testing** | Exercising a single host end-to-end against its own real infrastructure (database, cache, outbox) while replacing all cross-domain dependencies with mocks, validating the domain’s full behavior without coupling to other services. | [Testing](testing.md#intra-domain-host-tests) |
+| | 🔗 | **Inter-domain Mocking** | Replacing cross-domain HTTP calls and direct broker publishes with controlled fakes that assert the correct outbound request was made, decoupling test correctness from the availability or behavior of other domains. | [Testing](testing.md#intra-domain-vs-inter-domain-testing) |
+| | 🧹 | **Unit Testing** | Testing stateless components (validators, mappers) in a minimal DI container with no I/O, using real reference data loaded from the domain’s own seed file and mocking only intra-domain repository dependencies. | [Testing](testing.md#unit-tests-testunit) |
+| | ✨ | **Local Orchestration** | Running all domain hosts simultaneously as a single distributed application with unified health, log, trace, and metric visibility, enabling cross-domain interaction and end-to-end validation in a local environment. | [Aspire](aspire.md) |
+
diff --git a/samples/docs/testing.md b/samples/docs/testing.md
new file mode 100644
index 00000000..80c17def
--- /dev/null
+++ b/samples/docs/testing.md
@@ -0,0 +1,297 @@
+# Testing
+
+The sample test suite is organised around a clear principle: **each test project tests exactly one deployable host in isolation**. This mirrors the production topology — each host is an independently deployable process — and keeps test concerns sharply separated. The isolation boundary also determines what is real and what is mocked within each project.
+
+---
+
+## Intra-domain vs. inter-domain testing
+
+Understanding this distinction is the key to understanding every test setup decision in the samples.
+
+**Intra-domain** means everything that is *tightly coupled* to the domain under test — its own database, cache, outbox, and internal service logic. These are real dependencies that belong to the domain and are included in the test environment as-is.
+
+**Inter-domain** means everything that is *loosely coupled* — interactions with other domains or external services. These are represented by an abstraction (adapter, HTTP client) at the domain boundary and are **always mocked** in tests. The domain under test should never reach outside its own boundary during a test run.
+
+### Applied to the samples
+
+| Dependency | Domain | Intra or Inter? | How handled in tests |
+|---|---|---|---|
+| Products PostgreSQL database | Products | **Intra** | Real — migrated and seeded in `[OneTimeSetUp]` |
+| Products FusionCache | Products | **Intra** | Real — cleared in `[OneTimeSetUp]` |
+| Products outbox (PostgreSQL) | Products | **Intra** | Real — captured via `UseExpectedPostgresOutboxPublisher()` |
+| Shopping SQL Server database | Shopping | **Intra** | Real — migrated and seeded in `[OneTimeSetUp]` |
+| Shopping FusionCache | Shopping | **Intra** | Real — cleared in `[OneTimeSetUp]` |
+| Shopping outbox (SQL Server) | Shopping | **Intra** | Real — captured via `UseExpectedSqlServerOutboxPublisher()` |
+| Products API (`POST /api/inventory/reserve`) | Shopping | **Inter** | Mocked — `MockHttpClientFactory` intercepts the outbound call |
+| Azure Service Bus (direct publish) | Shopping | **Inter** | Captured via `UseExpectedAzureServiceBusPublisher()` |
+| Azure Service Bus (relay) | Products Outbox Relay | **Inter** | Real — drained and asserted via `GetAndClearAzureServiceBusAsync` |
+
+The Shopping `Basket_Checkout_Save_Failure` test is the sharpest illustration of the boundary: when the outbox write fails mid-checkout, Shopping falls back to publishing a `reservation.cancel` command *directly* to Service Bus (bypassing the outbox, since the DB transaction has already rolled back). The test asserts that:
+- No outbox events are published (intra-domain write failed, as injected).
+- One direct Service Bus event *is* published (inter-domain cancel, asserted via `ExpectAzureServiceBusEvents`).
+- The basket remains `Active` (state was correctly rolled back).
+
+This single test exercises three layers of the intra/inter boundary in one shot.
+
+---
+
+## Test project map
+
+| Project | What it tests | Base class | Infrastructure needed |
+|---|---|---|---|
+| `*.Test.Unit` | Validators and isolated components | `WithGenericTester<EntryPoint>` | None |
+| `*.Test.Api` | Full API host, intra-domain | `WithApiTester<Program>` | DB + Cache; inter-domain HTTP mocked |
+| `*.Test.Subscribe` | Subscribe host, intra-domain | `WithApiTester<Program>` | DB; Service Bus simulated in-process |
+| `*.Test.Relay` | Outbox relay host, intra-domain | `WithApiTester<Program>` | DB + real Service Bus |
+| `*.Test.Common` | Shared test data and migration helpers | — (referenced by the above) | — |
+| `Contoso.E2E.Runner` | Cross-domain scenarios | Interactive console | All infra + all hosts running |
+
+---
+
+## Unit tests (`*.Test.Unit`)
+
+### Why
+
+Validators and other stateless components can be tested with no database, cache, or broker. These tests are fast, deterministic, and require zero infrastructure.
+
+### How
+
+`WithGenericTester<EntryPoint>` builds a minimal DI container configured by `EntryPoint.ConfigureApplication`. The `EntryPoint` registers only what is needed: `ExecutionContext`, a memory cache, and a `ReferenceDataProvider` loaded from the *real* `ref-data.yaml` embedded in the domain's `*.Database` project. Tests therefore run against production-representative reference data, not a separate mock fixture.
+
+When a validator has a repository dependency (as `MovementRequestValidator` does), that repository is **mocked** with `Mock<IProductRepository>`. This is not an inter-domain mock — the repository is an intra-domain interface — but at the unit level all I/O dependencies are replaced to keep tests isolated and fast.
+
+```csharp
+// Contoso.Products.Test.Unit — no infrastructure, real reference data
+public class ProductValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void Empty_Required() => Test.Scoped(test =>
+    {
+        var p = new Product();
+        new ProductValidator().AssertErrors(p,
+            ("sku", "Sku is required."),
+            ("text", "Text is required."),
+            ("subCategory", "Sub-category is required."),
+            ("unitOfMeasure", "Unit-of-measure is required."));
+    });
+}
+```
+
+```csharp
+// Repository-dependent validator — mock the repository, test the logic
+public class InventoryReservationRequestValidatorTests : WithGenericTester<EntryPoint>
+{
+    private readonly Mock<IProductRepository> _mock = new();
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp()
+    {
+        _mock.Setup(x => x.GetForReservationAsync(It.IsAny<string[]>()))
+            .ReturnsAsync(new Dictionary<string, ProductReserve>
+            {
+                ["P1"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = false, IsInactive = false },
+                ["P2"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = true,  IsInactive = false },
+                ["P3"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = false, IsInactive = true  },
+            });
+    }
+
+    [Test]
+    public void Invalid_Products_Extended() => Test.Scoped(test =>
+    {
+        var req = new MovementRequest { Id = "100", Products = new()
+        {
+            ["P2"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1 },
+            ["P3"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1 },
+        }};
+        new MovementRequestValidator(_mock.Object).AssertErrors(req,
+            ("products.P2", "Product is non-stocked and therefore cannot be transacted."),
+            ("products.P3", "Product is not active and therefore cannot be transacted."));
+    });
+}
+```
+
+---
+
+## Intra-domain host tests
+
+`WithApiTester<Program>` boots the actual host `Program` (real DI, real middleware, real repositories) and applies test overrides during `[OneTimeSetUp]`. All intra-domain infrastructure is real; all inter-domain calls are mocked.
+
+### API tests (`*.Test.Api`)
+
+The `[OneTimeSetUp]` pattern for all API test classes:
+
+1. **Migrate and seed** — `MigratePostgresDataAsync` / `MigrateSqlServerDataAsync` resets the domain schema to the contents of `Data/data.yaml` in `*.Test.Common`. A `DataResetFilterPredicate` scopes the reset to the domain's own schema so Products and Shopping test runs cannot affect each other.
+2. **Clear cache** — `ClearFusionCacheAsync()` flushes L1 (in-process) and L2 (Redis) so tests start from a known state.
+3. **Capture events** — `UseExpectedOutboxPublisher()` wraps the outbox publisher with a capture decorator; tests can then assert published events inline.
+4. **Mock inter-domain HTTP** (Shopping only) — `MockHttpClientFactory` intercepts `POST api/inventory/reserve` so the Shopping API can be tested without a running Products API.
+
+```csharp
+// Contoso.Shopping.Test.Api — intra-domain real, inter-domain mocked
+public partial class MutateTests : WithApiTester<Contoso.Shopping.Api.Program>
+{
+    private UnitTestEx.Mocking.MockHttpClientRequest _mockHttpReserveRequest = null!;
+
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedSqlServerOutboxPublisher();
+        Test.UseExpectedAzureServiceBusPublisher();
+
+        // Mock the inter-domain HTTP call to the Products API.
+        var mcf = MockHttpClientFactory.Create();
+        _mockHttpReserveRequest = mcf.CreateClient("ProductsApi").Request(HttpMethod.Post, "api/inventory/reserve");
+        Test.ReplaceHttpClientFactory(mcf);
+    }
+}
+```
+
+Tests are written as fluent chains. Event assertions, response-body comparisons, and HTTP status codes are all inline:
+
+```csharp
+// Happy-path checkout — mock the Products API to succeed, assert the outbox event
+_mockHttpReserveRequest
+    .WithJsonResourceBody("Basket_Checkout_Success.products.req.json")
+    .Respond.With(HttpStatusCode.OK);
+
+var v = Test.Http<Basket>()
+    .ExpectChangeLogUpdated()
+    .ExpectSqlServerOutboxEvents(e => e
+        .AssertWithValue("contoso", "contoso.shopping.basket.checkedout.v1")
+        .AssertMetadata("contoso", "contoso.products.reservation.confirm", basket.Id))
+    .Run(HttpMethod.Post, $"/api/baskets/{basket.Id}/checkout")
+    .AssertOK()
+    .Value!;
+
+_mockHttpReserveRequest.Verify(); // Confirms the mock was actually called.
+```
+
+```csharp
+// Fault injection — simulate outbox failure, assert Service Bus cancel is published directly
+Test.Http()
+    .OnEventPublish(SqlServerOutboxPublisher.DefaultServiceKey,
+        () => throw new InvalidOperationException("Simulated outbox failure"))
+    .ExpectNoSqlServerOutboxEvents()
+    .ExpectAzureServiceBusEvents(e => e.AssertMetadata("contoso", "contoso.products.reservation.cancel", id))
+    .Run(HttpMethod.Post, $"/api/baskets/{id}/checkout")
+    .AssertInternalServerError();
+```
+
+### Subscribe tests (`*.Test.Subscribe`)
+
+`WithApiTester<Subscribe.Program>` boots the subscriber host. No real Service Bus is needed — tests construct a `ServiceBusReceivedMessage` in-process by building `EventData` → `CloudEvent` → `ServiceBusReceivedMessage` and calling `ServiceBusSubscribedSubscriber.ReceiveAsync(...)` directly.
+
+```csharp
+// Simulate receiving an inbound command message — no Service Bus required
+public partial class SubscriberTests : WithApiTester<Contoso.Products.Subscribe.Program>
+{
+    [Test]
+    public void ReservationConfirm_Success() => Test.Scoped(async test =>
+    {
+        test.ExpectPostgresOutboxEvents(e => e.AssertCount(3))
+            .Run(async _ =>
+            {
+                var ed = EventData.CreateCommand("products", "reservation", "confirm").WithKey(referenceId);
+                var ce = Test.CreateCloudEventFrom(ed);
+                var sbm = ce.ToServiceBusReceivedMessage();
+
+                var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+                var r = await sbs.ReceiveAsync(sbm);
+                r.IsSuccess.Should().BeTrue();
+            }).AssertSuccess();
+    });
+}
+```
+
+This approach also verifies error handling — `ErrorHandling.CompleteAsSilent` for unrecognised events, `ErrorHandling.CompleteAsInformation` for not-found entities — without needing a live broker.
+
+### Outbox relay tests (`*.Test.Relay`)
+
+`WithApiTester<Relay.Program>` boots the relay host **with its background services running**. Unlike the API and Subscribe tests, this one touches a real Service Bus because relaying *to* the broker is the entire point.
+
+The pattern is:
+1. Publish CloudEvents directly to the outbox table.
+2. Wait a few seconds for the running relay background service to pick them up.
+3. Drain the Service Bus topic subscription and assert the forwarded messages.
+
+```csharp
+public class RelayTests : WithApiTester<Contoso.Products.Relay.Program>
+{
+    [Test]
+    public async Task Outbox_Relay()
+    {
+        var ce1 = Test.CreateCloudEventFromJsonResource("ProductCreatedCloudEvent.json");
+        var ce2 = Test.CreateCloudEventFromJsonResource("ProductDeletedCloudEvent.json");
+
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.Run(async _ =>
+            {
+                var pub = ActivatorUtilities.GetServiceOrCreateInstance<PostgresOutboxPublisher>(test.Services);
+                pub.Add("contoso", [ce1, ce2]);
+                await pub.PublishAsync();
+
+                // Allow the relay background service time to forward the events.
+                for (int i = 0; i < 5; i++)
+                    await Task.Delay(TimeSpan.FromSeconds(1));
+
+                var list = await Test.GetAndClearAzureServiceBusAsync(
+                    ServiceBusSessionReceiverOptions.CreateForTopicSubscription("contoso", "products"));
+
+                list.Should().HaveCount(2);
+                ObjectComparer.AssertJson(ce1.EncodeToJsonElement().ToString(),
+                    list.Single(x => x.MessageId == ce1.Id).Body.ToString());
+            }).AssertSuccess();
+        });
+    }
+}
+```
+
+The relay host also exposes hosted-service management endpoints (`/hosted-services/{name}/pause`, `/resume`, `/status`), which are exercised directly in tests to verify the relay lifecycle:
+
+```csharp
+Test.Http()
+    .Run(HttpMethod.Post, "/hosted-services/postgres-outbox-relay-03/pause")
+    .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+```
+
+---
+
+## Test data and seeding
+
+### `*.Test.Common`
+
+Each domain has a `*.Test.Common` project containing:
+- `Data/data.yaml` — the canonical test dataset for that domain (products, inventory, baskets, movements, ref data, etc.).
+- `TestData` class — an assembly marker used by the migration helpers to locate the YAML file.
+- `DbMigration` — exposes `ConfigureMigrationArgs` reused across all test projects for that domain.
+
+### ID conventions
+
+IDs in `data.yaml` are expressed as small integers and converted to GUIDs at load time via `n.ToGuid()` (e.g. `3007.ToGuid()`). This keeps fixtures human-readable while using GUID primary keys at the database level.
+
+### Schema isolation
+
+`DataResetFilterPredicate` scopes each migration reset to the domain's own schema. Running Products and Shopping tests concurrently will not corrupt each other's test data.
+
+---
+
+## Response expectations (`Resources/`)
+
+Each `*.Test.Api` and `*.Test.Relay` project has a `Resources/` folder containing JSON files for two purposes:
+
+| File convention | Purpose |
+|---|---|
+| `*.res.json` | Expected API response body — compared against the actual response, with volatile paths (e.g. `etag`, `changelog`) excluded. |
+| `*.req.json` | Mock request body — what the `MockHttpClientRequest` expects to receive from the domain under test. |
+| `*.products.res.json` | Mock response body — what the `MockHttpClientRequest` returns to simulate the inter-domain answer. |
+
+---
+
+## E2E testing
+
+`Contoso.E2E.Runner` is an interactive console runner for cross-domain scenarios. Unlike the host tests above it requires **all** infrastructure and **all** hosts to be running simultaneously — orchestrated via Aspire. It tests the complete inter-domain flow end-to-end: basket checkout triggers a real HTTP call to Products, which publishes a real event to Service Bus, which is consumed by the real subscriber. It also supports a parallel load-simulation mode for concurrency and performance validation.
+
+See [aspire.md](aspire.md) for the full Aspire setup, E2E Runner usage, scenario descriptions, load-simulation configuration, and the recommended first-run order.
diff --git a/samples/docs/tooling.md b/samples/docs/tooling.md
new file mode 100644
index 00000000..e3b60414
--- /dev/null
+++ b/samples/docs/tooling.md
@@ -0,0 +1,161 @@
+# Developer Tooling
+
+The samples include two developer-time tooling projects per domain that are not part of the runtime stack. They run locally during development to generate code and manage the database schema. Neither is deployed or referenced at runtime.
+
+---
+
+## Code Generation (`*.CodeGen`)
+
+Each domain has a `*.CodeGen` console project (e.g. `Contoso.Products.CodeGen`, `Contoso.Shopping.CodeGen`) that drives the [CoreEx.CodeGen](../../src/CoreEx.CodeGen) package. Its sole purpose is to eliminate the boilerplate associated with reference data: every reference-data entity follows the same deterministic pattern — contract class, API controller route, service method, repository interface, repository implementation, and EF Core mapper — so all of it is generated rather than hand-authored.
+
+### How it works
+
+1. A developer authors `ref-data.yaml` alongside `Program.cs`, declaring each reference-data entity and any per-entity or per-property overrides.
+2. The file is validated against the [`coreex-refdata.json`](../../schema/coreex-refdata.json) JSON Schema (IDE YAML language-server support provides validation and auto-complete).
+3. Running `dotnet run` invokes `CodeGenConsole`, which hands off to [OnRamp](https://github.com/Avanade/OnRamp). OnRamp loads `ref-data-script.yaml` (embedded in the package), resolves the ordered generation steps, evaluates the embedded Handlebars templates against the typed configuration model, and writes `.g.cs` files into the correct target projects.
+4. Target project directories — Contracts, Api, Application, Infrastructure — are resolved automatically by convention from the CodeGen project's location; no path configuration is required.
+
+### What is generated
+
+| Artefact | Target layer | Description |
+|---|---|---|
+| `*.g.cs` contract class | Contracts | Typed reference-data entity contract. |
+| `*.g.cs` controller route | API host | HTTP endpoint exposing the entity collection. |
+| `*.g.cs` service method | Application | Service-layer method delegating to the repository. |
+| `*.g.cs` repository interface | Application | Interface declaration for the entity repository. |
+| `*.g.cs` repository | Infrastructure | EF Core repository implementation. |
+| `*.g.cs` mapper | Infrastructure | Bidirectional EF Core mapper for the entity. |
+
+All generated files carry the `.g.cs` suffix, clearly distinguishing them from hand-authored code and excluding them from manual maintenance.
+
+### `ref-data.yaml` structure
+
+```yaml
+collectionSortOrder: Code        # sort order applied to all entity collections
+repository: EntityFramework      # repository implementation strategy
+entities:
+- name: Brand                    # simplest form — all defaults apply
+- name: SubCategory
+  properties:
+  - name: CategoryCode
+    type: ^Category              # ^ prefix = reference-data typed property
+- name: UnitOfMeasure
+  plural: UnitsOfMeasure         # override pluralization
+  properties:
+  - name: Scale
+    type: int
+```
+
+The full schema reference is available in [`docs/CodeGeneration.md`](../../src/CoreEx.CodeGen/docs/CodeGeneration.md), [`docs/Entity.md`](../../src/CoreEx.CodeGen/docs/Entity.md), and [`docs/Property.md`](../../src/CoreEx.CodeGen/docs/Property.md).
+
+### Code-count reporting
+
+Running `dotnet run -- count` invokes the `Count` command, which walks all solution output directories, classifies `.g.cs` vs hand-authored `.cs` files, and renders a formatted table showing total and generated file and line counts per directory. This gives an at-a-glance view of how much of the codebase is generated.
+
+---
+
+## Database Management (`*.Database`)
+
+Each domain has a `*.Database` console project (e.g. `Contoso.Products.Database`, `Contoso.Shopping.Database`) that drives the [DbEx](https://github.com/Avanade/DbEx) database management framework. It is the **primary tool for deploying and managing the domain database across all environments** — local development, CI/CD pipelines, and production — providing a consistent, repeatable, command-driven lifecycle.
+
+Products uses `DbEx.Postgres` (PostgreSQL); Shopping uses `DbEx.SqlServer` (SQL Server), demonstrating that the same tooling approach is database-agnostic. A MySQL variant (`DbEx.MySql`) is also available.
+
+### DbEx commands
+
+DbEx exposes a rich command set. A single run can execute one or more commands in order:
+
+| Command | Description |
+|---|---|
+| `Drop` | Drops the database where it already exists. |
+| `Create` | Creates the database where it does not already exist. |
+| `Migrate` | Applies outstanding [DbUp](https://dbup.readthedocs.io/en/latest/philosophy-behind-dbup/)-style ordered migration scripts; tracks which have already run and applies only new ones. Scripts are immutable once applied. |
+| `CodeGen` | Executes an optional code-generation step — used here to generate the Infrastructure-layer `.g.cs` files (persistence models and `DbContext` partial). |
+| `Schema` | Drops and re-applies idempotent schema objects (stored procedures, functions, types) from the `Schema/` folder on every run. |
+| `Data` | Applies YAML/JSON-defined seed data — useful for reference data, master data, and test fixtures. Supports both `INSERT` and `MERGE` semantics. |
+| `Reset` | Deletes all data from the database (exclusions configurable); designed for test environment resets. |
+| `Execute` | Executes arbitrary SQL statements or script files directly. |
+| `Script` | Scaffolds a new timestamped migration script file using the naming convention. |
+
+Composite commands combine the above for common scenarios:
+
+| Composite | Runs |
+|---|---|
+| `All` | `Create` → `Migrate` → `CodeGen` → `Schema` → `Data` |
+| `Deploy` | `Migrate` → `Schema` |
+| `DeployWithData` | `Migrate` → `Schema` → `Data` |
+| `ResetAndAll` | `Reset` → `All` (test environments) |
+
+In the samples, `dotnet run` without arguments defaults to `All` for local development, and `Deploy` (or `DeployWithData`) is the typical command for environment promotion pipelines.
+
+### Migrate — schema evolution
+
+Migration scripts live under `Migrations/` as embedded resources and follow a timestamp-ordered naming convention:
+
+```
+20260101-000201-create-products-product.pgsql
+20260101-000202-create-products-inventory.pgsql
+```
+
+Scripts are **immutable once applied** — subsequent schema changes require new scripts (e.g. `ALTER TABLE`). DbEx tracks applied scripts in a journal table, so only new scripts are run. Scripts can include moustache-style parameter substitution (`{{Company}}`) resolved from `MigrationArgs.Parameters`.
+
+### Schema — idempotent objects
+
+Objects under `Schema/` (stored procedures, functions, user-defined table types) are dropped and re-created on every `Schema` run. This makes them safely idempotent and avoids the immutability constraint of migration scripts. The transactional outbox stored procedures / functions (e.g. `spOutboxEnqueue`, `fn_outbox_batch_claim`) are generated here and carry a `.g.sql` / `.g.pgsql` suffix.
+
+### Data — seeding
+
+Seed data is declared in `Data/ref-data.yaml` using a concise schema → table → rows YAML structure. DbEx infers column types from the live schema and supports:
+
+- **Insert** (default) — straightforward row insertion.
+- **Merge** (`$` prefix on table name) — upsert semantics; idempotent on repeated runs.
+- **Reference data resolution** — foreign-key `Id` columns can be specified by code; DbEx resolves the identifier at runtime via sub-query.
+- **Identifier generation** (`^` prefix) — auto-generates GUIDs for primary keys.
+
+```yaml
+products:
+  - $brand:           # merge (upsert) — safe to re-run
+    - AVA: Avanade
+    - CON: Contoso
+  - $unit_of_measure:
+    - EA: Each
+    - KG: Kilogram
+```
+
+### CodeGen — C# code generation
+
+The `CodeGen` command generates `.g.cs` files into the Infrastructure project based on the tables declared in `dbex.yaml`:
+
+| Generated artefact | Location | Description |
+|---|---|---|
+| `<Entity>.g.cs` (one per table) | `Infrastructure/Persistence/` | Schema-aligned persistence model extending `ModelBase<TId>`, with optional marker interfaces such as `ILogicallyDeleted`. |
+| `*DbContext.g.cs` | `Infrastructure/Repositories/` | Partial `DbContext` class exposing `AddGeneratedModels(ModelBuilder)` to register all persistence models with EF Core. |
+
+These are the only `.g.cs` files produced by `*.Database`; all other generated C# across the solution comes from `*.CodeGen`.
+
+### `dbex.yaml` structure
+
+`dbex.yaml` is the configuration entry point, declaring the schema, which tables to include in code generation, and whether to provision outbox infrastructure:
+
+```yaml
+schema: products        # schema (namespace) for all tables
+outbox: true            # generate transactional outbox tables + stored procs/functions
+outboxName: outbox      # prefix for outbox table and procedure names
+tables:
+- name: brand           # reference-data tables (also seeded via Data/ref-data.yaml)
+- name: category
+- name: product         # transactional tables
+- name: inventory
+```
+
+When `outbox: true` is set, DbEx generates the full outbox infrastructure — tables (via a `Migrate` script) and stored procedures / functions (via `Schema`) — with no hand-authored DDL required.
+
+---
+
+## Relationship to the layer stack
+
+The tooling projects feed the layer stack at design time but are invisible at runtime:
+
+- **CodeGen** → generates `.g.cs` files that become part of the **Contracts**, **API**, **Application**, and **Infrastructure** layers.
+- **Database** → deploys the schema that the **Infrastructure** layer reads and writes, provisions the outbox tables consumed by the **Outbox Relay** host, and generates the Infrastructure-layer persistence models (`Persistence/*.g.cs`) and EF Core `DbContext` partial (`Repositories/*DbContext.g.cs`).
+
+See [contracts-layer.md](contracts-layer.md#reference-data) for how generated reference-data types are used, [infrastructure-layer.md](infrastructure-layer.md#persistence-models) for the schema-aligned models, and [hosts-layer.md](hosts-layer.md#outbox-relay-host) for how the outbox relay consumes the deployed outbox infrastructure.
diff --git a/samples/src/Contoso.Order.Workflow.Client/Contoso.Order.Workflow.Client.csproj b/samples/src/Contoso.Order.Workflow.Client/Contoso.Order.Workflow.Client.csproj
new file mode 100644
index 00000000..a3a173ec
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Client/Contoso.Order.Workflow.Client.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>Contoso.Order.Workflow.Client</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DurableTask.Client.AzureManaged" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Contoso.Order.Workflow.Workflow\Contoso.Order.Workflow.Workflow.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Client/DurableTaskConnectionStringFactory.cs b/samples/src/Contoso.Order.Workflow.Client/DurableTaskConnectionStringFactory.cs
new file mode 100644
index 00000000..228b9321
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Client/DurableTaskConnectionStringFactory.cs
@@ -0,0 +1,16 @@
+namespace Contoso.Order.Workflow.Client;
+
+internal static class DurableTaskConnectionStringFactory
+{
+    public static string Create(DurableTaskSchedulerOptions options)
+    {
+        var endpoint = options.Endpoint;
+        var hostAddress = endpoint.Contains(';', StringComparison.Ordinal) ? endpoint.Split(';', StringSplitOptions.TrimEntries)[0] : endpoint;
+        var taskHubName = string.IsNullOrWhiteSpace(options.TaskHub) ? "order" : options.TaskHub;
+        var isLocalEmulator = hostAddress.StartsWith("http://localhost:8080", StringComparison.OrdinalIgnoreCase)
+            || hostAddress.StartsWith("http://localhost:8081", StringComparison.OrdinalIgnoreCase);
+
+        var authentication = isLocalEmulator ? "None" : "DefaultAzure";
+        return $"Endpoint={hostAddress};TaskHub={taskHubName};Authentication={authentication}";
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Client/DurableTaskSchedulerOptions.cs b/samples/src/Contoso.Order.Workflow.Client/DurableTaskSchedulerOptions.cs
new file mode 100644
index 00000000..505a7833
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Client/DurableTaskSchedulerOptions.cs
@@ -0,0 +1,10 @@
+namespace Contoso.Order.Workflow.Client;
+
+public sealed class DurableTaskSchedulerOptions
+{
+    public const string SectionName = "DurableTaskScheduler";
+
+    public string Endpoint { get; set; } = "http://localhost:8080";
+
+    public string TaskHub { get; set; } = "order";
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Client/IOrderWorkflowClient.cs b/samples/src/Contoso.Order.Workflow.Client/IOrderWorkflowClient.cs
new file mode 100644
index 00000000..7936bc48
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Client/IOrderWorkflowClient.cs
@@ -0,0 +1,11 @@
+using Contoso.Order.Workflow.Workflow.Contracts;
+using Microsoft.DurableTask.Client;
+
+namespace Contoso.Order.Workflow.Client;
+
+public interface IOrderWorkflowClient
+{
+    Task<string> StartAsync(OrderWorkflowRequest request, string? instanceId = null, CancellationToken cancellationToken = default);
+
+    Task<OrchestrationMetadata?> GetMetadataAsync(string instanceId, bool getInputsAndOutputs = false, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Client/OrderWorkflowClient.cs b/samples/src/Contoso.Order.Workflow.Client/OrderWorkflowClient.cs
new file mode 100644
index 00000000..b982ee80
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Client/OrderWorkflowClient.cs
@@ -0,0 +1,38 @@
+using Contoso.Order.Workflow.Workflow;
+using Contoso.Order.Workflow.Workflow.Contracts;
+using Microsoft.DurableTask;
+using Microsoft.DurableTask.Client;
+using Microsoft.Extensions.Logging;
+
+namespace Contoso.Order.Workflow.Client;
+
+public sealed class OrderWorkflowClient : IOrderWorkflowClient
+{
+    private readonly DurableTaskClient _durableTaskClient;
+    private readonly ILogger<OrderWorkflowClient> _logger;
+
+    public OrderWorkflowClient(DurableTaskClient durableTaskClient, ILogger<OrderWorkflowClient> logger)
+    {
+        _durableTaskClient = durableTaskClient;
+        _logger = logger;
+    }
+
+    public async Task<string> StartAsync(OrderWorkflowRequest request, string? instanceId = null, CancellationToken cancellationToken = default)
+    {
+        var startOptions = string.IsNullOrWhiteSpace(instanceId)
+            ? null
+            : new StartOrchestrationOptions(instanceId);
+
+        var orchestrationInstanceId = await _durableTaskClient.ScheduleNewOrchestrationInstanceAsync(
+            nameof(OrderWorkflowOrchestration),
+            request,
+            startOptions,
+            cancellationToken).ConfigureAwait(false);
+
+        _logger.LogInformation("Scheduled {OrchestrationName} with instance id {InstanceId}.", nameof(OrderWorkflowOrchestration), orchestrationInstanceId);
+        return orchestrationInstanceId;
+    }
+
+    public Task<OrchestrationMetadata?> GetMetadataAsync(string instanceId, bool getInputsAndOutputs = false, CancellationToken cancellationToken = default)
+        => _durableTaskClient.GetInstanceAsync(instanceId, getInputsAndOutputs, cancellationToken);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Client/ServiceCollectionExtensions.cs b/samples/src/Contoso.Order.Workflow.Client/ServiceCollectionExtensions.cs
new file mode 100644
index 00000000..d9eeebd4
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Client/ServiceCollectionExtensions.cs
@@ -0,0 +1,30 @@
+using Microsoft.DurableTask.Client;
+using Microsoft.DurableTask.Client.AzureManaged;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Contoso.Order.Workflow.Client;
+
+public static class ServiceCollectionExtensions
+{
+    public static IServiceCollection AddContosoOrderWorkflowClient(this IServiceCollection services, IConfiguration configuration)
+    {
+        var connectionString = configuration.GetConnectionString("DurableTaskScheduler");
+
+        var options = new DurableTaskSchedulerOptions
+        {
+            Endpoint = configuration[$"{DurableTaskSchedulerOptions.SectionName}:Endpoint"] ?? "http://localhost:8080",
+            TaskHub = configuration[$"{DurableTaskSchedulerOptions.SectionName}:TaskHub"] ?? "order"
+        };
+
+        services.AddDurableTaskClient(durableTaskBuilder =>
+        {
+            durableTaskBuilder.UseDurableTaskScheduler(string.IsNullOrWhiteSpace(connectionString)
+                ? DurableTaskConnectionStringFactory.Create(options)
+                : connectionString);
+        });
+
+        services.AddScoped<IOrderWorkflowClient, OrderWorkflowClient>();
+        return services;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Worker/Contoso.Order.Workflow.Worker.csproj b/samples/src/Contoso.Order.Workflow.Worker/Contoso.Order.Workflow.Worker.csproj
new file mode 100644
index 00000000..60edd4df
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Worker/Contoso.Order.Workflow.Worker.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <RootNamespace>Contoso.Order.Workflow.Worker</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DurableTask.Worker.AzureManaged" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Contoso.Order.Workflow.Workflow\Contoso.Order.Workflow.Workflow.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Worker/Program.cs b/samples/src/Contoso.Order.Workflow.Worker/Program.cs
new file mode 100644
index 00000000..d38cc725
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Worker/Program.cs
@@ -0,0 +1,62 @@
+using Contoso.Order.Workflow.Workflow;
+using Contoso.Order.Workflow.Workflow.Activities;
+using Microsoft.DurableTask.Worker;
+using Microsoft.DurableTask.Worker.AzureManaged;
+using OpenTelemetry.Trace;
+
+namespace Contoso.Order.Workflow.Worker;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+
+        builder.Logging.AddConsole();
+        builder.Logging.SetMinimumLevel(LogLevel.Information);
+
+        var endpoint = Environment.GetEnvironmentVariable("dts-endpoint")
+            ?? builder.Configuration["DurableTaskScheduler:Endpoint"]
+            ?? "http://localhost:8080";
+
+        var taskHubName = Environment.GetEnvironmentVariable("TASKHUB")
+            ?? builder.Configuration["DurableTaskScheduler:TaskHub"]
+            ?? "order";
+
+        var hostAddress = endpoint.Contains(';', StringComparison.Ordinal) ? endpoint.Split(';', StringSplitOptions.TrimEntries)[0] : endpoint;
+        var isLocalEmulator = hostAddress.StartsWith("http://localhost:8080", StringComparison.OrdinalIgnoreCase)
+            || hostAddress.StartsWith("http://localhost:8081", StringComparison.OrdinalIgnoreCase);
+
+        var connectionString = isLocalEmulator
+            ? $"Endpoint={hostAddress};TaskHub={taskHubName};Authentication=None"
+            : $"Endpoint={hostAddress};TaskHub={taskHubName};Authentication=DefaultAzure";
+
+        builder.Services.AddDurableTaskWorker()
+            .AddTasks(registry =>
+            {
+                registry.AddOrchestrator<OrderWorkflowOrchestration>();
+                registry.AddActivity<ValidateOrderActivity>();
+                registry.AddActivity<SubmitOrderActivity>();
+            })
+            .UseDurableTaskScheduler(connectionString);
+
+        builder.Services.AddOpenTelemetry()
+            .WithTracing(tracing =>
+            {
+                // The DurableTask SDK registers its own ActivitySource internally for orchestration and activity tracing.
+                tracing.AddOtlpExporter();
+            });
+
+        builder.Services.AddHealthChecks();
+
+        var app = builder.Build();
+
+        app.MapHealthChecks("/health");
+
+        var logger = app.Services.GetRequiredService<ILogger<Program>>();
+        if (logger.IsEnabled(LogLevel.Information))
+            logger.LogInformation("Order workflow worker started with endpoint: {Endpoint}, task hub: {TaskHub}, local emulator: {IsLocalEmulator}.", hostAddress, taskHubName, isLocalEmulator);
+
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Worker/Properties/launchSettings.json b/samples/src/Contoso.Order.Workflow.Worker/Properties/launchSettings.json
new file mode 100644
index 00000000..2cf083f9
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Worker/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Contoso.Order.Workflow.Worker": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:49680;http://localhost:49681"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Worker/appsettings.Development.json b/samples/src/Contoso.Order.Workflow.Worker/appsettings.Development.json
new file mode 100644
index 00000000..c86fcf0f
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Worker/appsettings.Development.json
@@ -0,0 +1,6 @@
+{
+  "DurableTaskScheduler": {
+    "Endpoint": "http://localhost:8080",
+    "TaskHub": "order"
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Worker/appsettings.json b/samples/src/Contoso.Order.Workflow.Worker/appsettings.json
new file mode 100644
index 00000000..97b5fce6
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Worker/appsettings.json
@@ -0,0 +1,12 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "DurableTaskScheduler": {
+    "Endpoint": "http://localhost:8080",
+    "TaskHub": "order"
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Workflow/Activities/SubmitOrderActivity.cs b/samples/src/Contoso.Order.Workflow.Workflow/Activities/SubmitOrderActivity.cs
new file mode 100644
index 00000000..019cca51
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Workflow/Activities/SubmitOrderActivity.cs
@@ -0,0 +1,15 @@
+using Contoso.Order.Workflow.Workflow.Contracts;
+using Microsoft.DurableTask;
+
+namespace Contoso.Order.Workflow.Workflow.Activities;
+
+[DurableTask]
+public sealed class SubmitOrderActivity : TaskActivity<SubmitOrderActivityInput, OrderWorkflowResult>
+{
+    public override Task<OrderWorkflowResult> RunAsync(TaskActivityContext context, SubmitOrderActivityInput input)
+    {
+        var message = $"Order '{input.OrderId}' accepted for {input.Amount:0.00} {input.Currency}.";
+        var result = new OrderWorkflowResult(input.OrderId, true, message, DateTimeOffset.UtcNow);
+        return Task.FromResult(result);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Workflow/Activities/ValidateOrderActivity.cs b/samples/src/Contoso.Order.Workflow.Workflow/Activities/ValidateOrderActivity.cs
new file mode 100644
index 00000000..796b998c
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Workflow/Activities/ValidateOrderActivity.cs
@@ -0,0 +1,17 @@
+using Contoso.Order.Workflow.Workflow.Contracts;
+using Microsoft.DurableTask;
+
+namespace Contoso.Order.Workflow.Workflow.Activities;
+
+[DurableTask]
+public sealed class ValidateOrderActivity : TaskActivity<ValidateOrderActivityInput, bool>
+{
+    public override Task<bool> RunAsync(TaskActivityContext context, ValidateOrderActivityInput input)
+    {
+        var hasOrderId = !string.IsNullOrWhiteSpace(input.OrderId);
+        var hasCurrency = !string.IsNullOrWhiteSpace(input.Currency);
+        var hasPositiveAmount = input.Amount > 0;
+
+        return Task.FromResult(hasOrderId && hasCurrency && hasPositiveAmount);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Workflow/Contoso.Order.Workflow.Workflow.csproj b/samples/src/Contoso.Order.Workflow.Workflow/Contoso.Order.Workflow.Workflow.csproj
new file mode 100644
index 00000000..7785e2fe
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Workflow/Contoso.Order.Workflow.Workflow.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <RootNamespace>Contoso.Order.Workflow.Workflow</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DurableTask.Abstractions" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Workflow/Contracts/OrderWorkflowContracts.cs b/samples/src/Contoso.Order.Workflow.Workflow/Contracts/OrderWorkflowContracts.cs
new file mode 100644
index 00000000..c137ea35
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Workflow/Contracts/OrderWorkflowContracts.cs
@@ -0,0 +1,9 @@
+namespace Contoso.Order.Workflow.Workflow.Contracts;
+
+public record OrderWorkflowRequest(string OrderId, decimal Amount, string Currency, string? RequestedBy = null);
+
+public record OrderWorkflowResult(string OrderId, bool Accepted, string Message, DateTimeOffset ProcessedAt);
+
+public record ValidateOrderActivityInput(string OrderId, decimal Amount, string Currency);
+
+public record SubmitOrderActivityInput(string OrderId, decimal Amount, string Currency, string? RequestedBy);
\ No newline at end of file
diff --git a/samples/src/Contoso.Order.Workflow.Workflow/OrderWorkflowOrchestration.cs b/samples/src/Contoso.Order.Workflow.Workflow/OrderWorkflowOrchestration.cs
new file mode 100644
index 00000000..932f2160
--- /dev/null
+++ b/samples/src/Contoso.Order.Workflow.Workflow/OrderWorkflowOrchestration.cs
@@ -0,0 +1,27 @@
+using Contoso.Order.Workflow.Workflow.Activities;
+using Contoso.Order.Workflow.Workflow.Contracts;
+using Microsoft.DurableTask;
+
+namespace Contoso.Order.Workflow.Workflow;
+
+[DurableTask]
+public sealed class OrderWorkflowOrchestration : TaskOrchestrator<OrderWorkflowRequest, OrderWorkflowResult>
+{
+    public override async Task<OrderWorkflowResult> RunAsync(TaskOrchestrationContext context, OrderWorkflowRequest input)
+    {
+        var validation = await context.CallActivityAsync<bool>(
+            nameof(ValidateOrderActivity),
+            new ValidateOrderActivityInput(input.OrderId, input.Amount, input.Currency));
+
+        if (!validation)
+        {
+            return new OrderWorkflowResult(input.OrderId, false, "Order request failed validation.", context.CurrentUtcDateTime);
+        }
+
+        var submission = await context.CallActivityAsync<OrderWorkflowResult>(
+            nameof(SubmitOrderActivity),
+            new SubmitOrderActivityInput(input.OrderId, input.Amount, input.Currency, input.RequestedBy));
+
+        return submission;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/Contoso.Orders.Api.csproj b/samples/src/Contoso.Orders.Api/Contoso.Orders.Api.csproj
new file mode 100644
index 00000000..62f64966
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/Contoso.Orders.Api.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\Contoso.Order.Workflow.Client\Contoso.Order.Workflow.Client.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Application\Contoso.Orders.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Contracts\Contoso.Orders.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Infrastructure\Contoso.Orders.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.Development.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/Controllers/OrderController.cs b/samples/src/Contoso.Orders.Api/Controllers/OrderController.cs
new file mode 100644
index 00000000..3c24cc49
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/Controllers/OrderController.cs
@@ -0,0 +1,55 @@
+namespace Contoso.Orders.Api.Controllers;
+
+using Contoso.Order.Workflow.Client;
+using Contoso.Order.Workflow.Workflow.Contracts;
+using OrderContract = Contoso.Orders.Contracts.Order;
+
+[ApiController, Route("/api/orders"), OpenApiTag("Orders")]
+public class OrderController(WebApi webApi, IOrderService service, IOrderWorkflowClient orderWorkflowClient) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IOrderService _service = service.ThrowIfNull();
+    private readonly IOrderWorkflowClient _orderWorkflowClient = orderWorkflowClient.ThrowIfNull();
+
+    [HttpPost]
+    [Accepts<OrderContract>]
+    [ProducesResponseType<OrderContract>(StatusCodes.Status201Created)]
+    [IdempotencyKey]
+    public Task<IActionResult> PostAsync() => _webApi.PostAsync<OrderContract, OrderContract>(Request, (ro, _) =>
+    {
+        ro.WithLocationUri(o => new Uri($"/api/orders/{o.Id}", UriKind.Relative));
+        return _service.CreateAsync(ro.Value);
+    });
+
+    [HttpPut("{id}")]
+    [Accepts<OrderContract>]
+    [ProducesResponseType(typeof(OrderContract), StatusCodes.Status200OK)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> PutAsync(string id) => _webApi.PutAsync<OrderContract, OrderContract>(Request, (ro, _)
+        => _service.UpdateAsync(ro.Value.Adjust(o => o.Id = id.Required())));
+
+    [HttpPatch("{id}")]
+    [Accepts<OrderContract>(HttpNames.MergePatchJsonMediaTypeName)]
+    [ProducesResponseType(typeof(OrderContract), StatusCodes.Status200OK)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> PatchAsync(string id) => _webApi.PatchAsync<OrderContract>(Request,
+        get: (ro, _) => _service.GetAsync(id.Required()),
+        put: (ro, _) => _service.UpdateAsync(ro.Value.Adjust(o => o.Id = id.Required())));
+
+    [HttpDelete("{id}")]
+    [ProducesResponseType(StatusCodes.Status204NoContent)]
+    public Task<IActionResult> DeleteAsync(string id) => _webApi.DeleteAsync(Request, (_, _)
+        => _service.DeleteAsync(id.Required()));
+
+    [HttpPost("orchestrate")]
+    [Accepts<OrderWorkflowRequest>]
+    [ProducesResponseType(typeof(OrchestrateOrderResponse), StatusCodes.Status202Accepted)]
+    [IdempotencyKey]
+    public Task<IActionResult> OrchestrateOrderAsync() => _webApi.PostAsync<OrderWorkflowRequest, OrchestrateOrderResponse>(Request, async (ro, ct) =>
+    {
+        var instanceId = await _orderWorkflowClient.StartAsync(ro.Value, cancellationToken: ct).ConfigureAwait(false);
+        return new OrchestrateOrderResponse(instanceId);
+    }, HttpStatusCode.Accepted);
+}
+
+public sealed record OrchestrateOrderResponse(string InstanceId);
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/Controllers/OrderReadController.cs b/samples/src/Contoso.Orders.Api/Controllers/OrderReadController.cs
new file mode 100644
index 00000000..31183dea
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/Controllers/OrderReadController.cs
@@ -0,0 +1,22 @@
+namespace Contoso.Orders.Api.Controllers;
+
+using OrderContract = Contoso.Orders.Contracts.Order;
+
+[ApiController, Route("/api/orders"), OpenApiTag("Orders")]
+public class OrderReadController(WebApi webApi, IOrderReadService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IOrderReadService _service = service.ThrowIfNull();
+
+    [HttpGet("{id}"), HttpHead("{id}")]
+    [ProducesResponseType(typeof(OrderContract), StatusCodes.Status200OK)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> GetAsync(string id) => _webApi.GetAsync(Request, (_, _)
+        => _service.GetAsync(id.Required()));
+
+    [HttpGet]
+    [ProducesResponseType(typeof(OrderLite[]), StatusCodes.Status200OK)]
+    [Query(supportsOrderBy: true), Paging(supportsCount: true)]
+    public Task<IActionResult> QueryAsync() => _webApi.GetAsync(Request, (ro, _)
+        => _service.QueryAsync(ro.QueryArgs, ro.PagingArgs));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/Controllers/ReferenceDataController.cs b/samples/src/Contoso.Orders.Api/Controllers/ReferenceDataController.cs
new file mode 100644
index 00000000..a7677951
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/Controllers/ReferenceDataController.cs
@@ -0,0 +1,12 @@
+namespace Contoso.Orders.Api.Controllers;
+
+[ApiController, Route("/api/refdata")]
+public class ReferenceDataController(WebApi webApi) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+
+    [HttpGet("order-statuses"), HttpHead("order-statuses")]
+    [ProducesResponseType(typeof(OrderStatus[]), StatusCodes.Status200OK)]
+    public Task<IActionResult> GetOrderStatusesAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<OrderStatus>(codes, text, ro.IsIncludeInactive, ct));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/GlobalUsing.cs b/samples/src/Contoso.Orders.Api/GlobalUsing.cs
new file mode 100644
index 00000000..e912609f
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/GlobalUsing.cs
@@ -0,0 +1,14 @@
+global using Contoso.Orders.Application;
+global using Contoso.Orders.Application.Interfaces;
+global using Contoso.Orders.Contracts;
+global using CoreEx;
+global using CoreEx.AspNetCore.Mvc;
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using CoreEx.Validation;
+global using Microsoft.AspNetCore.Mvc;
+global using NSwag.Annotations;
+global using System.Net;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/Program.cs b/samples/src/Contoso.Orders.Api/Program.cs
new file mode 100644
index 00000000..ebfc1191
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/Program.cs
@@ -0,0 +1,82 @@
+using Contoso.Orders.Infrastructure.Repositories;
+using Contoso.Order.Workflow.Client;
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace Contoso.Orders.Api;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        var builder = WebApplication.CreateBuilder(args);
+
+        builder.AddHostSettings();
+
+        builder.Services
+            .AddExecutionContext()
+            .AddReferenceDataOrchestrator<ReferenceDataService>()
+            .AddMvcWebApi()
+            .AddHttpWebApi();
+
+        builder.Services.AddContosoOrderWorkflowClient(builder.Configuration);
+
+        builder.Services.AddDynamicServicesUsing<ReferenceDataService, ReferenceDataRepository>();
+
+        builder.Services.AddMemoryCache();
+        builder.AddRedisDistributedCache("redis");
+
+        builder.Services.AddFusionCache()
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        builder.Services
+            .AddFusionHybridCache()
+            .AddDefaultCacheKeyProvider()
+            .AddHybridCacheIdempotencyProvider();
+
+        builder.AddSqlServerClient("SqlServer");
+        builder.Services
+            .AddSqlServerDatabase()
+            .AddSqlServerUnitOfWork()
+            .AddEventFormatter()
+            .AddSqlServerOutboxPublisher<OrdersOutboxPublisher>()
+            .AddDbContext<OrdersDbContext>()
+            .AddEfDb<OrdersEfDb>();
+
+        builder.Services.PostConfigureAllHealthChecks();
+
+        builder.Services.AddControllers();
+
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        builder.WithCoreExTelemetry()
+            .WithCoreExSqlServerTelemetry()
+            .UseOtlpExporter();
+
+        var app = builder.Build();
+
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.UseIdempotencyKey();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/Properties/launchSettings.json b/samples/src/Contoso.Orders.Api/Properties/launchSettings.json
new file mode 100644
index 00000000..0898c92e
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/Properties/launchSettings.json
@@ -0,0 +1,13 @@
+{
+  "profiles": {
+    "Contoso.Orders.Api": {
+      "commandName": "Project",
+      "launchUrl": "https://localhost:62023/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:62023;http://localhost:62024"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/appsettings.Development.json b/samples/src/Contoso.Orders.Api/appsettings.Development.json
new file mode 100644
index 00000000..ad8dee3b
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/appsettings.Development.json
@@ -0,0 +1,36 @@
+{
+  "ConnectionStrings": {
+    "DurableTaskScheduler": "Endpoint=http://localhost:8080;TaskHub=order;Authentication=None"
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    }
+  },
+  "DurableTaskScheduler": {
+    "Endpoint": "http://localhost:8080",
+    "TaskHub": "order"
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Api/appsettings.json b/samples/src/Contoso.Orders.Api/appsettings.json
new file mode 100644
index 00000000..8946e119
--- /dev/null
+++ b/samples/src/Contoso.Orders.Api/appsettings.json
@@ -0,0 +1,20 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Orders"
+    },
+    "Events": {
+      "Destination": "contoso"
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Update": "None"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/Contoso.Orders.Application.csproj b/samples/src/Contoso.Orders.Application/Contoso.Orders.Application.csproj
new file mode 100644
index 00000000..7a63b0d5
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/Contoso.Orders.Application.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.DomainDriven\CoreEx.DomainDriven.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Contracts\Contoso.Orders.Contracts.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/GlobalUsing.cs b/samples/src/Contoso.Orders.Application/GlobalUsing.cs
new file mode 100644
index 00000000..e65ce4c2
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/GlobalUsing.cs
@@ -0,0 +1,15 @@
+global using Contoso.Orders.Application.Interfaces;
+global using Contoso.Orders.Application.Repositories;
+global using Contoso.Orders.Application.Validators;
+global using Contoso.Orders.Contracts;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Localization;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Validation;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/Interfaces/IOrderReadService.cs b/samples/src/Contoso.Orders.Application/Interfaces/IOrderReadService.cs
new file mode 100644
index 00000000..b4d1fc0c
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/Interfaces/IOrderReadService.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Orders.Application.Interfaces;
+
+public interface IOrderReadService
+{
+    Task<Contracts.Order?> GetAsync(string id);
+
+    Task<ItemsResult<OrderLite>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/Interfaces/IOrderService.cs b/samples/src/Contoso.Orders.Application/Interfaces/IOrderService.cs
new file mode 100644
index 00000000..ceacfc72
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/Interfaces/IOrderService.cs
@@ -0,0 +1,12 @@
+namespace Contoso.Orders.Application.Interfaces;
+
+public interface IOrderService
+{
+    Task<Contracts.Order?> GetAsync(string id);
+
+    Task<Contracts.Order> CreateAsync(Contracts.Order order);
+
+    Task<Contracts.Order> UpdateAsync(Contracts.Order order);
+
+    Task DeleteAsync(string id);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/OrderReadService.cs b/samples/src/Contoso.Orders.Application/OrderReadService.cs
new file mode 100644
index 00000000..4d632199
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/OrderReadService.cs
@@ -0,0 +1,12 @@
+namespace Contoso.Orders.Application;
+
+[ScopedService<IOrderReadService>]
+public class OrderReadService(IOrderRepository repository) : IOrderReadService
+{
+    private readonly IOrderRepository _repository = repository.ThrowIfNull();
+
+    public Task<Order?> GetAsync(string id) => _repository.GetAsync(id);
+
+    public Task<ItemsResult<OrderLite>> QueryAsync(QueryArgs? query, PagingArgs? paging)
+        => _repository.QueryAsync(query, paging);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/OrderService.cs b/samples/src/Contoso.Orders.Application/OrderService.cs
new file mode 100644
index 00000000..17e46505
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/OrderService.cs
@@ -0,0 +1,56 @@
+namespace Contoso.Orders.Application;
+
+[ScopedService<IOrderService>]
+public class OrderService(IUnitOfWork unitOfWork, IOrderRepository repository) : IOrderService
+{
+    private readonly IUnitOfWork _unitOfWork = unitOfWork.ThrowIfNull();
+    private readonly IOrderRepository _repository = repository.ThrowIfNull();
+
+    public Task<Order?> GetAsync(string id) => _repository.GetAsync(id);
+
+    public async Task<Order> CreateAsync(Order order)
+    {
+        order.ThrowIfNull();
+
+        await OrderValidator.Default.ValidateAndThrowAsync(order).ConfigureAwait(false);
+
+        await IdentifierGenerator.Current.AssignIdentifierAsync(order).ConfigureAwait(false);
+        order.StatusCode ??= "P";
+
+        return await _unitOfWork.TransactionAsync(async () =>
+        {
+            var dr = await _repository.CreateAsync(order).ConfigureAwait(false);
+            return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+        }).ConfigureAwait(false);
+    }
+
+    public async Task<Order> UpdateAsync(Order order)
+    {
+        order.ThrowIfNull();
+        order.Id.ThrowIfNullOrEmpty();
+
+        await OrderValidator.Default.ValidateAndThrowAsync(order).ConfigureAwait(false);
+
+        var current = await _repository.GetAsync(order.Id).ConfigureAwait(false);
+        NotFoundException.ThrowIfDefault(current);
+
+        return await _unitOfWork.TransactionAsync(async () =>
+        {
+            var dr = await _repository.UpdateAsync(order).ConfigureAwait(false);
+            return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Updated)));
+        }).ConfigureAwait(false);
+    }
+
+    public async Task DeleteAsync(string id)
+    {
+        var order = await _repository.GetAsync(id).ConfigureAwait(false);
+        if (order is null)
+            return;
+
+        await _unitOfWork.TransactionAsync(async () =>
+        {
+            var dr = await _repository.DeleteAsync(id).ConfigureAwait(false);
+            dr.WhereMutated(() => _unitOfWork.Events.Add(EventData.CreateEvent<Order>(EventAction.Deleted).WithKey(id)));
+        }).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/ReferenceDataService.cs b/samples/src/Contoso.Orders.Application/ReferenceDataService.cs
new file mode 100644
index 00000000..a2503d0f
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/ReferenceDataService.cs
@@ -0,0 +1,18 @@
+namespace Contoso.Orders.Application;
+
+[ScopedService]
+public class ReferenceDataService(IReferenceDataRepository repository) : IReferenceDataProvider
+{
+    private readonly IReferenceDataRepository _repository = repository.ThrowIfNull();
+
+    public IEnumerable<(Type, Type)> Types =>
+    [
+        (typeof(OrderStatus), typeof(OrderStatusCollection)),
+    ];
+
+    public async Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+    {
+        _ when type == typeof(OrderStatus) => await _repository.GetAllOrderStatusesAsync().ConfigureAwait(false),
+        _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+    };
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/Repositories/IOrderRepository.cs b/samples/src/Contoso.Orders.Application/Repositories/IOrderRepository.cs
new file mode 100644
index 00000000..dd65ab9f
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/Repositories/IOrderRepository.cs
@@ -0,0 +1,14 @@
+namespace Contoso.Orders.Application.Repositories;
+
+public interface IOrderRepository
+{
+    Task<Contracts.Order?> GetAsync(string id);
+
+    Task<DataResult<Contracts.Order>> CreateAsync(Contracts.Order order);
+
+    Task<DataResult<Contracts.Order>> UpdateAsync(Contracts.Order order);
+
+    Task<DataResult> DeleteAsync(string id);
+
+    Task<ItemsResult<Contracts.OrderLite>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/Repositories/IReferenceDataRepository.cs b/samples/src/Contoso.Orders.Application/Repositories/IReferenceDataRepository.cs
new file mode 100644
index 00000000..7a7bea08
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/Repositories/IReferenceDataRepository.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Orders.Application.Repositories;
+
+public interface IReferenceDataRepository
+{
+    Task<OrderStatusCollection> GetAllOrderStatusesAsync();
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Application/Validators/OrderValidator.cs b/samples/src/Contoso.Orders.Application/Validators/OrderValidator.cs
new file mode 100644
index 00000000..95ae8212
--- /dev/null
+++ b/samples/src/Contoso.Orders.Application/Validators/OrderValidator.cs
@@ -0,0 +1,17 @@
+namespace Contoso.Orders.Application.Validators;
+
+public class OrderValidator : Validator<Order, OrderValidator>
+{
+    private static readonly Validator<OrderItem> _itemValidator = Validator.Create<OrderItem>()
+        .HasProperty(x => x.Id, p => p.Mandatory().MaximumLength(50))
+        .HasProperty(x => x.ProductId, p => p.Mandatory().MaximumLength(100))
+        .HasProperty(x => x.Quantity, p => p.GreaterThanOrEqualTo(0m).PrecisionScale(null, 4))
+        .HasProperty(x => x.UnitPrice, p => p.GreaterThanOrEqualTo(0m).PrecisionScale(null, 4));
+
+    public OrderValidator()
+    {
+        Property(o => o.CustomerId).Mandatory().MaximumLength(100);
+        Property(o => o.Status).Mandatory().IsValid();
+        Property(o => o.Items).Collection(with => with.WithItemValidator(_itemValidator));
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/Contoso.Orders.Contracts.csproj b/samples/src/Contoso.Orders.Contracts/Contoso.Orders.Contracts.csproj
new file mode 100644
index 00000000..e065a3f1
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/Contoso.Orders.Contracts.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/GlobalUsing.cs b/samples/src/Contoso.Orders.Contracts/GlobalUsing.cs
new file mode 100644
index 00000000..e5b13f15
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/GlobalUsing.cs
@@ -0,0 +1,5 @@
+global using CoreEx.Entities;
+global using CoreEx.Localization;
+global using CoreEx.RefData;
+global using System.ComponentModel;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/Order.cs b/samples/src/Contoso.Orders.Contracts/Order.cs
new file mode 100644
index 00000000..7d6ab4a8
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/Order.cs
@@ -0,0 +1,11 @@
+namespace Contoso.Orders.Contracts;
+
+[Contract]
+public partial class Order : OrderBase, IETag, IChangeLog
+{
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/OrderBase.cs b/samples/src/Contoso.Orders.Contracts/OrderBase.cs
new file mode 100644
index 00000000..98ec1a6c
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/OrderBase.cs
@@ -0,0 +1,16 @@
+namespace Contoso.Orders.Contracts;
+
+[Contract]
+public abstract partial class OrderBase : IIdentifier<string?>
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    public string? CustomerId { get; set; }
+
+    [ReferenceData<OrderStatus>]
+    [Localization("Order status")]
+    public partial string? StatusCode { get; set; }
+
+    public List<OrderItem>? Items { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/OrderItem.cs b/samples/src/Contoso.Orders.Contracts/OrderItem.cs
new file mode 100644
index 00000000..c835fc75
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/OrderItem.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Orders.Contracts;
+
+[Contract]
+public partial class OrderItem : IIdentifier<string?>
+{
+    public string? Id { get; set; }
+
+    public string? ProductId { get; set; }
+
+    public decimal Quantity { get; set; }
+
+    public decimal UnitPrice { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/OrderLite.cs b/samples/src/Contoso.Orders.Contracts/OrderLite.cs
new file mode 100644
index 00000000..ee1bdca3
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/OrderLite.cs
@@ -0,0 +1,17 @@
+namespace Contoso.Orders.Contracts;
+
+[Contract]
+public partial class OrderLite : IIdentifier<string?>
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    public string? CustomerId { get; set; }
+
+    [ReferenceData<OrderStatus>]
+    [Localization("Order status")]
+    public partial string? StatusCode { get; set; }
+
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Contracts/OrderStatus.cs b/samples/src/Contoso.Orders.Contracts/OrderStatus.cs
new file mode 100644
index 00000000..855973d6
--- /dev/null
+++ b/samples/src/Contoso.Orders.Contracts/OrderStatus.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Orders.Contracts;
+
+[ReferenceData]
+public partial class OrderStatus : ReferenceData<OrderStatus> { }
+
+public class OrderStatusCollection() : ReferenceDataCollection<OrderStatus>(ReferenceDataSortOrder.Code) { }
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Contoso.Orders.Database.csproj b/samples/src/Contoso.Orders.Database/Contoso.Orders.Database.csproj
new file mode 100644
index 00000000..fe22e9e9
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Contoso.Orders.Database.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DbEx.SqlServer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Data/ref-data.yaml b/samples/src/Contoso.Orders.Database/Data/ref-data.yaml
new file mode 100644
index 00000000..d5b6547b
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Data/ref-data.yaml
@@ -0,0 +1,5 @@
+Orders:
+  - $^OrderStatus:
+    - P: Pending
+    - C: Confirmed
+    - X: Cancelled
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Migrations/20260101-000001-create-orders-schema.sql b/samples/src/Contoso.Orders.Database/Migrations/20260101-000001-create-orders-schema.sql
new file mode 100644
index 00000000..6b581a3b
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Migrations/20260101-000001-create-orders-schema.sql
@@ -0,0 +1 @@
+CREATE SCHEMA [Orders]
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Migrations/20260101-000101-create-orders-orderstatus.sql b/samples/src/Contoso.Orders.Database/Migrations/20260101-000101-create-orders-orderstatus.sql
new file mode 100644
index 00000000..85e4cdd8
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Migrations/20260101-000101-create-orders-orderstatus.sql
@@ -0,0 +1,18 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Orders].[OrderStatus] (
+  [OrderStatusId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [Code] NVARCHAR(50) NOT NULL UNIQUE,
+  [Text] NVARCHAR(250) NULL,
+  [IsActive] BIT NULL,
+  [SortOrder] INT NULL,
+  [RowVersion] TIMESTAMP NOT NULL,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Migrations/20260101-000201-create-orders-order.sql b/samples/src/Contoso.Orders.Database/Migrations/20260101-000201-create-orders-order.sql
new file mode 100644
index 00000000..226a5af3
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Migrations/20260101-000201-create-orders-order.sql
@@ -0,0 +1,16 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Orders].[Order] (
+  [OrderId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [CustomerId] NVARCHAR(100) NOT NULL,
+  [StatusCode] NVARCHAR(50) NOT NULL,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL,
+  [RowVersion] TIMESTAMP NOT NULL
+);
+
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Migrations/20260101-000202-create-orders-orderitem.sql b/samples/src/Contoso.Orders.Database/Migrations/20260101-000202-create-orders-orderitem.sql
new file mode 100644
index 00000000..28c1bb48
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Migrations/20260101-000202-create-orders-orderitem.sql
@@ -0,0 +1,17 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Orders].[OrderItem] (
+  [OrderItemId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [OrderId] NVARCHAR(50) NOT NULL FOREIGN KEY REFERENCES [Orders].[Order]([OrderId]),
+  [ProductId] NVARCHAR(100) NOT NULL,
+  [Quantity] DECIMAL(18, 4) NOT NULL DEFAULT 0,
+  [UnitPrice] DECIMAL(18, 4) NOT NULL DEFAULT 0,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Migrations/20260101-000301-create-orders-outbox-tables.sql b/samples/src/Contoso.Orders.Database/Migrations/20260101-000301-create-orders-outbox-tables.sql
new file mode 100644
index 00000000..80696224
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Migrations/20260101-000301-create-orders-outbox-tables.sql
@@ -0,0 +1,33 @@
+-- Create table: [Orders].[Outbox] and [Orders].[OutboxLease]
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Orders].[Outbox] (
+  [OutboxId] BIGINT IDENTITY (1, 1) NOT NULL PRIMARY KEY,
+  [TenantId] NVARCHAR(255) NOT NULL,
+  [PartitionId] INT NOT NULL,
+  [Status] TINYINT NOT NULL DEFAULT 0,
+  [EnqueuedUtc] DATETIME2 NOT NULL,
+  [AvailableUtc] DATETIME2 NOT NULL,
+  [DequeuedUtc] DATETIME2 NULL,
+  [Attempts] INT NOT NULL DEFAULT 0,
+  [Destination] NVARCHAR(255) NULL,
+  [Event] NVARCHAR(MAX) NOT NULL,
+  [LeaseId] UNIQUEIDENTIFIER NULL,
+  [LeaseUntilUtc] DATETIME2 NULL,
+
+  INDEX [IX_Orders_Outbox_PartitionOrder] ([TenantId], [PartitionId], [OutboxId]) INCLUDE ([Status], [AvailableUtc], [LeaseUntilUtc], [Destination], [Event], [Attempts]),
+  INDEX [IX_Orders_Outbox_WorkerPull] ([TenantId], [PartitionId], [Status]) INCLUDE ([OutboxId], [AvailableUtc]),
+  INDEX [IX_Orders_Outbox_CleanUp] ([OutboxId]) INCLUDE ([DequeuedUtc]) WHERE [Status] = 2
+);
+
+CREATE TABLE [Orders].[OutboxLease] (
+  [TenantId] NVARCHAR(255) NOT NULL,
+  [PartitionId] INT NOT NULL,
+  [LeaseId] UNIQUEIDENTIFIER NULL,
+  [LeaseUntilUtc] DATETIME2 NULL,
+
+  CONSTRAINT PK_Orders_OutboxLease PRIMARY KEY (TenantId, PartitionId)
+);
+
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Program.cs b/samples/src/Contoso.Orders.Database/Program.cs
new file mode 100644
index 00000000..14d86fbb
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Program.cs
@@ -0,0 +1,40 @@
+using CoreEx.Database;
+using DbEx.Migration;
+using DbEx.SqlServer.Console;
+
+namespace Contoso.Orders.Database;
+
+/// <summary>
+/// Represents the <b>database utilities</b> program (capability).
+/// </summary>
+public class Program
+{
+    /// <summary>
+    /// Main startup.
+    /// </summary>
+    /// <param name="args">The startup arguments.</param>
+    /// <returns>The status code whereby zero indicates success.</returns>
+    public static Task<int> Main(string[] args) => SqlServerMigrationConsole
+        .Create<Program>("Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true")
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>
+    /// Configure the <see cref="MigrationArgs"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="MigrationArgs"/>.</param>
+    /// <returns>The <see cref="MigrationArgs"/>.</returns>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
+    {
+        args.AddAssembly<SqlStatement>().AddAssembly<Program>()
+            .IncludeExtendedSchemaScripts()
+            .DataParserArgs
+                .RefDataColumnDefault("SortOrder", _ => 0)
+                .RefDataColumnDefault("Scale", _ => 0);
+
+        // Only reset data for the Orders schema.
+        args.DataResetFilterPredicate = ts => ts.Schema == "Orders";
+
+        return args;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchCancel.g.sql b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchCancel.g.sql
new file mode 100644
index 00000000..4dd6c746
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchCancel.g.sql	
@@ -0,0 +1,58 @@
+CREATE OR ALTER PROCEDURE [Orders].[spOutboxBatchCancel]
+  @LeaseId UNIQUEIDENTIFIER,
+  @BackoffSeconds INT
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+   *
+   * Cancels a batch by LeaseId, marking messages as pending with backoff and releasing the lease.
+   * > Returns:
+   *   0 = Success.
+   *  -1 = No rows updated (e.g. already completed or invalid LeaseId).
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Cancel the batch.
+    UPDATE o
+      SET o.[Status] = 0,
+          o.[Attempts] = o.[Attempts] + 1,
+          o.[AvailableUtc] = DATEADD(SECOND, @BackoffSeconds, @Now),
+          o.[LeaseId] = NULL,
+          o.[LeaseUntilUtc] = NULL
+    FROM [Orders].[Outbox] AS o WITH (UPDLOCK, ROWLOCK)
+    WHERE o.[LeaseId] = @LeaseId
+      AND o.[Status] = 1;
+
+    IF (@@ROWCOUNT = 0)
+    BEGIN
+      COMMIT;
+      RETURN -1; -- No rows updated.
+    END
+
+    COMMIT;
+
+    -- 2) Release the partition lease.
+    BEGIN TRY
+      EXEC [Orders].[spOutboxLeaseRelease] @LeaseId;
+    END TRY
+    BEGIN CATCH
+      -- Ignore: lease will expire. Don't fail cancel.
+    END CATCH
+
+    RETURN 0;
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
diff --git a/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchClaim.g.sql b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchClaim.g.sql
new file mode 100644
index 00000000..8b92ab5f
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchClaim.g.sql	
@@ -0,0 +1,116 @@
+CREATE OR ALTER PROCEDURE [Orders].[spOutboxBatchClaim]
+  @TenantId NVARCHAR(255) = NULL,
+  @PartitionId INT,
+  @BatchSize INT,
+  @LeaseId UNIQUEIDENTIFIER,
+  @LeaseSeconds INT
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+   *
+   * Claims the next batch of pending/processing messages for a tenant/partition, marking them as processing with a lease.
+   * > Returns:
+   *   0 = Success; batch returned in result set.
+   *  -1 = No rows updated (e.g. already claimed by another).
+   *  -2 = No batch to claim (e.g. all completed).
+   *  -3 = Unable to acquire lease (e.g. another active batch).
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+  DECLARE @LeaseUntilUtc DATETIME2;
+  DECLARE @EffectiveTenantId NVARCHAR(255) = COALESCE(@TenantId, '(none)');
+
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+
+  -- 1) Acquire a partition lease; exit where unsuccessful.
+  DECLARE @RC INT;
+  EXEC @RC = [Orders].[spOutboxLeaseAcquire] @EffectiveTenantId, @PartitionId, @LeaseId, @LeaseSeconds, @LeaseUntilUtc OUTPUT;
+  IF (@RC < 0) RETURN -3;
+
+  -- 2) Claim the next batch (contiguous by OutboxId) for the tenant/partition.
+  BEGIN TRY
+    BEGIN TRAN;
+
+    DECLARE @HeadId BIGINT;
+    DECLARE @BlockerId BIGINT;
+
+    -- Determine head (first pending/processing) for strict contiguity.
+    SELECT @HeadId = MIN(o.OutboxId)
+      FROM [Orders].[Outbox] o WITH (UPDLOCK)
+      WHERE o.[TenantId] = @EffectiveTenantId
+        AND o.[PartitionId] = @PartitionId
+        AND o.[Status] IN (0, 1)
+      OPTION (RECOMPILE);
+
+    IF @HeadId IS NULL
+    BEGIN
+      COMMIT;
+
+      -- Release the lease outside transaction.
+      EXEC [Orders].[spOutboxLeaseRelease] @LeaseId;
+      RETURN -2; -- Nothing available.
+    END
+
+    -- Find first blocker at/after head: actively leased or not yet available.
+    SELECT @BlockerId = MIN(o.OutboxId)
+      FROM [Orders].[Outbox] o WITH (READPAST, UPDLOCK)
+      WHERE o.[TenantId] = @EffectiveTenantId
+        AND o.[PartitionId] = @PartitionId
+        AND o.[OutboxId] >= @HeadId
+        AND ((o.Status = 1 AND o.[LeaseUntilUtc] IS NOT NULL AND o.[LeaseUntilUtc] > @Now)
+          OR (o.Status = 0 AND o.[AvailableUtc] > @Now))
+      OPTION (RECOMPILE);
+
+    -- Claim contiguous run from head to before blocker.
+    ;WITH claim AS
+    (
+      SELECT TOP (@BatchSize)
+        o.[OutboxId], o.[TenantId], o.[Status], o.[PartitionId], o.[Destination], o.[Event],
+        o.[Attempts], o.[EnqueuedUtc], o.[AvailableUtc], o.[LeaseId], o.[LeaseUntilUtc]
+      FROM [Orders].[Outbox] o WITH (READPAST, UPDLOCK, ROWLOCK)
+      WHERE o.[TenantId] = @EffectiveTenantId
+        AND o.[PartitionId] = @PartitionId
+        AND o.[OutboxId] >= @HeadId
+        AND (@BlockerId IS NULL OR o.[OutboxId] < @BlockerId)
+        AND ((o.[Status] = 0 AND o.[AvailableUtc] <= @Now)
+          OR (o.[Status] = 1 AND (o.[LeaseUntilUtc] IS NULL OR o.[LeaseUntilUtc] <= @Now)))
+      ORDER BY o.OutboxId
+    )
+    UPDATE claim
+      SET [Status] = 1,
+          [LeaseId] = @LeaseId,
+          [LeaseUntilUtc] = @LeaseUntilUtc
+    OUTPUT
+      inserted.[OutboxId],
+      inserted.[TenantId],
+      inserted.[Status],
+      inserted.[PartitionId],
+      inserted.[Destination],
+      inserted.[Event],
+      inserted.[Attempts],
+      inserted.[EnqueuedUtc],
+      inserted.[AvailableUtc],
+      inserted.[LeaseUntilUtc];
+
+      IF (@@ROWCOUNT = 0)
+      BEGIN
+        COMMIT;
+
+        -- Release the lease outside transaction.
+        EXEC [Orders].[spOutboxLeaseRelease] @LeaseId;
+        RETURN -1; -- No rows updated.
+      END
+
+      COMMIT;
+      RETURN 0;
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchComplete.g.sql b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchComplete.g.sql
new file mode 100644
index 00000000..46521dfd
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxBatchComplete.g.sql	
@@ -0,0 +1,58 @@
+CREATE OR ALTER PROCEDURE [Orders].[spOutboxBatchComplete]
+  @LeaseId UNIQUEIDENTIFIER,
+  @DequeuedUtc DATETIME2 NULL
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+   *
+   * Marks a batch as completed by LeaseId, releasing the lease and making way for the next batch.
+   * > Returns:
+   *   0 = Success.
+   *  -1 = No rows updated (e.g. already completed or invalid LeaseId).
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Complete the batch.
+    UPDATE o
+      SET o.[Status] = 2,
+          o.[LeaseId] = NULL,
+          o.[LeaseUntilUtc] = NULL,
+          o.[DequeuedUtc] = COALESCE(@DequeuedUtc, @Now)
+    FROM [Orders].[Outbox] AS o WITH (UPDLOCK, ROWLOCK)
+    WHERE o.[LeaseId] = @LeaseId
+      AND o.[Status] = 1;
+
+    IF (@@ROWCOUNT = 0)
+    BEGIN
+      COMMIT;
+      RETURN -1; -- No rows updated.
+    END
+
+    COMMIT;
+
+    -- 2) Release the partition lease where identified.
+    BEGIN TRY
+      EXEC [Orders].[spOutboxLeaseRelease] @LeaseId;
+    END TRY
+    BEGIN CATCH
+      -- Ignore: lease will expire. Don't fail completion.
+    END CATCH
+
+    RETURN 0
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxEnqueue.g.sql b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxEnqueue.g.sql
new file mode 100644
index 00000000..736f5a62
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxEnqueue.g.sql	
@@ -0,0 +1,36 @@
+CREATE OR ALTER PROCEDURE [Orders].[spOutboxEnqueue]
+  @TenantId AS NVARCHAR(255) = NULL,
+  @PartitionId AS INT,
+  @Destination AS NVARCHAR(255),
+  @Event AS NVARCHAR(MAX),
+  @EnqueuedUtc AS DATETIME2 = NULL,
+  @AvailableUtc AS DATETIME2 = NULL
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+  DECLARE @EffectiveTenantId NVARCHAR(255) = COALESCE(@TenantId, '(none)');
+
+  INSERT INTO [Orders].[Outbox] (
+    [TenantId],
+    [PartitionId],
+    [Destination],
+    [Event],
+    [EnqueuedUtc],
+    [AvailableUtc]
+  )
+  VALUES (
+    @EffectiveTenantId,
+    @PartitionId,
+    @Destination,
+    @Event,
+    COALESCE(@EnqueuedUtc, @Now),
+    COALESCE(@AvailableUtc, COALESCE(@EnqueuedUtc, @Now))
+  )
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxLeaseAcquire.g.sql b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxLeaseAcquire.g.sql
new file mode 100644
index 00000000..3f1aa894
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxLeaseAcquire.g.sql	
@@ -0,0 +1,73 @@
+CREATE OR ALTER PROCEDURE [Orders].[spOutboxLeaseAcquire]
+  @TenantId NVARCHAR(255) = NULL,
+  @PartitionId INT,
+  @LeaseId UNIQUEIDENTIFIER,
+  @LeaseSeconds INT,
+  @LeaseUntilUtc DATETIME2 OUTPUT
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+   *
+   * Attempts to acquire a lease for a tenant/partition, returning success status and lease until timestamp.
+   * > Returns:
+   *   0 = Lease acquired; caller may proceed with batch claim.
+   *  -1 = Lease not acquired; caller should backoff and retry.
+   *
+   * Notes:
+   * - The procedure will return -1 where lease acquisition is unsuccessful, including where another active lease exists.
+   * - The caller should implement an appropriate retry/backoff strategy where -1 is returned, including randomization to avoid thundering herd issues.
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+  DECLARE @Until DATETIME2 = DATEADD(SECOND, @LeaseSeconds, @Now)
+  DECLARE @EffectiveTenantId NVARCHAR(255) = COALESCE(@TenantId, '(none)');
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Ensure the row exists (self-seeding); lock the key-range for this PartitionId to avoid insert races.
+    IF NOT EXISTS (
+      SELECT 1
+      FROM [Orders].[OutboxLease] WITH (UPDLOCK, HOLDLOCK)
+      WHERE [TenantId] = @EffectiveTenantId AND [PartitionId] = @PartitionId
+    )
+    BEGIN
+      INSERT INTO [Orders].[OutboxLease] ([TenantId], [PartitionId])
+      VALUES (@EffectiveTenantId, @PartitionId);
+    END
+
+    -- 2) Attempt to acquire lease where expired/empty.
+    UPDATE ol
+      SET ol.[LeaseId] = @LeaseId,
+          ol.[LeaseUntilUtc] = @Until
+      FROM [Orders].[OutboxLease] AS ol WITH (UPDLOCK, ROWLOCK)
+      WHERE ol.[PartitionId] = @PartitionId
+        AND ol.[TenantId] = @EffectiveTenantId
+        AND (ol.[LeaseUntilUtc] IS NULL OR ol.[LeaseUntilUtc] <= @Now)
+        OPTION (RECOMPILE);
+
+    -- 3) Commit and return lease success status.
+    DECLARE @Rows INT = @@ROWCOUNT;
+
+    COMMIT;
+
+    IF @Rows = 1
+    BEGIN
+      SET @LeaseUntilUtc = @Until;
+      RETURN 0; -- Lease successful.
+    END
+
+    SET @LeaseUntilUtc = NULL;
+    RETURN -1; -- Lease unsuccessful.
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxLeaseRelease.g.sql b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxLeaseRelease.g.sql
new file mode 100644
index 00000000..cd2c6a37
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/Schema/Stored Procedures/spOutboxLeaseRelease.g.sql	
@@ -0,0 +1,44 @@
+CREATE OR ALTER PROCEDURE [Orders].[spOutboxLeaseRelease]
+  @LeaseId UNIQUEIDENTIFIER
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+   *
+   * Releases a lease by LeaseId, making way for the next batch.
+   * > Returns:
+   *   0 = Success; lease released and available for next claim.
+   *  -1 = No rows updated (e.g. already released or invalid LeaseId).
+   *
+   * Notes:
+   * - The procedure will return -1 where release is unsuccessful, including where the lease is already released.
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Release lease where lessee.
+    UPDATE ol
+      SET ol.[LeaseId] = NULL,
+          ol.[LeaseUntilUtc] = NULL
+      FROM [Orders].[OutboxLease] AS ol WITH (UPDLOCK, ROWLOCK)
+      WHERE ol.[LeaseId] = @LeaseId;
+
+    -- 2) Commit and return release success status.
+    DECLARE @Rows INT = @@ROWCOUNT;
+
+    COMMIT;
+
+    IF @Rows = 1 RETURN 0; -- Release successful.
+    RETURN -1; -- Release unsuccessful.
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Database/dbex.yaml b/samples/src/Contoso.Orders.Database/dbex.yaml
new file mode 100644
index 00000000..1de3a2f5
--- /dev/null
+++ b/samples/src/Contoso.Orders.Database/dbex.yaml
@@ -0,0 +1,9 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/DbEx/refs/heads/main/schema/dbex.json
+outbox: true
+tables:
+# Reference-data
+- name: OrderStatus
+
+# Transactional-data
+- name: Order
+- name: OrderItem
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Contoso.Orders.Infrastructure.csproj b/samples/src/Contoso.Orders.Infrastructure/Contoso.Orders.Infrastructure.csproj
new file mode 100644
index 00000000..e8e6a3c8
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Contoso.Orders.Infrastructure.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Application\Contoso.Orders.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Contracts\Contoso.Orders.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/GlobalUsing.cs b/samples/src/Contoso.Orders.Infrastructure/GlobalUsing.cs
new file mode 100644
index 00000000..f5d9b216
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/GlobalUsing.cs
@@ -0,0 +1,19 @@
+global using Contoso.Orders.Application.Repositories;
+global using Contoso.Orders.Infrastructure.Mapping;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.Data.Models;
+global using CoreEx.Data.Querying;
+global using CoreEx.Database;
+global using CoreEx.Database.SqlServer;
+global using CoreEx.Database.SqlServer.Outbox;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.EntityFrameworkCore;
+global using CoreEx.EntityFrameworkCore.Converters;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Mapping;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.Extensions.Logging;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Mapping/OrderMapper.cs b/samples/src/Contoso.Orders.Infrastructure/Mapping/OrderMapper.cs
new file mode 100644
index 00000000..0306ba15
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Mapping/OrderMapper.cs
@@ -0,0 +1,33 @@
+namespace Contoso.Orders.Infrastructure.Mapping;
+
+public class OrderMapper : BiDirectionMapper<Contracts.Order, Persistence.Order, OrderMapper>
+{
+    protected override Persistence.Order OnMap(Contracts.Order source) => new()
+    {
+        Id = source.Id!,
+        CustomerId = source.CustomerId!,
+        StatusCode = source.Status?.Code!,
+        Items = source.Items?.Select(i => new Persistence.OrderItem
+        {
+            Id = i.Id!,
+            OrderId = source.Id!,
+            ProductId = i.ProductId!,
+            Quantity = i.Quantity,
+            UnitPrice = i.UnitPrice
+        }).ToList() ?? []
+    };
+
+    protected override Contracts.Order OnMap(Persistence.Order source) => new()
+    {
+        Id = source.Id,
+        CustomerId = source.CustomerId,
+        StatusCode = source.StatusCode,
+        Items = source.Items?.Select(i => new Contracts.OrderItem
+        {
+            Id = i.Id,
+            ProductId = i.ProductId,
+            Quantity = i.Quantity,
+            UnitPrice = i.UnitPrice
+        }).ToList() ?? []
+    };
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Mapping/OrderStatusMapper.cs b/samples/src/Contoso.Orders.Infrastructure/Mapping/OrderStatusMapper.cs
new file mode 100644
index 00000000..5de65875
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Mapping/OrderStatusMapper.cs
@@ -0,0 +1,16 @@
+namespace Contoso.Orders.Infrastructure.Mapping;
+
+internal class OrderStatusMapper : BiDirectionMapper<Contracts.OrderStatus, Persistence.OrderStatus, OrderStatusMapper>
+{
+    protected override Persistence.OrderStatus OnMap(Contracts.OrderStatus source) => throw new NotImplementedException();
+
+    protected override Contracts.OrderStatus OnMap(Persistence.OrderStatus source) => new()
+    {
+        Id = source.Id!,
+        Code = source.Code,
+        Text = source.Text,
+        SortOrder = source.SortOrder,
+        IsInactive = !source.IsActive,
+        ETag = source.ETag
+    };
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Persistence/Order.cs b/samples/src/Contoso.Orders.Infrastructure/Persistence/Order.cs
new file mode 100644
index 00000000..879783ef
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Persistence/Order.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Orders.Infrastructure.Persistence;
+
+public partial class Order
+{
+    public virtual ICollection<OrderItem> Items { get; set; } = [];
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Persistence/Order.g.cs b/samples/src/Contoso.Orders.Infrastructure/Persistence/Order.g.cs
new file mode 100644
index 00000000..48dff874
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Persistence/Order.g.cs
@@ -0,0 +1,22 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Orders.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>[Orders].[Order]</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>OrderId</c>' (type '<c>NVARCHAR(50)</c>').</remarks>
+public partial class Order : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>CustomerId</c>' column (type '<c>NVARCHAR(100)</c>').</summary>
+    public string CustomerId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>StatusCode</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string StatusCode { get; set; } = default!;
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Persistence/OrderItem.g.cs b/samples/src/Contoso.Orders.Infrastructure/Persistence/OrderItem.g.cs
new file mode 100644
index 00000000..98d7bbfd
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Persistence/OrderItem.g.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Orders.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>[Orders].[OrderItem]</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>OrderItemId</c>' (type '<c>NVARCHAR(50)</c>').</remarks>
+public partial class OrderItem : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>OrderId</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string OrderId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>ProductId</c>' column (type '<c>NVARCHAR(100)</c>').</summary>
+    public string ProductId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>Quantity</c>' column (type '<c>DECIMAL(18, 4)</c>').</summary>
+    public decimal Quantity { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>UnitPrice</c>' column (type '<c>DECIMAL(18, 4)</c>').</summary>
+    public decimal UnitPrice { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Persistence/OrderStatus.g.cs b/samples/src/Contoso.Orders.Infrastructure/Persistence/OrderStatus.g.cs
new file mode 100644
index 00000000..3c86b74f
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Persistence/OrderStatus.g.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Orders.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>[Orders].[OrderStatus]</c>' database table.</summary>
+public partial class OrderStatus : ReferenceDataModelBase<string> { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Repositories/OrderRepository.cs b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrderRepository.cs
new file mode 100644
index 00000000..6f0767aa
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrderRepository.cs
@@ -0,0 +1,93 @@
+namespace Contoso.Orders.Infrastructure.Repositories;
+
+[ScopedService<IOrderRepository>]
+public class OrderRepository(OrdersEfDb ef) : IOrderRepository
+{
+    private readonly OrdersEfDb _ef = ef.ThrowIfNull();
+
+    private static readonly QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
+        .WithFilter(filter => filter
+            .WithDefaultModelPrefix("Order")
+            .AddField<string>(nameof(Contracts.OrderBase.CustomerId), c => c.WithOperators(QueryFilterOperator.EqualityOperators | QueryFilterOperator.StartsWith))
+            .AddReferenceDataField<Contracts.OrderStatus>(nameof(Contracts.OrderBase.Status), "StatusCode"))
+        .WithOrderBy(orderby => orderby
+            .WithDefaultModelPrefix("Order")
+            .AddField(nameof(Contracts.OrderBase.CustomerId), c => c.WithDefault().WithAlwaysInclude()));
+
+    public Task<Contracts.Order?> GetAsync(string id) => _ef.Orders.GetAsync(id);
+
+    public Task<DataResult<Contracts.Order>> CreateAsync(Contracts.Order order) => _ef.Orders.CreateAsync(order);
+
+    public async Task<DataResult<Contracts.Order>> UpdateAsync(Contracts.Order order)
+    {
+        // Load the existing order with its items so EF tracks the child collection before the mapped update.
+        var existing = await _ef.DbContext.Set<Persistence.Order>()
+            .Include(o => o.Items)
+            .FirstOrDefaultAsync(o => o.Id == order.Id)
+            .ConfigureAwait(false);
+
+        if (existing is not null)
+            SynchronizeItems(order, existing);
+
+        return await _ef.Orders.UpdateAsync(order).ConfigureAwait(false);
+    }
+
+    public Task<DataResult> DeleteAsync(string id) => _ef.Orders.DeleteAsync(id);
+
+    public async Task<ItemsResult<Contracts.OrderLite>> QueryAsync(QueryArgs? query, PagingArgs? paging)
+    {
+        var parsed = _queryConfig.Parse(query).ThrowOnError();
+
+        var orders = _ef.Orders.Model.Query().IgnoreAutoIncludes();
+        return await orders.Where(parsed).OrderBy(parsed).ToMappedItemsResultAsync(x => new Contracts.OrderLite
+        {
+            Id = x.Id,
+            CustomerId = x.CustomerId,
+            StatusCode = x.StatusCode,
+            ChangeLog = new ChangeLog { CreatedBy = x.CreatedBy, CreatedOn = x.CreatedOn, UpdatedBy = x.UpdatedBy, UpdatedOn = x.UpdatedOn }
+        }, paging).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Synchronizes the items collection between the contract order and the tracked persistence model.
+    /// </summary>
+    private void SynchronizeItems(Contracts.Order order, Persistence.Order model)
+    {
+        var newItems = order.Items ?? [];
+        var existingItems = model.Items?.ToList() ?? [];
+
+        // Remove items that are no longer present in the updated order.
+        var toRemove = existingItems.Where(e => !newItems.Any(n => n.Id == e.Id)).ToList();
+        foreach (var item in toRemove)
+            _ef.DbContext.Entry(item).State = EntityState.Deleted;
+
+        // Add new items or update existing items.
+        foreach (var newItem in newItems)
+        {
+            var existingItem = existingItems.FirstOrDefault(e => e.Id == newItem.Id);
+            if (existingItem is null)
+            {
+                // New item: preserve the client-supplied identity used for future updates.
+                var addedItem = new Persistence.OrderItem
+                {
+                    Id = newItem.Id!,
+                    OrderId = order.Id!,
+                    ProductId = newItem.ProductId!,
+                    Quantity = newItem.Quantity,
+                    UnitPrice = newItem.UnitPrice
+                };
+                model.Items ??= [];
+                model.Items.Add(addedItem);
+                _ef.DbContext.Entry(addedItem).State = EntityState.Added;
+            }
+            else
+            {
+                // Existing item: update its properties.
+                existingItem.ProductId = newItem.ProductId!;
+                existingItem.Quantity = newItem.Quantity;
+                existingItem.UnitPrice = newItem.UnitPrice;
+                _ef.DbContext.Entry(existingItem).State = EntityState.Modified;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersDbContext.cs b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersDbContext.cs
new file mode 100644
index 00000000..2b7b63cc
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersDbContext.cs
@@ -0,0 +1,32 @@
+namespace Contoso.Orders.Infrastructure.Repositories;
+
+public partial class OrdersDbContext(DbContextOptions<OrdersDbContext> options, SqlServerDatabase database) : DbContext(options), IEfDbContext
+{
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseSqlServer(BaseDatabase.Connection);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        // Add the generated models to the model builder.
+        AddGeneratedModels(modelBuilder);
+
+        modelBuilder.ThrowIfNull().Entity<Persistence.Order>(e =>
+        {
+            e.HasMany(p => p.Items).WithOne().HasForeignKey(i => i.OrderId).OnDelete(DeleteBehavior.Cascade);
+            e.Navigation(r => r.Items).AutoInclude(true);
+        });
+    }
+
+    /// <summary>Adds the CodeGen-generated entity models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(ModelBuilder modelBuilder);
+}
diff --git a/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersDbContext.g.cs b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersDbContext.g.cs
new file mode 100644
index 00000000..8c856553
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersDbContext.g.cs
@@ -0,0 +1,69 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Orders.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Orders.Infrastructure.Repositories;
+
+public partial class OrdersDbContext
+{
+    /// <summary>Adds the generated models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="Microsoft.EntityFrameworkCore.ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(Microsoft.EntityFrameworkCore.ModelBuilder modelBuilder)
+    {
+        // Add the entity/model configuration for the [Orders].[OrderStatus] database table.
+        modelBuilder.Entity<Contoso.Orders.Infrastructure.Persistence.OrderStatus>(e =>
+        {
+            e.ToTable("OrderStatus", "Orders");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("OrderStatusId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Code).HasColumnName("Code").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.IsActive).HasColumnName("IsActive").HasColumnType("BIT");
+            e.Property(p => p.SortOrder).HasColumnName("SortOrder").HasColumnType("INT");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the [Orders].[Order] database table.
+        modelBuilder.Entity<Contoso.Orders.Infrastructure.Persistence.Order>(e =>
+        {
+            e.ToTable("Order", "Orders");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("OrderId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.CustomerId).HasColumnName("CustomerId").HasColumnType("NVARCHAR(100)");
+            e.Property(p => p.StatusCode).HasColumnName("StatusCode").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+        });
+
+        // Add the entity/model configuration for the [Orders].[OrderItem] database table.
+        modelBuilder.Entity<Contoso.Orders.Infrastructure.Persistence.OrderItem>(e =>
+        {
+            e.ToTable("OrderItem", "Orders");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("OrderItemId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.OrderId).HasColumnName("OrderId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.ProductId).HasColumnName("ProductId").HasColumnType("NVARCHAR(100)");
+            e.Property(p => p.Quantity).HasColumnName("Quantity").HasColumnType("DECIMAL(18, 4)");
+            e.Property(p => p.UnitPrice).HasColumnName("UnitPrice").HasColumnType("DECIMAL(18, 4)");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Ignore(p => p.ETag);
+        });
+    }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersEfDb.cs b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersEfDb.cs
new file mode 100644
index 00000000..82b67875
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersEfDb.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Orders.Infrastructure.Repositories;
+
+public sealed class OrdersEfDb(OrdersDbContext dbContext) : EfDb<OrdersDbContext>(dbContext)
+{
+    public EfDbModel<Persistence.OrderStatus> OrderStatuses => Model<Persistence.OrderStatus>();
+
+    public EfDbMappedModel<Contracts.Order, Persistence.Order, OrderMapper> Orders => Model<Persistence.Order>().ToMappedModel<Contracts.Order, OrderMapper>(OrderMapper.Default);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersOutboxPublisher.cs b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersOutboxPublisher.cs
new file mode 100644
index 00000000..742d8b33
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Repositories/OrdersOutboxPublisher.cs
@@ -0,0 +1,7 @@
+namespace Contoso.Orders.Infrastructure.Repositories;
+
+public class OrdersOutboxPublisher(SqlServerDatabase database, IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<OrdersOutboxPublisher>? logger = null)
+    : SqlServerOutboxPublisher(database, destinationProvider, formatter, logger)
+{
+    public override SqlStatement Statement { get; set; } = SqlStatement.StoredProcedure("[Orders].[spOutboxEnqueue]");
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Orders.Infrastructure/Repositories/ReferenceDataRepository.cs b/samples/src/Contoso.Orders.Infrastructure/Repositories/ReferenceDataRepository.cs
new file mode 100644
index 00000000..ea065ced
--- /dev/null
+++ b/samples/src/Contoso.Orders.Infrastructure/Repositories/ReferenceDataRepository.cs
@@ -0,0 +1,10 @@
+namespace Contoso.Orders.Infrastructure.Repositories;
+
+[ScopedService<IReferenceDataRepository>]
+public class ReferenceDataRepository(OrdersEfDb ef) : IReferenceDataRepository
+{
+    private readonly OrdersEfDb _ef = ef.ThrowIfNull();
+
+    public Task<Contracts.OrderStatusCollection> GetAllOrderStatusesAsync()
+        => _ef.OrderStatuses.Query().ToMappedItemsAsync<Persistence.OrderStatus, Contracts.OrderStatusCollection, Contracts.OrderStatus>(OrderStatusMapper.From);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Contoso.Products.Api.csproj b/samples/src/Contoso.Products.Api/Contoso.Products.Api.csproj
new file mode 100644
index 00000000..b7fd209e
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Contoso.Products.Api.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Application\Contoso.Products.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Infrastructure\Contoso.Products.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+  
+</Project>
diff --git a/samples/src/Contoso.Products.Api/Contoso.Products.Api.http b/samples/src/Contoso.Products.Api/Contoso.Products.Api.http
new file mode 100644
index 00000000..1200a333
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Contoso.Products.Api.http
@@ -0,0 +1,6 @@
+@Contoso.Products.Api_HostAddress = http://localhost:5207
+
+GET {{Contoso.Products.Api_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/samples/src/Contoso.Products.Api/Controllers/InventoryController.cs b/samples/src/Contoso.Products.Api/Controllers/InventoryController.cs
new file mode 100644
index 00000000..28cfe160
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Controllers/InventoryController.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Products.Api.Controllers;
+
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class InventoryController(WebApi webApi, IInventoryService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IInventoryService _service = service.ThrowIfNull();
+
+    [HttpGet("{id}/on-hand")]
+    [ProducesResponseType(typeof(Product), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> GetOnHandAsync(string id) => _webApi.GetAsync(Request, (_, _) => _service.GetOnHandAsync(id.Required()));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Controllers/MovementController.cs b/samples/src/Contoso.Products.Api/Controllers/MovementController.cs
new file mode 100644
index 00000000..a8a6927c
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Controllers/MovementController.cs
@@ -0,0 +1,32 @@
+namespace Contoso.Products.Api.Controllers;
+
+[ApiController, Route("/api/inventory"), OpenApiTag("Inventory")]
+public class MovementController(WebApi webApi, IMovementService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IMovementService _service = service.ThrowIfNull();
+
+    [HttpPost("reserve")]
+    [Accepts<MovementRequest>]
+    [ProducesResponseType<Movement[]>(200)]
+    [IdempotencyKey]
+    public Task<IActionResult> ReserveAsync() => _webApi.PostAsync<MovementRequest, List<Movement>>(Request, (ro, _)
+        => _service.CreateReservationAsync(ro.Value), HttpStatusCode.OK);
+
+    [HttpPost("reservation/{referenceId}/confirm")]
+    [ProducesResponseType<Movement[]>(200)]
+    public Task<IActionResult> ConfirmReservationAsync(string referenceId) => _webApi.PostAsync<List<Movement>>(Request, (ro, _)
+        => _service.ConfirmReservationAsync(referenceId.Required()), HttpStatusCode.OK);
+
+    [HttpPost("reservation/{referenceId}/cancel")]
+    [ProducesResponseType<Movement[]>(200)]
+    public Task<IActionResult> CancelReservationAsync(string referenceId) => _webApi.PostAsync<List<Movement>>(Request, (ro, _)
+        => _service.CancelReservationAsync(referenceId.Required()), HttpStatusCode.OK);
+
+    [HttpPost("adjust")]
+    [Accepts<MovementRequest>]
+    [ProducesResponseType<Movement[]>(200)]
+    [IdempotencyKey]
+    public Task<IActionResult> AdjustAsync() => _webApi.PostAsync<MovementRequest, List<Movement>>(Request, (ro, _)
+        => _service.AdjustAsync(ro.Value), HttpStatusCode.OK);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Controllers/MovementReadController.cs b/samples/src/Contoso.Products.Api/Controllers/MovementReadController.cs
new file mode 100644
index 00000000..51fcb9c2
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Controllers/MovementReadController.cs
@@ -0,0 +1,18 @@
+namespace Contoso.Products.Api.Controllers;
+
+[ApiController, Route("/api/inventory/movements"), OpenApiTag("Inventory")]
+public class MovementReadController(WebApi webApi, IMovementReadService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IMovementReadService _service = service.ThrowIfNull();
+
+    [HttpGet()]
+    [ProducesResponseType<Movement[]>(200)]
+    [Query, Paging(supportsCount: true)]
+    public Task<IActionResult> QueryAsync() => _webApi.GetAsync(Request, (ro, _)
+        => _service.QueryAsync(ro.QueryArgs, ro.PagingArgs), HttpStatusCode.OK);
+
+    [HttpGet("$query")]
+    [ProducesResponseType(typeof(JsonElement), 200)]
+    public Task<IActionResult> QuerySchemaAsync() => _webApi.GetAsync(Request, (ro, _) => _service.QuerySchemaAsync());
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Controllers/ProductController.cs b/samples/src/Contoso.Products.Api/Controllers/ProductController.cs
new file mode 100644
index 00000000..e06e03ec
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Controllers/ProductController.cs
@@ -0,0 +1,38 @@
+namespace Contoso.Products.Api.Controllers;
+
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductController(WebApi webApi, IProductService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IProductService _service = service.ThrowIfNull();
+
+    [HttpPost]
+    [Accepts<Product>]
+    [ProducesResponseType<Product>(201)]
+    [IdempotencyKey]
+    public Task<IActionResult> PostAsync() => _webApi.PostAsync<Product, Product>(Request, (ro, _) =>
+    {
+        ro.WithLocationUri(p => new Uri($"/api/products/{p.Id}", UriKind.Relative));
+        return _service.CreateAsync(ro.Value);
+    });
+
+    [HttpPut("{id}")]
+    [Accepts<Product>]
+    [ProducesResponseType(typeof(Product), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> PutAsync(string id) => _webApi.PutAsync<Product, Product>(Request, (ro, _)
+        => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id.Required())));
+
+    [HttpPatch("{id}")]
+    [Accepts<Product>(HttpNames.MergePatchJsonMediaTypeName)]
+    [ProducesResponseType(typeof(Product), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> PatchAsync(string id) => _webApi.PatchAsync<Product>(Request,
+        get: (ro, _) => _service.GetAsync(id.Required()),
+        put: (ro, _) => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id)));
+
+    [HttpDelete("{id}")]
+    [ProducesResponseType(204)]
+    public Task<IActionResult> DeleteAsync(string id) => _webApi.DeleteAsync(Request, (_, _)
+        => _service.DeleteAsync(id.Required()));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Controllers/ProductReadController.cs b/samples/src/Contoso.Products.Api/Controllers/ProductReadController.cs
new file mode 100644
index 00000000..6e89832e
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Controllers/ProductReadController.cs
@@ -0,0 +1,22 @@
+namespace Contoso.Products.Api.Controllers;
+
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductReadController(WebApi webApi, IProductReadService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IProductReadService _service = service.ThrowIfNull();
+
+    [HttpGet("{id}"), HttpHead("{id}")]
+    [ProducesResponseType(typeof(Product), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> GetAsync(string id) => _webApi.GetAsync(Request, (_, _) => _service.GetAsync(id.Required()));
+
+    [HttpGet]
+    [ProducesResponseType(typeof(ProductLite[]), 200)]
+    [Query(supportsOrderBy: true), Paging(supportsCount: true)]
+    public Task<IActionResult> QueryAsync() => _webApi.GetAsync(Request, (ro, _) => _service.QueryAsync(ro.QueryArgs, ro.PagingArgs));
+
+    [HttpGet("$query")]
+    [ProducesResponseType(typeof(JsonElement), 200)]
+    public Task<IActionResult> QuerySchemaAsync() => _webApi.GetAsync(Request, (ro, _) => _service.QuerySchemaAsync());
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Controllers/ReferenceDataController.g.cs b/samples/src/Contoso.Products.Api/Controllers/ReferenceDataController.g.cs
new file mode 100644
index 00000000..841a2425
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Controllers/ReferenceDataController.g.cs
@@ -0,0 +1,63 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Api.Controllers;
+
+/// <summary>Represents the reference-data controller.</summary>
+[ApiController, Route("/api/refdata")]
+public partial class ReferenceDataController(CoreEx.AspNetCore.Mvc.WebApi webApi) : ControllerBase
+{
+    private readonly CoreEx.AspNetCore.Mvc.WebApi _webApi = webApi.ThrowIfNull();
+
+    private static readonly DataMap<string> _mapper = new(StringComparer.OrdinalIgnoreCase)
+    {
+        { "brands", nameof(Brand) },
+        { "categories", nameof(Category) },
+        { "movement-kinds", nameof(MovementKind) },
+        { "movement-statuses", nameof(MovementStatus) },
+        { "sub-categories", nameof(SubCategory) },
+        { "units-of-measure", nameof(UnitOfMeasure) }
+    };
+
+    [HttpGet("brands"), HttpHead("brands")]
+    [ProducesResponseType(typeof(Brand[]), 200)]
+    public Task<IActionResult> GetBrandsAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<Brand>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("categories"), HttpHead("categories")]
+    [ProducesResponseType(typeof(Category[]), 200)]
+    public Task<IActionResult> GetCategoriesAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<Category>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("movement-kinds"), HttpHead("movement-kinds")]
+    [ProducesResponseType(typeof(MovementKind[]), 200)]
+    public Task<IActionResult> GetMovementKindsAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<MovementKind>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("movement-statuses"), HttpHead("movement-statuses")]
+    [ProducesResponseType(typeof(MovementStatus[]), 200)]
+    public Task<IActionResult> GetMovementStatusesAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<MovementStatus>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("sub-categories"), HttpHead("sub-categories")]
+    [ProducesResponseType(typeof(SubCategory[]), 200)]
+    public Task<IActionResult> GetSubCategoriesAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<SubCategory>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("units-of-measure"), HttpHead("units-of-measure")]
+    [ProducesResponseType(typeof(UnitOfMeasure[]), 200)]
+    public Task<IActionResult> GetUnitsOfMeasureAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<UnitOfMeasure>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet]
+    [ProducesResponseType(typeof(ReferenceDataMultiDictionary), 200)]
+    public Task<IActionResult> GetNamedAsync([FromQuery] string[] name)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetNamedAsync(name, ro.IsIncludeInactive, _mapper, ct));
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/GlobalUsing.cs b/samples/src/Contoso.Products.Api/GlobalUsing.cs
new file mode 100644
index 00000000..34866133
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/GlobalUsing.cs
@@ -0,0 +1,14 @@
+global using Contoso.Products.Application;
+global using Contoso.Products.Application.Interfaces;
+global using Contoso.Products.Contracts;
+global using CoreEx;
+global using CoreEx.AspNetCore.Mvc;
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using CoreEx.Validation;
+global using Microsoft.AspNetCore.Mvc;
+global using NSwag.Annotations;
+global using System.Net;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/Program.cs b/samples/src/Contoso.Products.Api/Program.cs
new file mode 100644
index 00000000..8b15165b
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Program.cs
@@ -0,0 +1,95 @@
+using Contoso.Products.Infrastructure.Repositories;
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace Contoso.Products.Api;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddReferenceDataOrchestrator()
+            .AddMvcWebApi()
+            .AddHttpWebApi();
+
+        // Add all the dynamically registered services.
+        builder.Services.AddDynamicServicesUsing<ReferenceDataService, ReferenceDataRepository>();
+
+        // Add L1/L2 caching services.
+        builder.Services.AddMemoryCache();              // Adds the in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Adds Redis as the distributed cache (using Aspire library) - L2.
+
+        // Add and wire-up FusionCache including backplane.
+        builder.Services.AddFusionCache()               
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        // Add CoreEx caching services.
+        builder.Services
+            .AddFusionHybridCache()                     // Adds the CoreEx.Caching.IHybridCache for FusionCache.
+            .AddDefaultCacheKeyProvider()               // Adds the default CoreEx.Caching.ICacheKeyProvider.
+            .AddHybridCacheIdempotencyProvider();       // Adds the CoreEx.Caching.Idempotency.IIdempotencyProvider.
+
+        // Add the repository and related outbox services.
+        builder.AddAzureNpgsqlDataSource("Postgres");   // Adds the NpgsqlDataSource (using Aspire library).
+        builder.Services
+            .AddPostgresDatabase()                      // Adds the PostgresDatabase.
+            .AddPostgresUnitOfWork()                    // Adds the PostgresUnitOfWork for the PostgresDatabase.
+            .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+            .AddPostgresOutboxPublisher()               // Adds the PostgresOutboxPublisher/IEventPublisher.
+            .AddDbContext<ProductsDbContext>()          // Adds the standard EF DbContext.
+            .AddEfDb<ProductsEfDb>();                   // Adds the CoreEx extended EF service.
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .WithCoreExPostgresTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.UseIdempotencyKey();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+
+        // Run the application.
+        app.Run();
+    }
+}
diff --git a/samples/src/Contoso.Products.Api/Properties/launchSettings.json b/samples/src/Contoso.Products.Api/Properties/launchSettings.json
new file mode 100644
index 00000000..adeb2b03
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/Properties/launchSettings.json
@@ -0,0 +1,22 @@
+{
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5207"
+    },
+    "https": {
+      "commandName": "Project",
+      "launchUrl": "https://localhost:7200/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7200;http://localhost:5207"
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/appsettings.Development.json b/samples/src/Contoso.Products.Api/appsettings.Development.json
new file mode 100644
index 00000000..33507b59
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/appsettings.Development.json
@@ -0,0 +1,26 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "Npgsql": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=contoso;Username=postgres;Password=yourStrong#!Password"
+    },
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Api/appsettings.json b/samples/src/Contoso.Products.Api/appsettings.json
new file mode 100644
index 00000000..7052c07a
--- /dev/null
+++ b/samples/src/Contoso.Products.Api/appsettings.json
@@ -0,0 +1,20 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Products"
+    },
+    "Events": {
+      "Destination": "contoso" // Topic/queue name.
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Update": "None"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Contoso.Products.Application.csproj b/samples/src/Contoso.Products.Application/Contoso.Products.Application.csproj
new file mode 100644
index 00000000..d01aac50
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Contoso.Products.Application.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.DomainDriven\CoreEx.DomainDriven.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/src/Contoso.Products.Application/GlobalUsing.cs b/samples/src/Contoso.Products.Application/GlobalUsing.cs
new file mode 100644
index 00000000..4aaebc93
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/GlobalUsing.cs
@@ -0,0 +1,15 @@
+global using Contoso.Products.Application.Interfaces;
+global using Contoso.Products.Application.Repositories;
+global using Contoso.Products.Application.Validators;
+global using Contoso.Products.Contracts;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Localization;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Validation;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Interfaces/IInventoryService.cs b/samples/src/Contoso.Products.Application/Interfaces/IInventoryService.cs
new file mode 100644
index 00000000..9a426df8
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Interfaces/IInventoryService.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Products.Application.Interfaces;
+
+public interface IInventoryService
+{
+    Task<decimal> GetOnHandAsync(string productId);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Interfaces/IMovementReadService.cs b/samples/src/Contoso.Products.Application/Interfaces/IMovementReadService.cs
new file mode 100644
index 00000000..4f1feecb
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Interfaces/IMovementReadService.cs
@@ -0,0 +1,24 @@
+namespace Contoso.Products.Application.Interfaces;
+
+public interface IMovementReadService
+{
+    /// <summary>
+    /// Gets the movements with the specified reference identifier (see <see cref="Contracts.Movement.ReferenceId"/>).
+    /// </summary>
+    /// <param name="referenceId">The reference identifier.</param>
+    /// <returns>The movements.</returns>
+    Task<Contracts.Movement[]> GetAsync(string referenceId);
+
+    /// <summary>
+    /// Gets the <see cref="QueryArgs"/> schema.
+    /// </summary>
+    Task<JsonElement> QuerySchemaAsync();
+
+    /// <summary>
+    /// Queries the movements.
+    /// </summary>
+    /// <param name="query">The <see cref="QueryArgs"/>.</param>
+    /// <param name="paging">The<see cref="PagingArgs"/>.</param>
+    /// <returns>The resulting movements.</returns>
+    Task<ItemsResult<Contracts.Movement>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Interfaces/IMovementService.cs b/samples/src/Contoso.Products.Application/Interfaces/IMovementService.cs
new file mode 100644
index 00000000..835027b4
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Interfaces/IMovementService.cs
@@ -0,0 +1,24 @@
+namespace Contoso.Products.Application.Interfaces;
+
+public interface IMovementService
+{
+    /// <summary>
+    /// Creates a reservation for inventory movement(s); inventory is adjusted, bit still requires confirmation to be finalized.
+    /// </summary>
+    Task<List<Movement>> CreateReservationAsync(MovementRequest request);
+
+    /// <summary>
+    /// Confirms a reservation for inventory movement(s); inventory is finalized and cannot be canceled after this step.
+    /// </summary>
+    Task<List<Movement>> ConfirmReservationAsync(string referenceId);
+
+    /// <summary>
+    /// Cancels a reservation and reverses any inventory adjustments made during the reservation.
+    /// </summary>
+    Task<List<Movement>> CancelReservationAsync(string referenceId);
+
+    /// <summary>
+    /// Adjusts inventory movement(s) directly without creating a reservation; inventory is adjusted immediately and cannot be canceled.
+    /// </summary>
+    Task<List<Movement>> AdjustAsync(MovementRequest request);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Interfaces/IProductReadService.cs b/samples/src/Contoso.Products.Application/Interfaces/IProductReadService.cs
new file mode 100644
index 00000000..059ddb6f
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Interfaces/IProductReadService.cs
@@ -0,0 +1,10 @@
+namespace Contoso.Products.Application.Interfaces;
+
+public interface IProductReadService
+{
+    Task<Contracts.Product?> GetAsync(string id);
+
+    Task<ItemsResult<ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+
+    Task<JsonElement> QuerySchemaAsync();
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Interfaces/IProductService.cs b/samples/src/Contoso.Products.Application/Interfaces/IProductService.cs
new file mode 100644
index 00000000..290a1e32
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Interfaces/IProductService.cs
@@ -0,0 +1,16 @@
+namespace Contoso.Products.Application.Interfaces;
+
+public interface IProductService
+{
+    Task<Contracts.Product?> GetAsync(string id);
+
+    Task<Contracts.Product> CreateAsync(Contracts.Product product);
+
+    Task<Contracts.Product> UpdateAsync(Contracts.Product product);
+
+    Task<Contracts.Product> ActivateAsync(string id);
+
+    Task<Contracts.Product> DeactivateAsync(string id);
+
+    Task DeleteAsync(string id);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/InventoryService.cs b/samples/src/Contoso.Products.Application/InventoryService.cs
new file mode 100644
index 00000000..c1949386
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/InventoryService.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Products.Application;
+
+[ScopedService<IInventoryService>]
+public class InventoryService(IInventoryRepository repository) : IInventoryService
+{
+    private readonly IInventoryRepository _repository = repository.ThrowIfNull();
+
+    public async Task<decimal> GetOnHandAsync(string productId)
+    {
+        var qtyOnHand = await _repository.GetOnHandAsync(productId, true).ConfigureAwait(false);
+        return qtyOnHand ?? 0m;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/MovementReadService.cs b/samples/src/Contoso.Products.Application/MovementReadService.cs
new file mode 100644
index 00000000..4ee39523
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/MovementReadService.cs
@@ -0,0 +1,16 @@
+namespace Contoso.Products.Application;
+
+[ScopedService<IMovementReadService>]
+public class MovementReadService(IMovementRepository movementRepository) : IMovementReadService
+{
+    private readonly IMovementRepository _movementRepository = movementRepository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public Task<Contracts.Movement[]> GetAsync(string referenceId) => _movementRepository.GetAsync(referenceId);
+
+    /// <inheritdoc/>
+    public Task<JsonElement> QuerySchemaAsync() => _movementRepository.QuerySchemaAsync();
+
+    /// <inheritdoc/>
+    public Task<ItemsResult<Contracts.Movement>> QueryAsync(QueryArgs? query, PagingArgs? paging) => _movementRepository.QueryAsync(query, paging);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/MovementService.cs b/samples/src/Contoso.Products.Application/MovementService.cs
new file mode 100644
index 00000000..c35e4d13
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/MovementService.cs
@@ -0,0 +1,131 @@
+namespace Contoso.Products.Application;
+
+[ScopedService<IMovementService>]
+public class MovementService(IUnitOfWork unitOfWork, IProductRepository productRepository, IMovementRepository movementRepository) : IMovementService
+{
+    private readonly IUnitOfWork _unitOfWork = unitOfWork.ThrowIfNull();
+    private readonly IProductRepository _productRepository = productRepository.ThrowIfNull();
+    private readonly IMovementRepository _movementRepository = movementRepository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public async Task<List<Movement>> CreateReservationAsync(MovementRequest request)
+    {
+        // Validate the request
+        var vr = await new MovementRequestValidator(productRepository).ValidateAsync(request);
+        vr.ThrowOnError();
+
+        // Build up the list of movements to create for the reservation.
+        var movements = new List<Movement>();
+        foreach (var product in request.Products!.Where(kv => kv.Value.Quantity > 0))
+        {
+            movements.Add(new Movement
+            {
+                ReferenceId = request.Id,
+                Kind = MovementKind.Issue,
+                Status = MovementStatus.Pending,
+                ProductId = product.Key,
+                Quantity = product.Value.Quantity * -1,
+                UnitOfMeasure = product.Value.UnitOfMeasure
+            });
+        }
+
+        // Exit early if there are no movements to create (e.g. all products had a quantity of 0).
+        if (movements.Count == 0)
+            return movements;
+
+        // Adjust the inventory levels, create the reservations, and emit the events in a unit-of-work transaction.
+        await _unitOfWork.TransactionAsync(async () =>
+        {
+            // Adjust inventory levels and persist movements.
+            movements = await _movementRepository.CreateAsync(movements).ConfigureAwait(false);
+
+            // Emit events for the movements that were created.
+            _unitOfWork.Events.Add(EventData.CreateEventsWith(movements, nameof(MovementStatus.Pending), ConfigureEvent));
+        }).ConfigureAwait(false);
+
+        return movements;
+    }
+
+    /// <inheritdoc/>
+    public Task<List<Movement>> ConfirmReservationAsync(string referenceId) => _unitOfWork.TransactionAsync(async () =>
+    {
+        // Confirm all movements for the specified reservation.
+        var movements = await _movementRepository.ConfirmAsync(referenceId).ConfigureAwait(false);
+        if (movements.Count == 0)
+            throw new NotFoundException().WithKey(referenceId).WithErrorCode("pending-reservation-not-found");
+
+        // Emit events for the movements that were confirmed.
+        _unitOfWork.Events.Add(EventData.CreateEventsWith(movements, nameof(MovementStatus.Confirmed), ConfigureEvent));
+
+        return movements;
+    });
+
+    /// <inheritdoc/>
+    public Task<List<Movement>> CancelReservationAsync(string referenceId) => _unitOfWork.TransactionAsync(async () =>
+    {
+        // Cancel all movements for the specified reservation.
+        var movements = await _movementRepository.CancelAsync(referenceId).ConfigureAwait(false);
+        if (movements.Count == 0)
+            throw new NotFoundException().WithKey(referenceId).WithErrorCode("pending-reservation-not-found");
+
+        // Emit events for the movements that were canceled.
+        _unitOfWork.Events.Add(EventData.CreateEventsWith(movements, nameof(MovementStatus.Canceled), ConfigureEvent));
+
+        return movements;
+    });
+
+    /// <inheritdoc/>
+    public async Task<List<Movement>> AdjustAsync(MovementRequest request)
+    {
+        // Validate the request
+        var vr = await new MovementRequestValidator(productRepository).ValidateAsync(request);
+        vr.ThrowOnError();
+
+        // Build up the list of movements to create for the reservation.
+        var movements = new List<Movement>();
+        foreach (var product in request.Products!.Where(kv => kv.Value.Quantity > 0))
+        {
+            movements.Add(new Movement
+            {
+                ReferenceId = request.Id,
+                Kind = MovementKind.Adjust,
+                Status = MovementStatus.Confirmed,
+                ProductId = product.Key,
+                Quantity = product.Value.Quantity,
+                UnitOfMeasure = product.Value.UnitOfMeasure
+            });
+        }
+
+        // Exit early if there are no movements to create (e.g. all products had a quantity of 0).
+        if (movements.Count == 0)
+            return movements;
+
+        // Adjust the inventory levels, and emit the events in a unit-of-work transaction.
+        await _unitOfWork.TransactionAsync(async () =>
+        {
+            // Adjust inventory levels and persist movements.
+            movements = await _movementRepository.CreateAsync(movements).ConfigureAwait(false);
+
+            // Emit events for the movements that were created.
+            _unitOfWork.Events.Add(EventData.CreateEventsWith(movements, nameof(MovementStatus.Confirmed), ConfigureEvent));
+        }).ConfigureAwait(false);
+
+        return movements;
+    }
+
+    /// <summary>
+    /// Configure the event name for the specified movement and event data. This is used to emit different events for issue, receive, and adjust movements, which can be useful for event subscribers that want to handle them differently.
+    /// </summary>
+    private static void ConfigureEvent(Movement m, EventData ed)
+    {
+        var extra = m.Kind!.Code switch
+        {
+            MovementKind.Issue => nameof(MovementKind.Issue),
+            MovementKind.Receive => nameof(MovementKind.Receive),
+            _ => nameof(MovementKind.Adjust)
+        };
+
+        ed.Entity += $".{extra}";
+        ed.WithPartitionKey(m.ProductId);   // Partition events by product identifier to ensure ordering of events for the same product.
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/ProductReadService.cs b/samples/src/Contoso.Products.Application/ProductReadService.cs
new file mode 100644
index 00000000..02aaffce
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/ProductReadService.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Products.Application;
+
+[ScopedService<IProductReadService>]
+public class ProductReadService(IProductRepository repository) : IProductReadService
+{
+    private readonly IProductRepository _repository = repository.ThrowIfNull();
+
+    public Task<Product?> GetAsync(string id) => _repository.GetAsync(id);
+
+    public Task<ItemsResult<ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging) => _repository.QueryAsync(query, paging);
+
+    public Task<JsonElement> QuerySchemaAsync() => _repository.QuerySchemaAsync();
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/ProductService.cs b/samples/src/Contoso.Products.Application/ProductService.cs
new file mode 100644
index 00000000..20031667
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/ProductService.cs
@@ -0,0 +1,98 @@
+namespace Contoso.Products.Application;
+
+[ScopedService<IProductService>]
+public class ProductService(IUnitOfWork unitOfWork, IProductRepository repository) : IProductService
+{
+    private readonly IUnitOfWork _unitOfWork = unitOfWork.ThrowIfNull();
+    private readonly IProductRepository _repository = repository.ThrowIfNull();
+
+    public Task<Product?> GetAsync(string id) => _repository.GetAsync(id);
+
+    public async Task<Product> CreateAsync(Product product)
+    {
+        product.ThrowIfNull();
+
+        await ProductValidator.Default.ValidateAndThrowAsync(product).ConfigureAwait(false);
+
+        product.Id = Runtime.NewId();
+        product.CategoryCode = product.SubCategory!.CategoryCode;
+        product.IsInactive = true;
+
+        return await _unitOfWork.TransactionAsync(async () =>
+        {
+            var dr = await _repository.CreateAsync(product).ConfigureAwait(false);
+            return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+        }).ConfigureAwait(false);
+    }
+
+    public async Task<Product> UpdateAsync(Product product)
+    {
+        product.ThrowIfNull();
+        product.Id.ThrowIfNullOrEmpty();
+
+        await ProductValidator.Default.ValidateAndThrowAsync(product);
+
+        var current = await _repository.GetAsync(product.Id).ConfigureAwait(false);
+        NotFoundException.ThrowIfDefault(current);
+
+        product.CategoryCode = product.SubCategory!.CategoryCode;
+        product.IsNonStocked = current.IsNonStocked;
+        product.IsInactive = current.IsInactive;
+
+        return await _unitOfWork.TransactionAsync(async () =>
+        {
+            var dr = await _repository.UpdateAsync(product).ConfigureAwait(false);
+            return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Updated)));
+        }).ConfigureAwait(false);
+    }
+
+    public async Task<Product> ActivateAsync(string id)
+    {
+        var product = await _repository.GetAsync(id).ConfigureAwait(false);
+        NotFoundException.ThrowIfDefault(product);
+
+        if (product.IsInactive)
+            return product;
+
+        return await _unitOfWork.TransactionAsync(async () =>
+        {
+            product.IsInactive = false;
+
+            var dr = await _repository.UpdateAsync(product).ConfigureAwait(false);
+            return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Activated)));
+        }).ConfigureAwait(false);
+    }
+
+    public async Task<Product> DeactivateAsync(string id)
+    {
+        var product = await _repository.GetAsync(id).ConfigureAwait(false);
+        NotFoundException.ThrowIfDefault(product);
+
+        if (!product.IsInactive)
+            return product;
+
+        return await _unitOfWork.TransactionAsync(async () =>
+        {
+            product.IsInactive = true;
+
+            var dr = await _repository.UpdateAsync(product).ConfigureAwait(false);
+            return dr.WhereMutated(v => _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Deactivated)));
+        }).ConfigureAwait(false);
+    }
+
+    public async Task DeleteAsync(string id)
+    {
+        var product = await _repository.GetAsync(id).ConfigureAwait(false);
+        if (product is null)
+            return;
+
+        if (!product.IsInactive)
+            throw new BusinessException("A product must first be deactivated before it can be deleted.");
+
+        await _unitOfWork.TransactionAsync(async () =>
+        {
+            var dr = await _repository.DeleteAsync(id).ConfigureAwait(false);
+            dr.WhereMutated(() => _unitOfWork.Events.Add(EventData.CreateEvent<Product>(EventAction.Deleted).WithKey(id)));
+        }).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/ReferenceDataService.g.cs b/samples/src/Contoso.Products.Application/ReferenceDataService.g.cs
new file mode 100644
index 00000000..1dbfc527
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/ReferenceDataService.g.cs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Application;
+
+/// <summary>Provides the <see cref="IReferenceDataProvider"/> implementation.</summary>
+[ScopedService<IReferenceDataProvider>]
+public partial class ReferenceDataService(IReferenceDataRepository repository) : IReferenceDataProvider
+{
+    private readonly IReferenceDataRepository _repository = repository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public IEnumerable<(Type, Type)> Types =>
+    [
+        (typeof(Brand), typeof(BrandCollection)),
+        (typeof(Category), typeof(CategoryCollection)),
+        (typeof(MovementKind), typeof(MovementKindCollection)),
+        (typeof(MovementStatus), typeof(MovementStatusCollection)),
+        (typeof(SubCategory), typeof(SubCategoryCollection)),
+        (typeof(UnitOfMeasure), typeof(UnitOfMeasureCollection)),
+    ];
+
+    /// <inheritdoc/>
+    public virtual async Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+    {
+        _ when type == typeof(Brand) => await _repository.GetAllBrandsAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(Category) => await _repository.GetAllCategoriesAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(MovementKind) => await _repository.GetAllMovementKindsAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(MovementStatus) => await _repository.GetAllMovementStatusesAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(SubCategory) => await _repository.GetAllSubCategoriesAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(UnitOfMeasure) => await _repository.GetAllUnitsOfMeasureAsync(cancellationToken).ConfigureAwait(false),
+        _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+    };
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Repositories/IInventoryRepository.cs b/samples/src/Contoso.Products.Application/Repositories/IInventoryRepository.cs
new file mode 100644
index 00000000..7f21daf4
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Repositories/IInventoryRepository.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Products.Application.Repositories;
+
+public interface IInventoryRepository
+{
+    Task<decimal?> GetOnHandAsync(string productId, bool throwNotFoundException);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Repositories/IMovementRepository.cs b/samples/src/Contoso.Products.Application/Repositories/IMovementRepository.cs
new file mode 100644
index 00000000..1b479da8
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Repositories/IMovementRepository.cs
@@ -0,0 +1,50 @@
+namespace Contoso.Products.Application.Repositories;
+
+public interface IMovementRepository
+{
+    /// <summary>
+    /// Creates new movement records (as specified) and applies the necessary adjustments to the underlying inventory based on the underlying <see cref="Contracts.Movement.Kind"/>.
+    /// </summary>
+    /// <param name="movements">The list of movements to be created and adjusted.</param>
+    /// <returns>The mutated movements.</returns>
+    /// <remarks>All movements must be of the same <see cref="MovementKind"/>.</remarks>
+    Task<List<Contracts.Movement>> CreateAsync(List<Contracts.Movement> movements);
+
+    /// <summary>
+    /// Confirms the movements with the specified reference identifier (see <see cref="Contracts.Movement.ReferenceId"/>).
+    /// </summary>
+    /// <param name="referenceId">The reference identifier.</param>
+    /// <returns>The mutated movements.</returns>
+    /// <remarks>The movements must be in a pending state to be confirmed.
+    /// <para>No underlying inventory adjustment(s) are required as the inventory was already adjusted during creation.</para></remarks>
+    Task<List<Contracts.Movement>> ConfirmAsync(string referenceId);
+
+    /// <summary>
+    /// Cancels the movements with the specified reference identifier (see <see cref="Contracts.Movement.ReferenceId"/>) and applies the necessary adjustments to the underlying inventory based on the underlying <see cref="Contracts.Movement.Kind"/>.
+    /// </summary>
+    /// <param name="referenceId">The reference identifier.</param>
+    /// <returns>The mutated movements.</returns>
+    /// <remarks>The movements must be in a pending state to be cancelled.</remarks>
+    Task<List<Contracts.Movement>> CancelAsync(string referenceId);
+
+    /// <summary>
+    /// Gets the movements with the specified reference identifier (see <see cref="Contracts.Movement.ReferenceId"/>).
+    /// </summary>
+    /// <param name="referenceId">The reference identifier.</param>
+    /// <returns>The movements.</returns>
+    Task<Contracts.Movement[]> GetAsync(string referenceId);
+
+    /// <summary>
+    /// Gets the <see cref="QueryArgs"/> schema.
+    /// </summary>
+    /// <returns></returns>
+    Task<JsonElement> QuerySchemaAsync();
+
+    /// <summary>
+    /// Queries the movements.
+    /// </summary>
+    /// <param name="query">The <see cref="QueryArgs"/>.</param>
+    /// <param name="paging">The<see cref="PagingArgs"/>.</param>
+    /// <returns>The resulting movements.</returns>
+    Task<ItemsResult<Contracts.Movement>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Repositories/IProductRepository.cs b/samples/src/Contoso.Products.Application/Repositories/IProductRepository.cs
new file mode 100644
index 00000000..655fa6cb
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Repositories/IProductRepository.cs
@@ -0,0 +1,18 @@
+namespace Contoso.Products.Application.Repositories;
+
+public interface IProductRepository
+{
+    Task<Contracts.Product?> GetAsync(string id);
+
+    Task<DataResult<Contracts.Product>> CreateAsync(Contracts.Product product);
+
+    Task<DataResult<Contracts.Product>> UpdateAsync(Contracts.Product product);
+
+    Task<DataResult> DeleteAsync(string id);
+
+    Task<JsonElement> QuerySchemaAsync();
+
+    Task<ItemsResult<Contracts.ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging);
+
+    Task<Dictionary<string, Contracts.ProductReserve>> GetForReservationAsync(string[] ids);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Repositories/IReferenceDataRepository.g.cs b/samples/src/Contoso.Products.Application/Repositories/IReferenceDataRepository.g.cs
new file mode 100644
index 00000000..d0021b38
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Repositories/IReferenceDataRepository.g.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Application.Repositories;
+
+/// <summary>Enables the underlying reference-data repository.</summary>
+public partial interface IReferenceDataRepository
+{
+    /// <summary>Gets all <see cref="Brand"/> items.</summary>
+    /// <returns>The <see cref="BrandCollection"/>.</returns>
+    Task<BrandCollection> GetAllBrandsAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="Category"/> items.</summary>
+    /// <returns>The <see cref="CategoryCollection"/>.</returns>
+    Task<CategoryCollection> GetAllCategoriesAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="MovementKind"/> items.</summary>
+    /// <returns>The <see cref="MovementKindCollection"/>.</returns>
+    Task<MovementKindCollection> GetAllMovementKindsAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="MovementStatus"/> items.</summary>
+    /// <returns>The <see cref="MovementStatusCollection"/>.</returns>
+    Task<MovementStatusCollection> GetAllMovementStatusesAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="SubCategory"/> items.</summary>
+    /// <returns>The <see cref="SubCategoryCollection"/>.</returns>
+    Task<SubCategoryCollection> GetAllSubCategoriesAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="UnitOfMeasure"/> items.</summary>
+    /// <returns>The <see cref="UnitOfMeasureCollection"/>.</returns>
+    Task<UnitOfMeasureCollection> GetAllUnitsOfMeasureAsync(CancellationToken cancellationToken = default);
+}
+    
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Validators/MovementRequestValidator.cs b/samples/src/Contoso.Products.Application/Validators/MovementRequestValidator.cs
new file mode 100644
index 00000000..ccc5384f
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Validators/MovementRequestValidator.cs
@@ -0,0 +1,46 @@
+namespace Contoso.Products.Application.Validators;
+
+public class MovementRequestValidator : Validator<Contracts.MovementRequest>
+{
+    private static readonly Validator<MovementRequestProduct> _productValidator = Validator.Create<MovementRequestProduct>()
+        .HasProperty(x => x.UnitOfMeasure, c => c.Mandatory().IsValid())
+        .HasProperty(x => x.Quantity, c => c.GreaterThanOrEqualTo(0).PrecisionScale(ctx => ctx.Entity.UnitOfMeasure!.Precision, ctx => ctx.Entity.UnitOfMeasure!.Scale).DependsOn(x => x.UnitOfMeasure));
+
+    private readonly IProductRepository _repository;
+    private readonly LText _productText = "Product";
+
+    public MovementRequestValidator(IProductRepository repository)
+    {
+        _repository = repository.ThrowIfNull();
+
+        Property(x => x.Id).Mandatory().MaximumLength(50);
+        Property(x => x.Products).Mandatory().Dictionary(c => c
+            .WithKeyValidator(_productText, k => k.Mandatory().MaximumLength(50))
+            .WithValueValidator(v => v.Mandatory().Entity(_productValidator)));
+    }
+
+    protected async override Task OnValidateAsync(ValidationContext<MovementRequest> context, CancellationToken cancellationToken)
+    {
+        // Fail-fast where any of the cheap validation errors have occurred.
+        if (context.HasErrors)
+            return;
+
+        // Get the product(s) info to determine whether request is valid.
+        var ids = context.Value.Products!.Select(kvp => kvp.Key).ToArray() ?? [];
+        var products = await _repository.GetForReservationAsync(ids).ConfigureAwait(false);
+
+        // Create extended product validator (dictionary value) that can access the product information for validating the unit of measure.
+        var dv = Validator.Create<MovementRequestProduct>()
+            .HasProperty(x => x.UnitOfMeasure, c => c.Equal(ctx => products[ctx.GetDictionaryKey<string>()].UnitOfMeasureCode));
+
+        // Create new validator for the request that ensures validity of the product (dictionary key) and value (dictionary value).
+        await context.ValidateFurtherAsync(c => c
+            .HasProperty(x => x.Products, c => c.Dictionary(c => c
+                .WithKeyValidator(_productText, k => k
+                    .NotFound().WhenValue(v => !products.ContainsKey(v))
+                    .Error("{0} is non-stocked and therefore cannot be transacted.").WhenValue(v => products[v].IsNonStocked)
+                    .Error("{0} is not active and therefore cannot be transacted.").WhenValue(v => products[v].IsInactive))
+                .WithValueValidator(dv))
+            ), cancellationToken).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Application/Validators/ProductValidator.cs b/samples/src/Contoso.Products.Application/Validators/ProductValidator.cs
new file mode 100644
index 00000000..903282da
--- /dev/null
+++ b/samples/src/Contoso.Products.Application/Validators/ProductValidator.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Products.Application.Validators;
+
+public class ProductValidator : Validator<Contracts.Product, ProductValidator>
+{
+    public ProductValidator()
+    {
+        Property(p => p.Sku).Mandatory().MaximumLength(50);
+        Property(p => p.Text).Mandatory().MaximumLength(250);
+        Property(p => p.SubCategory).Mandatory().IsValid();
+        Property(p => p.UnitOfMeasure).Mandatory().IsValid();
+        Property(p => p.Price).PrecisionScale(null, 2).GreaterThanOrEqualTo(0, _ => "zero");
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.CodeGen/Contoso.Products.CodeGen.csproj b/samples/src/Contoso.Products.CodeGen/Contoso.Products.CodeGen.csproj
new file mode 100644
index 00000000..e2c5c520
--- /dev/null
+++ b/samples/src/Contoso.Products.CodeGen/Contoso.Products.CodeGen.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.CodeGen\CoreEx.CodeGen.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Products.CodeGen/Program.cs b/samples/src/Contoso.Products.CodeGen/Program.cs
new file mode 100644
index 00000000..a3d4d78c
--- /dev/null
+++ b/samples/src/Contoso.Products.CodeGen/Program.cs
@@ -0,0 +1 @@
+await CoreEx.CodeGen.CodeGenConsole.Create().RunAsync(args);
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.CodeGen/ref-data.yaml b/samples/src/Contoso.Products.CodeGen/ref-data.yaml
new file mode 100644
index 00000000..ea4c0690
--- /dev/null
+++ b/samples/src/Contoso.Products.CodeGen/ref-data.yaml
@@ -0,0 +1,16 @@
+collectionSortOrder: Code
+repository: EntityFramework
+entities:
+- name: Brand
+- name: Category
+- name: MovementKind
+- name: MovementStatus
+- name: SubCategory
+  properties:
+  - name: CategoryCode
+    type: ^Category
+- name: UnitOfMeasure
+  plural: UnitsOfMeasure
+  properties:
+  - name: Scale
+    type: int
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/Brand.g.cs b/samples/src/Contoso.Products.Contracts/Brand.g.cs
new file mode 100644
index 00000000..5a45cb6f
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/Brand.g.cs
@@ -0,0 +1,20 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Contracts;
+
+/// <summary>Represents the 'Brand' reference-data contract.</summary>
+[ReferenceData]
+public partial class Brand : ReferenceData<Brand> { }
+
+/// <summary>
+/// Represents the 'Brand' reference-data contract collection.
+/// </summary>
+public partial class BrandCollection() : ReferenceDataCollection<Brand>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/Category.g.cs b/samples/src/Contoso.Products.Contracts/Category.g.cs
new file mode 100644
index 00000000..a40017f6
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/Category.g.cs
@@ -0,0 +1,20 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Contracts;
+
+/// <summary>Represents the 'Category' reference-data contract.</summary>
+[ReferenceData]
+public partial class Category : ReferenceData<Category> { }
+
+/// <summary>
+/// Represents the 'Category' reference-data contract collection.
+/// </summary>
+public partial class CategoryCollection() : ReferenceDataCollection<Category>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/Contoso.Products.Contracts.csproj b/samples/src/Contoso.Products.Contracts/Contoso.Products.Contracts.csproj
new file mode 100644
index 00000000..31817534
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/Contoso.Products.Contracts.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Products.Contracts/GlobalUsing.cs b/samples/src/Contoso.Products.Contracts/GlobalUsing.cs
new file mode 100644
index 00000000..e5b13f15
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/GlobalUsing.cs
@@ -0,0 +1,5 @@
+global using CoreEx.Entities;
+global using CoreEx.Localization;
+global using CoreEx.RefData;
+global using System.ComponentModel;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/Movement.cs b/samples/src/Contoso.Products.Contracts/Movement.cs
new file mode 100644
index 00000000..90f77c44
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/Movement.cs
@@ -0,0 +1,37 @@
+namespace Contoso.Products.Contracts;
+
+[Contract]
+public partial class Movement : IIdentifier<string?>, IETag, IChangeLog
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    public string? ReferenceId { get; set; }
+
+    [ReferenceData<MovementKind>]
+    public partial string? KindCode { get; set; }
+
+    [ReferenceData<MovementStatus>]
+    public partial string? StatusCode { get; set; }
+
+    public string? ProductId { get; set; }
+
+    public decimal Quantity { get; set; }
+
+    [ReferenceData<UnitOfMeasure>]
+    public partial string? UnitOfMeasureCode { get; set; }
+
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+
+    [JsonIgnore]
+    public bool IsQuantityValidForKind => KindCode switch
+    {
+        MovementKind.Issue => Quantity < 0,
+        MovementKind.Receive or MovementKind.Adjust => Quantity > 0,
+        _ => false
+    };
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/MovementKind.cs b/samples/src/Contoso.Products.Contracts/MovementKind.cs
new file mode 100644
index 00000000..095aed2c
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/MovementKind.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Products.Contracts;
+
+public partial class MovementKind
+{
+    public const string Adjust = "A";
+    public const string Issue = "I";
+    public const string Receive = "R";
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/MovementKind.g.cs b/samples/src/Contoso.Products.Contracts/MovementKind.g.cs
new file mode 100644
index 00000000..2e36d386
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/MovementKind.g.cs
@@ -0,0 +1,20 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Contracts;
+
+/// <summary>Represents the 'Movement Kind' reference-data contract.</summary>
+[ReferenceData]
+public partial class MovementKind : ReferenceData<MovementKind> { }
+
+/// <summary>
+/// Represents the 'MovementKind' reference-data contract collection.
+/// </summary>
+public partial class MovementKindCollection() : ReferenceDataCollection<MovementKind>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/MovementRequest.cs b/samples/src/Contoso.Products.Contracts/MovementRequest.cs
new file mode 100644
index 00000000..56732a39
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/MovementRequest.cs
@@ -0,0 +1,9 @@
+namespace Contoso.Products.Contracts;
+
+[Contract]
+public partial class MovementRequest : IIdentifier<string?>
+{
+    public string? Id { get; set; }
+
+    public DataMap<MovementRequestProduct>? Products { get; set; } 
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/MovementRequestProduct.cs b/samples/src/Contoso.Products.Contracts/MovementRequestProduct.cs
new file mode 100644
index 00000000..500298bc
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/MovementRequestProduct.cs
@@ -0,0 +1,12 @@
+namespace Contoso.Products.Contracts;
+
+[Contract]
+public partial class MovementRequestProduct
+{
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public decimal Quantity { get; set; }
+
+    [ReferenceData<UnitOfMeasure>]
+    [Localization("Unit-of-measure")]
+    public partial string? UnitOfMeasureCode { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/MovementStatus.cs b/samples/src/Contoso.Products.Contracts/MovementStatus.cs
new file mode 100644
index 00000000..7dece2c4
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/MovementStatus.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Products.Contracts;
+
+public partial class MovementStatus
+{
+    public const string Pending = "P";
+    public const string Confirmed = "C";
+    public const string Canceled = "X";
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/MovementStatus.g.cs b/samples/src/Contoso.Products.Contracts/MovementStatus.g.cs
new file mode 100644
index 00000000..7d772003
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/MovementStatus.g.cs
@@ -0,0 +1,20 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Contracts;
+
+/// <summary>Represents the 'Movement Status' reference-data contract.</summary>
+[ReferenceData]
+public partial class MovementStatus : ReferenceData<MovementStatus> { }
+
+/// <summary>
+/// Represents the 'MovementStatus' reference-data contract collection.
+/// </summary>
+public partial class MovementStatusCollection() : ReferenceDataCollection<MovementStatus>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/Product.cs b/samples/src/Contoso.Products.Contracts/Product.cs
new file mode 100644
index 00000000..7b19da89
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/Product.cs
@@ -0,0 +1,11 @@
+namespace Contoso.Products.Contracts;
+
+[Contract]
+public partial class Product : ProductBase, IETag, IChangeLog
+{
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/ProductBase.cs b/samples/src/Contoso.Products.Contracts/ProductBase.cs
new file mode 100644
index 00000000..5f624f18
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/ProductBase.cs
@@ -0,0 +1,34 @@
+namespace Contoso.Products.Contracts;
+
+[Contract]
+public abstract partial class ProductBase : IIdentifier<string?>
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    public string? Sku { get; set => field = value?.ToUpper(); }
+
+    public string? Text { get; set; }
+
+    [ReadOnly(true)]
+    [ReferenceData<Category>]
+    public partial string? CategoryCode { get; set; }
+
+    [ReferenceData<SubCategory>]
+    [Localization("Sub-category")]
+    public partial string? SubCategoryCode { get; set; }
+
+    [ReferenceData<UnitOfMeasure>()]
+    [Localization("Unit-of-measure")]
+    public partial string? UnitOfMeasureCode { get; set; }
+
+    [ReferenceData<Brand>()]
+    public partial string? BrandCode { get; set; }
+
+    public decimal Price { get; set; }
+
+    public bool IsNonStocked { get; set; }
+
+    [ReadOnly(true)]
+    public bool IsInactive { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/ProductLite.cs b/samples/src/Contoso.Products.Contracts/ProductLite.cs
new file mode 100644
index 00000000..e772ecc8
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/ProductLite.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Products.Contracts;
+
+public class ProductLite : ProductBase
+{
+    public decimal QtyOnHand { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/ProductReserve.cs b/samples/src/Contoso.Products.Contracts/ProductReserve.cs
new file mode 100644
index 00000000..63983838
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/ProductReserve.cs
@@ -0,0 +1,12 @@
+namespace Contoso.Products.Contracts;
+
+public class ProductReserve : IIdentifier<string>
+{
+    public string Id { get; set; } = default!;
+
+    public string UnitOfMeasureCode { get; set; } = default!;
+
+    public bool IsNonStocked { get; set; }
+
+    public bool IsInactive { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/SubCategory.g.cs b/samples/src/Contoso.Products.Contracts/SubCategory.g.cs
new file mode 100644
index 00000000..f367b332
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/SubCategory.g.cs
@@ -0,0 +1,25 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Contracts;
+
+/// <summary>Represents the 'Sub Category' reference-data contract.</summary>
+[ReferenceData]
+public partial class SubCategory : ReferenceData<SubCategory> 
+{
+    /// <summary>Gets or initializes the Category Code.</summary>
+    [ReferenceData<Category>]
+    public partial string CategoryCode { get; init; }
+}
+
+/// <summary>
+/// Represents the 'SubCategory' reference-data contract collection.
+/// </summary>
+public partial class SubCategoryCollection() : ReferenceDataCollection<SubCategory>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/UnitOfMeasure.cs b/samples/src/Contoso.Products.Contracts/UnitOfMeasure.cs
new file mode 100644
index 00000000..51c2777c
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/UnitOfMeasure.cs
@@ -0,0 +1,7 @@
+namespace Contoso.Products.Contracts;
+
+public partial class UnitOfMeasure
+{
+    [JsonIgnore]
+    public int Precision => 16 - Scale;
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Contracts/UnitOfMeasure.g.cs b/samples/src/Contoso.Products.Contracts/UnitOfMeasure.g.cs
new file mode 100644
index 00000000..996fe5a1
--- /dev/null
+++ b/samples/src/Contoso.Products.Contracts/UnitOfMeasure.g.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Contracts;
+
+/// <summary>Represents the 'Unit Of Measure' reference-data contract.</summary>
+[ReferenceData]
+public partial class UnitOfMeasure : ReferenceData<UnitOfMeasure> 
+{
+    /// <summary>Gets or initializes the Scale.</summary>
+    public int Scale { get; init; } = default!;
+}
+
+/// <summary>
+/// Represents the 'UnitOfMeasure' reference-data contract collection.
+/// </summary>
+public partial class UnitOfMeasureCollection() : ReferenceDataCollection<UnitOfMeasure>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Contoso.Products.Database.csproj b/samples/src/Contoso.Products.Database/Contoso.Products.Database.csproj
new file mode 100644
index 00000000..98eb3555
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Contoso.Products.Database.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DbEx.Postgres" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Schema\" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Products.Database/Data/ref-data.seed.yaml b/samples/src/Contoso.Products.Database/Data/ref-data.seed.yaml
new file mode 100644
index 00000000..000626e5
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Data/ref-data.seed.yaml
@@ -0,0 +1,57 @@
+products:
+  - $^category:
+    - A: Accessories
+    - B: Bikes
+    - G: Gear
+    - P: Parts
+    - M: Maintenance
+  - $^sub_category:
+    - { code: XC, text: Cross country, category_code: B }
+    - { code: TR, text: Trail, category_code: B }
+    - { code: DH, text: Downhill, category_code: B }
+    - { code: EN, text: Enduro, category_code: B }
+    - { code: EM, text: E-MTB, category_code: B }
+    - { code: FR, text: Freeride, category_code: B }
+    - { code: HT, text: Hardtail, category_code: B }
+    - { code: DR, text: Derailleur, category_code: P }
+    - { code: CA, text: Cassette, category_code: P }
+    - { code: CR, text: Crankset, category_code: P }
+    - { code: SP, text: Seatpost, category_code: P }
+    - { code: HB, text: Handlebar, category_code: P }
+    - { code: CH, text: Chain, category_code: P }
+    - { code: TY, text: Tires, category_code: A }
+    - { code: TO, text: Tools, category_code: A }
+    - { code: CL, text: Cleaner, category_code: A }
+    - { code: SE, text: Sealant, category_code: A }
+    - { code: HE, text: Helmets, category_code: G }
+    - { code: GL, text: Gloves, category_code: G }
+    - { code: LU, text: Lubricant, category_code: A }
+    - { code: LA, text: Labor, category_code: M }
+    - { code: MS, text: Miscellaneous, category_code: M }
+  - $^unit_of_measure:
+    - EA: Each
+    - SET: Set
+    - PR: Pair
+    - PK: Pack
+    - M: Meter
+    - CM: Centimeter
+    - L: Litre
+    - { code: HR, text: Hour, scale: 2 }
+  - $^brand:
+    - YETI: Yeti Cycles
+    - CANYON: Canyon Bicycles
+    - SPEC: Specialized
+    - GIANT: Giant Bicycles
+    - SHIMANO: Shimano
+    - SRAM: SRAM Corporation
+    - ONEUP: OneUp Components
+    - MUCOFF: Muc-Off
+    - NONE: None/Not Applicable
+  - $^movement_kind:
+    - A: Adjust
+    - I: Issue
+    - R: Receive
+  - $^movement_status:
+    - C: Confirmed
+    - P: Pending
+    - X: Cancelled
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000001-create-products-schema.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000001-create-products-schema.pgsql
new file mode 100644
index 00000000..c3c1c065
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000001-create-products-schema.pgsql
@@ -0,0 +1 @@
+CREATE SCHEMA IF NOT EXISTS "products";
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000101-create-products-category.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000101-create-products-category.pgsql
new file mode 100644
index 00000000..92bf0c74
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000101-create-products-category.pgsql
@@ -0,0 +1,17 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."category" (
+  "category_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000102-create-products-sub_category.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000102-create-products-sub_category.pgsql
new file mode 100644
index 00000000..b70f8f2d
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000102-create-products-sub_category.pgsql
@@ -0,0 +1,18 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."sub_category" (
+  "sub_category_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "category_code" VARCHAR(50) NOT NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000103-create-products-unit_of_measure.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000103-create-products-unit_of_measure.pgsql
new file mode 100644
index 00000000..be4c539d
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000103-create-products-unit_of_measure.pgsql
@@ -0,0 +1,18 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."unit_of_measure" (
+  "unit_of_measure_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "scale" INTEGER NOT NULL DEFAULT 0,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000104-create-products-brand.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000104-create-products-brand.pgsql
new file mode 100644
index 00000000..b08c9a44
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000104-create-products-brand.pgsql
@@ -0,0 +1,17 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."brand" (
+  "brand_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000105-create-products-movement_kind.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000105-create-products-movement_kind.pgsql
new file mode 100644
index 00000000..28157988
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000105-create-products-movement_kind.pgsql
@@ -0,0 +1,17 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."movement_kind" (
+  "movement_kind_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000106-create-products-movement_status.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000106-create-products-movement_status.pgsql
new file mode 100644
index 00000000..f7e27bd0
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000106-create-products-movement_status.pgsql
@@ -0,0 +1,17 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."movement_status" (
+  "movement_status_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "code" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NULL,
+  "is_active" BOOLEAN NULL,
+  "sort_order" INTEGER NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000201-create-products-product.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000201-create-products-product.pgsql
new file mode 100644
index 00000000..77eebfc5
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000201-create-products-product.pgsql
@@ -0,0 +1,22 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."product" (
+  "product_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "sku" VARCHAR(50) NOT NULL UNIQUE,
+  "text" VARCHAR(250) NOT NULL,
+  "sub_category_code" VARCHAR(50) NOT NULL,
+  "unit_of_measure_code" VARCHAR(50) NOT NULL,
+  "brand_code" VARCHAR(50) NULL,
+  "price" NUMERIC(18, 2) DEFAULT 0 NOT NULL,
+  "is_inactive" BOOLEAN DEFAULT FALSE NOT NULL,
+  "is_non_stocked" BOOLEAN DEFAULT FALSE NOT NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL,
+  "is_deleted" BOOLEAN DEFAULT FALSE NOT NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000202-create-products-inventory.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000202-create-products-inventory.pgsql
new file mode 100644
index 00000000..f2d9b93a
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000202-create-products-inventory.pgsql
@@ -0,0 +1,10 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."inventory" (
+  "inventory_id" VARCHAR(50) NOT NULL PRIMARY KEY, -- product_id.
+  "qty_on_hand" NUMERIC(18, 2) DEFAULT 0 NOT NULL
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000203-create-products-movement.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000203-create-products-movement.pgsql
new file mode 100644
index 00000000..062c96f4
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000203-create-products-movement.pgsql
@@ -0,0 +1,21 @@
+-- Migration Script.
+
+BEGIN TRANSACTION;
+
+CREATE TABLE "products"."movement" (
+  "movement_id" VARCHAR(50) NOT NULL PRIMARY KEY,
+  "reference_id" VARCHAR(50) NOT NULL,
+  "movement_kind_code" VARCHAR(50) NOT NULL,
+  "movement_status_code" VARCHAR(50) NOT NULL,
+  "product_id" VARCHAR(50) NOT NULL,
+  "quantity" NUMERIC(18, 2) DEFAULT 0 NOT NULL,
+  "unit_of_measure_code" VARCHAR(50) NOT NULL,
+  "created_by" VARCHAR(250) NULL,
+  "created_on" TIMESTAMPTZ NULL,
+  "updated_by" VARCHAR(250) NULL,
+  "updated_on" TIMESTAMPTZ NULL,
+
+  CONSTRAINT "uq_products_movement_reference_product" UNIQUE ("reference_id", "product_id")
+);
+
+COMMIT TRANSACTION;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Migrations/20260101-000301-create-products-outbox-tables.pgsql b/samples/src/Contoso.Products.Database/Migrations/20260101-000301-create-products-outbox-tables.pgsql
new file mode 100644
index 00000000..9a094a70
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Migrations/20260101-000301-create-products-outbox-tables.pgsql
@@ -0,0 +1,37 @@
+-- Create table: "products"."outbox" and "products"."outbox_lease"
+
+BEGIN;
+
+CREATE TABLE "products"."outbox" (
+  "outbox_id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "tenant_id" VARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  "partition_id" INTEGER NOT NULL,        -- Partition number; computed in application from partition-key.
+  "status" SMALLINT NOT NULL DEFAULT 0,   -- 0=Pending, 1=Processing, 2=Done.
+  "enqueued_utc" TIMESTAMPTZ NOT NULL,    -- When the event was enqueued within application.
+  "available_utc" TIMESTAMPTZ NOT NULL,   -- When the event is eligible for processing (retry delay).
+  "dequeued_utc" TIMESTAMPTZ NULL,        -- When the event was successfully dequeued/relayed.
+  "attempts" INTEGER NOT NULL DEFAULT 0,  -- Retry attempt count.
+
+  -- Message:
+  "destination" VARCHAR(255) NULL,        -- Message destination; i.e. queue/topic/etc.
+  "event" TEXT NOT NULL,                  -- CloudEvent as JSON.
+
+  -- Claim/leasing:
+  "lease_id" UUID NULL,                   -- Unique identifier of the lease.
+  "lease_until_utc" TIMESTAMPTZ NULL      -- Leased until UTC; after which assume released due to possible application crash.
+);
+
+CREATE INDEX "ix_products_outbox_partition_order" ON "products"."outbox" ("tenant_id", "partition_id", "outbox_id", "status", "available_utc", "lease_until_utc", "destination", "attempts");
+CREATE INDEX "ix_products_outbox_worker_pull" ON "products"."outbox" ("tenant_id", "partition_id", "status", "outbox_id", "available_utc");
+CREATE INDEX "ix_products_outbox_clean_up" ON "products"."outbox" ("outbox_id", "dequeued_utc") WHERE "status" = 2;
+
+CREATE TABLE "products"."outbox_lease" (
+  "tenant_id" VARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  "partition_id" INTEGER NOT NULL,        -- Partition number; computed in application from partition-key.
+  "lease_id" UUID NULL,                   -- Unique identifier of the lessee.
+  "lease_until_utc" TIMESTAMPTZ NULL,     -- Leased until UTC; after which assume released due to possible application crash.
+
+  CONSTRAINT "pk_products_outbox_lease" PRIMARY KEY ("tenant_id", "partition_id")
+);
+
+COMMIT;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Program.cs b/samples/src/Contoso.Products.Database/Program.cs
new file mode 100644
index 00000000..55709166
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Program.cs
@@ -0,0 +1,40 @@
+using CoreEx.Database;
+using DbEx.Migration;
+using DbEx.Postgres.Console;
+
+namespace Contoso.Products.Database;
+
+/// <summary>
+/// Represents the <b>database utilities</b> program (capability).
+/// </summary>
+public class Program
+{
+    /// <summary>
+    /// Main startup.
+    /// </summary>
+    /// <param name="args">The startup arguments.</param>
+    /// <returns>The status code whereby zero indicates success.</returns>
+    public static Task<int> Main(string[] args) => PostgresMigrationConsole
+        .Create<Program>("Server=127.0.0.1;Database=contoso;Username=postgres;Password=yourStrong#!Password")   
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>
+    /// Configure the <see cref="MigrationArgs"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="MigrationArgs"/>.</param>
+    /// <returns>The <see cref="MigrationArgs"/>.</returns>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
+    {
+        args.AddAssembly<SqlStatement>().AddAssembly<Program>()
+            .IncludeExtendedSchemaScripts()
+            .DataParserArgs
+                .RefDataColumnDefault("SortOrder", _ => 0)
+                .RefDataColumnDefault("Scale", _ => 0);
+
+        // Only reset data for the 'products' schema.
+        args.DataResetFilterPredicate = ts => ts.Schema == "products";
+
+        return args;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Properties/launchSettings.json b/samples/src/Contoso.Products.Database/Properties/launchSettings.json
new file mode 100644
index 00000000..4de54f7e
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Contoso.Products.Database": {
+      "commandName": "Project",
+      "commandLineArgs": "dropandall"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_cancel.g.pgsql b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_cancel.g.pgsql
new file mode 100644
index 00000000..4e5e2919
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_cancel.g.pgsql
@@ -0,0 +1,58 @@
+CREATE OR REPLACE FUNCTION "products"."fn_outbox_batch_cancel"(
+  p_lease_id UUID,
+  p_backoff_seconds INTEGER
+)
+RETURNS INTEGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  _now TIMESTAMPTZ;
+  _row_count INTEGER;
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+   *
+   * Cancels a batch by lease_id, marking messages as pending with backoff and releasing the lease.
+   * > Returns:
+   *   0 = Success.
+   *  -1 = No rows updated (e.g. already completed or invalid lease_id).
+   */
+
+  -- Set transaction parameters
+  SET LOCAL lock_timeout = '5s';
+  SET LOCAL transaction_isolation = 'read committed';
+
+  _now := NOW();
+
+  -- 1) Cancel all rows in the batch.
+  UPDATE "products"."outbox" AS o
+    SET "status" = 0,
+        "attempts" = o."attempts" + 1,
+        "available_utc" = _now + (p_backoff_seconds || ' seconds')::INTERVAL,
+        "lease_id" = NULL,
+        "lease_until_utc" = NULL
+    WHERE o."lease_id" = p_lease_id
+      AND o."status" = 1;
+
+  GET DIAGNOSTICS _row_count = ROW_COUNT;
+
+  IF _row_count = 0 THEN
+    RETURN -1; -- No rows updated; already completed or invalid lease_id.
+  END IF;
+
+  -- 2) Release the partition lease.
+  BEGIN
+    PERFORM "products"."fn_outbox_lease_release"(p_lease_id);
+  EXCEPTION
+    WHEN OTHERS THEN
+      -- Ignore: lease will expire. Don't fail cancel.
+      NULL;
+  END;
+
+  RETURN 0;
+
+EXCEPTION
+  WHEN OTHERS THEN
+    RAISE; -- Re-raise preserves error details to caller.
+END
+$$;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_claim.g.pgsql b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_claim.g.pgsql
new file mode 100644
index 00000000..2e98a1c3
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_claim.g.pgsql
@@ -0,0 +1,124 @@
+CREATE OR REPLACE FUNCTION "products"."fn_outbox_batch_claim"(
+  p_partition_id INTEGER,
+  p_batch_size INTEGER,
+  p_lease_id UUID,
+  p_lease_seconds INTEGER,
+  p_tenant_id VARCHAR(255) DEFAULT NULL
+)
+RETURNS TABLE (
+  "outbox_id" BIGINT,
+  "status" SMALLINT,
+  "destination" VARCHAR(255),
+  "event" TEXT,
+  "attempts" INTEGER,
+  "enqueued_utc" TIMESTAMPTZ,
+  "available_utc" TIMESTAMPTZ,
+  "lease_until_utc" TIMESTAMPTZ
+)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  _now TIMESTAMPTZ;
+  _lease_until_utc TIMESTAMPTZ;
+  _return_code INTEGER;
+  _effective_tenant_id VARCHAR(255);
+  _head_id BIGINT;
+  _blocker_id BIGINT;
+  _row_count INTEGER;
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+   *
+   * Claims the next batch of pending/processing messages for a tenant/partition, marking them as processing with a lease.
+   * > Returns:
+   *   Result set with claimed batch rows (may be empty).
+   */
+
+  -- Set transaction parameters
+  SET LOCAL lock_timeout = '5s';
+  SET LOCAL transaction_isolation = 'read committed';
+
+  _now := NOW();
+  _effective_tenant_id := COALESCE(p_tenant_id, '(none)');
+
+  -- 1) Acquire a partition lease; exit where unsuccessful.
+  SELECT * INTO _lease_until_utc, _return_code
+  FROM "products"."fn_outbox_lease_acquire"(
+    p_partition_id,
+    p_lease_id,
+    p_lease_seconds,
+    _effective_tenant_id
+  );
+
+  IF _return_code < 0 THEN
+    RETURN; -- Unable to acquire lease; return empty result set.
+  END IF;
+
+  -- 2) Claim the next batch (contiguous by outbox_id) for the tenant/partition.
+
+  -- Determine head (first pending/processing) and first blocker (actively leased or not yet available) in a single pass.
+  -- Any blocker row has status IN (0, 1) by definition, so blocker_id >= head_id is always true; no secondary scan needed.
+  SELECT
+    MIN(o."outbox_id") FILTER (WHERE o."status" IN (0, 1)),
+    MIN(o."outbox_id") FILTER (WHERE
+      (o."status" = 1 AND o."lease_until_utc" IS NOT NULL AND o."lease_until_utc" > _now)
+      OR (o."status" = 0 AND o."available_utc" > _now))
+  INTO _head_id, _blocker_id
+  FROM "products"."outbox" o
+  WHERE o."tenant_id" = _effective_tenant_id
+    AND o."partition_id" = p_partition_id
+    AND o."status" IN (0, 1);
+
+  IF _head_id IS NULL THEN
+    -- Release the lease.
+    PERFORM "products"."fn_outbox_lease_release"(p_lease_id);
+    RETURN; -- No batch to claim; return empty result set.
+  END IF;
+
+  -- Claim contiguous run from head to before blocker.
+  RETURN QUERY
+  WITH claim_cte AS (
+    SELECT
+      o."outbox_id", o."tenant_id", o."status", o."partition_id",
+      o."destination", o."event", o."attempts", o."enqueued_utc",
+      o."available_utc", o."lease_id", o."lease_until_utc"
+    FROM "products"."outbox" o
+    WHERE o."tenant_id" = _effective_tenant_id
+      AND o."partition_id" = p_partition_id
+      AND o."outbox_id" >= _head_id
+      AND (_blocker_id IS NULL OR o."outbox_id" < _blocker_id)
+      AND ((o."status" = 0 AND o."available_utc" <= _now)
+        OR (o."status" = 1 AND (o."lease_until_utc" IS NULL OR o."lease_until_utc" <= _now)))
+    ORDER BY o."outbox_id"
+    LIMIT p_batch_size
+    FOR UPDATE SKIP LOCKED
+  )
+  UPDATE "products"."outbox" o
+    SET "status" = 1,
+        "lease_id" = p_lease_id,
+        "lease_until_utc" = _lease_until_utc
+  FROM claim_cte
+  WHERE o."outbox_id" = claim_cte."outbox_id"
+  RETURNING
+    o."outbox_id",
+    o."status",
+    o."destination",
+    o."event",
+    o."attempts",
+    o."enqueued_utc",
+    o."available_utc",
+    o."lease_until_utc";
+
+  GET DIAGNOSTICS _row_count = ROW_COUNT;
+
+  IF _row_count = 0 THEN
+    -- Release the lease.
+    PERFORM "products"."fn_outbox_lease_release"(p_lease_id);
+    -- No row updated; return empty result set.
+  END IF;
+
+EXCEPTION
+  WHEN OTHERS THEN
+    RAISE; -- Re-raise preserves error details to caller.
+END
+$$;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_complete.g.pgsql b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_complete.g.pgsql
new file mode 100644
index 00000000..cb56b1d6
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_batch_complete.g.pgsql
@@ -0,0 +1,57 @@
+CREATE OR REPLACE FUNCTION "products"."fn_outbox_batch_complete"(
+  p_lease_id UUID,
+  p_dequeued_utc TIMESTAMPTZ DEFAULT NULL
+)
+RETURNS INTEGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  _now TIMESTAMPTZ;
+  _row_count INTEGER;
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+   *
+   * Marks a batch as completed by lease_id, releasing the lease and making way for the next batch.
+   * > Returns:
+   *   0 = Success.
+   *  -1 = No rows updated (e.g. already completed or invalid lease_id).
+   */
+
+  -- Set transaction parameters
+  SET LOCAL lock_timeout = '5s';
+  SET LOCAL transaction_isolation = 'read committed';
+
+  _now := NOW();
+
+  -- 1) Complete all rows in the batch.
+  UPDATE "products"."outbox" AS o
+    SET "status" = 2,
+        "lease_id" = NULL,
+        "lease_until_utc" = NULL,
+        "dequeued_utc" = COALESCE(p_dequeued_utc, _now)
+    WHERE o."lease_id" = p_lease_id
+      AND o."status" = 1;
+
+  GET DIAGNOSTICS _row_count = ROW_COUNT;
+
+  IF _row_count = 0 THEN
+    RETURN -1; -- No rows updated; already completed or invalid lease_id.
+  END IF;
+
+  -- 2) Release the partition lease where identified.
+  BEGIN
+    PERFORM "products"."fn_outbox_lease_release"(p_lease_id);
+  EXCEPTION
+    WHEN OTHERS THEN
+      -- Ignore: lease will expire. Don't fail completion.
+      NULL;
+  END;
+
+  RETURN 0;
+
+EXCEPTION
+  WHEN OTHERS THEN
+    RAISE; -- Re-raise preserves error details to caller.
+END
+$$;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_enqueue.g.pgsql b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_enqueue.g.pgsql
new file mode 100644
index 00000000..586be5e3
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_enqueue.g.pgsql
@@ -0,0 +1,40 @@
+CREATE OR REPLACE FUNCTION "products"."fn_outbox_enqueue"(
+  p_partition_id INTEGER,
+  p_destination VARCHAR(255),
+  p_event TEXT,
+  p_enqueued_utc TIMESTAMPTZ DEFAULT NULL,
+  p_tenant_id VARCHAR(255) DEFAULT NULL,
+  p_available_utc TIMESTAMPTZ DEFAULT NULL
+)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  _now TIMESTAMPTZ;
+  _effective_tenant_id VARCHAR(255);
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+   */
+
+  _now := NOW();
+  _effective_tenant_id := COALESCE(p_tenant_id, '(none)');
+
+  INSERT INTO "products"."outbox" (
+    "tenant_id",
+    "partition_id",
+    "destination",
+    "event",
+    "enqueued_utc",
+    "available_utc"
+  )
+  VALUES (
+    _effective_tenant_id,
+    p_partition_id,
+    p_destination,
+    p_event,
+    COALESCE(p_enqueued_utc, _now),
+    COALESCE(p_available_utc, p_enqueued_utc, _now)
+  );
+END
+$$;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_lease_acquire.g.pgsql b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_lease_acquire.g.pgsql
new file mode 100644
index 00000000..a7b87123
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_lease_acquire.g.pgsql
@@ -0,0 +1,61 @@
+CREATE OR REPLACE FUNCTION "products"."fn_outbox_lease_acquire"(
+  p_partition_id INTEGER,
+  p_lease_id UUID,
+  p_lease_seconds INTEGER,
+  p_tenant_id VARCHAR(255) DEFAULT NULL,
+  OUT p_lease_until_utc TIMESTAMPTZ,
+  OUT p_return_code INTEGER
+)
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  _now TIMESTAMPTZ;
+  _until TIMESTAMPTZ;
+  _effective_tenant_id VARCHAR(255);
+  _row_count INTEGER;
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+   *
+   * Attempts to acquire a lease for a tenant/partition, returning success status and lease until timestamp.
+   * > Returns:
+   *   return_code 0 = Lease acquired; caller may proceed with batch claim.
+   *   return_code -1 = Lease not acquired; caller should backoff and retry.
+   *
+   * Notes:
+   * - The function will return -1 where lease acquisition is unsuccessful, including where another active lease exists.
+   * - The caller should implement an appropriate retry/backoff strategy where -1 is returned, including randomization to avoid thundering herd issues.
+   */
+
+  -- Set transaction parameters
+  SET LOCAL lock_timeout = '5s';
+  SET LOCAL transaction_isolation = 'read committed';
+
+  _now := NOW();
+  _until := _now + (p_lease_seconds || ' seconds')::INTERVAL;
+  _effective_tenant_id := COALESCE(p_tenant_id, '(none)');
+
+  -- 1) Seed the row if it does not exist, and acquire the lease if expired/empty; single atomic statement.
+  INSERT INTO "products"."outbox_lease" ("tenant_id", "partition_id", "lease_id", "lease_until_utc")
+    VALUES (_effective_tenant_id, p_partition_id, p_lease_id, _until)
+    ON CONFLICT ("tenant_id", "partition_id") DO UPDATE
+      SET "lease_id" = p_lease_id,
+          "lease_until_utc" = _until
+      WHERE "outbox_lease"."lease_until_utc" IS NULL OR "outbox_lease"."lease_until_utc" <= _now;
+
+  -- 2) Return lease success status.
+  GET DIAGNOSTICS _row_count = ROW_COUNT;
+
+  IF _row_count = 1 THEN
+    p_lease_until_utc := _until;
+    p_return_code := 0; -- Lease successful.
+  ELSE
+    p_lease_until_utc := NULL;
+    p_return_code := -1; -- Lease unsuccessful.
+  END IF;
+
+EXCEPTION
+  WHEN OTHERS THEN
+    RAISE; -- Re-raise preserves error details to caller.
+END
+$$;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_lease_release.g.pgsql b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_lease_release.g.pgsql
new file mode 100644
index 00000000..bb3d2f42
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/Schema/Functions/fn_outbox_lease_release.g.pgsql
@@ -0,0 +1,45 @@
+CREATE OR REPLACE FUNCTION "products"."fn_outbox_lease_release"(
+  p_lease_id UUID
+)
+RETURNS INTEGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+  _row_count INTEGER;
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+   *
+   * Releases a lease by lease_id, making way for the next batch.
+   * > Returns:
+   *   0 = Success; lease released and available for next claim.
+   *  -1 = No rows updated (e.g. already released or invalid lease_id).
+   *
+   * Notes:
+   * - The function will return -1 where release is unsuccessful, including where the lease is already released.
+   */
+
+  -- Set transaction parameters
+  SET LOCAL lock_timeout = '5s';
+  SET LOCAL transaction_isolation = 'read committed';
+
+  -- 1) Release lease where lessee.
+  UPDATE "products"."outbox_lease" AS ol
+    SET "lease_id" = NULL,
+        "lease_until_utc" = NULL
+    WHERE ol."lease_id" = p_lease_id;
+
+  -- 2) Check row count and return release success status.
+  GET DIAGNOSTICS _row_count = ROW_COUNT;
+
+  IF _row_count = 1 THEN
+    RETURN 0; -- Release successful.
+  END IF;
+
+  RETURN -1; -- Release unsuccessful.
+
+EXCEPTION
+  WHEN OTHERS THEN
+    RAISE; -- Re-raise preserves error details to caller.
+END
+$$;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Database/dbex.yaml b/samples/src/Contoso.Products.Database/dbex.yaml
new file mode 100644
index 00000000..6715e5b8
--- /dev/null
+++ b/samples/src/Contoso.Products.Database/dbex.yaml
@@ -0,0 +1,17 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/DbEx/refs/heads/main/schema/dbex.json
+schema: products
+outbox: true
+outboxName: outbox
+tables:
+# Reference-data
+- name: brand
+- name: category
+- name: movement_kind
+- name: movement_status
+- name: sub_category
+- name: unit_of_measure
+
+# Transactional-data
+- name: inventory
+- name: movement
+- name: product
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Contoso.Products.Infrastructure.csproj b/samples/src/Contoso.Products.Infrastructure/Contoso.Products.Infrastructure.csproj
new file mode 100644
index 00000000..49255747
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Contoso.Products.Infrastructure.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Database.Postgres\CoreEx.Database.Postgres.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Application\Contoso.Products.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/GlobalUsing.cs b/samples/src/Contoso.Products.Infrastructure/GlobalUsing.cs
new file mode 100644
index 00000000..76e2b971
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/GlobalUsing.cs
@@ -0,0 +1,19 @@
+global using Contoso.Products.Application.Repositories;
+global using Contoso.Products.Infrastructure.Mapping;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.Data.Models;
+global using CoreEx.Data.Querying;
+global using CoreEx.Database;
+global using CoreEx.Database.Postgres;
+global using CoreEx.Database.Postgres.Outbox;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.EntityFrameworkCore;
+global using CoreEx.EntityFrameworkCore.Converters;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Mapping;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.Extensions.Logging;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/BrandMapper.g.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/BrandMapper.g.cs
new file mode 100644
index 00000000..c9061b51
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/BrandMapper.g.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.Brand"/> to <see cref="Contracts.Brand"/>.</summary>
+internal partial class BrandMapper : Mapper<Persistence.Brand, Contracts.Brand, BrandMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.Brand OnMap(Persistence.Brand source)
+    {
+        var destination = new Contracts.Brand
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.Brand source, Contracts.Brand destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/CategoryMapper.g.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/CategoryMapper.g.cs
new file mode 100644
index 00000000..48f90d0b
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/CategoryMapper.g.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.Category"/> to <see cref="Contracts.Category"/>.</summary>
+internal partial class CategoryMapper : Mapper<Persistence.Category, Contracts.Category, CategoryMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.Category OnMap(Persistence.Category source)
+    {
+        var destination = new Contracts.Category
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.Category source, Contracts.Category destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/MovementKindMapper.g.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/MovementKindMapper.g.cs
new file mode 100644
index 00000000..bfed492a
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/MovementKindMapper.g.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.MovementKind"/> to <see cref="Contracts.MovementKind"/>.</summary>
+internal partial class MovementKindMapper : Mapper<Persistence.MovementKind, Contracts.MovementKind, MovementKindMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.MovementKind OnMap(Persistence.MovementKind source)
+    {
+        var destination = new Contracts.MovementKind
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.MovementKind source, Contracts.MovementKind destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/MovementMapper.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/MovementMapper.cs
new file mode 100644
index 00000000..d0a5866c
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/MovementMapper.cs
@@ -0,0 +1,27 @@
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+public class MovementMapper : BiDirectionMapper<Contracts.Movement, Persistence.Movement, MovementMapper>
+{
+    protected override Persistence.Movement OnMap(Contracts.Movement source) => new()
+    {
+        Id = source.Id!,
+        ReferenceId = source.ReferenceId!,
+        MovementKindCode = source.KindCode!,
+        MovementStatusCode = source.StatusCode!,
+        ProductId = source.ProductId!,
+        Quantity = source.Quantity,
+        UnitOfMeasureCode = source.UnitOfMeasureCode!
+    };
+
+    protected override Contracts.Movement OnMap(Persistence.Movement source) => new()
+    {
+        Id = source.Id,
+        ReferenceId = source.ReferenceId,
+        KindCode = source.MovementKindCode,
+        StatusCode = source.MovementStatusCode,
+        ProductId = source.ProductId,
+        Quantity = source.Quantity,
+        UnitOfMeasureCode = source.UnitOfMeasureCode
+    };
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/MovementStatusMapper.g.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/MovementStatusMapper.g.cs
new file mode 100644
index 00000000..cabf9f72
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/MovementStatusMapper.g.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.MovementStatus"/> to <see cref="Contracts.MovementStatus"/>.</summary>
+internal partial class MovementStatusMapper : Mapper<Persistence.MovementStatus, Contracts.MovementStatus, MovementStatusMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.MovementStatus OnMap(Persistence.MovementStatus source)
+    {
+        var destination = new Contracts.MovementStatus
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.MovementStatus source, Contracts.MovementStatus destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/ProductMapper.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/ProductMapper.cs
new file mode 100644
index 00000000..20e1158f
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/ProductMapper.cs
@@ -0,0 +1,30 @@
+namespace Contoso.Products.Infrastructure.Mapping;
+
+public class ProductMapper : BiDirectionMapper<Contracts.Product, Persistence.Product, ProductMapper>
+{
+    protected override Persistence.Product OnMap(Contracts.Product source) => new()
+    {
+        Id = source.Id!,
+        Sku = source.Sku!,
+        Text = source.Text!,
+        SubCategoryCode = source.SubCategory?.Code!,
+        UnitOfMeasureCode = source.UnitOfMeasure?.Code!,
+        BrandCode = source.Brand?.Code!,
+        Price = source.Price,
+        IsInactive = source.IsInactive,
+        IsNonStocked = source.IsNonStocked
+    };
+
+    protected override Contracts.Product OnMap(Persistence.Product source) => new Contracts.Product()
+    {
+        Id = source.Id,
+        Sku = source.Sku,
+        Text = source.Text,
+        SubCategoryCode = source.SubCategoryCode,
+        UnitOfMeasureCode = source.UnitOfMeasureCode,
+        BrandCode = source.BrandCode,
+        Price = source.Price,
+        IsInactive = source.IsInactive,
+        IsNonStocked = source.IsNonStocked
+    }.Adjust(p => p.CategoryCode = p.SubCategory?.CategoryCode);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/SubCategoryMapper.g.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/SubCategoryMapper.g.cs
new file mode 100644
index 00000000..765540f1
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/SubCategoryMapper.g.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.SubCategory"/> to <see cref="Contracts.SubCategory"/>.</summary>
+internal partial class SubCategoryMapper : Mapper<Persistence.SubCategory, Contracts.SubCategory, SubCategoryMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.SubCategory OnMap(Persistence.SubCategory source)
+    {
+        var destination = new Contracts.SubCategory
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag,
+            CategoryCode = source.CategoryCode
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.SubCategory source, Contracts.SubCategory destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Mapping/UnitOfMeasureMapper.g.cs b/samples/src/Contoso.Products.Infrastructure/Mapping/UnitOfMeasureMapper.g.cs
new file mode 100644
index 00000000..a837a038
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Mapping/UnitOfMeasureMapper.g.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.UnitOfMeasure"/> to <see cref="Contracts.UnitOfMeasure"/>.</summary>
+internal partial class UnitOfMeasureMapper : Mapper<Persistence.UnitOfMeasure, Contracts.UnitOfMeasure, UnitOfMeasureMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.UnitOfMeasure OnMap(Persistence.UnitOfMeasure source)
+    {
+        var destination = new Contracts.UnitOfMeasure
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag,
+            Scale = source.Scale
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.UnitOfMeasure source, Contracts.UnitOfMeasure destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/Brand.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/Brand.g.cs
new file mode 100644
index 00000000..e471fa01
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/Brand.g.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>"products"."brand"</c>' database table.</summary>
+public partial class Brand : ReferenceDataModelBase<string> { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/Category.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/Category.g.cs
new file mode 100644
index 00000000..dd9088f6
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/Category.g.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>"products"."category"</c>' database table.</summary>
+public partial class Category : ReferenceDataModelBase<string> { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/Inventory.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/Inventory.g.cs
new file mode 100644
index 00000000..4daab16a
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/Inventory.g.cs
@@ -0,0 +1,19 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>"products"."inventory"</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>inventory_id</c>' (type '<c>CHARACTER VARYING(50)</c>').</remarks>
+public partial class Inventory : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>qty_on_hand</c>' column (type '<c>NUMERIC(18, 2)</c>').</summary>
+    public decimal QtyOnHand { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/Movement.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/Movement.g.cs
new file mode 100644
index 00000000..513d02f7
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/Movement.g.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>"products"."movement"</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>movement_id</c>' (type '<c>CHARACTER VARYING(50)</c>').</remarks>
+public partial class Movement : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>reference_id</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string ReferenceId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>movement_kind_code</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string MovementKindCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>movement_status_code</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string MovementStatusCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>product_id</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string ProductId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>quantity</c>' column (type '<c>NUMERIC(18, 2)</c>').</summary>
+    public decimal Quantity { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>unit_of_measure_code</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string UnitOfMeasureCode { get; set; } = default!;
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/MovementKind.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/MovementKind.g.cs
new file mode 100644
index 00000000..a9f82d6d
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/MovementKind.g.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>"products"."movement_kind"</c>' database table.</summary>
+public partial class MovementKind : ReferenceDataModelBase<string> { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/MovementStatus.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/MovementStatus.g.cs
new file mode 100644
index 00000000..dba09344
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/MovementStatus.g.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>"products"."movement_status"</c>' database table.</summary>
+public partial class MovementStatus : ReferenceDataModelBase<string> { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/Product.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/Product.g.cs
new file mode 100644
index 00000000..7e373a33
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/Product.g.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>"products"."product"</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>product_id</c>' (type '<c>CHARACTER VARYING(50)</c>').</remarks>
+public partial class Product : ModelBase<string>, ILogicallyDeleted
+{
+    /// <summary>Gets or sets the value of the '<c>sku</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string Sku { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>text</c>' column (type '<c>CHARACTER VARYING(250)</c>').</summary>
+    public string Text { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>sub_category_code</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string SubCategoryCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>unit_of_measure_code</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string UnitOfMeasureCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>brand_code</c>' column (type '<c>CHARACTER VARYING(50) NULL</c>').</summary>
+    public string? BrandCode { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>price</c>' column (type '<c>NUMERIC(18, 2)</c>').</summary>
+    public decimal Price { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>is_inactive</c>' column (type '<c>BOOLEAN</c>').</summary>
+    public bool IsInactive { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>is_non_stocked</c>' column (type '<c>BOOLEAN</c>').</summary>
+    public bool IsNonStocked { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>is_deleted</c>' column (type '<c>BOOLEAN</c>'); see <see cref="ILogicallyDeleted.IsDeleted"/>.</summary>
+    public bool IsDeleted { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/SubCategory.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/SubCategory.g.cs
new file mode 100644
index 00000000..8979a6ce
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/SubCategory.g.cs
@@ -0,0 +1,18 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>"products"."sub_category"</c>' database table.</summary>
+public partial class SubCategory : ReferenceDataModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>category_code</c>' column (type '<c>CHARACTER VARYING(50)</c>').</summary>
+    public string CategoryCode { get; set; } = default!;
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Persistence/UnitOfMeasure.g.cs b/samples/src/Contoso.Products.Infrastructure/Persistence/UnitOfMeasure.g.cs
new file mode 100644
index 00000000..81f5642b
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Persistence/UnitOfMeasure.g.cs
@@ -0,0 +1,18 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>"products"."unit_of_measure"</c>' database table.</summary>
+public partial class UnitOfMeasure : ReferenceDataModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>scale</c>' column (type '<c>INTEGER</c>').</summary>
+    public int Scale { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/InventoryRepository.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/InventoryRepository.cs
new file mode 100644
index 00000000..abd575cd
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/InventoryRepository.cs
@@ -0,0 +1,33 @@
+namespace Contoso.Products.Infrastructure.Repositories;
+
+[ScopedService<IInventoryRepository>]
+public class InventoryRepository(ProductsEfDb ef) : IInventoryRepository
+{
+    private readonly ProductsEfDb _ef = ef.ThrowIfNull();
+
+    public async Task<decimal?> GetOnHandAsync(string productId, bool throwNotFoundException)
+    {
+        var products = _ef.Products.Model.Query();
+        var inventory = _ef.Inventory.Query();
+
+        var q =
+            from p in products
+            where p.Id == productId
+            join i in inventory on p.Id equals i.Id into ig
+            from i in ig.DefaultIfEmpty()
+            select new
+            {
+                HasInventory = i != null,
+                QtyOnHand = i == null ? 0m : i.QtyOnHand
+            };
+
+        var res = await q.SingleOrDefaultAsync().ConfigureAwait(false);
+
+        // Where existence is not considered important, return zero when not found.
+        if (res is null)
+            return throwNotFoundException ? throw new NotFoundException() : null;
+
+        // Return the current quantity-on-hand where applicable.
+        return res.HasInventory ? res.QtyOnHand : null;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/MovementRepository.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/MovementRepository.cs
new file mode 100644
index 00000000..acc3aa63
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/MovementRepository.cs
@@ -0,0 +1,175 @@
+namespace Contoso.Products.Infrastructure.Repositories;
+
+[ScopedService<IMovementRepository>]
+public class MovementRepository(ProductsEfDb ef) : IMovementRepository
+{
+    private readonly ProductsEfDb _ef = ef.ThrowIfNull();
+
+    private readonly static QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
+        .WithFilter(filter => filter
+            .AddField<string>(nameof(Contracts.Movement.ReferenceId), c => c.WithOperators(QueryFilterOperator.EqualityOperators))
+            .AddField<string>(nameof(Contracts.Movement.ProductId), c => c.WithOperators(QueryFilterOperator.EqualityOperators))
+            .AddReferenceDataField<Contracts.MovementKind>(nameof(Contracts.Movement.Kind), nameof(Persistence.Movement.MovementKindCode))
+            .AddReferenceDataField<Contracts.MovementStatus>(nameof(Contracts.Movement.Status), nameof(Persistence.Movement.MovementStatusCode)))
+        .WithOrderBy(orderby => orderby
+            .AddField(nameof(Contracts.Movement.ReferenceId), c => c.WithDefault().WithAlwaysInclude())
+            .AddField(nameof(Contracts.Movement.ProductId), c => c.WithDefault().WithAlwaysInclude()));
+
+    /// <inheritdoc/>
+    public async Task<List<Contracts.Movement>> CreateAsync(List<Contracts.Movement> movements)
+    {   
+        movements.ThrowIfNull().ThrowWhen(movements => movements.Select(x => x.Kind).Distinct().Count() > 1, "All movements must be of the same kind.")
+            .ThrowWhen(movements => movements.Any(m => !m.IsQuantityValidForKind), "One or more movements have invalid quantities for their kind.");
+
+        // Process the movements and related inventory items.
+        var ids = movements.Select(m => m.ProductId).Distinct();
+        var inventoryItems = await _ef.Inventory.QueryTracked().Where(i => ids.Contains(i.Id)).ToDictionaryAsync(i => i.Id!, i => i).ConfigureAwait(false);
+        var args = new EfDbArgs { SaveChanges = false };
+
+        foreach (var movement in movements)
+        {
+            movement.Id = Runtime.NewId();
+            var movementModel = MovementMapper.To.Map(movement);
+
+            // Adjust the inventory item for the movement.
+            await InventoryAdjustAsync(args, inventoryItems, movementModel).ConfigureAwait(false);
+
+            // Create the movement.
+            movement.Id = Runtime.NewId();
+            await _ef.Movements.CreateAsync(args, MovementMapper.To.Map(movement)).ConfigureAwait(false);
+        }
+
+        // Save changes and return the mutated movements.
+        return await SaveAndGetAllMutatedMovements().ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Adjust the inventory item for the movement.
+    /// </summary>
+    private async Task InventoryAdjustAsync(EfDbArgs args, Dictionary<string, Persistence.Inventory> inventoryItems, Persistence.Movement movement)
+    {
+        // Create/adjust the inventory item for the movement.
+        if (inventoryItems.TryGetValue(movement.ProductId!, out var inventoryItem))
+        {
+            if (movement.MovementKindCode == Contracts.MovementKind.Adjust)
+                inventoryItem.QtyOnHand = movement.Quantity;
+            else
+                inventoryItem.QtyOnHand += movement.Quantity;
+
+            if (inventoryItem.QtyOnHand < 0)
+                throw new BusinessException($"Product '{movement.ProductId}' does not have sufficient quantity on hand.").WithErrorCode("insufficient-quantity").WithKey(movement.ProductId);
+
+            await _ef.Inventory.UpdateAsync(args, inventoryItem).ConfigureAwait(false);
+        }
+        else
+        {
+            if (movement.MovementKindCode == Contracts.MovementKind.Issue)
+                throw new BusinessException($"Product '{movement.ProductId}' does not have sufficient quantity on hand.").WithErrorCode("insufficient-quantity").WithKey(movement.ProductId);
+
+            var newInventoryItem = new Persistence.Inventory
+            {
+                Id = movement.ProductId,
+                QtyOnHand = movement.Quantity
+            };
+
+            await _ef.Inventory.CreateAsync(args, newInventoryItem).ConfigureAwait(false);
+        }
+    }
+
+    /// <inheritdoc/>
+    public async Task<List<Contracts.Movement>> ConfirmAsync(string referenceId)
+    {
+        // Get all pending movements for the reference identifier.
+        var movements = await _ef.Movements.QueryTracked().Where(m => m.ReferenceId == referenceId && m.MovementStatusCode == Contracts.MovementStatus.Pending).ToListAsync().ConfigureAwait(false);
+        if (movements.Count == 0)
+            return [];
+
+        // Update the movement status to confirmed for all movements; no inventory adjustment is needed as the inventory was already adjusted during creation.
+        var args = new EfDbArgs { SaveChanges = false };
+        foreach (var movement in movements)
+        {
+            movement.MovementStatusCode = Contracts.MovementStatus.Confirmed;
+            await _ef.Movements.UpdateAsync(args, movement).ConfigureAwait(false);
+        }
+
+        // Save changes and return the mutated movements.
+        return await SaveAndGetAllMutatedMovements().ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task<List<Contracts.Movement>> CancelAsync(string referenceId)
+    {
+        // Get all pending movements for the reference identifier.
+        var movements = await _ef.Movements.QueryTracked().Where(m => m.ReferenceId == referenceId && m.MovementStatusCode == Contracts.MovementStatus.Pending).ToListAsync().ConfigureAwait(false);
+        if (movements.Count == 0)
+            return [];
+
+        // Get the related inventory ready to adjust.
+        var ids = movements.Select(m => m.ProductId).Distinct();
+        var inventoryItems = await _ef.Inventory.QueryTracked().Where(i => ids.Contains(i.Id)).ToDictionaryAsync(i => i.Id!, i => i).ConfigureAwait(false);
+
+        // Update the movement status to cancelled and adjust inventory back for all movements.
+        var args = new EfDbArgs { SaveChanges = false };
+        foreach (var movement in movements)
+        {
+            // Create a fake movement with opposite quantity to adjust the inventory back.
+            var fakeMovement = new Persistence.Movement
+            {
+                ProductId = movement.ProductId,
+                Quantity = -movement.Quantity,
+                MovementKindCode = CreateReversalMovementKind(movement.MovementKindCode) 
+            };
+
+            // Reverse (adjust back) the inventory for the movement.
+            await InventoryAdjustAsync(args, inventoryItems, fakeMovement).ConfigureAwait(false);
+
+            // Update movement status to cancelled.
+            movement.MovementStatusCode = Contracts.MovementStatus.Canceled;
+            await _ef.Movements.UpdateAsync(args, movement).ConfigureAwait(false);
+        }
+
+        // Save changes and return the mutated movements.
+        return await SaveAndGetAllMutatedMovements().ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Create a reversal movement kind for the given movement kind.
+    /// </summary>
+    private static string CreateReversalMovementKind(string? kind) => kind switch
+    {
+        Contracts.MovementKind.Issue => Contracts.MovementKind.Receive,
+        Contracts.MovementKind.Receive => Contracts.MovementKind.Issue,
+        _ => throw new InvalidOperationException($"Unsupported movement kind: {kind}")
+    };
+
+    /// <summary>
+    /// Saves all the changes and returns the mutated movements mapping to the contract version.
+    /// </summary>
+    private async Task<List<Contracts.Movement>> SaveAndGetAllMutatedMovements()
+    {
+        // Save all changes.
+        await _ef.DbContext.SaveChangesAsync().ConfigureAwait(false);
+
+        // Return all mutated movements from the change tracker.
+        return [.. _ef.DbContext.ChangeTracker.Entries<Persistence.Movement>().Select(m => MovementMapper.From.Map(m.Entity))];
+    }
+
+    /// <inheritdoc/>
+    public async Task<Contracts.Movement[]> GetAsync(string referenceId)
+    {
+        var movements = await _ef.Movements.Query().Where(m => m.ReferenceId == referenceId).OrderBy(m => m.Id).ToArrayAsync().ConfigureAwait(false);
+        return movements is not null ? [.. movements.Select(m => MovementMapper.From.Map(m))] : [];
+    }
+
+    /// <inheritdoc/>
+    public Task<JsonElement> QuerySchemaAsync() => Task.FromResult(_queryConfig.ToJsonSchema());
+
+    /// <inheritdoc/>
+    public async Task<ItemsResult<Contracts.Movement>> QueryAsync(QueryArgs? query, PagingArgs? paging)
+    {
+        var parsed = _queryConfig.Parse(query).ThrowOnError();
+        var movements = _ef.Movements.Query();
+        var q = from m in movements select m;
+        return await q.Where(parsed).OrderBy(parsed).ToMappedItemsResultAsync(m => MovementMapper.From.Map(m), paging).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/ProductRepository.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductRepository.cs
new file mode 100644
index 00000000..e6fa0612
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductRepository.cs
@@ -0,0 +1,91 @@
+namespace Contoso.Products.Infrastructure.Repositories;
+
+[ScopedService<IProductRepository>]
+public class ProductRepository(ProductsEfDb ef) : IProductRepository
+{
+    private readonly ProductsEfDb _ef = ef.ThrowIfNull();
+
+    private readonly static QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
+        .WithFilter(filter => filter
+            .WithDefaultModelPrefix("Product")
+            .AddField<string>(nameof(Contracts.ProductBase.Sku), c => c.WithOperators(QueryFilterOperator.EqualityOperators | QueryFilterOperator.StartsWith).AsUpperCase())
+            .AddField<string>(nameof(Contracts.ProductBase.Text), c => c.WithOperators(QueryFilterOperator.StringFunctions).AsUpperCase())
+            .AddReferenceDataField<Contracts.Category>(nameof(Contracts.ProductBase.Category), "CategoryCode", c => c.WithModelPrefix(null))
+            .AddReferenceDataField<Contracts.SubCategory>(nameof(Contracts.ProductBase.SubCategory), "SubCategoryCode")
+            .AddReferenceDataField<Contracts.Brand>(nameof(Contracts.ProductBase.Brand), "BrandCode"))
+        .WithOrderBy(orderby => orderby
+            .WithDefaultModelPrefix("Product")
+            .AddField(nameof(Contracts.ProductBase.Sku), c => c.WithDefault().WithAlwaysInclude())
+            .AddField(nameof(Contracts.ProductBase.Text))
+            .AddField(nameof(Contracts.ProductBase.Brand)));
+
+    public Task<Contracts.Product?> GetAsync(string id) => _ef.Products.GetAsync(id);
+
+    public Task<DataResult<Contracts.Product>> CreateAsync(Contracts.Product product) => _ef.Products.CreateAsync(product);
+
+    public Task<DataResult<Contracts.Product>> UpdateAsync(Contracts.Product product) => _ef.Products.UpdateAsync(product);
+
+    public Task<DataResult> DeleteAsync(string id) => _ef.Products.DeleteAsync(id);
+
+    public Task<JsonElement> QuerySchemaAsync() => Task.FromResult(_queryConfig.ToJsonSchema());
+
+    public async Task<ItemsResult<Contracts.ProductLite>> QueryAsync(QueryArgs? query, PagingArgs? paging)
+    {
+        var parsed = _queryConfig.Parse(query).ThrowOnError();
+
+        var products = _ef.Products.Model.Query();
+        if (query?.IsIncludeInactive is false)
+            products = products.Where(p => !p.IsInactive);
+
+        var subcats = _ef.SubCategories.Query();
+        var inventory = _ef.Inventory.Query();
+
+        var q =
+            from p in products
+            join sc in subcats on p.SubCategoryCode equals sc.Code into scg
+            from sc in scg.DefaultIfEmpty()
+            join i in inventory on p.Id equals i.Id into ig
+            from i in ig.DefaultIfEmpty()
+            select new
+            {
+                Product = p,
+                SubCategoryCode = sc.Code,
+                sc.CategoryCode,
+                QtyOnHand = i == null ? 0 : i.QtyOnHand
+            };
+
+        return await q.Where(parsed).OrderBy(parsed).ToMappedItemsResultAsync(x => new Contracts.ProductLite
+        {
+            Id = x.Product.Id,
+            Sku = x.Product.Sku,
+            Text = x.Product.Text,
+            CategoryCode = x.CategoryCode,
+            SubCategoryCode = x.SubCategoryCode,
+            BrandCode = x.Product.BrandCode,
+            UnitOfMeasureCode = x.Product.UnitOfMeasureCode,
+            Price = x.Product.Price,
+            IsInactive = x.Product.IsInactive,
+            IsNonStocked = x.Product.IsNonStocked,
+            QtyOnHand = x.QtyOnHand
+        }, paging);
+    }
+
+    public Task<Dictionary<string, Contracts.ProductReserve>> GetForReservationAsync(string[] ids)
+    {
+        var products = _ef.Products.Model.Query();
+        var list = ids.ToList();    // PostgreSQL EF has issues translating array.Contains, but can do list.Contains; see: https://github.com/npgsql/efcore.pg/issues/3461.
+
+        var q =
+            from p in products
+            where list.Contains(p.Id)
+            select new Contracts.ProductReserve
+            {
+                Id = p.Id!,
+                UnitOfMeasureCode = p.UnitOfMeasureCode!,
+                IsInactive = p.IsInactive,
+                IsNonStocked = p.IsNonStocked
+            };
+
+        return q.ToDictionaryAsync(x => x.Id, x => x);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsDbContext.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsDbContext.cs
new file mode 100644
index 00000000..eec860d2
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsDbContext.cs
@@ -0,0 +1,28 @@
+namespace Contoso.Products.Infrastructure.Repositories;
+
+public partial class ProductsDbContext(DbContextOptions<ProductsDbContext> options, PostgresDatabase database) : DbContext(options), IEfDbContext
+{
+    /// <inheritdoc/>
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        // Uses IDatabase.Connection to ensure the same database/connection is used.
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseNpgsql(BaseDatabase.Connection, contextOwnsConnection: false);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        // Add the generated models to the model builder.
+        AddGeneratedModels(modelBuilder);
+    }
+
+    /// <summary>Adds the CodeGen-generated entity models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(ModelBuilder modelBuilder);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsDbContext.g.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsDbContext.g.cs
new file mode 100644
index 00000000..1b61f1fd
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsDbContext.g.cs
@@ -0,0 +1,181 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Repositories;
+
+public partial class ProductsDbContext
+{
+    /// <summary>Adds the generated models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="Microsoft.EntityFrameworkCore.ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(Microsoft.EntityFrameworkCore.ModelBuilder modelBuilder)
+    {
+        // Add the entity/model configuration for the "products"."brand" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.Brand>(e =>
+        {
+            e.ToTable("brand", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("brand_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Code).HasColumnName("code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.IsActive).HasColumnName("is_active").HasColumnType("BOOLEAN");
+            e.Property(p => p.SortOrder).HasColumnName("sort_order").HasColumnType("INTEGER");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the "products"."category" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.Category>(e =>
+        {
+            e.ToTable("category", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("category_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Code).HasColumnName("code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.IsActive).HasColumnName("is_active").HasColumnType("BOOLEAN");
+            e.Property(p => p.SortOrder).HasColumnName("sort_order").HasColumnType("INTEGER");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the "products"."movement_kind" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.MovementKind>(e =>
+        {
+            e.ToTable("movement_kind", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("movement_kind_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Code).HasColumnName("code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.IsActive).HasColumnName("is_active").HasColumnType("BOOLEAN");
+            e.Property(p => p.SortOrder).HasColumnName("sort_order").HasColumnType("INTEGER");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the "products"."movement_status" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.MovementStatus>(e =>
+        {
+            e.ToTable("movement_status", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("movement_status_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Code).HasColumnName("code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.IsActive).HasColumnName("is_active").HasColumnType("BOOLEAN");
+            e.Property(p => p.SortOrder).HasColumnName("sort_order").HasColumnType("INTEGER");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the "products"."sub_category" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.SubCategory>(e =>
+        {
+            e.ToTable("sub_category", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("sub_category_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Code).HasColumnName("code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.IsActive).HasColumnName("is_active").HasColumnType("BOOLEAN");
+            e.Property(p => p.SortOrder).HasColumnName("sort_order").HasColumnType("INTEGER");
+            e.Property(p => p.CategoryCode).HasColumnName("category_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the "products"."unit_of_measure" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.UnitOfMeasure>(e =>
+        {
+            e.ToTable("unit_of_measure", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("unit_of_measure_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Code).HasColumnName("code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.IsActive).HasColumnName("is_active").HasColumnType("BOOLEAN");
+            e.Property(p => p.SortOrder).HasColumnName("sort_order").HasColumnType("INTEGER");
+            e.Property(p => p.Scale).HasColumnName("scale").HasColumnType("INTEGER");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the "products"."inventory" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.Inventory>(e =>
+        {
+            e.ToTable("inventory", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("inventory_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.QtyOnHand).HasColumnName("qty_on_hand").HasColumnType("NUMERIC(18, 2)");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.CreatedBy).Ignore(p => p.CreatedOn).Ignore(p => p.UpdatedBy).Ignore(p => p.UpdatedOn);
+        });
+
+        // Add the entity/model configuration for the "products"."movement" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.Movement>(e =>
+        {
+            e.ToTable("movement", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("movement_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.ReferenceId).HasColumnName("reference_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.MovementKindCode).HasColumnName("movement_kind_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.MovementStatusCode).HasColumnName("movement_status_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.ProductId).HasColumnName("product_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Quantity).HasColumnName("quantity").HasColumnType("NUMERIC(18, 2)");
+            e.Property(p => p.UnitOfMeasureCode).HasColumnName("unit_of_measure_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+        });
+
+        // Add the entity/model configuration for the "products"."product" database table.
+        modelBuilder.Entity<Contoso.Products.Infrastructure.Persistence.Product>(e =>
+        {
+            e.ToTable("product", "products");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("product_id").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Sku).HasColumnName("sku").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.SubCategoryCode).HasColumnName("sub_category_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.UnitOfMeasureCode).HasColumnName("unit_of_measure_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.BrandCode).HasColumnName("brand_code").HasColumnType("CHARACTER VARYING(50)");
+            e.Property(p => p.Price).HasColumnName("price").HasColumnType("NUMERIC(18, 2)");
+            e.Property(p => p.IsInactive).HasColumnName("is_inactive").HasColumnType("BOOLEAN");
+            e.Property(p => p.IsNonStocked).HasColumnName("is_non_stocked").HasColumnType("BOOLEAN");
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("CHARACTER VARYING(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("TIMESTAMP WITH TIME ZONE");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("XID").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Property(p => p.IsDeleted).HasColumnName("is_deleted").HasColumnType("BOOLEAN");
+        });
+    }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsEfDb.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsEfDb.cs
new file mode 100644
index 00000000..b35529cf
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/ProductsEfDb.cs
@@ -0,0 +1,25 @@
+namespace Contoso.Products.Infrastructure.Repositories;
+
+public sealed class ProductsEfDb(ProductsDbContext dbContext) : EfDb<ProductsDbContext>(dbContext, _options)
+{
+    private static readonly EfDbOptions _options = new EfDbOptions()
+        .WithModel<Persistence.Product>(m => m.WithLogicalDeleteFilter());
+
+    public EfDbModel<Persistence.Category> Categories => Model<Persistence.Category>();
+
+    public EfDbModel<Persistence.SubCategory> SubCategories => Model<Persistence.SubCategory>();
+
+    public EfDbModel<Persistence.UnitOfMeasure> UnitsOfMeasure => Model<Persistence.UnitOfMeasure>();
+
+    public EfDbModel<Persistence.Brand> Brands => Model<Persistence.Brand>();
+
+    public EfDbModel<Persistence.MovementKind> MovementKinds => Model<Persistence.MovementKind>();
+
+    public EfDbModel<Persistence.MovementStatus> MovementStatuses => Model<Persistence.MovementStatus>();
+
+    public EfDbMappedModel<Contracts.Product, Persistence.Product, ProductMapper> Products => Model<Persistence.Product>().ToMappedModel<Contracts.Product, ProductMapper>(ProductMapper.Default);
+
+    public EfDbModel<Persistence.Inventory> Inventory => Model<Persistence.Inventory>();
+
+    public EfDbModel<Persistence.Movement> Movements => Model<Persistence.Movement>();
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/ReferenceDataRepository.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/ReferenceDataRepository.cs
new file mode 100644
index 00000000..792844d7
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/ReferenceDataRepository.cs
@@ -0,0 +1,3 @@
+namespace Contoso.Products.Infrastructure.Repositories;
+
+public partial class ReferenceDataRepository(ProductsEfDb ef) { }
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Infrastructure/Repositories/ReferenceDataRepository.g.cs b/samples/src/Contoso.Products.Infrastructure/Repositories/ReferenceDataRepository.g.cs
new file mode 100644
index 00000000..81c907b9
--- /dev/null
+++ b/samples/src/Contoso.Products.Infrastructure/Repositories/ReferenceDataRepository.g.cs
@@ -0,0 +1,40 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Products.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Products.Infrastructure.Repositories;
+
+/// <summary>Provides the underlying reference-data repository.</summary>
+[ScopedService<IReferenceDataRepository>]
+public partial class ReferenceDataRepository : IReferenceDataRepository
+{
+    /// <inheritdoc/>
+    public Task<Contracts.BrandCollection> GetAllBrandsAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.Brand>().Query().ToMappedItemsAsync<Persistence.Brand, Contracts.BrandCollection, Contracts.Brand>(BrandMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.CategoryCollection> GetAllCategoriesAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.Category>().Query().ToMappedItemsAsync<Persistence.Category, Contracts.CategoryCollection, Contracts.Category>(CategoryMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.MovementKindCollection> GetAllMovementKindsAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.MovementKind>().Query().ToMappedItemsAsync<Persistence.MovementKind, Contracts.MovementKindCollection, Contracts.MovementKind>(MovementKindMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.MovementStatusCollection> GetAllMovementStatusesAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.MovementStatus>().Query().ToMappedItemsAsync<Persistence.MovementStatus, Contracts.MovementStatusCollection, Contracts.MovementStatus>(MovementStatusMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.SubCategoryCollection> GetAllSubCategoriesAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.SubCategory>().Query().ToMappedItemsAsync<Persistence.SubCategory, Contracts.SubCategoryCollection, Contracts.SubCategory>(SubCategoryMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.UnitOfMeasureCollection> GetAllUnitsOfMeasureAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.UnitOfMeasure>().Query().ToMappedItemsAsync<Persistence.UnitOfMeasure, Contracts.UnitOfMeasureCollection, Contracts.UnitOfMeasure>(UnitOfMeasureMapper.Map, cancellationToken);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Relay/Contoso.Products.Relay.csproj b/samples/src/Contoso.Products.Relay/Contoso.Products.Relay.csproj
new file mode 100644
index 00000000..3a855c5e
--- /dev/null
+++ b/samples/src/Contoso.Products.Relay/Contoso.Products.Relay.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Infrastructure\Contoso.Products.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="Azure.Experimental.EnableActivitySource" Value="true" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Relay/Contoso.Products.Relay.http b/samples/src/Contoso.Products.Relay/Contoso.Products.Relay.http
new file mode 100644
index 00000000..55450416
--- /dev/null
+++ b/samples/src/Contoso.Products.Relay/Contoso.Products.Relay.http
@@ -0,0 +1,16 @@
+@Contoso.Products.Relay_HostAddress = https://localhost:7242
+
+GET {{Contoso.Products.Relay_HostAddress}}/hosted-services/postgres-outbox-relay-00/status
+Accept: application/json
+
+###
+
+POST {{Contoso.Products.Relay_HostAddress}}/hosted-services/postgres-outbox-relay-00/pause
+
+###
+
+POST {{Contoso.Products.Relay_HostAddress}}/hosted-services/postgres-outbox-relay-00/resume
+
+###
+
+GET {{Contoso.Products.Relay_HostAddress}}/health/ready/detailed
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Relay/Program.cs b/samples/src/Contoso.Products.Relay/Program.cs
new file mode 100644
index 00000000..432d37d6
--- /dev/null
+++ b/samples/src/Contoso.Products.Relay/Program.cs
@@ -0,0 +1,65 @@
+using CoreEx.Azure.Messaging.ServiceBus;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+
+namespace Contoso.Products.Relay;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddMvcWebApi()
+            .AddHttpWebApi()
+            .AddHostedServiceManager();
+
+        // Add the repository and related outbox services.
+        builder.AddAzureNpgsqlDataSource("Postgres");  // Adds the NpgsqlDataSource (using Aspire library).
+        builder.Services
+            .AddPostgresDatabase()                     // Adds the PostgresDatabase.
+            .AddPostgresUnitOfWork()                   // Adds the PostgresUnitOfWork for the PostgresDatabase.
+            .AddPostgresOutboxRelay();                 // Adds the PostgresOutboxRelay.
+
+        // Adds the PostgresOutboxRelayHostedService.
+        builder.AddPostgresOutboxRelayHostedService();
+
+        // Add the Azure Service Bus services.
+        builder.AddAzureServiceBusClient("ServiceBus"); // Adds azure service bus client using aspire.
+        builder.Services.AddAzureServiceBusPublisher((_, c) =>  // Adds the service bus as the IEventPublisher.
+        {
+            c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;  // Use a partition-id as the session-id.
+        });
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .WithCoreExPostgresTelemetry()
+            .WithCoreExServiceBusTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseExecutionContext();
+
+        app.MapHealthChecks();
+        app.MapHostedServices();
+
+        // Run the application.
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Relay/Properties/launchSettings.json b/samples/src/Contoso.Products.Relay/Properties/launchSettings.json
new file mode 100644
index 00000000..24d2c68e
--- /dev/null
+++ b/samples/src/Contoso.Products.Relay/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5117",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:7242;http://localhost:5117",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/samples/src/Contoso.Products.Relay/appsettings.Development.json b/samples/src/Contoso.Products.Relay/appsettings.Development.json
new file mode 100644
index 00000000..cac039ab
--- /dev/null
+++ b/samples/src/Contoso.Products.Relay/appsettings.Development.json
@@ -0,0 +1,24 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "Npgsql": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=contoso;Username=postgres;Password=yourStrong#!Password"
+    },
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Relay/appsettings.json b/samples/src/Contoso.Products.Relay/appsettings.json
new file mode 100644
index 00000000..9cda3b36
--- /dev/null
+++ b/samples/src/Contoso.Products.Relay/appsettings.json
@@ -0,0 +1,25 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Products",
+      "Services": {
+        "Interval": "00:00:00.500",
+        "OutboxRelay": {
+          "BatchSize": 10,
+          "PerWorkerPartitionCount": 2,
+          "LeaseDuration": "00:00:05",
+          "BackoffDuration": "00:00:05",
+          "ServicesCount": 4
+        }
+      }
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.csproj b/samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.csproj
new file mode 100644
index 00000000..f7bb2180
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Application\Contoso.Products.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Infrastructure\Contoso.Products.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="Azure.Experimental.EnableActivitySource" Value="true" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.http b/samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.http
new file mode 100644
index 00000000..e539ade1
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/Contoso.Products.Subscribe.http
@@ -0,0 +1,12 @@
+@Contoso.Products.Subscribe_HostAddress = http://localhost:5201
+
+GET {{Contoso.Products.Subscribe_HostAddress}}/hosted-services/azure-service-bus-receiver/status
+Accept: application/json
+
+###
+
+POST {{Contoso.Products.Subscribe_HostAddress}}/hosted-services/azure-service-bus-receiver/pause
+
+###
+
+POST {{Contoso.Products.Subscribe_HostAddress}}/hosted-services/azure-service-bus-receiver/resume
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Subscribe/GlobalUsing.cs b/samples/src/Contoso.Products.Subscribe/GlobalUsing.cs
new file mode 100644
index 00000000..2a5358dc
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/GlobalUsing.cs
@@ -0,0 +1,8 @@
+global using Contoso.Products.Application.Interfaces;
+global using CoreEx;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Events;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Json;
+global using CoreEx.Results;
+global using CoreEx.Validation;
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Subscribe/Program.cs b/samples/src/Contoso.Products.Subscribe/Program.cs
new file mode 100644
index 00000000..dc97caa2
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/Program.cs
@@ -0,0 +1,118 @@
+using Contoso.Products.Application;
+using Contoso.Products.Infrastructure.Repositories;
+using Contoso.Products.Subscribe.Subscribers;
+using CoreEx.Azure.Messaging.ServiceBus;
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace Contoso.Products.Subscribe;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddReferenceDataOrchestrator()
+            .AddMvcWebApi()
+            .AddHttpWebApi()
+            .AddHostedServiceManager();
+
+        // Add all the dynamically registered services.
+        builder.Services.AddDynamicServicesUsing<ReservationConfirmSubscriber, ReferenceDataService, ReferenceDataRepository>();
+
+        // Add L1/L2 caching services.
+        builder.Services.AddMemoryCache();              // Adds the in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Adds Redis as the distributed cache (using Aspire library) - L2.
+
+        // Add and wire-up FusionCache including backplane.
+        builder.Services.AddFusionCache()
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        // Add CoreEx caching services.
+        builder.Services
+            .AddFusionHybridCache()                     // Adds the CoreEx.Caching.IHybridCache for FusionCache.
+            .AddDefaultCacheKeyProvider()               // Adds the default CoreEx.Caching.ICacheKeyProvider.
+            .AddHybridCacheIdempotencyProvider();       // Adds the CoreEx.Caching.Idempotency.IIdempotencyProvider.
+
+        // Add the repository and related outbox services.
+        builder.AddAzureNpgsqlDataSource("Postgres");    // Adds the NpgsqlDataSource (using Aspire library).
+        builder.Services
+            .AddPostgresDatabase()                      // Adds the PostgresDatabase.
+            .AddPostgresUnitOfWork()                    // Adds the PostgresUnitOfWork for the PostgresDatabase.
+            .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+            .AddPostgresOutboxPublisher()               // Adds the ProductsOutboxPublisher as the PostgresOutboxPublisher/IEventPublisher.
+            .AddDbContext<ProductsDbContext>()          // Adds the standard EF DbContext.
+            .AddEfDb<ProductsEfDb>();                   // Adds the CoreEx extended EF service.
+
+        // Add Azure Service Bus client using Aspire.
+        builder.AddAzureServiceBusClient("ServiceBus");
+
+        // Add event formatter and subscribed-manager.
+        builder.Services.AddSubscribedManager((_, c) => c.AddSubscribersUsing<ReservationConfirmSubscriber>()); // Adds the SubscribedManager and dynamically links to the individual Subscribers.
+
+        // Builds and creates the Azure Service Bus receiving services.
+        builder.Services.AzureServiceBusReceiving()                                      
+            .WithSessionReceiver(_ =>
+            {                                                                                          // Adds the service bus receiver to pump messages to the subscriber.
+                var o = ServiceBusSessionReceiverOptions.CreateForTopicSubscription();                 // Set the topic and subscription from configuration. 
+                o.SessionProcessorOptions.MaxConcurrentSessions = 4;                                   // Set the maximum number of concurrent sessions to process.
+                return o;
+            })   
+            .WithSubscribedSubscriber()                                                                // Adds the service bus subscriber using the ^ SubscribedManager.
+            .WithHostedService()                                                                       // Adds the ^ service bus receiver as a hosted service.
+            .Build();                                                                                  // Builds all the ^ services and adds to the service collection.
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .WithCoreExServiceBusTelemetry()
+            .WithCoreExPostgresTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+        app.MapHostedServices();
+
+        // Run the application.
+        app.Run();
+    }
+}
diff --git a/samples/src/Contoso.Products.Subscribe/Properties/launchSettings.json b/samples/src/Contoso.Products.Subscribe/Properties/launchSettings.json
new file mode 100644
index 00000000..ea0ab3dc
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5201",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:7110;http://localhost:5201",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/samples/src/Contoso.Products.Subscribe/Subscribers/ReservationCancelSubscriber.cs b/samples/src/Contoso.Products.Subscribe/Subscribers/ReservationCancelSubscriber.cs
new file mode 100644
index 00000000..7f1fff96
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/Subscribers/ReservationCancelSubscriber.cs
@@ -0,0 +1,20 @@
+namespace Contoso.Products.Subscribe.Subscribers;
+
+[ScopedService, Subscribe("contoso.products.reservation.cancel")]
+public class ReservationCancelSubscriber : SubscribedBase
+{
+    private readonly IMovementService _service;
+
+    public ReservationCancelSubscriber(IMovementService service)
+    {
+        _service = service.ThrowIfNull();
+        ErrorHandler = ReservationConfirmSubscriber.DefaultErrorHandler;
+    }
+
+    protected async override Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+    {
+        var referenceId = @event.Key.Required();
+        await _service.CancelReservationAsync(referenceId).ConfigureAwait(false);
+        return Result.Success;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Subscribe/Subscribers/ReservationConfirmSubscriber.cs b/samples/src/Contoso.Products.Subscribe/Subscribers/ReservationConfirmSubscriber.cs
new file mode 100644
index 00000000..94c9d047
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/Subscribers/ReservationConfirmSubscriber.cs
@@ -0,0 +1,25 @@
+namespace Contoso.Products.Subscribe.Subscribers;
+
+[ScopedService, Subscribe("contoso.products.reservation.confirm")]
+public class ReservationConfirmSubscriber : SubscribedBase
+{
+    /// <summary>
+    /// Handle the scenario where a pending reservation is not found; possible where the reservation has expired and been removed, or was reserved with non-stocked products and thus not persisted.
+    /// </summary>
+    internal static readonly ErrorHandler DefaultErrorHandler = new ErrorHandler().Add<NotFoundException>(ex => ex.ErrorCode == "pending-reservation-not-found" ? ErrorHandling.CompleteAsInformation : null);
+
+    private readonly IMovementService _service;
+
+    public ReservationConfirmSubscriber(IMovementService service)
+    {
+        _service = service.ThrowIfNull();
+        ErrorHandler = DefaultErrorHandler;
+    }
+
+    protected async override Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+    {
+        var referenceId = @event.Key.Required();
+        await _service.ConfirmReservationAsync(referenceId).ConfigureAwait(false);
+        return Result.Success;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Subscribe/appsettings.Development.json b/samples/src/Contoso.Products.Subscribe/appsettings.Development.json
new file mode 100644
index 00000000..51595f3b
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/appsettings.Development.json
@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "Npgsql": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "Azure.Messaging.ServiceBus": "Critical",
+      "CoreEx.Azure.Messaging.ServiceBus": "Warning"
+    }
+  },
+  "Aspire": {
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=contoso;Username=postgres;Password=yourStrong#!Password"
+    },
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    },
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;",
+          "QueueOrTopicName": "contoso",
+          "SubscriptionName": "products"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Products.Subscribe/appsettings.json b/samples/src/Contoso.Products.Subscribe/appsettings.json
new file mode 100644
index 00000000..66eb72d3
--- /dev/null
+++ b/samples/src/Contoso.Products.Subscribe/appsettings.json
@@ -0,0 +1,21 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Products",
+      "Services": {
+        "Interval": "00:00:00.500"
+      }
+    },
+    "Events": {
+      "Destination": "contoso" // Topic/queue name.
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.csproj b/samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.csproj
new file mode 100644
index 00000000..3ff1e23e
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Application\Contoso.Shopping.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Infrastructure\Contoso.Shopping.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.http b/samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.http
new file mode 100644
index 00000000..6bf6855e
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Contoso.Shopping.Api.http
@@ -0,0 +1,6 @@
+@Contoso.Shopping.Api_HostAddress = http://localhost:5275
+
+GET {{Contoso.Shopping.Api_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/samples/src/Contoso.Shopping.Api/Controllers/BasketController.cs b/samples/src/Contoso.Shopping.Api/Controllers/BasketController.cs
new file mode 100644
index 00000000..00813672
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Controllers/BasketController.cs
@@ -0,0 +1,52 @@
+namespace Contoso.Shopping.Api.Controllers;
+
+[ApiController, Route("/api/baskets"), OpenApiTag("Baskets")]
+public class BasketController(WebApi webApi, IBasketService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IBasketService _service = service.ThrowIfNull();
+
+    [OpenApiTag("Customers")]
+    [HttpPost("/api/customers/{customerId}/baskets")]
+    [IdempotencyKey]
+    [ProducesResponseType(typeof(Basket), StatusCodes.Status201Created)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public Task<IActionResult> CreateAsync(string customerId) => _webApi.PostWithResultAsync<Basket>(Request, async (ro, _) =>
+    {
+        ro.WithLocationUri(p => new Uri($"/api/baskets/{p.Id}", UriKind.Relative));
+        return await _service.CreateAsync(customerId.Required()).ConfigureAwait(false);
+    });
+
+    [HttpPut("{basketId}/apply-discount/{coupon}")]
+    [ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public Task<IActionResult> ApplyDiscountAsync(string basketId, string coupon) => _webApi.PutWithResultAsync<Basket>(Request, (_, _)
+        => _service.ApplyDiscountAsync(basketId.Required(), coupon.Required()));
+
+    [HttpPost("{basketId}/checkout")]
+    [ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public Task<IActionResult> CheckoutAsync(string basketId) => _webApi.PostWithResultAsync<Basket>(Request, (_, _)
+        => _service.CheckoutAsync(basketId.Required()), HttpStatusCode.OK);
+
+    [HttpPost("{basketId}/items")]
+    [IdempotencyKey]
+    [Accepts<BasketItemAddRequest>]
+    [ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public Task<IActionResult> ItemAddAsync(string basketId) => _webApi.PostWithResultAsync<BasketItemAddRequest, Basket>(Request, (ro, _)
+        => _service.ItemAddAsync(basketId.Required(), ro.Value), HttpStatusCode.OK);
+
+    [HttpPut("{basketId}/items/{basketItemId}")]
+    [Accepts<BasketItemUpdateRequest>]
+    [ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public Task<IActionResult> ItemUpdateAsync(string basketId, string basketItemId) => _webApi.PutWithResultAsync<BasketItemUpdateRequest, Basket>(Request, (ro, _)
+        => _service.ItemUpdateAsync(basketId.Required(), basketItemId.Required(), ro.Value), HttpStatusCode.OK);
+
+    [HttpDelete("{basketId}/items/{basketItemId}")]
+    [ProducesResponseType(typeof(Basket), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status404NotFound)]
+    public Task<IActionResult> ItemDeleteAsync(string basketId, string basketItemId) => _webApi.DeleteWithResultAsync<Basket>(Request, (_, _)
+        => _service.ItemDeleteAsync(basketId.Required(), basketItemId.Required()));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/Controllers/BasketReadController.cs b/samples/src/Contoso.Shopping.Api/Controllers/BasketReadController.cs
new file mode 100644
index 00000000..fd62a934
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Controllers/BasketReadController.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Shopping.Api.Controllers;
+
+[ApiController, Route("/api/baskets"), OpenApiTag("Baskets")]
+public class BasketReadController(WebApi webApi, IBasketReadService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IBasketReadService _service = service.ThrowIfNull();
+
+    [HttpGet("{basketId}"), HttpHead("{basketId}")]
+    [ProducesResponseType(typeof(Basket), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> GetAsync(string basketId) => _webApi.GetAsync(Request, (_, _) => _service.GetAsync(basketId.Required()));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/Controllers/ReferenceDataController.g.cs b/samples/src/Contoso.Shopping.Api/Controllers/ReferenceDataController.g.cs
new file mode 100644
index 00000000..5bb01c56
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Controllers/ReferenceDataController.g.cs
@@ -0,0 +1,45 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Api.Controllers;
+
+/// <summary>Represents the reference-data controller.</summary>
+[ApiController, Route("/api/refdata")]
+public partial class ReferenceDataController(CoreEx.AspNetCore.Mvc.WebApi webApi) : ControllerBase
+{
+    private readonly CoreEx.AspNetCore.Mvc.WebApi _webApi = webApi.ThrowIfNull();
+
+    private static readonly DataMap<string> _mapper = new(StringComparer.OrdinalIgnoreCase)
+    {
+        { "basket-statuses", nameof(BasketStatus) },
+        { "discount-coupons", nameof(DiscountCoupon) },
+        { "units-of-measure", nameof(UnitOfMeasure) }
+    };
+
+    [HttpGet("basket-statuses"), HttpHead("basket-statuses")]
+    [ProducesResponseType(typeof(BasketStatus[]), 200)]
+    public Task<IActionResult> GetBasketStatusesAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<BasketStatus>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("discount-coupons"), HttpHead("discount-coupons")]
+    [ProducesResponseType(typeof(DiscountCoupon[]), 200)]
+    public Task<IActionResult> GetDiscountCouponsAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<DiscountCoupon>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet("units-of-measure"), HttpHead("units-of-measure")]
+    [ProducesResponseType(typeof(UnitOfMeasure[]), 200)]
+    public Task<IActionResult> GetUnitsOfMeasureAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<UnitOfMeasure>(codes, text, ro.IsIncludeInactive, ct));
+
+    [HttpGet]
+    [ProducesResponseType(typeof(ReferenceDataMultiDictionary), 200)]
+    public Task<IActionResult> GetNamedAsync([FromQuery] string[] name)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetNamedAsync(name, ro.IsIncludeInactive, _mapper, ct));
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/GlobalUsing.cs b/samples/src/Contoso.Shopping.Api/GlobalUsing.cs
new file mode 100644
index 00000000..8b035da6
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/GlobalUsing.cs
@@ -0,0 +1,14 @@
+global using Contoso.Shopping.Application;
+global using Contoso.Shopping.Application.Interfaces;
+global using Contoso.Shopping.Contracts;
+global using CoreEx;
+global using CoreEx.AspNetCore.Mvc;
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using CoreEx.Validation;
+global using Microsoft.AspNetCore.Mvc;
+global using NSwag.Annotations;
+global using System.Net;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/Program.cs b/samples/src/Contoso.Shopping.Api/Program.cs
new file mode 100644
index 00000000..afd088a3
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Program.cs
@@ -0,0 +1,109 @@
+using Contoso.Shopping.Infrastructure.Clients;
+using Contoso.Shopping.Infrastructure.Repositories;
+using CoreEx.Azure.Messaging.ServiceBus;
+using CoreEx.Database.SqlServer.Outbox;
+using CoreEx.Events.Publishing;
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace Contoso.Shopping.Api;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddReferenceDataOrchestrator()
+            .AddMvcWebApi()
+            .AddHttpWebApi();
+
+        // Add all the dynamically registered services.
+        builder.Services.AddDynamicServicesUsing<ReferenceDataService, ReferenceDataRepository>();
+
+        // Add L1/L2 caching services.
+        builder.Services.AddMemoryCache();              // Adds the in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Adds Redis as the distributed cache (using Aspire library) - L2.
+
+        // Add and wire-up FusionCache including backplane.
+        builder.Services.AddFusionCache()
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        // Add CoreEx caching services.
+        builder.Services
+            .AddFusionHybridCache()                     // Adds the CoreEx.Caching.IHybridCache for FusionCache.
+            .AddDefaultCacheKeyProvider()               // Adds the default CoreEx.Caching.ICacheKeyProvider.
+            .AddHybridCacheIdempotencyProvider();       // Adds the CoreEx.Caching.Idempotency.IIdempotencyProvider.
+
+        // Add the repository and related outbox services.
+        builder.AddSqlServerClient("SqlServer");        // Adds the SqlServerClient (using Aspire library).
+        builder.Services
+            .AddSqlServerDatabase()                     // Adds the SqlServerDatabase.
+            .AddSqlServerUnitOfWork()                   // Adds the SqlServerUnitOfWork for the SqlServerDatabase.
+            .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+            .AddSqlServerOutboxPublisher()              // Adds the SqlServerOutboxPublisher/IEventPublisher.
+            .AddDbContext<ShoppingDbContext>()          // Adds the standard EF DbContext.
+            .AddEfDb<ShoppingEfDb>();                   // Adds the CoreEx extended EF service.
+
+        // Add the Azure Service Bus services.
+        builder.AddAzureServiceBusClient("ServiceBus"); // Adds azure service bus client using aspire.
+        builder.Services.AddAzureServiceBusPublisher((_, c) =>  // Adds the service bus as the IEventPublisher.
+        {
+            c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;  // Use a partition-id as the session-id.
+        }, addAsDefaultIEventPublisher: false);
+
+        // Add external API services.
+        builder.AddTypedHttpClient<ProductsHttpClient>("ProductsApi");
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .WithCoreExSqlServerTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.UseIdempotencyKey();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+
+        // Run the application.
+        app.Run();
+    }
+}
diff --git a/samples/src/Contoso.Shopping.Api/Properties/launchSettings.json b/samples/src/Contoso.Shopping.Api/Properties/launchSettings.json
new file mode 100644
index 00000000..7a30945a
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/Properties/launchSettings.json
@@ -0,0 +1,22 @@
+{
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5275"
+    },
+    "https": {
+      "commandName": "Project",
+      "launchUrl": "https://localhost:7219/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7219;http://localhost:5275"
+    }
+  },
+  "$schema": "https://json.schemastore.org/launchsettings.json"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/appsettings.Development.json b/samples/src/Contoso.Shopping.Api/appsettings.Development.json
new file mode 100644
index 00000000..72654558
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/appsettings.Development.json
@@ -0,0 +1,41 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "System.Net.Http.HttpClient": "Warning",
+      "Polly": "Warning"
+    }
+  },
+  "Aspire": {
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    },
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
+        }
+      }
+    }
+  },
+  "ProductsApi": {
+    "BaseAddress": "https://localhost:7200"
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Api/appsettings.json b/samples/src/Contoso.Shopping.Api/appsettings.json
new file mode 100644
index 00000000..6c943a3c
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Api/appsettings.json
@@ -0,0 +1,18 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Shopping"
+    },
+    "Events": {
+      "Destination": "contoso" // Topic/queue name.
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Adapters/Products/IProductAdapter.cs b/samples/src/Contoso.Shopping.Application/Adapters/Products/IProductAdapter.cs
new file mode 100644
index 00000000..97ff5b97
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Adapters/Products/IProductAdapter.cs
@@ -0,0 +1,27 @@
+namespace Contoso.Shopping.Application.Adapters.Products;
+
+/// <summary>
+/// Enables the Products domain integration, serving as the external dependency boundary (anti-corruption layer) for product-related operations.
+/// </summary>
+public interface IProductAdapter
+{
+    /// <summary>
+    /// Gets the product.
+    /// </summary>
+    Task<Result<Product>> GetAsync(string id);
+
+    /// <summary>
+    /// Reserves the inventory (product * quantity) per basket item. 
+    /// </summary>
+    Task<Result> ReserveInventoryAsync(Domain.Basket basket);
+
+    /// <summary>
+    /// Confirms the reservation(s) for the basket.
+    /// </summary>
+    Task<Result> CreateConfirmReservationCommand(Domain.Basket basket);
+
+    /// <summary>
+    /// Cancels the reservation(s) for the basket.
+    /// </summary>
+    Task<Result> CancelReservationAsync(Domain.Basket basket);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Adapters/Products/IProductSyncAdapter.cs b/samples/src/Contoso.Shopping.Application/Adapters/Products/IProductSyncAdapter.cs
new file mode 100644
index 00000000..f0d4cfa9
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Adapters/Products/IProductSyncAdapter.cs
@@ -0,0 +1,17 @@
+namespace Contoso.Shopping.Application.Adapters.Products;
+
+/// <summary>
+/// Enables the Products-domain data synchronization operations via evet-based subscriptions.
+/// </summary>
+public interface IProductSyncAdapter
+{
+    /// <summary>
+    /// Modifies (creates/updates) the product.
+    /// </summary>
+    Task<Result> ModifyAsync(Product product);
+
+    /// <summary>
+    /// Deletes the replicated product.
+    /// </summary>
+    Task<Result> DeleteAsync(string id);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Adapters/Products/Product.cs b/samples/src/Contoso.Shopping.Application/Adapters/Products/Product.cs
new file mode 100644
index 00000000..8520bd7e
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Adapters/Products/Product.cs
@@ -0,0 +1,20 @@
+namespace Contoso.Shopping.Application.Adapters.Products;
+
+[Contract]
+public partial class Product : IIdentifier<string?>
+{
+    public string? Id { get; set; }
+
+    public string? Sku { get; set => field = value?.ToUpper(); }
+
+    public string? Text { get; set; }
+
+    [ReferenceData<UnitOfMeasure>()]
+    public partial string? UnitOfMeasureCode { get; set; }
+
+    public decimal Price { get; set; }
+
+    public bool IsInactive { get; set; }
+
+    public bool IsNonStocked { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/BasketReadService.cs b/samples/src/Contoso.Shopping.Application/BasketReadService.cs
new file mode 100644
index 00000000..e9311168
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/BasketReadService.cs
@@ -0,0 +1,12 @@
+namespace Contoso.Shopping.Application;
+
+[ScopedService<IBasketReadService>]
+public class BasketReadService(IBasketRepository repository) : IBasketReadService
+{
+    private readonly IBasketRepository _repository = repository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public Task<Result<Basket>> GetAsync(string basketId)
+        => Result.GoAsync(() => _repository.GetAsync(basketId))
+                 .ThenAs(b => BasketMapper.Map(b));
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/BasketService.cs b/samples/src/Contoso.Shopping.Application/BasketService.cs
new file mode 100644
index 00000000..604f8882
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/BasketService.cs
@@ -0,0 +1,160 @@
+namespace Contoso.Shopping.Application;
+
+[ScopedService<IBasketService>]
+public class BasketService(IUnitOfWork unitOfWork, IBasketRepository repository, IProductAdapter productAdapter, ILogger<BasketService> logger) : IBasketService
+{
+    private readonly IUnitOfWork _unitOfWork = unitOfWork.ThrowIfNull();
+    private readonly IBasketRepository _repository = repository.ThrowIfNull();
+    private readonly IProductAdapter _productAdapter = productAdapter.ThrowIfNull();
+    private readonly ILogger _logger = logger.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public Task<Result<Basket>> CreateAsync(string customerId)
+    {
+        // No validation for customerId is performed here, but could be added as required (e.g. check for valid format, or existence of the customer in the system).
+
+        // Create the aggregate representation.
+        var aggregate = Domain.Basket.CreateNew(customerId.ThrowIfNullOrEmpty());
+
+        // Orchestrate the creation of the basket within a transaction, ensuring that any events are only published if the transaction is successful.
+        return _unitOfWork.TransactionAsync(async () =>
+        {
+            // Create the aggregate in the repository, which will return the created aggregate with any updates (e.g. Id).
+            var br = await _repository.CreateAsync(aggregate).ConfigureAwait(false);
+            return br.ThenAs(b =>
+            {
+                // Map the result to the contract representation.
+                var contract = BasketMapper.Map(b);
+
+                // Add an event for the creation of the basket.
+                _unitOfWork.Events.Add(EventData.CreateEventWith(contract, EventAction.Created));
+
+                return contract;
+            });
+        });
+    }
+
+    /// <inheritdoc/>
+    public async Task<Result<Contracts.Basket>> ApplyDiscountAsync(string basketId, DiscountCoupon discountCoupon)
+    {
+        if (discountCoupon.IsInactive)
+            return Result.BusinessError("Discount coupon either does not exist or is no longer active.", e => e.WithErrorCode("discount-inactive"));
+
+        return await OrchestrateUpdateAsync(basketId, basket => basket.ApplyDiscount(discountCoupon), EventAction.Updated);
+    }
+
+    /// <inheritdoc/>
+    public async Task<Result<Basket>> ItemAddAsync(string basketId, BasketItemAddRequest item)
+    {
+        // Validate the request, and ensure the product exists (and retrieve the product details for use in the basket item).
+        var pr = await Result.GoAsync(() => BasketItemAddRequestValidator.Default.ValidateWithResultAsync(item))
+            .ThenAsAsync(item => new ProductPolicy(_productAdapter).EnsureExistsAsync(item.ProductId!));
+
+        if (pr.IsFailure)
+            return pr.AsResult();
+
+        // Add the item to the basket.
+        return await OrchestrateUpdateAsync(basketId, basket =>
+        {
+            var product = pr.Value;
+
+            return basket.ItemAdd(Domain.BasketItem.CreateNew(
+                product.Id!,
+                product.Sku!,
+                product.Text!,
+                new Domain.ValueObjects.ItemPricing { UnitOfMeasure = product.UnitOfMeasure!, Quantity = item.Quantity, UnitPrice = product.Price }));
+        });
+    }
+
+    /// <inheritdoc/>
+    public async Task<Result<Basket>> ItemUpdateAsync(string basketId, string basketItemId, BasketItemUpdateRequest item)
+    {
+        var vr = await BasketItemUpdateRequestValidator.Default.ValidateWithResultAsync(item);
+        if (vr.IsFailure)
+            return vr.AsResult();
+
+        return await OrchestrateUpdateAsync(basketId, basket => basket.ItemUpdate(basketItemId, item.Quantity, item.ETag));
+    }
+
+    /// <inheritdoc/>
+    public Task<Result<Basket>> ItemDeleteAsync(string basketId, string basketItemId)
+        => OrchestrateUpdateAsync(basketId, basket => basket.ItemDelete(basketItemId), EventAction.Updated);
+
+    /// <summary>
+    /// Orchestrate the update of the basket by first retrieving the aggregate, performing the mutation, and then updating within a transaction, ensuring that any events are only published if the transaction is successful.
+    /// </summary>
+    private async Task<Result<Basket>> OrchestrateUpdateAsync(string basketId, Func<Domain.Basket, Result> mutate, EventAction action = EventAction.Updated)
+    {
+        // Retrieve the aggregate from the repository for modification, and handle any failure (e.g. not found).
+        var br = await _repository.GetAsync(basketId).ConfigureAwait(false);
+        if (br.IsFailure)
+            return br.AsResult();
+
+        // Perform the mutation on the aggregate, then proceed to update.
+        return await mutate.ThrowIfNull().Invoke(br.Value)
+            .ThenAsAsync(() => UpdateAsync(br.Value, action))
+            .ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs the "actual" update of the basket within a transaction, ensuring that any events are only published if the transaction is successful.
+    /// </summary>
+    private Task<Result<Basket>> UpdateAsync(Domain.Basket basket, EventAction action) => _unitOfWork.TransactionAsync(async () =>
+    {
+        if (!basket.HasChanges)
+            return Result.Ok(BasketMapper.Map(basket));
+
+        // Update the aggregate in the repository, which will return the updated aggregate with any updates (e.g. Id).
+        var ur = await _repository.UpdateAsync(basket).ConfigureAwait(false);
+
+        return ur.ThenAs(basket =>
+        {
+            // Map the result to the contract representation.
+            var contract = BasketMapper.Map(basket);
+
+            // Add an event for the update of the basket.
+            _unitOfWork.Events.Add(EventData.CreateEventWith(contract, action));
+
+            return contract;
+        });
+    });
+
+    /// <inheritdoc/>
+    public Task<Result<Contracts.Basket>> CheckoutAsync(string basketId) => Result
+        .GoAsync(() => _repository.GetAsync(basketId))                      // Retrieve the basket aggregate from the repository.
+        .Then(basket => basket.Checkout().ThenAs(() => basket))             // Checkout the basket.
+        .ThenAsync(basket => _productAdapter.ReserveInventoryAsync(basket)) // Reserve the inventory; external service call, not transactional, fail-fast.
+        .ThenAsAsync(async basket =>
+        {
+            try
+            {
+                return await _unitOfWork.TransactionAsync(() => Result
+                    .GoAsync(() => _repository.UpdateAsync(basket))     // Update the basket aggregate to reflect the checkout (e.g. status change).
+                    .ThenAsAsync(async basket =>
+                    {
+                        // Map the result to the contract representation.
+                        var contract = BasketMapper.Map(basket);
+
+                        // Outbox the "checked-out" event for the basket aggregate.
+                        _unitOfWork.Events.Add(EventData.CreateEventWith(contract, EventAction.CheckedOut));
+
+                        // Note: the reservation confirmation is outboxed as a command to the products domain, as it's an action that we want to occur asynchronously after the transaction has completed, but it doesn't
+                        // necessarily need to be performed immediately after the checkout event (e.g. it could be performed after some delay, or after some other events have been processed). By using a command, we
+                        // also have more flexibility in how we handle failures and retries for the reservation confirmation, without impacting the checkout event processing.
+                        return (await _productAdapter.CreateConfirmReservationCommand(basket).ConfigureAwait(false))
+                            .ThenAs(() => contract);
+                    })).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                if (_logger.IsEnabled(LogLevel.Error))
+                    _logger.LogError(ex, "An error occurred during the checkout process; the reserved inventory will be cancelled asynchronously directly bypassing the Outbox.");
+
+                // Cancel the inventory reservation directly, bypassing the Outbox, as the transaction has failed at this point and we don't want to leave the inventory in a reserved state.
+                await _productAdapter.CancelReservationAsync(basket).ConfigureAwait(false);
+
+                // It's bad, keep throwing.
+                throw; 
+            }
+        });
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Contoso.Shopping.Application.csproj b/samples/src/Contoso.Shopping.Application/Contoso.Shopping.Application.csproj
new file mode 100644
index 00000000..d74ad586
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Contoso.Shopping.Application.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.DomainDriven\CoreEx.DomainDriven.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Domain\Contoso.Shopping.Domain.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/src/Contoso.Shopping.Application/GlobalUsing.cs b/samples/src/Contoso.Shopping.Application/GlobalUsing.cs
new file mode 100644
index 00000000..83ea53fb
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/GlobalUsing.cs
@@ -0,0 +1,19 @@
+global using Contoso.Shopping.Application.Adapters.Products;
+global using Contoso.Shopping.Application.Interfaces;
+global using Contoso.Shopping.Application.Mapping;
+global using Contoso.Shopping.Application.Policies;
+global using Contoso.Shopping.Application.Repositories;
+global using Contoso.Shopping.Application.Validators;
+global using Contoso.Shopping.Contracts;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Localization;
+global using CoreEx.Mapping;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Validation;
+global using Microsoft.Extensions.Logging;
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Interfaces/IBasketReadService.cs b/samples/src/Contoso.Shopping.Application/Interfaces/IBasketReadService.cs
new file mode 100644
index 00000000..95e89812
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Interfaces/IBasketReadService.cs
@@ -0,0 +1,9 @@
+namespace Contoso.Shopping.Application.Interfaces;
+
+public interface IBasketReadService
+{
+    /// <summary>
+    /// Get the <see cref="Contracts.Basket"/> for the specified <paramref name="basketId"/>
+    /// </summary>
+    Task<Result<Contracts.Basket>> GetAsync(string basketId);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Interfaces/IBasketService.cs b/samples/src/Contoso.Shopping.Application/Interfaces/IBasketService.cs
new file mode 100644
index 00000000..4a1ebb21
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Interfaces/IBasketService.cs
@@ -0,0 +1,34 @@
+namespace Contoso.Shopping.Application.Interfaces;
+
+public interface IBasketService
+{
+    /// <summary>
+    /// Create a new <see cref="Contracts.Basket"/> for the specified <paramref name="customerId"/>.
+    /// </summary>
+    Task<Result<Contracts.Basket>> CreateAsync(string customerId);
+
+    /// <summary>
+    /// Applies the <paramref name="discountCoupon"/> to the specified <see cref="Contracts.Basket"/>.
+    /// </summary>
+    Task<Result<Contracts.Basket>> ApplyDiscountAsync(string basketId, DiscountCoupon discountCoupon);
+
+    /// <summary>
+    /// Checkout the specified <see cref="Contracts.Basket"/>.
+    /// </summary>
+    Task<Result<Contracts.Basket>> CheckoutAsync(string basketId);
+
+    /// <summary>
+    /// Add (or merge) the specified <paramref name="item"/> into the specified <see cref="Contracts.Basket"/>.
+    /// </summary>
+    Task<Result<Contracts.Basket>> ItemAddAsync(string basketId, Contracts.BasketItemAddRequest item);
+
+    /// <summary>
+    /// Updates an existing <paramref name="item"/> in the specified <see cref="Contracts.Basket"/>.
+    /// </summary>
+    Task<Result<Contracts.Basket>> ItemUpdateAsync(string basketId, string basketItemId, Contracts.BasketItemUpdateRequest item);
+
+    /// <summary>
+    /// Deletes an existing <paramref name="item"/> from the specified <see cref="Contracts.Basket"/>.
+    /// </summary>
+    Task<Result<Contracts.Basket>> ItemDeleteAsync(string basketId, string basketItemId);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Mapping/BasketMapper.cs b/samples/src/Contoso.Shopping.Application/Mapping/BasketMapper.cs
new file mode 100644
index 00000000..84c585b5
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Mapping/BasketMapper.cs
@@ -0,0 +1,35 @@
+namespace Contoso.Shopping.Application.Mapping;
+
+public class BasketMapper : Mapper<Domain.Basket, Contracts.Basket, BasketMapper>
+{
+    protected override Contracts.Basket OnMap(Domain.Basket source) => new()
+    {
+        Id = source.Id,
+        CustomerId = source.CustomerId,
+        StatusCode = source.Status,
+        Pricing = new BasketPricing
+        {
+            SubTotal = source.SubTotal,
+            DiscountCouponCode = source.DiscountCoupon,
+            DiscountPercentage = source.DiscountPercentage,
+            DiscountAmount = source.DiscountAmount,
+            Total = source.Total
+        },
+        Items = [.. source.Items.Select(i => BasketItemMapper.Map(i))]
+    };
+
+    private class BasketItemMapper : Mapper<Domain.BasketItem, Contracts.BasketItem, BasketItemMapper>
+    {
+        protected override BasketItem OnMap(Domain.BasketItem i) => new()
+        {
+            Id = i.Id,
+            ProductId = i.ProductId,
+            Sku = i.Sku,
+            Text = i.Text,
+            Quantity = i.Pricing.Quantity,
+            UnitOfMeasureCode = i.Pricing.UnitOfMeasure,
+            UnitPrice = i.Pricing.UnitPrice,
+            Total = i.Pricing.Total
+        };
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Policies/ProductPolicy.cs b/samples/src/Contoso.Shopping.Application/Policies/ProductPolicy.cs
new file mode 100644
index 00000000..87a4a0ef
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Policies/ProductPolicy.cs
@@ -0,0 +1,11 @@
+namespace Contoso.Shopping.Application.Policies;
+
+public class ProductPolicy(IProductAdapter productAdapter)
+{
+    private static readonly LText _quantityText = new("Quantity");
+    private readonly IProductAdapter _productAdapter = productAdapter.ThrowIfNull();
+
+    public Task<Result<Product>> EnsureExistsAsync(string productId) => Result
+        .GoAsync(() => _productAdapter.GetAsync(productId))
+        .OnFailure(r => r.IsNotFoundError ? Result.ValidationError(MessageItem.CreateErrorMessage(nameof(productId), "Product was not found.")) : r);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/ReferenceDataService.g.cs b/samples/src/Contoso.Shopping.Application/ReferenceDataService.g.cs
new file mode 100644
index 00000000..37cd0621
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/ReferenceDataService.g.cs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Application;
+
+/// <summary>Provides the <see cref="IReferenceDataProvider"/> implementation.</summary>
+[ScopedService<IReferenceDataProvider>]
+public partial class ReferenceDataService(IReferenceDataRepository repository) : IReferenceDataProvider
+{
+    private readonly IReferenceDataRepository _repository = repository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public IEnumerable<(Type, Type)> Types =>
+    [
+        (typeof(BasketStatus), typeof(BasketStatusCollection)),
+        (typeof(DiscountCoupon), typeof(DiscountCouponCollection)),
+        (typeof(UnitOfMeasure), typeof(UnitOfMeasureCollection)),
+    ];
+
+    /// <inheritdoc/>
+    public virtual async Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+    {
+        _ when type == typeof(BasketStatus) => await _repository.GetAllBasketStatusesAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(DiscountCoupon) => await _repository.GetAllDiscountCouponsAsync(cancellationToken).ConfigureAwait(false),
+        _ when type == typeof(UnitOfMeasure) => await _repository.GetAllUnitsOfMeasureAsync(cancellationToken).ConfigureAwait(false),
+        _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+    };
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Repositories/IBasketRepository.cs b/samples/src/Contoso.Shopping.Application/Repositories/IBasketRepository.cs
new file mode 100644
index 00000000..5a322d2f
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Repositories/IBasketRepository.cs
@@ -0,0 +1,10 @@
+namespace Contoso.Shopping.Application.Repositories;
+
+public interface IBasketRepository
+{
+    Task<Result<Domain.Basket>> GetAsync(string id);
+
+    Task<Result<Domain.Basket>> CreateAsync(Domain.Basket basket);
+
+    Task<Result<Domain.Basket>> UpdateAsync(Domain.Basket basket);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Repositories/IReferenceDataRepository.g.cs b/samples/src/Contoso.Shopping.Application/Repositories/IReferenceDataRepository.g.cs
new file mode 100644
index 00000000..b7cad4ac
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Repositories/IReferenceDataRepository.g.cs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Application.Repositories;
+
+/// <summary>Enables the underlying reference-data repository.</summary>
+public partial interface IReferenceDataRepository
+{
+    /// <summary>Gets all <see cref="BasketStatus"/> items.</summary>
+    /// <returns>The <see cref="BasketStatusCollection"/>.</returns>
+    Task<BasketStatusCollection> GetAllBasketStatusesAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="DiscountCoupon"/> items.</summary>
+    /// <returns>The <see cref="DiscountCouponCollection"/>.</returns>
+    Task<DiscountCouponCollection> GetAllDiscountCouponsAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>Gets all <see cref="UnitOfMeasure"/> items.</summary>
+    /// <returns>The <see cref="UnitOfMeasureCollection"/>.</returns>
+    Task<UnitOfMeasureCollection> GetAllUnitsOfMeasureAsync(CancellationToken cancellationToken = default);
+}
+    
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Validators/BasketItemAddRequestValidator.cs b/samples/src/Contoso.Shopping.Application/Validators/BasketItemAddRequestValidator.cs
new file mode 100644
index 00000000..2990505e
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Validators/BasketItemAddRequestValidator.cs
@@ -0,0 +1,10 @@
+namespace Contoso.Shopping.Application.Validators;
+
+public class BasketItemAddRequestValidator : Validator<BasketItemAddRequest, BasketItemAddRequestValidator>
+{
+    public BasketItemAddRequestValidator()
+    {
+        Property(x => x.ProductId).Mandatory();
+        Property(x => x.Quantity).GreaterThanOrEqualTo(0);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Validators/BasketItemUpdateRequestValidator.cs b/samples/src/Contoso.Shopping.Application/Validators/BasketItemUpdateRequestValidator.cs
new file mode 100644
index 00000000..b1ed4bf5
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Validators/BasketItemUpdateRequestValidator.cs
@@ -0,0 +1,9 @@
+namespace Contoso.Shopping.Application.Validators;
+
+public class BasketItemUpdateRequestValidator : Validator<BasketItemUpdateRequest, BasketItemUpdateRequestValidator>
+{
+    public BasketItemUpdateRequestValidator()
+    {
+        Property(x => x.Quantity).GreaterThanOrEqualTo(0);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Application/Validators/ProductValidator.cs b/samples/src/Contoso.Shopping.Application/Validators/ProductValidator.cs
new file mode 100644
index 00000000..4e50ab0e
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Application/Validators/ProductValidator.cs
@@ -0,0 +1,17 @@
+namespace Contoso.Shopping.Application.Validators;
+
+/// <summary>
+/// Product validator leveraging the FluentValidation API compatibility; still leverages CoreEx.Validation to perform the actual validation and error handling, but provides the FluentValidation API for
+/// ease of use and familiarity.
+/// </summary>
+public class ProductValidator : AbstractValidator<Product, ProductValidator>
+{
+    public ProductValidator()
+    {
+        RuleFor(x => x.Id).NotEmpty();
+        RuleFor(x => x.Sku).NotEmpty();
+        RuleFor(x => x.Text).NotEmpty();
+        RuleFor(x => x.UnitOfMeasure).NotEmpty().IsValid();
+        RuleFor(x => x.Price).GreaterThanOrEqualTo(0);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.CodeGen/Contoso.Shopping.CodeGen.csproj b/samples/src/Contoso.Shopping.CodeGen/Contoso.Shopping.CodeGen.csproj
new file mode 100644
index 00000000..3d77bc6e
--- /dev/null
+++ b/samples/src/Contoso.Shopping.CodeGen/Contoso.Shopping.CodeGen.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.CodeGen\CoreEx.CodeGen.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.CodeGen/Program.cs b/samples/src/Contoso.Shopping.CodeGen/Program.cs
new file mode 100644
index 00000000..a3d4d78c
--- /dev/null
+++ b/samples/src/Contoso.Shopping.CodeGen/Program.cs
@@ -0,0 +1 @@
+await CoreEx.CodeGen.CodeGenConsole.Create().RunAsync(args);
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.CodeGen/ref-data.yaml b/samples/src/Contoso.Shopping.CodeGen/ref-data.yaml
new file mode 100644
index 00000000..f491e076
--- /dev/null
+++ b/samples/src/Contoso.Shopping.CodeGen/ref-data.yaml
@@ -0,0 +1,14 @@
+collectionSortOrder: Code
+repository: EntityFramework
+entities:
+- name: BasketStatus
+- name: DiscountCoupon
+  properties:
+  - name: DiscountPercentage
+    type: decimal
+    excludeContract: true
+- name: UnitOfMeasure
+  plural: UnitsOfMeasure
+  properties:
+  - name: Scale
+    type: int
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/Basket.cs b/samples/src/Contoso.Shopping.Contracts/Basket.cs
new file mode 100644
index 00000000..3f8e54cf
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/Basket.cs
@@ -0,0 +1,24 @@
+namespace Contoso.Shopping.Contracts;
+
+[Contract]
+public partial class Basket : IIdentifier<string?>, IChangeLog, IETag
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    public string? CustomerId { get; set; }
+
+    [ReferenceData<BasketStatus>]
+    public partial string? StatusCode { get; set; }
+
+    [ReadOnly(true)]
+    public List<BasketItem>? Items { get; set; }
+
+    public BasketPricing? Pricing { get; set; }
+
+    [ReadOnly(true)]
+    public ChangeLog? ChangeLog { get; set; }
+
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/BasketItem.cs b/samples/src/Contoso.Shopping.Contracts/BasketItem.cs
new file mode 100644
index 00000000..7eb34431
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/BasketItem.cs
@@ -0,0 +1,32 @@
+namespace Contoso.Shopping.Contracts;
+
+[Contract]
+public partial class BasketItem : IIdentifier<string?>, IETag
+{
+    [ReadOnly(true)]
+    public string? Id { get; set; }
+
+    [ReadOnly(true)]
+    public string? ProductId { get; set; }
+
+    [ReadOnly(true)]
+    public string? Sku { get; set; }
+
+    [ReadOnly(true)]
+    public string? Text { get; set; }
+
+    public decimal? Quantity { get; set; }
+
+    [ReadOnly(true)]
+    [ReferenceData<UnitOfMeasure>]
+    public partial string? UnitOfMeasureCode { get; set; }
+
+    [ReadOnly(true)]
+    public decimal? UnitPrice { get; set; }
+
+    [ReadOnly(true)]
+    public decimal? Total { get; set; }
+
+    [ReadOnly(true)]
+    public string? ETag { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/BasketItemAddRequest.cs b/samples/src/Contoso.Shopping.Contracts/BasketItemAddRequest.cs
new file mode 100644
index 00000000..5978b979
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/BasketItemAddRequest.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Shopping.Contracts;
+
+public class BasketItemAddRequest
+{
+    public string? ProductId { get; set; }
+
+    public decimal Quantity { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/BasketItemUpdateRequest.cs b/samples/src/Contoso.Shopping.Contracts/BasketItemUpdateRequest.cs
new file mode 100644
index 00000000..204a8d50
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/BasketItemUpdateRequest.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Shopping.Contracts;
+
+public class BasketItemUpdateRequest : IETag
+{
+    public decimal Quantity { get; set; }
+
+    public string? ETag { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/BasketPricing.cs b/samples/src/Contoso.Shopping.Contracts/BasketPricing.cs
new file mode 100644
index 00000000..025e0a9c
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/BasketPricing.cs
@@ -0,0 +1,23 @@
+namespace Contoso.Shopping.Contracts;
+
+[Contract]
+public partial class BasketPricing
+{
+    [ReadOnly(true)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public decimal SubTotal { get; set; }
+
+    [ReadOnly(true)]
+    [ReferenceData<DiscountCoupon>]
+    public partial string? DiscountCouponCode { get; set; }
+
+    [ReadOnly(true)]
+    public decimal DiscountPercentage { get; set; }
+
+    [ReadOnly(true)]
+    public decimal DiscountAmount { get; set; }
+
+    [ReadOnly(true)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public decimal Total { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/BasketStatus.cs b/samples/src/Contoso.Shopping.Contracts/BasketStatus.cs
new file mode 100644
index 00000000..00d4fa67
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/BasketStatus.cs
@@ -0,0 +1,11 @@
+namespace Contoso.Shopping.Contracts;
+
+public partial class BasketStatus
+{
+    public const string Empty = "E";
+    public const string Active = "A";
+    public const string CheckedOut = "C";
+    public const string Abandoned = "B";
+
+    public bool CanBeMutated => Code is Empty or Active;
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/BasketStatus.g.cs b/samples/src/Contoso.Shopping.Contracts/BasketStatus.g.cs
new file mode 100644
index 00000000..95a78554
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/BasketStatus.g.cs
@@ -0,0 +1,20 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Contracts;
+
+/// <summary>Represents the 'Basket Status' reference-data contract.</summary>
+[ReferenceData]
+public partial class BasketStatus : ReferenceData<BasketStatus> { }
+
+/// <summary>
+/// Represents the 'BasketStatus' reference-data contract collection.
+/// </summary>
+public partial class BasketStatusCollection() : ReferenceDataCollection<BasketStatus>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/Contoso.Shopping.Contracts.csproj b/samples/src/Contoso.Shopping.Contracts/Contoso.Shopping.Contracts.csproj
new file mode 100644
index 00000000..31817534
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/Contoso.Shopping.Contracts.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Shopping.Contracts/DiscountCoupon.cs b/samples/src/Contoso.Shopping.Contracts/DiscountCoupon.cs
new file mode 100644
index 00000000..8a6188e9
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/DiscountCoupon.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Shopping.Contracts;
+
+public partial class DiscountCoupon
+{
+    public decimal DiscountPercentage { get; init => field = value.ThrowIfLessThanOrEqualToZero("Discount percentage cannot be less than or equal to zero.").ThrowWhen(value => value > 100, "Discount percentage cannot be greater than 100."); }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/DiscountCoupon.g.cs b/samples/src/Contoso.Shopping.Contracts/DiscountCoupon.g.cs
new file mode 100644
index 00000000..b39fac37
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/DiscountCoupon.g.cs
@@ -0,0 +1,20 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Contracts;
+
+/// <summary>Represents the 'Discount Coupon' reference-data contract.</summary>
+[ReferenceData]
+public partial class DiscountCoupon : ReferenceData<DiscountCoupon> { }
+
+/// <summary>
+/// Represents the 'DiscountCoupon' reference-data contract collection.
+/// </summary>
+public partial class DiscountCouponCollection() : ReferenceDataCollection<DiscountCoupon>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/GlobalUsing.cs b/samples/src/Contoso.Shopping.Contracts/GlobalUsing.cs
new file mode 100644
index 00000000..7577aeb8
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/GlobalUsing.cs
@@ -0,0 +1,5 @@
+global using CoreEx;
+global using CoreEx.Entities;
+global using CoreEx.RefData;
+global using System.ComponentModel;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Contracts/UnitOfMeasure.g.cs b/samples/src/Contoso.Shopping.Contracts/UnitOfMeasure.g.cs
new file mode 100644
index 00000000..2da13818
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Contracts/UnitOfMeasure.g.cs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Contracts;
+
+/// <summary>Represents the 'Unit Of Measure' reference-data contract.</summary>
+[ReferenceData]
+public partial class UnitOfMeasure : ReferenceData<UnitOfMeasure> 
+{
+    /// <summary>Gets or initializes the Scale.</summary>
+    public int Scale { get; init; } = default!;
+}
+
+/// <summary>
+/// Represents the 'UnitOfMeasure' reference-data contract collection.
+/// </summary>
+public partial class UnitOfMeasureCollection() : ReferenceDataCollection<UnitOfMeasure>(ReferenceDataSortOrder.Code) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Contoso.Shopping.Database.csproj b/samples/src/Contoso.Shopping.Database/Contoso.Shopping.Database.csproj
new file mode 100644
index 00000000..336e3b2d
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Contoso.Shopping.Database.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DbEx.SqlServer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Schema\Stored Procedures\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Data/ref-data.seed.yaml b/samples/src/Contoso.Shopping.Database/Data/ref-data.seed.yaml
new file mode 100644
index 00000000..14805e5d
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Data/ref-data.seed.yaml
@@ -0,0 +1,18 @@
+Shopping:
+  - $^UnitOfMeasure:
+    - EA: Each
+    - SET: Set
+    - PR: Pair
+    - PK: Pack
+    - M: Meter
+    - CM: Centimeter
+    - L: Litre
+    - { Code: HR, Text: Hour, Scale: 2 }
+  - $^DiscountCoupon:
+    - { Code: SAVE10, Text: Save 10% on your order, DiscountPercentage: 10 }
+    - { Code: XMAS2025, Text: Save 15% for Christmas 2025, DiscountPercentage: 15, StartsOn: 2025-12-01, EndsOn: 2025-12-31 }
+  - $^BasketStatus:
+    - E: Empty
+    - A: Active
+    - C: Checked-out
+    - B: Abandoned
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000001-create-shopping-schema.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000001-create-shopping-schema.sql
new file mode 100644
index 00000000..0d6c8642
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000001-create-shopping-schema.sql
@@ -0,0 +1 @@
+CREATE SCHEMA [Shopping]
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000101-create-shopping-unitofmeasure.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000101-create-shopping-unitofmeasure.sql
new file mode 100644
index 00000000..6d78aaa5
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000101-create-shopping-unitofmeasure.sql
@@ -0,0 +1,19 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Shopping].[UnitOfMeasure] (
+  [UnitOfMeasureId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [Code] NVARCHAR(50) NOT NULL UNIQUE,
+  [Text] NVARCHAR(250) NULL,
+  [IsActive] BIT NULL,
+  [SortOrder] INT NULL,
+  [Scale] INT NOT NULL DEFAULT 0,
+  [RowVersion] TIMESTAMP NOT NULL,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+  
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000102-create-shopping-discountcoupon.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000102-create-shopping-discountcoupon.sql
new file mode 100644
index 00000000..1eb82bb6
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000102-create-shopping-discountcoupon.sql
@@ -0,0 +1,21 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Shopping].[DiscountCoupon] (
+  [DiscountCouponId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [Code] NVARCHAR(50) NOT NULL UNIQUE,
+  [Text] NVARCHAR(250) NULL,
+  [IsActive] BIT NULL,
+  [SortOrder] INT NULL,
+  [DiscountPercentage] DECIMAL(18,2) DEFAULT 0 NOT NULL,
+  [StartsOn] DATETIMEOFFSET NULL,
+  [EndsOn] DATETIMEOFFSET NULL,
+  [RowVersion] TIMESTAMP NOT NULL,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+  
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000103-create-shopping-basketstatus.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000103-create-shopping-basketstatus.sql
new file mode 100644
index 00000000..8b290c66
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000103-create-shopping-basketstatus.sql
@@ -0,0 +1,18 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Shopping].[BasketStatus] (
+  [BasketStatusId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [Code] NVARCHAR(50) NOT NULL UNIQUE,
+  [Text] NVARCHAR(250) NULL,
+  [IsActive] BIT NULL,
+  [SortOrder] INT NULL,
+  [RowVersion] TIMESTAMP NOT NULL,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+  
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000201-create-shopping-product.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000201-create-shopping-product.sql
new file mode 100644
index 00000000..2ee4f4ac
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000201-create-shopping-product.sql
@@ -0,0 +1,15 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Shopping].[Product] (
+  [ProductId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [Sku] NVARCHAR(50) NOT NULL UNIQUE,
+  [Text] NVARCHAR(250) NOT NULL,
+  [UnitOfMeasureCode] NVARCHAR(50) NOT NULL,
+  [Price] DECIMAL(18, 2) DEFAULT 0 NOT NULL,
+  [IsInactive] BIT DEFAULT 0 NOT NULL,
+  [IsNonStocked] BIT DEFAULT 0 NOT NULL
+);
+  
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000301-create-shopping-basket.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000301-create-shopping-basket.sql
new file mode 100644
index 00000000..36ad787c
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000301-create-shopping-basket.sql
@@ -0,0 +1,21 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Shopping].[Basket]
+(
+  [BasketId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+  [CustomerId] NVARCHAR(50) NOT NULL,
+  [BasketStatusCode] NVARCHAR(50) NOT NULL,
+  [SubTotal] DECIMAL(18, 2) NOT NULL DEFAULT 0,
+  [DiscountCouponCode] NVARCHAR(50) NULL,
+  [DiscountAmount] DECIMAL(18, 2) NOT NULL DEFAULT 0,
+  [Total] DECIMAL(18, 2) NOT NULL DEFAULT 0,
+  [RowVersion] ROWVERSION NOT NULL,
+  [CreatedBy] NVARCHAR(250) NULL,
+  [CreatedOn] DATETIMEOFFSET NULL,
+  [UpdatedBy] NVARCHAR(250) NULL,
+  [UpdatedOn] DATETIMEOFFSET NULL
+);
+  
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000302-create-shopping-basketitem.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000302-create-shopping-basketitem.sql
new file mode 100644
index 00000000..a9010fe2
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000302-create-shopping-basketitem.sql
@@ -0,0 +1,18 @@
+-- Migration Script
+
+BEGIN TRANSACTION
+
+CREATE TABLE Shopping.BasketItem
+(
+    [BasketItemId] NVARCHAR(50) NOT NULL PRIMARY KEY,
+    [BasketId] NVARCHAR(50) NOT NULL FOREIGN KEY REFERENCES Shopping.Basket([BasketId]),
+    [ProductId] NVARCHAR(50) NOT NULL,
+    [Sku] NVARCHAR(50) NOT NULL,
+    [Text] NVARCHAR(250) NOT NULL,
+    [UnitOfMeasureCode] NVARCHAR(50) NOT NULL,
+    [UnitPrice] DECIMAL(18, 2) NOT NULL DEFAULT 0,
+    [Quantity] DECIMAL(18, 2) NOT NULL DEFAULT 0,
+    [RowVersion] TIMESTAMP NOT NULL
+);
+  
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Migrations/20260101-000401-create-shopping-outbox-tables.sql b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000401-create-shopping-outbox-tables.sql
new file mode 100644
index 00000000..62219b05
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Migrations/20260101-000401-create-shopping-outbox-tables.sql
@@ -0,0 +1,37 @@
+-- Create table: [Shopping].[Outbox] and [Shopping].[OutboxLease]
+
+BEGIN TRANSACTION
+
+CREATE TABLE [Shopping].[Outbox] (
+  [OutboxId] BIGINT IDENTITY (1, 1) NOT NULL PRIMARY KEY,
+  [TenantId] NVARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  [PartitionId] INT NOT NULL,             -- Partition number; computed in application from partition-key.
+  [Status] TINYINT NOT NULL DEFAULT 0,    -- 0=Pending, 1=Processing, 2=Done.
+  [EnqueuedUtc] DATETIME2 NOT NULL,       -- When the event was enqueued within application.
+  [AvailableUtc] DATETIME2 NOT NULL,      -- When the event is eligible for processing (retry delay).
+  [DequeuedUtc] DATETIME2 NULL,           -- When the event was successfully dequeued/relayed.
+  [Attempts] INT NOT NULL DEFAULT 0,      -- Retry attempt count.
+
+  -- Message:
+  [Destination] NVARCHAR(255) NULL,       -- Message destination; i.e. queue/topic/etc.
+  [Event] NVARCHAR(MAX) NOT NULL,         -- CloudEvent as JSON.
+
+  -- Claim/leasing:
+  [LeaseId] UNIQUEIDENTIFIER NULL,        -- Unique identifier of the lease.
+  [LeaseUntilUtc] DATETIME2 NULL,         -- Leased until UTC; after which assume released due to possible application crash.
+
+  INDEX [IX_Shopping_Outbox_PartitionOrder] ([TenantId], [PartitionId], [OutboxId]) INCLUDE ([Status], [AvailableUtc], [LeaseUntilUtc], [Destination], [Event], [Attempts]),
+  INDEX [IX_Shopping_Outbox_WorkerPull] ([TenantId], [PartitionId], [Status]) INCLUDE ([OutboxId], [AvailableUtc]),
+  INDEX [IX_Shopping_Outbox_CleanUp] ([OutboxId]) INCLUDE ([DequeuedUtc]) WHERE [Status] = 2
+);
+
+CREATE TABLE [Shopping].[OutboxLease] (
+  [TenantId] NVARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  [PartitionId] INT NOT NULL,             -- Partition number; computed in application from partition-key.
+  [LeaseId] UNIQUEIDENTIFIER NULL,        -- Unique identifier of the lessee.
+  [LeaseUntilUtc] DATETIME2 NULL          -- Leased until UTC; after which assume released due to possible application crash.
+
+  CONSTRAINT PK_Shopping_OutboxLease PRIMARY KEY (TenantId, PartitionId)
+);
+
+COMMIT TRANSACTION
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Program.cs b/samples/src/Contoso.Shopping.Database/Program.cs
new file mode 100644
index 00000000..edcd2214
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Program.cs
@@ -0,0 +1,40 @@
+using CoreEx.Database;
+using DbEx.Migration;
+using DbEx.SqlServer.Console;
+
+namespace Contoso.Shopping.Database;
+
+/// <summary>
+/// Represents the <b>database utilities</b> program (capability).
+/// </summary>
+public class Program
+{
+    /// <summary>
+    /// Main startup.
+    /// </summary>
+    /// <param name="args">The startup arguments.</param>
+    /// <returns>The status code whereby zero indicates success.</returns>
+    public static Task<int> Main(string[] args) => SqlServerMigrationConsole
+        .Create<Program>("Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true")
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>
+    /// Configure the <see cref="MigrationArgs"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="MigrationArgs"/>.</param>
+    /// <returns>The <see cref="MigrationArgs"/>.</returns>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
+    {
+        args.AddAssembly<SqlStatement>().AddAssembly<Program>()
+            .IncludeExtendedSchemaScripts()
+            .DataParserArgs
+                .RefDataColumnDefault("SortOrder", _ => 0)
+                .RefDataColumnDefault("Scale", _ => 0);
+
+        // Only reset data for the Shopping schema.
+        args.DataResetFilterPredicate = ts => ts.Schema == "Shopping";
+
+        return args;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Properties/launchSettings.json b/samples/src/Contoso.Shopping.Database/Properties/launchSettings.json
new file mode 100644
index 00000000..f807a1c1
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Contoso.Shopping.Database": {
+      "commandName": "Project",
+      "commandLineArgs": "dropandall"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchCancel.g.sql b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchCancel.g.sql
new file mode 100644
index 00000000..02c73fe0
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchCancel.g.sql	
@@ -0,0 +1,58 @@
+CREATE OR ALTER PROCEDURE [Shopping].[spOutboxBatchCancel]
+  @LeaseId UNIQUEIDENTIFIER,
+  @BackoffSeconds INT
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+   *
+   * Cancels a batch by LeaseId, marking messages as pending with backoff and releasing the lease.
+   * > Returns:
+   *   0 = Success.
+   *  -1 = No rows updated (e.g. already completed or invalid LeaseId).
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Cancel the batch.
+    UPDATE o
+      SET o.[Status] = 0,
+          o.[Attempts] = o.[Attempts] + 1,
+          o.[AvailableUtc] = DATEADD(SECOND, @BackoffSeconds, @Now),
+          o.[LeaseId] = NULL,
+          o.[LeaseUntilUtc] = NULL
+    FROM [Shopping].[Outbox] AS o WITH (UPDLOCK, ROWLOCK)
+    WHERE o.[LeaseId] = @LeaseId
+      AND o.[Status] = 1;
+
+    IF (@@ROWCOUNT = 0)
+    BEGIN
+      COMMIT;
+      RETURN -1; -- No rows updated.
+    END
+
+    COMMIT;
+
+    -- 2) Release the partition lease.
+    BEGIN TRY
+      EXEC [Shopping].[spOutboxLeaseRelease] @LeaseId;
+    END TRY
+    BEGIN CATCH
+      -- Ignore: lease will expire. Don't fail cancel.
+    END CATCH
+
+    RETURN 0;
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
diff --git a/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchClaim.g.sql b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchClaim.g.sql
new file mode 100644
index 00000000..39a43480
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchClaim.g.sql	
@@ -0,0 +1,116 @@
+CREATE OR ALTER PROCEDURE [Shopping].[spOutboxBatchClaim]
+  @TenantId NVARCHAR(255) = NULL,
+  @PartitionId INT,
+  @BatchSize INT,
+  @LeaseId UNIQUEIDENTIFIER,
+  @LeaseSeconds INT
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+   *
+   * Claims the next batch of pending/processing messages for a tenant/partition, marking them as processing with a lease.
+   * > Returns:
+   *   0 = Success; batch returned in result set.
+   *  -1 = No rows updated (e.g. already claimed by another).
+   *  -2 = No batch to claim (e.g. all completed).
+   *  -3 = Unable to acquire lease (e.g. another active batch).
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+  DECLARE @LeaseUntilUtc DATETIME2;
+  DECLARE @EffectiveTenantId NVARCHAR(255) = COALESCE(@TenantId, '(none)');
+
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+
+  -- 1) Acquire a partition lease; exit where unsuccessful.
+  DECLARE @RC INT;
+  EXEC @RC = [Shopping].[spOutboxLeaseAcquire] @EffectiveTenantId, @PartitionId, @LeaseId, @LeaseSeconds, @LeaseUntilUtc OUTPUT;
+  IF (@RC < 0) RETURN -3;
+
+  -- 2) Claim the next batch (contiguous by OutboxId) for the tenant/partition.
+  BEGIN TRY
+    BEGIN TRAN;
+
+    DECLARE @HeadId BIGINT;
+    DECLARE @BlockerId BIGINT;
+
+    -- Determine head (first pending/processing) for strict contiguity.
+    SELECT @HeadId = MIN(o.OutboxId)
+      FROM [Shopping].[Outbox] o WITH (UPDLOCK)
+      WHERE o.[TenantId] = @EffectiveTenantId
+        AND o.[PartitionId] = @PartitionId
+        AND o.[Status] IN (0, 1)
+      OPTION (RECOMPILE);
+
+    IF @HeadId IS NULL
+    BEGIN
+      COMMIT;
+
+      -- Release the lease outside transaction.
+      EXEC [Shopping].[spOutboxLeaseRelease] @LeaseId;
+      RETURN -2; -- Nothing available.
+    END
+
+    -- Find first blocker at/after head: actively leased or not yet available.
+    SELECT @BlockerId = MIN(o.OutboxId)
+      FROM [Shopping].[Outbox] o WITH (READPAST, UPDLOCK)
+      WHERE o.[TenantId] = @EffectiveTenantId
+        AND o.[PartitionId] = @PartitionId
+        AND o.[OutboxId] >= @HeadId
+        AND ((o.Status = 1 AND o.[LeaseUntilUtc] IS NOT NULL AND o.[LeaseUntilUtc] > @Now)
+          OR (o.Status = 0 AND o.[AvailableUtc] > @Now))
+      OPTION (RECOMPILE);
+
+    -- Claim contiguous run from head to before blocker.
+    ;WITH claim AS
+    (
+      SELECT TOP (@BatchSize)
+        o.[OutboxId], o.[TenantId], o.[Status], o.[PartitionId], o.[Destination], o.[Event],
+        o.[Attempts], o.[EnqueuedUtc], o.[AvailableUtc], o.[LeaseId], o.[LeaseUntilUtc]
+      FROM [Shopping].[Outbox] o WITH (READPAST, UPDLOCK, ROWLOCK)
+      WHERE o.[TenantId] = @EffectiveTenantId
+        AND o.[PartitionId] = @PartitionId
+        AND o.[OutboxId] >= @HeadId
+        AND (@BlockerId IS NULL OR o.[OutboxId] < @BlockerId)
+        AND ((o.[Status] = 0 AND o.[AvailableUtc] <= @Now)
+          OR (o.[Status] = 1 AND (o.[LeaseUntilUtc] IS NULL OR o.[LeaseUntilUtc] <= @Now)))
+      ORDER BY o.OutboxId
+    )
+    UPDATE claim
+      SET [Status] = 1,
+          [LeaseId] = @LeaseId,
+          [LeaseUntilUtc] = @LeaseUntilUtc
+    OUTPUT
+      inserted.[OutboxId],
+      inserted.[TenantId],
+      inserted.[Status],
+      inserted.[PartitionId],
+      inserted.[Destination],
+      inserted.[Event],
+      inserted.[Attempts],
+      inserted.[EnqueuedUtc],
+      inserted.[AvailableUtc],
+      inserted.[LeaseUntilUtc];
+
+      IF (@@ROWCOUNT = 0)
+      BEGIN
+        COMMIT;
+
+        -- Release the lease outside transaction.
+        EXEC [Shopping].[spOutboxLeaseRelease] @LeaseId;
+        RETURN -1; -- No rows updated.
+      END
+
+      COMMIT;
+      RETURN 0;
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchComplete.g.sql b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchComplete.g.sql
new file mode 100644
index 00000000..f5c654da
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxBatchComplete.g.sql	
@@ -0,0 +1,58 @@
+CREATE OR ALTER PROCEDURE [Shopping].[spOutboxBatchComplete]
+  @LeaseId UNIQUEIDENTIFIER,
+  @DequeuedUtc DATETIME2 NULL
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+   *
+   * Marks a batch as completed by LeaseId, releasing the lease and making way for the next batch.
+   * > Returns:
+   *   0 = Success.
+   *  -1 = No rows updated (e.g. already completed or invalid LeaseId).
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Complete the batch.
+    UPDATE o
+      SET o.[Status] = 2,
+          o.[LeaseId] = NULL,
+          o.[LeaseUntilUtc] = NULL,
+          o.[DequeuedUtc] = COALESCE(@DequeuedUtc, @Now)
+    FROM [Shopping].[Outbox] AS o WITH (UPDLOCK, ROWLOCK)
+    WHERE o.[LeaseId] = @LeaseId
+      AND o.[Status] = 1;
+
+    IF (@@ROWCOUNT = 0)
+    BEGIN
+      COMMIT;
+      RETURN -1; -- No rows updated.
+    END
+
+    COMMIT;
+
+    -- 2) Release the partition lease where identified.
+    BEGIN TRY
+      EXEC [Shopping].[spOutboxLeaseRelease] @LeaseId;
+    END TRY
+    BEGIN CATCH
+      -- Ignore: lease will expire. Don't fail completion.
+    END CATCH
+
+    RETURN 0
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxEnqueue.g.sql b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxEnqueue.g.sql
new file mode 100644
index 00000000..e18302a0
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxEnqueue.g.sql	
@@ -0,0 +1,36 @@
+CREATE OR ALTER PROCEDURE [Shopping].[spOutboxEnqueue]
+  @TenantId AS NVARCHAR(255) = NULL,
+  @PartitionId AS INT,
+  @Destination AS NVARCHAR(255),
+  @Event AS NVARCHAR(MAX),
+  @EnqueuedUtc AS DATETIME2 = NULL,
+  @AvailableUtc AS DATETIME2 = NULL
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+  DECLARE @EffectiveTenantId NVARCHAR(255) = COALESCE(@TenantId, '(none)');
+
+  INSERT INTO [Shopping].[Outbox] (
+    [TenantId],
+    [PartitionId],
+    [Destination],
+    [Event],
+    [EnqueuedUtc],
+    [AvailableUtc]
+  )
+  VALUES (
+    @EffectiveTenantId,
+    @PartitionId,
+    @Destination,
+    @Event,
+    COALESCE(@EnqueuedUtc, @Now),
+    COALESCE(@AvailableUtc, COALESCE(@EnqueuedUtc, @Now))
+  )
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxLeaseAcquire.g.sql b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxLeaseAcquire.g.sql
new file mode 100644
index 00000000..80784adc
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxLeaseAcquire.g.sql	
@@ -0,0 +1,73 @@
+CREATE OR ALTER PROCEDURE [Shopping].[spOutboxLeaseAcquire]
+  @TenantId NVARCHAR(255) = NULL,
+  @PartitionId INT,
+  @LeaseId UNIQUEIDENTIFIER,
+  @LeaseSeconds INT,
+  @LeaseUntilUtc DATETIME2 OUTPUT
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+   *
+   * Attempts to acquire a lease for a tenant/partition, returning success status and lease until timestamp.
+   * > Returns:
+   *   0 = Lease acquired; caller may proceed with batch claim.
+   *  -1 = Lease not acquired; caller should backoff and retry.
+   *
+   * Notes:
+   * - The procedure will return -1 where lease acquisition is unsuccessful, including where another active lease exists.
+   * - The caller should implement an appropriate retry/backoff strategy where -1 is returned, including randomization to avoid thundering herd issues.
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  DECLARE @Now DATETIME2 = SYSUTCDATETIME();
+  DECLARE @Until DATETIME2 = DATEADD(SECOND, @LeaseSeconds, @Now)
+  DECLARE @EffectiveTenantId NVARCHAR(255) = COALESCE(@TenantId, '(none)');
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Ensure the row exists (self-seeding); lock the key-range for this PartitionId to avoid insert races.
+    IF NOT EXISTS (
+      SELECT 1
+      FROM [Shopping].[OutboxLease] WITH (UPDLOCK, HOLDLOCK)
+      WHERE [TenantId] = @EffectiveTenantId AND [PartitionId] = @PartitionId
+    )
+    BEGIN
+      INSERT INTO [Shopping].[OutboxLease] ([TenantId], [PartitionId])
+      VALUES (@EffectiveTenantId, @PartitionId);
+    END
+
+    -- 2) Attempt to acquire lease where expired/empty.
+    UPDATE ol
+      SET ol.[LeaseId] = @LeaseId,
+          ol.[LeaseUntilUtc] = @Until
+      FROM [Shopping].[OutboxLease] AS ol WITH (UPDLOCK, ROWLOCK)
+      WHERE ol.[PartitionId] = @PartitionId
+        AND ol.[TenantId] = @EffectiveTenantId
+        AND (ol.[LeaseUntilUtc] IS NULL OR ol.[LeaseUntilUtc] <= @Now)
+        OPTION (RECOMPILE);
+
+    -- 3) Commit and return lease success status.
+    DECLARE @Rows INT = @@ROWCOUNT;
+
+    COMMIT;
+
+    IF @Rows = 1
+    BEGIN
+      SET @LeaseUntilUtc = @Until;
+      RETURN 0; -- Lease successful.
+    END
+
+    SET @LeaseUntilUtc = NULL;
+    RETURN -1; -- Lease unsuccessful.
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxLeaseRelease.g.sql b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxLeaseRelease.g.sql
new file mode 100644
index 00000000..aa5e73af
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/Schema/Stored Procedures/spOutboxLeaseRelease.g.sql	
@@ -0,0 +1,44 @@
+CREATE OR ALTER PROCEDURE [Shopping].[spOutboxLeaseRelease]
+  @LeaseId UNIQUEIDENTIFIER
+AS
+BEGIN
+  /*
+   * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+   *
+   * Releases a lease by LeaseId, making way for the next batch.
+   * > Returns:
+   *   0 = Success; lease released and available for next claim.
+   *  -1 = No rows updated (e.g. already released or invalid LeaseId).
+   *
+   * Notes:
+   * - The procedure will return -1 where release is unsuccessful, including where the lease is already released.
+   */
+
+  SET NOCOUNT ON;
+  SET XACT_ABORT ON;
+  SET LOCK_TIMEOUT 5000; -- Milliseconds.
+  SET TRANSACTION ISOLATION LEVEL READ COMMITTED
+
+  BEGIN TRY
+    BEGIN TRAN;
+
+    -- 1) Release lease where lessee.
+    UPDATE ol
+      SET ol.[LeaseId] = NULL,
+          ol.[LeaseUntilUtc] = NULL
+      FROM [Shopping].[OutboxLease] AS ol WITH (UPDLOCK, ROWLOCK)
+      WHERE ol.[LeaseId] = @LeaseId;
+
+    -- 2) Commit and return release success status.
+    DECLARE @Rows INT = @@ROWCOUNT;
+
+    COMMIT;
+
+    IF @Rows = 1 RETURN 0; -- Release successful.
+    RETURN -1; -- Release unsuccessful.
+  END TRY
+  BEGIN CATCH
+    IF (XACT_STATE() <> 0) ROLLBACK;
+    THROW; -- Re-throw preserves error details to caller.
+  END CATCH
+END
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Database/dbex.yaml b/samples/src/Contoso.Shopping.Database/dbex.yaml
new file mode 100644
index 00000000..9de34f66
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Database/dbex.yaml
@@ -0,0 +1,12 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/DbEx/refs/heads/main/schema/dbex.json
+outbox: true
+tables:
+# Reference-data
+- name: BasketStatus
+- name: DiscountCoupon
+- name: UnitOfMeasure
+
+# Transactional-data
+- name: Basket
+- name: BasketItem
+- name: Product
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Domain/Basket.cs b/samples/src/Contoso.Shopping.Domain/Basket.cs
new file mode 100644
index 00000000..6c781bea
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Domain/Basket.cs
@@ -0,0 +1,139 @@
+namespace Contoso.Shopping.Domain;
+
+public sealed class Basket : Aggregate<string, Basket>
+{
+    private List<BasketItem> _items = [];
+
+    public static Basket CreateNew(string customerId) => new Basket(Runtime.NewId())
+    {
+        CustomerId = customerId,
+        Status = BasketStatus.Empty
+    }.AsNew();
+
+    public static Basket CreateFrom(string id, string customerId, BasketStatus status, DiscountCoupon? discountCoupon, IEnumerable<BasketItem>? items, ChangeLog? changeLog, string? etag) => new Basket(id)
+    {
+        CustomerId = customerId,
+        Status = status,
+        DiscountCoupon = discountCoupon,
+        _items = items is null ? [] : [.. items.Select(i => i.Clone(PersistenceState.NotModified))],
+        ChangeLog = changeLog,
+        ETag = etag
+    }.AsNotModified();
+
+    private Basket(string id) : base(id) { }
+
+    public string CustomerId { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+
+    public BasketStatus Status { get; private set => field = value.ThrowIfNull().ThrowIfInactive(); } = null!;
+
+    public DiscountCoupon? DiscountCoupon { get; private set => field = value?.ThrowIfInvalid(); }
+
+    public IReadOnlyList<BasketItem> Items => _items;
+
+    public decimal SubTotal => _items.Where(i => i.PersistenceState != PersistenceState.Removed).Sum(i => i.Pricing.Total);
+
+    public decimal DiscountPercentage => DiscountCoupon?.DiscountPercentage ?? 0;
+
+    public decimal DiscountAmount => DiscountCoupon is null ? 0 : Math.Round(SubTotal * (DiscountCoupon.DiscountPercentage / 100), 2);
+
+    public decimal Total => SubTotal - DiscountAmount;
+
+    public bool HasChanges => PersistenceState.IsNewOrModified || _items.Any(i => i.PersistenceState.IsNewOrModified);
+
+    /// <inheritdoc/>
+    /// <remarks>Check that it can be mutated; otherwise, error/fail.</remarks>
+    protected override Result OnCheckCanMutate() => Status.CanBeMutated
+        ? Result.Success
+        : Result.BusinessError($"Basket has a status of '{Status}' and as such cannot be modified.", c => c.WithKey(Id).WithErrorCode("invalid-status"));
+
+    /// <inheritdoc/>
+    /// <remarks>On mutation then re-determine status.</remarks>
+    protected override void OnMutate()
+    {
+        // Automatically update the status based on the items in the basket (where it can be mutated).
+        if (Status.CanBeMutated)
+            Status = _items.Any(i => i.PersistenceState.IsNotRemoved) ? BasketStatus.Active : BasketStatus.Empty;
+    }
+
+    /// <summary>
+    /// Applies the discount coupon to the basket (where not already applied).
+    /// </summary>
+    public Result ApplyDiscount(DiscountCoupon discountCoupon)
+    {
+        discountCoupon.ThrowIfNull().ThrowIfInactive();
+        if (discountCoupon != DiscountCoupon)
+            Modify(() => DiscountCoupon = discountCoupon);
+
+        return Result.Success;
+    }
+
+    /// <summary>
+    /// Adds new or merges into an existing item in the basket.
+    /// </summary>
+    public Result ItemAdd(BasketItem item) => Modify(() =>
+    {
+        item.ThrowIfNull();
+        if (_items.FirstOrDefault(i => i.ProductId == item.ProductId && i.PersistenceState.IsNotRemoved) is BasketItem existing)
+            existing.IncreaseQuantity(item.Pricing.Quantity);
+        else
+            _items.Add(item.Clone(PersistenceState.New));
+
+        return Result.Success;
+    });
+
+    /// <summary>
+    /// Updates the quantity of an existing item in the basket.
+    /// </summary>
+    public Result ItemUpdate(string basketItemId, decimal quantity, string? etag)
+    {
+        var item = _items.FirstOrDefault(i => i.Id == basketItemId.ThrowIfNullOrEmpty() && i.PersistenceState.IsNotRemoved);
+        if (item is null)
+            return Result.NotFoundError();
+
+        if (quantity != item.Pricing.Quantity)
+            Modify(() =>
+            {
+                item.OverrideQuantity(quantity);
+                item.SetETag(etag);
+            });
+
+        return Result.Success;
+    }
+
+    /// <summary>
+    /// Deletes the item from the basket (marking as removed).
+    /// </summary>
+    public Result ItemDelete(string basketItemId)
+    {
+        var item = _items.FirstOrDefault(i => i.Id == basketItemId.ThrowIfNullOrEmpty() && i.PersistenceState.IsNotRemoved);
+        if (item is not null)
+            Modify(() => item.Delete());
+
+        return Result.Success;
+    }
+
+    /// <summary>
+    /// Performs a basket checkout.
+    /// </summary>
+    public Result Checkout()
+    {
+        if (Status == BasketStatus.Empty)
+            return Result.BusinessError("An empty basket can not be checked out.", c => c.WithKey(Id).WithErrorCode("empty-basket"));
+
+        if (_items.Sum(i => i.Pricing.Quantity) == 0)
+            return Result.BusinessError("A basket must have at least one item with a quantity greater than zero to be checked out.", c => c.WithKey(Id).WithErrorCode("zero-quantity-basket"));
+
+        if (HasChanges)
+            throw new InvalidOperationException("A basket can not be checked out where changes have not been committed.");
+
+        Modify(() =>
+        {
+            foreach (var item in _items.Where(i => i.Pricing.Quantity == 0))
+                item.Delete();
+
+            Status = BasketStatus.CheckedOut;
+        });
+
+        return Result.Success;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Domain/BasketItem.cs b/samples/src/Contoso.Shopping.Domain/BasketItem.cs
new file mode 100644
index 00000000..7623893f
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Domain/BasketItem.cs
@@ -0,0 +1,39 @@
+namespace Contoso.Shopping.Domain;
+
+public sealed class BasketItem : Entity<string, BasketItem>
+{
+    public static BasketItem CreateNew(string productId, string sku, string text, ItemPricing pricing) => new BasketItem(Runtime.NewId())
+    {
+        ProductId = productId,
+        Sku = sku,
+        Text = text,
+        Pricing = pricing
+    }.AsNew();
+
+    public static BasketItem CreateFrom(string id, string productId, string sku, string text, ItemPricing pricing, string? etag) => new BasketItem(id)
+    {
+        ProductId = productId,
+        Sku = sku,
+        Text = text,
+        Pricing = pricing,
+        ETag = etag
+    }.AsNotModified();
+
+    private BasketItem(string id) : base(id) { }
+
+    public string ProductId { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+
+    public string Sku { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+
+    public string Text { get; private set => field = value.ThrowIfNullOrEmpty(); } = null!;
+
+    public ItemPricing Pricing { get; private set => field = value.ThrowIfNull().EnsureIsValid(); } = null!;
+
+    internal void OverrideQuantity(decimal quantity) => Modify(() => Pricing = Pricing with { Quantity = quantity });
+
+    internal void IncreaseQuantity(decimal quantity) => OverrideQuantity(Pricing.Quantity + quantity);
+
+    internal void Delete() => Remove();
+
+    internal BasketItem Clone(PersistenceState state) => CreateFrom(Id, ProductId, Sku, Text, Pricing, ETag).SetPersistenceState(state);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Domain/Contoso.Shopping.Domain.csproj b/samples/src/Contoso.Shopping.Domain/Contoso.Shopping.Domain.csproj
new file mode 100644
index 00000000..11458ccb
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Domain/Contoso.Shopping.Domain.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.DomainDriven\CoreEx.DomainDriven.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/samples/src/Contoso.Shopping.Domain/GlobalUsing.cs b/samples/src/Contoso.Shopping.Domain/GlobalUsing.cs
new file mode 100644
index 00000000..e330ae9a
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Domain/GlobalUsing.cs
@@ -0,0 +1,7 @@
+global using Contoso.Shopping.Contracts;
+global using Contoso.Shopping.Domain.ValueObjects;
+global using CoreEx;
+global using CoreEx.DomainDriven;
+global using CoreEx.Entities;
+global using CoreEx.Results;
+global using CoreEx.Validation;
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Domain/ValueObjects/ItemPricing.cs b/samples/src/Contoso.Shopping.Domain/ValueObjects/ItemPricing.cs
new file mode 100644
index 00000000..548216ef
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Domain/ValueObjects/ItemPricing.cs
@@ -0,0 +1,15 @@
+namespace Contoso.Shopping.Domain.ValueObjects;
+
+public sealed record class ItemPricing
+{
+    public required Contracts.UnitOfMeasure UnitOfMeasure { get; init => field = value.ThrowIfInactive(); }
+
+    public decimal UnitPrice { get; init => field = value.ThrowIfLessThanZero(); } 
+
+    public decimal Quantity { get; init => field = value.ThrowIfLessThanZero(); }
+
+    public decimal Total => UnitPrice * Quantity;
+
+    public ItemPricing EnsureIsValid() => DecimalRuleHelper.CheckScale(Quantity, UnitOfMeasure.Scale) ? this
+        : throw new ValidationException($"Quantity decimal places exceed the specified unit-of-measure ({UnitOfMeasure.Text}) configuration of {UnitOfMeasure.Scale}.");
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs b/samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs
new file mode 100644
index 00000000..69a2a21a
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductAdapter.cs
@@ -0,0 +1,61 @@
+namespace Contoso.Shopping.Infrastructure.Adapters;
+
+[ScopedService<IProductAdapter>]
+public class ProductAdapter(ShoppingEfDb ef, IEventPublisher eventPublisher, ProductsHttpClient client, [FromKeyedServices("AzureServiceBus")] IEventPublisher serviceBusPublisher) : IProductAdapter
+{
+    private readonly ShoppingEfDb _ef = ef.ThrowIfNull();
+    private readonly IEventPublisher _eventPublisher = eventPublisher.ThrowIfNull();
+    private readonly ProductsHttpClient _client = client.ThrowIfNull();
+    private readonly IEventPublisher _serviceBusPublisher = serviceBusPublisher.ThrowIfNull();
+
+    /// <inheritdoc/>
+    /// <remarks>Leverages the internal event-based replication store.</remarks>
+    public Task<Result<Product>> GetAsync(string id)
+        => Result.GoAsync(() => _ef.Products.GetWithResultAsync(id))
+                 .ThenAs(p => ProductMapper.From.Map(p));
+
+    /// <inheritdoc/>
+    /// <remarks>Invokes the Products API directly (real-time) to perform reservation; resulting BusinessException will bubble out.</remarks>
+    public async Task<Result> ReserveInventoryAsync(Domain.Basket basket)
+    {
+        // Get the list of non-stocked products in the basket; we don't need to reserve inventory for those, and we want to avoid sending them in the reservation request to the Products API.
+        var products = basket.Items.Select(i => i.ProductId).ToArray();
+        products = await _ef.Products.Query().Where(p => products.Contains(p.Id!) && !p.IsNonStocked).Select(p => p.Id!).ToArrayAsync();
+
+        // Check where no inventory reservation needed, so return success immediately; i.e. all products in the basket are non-stocked.
+        if (products.Length == 0)
+            return Result.Success;
+
+        // Create the reservation request for the basket.
+        var req = new Clients.MovementRequest
+        {
+            Id = basket.Id,
+            Products = basket.Items.Where(i => products.Contains(i.ProductId)).ToDataMap(
+                x => x.ProductId,
+                x => new Clients.MovementRequestProduct
+                {
+                    Quantity = x.Pricing.Quantity,
+                    UnitOfMeasure = x.Pricing.UnitOfMeasure
+                })
+        };
+
+        // Reserve the inventory for the basket using the typed http client; if successful, return the basket (unchanged).
+        return await _client.CreateReservationAsync(req).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Confirms the inventory reservation for the basket by creating the necessary confirmation command-style message to be sent/published as part of the consuming check-out unit-of-work.</remarks>
+    public Task<Result> CreateConfirmReservationCommand(Domain.Basket basket)
+    {
+        _eventPublisher.Add(EventData.CreateCommand("products", "reservation", "confirm").WithKey(basket.Id));
+        return Result.SuccessTask;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>This is invoked when the check-out unit-of-work fails; therefore, we need to bypass the Outbox (it may have been the failure point) and send via the message broker directly.</remarks>
+    public Task<Result> CancelReservationAsync(Domain.Basket basket)
+    {
+        _serviceBusPublisher.Add(EventData.CreateCommand("products", "reservation", "cancel").WithKey(basket.Id));
+        return Result.GoAsync(() => _serviceBusPublisher.PublishAsync());
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductSyncAdapter.cs b/samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductSyncAdapter.cs
new file mode 100644
index 00000000..a8e85382
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Adapters/ProductSyncAdapter.cs
@@ -0,0 +1,15 @@
+namespace Contoso.Shopping.Infrastructure.Adapters;
+
+[ScopedService<IProductSyncAdapter>]
+public class ProductSyncAdapter(ShoppingEfDb ef) : IProductSyncAdapter
+{
+    private readonly ShoppingEfDb _ef = ef.ThrowIfNull();
+
+    /// <inheritdoc/>
+    /// <remarks>Persists to the internal event-based replication store.</remarks>
+    public async Task<Result> ModifyAsync(Product product) => (await _ef.Products.UpsertWithResultAsync(ProductMapper.To.Map(product)).ConfigureAwait(false)).AsResult();
+
+    /// <inheritdoc/>
+    /// <remarks>Removes the product from the internal event-based replication store.</remarks>
+    public async Task<Result> DeleteAsync(string id) => (await _ef.Products.DeleteWithResultAsync(id).ConfigureAwait(false)).AsResult();
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Clients/MovementRequest.cs b/samples/src/Contoso.Shopping.Infrastructure/Clients/MovementRequest.cs
new file mode 100644
index 00000000..7fb2d7f6
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Clients/MovementRequest.cs
@@ -0,0 +1,8 @@
+namespace Contoso.Shopping.Infrastructure.Clients;
+
+public class MovementRequest : IIdentifier<string?>
+{
+    public string? Id { get; set; }
+
+    public DataMap<MovementRequestProduct>? Products { get; set; } 
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Clients/MovementRequestProduct.cs b/samples/src/Contoso.Shopping.Infrastructure/Clients/MovementRequestProduct.cs
new file mode 100644
index 00000000..a0e0246a
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Clients/MovementRequestProduct.cs
@@ -0,0 +1,9 @@
+namespace Contoso.Shopping.Infrastructure.Clients;
+
+public class MovementRequestProduct
+{
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public decimal Quantity { get; set; }
+
+    public string? UnitOfMeasure { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs b/samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs
new file mode 100644
index 00000000..9b4c7e3d
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Clients/ProductsHttpClient.cs
@@ -0,0 +1,20 @@
+namespace Contoso.Shopping.Infrastructure.Clients;
+
+/// <summary>
+/// Provides the HTTP facade for interacting with the external Products API.
+/// </summary>
+/// <param name="httpClient">The <see cref="HttpClient"/>.</param>
+public class ProductsHttpClient(HttpClient httpClient)
+{
+    private readonly HttpClient _httpClient = httpClient.ThrowIfNull();
+
+    /// <summary>
+    /// Creates a new inventory reservation.
+    /// </summary>
+    /// <param name="request">The <see cref="MovementRequest"/>.</param>
+    public async Task<Result> CreateReservationAsync(MovementRequest request)
+    {
+        var response = await _httpClient.PostAsJsonAsync("api/inventory/reserve", request, JsonDefaults.SerializerOptions);
+        return await response.ToResultAsync();  // Handles the response and returns errors/exceptions as expected.
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj b/samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj
new file mode 100644
index 00000000..ed85a179
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Contoso.Shopping.Infrastructure.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Application\Contoso.Shopping.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+  </ItemGroup>
+</Project>
diff --git a/samples/src/Contoso.Shopping.Infrastructure/GlobalUsing.cs b/samples/src/Contoso.Shopping.Infrastructure/GlobalUsing.cs
new file mode 100644
index 00000000..41ea4539
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/GlobalUsing.cs
@@ -0,0 +1,25 @@
+global using Contoso.Shopping.Application.Adapters.Products;
+global using Contoso.Shopping.Application.Repositories;
+global using Contoso.Shopping.Infrastructure.Clients;
+global using Contoso.Shopping.Infrastructure.Mapping;
+global using Contoso.Shopping.Infrastructure.Repositories;
+global using CoreEx;
+global using CoreEx.Data.Models;
+global using CoreEx.Database;
+global using CoreEx.Database.SqlServer;
+global using CoreEx.Database.SqlServer.Outbox;
+global using CoreEx.DependencyInjection;
+global using CoreEx.DomainDriven;
+global using CoreEx.Entities;
+global using CoreEx.EntityFrameworkCore;
+global using CoreEx.EntityFrameworkCore.Converters;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Json;
+global using CoreEx.Mapping;
+global using CoreEx.Results;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using System.Net.Http.Json;
+global using System.Text.Json.Serialization;
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketIntoMapper.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketIntoMapper.cs
new file mode 100644
index 00000000..7ff27ac4
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketIntoMapper.cs
@@ -0,0 +1,15 @@
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+internal sealed class BasketIntoMapper : IntoMapper<Domain.Basket, Persistence.Basket, BasketIntoMapper>
+{
+    protected override void OnMapInto(Domain.Basket source, Persistence.Basket destination)
+    {
+        destination.Id = source.Id;
+        destination.CustomerId = source.CustomerId;
+        destination.BasketStatusCode = source.Status;
+        destination.SubTotal = source.SubTotal;
+        destination.DiscountCouponCode = source.DiscountCoupon?.Code;
+        destination.DiscountAmount = source.DiscountAmount;
+        destination.Total = source.Total;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketItemIntoMapper.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketItemIntoMapper.cs
new file mode 100644
index 00000000..cf0e558b
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketItemIntoMapper.cs
@@ -0,0 +1,15 @@
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+internal sealed class BasketItemIntoMapper : IntoMapper<Domain.BasketItem, Persistence.BasketItem, BasketItemIntoMapper>
+{
+    protected override void OnMapInto(Domain.BasketItem source, Persistence.BasketItem destination)
+    {
+        destination.Id = source.Id;
+        destination.ProductId = source.ProductId;
+        destination.Sku = source.Sku;
+        destination.Text = source.Text;
+        destination.UnitOfMeasureCode = source.Pricing.UnitOfMeasure;
+        destination.Quantity = source.Pricing.Quantity;
+        destination.UnitPrice = source.Pricing.UnitPrice;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketMapper.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketMapper.cs
new file mode 100644
index 00000000..ed845743
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketMapper.cs
@@ -0,0 +1,29 @@
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+public class BasketMapper : Mapper<Persistence.Basket, Domain.Basket, BasketMapper>
+{
+    protected override Domain.Basket OnMap(Persistence.Basket source)
+    {
+        var items = source.Items?.Select(i => Domain.BasketItem.CreateFrom(
+            i.Id,
+            i.ProductId,
+            i.Sku,
+            i.Text,
+            new Domain.ValueObjects.ItemPricing
+            {
+                UnitOfMeasure = i.UnitOfMeasureCode,
+                Quantity = i.Quantity,
+                UnitPrice = i.UnitPrice
+            },
+            i.ETag));
+
+        return Domain.Basket.CreateFrom(
+            source.Id,
+            source.CustomerId,
+            source.BasketStatusCode,
+            source.DiscountCouponCode,
+            items,
+            ChangeLog.CreateFrom(source),
+            source.ETag);
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketStatusMapper.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketStatusMapper.g.cs
new file mode 100644
index 00000000..99995c41
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/BasketStatusMapper.g.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.BasketStatus"/> to <see cref="Contracts.BasketStatus"/>.</summary>
+internal partial class BasketStatusMapper : Mapper<Persistence.BasketStatus, Contracts.BasketStatus, BasketStatusMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.BasketStatus OnMap(Persistence.BasketStatus source)
+    {
+        var destination = new Contracts.BasketStatus
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.BasketStatus source, Contracts.BasketStatus destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/DiscountCouponMapper.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/DiscountCouponMapper.g.cs
new file mode 100644
index 00000000..1469338f
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/DiscountCouponMapper.g.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.DiscountCoupon"/> to <see cref="Contracts.DiscountCoupon"/>.</summary>
+internal partial class DiscountCouponMapper : Mapper<Persistence.DiscountCoupon, Contracts.DiscountCoupon, DiscountCouponMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.DiscountCoupon OnMap(Persistence.DiscountCoupon source)
+    {
+        var destination = new Contracts.DiscountCoupon
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag,
+            DiscountPercentage = source.DiscountPercentage
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.DiscountCoupon source, Contracts.DiscountCoupon destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/ProductMapper.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/ProductMapper.cs
new file mode 100644
index 00000000..38d9c759
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/ProductMapper.cs
@@ -0,0 +1,26 @@
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+public class ProductMapper : BiDirectionMapper<Product, Persistence.Product, ProductMapper>
+{
+    protected override Persistence.Product OnMap(Product source) => new()
+    {
+        Id = source.Id!,
+        Sku = source.Sku!,
+        Text = source.Text!,
+        UnitOfMeasureCode = source.UnitOfMeasureCode!,
+        Price = source.Price,
+        IsInactive = source.IsInactive,
+        IsNonStocked = source.IsNonStocked
+    };
+
+    protected override Product OnMap(Persistence.Product source) => new()
+    {
+        Id = source.Id,
+        Sku = source.Sku,
+        Text = source.Text,
+        UnitOfMeasureCode = source.UnitOfMeasureCode,
+        Price = source.Price,
+        IsInactive = source.IsInactive,
+        IsNonStocked = source.IsNonStocked
+    };
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Mapping/UnitOfMeasureMapper.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Mapping/UnitOfMeasureMapper.g.cs
new file mode 100644
index 00000000..83329cdd
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Mapping/UnitOfMeasureMapper.g.cs
@@ -0,0 +1,39 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Mapping;
+
+/// <summary>Provides mapping from <see cref="Persistence.UnitOfMeasure"/> to <see cref="Contracts.UnitOfMeasure"/>.</summary>
+internal partial class UnitOfMeasureMapper : Mapper<Persistence.UnitOfMeasure, Contracts.UnitOfMeasure, UnitOfMeasureMapper>
+{
+    /// <inheritdoc/>
+    protected override Contracts.UnitOfMeasure OnMap(Persistence.UnitOfMeasure source)
+    {
+        var destination = new Contracts.UnitOfMeasure
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag,
+            Scale = source.Scale
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend(Persistence.UnitOfMeasure source, Contracts.UnitOfMeasure destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/Basket.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/Basket.cs
new file mode 100644
index 00000000..40f3f0b1
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/Basket.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+public partial class Basket
+{
+    public List<BasketItem>? Items { get; set; }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/Basket.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/Basket.g.cs
new file mode 100644
index 00000000..6a5a6f09
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/Basket.g.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>[Shopping].[Basket]</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>BasketId</c>' (type '<c>NVARCHAR(50)</c>').</remarks>
+public partial class Basket : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>CustomerId</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string CustomerId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>BasketStatusCode</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string BasketStatusCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>SubTotal</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal SubTotal { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>DiscountCouponCode</c>' column (type '<c>NVARCHAR(50) NULL</c>').</summary>
+    public string? DiscountCouponCode { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>DiscountAmount</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal DiscountAmount { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>Total</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal Total { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/BasketItem.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/BasketItem.g.cs
new file mode 100644
index 00000000..e96e04ff
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/BasketItem.g.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>[Shopping].[BasketItem]</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>BasketItemId</c>' (type '<c>NVARCHAR(50)</c>').</remarks>
+public partial class BasketItem : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>BasketId</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string BasketId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>ProductId</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string ProductId { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>Sku</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string Sku { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>Text</c>' column (type '<c>NVARCHAR(250)</c>').</summary>
+    public string Text { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>UnitOfMeasureCode</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string UnitOfMeasureCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>UnitPrice</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal UnitPrice { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>Quantity</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal Quantity { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/BasketStatus.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/BasketStatus.g.cs
new file mode 100644
index 00000000..f88ea9c2
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/BasketStatus.g.cs
@@ -0,0 +1,14 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>[Shopping].[BasketStatus]</c>' database table.</summary>
+public partial class BasketStatus : ReferenceDataModelBase<string> { }
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/DiscountCoupon.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/DiscountCoupon.g.cs
new file mode 100644
index 00000000..c999dc61
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/DiscountCoupon.g.cs
@@ -0,0 +1,18 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>[Shopping].[DiscountCoupon]</c>' database table.</summary>
+public partial class DiscountCoupon : ReferenceDataModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>DiscountPercentage</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal DiscountPercentage { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/Product.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/Product.g.cs
new file mode 100644
index 00000000..693f08de
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/Product.g.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+/// <summary>Persistence model representing the '<c>[Shopping].[Product]</c>' database table.</summary>
+/// <remarks>The <see cref="Id"/> primary key column is '<c>ProductId</c>' (type '<c>NVARCHAR(50)</c>').</remarks>
+public partial class Product : ModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>Sku</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string Sku { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>Text</c>' column (type '<c>NVARCHAR(250)</c>').</summary>
+    public string Text { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>UnitOfMeasureCode</c>' column (type '<c>NVARCHAR(50)</c>').</summary>
+    public string UnitOfMeasureCode { get; set; } = default!;
+
+    /// <summary>Gets or sets the value of the '<c>Price</c>' column (type '<c>DECIMAL(18, 2)</c>').</summary>
+    public decimal Price { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>IsInactive</c>' column (type '<c>BIT</c>').</summary>
+    public bool IsInactive { get; set; }
+
+    /// <summary>Gets or sets the value of the '<c>IsNonStocked</c>' column (type '<c>BIT</c>').</summary>
+    public bool IsNonStocked { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Persistence/UnitOfMeasure.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Persistence/UnitOfMeasure.g.cs
new file mode 100644
index 00000000..0844c715
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Persistence/UnitOfMeasure.g.cs
@@ -0,0 +1,18 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Persistence;
+
+/// <summary>Persistence reference-data model representing the '<c>[Shopping].[UnitOfMeasure]</c>' database table.</summary>
+public partial class UnitOfMeasure : ReferenceDataModelBase<string>
+{
+    /// <summary>Gets or sets the value of the '<c>Scale</c>' column (type '<c>INT</c>').</summary>
+    public int Scale { get; set; }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Repositories/BasketRepository.cs b/samples/src/Contoso.Shopping.Infrastructure/Repositories/BasketRepository.cs
new file mode 100644
index 00000000..839511e1
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Repositories/BasketRepository.cs
@@ -0,0 +1,71 @@
+namespace Contoso.Shopping.Infrastructure.Repositories;
+
+[ScopedService<IBasketRepository>]
+public class BasketRepository(ShoppingEfDb ef) : IBasketRepository
+{
+    private readonly ShoppingEfDb _ef = ef.ThrowIfNull();
+
+    public Task<Result<Domain.Basket>> GetAsync(string id) => Result
+        .GoAsync(() => _ef.Baskets.GetWithResultAsync(id))
+        .ThenAs(model => BasketMapper.Map(model));
+
+    public Task<Result<Domain.Basket>> CreateAsync(Domain.Basket basket) => Result
+        .Go(() =>
+        {
+            var model = new Persistence.Basket();
+            BasketIntoMapper.MapInto(basket, model);
+            return SynchronizeItems(basket, model);
+        })
+        .ThenAsAsync(model => _ef.Baskets.CreateWithResultAsync(model))
+        .ThenAs(b => BasketMapper.Map(b));
+
+    public Task<Result<Domain.Basket>> UpdateAsync(Domain.Basket basket) => Result
+        .GoAsync(() => _ef.Baskets.GetWithResultAsync(basket.Id))
+        .Then(model =>
+        {
+            BasketIntoMapper.MapInto(basket, model);
+            return SynchronizeItems(basket, model);
+        })
+        .ThenAsAsync(model => _ef.Baskets.UpdateWithResultAsync(model))
+        .ThenAs(basket => BasketMapper.Map(basket));
+
+    /// <summary>
+    /// Synchronize the items between the domain and model, ensuring the appropriate EntityState is set for each item based on its PersistenceState.
+    /// </summary>
+    private Result<Persistence.Basket> SynchronizeItems(Domain.Basket basket, Persistence.Basket model)
+    {
+        _ef.DbContext.Entry(model).State = EntityState.Modified; // Ensure parent is marked as modified.
+
+        for (var i = 0; i < basket.Items.Count; i++)
+        {
+            switch (basket.Items[i].PersistenceState)
+            {
+                case PersistenceState.New:
+                    var itemModel = new Persistence.BasketItem { BasketId = model.Id };
+                    BasketItemIntoMapper.MapInto(basket.Items[i], itemModel);
+                    model.Items ??= [];
+                    model.Items.Add(itemModel);
+                    _ef.DbContext.Entry(itemModel).State = EntityState.Added;
+                    break;
+
+                case PersistenceState.Modified:
+                    itemModel = model.Items!.SingleOrDefault(x => x.Id == basket.Items[i].Id) ?? throw new ConcurrencyException(/* Edge-case: item no longer exists */).WithErrorCode("item-no-longer-exists").WithKey(basket.Items[i].Id);
+                    if (!ETag.TryCompare(basket.Items[i], itemModel)) // Ensure item etag matches as EF-caches/uses its own read value.
+                        return Result.ConcurrencyError();
+
+                    BasketItemIntoMapper.MapInto(basket.Items[i], itemModel);
+                    _ef.DbContext.Entry(itemModel).State = EntityState.Modified;
+                    break;
+
+                case PersistenceState.Removed:
+                    itemModel = model.Items!.SingleOrDefault(x => x.Id == basket.Items[i].Id);
+                    if (itemModel is not null)
+                        _ef.DbContext.Entry(itemModel).State = EntityState.Deleted;
+
+                    break;
+            }
+        }
+
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Repositories/ReferenceDataRepository.cs b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ReferenceDataRepository.cs
new file mode 100644
index 00000000..45d6d248
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ReferenceDataRepository.cs
@@ -0,0 +1,3 @@
+namespace Contoso.Shopping.Infrastructure.Repositories;
+
+public partial class ReferenceDataRepository(ShoppingEfDb ef) { }
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Repositories/ReferenceDataRepository.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ReferenceDataRepository.g.cs
new file mode 100644
index 00000000..95f11ced
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ReferenceDataRepository.g.cs
@@ -0,0 +1,28 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.CodeGen'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Repositories;
+
+/// <summary>Provides the underlying reference-data repository.</summary>
+[ScopedService<IReferenceDataRepository>]
+public partial class ReferenceDataRepository : IReferenceDataRepository
+{
+    /// <inheritdoc/>
+    public Task<Contracts.BasketStatusCollection> GetAllBasketStatusesAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.BasketStatus>().Query().ToMappedItemsAsync<Persistence.BasketStatus, Contracts.BasketStatusCollection, Contracts.BasketStatus>(BasketStatusMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.DiscountCouponCollection> GetAllDiscountCouponsAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.DiscountCoupon>().Query().ToMappedItemsAsync<Persistence.DiscountCoupon, Contracts.DiscountCouponCollection, Contracts.DiscountCoupon>(DiscountCouponMapper.Map, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<Contracts.UnitOfMeasureCollection> GetAllUnitsOfMeasureAsync(CancellationToken cancellationToken = default)
+        => ef.ThrowIfNull().Model<Persistence.UnitOfMeasure>().Query().ToMappedItemsAsync<Persistence.UnitOfMeasure, Contracts.UnitOfMeasureCollection, Contracts.UnitOfMeasure>(UnitOfMeasureMapper.Map, cancellationToken);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingDbContext.cs b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingDbContext.cs
new file mode 100644
index 00000000..42add495
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingDbContext.cs
@@ -0,0 +1,35 @@
+namespace Contoso.Shopping.Infrastructure.Repositories;
+
+public partial class ShoppingDbContext(DbContextOptions<ShoppingDbContext> options, SqlServerDatabase database) : DbContext(options), IEfDbContext
+{
+    /// <inheritdoc/>
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        // Uses IDatabase.Connection to ensure the same database/connection is used.
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseSqlServer(BaseDatabase.Connection, contextOwnsConnection: false).EnableDetailedErrors(true);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        // Add the generated models to the model builder.
+        AddGeneratedModels(modelBuilder);
+
+        // Extend the 'Shopping.Basket' model configuration.
+        modelBuilder.ThrowIfNull().Entity<Persistence.Basket>(e =>
+        {
+            e.HasMany(r => r.Items).WithOne().HasPrincipalKey(p => p.Id).HasForeignKey(p => p.BasketId).OnDelete(DeleteBehavior.ClientCascade);
+            e.Navigation(r => r.Items).AutoInclude(true);
+        });
+    }
+
+    /// <summary>Adds the CodeGen-generated entity models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(ModelBuilder modelBuilder);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingDbContext.g.cs b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingDbContext.g.cs
new file mode 100644
index 00000000..24c43afe
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingDbContext.g.cs
@@ -0,0 +1,128 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by 'Contoso.Shopping.Database'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace Contoso.Shopping.Infrastructure.Repositories;
+
+public partial class ShoppingDbContext
+{
+    /// <summary>Adds the generated models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="Microsoft.EntityFrameworkCore.ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(Microsoft.EntityFrameworkCore.ModelBuilder modelBuilder)
+    {
+        // Add the entity/model configuration for the [Shopping].[BasketStatus] database table.
+        modelBuilder.Entity<Contoso.Shopping.Infrastructure.Persistence.BasketStatus>(e =>
+        {
+            e.ToTable("BasketStatus", "Shopping");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("BasketStatusId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Code).HasColumnName("Code").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.IsActive).HasColumnName("IsActive").HasColumnType("BIT");
+            e.Property(p => p.SortOrder).HasColumnName("SortOrder").HasColumnType("INT");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the [Shopping].[DiscountCoupon] database table.
+        modelBuilder.Entity<Contoso.Shopping.Infrastructure.Persistence.DiscountCoupon>(e =>
+        {
+            e.ToTable("DiscountCoupon", "Shopping");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("DiscountCouponId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Code).HasColumnName("Code").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.IsActive).HasColumnName("IsActive").HasColumnType("BIT");
+            e.Property(p => p.SortOrder).HasColumnName("SortOrder").HasColumnType("INT");
+            e.Property(p => p.DiscountPercentage).HasColumnName("DiscountPercentage").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.StartsOn).HasColumnName("StartsOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.EndsOn).HasColumnName("EndsOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description);
+        });
+
+        // Add the entity/model configuration for the [Shopping].[UnitOfMeasure] database table.
+        modelBuilder.Entity<Contoso.Shopping.Infrastructure.Persistence.UnitOfMeasure>(e =>
+        {
+            e.ToTable("UnitOfMeasure", "Shopping");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("UnitOfMeasureId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Code).HasColumnName("Code").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.IsActive).HasColumnName("IsActive").HasColumnType("BIT");
+            e.Property(p => p.SortOrder).HasColumnName("SortOrder").HasColumnType("INT");
+            e.Property(p => p.Scale).HasColumnName("Scale").HasColumnType("INT");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.Description).Ignore(p => p.StartsOn).Ignore(p => p.EndsOn);
+        });
+
+        // Add the entity/model configuration for the [Shopping].[Basket] database table.
+        modelBuilder.Entity<Contoso.Shopping.Infrastructure.Persistence.Basket>(e =>
+        {
+            e.ToTable("Basket", "Shopping");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("BasketId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.CustomerId).HasColumnName("CustomerId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.BasketStatusCode).HasColumnName("BasketStatusCode").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.SubTotal).HasColumnName("SubTotal").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.DiscountCouponCode).HasColumnName("DiscountCouponCode").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.DiscountAmount).HasColumnName("DiscountAmount").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.Total).HasColumnName("Total").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+        });
+
+        // Add the entity/model configuration for the [Shopping].[BasketItem] database table.
+        modelBuilder.Entity<Contoso.Shopping.Infrastructure.Persistence.BasketItem>(e =>
+        {
+            e.ToTable("BasketItem", "Shopping");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("BasketItemId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.BasketId).HasColumnName("BasketId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.ProductId).HasColumnName("ProductId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Sku).HasColumnName("Sku").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UnitOfMeasureCode).HasColumnName("UnitOfMeasureCode").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.UnitPrice).HasColumnName("UnitPrice").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.Quantity).HasColumnName("Quantity").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+            e.Ignore(p => p.CreatedBy).Ignore(p => p.CreatedOn).Ignore(p => p.UpdatedBy).Ignore(p => p.UpdatedOn);
+        });
+
+        // Add the entity/model configuration for the [Shopping].[Product] database table.
+        modelBuilder.Entity<Contoso.Shopping.Infrastructure.Persistence.Product>(e =>
+        {
+            e.ToTable("Product", "Shopping");
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("ProductId").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Sku).HasColumnName("Sku").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(250)");
+            e.Property(p => p.UnitOfMeasureCode).HasColumnName("UnitOfMeasureCode").HasColumnType("NVARCHAR(50)");
+            e.Property(p => p.Price).HasColumnName("Price").HasColumnType("DECIMAL(18, 2)");
+            e.Property(p => p.IsInactive).HasColumnName("IsInactive").HasColumnType("BIT");
+            e.Property(p => p.IsNonStocked).HasColumnName("IsNonStocked").HasColumnType("BIT");
+            e.Ignore(p => p.CreatedBy).Ignore(p => p.CreatedOn).Ignore(p => p.UpdatedBy).Ignore(p => p.UpdatedOn).Ignore(p => p.ETag);
+        });
+    }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingEfDb.cs b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingEfDb.cs
new file mode 100644
index 00000000..580dfcd2
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Infrastructure/Repositories/ShoppingEfDb.cs
@@ -0,0 +1,18 @@
+namespace Contoso.Shopping.Infrastructure.Repositories;
+
+public sealed class ShoppingEfDb(ShoppingDbContext dbContext) : EfDb<ShoppingDbContext>(dbContext, _options)
+{
+    private static readonly EfDbOptions _options = new();
+
+    public EfDbModel<Persistence.BasketStatus> BasketStatuses => Model<Persistence.BasketStatus>();
+
+    public EfDbModel<Persistence.DiscountCoupon> DiscountCoupons => Model<Persistence.DiscountCoupon>();
+
+    public EfDbModel<Persistence.UnitOfMeasure> UnitsOfMeasure => Model<Persistence.UnitOfMeasure>();
+
+    public EfDbModel<Persistence.Basket> Baskets => Model<Persistence.Basket>();
+
+    public EfDbModel<Persistence.BasketItem> BasketItems => Model<Persistence.BasketItem>();
+
+    public EfDbModel<Persistence.Product> Products => Model<Persistence.Product>();
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.csproj b/samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.csproj
new file mode 100644
index 00000000..ec39498f
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Infrastructure\Contoso.Shopping.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="Azure.Experimental.EnableActivitySource" Value="true" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.http b/samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.http
new file mode 100644
index 00000000..e8087ec5
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Relay/Contoso.Shopping.Relay.http
@@ -0,0 +1,6 @@
+@Contoso.Shopping.Relay_HostAddress = http://localhost:5090
+
+GET {{Contoso.Shopping.Relay_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/samples/src/Contoso.Shopping.Relay/Program.cs b/samples/src/Contoso.Shopping.Relay/Program.cs
new file mode 100644
index 00000000..7949416d
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Relay/Program.cs
@@ -0,0 +1,65 @@
+using CoreEx.Azure.Messaging.ServiceBus;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+
+namespace Contoso.Shopping.Relay;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddMvcWebApi()
+            .AddHttpWebApi()
+            .AddHostedServiceManager();
+
+        // Add the repository and related outbox services.
+        builder.AddSqlServerClient("SqlServer");        // Adds the SqlServerClient (using Aspire library).
+        builder.Services
+            .AddSqlServerDatabase()                     // Adds the SqlServerDatabase.
+            .AddSqlServerUnitOfWork()                   // Adds the SqlServerUnitOfWork for the SqlServerDatabase.
+            .AddSqlServerOutboxRelay();                 // Adds the SqlServerOutboxRelay.
+
+        // Adds the SqlServerOutboxRelayHostedService.
+        builder.AddSqlServerOutboxRelayHostedService();
+
+        // Add the Azure Service Bus services.
+        builder.AddAzureServiceBusClient("ServiceBus"); // Adds azure service bus client using aspire.
+        builder.Services.AddAzureServiceBusPublisher((_, c) =>  // Adds the service bus as the IEventPublisher.
+        {
+            c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;  // Use a partition-id as the session-id.
+        });
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .WithCoreExSqlServerTelemetry()
+            .WithCoreExServiceBusTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseExecutionContext();
+
+        app.MapHealthChecks();
+        app.MapHostedServices();
+
+        // Run the application.
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Relay/Properties/launchSettings.json b/samples/src/Contoso.Shopping.Relay/Properties/launchSettings.json
new file mode 100644
index 00000000..f564babf
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Relay/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5090",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:7000;http://localhost:5090",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/samples/src/Contoso.Shopping.Relay/appsettings.Development.json b/samples/src/Contoso.Shopping.Relay/appsettings.Development.json
new file mode 100644
index 00000000..b2a2cccf
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Relay/appsettings.Development.json
@@ -0,0 +1,27 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Relay/appsettings.json b/samples/src/Contoso.Shopping.Relay/appsettings.json
new file mode 100644
index 00000000..d73f602d
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Relay/appsettings.json
@@ -0,0 +1,25 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Shopping",
+      "Services": {
+        "Interval": "00:00:00.500",
+        "OutboxRelay": {
+          "BatchSize": 10,
+          "PerWorkerPartitionCount": 2,
+          "LeaseDuration": "00:00:05",
+          "BackoffDuration": "00:00:05",
+          "ServicesCount": 4
+        }
+      }
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.csproj b/samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.csproj
new file mode 100644
index 00000000..d5d18625
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Application\Contoso.Shopping.Application.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Infrastructure\Contoso.Shopping.Infrastructure.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="Azure.Experimental.EnableActivitySource" Value="true" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.http b/samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.http
new file mode 100644
index 00000000..e156ce6c
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/Contoso.Shopping.Subscribe.http
@@ -0,0 +1,6 @@
+@Contoso.Shopping.Subscribe_HostAddress = http://localhost:5057
+
+GET {{Contoso.Shopping.Subscribe_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/samples/src/Contoso.Shopping.Subscribe/GlobalUsing.cs b/samples/src/Contoso.Shopping.Subscribe/GlobalUsing.cs
new file mode 100644
index 00000000..08ab16b2
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/GlobalUsing.cs
@@ -0,0 +1,9 @@
+global using Contoso.Shopping.Application.Adapters.Products;
+global using Contoso.Shopping.Application.Validators;
+global using CoreEx;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Events;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Json;
+global using CoreEx.Results;
+global using CoreEx.Validation;
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Subscribe/Program.cs b/samples/src/Contoso.Shopping.Subscribe/Program.cs
new file mode 100644
index 00000000..9800f9dc
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/Program.cs
@@ -0,0 +1,127 @@
+using Contoso.Shopping.Application;
+using Contoso.Shopping.Infrastructure.Clients;
+using Contoso.Shopping.Infrastructure.Repositories;
+using Contoso.Shopping.Subscribe.Subscribers;
+using CoreEx.Azure.Messaging.ServiceBus;
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace Contoso.Shopping.Subscribe;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddReferenceDataOrchestrator()
+            .AddMvcWebApi()
+            .AddHttpWebApi()
+            .AddHostedServiceManager();
+
+        // Add all the dynamically registered services.
+        builder.Services.AddDynamicServicesUsing<ProductModifySubscriber, ReferenceDataService, ReferenceDataRepository>();
+
+        // Add L1/L2 caching services.
+        builder.Services.AddMemoryCache();              // Adds the in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Adds Redis as the distributed cache (using Aspire library) - L2.
+
+        // Add and wire-up FusionCache including backplane.
+        builder.Services.AddFusionCache()
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        // Add CoreEx caching services.
+        builder.Services
+            .AddFusionHybridCache()                     // Adds the CoreEx.Caching.IHybridCache for FusionCache.
+            .AddDefaultCacheKeyProvider()               // Adds the default CoreEx.Caching.ICacheKeyProvider.
+            .AddHybridCacheIdempotencyProvider();       // Adds the CoreEx.Caching.Idempotency.IIdempotencyProvider.
+
+        // Add the repository and related outbox services.
+        builder.AddSqlServerClient("SqlServer");        // Adds the SqlServerClient (using Aspire library).
+        builder.Services
+            .AddSqlServerDatabase()                     // Adds the SqlServerDatabase.
+            .AddSqlServerUnitOfWork()                   // Adds the SqlServerUnitOfWork for the SqlServerDatabase.
+            .AddSqlServerOutboxPublisher()              // Adds the SqlServerOutboxPublisher for the SqlServerUnitOfWork.
+            .AddDbContext<ShoppingDbContext>()          // Adds the standard  EF DbContext.
+            .AddEfDb<ShoppingEfDb>();                   // Adds the CoreEx extended EF service.
+
+        // Add Azure Service Bus client using Aspire.
+        builder.AddAzureServiceBusClient("ServiceBus");
+        builder.Services.AddAzureServiceBusPublisher((_, c) =>  // Adds the service bus as the IEventPublisher.
+        {
+            c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;  // Use a partition-id as the session-id.
+        }, addAsDefaultIEventPublisher: false);
+
+        // Add event formatter and subscribed-manager.
+        builder.Services
+            .AddEventFormatter()                                                               // Adds the EventFormatter to enable message parsing.
+            .AddSubscribedManager((_, c) => c.AddSubscribersUsing<ProductModifySubscriber>()); // Adds the SubscribedManager and dynamically links to the individual Subscribers.
+
+        // Creates the Azure Service Bus receiving services builder.
+        builder.Services.AzureServiceBusReceiving()
+            .WithSessionReceiver(_ =>
+            {                                                                                          // Adds the service bus receiver to pump messages to the subscriber.
+                var o = ServiceBusSessionReceiverOptions.CreateForTopicSubscription();                 // Set the topic and subscription from configuration. 
+                o.SessionProcessorOptions.MaxConcurrentSessions = 4;                                   // Set the maximum number of concurrent sessions to process.
+                return o;
+            })
+            .WithSubscribedSubscriber()                                                                // Adds the service bus subscriber using the ^ SubscribedManager.
+            .WithHostedService()                                                                       // Adds the ^ service bus receiver as a hosted service.
+            .Build();                                                                                  // Builds all the ^ services and adds to the service collection.
+
+        // Add external API services.
+        builder.AddTypedHttpClient<ProductsHttpClient>("ProductsApi");
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .WithCoreExServiceBusTelemetry()
+            .WithCoreExSqlServerTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+        app.MapHostedServices();
+
+        // Run the application.
+        app.Run();
+    }
+}
diff --git a/samples/src/Contoso.Shopping.Subscribe/Properties/launchSettings.json b/samples/src/Contoso.Shopping.Subscribe/Properties/launchSettings.json
new file mode 100644
index 00000000..c5eea470
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/Properties/launchSettings.json
@@ -0,0 +1,23 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "http://localhost:5057",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": false,
+      "applicationUrl": "https://localhost:7088;http://localhost:5057",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductDeleteSubscriber.cs b/samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductDeleteSubscriber.cs
new file mode 100644
index 00000000..dfc64931
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductDeleteSubscriber.cs
@@ -0,0 +1,11 @@
+namespace Contoso.Shopping.Subscribe.Subscribers;
+
+[ScopedService]
+[Subscribe("contoso.products.product.deleted")]
+public class ProductDeleteSubscriber(IProductSyncAdapter adapter) : SubscribedBase
+{
+    private readonly IProductSyncAdapter _adapter = adapter.ThrowIfNull();
+
+    protected override Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => _adapter.DeleteAsync(@event.Key.Required());
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductModifySubscriber.cs b/samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductModifySubscriber.cs
new file mode 100644
index 00000000..070019f5
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/Subscribers/ProductModifySubscriber.cs
@@ -0,0 +1,14 @@
+namespace Contoso.Shopping.Subscribe.Subscribers;
+
+[ScopedService]
+[Subscribe("contoso.products.product.created.v1")]
+[Subscribe("contoso.products.product.updated.v1")]
+public class ProductModifySubscriber(IProductSyncAdapter adapter) : SubscribedBase<Product>
+{
+    private readonly IProductSyncAdapter _adapter = adapter.ThrowIfNull();
+
+    public override IValidator<Product>? ValueValidator => ProductValidator.Default;
+
+    protected override Task<Result> OnReceiveAsync(Product value, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => _adapter.ModifyAsync(value);
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Subscribe/appsettings.Development.json b/samples/src/Contoso.Shopping.Subscribe/appsettings.Development.json
new file mode 100644
index 00000000..690b25e5
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/appsettings.Development.json
@@ -0,0 +1,43 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "Azure.Messaging.ServiceBus": "Critical",
+      "CoreEx.Azure.Messaging.ServiceBus": "Warning"
+    }
+  },
+  "Aspire": {
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    },
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;",
+          "QueueOrTopicName": "contoso",
+          "SubscriptionName": "shopping"
+        }
+      }
+    }
+  },
+  "ProductsApi": {
+    "BaseAddress": "https://localhost:7200"
+  }
+}
\ No newline at end of file
diff --git a/samples/src/Contoso.Shopping.Subscribe/appsettings.json b/samples/src/Contoso.Shopping.Subscribe/appsettings.json
new file mode 100644
index 00000000..6c943a3c
--- /dev/null
+++ b/samples/src/Contoso.Shopping.Subscribe/appsettings.json
@@ -0,0 +1,18 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Contoso",
+      "DomainName": "Shopping"
+    },
+    "Events": {
+      "Destination": "contoso" // Topic/queue name.
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Contoso.E2E.Runner.csproj b/samples/tests/Contoso.E2E.Runner/Contoso.E2E.Runner.csproj
new file mode 100644
index 00000000..8172b1b1
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Contoso.E2E.Runner.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
+    <PackageReference Include="Microsoft.Extensions.Http" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="Spectre.Console" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Orders.Contracts\Contoso.Orders.Contracts.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Test.Common\Contoso.Orders.Test.Common.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Test.Common\Contoso.Products.Test.Common.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Test.Common\Contoso.Shopping.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.E2E.Runner/GlobalUsing.cs b/samples/tests/Contoso.E2E.Runner/GlobalUsing.cs
new file mode 100644
index 00000000..26a0d445
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/GlobalUsing.cs
@@ -0,0 +1,17 @@
+global using Contoso.E2E.Runner.Infrastructure;
+global using Contoso.E2E.Runner.Scenarios;
+global using Contoso.Products.Contracts;
+global using Contoso.Shopping.Contracts;
+global using CoreEx;
+global using CoreEx.Json;
+global using DbEx;
+global using DbEx.Migration;
+global using DbEx.Postgres.Migration;
+global using DbEx.SqlServer.Migration;
+global using Microsoft.Extensions.Configuration;
+global using Spectre.Console;
+global using System.Collections.Concurrent;
+global using System.Diagnostics;
+global using System.Net.Http.Json;
+global using System.Reflection;
+global using System.Text;
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/ChoiceManager.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/ChoiceManager.cs
new file mode 100644
index 00000000..c775b861
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/ChoiceManager.cs
@@ -0,0 +1,60 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Provides a menu of choices for the user to select which scenario or set-up to run, and manages the execution of those choices.
+/// </summary>
+/// <param name="context">The <see cref="TestContext"/>.</param>
+public class ChoiceManager(TestContext context)
+{
+    private const string _requiresApi = " [grey](requires APIs)[/]";
+    private readonly TestContext _context = context;
+    private readonly Dictionary<string, (ScenarioDefinition? Definition, int Group, Func<Task> RunAsync, ChoiceResult Result)> _choicesCache = [];
+
+    /// <summary>
+    /// Caches choices so they can be displayed and executed efficiently.
+    /// </summary>
+    public void CacheChoices()
+    {
+        Task<List<StepResult>> RunScenarioAsync(ScenarioDefinition scenarioDefinition) => new ScenarioRunner(_context).RunScenarioAsync(scenarioDefinition);
+
+        int i = 1;
+        foreach (var setUp in _context.SetUps)
+            _choicesCache.Add($"{i++}. {setUp.Value.Text}{(setUp.Value.Attribute.RequiresApi ? _requiresApi : string.Empty)}", (setUp.Value, 0, () => RunScenarioAsync(setUp.Value), ChoiceResult.ContinueWithPrompt));
+
+        foreach (var scenario in _context.Scenarios)
+            _choicesCache.Add($"{i++}. {scenario.Value.Text}{(scenario.Value.Attribute.RequiresApi ? _requiresApi : string.Empty)}", (scenario.Value, 1, () => RunScenarioAsync(scenario.Value), ChoiceResult.ContinueWithPrompt));
+
+        _choicesCache.Add($"{i++}. Run all scenarios as simulation{_requiresApi}", (null, 1, () => new LoadSimulationRunner(_context).RunAsync(), ChoiceResult.Continue));
+        _choicesCache.Add($"{i++}. Retry APIs", (null, -2, () => Task.CompletedTask, ChoiceResult.RetryApi));
+        _choicesCache.Add($"{i++}. Exit", (null, -1, () => Task.CompletedTask, ChoiceResult.Stop));
+    }
+
+    /// <summary>
+    /// Adds the cached choices to the provided <see cref="SelectionPrompt{T}"/>, grouped by set-ups, scenarios, and other options.
+    /// </summary>
+    public SelectionPrompt<string> AddRunnerChoices(SelectionPrompt<string> prompt)
+    {
+        if (_choicesCache.Count == 0)
+            CacheChoices();
+
+        prompt.AddChoiceGroup("Set-up:", _choicesCache.Where(c => c.Value.Group == 0).Select(c => c.Key));
+        prompt.AddChoiceGroup("Scenarios:", _choicesCache.Where(c => c.Value.Group == 1).Select(c => c.Key));
+        prompt.AddChoiceGroup("Other:", _choicesCache.Where(c => c.Value.Group < 0).Select(c => c.Key));
+        return prompt;
+    }
+
+    /// <summary>
+    /// Executes the specified choice asynchronously and returns the result of the operation.
+    /// </summary>
+    public async Task<ChoiceResult> RunChoiceAsync(string choice, bool apisHealthy)
+    {
+        if (!_choicesCache.TryGetValue(choice, out var item))
+            throw new InvalidOperationException($"Invalid choice: {choice}");
+
+        if (item.Definition?.Attribute.RequiresApi == true && !apisHealthy)
+            return ChoiceResult.RequiresApi;
+
+        await item.RunAsync();
+        return item.Result;
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/ChoiceResult.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/ChoiceResult.cs
new file mode 100644
index 00000000..3f5daaf8
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/ChoiceResult.cs
@@ -0,0 +1,13 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Provides the possible results of executing a choice in the <see cref="ChoiceManager"/>.
+/// </summary>
+public enum ChoiceResult
+{
+    Continue,
+    ContinueWithPrompt,
+    Stop,
+    RequiresApi,
+    RetryApi
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationConfig.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationConfig.cs
new file mode 100644
index 00000000..904c6947
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationConfig.cs
@@ -0,0 +1,17 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Configuration for load simulation settings.
+/// </summary>
+public class LoadSimulationConfig
+{
+    /// <summary>
+    /// Gets or sets the number of recent events to display.
+    /// </summary>
+    public int RecentEventsDisplayCount { get; set; } = 5;
+
+    /// <summary>
+    /// Gets or sets the collection of simulator configuration settings, indexed by simulator name.
+    /// </summary>
+    public Dictionary<string, LoadSimulationSimulatorConfig> Simulations { get; set; } = [];
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationRunner.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationRunner.cs
new file mode 100644
index 00000000..49db237f
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationRunner.cs
@@ -0,0 +1,296 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Manages the continuous load simulation with multiple parallel workers.
+/// </summary>
+public class LoadSimulationRunner
+{
+    private readonly TestContext _context;
+    private readonly LoadSimulationConfig _config;
+    private readonly RecentEventsBuffer _recentEvents;
+    private readonly WorkerStatistics _statistics = new();
+    private readonly ConcurrentDictionary<string, WorkerStatistics> _scenarioStatistics = [];
+    private readonly string _errorLogPath;
+    private readonly object _errorLogLock = new();
+    private readonly DateTimeOffset _startTimeUtc = DateTimeOffset.UtcNow;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LoadSimulationRunner"/> class.
+    /// </summary>
+    public LoadSimulationRunner(TestContext context)
+    {
+        _context = context;
+        _config = new LoadSimulationConfig();
+        _context.Config.GetSection("E2E").Bind(_config);
+        _recentEvents = new RecentEventsBuffer(_config.RecentEventsDisplayCount);
+
+        foreach (var scenario in _context.Scenarios)
+            _scenarioStatistics[scenario.Key] = new WorkerStatistics();
+
+        // Set up error log path next to the exe
+        var logsDir = Path.Combine(AppContext.BaseDirectory, "logs");
+        Directory.CreateDirectory(logsDir);
+        _errorLogPath = Path.Combine(logsDir, "load-simulation-errors.log");
+    }
+
+    /// <summary>
+    /// Runs the load simulation until ESC is pressed.
+    /// </summary>
+    public async Task RunAsync()
+    {
+        // Clear screen and start fresh.
+        AnsiConsole.Clear();
+
+        // Initialize error log (overwrite from previous run)
+        File.WriteAllText(_errorLogPath, $"Load Simulation Error Log - {DateTime.Now:yyyy-MM-dd HH:mm:ss}\n");
+        File.AppendAllText(_errorLogPath, new string('=', 80) + "\n\n");
+
+        // Enable cancellation infrastructure.
+        using var cts = new CancellationTokenSource();
+        var cancellationToken = cts.Token;
+
+        // Start workers
+        var workers = new List<Task>();
+        foreach (var scenario in _context.Scenarios)
+            workers.AddRange(RunWorkersAsync(scenario.Key, scenario.Value.Factory, cancellationToken));
+
+        // Use Spectre's built-in spinner.
+        var spinner = Spinner.Known.Dots;
+        var spinnerFrames = spinner.Frames.ToArray();
+        var spinnerIndex = 0;
+
+        // Start display and ESC listener.
+        await AnsiConsole.Live(CreateDisplay(spinnerFrames[0]))
+            .StartAsync(async ctx =>
+            {
+                while (!cancellationToken.IsCancellationRequested)
+                {
+                    // Check for ESC key
+                    if (Console.KeyAvailable && Console.ReadKey(true).Key == ConsoleKey.Escape)
+                    {
+                        cts.Cancel();
+                        break;
+                    }
+
+                    // Update spinner animation.
+                    spinnerIndex = (spinnerIndex + 1) % spinnerFrames.Length;
+
+                    // Update display.
+                    ctx.UpdateTarget(CreateDisplay(spinnerFrames[spinnerIndex]));
+                    await Task.Delay(250);
+                }
+
+                // Wait for all workers to complete their current iteration.
+                await Task.WhenAll(workers);
+
+                // Final display update with actual final stats - checkmark instead of spinner.
+                ctx.UpdateTarget(CreateDisplay("✓"));
+            });
+
+        // Let user see final results
+        AnsiConsole.WriteLine();
+        AnsiConsole.Markup("[grey]Press any key to continue...[/]");
+        Console.ReadKey(true);
+    }
+
+    /// <summary>
+    /// Spins up the configured number or workers and runs them in asynchronously parallel.
+    /// </summary>
+    private List<Task> RunWorkersAsync(string name, Func<IScenario> factory, CancellationToken cancellationToken)
+    {
+        var simulatorConfig = _config.Simulations.GetValueOrDefault(name, new LoadSimulationSimulatorConfig());
+        var workers = new List<Task>();
+
+        for (int i = 0; i < simulatorConfig.Parallelism; i++)
+        {
+            var workerId = i + 1;
+            workers.Add(Task.Run(() => RunWorkerAsync($"{name}-{workerId}", simulatorConfig, factory, cancellationToken), cancellationToken));
+        }
+
+        return workers;
+    }
+
+    /// <summary>
+    /// Create the scenario and run.
+    /// </summary>
+    private Task RunWorkerAsync(string workerName, LoadSimulationSimulatorConfig config, Func<IScenario> factory, CancellationToken cancellationToken)
+    {
+        var scenario = factory();
+        return RunWorkerLoopAsync(config, workerName, scenario, cancellationToken);
+    }
+
+    /// <summary>
+    /// Run the scenario in a loop until canceled.
+    /// </summary>
+    private async Task RunWorkerLoopAsync(LoadSimulationSimulatorConfig config, string workerName, IScenario scenario, CancellationToken cancellationToken)
+    {
+        var results = new List<StepResult>();
+        var context = new ScenarioContext(_context, results, silentMode: true);
+
+        // Extract scenario name from worker name (e.g., "Products-Update-1" -> "Products-Update")
+        var scenarioName = workerName[..workerName.LastIndexOf('-')];
+
+        while (!cancellationToken.IsCancellationRequested)
+        {
+            // Random delay between iterations.
+            if (!cancellationToken.IsCancellationRequested)
+            {
+                var delay = Random.Shared.Next(config.MinDelayMilliseconds, config.MaxDelayMilliseconds);
+                try
+                {
+                    await Task.Delay(delay, cancellationToken);
+                }
+                catch (OperationCanceledException)
+                {
+                    // Expected on cancellation
+                }
+            }
+
+            var sw = Stopwatch.StartNew();
+            results.Clear();
+
+            try
+            {
+                await scenario.RunAsync(context);
+                sw.Stop();
+
+                // Update both global and scenario-specific statistics
+                _statistics.RecordSuccess();
+                _scenarioStatistics[scenarioName].RecordSuccess();
+                _recentEvents.Add(workerName, true, "Completed", sw.Elapsed);
+            }
+            catch (Exception ex)
+            {
+                sw.Stop();
+
+                // Update both global and scenario-specific statistics
+                _statistics.RecordFailure();
+                _scenarioStatistics[scenarioName].RecordFailure();
+
+                // Log full error details to file
+                LogError(workerName, ex);
+
+                var errorMessage = ex.Message.Length > 100 ? ex.Message[..97] + "..." : ex.Message;
+                _recentEvents.Add(workerName, false, $"Failed: {errorMessage}", sw.Elapsed);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Logs full error details to the error log file.
+    /// </summary>
+    private void LogError(string workerName, Exception ex)
+    {
+        lock (_errorLogLock)
+        {
+            var errorEntry = new StringBuilder();
+            errorEntry.AppendLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff}] Worker: {workerName}");
+            errorEntry.AppendLine($"Exception Type: {ex.GetType().FullName}");
+            errorEntry.AppendLine($"Message: {ex.Message}");
+            if (ex.InnerException != null)
+            {
+                errorEntry.AppendLine($"Inner Exception: {ex.InnerException.GetType().FullName}");
+                errorEntry.AppendLine($"Inner Message: {ex.InnerException.Message}");
+            }
+            errorEntry.AppendLine($"Stack Trace:");
+            errorEntry.AppendLine(ex.StackTrace);
+            errorEntry.AppendLine(new string('-', 80));
+            errorEntry.AppendLine();
+
+            File.AppendAllText(_errorLogPath, errorEntry.ToString());
+        }
+    }
+
+    /// <summary>
+    /// Creates the live display panel.
+    /// </summary>
+    private Panel CreateDisplay(string spinnerFrame)
+    {
+        // Create the stats table
+        var totalWorkers = 0;
+        var table = new Table().Border(TableBorder.Rounded).BorderColor(Color.Blue);
+
+        // Make "Failed" column header a clickable link to error log
+        var failedHeader = _statistics.FailureCount > 0
+            ? $"[red][link=file:///{_errorLogPath.Replace('\\', '/')}]Failed[/][/]"
+            : "Failed";
+
+        table.AddColumns(
+            new TableColumn("Scenario").LeftAligned(),
+            new TableColumn("Workers").Centered(),
+            new TableColumn("Iterations").RightAligned(),
+            new TableColumn("Success").RightAligned(),
+            new TableColumn(failedHeader).RightAligned(),
+            new TableColumn("Rate").RightAligned(),
+            new TableColumn("Throughput").RightAligned());
+
+        foreach (var scenario in _context.Scenarios.Keys)
+        {
+            var scenarioStatistics = _scenarioStatistics[scenario];
+            var workers = _config.Simulations[scenario].Parallelism;
+            totalWorkers += workers;
+
+            table.AddRow(
+                scenario.EscapeMarkup(),
+                workers.ToString(),
+                scenarioStatistics.TotalIterations.ToString(),
+                $"[green]{scenarioStatistics.SuccessCount}[/]",
+                $"[red]{scenarioStatistics.FailureCount}[/]",
+                $"{scenarioStatistics.SuccessRate:F1}%",
+                $"{scenarioStatistics.IterationsPerMinute:F0}/min");
+        }
+
+        // Add total row
+        table.AddRow(
+            "[bold]TOTAL[/]",
+            $"[bold]{totalWorkers}[/]",
+            $"[bold]{_statistics.TotalIterations}[/]",
+            $"[green bold]{_statistics.SuccessCount}[/]",
+            $"[red bold]{_statistics.FailureCount}[/]",
+            $"[bold]{_statistics.SuccessRate:F1}%[/]",
+            $"[bold]{_statistics.IterationsPerMinute:F0}/min[/]");
+
+        // Build recent events markup
+        var eventsContent = new StringBuilder();
+        if (_config.RecentEventsDisplayCount > 0)
+        {
+            var recentEvents = _recentEvents.GetRecent();
+
+            if (recentEvents.Count > 0)
+            {
+                eventsContent.AppendLine();
+                eventsContent.AppendLine($"[bold]Recent Events (last {Math.Min(recentEvents.Count, _config.RecentEventsDisplayCount)}):[/]");
+                foreach (var evt in recentEvents.Take(_config.RecentEventsDisplayCount))
+                {
+                    var icon = evt.Success ? "[green]✓[/]" : "[red]✗[/]";
+                    var time = evt.Timestamp.ToString("HH:mm:ss");
+                    var workerName = evt.WorkerName.EscapeMarkup();
+                    var message = evt.Message.EscapeMarkup();
+                    eventsContent.AppendLine($"  {time} [grey]{workerName}[/] {icon} {message} [grey]({evt.Duration.TotalMilliseconds:F0}ms)[/]");
+                }
+            }
+            else
+            {
+                eventsContent.AppendLine();
+                eventsContent.AppendLine("[grey]Waiting for events...[/]");
+            }
+        }
+
+        // Combine table and events using Rows
+        var combinedContent = new Rows(
+            table,
+            new Markup(eventsContent.ToString())
+        );
+
+        var duration = DateTimeOffset.UtcNow - _startTimeUtc;
+
+        // Create single panel with everything
+        return new Panel(combinedContent)
+        {
+            Header = new PanelHeader($"[bold blue] {spinnerFrame}[/] [bold]Load Simulation Running[/] {duration:c} [grey](Press ESC to stop)[/]"),
+            Border = BoxBorder.Double,
+            BorderStyle = new Style(Color.Blue),
+            Expand = false
+        };
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationSimulatorConfig.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationSimulatorConfig.cs
new file mode 100644
index 00000000..71a213c6
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/LoadSimulationSimulatorConfig.cs
@@ -0,0 +1,22 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Provides configuration options for the load simulation runner, including parallelism and delay settings between scenario iterations.
+/// </summary>
+public class LoadSimulationSimulatorConfig
+{
+    /// <summary>
+    /// Gets or sets the number of parallel workers for the simulation.
+    /// </summary>
+    public int Parallelism { get; set; } = 1;
+
+    /// <summary>
+    /// Gets or sets the minimum delay in milliseconds between scenario iterations.
+    /// </summary>
+    public int MinDelayMilliseconds { get; set; } = 500;
+
+    /// <summary>
+    /// Gets or sets the maximum delay in milliseconds between scenario iterations.
+    /// </summary>
+    public int MaxDelayMilliseconds { get; set; } = 3000;
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/RecentEventsBuffer.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/RecentEventsBuffer.cs
new file mode 100644
index 00000000..6701bf95
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/RecentEventsBuffer.cs
@@ -0,0 +1,75 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Represents a single event entry.
+/// </summary>
+public record EventEntry(DateTime Timestamp, string WorkerName, bool Success, string Message, TimeSpan Duration);
+
+/// <summary>
+/// Thread-safe circular buffer for recent events.
+/// </summary>
+public class RecentEventsBuffer
+{
+    private readonly EventEntry?[] _buffer;
+    private readonly int _capacity;
+    private int _index;
+#if NET8_0
+    private readonly object _lock = new();
+#else
+    private readonly Lock _lock = new();
+#endif
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RecentEventsBuffer"/> class.
+    /// </summary>
+    /// <param name="capacity">The maximum number of events to store.</param>
+    public RecentEventsBuffer(int capacity)
+    {
+        _capacity = capacity;
+        _buffer = new EventEntry?[capacity];
+        _index = 0;
+    }
+
+    /// <summary>
+    /// Adds an event to the buffer.
+    /// </summary>
+    public void Add(string workerName, bool success, string message, TimeSpan duration)
+    {
+        if (_capacity == 0)
+            return;
+
+        var entry = new EventEntry(DateTime.Now, workerName, success, message, duration);
+
+        lock (_lock)
+        {
+            _buffer[_index] = entry;
+            _index = (_index + 1) % _capacity;
+        }
+    }
+
+    /// <summary>
+    /// Gets the most recent events in chronological order (oldest to newest).
+    /// </summary>
+    public List<EventEntry> GetRecent()
+    {
+        if (_capacity == 0)
+            return [];
+
+        lock (_lock)
+        {
+            var result = new List<EventEntry>(_capacity);
+
+            // Start from the oldest entry and go to the newest
+            for (int i = 0; i < _capacity; i++)
+            {
+                var entry = _buffer[(_index + i) % _capacity];
+                if (entry != null)
+                    result.Add(entry);
+            }
+
+            // Reverse to show newest first
+            result.Reverse();
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/RunnerAttribute.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/RunnerAttribute.cs
new file mode 100644
index 00000000..40930385
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/RunnerAttribute.cs
@@ -0,0 +1,38 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Provides the base attribute for defining test scenarios.
+/// </summary>
+public abstract class RunnerAttribute : Attribute
+{
+    /// <summary>
+    /// Gets the name.
+    /// </summary>
+    public string Name { get; protected init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the friendly text.
+    /// </summary>
+    public string Text { get; protected init; } = string.Empty;
+
+    /// <summary>
+    /// Gets the preferred order to display.
+    /// </summary>
+    public int Order { get; protected init; } = 0;
+
+    /// <summary>
+    /// Indicates whether the scenario requires API access.
+    /// </summary>
+    public bool RequiresApi { get; protected init; } = true;
+
+    /// <summary>
+    /// Dynamically discovers and retrieves scenario definitions from the specified assemblies based on the presence of a specific <see cref="RunnerAttribute"/>-derived attribute.
+    /// </summary>
+    public static Dictionary<string, ScenarioDefinition> GetScenarios<TAttribute>(params IEnumerable<Assembly>[] assemblies) where TAttribute : RunnerAttribute
+        => (from assembly in assemblies.Distinct().SelectMany(a => a)
+            from type in assembly.GetTypes()
+            where !type.IsAbstract && !type.IsGenericTypeDefinition && typeof(IScenario).IsAssignableFrom(type) && type.GetConstructor(Type.EmptyTypes) != null
+            let attr = type.GetCustomAttributes(typeof(TAttribute), true).SingleOrDefault() as TAttribute
+            where attr is not null
+            select new ScenarioDefinition { Attribute = attr, Factory = () => (IScenario)Activator.CreateInstance(type)! }).ToDictionary(sd => sd.Attribute.Name);
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/ScenarioContext.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/ScenarioContext.cs
new file mode 100644
index 00000000..015b6095
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/ScenarioContext.cs
@@ -0,0 +1,66 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Provides the context passed to scenario execution for step tracking.
+/// </summary>
+public class ScenarioContext(TestContext context, List<StepResult> results, bool silentMode = false)
+{
+    private readonly TestContext _context = context;
+    private readonly List<StepResult> _results = results;
+    private readonly bool _silentMode = silentMode;
+
+    public TestContext TestContext => _context;
+
+    /// <summary>
+    /// Executes a step with timing, error handling, and reporting with a result.
+    /// </summary>
+    public async Task<T> StepAsync<T>(string stepName, Func<Task<T>> action, Func<T, string>? detailsFormatter = null)
+    {
+        if (!_silentMode)
+            AnsiConsole.MarkupLine($"[grey]▶[/] {stepName.EscapeMarkup()}...");
+
+        var sw = Stopwatch.StartNew();
+
+        try
+        {
+            var result = await action();
+            sw.Stop();
+
+            var details = detailsFormatter?.Invoke(result) ?? result?.ToString() ?? "Success";
+            _results.Add(new StepResult(stepName, true, sw.Elapsed, details));
+
+            if (!_silentMode)
+                AnsiConsole.MarkupLine($"[green]  ✓[/] {stepName.EscapeMarkup()} [grey]({sw.ElapsedMilliseconds}ms)[/]");
+
+            return result;
+        }
+        catch (Exception ex)
+        {
+            sw.Stop();
+            _results.Add(new StepResult(stepName, false, sw.Elapsed, ex.Message, ex));
+
+            if (!_silentMode)
+                AnsiConsole.MarkupLine($"[red]  ✗[/] {stepName.EscapeMarkup()} [grey]({sw.ElapsedMilliseconds}ms)[/]");
+
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Executes a step with timing, error handling, and reporting with no result.
+    /// </summary>
+    public async Task StepAsync(string stepName, Func<Task> action, string? successDetails = null)
+    {
+        await StepAsync(stepName, async () =>
+        {
+            await action();
+            return successDetails ?? "Completed.";
+        }, details => details);
+    }
+
+    /// <summary>
+    /// Adds a randomized delay to simulate a pseudo user (who is pretty bloody speedy) pause;versus, overwhelming bang-bang.
+    /// </summary>
+    public static Task RandomizedDelayAsync(ScenarioContext ctx, CancellationToken cancellationToken = default)
+        => Task.Delay(Random.Shared.Next(ctx.TestContext.PerStepMinDelayMilliseconds, ctx.TestContext.PerStepMaxDelayMilliseconds), cancellationToken);
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/ScenarioRunner.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/ScenarioRunner.cs
new file mode 100644
index 00000000..697097ec
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/ScenarioRunner.cs
@@ -0,0 +1,77 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Represents the result of a scenario step.
+/// </summary>
+public record StepResult(string Name, bool Success, TimeSpan Duration, string Details, Exception? Exception = null);
+
+/// <summary>
+/// Provides scenario execution with progress tracking and visual reporting.
+/// </summary>
+public class ScenarioRunner(TestContext context)
+{
+    private readonly TestContext _context = context;
+
+    /// <summary>
+    /// Runs a scenario with progress tracking.
+    /// </summary>
+    public async Task<List<StepResult>> RunScenarioAsync(ScenarioDefinition scenarioDefinition)
+    {
+        var results = new List<StepResult>();
+        var context = new ScenarioContext(_context, results, silentMode: false);
+
+        var scenario = scenarioDefinition.Factory();
+
+        AnsiConsole.Write(new Rule($"[bold blue]{scenarioDefinition.Text}[/]").RuleStyle("blue").LeftJustified());
+        AnsiConsole.WriteLine();
+
+        try
+        {
+            await scenario.RunAsync(context);
+        }
+        catch (Exception) { }
+
+        AnsiConsole.WriteLine();
+        DisplayResults(scenarioDefinition.Text, results);
+
+        return results;
+    }
+
+    private static void DisplayResults(string title, List<StepResult> results)
+    {
+        var table = new Table()
+            .Border(TableBorder.Rounded)
+            .BorderColor(Color.Grey)
+            .AddColumn(new TableColumn("[bold]Step[/]").LeftAligned())
+            .AddColumn(new TableColumn("[bold]Status[/]").Centered())
+            .AddColumn(new TableColumn("[bold]Duration[/]").RightAligned())
+            .AddColumn(new TableColumn("[bold]Details[/]").LeftAligned());
+
+        foreach (var result in results)
+        {
+            var status = result.Success ? "[green]✓ PASS[/]" : "[red]✗ FAIL[/]";
+            var duration = $"{result.Duration.TotalMilliseconds:F0}ms";
+            var details = result.Details.Length > 200 ? result.Details[..197] + "..." : result.Details;
+
+            table.AddRow(
+                result.Name.EscapeMarkup(),
+                status,
+                duration,
+                details.EscapeMarkup()
+            );
+        }
+
+        AnsiConsole.Write(table);
+
+        var successCount = results.Count(r => r.Success);
+        var totalCount = results.Count;
+        var successRate = totalCount > 0 ? (double)successCount / totalCount * 100 : 0;
+
+        var summaryColor = successCount == totalCount ? "green" : (successCount > 0 ? "yellow" : "red");
+        var rule = new Rule($"[bold {summaryColor}]{title}: {successCount}/{totalCount} steps passed ({successRate:F0}%)[/]")
+            .RuleStyle(summaryColor);
+
+        AnsiConsole.Write(rule);
+        AnsiConsole.WriteLine();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/TestContext.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/TestContext.cs
new file mode 100644
index 00000000..24873c2d
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/TestContext.cs
@@ -0,0 +1,84 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Provides the context for end-to-end testing, including configuration, HTTP clients, and scenario management.
+/// </summary>
+public sealed class TestContext
+{
+    private readonly ScenarioManager _scenarioManager;
+    private readonly SetUpManager _setUpManager;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TestContext"/> class.
+    /// </summary>
+    public TestContext(IConfiguration config)
+    {
+        Config = config;
+
+        ProductsHttpClient = new HttpClient { BaseAddress = new Uri(config["E2E:Products:BaseAddress"] ?? throw new InvalidOperationException("E2E:Products:BaseAddress configuration value is missing.")), Timeout = TimeSpan.FromSeconds(30) };
+        ShoppingHttpClient = new HttpClient { BaseAddress = new Uri(config["E2E:Shopping:BaseAddress"] ?? throw new InvalidOperationException("E2E:Shopping:BaseAddress configuration value is missing.")), Timeout = TimeSpan.FromSeconds(30) };
+        OrdersHttpClient = new HttpClient { BaseAddress = new Uri(config["E2E:Orders:BaseAddress"] ?? throw new InvalidOperationException("E2E:Orders:BaseAddress configuration value is missing.")), Timeout = TimeSpan.FromSeconds(30) };
+
+        PerStepMinDelayMilliseconds = config.GetValue<int>("E2E:PerStepMinDelayMilliseconds");
+        PerStepMaxDelayMilliseconds = config.GetValue<int>("E2E:PerStepMaxDelayMilliseconds");
+
+        _scenarioManager = ScenarioManager.Create();
+        _setUpManager = SetUpManager.Create();
+    }
+
+    /// <summary>
+    /// Gets the application's configuration settings.
+    /// </summary>
+    public IConfiguration Config { get; }
+
+    /// <summary>
+    /// Gets the "Products" domain HTTP client configured with the base address and timeout specified in the configuration.
+    /// </summary>
+    public HttpClient ProductsHttpClient { get; }
+
+    /// <summary>
+    /// Gets the "Shopping" domain HTTP client configured with the base address and timeout specified in the configuration.
+    /// </summary>
+    public HttpClient ShoppingHttpClient { get; }
+
+    /// <summary>
+    /// Gets the "Orders" domain HTTP client configured with the base address and timeout specified in the configuration.
+    /// </summary>
+    public HttpClient OrdersHttpClient { get; }
+
+    /// <summary>
+    /// Gets the collection of set-up scenario definitions, keyed by scenario name.
+    /// </summary>
+    public IReadOnlyDictionary<string, ScenarioDefinition> SetUps => _setUpManager.SetUps;
+
+    /// <summary>
+    /// Gets the collection of available scenario definitions, keyed by scenario name.
+    /// </summary>
+    public IReadOnlyDictionary<string, ScenarioDefinition> Scenarios => _scenarioManager.Scenarios;
+
+    /// <summary>
+    /// Gets the per step minimum delay in milliseconds.
+    /// </summary>
+    public int PerStepMinDelayMilliseconds { get; set; }
+
+    /// <summary>
+    /// Gets the per step maximum delay in milliseonds.
+    /// </summary>
+    public int PerStepMaxDelayMilliseconds { get; set; }
+
+    /// <summary>
+    /// Performs a health check against the "/health/ready" endpoint of the provided HTTP client to determine if the associated API is responsive and healthy.
+    /// </summary>
+    public static async Task<bool> HealthCheckAsync(HttpClient client)
+    {
+        try
+        {
+            var response = await client.GetAsync("/health/ready");
+            return response.IsSuccessStatusCode;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Infrastructure/WorkerStatistics.cs b/samples/tests/Contoso.E2E.Runner/Infrastructure/WorkerStatistics.cs
new file mode 100644
index 00000000..14e314b1
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Infrastructure/WorkerStatistics.cs
@@ -0,0 +1,74 @@
+namespace Contoso.E2E.Runner.Infrastructure;
+
+/// <summary>
+/// Thread-safe aggregator for worker statistics.
+/// </summary>
+public class WorkerStatistics
+{
+    private int _totalIterations;
+    private int _successCount;
+    private int _failureCount;
+    private readonly Stopwatch _stopwatch = Stopwatch.StartNew();
+
+    /// <summary>
+    /// Gets the total number of iterations.
+    /// </summary>
+    public int TotalIterations => Volatile.Read(ref _totalIterations);
+
+    /// <summary>
+    /// Gets the number of successful iterations.
+    /// </summary>
+    public int SuccessCount => Volatile.Read(ref _successCount);
+
+    /// <summary>
+    /// Gets the number of failed iterations.
+    /// </summary>
+    public int FailureCount => Volatile.Read(ref _failureCount);
+
+    /// <summary>
+    /// Gets the elapsed time since the start of the simulation.
+    /// </summary>
+    public TimeSpan Elapsed => _stopwatch.Elapsed;
+
+    /// <summary>
+    /// Gets the success rate as a percentage.
+    /// </summary>
+    public double SuccessRate
+    {
+        get
+        {
+            var total = TotalIterations;
+            return total > 0 ? (double)SuccessCount / total * 100 : 0;
+        }
+    }
+
+    /// <summary>
+    /// Gets the throughput in iterations per minute.
+    /// </summary>
+    public double IterationsPerMinute
+    {
+        get
+        {
+            var elapsed = Elapsed.TotalMinutes;
+            return elapsed > 0 ? TotalIterations / elapsed : 0;
+        }
+    }
+
+    /// <summary>
+    /// Records a successful iteration.
+    /// </summary>
+    public void RecordSuccess()
+    {
+        Interlocked.Increment(ref _totalIterations);
+        Interlocked.Increment(ref _successCount);
+    }
+
+    /// <summary>
+    /// Records a failed iteration.
+    /// </summary>
+    public void RecordFailure()
+    {
+        Interlocked.Increment(ref _totalIterations);
+        Interlocked.Increment(ref _failureCount);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Program.cs b/samples/tests/Contoso.E2E.Runner/Program.cs
new file mode 100644
index 00000000..e465dca4
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Program.cs
@@ -0,0 +1,132 @@
+// Enable UTF-8 encoding for emoji and special character support.
+Console.OutputEncoding = System.Text.Encoding.UTF8;
+
+// Build configuration
+var config = new ConfigurationBuilder()
+    .SetBasePath(Directory.GetCurrentDirectory())
+    .AddJsonFile("appsettings.json", optional: false)
+    .AddEnvironmentVariables()
+    .Build();
+
+var context = new TestContext(config);
+(bool ProductApiOk, bool ShoppingApiOk, bool OrdersApiOk) status = (false, false, false);
+
+/***** Main program and choice pump. *****/
+
+// Check API health on startup.
+await CheckApiStatusAsync();
+
+// Present main menu and handle choices until user exits.
+var choiceManager = new ChoiceManager(context);
+
+while (true)
+{
+    var choice = AnsiConsole.Prompt(choiceManager.AddRunnerChoices(new SelectionPrompt<string>().Title($"Select [green]option[/]:")));
+    AnsiConsole.WriteLine();
+
+    // Execute the selection choice.
+    var result = await choiceManager.RunChoiceAsync(choice, status.ProductApiOk && status.ShoppingApiOk);
+
+    // Handle the result of the choice execution.
+    switch (result)
+    {
+        case ChoiceResult.Stop:
+            AnsiConsole.MarkupLine("[blue]Thanks for using Contoso E2E Runner :-)[/]");
+            return;
+
+        case ChoiceResult.RequiresApi:
+            AnsiConsole.MarkupLine("API(s) are not available :no_bicycles: - please start the Contoso.Aspire application [yellow]:oncoming_fist:[/]");
+            ContinuePrompt();
+            break;
+            
+        case ChoiceResult.RetryApi:
+            await CheckApiStatusAsync();
+            break;
+
+        case ChoiceResult.ContinueWithPrompt:
+            ContinuePrompt();
+            break;
+    }
+
+    // Refresh banner and config.
+    DisplayBannerAndConfig();
+}
+
+/***** Utility *****/
+
+// Display main banner and configuration.
+void DisplayBannerAndConfig()
+{
+    AnsiConsole.Clear();
+    AnsiConsole.Write(
+        new FigletText("Contoso E2E")
+            .Centered()
+            .Color(Color.Orange3));
+
+    AnsiConsole.Write(
+        new Panel(
+            new Markup($"{(status.ProductApiOk ? "[green]:check_mark:[/] " : "[red]:cross_mark:[/]")} [grey]Products API:[/] {context.ProductsHttpClient.BaseAddress?.ToString().EscapeMarkup()}\n"
+            + $"{(status.ShoppingApiOk ? "[green]:check_mark:[/] " : "[red]:cross_mark:[/]")} [grey]Shopping API:[/] {context.ShoppingHttpClient.BaseAddress?.ToString().EscapeMarkup()}\n"
+            + $"{(status.OrdersApiOk ? "[green]:check_mark:[/] " : "[red]:cross_mark:[/]")} [grey]Orders API:[/] {context.OrdersHttpClient.BaseAddress?.ToString().EscapeMarkup()}"))
+            .Header("[bold]API status:[/]")
+            .BorderColor(Color.Grey)
+            .Padding(1, 0));
+
+    AnsiConsole.WriteLine();
+}
+
+// Present a prompt to continue, used after scenarios or when APIs are not healthy.
+void ContinuePrompt()
+{
+    AnsiConsole.WriteLine();
+    AnsiConsole.Markup("[grey]Press any key to continue...[/]");
+    Console.ReadKey(true);
+}
+
+// Check API health with option to cancel by pressing ESC. Returns true if APIs are healthy, false if not or if check was cancelled.
+async Task CheckApiStatusAsync()
+{
+    DisplayBannerAndConfig();
+
+    status = await AnsiConsole.Status()
+        .Spinner(Spinner.Known.Dots)
+        .StartAsync<(bool ProductApiOk, bool ShoppingApiOk, bool OrdersApiOk)>("[grey]Checking API status... (press [yellow]ESC[/] to cancel)...[/]", async _ =>
+        {
+            var healthCheckTask = Task.Run(async () =>
+            {
+                var productApi = TestContext.HealthCheckAsync(context.ProductsHttpClient);
+                var shoppingApi = TestContext.HealthCheckAsync(context.ShoppingHttpClient);
+                var ordersApi = TestContext.HealthCheckAsync(context.OrdersHttpClient);
+
+                await Task.WhenAll(productApi, shoppingApi, ordersApi);
+                return (productApi.Result, shoppingApi.Result, ordersApi.Result);
+            });
+
+            // Wait for health check or ESC key
+            bool wasCancelled = false;
+            while (!healthCheckTask.IsCompleted)
+            {
+                if (Console.KeyAvailable && Console.ReadKey(true).Key == ConsoleKey.Escape)
+                {
+                    wasCancelled = true;
+                    break;
+                }
+
+                await Task.Delay(100);
+            }
+
+            if (wasCancelled)
+                return (false, false, false);
+            else
+                return await healthCheckTask;
+        });
+
+    if (!status.ProductApiOk || !status.ShoppingApiOk || !status.OrdersApiOk)
+    {
+        DisplayBannerAndConfig();
+        AnsiConsole.MarkupLine("API(s) are not available :no_bicycles: - please start the Contoso.Aspire application [yellow]:oncoming_fist:[/]");
+        ContinuePrompt();
+    }
+
+    DisplayBannerAndConfig();
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/DataSeedingSetup.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/DataSeedingSetup.cs
new file mode 100644
index 00000000..5bd81db7
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/DataSeedingSetup.cs
@@ -0,0 +1,37 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Provides data seeding for the E2E testing.
+/// </summary>
+[ScenarioSetUp("Data-Seeding", "Data Seeding for E2E Testing", 2)]
+public class DataSeedingSetup : IScenario
+{
+    /// <inheritdoc/>
+    public async Task RunAsync(ScenarioContext context)
+    {
+        // Step 1: Find all the products.
+        var products = await context.StepAsync("Find all products.", async () =>
+        {
+            return await ProductUpdateScenario.GetAllProductsAsync(context);
+        }, result => $"{result!.Length} product(s) found");
+
+        // Step 2: Adjust inventory for each product to ensure they have plenty in stock.
+        await context.StepAsync("Adjust inventory for all active and stocked products.", async () =>
+        {
+            var req = new MovementRequest
+            {
+                Id = Runtime.NewId(),
+                Products = products!.Where(x => !(x.IsInactive || x.IsNonStocked)).ToDataMap(
+                    p => p.Id!,
+                    p => new MovementRequestProduct
+                    {
+                        Quantity = 1000,
+                        UnitOfMeasureCode = p.UnitOfMeasureCode
+                    })
+            };
+
+            var response = await context.TestContext.ProductsHttpClient.PostAsJsonAsync("/api/inventory/adjust", req, JsonDefaults.SerializerOptions);
+            return await response.GetValueAsync<Movement[]>();
+        }, result => $"{result!.Length} inventory adjustment(s).");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/DatabaseMigrationSetup.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/DatabaseMigrationSetup.cs
new file mode 100644
index 00000000..fd874f2a
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/DatabaseMigrationSetup.cs
@@ -0,0 +1,54 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Provides scenario setup for performing database migrations and refreshing base data for the Products, Shopping and Orders databases.
+/// </summary>
+[ScenarioSetUp("Database-Migration", "Database Migration and Base Data Refresh", 1, false)]
+public sealed class DatabaseMigrationSetup : IScenario
+{
+    /// <inheritdoc/>
+    public async Task RunAsync(ScenarioContext context)
+    {
+        // Step 1: Products database migration.
+        await context.StepAsync("Products database migration.", async () =>
+        {
+            var cs = context.TestContext.Config.GetValue<string>("E2E:Products:ConnectionString") ?? throw new InvalidOperationException("E2E:Products:ConnectionString configuration value is missing.");
+            var ma = new MigrationArgs(MigrationCommand.All | MigrationCommand.ResetAndData, cs);
+            Contoso.Products.Database.Program.ConfigureMigrationArgs(ma);
+            ma.AddAssembly<Products.Test.Common.TestData>();
+
+            using var m = new PostgresMigration(ma);
+            var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+            if (!Success)
+                throw new Exception("Database migration failed:" + Environment.NewLine + Output);
+        }, "Successfully migrated; base data refreshed.").ConfigureAwait(false);
+
+        // Step 2: Shopping database migration.
+        await context.StepAsync("Shopping database migration.", async () =>
+        {
+            var cs = context.TestContext.Config.GetValue<string>("E2E:Shopping:ConnectionString") ?? throw new InvalidOperationException("E2E:Shopping:ConnectionString configuration value is missing.");
+            var ma = new MigrationArgs(MigrationCommand.All | MigrationCommand.ResetAndData, cs);
+            Contoso.Shopping.Database.Program.ConfigureMigrationArgs(ma);
+            ma.AddAssembly<Shopping.Test.Common.TestData>();
+
+            using var m = new SqlServerMigration(ma);
+            var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+            if (!Success)
+                throw new Exception("Database migration failed:" + Environment.NewLine + Output);
+        }, "Successfully migrated; base data refreshed.").ConfigureAwait(false);
+
+        // Step 3: Orders database migration.
+        await context.StepAsync("Orders database migration.", async () =>
+        {
+            var cs = context.TestContext.Config.GetValue<string>("E2E:Orders:ConnectionString") ?? throw new InvalidOperationException("E2E:Orders:ConnectionString configuration value is missing.");
+            var ma = new MigrationArgs(MigrationCommand.All | MigrationCommand.ResetAndData, cs);
+            Contoso.Orders.Database.Program.ConfigureMigrationArgs(ma);
+            ma.AddAssembly<Orders.Test.Common.TestData>();
+
+            using var m = new SqlServerMigration(ma);
+            var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+            if (!Success)
+                throw new Exception("Database migration failed:" + Environment.NewLine + Output);
+        }, "Successfully migrated; base data refreshed.").ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/IScenario.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/IScenario.cs
new file mode 100644
index 00000000..6d20c480
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/IScenario.cs
@@ -0,0 +1,12 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Enables the <see cref="RunAsync(ScenarioContext)"/> execution.
+/// </summary>
+public interface IScenario
+{
+    /// <summary>
+    /// Executes the scenario asynchronously using the specified context.
+    /// </summary>
+    public Task RunAsync(ScenarioContext context);
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ProductQuantityScenario.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ProductQuantityScenario.cs
new file mode 100644
index 00000000..62386130
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ProductQuantityScenario.cs
@@ -0,0 +1,41 @@
+using Azure;
+
+namespace Contoso.E2E.Runner.Scenarios;
+
+[Scenario("Products-Quantity", "Product Quantity Lifecycle", 2)]
+public class ProductQuantityScenario : IScenario
+{
+    private static readonly SemaphoreSlim _semaphore = new(1);
+    private ProductLite[]? _products;
+
+    /// <inheritdoc/>
+    public async Task RunAsync(ScenarioContext context)
+    {
+        // Step 1: Find all the products (first time only).
+        _semaphore.Wait();
+        try
+        {
+            if (_products is null)
+            {
+                _products = await context.StepAsync("Find all products.", async () =>
+                {
+                    return await ProductUpdateScenario.GetAllProductsAsync(context);
+                }, result => $"{result!.Length} product(s) found.");
+
+                await ScenarioContext.RandomizedDelayAsync(context);
+            }
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+
+        // Step 2: Select a random product and get the quantity.
+        var product = _products![Random.Shared.Next(0, _products.Length - 1)];
+        await context.StepAsync("Get product quantity.", async () =>
+        {
+            var response = await context.TestContext.ProductsHttpClient.GetAsync($"/api/products/{product.Id}/on-hand");
+            return await response.GetValueAsync<decimal>();
+        }, q => $"Product '{product.Sku}' has quantity: {q}.");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ProductQueryScenario.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ProductQueryScenario.cs
new file mode 100644
index 00000000..b1446cfb
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ProductQueryScenario.cs
@@ -0,0 +1,66 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Scenario: Product query lifecycle.
+/// </summary>
+[Scenario("Products-Query", "Product Query Lifecycle", 1)]
+public class ProductQueryScenario : IScenario
+{
+    /// <inheritdoc/>
+    public async Task RunAsync(ScenarioContext context)
+    {
+        var sb = new StringBuilder();
+
+        var val = Random.Shared.Next(0, 3);
+        if (val == 0)
+        {
+            var categories = await context.StepAsync($"Get all categories.", async () =>
+            {
+                var response = await context.TestContext.ProductsHttpClient.GetAsync($"/api/refdata/categories");
+                return await response.GetValueAsync<Category[]>();
+            }, result => "Categories retrieved successfully.");
+
+            var category = categories![Random.Shared.Next(0, categories.Length)];
+            sb.Append($"category eq '{category.Code}'");
+
+            await ScenarioContext.RandomizedDelayAsync(context);
+        }
+
+        val = Random.Shared.Next(0, 3);
+        if (val == 0)
+        {
+            var brands = await context.StepAsync($"Get all brands.", async () =>
+            {
+                var response = await context.TestContext.ProductsHttpClient.GetAsync($"/api/refdata/brands");
+                return await response.GetValueAsync<Brand[]>();
+            }, result => "Brands retrieved successfully.");
+
+            var brand = brands![Random.Shared.Next(0, brands.Length)];
+            if (sb.Length > 0)
+                sb.Append(" and ");
+
+            sb.Append($"brand eq '{brand.Code}'");
+
+            await ScenarioContext.RandomizedDelayAsync(context);
+        }
+
+        val = Random.Shared.Next(0, 3);
+        if (val == 1 || val == 2)
+        {
+            if (sb.Length > 0)
+                sb.Append(" and ");
+
+            if (val == 1)
+                sb.Append($"startswith(sku, 'Y')");
+            else
+                sb.Append($"endswith(text, 's')");
+        }
+
+        await context.StepAsync($"Query {sb}", async () =>
+        {
+            var response = await context.TestContext.ProductsHttpClient.GetAsync($"/api/products?$filter={sb}");
+            var products = await response.GetValueAsync<Product[]>();
+            return products;
+        }, result => $"Query returned {result!.Length} products.");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ProductUpdateScenario.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ProductUpdateScenario.cs
new file mode 100644
index 00000000..32c0e7c5
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ProductUpdateScenario.cs
@@ -0,0 +1,68 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Scenario: Product update lifecycle.
+/// </summary>
+[Scenario("Products-Update", "Product Update Lifecycle", 1)]
+public class ProductUpdateScenario : IScenario
+{
+    private static readonly SemaphoreSlim _semaphore = new(1);
+    private ProductLite[]? _products;
+
+    /// <summary>
+    /// Gets all the products (limited to 100) for use in the scenario.
+    /// </summary>
+    public static async Task<ProductLite[]> GetAllProductsAsync(ScenarioContext context)
+    {
+        var response = await context.TestContext.ProductsHttpClient.GetAsync("/api/products?$take=100");
+        var products = await response.GetValueAsync<ProductLite[]>();
+        return products ?? [];
+    }
+
+    /// <inheritdoc/>
+    public async Task RunAsync(ScenarioContext context)
+    {
+        // Step 1: Find all the products (first time only).
+        _semaphore.Wait();
+        try
+        {
+            if (_products is null)
+            {
+                _products = await context.StepAsync("Find all products.", async () =>
+                {
+                    return await GetAllProductsAsync(context);
+                }, result => $"{result!.Length} product(s) found.");
+
+                await ScenarioContext.RandomizedDelayAsync(context);
+            }
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+
+        // Step 2: Select a random product and full get.
+        var index = Random.Shared.Next(0, _products!.Length - 1);
+        var p = _products[index];
+
+        var product = await context.StepAsync($"Get: '{p.Id}'.", async () =>
+        {
+            var response = await context.TestContext.ProductsHttpClient.GetAsync($"/api/products/{p.Id}");
+            return await response.GetValueAsync<Product>();
+        }, result => "Product retrieved successfully.");
+
+        await ScenarioContext.RandomizedDelayAsync(context);
+
+        // Step 3: Update product description.
+        if (product!.Text!.EndsWith(" (updated)"))
+            product.Text = product.Text[..^10];
+        else
+            product.Text += " (updated)";
+
+        await context.StepAsync($"Update: '{product.Id}'.", async () =>
+        {
+            var response = await context.TestContext.ProductsHttpClient.PutAsJsonAsync($"/api/products/{product.Id}", product, JsonDefaults.SerializerOptions);
+            return await response.GetValueAsync<Product>();
+        }, p => $"Product {p!.Sku} updated.");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioAttribute.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioAttribute.cs
new file mode 100644
index 00000000..535cd07a
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioAttribute.cs
@@ -0,0 +1,18 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Provides the attribute to define an executable test scenario.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+public sealed class ScenarioAttribute : RunnerAttribute
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ScenarioAttribute"/> class.
+    /// </summary>
+    public ScenarioAttribute(string name, string text, int order = 0)
+    {
+        Name = name;
+        Text = text;
+        Order = order;
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioDefinition.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioDefinition.cs
new file mode 100644
index 00000000..4759c1b6
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioDefinition.cs
@@ -0,0 +1,16 @@
+using Contoso.E2E.Runner.Infrastructure;
+
+namespace Contoso.E2E.Runner.Scenarios;
+
+public sealed class ScenarioDefinition
+{
+    public required RunnerAttribute Attribute { get; init; }
+
+    public required Func<IScenario> Factory { get; init; }
+
+    public string Name => Attribute.Name;
+
+    public string Text => Attribute.Text;
+
+    public int Order => Attribute.Order;
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioManager.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioManager.cs
new file mode 100644
index 00000000..3c419f2b
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioManager.cs
@@ -0,0 +1,22 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Provides functionality to discover and manage scenario definitions from assemblies using scenario attributes.
+/// </summary>
+public sealed class ScenarioManager
+{
+    /// <summary>
+    /// Creates a new instance of the <see cref="ScenarioManager"/> class for the calling assembly.
+    /// </summary>
+    public static ScenarioManager Create() => Create(Assembly.GetCallingAssembly());
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="ScenarioManager"/> class for the specified assemblies.
+    /// </summary>
+    public static ScenarioManager Create(params IEnumerable<Assembly> assemblies) => new() { Scenarios = RunnerAttribute.GetScenarios<ScenarioAttribute>(assemblies) };
+
+    /// <summary>
+    /// Gets the collection of scenario definitions, keyed by scenario name.
+    /// </summary>
+    public required Dictionary<string, ScenarioDefinition> Scenarios { get; init; }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioSetUpAttribute.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioSetUpAttribute.cs
new file mode 100644
index 00000000..134845cb
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ScenarioSetUpAttribute.cs
@@ -0,0 +1,19 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Provides the attribute to define an executable off-off set-up scenario.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public sealed class ScenarioSetUpAttribute : RunnerAttribute
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ScenarioSetUpAttribute"/> class.
+    /// </summary>
+    public ScenarioSetUpAttribute(string name, string text, int order = 0, bool requiresApi = true)
+    {
+        Name = name;
+        Text = text;
+        Order = order;
+        RequiresApi = requiresApi;
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/SetUpManager.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/SetUpManager.cs
new file mode 100644
index 00000000..6b5fc618
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/SetUpManager.cs
@@ -0,0 +1,22 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Provides functionality to discover and manage one-off set-up scenario definitions from assemblies using scenario attributes.
+/// </summary>
+public sealed class SetUpManager
+{
+    /// <summary>
+    /// Creates a new instance of the <see cref="SetUpManager"/> class for the calling assembly.
+    /// </summary>
+    public static SetUpManager Create() => Create(Assembly.GetCallingAssembly());
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="SetUpManager"/> class for the specified assemblies.
+    /// </summary>
+    public static SetUpManager Create(params IEnumerable<Assembly> assemblies) => new() { SetUps = RunnerAttribute.GetScenarios<ScenarioSetUpAttribute>(assemblies) };
+
+    /// <summary>
+    /// Gets the collection of set-up scenario definitions, keyed by scenario name.
+    /// </summary>
+    public required Dictionary<string, ScenarioDefinition> SetUps { get; init; }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/Scenarios/ShoppingBasketScenario.cs b/samples/tests/Contoso.E2E.Runner/Scenarios/ShoppingBasketScenario.cs
new file mode 100644
index 00000000..ca85d07d
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/Scenarios/ShoppingBasketScenario.cs
@@ -0,0 +1,93 @@
+namespace Contoso.E2E.Runner.Scenarios;
+
+/// <summary>
+/// Scenario: Shopping basket lifecycle.
+/// </summary>
+[Scenario("Shopping-Basket", "Shopping Basket Lifecycle", 2)]
+public class ShoppingBasketScenario : IScenario
+{
+    private static readonly SemaphoreSlim _semaphore = new(1);
+    private ProductLite[]? _products;
+
+    /// <inheritdoc/>
+    public async Task RunAsync(ScenarioContext context)
+    {
+        // Step 1: Find all the products (first time only).
+        _semaphore.Wait();
+        try
+        {
+            if (_products is null)
+            {
+                _products = await context.StepAsync("Find all products.", async () =>
+                {
+                    return await ProductUpdateScenario.GetAllProductsAsync(context);
+                }, result => $"{result!.Length} product(s) found.");
+
+                await ScenarioContext.RandomizedDelayAsync(context);
+            }
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+
+        // Step 2: Create a new basket
+        var basket = await context.StepAsync("Create new basket.", async () =>
+        {
+            var response = await context.TestContext.ShoppingHttpClient.PostAsync($"/api/customers/test/baskets", null);
+            return await response.GetValueAsync<Basket>();
+        }, b => $"Basket '{b!.Id}' created.");
+
+        await ScenarioContext.RandomizedDelayAsync(context);
+
+        // Step 3: Add items to the basket
+        for (int i = 0; i < Random.Shared.Next(1, 5); i++)
+        {
+            var product = _products![Random.Shared.Next(0, _products.Length - 1)];
+            var quantity = Random.Shared.Next(1, 3);
+
+            basket = await context.StepAsync($"Add {quantity} x {product.Sku}.", async () =>
+            {
+                var item = new BasketItemAddRequest
+                {
+                    ProductId = product.Id,
+                    Quantity = quantity
+                };
+
+                var response = await context.TestContext.ShoppingHttpClient.PostAsJsonAsync($"/api/baskets/{basket!.Id}/items", item, JsonDefaults.SerializerOptions);
+                return await response.GetValueAsync<Basket>();
+            }, _ => "Item added.");
+
+            await ScenarioContext.RandomizedDelayAsync(context);
+        }
+
+        // Step 4: Apply discount coupon (10% off)
+        if (Random.Shared.Next(1, 3) == 2)
+        {
+            basket = await context.StepAsync("Apply discount coupon 'SAVE10'.", async () =>
+            {
+                var response = await context.TestContext.ShoppingHttpClient.PutAsync($"/api/baskets/{basket!.Id}/apply-discount/SAVE10", null);
+                return await response.GetValueAsync<Basket>();
+            }, b => $"Discount applied.");
+            await ScenarioContext.RandomizedDelayAsync(context);
+        }
+
+        await ScenarioContext.RandomizedDelayAsync(context);
+
+        // Step 5: Checkout the basket
+        basket = await context.StepAsync("Checkout basket.", async () =>
+        {
+            var response = await context.TestContext.ShoppingHttpClient.PostAsync($"/api/baskets/{basket!.Id}/checkout", null);
+            return await response.GetValueAsync<Basket>();
+        }, b => $"Basket checked-out.");
+
+        await ScenarioContext.RandomizedDelayAsync(context);
+
+        // Step 6: Get the basket.
+        basket = await context.StepAsync("Get checked-out basket.", async () =>
+        {
+            var response = await context.TestContext.ShoppingHttpClient.GetAsync($"/api/baskets/{basket!.Id}");
+            return await response.GetValueAsync<Basket>() ?? throw new NotFoundException();
+        }, b => $"Basket retrieved.");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.E2E.Runner/appsettings.json b/samples/tests/Contoso.E2E.Runner/appsettings.json
new file mode 100644
index 00000000..fda37ec2
--- /dev/null
+++ b/samples/tests/Contoso.E2E.Runner/appsettings.json
@@ -0,0 +1,47 @@
+{
+  "E2E": {
+    "Products": {
+      "BaseAddress": "https://localhost:7200",
+      "ConnectionString": "Server=127.0.0.1;Database=contoso;Username=postgres;Password=yourStrong#!Password"
+    },
+    "Shopping": {
+      "BaseAddress": "https://localhost:7219",
+      "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+    },
+    "Orders": {
+      "BaseAddress": "https://localhost:62023",
+      "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+    },
+    "RecentEventsDisplayCount": 10,
+    "PerStepMinDelayMilliseconds": 100,
+    "PerStepMaxDelayMilliseconds": 500,
+    "Simulations": {
+      "Products-Query": {
+        "Parallelism": 2,
+        "MinDelayMilliseconds": 200,
+        "MaxDelayMilliseconds": 500
+      },
+      "Products-Update": {
+        "Parallelism": 2,
+        "MinDelayMilliseconds": 1000,
+        "MaxDelayMilliseconds": 5000
+      },
+      "Products-Quantity": {
+        "Parallelism": 2,
+        "MinDelayMilliseconds": 200,
+        "MaxDelayMilliseconds": 300
+      },
+      "Shopping-Basket": {
+        "Parallelism": 3,
+        "MinDelayMilliseconds": 250,
+        "MaxDelayMilliseconds": 750
+      }
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "System.Net.Http": "Warning"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/Contoso.Orders.Test.Api.csproj b/samples/tests/Contoso.Orders.Test.Api/Contoso.Orders.Test.Api.csproj
new file mode 100644
index 00000000..11cb971c
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/Contoso.Orders.Test.Api.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Orders.Api\Contoso.Orders.Api.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Test.Common\Contoso.Orders.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/GlobalUsing.cs b/samples/tests/Contoso.Orders.Test.Api/GlobalUsing.cs
new file mode 100644
index 00000000..6cc92d84
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/GlobalUsing.cs
@@ -0,0 +1,13 @@
+global using Contoso.Orders.Contracts;
+global using CoreEx;
+global using CoreEx.Http.Abstractions;
+global using CoreEx.Database.SqlServer.Outbox;
+global using AwesomeAssertions;
+global using NUnit.Framework;
+global using Order = Contoso.Orders.Contracts.Order;
+global using System.Net;
+global using System.Text.Json;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = Contoso.Orders.Database.Program;
+global using TestData = Contoso.Orders.Test.Common.TestData;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Create.cs b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Create.cs
new file mode 100644
index 00000000..156c3ff0
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Create.cs
@@ -0,0 +1,87 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OrderMutateTests
+{
+    [Test]
+    public void Order_Create_Bad_Data()
+    {
+        var order = new Contoso.Orders.Contracts.Order
+        {
+            CustomerId = null,
+            StatusCode = "XX"
+        };
+
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/orders", order)
+            .AssertBadRequest()
+            .AssertErrors(
+                "Customer is required.",
+                "Order status is invalid.");
+    }
+
+    [Test]
+    public void Order_Create_Success()
+    {
+        var order = new Contoso.Orders.Contracts.Order
+        {
+            CustomerId = "CUST-3001",
+            StatusCode = "P",
+            Items =
+            [
+                new() { Id = "OI-3001", ProductId = "PROD-3001", Quantity = 2, UnitPrice = 19.95m }
+            ]
+        };
+
+        var created = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectIdentifier()
+            .ExpectETag()
+            .ExpectChangeLogCreated()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.orders.order.created.v1"))
+            .Run(HttpMethod.Post, "/api/orders", order)
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/orders/{r!.Id}", UriKind.Relative))
+            .Value!;
+
+        created.Id.Should().NotBeNullOrEmpty();
+        created.CustomerId.Should().Be(order.CustomerId);
+        created.StatusCode.Should().Be(order.StatusCode);
+        created.Items.Should().NotBeNull().And.HaveCount(1);
+        created.Items![0].Id.Should().Be("OI-3001");
+        created.Items[0].ProductId.Should().Be("PROD-3001");
+        created.Items[0].Quantity.Should().Be(2);
+        created.Items[0].UnitPrice.Should().Be(19.95m);
+
+        Test.Http<Contoso.Orders.Contracts.Order>()
+            .Run(HttpMethod.Get, $"/api/orders/{created.Id}")
+            .AssertOK()
+            .AssertValue(created);
+    }
+
+    [Test]
+    public void Order_Create_IdempotencyKey()
+    {
+        var order = new Contoso.Orders.Contracts.Order
+        {
+            CustomerId = "CUST-4001",
+            StatusCode = "C"
+        };
+
+        var ik = Guid.NewGuid().ToString();
+
+        var v1 = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, "/api/orders", order, requestModifier: r => r.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/orders/{r!.Id}", UriKind.Relative))
+            .Value!;
+
+        var v2 = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, "/api/orders", order, requestModifier: r => r.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/orders/{r!.Id}", UriKind.Relative))
+            .Value!;
+
+        ObjectComparer.Assert(v1, v2);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Delete.cs b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Delete.cs
new file mode 100644
index 00000000..e688d3e3
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Delete.cs
@@ -0,0 +1,35 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OrderMutateTests
+{
+    [Test]
+    public void Order_Delete_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Delete, "/api/orders/404")
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Order_Delete_Success()
+    {
+        var order = CreateOrder("DEL-OK");
+
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/orders/{order.Id}")
+            .AssertOK();
+
+        Test.Http()
+            .ExpectSqlServerOutboxEvents(e => e.AssertMetadata("contoso", "contoso.orders.order.deleted", order.Id!))
+            .Run(HttpMethod.Delete, $"/api/orders/{order.Id}")
+            .AssertNoContent();
+
+        Test.Http()
+            .Run(HttpMethod.Delete, $"/api/orders/{order.Id}")
+            .AssertNoContent();
+
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/orders/{order.Id}")
+            .AssertNotFound();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Patch.cs b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Patch.cs
new file mode 100644
index 00000000..f2a4c434
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Patch.cs
@@ -0,0 +1,61 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OrderMutateTests
+{
+    [Test]
+    public void Order_Patch_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Patch, "/api/orders/404", new { status = "C" }, requestModifier: r => r.WithMergePatchJsonContentType())
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Order_Patch_Validation()
+    {
+        var order = CreateOrder("PAT-VD");
+
+        Test.Http()
+            .Run(HttpMethod.Patch, $"/api/orders/{order.Id}", new { status = "ZZ" }, requestModifier: r => r.WithIfMatch(order.ETag).WithMergePatchJsonContentType())
+            .AssertBadRequest()
+            .AssertErrors("Order status is invalid.");
+    }
+
+    [Test]
+    public void Order_Patch_Success()
+    {
+        var order = CreateOrder("PAT-OK");
+
+        order.StatusCode = "X";
+
+        var updated = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.orders.order.updated.v1"))
+            .Run(HttpMethod.Patch, $"/api/orders/{order.Id}", new { status = "X" }, requestModifier: r => r.WithIfMatch(order.ETag).WithMergePatchJsonContentType())
+            .AssertOK()
+            .AssertValue(order, "etag", "changelog")
+            .Value!;
+
+        updated.StatusCode.Should().Be("X");
+        updated.ETag.Should().NotBe(order.ETag);
+
+        Test.Http<Contoso.Orders.Contracts.Order>()
+            .Run(HttpMethod.Get, $"/api/orders/{order.Id}")
+            .AssertOK()
+            .AssertValue(updated, "etag", "changelog");
+    }
+
+    [Test]
+    public void Order_Patch_NoChanges()
+    {
+        var order = CreateOrder("PAT-NC");
+
+        var updated = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Patch, $"/api/orders/{order.Id}", new { }, requestModifier: r => r.WithIfMatch(order.ETag).WithMergePatchJsonContentType())
+            .AssertOK()
+            .AssertValue(order, "etag", "changelog")
+            .Value!;
+
+        updated.ETag.Should().Be(order.ETag);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Update.cs b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Update.cs
new file mode 100644
index 00000000..c46401b4
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.Update.cs
@@ -0,0 +1,81 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OrderMutateTests
+{
+    [Test]
+    public void Order_Update_NotFound()
+    {
+        var order = CreateOrder("UPD-NF");
+
+        Test.Http()
+            .Run(HttpMethod.Put, "/api/orders/404", order)
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Order_Update_Concurrency()
+    {
+        var order = CreateOrder("UPD-CC");
+
+        order.StatusCode = "C";
+
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/orders/{order.Id}", order, requestModifier: r => r.WithIfMatch("AAAAAAAA"))
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void Order_Update_Success()
+    {
+        var order = CreateOrder("UPD-OK");
+
+        order.StatusCode = "C";
+        order.CustomerId = "CUST-1001-UPDATED";
+        order.Items =
+        [
+            new() { Id = "OI-UPD-1", ProductId = "PROD-1001", Quantity = 1.5m, UnitPrice = 12.34m }
+        ];
+
+        var updated = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectIdentifier()
+            .ExpectETag()
+            .ExpectChangeLogUpdated()
+            .ExpectValue(order)
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.orders.order.updated.v1"))
+            .Run(HttpMethod.Put, $"/api/orders/{order.Id}", order)
+            .AssertOK()
+            .Value!;
+
+        updated.CustomerId.Should().Be("CUST-1001-UPDATED");
+        updated.StatusCode.Should().Be("C");
+        updated.ETag.Should().NotBe(order.ETag);
+        updated.Items.Should().NotBeNull().And.HaveCount(1);
+        updated.Items![0].Id.Should().Be("OI-UPD-1");
+        updated.Items[0].ProductId.Should().Be("PROD-1001");
+        updated.Items[0].Quantity.Should().Be(1.5m);
+        updated.Items[0].UnitPrice.Should().Be(12.34m);
+
+        Test.Http<Contoso.Orders.Contracts.Order>()
+            .Run(HttpMethod.Get, $"/api/orders/{order.Id}")
+            .AssertOK()
+            .AssertValue(updated);
+    }
+
+    [Test]
+    public void Order_Update_NoChanges()
+    {
+        var order = CreateOrder("UPD-NC");
+
+        var updated = Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Put, $"/api/orders/{order.Id}", order)
+            .AssertOK()
+            .AssertValue(order, "etag", "changelog")
+            .Value!;
+
+        updated.ETag.Should().Be(order.ETag);
+        updated.ChangeLog.Should().NotBeNull();
+        updated.ChangeLog!.UpdatedBy.Should().BeNull();
+        updated.ChangeLog.UpdatedOn.Should().BeNull();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.cs b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.cs
new file mode 100644
index 00000000..d4f29809
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OrderMutateTests.cs
@@ -0,0 +1,34 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OrderMutateTests : WithApiTester<Contoso.Orders.Api.Program>
+{
+    private const string SqlConnectionString = "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true";
+
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs, SqlConnectionString).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedSqlServerOutboxPublisher();
+    }
+
+    private Contoso.Orders.Contracts.Order CreateOrder(string customerIdPrefix = "CUST")
+    {
+        var order = new Contoso.Orders.Contracts.Order
+        {
+            CustomerId = $"{customerIdPrefix}-{Guid.NewGuid():N}"[..21],
+            StatusCode = "P"
+        };
+
+        return Test.Http<Contoso.Orders.Contracts.Order>()
+            .ExpectIdentifier()
+            .ExpectETag()
+            .ExpectChangeLogCreated()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.orders.order.created.v1"))
+            .Run(HttpMethod.Post, "/api/orders", order)
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/orders/{r!.Id}", UriKind.Relative))
+            .Value!;
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OtherTests.Health.cs b/samples/tests/Contoso.Orders.Test.Api/OtherTests.Health.cs
new file mode 100644
index 00000000..46178316
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OtherTests.Health.cs
@@ -0,0 +1,39 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OtherTests
+{
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+    }
+
+    [TestCase("/health/live/detailed", true)]
+    [TestCase("/health/startup/detailed", false)]
+    [TestCase("/health/ready/detailed", false)]
+    public void Health_Detailed(string path, bool minimal)
+    {
+        string[] requiredServices =
+        [
+            "reference-data-orchestrator",
+            "stackExchange.Redis",
+            "sqlServer"
+        ];
+
+        var r = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .AssertContentTypeJson();
+
+        r.Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+
+        var json = r.GetContent();
+        if (minimal)
+            json.Should().NotContainAny(requiredServices);
+        else
+            json.Should().ContainAll(requiredServices);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OtherTests.ReferenceData.cs b/samples/tests/Contoso.Orders.Test.Api/OtherTests.ReferenceData.cs
new file mode 100644
index 00000000..3ec67703
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OtherTests.ReferenceData.cs
@@ -0,0 +1,18 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OtherTests
+{
+    [Test]
+    public void RefData_OrderStatuses()
+    {
+        var statuses = Test.Http<OrderStatus[]>()
+            .Run(HttpMethod.Get, "/api/refdata/order-statuses")
+            .AssertOK()
+            .Value;
+
+        statuses.Should().HaveCountGreaterThanOrEqualTo(3);
+        statuses.Should().Contain(s => s.Code == "P" && s.Text == "Pending");
+        statuses.Should().Contain(s => s.Code == "C" && s.Text == "Confirmed");
+        statuses.Should().Contain(s => s.Code == "X" && s.Text == "Cancelled");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OtherTests.Swagger.cs b/samples/tests/Contoso.Orders.Test.Api/OtherTests.Swagger.cs
new file mode 100644
index 00000000..6cc09bdc
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OtherTests.Swagger.cs
@@ -0,0 +1,32 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OtherTests
+{
+    [Test]
+    public void Swagger_UI()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger")
+            .Assert(HttpStatusCode.Found)
+            .AssertLocationHeader(new Uri("/swagger/index.html", UriKind.Relative));
+
+        var html = Test.Http()
+            .Run(HttpMethod.Get, "/swagger/index.html")
+            .Assert(HttpStatusCode.OK)
+            .GetContent();
+
+        html.Should().Contain("<title>Swagger UI</title>");
+    }
+
+    [Test]
+    public void Swagger_Json()
+    {
+        var json = Test.Http()
+            .Run(HttpMethod.Get, "/swagger/v1/swagger.json")
+            .Assert(HttpStatusCode.OK)
+            .AssertContentTypeJson()
+            .GetContent();
+
+        json.Should().Contain("Contoso.Orders.Api");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/OtherTests.cs b/samples/tests/Contoso.Orders.Test.Api/OtherTests.cs
new file mode 100644
index 00000000..e50fa60a
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/OtherTests.cs
@@ -0,0 +1,15 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class OtherTests : WithApiTester<Contoso.Orders.Api.Program>
+{
+    private const string SqlConnectionString = "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true";
+
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs, SqlConnectionString).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedSqlServerOutboxPublisher();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/ReadTests.OrderGet.cs b/samples/tests/Contoso.Orders.Test.Api/ReadTests.OrderGet.cs
new file mode 100644
index 00000000..c08ac18a
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/ReadTests.OrderGet.cs
@@ -0,0 +1,42 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class ReadTests
+{
+    [Test]
+    public void Order_Get_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/api/orders/404")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Order_Get_Found()
+    {
+        var order = Test.Http<Contoso.Orders.Contracts.Order>()
+            .Run(HttpMethod.Get, "/api/orders/ORD-1001")
+            .AssertOK()
+            .Value!;
+
+        order.Id.Should().Be("ORD-1001");
+        order.CustomerId.Should().Be("CUST-1001");
+        order.StatusCode.Should().Be("P");
+        order.ETag.Should().NotBeNullOrEmpty();
+        order.Items.Should().NotBeNull().And.BeEmpty();
+    }
+
+    [Test]
+    public void Order_Get_Not_Modified()
+    {
+        var r = Test.Http()
+            .Run(HttpMethod.Get, "/api/orders/ORD-1001")
+            .AssertOK()
+            .Response;
+
+        r.Headers.ETag.Should().NotBeNull();
+
+        Test.Http()
+            .Run(HttpMethod.Get, "/api/orders/ORD-1001", requestModifier: rm => rm.WithIfNoneMatch(r.Headers.ETag!.Tag))
+            .AssertNotModified();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/ReadTests.cs b/samples/tests/Contoso.Orders.Test.Api/ReadTests.cs
new file mode 100644
index 00000000..947e9bca
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/ReadTests.cs
@@ -0,0 +1,15 @@
+namespace Contoso.Orders.Test.Api;
+
+public partial class ReadTests : WithApiTester<Contoso.Orders.Api.Program>
+{
+    private const string SqlConnectionString = "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true";
+
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs, SqlConnectionString).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedSqlServerOutboxPublisher();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Api/appsettings.unittest.json b/samples/tests/Contoso.Orders.Test.Api/appsettings.unittest.json
new file mode 100644
index 00000000..802cead8
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Api/appsettings.unittest.json
@@ -0,0 +1,26 @@
+{
+  "ConnectionStrings": {
+    "SqlServer": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true",
+    "redis": "127.0.0.1:6379"
+  },
+  "Aspire": {
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Contoso;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "Microsoft.EntityFrameworkCore": "Information",
+      "Microsoft.EntityFrameworkCore.Update": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Common/Contoso.Orders.Test.Common.csproj b/samples/tests/Contoso.Orders.Test.Common/Contoso.Orders.Test.Common.csproj
new file mode 100644
index 00000000..cc8a284c
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Common/Contoso.Orders.Test.Common.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Orders.Database\Contoso.Orders.Database.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Common/Data/data.yaml b/samples/tests/Contoso.Orders.Test.Common/Data/data.yaml
new file mode 100644
index 00000000..824cc200
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Common/Data/data.yaml
@@ -0,0 +1,3 @@
+Orders:
+  - Order:
+    - { OrderId: ORD-1001, CustomerId: CUST-1001, StatusCode: P }
diff --git a/samples/tests/Contoso.Orders.Test.Common/TestData.cs b/samples/tests/Contoso.Orders.Test.Common/TestData.cs
new file mode 100644
index 00000000..a5bde808
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Common/TestData.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Orders.Test.Common;
+
+/// <summary>
+/// Marker class for test data used across multiple test projects in the 'Contoso.Orders' sample.
+/// </summary>
+public sealed class TestData { }
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Unit/Contoso.Orders.Test.Unit.csproj b/samples/tests/Contoso.Orders.Test.Unit/Contoso.Orders.Test.Unit.csproj
new file mode 100644
index 00000000..4a28dfca
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Unit/Contoso.Orders.Test.Unit.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Order.Workflow.Client\Contoso.Order.Workflow.Client.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Order.Workflow.Workflow\Contoso.Order.Workflow.Workflow.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Orders.Api\Contoso.Orders.Api.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Orders.Application\Contoso.Orders.Application.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Orders.Contracts\Contoso.Orders.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Orders.Test.Common\Contoso.Orders.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Unit/Controllers/OrderControllerTests.cs b/samples/tests/Contoso.Orders.Test.Unit/Controllers/OrderControllerTests.cs
new file mode 100644
index 00000000..4d571310
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Unit/Controllers/OrderControllerTests.cs
@@ -0,0 +1,83 @@
+using System.Text;
+using System.Text.Json;
+using Contoso.Order.Workflow.Client;
+using Contoso.Order.Workflow.Workflow.Contracts;
+using Contoso.Orders.Api.Controllers;
+using Contoso.Orders.Application.Interfaces;
+using CoreEx.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.DurableTask.Client;
+
+namespace Contoso.Orders.Test.Unit.Controllers;
+
+public class OrderControllerTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void Order_Controller_Orchestrate_Accepted() => Test.Scoped(async test =>
+    {
+        var request = new OrderWorkflowRequest("ORD-123", 42.50m, "AUD", "unit-test");
+        var workflowClient = new MockOrderWorkflowClient("orch-123");
+
+        var controller = new OrderController(new WebApi(executionContext: test.Service), new FakeOrderService(), workflowClient)
+        {
+            ControllerContext = new ControllerContext { HttpContext = CreateHttpContext(request, test.Services) }
+        };
+
+        var result = await controller.OrchestrateOrderAsync().ConfigureAwait(false);
+
+        result.Should().BeOfType<ContentResult>().Which.StatusCode.Should().Be(StatusCodes.Status202Accepted);
+
+        var content = ((ContentResult)result).Content;
+        content.Should().NotBeNull();
+
+        var response = JsonSerializer.Deserialize<OrchestrateOrderResponse>(content!, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+        response.Should().Be(new OrchestrateOrderResponse("orch-123"));
+        workflowClient.StartRequest.Should().Be(request);
+    });
+
+    private static DefaultHttpContext CreateHttpContext(OrderWorkflowRequest request, IServiceProvider serviceProvider)
+    {
+        var json = JsonSerializer.Serialize(request);
+        var body = new MemoryStream(Encoding.UTF8.GetBytes(json));
+
+        var httpContext = new DefaultHttpContext { RequestServices = serviceProvider };
+        httpContext.Request.Method = HttpMethods.Post;
+        httpContext.Request.ContentType = "application/json";
+        httpContext.Request.ContentLength = body.Length;
+        httpContext.Request.Body = body;
+
+        return httpContext;
+    }
+
+    private sealed class MockOrderWorkflowClient(string instanceId) : IOrderWorkflowClient
+    {
+        private readonly string _instanceId = instanceId;
+
+        public OrderWorkflowRequest? StartRequest { get; private set; }
+
+        public Task<string> StartAsync(OrderWorkflowRequest request, string? instanceId = null, CancellationToken cancellationToken = default)
+        {
+            StartRequest = request;
+            return Task.FromResult(instanceId ?? _instanceId);
+        }
+
+        public Task<OrchestrationMetadata?> GetMetadataAsync(string instanceId, bool getInputsAndOutputs = false, CancellationToken cancellationToken = default)
+            => throw new NotSupportedException();
+    }
+
+    private sealed class FakeOrderService : IOrderService
+    {
+        public Task<Contoso.Orders.Contracts.Order> CreateAsync(Contoso.Orders.Contracts.Order order)
+            => throw new NotSupportedException();
+
+        public Task DeleteAsync(string id)
+            => throw new NotSupportedException();
+
+        public Task<Contoso.Orders.Contracts.Order?> GetAsync(string id)
+            => throw new NotSupportedException();
+
+        public Task<Contoso.Orders.Contracts.Order> UpdateAsync(Contoso.Orders.Contracts.Order order)
+            => throw new NotSupportedException();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Unit/EntryPoint.cs b/samples/tests/Contoso.Orders.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..6b481503
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Unit/EntryPoint.cs
@@ -0,0 +1,28 @@
+namespace Contoso.Orders.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder)
+    {
+        builder.Services.AddExecutionContext();
+        builder.Services.AddMemoryCache();
+        builder.Services.AddReferenceDataOrchestrator<ReferenceDataProvider>();
+
+        var jdr = JsonDataReader.ParseYaml<Contoso.Orders.Database.Program>("ref-data.yaml", JsonDataReaderOptions.CreateForReferenceData());
+        builder.Services.AddSingleton(new ReferenceDataProvider(jdr));
+    }
+
+    public class ReferenceDataProvider(JsonDataReader jdr) : IReferenceDataProvider
+    {
+        public IEnumerable<(Type, Type)> Types =>
+        [
+            (typeof(OrderStatus), typeof(OrderStatusCollection))
+        ];
+
+        public Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+        {
+            _ when type == typeof(OrderStatus) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<OrderStatusCollection>("Orders.$^OrderStatus")!),
+            _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+        };
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Unit/GlobalUsing.cs b/samples/tests/Contoso.Orders.Test.Unit/GlobalUsing.cs
new file mode 100644
index 00000000..8bbe7c96
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Unit/GlobalUsing.cs
@@ -0,0 +1,12 @@
+global using AwesomeAssertions;
+global using Contoso.Orders.Application.Validators;
+global using Contoso.Orders.Contracts;
+global using CoreEx;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.UnitTesting;
+global using CoreEx.UnitTesting.Data;
+global using CoreEx.Validation;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Hosting;
+global using UnitTestEx;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Orders.Test.Unit/Validators/OrderValidatorTests.cs b/samples/tests/Contoso.Orders.Test.Unit/Validators/OrderValidatorTests.cs
new file mode 100644
index 00000000..b47cffc5
--- /dev/null
+++ b/samples/tests/Contoso.Orders.Test.Unit/Validators/OrderValidatorTests.cs
@@ -0,0 +1,37 @@
+namespace Contoso.Orders.Test.Unit.Validators;
+
+public class OrderValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void Empty_Required() => Test.Scoped(test =>
+    {
+        var order = new Contoso.Orders.Contracts.Order();
+        new OrderValidator().AssertErrors(order,
+            ("customerId", "Customer is required."),
+            ("status", "Order status is required."));
+    });
+
+    [Test]
+    public void Invalid_ReferenceData() => Test.Scoped(test =>
+    {
+        var order = new Contoso.Orders.Contracts.Order { CustomerId = "CUST-1001", StatusCode = "ZZ" };
+        new OrderValidator().AssertErrors(order,
+            ("status", "Order status is invalid."));
+    });
+
+    [Test]
+    public void Success() => Test.Scoped(test =>
+    {
+        var order = new Contoso.Orders.Contracts.Order
+        {
+            CustomerId = "CUST-1001",
+            StatusCode = "P",
+            Items =
+            [
+                new OrderItem { Id = "ORD-1001-1", ProductId = "PROD-100", Quantity = 1.00m, UnitPrice = 12.34m }
+            ]
+        };
+
+        new OrderValidator().AssertSuccess(order);
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj b/samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj
new file mode 100644
index 00000000..f2ece1a4
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Contoso.Products.Test.Api.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Api\Contoso.Products.Api.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Test.Common\Contoso.Products.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.Products.Test.Api/GlobalUsing.cs b/samples/tests/Contoso.Products.Test.Api/GlobalUsing.cs
new file mode 100644
index 00000000..6ebb089d
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/GlobalUsing.cs
@@ -0,0 +1,11 @@
+global using Contoso.Products.Contracts;
+global using CoreEx;
+global using CoreEx.Http.Abstractions;
+global using AwesomeAssertions;
+global using NUnit.Framework;
+global using System.Net;
+global using System.Text.Json;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = Contoso.Products.Database.Program;
+global using TestData = Contoso.Products.Test.Common.TestData;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/HostTests.ReferenceData.cs b/samples/tests/Contoso.Products.Test.Api/HostTests.ReferenceData.cs
new file mode 100644
index 00000000..f67cbffe
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/HostTests.ReferenceData.cs
@@ -0,0 +1,65 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class HostTests
+{
+    [Test]
+    public void RefData_Categories()
+    {
+        Test.Http<Category[]>()
+            .Run(HttpMethod.Get, "/api/refdata/categories")
+            .AssertOK()
+            .Value.Should().HaveCountGreaterThan(0);
+    }
+
+    [Test]
+    public void RefData_SubCategories()
+    {
+        var r = Test.Http<SubCategory[]>()
+            .Run(HttpMethod.Get, "/api/refdata/sub-categories")
+            .AssertOK()
+            .Value;
+
+        r.Should().HaveCountGreaterThan(0);
+        r.Should().Contain(sc => sc.Code == "CA" && sc.Text == "Cassette" && sc.CategoryCode == "P");
+    }
+
+    [Test]
+    public void RefData_UnitsOfMeasure()
+    {
+        var r = Test.Http<UnitOfMeasure[]>()
+            .Run(HttpMethod.Get, "/api/refdata/units-of-measure")
+            .AssertOK()
+            .Value;
+
+        r.Should().HaveCountGreaterThan(0);
+        r.Should().Contain(uom => uom.Code == "EA" && uom.Text == "Each" && uom.Scale == 0);
+        r.Should().Contain(uom => uom.Code == "HR" && uom.Text == "Hour" && uom.Scale == 2);
+    }
+
+    [Test]
+    public void RefData_Brands()
+    {
+        Test.Http<Brand[]>()
+            .Run(HttpMethod.Get, "/api/refdata/brands")
+            .AssertOK()
+            .Value.Should().HaveCountGreaterThan(0);
+    }
+
+    [Test]
+    public void RefData_Named()
+    {
+        var r = Test.Http<JsonElement>()
+            .Run(HttpMethod.Get, "/api/refdata?name=sub-cateGORies&name=brands&name=subcategory&name=other")
+            .AssertOK()
+            .Value;
+
+        r.ValueKind.Should().Be(JsonValueKind.Object);
+        r.EnumerateObject().Count().Should().Be(2);
+
+        r.TryGetProperty("sub-categories", out var subCategory).Should().BeTrue();
+        subCategory.GetArrayLength().Should().BeGreaterThan(0);
+
+        r.TryGetProperty("brands", out var brands).Should().BeTrue();
+        brands.GetArrayLength().Should().BeGreaterThan(0);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/HostTests.cs b/samples/tests/Contoso.Products.Test.Api/HostTests.cs
new file mode 100644
index 00000000..78cbd53a
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/HostTests.cs
@@ -0,0 +1,74 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class HostTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+    }
+
+    [Test]
+    public void Swagger_UI()
+    {
+        // Hit swagger and assert redirect.
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger")
+            .Assert(HttpStatusCode.Found)
+            .AssertLocationHeader(new Uri("/swagger/index.html", UriKind.Relative));
+
+        // Go to redirected URL and assert basic content.
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger/index.html")
+            .Assert(HttpStatusCode.OK)
+            .GetContent().Should().Contain("<title>Swagger UI</title>");
+    }
+
+    [Test]
+    public void Swagger_Json()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger/v1/swagger.json")
+            .Assert(HttpStatusCode.OK)
+            .AssertContentTypeJson()
+            .GetContent().Should().BeJson()
+                .ContainAll(["$.openapi", "$.info", "$.paths"])
+                .HavePath("$.info.title").GetValue<string>().Should().Be("Contoso.Products.Api");
+    }
+
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+    }
+
+    [TestCase("/health/live/detailed", true)]
+    [TestCase("/health/startup/detailed", false)]
+    [TestCase("/health/ready/detailed", false)]
+    public void Health_Detailed(string path, bool minimal)
+    {
+        string[] _paths =
+        [
+            "$.entries.reference-data-orchestrator",
+            "$.entries['stackExchange.Redis']",
+            "$.entries.postgreSql"
+        ];
+
+        var r = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .AssertContentTypeJson();
+
+        r.Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+
+        var json = r.GetContent().Should().BeJson();
+        if (minimal)
+            json.NotContainAny(_paths);
+        else
+            json.ContainAll(_paths);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Adjust.cs b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Adjust.cs
new file mode 100644
index 00000000..aa8f513b
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Adjust.cs
@@ -0,0 +1,51 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class MovementMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Adjust_Success()
+    {
+        // Arrange - get current on-hand quantities for the products to assert against after reservation
+        var p1 = 28.ToGuid().ToString();
+        var p2 = 16.ToGuid().ToString();
+
+        var q1 = Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p1}/on-hand")
+            .AssertOK()
+            .Value;
+
+        var q2 = Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p2}/on-hand")
+            .AssertOK()
+            .Value;
+
+        // Act - reserve inventory for the products.
+        var req = new MovementRequest
+        {
+            Id = 791632.ToGuid().ToString(),
+            Products = new()
+            {
+                { p1, new MovementRequestProduct { Quantity = 33, UnitOfMeasureCode = "EA" } },
+                { 14.ToGuid().ToString(), new MovementRequestProduct { Quantity = 0, UnitOfMeasureCode = "EA" } },
+                { p2, new MovementRequestProduct { Quantity = 11, UnitOfMeasureCode = "EA" } }
+            }
+        };
+
+        Test.Http<Movement[]>()
+            .ExpectPostgresOutboxEvents(e => e.AssertAllFromJsonResource("MovementMutateTests.Adjust_Success.event.json"))
+            .Run(HttpMethod.Post, "/api/inventory/adjust", req)
+            .AssertOK()
+            .Value.Should().HaveCount(2);
+
+        // Assert - on-hand quantities should be reduced by reserved amounts.
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p1}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(33);
+
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p2}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(11);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Cancel.cs b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Cancel.cs
new file mode 100644
index 00000000..083c1de3
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Cancel.cs
@@ -0,0 +1,49 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class MovementMutateTests 
+{
+    [Test]
+    public void Cancel_Success()
+    {
+        // Arrange - get current on-hand quantities for the products to assert against after cancellation.
+        var p1 = 24.ToGuid().ToString();
+        var p2 = 28.ToGuid().ToString();
+
+        var q1 = Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p1}/on-hand")
+            .AssertOK()
+            .Value;
+
+        var q2 = Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p2}/on-hand")
+            .AssertOK()
+            .Value;
+
+        // Act - cancel the reservation.
+        var referenceId = 1001.ToGuid().ToString();
+
+        Test.Http<Movement[]>()
+            .ExpectPostgresOutboxEvents(e => e.AssertCount(2))
+            .Run(HttpMethod.Post, $"/api/inventory/reservation/{referenceId}/cancel")
+            .AssertOK()
+            .AssertJsonFromResource("MovementMutateTests.Cancel_Success.res.json", pathsToIgnore: ["etag", "changelog"]);
+
+        // Assert - re-cancel, should result in not found as the reservation has already been confirmed and is no longer pending. 
+        Test.Http<ProblemDetails>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, $"/api/inventory/reservation/{referenceId}/cancel")
+            .AssertNotFound()
+            .Value!.ErrorCode.Should().Be("pending-reservation-not-found");
+
+        // Assert - on-hand quantities should have been reversed by reserved amounts.
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p1}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(q1 + 2);
+
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p2}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(q2 + 1);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Confirm.cs b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Confirm.cs
new file mode 100644
index 00000000..5a1f4204
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Confirm.cs
@@ -0,0 +1,23 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class MovementMutateTests 
+{
+    [Test]
+    public void Confirm_Success()
+    {
+        var referenceId = 1000.ToGuid().ToString();
+
+        Test.Http<Movement[]>()
+            .ExpectPostgresOutboxEvents(e => e.AssertCount(3))
+            .Run(HttpMethod.Post, $"/api/inventory/reservation/{referenceId}/confirm")
+            .AssertOK()
+            .AssertJsonFromResource("MovementMutateTests.Confirm_Success.res.json", pathsToIgnore: ["etag", "changelog"]);
+
+        // Re-confirm, should result in not found as the reservation has already been confirmed and is no longer pending. 
+        Test.Http<ProblemDetails>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, $"/api/inventory/reservation/{referenceId}/confirm")
+            .AssertNotFound()
+            .Value!.ErrorCode.Should().Be("pending-reservation-not-found");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Reserve.cs b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Reserve.cs
new file mode 100644
index 00000000..ab73dbfa
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.Reserve.cs
@@ -0,0 +1,91 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class MovementMutateTests 
+{
+    [Test]
+    public void Reserve_ProductNotFound()
+    {
+        var req = new MovementRequest
+        {
+            Id = 671953.ToGuid().ToString(),
+            Products = new()
+            {
+                { 9999.ToGuid().ToString(), new MovementRequestProduct { Quantity = 3, UnitOfMeasureCode = "EA" } }
+            }
+        };
+
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/inventory/reserve", req)
+            .AssertBadRequest()
+            .AssertErrors(new ApiError("products.0000270f-0000-0000-0000-000000000000", "Product was not found."));
+    }
+
+    [Test]
+    public void Reserve_InsufficientStock()
+    {
+        var p1 = 28.ToGuid().ToString();
+        var p2 = 16.ToGuid().ToString();
+
+        var req = new MovementRequest
+        {
+            Id = 671953.ToGuid().ToString(),
+            Products = new()
+            {
+                { p1, new MovementRequestProduct { Quantity = 3, UnitOfMeasureCode = "EA" } },
+                { p2, new MovementRequestProduct { Quantity = 100, UnitOfMeasureCode = "EA" } }
+            }
+        };
+
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/inventory/reserve", req)
+            .AssertBadRequest()
+            .AssertProblemDetailsTitle($"Product '{p2}' does not have sufficient quantity on hand.");
+    }
+
+    [Test]
+    public void Reserve_Success()
+    {
+        // Arrange - get current on-hand quantities for the products to assert against after reservation
+        var p1 = 28.ToGuid().ToString();
+        var p2 = 16.ToGuid().ToString();
+
+        var q1 = Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p1}/on-hand")
+            .AssertOK()
+            .Value;
+
+        var q2 = Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p2}/on-hand")
+            .AssertOK()
+            .Value;
+
+        // Act - reserve inventory for the products.
+        var req = new MovementRequest
+        {
+            Id = 671953.ToGuid().ToString(),
+            Products = new()
+            {
+                { p1, new MovementRequestProduct { Quantity = 3, UnitOfMeasureCode = "EA" } },
+                { 14.ToGuid().ToString(), new MovementRequestProduct { Quantity = 0, UnitOfMeasureCode = "EA" } },
+                { p2, new MovementRequestProduct { Quantity = 1, UnitOfMeasureCode = "EA" } }
+            }
+        };
+
+        Test.Http<Movement[]>()
+            .ExpectPostgresOutboxEvents(e => e.AssertAllFromJsonResource("MovementMutateTests.Reserve_Success.event.json"))
+            .Run(HttpMethod.Post, "/api/inventory/reserve", req)
+            .AssertOK()
+            .Value.Should().HaveCount(2);
+
+        // Assert - on-hand quantities should be reduced by reserved amounts.
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p1}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(q1 - 3);
+
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{p2}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(q2 - 1);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.cs b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.cs
new file mode 100644
index 00000000..4ddc31c4
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/MovementMutateTests.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class MovementMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedPostgresOutboxPublisher();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Create.cs b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Create.cs
new file mode 100644
index 00000000..5a1e31bb
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Create.cs
@@ -0,0 +1,118 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ProductMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Create_Bad_Data()
+    {
+        // Arrange.
+        var p = new Product
+        {
+            Sku = "abc",
+            Text = null,
+            Price = -1.99M,
+            SubCategoryCode = "XX",
+            BrandCode = "yeti",
+        };
+
+        // Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/products", p)
+            .AssertBadRequest()
+            .AssertErrors(
+                "Text is required.",
+                "Unit-of-measure is required.",
+                "Price must be greater than or equal to zero.",
+                "Sub-category is invalid."
+            );
+    }
+
+    [Test]
+    public void Create_Duplicate()
+    {
+        // Arrange.
+        var p = new Product
+        {
+            Sku = "Yeti-ASR-c2-2025",
+            Text = "Yeti ASR C2",
+            Price = 5800M,
+            SubCategoryCode = "XC",
+            UnitOfMeasureCode = "ea",
+            BrandCode = "yeti"
+        };
+
+        // Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/products", p)
+            .AssertConflict();
+    }
+
+    [Test]
+    public void Create_Success()
+    {
+        // Arrange.
+        var p = new Product
+        {
+            Sku = "New-SKU-123",
+            Text = "New Product",
+            Price = 1000M,
+            SubCategoryCode = "XC",
+            UnitOfMeasureCode = "ea",
+            BrandCode = "yeti"
+        };
+
+        // Act/Assert.
+        var r = Test.Http<Product>()
+            .ExpectIdentifier()
+            .ExpectETag()
+            .ExpectChangeLogCreated()
+            .ExpectJsonFromResource("ProductMutateTests.Create_Success.res.json")
+            .ExpectPostgresOutboxEvents(e => e.AssertWithValue("contoso", "contoso.products.product.created.v1"))
+            .Run(HttpMethod.Post, "/api/products", p)
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/products/{r!.Id}", UriKind.Relative))
+            .Value!;
+
+        // Assert.
+        Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{r.Id}")
+            .AssertOK()
+            .AssertValue(r);
+    }
+
+    [Test]
+    public void Create_IdempotencyKey()
+    {
+        // Arrange.
+        var p = new Product
+        {
+            Sku = "New-SKU-456",
+            Text = "Another New Product",
+            Price = 1200M,
+            SubCategoryCode = "XC",
+            UnitOfMeasureCode = "ea",
+            BrandCode = "yeti"
+        };
+
+        var ik = Guid.NewGuid().ToString();
+
+        // Act/Assert.
+        var v1 = Test.Http<Product>()
+            .ExpectPostgresOutboxEvents()
+            .Run(HttpMethod.Post, "/api/products", p, requestModifier: r => r.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/products/{r!.Id}", UriKind.Relative))
+            .Value!;
+
+        // Assert: repeat with same idempotency key; should get back same result & no extra event emitted.
+        var v2 = Test.Http<Product>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, "/api/products", p, requestModifier: r => r.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertLocationHeader(r => new Uri($"/api/products/{r!.Id}", UriKind.Relative))
+            .Value!;
+
+        // Assert: both results are the same.
+        ObjectComparer.Assert(v1, v2);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Delete.cs b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Delete.cs
new file mode 100644
index 00000000..74a96258
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Delete.cs
@@ -0,0 +1,59 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ProductMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Delete_NotFound()
+    {
+        // Arrange/Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Delete, "/api/products/404")
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Delete_IsDeleted()
+    {
+        // Arrange/Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Delete, $"/api/products/{18.ToGuid()}")
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Delete_IsActive()
+    {
+        // Arrange/Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Delete, $"/api/products/{12.ToGuid()}")
+            .AssertBadRequest()
+            .AssertProblemDetailsTitle("A product must first be deactivated before it can be deleted.");
+    }
+
+    [Test]
+    public void Delete_Success()
+    {
+        var id = 13.ToGuid().ToString();
+
+        // Arrange.
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/products/{id}")
+            .AssertOK();
+
+        // Act.
+        Test.Http()
+            .ExpectPostgresOutboxEvents(c => c.AssertMetadata("contoso", "contoso.products.product.deleted", id))
+            .Run(HttpMethod.Delete, $"/api/products/{id}")
+            .AssertNoContent();
+
+        // Assert idempotent.
+        Test.Http()
+            .Run(HttpMethod.Delete, $"/api/products/{id}")
+            .AssertNoContent();
+
+        // Assert.
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/products/{id}")
+            .AssertNotFound();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Patch.cs b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Patch.cs
new file mode 100644
index 00000000..be5fc40a
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Patch.cs
@@ -0,0 +1,107 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ProductMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Patch_NotFound()
+    {
+        // Arrange/Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Patch, "/api/products/404", new { text = "abc" }, requestModifier: r => r.WithMergePatchJsonContentType())
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Patch_Concurrency()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{7.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        p.Text += " Patched";
+
+        // Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Patch, $"/api/products/{p.Id}", new { text = p.Text }, requestModifier: r => r.WithIfMatch("AAAAAAAA").WithMergePatchJsonContentType())
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void Patch_Validation()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{7.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        p.Text += " Patched";
+
+        // Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Patch, $"/api/products/{p.Id}", new { text = p.Text, UnitOfMeasure = "XX" }, requestModifier: r => r.WithIfMatch(p.ETag).WithMergePatchJsonContentType())
+            .AssertBadRequest()
+            .AssertErrors("Unit-of-measure is invalid.");
+    }
+
+    [Test]
+    public void Patch_Success()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{7.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        p.Text += " Patched";
+
+        // Act/Assert.
+        var u = Test.Http<Product>()
+            .ExpectPostgresOutboxEvents(e => e.AssertWithValue("contoso", "contoso.products.product.updated.v1"))
+            .Run(HttpMethod.Patch, $"/api/products/{p.Id}", new { text = p.Text }, requestModifier: r => r.WithIfMatch(p.ETag).WithMergePatchJsonContentType())
+            .AssertOK()
+            .AssertValue(p, "etag", "changelog")
+            .Value!;
+
+        u.Text.Should().Be(p.Text);
+        u.ETag.Should().NotBe(p.ETag);
+
+        // Assert.
+        Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{p.Id}")
+            .AssertOK()
+            .AssertValue(u, "etag", "changelog");
+    }
+
+    [Test]
+    public void Patch_NoChanges()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{8.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        // Act/Assert.
+        var u = Test.Http<Product>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Patch, $"/api/products/{p.Id}", new { }, requestModifier: r => r.WithIfMatch(p.ETag).WithMergePatchJsonContentType())
+            .AssertOK()
+            .AssertValue(p, "etag", "changelog")
+            .Value!;
+
+        u.Text.Should().Be(p.Text);
+        u.ETag.Should().Be(p.ETag);
+        u.ChangeLog.Should().NotBeNull();
+        u.ChangeLog.UpdatedBy.Should().BeNull();
+        u.ChangeLog.UpdatedOn.Should().BeNull();
+
+        // Assert.
+        Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{p.Id}")
+            .AssertOK()
+            .AssertValue(u, "etag", "changelog");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Update.cs b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Update.cs
new file mode 100644
index 00000000..e8512616
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.Update.cs
@@ -0,0 +1,97 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ProductMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Update_NotFound()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{6.ToGuid()}")
+            .AssertOK()
+            .Value;
+
+        // Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Put, "/api/products/404", p)
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Update_Concurrency()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{6.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        p.Text += " Updated";
+
+        // Act/Assert.
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/products/{p.Id}", p, requestModifier: r => r.WithIfMatch("AAAAAAAA"))
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void Update_Success()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{6.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        p.Text += " Updated";
+
+        // Act/Assert.
+        var u = Test.Http<Product>()
+            .ExpectIdentifier()
+            .ExpectETag()
+            .ExpectChangeLogUpdated()
+            .ExpectValue(p)
+            .ExpectPostgresOutboxEvents(e => e.AssertWithValue("contoso", "contoso.products.product.updated.v1"))
+            .Run(HttpMethod.Put, $"/api/products/{p.Id}", p)
+            .AssertOK()
+            .Value!;
+
+        u.Text.Should().Be(p.Text);
+        u.ETag.Should().NotBe(p.ETag);
+
+        // Assert.
+        Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{p.Id}")
+            .AssertOK()
+            .AssertValue(u);
+    }
+
+    [Test]
+    public void Update_NoChanges()
+    {
+        // Arrange.
+        var p = Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{6.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        // Act/Assert.
+        var u = Test.Http<Product>()
+            .Run(HttpMethod.Put, $"/api/products/{p.Id}", p)
+            .AssertOK()
+            .AssertValue(p, "etag", "changelog")
+            .Value!;
+
+        u.Text.Should().Be(p.Text);
+        u.ETag.Should().Be(p.ETag);
+        u.ChangeLog.Should().NotBeNull();
+        u.ChangeLog.UpdatedBy.Should().BeNull();
+        u.ChangeLog.UpdatedOn.Should().BeNull();
+
+        // Assert.
+        Test.Http<Product>()
+            .Run(HttpMethod.Get, $"/api/products/{p.Id}")
+            .AssertOK()
+            .AssertValue(u);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.cs b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.cs
new file mode 100644
index 00000000..059d9e30
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ProductMutateTests.cs
@@ -0,0 +1,13 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ProductMutateTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedPostgresOutboxPublisher();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ReadTests.MovementQuery.cs b/samples/tests/Contoso.Products.Test.Api/ReadTests.MovementQuery.cs
new file mode 100644
index 00000000..7d918c81
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ReadTests.MovementQuery.cs
@@ -0,0 +1,25 @@
+using System;
+namespace Contoso.Products.Test.Api;
+
+public partial class ReadTests
+{
+    [Test]
+    public void Movement_Query_All()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/inventory/movements")
+            .AssertOK()
+            .Value;
+
+        r.Should().NotBeNull().And.HaveCount(5);
+    }
+
+    [Test]
+    public void Movement_Query_Filter()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, $"/api/inventory/movements?$filter=referenceid eq '{1000.ToGuid()}' and productid ne '{6.ToGuid()}' and kind eq 'I' and status eq 'p'")
+            .AssertOK()
+            .AssertJsonFromResource("Movement_Query_Filter.res.json", ["changelog", "etag"]);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductGet.cs b/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductGet.cs
new file mode 100644
index 00000000..d2545d8c
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductGet.cs
@@ -0,0 +1,44 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ReadTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Product_Get_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/api/products/404")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Product_Get_IsDeleted()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/products/{18.ToGuid()}")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Product_Get_Found()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}")
+            .AssertOK()
+            .AssertJsonFromResource("ReadTests.Product_Get_Found.res.json", "etag", "changelog");
+    }
+
+    [Test]
+    public void Product_Get_Not_Modified()
+    {
+        var r = Test.Http()
+            .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}")
+            .AssertOK()
+            .Response;
+
+        r.Headers.ETag.Should().NotBeNull();
+
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}", requestModifier: rm => rm.WithIfNoneMatch(r.Headers.ETag.Tag))
+            .AssertNotModified();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductQtyOnHand.cs b/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductQtyOnHand.cs
new file mode 100644
index 00000000..24257e63
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductQtyOnHand.cs
@@ -0,0 +1,30 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ReadTests
+{
+    [Test]
+    public void Product_QtyOnHand_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/api/products/404/on-hand")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Product_QtyOnHand_None()
+    {
+        Test.Http<int>()
+            .Run(HttpMethod.Get, $"/api/products/{32.ToGuid()}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(0);
+    }
+
+    [Test]
+    public void Product_QtyOnHand_Value()
+    {
+        Test.Http<decimal>()
+            .Run(HttpMethod.Get, $"/api/products/{1.ToGuid()}/on-hand")
+            .AssertOK()
+            .Value.Should().Be(3);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductQuery.cs b/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductQuery.cs
new file mode 100644
index 00000000..f3118210
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ReadTests.ProductQuery.cs
@@ -0,0 +1,100 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ReadTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [Test]
+    public void Product_Query_Schema()
+    {
+        Test.Http<JsonElement>()
+            .Run(HttpMethod.Get, "/api/products/$query")
+            .AssertOK()
+            .AssertJsonFromResource("ReadTests.Product_Query_Schema.res.json");
+    }
+
+    [Test]
+    public void Product_Query_All()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/products")
+            .AssertOK()
+            .Value;
+
+        r.Should().NotBeNull().And.HaveCount(25);
+        r.Single(x => x.Id == 1.ToGuid().ToString()).QtyOnHand.Should().Be(3);
+    }
+
+    [Test]
+    public void Product_Query_Paging()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/products?$skip=5&$take=10&$count=true")
+            .AssertOK();
+
+        r.Value.Should().NotBeNull().And.HaveCount(10);
+        r.Value.Should().HaveCount(10);
+
+        r.Response.Headers.Should().ContainKey("X-Paging-Skip").WhoseValue.Should().ContainSingle().Which.Should().Be("5");
+        r.Response.Headers.Should().ContainKey("X-Paging-Take").WhoseValue.Should().ContainSingle().Which.Should().Be("10");
+        r.Response.Headers.Should().ContainKey("X-Paging-Total-Count").WhoseValue.Should().ContainSingle().Which.Should().Be("29");
+    }
+
+    [Test]
+    public void Product_Query_FilterBySku()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/products?$filter=startswith(Sku, 'spec')")
+            .AssertOK()
+            .Value;
+
+        r.Should().NotBeNull()
+            .And.HaveCount(4)
+            .And.OnlyContain(p => p.Sku!.StartsWith("SPEC")).And.BeInAscendingOrder(x => x.Sku).And.NotContain(x => x.Sku == "SPEC-EPIC-8-PRO");
+    }
+
+    [Test]
+    public void Product_Query_FilterBySku_IncludeFields()
+    {
+        Test.Http<ProductLite[]>()
+            .ExpectLogContains("ORDER BY p.text DESC, p.sku")
+            .Run(HttpMethod.Get, "/api/products?$filter=startswith(Sku, 'spec')&$fields=sku,text&$orderby=text desc")
+            .AssertOK()
+            .AssertJsonFromResource("ReadTests.Product_Query_FilterBySku_IncludeFields.res.json");
+    }
+
+    [Test]
+    public void Product_Query_FilterBySku_IncludeInactive()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/products?$filter=startswith(Sku, 'spec')&$inactive")
+            .AssertOK()
+            .Value;
+
+        r.Should().NotBeNull()
+            .And.HaveCount(5)
+            .And.OnlyContain(p => p.Sku!.StartsWith("SPEC")).And.BeInAscendingOrder(x => x.Sku).And.Contain(x => x.Sku == "SPEC-EPIC-8-PRO");
+    }
+
+    [Test]
+    public void Product_Query_FilterByCategory()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/products?$filter=category eq 'm'")
+            .AssertOK()
+            .Value;
+
+        r.Should().NotBeNull()
+            .And.HaveCount(1)
+            .And.OnlyContain(p => p.Sku == "LABOR");
+    }
+
+    [Test]
+    public void Product_Query_FilterByBrandAndSubCategory()
+    {
+        var r = Test.Http<ProductLite[]>()
+            .Run(HttpMethod.Get, "/api/products?$filter=subcategory eq 'xc' and brand in ('yeti', 'canyon')")
+            .AssertOK()
+            .Value;
+
+        r.Should().NotBeNull().And.HaveCount(2);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/ReadTests.cs b/samples/tests/Contoso.Products.Test.Api/ReadTests.cs
new file mode 100644
index 00000000..7b42a4ca
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/ReadTests.cs
@@ -0,0 +1,11 @@
+namespace Contoso.Products.Test.Api;
+
+public partial class ReadTests : WithApiTester<Contoso.Products.Api.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["read-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Adjust_Success.event.json b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Adjust_Success.event.json
new file mode 100644
index 00000000..1241a837
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Adjust_Success.event.json
@@ -0,0 +1,62 @@
+[
+  {
+    "destination": "contoso",
+    "event": {
+      "specversion": "1.0",
+      "id": "019cced1-7956-7064-8369-e1f8512dda30",
+      "type": "contoso.products.movement.adjust.confirmed.v1",
+      "source": "urn:contoso:products",
+      "subject": "019cced1-78cb-7b7a-a5e3-e61958705cd4",
+      "time": "2026-03-08T18:59:20.399008Z",
+      "partitionkey": "019cced1-78cb-7b7a-a5e3-e61958705cd4",
+      "authtype": "user",
+      "authid": "METACORTEX\\thomas.anderson",
+      "traceparent": "00-e48c8aa42627e1cb8530989fc4b6beef-e8a010df8f010f8a-01",
+      "dataschemaversion": "1.0",
+      "datacontenttype": "application/json",
+      "data": {
+        "id": "019cced1-78cb-7b7a-a5e3-e61958705cd4",
+        "referenceId": "000c1450-0000-0000-0000-000000000000",
+        "kind": "A",
+        "status": "C",
+        "productId": "0000001c-0000-0000-0000-000000000000",
+        "quantity": 33,
+        "unitOfMeasure": "EA",
+        "changeLog": {
+          "createdBy": "METACORTEX\\thomas.anderson",
+          "createdOn": "2026-03-08T18:59:20.399008\u002B00:00"
+        }
+      }
+    }
+  },
+  {
+    "destination": "contoso",
+    "event": {
+      "specversion": "1.0",
+      "id": "019cced1-7962-7395-8a72-0764d3cafa89",
+      "type": "contoso.products.movement.adjust.confirmed.v1",
+      "source": "urn:contoso:products",
+      "subject": "019cced1-78f8-7026-b422-4a56e4df5360",
+      "time": "2026-03-08T18:59:20.399008Z",
+      "partitionkey": "019cced1-78f8-7026-b422-4a56e4df5360",
+      "authtype": "user",
+      "authid": "METACORTEX\\thomas.anderson",
+      "traceparent": "00-e48c8aa42627e1cb8530989fc4b6beef-e8a010df8f010f8a-01",
+      "dataschemaversion": "1.0",
+      "datacontenttype": "application/json",
+      "data": {
+        "id": "019cced1-78f8-7026-b422-4a56e4df5360",
+        "referenceId": "000c1450-0000-0000-0000-000000000000",
+        "kind": "A",
+        "status": "C",
+        "productId": "00000010-0000-0000-0000-000000000000",
+        "quantity": 11,
+        "unitOfMeasure": "EA",
+        "changeLog": {
+          "createdBy": "METACORTEX\\thomas.anderson",
+          "createdOn": "2026-03-08T18:59:20.399008\u002B00:00"
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Cancel_Success.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Cancel_Success.res.json
new file mode 100644
index 00000000..991173f5
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Cancel_Success.res.json
@@ -0,0 +1,34 @@
+[
+  {
+    "id": "00000005-0000-0000-0000-000000000000",
+    "referenceId": "000003e9-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "X",
+    "productId": "0000001c-0000-0000-0000-000000000000",
+    "quantity": -1.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-03-11T14:40:31.7590102\u002B00:00",
+      "updatedBy": "METACORTEX\\thomas.anderson",
+      "updatedOn": "2026-03-11T14:40:38.5301225\u002B00:00"
+    },
+    "etag": "AAAAAAAAKAQ="
+  },
+  {
+    "id": "00000004-0000-0000-0000-000000000000",
+    "referenceId": "000003e9-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "X",
+    "productId": "00000018-0000-0000-0000-000000000000",
+    "quantity": -2.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-03-11T14:40:31.7590102\u002B00:00",
+      "updatedBy": "METACORTEX\\thomas.anderson",
+      "updatedOn": "2026-03-11T14:40:38.5301225\u002B00:00"
+    },
+    "etag": "AAAAAAAAKAM="
+  }
+]
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Confirm_Success.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Confirm_Success.res.json
new file mode 100644
index 00000000..9f9999eb
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Confirm_Success.res.json
@@ -0,0 +1,50 @@
+[
+  {
+    "id": "00000003-0000-0000-0000-000000000000",
+    "referenceId": "000003e8-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "C",
+    "productId": "0000001f-0000-0000-0000-000000000000",
+    "quantity": -3.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-03-11T15:04:49.3962121\u002B00:00",
+      "updatedBy": "METACORTEX\\thomas.anderson",
+      "updatedOn": "2026-03-11T15:04:58.6529721\u002B00:00"
+    },
+    "etag": "AAAAAAAAKNQ="
+  },
+  {
+    "id": "00000002-0000-0000-0000-000000000000",
+    "referenceId": "000003e8-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "C",
+    "productId": "00000006-0000-0000-0000-000000000000",
+    "quantity": -1.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-03-11T15:04:49.3962121\u002B00:00",
+      "updatedBy": "METACORTEX\\thomas.anderson",
+      "updatedOn": "2026-03-11T15:04:58.6529721\u002B00:00"
+    },
+    "etag": "AAAAAAAAKNM="
+  },
+  {
+    "id": "00000001-0000-0000-0000-000000000000",
+    "referenceId": "000003e8-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "C",
+    "productId": "00000001-0000-0000-0000-000000000000",
+    "quantity": -2.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-03-11T15:04:49.3962121\u002B00:00",
+      "updatedBy": "METACORTEX\\thomas.anderson",
+      "updatedOn": "2026-03-11T15:04:58.6529721\u002B00:00"
+    },
+    "etag": "AAAAAAAAKNI="
+  }
+]
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Reserve_Success.event.json b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Reserve_Success.event.json
new file mode 100644
index 00000000..c64cb48c
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/MovementMutateTests/Reserve_Success.event.json
@@ -0,0 +1,62 @@
+[
+  {
+    "destination": "contoso",
+    "event": {
+      "specversion": "1.0",
+      "id": "019cced1-7956-7064-8369-e1f8512dda30",
+      "type": "contoso.products.movement.issue.pending.v1",
+      "source": "urn:contoso:products",
+      "subject": "019cced1-78cb-7b7a-a5e3-e61958705cd4",
+      "time": "2026-03-08T18:59:20.399008Z",
+      "partitionkey": "019cced1-78cb-7b7a-a5e3-e61958705cd4",
+      "authtype": "user",
+      "authid": "METACORTEX\\thomas.anderson",
+      "traceparent": "00-e48c8aa42627e1cb8530989fc4b6beef-e8a010df8f010f8a-01",
+      "dataschemaversion": "1.0",
+      "datacontenttype": "application/json",
+      "data": {
+        "id": "019cced1-78cb-7b7a-a5e3-e61958705cd4",
+        "referenceId": "000a40d1-0000-0000-0000-000000000000",
+        "kind": "I",
+        "status": "P",
+        "productId": "0000001c-0000-0000-0000-000000000000",
+        "quantity": -3,
+        "unitOfMeasure": "EA",
+        "changeLog": {
+          "createdBy": "METACORTEX\\thomas.anderson",
+          "createdOn": "2026-03-08T18:59:20.399008\u002B00:00"
+        }
+      }
+    }
+  },
+  {
+    "destination": "contoso",
+    "event": {
+      "specversion": "1.0",
+      "id": "019cced1-7962-7395-8a72-0764d3cafa89",
+      "type": "contoso.products.movement.issue.pending.v1",
+      "source": "urn:contoso:products",
+      "subject": "019cced1-78f8-7026-b422-4a56e4df5360",
+      "time": "2026-03-08T18:59:20.399008Z",
+      "partitionkey": "019cced1-78f8-7026-b422-4a56e4df5360",
+      "authtype": "user",
+      "authid": "METACORTEX\\thomas.anderson",
+      "traceparent": "00-e48c8aa42627e1cb8530989fc4b6beef-e8a010df8f010f8a-01",
+      "dataschemaversion": "1.0",
+      "datacontenttype": "application/json",
+      "data": {
+        "id": "019cced1-78f8-7026-b422-4a56e4df5360",
+        "referenceId": "000a40d1-0000-0000-0000-000000000000",
+        "kind": "I",
+        "status": "P",
+        "productId": "00000010-0000-0000-0000-000000000000",
+        "quantity": -1,
+        "unitOfMeasure": "EA",
+        "changeLog": {
+          "createdBy": "METACORTEX\\thomas.anderson",
+          "createdOn": "2026-03-08T18:59:20.399008\u002B00:00"
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/ProductMutateTests/Create_Success.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/ProductMutateTests/Create_Success.res.json
new file mode 100644
index 00000000..3c638de0
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/ProductMutateTests/Create_Success.res.json
@@ -0,0 +1,16 @@
+{
+  "id": "140d1f58-7927-47e4-a775-618b6516e2ab",
+  "sku": "NEW-SKU-123",
+  "text": "New Product",
+  "category": "B",
+  "subCategory": "XC",
+  "unitOfMeasure": "EA",
+  "brand": "YETI",
+  "price": 1000,
+  "isInactive": true,
+  "etag": "AAAAAAAACBU=",
+  "changeLog": {
+    "createdBy": "METACORTEX\\thomas.anderson",
+    "createdOn": "2026-01-18T14:10:09.3076098\u002B00:00"
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/ProductMutateTests/Movement_Query_Filter.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/ProductMutateTests/Movement_Query_Filter.res.json
new file mode 100644
index 00000000..264477f0
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/ProductMutateTests/Movement_Query_Filter.res.json
@@ -0,0 +1,30 @@
+[
+  {
+    "id": "00000001-0000-0000-0000-000000000000",
+    "referenceId": "000003e8-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "P",
+    "productId": "00000001-0000-0000-0000-000000000000",
+    "quantity": -2.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-01-18T00:40:12.697994+00:00"
+    },
+    "etag": "AAAAAAAEUUc="
+  },
+  {
+    "id": "00000003-0000-0000-0000-000000000000",
+    "referenceId": "000003e8-0000-0000-0000-000000000000",
+    "kind": "I",
+    "status": "P",
+    "productId": "0000001f-0000-0000-0000-000000000000",
+    "quantity": -3.00,
+    "unitOfMeasure": "EA",
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-01-18T00:40:12.697994+00:00"
+    },
+    "etag": "AAAAAAAEUUk="
+  }
+]
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Get_Found.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Get_Found.res.json
new file mode 100644
index 00000000..cc6f4f24
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Get_Found.res.json
@@ -0,0 +1,15 @@
+{
+  "id": "00000001-0000-0000-0000-000000000000",
+  "sku": "YETI-ASR-C2-2025",
+  "text": "Yeti ASR C2",
+  "category": "B",
+  "subCategory": "XC",
+  "unitOfMeasure": "EA",
+  "brand": "YETI",
+  "price": 5800.00,
+  "etag": "AAAAAAAAB9E=",
+  "changeLog": {
+    "createdBy": "METACORTEX\\thomas.anderson",
+    "createdOn": "2026-01-18T00:40:12.697994+00:00"
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Query_FilterBySku_IncludeFields.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Query_FilterBySku_IncludeFields.res.json
new file mode 100644
index 00000000..f1bbb090
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Query_FilterBySku_IncludeFields.res.json
@@ -0,0 +1,18 @@
+[
+  {
+    "sku": "SPEC-STUMPJUMPER-15-COMP",
+    "text": "Specialized Stumpjumper 15 Comp"
+  },
+  {
+    "sku": "SPEC-STATUS-140",
+    "text": "Specialized Status 140"
+  },
+  {
+    "sku": "SPEC-ENDURO-PRO",
+    "text": "Specialized Enduro Pro"
+  },
+  {
+    "sku": "SPEC-CHISEL-COMP",
+    "text": "Specialized Chisel Comp"
+  }
+]
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Query_Schema.res.json b/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Query_Schema.res.json
new file mode 100644
index 00000000..f5d28773
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/Resources/ReadTests/Product_Query_Schema.res.json
@@ -0,0 +1,70 @@
+{
+  "filter": {
+    "fields": {
+      "sku": {
+        "type": "string",
+        "operators": [
+          "eq",
+          "ne",
+          "in",
+          "startswith"
+        ]
+      },
+      "text": {
+        "type": "string",
+        "operators": [
+          "startswith",
+          "contains",
+          "endswith"
+        ]
+      },
+      "category": {
+        "type": "string",
+        "operators": [
+          "eq",
+          "ne",
+          "in"
+        ]
+      },
+      "subcategory": {
+        "type": "string",
+        "operators": [
+          "eq",
+          "ne",
+          "in"
+        ]
+      },
+      "brand": {
+        "type": "string",
+        "operators": [
+          "eq",
+          "ne",
+          "in"
+        ]
+      }
+    }
+  },
+  "orderby": {
+    "fields": {
+      "sku": {
+        "direction": [
+          "asc",
+          "desc"
+        ]
+      },
+      "text": {
+        "direction": [
+          "asc",
+          "desc"
+        ]
+      },
+      "brand": {
+        "direction": [
+          "asc",
+          "desc"
+        ]
+      }
+    },
+    "default": "sku asc"
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Api/appsettings.unittest.json b/samples/tests/Contoso.Products.Test.Api/appsettings.unittest.json
new file mode 100644
index 00000000..e93d43b6
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Api/appsettings.unittest.json
@@ -0,0 +1,14 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "Microsoft.EntityFrameworkCore": "Information",
+      "Microsoft.EntityFrameworkCore.Update": "Information",
+      "Npgsql": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Common/Contoso.Products.Test.Common.csproj b/samples/tests/Contoso.Products.Test.Common/Contoso.Products.Test.Common.csproj
new file mode 100644
index 00000000..e7d4eacd
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Common/Contoso.Products.Test.Common.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Database\Contoso.Products.Database.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+</Project>
diff --git a/samples/tests/Contoso.Products.Test.Common/Data/mutate-data.seed.yaml b/samples/tests/Contoso.Products.Test.Common/Data/mutate-data.seed.yaml
new file mode 100644
index 00000000..e78e56ef
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Common/Data/mutate-data.seed.yaml
@@ -0,0 +1,45 @@
+products:
+  - product:
+    - { product_id: ^1, sku: YETI-ASR-C2-2025, text: Yeti ASR C2, sub_category_code: XC, unit_of_measure_code: EA, price: 5800, brand_code: YETI }
+    - { product_id: ^2, sku: YETI-SB120-C2, text: Yeti SB120 C2, sub_category_code: TR, unit_of_measure_code: EA, price: 6200, brand_code: YETI }
+    - { product_id: ^3, sku: YETI-SB140-LR-C2, text: Yeti SB140 LR C2, sub_category_code: TR, unit_of_measure_code: EA, price: 6600, brand_code: YETI }
+    - { product_id: ^4, sku: YETI-SB165-C3, text: Yeti SB165 C3, sub_category_code: EN, unit_of_measure_code: EA, price: 7200, brand_code: YETI }
+    - { product_id: ^5, sku: YETI-MTE-C2, text: Yeti MTe C2 eMTB, sub_category_code: EM, unit_of_measure_code: EA, price: 9850, brand_code: YETI }
+    - { product_id: ^6, sku: CANYON-LUXTRAIL-CF6, text: Canyon Lux Trail CF 6, sub_category_code: XC, unit_of_measure_code: EA, price: 3899, brand_code: CANYON }
+    - { product_id: ^7, sku: CANYON-SPECTRAL-CF8, text: Canyon Spectral CF 8, sub_category_code: TR, unit_of_measure_code: EA, price: 4999, brand_code: CANYON }
+    - { product_id: ^8, sku: CANYON-NEURON-CF7, text: Canyon Neuron CF 7, sub_category_code: TR, unit_of_measure_code: EA, price: 3499, brand_code: CANYON }
+    - { product_id: ^9, sku: CANYON-TORQUE-MULLET-CF8, text: Canyon Torque Mullet CF 8, sub_category_code: EN, unit_of_measure_code: EA, price: 3599, brand_code: CANYON }
+    - { product_id: ^10, sku: CANYON-SENDER-CFR, text: Canyon Sender CFR, sub_category_code: DH, unit_of_measure_code: EA, price: 7799, brand_code: CANYON }
+    - { product_id: ^11, sku: SPEC-STUMPJUMPER-15-COMP, text: Specialized Stumpjumper 15 Comp, sub_category_code: TR, unit_of_measure_code: EA, price: 5500, brand_code: SPEC }
+    - { product_id: ^12, sku: SPEC-ENDURO-PRO, text: Specialized Enduro Pro, sub_category_code: EN, unit_of_measure_code: EA, price: 9500, brand_code: SPEC }
+    - { product_id: ^13, sku: SPEC-EPIC-8-PRO, text: Specialized Epic 8 Pro, sub_category_code: XC, unit_of_measure_code: EA, price: 9000, is_inactive: true, brand_code: SPEC }
+    - { product_id: ^14, sku: SPEC-CHISEL-COMP, text: Specialized Chisel Comp, sub_category_code: HT, unit_of_measure_code: EA, price: 3400, brand_code: SPEC }
+    - { product_id: ^15, sku: SPEC-STATUS-140, text: Specialized Status 140, sub_category_code: FR, unit_of_measure_code: EA, price: 2499, brand_code: SPEC }
+    - { product_id: ^16, sku: GIANT-TRANCE-X-ADVPRO29, text: Giant Trance X Advanced Pro 29, sub_category_code: TR, unit_of_measure_code: EA, price: 6200, brand_code: GIANT }
+    - { product_id: ^17, sku: GIANT-ANTHEM-ADV29-1, text: Giant Anthem Advanced 29 1, sub_category_code: XC, unit_of_measure_code: EA, price: 7800, brand_code: GIANT }
+    - { product_id: ^18, sku: GIANT-TALON-2, text: Giant Talon 2, sub_category_code: HT, unit_of_measure_code: EA, price: 800, is_deleted: true, brand_code: GIANT }
+    - { product_id: ^19, sku: SHIMANO-XT-M8100-RD, text: Shimano Deore XT M8100 Rear Derailleur, sub_category_code: DR, unit_of_measure_code: EA, price: 129, brand_code: SHIMANO }
+    - { product_id: ^20, sku: SHIMANO-SLX-M7100-CASSETTE, text: Shimano SLX M7100 12-speed Cassette, sub_category_code: CA, unit_of_measure_code: EA, price: 99, brand_code: SHIMANO }
+    - { product_id: ^21, sku: SHIMANO-XTR-M9100-CRANK, text: Shimano XTR M9100 Crankset, sub_category_code: CR, unit_of_measure_code: EA, price: 499, brand_code: SHIMANO }
+    - { product_id: ^22, sku: SRAM-GX-EAGLE-RD, text: SRAM GX Eagle Rear Derailleur, sub_category_code: DR, unit_of_measure_code: EA, price: 135, brand_code: SRAM }
+    - { product_id: ^23, sku: SRAM-X0-TRANSMISSION-RD, text: SRAM X0 Transmission Rear Derailleur, sub_category_code: DR, unit_of_measure_code: EA, price: 400, brand_code: SRAM }
+    - { product_id: ^24, sku: SRAM-XX1-EAGLE-CASSETTE, text: SRAM XX1 Eagle Cassette, sub_category_code: CA, unit_of_measure_code: EA, price: 449, brand_code: SRAM }
+    - { product_id: ^25, sku: ONEUP-V3-DROPPER-180, text: OneUp Dropper Post V3 180mm, sub_category_code: SP, unit_of_measure_code: EA, price: 269, brand_code: ONEUP }
+    - { product_id: ^26, sku: ONEUP-CARBON-HANDLEBAR, text: OneUp Carbon Handlebar, sub_category_code: HB, unit_of_measure_code: EA, price: 159, brand_code: ONEUP }
+    - { product_id: ^27, sku: ONEUP-COMPOSITE-PEDALS, text: OneUp Composite Pedals, sub_category_code: PE, unit_of_measure_code: PR, price: 49, is_inactive: true, brand_code: ONEUP }
+    - { product_id: ^28, sku: ONEUP-EDC-TOOL-V2, text: OneUp EDC Tool V2, sub_category_code: TO, unit_of_measure_code: EA, price: 59, brand_code: ONEUP }
+    - { product_id: ^29, sku: MUCOFF-NANO-CLEANER, text: Muc-Off Nano Tech Bike Cleaner, sub_category_code: CL, unit_of_measure_code: EA, price: 16.99, brand_code: MUCOFF }
+    - { product_id: ^30, sku: MUCOFF-TUBELESS-SEALANT, text: Muc-Off MTB Tubeless Sealant, sub_category_code: SE, unit_of_measure_code: EA, price: 8.00, brand_code: MUCOFF }
+    - { product_id: ^31, sku: MUCOFF-DRIVETRAIN-CLEANER, text: Muc-Off Drivetrain Cleaner, sub_category_code: CL, unit_of_measure_code: EA, price: 25.00, brand_code: MUCOFF }
+    - { product_id: ^32, sku: LABOR, text: Labor, sub_category_code: LA, unit_of_measure_code: HR, price: 80.00, brand_code: NONE, is_non_stocked: true }
+  - inventory:
+    - { inventory_id: ^1, qty_on_hand: 3 }
+    - { inventory_id: ^16, qty_on_hand: 1 }
+    - { inventory_id: ^24, qty_on_hand: 3 }
+    - { inventory_id: ^28, qty_on_hand: 5 }
+  - movement:
+    - { movement_id: ^1, product_id: ^1, quantity: -2, reference_id: ^1000, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^2, product_id: ^6, quantity: -1, reference_id: ^1000, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^3, product_id: ^31, quantity: -3, reference_id: ^1000, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^4, product_id: ^24, quantity: -2, reference_id: ^1001, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^5, product_id: ^28, quantity: -1, reference_id: ^1001, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Common/Data/no-data.seed.yaml b/samples/tests/Contoso.Products.Test.Common/Data/no-data.seed.yaml
new file mode 100644
index 00000000..3657fb01
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Common/Data/no-data.seed.yaml
@@ -0,0 +1 @@
+# This file intentionally left blank; to be used in tests where no data is required.
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Common/Data/read-data.seed.yaml b/samples/tests/Contoso.Products.Test.Common/Data/read-data.seed.yaml
new file mode 100644
index 00000000..e78e56ef
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Common/Data/read-data.seed.yaml
@@ -0,0 +1,45 @@
+products:
+  - product:
+    - { product_id: ^1, sku: YETI-ASR-C2-2025, text: Yeti ASR C2, sub_category_code: XC, unit_of_measure_code: EA, price: 5800, brand_code: YETI }
+    - { product_id: ^2, sku: YETI-SB120-C2, text: Yeti SB120 C2, sub_category_code: TR, unit_of_measure_code: EA, price: 6200, brand_code: YETI }
+    - { product_id: ^3, sku: YETI-SB140-LR-C2, text: Yeti SB140 LR C2, sub_category_code: TR, unit_of_measure_code: EA, price: 6600, brand_code: YETI }
+    - { product_id: ^4, sku: YETI-SB165-C3, text: Yeti SB165 C3, sub_category_code: EN, unit_of_measure_code: EA, price: 7200, brand_code: YETI }
+    - { product_id: ^5, sku: YETI-MTE-C2, text: Yeti MTe C2 eMTB, sub_category_code: EM, unit_of_measure_code: EA, price: 9850, brand_code: YETI }
+    - { product_id: ^6, sku: CANYON-LUXTRAIL-CF6, text: Canyon Lux Trail CF 6, sub_category_code: XC, unit_of_measure_code: EA, price: 3899, brand_code: CANYON }
+    - { product_id: ^7, sku: CANYON-SPECTRAL-CF8, text: Canyon Spectral CF 8, sub_category_code: TR, unit_of_measure_code: EA, price: 4999, brand_code: CANYON }
+    - { product_id: ^8, sku: CANYON-NEURON-CF7, text: Canyon Neuron CF 7, sub_category_code: TR, unit_of_measure_code: EA, price: 3499, brand_code: CANYON }
+    - { product_id: ^9, sku: CANYON-TORQUE-MULLET-CF8, text: Canyon Torque Mullet CF 8, sub_category_code: EN, unit_of_measure_code: EA, price: 3599, brand_code: CANYON }
+    - { product_id: ^10, sku: CANYON-SENDER-CFR, text: Canyon Sender CFR, sub_category_code: DH, unit_of_measure_code: EA, price: 7799, brand_code: CANYON }
+    - { product_id: ^11, sku: SPEC-STUMPJUMPER-15-COMP, text: Specialized Stumpjumper 15 Comp, sub_category_code: TR, unit_of_measure_code: EA, price: 5500, brand_code: SPEC }
+    - { product_id: ^12, sku: SPEC-ENDURO-PRO, text: Specialized Enduro Pro, sub_category_code: EN, unit_of_measure_code: EA, price: 9500, brand_code: SPEC }
+    - { product_id: ^13, sku: SPEC-EPIC-8-PRO, text: Specialized Epic 8 Pro, sub_category_code: XC, unit_of_measure_code: EA, price: 9000, is_inactive: true, brand_code: SPEC }
+    - { product_id: ^14, sku: SPEC-CHISEL-COMP, text: Specialized Chisel Comp, sub_category_code: HT, unit_of_measure_code: EA, price: 3400, brand_code: SPEC }
+    - { product_id: ^15, sku: SPEC-STATUS-140, text: Specialized Status 140, sub_category_code: FR, unit_of_measure_code: EA, price: 2499, brand_code: SPEC }
+    - { product_id: ^16, sku: GIANT-TRANCE-X-ADVPRO29, text: Giant Trance X Advanced Pro 29, sub_category_code: TR, unit_of_measure_code: EA, price: 6200, brand_code: GIANT }
+    - { product_id: ^17, sku: GIANT-ANTHEM-ADV29-1, text: Giant Anthem Advanced 29 1, sub_category_code: XC, unit_of_measure_code: EA, price: 7800, brand_code: GIANT }
+    - { product_id: ^18, sku: GIANT-TALON-2, text: Giant Talon 2, sub_category_code: HT, unit_of_measure_code: EA, price: 800, is_deleted: true, brand_code: GIANT }
+    - { product_id: ^19, sku: SHIMANO-XT-M8100-RD, text: Shimano Deore XT M8100 Rear Derailleur, sub_category_code: DR, unit_of_measure_code: EA, price: 129, brand_code: SHIMANO }
+    - { product_id: ^20, sku: SHIMANO-SLX-M7100-CASSETTE, text: Shimano SLX M7100 12-speed Cassette, sub_category_code: CA, unit_of_measure_code: EA, price: 99, brand_code: SHIMANO }
+    - { product_id: ^21, sku: SHIMANO-XTR-M9100-CRANK, text: Shimano XTR M9100 Crankset, sub_category_code: CR, unit_of_measure_code: EA, price: 499, brand_code: SHIMANO }
+    - { product_id: ^22, sku: SRAM-GX-EAGLE-RD, text: SRAM GX Eagle Rear Derailleur, sub_category_code: DR, unit_of_measure_code: EA, price: 135, brand_code: SRAM }
+    - { product_id: ^23, sku: SRAM-X0-TRANSMISSION-RD, text: SRAM X0 Transmission Rear Derailleur, sub_category_code: DR, unit_of_measure_code: EA, price: 400, brand_code: SRAM }
+    - { product_id: ^24, sku: SRAM-XX1-EAGLE-CASSETTE, text: SRAM XX1 Eagle Cassette, sub_category_code: CA, unit_of_measure_code: EA, price: 449, brand_code: SRAM }
+    - { product_id: ^25, sku: ONEUP-V3-DROPPER-180, text: OneUp Dropper Post V3 180mm, sub_category_code: SP, unit_of_measure_code: EA, price: 269, brand_code: ONEUP }
+    - { product_id: ^26, sku: ONEUP-CARBON-HANDLEBAR, text: OneUp Carbon Handlebar, sub_category_code: HB, unit_of_measure_code: EA, price: 159, brand_code: ONEUP }
+    - { product_id: ^27, sku: ONEUP-COMPOSITE-PEDALS, text: OneUp Composite Pedals, sub_category_code: PE, unit_of_measure_code: PR, price: 49, is_inactive: true, brand_code: ONEUP }
+    - { product_id: ^28, sku: ONEUP-EDC-TOOL-V2, text: OneUp EDC Tool V2, sub_category_code: TO, unit_of_measure_code: EA, price: 59, brand_code: ONEUP }
+    - { product_id: ^29, sku: MUCOFF-NANO-CLEANER, text: Muc-Off Nano Tech Bike Cleaner, sub_category_code: CL, unit_of_measure_code: EA, price: 16.99, brand_code: MUCOFF }
+    - { product_id: ^30, sku: MUCOFF-TUBELESS-SEALANT, text: Muc-Off MTB Tubeless Sealant, sub_category_code: SE, unit_of_measure_code: EA, price: 8.00, brand_code: MUCOFF }
+    - { product_id: ^31, sku: MUCOFF-DRIVETRAIN-CLEANER, text: Muc-Off Drivetrain Cleaner, sub_category_code: CL, unit_of_measure_code: EA, price: 25.00, brand_code: MUCOFF }
+    - { product_id: ^32, sku: LABOR, text: Labor, sub_category_code: LA, unit_of_measure_code: HR, price: 80.00, brand_code: NONE, is_non_stocked: true }
+  - inventory:
+    - { inventory_id: ^1, qty_on_hand: 3 }
+    - { inventory_id: ^16, qty_on_hand: 1 }
+    - { inventory_id: ^24, qty_on_hand: 3 }
+    - { inventory_id: ^28, qty_on_hand: 5 }
+  - movement:
+    - { movement_id: ^1, product_id: ^1, quantity: -2, reference_id: ^1000, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^2, product_id: ^6, quantity: -1, reference_id: ^1000, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^3, product_id: ^31, quantity: -3, reference_id: ^1000, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^4, product_id: ^24, quantity: -2, reference_id: ^1001, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
+    - { movement_id: ^5, product_id: ^28, quantity: -1, reference_id: ^1001, movement_kind_code: I, movement_status_code: P, unit_of_measure_code: EA }
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Common/TestData.cs b/samples/tests/Contoso.Products.Test.Common/TestData.cs
new file mode 100644
index 00000000..2fa0e9b0
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Common/TestData.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Products.Test.Common;
+
+/// <summary>
+/// Marker class for test data used across multiple test projects in the 'Contoso.Shopping' sample.
+/// </summary>
+public sealed class TestData { }
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/Contoso.Products.Test.Relay.csproj b/samples/tests/Contoso.Products.Test.Relay/Contoso.Products.Test.Relay.csproj
new file mode 100644
index 00000000..c9c4ccee
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/Contoso.Products.Test.Relay.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Relay\Contoso.Products.Relay.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Test.Common\Contoso.Products.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/GlobalUsing.cs b/samples/tests/Contoso.Products.Test.Relay/GlobalUsing.cs
new file mode 100644
index 00000000..feed6238
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/GlobalUsing.cs
@@ -0,0 +1,13 @@
+global using Contoso.Products.Infrastructure.Repositories;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Events;
+global using CoreEx.UnitTesting;
+global using AwesomeAssertions;
+global using Microsoft.Extensions.DependencyInjection;
+global using NUnit.Framework;
+global using System.Net;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = Contoso.Products.Database.Program;
+global using ExecutionContext = CoreEx.ExecutionContext;
+global using TestData = Contoso.Products.Test.Common.TestData;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/OtherTests.Health.cs b/samples/tests/Contoso.Products.Test.Relay/OtherTests.Health.cs
new file mode 100644
index 00000000..1bf53755
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/OtherTests.Health.cs
@@ -0,0 +1,41 @@
+namespace Contoso.Products.Test.Relay;
+
+public partial class OtherTests
+{
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+    }
+
+    [TestCase("/health/live/detailed", true)]
+    [TestCase("/health/startup/detailed", false)]
+    [TestCase("/health/ready/detailed", false)]
+    public void Health_Detailed(string path, bool minimal)
+    {
+        string[] _requiredServices =
+        [
+            "postgreSql",
+            "postgres-outbox-relay-00",
+            "postgres-outbox-relay-01",
+            "postgres-outbox-relay-02",
+            "postgres-outbox-relay-03"
+        ];
+
+        var r = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .AssertContentTypeJson();
+
+        r.Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+
+        var json = r.GetContent();
+        if (minimal)
+            json.Should().NotContainAny(_requiredServices);
+        else
+            json.Should().ContainAll(_requiredServices);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/OtherTests.HostedServices.cs b/samples/tests/Contoso.Products.Test.Relay/OtherTests.HostedServices.cs
new file mode 100644
index 00000000..6de7e908
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/OtherTests.HostedServices.cs
@@ -0,0 +1,36 @@
+namespace Contoso.Products.Test.Relay;
+
+public partial class OtherTests
+{
+    [Test]
+    public void HostedService_Pause_And_Resume()
+    {
+        var s = Test.Http<string>()
+            .Run(HttpMethod.Get, "/hosted-services/postgres-outbox-relay-03/status")
+            .Value;
+
+        s.Should().BeOneOf("Running", "Sleeping");
+
+        Test.Http()
+            .Run(HttpMethod.Post, "/hosted-services/postgres-outbox-relay-03/pause")
+            .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+
+        s = Test.Delay(TimeSpan.FromSeconds(1))
+            .Http<string>()
+            .Run(HttpMethod.Get, "/hosted-services/postgres-outbox-relay-03/status")
+            .Value;
+
+        s.Should().Be("Paused");
+
+        Test.Http()
+            .Run(HttpMethod.Post, "/hosted-services/postgres-outbox-relay-03/resume")
+            .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+
+        s = Test.Delay(TimeSpan.FromSeconds(1))
+            .Http<string>()
+            .Run(HttpMethod.Get, "/hosted-services/postgres-outbox-relay-03/status")
+            .Value;
+
+        s.Should().BeOneOf("Running", "Sleeping");
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/OtherTests.cs b/samples/tests/Contoso.Products.Test.Relay/OtherTests.cs
new file mode 100644
index 00000000..b75699bb
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/OtherTests.cs
@@ -0,0 +1,10 @@
+namespace Contoso.Products.Test.Relay;
+
+public partial class OtherTests : WithApiTester<Contoso.Products.Relay.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/RelayTests.cs b/samples/tests/Contoso.Products.Test.Relay/RelayTests.cs
new file mode 100644
index 00000000..1c0853a8
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/RelayTests.cs
@@ -0,0 +1,46 @@
+using CoreEx.Database.Postgres.Outbox;
+
+namespace Contoso.Products.Test.Relay;
+
+public class RelayTests : WithApiTester<Contoso.Products.Relay.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.GetAndClearAzureServiceBusAsync(ServiceBusSessionReceiverOptions.CreateForTopicSubscription("contoso", "products"));
+    }
+
+    [Test]
+    public void Outbox_Relay()
+    {
+        // Arrange the two events to publish and relay.
+        var ce1 = Test.CreateCloudEventFromJsonResource("ProductCreatedCloudEvent.json");
+        var ce2 = Test.CreateCloudEventFromJsonResource("ProductDeletedCloudEvent.json");
+
+        // Publish two events to the outbox.
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.Run(async _ =>
+            {
+                // Publish two events to the outbox.
+                var pub = ActivatorUtilities.GetServiceOrCreateInstance<PostgresOutboxPublisher>(test.Services);
+                pub.Add("contoso", [ce1, ce2]);
+                await pub.PublishAsync();
+
+                // Hosted-service(s) are currently running and should relay to Azure Service Bus; we just need to give it a few seconds to do so.
+                for (int i = 0; i < 5; i++)
+                    await Task.Delay(TimeSpan.FromSeconds(1));
+
+                // Receive the events from Azure Service Bus and assert.
+                var list = await Test.GetAndClearAzureServiceBusAsync(ServiceBusSessionReceiverOptions.CreateForTopicSubscription("contoso", "products"));
+
+                list.Should().NotBeNull().And.HaveCount(2);
+                var ce1Msg = list.Should().ContainSingle(x => x.MessageId == ce1.Id).Subject;
+                var ce2Msg = list.Should().ContainSingle(x => x.MessageId == ce2.Id).Subject;
+                ObjectComparer.AssertJson(ce1.EncodeToJsonElement().ToString(), ce1Msg.Body.ToString());
+                ObjectComparer.AssertJson(ce2.EncodeToJsonElement().ToString(), ce2Msg.Body.ToString());
+            }).AssertSuccess();
+        });
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/Resources/ProductCreatedCloudEvent.json b/samples/tests/Contoso.Products.Test.Relay/Resources/ProductCreatedCloudEvent.json
new file mode 100644
index 00000000..6e2bc299
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/Resources/ProductCreatedCloudEvent.json
@@ -0,0 +1,29 @@
+{
+  "specversion": "1.0",
+  "id": "019c72b9-e8e4-73aa-83fc-c5847cd4c217",
+  "type": "contoso.products.product.created.v1",
+  "source": "urn:contoso:products",
+  "subject": "019c72b9-e8d8-7d33-821b-3d18af870884",
+  "time": "2026-02-18T21:48:32.3532188Z",
+  "partitionkey": "019c72b9-e8d8-7d33-821b-3d18af870884",
+  "authtype": "user",
+  "authid": "DOMAIN-CORP\\eric.sibly",
+  "dataschemaversion": "1.0",
+  "datacontenttype": "application/json",
+  "traceparent": "00-7de3f6abfabf606dd289d93e6d118456-cc3d1971a8b15a04-01",
+  "data": {
+    "changeLog": {
+      "createdBy": "DOMAIN-CORP\\eric.sibly",
+      "createdOn": "2026-02-18T21:48:32.3532188\u002B00:00"
+    },
+    "id": "019c72b9-e8d8-7d33-821b-3d18af870884",
+    "sku": "NEW-SKU-123",
+    "text": "New Product",
+    "category": "B",
+    "subCategory": "XC",
+    "uom": "EA",
+    "brand": "YETI",
+    "price": 1000,
+    "isInactive": true
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/Resources/ProductDeletedCloudEvent.json b/samples/tests/Contoso.Products.Test.Relay/Resources/ProductDeletedCloudEvent.json
new file mode 100644
index 00000000..cf8ed21e
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/Resources/ProductDeletedCloudEvent.json
@@ -0,0 +1,12 @@
+{
+  "specversion": "1.0",
+  "id": "019c72b9-e9ab-7a00-97e9-cdf97f2f6024",
+  "type": "contoso.products.product.deleted",
+  "source": "urn:contoso:products",
+  "subject": "0000000d-0000-0000-0000-000000000000",
+  "time": "2026-02-18T21:48:32.5446661Z",
+  "partitionkey": "0000000d-0000-0000-0000-000000000000",
+  "authtype": "user",
+  "authid": "DOMAIN-CORP\\eric.sibly",
+  "traceparent": "00-1bd9e9901c03640e349802f6ce9df85f-e49a3299dd102aaa-01"
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Relay/appsettings.unittest.json b/samples/tests/Contoso.Products.Test.Relay/appsettings.unittest.json
new file mode 100644
index 00000000..1c14b653
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Relay/appsettings.unittest.json
@@ -0,0 +1,37 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "Npgsql": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "CoreEx": {
+    "Host": {
+      "Services": {
+        "Interval": "00:00:01"
+      }
+    }
+  },
+  "Aspire": {
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://127.0.0.1;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;",
+          "ClientOptions": {
+            "RetryOptions": {
+              "MaxRetries": 0,
+              "Delay": "00:00:01",
+              "MaxDelay": "00:00:01",
+              "Mode": "Fixed",
+              "TryTimeout": "00:00:01"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Subscribe/Contoso.Products.Test.Subscribe.csproj b/samples/tests/Contoso.Products.Test.Subscribe/Contoso.Products.Test.Subscribe.csproj
new file mode 100644
index 00000000..2bb6876d
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Subscribe/Contoso.Products.Test.Subscribe.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Subscribe\Contoso.Products.Subscribe.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Test.Common\Contoso.Products.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.Products.Test.Subscribe/GlobalUsing.cs b/samples/tests/Contoso.Products.Test.Subscribe/GlobalUsing.cs
new file mode 100644
index 00000000..6e413dbe
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Subscribe/GlobalUsing.cs
@@ -0,0 +1,14 @@
+global using Contoso.Products.Application.Interfaces;
+global using Contoso.Products.Contracts;
+global using CoreEx;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Events;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Events.Subscribing.Exceptions;
+global using AwesomeAssertions;
+global using Microsoft.Extensions.DependencyInjection;
+global using NUnit.Framework;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = Contoso.Products.Database.Program;
+global using TestData = Contoso.Products.Test.Common.TestData;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.ReservationCancel.cs b/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.ReservationCancel.cs
new file mode 100644
index 00000000..6b0c6da9
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.ReservationCancel.cs
@@ -0,0 +1,61 @@
+namespace Contoso.Products.Test.Subscribe;
+
+public partial class SubscriberTests 
+{
+    [Test]
+    public void ReservationCancel_NotFound() => Test.Scoped(test =>
+    {
+        var ed = EventData.CreateCommand("products", "reservation", "cancel").WithKey("abc");
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+
+            r.IsFailure.Should().BeTrue();
+            var e = r.Error.Should().BeOfType<EventSubscriberHandledException>().Subject;
+            e.ErrorHandling.Should().Be(ErrorHandling.CompleteAsInformation);
+            e.InnerException.Should().BeOfType<NotFoundException>().Which.ErrorCode.Should().Be("pending-reservation-not-found");
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void ReservationCancel_Success() => Test.Scoped(async test =>
+    {
+        // Arrange - ensure there are reservations to cancel.
+        var referenceId = 1001.ToGuid().ToString();
+
+        var ms = test.Services.GetRequiredService<IMovementReadService>();
+        var mr = await ms.GetAsync(referenceId);
+        mr.Should().NotBeNull().And.HaveCount(2).And.AllSatisfy(m => m.StatusCode.Should().Be(MovementStatus.Pending));
+
+        var qs = test.Services.GetRequiredService<IInventoryService>();
+        var q1 = await qs.GetOnHandAsync(mr[0].ProductId!);
+        var q2 = await qs.GetOnHandAsync(mr[1].ProductId!);
+
+        // Act - cancel the reservation using a simulated command-based message.
+        test.ExpectPostgresOutboxEvents(e => e.AssertCount(2))
+            .Run(async _ =>
+            {
+                var ed = EventData.CreateCommand("products", "reservation", "cancel").WithKey(referenceId);
+                var ce = Test.CreateCloudEventFrom(ed);
+                var sbm = ce.ToServiceBusReceivedMessage();
+
+                var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+                var r = await sbs.ReceiveAsync(sbm);
+                r.IsSuccess.Should().BeTrue();
+            }).AssertSuccess();
+
+        // Assert - the reservation should now be cancelled.
+        mr = await ms.GetAsync(referenceId);
+        mr.Should().NotBeNull().And.HaveCount(2).And.AllSatisfy(m => m.StatusCode.Should().Be(MovementStatus.Canceled));
+
+        // Assert - the on-hand quantity should be increased by the cancelled reservation quantity.
+        var q1After = await qs.GetOnHandAsync(mr[0].ProductId!);
+        var q2After = await qs.GetOnHandAsync(mr[1].ProductId!);
+        q1After.Should().Be(q1 + mr[0].Quantity * -1);
+        q2After.Should().Be(q2 + mr[1].Quantity * -1);
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.ReservationConfirm.cs b/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.ReservationConfirm.cs
new file mode 100644
index 00000000..cc33369b
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.ReservationConfirm.cs
@@ -0,0 +1,51 @@
+namespace Contoso.Products.Test.Subscribe;
+
+public partial class SubscriberTests 
+{
+    [Test]
+    public void ReservationConfirm_NotFound() => Test.Scoped(test =>
+    {
+        var ed = EventData.CreateCommand("products", "reservation", "confirm").WithKey("abc");
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+
+            r.IsFailure.Should().BeTrue();
+            var e = r.Error.Should().BeOfType<EventSubscriberHandledException>().Subject;
+            e.ErrorHandling.Should().Be(ErrorHandling.CompleteAsInformation);
+            e.InnerException.Should().BeOfType<NotFoundException>().Which.ErrorCode.Should().Be("pending-reservation-not-found");
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void ReservationConfirm_Success() => Test.Scoped(async test =>
+    {
+        // Arrange - ensure there are reservations to confirm.
+        var referenceId = 1000.ToGuid().ToString();
+
+        var ms = test.Services.GetRequiredService<IMovementReadService>();
+        var mr = await ms.GetAsync(referenceId);
+        mr.Should().NotBeNull().And.HaveCount(3).And.AllSatisfy(m => m.StatusCode.Should().Be(MovementStatus.Pending));
+
+        // Act - confirm the reservation using a simulated command-based message.
+        test.ExpectPostgresOutboxEvents(e => e.AssertCount(3))
+            .Run(async _ =>
+            {
+                var ed = EventData.CreateCommand("products", "reservation", "confirm").WithKey(referenceId);
+                var ce = Test.CreateCloudEventFrom(ed);
+                var sbm = ce.ToServiceBusReceivedMessage();
+
+                var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+                var r = await sbs.ReceiveAsync(sbm);
+                r.IsSuccess.Should().BeTrue();
+            }).AssertSuccess();
+
+        // Assert - the reservation should now be confirmed.
+        mr = await ms.GetAsync(referenceId);
+        mr.Should().NotBeNull().And.HaveCount(3).And.AllSatisfy(m => m.StatusCode.Should().Be(MovementStatus.Confirmed));
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.cs b/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.cs
new file mode 100644
index 00000000..aaf8ad00
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Subscribe/SubscriberTests.cs
@@ -0,0 +1,36 @@
+namespace Contoso.Products.Test.Subscribe;
+
+/// <summary>
+/// NOTE: Using the ServiceBusSubscribedSubscriber bypasses the need to actually send a message to the Service Bus, instead it simulates the receive of a message.
+/// </summary>
+public partial class SubscriberTests : WithApiTester<Contoso.Products.Subscribe.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigratePostgresDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedPostgresOutboxPublisher();
+    }
+
+    [Test]
+    public void Unsubscribed_Error() => Test.Scoped(test =>
+    {
+        var ed = EventData.CreateEvent("product", "deleted").WithKey("abc");
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+
+            r.IsFailure.Should().BeTrue();
+            var e = r.Error.Should().BeOfType<EventSubscriberHandledException>().Subject;
+            e.ErrorHandling.Should().Be(ErrorHandling.CompleteAsSilent);
+            e.InnerException.Should().NotBeNull();
+            e.InnerException.Message.Should().Be("No subscriber matched the event.");
+        }).AssertSuccess();
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Subscribe/appsettings.unittest.json b/samples/tests/Contoso.Products.Test.Subscribe/appsettings.unittest.json
new file mode 100644
index 00000000..05e93644
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Subscribe/appsettings.unittest.json
@@ -0,0 +1,13 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "Microsoft.EntityFrameworkCore": "Information",
+      "Microsoft.EntityFrameworkCore.Update": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Unit/Contoso.Products.Test.Unit.csproj b/samples/tests/Contoso.Products.Test.Unit/Contoso.Products.Test.Unit.csproj
new file mode 100644
index 00000000..dbd41422
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Unit/Contoso.Products.Test.Unit.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Application\Contoso.Products.Application.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Products.Contracts\Contoso.Products.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Products.Test.Common\Contoso.Products.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.Products.Test.Unit/EntryPoint.cs b/samples/tests/Contoso.Products.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..c6e2ae36
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Unit/EntryPoint.cs
@@ -0,0 +1,30 @@
+namespace Contoso.Products.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder)
+    {
+        // Configure the minimum services required for the execution context and reference data orchestrator; caching will be in-memory for the unit tests.
+        builder.Services.AddExecutionContext();
+        builder.Services.AddMemoryCache();
+        builder.Services.AddReferenceDataOrchestrator<ReferenceDataServiceDecorator>();
+
+        // Reuse the "real" database configured reference data.
+        var jdr = JsonDataReader.ParseYaml<Contoso.Products.Database.Program>("ref-data.seed.yaml", JsonDataReaderOptions.CreateForReferenceData(JsonPropertyNamingConvention.SnakeCase));
+        builder.Services.AddSingleton(new ReferenceDataServiceDecorator(jdr));
+    }
+
+    public class ReferenceDataServiceDecorator(JsonDataReader jdr) : ReferenceDataService(Mock.Of<IReferenceDataRepository>())
+    {
+        public override Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+        {
+            _ when type == typeof(Category) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<CategoryCollection>("products.$^category")!.ExtendForTesting([new Category { Id = Runtime.NewId(), Code = "X", IsInactive = false }])),
+            _ when type == typeof(SubCategory) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<SubCategoryCollection>("products.$^sub_category")!),
+            _ when type == typeof(UnitOfMeasure) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<UnitOfMeasureCollection>("products.$^unit_of_measure")!),
+            _ when type == typeof(Brand) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<BrandCollection>("products.$^brand")!),
+            _ when type == typeof(MovementKind) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<MovementKindCollection>("products.$^movement_kind")!),
+            _ when type == typeof(MovementStatus) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<MovementStatusCollection>("products.$^movement_status")!),
+            _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+        };
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Unit/GlobalUsing.cs b/samples/tests/Contoso.Products.Test.Unit/GlobalUsing.cs
new file mode 100644
index 00000000..7b465b95
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Unit/GlobalUsing.cs
@@ -0,0 +1,16 @@
+global using Contoso.Products.Contracts;
+global using Contoso.Products.Application;
+global using Contoso.Products.Application.Validators;
+global using Contoso.Products.Application.Repositories;
+global using CoreEx;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.UnitTesting;
+global using CoreEx.UnitTesting.Data;
+global using CoreEx.Validation;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Hosting;
+global using Moq;
+global using UnitTestEx;
+global using ExecutionContext = CoreEx.ExecutionContext;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Unit/Validators/InventoryReservationRequestValidatorTests.cs b/samples/tests/Contoso.Products.Test.Unit/Validators/InventoryReservationRequestValidatorTests.cs
new file mode 100644
index 00000000..b1d915c5
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Unit/Validators/InventoryReservationRequestValidatorTests.cs
@@ -0,0 +1,101 @@
+namespace Contoso.Products.Test.Unit.Validators;
+
+public class InventoryReservationRequestValidatorTests : WithGenericTester<EntryPoint>
+{
+    private readonly Mock<IProductRepository> _mock = new();
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp() 
+    {
+        _mock.Setup(x => x.GetForReservationAsync(It.IsAny<string[]>()))
+            .ReturnsAsync(new Dictionary<string, ProductReserve>
+            {
+                ["P1"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = false, IsInactive = false },
+                ["P2"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = true, IsInactive = false },
+                ["P3"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = false, IsInactive = true },
+                ["P4"] = new ProductReserve { UnitOfMeasureCode = "EA", IsNonStocked = false, IsInactive = false }
+            });
+    }
+
+    [Test]
+    public void Empty_Required() => Test.Scoped(test =>
+    {
+        var req = new MovementRequest();
+
+        new MovementRequestValidator(_mock.Object).AssertErrors(req,
+            ("id", "Identifier is required."),
+            ("products", "Products is required."));
+    });
+
+    [Test]
+    public void Invalid_No_Products() => Test.Scoped(test =>
+    {
+        var req = new MovementRequest
+        {
+            Id = "100",
+            Products = []
+        };
+
+        new MovementRequestValidator(_mock.Object).AssertErrors(req,
+            ("products", "Products is required."));
+    });
+
+    [Test]
+    public void Invalid_Products() => Test.Scoped((Action<UnitTestEx.Hosting.ScopedTypeTester<ExecutionContext>>)(test =>
+    {
+        var req = new MovementRequest
+        {
+            Id = "100",
+            Products = new()
+            {
+                ["P1"] = new MovementRequestProduct { UnitOfMeasure = "XX", Quantity = -1 },
+                [""] = null!,
+                ["P2"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1.33m }
+            }
+        };
+
+        new MovementRequestValidator(_mock.Object).AssertErrors(req,
+            ("products.P1.unitOfMeasure", "Unit-of-measure is invalid."),
+            ("products.P1.quantity", "Quantity must be greater than or equal to '0'."),
+            ("products.key", "Product is required."),
+            ("products.P2.quantity", "Quantity exceeds the maximum decimal places (0)."));
+    }));
+
+    [Test]
+    public void Invalid_Products_Extended() => Test.Scoped((Action<UnitTestEx.Hosting.ScopedTypeTester<ExecutionContext>>)(test =>
+    {
+        var req = new MovementRequest
+        {
+            Id = "100",
+            Products = new()
+            {
+                ["P0"] = new MovementRequestProduct { UnitOfMeasure = "L", Quantity = 1 },
+                ["P1"] = new MovementRequestProduct { UnitOfMeasure = "L", Quantity = 1 },
+                ["P2"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1 },
+                ["P3"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1 }
+            }
+        };
+
+        new MovementRequestValidator(_mock.Object).AssertErrors(req,
+            ("products.P0", "Product was not found."),
+            ("products.P1.unitOfMeasure", "Unit-of-measure must be equal to 'Each'."),
+            ("products.P2", "Product is non-stocked and therefore cannot be transacted."),
+            ("products.P3", "Product is not active and therefore cannot be transacted."));
+    }));
+
+    [Test]
+    public void Success() => Test.Scoped((Action<UnitTestEx.Hosting.ScopedTypeTester<ExecutionContext>>)(test =>
+    {
+        var req = new MovementRequest
+        {
+            Id = "100",
+            Products = new()
+            {
+                ["P1"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1 },
+                ["P4"] = new MovementRequestProduct { UnitOfMeasure = "EA", Quantity = 1 }
+            }
+        };
+
+        new MovementRequestValidator(_mock.Object).AssertSuccess(req);
+    }));
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Products.Test.Unit/Validators/ProductValidatorTests.cs b/samples/tests/Contoso.Products.Test.Unit/Validators/ProductValidatorTests.cs
new file mode 100644
index 00000000..87ae3875
--- /dev/null
+++ b/samples/tests/Contoso.Products.Test.Unit/Validators/ProductValidatorTests.cs
@@ -0,0 +1,32 @@
+namespace Contoso.Products.Test.Unit.Validators;
+
+public class ProductValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void Empty_Required() => Test.Scoped(test =>
+    {
+        var p = new Product();
+        ProductValidator.Default.AssertErrors(p,
+            ("sku", "Sku is required."),
+            ("text", "Text is required."),
+            ("subCategory", "Sub-category is required."),
+            ("unitOfMeasure", "Unit-of-measure is required."));
+    });
+
+    [Test]
+    public void Invalid_ReferenceData() => Test.Scoped(test =>
+    {
+        var p = new Product { Sku = "X", Text = "Test", SubCategoryCode = "XX", UnitOfMeasureCode = "XX", Price = -9.99m };
+        ProductValidator.Default.AssertErrors(p,
+            ("subCategory", "Sub-category is invalid."),
+            ("unitOfMeasure", "Unit-of-measure is invalid."),
+            ("price", "Price must be greater than or equal to zero."));
+    });
+
+    [Test]
+    public void Success() => Test.Scoped(test =>
+    {
+        var p = new Product { Sku = "X", Text = "Test", SubCategoryCode = "XC", UnitOfMeasureCode = "EA", Price = 9.99m };
+        ProductValidator.Default.AssertSuccess(p);
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Contoso.Shopping.Test.Api.csproj b/samples/tests/Contoso.Shopping.Test.Api/Contoso.Shopping.Test.Api.csproj
new file mode 100644
index 00000000..0878a7e6
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Contoso.Shopping.Test.Api.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Api\Contoso.Shopping.Api.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Database\Contoso.Shopping.Database.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Test.Common\Contoso.Shopping.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.Shopping.Test.Api/GlobalUsing.cs b/samples/tests/Contoso.Shopping.Test.Api/GlobalUsing.cs
new file mode 100644
index 00000000..93633b07
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/GlobalUsing.cs
@@ -0,0 +1,10 @@
+global using Contoso.Shopping.Contracts;
+global using CoreEx;
+global using CoreEx.Database.SqlServer.Outbox;
+global using AwesomeAssertions;
+global using NUnit.Framework;
+global using System.Net;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = Contoso.Shopping.Database.Program;
+global using TestData = Contoso.Shopping.Test.Common.TestData;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/MutateTests.Basket.cs b/samples/tests/Contoso.Shopping.Test.Api/MutateTests.Basket.cs
new file mode 100644
index 00000000..ad9ae8b3
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/MutateTests.Basket.cs
@@ -0,0 +1,179 @@
+namespace Contoso.Shopping.Test.Api;
+
+public partial class MutateTests
+{
+    [Test]
+    public void Basket_Create()
+    {
+        var basket = Test.Http<Basket>()
+            .ExpectIdentifier()
+            .ExpectChangeLogCreated()
+            .ExpectETag()
+            .ExpectJsonFromResource("Basket_Create.res.json", _pathsToIgnore)
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.created.v1"))
+            .Run(HttpMethod.Post, $"/api/customers/{1004.ToGuid()}/baskets")
+            .AssertCreated()
+            .AssertLocationHeader(b => new Uri($"/api/baskets/{b!.Id}", UriKind.Relative))
+            .Value!;
+
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/baskets/{basket.Id}")
+            .AssertOK()
+            .AssertValue(basket);
+    }
+
+    [Test]
+    public void Basket_ApplyDiscount_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/baskets/{404.ToGuid()}/apply-discount/save10")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Basket_ApplyDiscount_Invalid()
+    {
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/baskets/{404.ToGuid()}/apply-discount/save100")
+            .AssertBadRequest()
+            .AssertProblemDetailsTitle("Discount coupon either does not exist or is no longer active.");
+    }
+
+
+    [Test]
+    public void Basket_ApplyDiscount_Inactive()
+    {
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/baskets/{404.ToGuid()}/apply-discount/XMAS2025")
+            .AssertBadRequest()
+            .AssertProblemDetailsTitle("Discount coupon either does not exist or is no longer active.");
+    }
+
+    [Test]
+    public void Basket_ApplyDiscount_Success()
+    {
+        var v = Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3006.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        v.Pricing.Should().NotBeNull();
+        v.Pricing.DiscountCouponCode.Should().BeNull();
+        v.Pricing.DiscountPercentage.Should().Be(0m);
+        v.Pricing.DiscountAmount.Should().Be(0m);
+
+        v = Test.Http<Basket>()
+            .ExpectChangeLogUpdated()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.updated.v1"))
+            .Run(HttpMethod.Put, $"/api/baskets/{v.Id}/apply-discount/save10")
+            .AssertOK()
+            .Value!;
+
+        v.Pricing.Should().NotBeNull();
+        v.Pricing.DiscountCouponCode.Should().Be("SAVE10");
+        v.Pricing.DiscountPercentage.Should().Be(10m);
+        v.Pricing.DiscountAmount.Should().NotBe(0);
+
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/baskets/{v.Id}")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Basket_Checkout_Success()
+    {
+        // Arrange - ensure the basket is in the correct state for checkout.
+        var v = Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3007.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        v.StatusCode.Should().Be(BasketStatus.Active);
+
+        // Arrange - mock the inventory reservation to succeed.
+        _mockHttpReserveRequest.WithJsonResourceBody("Basket_Checkout_Success.products.req.json").Respond.With(HttpStatusCode.OK);
+
+        // Act - checkout the basket
+        v = Test.Http<Basket>()
+            .ExpectChangeLogUpdated()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.checkedout.v1")
+                                               .AssertMetadata("contoso", "contoso.products.reservation.confirm", v.Id))
+            .Run(HttpMethod.Post, $"/api/baskets/{v.Id}/checkout")
+            .AssertOK()
+            .Value!;
+
+        // Assert - the inventory reservation endpoint should have been called with the expected request body.
+        _mockHttpReserveRequest.Verify();
+
+        // Assert - the basket should be in the "CheckedOut" state.
+        v.StatusCode.Should().Be(BasketStatus.CheckedOut);
+
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/baskets/{v.Id}")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Basket_Checkout_Insufficient_Quantity()
+    {
+        // Arrange - mock the inventory reservation to fail due to insufficient inventory.
+        _mockHttpReserveRequest.WithAnyBody()
+            .Respond.WithJsonResource("Basket_Checkout_Insufficient_Quantity.products.res.json", HttpStatusCode.BadRequest, System.Net.Mime.MediaTypeNames.Application.ProblemJson);
+
+        // Act / Assert - checkout the basket and assert ProblemDetails.
+        Test.Http()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, $"/api/baskets/{3008.ToGuid()}/checkout")
+            .AssertBadRequest()
+            .AssertContentTypeProblemJson()
+            .AssertJsonFromResource("Basket_Checkout_Insufficient_Quantity.products.res.json", "traceid");
+
+        // Assert - the inventory reservation endpoint should have been called with the expected request body.
+        _mockHttpReserveRequest.Verify();
+    }
+
+    [Test]
+    public void Basket_Checkout_Downstream_Validation_Failure()
+    {
+        // Arrange - mock the inventory reservation to fail due to insufficient inventory.
+        _mockHttpReserveRequest.WithAnyBody()
+            .Respond.WithJsonResource("Basket_Checkout_Downstream_Validation_Failure.products.res.json", HttpStatusCode.BadRequest, System.Net.Mime.MediaTypeNames.Application.ProblemJson);
+
+        // Act / Assert - checkout the basket and assert ProblemDetails for validation failure.
+        Test.Http()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Post, $"/api/baskets/{3008.ToGuid()}/checkout")
+            .AssertInternalServerError()
+            .AssertContentTypeProblemJson();
+    }
+
+    [Test]
+    public void Basket_Checkout_Save_Failure()
+    {
+        var id = 3008.ToGuid().ToString();
+
+        // Arrange - mock the inventory reservation to always succeed.
+        _mockHttpReserveRequest.WithAnyBody().Respond.With(HttpStatusCode.OK);
+
+        // Act / Assert - checkout the basket and assert ProblemDetails.
+        Test.Http()
+            .OnEventPublish(SqlServerOutboxPublisher.DefaultServiceKey, () => throw new InvalidOperationException("Simulated failure during save; oh no, we all ready reserved inventory!"))
+            .ExpectNoSqlServerOutboxEvents()
+            .ExpectAzureServiceBusEvents(e => e.AssertMetadata("contoso", "contoso.products.reservation.cancel", id))
+            .Run(HttpMethod.Post, $"/api/baskets/{id}/checkout")
+            .AssertInternalServerError();
+
+        // Assert - the inventory reservation endpoint should have been called with the expected request body.
+        _mockHttpReserveRequest.Verify();
+
+        // Assert - the basket should still be active as the checkout process should have been rolled back.
+        var v = Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{id}")
+            .AssertOK()
+            .Value!;
+
+        v.StatusCode.Should().Be(BasketStatus.Active);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/MutateTests.BasketItem.cs b/samples/tests/Contoso.Shopping.Test.Api/MutateTests.BasketItem.cs
new file mode 100644
index 00000000..09f3e8e4
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/MutateTests.BasketItem.cs
@@ -0,0 +1,133 @@
+namespace Contoso.Shopping.Test.Api;
+
+public partial class MutateTests
+{
+    [Test]
+    public void Basket_Item_Add_New()
+    {
+        var item = new BasketItemAddRequest { ProductId = 32.ToGuid().ToString(), Quantity = 1.5m };
+
+        var v = Test.Http<Basket>()
+            .ExpectChangeLogUpdated()
+            .ExpectETag()
+            .ExpectJsonFromResource("Basket_Item_Add_New.res.json", [.. _pathsToIgnore, "items[2].id"])
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.updated.v1"))
+            .Run(HttpMethod.Post, $"/api/baskets/{3003.ToGuid()}/items", item, r => r.WithIdempotencyKey())
+            .AssertOK()
+            .Value!;
+
+        Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3003.ToGuid()}")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Basket_Item_Add_Existing()
+    {
+        var item = new BasketItemAddRequest { ProductId = 27.ToGuid().ToString(), Quantity = 1m };
+
+        var v = Test.Http<Basket>()
+            .ExpectChangeLogUpdated()
+            .ExpectETag()
+            .ExpectJsonFromResource("Basket_Item_Add_Existing.res.json", _pathsToIgnore)
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.updated.v1"))
+            .Run(HttpMethod.Post, $"/api/baskets/{3005.ToGuid()}/items", item, r => r.WithIdempotencyKey())
+            .AssertOK()
+            .Value!;
+
+        Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3005.ToGuid()}")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Basket_Item_Update_NotFound()
+    {
+        var item = new BasketItemUpdateRequest { Quantity = 2m };
+
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/baskets/{3005.ToGuid()}/items/{404.ToGuid()}", item, r => r.WithIfMatch("xxx"))
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Basket_Item_Update_Scale_Error()
+    {
+        var item = new BasketItemUpdateRequest { Quantity = 2.3m, ETag = "xxx" };
+
+        Test.Http()
+            .Run(HttpMethod.Put, $"/api/baskets/{3005.ToGuid()}/items/{4008.ToGuid()}", item)
+            .AssertBadRequest()
+            .AssertContentTypeProblemJson()
+            .AssertProblemDetailsTitle("Quantity decimal places exceed the specified unit-of-measure (Pair) configuration of 0.");
+    }
+
+    [Test]
+    public void Basket_Item_Update_Success()
+    {
+        // Arrange - ensure the item to be updated exists; plus we need the ETag for concurrency control.
+        var v = Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3005.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        var item = new BasketItemUpdateRequest { Quantity = 6m, ETag = v.Items![0].ETag };
+
+        // Act - update the item quantity.
+        v = Test.Http<Basket>()
+            .ExpectChangeLogUpdated()
+            .ExpectETag()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.updated.v1"))
+            .Run(HttpMethod.Put, $"/api/baskets/{3005.ToGuid()}/items/{4008.ToGuid()}", item, r => r.WithIdempotencyKey())
+            .AssertOK()
+            .Value!;
+
+        // Assert - the item quantity is updated.
+        v.Items![0].Quantity.Should().Be(item.Quantity);
+
+        // Assert - the basket get also reflects the item quantity update.
+        Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3005.ToGuid()}")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Basket_Item_Delete()
+    {
+        // Arrange - ensure the item to be deleted exists before attempting to delete it, otherwise the test will not be valid
+        var v = Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3006.ToGuid()}")
+            .AssertOK()
+            .Value!;
+
+        v.Items.Should().NotBeNull().And.HaveCount(1);
+        v.StatusCode.Should().Be(BasketStatus.Active);
+
+        // Act - delete the item.
+        var v2 = Test.Http<Basket>()
+            .ExpectSqlServerOutboxEvents(e => e.AssertWithValue("contoso", "contoso.shopping.basket.updated.v1"))
+            .Run(HttpMethod.Delete, $"/api/baskets/{3006.ToGuid()}/items/{v.Items![0].Id}")
+            .AssertOK()
+            .Value!;
+
+        // Assert - the item is deleted and the basket is now empty.
+        v2.Items.Should().NotBeNull().And.HaveCount(0);
+        v2.StatusCode.Should().Be(BasketStatus.Empty);
+
+        // Assert - deleting the item again shows the same result.
+        Test.Http<Basket>()
+            .ExpectNoSqlServerOutboxEvents()
+            .Run(HttpMethod.Delete, $"/api/baskets/{3006.ToGuid()}/items/{v.Items![0].Id}")
+            .AssertOK()
+            .AssertValue(v2);
+
+        // Assert - the basket get also reflects the item deletion.
+        Test.Http<Basket>()
+            .Run(HttpMethod.Get, $"/api/baskets/{3006.ToGuid()}")
+            .AssertOK()
+            .AssertValue(v2);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/MutateTests.cs b/samples/tests/Contoso.Shopping.Test.Api/MutateTests.cs
new file mode 100644
index 00000000..cae13d7b
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/MutateTests.cs
@@ -0,0 +1,25 @@
+namespace Contoso.Shopping.Test.Api;
+
+public partial class MutateTests : WithApiTester<Contoso.Shopping.Api.Program>
+{
+    private static readonly string[] _pathsToIgnore = ["items.etag"];
+
+    private UnitTestEx.Mocking.MockHttpClientRequest _mockHttpReserveRequest = null!;
+
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        // Migrate the database and seed it with test data before starting the test server.
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        // Use the expected SQL Server Outbox & Azure Service Bus publishers for the tests.
+        Test.UseExpectedSqlServerOutboxPublisher();
+        Test.UseExpectedAzureServiceBusPublisher();
+
+        // Mock the HTTP client.
+        var mcf = MockHttpClientFactory.Create();
+        _mockHttpReserveRequest = mcf.CreateClient("ProductsApi").Request(HttpMethod.Post, "api/inventory/reserve");
+        Test.ReplaceHttpClientFactory(mcf);
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/ReadTests.Basket.cs b/samples/tests/Contoso.Shopping.Test.Api/ReadTests.Basket.cs
new file mode 100644
index 00000000..2c738c5a
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/ReadTests.Basket.cs
@@ -0,0 +1,23 @@
+namespace Contoso.Shopping.Test.Api;
+
+public partial class ReadTests
+{
+    [Test]
+    public void Get_NotFound()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, $"/api/baskets/{404.ToGuid()}")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Get_Found()
+    {
+        Test.Http<Basket>()
+            .IgnoreChangeLog()
+            .IgnoreETag()
+            .ExpectJsonFromResource("Basket_Get_Found.res.json", _pathsToIgnore)
+            .Run(HttpMethod.Get, $"/api/baskets/{3002.ToGuid()}")
+            .AssertOK();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/ReadTests.cs b/samples/tests/Contoso.Shopping.Test.Api/ReadTests.cs
new file mode 100644
index 00000000..3ab0bba4
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/ReadTests.cs
@@ -0,0 +1,17 @@
+namespace Contoso.Shopping.Test.Api;
+
+public partial class ReadTests : WithApiTester<Contoso.Shopping.Api.Program>
+{
+    private static readonly string[] _pathsToIgnore = ["items.etag"];
+
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        // Use the expected SQL Server Outbox & Azure Service Bus publishers for the tests.
+        Test.UseExpectedSqlServerOutboxPublisher();
+        Test.UseExpectedAzureServiceBusPublisher();
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Downstream_Validation_Failure.products.res.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Downstream_Validation_Failure.products.res.json
new file mode 100644
index 00000000..5c461245
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Downstream_Validation_Failure.products.res.json
@@ -0,0 +1,12 @@
+{
+  "type": "https://tools.ietf.org/html/rfc9110#section-15.5.1",
+  "title": "A data validation error occurred.",
+  "status": 400,
+  "errors": {
+    "products.0000270f-0000-0000-0000-000000000000": [
+      "Product was not found."
+    ]
+  },
+  "traceId": "00-827ab1dc5c4ab17dda2d137d43db16d4-a9e13d892f16779b-01",
+  "errorType": "validation"
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Insufficient_Quantity.products.res.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Insufficient_Quantity.products.res.json
new file mode 100644
index 00000000..7edae0d9
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Insufficient_Quantity.products.res.json
@@ -0,0 +1,8 @@
+{
+  "type": "https://tools.ietf.org/html/rfc9110#section-15.5.1",
+  "title": "Product \u002700000001-0000-0000-0000-000000000000\u0027 does not have sufficient quantity on hand.",
+  "status": 400,
+  "errorType": "business",
+  "errorCode": "insufficient-quantity",
+  "Key": "00000001-0000-0000-0000-000000000000"
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Success.products.req.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Success.products.req.json
new file mode 100644
index 00000000..85696f3a
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Checkout_Success.products.req.json
@@ -0,0 +1,13 @@
+{
+  "id": "00000bbf-0000-0000-0000-000000000000",
+  "products": {
+    "00000001-0000-0000-0000-000000000000": {
+      "quantity": 2.00,
+      "unitOfMeasure": "EA"
+    },
+    "00000014-0000-0000-0000-000000000000": {
+      "quantity": 1.00,
+      "unitOfMeasure": "EA"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Create.res.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Create.res.json
new file mode 100644
index 00000000..d3febb87
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Create.res.json
@@ -0,0 +1,15 @@
+{
+  "id": "eda1e75a-199a-44f1-b927-93844608d4e2",
+  "customerId": "000003ec-0000-0000-0000-000000000000",
+  "status": "E",
+  "items": [],
+  "pricing": {
+    "subTotal": 0,
+    "total": 0
+  },
+  "changeLog": {
+    "createdBy": "DOMAIN-CORP\\eric.sibly",
+    "createdOn": "2026-02-21T19:13:24.7027106\u002B00:00"
+  },
+  "etag": "AAAAAAAACTg="
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Get_Found.res.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Get_Found.res.json
new file mode 100644
index 00000000..531be9c3
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Get_Found.res.json
@@ -0,0 +1,41 @@
+{
+  "id": "00000bba-0000-0000-0000-000000000000",
+  "customerId": "000003ea-0000-0000-0000-000000000000",
+  "status": "C",
+  "items": [
+    {
+      "id": "00000fa3-0000-0000-0000-000000000000",
+      "productId": "00000001-0000-0000-0000-000000000000",
+      "sku": "YETI-ASR-C2-2025",
+      "text": "Yeti ASR C2",
+      "quantity": 1.00,
+      "unitOfMeasure": "EA",
+      "unitPrice": 9850.00,
+      "total": 9850.0000,
+      "etag": "AAAAAAAACDQ="
+    },
+    {
+      "id": "00000fa4-0000-0000-0000-000000000000",
+      "productId": "00000014-0000-0000-0000-000000000000",
+      "sku": "SHIMANO-SLX-M7100-CASSETTE",
+      "text": "Shimano SLX M7100 12-speed Cassette",
+      "quantity": 1.00,
+      "unitOfMeasure": "EA",
+      "unitPrice": 99.00,
+      "total": 99.0000,
+      "etag": "AAAAAAAACDU="
+    }
+  ],
+  "pricing": {
+    "subTotal": 9949.0000,
+    "discountCoupon": "XMAS2025",
+    "discountPercentage": 15.00,
+    "discountAmount": 1492.35,
+    "total": 8456.6500
+  },
+  "changeLog": {
+    "createdBy": "DOMAIN-CORP\\eric.sibly",
+    "createdOn": "2026-02-21T17:53:32.8347127\u002B00:00"
+  },
+  "etag": "AAAAAAAACDA="
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Item_Add_Existing.res.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Item_Add_Existing.res.json
new file mode 100644
index 00000000..66e36236
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Item_Add_Existing.res.json
@@ -0,0 +1,29 @@
+{
+  "id": "00000bbd-0000-0000-0000-000000000000",
+  "customerId": "000003eb-0000-0000-0000-000000000000",
+  "status": "A",
+  "items": [
+    {
+      "id": "00000fa8-0000-0000-0000-000000000000",
+      "productId": "0000001b-0000-0000-0000-000000000000",
+      "sku": "ONEUP-COMPOSITE-PEDALS",
+      "text": "OneUp Composite Pedals",
+      "quantity": 3.00,
+      "unitOfMeasure": "PR",
+      "unitPrice": 49.00,
+      "total": 147.0000,
+      "etag": "AAAAAAAADCg="
+    }
+  ],
+  "pricing": {
+    "subTotal": 147.0000,
+    "total": 147.0000
+  },
+  "changeLog": {
+    "createdBy": "AVANADE-CORP\\eric.sibly",
+    "createdOn": "2026-02-22T22:49:39.6554207\u002B00:00",
+    "updatedBy": "AVANADE-CORP\\eric.sibly",
+    "updatedOn": "2026-02-22T22:49:45.001148\u002B00:00"
+  },
+  "etag": "AAAAAAAADCc="
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Item_Add_New.res.json b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Item_Add_New.res.json
new file mode 100644
index 00000000..5b931295
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/Resources/Basket_Item_Add_New.res.json
@@ -0,0 +1,51 @@
+{
+  "id": "00000bbb-0000-0000-0000-000000000000",
+  "customerId": "000003e9-0000-0000-0000-000000000000",
+  "status": "A",
+  "items": [
+    {
+      "id": "00000fa5-0000-0000-0000-000000000000",
+      "productId": "0000000c-0000-0000-0000-000000000000",
+      "sku": "SPEC-ENDURO-PRO",
+      "text": "Specialized Enduro Pro",
+      "quantity": 1.00,
+      "unitOfMeasure": "EA",
+      "unitPrice": 9500.00,
+      "total": 9500.0000,
+      "etag": "AAAAAAAADEM="
+    },
+    {
+      "id": "00000fa6-0000-0000-0000-000000000000",
+      "productId": "00000015-0000-0000-0000-000000000000",
+      "sku": "SHIMANO-XTR-M9100-CRANK",
+      "text": "Shimano XTR M9100 Crankset",
+      "quantity": 1.00,
+      "unitOfMeasure": "EA",
+      "unitPrice": 499.00,
+      "total": 499.0000,
+      "etag": "AAAAAAAADEQ="
+    },
+    {
+      "id": "0d03b2d4-c1af-4b52-9773-666c96c409ac",
+      "productId": "00000020-0000-0000-0000-000000000000",
+      "sku": "LABOR",
+      "text": "Labor",
+      "quantity": 1.5,
+      "unitOfMeasure": "HR",
+      "unitPrice": 80.00,
+      "total": 120.000,
+      "etag": "AAAAAAAADEs="
+    }
+  ],
+  "pricing": {
+    "subTotal": 10119.0000,
+    "total": 10119.0000
+  },
+  "changeLog": {
+    "createdBy": "DOMAIN-CORP\\eric.sibly",
+    "createdOn": "2026-02-22T22:58:37.3812872\u002B00:00",
+    "updatedBy": "DOMAIN-CORP\\eric.sibly",
+    "updatedOn": "2026-02-22T22:58:43.1942797\u002B00:00"
+  },
+  "etag": "AAAAAAAADEo="
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Api/appsettings.unittest.json b/samples/tests/Contoso.Shopping.Test.Api/appsettings.unittest.json
new file mode 100644
index 00000000..9a9e0740
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Api/appsettings.unittest.json
@@ -0,0 +1,13 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "System.Net.Http.HttpClient": "Information",
+      "Polly": "Information"
+    }
+  }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Common/Contoso.Shopping.Test.Common.csproj b/samples/tests/Contoso.Shopping.Test.Common/Contoso.Shopping.Test.Common.csproj
new file mode 100644
index 00000000..9b836d3f
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Common/Contoso.Shopping.Test.Common.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Database\Contoso.Shopping.Database.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+</Project>
diff --git a/samples/tests/Contoso.Shopping.Test.Common/Data/data.yaml b/samples/tests/Contoso.Shopping.Test.Common/Data/data.yaml
new file mode 100644
index 00000000..fbaf1e5b
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Common/Data/data.yaml
@@ -0,0 +1,56 @@
+Shopping:
+  - Product:
+    - { ProductId: ^1, Sku: YETI-ASR-C2-2025, Text: Yeti ASR C2, UnitOfMeasureCode: EA, Price: 5800 }
+    - { ProductId: ^2, Sku: YETI-SB120-C2, Text: Yeti SB120 C2, UnitOfMeasureCode: EA, Price: 6200 }
+    - { ProductId: ^3, Sku: YETI-SB140-LR-C2, Text: Yeti SB140 LR C2, UnitOfMeasureCode: EA, Price: 6600 }
+    - { ProductId: ^4, Sku: YETI-SB165-C3, Text: Yeti SB165 C3, UnitOfMeasureCode: EA, Price: 7200 }
+    - { ProductId: ^5, Sku: YETI-MTE-C2, Text: Yeti MTe C2 eMTB, UnitOfMeasureCode: EA, Price: 9850 }
+    - { ProductId: ^6, Sku: CANYON-LUXTRAIL-CF6, Text: Canyon Lux Trail CF 6, UnitOfMeasureCode: EA, Price: 3899 }
+    - { ProductId: ^7, Sku: CANYON-SPECTRAL-CF8, Text: Canyon Spectral CF 8, UnitOfMeasureCode: EA, Price: 4999 }
+    - { ProductId: ^8, Sku: CANYON-NEURON-CF7, Text: Canyon Neuron CF 7, UnitOfMeasureCode: EA, Price: 3499 }
+    - { ProductId: ^9, Sku: CANYON-TORQUE-MULLET-CF8, Text: Canyon Torque Mullet CF 8, UnitOfMeasureCode: EA, Price: 3599 }
+    - { ProductId: ^10, Sku: CANYON-SENDER-CFR, Text: Canyon Sender CFR, UnitOfMeasureCode: EA, Price: 7799 }
+    - { ProductId: ^11, Sku: SPEC-STUMPJUMPER-15-COMP, Text: Specialized Stumpjumper 15 Comp, UnitOfMeasureCode: EA, Price: 5500 }
+    - { ProductId: ^12, Sku: SPEC-ENDURO-PRO, Text: Specialized Enduro Pro, UnitOfMeasureCode: EA, Price: 9500 }
+    - { ProductId: ^13, Sku: SPEC-EPIC-8-PRO, Text: Specialized Epic 8 Pro, UnitOfMeasureCode: EA, Price: 9000, IsInactive: true }
+    - { ProductId: ^14, Sku: SPEC-CHISEL-COMP, Text: Specialized Chisel Comp, UnitOfMeasureCode: EA, Price: 3400 }
+    - { ProductId: ^15, Sku: SPEC-STATUS-140, Text: Specialized Status 140, UnitOfMeasureCode: EA, Price: 2499 }
+    - { ProductId: ^16, Sku: GIANT-TRANCE-X-ADVPRO29, Text: Giant Trance X Advanced Pro 29, UnitOfMeasureCode: EA, Price: 6200 }
+    - { ProductId: ^17, Sku: GIANT-ANTHEM-ADV29-1, Text: Giant Anthem Advanced 29 1, UnitOfMeasureCode: EA, Price: 7800 }
+    - { ProductId: ^19, Sku: SHIMANO-XT-M8100-RD, Text: Shimano Deore XT M8100 Rear Derailleur, UnitOfMeasureCode: EA, Price: 129 }
+    - { ProductId: ^20, Sku: SHIMANO-SLX-M7100-CASSETTE, Text: Shimano SLX M7100 12-speed Cassette, UnitOfMeasureCode: EA, Price: 99 }
+    - { ProductId: ^21, Sku: SHIMANO-XTR-M9100-CRANK, Text: Shimano XTR M9100 Crankset, UnitOfMeasureCode: EA, Price: 499 }
+    - { ProductId: ^22, Sku: SRAM-GX-EAGLE-RD, Text: SRAM GX Eagle Rear Derailleur, UnitOfMeasureCode: EA, Price: 135 }
+    - { ProductId: ^23, Sku: SRAM-X0-TRANSMISSION-RD, Text: SRAM X0 Transmission Rear Derailleur, UnitOfMeasureCode: EA, Price: 400 }
+    - { ProductId: ^24, Sku: SRAM-XX1-EAGLE-CASSETTE, Text: SRAM XX1 Eagle Cassette, UnitOfMeasureCode: EA, Price: 449 }
+    - { ProductId: ^25, Sku: ONEUP-V3-DROPPER-180, Text: OneUp Dropper Post V3 180mm, UnitOfMeasureCode: EA, Price: 269 }
+    - { ProductId: ^26, Sku: ONEUP-CARBON-HANDLEBAR, Text: OneUp Carbon Handlebar, UnitOfMeasureCode: EA, Price: 159 }
+    - { ProductId: ^27, Sku: ONEUP-COMPOSITE-PEDALS, Text: OneUp Composite Pedals, UnitOfMeasureCode: PR, Price: 49, IsInactive: true }
+    - { ProductId: ^28, Sku: ONEUP-EDC-TOOL-V2, Text: OneUp EDC Tool V2, UnitOfMeasureCode: EA, Price: 59 }
+    - { ProductId: ^29, Sku: MUCOFF-NANO-CLEANER, Text: Muc-Off Nano Tech Bike Cleaner, UnitOfMeasureCode: EA, Price: 16.99 }
+    - { ProductId: ^30, Sku: MUCOFF-TUBELESS-SEALANT, Text: Muc-Off MTB Tubeless Sealant, UnitOfMeasureCode: EA, Price: 8.00 }
+    - { ProductId: ^31, Sku: MUCOFF-DRIVETRAIN-CLEANER, Text: Muc-Off Drivetrain Cleaner, UnitOfMeasureCode: EA, Price: 25.00 }
+    - { ProductId: ^32, Sku: LABOR, Text: Labor, UnitOfMeasureCode: HR, Price: 80.00, IsNonStocked: true }
+  - Basket:
+    - { BasketId: ^3001, CustomerId: ^1001, BasketStatusCode: E, SubTotal: 0, Total: 0 }
+    - { BasketId: ^3002, CustomerId: ^1002, BasketStatusCode: C, SubTotal: 9679, DiscountCouponCode: XMAS2025, DiscountAmount: 145.19, Total: 9533.81 }
+    - { BasketId: ^3003, CustomerId: ^1001, BasketStatusCode: A, SubTotal: 9999, Total: 9999 }
+    - { BasketId: ^3004, CustomerId: ^1003, BasketStatusCode: B, SubTotal: 98, Total: 98 }
+    - { BasketId: ^3005, CustomerId: ^1003, BasketStatusCode: A, SubTotal: 98, Total: 98 }
+    - { BasketId: ^3006, CustomerId: ^1003, BasketStatusCode: A, SubTotal: 98, Total: 98 }
+    - { BasketId: ^3007, CustomerId: ^1003, BasketStatusCode: A, SubTotal: 98, Total: 98 }
+    - { BasketId: ^3008, CustomerId: ^1003, BasketStatusCode: A, SubTotal: 98, Total: 98 }
+  - BasketItem:
+    - { BasketItemId: ^4001, BasketId: ^3006, ProductId: ^27, Sku: ONEUP-COMPOSITE-PEDALS, Text: OneUp Composite Pedals, UnitOfMeasureCode: PR, Quantity: 2, UnitPrice: 49 }
+    - { BasketItemId: ^4002, BasketId: ^3001, ProductId: ^1, Sku: YETI-ASR-C2-2025, Text: Yeti ASR C2, UnitOfMeasureCode: EA, Quantity: 2, UnitPrice: 129 }
+    - { BasketItemId: ^4003, BasketId: ^3002, ProductId: ^1, Sku: YETI-ASR-C2-2025, Text: Yeti ASR C2, UnitOfMeasureCode: EA, Quantity: 1, UnitPrice: 9850 }
+    - { BasketItemId: ^4004, BasketId: ^3002, ProductId: ^20, Sku: SHIMANO-SLX-M7100-CASSETTE, Text: Shimano SLX M7100 12-speed Cassette, UnitOfMeasureCode: EA, Quantity: 1, UnitPrice: 99 }
+    - { BasketItemId: ^4005, BasketId: ^3003, ProductId: ^12, Sku: SPEC-ENDURO-PRO, Text: Specialized Enduro Pro, UnitOfMeasureCode: EA, Quantity: 1, UnitPrice: 9500 }
+    - { BasketItemId: ^4006, BasketId: ^3003, ProductId: ^21, Sku: SHIMANO-XTR-M9100-CRANK, Text: Shimano XTR M9100 Crankset, UnitOfMeasureCode: EA, Quantity: 1, UnitPrice: 499 }
+    - { BasketItemId: ^4007, BasketId: ^3004, ProductId: ^27, Sku: ONEUP-COMPOSITE-PEDALS, Text: OneUp Composite Pedals, UnitOfMeasureCode: PR, Quantity: 2, UnitPrice: 49 }
+    - { BasketItemId: ^4008, BasketId: ^3005, ProductId: ^27, Sku: ONEUP-COMPOSITE-PEDALS, Text: OneUp Composite Pedals, UnitOfMeasureCode: PR, Quantity: 2, UnitPrice: 49 }
+    - { BasketItemId: ^4009, BasketId: ^3007, ProductId: ^1, Sku: YETI-ASR-C2-2025, Text: Yeti ASR C2, UnitOfMeasureCode: EA, Quantity: 2, UnitPrice: 9850 }
+    - { BasketItemId: ^4010, BasketId: ^3007, ProductId: ^20, Sku: SHIMANO-SLX-M7100-CASSETTE, Text: Shimano SLX M7100 12-speed Cassette, UnitOfMeasureCode: EA, Quantity: 1, UnitPrice: 99 }
+    - { BasketItemId: ^4011, BasketId: ^3008, ProductId: ^1, Sku: YETI-ASR-C2-2025, Text: Yeti ASR C2, UnitOfMeasureCode: EA, Quantity: 2, UnitPrice: 9850 }
+    - { BasketItemId: ^4012, BasketId: ^3008, ProductId: ^20, Sku: SHIMANO-SLX-M7100-CASSETTE, Text: Shimano SLX M7100 12-speed Cassette, UnitOfMeasureCode: EA, Quantity: 1, UnitPrice: 99 }
+    - { BasketItemId: ^4013, BasketId: ^3007, ProductId: ^32, Sku: LABOR, Text: Labor, UnitOfMeasureCode: HR, Quantity: 1.5, UnitPrice: 80 }
diff --git a/samples/tests/Contoso.Shopping.Test.Common/TestData.cs b/samples/tests/Contoso.Shopping.Test.Common/TestData.cs
new file mode 100644
index 00000000..1fe40dde
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Common/TestData.cs
@@ -0,0 +1,6 @@
+namespace Contoso.Shopping.Test.Common;
+
+/// <summary>
+/// Marker class for test data used across multiple test projects in the 'Contoso.Shopping' sample.
+/// </summary>
+public sealed class TestData { }
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Subscribe/Contoso.Shopping.Test.Subscribe.csproj b/samples/tests/Contoso.Shopping.Test.Subscribe/Contoso.Shopping.Test.Subscribe.csproj
new file mode 100644
index 00000000..73b71fd3
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Subscribe/Contoso.Shopping.Test.Subscribe.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Subscribe\Contoso.Shopping.Subscribe.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Test.Common\Contoso.Shopping.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.Shopping.Test.Subscribe/GlobalUsing.cs b/samples/tests/Contoso.Shopping.Test.Subscribe/GlobalUsing.cs
new file mode 100644
index 00000000..b186acfb
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Subscribe/GlobalUsing.cs
@@ -0,0 +1,16 @@
+global using Contoso.Shopping.Application.Adapters.Products;
+global using Contoso.Shopping.Contracts;
+global using CoreEx;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Database.SqlServer.Outbox;
+global using CoreEx.Events;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Events.Subscribing.Exceptions;
+global using CoreEx.Results;
+global using AwesomeAssertions;
+global using Microsoft.Extensions.DependencyInjection;
+global using NUnit.Framework;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = Contoso.Shopping.Database.Program;
+global using TestData = Contoso.Shopping.Test.Common.TestData;
diff --git a/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.ProductDelete.cs b/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.ProductDelete.cs
new file mode 100644
index 00000000..9ef632c6
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.ProductDelete.cs
@@ -0,0 +1,48 @@
+namespace Contoso.Shopping.Test.Subscribe;
+
+public partial class SubscriberTests 
+{
+    [Test]
+    public void ProductDelete_NotFound() => Test.Scoped(test =>
+    {
+        var ed = new EventData().WithTitle("contoso.products.product.deleted").WithKey(404.ToGuid());
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+            r.IsSuccess.Should().BeTrue();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void ProductDelete_Success() => Test.Scoped(async test =>
+    {
+        // Arrange - ensure there is a product to delete.
+        var productId = 20.ToGuid().ToString();
+
+        var pa = test.Services.GetRequiredService<IProductAdapter>();
+        var pr = await pa.GetAsync(productId);
+        pr.IsSuccess.Should().BeTrue();
+        pr.Value.Should().NotBeNull();
+
+        var ed = new EventData().WithTitle("contoso.products.product.deleted").WithKey(productId);
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        // Act - delete the product.
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+            r.IsSuccess.Should().BeTrue();
+        }).AssertSuccess();
+
+        // Assert - the product should be deleted.
+        pr = await pa.GetAsync(productId);
+        pr.IsFailure.Should().BeTrue();
+        pr.IsNotFoundError.Should().BeTrue();
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.ProductModify.cs b/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.ProductModify.cs
new file mode 100644
index 00000000..cd1b3d07
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.ProductModify.cs
@@ -0,0 +1,69 @@
+namespace Contoso.Shopping.Test.Subscribe;
+
+public partial class SubscriberTests 
+{
+    [Test]
+    public void ProductModify_Found() => Test.Scoped(async test =>
+    {
+        // Arrange - ensure the product exists and prepare a message to modify it.
+        var pa = test.Services.GetRequiredService<IProductAdapter>();
+        var pr = await pa.GetAsync(22.ToGuid().ToString());
+        pr.IsSuccess.Should().BeTrue();
+        pr.Value.Should().NotBeNull();
+        var p = pr.Value;
+        p.Text += " modified";
+
+        var ed = new EventData().WithTitle("contoso.products.product.updated.v1").WithValue(p);
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        // Act - modify the product.
+        var r = test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            return await sbs.ReceiveAsync(sbm);
+        }).AssertSuccess();
+
+        r.Value.IsSuccess.Should().BeTrue();
+
+        // Assert - the product should be updated.
+        pr = await pa.GetAsync(22.ToGuid().ToString());
+        pr.IsSuccess.Should().BeTrue();
+        pr.Value.Should().NotBeNull();
+        pr.Value.Text.Should().EndWith(" modified");
+    });
+
+    [Test]
+    public void ProductModify_NotFound() => Test.Scoped(async test =>
+    {
+        // Arrange - get a product and clone it.
+        var pa = test.Services.GetRequiredService<IProductAdapter>();
+        var pr = await pa.GetAsync(24.ToGuid().ToString());
+        pr.IsSuccess.Should().BeTrue();
+        pr.Value.Should().NotBeNull();
+        var p = pr.Value;
+
+        p.Id = Runtime.NewId();
+        p.Sku += "-NEW";
+        p.Text += " new";
+
+        var ed = new EventData().WithTitle("contoso.products.product.created.v1").WithValue(p);
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        // Act - modify the product.
+        var r = test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            return await sbs.ReceiveAsync(sbm);
+        }).AssertSuccess();
+
+        r.Value.IsSuccess.Should().BeTrue();
+
+        // Assert - the product should be updated.
+        pr = await pa.GetAsync(p.Id);
+        pr.IsSuccess.Should().BeTrue();
+        pr.Value.Should().NotBeNull();
+        pr.Value.Text.Should().EndWith(" new");
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.cs b/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.cs
new file mode 100644
index 00000000..7d5f38d1
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Subscribe/SubscriberTests.cs
@@ -0,0 +1,36 @@
+namespace Contoso.Shopping.Test.Subscribe;
+
+/// <summary>
+/// NOTE: Using the ServiceBusSubscribedSubscriber bypasses the need to actually send a message to the Service Bus, instead it simulates the receive of a message.
+/// </summary>
+public partial class SubscriberTests : WithApiTester<Contoso.Shopping.Subscribe.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        await Test.MigrateSqlServerDataAsync<TestData>(["data.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        Test.UseExpectedSqlServerOutboxPublisher();
+    }
+
+    [Test]
+    public void Unsubscribed_Error() => Test.Scoped(test =>
+    {
+        var ed = EventData.CreateEvent("test", "not-subscribed").WithKey("abc");
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+
+            r.IsFailure.Should().BeTrue();
+            var e = r.Error.Should().BeOfType<EventSubscriberHandledException>().Subject;
+            e.ErrorHandling.Should().Be(ErrorHandling.CompleteAsSilent);
+            e.InnerException.Should().NotBeNull();
+            e.InnerException.Message.Should().Be("No subscriber matched the event.");
+        }).AssertSuccess();
+    });
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Subscribe/appsettings.unittest.json b/samples/tests/Contoso.Shopping.Test.Subscribe/appsettings.unittest.json
new file mode 100644
index 00000000..c1576668
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Subscribe/appsettings.unittest.json
@@ -0,0 +1,13 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "System.Net.Http.HttpClient": "Information",
+      "Polly": "Information"
+    }
+  }
+}
diff --git a/samples/tests/Contoso.Shopping.Test.Unit/Contoso.Shopping.Test.Unit.csproj b/samples/tests/Contoso.Shopping.Test.Unit/Contoso.Shopping.Test.Unit.csproj
new file mode 100644
index 00000000..8ee6453c
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Unit/Contoso.Shopping.Test.Unit.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Application\Contoso.Shopping.Application.csproj" />
+    <ProjectReference Include="..\..\src\Contoso.Shopping.Contracts\Contoso.Shopping.Contracts.csproj" />
+    <ProjectReference Include="..\Contoso.Shopping.Test.Common\Contoso.Shopping.Test.Common.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/tests/Contoso.Shopping.Test.Unit/EntryPoint.cs b/samples/tests/Contoso.Shopping.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..cf15d3be
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Unit/EntryPoint.cs
@@ -0,0 +1,25 @@
+namespace Contoso.Shopping.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder)
+    {
+        // Configure the minimum services required for the execution context and reference data orchestrator; caching will be in-memory for the unit tests.
+        builder.Services.AddExecutionContext();
+        builder.Services.AddMemoryCache();
+        builder.Services.AddReferenceDataOrchestrator<ReferenceDataServiceDecorator>();
+
+        // Reuse the "real" database configured reference data.
+        var jdr = JsonDataReader.ParseYaml<Contoso.Shopping.Database.Program>("ref-data.seed.yaml", JsonDataReaderOptions.CreateForReferenceData(JsonPropertyNamingConvention.SnakeCase));
+        builder.Services.AddSingleton(new ReferenceDataServiceDecorator(jdr));
+    }
+
+    public class ReferenceDataServiceDecorator(JsonDataReader jdr) : ReferenceDataService(Mock.Of<IReferenceDataRepository>())
+    {
+        public override Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+        {
+            _ when type == typeof(UnitOfMeasure) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<UnitOfMeasureCollection>("Shopping.$^UnitOfMeasure")!),
+            _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+        };
+    }
+}
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Unit/GlobalUsing.cs b/samples/tests/Contoso.Shopping.Test.Unit/GlobalUsing.cs
new file mode 100644
index 00000000..a8389bb0
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Unit/GlobalUsing.cs
@@ -0,0 +1,17 @@
+global using Contoso.Shopping.Application.Adapters.Products;
+global using Contoso.Shopping.Contracts;
+global using Contoso.Shopping.Application;
+global using Contoso.Shopping.Application.Validators;
+global using Contoso.Shopping.Application.Repositories;
+global using CoreEx;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.UnitTesting;
+global using CoreEx.UnitTesting.Data;
+global using CoreEx.Validation;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Hosting;
+global using Moq;
+global using UnitTestEx;
+global using ExecutionContext = CoreEx.ExecutionContext;
\ No newline at end of file
diff --git a/samples/tests/Contoso.Shopping.Test.Unit/Validators/BasketItemAddRequestValidatorTests.cs b/samples/tests/Contoso.Shopping.Test.Unit/Validators/BasketItemAddRequestValidatorTests.cs
new file mode 100644
index 00000000..8698c309
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Unit/Validators/BasketItemAddRequestValidatorTests.cs
@@ -0,0 +1,27 @@
+namespace Contoso.Shopping.Test.Unit.Validators;
+
+public class BasketItemAddRequestValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void BasketItemAddRequest_Validate_Empty_Required() => Test.Scoped(test =>
+    {
+        var r = new BasketItemAddRequest();
+        BasketItemAddRequestValidator.Default.AssertErrors(r,
+            ("productId", "Product is required."));
+    });
+
+    [Test]
+    public void BasketItemAddRequest_Validate_Quantity_Negative() => Test.Scoped(test =>
+    {
+        var r = new BasketItemAddRequest { ProductId = "P1", Quantity = -1m };
+        BasketItemAddRequestValidator.Default.AssertErrors(r,
+            ("quantity", "Quantity must be greater than or equal to '0'."));
+    });
+
+    [Test]
+    public void BasketItemAddRequest_Validate_Success() => Test.Scoped(test =>
+    {
+        var r = new BasketItemAddRequest { ProductId = "P1", Quantity = 2m };
+        BasketItemAddRequestValidator.Default.AssertSuccess(r);
+    });
+}
diff --git a/samples/tests/Contoso.Shopping.Test.Unit/Validators/BasketItemUpdateRequestValidatorTests.cs b/samples/tests/Contoso.Shopping.Test.Unit/Validators/BasketItemUpdateRequestValidatorTests.cs
new file mode 100644
index 00000000..727c6459
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Unit/Validators/BasketItemUpdateRequestValidatorTests.cs
@@ -0,0 +1,19 @@
+namespace Contoso.Shopping.Test.Unit.Validators;
+
+public class BasketItemUpdateRequestValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void BasketItemUpdateRequest_Validate_Quantity_Negative() => Test.Scoped(test =>
+    {
+        var r = new BasketItemUpdateRequest { Quantity = -1m };
+        BasketItemUpdateRequestValidator.Default.AssertErrors(r,
+            ("quantity", "Quantity must be greater than or equal to '0'."));
+    });
+
+    [Test]
+    public void BasketItemUpdateRequest_Validate_Success() => Test.Scoped(test =>
+    {
+        var r = new BasketItemUpdateRequest { Quantity = 2m };
+        BasketItemUpdateRequestValidator.Default.AssertSuccess(r);
+    });
+}
diff --git a/samples/tests/Contoso.Shopping.Test.Unit/Validators/ProductValidatorTests.cs b/samples/tests/Contoso.Shopping.Test.Unit/Validators/ProductValidatorTests.cs
new file mode 100644
index 00000000..cde318a2
--- /dev/null
+++ b/samples/tests/Contoso.Shopping.Test.Unit/Validators/ProductValidatorTests.cs
@@ -0,0 +1,38 @@
+namespace Contoso.Shopping.Test.Unit.Validators;
+
+public class ProductValidatorTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void Product_Validate_Empty_AllRequired() => Test.Scoped(test =>
+    {
+        var p = new Product();
+        ProductValidator.Default.AssertErrors(p,
+            ("id", "Identifier is required."),
+            ("sku", "Sku is required."),
+            ("text", "Text is required."),
+            ("unitOfMeasure", "Unit of measure is required."));
+    });
+
+    [Test]
+    public void Product_Validate_Price_Negative() => Test.Scoped(test =>
+    {
+        var p = new Product { Id = "1", Sku = "WIDGET", Text = "Widget", UnitOfMeasureCode = "EA", Price = -1m };
+        ProductValidator.Default.AssertErrors(p,
+            ("price", "Price must be greater than or equal to '0'."));
+    });
+
+    [Test]
+    public void Product_Validate_UnitOfMeasure_Invalid() => Test.Scoped(test =>
+    {
+        var p = new Product { Id = "1", Sku = "WIDGET", Text = "Widget", UnitOfMeasureCode = "BADCODE", Price = 9.99m };
+        ProductValidator.Default.AssertErrors(p,
+            ("unitOfMeasure", "Unit of measure is invalid."));
+    });
+
+    [Test]
+    public void Product_Validate_Success() => Test.Scoped(test =>
+    {
+        var p = new Product { Id = "1", Sku = "WIDGET", Text = "Widget", UnitOfMeasureCode = "EA", Price = 9.99m };
+        ProductValidator.Default.AssertSuccess(p);
+    });
+}
diff --git a/samples/tests/Directory.Build.props b/samples/tests/Directory.Build.props
new file mode 100644
index 00000000..338dd20d
--- /dev/null
+++ b/samples/tests/Directory.Build.props
@@ -0,0 +1,11 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
+
+  <PropertyGroup Condition="$([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Api')) Or $([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Unit')) Or $([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Subscribe')) Or $([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Relay'))">
+    <TestTfmsInParallel>false</TestTfmsInParallel>
+  </PropertyGroup>
+
+  <ItemGroup Condition="$([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Api')) Or $([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Unit')) Or $([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Subscribe')) Or $([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.Test.Relay'))">
+    <Compile Include="$(MSBuildThisFileDirectory)NUnitAssemblyInfo.cs" Link="NUnitAssemblyInfo.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/tests/NUnitAssemblyInfo.cs b/samples/tests/NUnitAssemblyInfo.cs
new file mode 100644
index 00000000..5c883bb3
--- /dev/null
+++ b/samples/tests/NUnitAssemblyInfo.cs
@@ -0,0 +1,3 @@
+using NUnit.Framework;
+
+[assembly: LevelOfParallelism(1)]
\ No newline at end of file
diff --git a/schema/coreex-refdata.json b/schema/coreex-refdata.json
new file mode 100644
index 00000000..766d4b0d
--- /dev/null
+++ b/schema/coreex-refdata.json
@@ -0,0 +1,243 @@
+{
+  "title": "JSON Schema for CoreEx code-generation (https://github.com/avanade/coreex).",
+  "$schema": "https://json-schema.org/draft-04/schema#",
+  "definitions": {
+    "CodeGeneration": {
+      "type": "object",
+      "title": "Reference-data code-generation.",
+      "description": "This configuration is used for generating reference-data related code. This is a well understood, deterministic pattern, that is best suited for scenarios where reference-data capabilities are required in a consistent manner.",
+      "properties": {
+        "domain": {
+          "type": "string",
+          "title": "The domain name.",
+          "description": "This is the .NET domain name. Attempts to default from the underlying data project file path; uses the second to last segment of the child-most sub-directory by convention. For example, \u0060/xxx/yyy/My.App.Sales.CodeGen\u0060, the domain would be \u0060Sales\u0060."
+        },
+        "idType": {
+          "type": "string",
+          "title": "The default reference data identifier type.",
+          "description": "Defaults to \u0060String\u0060.",
+          "enum": [
+            "String",
+            "Guid",
+            "Int32",
+            "Int64"
+          ]
+        },
+        "collectionSortOrder": {
+          "type": "string",
+          "title": "The default reference data collection sort order.",
+          "description": "This is the default collection sort order. Defaults to \u0060Code\u0060.",
+          "enum": [
+            "Code",
+            "Id",
+            "Text",
+            "SortOrder"
+          ]
+        },
+        "route": {
+          "type": "string",
+          "title": "The route prefix.",
+          "description": "Defaults to \u0060/api/refdata\u0060."
+        },
+        "routeConvention": {
+          "type": "string",
+          "title": "The route naming convention where not directly specified.",
+          "description": "Defaults to \u0060KebabCase\u0060.",
+          "enum": [
+            "KebabCase",
+            "SnakeCase",
+            "CamelCase",
+            "Lowercase"
+          ]
+        },
+        "repository": {
+          "type": "string",
+          "title": "The default repository implementation.",
+          "enum": [
+            "None",
+            "EntityFramework"
+          ]
+        },
+        "entityFrameworkRepositoryName": {
+          "type": "string",
+          "title": "The default Entity Framework (EF) repository parameter name.",
+          "description": "This is the .NET Entity Framework (EF) repository parameter name that should be used within the generated code. Defaults to \u0060ef\u0060."
+        },
+        "contractsProjectPath": {
+          "type": "string",
+          "title": "The relative path for the .NET contracts-related project.",
+          "description": "Defaults to \u0060Contracts\u0060."
+        },
+        "apiProjectPath": {
+          "type": "string",
+          "title": "The relative path for the .NET API-related project.",
+          "description": "Defaults to \u0060Api\u0060."
+        },
+        "applicationProjectPath": {
+          "type": "string",
+          "title": "The relative path for the .NET application-related project.",
+          "description": "Defaults to \u0060Application\u0060."
+        },
+        "dataProjectPath": {
+          "type": "string",
+          "title": "The relative path for the .NET data-related project.",
+          "description": "Defaults to automatic inference using expected name of \u0060Infrastructure\u0060."
+        },
+        "dataRepositoriesPath": {
+          "type": "string",
+          "title": "The path to append to the \u0060{DotNetDataProjectPath}\u0060 for the .NET generated repository code.",
+          "description": "Defaults to \u0060Repositories\u0060."
+        },
+        "dataModelsPath": {
+          "type": "string",
+          "title": "The path to append to the \u0060{DotNetDataProjectPath}\u0060 for the .NET generated models code.",
+          "description": "Defaults to \u0060Persistence\u0060."
+        },
+        "dataMappingPath": {
+          "type": "string",
+          "title": "The path to append to the \u0060{DotNetDataProjectPath}\u0060 for the .NET generated mapping code.",
+          "description": "Defaults to \u0060Mapping\u0060."
+        },
+        "entities": {
+          "type": "array",
+          "title": "The entity collection configuration.",
+          "items": {
+            "$ref": "#/definitions/Entity"
+          }
+        }
+      },
+      "required": [
+        "repository"
+      ]
+    },
+    "Entity": {
+      "type": "object",
+      "title": "Reference-data entity configuration.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "title": "The reference-data entity (contract) name."
+        },
+        "plural": {
+          "type": "string",
+          "title": "The pluralized reference-data entity (contract) name.",
+          "description": "Defaults to \u0060{Name}\u0060 with the last word pluralized."
+        },
+        "text": {
+          "type": "string",
+          "title": "The reference-data entity friendly text.",
+          "description": "Defaults to \u0060{Name}\u0060 converted to sentence case. This is primarily used in generated code comments."
+        },
+        "idType": {
+          "type": "string",
+          "title": "The reference-data identifier type.",
+          "description": "Defaults to root \u0060{IdType}\u0060.",
+          "enum": [
+            "String",
+            "Guid",
+            "Int32",
+            "Int64"
+          ]
+        },
+        "collectionSortOrder": {
+          "type": "string",
+          "title": "The collection sort order.",
+          "description": "This is the collection sort order. Defaults to root \u0060{CollectionSortOrder}\u0060.",
+          "enum": [
+            "Code",
+            "Id",
+            "Text",
+            "SortOrder"
+          ]
+        },
+        "route": {
+          "type": "string",
+          "title": "The route suffix.",
+          "description": "Defaults to \u0060{Plural}\u0060 and root \u0060{RouteConvention}\u0060 configuration."
+        },
+        "repository": {
+          "type": "string",
+          "title": "The repository implementation.",
+          "description": "Defaults to root \u0060{Repository}\u0060.",
+          "enum": [
+            "None",
+            "EntityFramework"
+          ]
+        },
+        "repositoryName": {
+          "type": "string",
+          "title": "The repository parameter name.",
+          "description": "This is the .NET repository parameter name that should be used within the generated code. Defaults from root \u0060{Repository}\u0060 and related configuration."
+        },
+        "model": {
+          "type": "string",
+          "title": "The corresponding repository model name.",
+          "description": "Defaults to \u0060{Name}\u0060 (assumes same)."
+        },
+        "mapper": {
+          "type": "string",
+          "title": "The mapper name.",
+          "description": "This is the .NET mapper name used within the generated code. Defaults to root \u0060{Name}Mapper\u0060."
+        },
+        "excludeMapper": {
+          "type": "boolean",
+          "title": "Indicates whether to exclude the generation of the mapper.",
+          "description": "Defaults to \u0060false\u0060."
+        },
+        "properties": {
+          "type": "array",
+          "title": "The property collection configuration.",
+          "items": {
+            "$ref": "#/definitions/Property"
+          }
+        }
+      },
+      "required": [
+        "name"
+      ]
+    },
+    "Property": {
+      "type": "object",
+      "title": "Reference-data property configuration.",
+      "properties": {
+        "name": {
+          "type": "string",
+          "title": "The property name."
+        },
+        "type": {
+          "type": "string",
+          "title": "The property type.",
+          "description": "Defaults to \u0060string?\u0060. Supports the following conventions: \u0060^\u0060-prefix for reference-data and \u0060?\u0060-suffix for nullable."
+        },
+        "text": {
+          "type": "string",
+          "title": "The property text.",
+          "description": "Defaults to \u0060{Name}\u0060 converted to sentence case. This is primarily used in generated code comments."
+        },
+        "model": {
+          "type": "string",
+          "title": "The corresponding data model property name.",
+          "description": "Defaults to \u0060{Name}\u0060 (assumes same)."
+        },
+        "excludeContract": {
+          "type": "boolean",
+          "title": "Indicates whether to exclude the property from the generated contract code.",
+          "description": "Defaults to \u0060false\u0060."
+        },
+        "excludeMapping": {
+          "type": "boolean",
+          "title": "Indicates whether to exclude the property from the generated mapping code.",
+          "description": "Defaults to \u0060false\u0060."
+        }
+      },
+      "required": [
+        "name"
+      ]
+    }
+  },
+  "allOf": [
+    {
+      "$ref": "#/definitions/CodeGeneration"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/servicebus/Config.json b/servicebus/Config.json
new file mode 100644
index 00000000..47a1a331
--- /dev/null
+++ b/servicebus/Config.json
@@ -0,0 +1,81 @@
+{
+  "UserConfig": {
+    "Namespaces": [
+      {
+        "Name": "sbemulatorns",
+        "Topics": [
+          {
+            "Name": "unit-test",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "default",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": false
+                }
+              }
+            ]
+          },
+          {
+            "Name": "unit-test-2",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "default",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": false
+                }
+              }
+            ]
+          },
+          {
+            "Name": "contoso",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "products",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": true
+                }
+              },
+              {
+                "Name": "shopping",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": true
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "Logging": {
+      "Type": "Console"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore.NSwag/AGENTS.md b/src/CoreEx.AspNetCore.NSwag/AGENTS.md
new file mode 100644
index 00000000..50647cff
--- /dev/null
+++ b/src/CoreEx.AspNetCore.NSwag/AGENTS.md
@@ -0,0 +1,41 @@
+# CoreEx.AspNetCore.NSwag — AI Usage Guide
+
+Wires CoreEx MVC attributes into the NSwag OpenAPI document pipeline. Register with a single call in `Program.cs`.
+
+## Registration
+
+```csharp
+// Program.cs
+builder.Services.AddOpenApiDocument(s =>
+{
+    s.Title = builder.Environment.ApplicationName;
+    s.AddCoreExConfiguration();   // registers the CoreEx NSwag operation processor + STJ schema settings
+});
+
+// Middleware
+app.UseOpenApi();
+app.UseSwaggerUi();
+```
+
+`AddCoreExConfiguration()` is the only call required. It registers `NSwagOpenApiOperationProcessor` and aligns the NSwag JSON schema with `JsonDefaults.SerializerOptions` (camelCase, enum-as-string, write-when-not-default).
+
+## What Gets Generated Automatically
+
+| Attribute on action | OpenAPI artifact added |
+|---|---|
+| `[Paging]` | `$skip`, `$take`, optionally `$count`/`$page` query params |
+| `[Query]` | `$filter`, `$orderby` query params |
+| `[IdempotencyKey]` | `x-idempotency-key` header parameter |
+| `[ProducesNotFoundProblem]` | `404 application/problem+json` response entry |
+| `[Accepts(typeof(T))]` | Request body content type and JSON schema |
+
+## Do Not
+
+- Do not manually add paging/idempotency parameters to NSwag operations — let the operation processor generate them from attributes.
+- Do not call `AddCoreExConfiguration()` more than once per document.
+
+## Further Reading
+
+- [README](./README.md) — full processor and options API reference.
+- [CoreEx.AspNetCore](../CoreEx.AspNetCore/README.md) — defines the MVC attributes read by this processor.
+- [Hosts layer](../../samples/docs/hosts-layer.md) — shows NSwag registration in a real API host `Program.cs`.
diff --git a/src/CoreEx.AspNetCore.NSwag/CoreEx.AspNetCore.NSwag.csproj b/src/CoreEx.AspNetCore.NSwag/CoreEx.AspNetCore.NSwag.csproj
new file mode 100644
index 00000000..6dbccd76
--- /dev/null
+++ b/src/CoreEx.AspNetCore.NSwag/CoreEx.AspNetCore.NSwag.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx NSwag .NET extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend web-api services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data nswag aspnet webapi swagger</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="NSwag.AspNetCore" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore.NSwag/CoreExNSwagExtensions.DependencyInjection.cs b/src/CoreEx.AspNetCore.NSwag/CoreExNSwagExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..50fab906
--- /dev/null
+++ b/src/CoreEx.AspNetCore.NSwag/CoreExNSwagExtensions.DependencyInjection.cs
@@ -0,0 +1,53 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides the <see href="https://github.com/RicoSuter/NSwag"/> extensions.
+/// </summary>
+public static class CoreExNSwagExtensions
+{
+    /// <summary>
+    /// Adds the <i>CoreEx</i>-specific <i>OpenAPI</i> configuration.
+    /// </summary>
+    /// <param name="settings">The <see cref="OpenApiDocumentGeneratorSettings"/>.</param>
+    /// <returns>The <see cref="OpenApiDocumentGeneratorSettings"/> for fluent-style method-chaining.</returns>
+    /// <remarks>This is a shortcut for calling both <see cref="AddOpenApiDocumentExtensions(OpenApiDocumentGeneratorSettings, Action{OpenApiOptions}?)"/> and <see cref="ConfigureSchemaSettings(OpenApiDocumentGeneratorSettings, JsonSerializerOptions?)"/>.</remarks>
+    public static OpenApiDocumentGeneratorSettings AddCoreExConfiguration(this OpenApiDocumentGeneratorSettings settings) => settings.AddOpenApiDocumentExtensions().ConfigureSchemaSettings();
+
+    /// <summary>
+    /// Adds the <i>CoreEx</i>-specific <i>OpenAPI</i> generated specification configuration extensions.
+    /// </summary>
+    /// <param name="settings">The <see cref="OpenApiDocumentGeneratorSettings"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="OpenApiOptions"/>.</param>
+    /// <returns>The <see cref="OpenApiDocumentGeneratorSettings"/> for fluent-style method-chaining.</returns>
+    public static OpenApiDocumentGeneratorSettings AddOpenApiDocumentExtensions(this OpenApiDocumentGeneratorSettings settings, Action<OpenApiOptions>? configure = null)
+    {
+        settings.ThrowIfNull();
+
+        var options = new OpenApiOptions();
+        configure?.Invoke(options);
+
+        settings.OperationProcessors.Add(new NSwagOpenApiOperationProcessor(options));
+        return settings;
+    }
+
+    /// <summary>
+    /// Configures the <see cref="OpenApiDocumentGeneratorSettings.SchemaSettings"/> to use the <see cref="JsonDefaults.SerializerOptions"/> (unless specifically overridden).
+    /// </summary>
+    /// <param name="settings">The <see cref="OpenApiDocumentGeneratorSettings"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/> override.</param>
+    /// <returns>The <see cref="OpenApiDocumentGeneratorSettings"/> for fluent-style method-chaining.</returns>
+    public static OpenApiDocumentGeneratorSettings ConfigureSchemaSettings(this OpenApiDocumentGeneratorSettings settings, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        settings.ThrowIfNull();
+
+        settings.SchemaSettings = new SystemTextJsonSchemaGeneratorSettings()
+        {
+            SchemaType = NJsonSchema.SchemaType.OpenApi3,
+            SerializerOptions = jsonSerializerOptions ?? JsonDefaults.SerializerOptions
+        };
+
+        return settings;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore.NSwag/GlobalUsing.cs b/src/CoreEx.AspNetCore.NSwag/GlobalUsing.cs
new file mode 100644
index 00000000..b78fc2ba
--- /dev/null
+++ b/src/CoreEx.AspNetCore.NSwag/GlobalUsing.cs
@@ -0,0 +1,20 @@
+global using CoreEx;
+global using CoreEx.AspNetCore;
+global using CoreEx.AspNetCore.Idempotency;
+global using CoreEx.AspNetCore.Mvc;
+global using CoreEx.AspNetCore.NSwag;
+global using CoreEx.Data;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.Results;
+global using Microsoft.AspNetCore.Http;
+global using NJsonSchema;
+global using NJsonSchema.Generation;
+global using NSwag;
+global using NSwag.Generation;
+global using NSwag.Generation.AspNetCore;
+global using NSwag.Generation.Processors;
+global using NSwag.Generation.Processors.Contexts;
+global using System.Net;
+global using System.Net.Mime;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore.NSwag/NSwagOpenApiOperationProcessor.cs b/src/CoreEx.AspNetCore.NSwag/NSwagOpenApiOperationProcessor.cs
new file mode 100644
index 00000000..0e4d53cb
--- /dev/null
+++ b/src/CoreEx.AspNetCore.NSwag/NSwagOpenApiOperationProcessor.cs
@@ -0,0 +1,213 @@
+namespace CoreEx.AspNetCore.NSwag;
+
+/// <summary>
+/// Provides the <i>NSwag</i> <see cref="IOperationProcessor"/> implementation that leverages the <see cref="OpenApiOptions"/> and applies the relevant attributes to the generated output.
+/// </summary>
+/// <param name="options">The <see cref="OpenApiOptions"/>.</param>
+internal sealed class NSwagOpenApiOperationProcessor(OpenApiOptions options) : IOperationProcessor
+{
+    /// <summary>
+    /// Gets the <see cref="OpenApiOptions"/>.
+    /// </summary>
+    public OpenApiOptions Options { get; } = options.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public bool Process(OperationProcessorContext context)
+    {
+        if (context is AspNetCoreOperationProcessorContext ctx)
+        {
+            HandleAcceptsAttribute(ctx);
+            HandleQueryAttribute(ctx);
+            HandlePagingAttribute(ctx);
+            HandleIdempotencyKeyAttribute(ctx);
+            HandleProducesNotFoundProblemAttribute(ctx);
+            HandleResponseProblemDetails(ctx);
+
+            if (Options.IncludeFieldsRequestHeaders)
+                HandleRequestFieldQueryString(ctx);
+
+            if (Options.IncludeMessagesResponseHeaders) 
+                HandleMessagesResponseHeaders(ctx);
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Handles the <see cref="AcceptsAttribute"/>.
+    /// </summary>
+    private static void HandleAcceptsAttribute(AspNetCoreOperationProcessorContext context)
+    {
+        var accepts = (AcceptsAttribute?)context.ApiDescription.ActionDescriptor.EndpointMetadata.FirstOrDefault(x => x is AcceptsAttribute);
+        if (accepts is null)
+            return;
+
+        var body = new OpenApiRequestBody();
+        context.OperationDescription.Operation.RequestBody = body;
+
+        var schema = GetOrGenerateSchemaForType(context, accepts.BodyType);
+        foreach (var contentType in new[] { accepts.ContentType }.Concat(accepts.AdditionalContentTypes ?? []))
+        {
+            body.Content.Add(contentType, new OpenApiMediaType { Schema = schema });
+        }
+    }
+
+    /// <summary>
+    /// Handles the <see cref="QueryAttribute"/>.
+    /// </summary>
+    private void HandleQueryAttribute(AspNetCoreOperationProcessorContext context)
+    {
+        var query = (QueryAttribute?)context.ApiDescription.ActionDescriptor.EndpointMetadata.FirstOrDefault(x => x is QueryAttribute);
+        if (query is null)
+            return;
+
+        if (query.SupportsFilter)
+            context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.QueryFilterQueryStringName, Options.QueryFilterText, JsonObjectType.String, $"{nameof(QueryArgs)}{nameof(QueryArgs.Filter)}"));
+
+        if (query.SupportsOrderBy)
+            context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.QueryOrderByQueryStringName, Options.QueryOrderByText, JsonObjectType.String, $"{nameof(QueryArgs)}{nameof(QueryArgs.OrderBy)}"));
+    }
+
+    /// <summary>
+    /// Handles the <see cref="PagingAttribute"/>.
+    /// </summary>
+    private void HandlePagingAttribute(AspNetCoreOperationProcessorContext context)
+    {
+        var paging = (PagingAttribute?)context.ApiDescription.ActionDescriptor.EndpointMetadata.FirstOrDefault(x => x is PagingAttribute);
+        if (paging is null)
+            return;
+
+        context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.PagingSkipQueryStringName, Options.PagingSkipText, JsonObjectType.Integer, $"{nameof(PagingArgs)}{nameof(PagingArgs.Skip)}"));
+        context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.PagingTakeQueryStringName, Options.PagingTakeText, JsonObjectType.Integer, $"{nameof(PagingArgs)}{nameof(PagingArgs.Take)}"));
+        if (paging.SupportsCount)
+            context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.PagingCountQueryStringName, Options.PagingCountText, JsonObjectType.Boolean, $"{nameof(PagingArgs)}{nameof(ITotalCount.IsCountRequested)}"));
+
+        if (Options.IncludePagingResponseHeaders)
+        {
+            foreach (var r in context.OperationDescription.Operation.Responses.Where(r => int.TryParse(r.Key, out var code) && code >= 200 && code < 300))
+            {
+                r.Value.Headers.Add(HttpNames.PagingSkipHeaderName, new OpenApiHeader { Schema = new JsonSchema { Type = JsonObjectType.Integer }, OriginalName = $"{nameof(PagingResult)}{nameof(PagingResult.Skip)}", Description = Options.PagingSkipText });
+                r.Value.Headers.Add(HttpNames.PagingTakeHeaderName, new OpenApiHeader { Schema = new JsonSchema { Type = JsonObjectType.Integer }, OriginalName = $"{nameof(PagingResult)}{nameof(PagingResult.Take)}", Description = Options.PagingTakeText });
+                if (paging.SupportsCount)
+                    r.Value.Headers.Add(HttpNames.PagingTotalCountHeaderName, new OpenApiHeader { Schema = new JsonSchema { Type = JsonObjectType.Integer, IsNullableRaw = true }, OriginalName = $"{nameof(PagingResult)}{nameof(PagingResult.TotalCount)}", Description = Options.PagingTotalCountText });
+            }
+        }
+    }
+
+    /// <summary>
+    /// Handles the <see cref="IdempotencyKeyAttribute"/>.
+    /// </summary>
+    /// <param name="context"></param>
+    private void HandleIdempotencyKeyAttribute(AspNetCoreOperationProcessorContext context)
+    {
+        var idempotencyKey = (IdempotencyKeyAttribute?)context.ApiDescription.ActionDescriptor.EndpointMetadata.FirstOrDefault(x => x is IdempotencyKeyAttribute);
+        if (idempotencyKey is null)
+            return;
+
+        context.OperationDescription.Operation.Parameters.Add(new OpenApiParameter
+        {
+            Name = HttpNames.IdempotencyKeyHeaderName,
+            OriginalName = nameof(IdempotencyKey),
+            Description = Options.IdempotencyKeyText,
+            Kind = OpenApiParameterKind.Header,
+            Schema = new JsonSchema { Type = JsonObjectType.String, MinLength = 8, MaxLength = 128, IsNullableRaw = !idempotencyKey.IsRequired }
+        });
+    }
+
+    /// <summary>
+    /// Handles the <see cref="ProducesNotFoundProblemAttribute"/>.
+    /// </summary>
+    private static void HandleProducesNotFoundProblemAttribute(AspNetCoreOperationProcessorContext context)
+    {
+        var notFoundProblem = (ProducesNotFoundProblemAttribute?)context.ApiDescription.ActionDescriptor.EndpointMetadata.FirstOrDefault(x => x is ProducesNotFoundProblemAttribute);
+        if (notFoundProblem is null)
+            return;
+
+        // Add the NotFound ProblemDetails response.
+        var schema = GetOrGenerateSchemaForType(context, typeof(Microsoft.AspNetCore.Mvc.ProblemDetails));
+        var key = ((int)HttpStatusCode.NotFound).ToString();
+        if (!context.OperationDescription.Operation.Responses.ContainsKey(key))
+            context.OperationDescription.Operation.Responses[key] = new OpenApiResponse { Content = { [MediaTypeNames.Application.ProblemJson] = new OpenApiMediaType { Schema = schema } } };
+    }
+
+    /// <summary>
+    /// Handles the response problems.
+    /// </summary>
+    private void HandleResponseProblemDetails(AspNetCoreOperationProcessorContext context)
+    {
+        if (options.IncludeValidationProblemDetailsHttpStatusCodes)
+        {
+            var schema = GetOrGenerateSchemaForType(context, typeof(Microsoft.AspNetCore.Mvc.ValidationProblemDetails));
+
+            foreach (var sc in options.ValidationProblemDetailsHttpStatusCodes)
+            {
+                var key = ((int)sc).ToString();
+                if (!context.OperationDescription.Operation.Responses.ContainsKey(key))
+                    context.OperationDescription.Operation.Responses[key] = new OpenApiResponse { Content = { [MediaTypeNames.Application.ProblemJson] = new OpenApiMediaType { Schema = schema } } };
+            }
+        }
+
+        if (options.IncludeProblemDetailsHttpStatusCodes)
+        {
+            var schema = GetOrGenerateSchemaForType(context, typeof(Microsoft.AspNetCore.Mvc.ProblemDetails));
+
+            foreach (var sc in options.ProblemDetailsHttpStatusCodes)
+            {
+                var key = ((int)sc).ToString();
+                if (!context.OperationDescription.Operation.Responses.ContainsKey(key))
+                    context.OperationDescription.Operation.Responses[key] = new OpenApiResponse { Content = { [MediaTypeNames.Application.ProblemJson] = new OpenApiMediaType { Schema = schema } } };
+            }
+        }
+    }
+
+    /// <summary>
+    /// Gets or generates the schema for the specified <paramref name="type"/>.
+    /// </summary>
+    private static JsonSchema GetOrGenerateSchemaForType(AspNetCoreOperationProcessorContext context, Type type)
+    {
+        var schema = context.SchemaGenerator.Generate(type, context.SchemaResolver);
+
+        if (schema.Reference is not null)
+            return new JsonSchema { Reference = schema.Reference };
+
+        var name = schema.Title ?? type.Name;
+        context.Document.Components.Schemas[name] = schema.ActualSchema;
+        return new JsonSchema { Reference = schema.ActualSchema };
+    }
+
+    /// <summary>
+    /// Handles the <see cref="HttpNames.WarningMessagesHeaderName"/> and <see cref="HttpNames.InfoMessagesHeaderName"/> response headers.
+    /// </summary>
+    private void HandleMessagesResponseHeaders(AspNetCoreOperationProcessorContext context)
+    {
+        foreach (var r in context.OperationDescription.Operation.Responses.Where(x => int.TryParse(x.Key, out var sc) && sc < 400))
+        {
+            r.Value.Headers.Add(HttpNames.WarningMessagesHeaderName, new OpenApiHeader { Schema = new JsonSchema { Type = JsonObjectType.Array, Item = new JsonSchema { Type = JsonObjectType.String } }, OriginalName = "WarningMessages", Description = Options.WarningMessagesText });
+            r.Value.Headers.Add(HttpNames.InfoMessagesHeaderName, new OpenApiHeader { Schema = new JsonSchema { Type = JsonObjectType.Array, Item = new JsonSchema { Type = JsonObjectType.String } }, OriginalName = "InfoMessages", Description = Options.InfoMessagesText });
+        }
+    }
+
+    /// <summary>
+    /// Handles the <see cref="HttpNames.IncludeFieldsQueryStringName"/> and <see cref="HttpNames.ExcludeFieldsQueryStringName"/>.
+    /// </summary>
+    private void HandleRequestFieldQueryString(AspNetCoreOperationProcessorContext context)
+    {
+        if (context.OperationDescription.Method.Equals(HttpMethods.Get, StringComparison.OrdinalIgnoreCase) && context.OperationDescription.Operation.Responses.Any(x => int.TryParse(x.Key, out var sc) && sc < 400 && x.Value.Content.ContainsKey(MediaTypeNames.Application.Json)))
+        {
+            context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.IncludeFieldsQueryStringName, Options.IncludeFieldsText, JsonObjectType.String, $"{nameof(PagingArgs)}{nameof(QueryArgs.IncludeFields)}"));
+            context.OperationDescription.Operation.Parameters.Add(CreateParameter(HttpNames.ExcludeFieldsQueryStringName, Options.ExcludeFieldsText, JsonObjectType.String, $"{nameof(PagingArgs)}{nameof(QueryArgs.ExcludeFields)}"));
+        }
+    }
+
+    /// <summary>
+    /// Create the parameter definition.
+    /// </summary>
+    private static OpenApiParameter CreateParameter(string name, string description, JsonObjectType type, string? original = null) => new()
+    {
+        Name = name,
+        OriginalName = original ?? name,
+        Description = description,
+        Kind = OpenApiParameterKind.Query,
+        Schema = new JsonSchema { Type = type }
+    };
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore.NSwag/README.md b/src/CoreEx.AspNetCore.NSwag/README.md
new file mode 100644
index 00000000..9eb31291
--- /dev/null
+++ b/src/CoreEx.AspNetCore.NSwag/README.md
@@ -0,0 +1,44 @@
+# CoreEx.AspNetCore.NSwag
+
+> Provides the NSwag `IOperationProcessor` integration that reads CoreEx MVC attributes (`[Paging]`, `[Query]`, `[Accepts]`, `[IdempotencyKey]`, `[ProducesNotFoundProblem]`) and injects the corresponding parameters, request bodies, and response entries into the generated OpenAPI specification.
+
+## Overview
+
+`CoreEx.AspNetCore.NSwag` bridges CoreEx's declarative MVC attributes with NSwag's OpenAPI document generation pipeline. Without this package, NSwag cannot infer paging query-string parameters, idempotency-key request headers, or standard `ProblemDetails` error responses from CoreEx's attribute-based conventions.
+
+`NSwagOpenApiOperationProcessor` is registered as a NSwag `IOperationProcessor` and runs once per operation during document generation. It reads endpoint metadata for each of the CoreEx MVC attributes and adds the corresponding OpenAPI artifacts — parameters, request-body content types, response entries — to the generated `OpenApiOperation`. The processor is controlled by `OpenApiOptions` (from `CoreEx.AspNetCore`), which exposes flags and display-text properties for every injected element.
+
+`CoreExNSwagExtensions.AddCoreExConfiguration()` (on `OpenApiDocumentGeneratorSettings`) is the single registration call that wires both the operation processor and the CoreEx-aligned `System.Text.Json` schema settings.
+
+## Key capabilities
+
+- 📋 **Paging parameters**: Reads `[PagingAttribute]` and adds `$skip`, `$take`, and optionally `$count` / `$page` query-string parameters with descriptions controlled by `OpenApiOptions.PagingSkipText`, `PagingTakeText`, etc.
+- 🔍 **Query parameters**: Reads `[QueryAttribute]` and adds `$filter` and/or `$orderby` query-string parameters when `SupportsFilter` / `SupportsOrderBy` are set.
+- 📦 **Request body content types**: Reads `[AcceptsAttribute]` and populates the operation `RequestBody` with the declared content type(s) and NSwag-inferred JSON schema for the body type.
+- 🔑 **Idempotency-key header**: Reads `[IdempotencyKeyAttribute]` and adds an `x-idempotency-key` header parameter to the operation.
+- 🚫 **Not-found response**: Reads `[ProducesNotFoundProblemAttribute]` and adds a `404 application/problem+json` response entry.
+- ⚠️ **ProblemDetails responses**: Optionally injects `application/problem+json` response entries for the HTTP status codes configured via `OpenApiOptions.IncludeProblemDetailsHttpStatusCodes` / `OpenApiOptions.IncludeValidationProblemDetailsHttpStatusCodes` and their corresponding status-code lists; `500` is only included when it is present in the configured list, not by default via a separate `IncludeStandardProblemDetailsResponses` option.
+- 📡 **Fields query string**: When `OpenApiOptions.IncludeFieldsRequestHeaders` is set, adds the `$fields` query-string parameter for response field projection.
+- 💬 **Message response headers**: When `OpenApiOptions.IncludeMessagesResponseHeaders` is set, documents `x-messages-warning` and `x-messages-info` response headers.
+- ⚙️ **STJ schema settings**: `ConfigureSchemaSettings()` aligns NSwag's JSON schema generation with `JsonDefaults.SerializerOptions` (camelCase, enum-as-string, `WhenWritingDefault`) so the generated schema matches the actual serialized output.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`NSwagOpenApiOperationProcessor`](./NSwagOpenApiOperationProcessor.cs)** | NSwag `IOperationProcessor` that reads CoreEx endpoint metadata and injects paging, query, accepts, idempotency-key, not-found, ProblemDetails, fields, and message-header artifacts into each `OpenApiOperation`. |
+| **[`CoreExNSwagExtensions`](./CoreExNSwagExtensions.DependencyInjection.cs)** | `OpenApiDocumentGeneratorSettings` extension methods: `AddCoreExConfiguration()` (registers processor + schema settings), `AddOpenApiDocumentExtensions(configure?)`, `ConfigureSchemaSettings(jsonSerializerOptions?)`. |
+
+## Related Namespaces
+
+- **[`CoreEx.AspNetCore`](../CoreEx.AspNetCore/README.md)** - Defines `OpenApiOptions` (processor configuration), and the MVC attributes (`[PagingAttribute]`, `[QueryAttribute]`, `[AcceptsAttribute]`, `[IdempotencyKeyAttribute]`, `[ProducesNotFoundProblemAttribute]`) read by this processor.
+- **[`CoreEx.Http`](../CoreEx/Http/README.md)** - `HttpNames` provides the configurable query-string and header name constants used when creating OpenAPI parameter names.
+- **[`CoreEx.Json`](../CoreEx/Json/README.md)** - `JsonDefaults.SerializerOptions` is the options instance applied to NSwag schema settings by `ConfigureSchemaSettings()`.
+
+## Additional Resources
+
+- [NSwag GitHub](https://github.com/RicoSuter/NSwag) - The NSwag library this package extends.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/AGENTS.md b/src/CoreEx.AspNetCore/AGENTS.md
new file mode 100644
index 00000000..c499dd7b
--- /dev/null
+++ b/src/CoreEx.AspNetCore/AGENTS.md
@@ -0,0 +1,96 @@
+# CoreEx.AspNetCore — AI Usage Guide
+
+Provides the `WebApi` HTTP execution helper, exception-to-ProblemDetails middleware, idempotency, and health checks for ASP.NET Core hosts.
+
+## Controllers
+
+Inherit `ControllerBase`. Inject `WebApi` and the application service interface. Use `WebApi` helper methods for all action methods — never return `ActionResult<T>` directly.
+
+```csharp
+[ApiController, Route("/api/products"), OpenApiTag("Products")]
+public class ProductController(WebApi webApi, IProductService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly IProductService _service = service.ThrowIfNull();
+
+    [HttpGet("{id}"), ProducesNotFoundProblem]
+    public Task<IActionResult> GetAsync(Guid id) =>
+        _webApi.GetAsync(Request, () => _service.GetAsync(id));
+
+    [HttpPost, IdempotencyKey]
+    public Task<IActionResult> CreateAsync([FromBody] Product product) =>
+        _webApi.PostAsync(Request, () => _service.CreateAsync(product),
+            statusCode: HttpStatusCode.Created,
+            locationUri: r => new Uri($"/api/products/{r!.Id}", UriKind.Relative));
+
+    [HttpPut("{id}")]
+    public Task<IActionResult> UpdateAsync(Guid id, [FromBody] Product product) =>
+        _webApi.PutAsync(Request, () => _service.UpdateAsync(id, product));
+
+    [HttpDelete("{id}")]
+    public Task<IActionResult> DeleteAsync(Guid id) =>
+        _webApi.DeleteAsync(Request, () => _service.DeleteAsync(id));
+}
+```
+
+## PATCH (JSON Merge Patch)
+
+Use `PatchAsync` with a function that loads the current entity for merging.
+
+```csharp
+[HttpPatch("{id}")]
+public Task<IActionResult> PatchAsync(Guid id) =>
+    _webApi.PatchAsync(Request,
+        get: _ => _service.GetAsync(id),
+        put: product => _service.UpdateAsync(id, product));
+```
+
+## Query / Paged List Endpoints
+
+Use `[Query]` and `[Paging]` attributes; the `WebApi` helper reads them from the request automatically.
+
+```csharp
+[HttpGet, Query, Paging]
+public Task<IActionResult> GetAllAsync() =>
+    _webApi.GetAsync(Request, q => _service.GetAllAsync(q.QueryArgs, q.PagingArgs));
+```
+
+## Middleware Registration Order
+
+Order matters — follow this sequence in `Program.cs`:
+
+```csharp
+app.UseCoreExExceptionHandler();   // translates IExtendedException → ProblemDetails
+app.UseHttpsRedirection();
+app.UseAuthorization();
+app.UseExecutionContext();         // scopes ExecutionContext per request
+app.UseIdempotencyKey();           // must come AFTER UseExecutionContext
+app.MapControllers();
+app.MapHealthChecks();
+```
+
+## Service Registration
+
+```csharp
+builder.Services
+    .AddExecutionContext()
+    .AddMvcWebApi()       // registers Mvc.WebApi + invoker
+    .AddHttpWebApi();     // registers Http.WebApi for Minimal API
+```
+
+## Do Not
+
+- Do not inherit from `Controller` — use `ControllerBase`.
+- Do not return `ActionResult<T>` directly — always delegate to the `WebApi` helper.
+- Do not inject `IUnitOfWork` into controllers — it belongs in the application service.
+- Do not put business logic in controllers — delegate immediately to the application service.
+- Do not call `UseIdempotencyKey()` before `UseExecutionContext()`.
+
+## Further Reading
+
+- [README](./README.md) — full API surface for `WebApi`, middleware, and health checks.
+- [CoreEx](../CoreEx/README.md) — semantic exceptions and `Result<T>` translated by this package.
+- [CoreEx.AspNetCore.NSwag](../CoreEx.AspNetCore.NSwag/README.md) — OpenAPI spec generation for CoreEx attributes.
+- [Hosts layer](../../samples/docs/hosts-layer.md) — real-world `Program.cs` shape, middleware ordering, and host-specific wiring patterns.
+- [Patterns](../../samples/docs/patterns.md) — pattern catalogue for HTTP endpoints, idempotency, paging, and PATCH.
+- [Layers overview](../../samples/docs/layers.md) — full layer dependency diagram and host composition rules.
diff --git a/src/CoreEx.AspNetCore/Abstractions/AspNetCoreApplicationBuilderExtensions.cs b/src/CoreEx.AspNetCore/Abstractions/AspNetCoreApplicationBuilderExtensions.cs
deleted file mode 100644
index 35ce35f9..00000000
--- a/src/CoreEx.AspNetCore/Abstractions/AspNetCoreApplicationBuilderExtensions.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.RefData;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.AspNetCore.Builder
-{
-    /// <summary>
-    /// Provides <see cref="IApplicationBuilder"/> extensions.
-    /// </summary>
-    public static class AspNetCoreApplicationBuilderExtensions
-    {
-        /// <summary>
-        /// Registers the action to <paramref name="executionContextUpdate"/> the <see cref="ExecutionContext"/> for a request. 
-        /// </summary>
-        /// <param name="builder">The <see cref="IApplicationBuilder"/>.</param>
-        /// <param name="executionContextUpdate">An optional function to update the <see cref="ExecutionContext"/>.</param>
-        /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
-        public static IApplicationBuilder UseExecutionContext(this IApplicationBuilder builder, Func<HttpContext, ExecutionContext, Task>? executionContextUpdate = null)
-            => builder.UseMiddleware<WebApiExecutionContextMiddleware>(executionContextUpdate ?? WebApiExecutionContextMiddleware.DefaultExecutionContextUpdate);
-
-        /// <summary>
-        /// Adds the <see cref="WebApiExceptionHandlerMiddleware"/> to the <see cref="IApplicationBuilder"/> request execution pipeline.
-        /// </summary>
-        /// <param name="builder">The <see cref="IApplicationBuilder"/>.</param>
-        /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
-        public static IApplicationBuilder UseWebApiExceptionHandler(this IApplicationBuilder builder) => builder.UseMiddleware<WebApiExceptionHandlerMiddleware>();
-
-        /// <summary>
-        /// Registers the <see cref="ReferenceDataOrchestrator"/> instance (using <see cref="ReferenceDataOrchestrator.SetCurrent(ReferenceDataOrchestrator)"/>) so that it can be universally referenced.
-        /// </summary>
-        /// <param name="builder">The <see cref="IApplicationBuilder"/>.</param>
-        /// <returns>The <see cref="IApplicationBuilder"/>.</returns>
-        public static IApplicationBuilder UseReferenceDataOrchestrator(this IApplicationBuilder builder)
-        {
-            ReferenceDataOrchestrator.SetCurrent(builder.ApplicationServices.GetRequiredService<ReferenceDataOrchestrator>());
-            return builder;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/AspNetCoreServiceCollectionExtensions.cs b/src/CoreEx.AspNetCore/Abstractions/AspNetCoreServiceCollectionExtensions.cs
deleted file mode 100644
index 1063bf42..00000000
--- a/src/CoreEx.AspNetCore/Abstractions/AspNetCoreServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Json;
-using CoreEx.Json.Merge;
-using Microsoft.Extensions.Logging;
-using System;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extensions.
-    /// </summary>
-    public static class AspNetCoreServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Checks that the <see cref="IServiceCollection"/> is not null.
-        /// </summary>
-        private static IServiceCollection CheckServices(IServiceCollection services) => services.ThrowIfNull(nameof(services));
-
-        /// <summary>
-        /// Adds the <see cref="WebApi"/> as a scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="WebApi"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddWebApi(this IServiceCollection services, Action<IServiceProvider, WebApi>? configure = null) => CheckServices(services).AddScoped(sp =>
-        {
-            var wa = new WebApi(sp.GetRequiredService<ExecutionContext>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<IJsonSerializer>(), sp.GetRequiredService<ILogger<WebApi>>(), sp.GetService<WebApiInvoker>(), sp.GetService<IJsonMergePatch>());
-            configure?.Invoke(sp, wa);
-            return wa;
-        });
-
-        /// <summary>
-        /// Adds the <see cref="ReferenceDataContentWebApi"/> as a scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="WebApi"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddReferenceDataContentWebApi(this IServiceCollection services, Action<IServiceProvider, ReferenceDataContentWebApi>? configure = null) => CheckServices(services).AddScoped(sp =>
-        {
-            var wa = new ReferenceDataContentWebApi(sp.GetRequiredService<ExecutionContext>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<IReferenceDataContentJsonSerializer>(), sp.GetRequiredService<ILogger<WebApi>>(), sp.GetService<WebApiInvoker>(), sp.GetService<IJsonMergePatch>());
-            configure?.Invoke(sp, wa);
-            return wa;
-        });
-
-        /// <summary>
-        /// Adds the <see cref="WebApiPublisher"/> as a scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="WebApi"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddWebApiPublisher(this IServiceCollection services, Action<IServiceProvider, WebApiPublisher>? configure = null) => CheckServices(services).AddScoped(sp =>
-        {
-            var wap = new WebApiPublisher(sp.GetRequiredService<IEventPublisher>(), sp.GetRequiredService<ExecutionContext>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<IJsonSerializer>(), sp.GetRequiredService<ILogger<WebApiPublisher>>(), sp.GetService<WebApiInvoker>());
-            configure?.Invoke(sp,wap);
-            return wap;
-        });
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/IWebApiRequestOptions.cs b/src/CoreEx.AspNetCore/Abstractions/IWebApiRequestOptions.cs
new file mode 100644
index 00000000..141debd7
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/IWebApiRequestOptions.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Enables the <see cref="WebApi{TResult}"/> request options.
+/// </summary>
+/// <typeparam name="TRequest">The request type.</typeparam>
+public interface IWebApiRequestOptions<TRequest>
+{
+    /// <summary>
+    /// Gets the request value or <see langword="default"/>.
+    /// </summary>
+    TRequest? ValueOrDefault { get; }
+
+    /// <summary>
+    /// Gets the request value where not <see langword="default"/>; otherwise, results in a corresponding <see cref="ValidationException"/> (see <see cref="Validation.ValidatorExtensions.Required{T}(T, string?, LText?)"/>).
+    /// </summary>
+    [NotNull]
+    TRequest Value { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/IWebApiResponseOptions.cs b/src/CoreEx.AspNetCore/Abstractions/IWebApiResponseOptions.cs
new file mode 100644
index 00000000..fa786bca
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/IWebApiResponseOptions.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Enables the <see cref="WebApi{TResult}"/> response options.
+/// </summary>
+public interface IWebApiResponseOptions
+{
+    /// <summary>
+    /// Creates the <see cref="Uri"/> representing the location of the resource.
+    /// </summary>
+    Uri? CreateLocationUri(object? value);
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/IWebApiResponseOptionsT.cs b/src/CoreEx.AspNetCore/Abstractions/IWebApiResponseOptionsT.cs
new file mode 100644
index 00000000..5d9f84c3
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/IWebApiResponseOptionsT.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Enables the <see cref="WebApi{TResult}"/> response options.
+/// </summary>
+/// <typeparam name="TResponse">The response type.</typeparam>
+public interface IWebApiResponseOptions<TResponse> : IWebApiResponseOptions
+{
+    /// <summary>
+    /// Gets the function that will return the <see cref="Uri"/> representing the location of the resource.
+    /// </summary>
+    Func<TResponse, Uri>? LocationUri { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/README.md b/src/CoreEx.AspNetCore/Abstractions/README.md
new file mode 100644
index 00000000..566333eb
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/README.md
@@ -0,0 +1,41 @@
+# CoreEx.AspNetCore.Abstractions
+
+> Contains the abstract `WebApi<TResult>` base class, `WebApiInvoker<TResult>`, `WebApiResult<TResult>`, `WebApiPagingResult`, and the request/response option interfaces shared by both the MVC and Minimal API `WebApi` implementations.
+
+## Overview
+
+`CoreEx.AspNetCore.Abstractions` is the shared execution kernel for the two concrete `WebApi` flavours. `WebApi<TResult>` provides the complete implementation of every HTTP verb method (`GetAsync`, `PostAsync`, `PutAsync`, `PatchAsync`, `DeleteAsync`) in terms of a generic `TResult`, while the concrete subclasses in `Mvc` and `Http` supply only the `CreateResult(WebApiResult<TResult>)` method that maps a `WebApiResult` to either `IActionResult` or `IResult`.
+
+`WebApiResult<TResult>` is the internal transfer object that carries the HTTP response state — optional result value, exception, status code, ETag, location URI, and paging metadata — between the execution pipeline and `CreateResult`. `WebApiInvoker<TResult>` wraps each invocation with an OpenTelemetry span (via `InvokerBase<WebApi<TResult>>`) and structured logging.
+
+The request/response option types (`IWebApiRequestOptions`, `IWebApiResponseOptions`, `WebApiOptionsBase`) define the per-operation configuration surface that controllers pass when calling `WebApi` helpers.
+
+## Key capabilities
+
+- 🔀 **Verb method implementations**: `GetAsync`, `PostAsync`, `PutAsync`, `PatchAsync`, `DeleteAsync` all live in `WebApi<TResult>` as complete implementations; subclasses need only implement `CreateResult`.
+- 📦 **Request body deserialization**: `PostAsync`/`PutAsync`/`PatchAsync` deserialize the request body with `JsonSerializer`, enforcing `Content-Type` and returning `400 Bad Request` with a descriptive `ProblemDetails` on failure.
+- 🏷️ **ETag / If-Match concurrency**: `PutAsync` and `PatchAsync` read the `If-Match` request header and stamp the `ETag` response header from the entity; `PatchAsync` additionally validates the ETag before applying the patch.
+- 📃 **Paging header stamping**: When an operation returns an `ICollectionResult` / `ItemsResult<T>`, `WebApiPagingResult` stamps the `x-paging-skip`, `x-paging-take`, `x-paging-count`, and `x-paging-page` response headers.
+- ⚡ **WebApiInvoker tracing**: Every `InvokeAsync` call is wrapped by `WebApiInvoker<TResult>`, which creates an `Activity` span tagged with operation result and error details.
+- 🔌 **Extension points**: `WebApiOptionsBase` exposes `AlternateStatusCode`, `AlternateOnDefault`, and `OnCreateBeforeResponseAsync` hooks for customizing per-operation behavior without subclassing `WebApi<TResult>`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| _[`WebApi<TResult>`](./WebApi.cs)_ | Abstract base providing all HTTP verb implementations; `TResult` is either `IActionResult` (MVC) or `IResult` (Minimal API). |
+| _[`WebApiBase`](./WebApiBase.cs)_ | Root abstract base holding `JsonSerializerOptions`, `Logger`, `ExecutionContext`, and `ConvertUnhandledExceptionsToProblemDetails`. |
+| **[`WebApiResult<TResult>`](./WebApiResult.cs)** | Internal transfer object carrying `Result`, `Exception`, `StatusCode`, `ETag`, `Location`, `BypassExceptionLogging`, and `HttpResponse`. |
+| **[`WebApiPagingResult`](./WebApiPagingResult.cs)** | Carries `PagingResult` metadata stamped onto the response as `x-paging-*` headers. |
+| **[`WebApiInvoker<TResult>`](./WebApiInvoker.cs)** | `InvokerBase<WebApi<TResult>>` creating OpenTelemetry spans and structured log entries for every `WebApi` invocation. |
+| [`WebApiHeader`](./WebApiHeader.cs) | Constants for internal response headers used by `WebApi` (e.g. `x-messages`). |
+| [`IWebApiRequestOptions`](./IWebApiRequestOptions.cs) | Per-operation request options: `HttpRequest`, `RequestBodyType`, and request body handling configuration. |
+| [`IWebApiResponseOptions`](./IWebApiResponseOptions.cs) | Per-operation response options: `StatusCode`, `AlternateStatusCode`, `Location` URI, and `ETag` configuration. |
+| [`WebApiOptionsBase`](./WebApiOptionsBase.cs) | Abstract base for concrete options types combining request and response option interfaces. |
+
+## Related Namespaces
+
+- **[`CoreEx.AspNetCore`](../README.md)** - The root package; `ExecutionContextMiddleware` and `ExceptionHandlingMiddleware` provide the per-request setup that `WebApi<TResult>` assumes is in place.
+- **[`CoreEx.AspNetCore.Mvc`](../Mvc/README.md)** - `Mvc.WebApi` extends `WebApi<IActionResult>` with MVC-specific `CreateResult` and `WebApiInvoker`.
+- **[`CoreEx.AspNetCore.Http`](../Http/README.md)** - `Http.WebApi` extends `WebApi<IResult>` with Minimal API-specific `CreateResult` and `WebApiInvoker`.
+- **[`CoreEx.Invokers`](../../CoreEx/Invokers/README.md)** - `WebApiInvoker<TResult>` extends `InvokerBase<WebApi<TResult>>` using the standard tracing/logging pipeline.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/ReferenceDataOrchestratorExtensions.cs b/src/CoreEx.AspNetCore/Abstractions/ReferenceDataOrchestratorExtensions.cs
deleted file mode 100644
index c7177b9e..00000000
--- a/src/CoreEx.AspNetCore/Abstractions/ReferenceDataOrchestratorExtensions.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.AspNetCore.WebApis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides <see cref="ReferenceDataOrchestrator"/> extensions.
-    /// </summary>
-    public static class ReferenceDataOrchestratorExtensions
-    {
-        /// <summary>
-        /// Gets the reference data items for the specified names and related codes (see <see cref="IReferenceData.Code"/>) from the <paramref name="requestOptions"/>.
-        /// </summary>
-        /// <param name="orchestrator">The <see cref="ReferenceDataOrchestrator"/>.</param>
-        /// <param name="requestOptions">The <see cref="WebApiRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ReferenceDataMultiDictionary"/>.</returns>
-        /// <remarks>The reference data names and codes are specified as part of the query string. Either '<c>?names=RefA,RefB,RefX</c>' or <c>?RefA,RefB=CodeA,CodeB,RefX=CodeX</c> or any combination thereof.</remarks>
-        public static Task<ReferenceDataMultiDictionary> GetNamedAsync(this ReferenceDataOrchestrator orchestrator, WebApiRequestOptions requestOptions, CancellationToken cancellationToken = default)
-        {
-            var dict = new Dictionary<string, List<string>>();
-
-            foreach (var q in requestOptions.Request.Query.Where(x => !string.IsNullOrEmpty(x.Key)))
-            {
-                if (string.Compare(q.Key, "names", StringComparison.OrdinalIgnoreCase) == 0)
-                {
-                    foreach (var v in SplitStringValues(q.Value.Where(x => !string.IsNullOrEmpty(x)).Distinct()!))
-                    {
-                        dict.TryAdd(v, []);
-                    }
-                }
-                else
-                {
-                    if (dict.TryGetValue(q.Key, out var codes))
-                    {
-                        foreach (var code in SplitStringValues(q.Value.Distinct()!))
-                        {
-                            if (!codes.Contains(code))
-                                codes.Add(code);
-                        }
-                    }
-                    else
-                        dict.Add(q.Key, new List<string>(SplitStringValues(q.Value.Distinct()!)));
-                }
-            }
-
-            return orchestrator.GetNamedAsync(dict.ToList(), requestOptions.IncludeInactive, cancellationToken);
-        }
-
-        /// <summary>
-        /// Perform a further split of the string values.
-        /// </summary>
-        private static List<string> SplitStringValues(IEnumerable<string> values)
-        {
-            var list = new List<string>();
-            foreach (var value in values)
-            {
-                list.AddRange(value.Split(',', StringSplitOptions.RemoveEmptyEntries));
-            }
-
-            return list;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.Delete.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.Delete.cs
new file mode 100644
index 00000000..0e8cce16
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.Delete.cs
@@ -0,0 +1,97 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+public abstract partial class WebApi<TResult>
+{
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Delete"/> operation.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The resulting <see cref="HttpStatusCode"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> DeleteAsync(HttpRequest request, Func<WebApiOptions, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => DeleteWithResultAsync(request, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Delete"/> operation.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The resulting <see cref="HttpStatusCode"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> DeleteWithResultAsync(HttpRequest request, Func<WebApiOptions, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Delete]);
+        function.ThrowIfNull();
+
+        TResult CreateStatusResult(WebApiOptions ro) => CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode });
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiOptions(request).WithOperationType(OperationType.Delete).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            try
+            {
+                var result = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(DeleteAsync)}::{nameof(function)}").ConfigureAwait(false);
+
+                if (result.IsFailure)
+                {
+                    if (ConvertNotfoundToDefaultStatusCodeOnDelete && result.IsNotFoundError)
+                        return CreateStatusResult(ro);
+                    else
+                        return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = result.Error });
+                }
+                else
+                    return CreateStatusResult(ro);
+            }
+            catch (NotFoundException) when (ConvertNotfoundToDefaultStatusCodeOnDelete)
+            {
+                return CreateStatusResult(ro);
+            }
+        }, cancellationToken, nameof(DeleteAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Delete"/> operation with a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    /// <remarks>The <see cref="WebApiBase.ConvertNotfoundToDefaultStatusCodeOnDelete"/> is not applicable for this method.</remarks>
+    public Task<TResult> DeleteAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.OK, CancellationToken cancellationToken = default)
+        => DeleteWithResultAsync<TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Delete"/> operation with a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    /// <remarks>The <see cref="WebApiBase.ConvertNotfoundToDefaultStatusCodeOnDelete"/> is not applicable for this method.</remarks>
+    public async Task<TResult> DeleteWithResultAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Delete]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiResponseOptions<TResponse>(request).WithOperationType(OperationType.Delete).WithStatusCode(statusCode);
+
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(DeleteAsync)}::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(DeleteAsync));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.Get.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.Get.cs
new file mode 100644
index 00000000..04bdbc7f
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.Get.cs
@@ -0,0 +1,45 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+public abstract partial class WebApi<TResult>
+{
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Get"/> (and <see cref="HttpMethods.Head"/>) operation returning a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <see langword="null"/>.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    /// <remarks>This <see cref="GetAsync"/> also handles a <see cref="HttpMethods.Head"/> and responds accordingly.</remarks>
+    public Task<TResult> GetAsync<TResponse>(HttpRequest request, Func<WebApiOptionsBase, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NotFound, CancellationToken cancellationToken = default)
+        => GetWithResultAsync<TResponse>(request, async (ro, ct) => { var rv = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(rv); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Get"/> (and <see cref="HttpMethods.Head"/>) operation returning a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <see langword="null"/>.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    /// <remarks>This <see cref="GetAsync"/> also handles a <see cref="HttpMethods.Head"/> and responds accordingly.</remarks>
+    public async Task<TResult> GetWithResultAsync<TResponse>(HttpRequest request, Func<WebApiOptionsBase, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NotFound, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Get, HttpMethods.Head]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiResponseOptions<TResponse>(request).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var result = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(GetAsync)}::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, result));
+        }, cancellationToken, nameof(GetAsync)).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.MergePatch.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.MergePatch.cs
new file mode 100644
index 00000000..bcd78e09
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.MergePatch.cs
@@ -0,0 +1,105 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+public abstract partial class WebApi<TResult>
+{
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response <typeparamref name="TValue"/>.
+    /// </summary>
+    /// <typeparam name="TValue">The request and response value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="get">The function to execute the <i>get</i> to retrieve the value to patch into. Where this returns a <see langword="null"/> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
+    /// <param name="put">The function to execute the <i>put</i> to replace (update) the patched value.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync<TValue>(HttpRequest request, Func<WebApiResponseOptions<TValue>, CancellationToken, Task<TValue?>> get, Func<WebApiRequestResponseOptions<TValue, TValue>, CancellationToken, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync<TValue>(request,
+            async (ro, ct) => Result.Ok(await get(ro, ct).ConfigureAwait(false)),
+            async (ro, ct) => Result.Ok(await put(ro, ct).ConfigureAwait(false)),
+            statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response <typeparamref name="TValue"/>.
+    /// </summary>
+    /// <typeparam name="TValue">The request and response value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="get">The function to execute the <i>get</i> to retrieve the value to patch into. Where this returns a <see langword="null"/> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
+    /// <param name="put">The function to execute the <i>put</i> to replace (update) the patched value.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync<TValue>(HttpRequest request, Func<WebApiResponseOptions<TValue>, CancellationToken, Task<Result<TValue?>>> get, Func<WebApiRequestResponseOptions<TValue, TValue>, CancellationToken, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        get.ThrowIfNull();
+        put.ThrowIfNull();
+
+        TResult RequiredErrorResult() => CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = Validation.Validation.CreateRequiredValueResult<Result>().Error });
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            // Make sure that only the supported content types are used.
+            var hct = request.GetTypedHeaders()?.ContentType?.MediaType.Value;
+            if (StringComparer.OrdinalIgnoreCase.Compare(hct, HttpNames.MergePatchJsonMediaTypeName) != 0)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response)
+                {
+                    StatusCode = HttpStatusCode.UnsupportedMediaType,
+                    ContentType = MediaTypeNames.Text.Plain,
+                    Content = $"Unsupported '{HeaderNames.ContentType}' for an HTTP {HttpMethods.Patch}; only JSON Merge Patch is supported using either: '{HttpNames.MergePatchJsonMediaTypeName}' or '{MediaTypeNames.Application.Json}'."
+                });
+
+            // Get the JSON merge content.
+            if (request.ContentLength is null || request.ContentLength == 0)
+                return RequiredErrorResult();
+
+            var content = await BinaryData.FromStreamAsync(request.Body, cancellationToken).ConfigureAwait(false);
+            if (content.IsEmpty)
+                return RequiredErrorResult();
+
+            // Invokes the Merge which also includes the get function execution.
+            var gro = new WebApiResponseOptions<TValue>(request).WithOperationType(OperationType.Get).WithStatusCode(statusCode);
+            if (gro.IsInError(out var gror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = gror.Error });
+
+            var mpr = await JsonMergePatch.MergeWithResultAsync(content, async ct =>
+            {
+                // Perform the get operation to retrieve the current value.
+                return Result.Go(await _invoker.InvokeAsync(this, async (_, cancellationToken) => await get(gro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(PatchAsync)}::{nameof(get)}").ConfigureAwait(false))
+                    .Then(gv => 
+                    {
+                        if (gv is null || gv is not IReadOnlyETag etag)
+                            return gv;
+
+                        // Where there is etag support and it is null (assumes auto-generation) then generate; and finally compare etag for a match.
+                        //ETag.Compare(gro.ETag, etag.ETag ?? ETag.Generate(gv, JsonSerializerOptions));
+                        if (gro.ETag != (etag.ETag ?? ETag.Generate(gv, JsonSerializerOptions)))
+                            return Result.ConcurrencyError();
+
+                        return gv;
+                    });
+            }, cancellationToken).ConfigureAwait(false);
+
+            // Value is not good so error out.
+            if (mpr.IsFailure)
+            {
+                if (mpr.Error is IExtendedException)
+                    return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = mpr.Error });
+                else
+                    return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = Validation.Validation.CreateInvalidValueResult<Result>(mpr.Error.Message).Error });
+            }
+
+            // Value is not found so error out.
+            if (mpr.Value.Merged is null)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = new NotFoundException() });
+
+            // No change so return the get value as-is.
+            if (!mpr.Value.HasChanges)
+                return CreateResult(CreateContentForValue(gro, mpr.Value.Merged));
+
+            // Finish by performing the put operation with the changed value.
+            var pro = new WebApiRequestResponseOptions<TValue, TValue>(gro, mpr.Value.Merged).WithOperationType(OperationType.Update);
+            var value = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await put(pro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(PatchAsync)}::{nameof(put)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(pro, value));
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.Patch.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.Patch.cs
new file mode 100644
index 00000000..d44b870e
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.Patch.cs
@@ -0,0 +1,261 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+public abstract partial class WebApi<TResult>
+{
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with no request content or response value.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync(HttpRequest request, Func<WebApiOptions, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync(request, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with no request content or response value.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync(HttpRequest request, Func<WebApiOptions, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiOptions(request).WithOperationType(OperationType.Create).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Patch)}Async::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync<TRequest>(HttpRequest request, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync<TRequest>(request, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync<TRequest>(HttpRequest request, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var vr = await GetRequestValueAsync<TRequest>(request, cancellationToken).ConfigureAwait(false);
+            if (vr.IsFailure)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = vr.Error });
+
+            var ro = new WebApiRequestOptions<TRequest>(request, vr.Value).WithOperationType(OperationType.Create).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Patch)}Async::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with the specified request <paramref name="value"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync<TRequest>(HttpRequest request, TRequest value, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync(request, value, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with the specified request <paramref name="value"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync<TRequest>(HttpRequest request, TRequest value, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiRequestOptions<TRequest>(request, value).WithOperationType(OperationType.Create).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Patch)}Async::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync<TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiResponseOptions<TResponse>(request).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Patch)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync<TRequest, TResponse>(HttpRequest request, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync<TRequest, TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync<TRequest, TResponse>(HttpRequest request, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var vr = await GetRequestValueAsync<TRequest>(request, cancellationToken).ConfigureAwait(false);
+            if (vr.IsFailure)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = vr.Error });
+
+            var ro = new WebApiRequestResponseOptions<TRequest, TResponse>(request, vr.Value).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Patch)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with the specified request <paramref name="value"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PatchAsync<TRequest, TResponse>(HttpRequest request, TRequest value, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PatchWithResultAsync<TRequest, TResponse>(request, value, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Patch"/> operation with the specified request <paramref name="value"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PatchWithResultAsync<TRequest, TResponse>(HttpRequest request, TRequest value, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Patch]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiRequestResponseOptions<TRequest, TResponse>(request, value).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Patch)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.Post.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.Post.cs
new file mode 100644
index 00000000..34200fe2
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.Post.cs
@@ -0,0 +1,261 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+public abstract partial class WebApi<TResult>
+{
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with no request content or response value.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PostAsync(HttpRequest request, Func<WebApiOptions, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PostWithResultAsync(request, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with no request content or response value.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PostWithResultAsync(HttpRequest request, Func<WebApiOptions, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Post]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiOptions(request).WithOperationType(OperationType.Create).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Post)}Async::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode, Headers = new WebApiHeader { Location = ro.LocationUri?.Invoke() } });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PostAsync<TRequest>(HttpRequest request, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PostWithResultAsync<TRequest>(request, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PostWithResultAsync<TRequest>(HttpRequest request, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Post]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var vr = await GetRequestValueAsync<TRequest>(request, cancellationToken).ConfigureAwait(false);
+            if (vr.IsFailure)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = vr.Error });
+
+            var ro = new WebApiRequestOptions<TRequest>(request, vr.Value).WithOperationType(OperationType.Create).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Post)}Async::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode, Headers = new WebApiHeader { Location = ro.LocationUri?.Invoke() } });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with the specified request <paramref name="value"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PostAsync<TRequest>(HttpRequest request, TRequest value, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PostWithResultAsync(request, value, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with the specified request <paramref name="value"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PostWithResultAsync<TRequest>(HttpRequest request, TRequest value, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Post]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiRequestOptions<TRequest>(request, value).WithOperationType(OperationType.Create).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Post)}Async::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode, Headers = new WebApiHeader { Location = ro.LocationUri?.Invoke() } });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PostAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PostWithResultAsync<TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PostWithResultAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Post]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiResponseOptions<TResponse>(request).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Post)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PostAsync<TRequest, TResponse>(HttpRequest request, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PostWithResultAsync<TRequest, TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PostWithResultAsync<TRequest, TResponse>(HttpRequest request, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Post]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var vr = await GetRequestValueAsync<TRequest>(request, cancellationToken).ConfigureAwait(false);
+            if (vr.IsFailure)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = vr.Error });
+
+            var ro = new WebApiRequestResponseOptions<TRequest, TResponse>(request, vr.Value).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Post)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with the specified request <paramref name="value"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PostAsync<TRequest, TResponse>(HttpRequest request, TRequest value, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PostWithResultAsync<TRequest, TResponse>(request, value, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Post"/> operation with the specified request <paramref name="value"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PostWithResultAsync<TRequest, TResponse>(HttpRequest request, TRequest value, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.Created,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Post]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiRequestResponseOptions<TRequest, TResponse>(request, value).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Post)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.Put.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.Put.cs
new file mode 100644
index 00000000..29626af3
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.Put.cs
@@ -0,0 +1,223 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+public abstract partial class WebApi<TResult>
+{
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PutAsync<TRequest>(HttpRequest request, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PutWithResultAsync<TRequest>(request, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PutWithResultAsync<TRequest>(HttpRequest request, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Put]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var vr = await GetRequestValueAsync<TRequest>(request, cancellationToken).ConfigureAwait(false);
+            if (vr.IsFailure)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = vr.Error });
+
+            var ro = new WebApiRequestOptions<TRequest>(request, vr.Value).WithOperationType(OperationType.Update).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(PutAsync)}::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with the specified request <paramref name="value"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PutAsync<TRequest>(HttpRequest request, TRequest value, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PutWithResultAsync<TRequest>(request, value, async (ro, ct) => { await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Success; }, statusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with the specified request <paramref name="value"/> and no corresponding response value.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PutWithResultAsync<TRequest>(HttpRequest request, TRequest value, Func<WebApiRequestOptions<TRequest>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Put]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiRequestOptions<TRequest>(request, value).WithOperationType(OperationType.Update).WithStatusCode(statusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(PutAsync)}::{nameof(function)}").ConfigureAwait(false);
+            if (fr.IsSuccess)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { StatusCode = ro.StatusCode });
+            else
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = fr.Error });
+        }, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PutAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PutWithResultAsync<TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PutWithResultAsync<TResponse>(HttpRequest request, Func<WebApiResponseOptions<TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Put]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiResponseOptions<TResponse>(request).WithOperationType(OperationType.Create).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var fr = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(HttpMethods.Put)}Async::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, fr));
+        }, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PutAsync<TRequest, TResponse>(HttpRequest request, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PutWithResultAsync<TRequest, TResponse>(request, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TRequest"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PutWithResultAsync<TRequest, TResponse>(HttpRequest request, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Put]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var vr = await GetRequestValueAsync<TRequest>(request, cancellationToken).ConfigureAwait(false);
+            if (vr.IsFailure)
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = vr.Error });
+
+            var ro = new WebApiRequestResponseOptions<TRequest, TResponse>(request, vr.Value).WithOperationType(OperationType.Update).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var result = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(PutAsync)}::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, result));
+        }, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with the specified request <paramref name="value"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public Task<TResult> PutAsync<TRequest, TResponse>(HttpRequest request, TRequest value, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<TResponse>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+        => PutWithResultAsync<TRequest, TResponse>(request, value, async (ro, ct) => { var r = await function.ThrowIfNull()(ro, ct).ConfigureAwait(false); return Result.Ok(r); }, statusCode, alternateStatusCode, cancellationToken);
+
+    /// <summary>
+    /// Performs a <see cref="HttpMethods.Put"/> operation with the specified request <paramref name="value"/> and a response of <see cref="Type"/> <typeparamref name="TResponse"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TResponse">The response result <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The value (already deserialized).</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
+    /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <see langword="null"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <typeparamref name="TResult"/>.</returns>
+    public async Task<TResult> PutWithResultAsync<TRequest, TResponse>(HttpRequest request, TRequest value, Func<WebApiRequestResponseOptions<TRequest, TResponse>, CancellationToken, Task<Result<TResponse>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
+        HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, CancellationToken cancellationToken = default)
+    {
+        CheckRequest(request, [HttpMethods.Put]);
+        function.ThrowIfNull();
+
+        return await InvokeAsync(request, async cancellationToken =>
+        {
+            var ro = new WebApiRequestResponseOptions<TRequest, TResponse>(request, value).WithOperationType(OperationType.Update).WithStatusCode(statusCode).WithAlternateStatusCode(alternateStatusCode);
+            if (ro.IsInError(out var ror))
+                return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ror.Error });
+
+            var result = await _invoker.InvokeAsync(this, async (_, cancellationToken) => await function(ro, cancellationToken).ConfigureAwait(false), cancellationToken, $"{nameof(PutAsync)}::{nameof(function)}").ConfigureAwait(false);
+            return CreateResult(CreateContentForValue(ro, result));
+        }, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApi.cs b/src/CoreEx.AspNetCore/Abstractions/WebApi.cs
new file mode 100644
index 00000000..a10cf847
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApi.cs
@@ -0,0 +1,220 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Provides the base ASP.NET Core Web API capabilities to enable both MVC and HTTP <typeparamref name="TResult"/> support in a consistent manner.
+/// </summary>
+/// <typeparam name="TResult">The ASP.NET Core result <see cref="Type"/>.</typeparam>
+/// <param name="invoker">The <see cref="WebApiInvoker{TResult}"/>.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/> for the <see cref="WebApi{TResult}"/>.</param>
+/// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+/// <remarks>The <see cref="HttpMethods.Get"/> methods within can also be used for a <see cref="HttpMethods.Head"/> as it is essentially the same operation without a corresponding response; this distinction is handled internally.</remarks>
+public abstract partial class WebApi<TResult>(WebApiInvoker<TResult> invoker, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<WebApi<TResult>>? logger = null, ExecutionContext? executionContext = null)
+    : WebApiBase(jsonSerializerOptions, logger, executionContext)
+{
+    private const string _requestBodyErrorType = "request-body";
+    private static readonly LText _requestBodyRequiredText = new("CoreEx.AspNetCore.WebApi.RequestBodyRequired", "Request body is required.");
+    private static readonly LText _requestBodyInvalidText = new("CoreEx.AspNetCore.WebApi.RequestBodyInvalid", "Request body is invalid: {0}");
+
+    private readonly WebApiInvoker<TResult> _invoker = invoker.ThrowIfNull();
+
+    /// <summary>
+    /// Invokes the <paramref name="function"/> asynchronously performing standardized execution.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="function">The function to execute.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    protected async Task<TResult> InvokeAsync(HttpRequest request, Func<CancellationToken, Task<TResult>> function, CancellationToken cancellationToken, [CallerMemberName] string? memberName = null) => await _invoker.InvokeAsync(this, async (_, cancellationToken) =>
+    {
+        try
+        {
+            var result = await function(cancellationToken).ConfigureAwait(false);
+            if (ExecutionContext.TryGetCurrent(out var ec))
+                ExecutionContextMiddleware.AddMessagesHeader(request.HttpContext, ec);
+
+            return result;
+        }
+        catch (Exception ex) when (ex is IExtendedException eex && eex.IsError)
+        {
+            return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ex });
+        }
+        catch (Exception ex) when (ConvertUnhandledExceptionsToProblemDetails)
+        {
+            return CreateResult(new WebApiResult<TResult>(request.HttpContext.Response) { Exception = ex });
+        }
+    }, cancellationToken, memberName).ConfigureAwait(false);
+
+    /// <summary>
+    /// Creates the corresponding <see cref="WebApi{TResult}"/> for the <paramref name="value"/>, etc.
+    /// </summary>
+    private WebApiResult<TResult> CreateContentForValue<T>(WebApiOptionsBase options, T value, WebApiPagingResult? paging = null, MessageItemCollection? messages = null)
+    {
+        options.ThrowIfNull();
+
+        // Where null then use the alternate status code.
+        if (value is null)
+        {
+            return options.AlternateStatusCode.HasValue 
+                ? new WebApiResult<TResult>(options.Request.HttpContext.Response) { StatusCode = options.AlternateStatusCode.Value, Exception = OnConvertAlternateStatusCodeToException(options.AlternateStatusCode.Value) } 
+                : throw new InvalidOperationException("Function has not returned a result; no AlternateStatusCode has been configured to return.");
+        }
+
+        // Where already a TResult then return as-is.
+        if (value is TResult tr)
+            return new WebApiResult<TResult>(options.Request.HttpContext.Response) { Result = tr };
+
+        // Special case when is railway-oriented IResult, as it is the underlying Value or Exception that is to be processed.
+        if (value is Results.Abstractions.IResult r)
+        {
+            if (r.IsFailure)
+                return new WebApiResult<TResult>(options.Request.HttpContext.Response) { Exception = r.Error! };
+            else
+                return CreateContentForValue(options, r.Value, paging, messages);
+        }
+
+        // Special case when IItemsResult, as it is the Items only that is to be serialized and returned.
+        if (value is IItemsResult itemsResult)
+        {
+            var wpr = itemsResult.Paging is null ? null : new WebApiPagingResult(itemsResult.Paging, itemsResult.Items is null ? 0 : itemsResult.GetItemsCount());
+            return CreateContentForValue(options, itemsResult.Items ?? Array.Empty<object?>(), wpr, messages);
+        }
+
+        // Special case when IValueResult, as it is the underlying Value and StatusCode that is to be serialized and returned.
+        if (value is IValueResult valueResult)
+        {
+            if (valueResult.StatusCode.HasValue)
+                options.StatusCode = valueResult.StatusCode.Value;
+
+            return CreateContentForValue(options, valueResult.Value, paging, messages);
+        }
+
+        // Where there is mutable etag support and it is null (assumes auto-generation) then generate from the full value JSON contents as the baseline value.
+        if (value is IETag etag && etag.ETag is null)
+            etag.ETag = ETag.Generate(value, JsonSerializerOptions);
+
+        // Serialize the value and perform any field selection/filtering as per the request options where specified.
+        string json;
+        if (options.IncludeFields is not null && options.IncludeFields.Count > 0)
+            JsonFilter.TryFilter(value, options.IncludeFields, out json, JsonFilterOption.Include, JsonSerializerOptions);
+        else if (options.ExcludeFields is not null && options.ExcludeFields.Count > 0)
+            JsonFilter.TryFilter(value, options.ExcludeFields, out json, JsonFilterOption.Exclude, JsonSerializerOptions);
+        else
+            json = JsonSerializer.Serialize(value, JsonSerializerOptions);
+
+        // Determine final etag - where the query string is provided this may affect the ETag and should be included in the hash as such; i.e. paging, filtering, fields, etc.
+        var getag = options.HasQueryString
+            ? Entities.ETag.Generate(json, options.Request.QueryString.ToString())
+            : value is IReadOnlyETag vetag && vetag.ETag is not null ? vetag.ETag : ETag.Generate(json);
+
+        // Where the request is a GET or HEAD and the ETag matches then return a 304 Not Modified.
+        if (options.ETag is not null && (HttpMethods.IsGet(options.Request.Method) || HttpMethods.IsHead(options.Request.Method)) && options.ETag == getag)
+            return new WebApiResult<TResult>(options.Request.HttpContext.Response)
+            {
+                StatusCode = HttpStatusCode.NotModified,
+                Headers = new WebApiHeader { ETag = getag }
+            };
+
+        // Create the location value where applicable.
+        var location = options is IWebApiResponseOptions lro ? lro.CreateLocationUri(value) : null;
+
+        // Handle the HEAD request where no content is returned.
+        if (HttpMethods.IsHead(options.Request.Method))
+            return new WebApiResult<TResult>(options.Request.HttpContext.Response)
+            {
+                StatusCode = options.StatusCode,
+                Headers = new WebApiHeader { ETag = getag, Location = location }
+            };
+
+        // All others should return content.
+        return new WebApiResult<TResult>(options.Request.HttpContext.Response)
+        {
+            Content = json,
+            ContentType = MediaTypeNames.Application.Json,
+            StatusCode = options.StatusCode,
+            Headers = new WebApiHeader
+            {
+                ETag = getag,
+                Location = location,
+                PagingResult = paging
+            }
+        };
+    }
+
+    /// <summary>
+    /// Creates a <typeparamref name="TResult"/> for the specified <see cref="WebApiResult{TResult}"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="WebApiResult{TResult}"/>.</param>
+    /// <returns>The content <typeparamref name="TResult"/>.</returns>
+    internal abstract TResult CreateResult(WebApiResult<TResult> result);
+
+    /// <summary>
+    /// Gets the <typeparamref name="TRequest"/> value from the <see cref="HttpRequest"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request JSON content value <see cref="Type"/>.</typeparam>
+    /// <param name="request">The <see cref="HttpResponse"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
+    protected async Task<Result<TRequest?>> GetRequestValueAsync<TRequest>(HttpRequest request, CancellationToken cancellationToken)
+    {
+        if (request.ContentLength == 0)
+            return new ValidationException(_requestBodyRequiredText).WithErrorType(_requestBodyErrorType);
+
+        try
+        {
+            return await request.ReadFromJsonAsync<TRequest>(JsonSerializerOptions, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            return new ValidationException(_requestBodyInvalidText.WithArgs(ex.Message)).WithErrorType(_requestBodyErrorType);
+        }
+    }
+
+    /// <summary>
+    /// Creates the <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/> extensions for the <paramref name="exception"/>.
+    /// </summary>
+    /// <param name="exception">The <see cref="IExtendedException"/>.</param>
+    /// <returns>The <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails.Extensions"/>.</returns>
+    protected IDictionary<string, object?> CreateProblemDetailsExtensions(IExtendedException? exception)
+    {
+        var ext = new Dictionary<string, object?>();
+
+        if (exception is not null)
+        {
+            if (exception.ErrorType is not null)
+                ext.Add(HttpNames.ErrorTypeName, exception.ErrorType);
+
+            if (exception.ErrorCode is not null)
+                ext.Add(HttpNames.ErrorCodeName, exception.ErrorCode);
+        }
+
+        if (Activity.Current is not null)
+            ext.Add(HttpNames.TraceIdName, Activity.Current.Id);
+
+        return ext;
+    }
+
+    /// <summary>
+    /// Provides the ability to convert an alternate <see cref="HttpStatusCode"/> to an <see cref="Exception"/> (where required).
+    /// </summary>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/>.</param>
+    /// <returns>The resulting <see cref="Exception"/> where applicable; otherwise, <see langword="null"/> indicating no conversion required.</returns>
+    /// <remarks>Attempts to convert all known error (>= 400) <paramref name="statusCode"/> values to their <see cref="IExtendedException"/> equivalents; otherwise, defaults to an <see cref="UnexpectedInternalException"/>.</remarks>
+    protected virtual Exception? OnConvertAlternateStatusCodeToException(HttpStatusCode statusCode)
+    {
+        if ((int)statusCode < 400)
+            return null;
+
+        return (int)statusCode switch
+        {
+            (int)HttpStatusCode.Unauthorized => new AuthenticationException(),
+            (int)HttpStatusCode.Forbidden => new AuthorizationException(),
+            (int)HttpStatusCode.BadRequest => new ValidationException(),
+            (int)HttpStatusCode.PreconditionFailed => new ConcurrencyException(),
+            (int)HttpStatusCode.Conflict => new ConflictException(),
+            (int)HttpStatusCode.NotFound => new NotFoundException(),
+            (int)HttpStatusCode.ServiceUnavailable => new TransientException(),
+            _ => new UnexpectedInternalException { StatusCode = statusCode },
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApiBase.cs b/src/CoreEx.AspNetCore/Abstractions/WebApiBase.cs
new file mode 100644
index 00000000..c5e81c09
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApiBase.cs
@@ -0,0 +1,74 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Provides the base ASP.NET Core Web API capabilities to enable both MVC and HTTP support in a consistent manner.
+/// </summary>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/> for the <see cref="WebApiBase"/>.</param>
+/// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+public abstract class WebApiBase(JsonSerializerOptions? jsonSerializerOptions = null, ILogger? logger = null, ExecutionContext? executionContext = null)
+{
+    private JsonMergePatch? _jsonMergePatch;
+
+    /// <summary>
+    /// The configuration name to indicate whether to include exception details in the <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/>.
+    /// </summary>
+    protected const string IncludeExceptionInProblemDetailsName = "CoreEx:IncludeExceptionInProblemDetails";
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    public ILogger? Logger { get; } = logger;
+
+    /// <summary>
+    /// Gets the <see cref="CoreEx.ExecutionContext"/>.
+    /// </summary>
+    public ExecutionContext? ExecutionContext { get; } = executionContext;
+
+    /// <summary>
+    /// Gets the <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="JsonDefaults.SerializerOptions"/>.</remarks>
+    public JsonSerializerOptions JsonSerializerOptions { get; set; } = jsonSerializerOptions ?? JsonDefaults.SerializerOptions;
+
+    /// <summary>
+    /// Indicates whether to convert a <see cref="NotFoundException"/> to the default <see cref="HttpStatusCode"/> on <see cref="HttpMethods.Delete"/>.
+    /// </summary>
+    public bool ConvertNotfoundToDefaultStatusCodeOnDelete { get; } = true;
+
+    /// <summary>
+    /// Indicates whether to convert unhandled exceptions to <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/>; otherwise, allow to bubble up for middleware to handle.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/> to allow the middleware to handle unhandled exceptions in a consistent/standardized manner.</remarks>
+    public bool ConvertUnhandledExceptionsToProblemDetails { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the optional <see cref="JsonMergePatch"/>.
+    /// </summary>
+    public JsonMergePatch JsonMergePatch { get => _jsonMergePatch ??= new JsonMergePatch(new JsonMergePatchOptions(JsonSerializerOptions)); set => _jsonMergePatch = value; }
+
+    /// <summary>
+    /// Indicates whether to use absolute paths versus relative in the likes of response headers, etc.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/> indicates the use of <i>relative</i> paths.</remarks>
+    public bool UseAbsolutePaths { get; set; } = false;
+
+    /// <summary>
+    /// Check the <paramref name="request"/> to ensure valid to continue.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequest"/>.</param>
+    /// <param name="expectedmethods">The expected <see cref="HttpMethod"/> names.</param>
+    /// <param name="memberName">The calling member name to include in any resulting <see cref="ArgumentException"/>.</param>
+    protected static void CheckRequest([NotNull] HttpRequest request, string[] expectedmethods, [CallerMemberName] string? memberName = null)
+    {
+        request.ThrowIfNull();
+
+        foreach (var em in expectedmethods)
+        {
+            if (HttpMethods.Equals(request.Method, em))
+                return;
+        }
+
+        throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{string.Join(", ", expectedmethods)}' to use {memberName ?? "??"}.", nameof(request));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApiHeader.cs b/src/CoreEx.AspNetCore/Abstractions/WebApiHeader.cs
new file mode 100644
index 00000000..825bffb5
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApiHeader.cs
@@ -0,0 +1,141 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Provides the standard <see cref="HttpResponse"/> headers specification and corresponding <see cref="ApplyTo"/>.
+/// </summary>
+internal readonly struct WebApiHeader
+{
+    /// <summary>
+    /// Gets or sets the <see cref="IHeaderDictionary"/> for additional ad-hoc <see cref="HttpResponse"/> headers.
+    /// </summary>
+    public IHeaderDictionary? Headers { get; init; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.
+    /// </summary>
+    public Uri? Location { get; init; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="TimeSpan"/> for the <see cref="System.Net.Http.Headers.RetryConditionHeaderValue"/>.
+    /// </summary>
+    public TimeSpan? RetryAfter { get; init; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReadOnlyETag.ETag"/> value.
+    /// </summary>
+    public string? ETag { get; init; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="WebApiPagingResult"/>.
+    /// </summary>
+    public WebApiPagingResult? PagingResult { get; init; }
+
+    /// <summary>
+    /// Applies the <see cref="WebApiHeader"/> to the <see cref="HttpResponse"/>.
+    /// </summary>
+    /// <param name="webApi">The <see cref="WebApiBase"/>.</param>
+    /// <param name="httpResponse">The <see cref="HttpResponse"/>.</param>
+    public void ApplyTo(WebApiBase webApi, HttpResponse httpResponse)
+    {
+        var headers = httpResponse.GetTypedHeaders();
+        if (ETag is not null)
+            headers.ETag = new EntityTagHeaderValue(Entities.ETag.FormatETag(ETag), true);
+
+        if (Location is not null)
+            headers.Location = Location;
+
+        if (RetryAfter.HasValue)
+            httpResponse.Headers.Append(HeaderNames.RetryAfter, new System.Net.Http.Headers.RetryConditionHeaderValue(RetryAfter.Value).ToString());
+
+        if (Headers is not null && Headers.Count > 0)
+        {
+            foreach (var header in Headers)
+            {
+                httpResponse.Headers.Append(header.Key, header.Value);
+            }
+        }
+
+        if (PagingResult is not null)
+        {
+            httpResponse.Headers.Append(HttpNames.PagingSkipHeaderName, PagingResult.Skip.ToString());
+            httpResponse.Headers.Append(HttpNames.PagingTakeHeaderName, PagingResult.Take.ToString());
+            if (PagingResult.TotalCount.HasValue)
+                httpResponse.Headers.Append(HttpNames.PagingTotalCountHeaderName, PagingResult.TotalCount.Value.ToString());
+
+            ApplyPagingPrevAndNextLinks(webApi, httpResponse);
+        }
+    }
+
+    /// <summary>
+    /// Applies the previous and next links to the <see cref="HttpResponse"/>.
+    /// </summary>
+    private void ApplyPagingPrevAndNextLinks(WebApiBase webApi, HttpResponse httpResponse)
+    {
+        // Get the orginating URI without query string.
+        var url = webApi.UseAbsolutePaths
+            ? UriHelper.BuildAbsolute(httpResponse.HttpContext.Request.Scheme, httpResponse.HttpContext.Request.Host, httpResponse.HttpContext.Request.PathBase, httpResponse.HttpContext.Request.Path)
+            : UriHelper.BuildRelative(httpResponse.HttpContext.Request.PathBase, httpResponse.HttpContext.Request.Path);
+
+        QueryString qs;
+        PagingArgs? pa = PagingResult?.GetPreviousPage();
+        if (pa is not null)
+        {
+            qs = RebuildPagingLinkQueryString(httpResponse, pa);
+            httpResponse.Headers.Append("Link", $"<{url}{qs}>; rel=\"prev\"");
+        }
+
+        pa = PagingResult?.GetNextPage();
+        if (pa is not null)
+        {
+            qs = RebuildPagingLinkQueryString(httpResponse, pa);
+            httpResponse.Headers.Append("Link", $"<{url}{qs}>; rel=\"next\"");
+        }
+    }
+
+    /// <summary>
+    /// Rebuild the originating request query string with the updated paging args.
+    /// </summary>
+    private static QueryString RebuildPagingLinkQueryString(HttpResponse httpResponse, PagingArgs paging)
+    {
+        var ps = false;
+        var pt = false;
+        var qs = new QueryString();
+
+        foreach (var item in httpResponse.HttpContext.Request.Query)
+        {
+            if (item.Key.Equals(HttpNames.PagingSkipQueryStringName, StringComparison.OrdinalIgnoreCase))
+            {
+                ps = true;
+                qs = qs.Add(HttpNames.PagingSkipQueryStringName, paging.Skip.ToString("D"));
+            }
+            else if (item.Key.Equals(HttpNames.PagingTakeQueryStringName, StringComparison.OrdinalIgnoreCase))
+            {
+                pt = true;
+                qs = qs.Add(HttpNames.PagingTakeQueryStringName, paging.Take.ToString("D"));
+            }
+            else
+            {
+                if (item.Value.Count == 0)
+                    qs = qs.Add(new QueryString($"?{item.Key}"));
+                else
+                {
+                    foreach (var value in item.Value)
+                    {
+                        if (string.IsNullOrEmpty(value))
+                            qs = qs.Add(new QueryString($"?{item.Key}"));
+                        else
+                            qs = qs.Add(item.Key, value);
+                    }
+                }
+            }
+        }
+
+        if (!ps)
+            qs = qs.Add(HttpNames.PagingSkipQueryStringName, paging.Skip.ToString("D"));
+
+        if (!pt)
+            qs = qs.Add(HttpNames.PagingTakeQueryStringName, paging.Take.ToString("D"));
+
+        return qs;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApiInvoker.cs b/src/CoreEx.AspNetCore/Abstractions/WebApiInvoker.cs
new file mode 100644
index 00000000..b3d433b9
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApiInvoker.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Provides the base <see cref="WebApi{TResult}"/> invoker.
+/// </summary>
+/// <typeparam name="TResult">The ASP.NET Core result <see cref="Type"/>.</typeparam>
+public abstract class WebApiInvoker<TResult> : InvokerBase<WebApi<TResult>> { }
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApiOptionsBase.cs b/src/CoreEx.AspNetCore/Abstractions/WebApiOptionsBase.cs
new file mode 100644
index 00000000..092016ad
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApiOptionsBase.cs
@@ -0,0 +1,265 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Represents the base <see cref="WebApi{TResult}"/> options.
+/// </summary>
+public class WebApiOptionsBase 
+{
+    private QueryArgs? _queryArgs;
+    private PagingArgs? _pagingArgs;
+    private bool _attemptedIncludeFields;
+    private bool _attemptedExcludeFields;
+    private List<string>? _includeFields;
+    private List<string>? _excludeFields;
+    private bool? _isIncludeRelatedText;
+    private bool? _isIncludeInactive;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiOptions"/> class.
+    /// </summary>
+    /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
+    internal WebApiOptionsBase(HttpRequest httpRequest)
+    {
+        Request = httpRequest.ThrowIfNull();
+        HasQueryString = Request.Query is not null && Request.Query.Count > 0;
+
+        // Get the ETag from the request headers and parse accordingly.
+        StringSegment? etag;
+        var rth = httpRequest.GetTypedHeaders();
+
+        if (HttpMethods.IsGet(httpRequest.Method) || HttpMethods.IsHead(httpRequest.Method))
+            etag = rth.IfNoneMatch.FirstOrDefault()?.Tag;
+        else if (HttpMethods.IsPut(httpRequest.Method) || HttpMethods.IsPatch(httpRequest.Method))
+            etag = rth.IfMatch.FirstOrDefault()?.Tag;
+        else
+            etag = null;
+
+        if (etag is not null && etag.HasValue)
+            ETag = Entities.ETag.ParseETag(etag.Value);
+
+        // Also, check whether the include text query string was specified.
+        if (IsIncludeText && ExecutionContext.TryGetCurrent(out var ec))
+            ec.IncludeRelatedText = true;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiOptions"/> class from an existing instance.
+    /// </summary>
+    /// <param name="options">The <see cref="WebApiOptionsBase"/>.</param>
+    public WebApiOptionsBase(WebApiOptionsBase options)
+    {
+        Request = options.Request;
+        HasQueryString = options.HasQueryString;
+        OperationType = options.OperationType;
+        ETag = options.ETag;
+        StatusCode = options.StatusCode;
+        LocationUri = options.LocationUri;
+
+        _queryArgs = options._queryArgs;
+        _pagingArgs = options._pagingArgs;
+        _attemptedIncludeFields = options._attemptedIncludeFields;
+        _attemptedExcludeFields = options._attemptedExcludeFields;
+        _includeFields = options._includeFields;
+        _excludeFields = options._excludeFields;
+        _isIncludeRelatedText = options._isIncludeRelatedText;
+        _isIncludeInactive = options._isIncludeInactive;
+    }
+
+    /// <summary>
+    /// Gets the originating <see cref="HttpRequest"/>.
+    /// </summary>
+    public HttpRequest Request { get; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="Request"/> has a query string.
+    /// </summary>
+    public bool HasQueryString { get; }
+
+    /// <summary>
+    /// Gets the <see cref="CoreEx.OperationType"/>.
+    /// </summary>
+    /// <remarks>This is used to set (override) the <see cref="ExecutionContext.OperationType"/> per request.</remarks>
+    public OperationType OperationType
+    {
+        get => field;
+
+        internal set
+        {
+            field = value;
+            if (ExecutionContext.TryGetCurrent(out var ec))
+                ec.OperationType = value;
+        }
+    } = OperationType.Unspecified;
+
+    /// <summary>
+    /// Gets the entity tag that was passed; a) <c>If-None-Match</c> header where <see cref="HttpMethod.Get"/>, b) <c>If-Match</c> header where <see cref="HttpMethod.Put"/>, or c) otherwise, <see langword="null"/>.
+    /// </summary>
+    /// <remarks>Represents the underlying raw value; i.e. is stripped of any <c>W/"xxxx"</c> formatting.</remarks>
+    public string? ETag { get; }
+
+    /// <summary>
+    /// Gets the <see cref="HttpStatusCode"/>.
+    /// </summary>
+    public HttpStatusCode StatusCode { get; internal set; }
+
+    /// <summary>
+    /// Gets the alternate <see cref="HttpStatusCode"/>.
+    /// </summary>
+    public HttpStatusCode? AlternateStatusCode { get; internal set; }
+
+    /// <summary>
+    /// Gets the function that will return the <see cref="Uri"/> representing the location of the resource.
+    /// </summary>
+    public Func<Uri>? LocationUri { get; internal set; }
+
+    /// <summary>
+    /// Gets the list of <i>included</i> fields.
+    /// </summary>
+    /// <remarks>The <see cref="IncludeFields"/> and <see cref="ExcludeFields"/> are mutually exclusive.</remarks>
+    public List<string>? IncludeFields
+    {
+        get
+        {
+            if (_includeFields is null && !_attemptedIncludeFields)
+            {
+                _includeFields = GetNamedQueryStrings(Request.Query, HttpNames.IncludeFieldsQueryStringName);
+                _attemptedIncludeFields = true;
+            }
+
+            return _includeFields;
+        }
+    }
+
+    /// <summary>
+    /// Gets the list of <i>excluded</i> fields.
+    /// </summary>
+    /// <remarks>The <see cref="IncludeFields"/> and <see cref="ExcludeFields"/> are mutually exclusive.</remarks>
+    public List<string>? ExcludeFields
+    {
+        get
+        {
+            if (_excludeFields is null && !_attemptedExcludeFields)
+            {
+                _excludeFields = GetNamedQueryStrings(Request.Query, HttpNames.ExcludeFieldsQueryStringName);
+                _attemptedExcludeFields = true;
+            }
+
+            return _excludeFields;
+        }
+    }
+
+    /// <summary>
+    /// Indicates whether <see cref="HttpNames.IncludeTextQueryStringName"/> is specified within the current request to include text(s) where available.
+    /// </summary>
+    public bool IsIncludeText => _isIncludeRelatedText ??= (HasQueryString && ParseBoolValue(GetNamedQueryString(Request.Query, HttpNames.IncludeTextQueryStringName, "true")));
+
+    /// <summary>
+    /// Indicates whether <see cref="HttpNames.IncludeInactiveQueryStringName"/> is specified within the current request to include inactive items for the resulting item(s).
+    /// </summary>
+    public bool IsIncludeInactive => _isIncludeInactive ??= (HasQueryString && ParseBoolValue(GetNamedQueryString(Request.Query, HttpNames.IncludeInactiveQueryStringName, "true")));
+
+    /// <summary>
+    /// Gets the <see cref="QueryArgs"/>.
+    /// </summary>
+    public QueryArgs QueryArgs => _queryArgs ??= GetQueryArgs();
+
+    /// <summary>
+    /// Gets the <see cref="PagingArgs"/>.
+    /// </summary>
+    public PagingArgs PagingArgs => _pagingArgs ??= GetPagingArgs();
+
+    /// <summary>
+    /// Gets the <see cref="QueryArgs"/> from the <see cref="IQueryCollection"/>.
+    /// </summary>
+    private QueryArgs GetQueryArgs()
+    {
+        if (!HasQueryString)
+            return new QueryArgs();
+
+        return new QueryArgs()
+        {
+            Filter = GetNamedQueryString(Request.Query, HttpNames.QueryFilterQueryStringName),
+            OrderBy = GetNamedQueryString(Request.Query, HttpNames.QueryOrderByQueryStringName),
+            IncludeFields = IncludeFields,
+            ExcludeFields = ExcludeFields,
+            IsIncludeText = IsIncludeText,
+            IsIncludeInactive = IsIncludeInactive
+        };
+    }
+
+    /// <summary>
+    /// Gets the <see cref="PagingArgs"/> from the <see cref="IQueryCollection"/>.
+    /// </summary>
+    private PagingArgs GetPagingArgs()
+    {
+        if (!HasQueryString)
+            return PagingArgs.Create();
+
+        string? skip = GetNamedQueryString(Request.Query, HttpNames.PagingSkipQueryStringName);
+        string? take = GetNamedQueryString(Request.Query, HttpNames.PagingTakeQueryStringName);
+        string? count = GetNamedQueryString(Request.Query, HttpNames.PagingCountQueryStringName, "true");
+
+        if (skip is null && take is null && count is null)
+            return PagingArgs.Create();
+
+        return new PagingArgs(ParseInt32Value(skip) ?? 0, ParseInt32Value(take) ?? PagingArgs.DefaultTake, ParseBoolValue(count));
+    }
+
+    /// <summary>
+    /// Parses the value as a <see cref="int"/>.
+    /// </summary>
+    private static int? ParseInt32Value(string? value) => int.TryParse(value, out int val) ? (val < 0 ? null : val) : null;
+
+    /// <summary>
+    /// Parses the value as a <see cref="bool"/>.
+    /// </summary>
+    private static bool ParseBoolValue(string? value) => bool.TryParse(value, out bool val) && val;
+
+    /// <summary>
+    /// Gets the first value for the named query string.
+    /// </summary>
+    private static string? GetNamedQueryString(IQueryCollection query, string name, string? emptyValue = null)
+    {
+        var q = query.FirstOrDefault(x => string.Compare(x.Key, name, StringComparison.OrdinalIgnoreCase) == 0);
+        var val = q.Value.FirstOrDefault();
+        return val is null ? null : (string.IsNullOrEmpty(val) ? emptyValue : val);
+    }
+
+    /// <summary>
+    /// Gets all the named query strings and splits them by comma.
+    /// </summary>
+    private static List<string>? GetNamedQueryStrings(IQueryCollection query, string name)
+    {
+        List<string>? fields = null;
+        foreach (var q in query.Where(x => string.Compare(x.Key, name, StringComparison.OrdinalIgnoreCase) == 0))
+        {
+            foreach (var v in q.Value)
+            {
+                if (v is not null)
+                    (fields ??= []).AddRange(v.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries));
+            }
+        }
+
+        return fields is null || fields.Count == 0 ? null : [.. fields.Distinct()];
+    }
+
+    /// <summary>
+    /// Verifies the request from a <see cref="WebApiOptions"/> perspective; i.e. whether the request is valid for further processing.
+    /// </summary>
+    /// <returns>The <see cref="Result"/>.</returns>
+    /// <remarks>This is intended to verify the semantic request; i.e. the request content and structure, rather than syntactic correctness. For example, whether a <see cref="HttpMethods.Put"/>
+    /// requires an <see cref="HttpRequestHeader.IfMatch"/> (ETag).</remarks>
+    protected internal virtual Result Verify() => Result.Success;
+
+    /// <summary>
+    /// Tries to verify the request from a <see cref="WebApiOptions"/> perspective; i.e. whether the request is valid for further processing.
+    /// </summary>
+    /// <param name="result"></param>
+    /// <returns></returns>
+    internal bool IsInError(out Result result)
+    {
+        var r = Verify();
+        result = r;
+        return r.IsFailure;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApiPagingResult.cs b/src/CoreEx.AspNetCore/Abstractions/WebApiPagingResult.cs
new file mode 100644
index 00000000..adcdce6a
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApiPagingResult.cs
@@ -0,0 +1,57 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Provides a <see cref="PagingResult"/> with the actual <see cref="PagedCount"/>.
+/// </summary>
+internal sealed record class WebApiPagingResult : PagingResult
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiPagingResult"/> class.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingResult"/>.</param>
+    /// <param name="pagedCount">The actual count of the paged elements.</param>
+    public WebApiPagingResult(PagingResult paging, int pagedCount) : base(paging)
+    {
+        WithTotalCount(paging.TotalCount);
+        PagedCount = pagedCount;
+    }
+
+    /// <summary>
+    /// Gets the actual count of the paged elements.
+    /// </summary>
+    public int PagedCount { get; }
+
+    /// <summary>
+    /// Gets the previous <see cref="PagingArgs"/>.
+    /// </summary>
+    /// <returns>The previous <see cref="PagingArgs"/> where applicable; otherwise, <see langword="null"/>.</returns>
+    public PagingArgs? GetPreviousPage()
+    {
+        if (Skip == 0)
+            return null;
+
+        int skip = Skip - Take;
+        if (TotalCount is not null && skip >= TotalCount)
+            skip = (int)TotalCount - Take;
+
+        if (skip < 0)
+            skip = 0;
+
+        return new PagingArgs(skip, Take > Skip ? Skip : Take);
+    }
+
+    /// <summary>
+    /// Gets the next <see cref="PagingArgs"/>.
+    /// </summary>
+    /// <returns>The next <see cref="PagingArgs"/> where applicable; otherwise, <see langword="null"/>.</returns>
+    public PagingArgs? GetNextPage()
+    {
+        if (PagedCount < Take)
+            return null;
+
+        if (TotalCount is not null && (Skip + Take) >= TotalCount)
+            return null;
+
+        return new PagingArgs(Skip + Take, Take);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Abstractions/WebApiResult.cs b/src/CoreEx.AspNetCore/Abstractions/WebApiResult.cs
new file mode 100644
index 00000000..20fefc28
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Abstractions/WebApiResult.cs
@@ -0,0 +1,50 @@
+namespace CoreEx.AspNetCore.Abstractions;
+
+/// <summary>
+/// Represents a result from a Web API operation.
+/// </summary>
+/// <typeparam name="TResult">The ASP.NET Core result <see cref="Type"/>.</typeparam>
+/// <param name="httpResponse">The <see cref="HttpResponse"/>.</param>
+internal readonly record struct WebApiResult<TResult>(HttpResponse httpResponse)
+{
+    /// <summary>
+    /// Gets the <see cref="HttpResponse"/>.
+    /// </summary>
+    public HttpResponse HttpResponse { get; } = httpResponse.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the content.
+    /// </summary>
+    public string? Content { get; init; }
+
+    /// <summary>
+    /// Gets the content type.
+    /// </summary>
+    public string? ContentType { get; init; }
+
+    /// <summary>
+    /// Gets the <see cref="HttpStatusCode"/>.
+    /// </summary>
+    public HttpStatusCode StatusCode { get; init; }
+
+    /// <summary>
+    /// Gets the <see cref="Exception"/>.
+    /// </summary>
+    public Exception? Exception { get; init; }
+
+    /// <summary>
+    /// Indicates whether to bypass exception logging for the <see cref="Exception"/>. 
+    /// </summary>
+    /// <remarks>This is typically used when the exception is already handled and logged, and you want to prevent duplicate logging.</remarks>
+    public bool BypassExceptionLogging { get; init; }
+
+    /// <summary>
+    /// Gets the result where already pre-formed.
+    /// </summary>
+    public TResult? Result { get; init; }
+
+    /// <summary>
+    /// Gets the <see cref="WebApiHeader"/>.
+    /// </summary>
+    public WebApiHeader? Headers { get; init; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/AspNetCoreExtensions.cs b/src/CoreEx.AspNetCore/AspNetCoreExtensions.cs
new file mode 100644
index 00000000..b40a16e6
--- /dev/null
+++ b/src/CoreEx.AspNetCore/AspNetCoreExtensions.cs
@@ -0,0 +1,59 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class AspNetCoreExtensions
+{
+    /// <summary>
+    /// Overrides the <see cref="WebApiOptionsBase.StatusCode"/>.
+    /// </summary>
+    /// <typeparam name="TRequestOptions">The <see cref="WebApiOptionsBase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="requestOptions">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/>.</param>
+    /// <returns>The <paramref name="requestOptions"/> to support fluent-style method-chaining.</returns>
+    public static TRequestOptions WithStatusCode<TRequestOptions>(this TRequestOptions requestOptions, HttpStatusCode statusCode) where TRequestOptions : WebApiOptionsBase
+    {
+        requestOptions.ThrowIfNull().StatusCode = statusCode;
+        return requestOptions;
+    }
+
+    /// <summary>
+    /// Overrides the <see cref="WebApiOptionsBase.AlternateStatusCode"/>.
+    /// </summary>
+    /// <typeparam name="TRequestOptions">The <see cref="WebApiOptionsBase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="requestOptions">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="alternateStatusCode">The <see cref="HttpStatusCode"/>.</param>
+    /// <returns>The <paramref name="requestOptions"/> to support fluent-style method-chaining.</returns>
+    public static TRequestOptions WithAlternateStatusCode<TRequestOptions>(this TRequestOptions requestOptions, HttpStatusCode alternateStatusCode) where TRequestOptions : WebApiOptionsBase
+    {
+        requestOptions.ThrowIfNull().AlternateStatusCode = alternateStatusCode;
+        return requestOptions;
+    }
+
+    /// <summary>
+    /// Overrides the <see cref="WebApiOptionsBase.OperationType"/>.
+    /// </summary>
+    /// <typeparam name="TRequestOptions">The <see cref="WebApiOptionsBase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="requestOptions">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="operationType">The <see cref="CoreEx.OperationType"/>.</param>
+    /// <returns>The <paramref name="requestOptions"/> to support fluent-style method-chaining.</returns>
+    public static TRequestOptions WithOperationType<TRequestOptions>(this TRequestOptions requestOptions, OperationType operationType) where TRequestOptions : WebApiOptionsBase
+    {
+        requestOptions.ThrowIfNull().OperationType = operationType;
+        return requestOptions;
+    }
+
+    /// <summary>
+    /// Overrides the <see cref="WebApiOptionsBase.LocationUri"/> function.
+    /// </summary>
+    /// <typeparam name="TRequestOptions">The <see cref="WebApiOptionsBase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="requestOptions">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="locationUri">The function to return the location <see cref="Uri"/>.</param>
+    /// <returns></returns>
+    public static TRequestOptions WithLocationUri<TRequestOptions>(this TRequestOptions requestOptions, Func<Uri> locationUri) where TRequestOptions : WebApiOptionsBase
+    {
+        requestOptions.ThrowIfNull().LocationUri = locationUri;
+        return requestOptions;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj b/src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj
index 1d8db560..fce1c328 100644
--- a/src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj
+++ b/src/CoreEx.AspNetCore/CoreEx.AspNetCore.csproj
@@ -1,25 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>CoreEx.AspNetCore</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx ASP.NET Core backend Extensions.</Title>
-    <Description>CoreEx ASP.NET backend Extensions.</Description>
-    <PackageTags>coreex api aspnet entity microservices</PackageTags>
-    <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
-    
+    <Title>CoreEx AspNetCore .NET extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend web-api services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data aspnet webapi mvc http idempotency etag if-match </PackageTags>
   </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
+  
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.ApplicationBuilder.cs b/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.ApplicationBuilder.cs
new file mode 100644
index 00000000..3eb8e132
--- /dev/null
+++ b/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.ApplicationBuilder.cs
@@ -0,0 +1,148 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.AspNetCore.Builder;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class CoreExAspNetCoreExtensions
+{
+    /// <summary>
+    /// Adds a middleware action to <paramref name="configure"/> the <see cref="ExecutionContext"/> per request. 
+    /// </summary>
+    /// <param name="builder">The <see cref="IApplicationBuilder"/>.</param>
+    /// <param name="configure">An optional function to update the <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <see cref="IApplicationBuilder"/> for fluent-style method-chaining.</returns>
+    public static IApplicationBuilder UseExecutionContext(this IApplicationBuilder builder, Func<HttpContext, ExecutionContext, Task>? configure = null)
+        => builder.ThrowIfNull().UseMiddleware<ExecutionContextMiddleware>(configure ?? ExecutionContextMiddleware.DefaultConfigure);
+
+    /// <summary>
+    /// Registers the standard ASP.NET Core exception handling middleware leveraging the <i>CoreEx</i> <see cref="ExceptionHandlingMiddleware.ConvertExceptionToProblemDetails(IApplicationBuilder)"/> to convert the <see cref="Exception"/> into a <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="IApplicationBuilder"/>.</param>
+    /// <returns>The <see cref="IApplicationBuilder"/> for fluent-style method-chaining.</returns>
+    /// <remarks>This is primarily required to support specific <see cref="IExtendedException"/> handling.
+    /// <para>Is effectively a convenience method for <see cref="ExceptionHandlerExtensions.UseExceptionHandler(IApplicationBuilder)"/>, i.e.:
+    /// <code>    builder.UseExceptionHandler(CoreEx.AspNetCore.ExceptionHandlingMiddleware.ConvertExceptionToProblemDetails);</code></para></remarks>
+    public static IApplicationBuilder UseCoreExExceptionHandler(this IApplicationBuilder builder)
+        => builder.ThrowIfNull().UseExceptionHandler(ExceptionHandlingMiddleware.ConvertExceptionToProblemDetails);
+
+    /// <summary>
+    /// Adds the standard <i>CoreEx</i> OpenTelemetry instrumentation using the application name as the service name.
+    /// </summary>
+    /// <param name="builder">The <see cref="IHostApplicationBuilder"/>.</param>
+    /// <param name="serviceVersion">The optional version of the service; defaults to <c>1.0.0</c>.</param>
+    /// <returns>The resulting <see cref="OpenTelemetryBuilder"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Includes <see cref="OpenTelemetry.Trace.CoreExExtensions.WithCoreExTelemetry(OpenTelemetryBuilder)"/> and <see cref="OpenTelemetry.Trace.CoreExAspNetCoreExtensions.WithAspNetCoreTelemetry(OpenTelemetryBuilder)"/>.</remarks>
+    public static OpenTelemetryBuilder WithCoreExTelemetry(this IHostApplicationBuilder builder, string? serviceVersion = "1.0.0")
+    {
+        var telemetry = builder.ThrowIfNull().Services.AddOpenTelemetry().WithCoreExTelemetry().WithAspNetCoreTelemetry();
+        telemetry.ConfigureResource(x => x.AddService(builder.Environment.ApplicationName, serviceVersion: serviceVersion));
+        return telemetry;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="IdempotencyKeyMiddleware"/> to handle operations that required idempotency (see <see cref="CoreEx.AspNetCore.Mvc.IdempotencyKeyAttribute"/>).
+    /// </summary>
+    /// <param name="builder">The <see cref="IApplicationBuilder"/>.</param>
+    /// <returns>The <see cref="IApplicationBuilder"/> for fluent-style method-chaining.</returns>
+    public static IApplicationBuilder UseIdempotencyKey(this IApplicationBuilder builder)
+        => builder.ThrowIfNull().UseMiddleware<IdempotencyKeyMiddleware>();
+
+    /// <summary>   
+    /// Maps health check endpoints enabling live, startup, and ready health checks with optional detailed responses as oer the specified <paramref name="options"/>.
+    /// </summary>
+    /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
+    /// <param name="options">The optional <see cref="HealthCheckOptions"/>.</param>
+    /// <returns>The <paramref name="endpoints"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="options"/> default where not specified. Additionally, the <paramref name="options"/> are overridden using configuration settings where applicable.</remarks>
+    public static IEndpointRouteBuilder MapHealthChecks(this IEndpointRouteBuilder endpoints, HealthCheckOptions? options = null)
+    {
+        endpoints.ThrowIfNull();
+
+        // Bind options with configuration; also, default options where applicable.
+        options ??= new HealthCheckOptions();
+        endpoints.ServiceProvider.GetService<IConfiguration>()?.GetSection("CoreEx.AspNetCore.HealthChecks")?.Bind(options);
+
+        // Map health checks for the specified path and tags.
+        void MapHealthChecks(string path, string[] tags)
+        {
+            endpoints.MapHealthChecks(path, new Microsoft.AspNetCore.Diagnostics.HealthChecks.HealthCheckOptions
+            {
+                Predicate = check => CheckRegistration(check, tags),
+            });
+
+            if (options.AreDetailedEndpointsEnabled)
+            {
+                endpoints.MapHealthChecks($"{path.TrimEnd('/')}/{options.DetailedPathSuffix.TrimStart('/')}", new Microsoft.AspNetCore.Diagnostics.HealthChecks.HealthCheckOptions
+                {
+                    Predicate = check => CheckRegistration(check, tags),
+                    ResponseWriter = options.OnWriteDetailedHealthCheckAsync
+                });
+            }
+        }
+
+        // Check and update the registration.
+        bool CheckRegistration(HealthCheckRegistration rego, string[] tags)
+        { 
+            if (rego.Tags is not null && rego.Tags.Any(tag => tags.Contains(tag)))
+            {
+                options.OnConfigureHealthCheckRegistration(rego);
+                return true;
+            }
+
+            return false;
+        }
+
+        // Map the configured health check endpoints.
+        if (options.IsLiveEndpointEnabled)
+            MapHealthChecks(options.LivePath, options.LiveTags);
+
+        if (options.IsStartupEndpointEnabled)
+            MapHealthChecks(options.StartupPath, options.StartupTags);
+
+        if (options.IsReadyEndpointEnabled)
+            MapHealthChecks(options.ReadyPath, options.ReadyTags);
+
+        return endpoints;
+    }
+
+    /// <summary>
+    /// Maps endpoints for managing <see cref="HostedServiceBase"/> services, including status retrieval, pause, and resume operations.
+    /// </summary>
+    /// <param name="endpoints">The <see cref="IEndpointRouteBuilder"/>.</param>
+    /// <param name="routeName">The base route name for the hosted services endpoints.</param>
+    /// <param name="groupConfigure">An optional action to configure the <see cref="RouteGroupBuilder"/>.</param>
+    /// <returns>The <see cref="IEndpointRouteBuilder"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The mapped endpoints are excluded from OpenAPI documentation by default, as they are typically intended for administrative use only. The <paramref name="groupConfigure"/> allows additional
+    /// configuration, such as adding authorization policies, etc. which is highly recommended.</remarks>
+    public static IEndpointRouteBuilder MapHostedServices(this IEndpointRouteBuilder endpoints, string routeName = "/hosted-services", Action<RouteGroupBuilder>? groupConfigure = null)
+    {
+        // Map the endpoint group and hide from OpenAPI description - these are generally for admin use only!
+        var group = endpoints.ThrowIfNull().MapGroup(routeName.ThrowIfNullOrEmpty()).ExcludeFromDescription();
+
+        // Provides the all "hosted services" status management.
+        group.MapGet("/all/status", (HttpRequest request, CoreEx.AspNetCore.Http.WebApi webApi, [Microsoft.AspNetCore.Mvc.FromServices] HostedServiceManager manager, CancellationToken cancellationToken)
+            => webApi.GetWithResultAsync(request, (_, CancellationToken) => manager.ThrowIfNull().GetAllStatusesAsync(cancellationToken), cancellationToken: cancellationToken));
+
+        group.MapPost("/all/pause", (HttpRequest request, CoreEx.AspNetCore.Http.WebApi webApi, [Microsoft.AspNetCore.Mvc.FromServices] HostedServiceManager manager, CancellationToken cancellationToken)
+            => webApi.PostWithResultAsync(request, (_, CancellationToken) => manager.ThrowIfNull().PauseAllAsync(cancellationToken), HttpStatusCode.Accepted, cancellationToken: cancellationToken));
+
+        group.MapPost("/all/resume", (HttpRequest request, CoreEx.AspNetCore.Http.WebApi webApi, [Microsoft.AspNetCore.Mvc.FromServices] HostedServiceManager manager, CancellationToken cancellationToken)
+            => webApi.PostWithResultAsync(request, (_, CancellationToken) => manager.ThrowIfNull().ResumeAllAsync(cancellationToken), HttpStatusCode.Accepted, cancellationToken: cancellationToken));
+
+        // Provides the per "hosted service" status management.
+        group.MapGet("/{serviceKey}/status", (HttpRequest request, CoreEx.AspNetCore.Http.WebApi webApi, [Microsoft.AspNetCore.Mvc.FromServices] HostedServiceManager manager, string serviceKey, CancellationToken cancellationToken)
+            => webApi.GetWithResultAsync(request, (_, CancellationToken) => manager.ThrowIfNull().GetStatusAsync(serviceKey, cancellationToken), cancellationToken: cancellationToken));
+
+        group.MapPost("/{serviceKey}/pause", (HttpRequest request, CoreEx.AspNetCore.Http.WebApi webApi, [Microsoft.AspNetCore.Mvc.FromServices] HostedServiceManager manager, string serviceKey, CancellationToken cancellationToken)
+            => webApi.PostWithResultAsync(request, (_, CancellationToken) => manager.ThrowIfNull().PauseAsync(serviceKey, cancellationToken), HttpStatusCode.Accepted, cancellationToken: cancellationToken));
+
+        group.MapPost("/{serviceKey}/resume", (HttpRequest request, CoreEx.AspNetCore.Http.WebApi webApi, [Microsoft.AspNetCore.Mvc.FromServices] HostedServiceManager manager, string serviceKey, CancellationToken cancellationToken)
+            => webApi.PostWithResultAsync(request, (_, CancellationToken) => manager.ThrowIfNull().ResumeAsync(serviceKey, cancellationToken), HttpStatusCode.Accepted, cancellationToken: cancellationToken));
+
+        // Enable further group configuration by the consuming developer, such as adding authorization policies, etc.
+        groupConfigure?.Invoke(group);
+        return endpoints;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.DependencyInjection.cs b/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..7f480abb
--- /dev/null
+++ b/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.DependencyInjection.cs
@@ -0,0 +1,64 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class CoreExAspNetCoreExtensions
+{
+    /// <summary>
+    /// Adds a scoped service to instantiate a new <see cref="CoreEx.AspNetCore.Mvc.WebApi"/> instance.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="CoreEx.AspNetCore.Mvc.WebApi"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddMvcWebApi(this IServiceCollection services, Action<IServiceProvider, CoreEx.AspNetCore.Mvc.WebApi>? configure = null) => services.ThrowIfNull().AddScoped(sp =>
+    {
+        var webApi = new CoreEx.AspNetCore.Mvc.WebApi(sp.GetService<JsonSerializerOptions>(), sp.GetService<ILogger<CoreEx.AspNetCore.Mvc.WebApi>>(), sp.GetService<ExecutionContext>());
+        configure?.Invoke(sp, webApi);
+        return webApi;
+    });
+
+    /// <summary>
+    /// Adds a scoped service to instantiate a new <see cref="CoreEx.AspNetCore.Http.WebApi"/> instance.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="CoreEx.AspNetCore.Http.WebApi"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddHttpWebApi(this IServiceCollection services, Action<IServiceProvider, CoreEx.AspNetCore.Http.WebApi>? configure = null) => services.ThrowIfNull().AddScoped(sp =>
+    {
+        var webApi = new CoreEx.AspNetCore.Http.WebApi(sp.GetService<JsonSerializerOptions>(), sp.GetService<ILogger<CoreEx.AspNetCore.Http.WebApi>>(), sp.GetService<ExecutionContext>());
+        configure?.Invoke(sp, webApi);
+        return webApi;
+    });
+
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="HybridCacheIdempotencyProvider"/> service as the <see cref="IIdempotencyProvider"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="HybridCacheIdempotencyProvider"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Will also try to add the <b>scoped</b> <see cref="IdempotencyKeyMiddleware"/>.</remarks>
+    public static IServiceCollection AddHybridCacheIdempotencyProvider(this IServiceCollection services, Action<IServiceProvider, HybridCacheIdempotencyProvider>? configure = null)
+    {
+        services.ThrowIfNull().AddScoped<IIdempotencyProvider>(sp =>
+        {
+            var provider = new HybridCacheIdempotencyProvider(sp.GetRequiredService<IHybridCache>());
+            configure?.Invoke(sp, provider);
+            return provider;
+        });
+
+        services.TryAddScoped<IdempotencyKeyMiddleware>();
+        return services;
+    }
+
+    /// <summary>
+    /// Adds a <b>scoped</b> a scoped <see cref="IdempotencyKeyMiddleware"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddIdempotencyKeyMiddleware(this IServiceCollection services)
+        => services.ThrowIfNull().AddScoped<IdempotencyKeyMiddleware>();
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.OpenTelemetry.cs b/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.OpenTelemetry.cs
new file mode 100644
index 00000000..d3c5df78
--- /dev/null
+++ b/src/CoreEx.AspNetCore/CoreExAspNetCoreExtensions.OpenTelemetry.cs
@@ -0,0 +1,30 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace OpenTelemetry.Trace;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExAspNetCoreExtensions
+{
+    /// <summary>
+    /// Enables <i>CoreEx</i> OpenTelemetry instrumentation for ASP.NET Core. <see cref="CoreEx.AspNetCore.Mvc.WebApi"/> and <see cref="CoreEx.AspNetCore.Http.WebApi"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Also, includes <see cref="WithCoreExAspNetCoreSources(TracerProviderBuilder)"/>.</remarks>
+    public static OpenTelemetryBuilder WithAspNetCoreTelemetry(this OpenTelemetryBuilder builder)
+        => builder.ThrowIfNull().ThrowIfNull()
+            .WithTracing(t => t.AddAspNetCoreInstrumentation().WithCoreExAspNetCoreSources())
+            .WithMetrics(m => m.AddAspNetCoreInstrumentation());
+
+    /// <summary>
+    /// Enables (adds) the <i>CoreEx</i>-specified OpenTelemetry tracing sources.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static TracerProviderBuilder WithCoreExAspNetCoreSources(this TracerProviderBuilder builder) => builder.ThrowIfNull()
+        .AddInvokerAsSource<CoreEx.AspNetCore.Http.WebApiInvoker>()
+        .AddInvokerAsSource<CoreEx.AspNetCore.Mvc.WebApiInvoker>()
+        .AddInvokerAsSource<CoreEx.AspNetCore.Idempotency.IdempotencyProviderInvoker>();
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/ExceptionHandlingMiddleware.cs b/src/CoreEx.AspNetCore/ExceptionHandlingMiddleware.cs
new file mode 100644
index 00000000..a2fb11e6
--- /dev/null
+++ b/src/CoreEx.AspNetCore/ExceptionHandlingMiddleware.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Provides unhandled <see cref="Exception"/> handling to be used by standard middleware to convert into a <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/>.
+/// </summary>
+public static class ExceptionHandlingMiddleware
+{
+    /// <summary>
+    /// Configures the application to use <i>CoreEx</i> exception handling.
+    /// </summary>
+    /// <param name="app">The <see cref="IApplicationBuilder"/>.</param>
+    public static void ConvertExceptionToProblemDetails(this IApplicationBuilder app) => app.Run(async context =>
+    {
+        // Where the response has already started then do nothing.
+        if (context.Response.HasStarted)
+            return;
+
+        // Get the exception and process using standardized handling; note, already logged by ASPNET, so bypass ours to ensure double logging does not occur.
+        var ex = context.Features.Get<IExceptionHandlerFeature>()?.Error;
+        if (ex is not null)
+        {
+            var webApi = context.RequestServices.GetRequiredService<Http.WebApi>();
+            var ir = webApi.CreateResult(new WebApiResult<IResult>(context.Response) { Exception = ex, BypassExceptionLogging = true });
+            await ir.ExecuteAsync(context).ConfigureAwait(false);
+        }
+    });
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/ExecutionContextMiddleware.cs b/src/CoreEx.AspNetCore/ExecutionContextMiddleware.cs
new file mode 100644
index 00000000..64e1fce4
--- /dev/null
+++ b/src/CoreEx.AspNetCore/ExecutionContextMiddleware.cs
@@ -0,0 +1,66 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Provides an <see cref="ExecutionContext"/> handling middleware that (using dependency injection) enables additional configuration where required.
+/// </summary>
+/// <remarks>A new <see cref="ExecutionContext"/> <see cref="ExecutionContext.Current"/> instantiated through dependency injection is updated to use the <see cref="HttpContext.RequestServices"/>.</remarks>
+/// <param name="next">The next <see cref="RequestDelegate"/>.</param>
+/// <param name="configure">The optional function to update the <see cref="ExecutionContext"/>.</param>
+public class ExecutionContextMiddleware(RequestDelegate next, Func<HttpContext, ExecutionContext, Task>? configure)
+{
+    private readonly RequestDelegate _next = next.ThrowIfNull();
+    private readonly Func<HttpContext, ExecutionContext, Task> _configure = configure ?? DefaultConfigure;
+
+    /// <summary>
+    /// Provides a default configuration for the <see cref="ExecutionContext"/>.
+    /// </summary>
+    /// <param name="httpContext">The <see cref="HttpContent"/>.</param>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
+    public static Task DefaultConfigure(HttpContext httpContext, ExecutionContext executionContext) => Task.CompletedTask;
+
+    /// <summary>
+    /// Invokes the <see cref="ExecutionContextMiddleware"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="HttpContext"/>.</param>
+    /// <returns>The <see cref="Task"/>.</returns>
+    public async Task InvokeAsync(HttpContext context)
+    {
+        var ec = context.ThrowIfNull().RequestServices.GetRequiredService<ExecutionContext>();
+        ec.ServiceProvider ??= context.RequestServices;
+
+        await _configure(context, ec).ConfigureAwait(false);
+        await _next(context).ConfigureAwait(false);
+
+        AddMessagesHeader(context, ec);
+    }
+
+    /// <summary>
+    /// Adds the <see cref="HttpNames.WarningMessagesHeaderName"/> and <see cref="HttpNames.InfoMessagesHeaderName"/> to the <see cref="HttpContext.Response"/> where there are <see cref="ExecutionContext.Messages"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="HttpContext"/>.</param>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
+    /// <remarks>Only adds where the <see cref="HttpResponse.StatusCode"/> is less than <c>400</c> and the <see cref="HttpNames.WarningMessagesHeaderName"/> and <see cref="HttpNames.InfoMessagesHeaderName"/> does not currently exist.</remarks>
+    public static void AddMessagesHeader(HttpContext context, ExecutionContext executionContext)
+    {
+        context.ThrowIfNull();
+        executionContext.ThrowIfNull();
+
+        // Where there are info and/or warning messages then add to the response.
+        if (executionContext.HasMessages && context.Response.StatusCode < 400)
+        {
+            if (!context.Response.Headers.ContainsKey(HttpNames.WarningMessagesHeaderName))
+            {
+                var msgs = executionContext.Messages!.Where(x => x.Type == MessageType.Warning).Select(x => x.Text?.ToString()).ToArray();
+                if (msgs.Length > 0)
+                    context.Response.Headers.Append(HttpNames.WarningMessagesHeaderName, new Microsoft.Extensions.Primitives.StringValues(msgs));
+            }
+
+            if (!context.Response.Headers.ContainsKey(HttpNames.InfoMessagesHeaderName))
+            {
+                var msgs = executionContext.Messages!.Where(x => x.Type == MessageType.Info).Select(x => x.Text.ToString()).ToArray();
+                if (msgs.Length > 0)
+                    context.Response.Headers.Append(HttpNames.InfoMessagesHeaderName, new Microsoft.Extensions.Primitives.StringValues(msgs));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/GlobalUsing.cs b/src/CoreEx.AspNetCore/GlobalUsing.cs
new file mode 100644
index 00000000..e01aba9a
--- /dev/null
+++ b/src/CoreEx.AspNetCore/GlobalUsing.cs
@@ -0,0 +1,44 @@
+global using CoreEx;
+global using CoreEx.Abstractions;
+global using CoreEx.AspNetCore;
+global using CoreEx.AspNetCore.Abstractions;
+global using CoreEx.AspNetCore.HealthChecks;
+global using CoreEx.AspNetCore.Idempotency;
+global using CoreEx.Caching;
+global using CoreEx.Data;
+global using CoreEx.Entities;
+global using CoreEx.HealthChecks;
+global using CoreEx.Hosting;
+global using CoreEx.Http;
+global using CoreEx.Invokers;
+global using CoreEx.Json;
+global using CoreEx.Localization;
+global using CoreEx.Results;
+global using CoreEx.Validation;
+global using Microsoft.AspNetCore.Builder;
+global using Microsoft.AspNetCore.Diagnostics;
+global using Microsoft.AspNetCore.Http;
+global using Microsoft.AspNetCore.Http.Extensions;
+global using Microsoft.AspNetCore.Routing;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Hosting;
+global using Microsoft.Extensions.Logging;
+global using Microsoft.Extensions.Primitives;
+global using Microsoft.Net.Http.Headers;
+global using OpenTelemetry;
+global using OpenTelemetry.Metrics;
+global using OpenTelemetry.Resources;
+global using OpenTelemetry.Trace;
+global using System.Buffers;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Net;
+global using System.Net.Mime;
+global using System.Runtime.CompilerServices;
+global using System.Security.Cryptography;
+global using System.Text.Json;
+global using System.Text.RegularExpressions;
+global using ExecutionContext = CoreEx.ExecutionContext;
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/HealthChecks/HealthCheckOptions.cs b/src/CoreEx.AspNetCore/HealthChecks/HealthCheckOptions.cs
new file mode 100644
index 00000000..f5c89ddd
--- /dev/null
+++ b/src/CoreEx.AspNetCore/HealthChecks/HealthCheckOptions.cs
@@ -0,0 +1,110 @@
+namespace CoreEx.AspNetCore.HealthChecks;
+
+/// <summary>
+/// Provides configuration options for health checks.
+/// </summary>
+/// <remarks>Additionally, override the <see cref="OnWriteDetailedHealthCheckAsync(HttpContext, HealthReport)"/> to change the default detailed <see cref="HealthReport"/>.</remarks>
+public class HealthCheckOptions
+{
+    /// <summary>
+    /// Indicates whether the <i>live</i> health check endpoint is enabled.
+    /// </summary>
+    public bool IsLiveEndpointEnabled { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the <i>startup</i> health check endpoint is enabled.
+    /// </summary>
+    public bool IsStartupEndpointEnabled { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the <i>ready</i> health check endpoint is enabled.
+    /// </summary>
+    public bool IsReadyEndpointEnabled { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the <i>detailed</i> health check endpoints are enabled.
+    /// </summary>
+    public bool AreDetailedEndpointsEnabled { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the <i>live</i> health check path.
+    /// </summary>
+    public string LivePath { get; set; } = "/health/live";
+
+    /// <summary>
+    /// Gets or sets the <i>startup</i> health check path.
+    /// </summary>
+    public string StartupPath { get; set; } = "/health/startup";
+
+    /// <summary>
+    /// Gets or sets the <i>ready</i> health check path.
+    /// </summary>
+    public string ReadyPath { get; set; } = "/health/ready";
+
+    /// <summary>
+    /// Gets or sets the <i>detailed</i> path suffix.
+    /// </summary>
+    public string DetailedPathSuffix { get; set; } = "detailed";
+
+    /// <summary>
+    /// Gets or sets the <i>live</i> health check tags.
+    /// </summary>
+    public string[] LiveTags { get; set; } = [nameof(HealthCheckTags.Live)];
+
+    /// <summary>
+    /// Gets or sets the <i>startup</i> health check tags.
+    /// </summary>
+    public string[] StartupTags { get; set; } = [nameof(HealthCheckTags.Startup)];
+
+    /// <summary>
+    /// Gets or sets the <i>ready</i> health check tags.
+    /// </summary>
+    public string[] ReadyTags { get; set; } = [nameof(HealthCheckTags.Ready)];
+
+    /// <summary>
+    /// Gets or sets the <see cref="JsonSerializerOptions"/> used for <see cref="AreDetailedEndpointsEnabled">detailed</see> health check responses.
+    /// </summary>
+    /// <remarks>This defaults to a clone of the <see cref="Json.JsonDefaults.SerializerOptions"/> extending the <see cref="JsonSerializerOptions.Converters"/> to include the specialized
+    /// <see cref="Json.JsonExceptionConverterFactory"/> for when a <see cref="HealthReportEntry.Exception"/> is being reported.</remarks>
+    public JsonSerializerOptions? JsonSerializerOptions { get; set; }
+
+    /// <summary>
+    /// Indicates the default <i>detailed</i> health check JSON response should be pretty printed.
+    /// </summary>
+    /// <remarks>This sets the underlying <see cref="JsonSerializerOptions.WriteIndented"/> value accordingly.</remarks>
+    public bool? PrettyPrint { get; set; } = true;
+
+    /// <summary>
+    /// Gets (creates) the <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    /// <returns></returns>
+    private JsonSerializerOptions GetJsonSerializerOptions()
+    {
+        if (JsonSerializerOptions is not null)
+            return JsonSerializerOptions;
+
+        var jso = new JsonSerializerOptions(JsonDefaults.SerializerOptions);
+        jso.Converters.Add(new JsonExceptionConverterFactory());
+
+        if (PrettyPrint.HasValue)
+            jso.WriteIndented = PrettyPrint.Value;
+
+        return jso;
+    }
+
+    /// <summary>
+    /// Writes the <i>detailed</i> health check response from the <paramref name="report"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="HttpContext"/>.</param>
+    /// <param name="report">The <see cref="HealthReport"/>.</param>
+    /// <remarks>This will only be invoked where accessing a valid detailed endpoint where <see cref="AreDetailedEndpointsEnabled"/> is <see langword="true"/>.
+    /// <para>The default implementation simply JSON serializes the <paramref name="report"/> as the response using the <see cref="JsonSerializerOptions"/>.</para></remarks>
+    public virtual async Task OnWriteDetailedHealthCheckAsync(HttpContext context, HealthReport report)
+        => await context.Response.WriteAsJsonAsync(report, GetJsonSerializerOptions()).ConfigureAwait(false);
+
+    /// <summary>
+    /// Provides an opportunity to further configure the health check <paramref name="registration"/>.
+    /// </summary>
+    /// <param name="registration">The <see cref="HealthCheckRegistration"/>.</param>
+    public virtual void OnConfigureHealthCheckRegistration(HealthCheckRegistration registration) { }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/HealthChecks/HealthReportStatusWriter.cs b/src/CoreEx.AspNetCore/HealthChecks/HealthReportStatusWriter.cs
deleted file mode 100644
index cc2ffcfb..00000000
--- a/src/CoreEx.AspNetCore/HealthChecks/HealthReportStatusWriter.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-using System.IO;
-using System.Net.Mime;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.HealthChecks
-{
-    /// <summary>
-    /// Provides additional <see cref="HealthReport"/> <c>HealthCheckOptions.ResponseWriter</c> capabilities.
-    /// </summary>
-    public static class HealthReportStatusWriter
-    {
-        /// <summary>
-        /// Writes the <paramref name="healthReport"/> as a JSON summary.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <param name="healthReport">The <see cref="HealthReport"/>.</param>
-        public static Task WriteJsonSummary(HttpContext context, HealthReport healthReport) => WriteJson(context, healthReport, false, false, null);
-
-        /// <summary>
-        /// Writes the <paramref name="healthReport"/> as JSON including the <see cref="HealthReport.Entries"/> results.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <param name="healthReport">The <see cref="HealthReport"/>.</param>
-        public static Task WriteJsonResults(HttpContext context, HealthReport healthReport) => WriteJson(context, healthReport, true, false, null);
-
-        /// <summary>
-        /// Writes the <paramref name="healthReport"/> as JSON including the <see cref="SettingsBase.Deployment"/> and <see cref="HealthReport.Entries"/> results.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <param name="healthReport">The <see cref="HealthReport"/>.</param>
-        public static async Task WriteJsonDeploymentResults(HttpContext context, HealthReport healthReport) => await WriteJson(context, healthReport, true, true, null).ConfigureAwait(false);
-
-        /// <summary>
-        /// Writes the <paramref name="healthReport"/> as JSON to the <paramref name="context"/>.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <param name="healthReport">The <see cref="HealthReport"/>.</param>
-        /// <param name="includeResults">Indicates whether to include <see cref="HealthReport.Entries"/> results (where applicable).</param>
-        /// <param name="includeDeployment">Indicates whether to include <see cref="SettingsBase.Deployment"/> information (where applicable).</param>
-        /// <param name="extension">An action to enable extensions to the underlying JSON being written.</param>
-        public static async Task WriteJson(HttpContext context, HealthReport healthReport, bool includeResults = true, bool includeDeployment = true, Action<HealthReport, Utf8JsonWriter>? extension = null)
-        {
-            using var memoryStream = new MemoryStream();
-            using (var jsonWriter = new Utf8JsonWriter(memoryStream))
-            {
-                jsonWriter.WriteStartObject();
-                jsonWriter.WriteString("status", healthReport.Status.ToString());
-                jsonWriter.WriteString("duration", healthReport.TotalDuration.ToString());
-
-                if (ExecutionContext.HasCurrent)
-                    jsonWriter.WriteString("correlationId", ExecutionContext.Current.CorrelationId);
-
-                jsonWriter.WriteStartObject("results");
-
-                foreach (var e in healthReport.Entries)
-                {
-                    jsonWriter.WriteStartObject(e.Key.Replace(' ', '-'));
-                    jsonWriter.WriteString("status", e.Value.Status.ToString());
-                    jsonWriter.WriteString("description", e.Value.Description);
-                    jsonWriter.WriteString("duration", e.Value.Duration.ToString());
-
-                    if (e.Value.Exception is not null)
-                    {
-                        var settings = ExecutionContext.GetService<SettingsBase>();
-                        if (settings is not null && settings.IncludeExceptionInResult)
-                            jsonWriter.WriteString("exception", e.Value.Exception?.ToString());
-                        else
-                            jsonWriter.WriteString("exception", e.Value.Exception?.Message);
-                    }
-
-                    if (includeDeployment)
-                    {
-                        var settings = ExecutionContext.GetService<SettingsBase>();
-                        if (settings is not null)
-                        {
-                            jsonWriter.WritePropertyName("deployment");
-                            JsonSerializer.Serialize(jsonWriter, settings, Text.Json.JsonSerializer.DefaultOptions);
-                        }
-                    }
-
-                    if (includeResults && e.Value.Data.Count > 0)
-                    {
-                        jsonWriter.WriteStartObject("data");
-
-                        foreach (var d in e.Value.Data)
-                        {
-                            jsonWriter.WritePropertyName(d.Key);
-                            JsonSerializer.Serialize(jsonWriter, d.Value, d.Value?.GetType() ?? typeof(object), Text.Json.JsonSerializer.DefaultOptions);
-                        }
-
-                        jsonWriter.WriteEndObject();
-                    }
-
-                    jsonWriter.WriteEndObject();
-                }
-
-                extension?.Invoke(healthReport, jsonWriter);
-
-                jsonWriter.WriteEndObject();
-                jsonWriter.WriteEndObject();
-            }
-
-            context.Response.ContentType = MediaTypeNames.Application.Json;
-            await context.Response.WriteAsync(Encoding.UTF8.GetString(memoryStream.ToArray())).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/HealthChecks/README.md b/src/CoreEx.AspNetCore/HealthChecks/README.md
new file mode 100644
index 00000000..7c86b9ed
--- /dev/null
+++ b/src/CoreEx.AspNetCore/HealthChecks/README.md
@@ -0,0 +1,28 @@
+# CoreEx.AspNetCore.HealthChecks
+
+> Provides `HealthCheckOptions` and endpoint-registration extensions for wiring CoreEx-standard live, startup, ready, and detailed health check endpoints into an ASP.NET Core application.
+
+## Overview
+
+`CoreEx.AspNetCore.HealthChecks` bridges the `CoreEx.HealthChecks` tag conventions and the `CoreEx.Hosting` `HostedServiceHealthCheck` registrations into fully configured ASP.NET Core endpoint middleware. `HealthCheckOptions` controls which of the standard endpoint paths are enabled, what path each uses, and whether detailed JSON output is served.
+
+The detail endpoint writes a JSON `HealthReport` body (status, duration, each entry's status/duration/exception/data), making it easy for operations dashboards to consume without custom serialization. Each endpoint uses tag-based filtering (`live`, `ready`) aligned with `HealthCheckTags` from `CoreEx.HealthChecks`.
+
+## Key capabilities
+
+- ♥ **Standard endpoints**: Live (`/health/live`), startup (`/health/startup`), ready (`/health/ready`), and related detail (e.g. `/health/ready/detail`) are configurable via `HealthCheckOptions` properties.
+- 📋 **JSON detail report**: The detail endpoint writes a structured JSON `HealthReport` with per-entry status, description, duration, exception message, and custom data dictionary.
+- ⚙️ **Per-endpoint enable/disable**: Each endpoint can be disabled independently (`IsLiveEndpointEnabled`, `IsReadyEndpointEnabled`, `IsStartupEndpointEnabled`, `AreDetailedEndpointsEnabled`) for environments where not all probes are needed.
+- 🔌 **Custom detail writer**: `OnWriteDetailedHealthCheckAsync(HttpContext, HealthReport)` is a virtual method on `HealthCheckOptions` for full control over the detail response format.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`HealthCheckOptions`](./HealthCheckOptions.cs)** | Configuration for live/startup/ready/detail endpoint paths, enable flags, and the virtual `OnWriteDetailedHealthCheckAsync` detail writer. |
+
+## Related Namespaces
+
+- **[`CoreEx.HealthChecks`](../../CoreEx/HealthChecks/README.md)** - Defines `HealthCheckTags.Live` and `HealthCheckTags.Ready` constants consumed by the endpoint tag filters.
+- **[`CoreEx.Hosting`](../../CoreEx/Hosting/README.md)** - `HostedServiceHealthCheck` and `HostedServiceManager` register health checks that appear in the ready endpoint aggregation.
+- **[`CoreEx.AspNetCore`](../README.md)** - `MapCoreExHealthChecks(HealthCheckOptions)` extension method in the root package wires all four endpoints into the application's endpoint routing.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/AspNetCoreHttpExtensions.cs b/src/CoreEx.AspNetCore/Http/AspNetCoreHttpExtensions.cs
new file mode 100644
index 00000000..bc9d7571
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Http/AspNetCoreHttpExtensions.cs
@@ -0,0 +1,66 @@
+using CoreEx.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http.Metadata;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Http;
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class AspNetCoreHttpExtensions
+{
+    /// <summary>
+    /// Adds metadata to the <see cref="RouteHandlerBuilder"/> that the action/operation supports <see cref="PagingArgs"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <param name="supportsCount">Indicates whether the <see cref="PagingArgs.IsCountRequested"/> is supported.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder WithPaging(this RouteHandlerBuilder builder, bool supportsCount = false) => builder.ThrowIfNull().WithMetadata(new PagingAttribute(supportsCount));
+
+    /// <summary>
+    /// Adds metadata to the <see cref="RouteHandlerBuilder"/> that the action/operation supports <see cref="QueryArgs"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <param name="supportsFilter">Indicates whether <see cref="QueryArgs.Filter"/> is supported/enabled.</param>
+    /// <param name="supportsOrderBy">Indicates whether <see cref="QueryArgs.OrderBy"/> is supported/enabled.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder WithQuery(this RouteHandlerBuilder builder, bool supportsFilter = true, bool supportsOrderBy = false) => builder.ThrowIfNull().WithMetadata(new QueryAttribute(supportsFilter, supportsOrderBy));
+
+    /// <summary>
+    /// Adds <see cref="Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by the <paramref name="builder"/> defaulting the content type to <see cref="MediaTypeNames.Application.Json"/>.
+    /// </summary>
+    /// <typeparam name="TRequest">The request <i>Body</i> <see cref="Type"/>.</typeparam>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder Accepts<TRequest>(this RouteHandlerBuilder builder) => builder.ThrowIfNull().Accepts(typeof(TRequest), MediaTypeNames.Application.Json);
+
+    /// <summary>
+    /// Adds an <see cref="IProducesResponseTypeMetadata"/> with a <see cref="ProblemDetails"/> type and <see cref="HttpStatusCode.NotFound"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder ProducesNotFoundProblem(this RouteHandlerBuilder builder) => builder.ThrowIfNull().ProducesProblem((int)HttpStatusCode.NotFound);
+
+    /// <summary>
+    /// Adds an <see cref="IProducesResponseTypeMetadata"/> with a <see cref="HttpStatusCode.NoContent"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by <paramref name="builder"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder ProducesNoContent(this RouteHandlerBuilder builder) => builder.ThrowIfNull().Produces((int)HttpStatusCode.NoContent);
+
+    /// <summary>
+    /// Adds an <see cref="IProducesResponseTypeMetadata"/> with a <typeparamref name="TResponse"/> type and <see cref="HttpStatusCode.Created"/> to <see cref="EndpointBuilder.Metadata"/> for all endpoints produced by <paramref name="builder"/>.
+    /// </summary>
+    /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder ProducesCreated<TResponse>(this RouteHandlerBuilder builder) => builder.ThrowIfNull().Produces<TResponse>((int)HttpStatusCode.Created);
+
+    /// <summary>
+    /// Adds metadata to the <see cref="RouteHandlerBuilder"/> that the action/operation supports the <see cref="HttpNames.IdempotencyKeyHeaderName"/>.
+    /// </summary>
+    /// <param name="builder">The <see cref="RouteHandlerBuilder"/>.</param>
+    /// <param name="isRequired">Indicates whether an <see cref="HttpNames.IdempotencyKeyHeaderName"/> is required for the request.</param>
+    /// <returns>The <see cref="RouteHandlerBuilder"/> to support fluent-style method-chaining.</returns>
+    public static RouteHandlerBuilder WithIdempotencyKey(this RouteHandlerBuilder builder, bool isRequired = false) => builder.ThrowIfNull().WithMetadata(new IdempotencyKeyAttribute(isRequired));
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/HttpRequestJsonValue.cs b/src/CoreEx.AspNetCore/Http/HttpRequestJsonValue.cs
deleted file mode 100644
index c9433e08..00000000
--- a/src/CoreEx.AspNetCore/Http/HttpRequestJsonValue.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.AspNetCore.Http
-{
-    /// <summary>
-    /// Represents a dynamic HTTP request JSON-deserialized <see cref="Value"/>.
-    /// </summary>
-    public class HttpRequestJsonValue : HttpRequestJsonValueBase
-    {
-        /// <summary>
-        /// Gets or sets the deserialized request value.
-        /// </summary>
-        public object? Value { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/HttpRequestJsonValueBase.cs b/src/CoreEx.AspNetCore/Http/HttpRequestJsonValueBase.cs
deleted file mode 100644
index b1fbc072..00000000
--- a/src/CoreEx.AspNetCore/Http/HttpRequestJsonValueBase.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.AspNetCore.Http
-{
-    /// <summary>
-    /// Represents the base for a <see cref="HttpRequestJsonValue"/> and <see cref="HttpRequestJsonValue{T}"/>.
-    /// </summary>
-    public abstract class HttpRequestJsonValueBase
-    {
-        /// <summary>
-        /// Indicates whether the request value was found to be valid.
-        /// </summary>
-        public bool IsValid => ValidationException == null;
-
-        /// <summary>
-        /// Indicates whether the request value was found to be invalid.
-        /// </summary>
-        public bool IsInvalid => !IsValid;
-
-        /// <summary>
-        /// Gets or sets any corresponding <see cref="Exception"/> related to validation.
-        /// </summary>
-        /// <remarks>This is typically set as the result of JSON deserialization.</remarks>
-        public Exception? ValidationException { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/HttpRequestJsonValueT.cs b/src/CoreEx.AspNetCore/Http/HttpRequestJsonValueT.cs
deleted file mode 100644
index 802ed0df..00000000
--- a/src/CoreEx.AspNetCore/Http/HttpRequestJsonValueT.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.AspNetCore.Http
-{
-    /// <summary>
-    /// Represents a <see cref="Type"/> <typeparamref name="T"/> HTTP request JSON-deserialized <see cref="Value"/>.
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    public class HttpRequestJsonValue<T> : HttpRequestJsonValueBase
-    {
-        /// <summary>
-        /// Gets or sets the deserialized request value.
-        /// </summary>
-        public T Value { get; set; } = default!;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/HttpResultExtensions.cs b/src/CoreEx.AspNetCore/Http/HttpResultExtensions.cs
deleted file mode 100644
index b0992412..00000000
--- a/src/CoreEx.AspNetCore/Http/HttpResultExtensions.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-
-namespace CoreEx.AspNetCore.Http
-{
-    /// <summary>
-    /// Extension methods for <see cref="HttpRequest"/>.
-    /// </summary>
-    public static class HttpResultExtensions
-    {
-        /// <summary>
-        /// Gets the standard invalid JSON message prefix.
-        /// </summary>
-        public const string InvalidJsonMessagePrefix = "Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted:";
-
-        /// <summary>
-        /// Applies the <see cref="HttpRequestOptions"/> to the <see cref="HttpRequest"/>.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
-        /// <param name="requestOptions">The <see cref="HttpRequestOptions"/>.</param>
-        /// <returns>The <see cref="HttpRequest"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This will automatically invoke <see cref="ApplyETag(HttpRequest, string)"/> where there is an <see cref="HttpRequestOptions.ETag"/> value.</remarks>
-        public static HttpRequest ApplyRequestOptions(this HttpRequest httpRequest, HttpRequestOptions? requestOptions)
-        {
-            httpRequest.ThrowIfNull(nameof(httpRequest));
-
-            if (requestOptions == null)
-                return httpRequest;
-
-            // Apply the ETag header.
-            httpRequest.ApplyETag(requestOptions.ETag);
-
-            // Apply updates to the query string.
-            httpRequest.QueryString = QueryString.FromUriComponent(requestOptions.AddToQueryString(httpRequest.QueryString.ToUriComponent())!);
-
-            return httpRequest;
-        }
-
-        /// <summary>
-        /// Applies the <i>ETag</i> to the <see cref="HttpRequest"/> <see cref="HttpRequest.Headers"/> as an <see cref="HttpRequestHeader.IfNoneMatch"/> (where <see cref="HttpRequest.Method"/> is <see cref="HttpMethod.Get"/>
-        /// or <see cref="HttpMethod.Head"/>); otherwise, an <see cref="HttpRequestHeader.IfMatch"/>.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
-        /// <param name="etag">The <i>ETag</i> value.</param>
-        /// <returns>The <see cref="HttpRequest"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Automatically adds quoting to be ETag Header format compliant.</remarks>
-        public static HttpRequest ApplyETag(this HttpRequest httpRequest, string? etag)
-        {
-            // Apply the ETag header.
-            if (!string.IsNullOrEmpty(etag))
-            {
-                if (httpRequest.Method.Equals(HttpMethod.Get.Method, StringComparison.OrdinalIgnoreCase) || httpRequest.Method.Equals(HttpMethod.Head.Method, StringComparison.OrdinalIgnoreCase))
-                    httpRequest.Headers.Append(HeaderNames.IfNoneMatch, ETagGenerator.FormatETag(etag));
-                else
-                    httpRequest.Headers.Append(HeaderNames.IfMatch, ETagGenerator.FormatETag(etag));
-            }
-
-            return httpRequest;
-        }
-
-        /// <summary>
-        /// Deserialize the HTTP JSON <see cref="HttpRequest.Body"/> to a specified .NET object <see cref="Type"/> via a <see cref="HttpRequestJsonValue{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The optional <see cref="IValidator{T}"/> to validate the value (only invoked where the value is not <c>null</c>).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpRequestJsonValue{T}"/>.</returns>
-        public static async Task<HttpRequestJsonValue<T>> ReadAsJsonValueAsync<T>(this HttpRequest httpRequest, IJsonSerializer jsonSerializer, bool valueIsRequired = true, IValidator<T>? validator = null, CancellationToken cancellationToken = default)
-        {
-            httpRequest.ThrowIfNull(nameof(httpRequest));
-
-            var content = await BinaryData.FromStreamAsync(httpRequest.Body, cancellationToken).ConfigureAwait(false);
-            var jv = new HttpRequestJsonValue<T>();
-
-            // Deserialize the JSON into the selected type.
-            try
-            {
-                if (content.ToMemory().Length > 0)
-                    jv.Value = jsonSerializer.ThrowIfNull(nameof(jsonSerializer)).Deserialize<T>(content)!;
-
-                if (valueIsRequired && jv.Value == null)
-                    jv.ValidationException = new ValidationException($"{InvalidJsonMessagePrefix} Value is mandatory.");
-
-                if (jv.Value != null && validator != null)
-                {
-                    var vr = await validator.ValidateAsync(jv.Value, cancellationToken).ConfigureAwait(false);
-                    jv.ValidationException = vr.ToException();
-                }
-            }
-            catch (Exception ex)
-            {
-                jv.ValidationException = new ValidationException($"{InvalidJsonMessagePrefix} {ex.Message}", ex);
-            }
-
-            return jv;
-        }
-
-        /// <summary>
-        /// Reads the HTTP <see cref="HttpRequest.Body"/> as <see cref="BinaryData"/> and optionally validates whether <paramref name="valueIsRequired"/>.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where underlying <see cref="Stream"/> length is zero.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="BinaryData"/> content where successful, otherwise the <see cref="ValidationException"/> invalid.</returns>
-        public static async Task<(BinaryData? Content, ValidationException? Exception)> ReadAsBinaryDataAsync(this HttpRequest httpRequest, bool valueIsRequired = true, CancellationToken cancellationToken = default)
-        {
-            var content = await BinaryData.FromStreamAsync(httpRequest.Body, cancellationToken).ConfigureAwait(false);
-
-            if (valueIsRequired && content.ToMemory().Length == 0)
-                return (null, new ValidationException($"{InvalidJsonMessagePrefix} Value is mandatory."));
-            else
-                return (content, null);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="WebApiRequestOptions"/> from the <see cref="HttpRequest"/>.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
-        /// <returns>The <see cref="WebApiRequestOptions"/>.</returns>
-        public static WebApiRequestOptions GetRequestOptions(this HttpRequest httpRequest) => new(httpRequest.ThrowIfNull(nameof(httpRequest)));
-
-        /// <summary>
-        /// Adds the <see cref="PagingArgs"/> to the <see cref="IHeaderDictionary"/>.
-        /// </summary>
-        /// <param name="headers">The <see cref="IHeaderDictionary"/>.</param>
-        /// <param name="paging">The <see cref="PagingResult"/>.</param>
-        public static void AddPagingResult(this IHeaderDictionary headers, PagingResult? paging)
-        {
-            if (paging == null)
-                return;
-
-            switch (paging.Option)
-            {
-                case PagingOption.SkipAndTake:
-                    headers[HttpConsts.PagingSkipHeaderName] = paging.Skip!.Value.ToString(CultureInfo.InvariantCulture);
-                    headers[HttpConsts.PagingTakeHeaderName] = paging.Take.ToString(CultureInfo.InvariantCulture);
-                    break;
-
-                case PagingOption.PageAndSize:
-                    headers[HttpConsts.PagingPageNumberHeaderName] = paging.Page!.Value.ToString(CultureInfo.InvariantCulture);
-                    headers[HttpConsts.PagingPageSizeHeaderName] = paging.Take.ToString(CultureInfo.InvariantCulture);
-                    break;
-
-                default:
-                    headers[HttpConsts.PagingTokenHeaderName] = paging.Token;
-                    headers[HttpConsts.PagingTakeHeaderName] = paging.Take.ToString(CultureInfo.InvariantCulture);
-                    break;
-            }
-
-            if (paging.TotalCount.HasValue)
-                headers[HttpConsts.PagingTotalCountHeaderName] = paging.TotalCount.Value.ToString(CultureInfo.InvariantCulture);
-
-            if (paging.TotalPages.HasValue)
-                headers[HttpConsts.PagingTotalPagesHeaderName] = paging.TotalPages.Value.ToString(CultureInfo.InvariantCulture);
-        }
-
-        /// <summary>
-        /// Adds the <see cref="MessageItemCollection"/> to the <see cref="IHeaderDictionary"/>.
-        /// </summary>
-        /// <param name="headers">The <see cref="IHeaderDictionary"/>.</param>
-        /// <param name="messages">The <see cref="MessageItemCollection"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        public static void AddMessages(this IHeaderDictionary headers, MessageItemCollection? messages, IJsonSerializer? jsonSerializer = null)
-        {
-            if (messages is null || messages.Count == 0)
-                return;
-
-            jsonSerializer ??= JsonSerializer.Default;
-            headers.TryAdd(HttpConsts.MessagesHeaderName, jsonSerializer.Serialize(messages));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/README.md b/src/CoreEx.AspNetCore/Http/README.md
new file mode 100644
index 00000000..90ec0b13
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Http/README.md
@@ -0,0 +1,32 @@
+# CoreEx.AspNetCore.Http
+
+> Provides `Http.WebApi` — the Minimal API (`IResult`-returning) concrete implementation of the CoreEx `WebApi<TResult>` execution helper — and its dedicated `WebApiInvoker`.
+
+## Overview
+
+`CoreEx.AspNetCore.Http` contains the Minimal API variant of the CoreEx Web API helper. `Http.WebApi` extends the abstract `WebApi<IResult>` base and implements `CreateResult(WebApiResult<IResult>)` to translate a `WebApiResult` into an ASP.NET Core `IResult` — either a typed `Results<T>` value or a `ProblemDetails` result.
+
+It is registered via `services.AddHttpWebApi()` and injected into Minimal API endpoint delegates in the same way that `Mvc.WebApi` is injected into MVC controllers. The HTTP verb methods (`GetAsync`, `PostAsync`, `PutAsync`, `PatchAsync`, `DeleteAsync`) are inherited from `WebApi<IResult>` unchanged; only the final `IResult` creation differs.
+
+`AspNetCoreHttpExtensions` provides `IResult`-oriented extension helpers used by the Minimal API endpoint pipeline.
+
+## Key capabilities
+
+- ⚡ **Minimal API integration**: Returns `IResult` types compatible with `Results<T>` and `TypedResults`, enabling full Minimal API support with OpenAPI inference.
+- 📄 **ProblemDetails responses**: `CreateResult` maps every `IExtendedException` (and unhandled exception when `ConvertUnhandledExceptionsToProblemDetails` is set) to a `TypedResults.Problem(ProblemDetails)` result.
+- 🔗 **Shared execution pipeline**: All verb logic (deserialization, ETag, paging, `Result<T>` unwrapping) is inherited from `WebApi<IResult>` — no duplication with the MVC variant.
+- 🔧 **DI registration**: `AddHttpWebApi(services, configure?)` registers `Http.WebApi` as a scoped service with optional startup configuration action.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`Http.WebApi`](./WebApi.cs)** | Minimal API `IResult`-returning `WebApi<IResult>` implementation; maps `WebApiResult<IResult>` to `TypedResults.Ok`, `TypedResults.Created`, `TypedResults.NoContent`, or `TypedResults.Problem`. |
+| **[`Http.WebApiInvoker`](./WebApiInvoker.cs)** | `WebApiInvoker<IResult>` singleton used by `Http.WebApi` to wrap invocations with OpenTelemetry spans. |
+| [`AspNetCoreHttpExtensions`](./AspNetCoreHttpExtensions.cs) | `IResult` extension helpers for Minimal API result construction used internally by `Http.WebApi`. |
+
+## Related Namespaces
+
+- **[`CoreEx.AspNetCore.Abstractions`](../Abstractions/README.md)** - `WebApi<IResult>` base class providing all verb implementations; `Http.WebApi` supplies only `CreateResult`.
+- **[`CoreEx.AspNetCore.Mvc`](../Mvc/README.md)** - Parallel MVC variant returning `IActionResult` instead of `IResult`.
+- **[`CoreEx.AspNetCore`](../README.md)** - `AddHttpWebApi()` DI extension is defined in the root package's `CoreExAspNetCoreExtensions.DependencyInjection.cs`.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/WebApi.cs b/src/CoreEx.AspNetCore/Http/WebApi.cs
new file mode 100644
index 00000000..95c5816b
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Http/WebApi.cs
@@ -0,0 +1,89 @@
+using AspHttp = Microsoft.AspNetCore.Http;
+
+namespace CoreEx.AspNetCore.Http;
+
+/// <summary>
+/// Provides the foundation (<see cref="HttpMethods.Get"/>, <see cref="HttpMethods.Post"/>, <see cref="HttpMethods.Put"/> and <see cref="HttpMethods.Delete"/>) ASP.NET Core Minimal Web API execution encapsulation.
+/// </summary>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonDefaults"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/> for the <see cref="WebApi"/>.</param>
+/// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+/// <remarks>The <see cref="HttpMethods.Get"/> methods within can also be used for a <see cref="HttpMethods.Head"/> as it is essentially the same operation without a corresponding response; this distinction is handled internally.</remarks>
+public class WebApi(JsonSerializerOptions? jsonSerializerOptions = null, ILogger<WebApi>? logger = null, ExecutionContext? executionContext = null) : WebApi<IResult>(WebApiInvoker.Default, jsonSerializerOptions, logger, executionContext)
+{
+    /// <inheritdoc/>
+    internal override IResult CreateResult(WebApiResult<IResult> result)
+    {
+        if (result.Result is not null)
+            return result.Result;
+
+        IExtendedException? eex = null;
+
+        if (result.Exception is not null)
+        {
+            if (!result.BypassExceptionLogging)
+            {
+                if (result.Exception is not IExtendedException reex || !reex.IsError)
+                {
+                    // Treat the unhandled exception as an error.
+                    var logger = Logger ?? result.HttpResponse.HttpContext.RequestServices.GetRequiredService<ILogger<WebApi>>();
+                    if (logger.IsEnabled(LogLevel.Error))
+                        logger.LogError(result.Exception, "{Error}", result.Exception.Message);
+                }
+                else
+                {
+                    // Log the exception where required.
+                    eex = reex;
+                    var logger = Logger ?? result.HttpResponse.HttpContext.RequestServices.GetRequiredService<ILogger<WebApi>>();
+                    if (eex.ShouldBeLogged && logger.IsEnabled(LogLevel.Error))
+                        logger.LogError(result.Exception, "{Error}", eex.Message);
+                }
+            }
+            else
+                // Bypass logging, but still determine if the exception is an extended exception for later processing.
+                eex = result.Exception as IExtendedException;
+
+            // Merge all extensions.
+            var extensions = CreateProblemDetailsExtensions(eex);
+            if (eex is not null && eex.HasExtensions)
+            {
+                foreach (var kvp in eex.Extensions)
+                {
+                    extensions.TryAdd(kvp.Key, kvp.Value);
+                }
+            }
+
+            // Special case where the exception is a ValidationException and has messages.
+            if (eex is ValidationException vex && vex.Messages is not null && vex.Messages.Count > 0)
+            {
+                var msd = new Dictionary<string, string[]>();
+                foreach (var item in from m in vex.Messages.GetMessagesForType(MessageType.Error).Where(x => x.Property is not null && x.Text is not null)
+                                     group m by m.Property into g
+                                     select new { Property = g.Key, Messages = g })
+                {
+                    msd.Add(item.Property!, [.. item.Messages.Select(m => m.Text!.ToString()!)]);
+                }
+
+                return AspHttp.Results.ValidationProblem(msd, title: vex.Message, detail: vex.Detail, extensions: extensions);
+            }
+
+            // Convert and return exception as problem details.
+            new WebApiHeader { RetryAfter = eex?.RetryAfter }.ApplyTo(this, result.HttpResponse);
+            if (eex is not null)
+                return AspHttp.Results.Problem(statusCode: (int)eex.StatusCode, title: eex.Message, detail: eex.Detail, extensions: extensions);
+
+            var config = result.HttpResponse.HttpContext.RequestServices.GetRequiredService<IConfiguration>();
+            var include = Internal.GetConfigurationValue(IncludeExceptionInProblemDetailsName, false, config);
+
+            if (include)
+                return AspHttp.Results.Problem(statusCode: (int)HttpStatusCode.InternalServerError, title: result.Exception.Message, detail: result.Exception.ToString(), extensions: extensions);
+            else
+                return AspHttp.Results.Problem(statusCode: (int)HttpStatusCode.InternalServerError, title: new UnexpectedInternalException().Message, extensions: extensions);
+        }
+
+        result.Headers?.ApplyTo(this, result.HttpResponse);
+        return result.Content is not null
+            ? AspHttp.Results.Content(result.Content, result.ContentType ?? MediaTypeNames.Text.Plain, statusCode: (int)result.StatusCode)
+            : AspHttp.Results.StatusCode((int)result.StatusCode);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Http/WebApiInvoker.cs b/src/CoreEx.AspNetCore/Http/WebApiInvoker.cs
new file mode 100644
index 00000000..d3a893af
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Http/WebApiInvoker.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.AspNetCore.Http;
+
+/// <summary>
+/// Provides the ASP.NET Core Minimal Web API <see cref="WebApi{TResult}"/> invoker.
+/// </summary>
+[InvokerName("CoreEx.AspNetCore.Http.WebApi")]
+public class WebApiInvoker : WebApiInvoker<IResult>
+{
+    private static WebApiInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="WebApiInvoker"/> instance.
+    /// </summary>
+    public static WebApiInvoker Default => ExecutionContext.GetService<WebApiInvoker>() ?? (_default ??= new WebApiInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/HybridCacheIdempotencyProvider.cs b/src/CoreEx.AspNetCore/Idempotency/HybridCacheIdempotencyProvider.cs
new file mode 100644
index 00000000..defc639e
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/HybridCacheIdempotencyProvider.cs
@@ -0,0 +1,219 @@
+using CoreEx.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Provides an <see cref="IIdempotencyProvider"/> implementation that uses an <see cref="IHybridCache"/> to store and retrieve idempotent request/response data.
+/// </summary>
+/// <param name="cache">The <see cref="IHybridCache"/>.</param>
+/// <remarks>This implementation uses the <see cref="HttpNames.IdempotencyKeyHeaderName"/> header to identify idempotent requests and store/retrieve the associated response data in/from the <see cref="IHybridCache"/>.
+/// <para>This allows for efficient handling of repeated requests with the same idempotency key, ensuring that only one request is processed and the result is cached for subsequent requests.</para></remarks>
+public class HybridCacheIdempotencyProvider(IHybridCache cache) : IIdempotencyProvider
+{
+    private static readonly TimeSpan _defaultExpiration = TimeSpan.FromHours(8);
+
+    private readonly IdempotencyProviderInvoker _invoker = IdempotencyProviderInvoker.Default;
+    private readonly IHybridCache _cache = cache.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the maximum cached response body size in bytes.
+    /// </summary>
+    /// <remarks>The default is 512 * 1024 (512 KB).</remarks>
+    public int MaxCachedResponseBodySize { get; set => field = value.ThrowWhen(value => value <= 0); } = 512 * 1024;
+
+    /// <summary>
+    /// Gets the list of HTTP request headers to include in the idempotency key fingerprint (see <see cref="IdempotencyKey.Fingerprint"/>).
+    /// </summary>
+    /// <remarks>Should be a <i>canonical</i> list of request headers to include in fingerprinting; being important, and non-varying, to avoid errant request equality checking.</remarks>
+    public List<string> HttpRequestHeadersToIncludeInFingerprint { get; } = ["Content-Type"];
+
+    /// <summary>
+    /// Gets or sets the <see cref="HybridCacheEntryOptions"/> to use when storing idempotency key entries.
+    /// </summary>
+    public HybridCacheEntryOptions? CacheEntryOptions { get; set; }
+
+    /// <inheritdoc/>
+    public async Task OnInvokeAsync(IdempotencyKeyAttribute attribute, HttpContext context, RequestDelegate next)
+    {
+        IdempotencyKey? cached = null;
+        string? idempotencyKey = null;
+        string? idempotencyCacheKey = null;
+        HybridCacheEntryOptions? cacheEntryOptions = CacheEntryOptions;
+
+        // Pre-processing - check for existing cached response and replay where applicable.
+        var replayedResponse = await _invoker.InvokeAsync(this, async tracer =>
+        {
+            if (context.Request.Headers.TryGetValue(HttpNames.IdempotencyKeyHeaderName, out var strings))
+            {
+                // Get the key and ensure valid.
+                idempotencyKey = strings.FirstOrDefault();
+                idempotencyCacheKey = $"Idempotency:{idempotencyKey}";
+                tracer.Activity?.AddTag("idempotency.key", idempotencyKey);
+
+                if (!IdempotencyKey.IsIdempotencyKeyValid(idempotencyKey, out var exception))
+                {
+                    tracer.Activity?.AddTag("idempotency.result", "key-is-invalid");
+                    throw exception;
+                }
+
+                // Check the cache for existing entry and ensure valid for this request.
+                cacheEntryOptions ??= HybridCacheEntryOptions.CreateFor<IdempotencyKey>(_defaultExpiration, _defaultExpiration, CacheStrategy.Hybrid);
+                cacheEntryOptions.WithTags(HttpNames.IdempotencyKeyHeaderName);
+
+                var initial = await IdempotencyKey.CreateFromHttpRequestAsync(context, HttpRequestHeadersToIncludeInFingerprint).ConfigureAwait(false);
+                cached = await _cache.GetOrCreateByKeyAsync(idempotencyCacheKey, _ => Task.FromResult(initial), cacheEntryOptions).ConfigureAwait(false);
+
+                if (initial.Fingerprint != cached.Fingerprint)
+                {
+                    tracer.Activity?.AddTag("idempotency.result", "key-used-for-different-request");
+                    throw IdempotencyKey.CreateUsedForDifferentRequestException();
+                }
+
+                // Where in-progress and a different request then throw the relevant concurrency exception.
+                if (cached.Status == IdempotencyStatus.InProgress)
+                {
+                    if (!ReferenceEquals(initial, cached))
+                    {
+                        tracer.Activity?.AddTag("idempotency.result", "key-used-for-different-request");
+                        throw IdempotencyKey.CreateInProgressException();
+                    }
+                }
+                else if (cached.Status == IdempotencyStatus.CompletedTooLargeToReplay)
+                {
+                    if (tracer.Logger?.IsEnabled(LogLevel.Warning) ?? false)
+                        tracer.Logger.LogWarning("Idempotent request with key '{IdempotencyKey}' cannot be replayed as the original response was too large to cache.", idempotencyKey);
+
+                    tracer.Activity?.AddTag("idempotency.result", "original-response-too-large");
+                    throw IdempotencyKey.CreateResponseTooLargeException();
+                }
+                else
+                {
+                    if (tracer.Logger?.IsEnabled(LogLevel.Information) ?? false)
+                        tracer.Logger.LogInformation("Idempotent request with key '{IdempotencyKey}' has resulted in the response being replayed from the cache.", idempotencyKey);
+
+                    // Write the cached response to the context and return, done, boom!
+                    tracer.Activity?.AddTag("idempotency.result", "used-cached-response");
+                    await cached.WriteToHttpResponseAsync(context).ConfigureAwait(false);
+
+                    return true;
+                }
+            }
+            else if (attribute.IsRequired)
+            {
+                tracer.Activity?.AddTag("idempotency.result", "key-required");
+                throw IdempotencyKey.CreateIdempotencyKeyRequiredException();
+            }
+
+            tracer.Activity?.AddTag("idempotency.result", "processing");
+            return false;
+        }, memberName: $"{nameof(OnInvokeAsync)}::PreProcessing").ConfigureAwait(false);
+
+        // Have processed before and have just arranged to replay the stored idempotency data; nice one stu (https://www.kiwitv.org.nz/index.php/tv-shows-mainmenu-42/46-kids/276-nice-one)!
+        if (replayedResponse)
+            return;
+
+        // Where idempotency not requested for this request; carry on, nothing to see here.
+        if (cached is null)
+        {
+            await next(context).ConfigureAwait(false);
+            return;
+        }
+
+        // Prepare to capture the response.
+        var originalBody = context.Response.Body;
+        await using var buffer = new MemoryStream();
+        context.Response.Body = buffer;
+
+        // Execute the next action then post-process.
+        try
+        {
+            // Execute the next action in the pipeline.
+            try
+            {
+                await next(context).ConfigureAwait(false);
+            }
+            catch
+            {
+                // Remove the in-progress marker for failed responses - retry with same idempotency-key allowed.
+                await _invoker.InvokeAsync(this, async tracer =>
+                {
+                    await GuardedCacheRemoveAsync(idempotencyCacheKey!, cacheEntryOptions, tracer.Logger).ConfigureAwait(false);
+
+                    tracer.Activity?.AddTag("idempotency.result", "error-and-removed");
+                }, memberName: $"{nameof(OnInvokeAsync)}::PostProcessing").ConfigureAwait(false);
+
+                // Keep bubbling...
+                throw;
+            }
+
+            // Post-processing - cache the response on successful completion; otherwise, remove the in-progress marker.
+            await _invoker.InvokeAsync(this, async tracer =>
+            {
+                // Cache the successful response.
+                if (context.Response.StatusCode >= 200 && context.Response.StatusCode < 300)
+                {
+                    cached.StatusCode = context.Response.StatusCode;
+                    cached.Headers = context.Response.Headers.ToDictionary(h => h.Key, h => h.Value.ToArray());
+
+                    if (buffer.Length > MaxCachedResponseBodySize)
+                    {
+                        cached.Body = null;
+                        cached.Status = IdempotencyStatus.CompletedTooLargeToReplay;
+                        await _cache.SetByKeyAsync(idempotencyCacheKey!, cached, cacheEntryOptions).ConfigureAwait(false);
+
+                        if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Warning))
+                            tracer.Logger.LogWarning("Idempotent request with key '{IdempotencyKey}' response body size of {ResponseBodySize} bytes exceeds the maximum allowable cached size of {MaxCachedResponseBodySize} bytes; response will not be stored for replay.",
+                                idempotencyKey, buffer.Length, MaxCachedResponseBodySize);
+
+                        tracer.Activity?.AddTag("idempotency.result", "success-but-too-large-to-store");
+                    }
+                    else
+                    {
+                        buffer.Position = 0;
+                        cached.Body = BinaryData.FromStream(buffer);
+                        cached.Status = IdempotencyStatus.CompletedAndReplayable;
+                        await _cache.SetByKeyAsync(idempotencyCacheKey!, cached, cacheEntryOptions).ConfigureAwait(false);
+
+                        tracer.Activity?.AddTag("idempotency.result", "success-and-stored");
+                    }
+                }
+                else
+                {
+                    // Remove the in-progress marker for failed responses - retry with same idempotency-key allowed.
+                    await GuardedCacheRemoveAsync(idempotencyCacheKey!, cacheEntryOptions, tracer.Logger).ConfigureAwait(false);
+
+                    tracer.Activity?.AddTag("idempotency.result", "error-and-removed");
+                }
+
+                // Rewind and copy the response back to the original stream.
+                context.Response.Body = originalBody;
+                context.Response.ContentLength = buffer.Length;
+
+                buffer.Position = 0;
+                await buffer.CopyToAsync(originalBody, context.RequestAborted).ConfigureAwait(false);
+            }, memberName: $"{nameof(OnInvokeAsync)}::PostProcessing").ConfigureAwait(false);
+        }
+        finally
+        {
+            // Rewire the response body.
+            context.Response.Body = originalBody;
+        }
+    }
+
+    /// <summary>
+    /// Guard the cache remove to swallow any exceptions.
+    /// </summary>
+    private async Task GuardedCacheRemoveAsync(string idempotencyCacheKey, HybridCacheEntryOptions? cacheEntryOptions, ILogger? logger)
+    {
+        try
+        {
+            await _cache.RemoveByKeyAsync(idempotencyCacheKey, cacheEntryOptions).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            // Log and swallow.
+            if (logger?.IsEnabled(LogLevel.Warning) ?? false)
+                logger?.LogWarning(ex, "Attempt to remove Idempotency-Key cache entry '{IdempotencyKey}' failed; underlying response processing has continued.", idempotencyCacheKey);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/IIdempotencyProvider.cs b/src/CoreEx.AspNetCore/Idempotency/IIdempotencyProvider.cs
new file mode 100644
index 00000000..00fb64ca
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/IIdempotencyProvider.cs
@@ -0,0 +1,18 @@
+using CoreEx.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Provides the underlying <see cref="IdempotencyKeyMiddleware"/> implementation services.
+/// </summary>
+/// <remarks>See also <see cref="IdempotencyKeyAttribute"/>.</remarks>
+public interface IIdempotencyProvider
+{
+    /// <summary>
+    /// Represents the <see cref="IMiddleware.InvokeAsync(HttpContext, RequestDelegate)"/> idempotency handling.
+    /// </summary>
+    /// <param name="attribute">The <see cref="IdempotencyKeyAttribute"/>.</param>
+    /// <param name="context">The <see cref="HttpContext"/>.</param>
+    /// <param name="next">The next <see cref="RequestDelegate"/>.</param>
+    Task OnInvokeAsync(IdempotencyKeyAttribute attribute, HttpContext context, RequestDelegate next);
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/IdempotencyKey.Static.cs b/src/CoreEx.AspNetCore/Idempotency/IdempotencyKey.Static.cs
new file mode 100644
index 00000000..2e5a074e
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/IdempotencyKey.Static.cs
@@ -0,0 +1,78 @@
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Provides <see cref="IIdempotencyProvider"/> utility.
+/// </summary>
+public partial class IdempotencyKey
+{
+    private const string _errorType = "idempotency-key";
+
+    /// <summary>
+    /// Checks whether the specified idempotency key is considered valid.
+    /// </summary>
+    /// <param name="idempotencyKey">The idempotency key to validate.</param>
+    /// <param name="exception">The resulting validation exception where the idempotency key is invalid.</param>
+    /// <returns><see langword="true"/> indicates that the idempotency key is valid; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>The idempotency key must be between 8 and 128 characters in length and consist of only letters, numbers, hyphens and underscores.</remarks>
+    public static bool IsIdempotencyKeyValid([NotNullWhen(true)] string? idempotencyKey, [NotNullWhen(false)] out ValidationException? exception)
+    {
+        if (string.IsNullOrEmpty(idempotencyKey) || !_idempotencyKeyRegex().IsMatch(idempotencyKey))
+        {
+            exception = new ValidationException($"The '{HttpNames.IdempotencyKeyHeaderName}' header is invalid.")
+                .WithErrorType(_errorType)
+                .WithErrorCode("header-is-invalid")
+                .WithDetail("The idempotency key must be between 8 and 128 characters in length and consist of only letters, numbers, hyphens and underscores.");
+
+            return false;
+        }
+
+        exception = null;
+        return true;
+    }
+
+    /// <summary>
+    /// Creates a <see cref="ValidationException"/> to indicate that the idempotency key is required.
+    /// </summary>
+    /// <returns>The resulting validation exception.</returns>
+    public static ValidationException CreateIdempotencyKeyRequiredException()
+        => new ValidationException($"The '{HttpNames.IdempotencyKeyHeaderName}' header is required.")
+        .WithErrorType(_errorType)
+        .WithErrorCode("header-is-required")
+        .WithDetail("An Idempotency key must be provided in the request header; it must be between 8 and 128 characters in length and consist of only letters, numbers, hyphens and underscores.");
+
+    /// <summary>
+    /// Creates a <see cref="ConflictException"/> to indicate that the idempotent operation is in progress.
+    /// </summary>
+    /// <param name="retryAfter">The optional retry-after interval; defaults to <see cref="TransientException.DefaultRetryAfter"/>.</param>
+    /// <returns>The resulting conflict exception.</returns>
+    public static ConflictException CreateInProgressException(TimeSpan? retryAfter = null)
+        => new ConflictException($"An operation with the specified '{HttpNames.IdempotencyKeyHeaderName}' header is already in progress.")
+        .WithErrorType(_errorType)
+        .WithErrorCode("is-in-progress")
+        .WithDetail("An operation with the specified idempotency key is already in progress; please wait for its completion before retrying.")
+        .AsTransient(retryAfter);
+
+    /// <summary>
+    /// Creates a <see cref="ConflictException"/> to indicate that the idempotency key has already been used for a different request.
+    /// </summary>
+    /// <returns>The resulting conflict exception.</returns>
+    public static ConflictException CreateUsedForDifferentRequestException()
+        => new ConflictException($"The '{HttpNames.IdempotencyKeyHeaderName}' header has already been used for a different request.")
+        .WithStatusCode(HttpStatusCode.UnprocessableContent)
+        .WithErrorType(_errorType)
+        .WithErrorCode("different-request")
+        .WithDetail("The specified idempotency key has already been used for a different request; reuse of idempotency keys is not allowed.");
+
+    /// <summary>
+    /// Creates a <see cref="ConflictException"/> to indicate that the response associated with the idempotency key was too large can not be replayed.
+    /// </summary>
+    /// <returns>The resulting conflict exception.</returns>
+    public static ConflictException CreateResponseTooLargeException()
+        => new ConflictException($"The response associated with the specified '{HttpNames.IdempotencyKeyHeaderName}' is no longer available.")
+        .WithErrorType(_errorType)
+        .WithErrorCode("response-unavailable")
+        .WithDetail("The response associated with the specified idempotency key completed successfully; however, it cannot be replayed as the original response representation is no longer available.");
+
+    [GeneratedRegex("^[A-Za-z0-9_-]{8,128}$", RegexOptions.Compiled)]
+    private static partial Regex _idempotencyKeyRegex();
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/IdempotencyKey.cs b/src/CoreEx.AspNetCore/Idempotency/IdempotencyKey.cs
new file mode 100644
index 00000000..bca275eb
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/IdempotencyKey.cs
@@ -0,0 +1,92 @@
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Provides <see cref="IIdempotencyProvider"/> implementation agnostic data and utility capabilities.
+/// </summary>
+public sealed partial class IdempotencyKey
+{
+    /// <summary>
+    /// Creates a new instance of the <see cref="IdempotencyKey"/> class.
+    /// </summary>
+    public static async Task<IdempotencyKey> CreateFromHttpRequestAsync(HttpContext context, IEnumerable<string> headersToIncludeInFingerprint)
+    {
+        // Fingerprint the request: method, path (no query string) and canonical headers.
+        using var ih = IncrementalHash.CreateHash(HashAlgorithmName.SHA256);
+        ih.AppendData(new BinaryData(context.Request.Method.ToUpperInvariant()));
+        ih.AppendData(new BinaryData(context.Request.Path.ToString().ToLowerInvariant()));
+
+        foreach (var header in headersToIncludeInFingerprint)
+        {
+            if (context.Request.Headers.TryGetValue(header, out var values))
+            {
+                ih.AppendData(new BinaryData(header));
+
+                foreach (var value in values)
+                {
+                    var val = value?.Trim();
+                    if (!string.IsNullOrEmpty(val))
+                        ih.AppendData(new BinaryData(val));
+                }
+            }
+        }
+
+        // Read and include the request body.
+        context.Request.EnableBuffering();
+        await using var ms = new MemoryStream();
+        await context.Request.Body.CopyToAsync(ms);
+        ih.AppendData(ms.ToArray());
+
+        // Rewind stream position for downstream consumption. 
+        context.Request.Body.Position = 0;
+
+        // Create and return the cached response with the computed request fingerprint.
+        var hash = ih.GetCurrentHash();
+        return new IdempotencyKey { Fingerprint = Convert.ToBase64String(hash) };
+    }
+
+    /// <summary>
+    /// Gets or sets the <see cref="Idempotency.IdempotencyStatus"/>.
+    /// </summary>
+    public IdempotencyStatus Status { get; set; } = IdempotencyStatus.InProgress;
+
+    /// <summary>
+    /// Gets or sets the originating request fingerprint.
+    /// </summary>
+    public string? Fingerprint { get; set; }
+
+    /// <summary>
+    /// Gets or sets the response status code.
+    /// </summary>
+    public int? StatusCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the response headers.
+    /// </summary>
+    public IDictionary<string, string?[]>? Headers { get; set; }
+
+    /// <summary>
+    /// Gets or sets the response body.
+    /// </summary>
+    public BinaryData? Body { get; set; }
+
+    /// <summary>
+    /// Writes the idempotency data to the specified <see cref="HttpContext"/> response.
+    /// </summary>
+    /// <param name="context">The <see cref="HttpContext"/>.</param>
+    public async Task WriteToHttpResponseAsync(HttpContext context)
+    {
+        if (context.Response.HasStarted)
+            throw new InvalidOperationException("Response already started; cannot replay idempotent response.");
+
+        context.Response.StatusCode = StatusCode ?? 200;
+        context.Response.Headers.Clear();
+
+        if (Headers is not null)
+        {
+            foreach (var header in Headers)
+                context.Response.Headers.TryAdd(header.Key, header.Value);
+        }
+
+        await context.Response.Body.WriteAsync(Body);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/IdempotencyKeyMiddleware.cs b/src/CoreEx.AspNetCore/Idempotency/IdempotencyKeyMiddleware.cs
new file mode 100644
index 00000000..071c02f5
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/IdempotencyKeyMiddleware.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Provides the <see cref="Mvc.IdempotencyKeyAttribute"/> handling middleware to enable idempotent operations via a pluggable <see cref="IIdempotencyProvider"/>.
+/// </summary>
+public sealed class IdempotencyKeyMiddleware(IIdempotencyProvider provider) : IMiddleware
+{
+    private readonly IIdempotencyProvider? _provider = provider.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+    {
+        // Check if the endpoint supports idempotency.
+        var endpoint = context.ThrowIfNull().GetEndpoint();
+        var idempotencyAttribute = endpoint?.Metadata.GetMetadata<Mvc.IdempotencyKeyAttribute>();
+
+        // Where no idempotency attribute, just continue on as normal; otherwise, Invoke the provider to handle.
+        if (idempotencyAttribute is null)
+            await next(context).ConfigureAwait(false);
+        else
+            await _provider.ThrowIfNull().OnInvokeAsync(idempotencyAttribute, context, next).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/IdempotencyProviderInvoker.cs b/src/CoreEx.AspNetCore/Idempotency/IdempotencyProviderInvoker.cs
new file mode 100644
index 00000000..bf832a2d
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/IdempotencyProviderInvoker.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Provides the <see cref="IIdempotencyProvider"/> invoker.
+/// </summary>
+[InvokerName("CoreEx.AspNetCore.Idempotency.IdempotencyProviderInvoker")]
+public class IdempotencyProviderInvoker : InvokerBase<IIdempotencyProvider>
+{
+    private static IdempotencyProviderInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="IdempotencyProviderInvoker"/> instance.
+    /// </summary>
+    public static IdempotencyProviderInvoker Default => ExecutionContext.GetService<IdempotencyProviderInvoker>() ?? (_default ??= new IdempotencyProviderInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/IdempotencyStatus.cs b/src/CoreEx.AspNetCore/Idempotency/IdempotencyStatus.cs
new file mode 100644
index 00000000..53473a25
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/IdempotencyStatus.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.AspNetCore.Idempotency;
+
+/// <summary>
+/// Respresents the status of the request (server-side) with respect to idempotency.
+/// </summary>
+public enum IdempotencyStatus
+{
+    /// <summary>
+    /// Indicates that the operation is currently being processed.
+    /// </summary>
+    InProgress,
+
+    /// <summary>
+    /// Indicates that the operation has completed and can be replayed if necessary.
+    /// </summary>
+    CompletedAndReplayable,
+
+    /// <summary>
+    /// Indicates that the completed operation cannot be replayed because its size exceeds the allowable limit.
+    /// </summary>
+    CompletedTooLargeToReplay
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Idempotency/README.md b/src/CoreEx.AspNetCore/Idempotency/README.md
new file mode 100644
index 00000000..23f8ac0c
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Idempotency/README.md
@@ -0,0 +1,38 @@
+# CoreEx.AspNetCore.Idempotency
+
+> Provides end-to-end idempotency key support: `IdempotencyKeyMiddleware` intercepts `[IdempotencyKey]`-marked endpoints, and `HybridCacheIdempotencyProvider` stores and replays prior responses using `IHybridCache`.
+
+## Overview
+
+Idempotency prevents duplicate processing when clients retry `POST` requests due to network failures or timeouts. `CoreEx.AspNetCore.Idempotency` implements this pattern transparently at the middleware layer so individual action methods require no idempotency-specific code.
+
+The flow: a client sends a `POST` with an `x-idempotency-key` header and a `[IdempotencyKey]` attribute is discovered on the endpoint; `IdempotencyKeyMiddleware` delegates to `IIdempotencyProvider.OnInvokeAsync`; the provider checks the cache for a prior response keyed by `(type-name, idempotency-key)`; on a hit it replays the cached HTTP response body and headers; on a miss it executes the action and stores the result before returning.
+
+`HybridCacheIdempotencyProvider` is the built-in implementation backed by `IHybridCache`. It serializes the response body as a `BinaryData` entry and stores response headers, status code, and content type alongside it, enabling a complete response replay.
+
+## Key capabilities
+
+- 🔁 **Transparent replay**: Duplicate requests with the same `x-idempotency-key` on `[IdempotencyKey]`-marked endpoints receive the original response without executing the handler again.
+- 🗄️ **HybridCache backing**: `HybridCacheIdempotencyProvider` stores responses in `IHybridCache` with configurable `LocalExpiration` and `DistributedExpiration`.
+- 🔒 **In-flight deduplication**: `IdempotencyStatus.Processing` is stamped during execution; concurrent identical requests receive a `409 Conflict` until the first completes, preventing double-execution under parallel retries.
+- 🏷️ **Attribute-driven**: `[IdempotencyKey]` is applied per action method; endpoints without the attribute pass through the middleware unchanged.
+- 🔌 **Pluggable provider**: `IIdempotencyProvider` is a single-method interface, allowing any storage backend (Redis, SQL, etc.) to be substituted for `HybridCacheIdempotencyProvider`.
+- ⚙️ **DI registration**: `AddHybridCacheIdempotencyProvider(services, configure?)` registers both `HybridCacheIdempotencyProvider` and `IdempotencyKeyMiddleware` as scoped services.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`IdempotencyKeyMiddleware`](./IdempotencyKeyMiddleware.cs)** | `IMiddleware` that reads `[IdempotencyKeyAttribute]` from endpoint metadata and dispatches to `IIdempotencyProvider.OnInvokeAsync`. |
+| **[`HybridCacheIdempotencyProvider`](./HybridCacheIdempotencyProvider.cs)** | `IIdempotencyProvider` backed by `IHybridCache`; stores response body, headers, status code, and content type; marks in-flight requests as `Processing`. |
+| **[`IdempotencyStatus`](./IdempotencyStatus.cs)** | Enum: `None`, `Processing`, `Completed` — tracks the lifecycle of a cached idempotency entry. |
+| **[`IdempotencyProviderInvoker`](./IdempotencyProviderInvoker.cs)** | `InvokerBase<HybridCacheIdempotencyProvider>` wrapping provider executions with OpenTelemetry spans. |
+| [`IIdempotencyProvider`](./IIdempotencyProvider.cs) | Single-method pluggable interface: `OnInvokeAsync(IdempotencyKeyAttribute, HttpContext, RequestDelegate)`. |
+| [`IdempotencyKey`](./IdempotencyKey.cs) | Internal static helpers for cache key construction and response capture/replay. |
+
+## Related Namespaces
+
+- **[`CoreEx.AspNetCore.Mvc`](../Mvc/README.md)** - `[IdempotencyKeyAttribute]` is defined in `Mvc`; it is discovered from endpoint metadata by `IdempotencyKeyMiddleware`.
+- **[`CoreEx.Caching`](../../CoreEx/Caching/README.md)** - `IHybridCache` is the cache abstraction used by `HybridCacheIdempotencyProvider`.
+- **[`CoreEx.Http`](../../CoreEx/Http/README.md)** - `HttpNames.IdempotencyKeyHeaderName` (`x-idempotency-key`) is the agreed header name read by the provider.
+- **[`CoreEx.Invokers`](../../CoreEx/Invokers/README.md)** - `IdempotencyProviderInvoker` extends `InvokerBase` to emit spans for idempotency provider executions.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/AcceptsAttribute.cs b/src/CoreEx.AspNetCore/Mvc/AcceptsAttribute.cs
new file mode 100644
index 00000000..794da859
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/AcceptsAttribute.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// An attribute that specifies the expected request <b>body</b> <see cref="Type"/> that the action/operation accepts and the supported request content types.
+/// </summary>
+/// <remarks>The is used to enable <i>OpenApi</i> generated documentation where the operation does not explicitly define the body as a method parameter; i.e. via <see cref="Microsoft.AspNetCore.Mvc.FromBodyAttribute"/>.</remarks>
+/// <param name="type">The request <b>body</b> <see cref="Type"/>; defaults to <see cref="MediaTypeNames.Application.Json"/>.</param>
+/// <param name="contentType">The primary request <b>body</b> content type.</param>
+/// <param name="additionalContentTypes">The additional request <b>body</b> content type(s).</param>
+[AttributeUsage(AttributeTargets.Method)]
+public class AcceptsAttribute(Type type, string? contentType = MediaTypeNames.Application.Json, params string[] additionalContentTypes) : Attribute
+{
+    /// <summary>
+    /// Gets the request <b>body</b> <see cref="Type"/>.
+    /// </summary>
+    public Type BodyType { get; } = type.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the primary request <b>body</b> content type.
+    /// </summary>
+    public string ContentType { get; } = contentType.ThrowIfNullOrEmpty();
+
+    /// <summary>
+    /// Gets the additional request <b>body</b> content type(s).
+    /// </summary>
+    public string[] AdditionalContentTypes { get; } = [.. additionalContentTypes];
+
+    /// <summary>
+    /// Indicates whether the request body is optional.
+    /// </summary>
+    public bool IsOptional { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/AcceptsAttributeT.cs b/src/CoreEx.AspNetCore/Mvc/AcceptsAttributeT.cs
new file mode 100644
index 00000000..f9e84280
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/AcceptsAttributeT.cs
@@ -0,0 +1,11 @@
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// An attribute that specifies the expected request <b>body</b> <see cref="Type"/> that the action/operation accepts and the supported request content types.
+/// </summary>
+/// <remarks>The is used to enable <i>OpenApi</i> generated documentation where the operation does not explicitly define the body as a method parameter; i.e. via <see cref="Microsoft.AspNetCore.Mvc.FromBodyAttribute"/>.</remarks>
+/// <typeparam name="TRequest">The request <b>body</b> <see cref="Type"/>.</typeparam>
+/// <param name="contentType">The primary request <b>body</b> content type.</param>
+/// <param name="additionalContentTypes">The additional request <b>body</b> content type(s).</param>
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class AcceptsAttribute<TRequest>(string? contentType = MediaTypeNames.Application.Json, params string[] additionalContentTypes) : AcceptsAttribute(typeof(TRequest), contentType, additionalContentTypes) { }
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/IdempotencyKeyAttribute.cs b/src/CoreEx.AspNetCore/Mvc/IdempotencyKeyAttribute.cs
new file mode 100644
index 00000000..b0ba45c3
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/IdempotencyKeyAttribute.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// Provides the attribute to indicate that the decorated operation is idempotent and should be handled accordingly.
+/// </summary>
+/// <param name="isRequired">Indicates whether an <see cref="HttpNames.IdempotencyKeyHeaderName"/> is required for the request.</param>
+[AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+public partial class IdempotencyKeyAttribute(bool isRequired = false) : Attribute
+{
+    /// <summary>
+    /// Indicates whether an <see cref="HttpNames.IdempotencyKeyHeaderName"/> is required for the request.
+    /// </summary>
+    public bool IsRequired { get; } = isRequired;
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/PagingAttribute.cs b/src/CoreEx.AspNetCore/Mvc/PagingAttribute.cs
new file mode 100644
index 00000000..558fde03
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/PagingAttribute.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// An attribute that specifies that the action/operation supports <see cref="PagingArgs"/> (not explicitly defined as a parameter).
+/// </summary>
+/// <remarks>The is used to enable <i>OpenAPI</i> generated documentation where the operation does not explicitly define the <see cref="PagingArgs"/> as a method parameter; i.e. via <see cref="Microsoft.AspNetCore.Mvc.FromQueryAttribute"/>.</remarks>
+/// <param name="supportsCount">Indicates whether <see cref="PagingArgs.IsCountRequested"/> is supported/enabled.</param>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+public sealed class PagingAttribute(bool supportsCount = false) : Attribute
+{
+    /// <summary>
+    /// Indicates whether the <see cref="PagingArgs.IsCountRequested"/> is supported.
+    /// </summary>
+    public bool SupportsCount { get; } = supportsCount;
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/ProducesNotFoundProblemAttribute.cs b/src/CoreEx.AspNetCore/Mvc/ProducesNotFoundProblemAttribute.cs
new file mode 100644
index 00000000..9bb5d25c
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/ProducesNotFoundProblemAttribute.cs
@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// An attribute that specifies that the action/operation may return a <see cref="HttpStatusCode.NotFound"/> <see cref="ProblemDetails"/> response. 
+/// </summary>
+/// <remarks>This is shorthand for specifying: <c>[ProducesResponseType(typeof(ProblemDetails), 200, MediaTypeNames.Application.ProblemJson)]</c>.</remarks>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+public sealed class ProducesNotFoundProblemAttribute : Attribute { }
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/QueryAttribute.cs b/src/CoreEx.AspNetCore/Mvc/QueryAttribute.cs
new file mode 100644
index 00000000..f6b3fb49
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/QueryAttribute.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// An attribute that specifies that the action/operation supports <see cref="QueryArgs"/> (not explicitly defined as a parameter).
+/// </summary>
+/// <remarks>The is used to enable <i>OpenApi</i> generated documentation where the operation does not explicitly define the <see cref="QueryArgs"/> as a method parameter; i.e. via <see cref="Microsoft.AspNetCore.Mvc.FromQueryAttribute"/>.</remarks>
+/// <param name="supportsFilter">Indicates whether <see cref="QueryArgs.Filter"/> is supported/enabled.</param>
+/// <param name="supportsOrderBy">Indicates whether <see cref="QueryArgs.OrderBy"/> is supported/enabled.</param>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+public sealed class QueryAttribute(bool supportsFilter = true, bool supportsOrderBy = false) : Attribute
+{
+    /// <summary>
+    /// Indicates whether the <see cref="QueryArgs.Filter"/> is supported.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/>.</remarks>
+    public bool SupportsFilter { get; } = supportsFilter;
+
+    /// <summary>
+    /// Indicates whether the <see cref="QueryArgs.OrderBy"/> is supported.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/>.</remarks>
+    public bool SupportsOrderBy { get; } = supportsOrderBy;
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/README.md b/src/CoreEx.AspNetCore/Mvc/README.md
new file mode 100644
index 00000000..be418b06
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/README.md
@@ -0,0 +1,38 @@
+# CoreEx.AspNetCore.Mvc
+
+> Provides `Mvc.WebApi` — the MVC (`IActionResult`-returning) concrete `WebApi<TResult>` implementation — along with MVC action attributes for paging, query, accepts, idempotency, and not-found responses that enrich OpenAPI/NSwag output.
+
+## Overview
+
+`CoreEx.AspNetCore.Mvc` contains the MVC-specific pieces of the CoreEx Web API layer. `Mvc.WebApi` extends `WebApi<IActionResult>` and implements `CreateResult(WebApiResult<IActionResult>)` to map every outcome — value, `null` (alternate status), or exception — to the appropriate `IActionResult`: `OkObjectResult`, `CreatedResult`, `NoContentResult`, or an RFC 7807 `ObjectResult(ProblemDetails)` with the correct HTTP status code.
+
+The namespace also provides a set of small, targeted MVC attributes. These carry metadata that NSwag operation processors read to inject paging query parameters, JSON schema accept types, idempotency-key request headers, and standard error response types (404, 409, etc.) into the generated OpenAPI document — without requiring controllers to declare every parameter and response code explicitly.
+
+## Key capabilities
+
+- 🎯 **MVC result creation**: `Mvc.WebApi.CreateResult` translates `WebApiResult<IActionResult>` to the full range of `IActionResult` types, including field-level `ValidationException` → `400 Bad Request` with `errors` extension, and `ConcurrencyException` → `412 Precondition Failed`.
+- 📑 **Paging attribute**: `[PagingAttribute]` marks operations that accept paging arguments via query string without declaring `PagingArgs` as an explicit method parameter; NSwag reads this to add `$skip`, `$take`, `$count`, `$page` query parameters to the spec.
+- 🔍 **Query attribute**: `[QueryAttribute]` marks operations that accept OData-style `$filter` / `$orderby` query arguments; NSwag adds the corresponding parameters.
+- ✅ **Accepts attribute**: `[AcceptsAttribute<T>]` declares the request body `Content-Type` and schema type for NSwag, replacing the need for `[Consumes]` with schema inference.
+- 🚫 **Not-found response attribute**: `[ProducesNotFoundProblem]` adds a `404 application/problem+json` response entry to the NSwag spec for operations that can return `NotFoundException`.
+- 🔑 **Idempotency key attribute**: `[IdempotencyKey]` marks a `POST` action as idempotent; `IdempotencyKeyMiddleware` reads this from endpoint metadata; NSwag adds the `x-idempotency-key` header parameter to the spec.
+- 🔧 **DI registration**: `AddMvcWebApi(services, configure?)` registers `Mvc.WebApi` as a scoped service.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`Mvc.WebApi`](./WebApi.cs)** | MVC `IActionResult`-returning `WebApi<IActionResult>` implementation; maps `WebApiResult` to `OkObjectResult`, `CreatedResult`, `NoContentResult`, `ObjectResult(ProblemDetails)`, etc. |
+| **[`Mvc.WebApiInvoker`](./WebApiInvoker.cs)** | `WebApiInvoker<IActionResult>` singleton providing OpenTelemetry spans for MVC `WebApi` invocations. |
+| **[`PagingAttribute`](./PagingAttribute.cs)** | Marks an operation as supporting `PagingArgs` via query string; NSwag reads `SupportsCount` to conditionally add `$count`. |
+| **[`QueryAttribute`](./QueryAttribute.cs)** | Marks an operation as accepting OData-style query arguments; NSwag adds `$filter`/`$orderby` parameters. |
+| **[`AcceptsAttribute`](./AcceptsAttribute.cs)** | Declares the request body content type; generic `AcceptsAttribute<T>` adds schema type inference for NSwag. |
+| **[`ProducesNotFoundProblemAttribute`](./ProducesNotFoundProblemAttribute.cs)** | Adds `404 application/problem+json` to the NSwag operation response list. |
+| **[`IdempotencyKeyAttribute`](./IdempotencyKeyAttribute.cs)** | Marks a POST action as idempotent; read by `IdempotencyKeyMiddleware` and NSwag processor to add `x-idempotency-key` header. |
+
+## Related Namespaces
+
+- **[`CoreEx.AspNetCore.Abstractions`](../Abstractions/README.md)** - `WebApi<IActionResult>` base class providing all verb implementations inherited by `Mvc.WebApi`.
+- **[`CoreEx.AspNetCore.Idempotency`](../Idempotency/README.md)** - `IdempotencyKeyMiddleware` reads `[IdempotencyKeyAttribute]` from endpoint metadata to trigger idempotency handling.
+- **[`CoreEx.AspNetCore.Http`](../Http/README.md)** - Parallel Minimal API variant returning `IResult` instead of `IActionResult`.
+- **[`CoreEx.AspNetCore`](../README.md)** - `AddMvcWebApi()` DI extension and NSwag `OpenApiOptions` are defined in the root package.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/WebApi.cs b/src/CoreEx.AspNetCore/Mvc/WebApi.cs
new file mode 100644
index 00000000..29c156e7
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/WebApi.cs
@@ -0,0 +1,112 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Infrastructure;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// Provides the foundation (<see cref="HttpMethods.Get"/>, <see cref="HttpMethods.Post"/>, <see cref="HttpMethods.Put"/> and <see cref="HttpMethods.Delete"/>) ASP.NET Core MVC Web API execution encapsulation.
+/// </summary>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonDefaults"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/> for the <see cref="WebApi"/>.</param>
+/// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+/// <remarks>The <see cref="HttpMethods.Get"/> methods within can also be used for a <see cref="HttpMethods.Head"/> as it is essentially the same operation without a corresponding response; this distinction is handled internally.
+/// <para>Any <see cref="WebApiResult{TResult}.Exception"/> that is not an <see cref="IExtendedException"/> and not <see cref="IExtendedException.IsError"/> will be thrown.</para></remarks>
+public class WebApi(JsonSerializerOptions? jsonSerializerOptions = null, ILogger<WebApi>? logger = null, ExecutionContext? executionContext = null) : WebApi<IActionResult>(WebApiInvoker.Default, jsonSerializerOptions, logger, executionContext)
+{
+    /// <inheritdoc/>
+    internal override IActionResult CreateResult(WebApiResult<IActionResult> result)
+    {
+        static void AddExtensions(IDictionary<string, object?> extensions, IDictionary<string, object?> extended)
+        {
+            foreach (var kvp in extended)
+            {
+                extensions.TryAdd(kvp.Key, kvp.Value);
+            }
+        }
+
+        if (result.Result is not null)
+            return result.Result;
+
+        IExtendedException? eex = null;
+
+        if (result.Exception is not null)
+        {
+            if (!result.BypassExceptionLogging)
+            {
+                if (result.Exception is not IExtendedException reex || !reex.IsError)
+                {
+                    if (!ConvertUnhandledExceptionsToProblemDetails)
+                        throw result.Exception;
+
+                    // Treat the unhandled exception as an error.
+                    var logger = Logger ?? result.HttpResponse.HttpContext.RequestServices.GetRequiredService<ILogger<WebApi>>();
+                    if (logger.IsEnabled(LogLevel.Error))
+                        logger.LogError(result.Exception, "{Error}", result.Exception.Message);
+                }
+                else
+                {
+                    // Log the exception where required.
+                    eex = reex;
+                    var logger = Logger ?? result.HttpResponse.HttpContext.RequestServices.GetRequiredService<ILogger<WebApi>>();
+                    if (eex.ShouldBeLogged && logger.IsEnabled(LogLevel.Error))
+                        logger.LogError(result.Exception, "{Error}", eex.Message);
+                }
+            }
+
+            var pdf = result.HttpResponse.HttpContext.RequestServices.GetRequiredService<ProblemDetailsFactory>();
+
+            // Special case where the exception is a ValidationException and has messages.
+            if (eex is ValidationException vex && vex.Messages is not null && vex.Messages.Count > 0)
+            {
+                var msd = new ModelStateDictionary();
+                foreach (var item in vex.Messages.GetMessagesForType(MessageType.Error))
+                {
+                    if (item.Property is not null && item.Text is not null)
+                        msd.AddModelError(item.Property, item.Text.ToString()!);
+                }
+
+                var vpd = pdf.CreateValidationProblemDetails(result.HttpResponse.HttpContext, msd, title: vex.Message, detail: vex.Detail);
+                AddExtensions(vpd.Extensions, CreateProblemDetailsExtensions(eex));
+                if (eex.HasExtensions)
+                    AddExtensions(vpd.Extensions, eex.Extensions);
+
+                return new BadRequestObjectResult(vpd);
+            }
+
+            // Apply the Retry-After header where applicable.
+            if (eex is not null && eex.RetryAfter.HasValue)
+                new WebApiHeader { RetryAfter = eex.RetryAfter }.ApplyTo(this, result.HttpResponse);
+
+            // Convert and return exception as problem details
+            ProblemDetails pd;
+            if (eex is not null)
+            {
+                pd = pdf.CreateProblemDetails(result.HttpResponse.HttpContext, (int)eex.StatusCode, title: eex.Message, detail: eex.Detail);
+                AddExtensions(pd.Extensions, CreateProblemDetailsExtensions(eex));
+                if (eex.HasExtensions)
+                    AddExtensions(pd.Extensions, eex.Extensions);
+
+                return new ObjectResult(pd) { StatusCode = (int)eex.StatusCode };
+            }
+            else
+            {
+                var config = result.HttpResponse.HttpContext.RequestServices.GetRequiredService<IConfiguration>();
+                var include = Internal.GetConfigurationValue("CoreEx:AspNetCore:IncludeExceptionInProblemDetails", false, config);
+
+                if (include)
+                    pd = pdf.CreateProblemDetails(result.HttpResponse.HttpContext, (int)HttpStatusCode.InternalServerError, title: result.Exception.Message, detail: result.Exception.ToString());
+                else
+                    pd = pdf.CreateProblemDetails(result.HttpResponse.HttpContext, (int)HttpStatusCode.InternalServerError, title: new UnexpectedInternalException().Message, detail: null);
+
+                AddExtensions(pd.Extensions, CreateProblemDetailsExtensions(null));
+                return new ObjectResult(pd) { StatusCode = (int)HttpStatusCode.InternalServerError };
+            }
+        }
+
+        result.Headers?.ApplyTo(this, result.HttpResponse);
+        return result.Content is not null
+            ? new ContentResult { Content = result.Content, ContentType = result.ContentType ?? MediaTypeNames.Text.Plain, StatusCode = (int)result.StatusCode }
+            : new StatusCodeResult((int)result.StatusCode);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/Mvc/WebApiInvoker.cs b/src/CoreEx.AspNetCore/Mvc/WebApiInvoker.cs
new file mode 100644
index 00000000..ba3b227d
--- /dev/null
+++ b/src/CoreEx.AspNetCore/Mvc/WebApiInvoker.cs
@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Mvc;
+
+/// <summary>
+/// Provides the ASP.NET Core MVC Web API <see cref="WebApi{TResult}"/> invoker
+/// </summary>
+[InvokerName("CoreEx.AspNetCore.Mvc.WebApiInvoker")]
+public class WebApiInvoker : WebApiInvoker<IActionResult>
+{
+    private static WebApiInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="WebApiInvoker"/> instance.
+    /// </summary>
+    public static WebApiInvoker Default => ExecutionContext.GetService<WebApiInvoker>() ?? (_default ??= new WebApiInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/OpenApiOptions.cs b/src/CoreEx.AspNetCore/OpenApiOptions.cs
new file mode 100644
index 00000000..cadaf26e
--- /dev/null
+++ b/src/CoreEx.AspNetCore/OpenApiOptions.cs
@@ -0,0 +1,111 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Provides the <i>OpenAPI</i> generated specification configuration settings.
+/// </summary>
+public class OpenApiOptions
+{
+    /// <summary>
+    /// Gets or sets the <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    public JsonSerializerOptions? JsonSerializerOptions { get; set; } = JsonDefaults.SerializerOptions;
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.PagingSkipQueryStringName"/> and <see cref="HttpNames.PagingSkipHeaderName"/>descriptive text.
+    /// </summary>
+    public string PagingSkipText { get; set; } = "The zero-based offset of the first item to return where paging.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.PagingTakeQueryStringName"/> and <see cref="HttpNames.PagingTakeHeaderName"/> descriptive text.
+    /// </summary>
+    public string PagingTakeText { get; set; } = "The maximum number of items to return where paging.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.PagingCountQueryStringName"/> descriptive text.
+    /// </summary>
+    public string PagingCountText { get; set; } = "Indicates whether to also attempt to include the total of matching items where paging.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.PagingTotalCountHeaderName"/> descriptive text.
+    /// </summary>
+    public string PagingTotalCountText { get; set; } = "The total number of matching items (only returned when `count=true`) where paging.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.QueryFilterQueryStringName"/> descriptive text.
+    /// </summary>
+    public string QueryFilterText { get; set; } = "The OData-like query filter expression.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.QueryOrderByQueryStringName"/> descriptive text.
+    /// </summary>
+    public string QueryOrderByText { get; set; } = "The OData-like query order-by expression.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.IncludeFieldsQueryStringName"/> descriptive text.
+    /// </summary>
+    public string IncludeFieldsText { get; set; } = "The comma separated list of JSON field names to include only in the response.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.ExcludeFieldsQueryStringName"/> descriptive text.
+    /// </summary>
+    public string ExcludeFieldsText { get; set; } = "The comma separated list of JSON field names to exclude from the response.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.IdempotencyKeyHeaderName"/> descriptive text.
+    /// </summary>
+    public string IdempotencyKeyText { get; set; } = "The idempotency key to use for the request (must be between 8 and 128 characters in length and consist of only letters, numbers, hyphens and underscores).";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.WarningMessagesHeaderName"/> descriptive text.
+    /// </summary>
+    public string WarningMessagesText { get; set; } = "Additional resulting warning message(s) where applicable.";
+
+    /// <summary>
+    /// Gets or sets the <see cref="HttpNames.InfoMessagesHeaderName"/> descriptive text.
+    /// </summary>
+    public string InfoMessagesText { get; set; } = "Additional resulting informational message(s) where applicable.";
+
+    /// <summary>
+    /// Indicates whether the <see cref="HttpNames.WarningMessagesHeaderName"/> and <see cref="HttpNames.InfoMessagesHeaderName"/> response headers should be included in the <i>OpenAPI</i> generated specification.
+    /// </summary>
+    public bool IncludeMessagesResponseHeaders { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the 
+    /// </summary>
+    public bool IncludeFieldsRequestHeaders { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the <see cref="HttpNames.PagingSkipHeaderName"/>, <see cref="HttpNames.PagingTakeHeaderName"/>, and <see cref="HttpNames.PagingTotalCountHeaderName"/> response headers should be included in the <i>OpenAPI</i> generated specification
+    /// where the operation is a success (i.e. <see cref="HttpResponseMessage.StatusCode"/> is within the range 200-299).
+    /// </summary>
+    /// <remarks>The underlying operation must also have the <see cref="Mvc.PagingAttribute"/> metadata assigned.</remarks>
+    public bool IncludePagingResponseHeaders { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/> should be included in the <i>OpenAPI</i> generated operation response specification for each <see cref="HttpStatusCode"/> specified within the <see cref="ProblemDetailsHttpStatusCodes"/>.
+    /// </summary>
+    public bool IncludeProblemDetailsHttpStatusCodes { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether the <see cref="Microsoft.AspNetCore.Mvc.ValidationProblemDetails"/> should be included in the <i>OpenAPI</i> generated operation response specification for each <see cref="HttpStatusCode"/> specified within the <see cref="ValidationProblemDetailsHttpStatusCodes"/>.
+    /// </summary>
+    public bool IncludeValidationProblemDetailsHttpStatusCodes { get; set; } = true;
+
+    /// <summary>
+    /// Gets the <see cref="HttpStatusCode"/> list that are related to a <see cref="Microsoft.AspNetCore.Mvc.ProblemDetails"/>.
+    /// </summary>
+    public List<HttpStatusCode> ProblemDetailsHttpStatusCodes { get; } =
+    [
+        HttpStatusCode.Unauthorized,
+        HttpStatusCode.Forbidden,
+        HttpStatusCode.Conflict,
+        HttpStatusCode.PreconditionFailed,
+        HttpStatusCode.ServiceUnavailable
+    ];
+
+    /// <summary>
+    /// Gets the <see cref="HttpStatusCode"/> list that are related to a <see cref="Microsoft.AspNetCore.Mvc.ValidationProblemDetails"/>.
+    /// </summary>
+    public List<HttpStatusCode> ValidationProblemDetailsHttpStatusCodes { get; } = [HttpStatusCode.BadRequest];
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/README.md b/src/CoreEx.AspNetCore/README.md
index 60ab6263..da997b91 100644
--- a/src/CoreEx.AspNetCore/README.md
+++ b/src/CoreEx.AspNetCore/README.md
@@ -1,258 +1,63 @@
-# CoreEx.AspNetCore
+# CoreEx.AspNetCore
 
-The `CoreEx.AspNetCore` namespace provides extended capabilities to build Web APIs, for the likes of [ASP.NET](https://dotnet.microsoft.com/en-us/apps/aspnet/apis) or [HTTP-triggered Azure functions](https://docs.microsoft.com/en-us/azure/azure-functions/functions-bindings-http-webhook-trigger). The [`WebApi`](./WebApis/WebApi.cs) and [`WebApiPublisher`](./WebApis/WebApiPublisher.cs) capabilities (within the `CoreEx.AspNetCore.WebApis` namespace)  encapsulate the consistent handling of the HTTP request and corresponding response, whilst also providing additional capabilities that are not available out-of-the-box within the .NET runtime.
+> Provides the ASP.NET Core integration layer for CoreEx: the `WebApi` execution helper (MVC and Minimal API variants), middleware for `ExecutionContext` scoping and exception-to-ProblemDetails translation, idempotency key handling, health check configuration, and OpenAPI/NSwag extensions.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.AspNetCore` is the server-side HTTP integration package. It bridges CoreEx domain logic — semantic exceptions, `Result<T>` pipelines, paging, entity contracts — into ASP.NET Core HTTP responses, following RFC 7807 ProblemDetails conventions throughout.
 
-To standardize, and simplify, the development of JSON-based Web APIs. The key integration patterns currently being addressed are as follows:
+The centrepiece is `WebApi`, which controllers and Minimal API handlers inject and call (`GetAsync`, `PostAsync`, `PutAsync`, `PatchAsync`, `DeleteAsync`). `WebApi` handles request body deserialization, `ETag`/`If-Match` concurrency checking, `Result<T>` unwrapping, paging header stamping, info/warning message header propagation, and exception-to-`ProblemDetails` translation — all in a single invocation boundary so individual action methods stay focused on business logic.
 
-Pattern | Description | Capability
--|-|-
-Request-response | This represents a real-time request-response, whereby the request is immediately fulfilled (synchronous) with the response representing the result of the request. | [WebApi](#webapi)
-Fire-and-forget | This is to enable decoupled asynchronous processing, whereby the request is immediately accepted (queued internally), with a separate internal process that fulfils the request independently of the request. | [WebApiPublish](#webapipublish)
+Two concrete `WebApi` implementations ship: `Mvc.WebApi` returning `IActionResult` for MVC controllers, and `Http.WebApi` returning `IResult` for Minimal API endpoints. Both share the same abstract base (`WebApi<TResult>`) and invoker infrastructure.
 
-<br/>
+## Key capabilities
 
-## Limitations
+- 🌐 **WebApi execution helper**: `WebApi` encapsulates GET/HEAD, POST (with idempotency), PUT, PATCH (JSON Merge Patch), and DELETE patterns with standardized request validation, deserialization, ETag checks, and response serialization.
+- 📄 **RFC 7807 ProblemDetails**: All `IExtendedException` types (`ValidationException`, `NotFoundException`, `ConcurrencyException`, etc.) are translated to typed `ProblemDetails` responses with appropriate HTTP status codes and optional field-level `errors` extension.
+- 🔁 **JSON Merge Patch (PATCH)**: `WebApi.PatchAsync` reads the request body as a merge-patch document, deserializes the current entity via a provided function, applies the patch, and re-validates before saving.
+- ⚙️ **ExecutionContext middleware**: `ExecutionContextMiddleware` resolves the DI-scoped `ExecutionContext` per request, wires `ServiceProvider`, and propagates info/warning messages to response headers on completion.
+- 🛡️ **Idempotency key middleware**: `IdempotencyKeyMiddleware` + `[IdempotencyKey]` attribute intercepts `POST` operations, checks a pluggable `IIdempotencyProvider` for a prior response, and either replays the cached result or executes and caches the new one.
+- ♥ **Health check endpoints**: `HealthCheckOptions` configures `/health/live`, `/health/startup`, `/health/ready`, and `/health/detail` endpoints with tag-based filtering, JSON detail output, and per-endpoint enable/disable.
+- 🏷️ **MVC attributes**: `[PagingAttribute]`, `[QueryAttribute]`, `[AcceptsAttribute]`, `[ProducesNotFoundProblem]`, and `[IdempotencyKey]` enrich OpenAPI/NSwag output without cluttering action signatures.
+- 🔍 **OpenAPI extensions**: `OpenApiOptions` and `AspNetCoreExtensions` wire NSwag operation processors that read CoreEx MVC attributes and add paging/query parameters, idempotency-key headers, and standard error response types to the generated spec.
+- 📡 **OpenTelemetry**: `CoreExAspNetCoreExtensions.AddCoreExAspNetCoreOpenTelemetry` wires CoreEx `WebApiInvoker` activity sources into the OTEL tracer provider.
 
-Only JSON-based Web APIs are generally supported. Where additional or other content types are needed then this library in its current state will not be able to enable, and these Web APIs will need to be implemented in a traditional custom manner.
+## Key types
 
-There is provision such that any result of type [`IActionResult`](https://learn.microsoft.com/en-us/aspnet/core/web-api/action-return-types), for example [`FileContentResult`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.filecontentresult), is returned these will be enacted by the ASP.NET Core runtime as-is (i.e. no `CoreEx.AspNetCore` processing will occur on the result). However, all other request handling, exception handling, logging, etc. described below will occur which has a consistency benefit.
+| Type | Description |
+|------|-------------|
+| **[`Mvc.WebApi`](./Mvc/WebApi.cs)** | MVC `IActionResult`-returning Web API helper; injected into controllers for typed GET/POST/PUT/PATCH/DELETE handling. |
+| **[`Http.WebApi`](./Http/WebApi.cs)** | Minimal API `IResult`-returning Web API helper; used in `MapGet`/`MapPost` etc. endpoint delegates. |
+| **[`ExecutionContextMiddleware`](./ExecutionContextMiddleware.cs)** | Per-request `ExecutionContext` scoping, optional custom configuration, and info/warning message response header propagation. |
+| **[`ExceptionHandlingMiddleware`](./ExceptionHandlingMiddleware.cs)** | `UseExceptionHandler` callback that converts unhandled exceptions to `ProblemDetails` using the ambient `WebApi` instance. |
+| **[`IdempotencyKeyMiddleware`](./Idempotency/IdempotencyKeyMiddleware.cs)** | Middleware that checks `[IdempotencyKey]`-marked endpoints and delegates to `IIdempotencyProvider` for replay/cache. |
+| **[`HybridCacheIdempotencyProvider`](./Idempotency/HybridCacheIdempotencyProvider.cs)** | `IIdempotencyProvider` backed by `IHybridCache`; stores serialized responses keyed by `x-idempotency-key` with configurable expiry. |
+| **[`HealthCheckOptions`](./HealthChecks/HealthCheckOptions.cs)** | Configures live/startup/ready/detail health check endpoint paths, tag filters, and JSON detail writer; registered via `MapCoreExHealthChecks()`. |
+| **[`WebApiOptions`](./WebApiOptions.cs)** | Per-request options controlling response status code, `ETag`, location header, paging, and alternate status code behavior. |
+| **[`OpenApiOptions`](./OpenApiOptions.cs)** | NSwag/OpenAPI document-processor and operation-processor registration for CoreEx paging, query, accepts, and idempotency attributes. |
+| [`WebApiBase`](./Abstractions/WebApiBase.cs) | Abstract base for both `WebApi<TResult>` variants: holds `JsonSerializerOptions`, `Logger`, `ExecutionContext`, and `ConvertUnhandledExceptionsToProblemDetails` flag. |
 
-<br/>
+## Namespaces
 
-## WebApi
+| Namespace | Description |
+|-----------|-------------|
+| [**`Abstractions`**](./Abstractions/README.md) | Abstract `WebApi<TResult>` base, `WebApiInvoker<TResult>`, `WebApiResult<TResult>`, `WebApiPagingResult`, and request/response option interfaces. |
+| [**`HealthChecks`**](./HealthChecks/README.md) | `HealthCheckOptions` and endpoint registration extensions for live/startup/ready/detail health probes. |
+| [**`Http`**](./Http/README.md) | Minimal API `WebApi` (`IResult`-returning) and its `WebApiInvoker`. |
+| [**`Idempotency`**](./Idempotency/README.md) | `IIdempotencyProvider`, `IdempotencyKeyMiddleware`, `HybridCacheIdempotencyProvider`, and `IdempotencyStatus`. |
+| [**`Mvc`**](./Mvc/README.md) | MVC `WebApi` (`IActionResult`-returning), MVC attributes (`[PagingAttribute]`, `[QueryAttribute]`, `[IdempotencyKey]`, `[Accepts]`, `[ProducesNotFoundProblem]`), and `WebApiInvoker`. |
 
-The [`WebApi`](./WebApis/WebApi.cs) class should be leveraged as the primary means to enable Web API functionality, it provides methods for HTTP `GET`, `POST`, `PUT`, `PATCH` and `DELETE` operations that encapsulates the execution in a standardized manner, providing alternate overloads and options to enable the desired behaviours.
+## Related Namespaces
 
-The `WebApi` extends (inherits) [`WebApiBase`](./WebApis/WebApiBase.cs) that provides the base `RunAsync` method that all other methods invoke to wrap the underlying logic. This in turns invokes the [`WebApiInvoker`](./WebApis/WebApiInvoker.cs) which provides a pluggable mechanism (i.e. can be replaced) that by default handles the following consistently for each request:
+- **[`CoreEx`](../CoreEx/README.md)** - Semantic exceptions, `ExecutionContext`, `Result<T>`, and `PagingArgs` are the domain primitives translated by this package into HTTP responses.
+- **[`CoreEx.Http`](../CoreEx.Http/README.md)** - Client-side `TypedHttpClientBase<TSelf>` consumes `ProblemDetails` responses produced by this package; `HttpNames` defines the shared header/query-string constants.
+- **[`CoreEx.Validation`](../CoreEx.Validation/README.md)** - `ValidationException` raised by validators is translated to `400 Bad Request` with a field-level `errors` extension in `ProblemDetails`.
 
-- Infers the standard [`WebApiRequestOptions`](./WebApis/WebApiRequestOptions.cs) from the HTTP request headers and query string (names are configurable).
-- Infers the correlation identifier from the HTTP request header (names are configurable).
-- Begins a logging scope to include the correlation identifier.
-- Invokes the request logic and returns the corresponding [`IActionResult`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.iactionresult).
-- Handle all exceptions:
-  - Where the exception implements [`IExtendedException`](../CoreEx/Abstractions/IExtendedException.cs) then returns `IExtendedException.ToResult()`. Also, where `IExtendedException.ShouldBeLogged` is `true` then a `ILogger.LogError` will occur; some errors, such as `400-BadRequest`, need not be logged as they are not a run-time error per se.
-  - Invoke the protected `OnUnhandledExceptionAsync` then return resulting `IActionResult` where not `null`.
+## Additional Resources
 
-<br/>
+- [RFC 7807 — Problem Details for HTTP APIs](https://tools.ietf.org/html/rfc7807) - The specification implemented by `WebApi` exception handling.
+- [ASP.NET Core Health Checks](https://learn.microsoft.com/en-us/aspnet/core/host-and-deploy/health-checks) - The underlying infrastructure extended by `HealthCheckOptions`.
 
-### Supported HTTP methods
+## AI Usage Guide
 
-`WebApi` provides the following per HTTP method; each with varying overloads depending on need. Where a generic `Type` is specified, either `TValue` being the request content body and/or `TResult` being the response body, this signifies that `WebApi` will manage the underlying JSON serialization:
-
-HTTP | Method | Description
--|-|-
-`GET` | `GetAsync<TResult>()` | Performs a `GET` operation. 
-`POST` | `PostAsync()` <br/> `PostAsync<TValue>()` <br/> `PostAsync<TResult>()` <br/> `Post<TValue, TResult>()` | Performs a `POST` operation.
-`PUT` | `PutAsync<TValue>()` <br/> `PutAsync<TValue, TResult>()` | Performs a `PUT` operation.
-`PATCH` | `PatchAsync<TValue>` | Performs a `PATCH` operation. Support for [`application/merge-patch+json`](https://tools.ietf.org/html/rfc7396) with [`JsonMergePatch`](../CoreEx/Json/Merge/JsonMergePatch.cs).
-`DELETE` | `DeleteAsync()` | Performs a `DELETE` operation.
-`*` | `RunAsync()` <br/> `RunAsync<TValue>()` | Performs _any_ operation returning an `IActionResult`.
-
-<br/>
-
-### Request
-
-Where a request contains a content body that contains JSON (content-type of `application/json`) then these methods _can_ (where the `TValue` is defined) perform the deserialization using the appropriate [`IJsonSerailizer`](../CoreEx/Json/IJsonSerializer.cs). The corresponding [`WebApiRequestOptions`](./WebApis/WebApiRequestOptions.cs) are also automatically inferred as described above.
-
-Where using `CoreEx` to perform the JSON deserialization then the value is _not_ specified as an argument within the method (typically with the [`FromBody`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.mvc.frombodyattribute) attribute). However, this will mean that the value type is not output when _Swagger_ output is generated; to enable, use the [`AcceptsBody`](./WebApis/AcceptsBodyAttribute.cs) attribute to specify. 
-
-<br/>
-
-### Response
- 
-Where a `TResult` value is returned then these methods will perform the JSON serialization, using the appropriate `IJsonSerailizer`. This is managed by the underlying [`ValueContentResult.CreateResult`](./WebApis/ValueContentResult.cs) which additionally performs the following:
-
-Step | Description
--|-
-[`PagingResult`](../CoreEx/Entities/PagingResult.cs) headers | Where response value is [`ICollectionResult`](..//CoreEx/Entities/ICollectionResult.cs) then sets `PagingResult` headers and returns underlying collection (`ICollectionResult.Collection`).
-JSON serialization | Serializes the `TResult` value using the `IJsonSerailizer`. Where include or exclude fields were specified within the request query string then these will be applied (`IJsonSerializer.TryApplyFilter`) to the JSON response to limit the response content.
-`ETag` generation | Checks if value implements [`IETag`](../CoreEx/Entities/IETag.cs), where non-null leave as-is; otherwise, automatically [generate](../CoreEx/Abstractions/ETagGenerator.cs) `ETag` hash from serialized value (excluding filters).
-`GET` [`If-Match`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-Match) | Where the value/generated `ETag` equals the `GET` request `If-Match` value then return an HTTP status code of `304-NotModified` with no content.
-[`ETag`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/ETag) header | Sets the HTTP `ETag` header using either `IETag.ETag` or generated hash.
-[Status code](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status) | Sets the response HTTP status code as configured.
-[`Location`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Location) | Sets the HTTP `Location` header where specified (where applicable).
-
-As described earlier, the above will _not_ occur for `IActionResult` results.
-
-<br/>
-
-### ASP.NET example
-
-The following demonstrates usage when creating an ASP.NET `Controller`:
-
-``` csharp
-[Route("api/employees")]
-public class EmployeeController : ControllerBase
-{
-    private readonly WebApi _webApi;
-    private readonly EmployeeService _service;
-
-    public EmployeeController(WebApi webApi, EmployeeService service)
-    {
-        _webApi = webApi;
-        _service = service;
-    }
-
-    [HttpGet("{id}", Name = "Get")]
-    public Task<IActionResult> GetAsync(Guid id)
-        => _webApi.GetAsync(Request, _ => _service.GetEmployeeAsync(id));
-
-    [HttpGet("", Name = "GetAll")]
-    public Task<IActionResult> GetAllAsync()
-        => _webApi.GetAsync(Request, p => _service.GetAllAsync(p.RequestOptions.Paging));
-
-    [HttpPost("", Name = "Create")]
-    public Task<IActionResult> CreateAsync()
-        => _webApi.PostAsync<Employee, Employee>(Request, p => _service.AddEmployeeAsync(p.Validate<Employee, EmployeeValidator>()),
-           statusCode: HttpStatusCode.Created, locationUri: e => new Uri($"api/employees/{e.Id}", UriKind.RelativeOrAbsolute));
-
-    [HttpPut("{id}", Name = "Update")]
-    public Task<IActionResult> UpdateAsync(Guid id)
-        => _webApi.PutAsync<Employee, Employee>(Request, p => _service.UpdateEmployeeAsync(p.Validate<Employee, EmployeeValidator>(), id));
-
-    [HttpPatch("{id}", Name = "Patch")]
-    public Task<IActionResult> PatchAsync(Guid id)
-        => _webApi.PatchAsync(Request, get: _ => _service.GetEmployeeAsync(id), put: p => _service.UpdateEmployeeAsync(p.Validate<Employee, EmployeeValidator>(), id));
-
-    [HttpDelete("{id}", Name = "Delete")]
-    public Task<IActionResult> DeleteAsync(Guid id)
-        => _webApi.DeleteAsync(Request, _ => _service.DeleteEmployeeAsync(id));
-```
-
-<br/>
-
-### Azure HTTP-triggered Function example
-
-The following demonstrates usage when creating an Azure HTTP-triggered Function (essentially the same `_webApi` invocation code to `Controller` above):
-
-``` csharp
-public class EmployeeFunction
-{
-    private readonly WebApi _webApi;
-    private readonly EmployeeService _service;
-
-    public EmployeeFunction(WebApi webApi, EmployeeService service)
-    {
-        _webApi = webApi;
-        _service = service;
-    }
-
-    [FunctionName("Get")]
-    public Task<IActionResult> GetAsync([HttpTrigger(AuthorizationLevel.Function, "get", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.GetAsync(request, _ => _service.GetEmployeeAsync(id));
-
-    [FunctionName("GetAll")]
-    public Task<IActionResult> GetAllAsync([HttpTrigger(AuthorizationLevel.Function, "get", Route = "api/employees")] HttpRequest request)
-        => _webApi.GetAsync(request, p => _service.GetAllAsync(p.RequestOptions.Paging));
-
-    [FunctionName("Create")]
-    public Task<IActionResult> CreateAsync([HttpTrigger(AuthorizationLevel.Function, "post", Route = "api/employees")] HttpRequest request)
-        => _webApi.PostAsync<Employee, Employee>(request, p => _service.AddEmployeeAsync(p.Validate<Employee, EmployeeValidator>()),
-           statusCode: HttpStatusCode.Created, locationUri: e => new Uri($"api/employees/{e.Id}", UriKind.RelativeOrAbsolute));
-
-    [FunctionName("Update")]
-    public Task<IActionResult> UpdateAsync([HttpTrigger(AuthorizationLevel.Function, "put", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.PutAsync<Employee, Employee>(request, p => _service.UpdateEmployeeAsync(p.Validate<Employee, EmployeeValidator>(), id));
-
-    [FunctionName("Patch")]
-    public Task<IActionResult> PatchAsync([HttpTrigger(AuthorizationLevel.Function, "patch", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.PatchAsync(request, get: _ => _service.GetEmployeeAsync(id), put: p => _service.UpdateEmployeeAsync(p.Validate<Employee, EmployeeValidator>(), id));
-
-    [FunctionName("Delete")]
-    public Task<IActionResult> DeleteAsync([HttpTrigger(AuthorizationLevel.Function, "delete", Route = "api/employees/{id}")] HttpRequest request, Guid id)
-        => _webApi.DeleteAsync(request, _ => _service.DeleteEmployeeAsync(id));
-```
-
-<br/>
-
-## WebApiPublish
-
-The [`WebApiPublisher`](./WebApis/WebApiPublisher.cs) class should be leveraged for _fire-and-forget_ style APIs, where the message is received, validated and then published as an event for out-of-process decoupled processing.
-
-The `WebApiPublish` extends (inherits) [`WebApiBase`](./WebApis/WebApiBase.cs) that provides the base `RunAsync` method described [above](#WebApi).
-
-The `WebApiPublisher` constructor takes an [`IEventPublisher`](../CoreEx/Events/IEventPublisher.cs) that is responsible for formatting and sending the event to the requisite messaging platform. See [Events](./CoreEx/Events) for more information regarding events.
-
-<br/>
-
-### Supported HTTP methods
-
-A publish should be performed using an HTTP `POST` and as such this is the only HTTP method supported. The `WebApiPublish` provides the following overloads depending on need.
-
-HTTP | Method | Description
--|-|-
-`POST` | `PublishAsync<TValue>()` | Publish a single message/event with `TValue` being the request content body.
-`POST` | `PublishValueAsync<TValue>()` | Publish a single message/event with `TValue` being the specified value (preivously deserialized).
-`POST` | `PublishAsync<TValue, TEventValue>()` | Publish a single message/event with `TValue` being the request content body mapping to the specified event value type.
-`POST` | `PublishValueAsync<TValue, TEventValue>()` | Publish a single message/event with `TValue` being the specified value (preivously deserialized) mapping to the specified event value type.
-- | -
-`POST` | `PublishCollectionAsync<TColl, TItem>()` | Publish zero or more message/event(s) from the `TColl` collection with an item type of `TItem` being the request content body.
-`POST` | `PublishCollectionValueAsync<TColl, TItem>()` | Publish zero or more message/event(s) from the `TColl` collection with an item type of `TItem` being the specified value (preivously deserialized).
-`POST` | `PublishCollectionAsync<TColl, TItem, TEventItem>()` | Publish zero or more message/event(s) from the `TColl` collection with an item type of `TItem` being the request content body mapping to the specified event value type.
-`POST` | `PublishCollectionValueAsync<TColl, TItem, TEventItem>()` | Publish zero or more message/event(s) from the `TColl` collection with an item type of `TItem` being the specified value (preivously deserialized) mapping to the specified event value type.
-
-<br/>
-
-### Argument
-
-Depending on the overload used (as defined above), an optional _argument_ can be specified that provides additional opportunities to configure and add additional logic into the underlying publishing orchestration.
-
-The following argurment types are supported:
-- [`WebApiPublisherArgs<TValue>`](./WebApis/WebApiPublisherArgsT.cs) - single message with no mapping.
-- [`WebApiPublisherArgs<TValue, TEventValue>`](./WebApis/WebApiPublisherArgsT2.cs) - single message _with_ [mapping](https://github.com/Avanade/CoreEx/tree/main/src/CoreEx/Mapping).
-- [`WebApiPublisherCollectionArgs<TColl, TItem>`](./WebApis/WebApiPublisherCollectionArgsT.cs) - collection of messages with no mapping.
-- [`WebApiPublisherCollectionArgs<TColl, TItem, TEventItem>`](./WebApis/WebApiPublisherCollectionArgsT2.cs) - collection of messages _with_ [mapping](https://github.com/Avanade/CoreEx/tree/main/src/CoreEx/Mapping).
-
-The arguments will have the following properties depending on the supported functionality. The sequence defines the order in which each of the properties is enacted (orchestrated) internally. Where a failure or exception occurs then the execution will be aborted and the corresponding `IActionResult` returned (including the likes of logging etc. where applicable).
-
-Property | Description | Sequence
--|-
-`EventName` | The event destintion name (e.g. Queue or Topic name) where applicable. | N/A
-`EventTemplate` | The [`EventData`](../CoreEx/Events/EventData.cs) template to be used to create the message/event. | N/A
-`StatusCode` | The resulting status code where successful. Defaults to `204-Accepted`. | N/A
-`OperationType` | The [`OperationType`](../CoreEx/OperationType.cs). Defaults to `OperationType.Unspecified`. | N/A
-`MaxCollectionSize` | The maximum collection size allowed/supported (where applicable). | 1
-`OnBeforeValidateAsync` | The function to be invoked before the request value is validated; opportunity to modify contents. | 2
-`Validator` | The `IValidator<T>` to validate the request value. | 3
-`OnBeforeEventAsync` | The function to be invoked after validation / before event; opportunity to modify contents. | 4
-`Mapper` | The `IMapper<TSource, TDestination>` override (where applicable). | 5
-`OnEvent` | The action to be invoked once converted to an [`EventData`](../CoreEx/Events/EventData.cs); opportunity to modify contents. | 6
-`CreateSuccessResult` | The function to be invoked to create/override the success `IActionResult`. Defaults to returning specified `StatusCode`. | 7
-
-<br/>
-
-### Request
-
-A request body is mandatory and must be serialized JSON as per the specified generic types.
-
-<br/>
-
-### Response
-
-The response HTTP status code is `204-Accepted` (default) with no content. This can be overridden using the arguments `StatusCode` property.
-
-<br/>
-
-### Azure HTTP-triggered Function example
-
-The following demonstrates usage when creating an Azure HTTP-triggered Function:
-
-``` csharp
-public class HttpTriggerQueueVerificationFunction
-{
-    private readonly WebApiPublisher _webApiPublisher;
-    private readonly HrSettings _settings;
-
-    public HttpTriggerQueueVerificationFunction(WebApiPublisher webApiPublisher, HrSettings settings)
-    {
-        _webApiPublisher = webApiPublisher;
-        _settings = settings;
-    }
-
-    public Task<IActionResult> RunAsync([HttpTrigger(AuthorizationLevel.Function, "post", Route = "employee/verify")] HttpRequest request)
-        => _webApiPublisher.PublishAsync(request, new WebApiPublisherArgs<EmployeeVerificationRequest>(_settings.VerificationQueueName) { Validator = new EmployeeVerificationValidator().Wrap() });
-}
\ No newline at end of file
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApiOptions.cs b/src/CoreEx.AspNetCore/WebApiOptions.cs
new file mode 100644
index 00000000..8012ea04
--- /dev/null
+++ b/src/CoreEx.AspNetCore/WebApiOptions.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Represents the <see cref="WebApi{TResult}"/> options.
+/// </summary>
+public sealed class WebApiOptions : WebApiOptionsBase
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiOptions"/> class.
+    /// </summary>
+    /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
+    public WebApiOptions(HttpRequest httpRequest) : base(httpRequest) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiOptions"/> class from an existing instance.
+    /// </summary>
+    /// <param name="options">The <see cref="WebApiOptionsBase"/>.</param>
+    public WebApiOptions(WebApiOptionsBase options) : base(options) { }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApiRequestOptions.cs b/src/CoreEx.AspNetCore/WebApiRequestOptions.cs
new file mode 100644
index 00000000..beecdf4e
--- /dev/null
+++ b/src/CoreEx.AspNetCore/WebApiRequestOptions.cs
@@ -0,0 +1,66 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Represents the <see cref="WebApi{TResult}"/> request options.
+/// </summary>
+/// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
+public sealed class WebApiRequestOptions<TRequest> : WebApiOptionsBase, IWebApiRequestOptions<TRequest>
+{
+    private static readonly LText _concurrencyMessage = new($"{typeof(WebApiOptionsBase).FullName}.IfMatchRequired" , "A concurrency error occurred; an ETag is required either as an IF-MATCH header (preferred) or specified within the request body (where supported).");
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiRequestOptions{T}"/> class.
+    /// </summary>
+    /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The deserialized request value.</param>
+    public WebApiRequestOptions(HttpRequest httpRequest, TRequest? value) : base(httpRequest)
+    {
+        ValueOrDefault = value;
+
+        // Override the ETag where specified as a request IF-MATCH header.
+        if (value is not null && ETag is not null && value is IETag etag)
+            etag.ETag = ETag;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiRequestOptions{T}"/> class from an existing instance.
+    /// </summary>
+    /// <param name="options">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="value">The deserialized request value.</param>
+    public WebApiRequestOptions(WebApiOptionsBase options, TRequest? value) : base(options)
+    {
+        ValueOrDefault = value;
+
+        // Override the ETag where specified as a request IF-MATCH header.
+        if (value is not null && ETag is not null && value is IETag etag)
+            etag.ETag = ETag;
+    }
+
+    /// <inheritdoc/>
+    public TRequest? ValueOrDefault { get; }
+
+    /// <inheritdoc/>
+    [NotNull]
+    public TRequest Value => ValueOrDefault.Required();
+
+    /// <inheritdoc/>
+    protected internal override Result Verify() => VerifyRequest(this, ValueOrDefault).Then(() => base.Verify());
+
+    /// <summary>
+    /// Enables standard verification of the <see cref="IWebApiRequestOptions{TRequest}.ValueOrDefault"/>, such as ensuring an ETag is provided for PUT and PATCH requests.
+    /// </summary>
+    /// <typeparam name="TOptions">The <see cref="WebApiOptionsBase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="options">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="value">The request value.</param>
+    /// <returns>The <see cref="Result"/> of the verification.</returns>
+    internal static Result VerifyRequest<TOptions>(TOptions options, TRequest? value) where TOptions : WebApiOptionsBase, IWebApiRequestOptions<TRequest>
+    {
+        if (HttpMethods.IsPut(options.Request.Method) || HttpMethods.IsPatch(options.Request.Method))
+        {
+            if (value is IETag etag && etag.ETag is null)
+                return Result.Fail(new ConcurrencyException(_concurrencyMessage).WithStatusCode(HttpStatusCode.PreconditionRequired));
+        }
+
+        return Result.Success;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApiRequestResponseOptions.cs b/src/CoreEx.AspNetCore/WebApiRequestResponseOptions.cs
new file mode 100644
index 00000000..f2d8a775
--- /dev/null
+++ b/src/CoreEx.AspNetCore/WebApiRequestResponseOptions.cs
@@ -0,0 +1,84 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Represents the <see cref="WebApi{TResult}"/> request and response options.
+/// </summary>
+/// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
+/// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
+public sealed class WebApiRequestResponseOptions<TRequest, TResponse> : WebApiOptionsBase, IWebApiRequestOptions<TRequest>, IWebApiResponseOptions<TResponse>
+{
+    private Func<TResponse, Uri>? _locationUri;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiRequestResponseOptions{TRequest, TResponse}"/> class.
+    /// </summary>
+    /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
+    /// <param name="value">The deserialized request value.</param>
+    public WebApiRequestResponseOptions(HttpRequest httpRequest, TRequest? value) : base(httpRequest) 
+    {
+        ValueOrDefault = value;
+
+        // Override the ETag where specified as a request IF-MATCH header.
+        if (value is not null && ETag is not null && value is IETag etag)
+            etag.ETag = ETag;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebApiRequestResponseOptions{TRequest, TResponse}"/> class from an existing instance.
+    /// </summary>
+    /// <param name="options">The <see cref="WebApiOptionsBase"/>.</param>
+    /// <param name="value">The deserialized request value.</param>
+    public WebApiRequestResponseOptions(WebApiOptionsBase options, TRequest? value) : base(options) 
+    {
+        ValueOrDefault = value;
+
+        // Override the ETag where specified as a request IF-MATCH header.
+        if (value is not null && ETag is not null && value is IETag etag)
+            etag.ETag = ETag;
+
+        // Override the location function;
+        if (options is IWebApiResponseOptions<TResponse> ro)
+            _locationUri = ro.LocationUri;
+    }
+
+    /// <inheritdoc/>
+    public TRequest? ValueOrDefault { get; }
+
+    /// <inheritdoc/>
+    [NotNull]
+    public TRequest Value => ValueOrDefault.Required();
+
+    /// <inheritdoc/>
+    Func<TResponse, Uri>? IWebApiResponseOptions<TResponse>.LocationUri => _locationUri;
+
+    /// <summary>
+    /// Sets (overrides) the response <see cref="IWebApiResponseOptions{TResponse}.LocationUri"/> to use the <paramref name="locationUri"/> function.
+    /// </summary>
+    /// <param name="locationUri">The function to return the <see cref="Uri"/> representing the location of the resource.</param>
+    /// <returns>The <see cref="WebApiRequestResponseOptions{TRequest, TResponse}"/> to support fluent-style method-chaining.</returns>
+    public WebApiRequestResponseOptions<TRequest, TResponse> WithLocationUri(Func<TResponse, Uri>? locationUri)
+    {
+        _locationUri = locationUri;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    Uri? IWebApiResponseOptions.CreateLocationUri(object? value)
+    {
+        // Check if there is a valued-version and invoke.
+        if (_locationUri is not null)
+        {
+            if (value is null)
+                throw new InvalidOperationException($"The resulting value cannot be null when {nameof(LocationUri)} is specified.");
+
+            var val = (TResponse)value;
+            return _locationUri(val);
+        }
+
+        // Invoke the default parameterless version.
+        return LocationUri?.Invoke();
+    }
+
+    /// <inheritdoc/>
+    protected internal override Result Verify() => WebApiRequestOptions<TRequest>.VerifyRequest(this, ValueOrDefault).Then(() => base.Verify());
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApiResponseOptions.cs b/src/CoreEx.AspNetCore/WebApiResponseOptions.cs
new file mode 100644
index 00000000..f6e58fdb
--- /dev/null
+++ b/src/CoreEx.AspNetCore/WebApiResponseOptions.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.AspNetCore;
+
+/// <summary>
+/// Represents the <see cref="WebApi{TResult}"/> response options.
+/// </summary>
+/// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
+/// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
+public sealed class WebApiResponseOptions<TResponse>(HttpRequest httpRequest) : WebApiOptionsBase(httpRequest), IWebApiResponseOptions<TResponse>
+{
+    private Func<TResponse, Uri>? _locationUri;
+
+    /// <inheritdoc/>
+    Func<TResponse, Uri>? IWebApiResponseOptions<TResponse>.LocationUri => _locationUri;
+
+    /// <summary>
+    /// Sets (overrides) the response <see cref="IWebApiResponseOptions{TResponse}.LocationUri"/> to use the <paramref name="locationUri"/> function.
+    /// </summary>
+    /// <param name="locationUri">The function to return the <see cref="Uri"/> representing the location of the resource.</param>
+    /// <returns>The <see cref="WebApiResponseOptions{TResponse}"/> to support fluent-style method-chaining.</returns>
+    public WebApiResponseOptions<TResponse> WithLocationUri(Func<TResponse, Uri>? locationUri)
+    {
+        _locationUri = locationUri;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    Uri? IWebApiResponseOptions.CreateLocationUri(object? value)
+    {
+        // Check if there is a valued-version and invoke.
+        if (_locationUri is not null)
+        {
+            if (value is null)
+                throw new InvalidOperationException($"The resulting value cannot be null when {nameof(LocationUri)} is specified.");
+
+            var val = (TResponse)value;
+            return _locationUri(val);
+        }
+
+        // Invoke the default parameterless version.
+        return LocationUri?.Invoke();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/AcceptsBodyAttribute.cs b/src/CoreEx.AspNetCore/WebApis/AcceptsBodyAttribute.cs
deleted file mode 100644
index 1813c122..00000000
--- a/src/CoreEx.AspNetCore/WebApis/AcceptsBodyAttribute.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Net.Mime;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// An attribute that specifies the expected request <b>body</b> <see cref="Type"/> that the action/operation accepts and the supported request content types.
-    /// </summary>
-    /// <remarks>The is used to enable <i>Swagger/Swashbuckle</i> generated documentation where the operation does not explicitly define the body as a method parameter; i.e. via <see cref="Microsoft.AspNetCore.Mvc.FromBodyAttribute"/>.</remarks>
-    /// <param name="type">The <b>body</b> <see cref="Type"/>.</param>
-    /// <param name="contentTypes">The <b>body</b> content type(s). Defaults to <see cref="MediaTypeNames.Application.Json"/>.</param>
-    /// <exception cref="ArgumentNullException"></exception>
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class AcceptsBodyAttribute(Type type, params string[] contentTypes) : Attribute
-    {
-        /// <summary>
-        /// Gets the <b>body</b> <see cref="Type"/>.
-        /// </summary>
-        public Type BodyType { get; } = type.ThrowIfNull(nameof(type));
-
-        /// <summary>
-        /// Gets the <b>body</b> content type(s).
-        /// </summary>
-        public string[] ContentTypes { get; } = contentTypes.Length == 0 ? [MediaTypeNames.Application.Json] : contentTypes;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/AcceptsBodyOperationFilter.cs b/src/CoreEx.AspNetCore/WebApis/AcceptsBodyOperationFilter.cs
deleted file mode 100644
index b94e5175..00000000
--- a/src/CoreEx.AspNetCore/WebApis/AcceptsBodyOperationFilter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Linq;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// A <i>Swagger/Swashbuckle</i> <see cref="IOperationFilter"/> to infer the <see cref="OpenApiRequestBody"/> from the specification of the <see cref="AcceptsBodyAttribute"/>.
-    /// </summary>
-    /// <remarks>The <see cref="AcceptsBodyOperationFilter"/> must be added when registering services (DI) during application startup; example as follows:
-    /// <code>
-    /// services.AddSwaggerGen(c =&gt; c.OperationFilter&lt;AcceptsBodyOperationFilter&gt;());
-    /// </code></remarks>
-    public sealed class AcceptsBodyOperationFilter : IOperationFilter
-    {
-        /// <summary>
-        /// Applies the filter.
-        /// </summary>
-        /// <param name="operation">The <see cref="OpenApiOperation"/>.</param>
-        /// <param name="context">The <see cref="OperationFilterContext"/>.</param>
-        public void Apply(OpenApiOperation operation, OperationFilterContext context)
-        {
-            // Inspired by: https://stackoverflow.com/questions/66171439/swagger-parameter-on-method-with-parameters-from-body-but-no-model-binding
-            var att = context.ApiDescription.CustomAttributes().OfType<AcceptsBodyAttribute>().FirstOrDefault();
-            if (att == null)
-                return;
-
-            var schema = context.SchemaGenerator.GenerateSchema(att.BodyType, context.SchemaRepository);
-            operation.RequestBody = new OpenApiRequestBody();
-            att.ContentTypes.ForEach(item => operation.RequestBody.Content.Add(item, new OpenApiMediaType { Schema = schema }));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/ExtendedContentResult.cs b/src/CoreEx.AspNetCore/WebApis/ExtendedContentResult.cs
deleted file mode 100644
index 0884fd82..00000000
--- a/src/CoreEx.AspNetCore/WebApis/ExtendedContentResult.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.AspNetCore.Http;
-using CoreEx.Entities;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents an extended <see cref="ContentResult"/> that enables customization of the <see cref="HttpResponse"/>.
-    /// </summary>
-    public class ExtendedContentResult : ContentResult, IExtendedActionResult
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders"/> <see cref="CoreEx.Http.HttpConsts.MessagesHeaderName"/> <see cref="MessageItemCollection"/>.
-        /// </summary>
-        /// <remarks>Defaults to the <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.Messages"/>.
-        /// <para><i>Note:</i> These are only written to the headers where the <see cref="ContentResult.StatusCode"/> is considered successful; i.e. is in the 200-299 range.</para></remarks>
-        public MessageItemCollection? Messages { get; set; } = ExecutionContext.HasCurrent && ExecutionContext.Current.HasMessages ? ExecutionContext.Current.Messages : null;
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public Func<HttpResponse, Task>? BeforeExtension { get; set; }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public Func<HttpResponse, Task>? AfterExtension { get; set; }
-
-        /// <inheritdoc/>
-        public override async Task ExecuteResultAsync(ActionContext context)
-        {
-            if (StatusCode >= 200 || StatusCode <= 299)
-                context.HttpContext.Response.Headers.AddMessages(Messages);
-
-            if (BeforeExtension != null)
-                await BeforeExtension(context.HttpContext.Response).ConfigureAwait(false);
-
-            await base.ExecuteResultAsync(context).ConfigureAwait(false);
-
-            if (AfterExtension != null)
-                await AfterExtension(context.HttpContext.Response).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/ExtendedStatusCodeResult.cs b/src/CoreEx.AspNetCore/WebApis/ExtendedStatusCodeResult.cs
deleted file mode 100644
index 4e903f74..00000000
--- a/src/CoreEx.AspNetCore/WebApis/ExtendedStatusCodeResult.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.AspNetCore.Http;
-using CoreEx.Entities;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents an extended <see cref="StatusCodeResult"/> that enables customization of the <see cref="HttpResponse"/>.
-    /// </summary>
-    /// <param name="statusCode">The status code value.</param>
-    public class ExtendedStatusCodeResult(int statusCode) : StatusCodeResult(statusCode), IExtendedActionResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExtendedStatusCodeResult"/> class with the specified <see cref="HttpStatusCode"/>.
-        /// </summary>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/>.</param>
-        public ExtendedStatusCodeResult(HttpStatusCode statusCode) : this((int)statusCode) { }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.
-        /// </summary>
-        public Uri? Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders"/> <see cref="CoreEx.Http.HttpConsts.MessagesHeaderName"/> <see cref="MessageItemCollection"/>.
-        /// </summary>
-        /// <remarks>Defaults to the <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.Messages"/>.
-        /// <para><i>Note:</i> These are only written to the headers where the <see cref="StatusCodeResult.StatusCode"/> is considered successful; i.e. is in the 200-299 range.</para></remarks>
-        public MessageItemCollection? Messages { get; set; } = ExecutionContext.HasCurrent && ExecutionContext.Current.HasMessages ? ExecutionContext.Current.Messages : null;
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public Func<HttpResponse, Task>? BeforeExtension { get; set; }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public Func<HttpResponse, Task>? AfterExtension { get; set; }
-
-        /// <inheritdoc/>
-        public override async Task ExecuteResultAsync(ActionContext context)
-        {
-            if (StatusCode >= 200 || StatusCode <= 299)
-                context.HttpContext.Response.Headers.AddMessages(Messages);
-
-            if (Location != null)
-                context.HttpContext.Response.GetTypedHeaders().Location = Location;
-
-            if (BeforeExtension != null)
-                await BeforeExtension(context.HttpContext.Response).ConfigureAwait(false);
-
-            await base.ExecuteResultAsync(context).ConfigureAwait(false);
-
-            if (AfterExtension != null)
-                await AfterExtension(context.HttpContext.Response).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/IExtendedActionResult.cs b/src/CoreEx.AspNetCore/WebApis/IExtendedActionResult.cs
deleted file mode 100644
index 0c1fc618..00000000
--- a/src/CoreEx.AspNetCore/WebApis/IExtendedActionResult.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Extends an <see cref="IActionResult"/> to enable customization of the resulting <see cref="HttpResponse"/> using the <see cref="BeforeExtension"/> and <see cref="AfterExtension"/> functions.
-    /// </summary>
-    public interface IExtendedActionResult : IActionResult
-    {
-        /// <summary>
-        /// Gets or sets the function to perform the extended <see cref="HttpResponse"/> customization.
-        /// </summary>
-        [JsonIgnore]
-        Func<HttpResponse, Task>? BeforeExtension { get; set; }
-
-        /// <summary>
-        /// Gets or sets the function to perform the extended <see cref="HttpResponse"/> customization.
-        /// </summary>
-        [JsonIgnore]
-        Func<HttpResponse, Task>? AfterExtension { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/IWebApiPublisherArgs.cs b/src/CoreEx.AspNetCore/WebApis/IWebApiPublisherArgs.cs
deleted file mode 100644
index f264fb9f..00000000
--- a/src/CoreEx.AspNetCore/WebApis/IWebApiPublisherArgs.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Hosting.Work;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Enables the <see cref="WebApiPublisher"/> arguments.
-    /// </summary>
-    /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TEventValue">The <see cref="EventData.Value"/> <see cref="Type"/> (where different then a <see cref="Mapper"/> will be required).</typeparam>
-    public interface IWebApiPublisherArgs<TValue, TEventValue>
-    {
-        /// <summary>
-        /// Indicates whether the <typeparamref name="TValue"/> and <typeparamref name="TEventValue"/> are the same <see cref="Type"/>.
-        /// </summary>
-        internal bool AreSameType => typeof(TValue) == typeof(TEventValue);
-
-        /// <summary>
-        /// Gets or sets the optional event destintion name (e.g. Queue or Topic name).
-        /// </summary>
-        /// <remarks>Will leverage either <see cref="IEventPublisher.Publish(EventData[])"/> or <see cref="IEventPublisher.PublishNamed(string, EventData[])"/> depending on whether name is specified or not.</remarks>
-        string? EventName { get; }
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="EventData"/> to use as a template when instantiating the <see cref="EventData"/> for publishing.
-        /// </summary>
-        /// <remarks>Will use the <see cref="EventData(EventDataBase)"/> constructor to copy from the template.</remarks>
-        EventData? EventTemplate { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpStatusCode"/> where successful.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpStatusCode.Accepted"/>.</remarks>
-        HttpStatusCode StatusCode { get; }
-
-        /// <summary>
-        /// Indicates whether the <typeparamref name="TValue"/> is required.
-        /// </summary>
-        bool ValueIsRequired { get; }
-
-        /// <summary>
-        /// Gets or sets the optional <typeparamref name="TValue"/> validator.
-        /// </summary>
-        IValidator<TValue>? Validator { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="CoreEx.OperationType"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="OperationType.Unspecified"/>.</remarks>
-        OperationType OperationType { get; }
-
-        /// <summary>
-        /// Gets or sets the on before validation <typeparamref name="TValue"/> function.
-        /// </summary>
-        /// <remarks>Enables the likes of security, value modification, etc., before validation. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        Func<WebApiParam<TValue>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; }
-
-        /// <summary>
-        /// Gets or sets the after validation / on before event <typeparamref name="TValue"/> function.
-        /// </summary>
-        /// <remarks>Enables the likes of security, value modification, etc., after validation. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        Func<WebApiParam<TValue>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventData"/> modifier function.
-        /// </summary>
-        /// <remarks>Enables the corresponding <see cref="EventData"/> to be modified prior to publish beyond the <see cref="EventTemplate"/> application.</remarks>
-        Action<EventData>? OnEvent { get; }
-
-        /// <summary>
-        /// Gets or sets the <typeparamref name="TValue"/> to <typeparamref name="TEventValue"/> <see cref="IMapper{TSource, TDestination}"/> override.
-        /// </summary>
-        /// <remarks>Where <c>null</c> the <see cref="WebApiPublisher.Mapper"/> will be used to get the corresponding <see cref="IMapper{TSource, TDestination}"/> instance to perform the underlying mapping.</remarks>
-        IMapper<TValue, TEventValue>? Mapper { get; }
-        
-        /// <summary>
-        /// Gets or sets the function to override the creation of the success <see cref="IActionResult"/>.
-        /// </summary>
-        /// <remarks>Defaults to a <see cref="ExtendedStatusCodeResult"/> using the defined <see cref="StatusCode"/>.</remarks>
-        Func<Task<IActionResult>>? CreateSuccessResultAsync { get; }
-
-        /// <summary>
-        /// Gets or sets the function to create the <see cref="Uri"/> for the <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/>.
-        /// </summary>
-        /// <remarks>
-        /// Where enabling the likes of the <i>asynchronous request-response</i> pattern then the <see cref="EventDataBase.Id"/> represents the <see cref="WorkState.Id"/> which is the unique identifier for the work instance and is therefore required.
-        /// <para>This will not be invoked automatically where the <see cref="CreateSuccessResultAsync"/> is overridden.</para></remarks>
-        Func<WebApiParam<TValue>, EventData, Uri>? CreateLocation { get; }
-
-        /// <summary>
-        /// Gets or sets the function to create the <see cref="WorkStateArgs"/>.
-        /// </summary>
-        /// <remarks><para>The <see cref="WorkStateArgs.Id"/> and <see cref="WorkStateArgs.CorrelationId"/> will be overridden by the <see cref="EventData"/> equivalents after creation to ensure consistencey; therefore, these properties need
-        /// not be set during create. The <see cref="WorkStateArgs.Key"/> will be set to the <see cref="EventDataBase.Key"/> where <c>null</c>, so also does not need to be explicitly set.</para>
-        /// An <see cref="InvalidOperationException"/> will occur where this is set and the corresponding <see cref="WebApiPublisher.WorkStateOrchestrator"/> is <c>null</c>. The combination of the two enables
-        /// the automatic create (<see cref="WorkStateOrchestrator.CreateAsync(WorkStateArgs, CancellationToken)"/>) of <see cref="WorkState"/> tracking to enable the likes of the <i>asynchronous request-response</i> pattern.</remarks>
-        Func<WorkStateArgs>? CreateWorkStateArgs { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/IWebApiPublisherCollectionArgs.cs b/src/CoreEx.AspNetCore/WebApis/IWebApiPublisherCollectionArgs.cs
deleted file mode 100644
index ed357fc0..00000000
--- a/src/CoreEx.AspNetCore/WebApis/IWebApiPublisherCollectionArgs.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Enables the <see cref="WebApiPublisher"/> collection-based arguments.
-    /// </summary>
-    /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TEventItem">The <typeparamref name="TItem"/>-equivalent <see cref="EventData.Value"/> <see cref="Type"/> (where different then a <see cref="Mapper"/> will be required).</typeparam>
-    public interface IWebApiPublisherCollectionArgs<TColl, TItem, TEventItem> where TColl : IEnumerable<TItem>
-    {
-        /// <summary>
-        /// Indicates whether the <typeparamref name="TItem"/> and <typeparamref name="TEventItem"/> are the same <see cref="Type"/>.
-        /// </summary>
-        internal bool AreSameType => typeof(TItem) == typeof(TEventItem);
-
-        /// <summary>
-        /// Gets or sets the optional event destintion name (e.g. Queue or Topic name).
-        /// </summary>
-        /// <remarks>Will leverage either <see cref="IEventPublisher.Publish(EventData[])"/> or <see cref="IEventPublisher.PublishNamed(string, EventData[])"/> depending on whether name is specified or not.</remarks>
-        string? EventName { get; }
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="EventData"/> to use as a template when instantiating the <see cref="EventData"/> for publishing.
-        /// </summary>
-        /// <remarks>Will use the <see cref="EventData(EventDataBase)"/> constructor to copy from the template.</remarks>
-        EventData? EventTemplate { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpStatusCode"/> where successful.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpStatusCode.Accepted"/>.</remarks>
-        HttpStatusCode StatusCode { get; }
-
-        /// <summary>
-        /// Gets or sets the maximum collection size.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="SettingsBase.MaxPublishCollSize"/>.</remarks>
-        int? MaxCollectionSize { get; }
-
-        /// <summary>
-        /// Gets or sets the optional validator
-        /// </summary>
-        IValidator<TColl>? Validator { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="CoreEx.OperationType"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="OperationType.Unspecified"/>.</remarks>
-        OperationType OperationType { get; }
-
-        /// <summary>
-        /// Gets or sets the on before validation <typeparamref name="TColl"/> modifier function.
-        /// </summary>
-        /// <remarks>Enables the value to be modified before validation. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        Func<WebApiParam<TColl>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; }
-
-        /// <summary>
-        /// Gets or sets the after validation / on before event <typeparamref name="TColl"/> modifier function.
-        /// </summary>
-        /// <remarks>Enables the value to be modified after validation. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        Func<WebApiParam<TColl>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventData"/> modifier function.
-        /// </summary>
-        /// <remarks>Enables the corresponding <see cref="EventData"/> to be modified prior to publish.</remarks>
-        Action<EventData>? OnEvent { get; }
-
-        /// <summary>
-        /// Gets or sets the <typeparamref name="TItem"/> to <typeparamref name="TEventItem"/> <see cref="IMapper{TSource, TDestination}"/> override.
-        /// </summary>
-        /// <remarks>Where <c>null</c> the <see cref="WebApiPublisher.Mapper"/> will be used to get the corresponding <see cref="IMapper{TSource, TDestination}"/> instance to perform the underlying mapping.</remarks>
-        IMapper<TItem, TEventItem>? Mapper { get; }
-
-        /// <summary>
-        /// Gets or sets the function to override the creation of the success <see cref="IActionResult"/>.
-        /// </summary>
-        /// <remarks>Defaults to a <see cref="ExtendedStatusCodeResult"/> using the defined <see cref="StatusCode"/>.</remarks>
-        Func<Task<IActionResult>>? CreateSuccessResultAsync { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/PagingAttribute.cs b/src/CoreEx.AspNetCore/WebApis/PagingAttribute.cs
deleted file mode 100644
index abd5c658..00000000
--- a/src/CoreEx.AspNetCore/WebApis/PagingAttribute.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// An attribute that specifies that the action/operation supports <see cref="PagingArgs"/> (not explicitly defined as a parameter).
-    /// </summary>
-    /// <remarks>The is used to enable <i>Swagger/Swashbuckle</i> generated documentation where the operation does not explicitly define the <see cref="PagingArgs"/> as a method parameter.</remarks>
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public class PagingAttribute : Attribute { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/PagingOperationFilter.cs b/src/CoreEx.AspNetCore/WebApis/PagingOperationFilter.cs
deleted file mode 100644
index 9367ef0c..00000000
--- a/src/CoreEx.AspNetCore/WebApis/PagingOperationFilter.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Http;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Linq;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// A <i>Swagger/Swashbuckle</i> <see cref="IOperationFilter"/> to add the <see cref="PagingArgs"/> parameters from the specification of the <see cref="PagingAttribute"/>.
-    /// </summary>
-    /// <remarks>The <see cref="PagingOperationFilter"/> must be added when registering services (DI) during application startup; example as follows:
-    /// <code>
-    /// services.AddSwaggerGen(c =&gt; c.OperationFilter&lt;PagingOperationFilter&gt;(PagingOperationFilterFields.SkipTakeCount));
-    /// </code>
-    /// </remarks>
-    public class PagingOperationFilter : IOperationFilter
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PagingOperationFilter"/> class with a default of <see cref="PagingOperationFilterFields.SkipTakeCount"/>.
-        /// </summary>
-        public PagingOperationFilter() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PagingOperationFilter"/> class with the selected <paramref name="fields"/>.
-        /// </summary>
-        /// <param name="fields">The <see cref="PagingOperationFilterFields"/>.</param>
-        public PagingOperationFilter(PagingOperationFilterFields fields) => Fields = fields;
-
-        /// <summary>
-        /// Gets the <see cref="PagingOperationFilterFields"/> to apply.
-        /// </summary>
-        public PagingOperationFilterFields Fields { get; } = PagingOperationFilterFields.SkipTakeCount;
-
-        /// <summary>
-        /// Applies the filter.
-        /// </summary>
-        /// <param name="operation">The <see cref="OpenApiOperation"/>.</param>
-        /// <param name="context">The <see cref="OperationFilterContext"/>.</param>
-        public void Apply(OpenApiOperation operation, OperationFilterContext context)
-        {
-            var att = context.ApiDescription.CustomAttributes().OfType<PagingAttribute>().FirstOrDefault();
-            if (att == null)
-                return;
-
-            if (Fields.HasFlag(PagingOperationFilterFields.Skip))
-                operation.Parameters.Add(CreateParameter(HttpConsts.PagingArgsSkipQueryStringName, "The specified number of elements in a sequence to bypass.", "number", "int64"));
-
-            if (Fields.HasFlag(PagingOperationFilterFields.Page))
-                operation.Parameters.Add(CreateParameter(HttpConsts.PagingArgsPageQueryStringName, "The page number for the elements in a sequence to select.", "number", "int64"));
-
-            if (Fields.HasFlag(PagingOperationFilterFields.Token))
-                operation.Parameters.Add(CreateParameter(HttpConsts.PagingArgsTokenQueryStringName, "The token to get the next page of elements.", "string"));
-
-            if (Fields.HasFlag(PagingOperationFilterFields.Take))
-                operation.Parameters.Add(CreateParameter(HttpConsts.PagingArgsTakeQueryStringName, "The specified number of contiguous elements from the start of a sequence.", "number", "int64"));
-
-            if (Fields.HasFlag(PagingOperationFilterFields.Size))
-                operation.Parameters.Add(CreateParameter(HttpConsts.PagingArgsSizeQueryStringName, "The page size being the specified number of contiguous elements from the start of a sequence.", "number", "int64"));
-
-            if (Fields.HasFlag(PagingOperationFilterFields.Count))
-                operation.Parameters.Add(CreateParameter(HttpConsts.PagingArgsCountQueryStringName, "Indicates whether to get the total count when performing the underlying query.", "boolean"));
-        }
-
-        /// <summary>
-        /// Create the parameter definition.
-        /// </summary>
-        internal static OpenApiParameter CreateParameter(string name, string description, string typeName, string? format = null) => new()
-        {
-            Name = name,
-            Description = description,
-            In = ParameterLocation.Query,
-            Required = false,
-            Schema = new OpenApiSchema { Type = typeName, Format = format }
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/PagingOperationFilterFields.cs b/src/CoreEx.AspNetCore/WebApis/PagingOperationFilterFields.cs
deleted file mode 100644
index ae802a7e..00000000
--- a/src/CoreEx.AspNetCore/WebApis/PagingOperationFilterFields.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Http;
-using System;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides the <see cref="PagingOperationFilter"/> fields.
-    /// </summary>
-    [Flags]
-    public enum PagingOperationFilterFields
-    {
-        /// <summary>
-        /// Indicates to include <see cref="PagingArgs.Skip"/> field (named <see cref="HttpConsts.PagingArgsSkipQueryStringName"/>).
-        /// </summary>
-        Skip = 1,
-
-        /// <summary>
-        /// Indicates to include <see cref="PagingArgs.Take"/> field (named <see cref="HttpConsts.PagingArgsTakeQueryStringName"/>).
-        /// </summary>
-        Take = 2,
-
-        /// <summary>
-        /// Indicates to include <see cref="PagingArgs.Page"/> field (named <see cref="HttpConsts.PagingArgsPageQueryStringName"/>).
-        /// </summary>
-        Page = 4,
-
-        /// <summary>
-        /// Indicates to include <see cref="PagingArgs.Size"/> field (named <see cref="HttpConsts.PagingArgsSizeQueryStringName"/>).
-        /// </summary>
-        Size = 8,
-
-        /// <summary>
-        /// Indicates to include <see cref="PagingArgs.IsGetCount"/> field (named <see cref="HttpConsts.PagingArgsCountQueryStringName"/>).
-        /// </summary>
-        Count = 16,
-
-        /// <summary>
-        /// Indicates to include <see cref="PagingArgs.Token"/> field (named <see cref="HttpConsts.PagingArgsTokenQueryStringName"/>).
-        /// </summary>
-        Token = 32,
-
-        /// <summary>
-        /// Indicates to include <see cref="Skip"/> and <see cref="Take"/> fields.
-        /// </summary>
-        SkipTake = Skip | Take,
-
-        /// <summary>
-        /// Indicates to include <see cref="Skip"/>, <see cref="Take"/> and <see cref="Count"/> fields.
-        /// </summary>
-        SkipTakeCount = Skip | Take | Count,
-
-        /// <summary>
-        /// Indicates to include <see cref="Page"/> and <see cref="Size"/> fields.
-        /// </summary>
-        PageSize = Page | Size,
-
-        /// <summary>
-        /// Indicates to include <see cref="Page"/>, <see cref="Size"/> and <see cref="Count"/> fields.
-        /// </summary>
-        PageSizeCount = Page | Size | Count,
-
-        /// <summary>
-        /// Indicates to include <see cref="Token"/> and <see cref="Take"/> fields.
-        /// </summary>
-        TokenTake = Token | Take,
-
-        /// <summary>
-        /// Indicates to include <see cref="Token"/>, <see cref="Take"/> and <see cref="Count"/> fields.
-        /// </summary>
-        TokenTakeCount = Token | Size | Count,
-
-        /// <summary>
-        /// Indicates to include all fields.
-        /// </summary>
-        All = Skip | Take | Page | Size | Count | Token
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/QueryAttribute.cs b/src/CoreEx.AspNetCore/WebApis/QueryAttribute.cs
deleted file mode 100644
index 5eee176a..00000000
--- a/src/CoreEx.AspNetCore/WebApis/QueryAttribute.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// An attribute that specifies that the action/operation supports <see cref="QueryArgs"/> (not explicitly defined as a parameter).
-    /// </summary>
-    /// <remarks>The is used to enable <i>Swagger/Swashbuckle</i> generated documentation where the operation does not explicitly define the <see cref="QueryArgs"/> as a method parameter.</remarks>
-    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-    public class QueryAttribute : Attribute { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/QueryOperationFilter.cs b/src/CoreEx.AspNetCore/WebApis/QueryOperationFilter.cs
deleted file mode 100644
index bcd4c4e5..00000000
--- a/src/CoreEx.AspNetCore/WebApis/QueryOperationFilter.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Http;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Linq;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// A <i>Swagger/Swashbuckle</i> <see cref="IOperationFilter"/> to add the <see cref="QueryArgs"/> parameters from the specification of the <see cref="QueryAttribute"/>.
-    /// </summary>
-    /// <remarks>The <see cref="PagingOperationFilter"/> must be added when registering services (DI) during application startup; example as follows:
-    /// <code>
-    /// services.AddSwaggerGen(c =&gt; c.OperationFilter&lt;PagingOperationFilter&gt;(PagingOperationFilterFields.SkipTakeCount));
-    /// </code>
-    /// </remarks>
-    public class QueryOperationFilter : IOperationFilter
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryOperationFilter"/> class with a default of <see cref="QueryOperationFilterFields.FilterAndOrderby"/>.
-        /// </summary>
-        public QueryOperationFilter() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryOperationFilter"/> class with the selected <paramref name="fields"/>.
-        /// </summary>
-        /// <param name="fields">The <see cref="QueryOperationFilterFields"/>.</param>
-        public QueryOperationFilter(QueryOperationFilterFields fields) => Fields = fields;
-
-        /// <summary>
-        /// Gets the <see cref="QueryOperationFilterFields"/> to apply.
-        /// </summary>
-        public QueryOperationFilterFields Fields { get; } = QueryOperationFilterFields.FilterAndOrderby;
-
-        /// <summary>
-        /// Applies the filter.
-        /// </summary>
-        /// <param name="operation">The <see cref="OpenApiOperation"/>.</param>
-        /// <param name="context">The <see cref="OperationFilterContext"/>.</param>
-        public void Apply(OpenApiOperation operation, OperationFilterContext context)
-        {
-            var att = context.ApiDescription.CustomAttributes().OfType<QueryAttribute>().FirstOrDefault();
-            if (att == null)
-                return;
-
-            if (Fields.HasFlag(QueryOperationFilterFields.Filter))
-                operation.Parameters.Add(PagingOperationFilter.CreateParameter(HttpConsts.QueryArgsFilterQueryStringName, "The basic dynamic OData-like filter statement.", "string", null));
-
-            if (Fields.HasFlag(QueryOperationFilterFields.OrderBy))
-                operation.Parameters.Add(PagingOperationFilter.CreateParameter(HttpConsts.QueryArgsOrderByQueryStringName, "The basic dynamic OData-like order-by statement.", "string", null));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/QueryOperationFilterFields.cs b/src/CoreEx.AspNetCore/WebApis/QueryOperationFilterFields.cs
deleted file mode 100644
index f72e7091..00000000
--- a/src/CoreEx.AspNetCore/WebApis/QueryOperationFilterFields.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Http;
-using System;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides the <see cref="QueryOperationFilter"/> fields.
-    /// </summary>
-    [Flags]
-    public enum QueryOperationFilterFields
-    {
-        /// <summary>
-        /// Indicates to include the <see cref="QueryArgs.Filter"/> field (named <see cref="HttpConsts.QueryArgsFilterQueryStringName"/>).
-        /// </summary>
-        Filter = 1,
-
-        /// <summary>
-        /// Indicates to include the <see cref="QueryArgs.OrderBy"/> field (named <see cref="HttpConsts.QueryArgsOrderByQueryStringName"/>).
-        /// </summary>
-        OrderBy = 2,
-
-        /// <summary>
-        /// Indicates to include both the <see cref="Filter"/> and <see cref="OrderBy"/>.
-        /// </summary>
-        FilterAndOrderby = Filter | OrderBy
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/ReferenceDataContentWebApi.cs b/src/CoreEx.AspNetCore/WebApis/ReferenceDataContentWebApi.cs
deleted file mode 100644
index 9911a55a..00000000
--- a/src/CoreEx.AspNetCore/WebApis/ReferenceDataContentWebApi.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Json;
-using CoreEx.Json.Merge;
-using CoreEx.RefData;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides the core (<see cref="HttpMethods.Get"/>, <see cref="HttpMethods.Post"/>, <see cref="HttpMethods.Put"/> and <see cref="HttpMethods.Delete"/>) Web API execution encapsulation that uses the <see cref="IReferenceDataContentJsonSerializer"/>
-    /// to allow <see cref="IReferenceData"/> types to serialize contents.
-    /// </summary>
-    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The <see cref="WebApiInvoker"/>; defaults where not specified.</param>
-    /// <param name="jsonMergePatch">The <see cref="IJsonMergePatch"/> to support the <see cref="HttpMethods.Patch"/> operations.</param>
-    public class ReferenceDataContentWebApi(ExecutionContext executionContext, SettingsBase settings, IReferenceDataContentJsonSerializer jsonSerializer, ILogger<WebApi> logger, WebApiInvoker? invoker = null, IJsonMergePatch? jsonMergePatch = null)
-        : WebApi(executionContext, settings, jsonSerializer, logger, invoker, jsonMergePatch) { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/ValueContentResult.cs b/src/CoreEx.AspNetCore/WebApis/ValueContentResult.cs
deleted file mode 100644
index 405be475..00000000
--- a/src/CoreEx.AspNetCore/WebApis/ValueContentResult.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.AspNetCore.Http;
-using CoreEx.Entities;
-using CoreEx.Json;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Mime;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents an <see cref="ExtendedContentResult"/> with a JSON serialized value.
-    /// </summary>
-    /// <remarks>This contains extended functionality to manage the setting of response headers related to <see cref="ETag"/>, <see cref="PagingResult"/> and <see cref="Location"/>.
-    /// <para>The <see cref="CreateResult{T}"/> and <see cref="TryCreateValueContentResult{T}"/> will return the value as-is where it is an instance of <see cref="IActionResult"/>; i.e. will bypass all related functionality.</para></remarks>
-    public sealed class ValueContentResult : ExtendedContentResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValueContentResult"/> class.
-        /// </summary>
-        /// <param name="content">The value serialized as JSON content.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/>.</param>
-        /// <param name="etag">The related <see cref="IETag.ETag"/>.</param>
-        /// <param name="pagingResult">The related <see cref="ICollectionResult.Paging"/>.</param>
-        /// <param name="location">The <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.</param>
-        public ValueContentResult(string content, HttpStatusCode statusCode, string? etag, PagingResult? pagingResult, Uri? location)
-        {
-            Content = content;
-            ContentType = MediaTypeNames.Application.Json;
-            StatusCode = (int)statusCode;
-            ETag = etag;
-            PagingResult = pagingResult;
-            Location = location;
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IETag.ETag"/> value.
-        /// </summary>
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the corresponding <see cref="Entities.PagingResult"/> (where the originating value was an <see cref="ICollectionResult"/>).
-        /// </summary>
-        public PagingResult? PagingResult { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.
-        /// </summary>
-        public Uri? Location { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="TimeSpan"/> for the <see cref="System.Net.Http.Headers.RetryConditionHeaderValue"/>.
-        /// </summary>
-        public TimeSpan? RetryAfter { get; set; }
-
-        /// <inheritdoc/>
-        public override Task ExecuteResultAsync(ActionContext context)
-        {
-            context.HttpContext.Response.Headers.AddPagingResult(PagingResult);
-
-            var headers = context.HttpContext.Response.GetTypedHeaders();
-            if (ETag != null)
-                headers.ETag = new EntityTagHeaderValue(ETagGenerator.FormatETag(ETag), true);
-
-            if (Location != null)
-                headers.Location = Location;
-
-            if (RetryAfter is not null)
-                context.HttpContext.Response.Headers.Append(HeaderNames.RetryAfter, new System.Net.Http.Headers.RetryConditionHeaderValue(RetryAfter.Value).ToString());
-
-            return base.ExecuteResultAsync(context);
-        }
-
-        /// <summary>
-        /// Creates the <see cref="IActionResult"/> as either <see cref="ValueContentResult"/> or <see cref="ExtendedStatusCodeResult"/> as per <see cref="TryCreateValueContentResult"/>; unless <paramref name="value"/> is an instance of <see cref="IActionResult"/> which will return as-is.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="statusCode">The primary status code where there is a value.</param>
-        /// <param name="alternateStatusCode">The alternate status code where there is not a value (i.e. <c>null</c>).</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="requestOptions">The <see cref="WebApiRequestOptions"/>.</param>
-        /// <param name="checkForNotModified">Indicates whether to check for <see cref="HttpStatusCode.NotModified"/> by comparing request and response <see cref="IETag.ETag"/> values.</param>
-        /// <param name="location">The <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/>.</returns>
-        internal static IActionResult CreateResult<T>(T value, HttpStatusCode statusCode, HttpStatusCode? alternateStatusCode, IJsonSerializer jsonSerializer, WebApiRequestOptions requestOptions, bool checkForNotModified, Uri? location)
-            => TryCreateValueContentResult(value, statusCode, alternateStatusCode, jsonSerializer, requestOptions, checkForNotModified, location, out var pr, out var ar) ? pr! : ar!;
-
-        /// <summary>
-        /// Try and create an <see cref="IActionResult"/> as either <see cref="ValueContentResult"/> or <see cref="ExtendedStatusCodeResult"/> as per <see cref="TryCreateValueContentResult"/>; unless <paramref name="value"/> is an instance of <see cref="IActionResult"/> which will return as-is.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="statusCode">The primary status code where there is a value.</param>
-        /// <param name="alternateStatusCode">The alternate status code where there is not a value (i.e. <c>null</c>).</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="requestOptions">The <see cref="WebApiRequestOptions"/>.</param>
-        /// <param name="checkForNotModified">Indicates whether to check for <see cref="HttpStatusCode.NotModified"/> by comparing request and response <see cref="IETag.ETag"/> values.</param>
-        /// <param name="location">The <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.</param>
-        /// <param name="primaryResult">The <see cref="IActionResult"/> where created.</param>
-        /// <param name="alternateResult">The alternate result where no <paramref name="primaryResult"/>.</param>
-        /// <returns><c>true</c> indicates that the <paramref name="primaryResult"/> was created; otherwise, <c>false</c> for <paramref name="alternateResult"/> creation.</returns>
-        internal static bool TryCreateValueContentResult<T>(T value, HttpStatusCode statusCode, HttpStatusCode? alternateStatusCode, IJsonSerializer jsonSerializer, WebApiRequestOptions requestOptions, bool checkForNotModified, Uri? location, out IActionResult? primaryResult, out IActionResult? alternateResult)
-        {
-            if (value is Results.IResult)
-                throw new ArgumentException($"The {nameof(value)} must not implement {nameof(Results.IResult)}; the underlying {nameof(Results.IResult.Value)} must be unwrapped before invoking.", nameof(value));
-
-            // Where already an IActionResult then return as-is.
-            if (value is IActionResult iar)
-            {
-                primaryResult = iar;
-                alternateResult = null;
-                return true;
-            }
-
-            object? val;
-            PagingResult? paging;
-
-            // Special case when ICollectionResult, as it is the Result only that is serialized and returned.
-            if (value is ICollectionResult cr)
-            {
-                val = cr.Items ?? Array.Empty<object?>(); // Where there is an ICollectionResult, then there should always be a value, at least an empty array versus null.
-                paging = cr.Paging;
-            }
-            else
-            {
-                val = value;
-                paging = null;
-            }
-
-            // Handle null result; generally either not-found, or no-content, depending on context.
-            if (val == null)
-            {
-                if (alternateStatusCode.HasValue)
-                {
-                    primaryResult = null;
-                    alternateResult = new StatusCodeResult((int)alternateStatusCode);
-                    return false;
-                }
-                else
-                    throw new InvalidOperationException("Function has not returned a result; no AlternateStatusCode has been configured to return.");
-            }
-
-            // Where there is etag support and it is null (assumes auto-generation) then generate from the full value JSON contents as the baseline value.
-            var isTextSerializationEnabled = ExecutionContext.HasCurrent && ExecutionContext.Current.IsTextSerializationEnabled;
-            var etag = value is IETag vetag ? vetag.ETag : null;
-            if (etag is null)
-            {
-                if (isTextSerializationEnabled)
-                    ExecutionContext.Current.IsTextSerializationEnabled = false;
-
-                etag = ETagGenerator.Generate(jsonSerializer, value);
-                if (value is IETag vetag2)
-                    vetag2.ETag = etag;
-            }
-
-            // Where IncludeText is selected then enable before serialization occurs.
-            if (requestOptions.IncludeText && ExecutionContext.HasCurrent)
-                ExecutionContext.Current.IsTextSerializationEnabled = true;
-
-            // Serialize the value performing any filtering as per the request options.
-            string? json = null;
-            if (requestOptions.IncludeFields != null && requestOptions.IncludeFields.Length > 0)
-                jsonSerializer.TryApplyFilter(val, requestOptions.IncludeFields, out json, JsonPropertyFilter.Include);
-            else if (requestOptions.ExcludeFields != null && requestOptions.ExcludeFields.Length > 0)
-                jsonSerializer.TryApplyFilter(val, requestOptions.ExcludeFields, out json, JsonPropertyFilter.Exclude);
-            else
-                json = jsonSerializer.Serialize(val);
-
-            // Generate the etag from the final JSON serialization and check for not-modified.
-            var result = GenerateETag(requestOptions, val, json, jsonSerializer);
-
-            // Reset the text serialization flag.
-            if (ExecutionContext.HasCurrent)
-                ExecutionContext.Current.IsTextSerializationEnabled = isTextSerializationEnabled;
-
-            // Check for not-modified and return status accordingly.
-            if (checkForNotModified && requestOptions.ETag is not null && result.etag == requestOptions.ETag)
-            {
-                primaryResult = null;
-                alternateResult = new ExtendedStatusCodeResult(HttpStatusCode.NotModified);
-                return false;
-            }
-
-            // Create and return the ValueContentResult.
-            primaryResult = new ValueContentResult(result.json!, statusCode, result.etag ?? etag, paging, location);
-            alternateResult = null;
-            return true;
-        }
-
-        /// <summary>
-        /// Establish (use existing or generate) the ETag for the value/json.
-        /// </summary>
-        /// <param name="requestOptions">The <see cref="WebApiRequestOptions"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="json">The value serialized to JSON.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <returns>The etag and serialized JSON (where performed).</returns>
-        internal static (string? etag, string? json) GenerateETag<T>(WebApiRequestOptions requestOptions, T value, string? json, IJsonSerializer jsonSerializer)
-        {
-            // Where not a GET or HEAD then no etag is generated; just use what we have.
-            if (!HttpMethods.IsGet(requestOptions.Request.Method) && !HttpMethods.IsHead(requestOptions.Request.Method))
-                return (value is IETag etag ? etag.ETag : null, json);
-
-            // Where no query string and there is an etag then that value should be leveraged as the fast-path.
-            if (!requestOptions.HasQueryString)
-            {
-                if (value is IETag etag && etag.ETag != null)
-                    return (etag.ETag, json);
-
-                // Where there is a collection then we need to generate a hash that represents the collection.
-                if (json is null && value is not string && value is IEnumerable coll)
-                {
-                    var hasEtags = true;
-                    var list = new List<string>();
-
-                    foreach (var item in coll)
-                    {
-                        if (item is IETag cetag && cetag.ETag is not null)
-                        {
-                            list.Add(cetag.ETag);
-                            continue;
-                        }
-
-                        // No longer can fast-path as there is no ETag.
-                        hasEtags = false;
-                        break;
-                    }
-
-                    // Where fast-path then return the hash for the etag list.
-                    if (hasEtags)
-                        return (ETagGenerator.GenerateHash([.. list]), json);
-                }
-            }
-
-            // Serialize and then generate a hash to represent the etag.
-            json ??= jsonSerializer.Serialize(value);
-            return (ETagGenerator.GenerateHash(requestOptions.HasQueryString ? [json, requestOptions.Request.QueryString.ToString()] : [json]), json);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApi.cs b/src/CoreEx.AspNetCore/WebApis/WebApi.cs
deleted file mode 100644
index 20a4446d..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApi.cs
+++ /dev/null
@@ -1,884 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.AspNetCore.Http;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.Json.Merge;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Net;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides the core (<see cref="HttpMethods.Get"/>, <see cref="HttpMethods.Post"/>, <see cref="HttpMethods.Put"/> and <see cref="HttpMethods.Delete"/>) Web API execution encapsulation.
-    /// </summary>
-    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The <see cref="WebApiInvoker"/>; defaults where not specified.</param>
-    /// <param name="jsonMergePatch">The <see cref="IJsonMergePatch"/> to support the <see cref="HttpMethods.Patch"/> operations.</param>
-    public partial class WebApi(ExecutionContext executionContext, SettingsBase settings, IJsonSerializer jsonSerializer, ILogger<WebApi> logger, WebApiInvoker? invoker = null, IJsonMergePatch? jsonMergePatch = null) : WebApiBase(executionContext, settings, jsonSerializer, logger, invoker)
-    {
-        /// <summary>
-        /// Gets the <see cref="IJsonMergePatch"/>.
-        /// </summary>
-        public IJsonMergePatch? JsonMergePatch { get; } = jsonMergePatch;
-
-        /// <summary>
-        /// Indicates whether to convert a <see cref="NotFoundException"/> to the default <see cref="HttpStatusCode"/> on delete (see <see cref="DeleteAsync(HttpRequest, Func{WebApiParam, CancellationToken, Task}, HttpStatusCode, OperationType, CancellationToken)"/>.
-        /// </summary>
-        public bool ConvertNotfoundToDefaultStatusCodeOnDelete { get; } = true;
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="HttpRequest"/> <paramref name="function"/> returning a corresponding <see cref="IActionResult"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        /// <remarks>This is, and must be, used by all methods that process an <see cref="HttpRequest"/> to ensure that the standardized before and after, success and error, handling occurs as required.</remarks>
-        public Task<IActionResult> RunAsync(HttpRequest request, Func<WebApiParam, Task<IActionResult>> function, OperationType operationType = OperationType.Unspecified)
-            => base.RunAsync(request, (p, _) => function(p), operationType, CancellationToken.None);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="HttpRequest"/> <paramref name="function"/> returning a corresponding <see cref="IActionResult"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>This is, and must be, used by all methods that process an <see cref="HttpRequest"/> to ensure that the standardized before and after, success and error, handling occurs as required.</remarks>
-        public Task<IActionResult> RunAsync(HttpRequest request, Func<WebApiParam, CancellationToken, Task<IActionResult>> function, OperationType operationType = OperationType.Unspecified, CancellationToken cancellationToken = default)
-            => base.RunAsync(request, function, operationType, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="HttpRequest"/> <paramref name="function"/> with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding <see cref="IActionResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        public Task<IActionResult> RunAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, Task<IActionResult>> function, OperationType operationType = OperationType.Unspecified,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => RunAsync(request, (p, ct) => function(p), operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="HttpRequest"/> <paramref name="function"/> with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding <see cref="IActionResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        public async Task<IActionResult> RunAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<IActionResult>> function, OperationType operationType = OperationType.Unspecified,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var vr = await request.ReadAsJsonValueAsync(JsonSerializer, valueIsRequired, validator, ct).ConfigureAwait(false);
-                if (vr.IsInvalid)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vr.ValidationException!, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                return await function(new WebApiParam<TValue>(wap, vr.Value), ct).ConfigureAwait(false);
-            }, operationType, cancellationToken, nameof(RunAsync)).ConfigureAwait(false);
-        }
-
-        #region GetAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation returning a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> GetAsync<TResult>(HttpRequest request, Func<WebApiParam, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NotFound, OperationType operationType = OperationType.Read)
-            => GetAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation returning a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public async Task<IActionResult> GetAsync<TResult>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK, 
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NotFound, OperationType operationType = OperationType.Read, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsGet(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Get}' to use {nameof(GetAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var result = await function(wap, ct).ConfigureAwait(false);
-                return ValueContentResult.CreateResult(result, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: true, location: null);
-            }, operationType, cancellationToken, nameof(GetAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PostAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request content or response value.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        public Task<IActionResult> PostAsync(HttpRequest request, Func<WebApiParam, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create, Func<Uri>? locationUri = null)
-            => PostAsync(request, (p, _) => function(p), statusCode, operationType, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request content or response value.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public async Task<IActionResult> PostAsync(HttpRequest request, Func<WebApiParam, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                await function(wap, ct).ConfigureAwait(false);
-                return new ExtendedStatusCodeResult(statusCode) { Location = locationUri?.Invoke() };
-            }, operationType, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);                                                   
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null)
-            => PostAsync(request, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostInternalAsync(request, false, default!, function, statusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null)
-            => PostAsync(request, value, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostInternalAsync(request, true, value, function, statusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        private async Task<IActionResult> PostInternalAsync<TValue>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                await function(wapv!, ct).ConfigureAwait(false);
-                return new ExtendedStatusCodeResult(statusCode) { Location = locationUri?.Invoke() };
-            }, operationType, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostAsync<TResult>(HttpRequest request, Func<WebApiParam, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Create, Func<TResult, Uri>? locationUri = null)
-            => PostAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public async Task<IActionResult> PostAsync<TResult>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Create, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var result = await function(wap, ct).ConfigureAwait(false);
-                return ValueContentResult.CreateResult(result, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: locationUri?.Invoke(result));
-            }, operationType, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null)
-            => PostAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostInternalAsync(request, false, default!, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null)
-            => PostAsync(request, value, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostInternalAsync(request, true, value, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        private async Task<IActionResult> PostInternalAsync<TValue, TResult>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                var result = await function(wapv!, ct).ConfigureAwait(false);
-                return ValueContentResult.CreateResult(result, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: locationUri?.Invoke(result));
-            }, operationType, cancellationToken, nameof(PostAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PutAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutAsync(request, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutInternalAsync(request, false, default!, function, statusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutInternalAsync(request, true, value, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutInternalAsync(request, true, value, function, statusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value.
-        /// </summary>
-        private async Task<IActionResult> PutInternalAsync<TValue>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPut(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Put}' to use {nameof(PutAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                await function(wapv!, ct).ConfigureAwait(false);
-                return new ExtendedStatusCodeResult(statusCode);
-            }, operationType, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutInternalAsync(request, false, default!, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutAsync(request, value, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutInternalAsync(request, true, value, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/>.
-        /// </summary>
-        public async Task<IActionResult> PutInternalAsync<TValue, TResult>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<TResult>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPut(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Put}' to use {nameof(PutAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                var result = await function(wapv!, ct).ConfigureAwait(false);
-                return ValueContentResult.CreateResult(result, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: null);
-            }, operationType, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, Func<WebApiParam, Task<TValue?>> get, Func<WebApiParam<TValue>, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false) where TValue : class
-            => PutAsync(request, (p, _) => get(p), (p, _) => put(p), statusCode, operationType, validator, simulatedConcurrency, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<TValue?>> get, Func<WebApiParam<TValue>, CancellationToken, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-            => PutInternalAsync(request, false, default!, get, put, statusCode, operationType, validator, simulatedConcurrency, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam, Task<TValue?>> get, Func<WebApiParam<TValue>, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false) where TValue : class
-            => PutAsync(request, value, (p, _) => get(p), (p, _) => put(p), statusCode, operationType, validator, simulatedConcurrency, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam, CancellationToken, Task<TValue?>> get, Func<WebApiParam<TValue>, CancellationToken, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-            => PutInternalAsync(request, true, value, get, put, statusCode, operationType, validator, simulatedConcurrency, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        private async Task<IActionResult> PutInternalAsync<TValue>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam, CancellationToken, Task<TValue?>> get, Func<WebApiParam<TValue>, CancellationToken, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-        {
-            request.ThrowIfNull(nameof(request));
-            get.ThrowIfNull(nameof(get));
-            put.ThrowIfNull(nameof(put));
-
-            if (!HttpMethods.IsPut(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Put}' to use {nameof(PutAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, true, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Get the current value before we perform the update; also performing a concurrency match.
-                var cvalue = await get(wap, ct).ConfigureAwait(false);
-                var ex = cvalue == null ? (Exception)new NotFoundException() : ConcurrencyETagMatching(wap, cvalue, wapv!.Value, simulatedConcurrency);
-                if (ex is not null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, ex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Update the value.
-                var result = await put(wapv!, ct).ConfigureAwait(false);
-                return ValueContentResult.CreateResult(result, statusCode, null, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: null);
-            }, operationType, cancellationToken, nameof(PutAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Where etags are supported or automatic concurrency then we need to make sure one was provided up-front and match.
-        /// </summary>
-        private ConcurrencyException? ConcurrencyETagMatching<TValue>(WebApiParam wap, TValue getValue, TValue putValue, bool autoConcurrency)
-        {
-            var ptag = putValue as IETag;
-            if (ptag != null || autoConcurrency)
-            {
-                string? etag = wap.RequestOptions.ETag ?? ptag?.ETag;
-                if (string.IsNullOrEmpty(etag))
-                    return new ConcurrencyException($"An 'If-Match' header is required for an HTTP {wap.Request.Method} where the underlying entity supports concurrency (ETag).");
-
-                if (etag != null)
-                {
-                    var gtag = getValue is IETag getag ? getag.ETag : null;
-                    if (gtag is null)
-                    {
-                        var isTextSerializationEnabled = ExecutionContext.HasCurrent && ExecutionContext.Current.IsTextSerializationEnabled;
-                        if (isTextSerializationEnabled)
-                            ExecutionContext.Current.IsTextSerializationEnabled = false;
-
-                        gtag = ETagGenerator.Generate(JsonSerializer, getValue);
-
-                        if (ExecutionContext.HasCurrent)
-                            ExecutionContext.Current.IsTextSerializationEnabled = isTextSerializationEnabled;
-                    }
-
-                    if (etag != gtag)
-                        return new ConcurrencyException();
-                }
-            }
-
-            return null;
-        }
-
-        #endregion
-
-        #region DeleteAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Delete"/> operation.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> DeleteAsync(HttpRequest request, Func<WebApiParam, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Delete)
-            => DeleteAsync(request, (p, _) => function(p), statusCode, operationType, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Delete"/> operation.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public async Task<IActionResult> DeleteAsync(HttpRequest request, Func<WebApiParam, CancellationToken, Task> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Delete, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsDelete(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Delete}' to use {nameof(DeleteAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                try
-                {
-                    await function(wap, ct).ConfigureAwait(false);
-                }
-                catch (NotFoundException) when (ConvertNotfoundToDefaultStatusCodeOnDelete) { /* Return default status code. */ }
-
-                return new ExtendedStatusCodeResult(statusCode);
-            }, operationType, cancellationToken, nameof(DeleteAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PatchAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value to patch into. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the patched value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>Currently on the <see cref="JsonMergePatch"/> is supported.</remarks>
-        public Task<IActionResult> PatchAsync<TValue>(HttpRequest request, Func<WebApiParam, Task<TValue?>> get, Func<WebApiParam<TValue>, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false) where TValue : class
-            => PatchAsync(request, (p, _) => get(p), (p, _) => put(p), statusCode, operationType, validator, simulatedConcurrency, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value to patch into. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the patched value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>Currently only the <see cref="JsonMergePatch"/> is supported.</remarks>
-        public async Task<IActionResult> PatchAsync<TValue>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<TValue?>> get, Func<WebApiParam<TValue>, CancellationToken, Task<TValue>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-        {
-            request.ThrowIfNull(nameof(request));
-            get.ThrowIfNull(nameof(get));
-            put.ThrowIfNull(nameof(put));
-
-            if (JsonMergePatch == null)
-                throw new InvalidOperationException($"To use the '{nameof(PatchAsync)}' methods the '{nameof(JsonMergePatch)}' object must be passed in the constructor. Where using dependency injection consider using '{nameof(Microsoft.Extensions.DependencyInjection.IServiceCollectionExtensions.AddJsonMergePatch)}' to add and configure the supported options.");
-
-            if (!HttpMethods.IsPatch(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Patch}' to use {nameof(PatchAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                // Make sure that the only the support content types are used.
-                var hct = request.GetTypedHeaders()?.ContentType?.MediaType.Value;
-                if (StringComparer.OrdinalIgnoreCase.Compare(hct, HttpConsts.MergePatchMediaTypeName) != 0 && StringComparer.OrdinalIgnoreCase.Compare(hct, MediaTypeNames.Application.Json) != 0)
-                    return new ContentResult 
-                    { 
-                        StatusCode = (int)HttpStatusCode.UnsupportedMediaType,
-                        ContentType = MediaTypeNames.Text.Plain, 
-                        Content = $"Unsupported 'Content-Type' for a PATCH; only JSON Merge Patch is supported using either: 'application/merge-patch+json' or '{MediaTypeNames.Application.Json}'."
-                    };
-
-                // Retrieve the JSON content string; there must be some content of some type.
-                var json = await request.ReadAsBinaryDataAsync(true, ct).ConfigureAwait(false);
-                if (json.Exception != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, json.Exception, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Note: the JsonMergePatch will throw JsonMergePatchException on error which will be automatically converted to an appropriate IActionResult by the invoking RunAsync method.
-                var (HasChanges, Value) = await JsonMergePatch.MergeAsync<TValue>(json.Content!, async (jpv, ct2) =>
-                {
-                    // Get the current value and perform a concurrency match before we perform the merge.
-                    var value = await get(wap, ct2).ConfigureAwait(false);
-                    var ex = value is null ? (Exception)new NotFoundException() : ConcurrencyETagMatching(wap, value, jpv, simulatedConcurrency);
-                    if (ex is not null)
-                        throw ex;
-
-                    return value;
-                }, ct).ConfigureAwait(false);
-
-                // Only invoke the put function where something was *actually* changed.
-                if (HasChanges)
-                {
-                    if (validator != null)
-                    {
-                        var vr = await validator.ValidateAsync(Value!, ct).ConfigureAwait(false);
-                        if (vr.HasErrors)
-                            return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vr.ToException()!, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                    }
-
-                    Value = await put(new WebApiParam<TValue>(wap, Value!), ct).ConfigureAwait(false);
-                }
-
-                return ValueContentResult.CreateResult(Value, statusCode, null, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: null);
-            }, operationType, cancellationToken, nameof(PatchAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiBase.cs b/src/CoreEx.AspNetCore/WebApis/WebApiBase.cs
deleted file mode 100644
index 8eeba4c7..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiBase.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.AspNetCore.Http;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Mime;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides the base Web API execution encapsulation to <see cref="RunAsync"/> the underlying logic in a consistent manner.
-    /// </summary>
-    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The <see cref="WebApiInvoker"/>; defaults where not specified.</param>
-    public abstract class WebApiBase(ExecutionContext executionContext, SettingsBase settings, IJsonSerializer jsonSerializer, ILogger<WebApiBase> logger, WebApiInvoker? invoker)
-    {
-        /// <summary>
-        /// Gets the <see cref="CoreEx.ExecutionContext"/>.
-        /// </summary>
-        public ExecutionContext ExecutionContext { get; } = executionContext.ThrowIfNull(nameof(executionContext));
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        public SettingsBase Settings { get; } = settings.ThrowIfNull(nameof(settings));
-
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public IJsonSerializer JsonSerializer { get; } = jsonSerializer.ThrowIfNull(nameof(jsonSerializer));
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        public ILogger Logger { get; } = logger.ThrowIfNull(nameof(logger));
-
-        /// <summary>
-        /// Gets the <see cref="WebApiInvoker"/>.
-        /// </summary>
-        public WebApiInvoker Invoker { get; } = invoker ?? WebApiInvoker.Current;
-
-        /// <summary>
-        /// Gets or sets the list of secondary correlation identifier names.
-        /// </summary>
-        /// <remarks>Searches the <see cref="HttpRequest.Headers"/> for <see cref="HttpConsts.CorrelationIdHeaderName"/> or one of the other <see cref="SecondaryCorrelationIdNames"/> to determine the <see cref="ExecutionContext.CorrelationId"/> (uses first value found in sequence).</remarks>
-        public IEnumerable<string> SecondaryCorrelationIdNames { get; set; } = ["x-ms-client-tracking-id"];
-
-        /// <summary>
-        /// Gets or sets the <see cref="IExtendedException"/> <see cref="IActionResult"/> creator function used by <see cref="CreateActionResultFromExtendedException"/>.
-        /// </summary>
-        /// <remarks>This allows an alternate serialization or handling as required. Defaults to the <see cref="DefaultExtendedExceptionActionResultCreator"/>.</remarks>
-        public Func<Exception, ILogger?, IActionResult> ExtendedExceptionActionResultCreator { get; set; } = DefaultExtendedExceptionActionResultCreator;
-
-        /// <summary>
-        /// Gets the list of correlation identifier names, being <see cref="HttpConsts.CorrelationIdHeaderName"/> and <see cref="SecondaryCorrelationIdNames"/> (inclusive).
-        /// </summary>
-        /// <returns>The list of correlation identifier names.</returns>
-        public virtual IEnumerable<string> GetCorrelationIdNames()
-        {
-            var list = new List<string>([HttpConsts.CorrelationIdHeaderName]);
-            list.AddRange(SecondaryCorrelationIdNames);
-            return list;
-        }
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="HttpRequest"/> <paramref name="function"/> returning a corresponding <see cref="IActionResult"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <remarks>This is, and must be, used by all methods that process an <see cref="HttpRequest"/> to ensure that the standardized before and after, success and error, handling occurs as required.</remarks>
-        protected async Task<IActionResult> RunAsync(HttpRequest request, Func<WebApiParam, CancellationToken, Task<IActionResult>> function, OperationType operationType = OperationType.Unspecified, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            // Invoke the "actual" function via the pluggable invoker.
-            ExecutionContext.OperationType = operationType;
-            var wap = new WebApiParam(this, new WebApiRequestOptions(request), operationType);
-            return await Invoker.InvokeAsync(this, wap, (_, w, ct) => function(w, ct), wap, cancellationToken, memberName).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Validate the <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="wap">The <see cref="WebApiParam"/>.</param>
-        /// <param name="useValue">Indicates whether to use the <paramref name="value"/>; otherwise, deserialize the JSON from the <see cref="WebApiParam.Request"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The optional <see cref="IValidator{T}"/> to validate the value (only invoked where the value is not <c>null</c>).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Exception"/> where there is an error; otherwise, <see cref="WebApiParam{T}"/> for success.</returns>
-        protected internal async Task<(WebApiParam<TValue>?, Exception?)> ValidateValueAsync<TValue>(WebApiParam wap, bool useValue, TValue value, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-        {
-            wap.ThrowIfNull(nameof(wap));
-
-            WebApiParam<TValue> wapv;
-            if (useValue)
-            {
-                if (valueIsRequired && value == null)
-                    return (null, new ValidationException($"{HttpResultExtensions.InvalidJsonMessagePrefix} Value is mandatory."));
-
-                if (value != null && validator != null)
-                {
-                    var vr = await validator.ValidateAsync(value, cancellationToken).ConfigureAwait(false);
-                    return (null, vr.ToException());
-                }
-
-                wapv = new WebApiParam<TValue>(wap, value);
-            }
-            else
-            {
-                var vr = await wap.Request.ReadAsJsonValueAsync(JsonSerializer, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vr.IsInvalid)
-                    return (null, vr.ValidationException);
-
-                wapv = new WebApiParam<TValue>(wap, vr.Value);
-            }
-
-            return (wapv, null);
-        }
-
-        /// <summary>
-        /// Provides an opportunity to handle an unhandled exception.
-        /// </summary>
-        /// <param name="ex">The unhandled <see cref="Exception"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> to return where handled; otherwise, <c>null</c> which in turn will result in it be handled by <see cref="CreateActionResultFromExceptionAsync"/>.</returns>
-        protected internal virtual Task<IActionResult?> OnUnhandledExceptionAsync(Exception ex, ILogger logger, CancellationToken cancellationToken) => UnhandledExceptionAsync(ex, logger, cancellationToken);
-
-        /// <summary>
-        /// Gets or sets the delegate that is invoked as an opportunity to handle an unhandled exception.
-        /// </summary>
-        /// <remarks>This is invoked by <see cref="OnUnhandledExceptionAsync(Exception, ILogger, CancellationToken)"/>.
-        /// <para>This should also include any logging requirements; not performed by default as it may not be required for all exception types.</para></remarks>
-        public Func<Exception, ILogger, CancellationToken, Task<IActionResult?>> UnhandledExceptionAsync { get; set; } = (_, _, _) => Task.FromResult<IActionResult?>(null!);
-
-        /// <summary>
-        /// Creates an <see cref="IActionResult"/> from an <paramref name="exception"/>.
-        /// </summary>
-        /// <param name="owner">The optional owning <see cref="WebApiBase"/>.</param>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <param name="exception">The <see cref="Exception"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="unhandledExceptionAsync">The delegate that is invoked as an opportunity to handle an unhandled exception.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IActionResult"/>.</returns>
-        public static async Task<IActionResult> CreateActionResultFromExceptionAsync(WebApiBase? owner, HttpContext context, Exception exception, SettingsBase settings, ILogger logger, Func<Exception, ILogger, CancellationToken, Task<IActionResult?>>? unhandledExceptionAsync = null, CancellationToken cancellationToken = default)
-        {
-            context.ThrowIfNull(nameof(context));
-            exception.ThrowIfNull(nameof(exception));
-            logger.ThrowIfNull(nameof(logger));
-            settings.ThrowIfNull(nameof(settings));
-
-            if (owner is not null && !owner.Invoker.CatchAndHandleExceptions)
-                throw exception;
-
-            // Also check for an inner IExtendedException where the outer is an AggregateException; if so, then use.
-            if (exception is AggregateException aex && aex.InnerException is not null && aex.InnerException is IExtendedException)
-                exception = aex.InnerException;
-
-            IActionResult? ar = null;
-            if (exception is IExtendedException eex)
-            {
-                ar = owner is null 
-                    ? DefaultExtendedExceptionActionResultCreator(exception, logger)
-                    : owner.CreateActionResultFromExtendedException(exception, logger);
-            }
-            else
-            {
-                if (unhandledExceptionAsync is not null)
-                    ar = await unhandledExceptionAsync(exception, logger, cancellationToken).ConfigureAwait(false);
-
-                if (ar is null)
-                {
-                    logger.LogCritical(exception, "WebApi unhandled exception: {Error}", exception.Message);
-                    ar = CreateActionResultForUnexpectedResult(exception, settings.IncludeExceptionInResult);
-                }
-            }
-
-            return ar;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IActionResult"/> from an <paramref name="extendedException"/>.
-        /// </summary>
-        /// <param name="extendedException">The <see cref="IExtendedException"/> <see cref="Exception"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        public IActionResult CreateActionResultFromExtendedException(Exception extendedException, ILogger? logger) => ExtendedExceptionActionResultCreator(extendedException, logger);
-
-        /// <summary>
-        /// The default <see cref="ExtendedExceptionActionResultCreator"/>.
-        /// </summary>
-        /// <param name="extendedException">The <see cref="IExtendedException"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <returns>The resulting <see cref="IActionResult"/>.</returns>
-        public static IActionResult DefaultExtendedExceptionActionResultCreator(Exception extendedException, ILogger? logger)
-        {
-            if (extendedException.ThrowIfNull(nameof(extendedException)) is not IExtendedException eex)
-                throw new ArgumentException($"The exception must implement {nameof(IExtendedException)}.", nameof(extendedException));
-
-            if (eex.ShouldBeLogged)
-            {
-                if (logger is null)
-                    throw new ArgumentNullException(nameof(logger), $"The logger is required to log the exception (see {nameof(IExtendedException)}.{nameof(IExtendedException.ShouldBeLogged)}).");
-
-                logger?.LogError(extendedException, "{Error}", extendedException.Message);
-            }
-
-            if (extendedException is ValidationException vex && vex.Messages is not null && vex.Messages.Count > 0)
-            {
-                var msd = new ModelStateDictionary();
-                foreach (var item in vex.Messages.GetMessagesForType(MessageType.Error))
-                {
-                    if (item.Property is not null && item.Text is not null)
-                        msd.AddModelError(item.Property, item.Text);
-                }
-
-                return new BadRequestObjectResult(msd);
-            }
-
-            return new ExtendedContentResult
-            {
-                Content = extendedException.Message,
-                ContentType = MediaTypeNames.Text.Plain,
-                StatusCode = (int)eex.StatusCode,
-                BeforeExtension = r =>
-                {
-                    var th = r.GetTypedHeaders();
-                    th.Set(HttpConsts.ErrorTypeHeaderName, eex.ErrorType);
-                    th.Set(HttpConsts.ErrorCodeHeaderName, eex.ErrorCode.ToString());
-                    if (extendedException is TransientException tex)
-                        th.Set(HeaderNames.RetryAfter, tex.RetryAfterSeconds);
-
-                    return Task.CompletedTask;
-                }
-            };
-        }
-
-        /// <summary>
-        /// Creates an <see cref="IActionResult"/> from an unexpected <paramref name="exception"/>.
-        /// </summary>
-        private static ContentResult CreateActionResultForUnexpectedResult(Exception exception, bool includeExceptionInResult) => includeExceptionInResult
-            ? new ContentResult { StatusCode = (int)HttpStatusCode.InternalServerError, ContentType = MediaTypeNames.Text.Plain, Content = $"An unexpected internal server error has occurred. CorrelationId={ExecutionContext.Current.CorrelationId} Exception={exception}" }
-            : new ContentResult { StatusCode = (int)HttpStatusCode.InternalServerError, ContentType = MediaTypeNames.Text.Plain, Content = $"An unexpected internal server error has occurred. CorrelationId={ExecutionContext.Current.CorrelationId}" };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiExceptionHandlerMiddleware.cs b/src/CoreEx.AspNetCore/WebApis/WebApiExceptionHandlerMiddleware.cs
deleted file mode 100644
index d473be04..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiExceptionHandlerMiddleware.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Configuration;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides a <b>CoreEx</b> oriented <see cref="Exception"/> handling middleware that is <see cref="IExtendedException"/> result aware.
-    /// </summary>
-    /// <param name="next">The next <see cref="RequestDelegate"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public class WebApiExceptionHandlerMiddleware(RequestDelegate next, SettingsBase settings, ILogger<WebApiExceptionHandlerMiddleware> logger)
-    {
-        private readonly RequestDelegate _next = next.ThrowIfNull(nameof(next));
-        private readonly SettingsBase _settings = settings.ThrowIfNull(nameof(settings));
-        private readonly ILogger _logger = logger.ThrowIfNull(nameof(logger));
-
-        /// <summary>
-        /// Invokes the <see cref="WebApiExceptionHandlerMiddleware"/>.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        public async Task InvokeAsync(HttpContext context)
-        {
-            try
-            {
-                await _next(context).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                var ar = await WebApiBase.CreateActionResultFromExceptionAsync(null, context, ex, _settings, _logger, null, default).ConfigureAwait(false);
-                var ac = new ActionContext(context, new RouteData(), new ActionDescriptor());
-                await ar.ExecuteResultAsync(ac).ConfigureAwait(false);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiExecutionContextMiddleware.cs b/src/CoreEx.AspNetCore/WebApis/WebApiExecutionContextMiddleware.cs
deleted file mode 100644
index 882c36e3..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiExecutionContextMiddleware.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides an <see cref="ExecutionContext"/> handling middleware that (using dependency injection) enables additional configuration where required.
-    /// </summary>
-    /// <remarks>A new <see cref="ExecutionContext"/> <see cref="ExecutionContext.Current"/> is instantiated through dependency injection using the <see cref="HttpContext.RequestServices"/>.</remarks>
-    /// <param name="next">The next <see cref="RequestDelegate"/>.</param>
-    /// <param name="executionContextUpdate">The optional function to update the <see cref="ExecutionContext"/>. Defaults to <see cref="DefaultExecutionContextUpdate(HttpContext, ExecutionContext)"/> where not specified.</param>
-    public class WebApiExecutionContextMiddleware(RequestDelegate next, Func<HttpContext, ExecutionContext, Task>? executionContextUpdate = null)
-    {
-        private readonly RequestDelegate _next = next.ThrowIfNull(nameof(next));
-        private readonly Func<HttpContext, ExecutionContext, Task> _updateFunc = executionContextUpdate ?? DefaultExecutionContextUpdate;
-
-        /// <summary>
-        /// Gets the default username where it is unable to be inferred (<see cref="System.Security.Principal.IIdentity.Name"/> from the <see cref="HttpContext"/> <see cref="HttpContext.User"/>).
-        /// </summary>
-        /// <remarks>Defaults to '<c>Anonymous</c>'.</remarks>
-        public static string DefaultUsername { get; set; } = "Anonymous";
-
-        /// <summary>
-        /// Represents the default <see cref="ExecutionContext"/> update function. 
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <param name="ec">The <see cref="ExecutionContext"/>.</param>
-        /// <remarks>The <see cref="ExecutionContext.UserName"/> will be set to the <see cref="System.Security.Principal.IIdentity.Name"/> from the <see cref="HttpContext"/> <see cref="HttpContext.User"/>; otherwise, <see cref="DefaultUsername"/> where <c>null</c>.</remarks>
-        public static Task DefaultExecutionContextUpdate(HttpContext context, ExecutionContext ec)
-        {
-            context.ThrowIfNull(nameof(context));
-            ec.ThrowIfNull(nameof(ec));
-
-            ec.UserName = context.User?.Identity?.Name ?? DefaultUsername;
-            ec.Timestamp = context.RequestServices.GetService<ISystemTime>()?.UtcNow ?? SystemTime.Default.UtcNow;
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Invokes the <see cref="WebApiExecutionContextMiddleware"/>.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/>.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task InvokeAsync(HttpContext context)
-        {
-            context.ThrowIfNull(nameof(context));
-
-            var ec = context.RequestServices.GetRequiredService<ExecutionContext>();
-            ec.ServiceProvider ??= context.RequestServices;
-
-            await _updateFunc(context, ec).ConfigureAwait(false);
-            await _next(context).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiInvoker.cs b/src/CoreEx.AspNetCore/WebApis/WebApiInvoker.cs
deleted file mode 100644
index 45cfd480..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiInvoker.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Http;
-using CoreEx.Invokers;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Primitives;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides pluggable invocation orchestration, logging and exception handling for <see cref="WebApiBase.RunAsync"/>.
-    /// </summary>
-    public class WebApiInvoker : InvokerBase<WebApiBase, WebApiParam>
-    {
-        private static WebApiInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static WebApiInvoker Current => CoreEx.ExecutionContext.GetService<WebApiInvoker>() ?? (_default ??= new WebApiInvoker());
-
-        /// <summary>
-        /// Indicates whether to catch and handle any <see cref="Exception"/> thrown as a result of executing the underlying logic.
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>.</remarks>
-        public bool CatchAndHandleExceptions { get; set; } = true;
-
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, WebApiBase invoker, Func<InvokeArgs, TResult> func, WebApiParam? args) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, WebApiBase owner, Func<InvokeArgs, CancellationToken, Task<TResult>> func, WebApiParam? param, CancellationToken cancellationToken)
-        {
-            param = param.ThrowIfNull();
-
-            // Get and override the correlation-id.
-            foreach (var name in owner.GetCorrelationIdNames())
-            {
-                if (param.Request.Headers.TryGetValue(name, out var values))
-                {
-                    owner.ExecutionContext.CorrelationId = values[0]!;
-                    break;
-                }
-            }
-
-            // Set correlation-id for the response.
-            param.Request.HttpContext.Response.Headers.Append(HttpConsts.CorrelationIdHeaderName, owner.ExecutionContext.CorrelationId);
-
-            // Start logging scope and begin work.
-            using (owner.Logger.BeginScope(new Dictionary<string, object>() { { HttpConsts.CorrelationIdHeaderName, owner.ExecutionContext.CorrelationId } }))
-            {
-                try
-                {
-                    return await func(invokeArgs, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex) when (CatchAndHandleExceptions)
-                {
-                    return (TResult)await WebApiBase.CreateActionResultFromExceptionAsync(owner, param.Request.HttpContext, ex, owner.Settings, owner.Logger, owner.OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex) when (!CatchAndHandleExceptions)
-                {
-                    owner.Logger.LogDebug("WebApi unhandled exception: {Error} [{Type}]", ex.Message, ex.GetType().Name);
-                    throw;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiParam.cs b/src/CoreEx.AspNetCore/WebApis/WebApiParam.cs
deleted file mode 100644
index f5b999ad..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiParam.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents a <see cref="WebApi"/> parameter.
-    /// </summary>
-    /// <param name="webApi">The parent <see cref="WebApiBase"/> instance.</param>
-    /// <param name="requestOptions">The <see cref="WebApiRequestOptions"/>.</param>
-    /// <param name="operationType">The <see cref="CoreEx.OperationType"/>.</param>
-    /// <remarks>This enables access to the corresponding <see cref="WebApi"/>, <see cref="Request"/>, <see cref="RequestOptions"/>, etc.</remarks>
-    public class WebApiParam(WebApiBase webApi, WebApiRequestOptions requestOptions, OperationType operationType = OperationType.Unspecified)
-    {
-        /// <summary>
-        /// Gets the parent (invoking) <see cref="WebApi"/>.
-        /// </summary>
-        public WebApiBase WebApi { get; } = webApi.ThrowIfNull(nameof(webApi));
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequest"/>.
-        /// </summary>
-        public HttpRequest Request => RequestOptions.Request;
-
-        /// <summary>
-        /// Gets or sets the <see cref="WebApiRequestOptions"/>.
-        /// </summary>
-        public WebApiRequestOptions RequestOptions { get; } = requestOptions.ThrowIfNull(nameof(requestOptions));
-
-        /// <summary>
-        /// Gets the <see cref="Entities.PagingArgs"/>.
-        /// </summary>
-        public PagingArgs? Paging => RequestOptions.Paging;
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.OperationType"/>.
-        /// </summary>
-        public OperationType OperationType { get; } = operationType;
-
-        /// <summary>
-        /// Inspects the <paramref name="value"/> to either update the <see cref="WebApiRequestOptions.ETag"/> or <paramref name="value"/> <see cref="IETag.ETag"/> where appropriate.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <returns>The value to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="WebApiRequestOptions.ETag"/> takes precedence over the <paramref name="value"/> <see cref="IETag.ETag"/> and will override value where specified.</remarks>
-        public T InspectValue<T>(T value)
-        {
-            if (RequestOptions.ETag != null && value != null && value is IETag etag)
-                etag.ETag = RequestOptions.ETag;
-            else if (RequestOptions.ETag == null && value != null && value is IETag etag2 && etag2.ETag != null)
-                RequestOptions.ETag = etag2.ETag;
-
-            return value;
-        }
-
-        /// <summary>
-        /// Creates the <see cref="IActionResult"/> as either <see cref="ValueContentResult"/> or <see cref="ExtendedStatusCodeResult"/> (<see cref="IExtendedActionResult"/>) as per <see cref="ValueContentResult.TryCreateValueContentResult"/>; unless <paramref name="value"/> is an instance of <see cref="IActionResult"/> which will return as-is.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="statusCode">The primary status code where there is a value.</param>
-        /// <param name="alternateStatusCode">The alternate status code where there is not a value (i.e. <c>null</c>).</param>
-        /// <param name="checkForNotModified">Indicates whether to check for <see cref="HttpStatusCode.NotModified"/> by comparing request and response <see cref="IETag.ETag"/> values.</param>
-        /// <param name="location">The <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/> <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/>.</returns>
-        public IActionResult CreateActionResult<T>(T value, HttpStatusCode statusCode, HttpStatusCode? alternateStatusCode = null, bool checkForNotModified = true, Uri? location = null)
-            => ValueContentResult.CreateResult(value, statusCode, alternateStatusCode, WebApi.JsonSerializer, RequestOptions, checkForNotModified, location);
-
-        /// <summary>
-        /// Creates the <see cref="IActionResult"/> as a <see cref="ExtendedStatusCodeResult"/> (<see cref="IExtendedActionResult"/>).
-        /// </summary>
-        /// <param name="statusCode">The status code.</param>
-        public static IActionResult CreateActionResult(HttpStatusCode statusCode) => new ExtendedStatusCodeResult(statusCode);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiParamT.cs b/src/CoreEx.AspNetCore/WebApis/WebApiParamT.cs
deleted file mode 100644
index 28d024e5..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiParamT.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents a <see cref="WebApi"/> parameter with a request <see cref="Value"/>.
-    /// </summary>
-    /// <remarks>This enables access to the corresponding <see cref="WebApiParam.WebApi"/>, <see cref="WebApiParam.Request"/>, <see cref="WebApiParam.RequestOptions"/>, deserialized <see cref="Value"/>, etc.</remarks>
-    public class WebApiParam<T> : WebApiParam
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebApiParam"/> class.
-        /// </summary>
-        /// <param name="wap">The <see cref="WebApiParam"/> to copy from.</param>
-        /// <param name="value">The deserialized request value.</param>
-        public WebApiParam(WebApiParam wap, T value) : base(wap.ThrowIfNull(nameof(wap)).WebApi, wap.RequestOptions, wap.OperationType) => Value = InspectValue(value);
-
-        /// <summary>
-        /// Gets the deserialized request value.
-        /// </summary>
-        public T? Value { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisher.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisher.cs
deleted file mode 100644
index d41b720a..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisher.cs
+++ /dev/null
@@ -1,476 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.AspNetCore.Http;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Hosting.Work;
-using CoreEx.Json;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Provides the core <see cref="IEventPublisher"/> Web API execution encapsulation.
-    /// </summary>
-    /// <remarks>Support to change/map request into a different published event type is also enabled where required (see also <seealso cref="Mapper"/>).
-    /// <para>By adding a <see cref="WorkStateOrchestrator"/> then the beginnings of the <i>asynchronous request-response</i> pattern implementation can be achieved.</para></remarks>
-    /// <param name="eventPublisher">The <see cref="IEventPublisher"/>.</param>
-    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    /// <param name="invoker">The <see cref="WebApiInvoker"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public class WebApiPublisher(IEventPublisher eventPublisher, ExecutionContext executionContext, SettingsBase settings, IJsonSerializer jsonSerializer, ILogger<WebApiPublisher> logger, WebApiInvoker? invoker = null) : WebApiBase(executionContext, settings, jsonSerializer, logger, invoker)
-    {
-        private IMapper? _mapper;
-
-        /// <summary>
-        /// Gets the <see cref="IEventPublisher"/>.
-        /// </summary>
-        public IEventPublisher EventPublisher { get; } = eventPublisher.ThrowIfNull(nameof(eventPublisher));
-
-        /// <summary>
-        /// Gets or sets the <see cref="IMapper"/>.
-        /// </summary>
-        /// <remarks>Where not explicity set will attempt to use the <see cref="ExecutionContext.GetRequiredService{T}()"/> on first use; will throw an exception where not configured.
-        /// <para>This is required where one of the underlying publishing methods is invoked that enables mapping between request and event types and the corresponding <c>beforeEvent</c> parameter is <c>null</c>; 
-        /// i.e. the default behaviour is to perform a <see cref="IMapper.Map{TDestination}(object?, OperationTypes)"/> to enable.</para></remarks>
-        public IMapper Mapper
-        {
-            get => _mapper ??= ExecutionContext.GetRequiredService<IMapper>();
-            set => _mapper = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Hosting.Work.WorkStateOrchestrator"/>.
-        /// </summary>
-        /// <remarks>See <see cref="IWebApiPublisherArgs{TValue, TEventValue}.CreateWorkStateArgs"/> for corresponding <i>asynchronous request-response</i> pattern implementation.</remarks>
-        public WorkStateOrchestrator? WorkStateOrchestrator { get; set; }
-
-        #region PublishAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no content body that is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherArgs{TValue}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishAsync(HttpRequest request, WebApiPublisherArgs args, CancellationToken cancellationToken = default)
-            => PublishOrchestrateAsync(request, false, default!, args.ThrowIfNull(nameof(args)), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON body content value of <see cref="Type"/> <typeparamref name="TValue"/> that is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherArgs{TValue}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishAsync<TValue>(HttpRequest request, WebApiPublisherArgs<TValue>? args = null, CancellationToken cancellationToken = default)
-            => PublishOrchestrateAsync(request, false, default!, args ?? new WebApiPublisherArgs<TValue>(), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> that is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="args">The <see cref="WebApiPublisherArgs{TValue}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishValueAsync<TValue>(HttpRequest request, TValue value, WebApiPublisherArgs<TValue>? args = null, CancellationToken cancellationToken = default)
-            => PublishOrchestrateAsync(request, true, value, args ?? new WebApiPublisherArgs<TValue>(), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON body content value of <see cref="Type"/> <typeparamref name="TValue"/> that is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TEventValue">The <see cref="EventData.Value"/> <see cref="Type"/> (where different to the request).</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherArgs{TValue}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishAsync<TValue, TEventValue>(HttpRequest request, WebApiPublisherArgs<TValue, TEventValue>? args = null, CancellationToken cancellationToken = default)
-            => PublishOrchestrateAsync(request, false, default!, args ?? new WebApiPublisherArgs<TValue, TEventValue>(), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> that is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TEventValue">The <see cref="EventData.Value"/> <see cref="Type"/> (where different to the request).</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="args">The <see cref="WebApiPublisherArgs{TValue}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishValueAsync<TValue, TEventValue>(HttpRequest request, TValue value, WebApiPublisherArgs<TValue, TEventValue>? args = null, CancellationToken cancellationToken = default)
-            => PublishOrchestrateAsync(request, true, value, args ?? new WebApiPublisherArgs<TValue, TEventValue>(), cancellationToken);
-
-        /// <summary>
-        /// Performs the publish orchestration.
-        /// </summary>
-        private async Task<IActionResult> PublishOrchestrateAsync<TValue, TEventValue>(HttpRequest request, bool useValue, TValue value, IWebApiPublisherArgs<TValue, TEventValue> args, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull();
-            args.ThrowIfNull();
-
-            if (request.Method != HttpMethods.Post)
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PublishAsync)}.", nameof(request));
-
-            if (args.CreateWorkStateArgs is not null && WorkStateOrchestrator is null)
-                throw new InvalidOperationException($"The {nameof(WorkStateOrchestrator)} must be set to use {nameof(IWebApiPublisherArgs<TValue, TEventValue>)}.{nameof(IWebApiPublisherArgs<TValue, TEventValue>.CreateWorkStateArgs)}.");    
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                // Use specified value or get from the request. 
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, args.ValueIsRequired, null, cancellationToken).ConfigureAwait(false);
-                if (vex is not null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Process the publishing as configured.
-                WorkState? ws = null;
-                var r = await Result.Go()
-                    .WhenAsAsync(() => args.OnBeforeValidationAsync is not null, () => args.OnBeforeValidationAsync!(wapv!, ct))
-                    .WhenAsAsync(_ => args.Validator is not null, async _ => (await args.Validator!.ValidateAsync(wapv!.Value!, ct).ConfigureAwait(false)).ToResult<TValue>())
-                    .WhenAsync(_ => args.OnBeforeEventAsync is not null, _ => args.OnBeforeEventAsync!(wapv!, ct))
-                    .ThenAs(_ => args.EventTemplate is null ? new EventData() : new EventData(args.EventTemplate))
-                    .WhenAs(e => args.AreSameType, e => e.Adjust(x => x.Value = wapv!.Value), e => e.Adjust(x => x.Value = args.Mapper is not null ? args.Mapper.Map(wapv!.Value) : Mapper.Map<TValue, TEventValue>(wapv!.Value)))
-                    .Then(e => args.OnEvent?.Invoke(e))
-                    .Then(e =>
-                    {
-                        if (args.EventName is null)
-                            EventPublisher.Publish(e);
-                        else
-                            EventPublisher.PublishNamed(args.EventName, e);
-                    })
-                    .ThenAsync(async e =>
-                    {
-                        await EventPublisher.SendAsync(ct).ConfigureAwait(false);
-                    })
-                    .WhenAsync(e => WorkStateOrchestrator is not null && args.CreateWorkStateArgs is not null, async e =>
-                    {
-                        var wsa = args.CreateWorkStateArgs!();
-                        wsa.Id = e.Id;
-                        wsa.CorrelationId = e.CorrelationId;
-                        wsa.Key ??= e.Key;
-                        ws = await WorkStateOrchestrator!.CreateAsync(wsa).ConfigureAwait(false);
-                    });
-
-                if (r.IsFailure)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, r.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                if (args.CreateSuccessResultAsync is not null)
-                    return await args.CreateSuccessResultAsync().ConfigureAwait(false) ?? throw new InvalidOperationException($"The {nameof(IWebApiPublisherArgs<TValue, TEventValue>.CreateSuccessResultAsync)} must return a result.");
-
-                return ValueContentResult.CreateResult(ws, HttpStatusCode.Accepted, HttpStatusCode.Accepted, JsonSerializer, request.GetRequestOptions(), false, args.CreateLocation?.Invoke(wapv!, r.Value));
-            }, args.OperationType, cancellationToken, nameof(PublishAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PublishCollectionAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TColl"/> where each item is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherCollectionArgs{TColl, TItem}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishCollectionAsync<TColl, TItem>(HttpRequest request, WebApiPublisherCollectionArgs<TColl, TItem>? args = null, CancellationToken cancellationToken = default) where TColl : IEnumerable<TItem>
-            => PublishCollectionOrchestrateAsync(request, false, default!, args ?? new WebApiPublisherCollectionArgs<TColl, TItem>(), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TColl"/> where each item is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="args">The <see cref="WebApiPublisherCollectionArgs{TColl, TItem}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishCollectionValueAsync<TColl, TItem>(HttpRequest request, TColl value, WebApiPublisherCollectionArgs<TColl, TItem>? args = null, CancellationToken cancellationToken = default) where TColl : IEnumerable<TItem>
-            => PublishCollectionOrchestrateAsync(request, true, value, args ?? new WebApiPublisherCollectionArgs<TColl, TItem>(), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TColl"/> where each item is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TEventItem">The <typeparamref name="TItem"/>-equivalent <see cref="EventData.Value"/> <see cref="Type"/> (where different to the request).</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="IWebApiPublisherCollectionArgs{TColl, TItem, TEventItem}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishCollectionAsync<TColl, TItem, TEventItem>(HttpRequest request, WebApiPublisherCollectionArgs<TColl, TItem, TEventItem>? args = null, CancellationToken cancellationToken = default) where TColl : IEnumerable<TItem>
-            => PublishCollectionOrchestrateAsync(request, false, default!, args ?? new WebApiPublisherCollectionArgs<TColl, TItem, TEventItem>(), cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TColl"/> where each item is to be published using the <see cref="EventPublisher"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TEventItem">The <typeparamref name="TItem"/>-equivalent <see cref="EventData.Value"/> <see cref="Type"/> (where different to the request).</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="args">The <see cref="IWebApiPublisherCollectionArgs{TColl, TItem, TEventItem}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>The <paramref name="request"/> must have an <see cref="HttpRequest.Method"/> of <see cref="HttpMethods.Post"/>.</remarks>
-        public Task<IActionResult> PublishCollectionValueAsync<TColl, TItem, TEventItem>(HttpRequest request, TColl value, WebApiPublisherCollectionArgs<TColl, TItem, TEventItem>? args = null, CancellationToken cancellationToken = default) where TColl : IEnumerable<TItem>
-            => PublishCollectionOrchestrateAsync(request, true, value, args ?? new WebApiPublisherCollectionArgs<TColl, TItem, TEventItem>(), cancellationToken);
-
-        /// <summary>
-        /// Performs the publish orchestration.
-        /// </summary>
-        private async Task<IActionResult> PublishCollectionOrchestrateAsync<TColl, TItem, TEventValue>(HttpRequest request, bool useValue, TColl coll, IWebApiPublisherCollectionArgs<TColl, TItem, TEventValue> args, CancellationToken cancellationToken = default) where TColl : IEnumerable<TItem>
-        {
-            request.ThrowIfNull();
-            args.ThrowIfNull();
-
-            if (request.Method != HttpMethods.Post)
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PublishAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                // Use specified value or get from the request. 
-                var (wapc, vex) = await ValidateValueAsync(wap, useValue, coll, true, null, cancellationToken).ConfigureAwait(false);
-                if (vex is not null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Check the collection size.
-                var max = args.MaxCollectionSize ?? Settings.MaxPublishCollSize;
-                if (max <= 0)
-                    throw new InvalidOperationException($"The maximum collection size must be greater than zero.");
-
-                var count = wapc!.Value?.Count() ?? 0;
-                if (count > max)
-                {
-                    Logger.LogWarning("The publish collection contains {EventsCount} items where only a maximum size of {MaxCollSize} is supported; request has been rejected.", count, max);
-                    var bex = new BusinessException($"The publish collection contains {count} items where only a maximum size of {max} is supported.");
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, bex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (count == 0)
-                    return new AcceptedResult();
-
-                // Process the publishing as configured.
-                var r = await Result.Go()
-                    .WhenAsAsync(() => args.OnBeforeValidationAsync is not null, () => args.OnBeforeValidationAsync!(wapc!, ct))
-                    .WhenAsAsync(_ => args.Validator is not null, async _ => (await args.Validator!.ValidateAsync(wapc!.Value!, ct).ConfigureAwait(false)).ToResult<TColl>())
-                    .WhenAsync(_ => args.OnBeforeEventAsync is not null, _ => args.OnBeforeEventAsync!(wapc!, ct));
-
-                if (r.IsFailure)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, r.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Create the events (also performing mapping where applicable).
-                foreach (var item in wapc!.Value!)
-                {
-                    var @event = args.EventTemplate is null ? new EventData() : new EventData(args.EventTemplate);
-                    @event.Value = args.AreSameType ? item : (args.Mapper is not null ? args.Mapper.Map(item) : Mapper.Map<TItem, TEventValue>(item));
-                    args.OnEvent?.Invoke(@event);
-
-                    if (args.EventName is null)
-                        EventPublisher.Publish(@event);
-                    else
-                        EventPublisher.PublishNamed(args.EventName, @event);
-                }
-
-                await EventPublisher.SendAsync(ct).ConfigureAwait(false);
-
-                if (args.CreateSuccessResultAsync is not null)
-                    return await args.CreateSuccessResultAsync().ConfigureAwait(false) ?? throw new InvalidOperationException($"The {nameof(IWebApiPublisherCollectionArgs<TColl, TItem, TEventValue>.CreateSuccessResultAsync)} must return a result.");
-
-                return new ExtendedStatusCodeResult(args.StatusCode);
-            }, args.OperationType, cancellationToken, nameof(PublishAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region Async Request-Response
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation to get the <see cref="WorkState"/> <see cref="WorkState.Status"/> to enable the likes of the <i>asynchronous request-response</i> pattern.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherStatusArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IActionResult"/>.</returns>
-        public Task<IActionResult> GetWorkStatusAsync(HttpRequest request, WebApiPublisherStatusArgs args, CancellationToken cancellationToken = default)
-        {
-            if (WorkStateOrchestrator is null)
-                throw new InvalidOperationException($"The {nameof(GetWorkStatusAsync)} operation requires that the {nameof(WorkStateOrchestrator)} is not null.");
-
-            request.ThrowIfNull(nameof(request));
-            args.ThrowIfNull(nameof(args));
-
-            if (request.Method != HttpMethods.Get)
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Get}' to use {nameof(GetWorkStatusAsync)}.", nameof(request));
-
-            return RunAsync(request, async (wap, ct) =>
-            {
-                var ws = string.IsNullOrEmpty(args.Id) ? null : await WorkStateOrchestrator!.GetAsync(args.TypeName, args.Id, ct).ConfigureAwait(false);
-                if (ws is null)
-                    return new ExtendedStatusCodeResult(HttpStatusCode.NotFound);
-
-                if (args.OnBeforeResponseAsync is not null)
-                {
-                    var r = await args.OnBeforeResponseAsync(ws).ConfigureAwait(false);
-                    if (r.IsFailure)
-                        return await CreateActionResultFromExceptionAsync(this, request.HttpContext, r.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                }
-
-                // Check for the completed status and redirect to the result location where applicable.
-                if (ws.Status == WorkStatus.Completed && args.CreateResultLocation is not null)
-                    return new ExtendedStatusCodeResult(HttpStatusCode.Redirect) { Location = args.CreateResultLocation(ws) ?? throw new InvalidOperationException("A result location is ") };
-
-                // Return the work status as either a BadRequest or OK.
-                var res = ValueContentResult.CreateResult(ws, WorkStatus.Terminated.HasFlag(ws.Status) ? HttpStatusCode.BadRequest : HttpStatusCode.OK, null, JsonSerializer, request.GetRequestOptions(), true, null);
-                if (res is ValueContentResult vcr && WorkStatus.Executing.HasFlag(ws.Status))
-                    vcr.RetryAfter = args.ExecutingRetryAfter;
-
-                return res;
-
-            }, OperationType.Unspecified, cancellationToken, nameof(GetWorkStatusAsync));
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation to get the <see cref="WorkState"/> result with no resulting value by default.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherResultArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IActionResult"/>.</returns>
-        public Task<IActionResult> GetWorkResultAsync(HttpRequest request, WebApiPublisherResultArgs args, CancellationToken cancellationToken = default)
-        {
-            if (WorkStateOrchestrator is null)
-                throw new InvalidOperationException($"The {nameof(GetWorkResultAsync)} operation requires that the {nameof(WorkStateOrchestrator)} is not null.");
-
-            request.ThrowIfNull(nameof(request));
-            args.ThrowIfNull(nameof(args));
-
-            if (request.Method != HttpMethods.Get)
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Get}' to use {nameof(GetWorkResultAsync)}.", nameof(request));
-
-            return RunAsync(request, async (wap, ct) =>
-            {
-                var ws = string.IsNullOrEmpty(args.Id) ? null : await WorkStateOrchestrator!.GetAsync(args.TypeName, args.Id, ct).ConfigureAwait(false);
-                if (ws is null || ws.Status != WorkStatus.Completed)
-                    return new ExtendedStatusCodeResult(HttpStatusCode.NotFound);
-
-                if (args.OnBeforeResponseAsync is not null)
-                {
-                    var r = await args.OnBeforeResponseAsync(ws).ConfigureAwait(false);
-                    if (r.IsFailure)
-                        return await CreateActionResultFromExceptionAsync(this, request.HttpContext, r.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                }
-
-                if (args.CreateSuccessResultAsync is not null)
-                    return await args.CreateSuccessResultAsync(ws).ConfigureAwait(false) ?? throw new InvalidOperationException($"The {nameof(WebApiPublisherResultArgs.CreateSuccessResultAsync)} must return a result.");
-
-                return new ExtendedStatusCodeResult(HttpStatusCode.NoContent); 
-
-            }, OperationType.Unspecified, cancellationToken, nameof(GetWorkResultAsync));
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation to get the <see cref="WorkState"/> result with a result of <see cref="Type"/> <typeparamref name="TValue"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherResultArgs{TValue}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IActionResult"/>.</returns>
-        public Task<IActionResult> GetWorkResultAsync<TValue>(HttpRequest request, WebApiPublisherResultArgs<TValue> args, CancellationToken cancellationToken = default)
-        {
-            if (WorkStateOrchestrator is null)
-                throw new InvalidOperationException($"The {nameof(GetWorkResultAsync)} operation requires that the {nameof(WorkStateOrchestrator)} is not null.");
-
-            request.ThrowIfNull(nameof(request));
-            args.ThrowIfNull(nameof(args));
-
-            if (request.Method != HttpMethods.Get)
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Get}' to use {nameof(GetWorkResultAsync)}.", nameof(request));
-
-            return RunAsync(request, async (wap, ct) =>
-            {
-                var ws = string.IsNullOrEmpty(args.Id) ? null : await WorkStateOrchestrator!.GetAsync(args.TypeName, args.Id, ct).ConfigureAwait(false);
-                if (ws is null || ws.Status != WorkStatus.Completed)
-                    return new ExtendedStatusCodeResult(HttpStatusCode.NotFound);
-
-                if (args.OnBeforeResponseAsync is not null)
-                {
-                    var r = await args.OnBeforeResponseAsync(ws).ConfigureAwait(false);
-                    if (r.IsFailure)
-                        return await CreateActionResultFromExceptionAsync(this, request.HttpContext, r.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                }
-
-                var value = await WorkStateOrchestrator.GetDataAsync<TValue>(args.Id!, ct).ConfigureAwait(false);
-                return ValueContentResult.CreateResult(value, HttpStatusCode.OK, HttpStatusCode.NoContent, JsonSerializer, request.GetRequestOptions(), true, null);
-            }, OperationType.Unspecified, cancellationToken, nameof(GetWorkResultAsync));
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation to cancel the <see cref="WorkState"/> <see cref="WorkState.Status"/> to enable the likes of the <i>asynchronous request-response</i> pattern.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="args">The <see cref="WebApiPublisherCancelArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IActionResult"/>.</returns>
-        public Task<IActionResult> CancelWorkStatusAsync(HttpRequest request, WebApiPublisherCancelArgs args, CancellationToken cancellationToken = default)
-        {
-            if (WorkStateOrchestrator is null)
-                throw new InvalidOperationException($"The {nameof(CancelWorkStatusAsync)} operation requires that the {nameof(WorkStateOrchestrator)} is not null.");
-
-            request.ThrowIfNull(nameof(request));
-            args.ThrowIfNull(nameof(args));
-
-            if (request.Method != HttpMethods.Get)
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Get}' to use {nameof(CancelWorkStatusAsync)}.", nameof(request));
-
-            return RunAsync(request, async (wap, ct) =>
-            {
-                var ws = string.IsNullOrEmpty(args.Id) ? null : await WorkStateOrchestrator!.GetAsync(args.TypeName, args.Id, ct).ConfigureAwait(false);
-                if (ws is null)
-                    return new ExtendedStatusCodeResult(HttpStatusCode.NotFound);
-
-                if (args.OnBeforeResponseAsync is not null)
-                {
-                    var r = await args.OnBeforeResponseAsync(ws).ConfigureAwait(false);
-                    if (r.IsFailure)
-                        return await CreateActionResultFromExceptionAsync(this, request.HttpContext, r.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-                }
-
-                // Check for the completed status and redirect to the result location where applicable.
-                var cr = await WorkStateOrchestrator!.CancelAsync(args.Id!, args.Reason ?? WebApiPublisherCancelArgs.NotSpecifiedReason, ct).ConfigureAwait(false);
-                if (cr.IsFailure)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, cr.Error, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                return ValueContentResult.CreateResult(cr.Value, HttpStatusCode.OK, null, JsonSerializer, request.GetRequestOptions(), true, null);
-            }, OperationType.Unspecified, cancellationToken, nameof(CancelWorkStatusAsync));
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgs.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgs.cs
deleted file mode 100644
index 371934ca..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgs.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Hosting.Work;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher"/> arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <remarks>
-    /// Initializes a new instance of the <see cref="WebApiPublisherArgs{TValue}"/> class.
-    /// </remarks>
-    /// <param name="eventName">The event destination name (e.g. Queue or Topic name).</param>
-    public class WebApiPublisherArgs(string eventName) : IWebApiPublisherArgs<object, object>
-    {
-        /// <inheritdoc/>
-        public string? EventName { get; set; } = eventName.ThrowIfNull(nameof(eventName));
-
-        /// <inheritdoc/>
-        public EventData? EventTemplate { get; set; }
-
-        /// <inheritdoc/>
-        public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.Accepted;
-
-        /// <inheritdoc/>
-        bool IWebApiPublisherArgs<object, object>.ValueIsRequired => false;
-
-        /// <inheritdoc/>
-        IValidator<object>? IWebApiPublisherArgs<object, object>.Validator => null;
-
-        /// <inheritdoc/>
-        public OperationType OperationType { get; set; } = OperationType.Unspecified;
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<object>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<object>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Action<EventData>? OnEvent { get; set; }
-
-        /// <inheritdoc/>
-        IMapper<object, object>? IWebApiPublisherArgs<object, object>.Mapper => null;
-
-        /// <inheritdoc/>
-        public Func<Task<IActionResult>>? CreateSuccessResultAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<object>, EventData, Uri>? CreateLocation { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WorkStateArgs>? CreateWorkStateArgs { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgsT.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgsT.cs
deleted file mode 100644
index 75cd7c41..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgsT.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Hosting.Work;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher"/> arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-    /// <param name="validator">The optional validator.</param>
-    public class WebApiPublisherArgs<TValue>(IValidator<TValue>? validator = null) : IWebApiPublisherArgs<TValue, TValue>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebApiPublisherArgs{TValue}"/> class.
-        /// </summary>
-        /// <param name="eventName">The event destination name (e.g. Queue or Topic name).</param>
-        /// <param name="validator">The optional validator.</param>
-        public WebApiPublisherArgs(string eventName, IValidator<TValue>? validator = null) : this(validator) => EventName = eventName;
-
-        /// <inheritdoc/>
-        public string? EventName { get; set; }
-
-        /// <inheritdoc/>
-        public EventData? EventTemplate { get; set; }
-
-        /// <inheritdoc/>
-        public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.Accepted;
-
-        /// <inheritdoc/>
-        public bool ValueIsRequired { get; set; } = true;
-
-        /// <inheritdoc/>
-        public IValidator<TValue>? Validator { get; set; } = validator;
-
-        /// <inheritdoc/>
-        public OperationType OperationType { get; set; } = OperationType.Unspecified;
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TValue>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TValue>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Action<EventData>? OnEvent { get; set; }
-
-        /// <inheritdoc/>
-        IMapper<TValue, TValue>? IWebApiPublisherArgs<TValue, TValue>.Mapper => null;
-
-        /// <inheritdoc/>
-        public Func<Task<IActionResult>>? CreateSuccessResultAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TValue>, EventData, Uri>? CreateLocation { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WorkStateArgs>? CreateWorkStateArgs { get; set; }
-
-        /// <summary>
-        /// Sets the <see cref="CreateWorkStateArgs"/> to use the <see cref="WorkStateArgs.Create{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
-        /// <returns>The <see cref="WebApiPublisherArgs{TValue}"/> to support fluent-style method-chaining.</returns>
-        public WebApiPublisherArgs<TValue> WithWorkState<T>()
-        {
-            CreateWorkStateArgs = () => WorkStateArgs.Create<T>();
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="CreateWorkStateArgs"/> to use the specified <paramref name="typeName"/> or where <c>null</c> automatically set using the <typeparamref name="TValue"/> <see cref="Type"/>.
-        /// </summary>
-        /// <param name="typeName">The type name.</param>
-        /// <returns>The <see cref="WebApiPublisherArgs{TValue}"/> to support fluent-style method-chaining.</returns>
-        public WebApiPublisherArgs<TValue> WithWorkState(string? typeName = null)
-        {
-            if (typeName is null)
-                return WithWorkState<TValue>();
-
-            CreateWorkStateArgs = () => new WorkStateArgs(typeName);
-            return this;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgsT2.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgsT2.cs
deleted file mode 100644
index 27428a36..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherArgsT2.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Hosting.Work;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher"/> arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TEventValue"><see cref="EventData.Value"/> <see cref="Type"/> (where different to the request).</typeparam>
-    /// <param name="validator">The optional validator.</param>
-    public class WebApiPublisherArgs<TValue, TEventValue>(IValidator<TValue>? validator = null) : IWebApiPublisherArgs<TValue, TEventValue>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebApiPublisherArgs{TValue}"/> class.
-        /// </summary>
-        /// <param name="eventName">The event destination name (e.g. Queue or Topic name).</param>
-        /// <param name="validator">The optional validator.</param>
-        public WebApiPublisherArgs(string eventName, IValidator<TValue>? validator = null) : this(validator) => EventName = eventName;
-
-        /// <inheritdoc/>
-        public string? EventName { get; set; } = default!;
-
-        /// <inheritdoc/>
-        public EventData? EventTemplate { get; set; }
-
-        /// <inheritdoc/>
-        public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.Accepted;
-
-        /// <inheritdoc/>
-        public bool ValueIsRequired { get; set; } = true;
-
-        /// <inheritdoc/>
-        public IValidator<TValue>? Validator { get; set; } = validator;
-
-        /// <inheritdoc/>
-        public OperationType OperationType { get; set; } = OperationType.Unspecified;
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TValue>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TValue>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Action<EventData>? OnEvent { get; set; }
-
-        /// <inheritdoc/>
-        public IMapper<TValue, TEventValue>? Mapper { get; set; }
-
-        /// <inheritdoc/>
-        public Func<Task<IActionResult>>? CreateSuccessResultAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TValue>, EventData, Uri>? CreateLocation { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WorkStateArgs>? CreateWorkStateArgs { get; set; }
-
-        /// <summary>
-        /// Sets the <see cref="CreateWorkStateArgs"/> to use the <see cref="WorkStateArgs.Create{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
-        /// <returns>The <see cref="WebApiPublisherArgs{TValue}"/> to support fluent-style method-chaining.</returns>
-        public WebApiPublisherArgs<TValue, TEventValue> WithWorkState<T>()
-        {
-            CreateWorkStateArgs = () => WorkStateArgs.Create<T>();
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="CreateWorkStateArgs"/> to use the specified <paramref name="typeName"/> or where <c>null</c> automatically set using the <typeparamref name="TEventValue"/> <see cref="Type"/>.
-        /// </summary>
-        /// <param name="typeName">The type name.</param>
-        /// <returns>The <see cref="WebApiPublisherArgs{TValue}"/> to support fluent-style method-chaining.</returns>
-        public WebApiPublisherArgs<TValue, TEventValue> WithWorkState(string? typeName = null)
-        {
-            if (typeName is null)
-                return WithWorkState<TEventValue>();
-
-            CreateWorkStateArgs = () => new WorkStateArgs(typeName);
-            return this;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCancelArgs.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCancelArgs.cs
deleted file mode 100644
index abfa98b4..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCancelArgs.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using CoreEx.Localization;
-using CoreEx.Results;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher.CancelWorkStatusAsync"/> arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <param name="typeName">The <see cref="WorkState.TypeName"/> enabling state separation.</param>
-    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-    /// <param name="reason">The cancellation reason.</param>
-    public class WebApiPublisherCancelArgs(string typeName, string? id, string? reason = null)
-    {
-        /// <summary>
-        /// Gets the default <see cref="WorkState.Reason"/>.
-        /// </summary>
-        public static LText NotSpecifiedReason { get; } = "No reason was specified.";
-
-        /// <summary>
-        /// Gets the <see cref="WorkStateOrchestrator"/> type name.
-        /// </summary>
-        /// <remarks>Enables separation between one or more <see cref="WorkState"/> types.</remarks>
-        public string TypeName => typeName.ThrowIfNullOrEmpty(nameof(typeName));
-
-        /// <summary>
-        /// Gets or sets the <see cref="WorkState.Id"/>.
-        /// </summary>
-        public string? Id { get; set; } = id;
-
-        /// <summary>
-        /// Gets or sets the cancellation reason; defaults to <see cref="NotSpecifiedReason"/>.
-        /// </summary>
-        public string? Reason { get; set; } = reason;
-
-        /// <summary>
-        /// Gets or sets the function to execute prior to returning the response.
-        /// </summary>
-        /// <remarks>Enables the likes of security, etc., before returning the response. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        public Func<WorkState, Task<Result>>? OnBeforeResponseAsync { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCollectionArgsT.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCollectionArgsT.cs
deleted file mode 100644
index 2540504c..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCollectionArgsT.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher"/> collection-based arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-    /// <param name="validator">The optional validator.</param>
-    public class WebApiPublisherCollectionArgs<TColl, TItem>(IValidator<TColl>? validator = null) : IWebApiPublisherCollectionArgs<TColl, TItem, TItem> where TColl : IEnumerable<TItem>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebApiPublisherCollectionArgs{TColl, TItem}"/> class.
-        /// </summary>
-        /// <param name="eventName">The event destination name (e.g. Queue or Topic name).</param>
-        /// <param name="validator">The optional validator.</param>
-        public WebApiPublisherCollectionArgs(string eventName, IValidator<TColl>? validator = null) : this(validator) => EventName = eventName;
-
-        /// <inheritdoc/>
-        public string? EventName { get; set; }
-
-        /// <inheritdoc/>
-        public EventData? EventTemplate { get; set;  }
-
-        /// <inheritdoc/>
-        public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.Accepted;
-
-        /// <inheritdoc/>
-        public int? MaxCollectionSize { get; set; }
-
-        /// <inheritdoc/>
-        public IValidator<TColl>? Validator { get; set; } = validator;
-
-        /// <inheritdoc/>
-        public OperationType OperationType { get; set; } = OperationType.Unspecified;
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TColl>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TColl>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Action<EventData>? OnEvent { get; set; }
-
-        /// <inheritdoc/>
-        IMapper<TItem, TItem>? IWebApiPublisherCollectionArgs<TColl, TItem, TItem>.Mapper => null;
-
-        /// <inheritdoc/>
-        public Func<Task<IActionResult>>? CreateSuccessResultAsync { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCollectionArgsT2.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCollectionArgsT2.cs
deleted file mode 100644
index 1e7d4be7..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherCollectionArgsT2.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher"/> collection-based arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <typeparam name="TColl">The request JSON collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The collection item <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TEventItem">The <typeparamref name="TItem"/>-equivalent <see cref="EventData.Value"/> <see cref="Type"/> (where different then a <see cref="Mapper"/> will be required).</typeparam>
-    /// <param name="validator">The optional validator.</param>
-    public class WebApiPublisherCollectionArgs<TColl, TItem, TEventItem>(IValidator<TColl>? validator = null) : IWebApiPublisherCollectionArgs<TColl, TItem, TEventItem> where TColl : IEnumerable<TItem>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebApiPublisherCollectionArgs{TColl, TItem}"/> class.
-        /// </summary>
-        /// <param name="eventName">The event destination name (e.g. Queue or Topic name).</param>
-        /// <param name="validator">The optional validator.</param>
-        public WebApiPublisherCollectionArgs(string eventName, IValidator<TColl>? validator = null) : this(validator) => EventName = eventName;
-
-        /// <inheritdoc/>
-        public string? EventName { get; set; }
-
-        /// <inheritdoc/>
-        public EventData? EventTemplate { get; set; }
-
-        /// <inheritdoc/>
-        public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.Accepted;
-
-        /// <inheritdoc/>
-        public int? MaxCollectionSize { get; set; }
-
-        /// <inheritdoc/>
-        public IValidator<TColl>? Validator { get; set; } = validator;
-
-        /// <inheritdoc/>
-        public OperationType OperationType { get; set; } = OperationType.Unspecified;
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TColl>, CancellationToken, Task<Result>>? OnBeforeValidationAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Func<WebApiParam<TColl>, CancellationToken, Task<Result>>? OnBeforeEventAsync { get; set; }
-
-        /// <inheritdoc/>
-        public Action<EventData>? OnEvent { get; set; }
-
-        /// <inheritdoc/>
-        public IMapper<TItem, TEventItem>? Mapper { get; set; }
-
-        /// <inheritdoc/>
-        public Func<Task<IActionResult>>? CreateSuccessResultAsync { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherResultArgs.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherResultArgs.cs
deleted file mode 100644
index 820c3939..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherResultArgs.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using CoreEx.Results;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher.GetWorkResultAsync"/> arguments with no result value; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <param name="typeName">The <see cref="WorkState.TypeName"/> enabling state separation.</param>
-    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-    public class WebApiPublisherResultArgs(string typeName, string? id)
-    {
-        /// <summary>
-        /// Gets the <see cref="WorkStateOrchestrator"/> type name.
-        /// </summary>
-        /// <remarks>Enables separation between one or more <see cref="WorkState"/> types.</remarks>
-        public string TypeName => typeName.ThrowIfNullOrEmpty(nameof(typeName));
-
-        /// <summary>
-        /// Gets or sets the <see cref="WorkState.Id"/>.
-        /// </summary>
-        public string? Id { get; set; } = id;
-
-        /// <summary>
-        /// Gets or sets the function to execute prior to returning the response.
-        /// </summary>
-        /// <remarks>Enables the likes of security, etc., before returning the response. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        public Func<WorkState, Task<Result>>? OnBeforeResponseAsync { get; set; }
-
-        /// <summary>
-        /// Gets or sets the function to override the creation of the success <see cref="IActionResult"/>.
-        /// </summary>
-        /// <remarks>Defaults to a <see cref="ExtendedStatusCodeResult"/> with <see cref="HttpStatusCode.NoContent"/>.</remarks>
-        public Func<WorkState, Task<IActionResult>>? CreateSuccessResultAsync { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherResultArgsT.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherResultArgsT.cs
deleted file mode 100644
index 354a478d..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherResultArgsT.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using CoreEx.Results;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher.GetWorkResultAsync"/> arguments with a result value; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <typeparam name="TValue">The resulting value <see cref="Type"/>.</typeparam>
-    /// <param name="typeName">The <see cref="WorkState.TypeName"/> enabling state separation.</param>
-    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-    public class WebApiPublisherResultArgs<TValue>(string typeName, string? id)
-    {
-        /// <summary>
-        /// Gets the resulting <typeparamref name="TValue"/> <see cref="Type"/>.
-        /// </summary>
-        public Type ValueType => typeof(TValue);
-
-        /// <summary>
-        /// Gets the <see cref="WorkStateOrchestrator"/> type name.
-        /// </summary>
-        /// <remarks>Enables separation between one or more <see cref="WorkState"/> types.</remarks>
-        public string TypeName => typeName.ThrowIfNullOrEmpty(nameof(typeName));
-
-        /// <summary>
-        /// Gets or sets the <see cref="WorkState.Id"/>.
-        /// </summary>
-        public string? Id { get; set; } = id;
-
-        /// <summary>
-        /// Gets or sets the function to execute prior to returning the response.
-        /// </summary>
-        /// <remarks>Enables the likes of security, etc., before returning the response. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        public Func<WorkState, Task<Result>>? OnBeforeResponseAsync { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherStatusArgs.cs b/src/CoreEx.AspNetCore/WebApis/WebApiPublisherStatusArgs.cs
deleted file mode 100644
index be2a993b..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiPublisherStatusArgs.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using CoreEx.Results;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApiPublisher.GetWorkStatusAsync"/> arguments; being the opportunity to further configure the standard processing.
-    /// </summary>
-    /// <param name="typeName">The <see cref="WorkState.TypeName"/> enabling state separation.</param>
-    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-    public class WebApiPublisherStatusArgs(string typeName, string? id)
-    {
-        /// <summary>
-        /// Gets the <see cref="WorkStateOrchestrator"/> type name.
-        /// </summary>
-        /// <remarks>Enables separation between one or more <see cref="WorkState"/> types.</remarks>
-        public string TypeName => typeName.ThrowIfNullOrEmpty(nameof(typeName));
-
-        /// <summary>
-        /// Gets or sets the <see cref="WorkState.Id"/>.
-        /// </summary>
-        public string? Id { get; set; } = id;
-
-        /// <summary>
-        /// Gets or sets the function to execute prior to returning the response.
-        /// </summary>
-        /// <remarks>Enables the likes of security, etc., before returning the response. The <see cref="Result"/> will allow failures and alike to be returned where applicable.</remarks>
-        public Func<WorkState, Task<Result>>? OnBeforeResponseAsync { get; set; }
-
-        /// <summary>
-        /// Gets or sets the function to create the <see cref="Uri"/> for the result <see cref="Microsoft.AspNetCore.Http.Headers.ResponseHeaders.Location"/>.
-        /// </summary>
-        /// <remarks>This will only be invoked when the <see cref="WorkState.Status"/> is <see cref="WorkStatus.Completed"/> and enables the <see cref="System.Net.HttpStatusCode.Redirect"/> <see cref="ExtendedStatusCodeResult"/> behavior.</remarks>
-        public Func<WorkState, Uri>? CreateResultLocation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="TimeSpan"/> for the <see cref="WorkStatus.Executing"/> <see cref="System.Net.Http.Headers.RetryConditionHeaderValue"/>.
-        /// </summary>
-        /// <remarks>This will only be invoked when the <see cref="WorkState.Status"/> is <see cref="WorkStatus.Executing"/>. Defaults to 30 seconds.</remarks>
-        public TimeSpan? ExecutingRetryAfter { get; set; } = TimeSpan.FromSeconds(30);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiRequestOptions.cs b/src/CoreEx.AspNetCore/WebApis/WebApiRequestOptions.cs
deleted file mode 100644
index 88599441..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiRequestOptions.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.RefData;
-using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    /// <summary>
-    /// Represents the <see cref="WebApi"/> request options; the server-side representation of the <see cref="CoreEx.Http.HttpRequestOptions"/>.
-    /// </summary>
-    /// <remarks>Usage assumes that the HTTP endpoint supports and actions accordingly; i.e. by sending there is no guarantee that the desired outcome will occur as selected.</remarks>
-    public class WebApiRequestOptions
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebApiRequestOptions"/> class.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequest"/>.</param>
-        public WebApiRequestOptions(HttpRequest httpRequest)
-        {
-            Request = httpRequest.ThrowIfNull(nameof(httpRequest));
-            HasQueryString = GetQueryStringOptions(Request.Query);
-
-            // Get the raw ETag from the request headers.
-            var rth = httpRequest.GetTypedHeaders();
-            var etag = rth.IfNoneMatch.FirstOrDefault()?.Tag ?? rth.IfMatch.FirstOrDefault()?.Tag;
-            if (etag.HasValue)
-                ETag = etag.Value.Substring(1, etag.Value.Length - 2);
-        }
-
-        /// <summary>
-        /// Gets the originating <see cref="HttpRequest"/>.
-        /// </summary>
-        public HttpRequest Request { get; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="Request"/> has a query string.
-        /// </summary>
-        public bool HasQueryString { get; }
-
-        /// <summary>
-        /// Gets or sets the entity tag that was passed as either a <c>If-None-Match</c> header where <see cref="HttpMethod.Get"/>; otherwise, an <c>If-Match</c> header.
-        /// </summary>
-        /// <remarks>Represents the underlying ray value; i.e. is stripped of any <c>W/"xxxx"</c> formatting.</remarks>
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets the list of <b>included</b> fields (JSON property names) to limit the serialized data payload (results in url query string: "$fields=x,y,z").
-        /// </summary>
-        public string[]? IncludeFields { get; private set; }
-
-        /// <summary>
-        /// Gets the list of <b>excluded</b> fields (JSON property names) to limit the serialized data payload (results in url query string: "$excludefields=x,y,z").
-        /// </summary>
-        public string[]? ExcludeFields { get; private set; }
-
-        /// <summary>
-        /// Gets the <see cref="PagingArgs"/>.
-        /// </summary>
-        public PagingArgs? Paging { get; private set; }
-
-        /// <summary>
-        /// Gets the dynamic <see cref="QueryArgs"/>.
-        /// </summary>
-        public QueryArgs? Query { get; private set; }
-
-        /// <summary>
-        /// Indicates whether to include any related texts for the item(s).
-        /// </summary>
-        /// <remarks>For example, include corresponding <see cref="IReferenceData.Text"/> for any <b>ReferenceData</b> values returned in the JSON response payload.</remarks>
-        public bool IncludeText { get; private set; }
-
-        /// <summary>
-        /// Indicates whether to include any inactive item(s); 
-        /// </summary>
-        /// <remarks>For example, include item(s) where <see cref="IReferenceData.IsActive"/> is <c>false</c>.</remarks>
-        public bool IncludeInactive { get; private set; }
-
-        /// <summary>
-        /// Gets the options from the <see cref="IQueryCollection"/>.
-        /// </summary>
-        private bool GetQueryStringOptions(IQueryCollection query)
-        {
-            if (query == null || query.Count == 0)
-                return false;
-
-            Paging = GetPagingArgs(query);
-            Query = GetQueryArgs(query);
-
-            var fields = GetNamedQueryString(query, HttpConsts.IncludeFieldsQueryStringNames);
-            if (!string.IsNullOrEmpty(fields))
-            {
-#if NET6_0_OR_GREATER
-                IncludeFields = fields.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-#else
-                IncludeFields = fields.Split(',', StringSplitOptions.RemoveEmptyEntries);
-#endif
-                Query ??= new QueryArgs();
-                Query.Include(IncludeFields);
-            }
-
-            fields = GetNamedQueryString(query, HttpConsts.ExcludeFieldsQueryStringNames);
-            if (!string.IsNullOrEmpty(fields))
-            {
-#if NET6_0_OR_GREATER
-                ExcludeFields = fields.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-#else
-                ExcludeFields = fields.Split(',', StringSplitOptions.RemoveEmptyEntries);
-#endif
-                Query ??= new QueryArgs();
-                Query.Exclude(ExcludeFields);
-            }
-
-            IncludeText = HttpExtensions.ParseBoolValue(GetNamedQueryString(query, HttpConsts.IncludeTextQueryStringNames));
-            IncludeInactive = HttpExtensions.ParseBoolValue(GetNamedQueryString(query, HttpConsts.IncludeInactiveQueryStringNames, "true"));
-            return true;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="PagingArgs"/> from an <see cref="IQueryCollection"/>.
-        /// </summary>
-        private static PagingArgs? GetPagingArgs(IQueryCollection query)
-        {
-            long? skip = HttpExtensions.ParseLongValue(GetNamedQueryString(query, HttpConsts.PagingArgsSkipQueryStringNames));
-            long? take = HttpExtensions.ParseLongValue(GetNamedQueryString(query, HttpConsts.PagingArgsTakeQueryStringNames));
-            long? page = skip.HasValue ? null : HttpExtensions.ParseLongValue(GetNamedQueryString(query, HttpConsts.PagingArgsPageQueryStringNames));
-            string? token = GetNamedQueryString(query, HttpConsts.PagingArgsTokenQueryStringNames);
-            bool isGetCount = HttpExtensions.ParseBoolValue(GetNamedQueryString(query, HttpConsts.PagingArgsCountQueryStringNames));
-
-            if (skip == null && take == null && page == null && string.IsNullOrEmpty(token) && !isGetCount)
-                return null;
-
-            PagingArgs paging;
-            if (!string.IsNullOrEmpty(token))
-                paging = PagingArgs.CreateTokenAndTake(token, take);
-            else if (skip == null && page == null)
-                paging = take.HasValue ? PagingArgs.CreateSkipAndTake(0, take) : new PagingArgs();
-            else
-                paging = skip.HasValue ? PagingArgs.CreateSkipAndTake(skip.Value, take) : PagingArgs.CreatePageAndSize(page == null ? 0 : page.Value, take);
-
-            paging.IsGetCount = isGetCount;
-            return paging;
-        }
-
-        /// <summary>
-        /// Gets the first value for the named query string.
-        /// </summary>
-        private static string? GetNamedQueryString(IQueryCollection query, IEnumerable<string> names, string? defaultValue = null)
-        {
-            var q = query.Where(x => names.Contains(x.Key, StringComparer.OrdinalIgnoreCase)).FirstOrDefault();
-            if (q.Key == null)
-                return null;
-
-            var val = q.Value.FirstOrDefault();
-            return string.IsNullOrEmpty(val) ? defaultValue : val;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="QueryArgs"/> from an <see cref="IQueryCollection"/>.
-        /// </summary>
-        private static QueryArgs? GetQueryArgs(IQueryCollection query)
-        {
-            var filter = GetNamedQueryString(query, HttpConsts.QueryArgsFilterQueryStringNames);
-            var orderBy = GetNamedQueryString(query, HttpConsts.QueryArgsOrderByQueryStringNames);
-            return string.IsNullOrEmpty(filter) && string.IsNullOrEmpty(orderBy) ? null : new QueryArgs { Filter = filter, OrderBy = orderBy };
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/WebApis/WebApiWithResult.cs b/src/CoreEx.AspNetCore/WebApis/WebApiWithResult.cs
deleted file mode 100644
index 96233e05..00000000
--- a/src/CoreEx.AspNetCore/WebApis/WebApiWithResult.cs
+++ /dev/null
@@ -1,784 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.AspNetCore.Http;
-using CoreEx.Http;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Net;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.AspNetCore.WebApis
-{
-    public partial class WebApi
-    {
-        #region GetWithResultAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation returning a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> GetWithResultAsync<TResult>(HttpRequest request, Func<WebApiParam, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NotFound, OperationType operationType = OperationType.Read)
-            => GetWithResultAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Get"/> operation returning a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public async Task<IActionResult> GetWithResultAsync<TResult>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NotFound, OperationType operationType = OperationType.Read, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsGet(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Get}' to use {nameof(GetAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var result = await function(wap, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : ValueContentResult.CreateResult(result.Value, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: true, location: null);
-            }, operationType, cancellationToken, nameof(GetWithResultAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PostWithResultAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request content or response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        public Task<IActionResult> PostWithResultAsync(HttpRequest request, Func<WebApiParam, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create, Func<Uri>? locationUri = null)
-            => PostWithResultAsync(request, (p, _) => function(p), statusCode, operationType, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request content or response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public async Task<IActionResult> PostWithResultAsync(HttpRequest request, Func<WebApiParam, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var result = await function(wap, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : new ExtendedStatusCodeResult(statusCode) { Location = locationUri?.Invoke() };
-            }, operationType, cancellationToken, nameof(PostWithResultAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null)
-            => PostWithResultAsync(request, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostWithResultInternalAsync(request, false, default!, function, statusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK, OperationType operationType = OperationType.Create,
-            bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null)
-            => PostWithResultAsync(request, value, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostWithResultInternalAsync(request, true, value, function, statusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        private async Task<IActionResult> PostWithResultInternalAsync<TValue>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                var result = await function(wapv!, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : new ExtendedStatusCodeResult(statusCode) { Location = locationUri?.Invoke() };
-            }, operationType, cancellationToken, nameof(PostWithResultAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostWithResultAsync<TResult>(HttpRequest request, Func<WebApiParam, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Create, Func<TResult, Uri>? locationUri = null)
-            => PostWithResultAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with no request body and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public async Task<IActionResult> PostWithResultAsync<TResult>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Create, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var result = await function(wap, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : ValueContentResult.CreateResult(result.Value, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: locationUri?.Invoke(result));
-            }, operationType, cancellationToken, nameof(PostWithResultAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null)
-            => PostWithResultAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostWithResultInternalAsync(request, false, default!, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null)
-            => PostWithResultAsync(request, value, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="locationUri">The optional function to set the location <see cref="Uri"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PostWithResultAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-            => PostWithResultInternalAsync(request, true, value, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, locationUri, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Post"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        private async Task<IActionResult> PostWithResultInternalAsync<TValue, TResult>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK, HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Create, bool valueIsRequired = true, IValidator<TValue>? validator = null, Func<TResult, Uri>? locationUri = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPost(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Post}' to use {nameof(PostAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, ct).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                var result = await function(wapv!, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : ValueContentResult.CreateResult(result.Value, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: locationUri?.Invoke(result));
-            }, operationType, cancellationToken, nameof(PostWithResultAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PutWithResultAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutWithResultAsync(request, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutWithResultInternalAsync(request, false, default!, function, statusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutWithResultInternalAsync(request, true, value, (p, _) => function(p), statusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutWithResultInternalAsync(request, true, value, function, statusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and no corresponding response value (with a <see cref="Result"/>).
-        /// </summary>
-        private async Task<IActionResult> PutWithResultInternalAsync<TValue>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent,
-            OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPut(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Put}' to use {nameof(PutWithResultAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                var result = await function(wapv!, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : new ExtendedStatusCodeResult(statusCode);
-            }, operationType, cancellationToken, nameof(PutWithResultAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutWithResultAsync(request, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue, TResult>(HttpRequest request, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutWithResultInternalAsync(request, false, default!, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null)
-            => PutWithResultAsync(request, value, (p, _) => function(p), statusCode, alternateStatusCode, operationType, valueIsRequired, validator, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The response result <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="alternateStatusCode">The alternate <see cref="HttpStatusCode"/> where result is <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="valueIsRequired">Indicates whether the request value is required; will consider invalid where <c>null</c>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IActionResult"/> (either <see cref="ValueContentResult"/> on non-<c>null</c> result; otherwise, a <see cref="StatusCodeResult"/>).</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue, TResult>(HttpRequest request, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-            => PutWithResultInternalAsync(request, true, value, function, statusCode, alternateStatusCode, operationType, valueIsRequired, validator, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> and a response of <see cref="Type"/> <typeparamref name="TResult"/> (with a <see cref="Result{T}"/>).
-        /// </summary>
-        public async Task<IActionResult> PutWithResultInternalAsync<TValue, TResult>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TResult>>> function, HttpStatusCode statusCode = HttpStatusCode.OK,
-            HttpStatusCode alternateStatusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Update, bool valueIsRequired = true, IValidator<TValue>? validator = null, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsPut(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Put}' to use {nameof(PutWithResultAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, valueIsRequired, validator, ct).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                var result = await function(wapv!, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : ValueContentResult.CreateResult(result.Value, statusCode, alternateStatusCode, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: null);
-            }, operationType, cancellationToken, nameof(PutWithResultAsync)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false) where TValue : class
-            => PutWithResultAsync(request, (p, _) => get(p), (p, _) => put(p), statusCode, operationType, validator, simulatedConcurrency, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-            => PutWithResultInternalAsync(request, false, default!, get, put, statusCode, operationType, validator, simulatedConcurrency, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false) where TValue : class
-            => PutWithResultAsync(request, value, (p, _) => get(p), (p, _) => put(p), statusCode, operationType, validator, simulatedConcurrency, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="value">The value (already deserialized).</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> PutWithResultAsync<TValue>(HttpRequest request, TValue value, Func<WebApiParam, CancellationToken, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-            => PutWithResultInternalAsync(request, true, value, get, put, statusCode, operationType, validator, simulatedConcurrency, cancellationToken);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Put"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        private async Task<IActionResult> PutWithResultInternalAsync<TValue>(HttpRequest request, bool useValue, TValue value, Func<WebApiParam, CancellationToken, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-        {
-            request.ThrowIfNull(nameof(request));
-            get.ThrowIfNull(nameof(get));
-            put.ThrowIfNull(nameof(put));
-
-            if (!HttpMethods.IsPut(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Put}' to use {nameof(PutWithResultAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var (wapv, vex) = await ValidateValueAsync(wap, useValue, value, true, validator, ct).ConfigureAwait(false);
-                if (vex != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, vex, Settings, Logger, OnUnhandledExceptionAsync, cancellationToken).ConfigureAwait(false);
-
-                // Get the current value before we perform the update; also performing a concurrency match.
-                var cresult = await get(wap, ct).ConfigureAwait(false);
-                var ex = cresult.IsFailure ? cresult.Error : (cresult.Value == null ? new NotFoundException() : ConcurrencyETagMatching(wap, cresult.Value, wapv!.Value, simulatedConcurrency));
-
-                if (ex is not null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, ex, Settings, Logger, OnUnhandledExceptionAsync, ct).ConfigureAwait(false);
-
-                // Update the value.
-                var result = await put(wapv!, ct).ConfigureAwait(false);
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false)
-                    : ValueContentResult.CreateResult(result.Value, statusCode, null, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: null);
-            }, operationType, cancellationToken, nameof(PutWithResultAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region DeleteWithResultAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Delete"/> operation (with a <see cref="Result"/>).
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public Task<IActionResult> DeleteWithResultAsync(HttpRequest request, Func<WebApiParam, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Delete)
-            => DeleteWithResultAsync(request, (p, _) => function(p), statusCode, operationType, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Delete"/> operation (with a <see cref="Result"/>).
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="function">The function to execute.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where result is not <c>null</c>.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        public async Task<IActionResult> DeleteWithResultAsync(HttpRequest request, Func<WebApiParam, CancellationToken, Task<Result>> function, HttpStatusCode statusCode = HttpStatusCode.NoContent, OperationType operationType = OperationType.Delete, CancellationToken cancellationToken = default)
-        {
-            request.ThrowIfNull(nameof(request));
-            function.ThrowIfNull(nameof(function));
-
-            if (!HttpMethods.IsDelete(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Delete}' to use {nameof(DeleteWithResultAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                var result = await function(wap, ct).ConfigureAwait(false);
-                if (result.IsFailure)
-                {
-                    // Return default status code where configured for a NotFoundException. 
-                    if (!(ConvertNotfoundToDefaultStatusCodeOnDelete && (result.Error is NotFoundException || (result.Error is AggregateException ae && ae.InnerException is NotFoundException))))
-                        return await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, OnUnhandledExceptionAsync, ct).ConfigureAwait(false);
-                }
-
-                return new ExtendedStatusCodeResult(statusCode);
-            }, operationType, cancellationToken, nameof(DeleteWithResultAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region PatchWithResultAsync
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value to patch into. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the patched value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>Currently on the <see cref="JsonMergePatch"/> is supported.</remarks>
-        public Task<IActionResult> PatchWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false) where TValue : class
-            => PatchWithResultAsync(request, (p, _) => get(p), (p, _) => put(p), statusCode, operationType, validator, simulatedConcurrency, CancellationToken.None);
-
-        /// <summary>
-        /// Performs a <see cref="HttpMethods.Patch"/> operation with a request JSON content value of <see cref="Type"/> <typeparamref name="TValue"/> returning a corresponding response value (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="TValue">The request JSON content value <see cref="Type"/>.</typeparam>
-        /// <param name="request">The <see cref="HttpRequest"/>.</param>
-        /// <param name="get">The function to execute the <i>get</i> to retrieve the value to patch into. Where this returns a <c>null</c> then this will result in a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>.</param>
-        /// <param name="put">The function to execute the <i>put</i> to replace (update) the patched value.</param>
-        /// <param name="statusCode">The <see cref="HttpStatusCode"/> where successful.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="simulatedConcurrency">Indicates whether simulated concurrency (ETag) checking/generation is performed as underlying data source does not support.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="ExtendedStatusCodeResult"/> <see cref="IActionResult"/> where successful.</returns>
-        /// <remarks>Currently on the <see cref="JsonMergePatch"/> is supported.</remarks>
-        public async Task<IActionResult> PatchWithResultAsync<TValue>(HttpRequest request, Func<WebApiParam, CancellationToken, Task<Result<TValue?>>> get, Func<WebApiParam<TValue>, CancellationToken, Task<Result<TValue>>> put, HttpStatusCode statusCode = HttpStatusCode.OK,
-            OperationType operationType = OperationType.Update, IValidator<TValue>? validator = null, bool simulatedConcurrency = false, CancellationToken cancellationToken = default) where TValue : class
-        {
-            request.ThrowIfNull(nameof(request));
-            get.ThrowIfNull(nameof(get));
-            put.ThrowIfNull(nameof(put));
-
-            if (JsonMergePatch == null)
-                throw new InvalidOperationException($"To use the '{nameof(PatchWithResultAsync)}' methods the '{nameof(JsonMergePatch)}' object must be passed in the constructor. Where using dependency injection consider using '{nameof(Microsoft.Extensions.DependencyInjection.IServiceCollectionExtensions.AddJsonMergePatch)}' to add and configure the supported options.");
-
-            if (!HttpMethods.IsPatch(request.Method))
-                throw new ArgumentException($"HttpRequest.Method is '{request.Method}'; must be '{HttpMethods.Patch}' to use {nameof(PatchWithResultAsync)}.", nameof(request));
-
-            return await RunAsync(request, async (wap, ct) =>
-            {
-                // Make sure that the only the support content types are used.
-                var hct = request.GetTypedHeaders()?.ContentType?.MediaType.Value;
-                if (StringComparer.OrdinalIgnoreCase.Compare(hct, HttpConsts.MergePatchMediaTypeName) != 0 && StringComparer.OrdinalIgnoreCase.Compare(hct, MediaTypeNames.Application.Json) != 0)
-                    return new ContentResult
-                    {
-                        StatusCode = (int)HttpStatusCode.UnsupportedMediaType,
-                        ContentType = MediaTypeNames.Text.Plain,
-                        Content = $"Unsupported 'Content-Type' for a PATCH; only JSON Merge Patch is supported using either: 'application/merge-patch+json' or '{MediaTypeNames.Application.Json}'."
-                    };
-
-                // Retrieve the JSON content string; there must be some content of some type.
-                var json = await request.ReadAsBinaryDataAsync(true, ct).ConfigureAwait(false);
-                if (json.Exception != null)
-                    return await CreateActionResultFromExceptionAsync(this, request.HttpContext, json.Exception, Settings, Logger, UnhandledExceptionAsync, ct).ConfigureAwait(false);
-
-                // Note: the JsonMergePatch will throw JsonMergePatchException on error which will be automatically converted to an appropriate IActionResult by the invoking RunAsync method.
-                var mresult = await JsonMergePatch.MergeWithResultAsync<TValue>(json.Content!, async (jpv, ct2) =>
-                {
-                    // Get the current value and perform a concurrency match before we perform the merge.
-                    var rv = await get(wap, ct2).ConfigureAwait(false);
-                    var ex = rv.IsFailure ? rv.Error : (rv.Value is null ? new NotFoundException() : ConcurrencyETagMatching(wap, rv.Value, jpv, simulatedConcurrency));
-                    return ex is null ? Result<TValue?>.Ok(rv.Value) : Result<TValue?>.Fail(ex);
-                }, ct).ConfigureAwait(false);
-
-                // Only invoke the put function where something was *actually* changed.
-                var result = await mresult.ThenAsAsync(async v =>
-                {
-                    if (v.HasChanges)
-                    {
-                        if (validator != null)
-                        {
-                            var vr = await validator.ValidateAsync(v.Value!, ct).ConfigureAwait(false);
-                            if (vr.HasErrors)
-                                return vr.ToException()!;
-                        }
-
-                        return await put(new WebApiParam<TValue>(wap, v.Value!), ct).ConfigureAwait(false);
-                    }
-
-                    return Result.Ok(v.Value!);
-                }).ConfigureAwait(false);
-
-                return result.IsFailure
-                    ? await CreateActionResultFromExceptionAsync(this, request.HttpContext, result.Error, Settings, Logger, UnhandledExceptionAsync, cancellationToken).ConfigureAwait(false)
-                    : ValueContentResult.CreateResult(result.Value, statusCode, null, JsonSerializer, wap.RequestOptions, checkForNotModified: false, location: null);
-            }, operationType, cancellationToken, nameof(PatchWithResultAsync)).ConfigureAwait(false);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/AutoMapperConverterWrapper.cs b/src/CoreEx.AutoMapper/AutoMapperConverterWrapper.cs
deleted file mode 100644
index 25060832..00000000
--- a/src/CoreEx.AutoMapper/AutoMapperConverterWrapper.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Wraps an <see cref="IConverter"/> to enable <see cref="AutoMapper.IValueConverter{TSourceMember, TDestinationMember}"/> to/from capabilities.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TConverter">The <see cref="IConverter{TSource, TDestination}"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The declaring <see cref="Type"/> itself to enable <see cref="Default"/>.</typeparam>
-    /// <param name="create">The optional function to create the <typeparamref name="TConverter"/> instance.</param>
-    public abstract class AutoMapperConverterWrapper<TSource, TDestination, TConverter, TSelf>(Func<TConverter>? create = null)
-        where TConverter : IConverter<TSource, TDestination>, new()
-        where TSelf : AutoMapperConverterWrapper<TSource, TDestination, TConverter, TSelf>, new()
-    {
-        private readonly Func<TConverter> _create = create ?? (() => new TConverter());
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static TSelf Default { get; set; } = new();
-
-        /// <summary>
-        /// Gets the source to destination <see cref="AutoMapper.IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public AutoMapper.IValueConverter<TSource, TDestination> ToDestination => new ToDestinationMapper(_create().ToDestination);
-
-        /// <summary>
-        /// Gets the destination to source <see cref="AutoMapper.IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public AutoMapper.IValueConverter<TDestination, TSource> ToSource => new ToSourceMapper(_create().ToSource);
-
-        /// <summary>
-        /// Represents the source to destination <see cref="AutoMapper.IValueConverter{TSource, TDestination}"/> struct.
-        /// </summary>
-        public readonly struct ToDestinationMapper : AutoMapper.IValueConverter<TSource, TDestination>
-        {
-            private readonly IValueConverter<TSource, TDestination> _valueConverter;
-
-            internal ToDestinationMapper(IValueConverter<TSource, TDestination> valueConverter) => _valueConverter = valueConverter;
-
-            /// <inheritdoc/>
-            public TDestination Convert(TSource sourceMember, AutoMapper.ResolutionContext context) => _valueConverter.Convert(sourceMember)!;
-        }
-
-        /// <summary>
-        /// Represents the destination to source <see cref="AutoMapper.IValueConverter{TDestination, TSource}"/> struct.
-        /// </summary>
-        public readonly struct ToSourceMapper : AutoMapper.IValueConverter<TDestination, TSource>
-        {
-            private readonly IValueConverter<TDestination, TSource> _valueConverter;
-
-            internal ToSourceMapper(IValueConverter<TDestination, TSource> valueConverter) => _valueConverter = valueConverter;
-
-            /// <inheritdoc/>
-            public TSource Convert(TDestination sourceMember, AutoMapper.ResolutionContext context) => _valueConverter.Convert(sourceMember)!;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/AutoMapperExtensions.cs b/src/CoreEx.AutoMapper/AutoMapperExtensions.cs
deleted file mode 100644
index 7cb5766c..00000000
--- a/src/CoreEx.AutoMapper/AutoMapperExtensions.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using AutoMapper;
-using AutoMapper.Configuration;
-using System;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Adds additional extension methods for <c>AutoMapper</c>.
-    /// </summary>
-    public static class AutoMapperExtensions
-    {
-        /// <summary>
-        /// Gets the <see cref="CoreEx.Mapping.OperationTypes"/> name used for indexing <see cref="IMappingOperationOptions.Items"/>.
-        /// </summary>
-        public const string OperationTypesName = nameof(OperationTypes);
-
-        /// <summary>
-        /// Conditionally map this member with the specified the <see cref="CoreEx.Mapping.OperationTypes"/> against the <see cref="IMappingOperationOptions.Items"/> <see cref="OperationTypesName"/> value, evaluated before accessing the source value.
-        /// </summary>
-        /// <typeparam name="TSource">The source entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TSourceMember">The source entity member <see cref="Type"/>.</typeparam>
-        /// <param name="mce">The <see cref="IMemberConfigurationExpression{TSource, TDestination, TMember}"/>.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/>.</param>
-        /// <remarks>Uses the <see cref="IMemberConfigurationExpression{TSource, TDestination, TMember}.PreCondition(Func{ResolutionContext, bool})"/>.</remarks>
-        public static IMemberConfigurationExpression<TSource, TDestination, TSourceMember> OperationTypes<TSource, TDestination, TSourceMember>(this IMemberConfigurationExpression<TSource, TDestination, TSourceMember> mce, OperationTypes operationTypes)
-        {
-            mce.ThrowIfNull(nameof(mce)).PreCondition((ResolutionContext rc) => !rc.Items.TryGetValue(OperationTypesName, out var ot) || operationTypes.HasFlag((OperationTypes)ot));
-            return mce;
-        }
-
-        /// <summary>
-        /// Conditionally map this path with the specified the <see cref="CoreEx.Mapping.OperationTypes"/> against the <see cref="IMappingOperationOptions.Items"/> <see cref="OperationTypesName"/> value, evaluated before accessing the source value.
-        /// </summary>
-        /// <typeparam name="TSource">The source entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TMember">The member <see cref="Type"/>.</typeparam>
-        /// <param name="pce">The <see cref="IPathConfigurationExpression{TSource, TDestination, TMember}"/>.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/>.</param>
-        /// <remarks>Uses the <see cref="IPathConfigurationExpression{TSource, TDestination, TMember}.Condition(Func{ConditionParameters{TSource, TDestination, TMember}, bool})"/>.</remarks>
-        public static IPathConfigurationExpression<TSource, TDestination, TMember> OperationTypes<TSource, TDestination, TMember>(this IPathConfigurationExpression<TSource, TDestination, TMember> pce, OperationTypes operationTypes)
-        {
-            pce.ThrowIfNull(nameof(pce)).Condition(cp => !cp.Context.Items.TryGetValue(OperationTypesName, out var ot) || operationTypes.HasFlag((OperationTypes)ot));
-            return pce;
-        }
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> (inferring <see cref="Type"/>) value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="AutoMapper.IMapper"/>.</param>
-        /// <param name="source">The source value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="CoreEx.Mapping.OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        public static TDestination Map<TDestination>(this AutoMapper.IMapper mapper, object source, OperationTypes operationType)
-            => mapper.ThrowIfNull(nameof(mapper)).Map<TDestination>(source, o => o.Items.Add(OperationTypesName, operationType));
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="AutoMapper.IMapper"/>.</param>
-        /// <param name="source">The source value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="CoreEx.Mapping.OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        public static TDestination Map<TSource, TDestination>(this AutoMapper.IMapper mapper, TSource source, OperationTypes operationType)
-            => mapper.ThrowIfNull(nameof(mapper)).Map<TSource, TDestination>(source, o => o.Items.Add(OperationTypesName, operationType));
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value into the existing <paramref name="destination"/> value.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="AutoMapper.IMapper"/>.</param>
-        /// <param name="source">The source value.</param>
-        /// <param name="destination">The destination value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="CoreEx.Mapping.OperationTypes"/> value being performed.</param>
-        /// <returns>The <paramref name="destination"/> value.</returns>
-        public static TDestination Map<TSource, TDestination>(this AutoMapper.IMapper mapper, TSource source, TDestination destination, OperationTypes operationType)
-            => mapper.ThrowIfNull(nameof(mapper)).Map(source, destination, o => o.Items.Add(OperationTypesName, operationType));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/AutoMapperProfile.cs b/src/CoreEx.AutoMapper/AutoMapperProfile.cs
deleted file mode 100644
index 6eeda98b..00000000
--- a/src/CoreEx.AutoMapper/AutoMapperProfile.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using AutoMapper;
-using CoreEx.Entities;
-using System.Reflection;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Represents the core <c>AutoMapper</c> <see cref="Profile"/> for <i>CoreEx</i>.
-    /// </summary>
-    /// <remarks>Automatically sets the mapping between <see cref="ChangeLog"/> and <see cref="Entities.Extended.ChangeLogEx"/>.</remarks>
-    public class AutoMapperProfile : Profile
-    {
-        /// <summary>
-        /// Gets the <i>CoreEx</i> <see cref="AutoMapperProfile"/> <see cref="System.Reflection.Assembly"/>.
-        /// </summary>
-        public static Assembly Assembly => typeof(AutoMapperProfile).Assembly;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AutoMapperProfile"/> class.
-        /// </summary>
-        public AutoMapperProfile()
-        {
-            // Standardize ChangeLog -> Changelog mapping with the OperationTypes condition.
-            CreateMap<ChangeLog, ChangeLog>()
-                .ForMember(d => d.CreatedBy, o => o.OperationTypes(OperationTypes.AnyExceptUpdate).MapFrom(s => s.CreatedBy))
-                .ForMember(d => d.CreatedDate, o => o.OperationTypes(OperationTypes.AnyExceptUpdate).MapFrom(s => s.CreatedDate))
-                .ForMember(d => d.UpdatedBy, o => o.OperationTypes(OperationTypes.AnyExceptCreate).MapFrom(s => s.UpdatedBy))
-                .ForMember(d => d.UpdatedDate, o => o.OperationTypes(OperationTypes.AnyExceptCreate).MapFrom(s => s.UpdatedDate));
-
-            CreateMap<ChangeLog, Entities.Extended.ChangeLogEx>()
-                .ForMember(d => d.CreatedBy, o => o.OperationTypes(OperationTypes.AnyExceptUpdate).MapFrom(s => s.CreatedBy))
-                .ForMember(d => d.CreatedDate, o => o.OperationTypes(OperationTypes.AnyExceptUpdate).MapFrom(s => s.CreatedDate))
-                .ForMember(d => d.UpdatedBy, o => o.OperationTypes(OperationTypes.AnyExceptCreate).MapFrom(s => s.UpdatedBy))
-                .ForMember(d => d.UpdatedDate, o => o.OperationTypes(OperationTypes.AnyExceptCreate).MapFrom(s => s.UpdatedDate))
-                .ReverseMap();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/AutoMapperServiceCollectionExtensions.cs b/src/CoreEx.AutoMapper/AutoMapperServiceCollectionExtensions.cs
deleted file mode 100644
index 5a7b9508..00000000
--- a/src/CoreEx.AutoMapper/AutoMapperServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Mapping;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extenstion methods.
-    /// </summary>
-    public static class AutoMapperServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds an <see cref="AutoMapperWrapper"/> to wrap the <see cref="AutoMapper.IMapper"/> as a singleton services.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddAutoMapperWrapper(this IServiceCollection services)
-            => services.ThrowIfNull(nameof(services)).AddSingleton<IMapper>(sp => new AutoMapperWrapper(sp.GetRequiredService<AutoMapper.IMapper>()));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/AutoMapperWrapper.cs b/src/CoreEx.AutoMapper/AutoMapperWrapper.cs
deleted file mode 100644
index 575274ac..00000000
--- a/src/CoreEx.AutoMapper/AutoMapperWrapper.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Represents an <see cref="AutoMapper.IMapper"/> wrapper to enable <i>CoreEx</i> <see cref="IMapper"/>.
-    /// </summary>
-    /// <param name="autoMapper">The <see cref="AutoMapper.IMapper"/> being wrapped.</param>
-    public class AutoMapperWrapper(AutoMapper.IMapper autoMapper) : IMapper
-    {
-        /// <summary>
-        /// Gets the wrapped <see cref="AutoMapper.IMapper"/>
-        /// </summary>
-        public AutoMapper.IMapper Mapper { get; } = autoMapper.ThrowIfNull(nameof(autoMapper));
-
-        /// <inheritdoc/>
-        public TDestination? Map<TDestination>(object? source, OperationTypes operationType = OperationTypes.Unspecified) => Mapper.Map<TDestination>(source!, operationType);
-
-        /// <inheritdoc/>
-        public TDestination? Map<TSource, TDestination>(TSource? source, OperationTypes operationType = OperationTypes.Unspecified) => Mapper.Map<TSource, TDestination>(source!, operationType);
-
-        /// <inheritdoc/>
-        public TDestination? Map<TSource, TDestination>(TSource? source, TDestination? destination, OperationTypes operationType = OperationTypes.Unspecified) => Mapper.Map(source, destination, operationType);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/Converters/AutoMapperObjectToJsonConverter.cs b/src/CoreEx.AutoMapper/Converters/AutoMapperObjectToJsonConverter.cs
deleted file mode 100644
index 2f8203fc..00000000
--- a/src/CoreEx.AutoMapper/Converters/AutoMapperObjectToJsonConverter.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Wraps a <see cref="ObjectToJsonConverter{T}"/> to enable for <b>AutoMapper</b>.
-    /// </summary>
-    public class AutoMapperObjectToJsonConverter<T> : AutoMapperConverterWrapper<T?, string?, ObjectToJsonConverter<T>, AutoMapperObjectToJsonConverter<T>> { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/Converters/AutoMapperReferenceDataCodeConverter.cs b/src/CoreEx.AutoMapper/Converters/AutoMapperReferenceDataCodeConverter.cs
deleted file mode 100644
index 1193d5cb..00000000
--- a/src/CoreEx.AutoMapper/Converters/AutoMapperReferenceDataCodeConverter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Wraps a <see cref="ReferenceDataCodeConverter{TRef}"/> to enable for <b>AutoMapper</b>.
-    /// </summary>
-    public class AutoMapperReferenceDataCodeConverter<TRef> : AutoMapperConverterWrapper<TRef?, string?, ReferenceDataCodeConverter<TRef>, AutoMapperReferenceDataCodeConverter<TRef>> where TRef : IReferenceData, new() { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/Converters/AutoMapperReferenceDataIdConverter.cs b/src/CoreEx.AutoMapper/Converters/AutoMapperReferenceDataIdConverter.cs
deleted file mode 100644
index a002b05c..00000000
--- a/src/CoreEx.AutoMapper/Converters/AutoMapperReferenceDataIdConverter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Wraps a <see cref="ReferenceDataIdConverter{TRef, TId}"/> to enable for <b>AutoMapper</b>.
-    /// </summary>
-    public class AutoMapperReferenceDataIdConverter<TRef, TId> : AutoMapperConverterWrapper<TRef?, TId, ReferenceDataIdConverter<TRef, TId>, AutoMapperReferenceDataIdConverter<TRef, TId>> where TRef : IReferenceData, new() { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/Converters/AutoMapperStringToBase64Converter.cs b/src/CoreEx.AutoMapper/Converters/AutoMapperStringToBase64Converter.cs
deleted file mode 100644
index 7135c68a..00000000
--- a/src/CoreEx.AutoMapper/Converters/AutoMapperStringToBase64Converter.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Wraps a <see cref="StringToBase64Converter"/> to enable for <b>AutoMapper</b>.
-    /// </summary>
-    public class AutoMapperStringToBase64Converter : AutoMapperConverterWrapper<string?, byte[]?, StringToBase64Converter, AutoMapperStringToBase64Converter> { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/Converters/AutoMapperTypeToStringConverter.cs b/src/CoreEx.AutoMapper/Converters/AutoMapperTypeToStringConverter.cs
deleted file mode 100644
index 825abd9e..00000000
--- a/src/CoreEx.AutoMapper/Converters/AutoMapperTypeToStringConverter.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Wraps a <see cref="TypeToStringConverter{T}"/> to enable for <b>AutoMapper</b>.
-    /// </summary>
-    public class AutoMapperTypeToStringConverter<T> : AutoMapperConverterWrapper<T, string?, TypeToStringConverter<T>, AutoMapperTypeToStringConverter<T>> { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj b/src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj
deleted file mode 100644
index 17cfcf32..00000000
--- a/src/CoreEx.AutoMapper/CoreEx.AutoMapper.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>CoreEx.Mapping</RootNamespace>
-    <Product>CoreEx.AutoMapper</Product>
-    <Title>CoreEx .NET AutoMapper Extensions.</Title>
-    <Description>CoreEx .NET AutoMapper Extensions.</Description>
-    <PackageTags>coreex automapper mapper imapper</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/CoreEx.AutoMapper/strong-name-key.snk b/src/CoreEx.AutoMapper/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.AutoMapper/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/AGENTS.md b/src/CoreEx.Azure.Messaging.ServiceBus/AGENTS.md
new file mode 100644
index 00000000..22dc7228
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/AGENTS.md
@@ -0,0 +1,95 @@
+# CoreEx.Azure.Messaging.ServiceBus — AI Usage Guide
+
+Provides Azure Service Bus publishing and subscriber hosting for the CoreEx events pipeline.
+
+## Publishing
+
+Register the publisher in `Program.cs`. When the outbox pattern is used (recommended), Service Bus is **not** the default `IEventPublisher` — the outbox publisher is. Pass `addAsDefaultIEventPublisher: false`.
+
+```csharp
+// Outbox-backed API or Subscribe host — outbox publishes to the DB; relay forwards to Service Bus
+builder.Services.AddAzureServiceBusPublisher((_, c) =>
+{
+    c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;
+}, addAsDefaultIEventPublisher: false);
+
+// Outbox Relay host — Service Bus IS the default publisher (no outbox layer here)
+builder.Services.AddAzureServiceBusPublisher((_, c) =>
+{
+    c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;
+});
+```
+
+## Subscribe Host Wiring
+
+```csharp
+// Register the event formatter and subscriber manager first
+builder.Services
+    .AddEventFormatter()
+    .AddSubscribedManager((_, c) => c.AddSubscribersUsing<MySubscriber>());
+// AddSubscribersUsing<T> scans the assembly of T and auto-registers all [Subscribe]-decorated classes.
+
+// Wire the Service Bus receiver
+builder.Services.AzureServiceBusReceiving()
+    .WithSessionReceiver(_ =>
+    {
+        var o = ServiceBusSessionReceiverOptions.CreateForTopicSubscription();
+        o.SessionProcessorOptions.MaxConcurrentSessions = 4;
+        return o;
+    })
+    .WithSubscribedSubscriber()   // routes messages through SubscribedManager
+    .WithHostedService()          // runs as a BackgroundService
+    .Build();
+```
+
+## Subscriber Classes
+
+Subscribers are decorated with `[Subscribe("subject")]` and extend `SubscribedBase` (untyped) or `SubscribedBase<TValue>` (typed payload). Register with `[ScopedService]`.
+
+```csharp
+// Untyped subscriber
+[ScopedService, Subscribe("contoso.orders.order.created.v1")]
+public class OrderCreatedSubscriber(IOrderService service) : SubscribedBase
+{
+    protected override async Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args,
+        CancellationToken cancellationToken = default)
+    {
+        var id = @event.Key.Required();
+        await service.ProcessCreatedAsync(id, cancellationToken).ConfigureAwait(false);
+        return Result.Success;
+    }
+}
+
+// Typed subscriber with validation
+[ScopedService, Subscribe("contoso.orders.order.updated.v1")]
+public class OrderUpdatedSubscriber(IOrderService service) : SubscribedBase<Order>
+{
+    public override IValidator<Order>? ValueValidator => OrderValidator.Default;
+
+    protected override Task<Result> OnReceiveAsync(Order value, EventData @event,
+        EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => service.UpdateAsync(value, cancellationToken);
+}
+```
+
+## Error Handling
+
+Use `ErrorHandler` on a subscriber to map specific exceptions to dead-letter, silent completion, or retry — no try/catch in subscriber code.
+
+```csharp
+internal static readonly ErrorHandler DefaultErrorHandler = new ErrorHandler()
+    .Add<NotFoundException>(_ => ErrorHandling.CompleteAsInformation);
+```
+
+## Do Not
+
+- Do not register `AddAzureServiceBusPublisher` as the default publisher when using the transactional outbox — pass `addAsDefaultIEventPublisher: false`.
+- Do not add a new subscriber to `Program.cs` — creating the class with `[Subscribe]` and `[ScopedService]` is sufficient; `AddSubscribersUsing<T>()` discovers it automatically.
+
+## Further Reading
+
+- [README](./README.md) — full publisher, subscriber, and receiver API reference.
+- [CoreEx.Events](../CoreEx.Events/README.md) — `IEventPublisher`, `EventSubscriberBase`, and `SubscribedManager` that this package binds to Service Bus.
+- [Hosts layer](../../samples/docs/hosts-layer.md) — Subscribe and Relay host `Program.cs` shapes and Azure Service Bus wiring.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — outbox table setup and relay publisher integration.
+- [Patterns](../../samples/docs/patterns.md) — transactional outbox, event publishing, and subscriber error-handling patterns.
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ProcessMessageEventArgsActions.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ProcessMessageEventArgsActions.cs
new file mode 100644
index 00000000..597eb6b1
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ProcessMessageEventArgsActions.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides an implementation of <see cref="IServiceBusMessageActions"/> for the <see cref="ProcessMessageEventArgs"/>.
+/// </summary>
+/// <param name="args">The <see cref="ProcessMessageEventArgs"/>.</param>
+public sealed class ProcessMessageEventArgsActions(ProcessMessageEventArgs args) : ServiceBusMessageActionsBase
+{
+    private readonly ProcessMessageEventArgs _args = args.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public override string EntityPath => _args.EntityPath;
+
+    /// <inheritdoc/>
+    public override Amqp.AmqpAnnotatedMessage AmqpMessage => _args.Message.GetRawAmqpMessage();
+
+    /// <inheritdoc/>
+    protected override Task OnCompletedMessageAsync(CancellationToken cancellationToken) => _args.CompleteMessageAsync(_args.Message, cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnAbandonedMessageAsync(Exception exception, CancellationToken cancellationToken)
+        => _args.AbandonMessageAsync(_args.Message, new Dictionary<string, object> { { AbandonReasonName, FormatText(exception.Message, NoneReasonText)! } }, cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnDeadLetteredMessageAsync(Exception exception, CancellationToken cancellationToken)
+        => _args.DeadLetterMessageAsync(_args.Message, FormatText(exception.Message, NoneReasonText), FormatText(exception.StackTrace), cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ProcessSessionMessageEventArgsActions.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ProcessSessionMessageEventArgsActions.cs
new file mode 100644
index 00000000..5a8a7972
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ProcessSessionMessageEventArgsActions.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides an implementation of <see cref="IServiceBusMessageActions"/> for the <see cref="ProcessSessionMessageEventArgs"/>.
+/// </summary>
+/// <param name="args">The <see cref="ProcessSessionMessageEventArgs"/>.</param>
+public sealed class ProcessSessionMessageEventArgsActions(ProcessSessionMessageEventArgs args) : ServiceBusMessageActionsBase
+{
+    private readonly ProcessSessionMessageEventArgs _args = args.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public override string EntityPath => _args.EntityPath;
+
+    /// <inheritdoc/>
+    public override Amqp.AmqpAnnotatedMessage AmqpMessage => _args.Message.GetRawAmqpMessage();
+
+    /// <inheritdoc/>
+    protected override Task OnCompletedMessageAsync(CancellationToken cancellationToken) => _args.CompleteMessageAsync(_args.Message, cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnAbandonedMessageAsync(Exception exception, CancellationToken cancellationToken)
+        => _args.AbandonMessageAsync(_args.Message, new Dictionary<string, object> { { ProcessMessageEventArgsActions.AbandonReasonName, FormatText(exception.Message, ProcessMessageEventArgsActions.NoneReasonText)! } }, cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnDeadLetteredMessageAsync(Exception exception, CancellationToken cancellationToken)
+        => _args.DeadLetterMessageAsync(_args.Message, FormatText(exception.Message, ProcessMessageEventArgsActions.NoneReasonText), FormatText(exception.StackTrace), cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/README.md b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/README.md
new file mode 100644
index 00000000..725ac0eb
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/README.md
@@ -0,0 +1,35 @@
+# CoreEx.Azure.Messaging.ServiceBus.Abstractions
+
+> Provides the foundational base classes for the Azure Service Bus receiver pipeline: `ServiceBusReceiverBase` and its typed variant, `ServiceBusReceiverOptionsBase`, `ServiceBusMessageActionsBase`, concrete message-actions adapters, and the `ServiceBusErrorClassifier` utility.
+
+## Overview
+
+The `Abstractions` namespace contains the building blocks that `ServiceBusReceiver<TSubscriber>` and `ServiceBusSessionReceiver<TSubscriber>` are built on top of. Direct consumers of the package rarely need to reference these types; they exist to allow extension and testing of the receiver infrastructure without depending on specific SDK processor types.
+
+`ServiceBusReceiverBase` manages the receiver lifecycle — start, pause, resume, stop — and co-ordinates the two Polly resiliency pipelines (circuit breaker at the receiver level, retry at the message level). `ServiceBusReceiverBase<TSubscriber>` adds the scoped DI resolution of `TSubscriber`, `ExecutionContext` configuration, and the full per-message processing flow. `ServiceBusReceiverOptionsBase` centralises the shared configuration that both `ServiceBusReceiverOptions` and `ServiceBusSessionReceiverOptions` inherit.
+
+`IServiceBusMessageActions` is the abstraction over the SDK's `ProcessMessageEventArgs` and `ProcessSessionMessageEventArgs` complete/abandon/dead-letter/defer operations. `ServiceBusMessageActionsBase` provides the metrics-recording wrapper, while `ProcessMessageEventArgsActions` and `ProcessSessionMessageEventArgsActions` are the concrete SDK-bound implementations. `ServiceBusErrorClassifier` classifies `ServiceBusException` errors (lock lost, transient, idle connection) and logs at the appropriate severity.
+
+## Key capabilities
+
+- 🧱 **Receiver lifecycle management**: `ServiceBusReceiverBase` exposes `StartAsync`, `PauseAsync`, `ResumeAsync`, and `StopAsync` with a `ServiceStatus` state machine and `SemaphoreSlim` guard to prevent concurrent state transitions.
+- 🔄 **Typed scoped execution**: `ServiceBusReceiverBase<TSubscriber>` resolves a fresh `TSubscriber` and `ExecutionContext` per message from a DI scope, then executes with `MessageResiliency` (Polly retry) wrapped inside `ReceiverResiliency` (circuit breaker).
+- 🔧 **Shared options base**: `ServiceBusReceiverOptionsBase` carries `QueueOrTopicName`, `SubscriptionName`, `ReceiverResiliency`, `MessageResiliency`, `ExecutionContextConfigure`, and `SubscriberServiceKey`; supports configuration-key indirection via `config:`, `^`, and `%` prefixes.
+- 📊 **Metrics-instrumented message actions**: `ServiceBusMessageActionsBase` records `MessagesReceivedComplete`, `MessagesReceivedAbandoned`, `MessagesReceivedDeadLetter`, and `MessagesReceivedDeferred` counters on each disposition call before delegating to the SDK.
+- 🛡 **Error classification**: `ServiceBusErrorClassifier.ClassifyAndLogError` inspects `ProcessErrorEventArgs`, distinguishes lock-lost, transient, and idle-connection-closed conditions, and logs at `Information` rather than `Error` to reduce noise.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| _[`ServiceBusReceiverBase`](./ServiceBusReceiverBase.cs)_ | Abstract base managing processor lifecycle (start/pause/resume/stop), `ServiceStatus` state machine, `ReceiverResiliency` circuit breaker, and `OnProcessMessageAsync` dispatch. |
+| _[`ServiceBusReceiverBase<TSubscriber>`](./ServiceBusReceiverBaseT.cs)_ | Typed abstract receiver; resolves scoped `TSubscriber` and `ExecutionContext` per message, applies `MessageResiliency` retry, and maps `Result` outcomes to SDK message actions (complete/abandon/dead-letter). |
+| _[`ServiceBusReceiverOptionsBase`](./ServiceBusReceiverOptionsBase.cs)_ | Abstract options base; holds queue/topic name, subscription name, both Polly resiliency pipelines, `ExecutionContextConfigure`, and `SubscriberServiceKey`. |
+| _[`ServiceBusMessageActionsBase`](./ServiceBusMessageActionsBase.cs)_ | Abstract `IServiceBusMessageActions` implementation; adds `ServiceBusMetrics` counters around complete/abandon/dead-letter/defer before delegating to the concrete SDK operation. |
+| **[`ProcessMessageEventArgsActions`](./ProcessMessageEventArgsActions.cs)** | Concrete `ServiceBusMessageActionsBase` for `ProcessMessageEventArgs`; delegates complete/abandon/dead-letter to the SDK args. |
+| **[`ProcessSessionMessageEventArgsActions`](./ProcessSessionMessageEventArgsActions.cs)** | Session-aware variant of `ProcessMessageEventArgsActions` for `ProcessSessionMessageEventArgs`. |
+| **[`ServiceBusErrorClassifier`](./ServiceBusErrorClassifier.cs)** | Static utility; classifies `ServiceBusException` into lock-lost, transient, and idle-connection-closed categories and logs at the appropriate level. |
+
+## Related namespaces
+
+- **[`CoreEx.Azure.Messaging.ServiceBus`](../README.md)** - Parent package; `ServiceBusReceiver<TSubscriber>` and `ServiceBusSessionReceiver<TSubscriber>` inherit from these base types.
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusErrorClassifier.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusErrorClassifier.cs
new file mode 100644
index 00000000..0d6a6a76
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusErrorClassifier.cs
@@ -0,0 +1,92 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides utility methods for classifying and interpreting a <see cref="ServiceBusException"/>.
+/// </summary>
+public static class ServiceBusErrorClassifier
+{
+    /// <summary>
+    /// Classifies the specified Azure Service Bus error and logs an appropriate message based on its severity.
+    /// </summary>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    /// <param name="args">The <see cref="ProcessErrorEventArgs"/> containing details about the error.</param>
+    /// <returns><see langword="true"/> where the error was classified as a known scenario (e.g., lock lost, transient, idle connection closed); otherwise, <see langword="false"/>.</returns>
+    public static bool ClassifyAndLogError(ILogger logger, ProcessErrorEventArgs args)
+    {
+        if (args.Exception is ServiceBusException sbex)
+        {
+            if (IsLockLost(sbex))
+            {
+                if (logger.IsEnabled(LogLevel.Information))
+                    logger.LogInformation(sbex, "A lock lost scenario occurred on entity {EntityPath} with error source {ErrorSource}.", args.EntityPath, args.ErrorSource);
+
+                return true;
+            }
+            else if (IsTransient(sbex))
+            {
+                if (logger.IsEnabled(LogLevel.Information))
+                    logger.LogInformation(sbex, "A transient error occurred on entity {EntityPath} with error source {ErrorSource}.", args.EntityPath, args.ErrorSource);
+
+                return true;
+            }
+            else if (IsIdleConnectionClosed(sbex))
+            {
+                if (logger.IsEnabled(LogLevel.Debug))
+                    logger.LogDebug(sbex, "An idle connection closed scenario occurred on entity {EntityPath} with error source {ErrorSource}.", args.EntityPath, args.ErrorSource);
+
+                return true;
+            }
+
+            if (logger.IsEnabled(LogLevel.Error))
+                logger.LogError(sbex, "An unclassified Service Bus error occurred on entity {EntityPath} with error source {ErrorSource} and reason {Reason}.", args.EntityPath, args.ErrorSource, sbex.Reason);
+
+            return false;
+        }
+
+        if (logger.IsEnabled(LogLevel.Error))
+            logger.LogError(args.Exception, "An unclassified Service Bus error occurred on entity {EntityPath} with error source {ErrorSource}", args.EntityPath, args.ErrorSource);
+
+        return false;
+    }
+
+
+    /// <summary>
+    /// Indicates whether the given <see cref="ServiceBusException"/> is a lock lost scenario, which typically occurs when a message lock expires before processing is completed, or when a session lock is lost.
+    /// </summary>
+    /// <param name="exception">The <see cref="ServiceBusException"/>.</param>
+    /// <remarks>This can happen due to various reasons such as long processing times, network issues, or other transient conditions that cause the lock to be released by the Service Bus.</remarks>
+    public static bool IsLockLost(ServiceBusException exception) => exception.Reason == ServiceBusFailureReason.MessageLockLost || exception.Reason == ServiceBusFailureReason.SessionLockLost;
+
+    /// <summary>   
+    /// Indicates whether the given <see cref="ServiceBusException"/> is considered transient, meaning it is likely to be resolved by retrying the operation after a delay.
+    /// </summary>
+    /// <param name="exception">The <see cref="ServiceBusException"/>.</param>
+    /// <remarks>This typically includes exceptions that occur due to temporary issues such as network connectivity problems, service unavailability, or throttling by the Service Bus.</remarks>
+    public static bool IsTransient(ServiceBusException exception)
+    {
+        // Best broad signal the SDK gives you.
+        if (exception.IsTransient)
+            return true;
+
+        // Optional explicit belt-and-braces cases.
+        return exception.Reason == ServiceBusFailureReason.ServiceTimeout
+            || exception.Reason == ServiceBusFailureReason.ServiceBusy
+            || exception.Reason == ServiceBusFailureReason.ServiceCommunicationProblem
+            || IsIdleConnectionClosed(exception);
+    }
+
+    /// <summary>
+    /// Indicates whether the given <see cref="ServiceBusException"/> is due to an idle connection being closed by the Service Bus, which can occur when a connection remains idle for an extended period and is automatically closed by the Service Bus to free up resources.
+    /// </summary>
+    /// <param name="exception">The <see cref="ServiceBusException"/>.</param>
+    public static bool IsIdleConnectionClosed(ServiceBusException exception)
+    {
+        if (exception.Message is null)
+            return false;
+
+        // This is a bit of a hack as the SDK does not provide a specific reason for this scenario, but it is a known pattern that can be identified by the message content.
+        return exception.Reason == ServiceBusFailureReason.GeneralError
+            && exception.Message.Contains("did not have any active links", StringComparison.OrdinalIgnoreCase)
+            && exception.Message.Contains("The connection was closed by container", StringComparison.OrdinalIgnoreCase);
+    }
+}
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusMessageActionsBase.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusMessageActionsBase.cs
new file mode 100644
index 00000000..667b5117
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusMessageActionsBase.cs
@@ -0,0 +1,72 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides the base <see cref="IServiceBusMessageActions"/> implementation for Azure Service Bus, including the recording of metrics for each action.
+/// </summary>
+public abstract class ServiceBusMessageActionsBase : IServiceBusMessageActions
+{
+    /// <inheritdoc/>
+    public abstract string EntityPath { get; }
+
+    /// <inheritdoc/>
+    public abstract Amqp.AmqpAnnotatedMessage AmqpMessage { get; }
+
+    /// <inheritdoc/>
+    public Task CompleteMessageAsync(CancellationToken cancellationToken)
+    {
+        ServiceBusMetrics.MessagesReceivedComplete.Add(1, [new(ServiceBusMetrics.SourceTagName, EntityPath)]);
+        return OnCompletedMessageAsync(cancellationToken);
+    }
+
+    /// <summary>
+    /// Marks the current message as completed, indicating that it has been processed successfully.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnCompletedMessageAsync(CancellationToken cancellationToken);
+
+    /// <inheritdoc/>
+    public Task AbandonMessageAsync(Exception exception, CancellationToken cancellationToken)
+    {
+        ServiceBusMetrics.MessagesReceivedAbandoned.Add(1, [new(ServiceBusMetrics.SourceTagName, EntityPath)]);
+        return OnAbandonedMessageAsync(exception, cancellationToken);
+    }
+
+    /// <summary>
+    /// Marks the current message as abandoned, indicating that it could not be processed successfully, and records the specified <paramref name="exception"/> as the reason.
+    /// </summary>
+    /// <param name="exception">The <see cref="Exception"/> that describes the reason for abandoning the message.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnAbandonedMessageAsync(Exception exception, CancellationToken cancellationToken);
+
+    /// <inheritdoc/>
+    public Task DeadLetterMessageAsync(Exception exception, CancellationToken cancellationToken)
+    {
+        ServiceBusMetrics.MessagesReceivedDeadLetter.Add(1, [new(ServiceBusMetrics.SourceTagName, EntityPath)]);
+        return OnDeadLetteredMessageAsync(exception, cancellationToken);
+    }
+
+    /// <summary>
+    /// Marks the current message as abandoned, indicating that it could not be processed successfully, and records the specified <paramref name="exception"/> as the reason.
+    /// </summary>
+    /// <param name="exception">The <see cref="Exception"/> that describes the reason for abandoning the message.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnDeadLetteredMessageAsync(Exception exception, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets the name of the property within the <see cref="ServiceBusReceivedMessage.ApplicationProperties"/> that contains the abandon reason.
+    /// </summary>
+    public const string AbandonReasonName = "AbandonReason";
+
+    /// <summary>
+    /// Gets the text used where no reason is available.
+    /// </summary>
+    public static LText NoneReasonText { get; } = new LText("CoreEx.Azure.Messaging.ServiceBus.None", "None.");
+
+    /// <summary>
+    /// Formats the text for logging purposes, truncating to 512 characters.
+    /// </summary>
+    /// <param name="text">The text to format.</param>
+    /// <param name="default">The default where the <paramref name="text"/> is <see langword="null"/>.</param>
+    /// <returns>The formatted text.</returns>
+    public static string? FormatText(string? text, string? @default = null) => text?[..Math.Min(text.Length, 512)] ?? @default;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBase.Static.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBase.Static.cs
new file mode 100644
index 00000000..8c71e745
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBase.Static.cs
@@ -0,0 +1,115 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+public abstract partial class ServiceBusReceiverBase
+{
+    /// <summary>
+    /// Gets or sets the maximum text length used by <see cref="FormatText(string?, string?)"/>.
+    /// </summary>
+    /// <remarks>Default is '<c>512</c>'.</remarks>
+    public static int MaxFormatTextLength { get; set; } = 512;
+
+    /// <summary>
+    /// Formats the <paramref name="text"/> for the likes of logging, etc., truncating to <see cref="MaxFormatTextLength"/> characters.
+    /// </summary>
+    /// <param name="text">The text to format.</param>
+    /// <param name="default">The default where the <paramref name="text"/> is <see langword="null"/>.</param>
+    /// <returns>The formatted text.</returns>
+    public static string? FormatText(string? text, string? @default = null) => text?[..Math.Min(text.Length, MaxFormatTextLength)] ?? @default;
+
+    /// <summary>
+    /// Provides a standardized/reusable means for actioning known exceptions in a consistent manner.
+    /// </summary>
+    /// <param name="exception">The exception that occurred.</param>
+    /// <param name="actions">The <see cref="IServiceBusMessageActions"/> to perform message actions.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/> of the error handling operation.</returns>
+    /// <remarks>Where the <paramref name="exception"/> has been actioned then the returned <see cref="Result"/> will be <see cref="Result.IsSuccess"/>; otherwise, <see cref="Result.IsFailure"/>.</remarks>
+    public static async Task<Result> MessageErrorActionAsync(Exception exception, IServiceBusMessageActions actions, CancellationToken cancellationToken)
+    {
+        if (exception.ThrowIfNull() is IEventSubscriberException esex)
+        {
+            switch (esex.ErrorHandling)
+            {
+                case ErrorHandling.CompleteAsSilent:
+                case ErrorHandling.CompleteAsInformation:
+                case ErrorHandling.CompleteAsWarning:
+                case ErrorHandling.CompleteAsError:
+                    await actions.CompleteMessageAsync(cancellationToken).ConfigureAwait(false);
+                    return Result.Success;
+
+                case ErrorHandling.Retry:
+                    await actions.AbandonMessageAsync(exception, cancellationToken).ConfigureAwait(false);
+                    return Result.Success;
+
+                case ErrorHandling.DeadLetter:
+                    await actions.DeadLetterMessageAsync(exception, cancellationToken).ConfigureAwait(false);
+                    return Result.Success;
+
+                default:
+                    return exception;
+            }
+        }
+        else
+            return exception;
+    }
+
+    /// <summary>
+    /// Logs the conversion of an exception to a different handling as per the configured options; e.g. retry to dead-letter, etc.
+    /// </summary>
+    private static Exception LogConversion(ILogger logger, Exception exception)
+    {
+        if (logger.IsEnabled(LogLevel.Information))
+            logger.LogInformation(exception, "{ConversionMessage}", exception.Message);
+
+        return exception;
+    }
+
+    /// <summary>
+    /// Determine the final handling of an exhausted retry error based on the configured options.
+    /// </summary>
+    protected static Result MessageRetryErrorDetermination(Result result, ServiceBusReceiverOptionsBase options, ILogger logger)
+    {
+        static Result HandleAsPerConfiguredOptions(Exception exception, ServiceBusReceiverOptionsBase options, ILogger logger)
+        {
+            return options.RetryErrorHandling switch
+            {
+                ErrorHandling.DeadLetter => LogConversion(logger, new EventSubscriberDeadLetterException("Service bus receiver has converted Retry error to DeadLetter (as configured).", exception)),
+                ErrorHandling.Catastrophic => LogConversion(logger, new EventSubscriberCatastrophicException("Service bus receiver has converted Retry error to Catastrophic (as configured).", exception)),
+                _ => exception
+            };
+        }
+
+        return result.OnFailure(r =>
+        {
+            if (r.Error is IEventSubscriberException esex)
+                return esex.ErrorHandling == ErrorHandling.Retry ? HandleAsPerConfiguredOptions(r.Error, options, logger) : r.Error;
+            else
+                return HandleAsPerConfiguredOptions(r.Error, options, logger);
+        });
+    }
+
+    /// <summary>
+    /// Determine the final handling of an unhandled error based on the configured options.
+    /// </summary>
+    protected static Result MessageUnhandledErrorDetermination(Result result, ServiceBusReceiverOptionsBase options, ILogger logger)
+    {
+        static Result HandleAsPerConfiguredOptions(Exception exception, ServiceBusReceiverOptionsBase options, ILogger logger)
+        {
+            return options.UnhandledErrorHandling switch
+            {
+                ErrorHandling.Retry => LogConversion(logger, new EventSubscriberRetryException("Service bus receiver has converted Unhandled to Retry error (as configured).", exception)),
+                ErrorHandling.DeadLetter => LogConversion(logger, new EventSubscriberDeadLetterException("Service bus receiver has converted Unhandled error to DeadLetter (as configured).", exception)),
+                ErrorHandling.Catastrophic => LogConversion(logger, new EventSubscriberCatastrophicException("Service bus receiver has converted Unhandled error to Catastrophic (as configured).", exception)),
+                _ => exception
+            };
+        }
+
+        return result.OnFailure(r =>
+        {
+            if (r.Error is IEventSubscriberException esex)
+                return esex.ErrorHandling == ErrorHandling.None ? HandleAsPerConfiguredOptions(r.Error, options, logger) : r.Error;
+            else
+                return HandleAsPerConfiguredOptions(r.Error, options, logger);
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBase.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBase.cs
new file mode 100644
index 00000000..e3686bf1
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBase.cs
@@ -0,0 +1,232 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides the base Azure Service Bus receiver functionality.
+/// </summary>
+/// <param name="serviceBusClient">The <see cref="ServiceBusClient"/>.</param>
+/// <param name="options">The <see cref="ServiceBusReceiverOptionsBase"/>.</param>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public abstract partial class ServiceBusReceiverBase(ServiceBusClient serviceBusClient, ServiceBusReceiverOptionsBase options, IServiceProvider serviceProvider, ILogger<ServiceBusReceiverBase> logger) : IAsyncDisposable
+{
+    private readonly SemaphoreSlim _semaphore = new(1, 1);
+    private bool _disposed;
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusClient"/>.
+    /// </summary>
+    protected ServiceBusClient ServiceBusClient { get; } = serviceBusClient.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusReceiverOptionsBase"/>.
+    /// </summary>
+    public ServiceBusReceiverOptionsBase Options { get; } = options.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="IServiceProvider"/>.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; } = serviceProvider.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    public ILogger Logger { get; } = logger.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusReceiverInvoker"/>.
+    /// </summary>
+    protected ServiceBusReceiverInvoker Invoker { get; } = serviceProvider.ThrowIfNull().GetService<ServiceBusReceiverInvoker>() ?? new();
+
+    /// <summary>
+    /// Gets the <see cref="ServiceStatus"/>.
+    /// </summary>
+    public ServiceStatus Status { get; private set; }
+
+    /// <summary>
+    /// Gets the reason for the current <see cref="Status"/> (where applicable).
+    /// </summary>
+    public string? StatusReason { get; set; }
+
+    /// <summary>
+    /// Starts the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task StartAsync(CancellationToken cancellationToken = default)
+    {
+        await _semaphore.WaitAsync(cancellationToken);
+
+        try
+        {
+            if (!Status.CanStart)
+                return;
+
+            LogStatusChange(Status = ServiceStatus.Starting);
+
+            await OnStartAsync(cancellationToken).ConfigureAwait(false);
+
+            LogStatusChange(Status = ServiceStatus.Running);
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Starts the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnStartAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Pauses the underlying message processor.
+    /// </summary>
+    /// <param name="reason">The reason for the pause.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task PauseAsync(string reason, CancellationToken cancellationToken = default)
+    {
+        await _semaphore.WaitAsync(cancellationToken);
+        try
+        {
+            if (!Status.CanPause)
+                return;
+
+            StatusReason = reason;
+            LogStatusChange(Status = ServiceStatus.Pausing);
+
+            await OnPauseAsync(cancellationToken).ConfigureAwait(false);
+
+            LogStatusChange(Status = ServiceStatus.Paused);
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Pauses the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnPauseAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Resumes the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task ResumeAsync(CancellationToken cancellationToken = default)
+    {
+        await _semaphore.WaitAsync(cancellationToken);
+        try
+        {
+            if (!Status.CanResume)
+                return;
+
+            LogStatusChange(Status = ServiceStatus.Resuming);
+
+            await OnResumeAsync(cancellationToken).ConfigureAwait(false);
+
+            LogStatusChange(Status = ServiceStatus.Running);
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Resumes the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnResumeAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Stops the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task StopAsync(CancellationToken cancellationToken = default)
+    {
+        await _semaphore.WaitAsync(cancellationToken);
+
+        try
+        {
+            LogStatusChange(Status = ServiceStatus.Stopping);
+
+            if (!Status.IsInitializing)
+                await OnStopAsync(cancellationToken).ConfigureAwait(false);
+
+            LogStatusChange(Status = ServiceStatus.Stopped);
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Stops the underlying message processor.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnStopAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Logs the status change.
+    /// </summary>
+    private void LogStatusChange(ServiceStatus status)
+    {
+        // Only a pause should have a reason, so clear the reason for any other status.
+        if (!status.IsPause)
+            StatusReason = null;
+
+        // Log the status change.
+        if (Logger.IsEnabled(LogLevel.Debug))
+            Logger.LogDebug("Azure Service Bus receiver: {Status}.", status);
+    }
+
+    /// <summary>
+    /// Encapsulates the standardized processing of the <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
+    /// <param name="actions">The <see cref="IServiceBusMessageActions"/> to perform message actions.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected Task ProcessMessageAsync(ServiceBusReceivedMessage message, IServiceBusMessageActions actions, CancellationToken cancellationToken)
+        => Invoker.InvokeAsync(this, actions, async (_, _, cancellationToken) =>
+        {
+            var result = await OnProcessMessageAsync(message, actions, cancellationToken).ConfigureAwait(false);
+            MessageProcessed?.Invoke(this, new(result));
+            return result;
+        }, cancellationToken);
+
+    /// <summary>
+    /// Provides the standardized processing of the <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
+    /// <param name="actions">The <see cref="IServiceBusMessageActions"/> to perform message actions.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/> of the message processing.</returns>
+    protected abstract Task<Result> OnProcessMessageAsync(ServiceBusReceivedMessage message, IServiceBusMessageActions actions, CancellationToken cancellationToken);
+
+    /// <inheritdoc/>
+    public async ValueTask DisposeAsync()
+    {
+        if (_disposed)
+            return;
+
+        _semaphore.Dispose();
+
+        _disposed = true;
+        await DisposeAsync(true).ConfigureAwait(false);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources asynchronously.
+    /// </summary>
+    /// <param name="disposing">Indicates whether to dispose of managed resources.</param>
+    protected virtual ValueTask DisposeAsync(bool disposing) => ValueTask.CompletedTask;
+
+    /// <summary>
+    /// Gets or sets the event that is raised when a message has been processed (either successfully or unsuccessfully).
+    /// </summary>
+    public event EventHandler<MessageProcessedEventArgs>? MessageProcessed;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBaseT.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBaseT.cs
new file mode 100644
index 00000000..bcfdba46
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverBaseT.cs
@@ -0,0 +1,98 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides the base Azure Service Bus receiver functionality including underlying <typeparamref name="TSubscriber"/>.
+/// </summary>
+/// <param name="client">The <see cref="ServiceBusClient"/>.</param>
+/// <param name="options">The <see cref="ServiceBusReceiverOptionsBase"/>.</param>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public abstract class ServiceBusReceiverBase<TSubscriber>(ServiceBusClient client, ServiceBusReceiverOptionsBase options, IServiceProvider serviceProvider, ILogger<ServiceBusReceiverBase<TSubscriber>> logger)
+    : ServiceBusReceiverBase(client, options, serviceProvider, logger) where TSubscriber : ServiceBusSubscriberBase
+{
+    private const string _destination = "destination";
+
+    /// <inheritdoc/>
+    protected sealed async override Task<Result> OnProcessMessageAsync(ServiceBusReceivedMessage message, IServiceBusMessageActions actions, CancellationToken cancellationToken)
+    {
+        // Get a resilience context from the pool to use for this execution.
+        var ctx = ResilienceContextPool.Shared.Get(cancellationToken);
+
+        // Wrapper for the resilience context to ensure it is returned to the pool after execution, even in the case of an exception.
+        try
+        {
+            // Create a scope in which to perform the execution.
+            await using var scope = ServiceProvider.CreateAsyncScope();
+
+            // Instantiate and configure the execution context.
+            var ec = scope.ServiceProvider.GetRequiredService<ExecutionContext>();
+            Options.ExecutionContextConfigure?.Invoke(ec);
+
+            // Get the subscriber to process the message.
+            var subscriber = Options.SubscriberServiceKey is null
+                ? scope.ServiceProvider.GetRequiredService<TSubscriber>()
+                : scope.ServiceProvider.GetRequiredKeyedService<TSubscriber>(Options.SubscriberServiceKey);
+
+            // Set the resilience property within the context for access during processing.
+            ctx.Properties.Set(ServiceBusReceiverResiliency.ResiliencePropertyKey, this);
+
+            // Execute the receive with resiliency.
+            var esa = new EventSubscriberArgs();
+            var result = await Options.MessageResiliency.ExecuteAsync<Result, (TSubscriber Subscriber, ServiceBusReceivedMessage Message, EventSubscriberArgs Args, ServiceBusReceiverBase Owner)>(async static (ctx, state) =>
+            {
+                // Invoke the subscriber's receive to process the message.
+                Result result;
+                try
+                {
+                    result = await state.Subscriber.ReceiveAsync(state.Message, state.Args, ctx.CancellationToken).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    // Capture any exception as a Result for standardized handling.
+                    result = Result.Fail(ex);
+                }
+
+                // Determine where unhandled what the final error handling will be; otherwise, success.
+                return MessageUnhandledErrorDetermination(result, state.Owner.Options, state.Owner.Logger);
+            }, ctx, (subscriber, message, esa, this));
+
+            // On success complete the message and exit.
+            if (result.IsSuccess)
+            {
+                await actions.CompleteMessageAsync(cancellationToken).ConfigureAwait(false);
+                return result;
+            }
+
+            // Handle the error accordingly; a) retry error conversion, b) invoke message action, then c) pause where critical.
+            return await result
+                .OnFailure(r => MessageRetryErrorDetermination(r, Options, Logger))
+                .OnFailureAsync(r => MessageErrorActionAsync(r.Error!, actions, cancellationToken))
+                .OnFailureAsync(async r =>
+                {
+                    if (r.Error is IEventSubscriberException esex && esex.ErrorHandling == ErrorHandling.Catastrophic && Options.PauseReceiverOnCatastrophicError)
+                    {
+                        if (Logger.IsEnabled(LogLevel.Critical))
+                            Logger.LogCritical(r.Error, "A Catastrophic error has occurred within the service bus receiver for subscriber '{SubscriberTypeName}'. Abandoning the message and pausing the receiver.", typeof(TSubscriber).Name);
+
+                        await actions.AbandonMessageAsync(r.Error, cancellationToken: cancellationToken).ConfigureAwait(false);
+
+                        // Do not await the pause as we want to allow the message to be abandoned and the error logged without delay.
+                        _ = Task.Run(() => PauseAsync("A Catastrophic error occurred within the service bus receiver.", default));
+                    }
+                    else
+                    {
+                        // Basically unhandled, and we don't really have any other course of action other than to abandon the message and log the error.
+                        if (Logger.IsEnabled(LogLevel.Error))
+                            Logger.LogError(r.Error, "An unhandled error has occurred within the service bus receiver for subscriber '{SubscriberTypeName}'. Abandoning the message.", typeof(TSubscriber).Name);
+
+                        await actions.AbandonMessageAsync(r.Error, cancellationToken: cancellationToken).ConfigureAwait(false);
+                    }
+                }).ConfigureAwait(false);
+        }
+        finally
+        {
+            // Return the context to the pool to ensure it is available for reuse and to prevent memory leaks.
+            ResilienceContextPool.Shared.Return(ctx);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverOptionsBase.cs b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverOptionsBase.cs
new file mode 100644
index 00000000..d6b8aea9
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/Abstractions/ServiceBusReceiverOptionsBase.cs
@@ -0,0 +1,105 @@
+namespace CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+
+/// <summary>
+/// Provides the base options to be used when creating a <see cref="ServiceBusReceiverBase"/> instance.
+/// </summary>
+public abstract class ServiceBusReceiverOptionsBase
+{
+    /// <summary>
+    /// Gets the default configuration key for the <see cref="QueueOrTopicName"/>.
+    /// </summary>
+    public const string QueueOrTopicNameAsConfigKey = "^Aspire:Azure:Messaging:ServiceBus:QueueOrTopicName";
+
+    /// <summary>
+    /// Gets the default configuration key for the <see cref="SubscriptionName"/>.
+    /// </summary>
+    public const string SubscriptionNameAsConfigKey = "^Aspire:Azure:Messaging:ServiceBus:SubscriptionName";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ServiceBusReceiverOptionsBase"/> class.
+    /// </summary>
+    /// <param name="queueOrTopicName">The queue or topic name to receive from.</param>
+    /// <param name="subscriptionName">The subscription name to receive from (where applicable).</param>
+    public ServiceBusReceiverOptionsBase(string queueOrTopicName, string? subscriptionName)
+    {
+        QueueOrTopicName = queueOrTopicName.ThrowIfNullOrEmpty();
+        SubscriptionName = subscriptionName.ThrowIfEmpty();
+
+        ReceiverResiliency = ServiceBusReceiverResiliency.CreateReceiverCircuitBreakerResiliency();
+        MessageResiliency = ServiceBusReceiverResiliency.CreateMessageRetryResiliency();
+    }
+
+    /// <summary>
+    /// Get the name of the queue or topic to receive from.
+    /// </summary>
+    /// <remarks>Supports the retrieval of the <see cref="QueueOrTopicName"/> from <see cref="IConfiguration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public string QueueOrTopicName { get; }
+
+    /// <summary>
+    /// Get the name of the subscription to receive from (where applicable).
+    /// </summary>
+    /// <remarks>Supports the retrieval of the <see cref="SubscriptionName"/> from <see cref="IConfiguration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public string? SubscriptionName { get; }
+
+    /// <summary>
+    /// Indicates whether the receiver is for a topic/subscription or a queue.
+    /// </summary>
+    public bool IsSubscription => SubscriptionName is not null;
+
+    /// <summary>
+    /// Gets the optional service key to be used when resolving the <see cref="ServiceBusSubscriberBase"/> from the <see cref="IServiceProvider"/>.
+    /// </summary>
+    public object? SubscriberServiceKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the action to configure the <see cref="ExecutionContext"/> prior to processing an individual message.
+    /// </summary>
+    public Action<ExecutionContext>? ExecutionContextConfigure { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> to use after the configured <see cref="MessageResiliency"/> has been exhausted; defaults to <see cref="ErrorHandling.Retry"/>.
+    /// </summary>
+    /// <remarks>Valid values are <see cref="ErrorHandling.Catastrophic"/>, <see cref="ErrorHandling.DeadLetter"/>, or <see cref="ErrorHandling.Retry"/>.</remarks>
+    public ErrorHandling RetryErrorHandling
+    {
+        get;
+        set => field = value.ThrowWhen(value => value != ErrorHandling.Catastrophic && value != ErrorHandling.DeadLetter && value != ErrorHandling.Retry);
+    } = ErrorHandling.Retry;
+
+    /// <summary>
+    /// Gets or sets the unhandled <see cref="ErrorHandling"/> to use as the final catch-all handling.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.None"/>; which indicates that unhandled exception will be rethrown allowing the receivers native exception handling to occur.
+    /// <para>This is a catch all for any <see cref="Exception"/> not explicitly handled; valid values are <see cref="ErrorHandling.Catastrophic"/>, <see cref="ErrorHandling.DeadLetter"/>,
+    /// <see cref="ErrorHandling.Retry"/>, or <see cref="ErrorHandling.None"/>.</para></remarks>
+    public ErrorHandling UnhandledErrorHandling
+    {
+        get;
+        set => field = value.ThrowWhen(value => value != ErrorHandling.Catastrophic && value != ErrorHandling.DeadLetter && value != ErrorHandling.Retry && value != ErrorHandling.None);
+    } = ErrorHandling.None;
+
+    /// <summary>
+    /// Indicates whether to initiate a pause on the underlying receiver when a <see cref="ErrorHandling.Catastrophic"/> error occurs; defaults to <see langword="true"/>.
+    /// </summary>
+    /// <remarks>Where the receiver has been paused, it will then need to be manually resumed.</remarks>
+    public bool PauseReceiverOnCatastrophicError { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ResiliencePipeline{T}"/> used to apply the likes of circuit breaker logic to protect the service bus receiver from unhandled exceptions and allow for automatic recovery.
+    /// </summary>
+    public ResiliencePipeline<Result> ReceiverResiliency { get; set => field = value.ThrowIfNull(); }
+
+    /// <summary>
+    /// Gets or sets the <see cref="ResiliencePipeline{T}"/> used to apply the likes of retry logic where message processing results in a <see cref="Result.Error"/> that is an <see cref="EventSubscriberRetryException"/>.
+    /// </summary>
+    /// <remarks>Consider using <see cref="ServiceBusReceiverResiliency.CreateMessageRetryResiliency(TimeSpan?, int, DelayBackoffType)"/> which provides a standardized retry strategy. This is used by default.</remarks>
+    public ResiliencePipeline<Result> MessageResiliency { get; set => field = value.ThrowIfNull(); }
+
+    /// <summary>
+    /// Gets or sets the duration to delay after each unhandled error (see <see cref="EventSubscriberUnhandledException"/>) occurs.
+    /// </summary>
+    /// <remarks>This is outside of the resiliency pipelines and is intended as a means to slow-down the processing of messages as these type of errors occur.
+    /// <para>Defaults to '<c>2</c>' seconds.</para>
+    /// <para>Be careful that the value is not set too high as to impact the <see cref="ReceiverResiliency"/> as this will occur within the scope of this execution.</para></remarks>
+    public TimeSpan PerUnhandledErrorDelayDuration { get; set; } = TimeSpan.FromSeconds(2);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj b/src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj
new file mode 100644
index 00000000..1e325708
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/CoreEx.Azure.Messaging.ServiceBus.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx Azure Service Bus .NET extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data azure servicebus cloud-events</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreEx.Events\CoreEx.Events.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Azure.Messaging.ServiceBus" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/CoreExServiceBusExtensions.DependencyInjection.cs b/src/CoreEx.Azure.Messaging.ServiceBus/CoreExServiceBusExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..01fc274e
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/CoreExServiceBusExtensions.DependencyInjection.cs
@@ -0,0 +1,425 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExServiceBusExtensions
+{
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> Azure <see cref="ServiceBusPublisher"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="ServiceBusPublisher"/> instance.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Microsoft.Extensions.DependencyInjection.CoreExEventsExtensions.AddEventPublisher(IServiceCollection, string, Func{IServiceProvider, IEventPublisher}, bool)"/> for more information
+    /// related to the underlying registration implementation.</remarks>
+    public static IServiceCollection AddAzureServiceBusPublisher(this IServiceCollection services, Action<IServiceProvider, ServiceBusPublisher>? configure = null, bool addAsDefaultIEventPublisher = true, string serviceKey = ServiceBusPublisher.DefaultServiceKey)
+        => services.ThrowIfNull().AddEventPublisher(serviceKey, sp =>
+        {
+            var sbp = ActivatorUtilities.CreateInstance<ServiceBusPublisher>(sp);
+            configure?.Invoke(sp, sbp);
+            return sbp;
+        }, addAsDefaultIEventPublisher);
+
+    /// <summary>
+    /// Adds a <b>singleton</b> Azure <see cref="ServiceBusSubscribedSubscriber"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="ServiceBusSubscribedSubscriber"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddAzureServiceBusSubscribedSubscriber(this IServiceCollection services, Action<IServiceProvider, ServiceBusSubscribedSubscriber>? configure = null)
+    {
+        return services.ThrowIfNull().AddSingleton(sp =>
+        {
+            var sbss = ActivatorUtilities.CreateInstance<ServiceBusSubscribedSubscriber>(sp);
+            configure?.Invoke(sp, sbss);
+            return sbss;
+        });
+    }
+
+    /// <summary>
+    /// Provides a builder to register the Azure Service Bus receiving services.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="AzureServiceBusReceiveServiceBuilder"/>.</returns>
+    /// <remarks>Provides a fluent-style builder for configuring and registering the related Azure Service Bus receiver services to simplify usage and minimize challenges with the configuration hierarchy.</remarks>
+    public static AzureServiceBusReceiveServiceBuilder AzureServiceBusReceiving(this IServiceCollection services) => new(services);
+
+    /// <summary>
+    /// Provides a builder for configuring and registering Azure Service Bus receiver services .
+    /// </summary>
+    public sealed class AzureServiceBusReceiveServiceBuilder
+    {
+        private readonly IServiceCollection _services;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AzureServiceBusReceiveServiceBuilder"/> class.
+        /// </summary>
+        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+        internal AzureServiceBusReceiveServiceBuilder(IServiceCollection services) => _services = services.ThrowIfNull();
+
+        /// <summary>
+        /// Adds a <b>singleton</b> Azure <see cref="ServiceBusReceiver"/> service enabling ongoing fluent-style method-chaining registration.
+        /// </summary>
+        /// <param name="optionsFactory">The factory to create the required <see cref="CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverOptions"/>.</param>
+        /// <returns>The <see cref="AzureServiceBusReceiverService"/> for fluent-style method-chaining.</returns>
+        public AzureServiceBusReceiverService WithReceiver(Func<IServiceProvider, CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverOptions> optionsFactory) => new(_services, null, optionsFactory);
+
+        /// <summary>
+        /// Adds a <b>singleton</b> Azure <see cref="ServiceBusSessionReceiver"/> service enabling ongoing fluent-style method-chaining registration.
+        /// </summary>
+        /// <param name="optionsFactory">The factory to create the required <see cref="CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverOptions"/>.</param>
+        /// <returns>The <see cref="AzureServiceBusSessionReceiverService"/> for fluent-style method-chaining.</returns>
+        public AzureServiceBusSessionReceiverService WithSessionReceiver(Func<IServiceProvider, CoreEx.Azure.Messaging.ServiceBus.ServiceBusSessionReceiverOptions> optionsFactory) => new(_services, null, optionsFactory);
+
+        /// <summary>
+        /// Provides the <see cref="ServiceBusReceiver{TSubscriber}"/> service registration.
+        /// </summary>
+        public sealed class AzureServiceBusReceiverService
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="AzureServiceBusReceiverService"/> class.
+            /// </summary>
+            /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="optionsFactory">The factory to create the required <see cref="CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverOptions"/>.</param>
+            internal AzureServiceBusReceiverService(IServiceCollection services, object? serviceKey, Func<IServiceProvider, CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverOptions> optionsFactory)
+            {
+                Services = services.ThrowIfNull();
+                ServiceKey = serviceKey;
+                OptionsFactory = optionsFactory.ThrowIfNull();
+            }
+
+            /// <summary>
+            /// Gets the <see cref="IServiceCollection"/>.
+            /// </summary>
+            internal IServiceCollection Services { get; }
+
+            /// <summary>
+            /// Gets the service key.
+            /// </summary>
+            internal object? ServiceKey { get; }
+
+            /// <summary>
+            /// Gets the options factory.
+            /// </summary>
+            internal Func<IServiceProvider, CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverOptions> OptionsFactory { get; }
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure Service Bus <typeparamref name="TSubscriber"/> (see <see cref="CoreEx.Azure.Messaging.ServiceBus.Abstractions.ServiceBusReceiverBase"/>).
+            /// </summary>
+            /// <typeparam name="TSubscriber">The Azure <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/>.</typeparam>
+            /// <param name="configure">An optional action to configure the <typeparamref name="TSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSubscriberService<TSubscriber> WithSubscriber<TSubscriber>(Action<IServiceProvider, TSubscriber>? configure = null) where TSubscriber : ServiceBusSubscriberBase
+                => new(this, null, configure);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure Service Bus <typeparamref name="TSubscriber"/> (see <see cref="CoreEx.Azure.Messaging.ServiceBus.Abstractions.ServiceBusReceiverBase"/>).
+            /// </summary>
+            /// <typeparam name="TSubscriber">The Azure <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/>.</typeparam>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <typeparamref name="TSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSubscriberService<TSubscriber> WithKeyedSubscriber<TSubscriber>(object serviceKey, Action<IServiceProvider, TSubscriber>? configure = null) where TSubscriber : ServiceBusSubscriberBase
+                => new(this, serviceKey, configure);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure <see cref="ServiceBusSubscribedSubscriber"/> as the subscriber.
+            /// </summary>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusSubscribedSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSubscriberService<ServiceBusSubscribedSubscriber> WithSubscribedSubscriber(Action<IServiceProvider, ServiceBusSubscribedSubscriber>? configure = null) => WithSubscriber(configure);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure <see cref="ServiceBusSubscribedSubscriber"/> as the subscriber.
+            /// </summary>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusSubscribedSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSubscriberService<ServiceBusSubscribedSubscriber> WithKeyedSubscribedSubscriber(object serviceKey, Action<IServiceProvider, ServiceBusSubscribedSubscriber>? configure = null) => WithKeyedSubscriber(serviceKey, configure);
+        }
+
+        /// <summary>
+        /// Provides the <typeparamref name="TSubscriber"/> service registration.
+        /// </summary>
+        /// <typeparam name="TSubscriber"></typeparam>
+        public sealed class WithSubscriberService<TSubscriber> where TSubscriber : ServiceBusSubscriberBase
+        {
+            private readonly AzureServiceBusReceiverService _owner;
+            private readonly object? _serviceKey;
+            private readonly Action<IServiceProvider, TSubscriber>? _configure;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="WithSubscriberService{TSubscriber}"/> class.
+            /// </summary>
+            /// <param name="owner">The owner <see cref="AzureServiceBusReceiverService"/> instance.</param>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <typeparamref name="TSubscriber"/> instance.</param>
+            internal WithSubscriberService(AzureServiceBusReceiverService owner, object? serviceKey, Action<IServiceProvider, TSubscriber>? configure)
+            {
+                _owner = owner.ThrowIfNull();
+                _serviceKey = serviceKey;
+                _configure = configure;
+            }
+
+            /// <summary>
+            /// Builds and registers all of the chained services.
+            /// </summary>
+            /// <remarks>Where a hosted service is also required then the chained <see cref="WithHostedService"/> should be used instead.</remarks>
+            public void Build()
+            {
+                // Add the subscriber service.
+                if (_serviceKey is null)
+                    _owner.Services.AddSingleton(sp =>
+                    {
+                        var subscriber = ActivatorUtilities.CreateInstance<TSubscriber>(sp);
+                        _configure?.Invoke(sp, subscriber);
+                        return subscriber;
+                    });
+                else
+                    _owner.Services.AddKeyedSingleton(_serviceKey, (sp, _) =>
+                    {
+                        var subscriber = ActivatorUtilities.CreateInstance<TSubscriber>(sp);
+                        _configure?.Invoke(sp, subscriber);
+                        return subscriber;
+                    });
+
+                // Add the receiver service.
+                if (_owner.ServiceKey is null)
+                    _owner.Services.AddSingleton(sp =>
+                    {
+                        var options = _owner.OptionsFactory(sp) ?? throw new InvalidOperationException("The options factory must return a non-null.");
+                        options.SubscriberServiceKey = _serviceKey;
+                        var receiver = ActivatorUtilities.CreateInstance<ServiceBusReceiver<TSubscriber>>(sp, options);
+                        return receiver;
+                    });
+                else
+                    _owner.Services.AddKeyedSingleton(_owner.ServiceKey, (sp, _) =>
+                    {
+                        var options = _owner.OptionsFactory(sp) ?? throw new InvalidOperationException("The options factory must return a non-null.");
+                        options.SubscriberServiceKey = _serviceKey;
+                        var receiver = ActivatorUtilities.CreateInstance<ServiceBusReceiver<TSubscriber>>(sp, options);
+                        return receiver;
+                    });
+            }
+
+            /// <summary>
+            /// Create the receiver instance.
+            /// </summary>
+            private ServiceBusReceiver<TSubscriber> GetReceiverInstance(IServiceProvider serviceProvider) => _serviceKey is null
+                ? serviceProvider.GetRequiredService<ServiceBusReceiver<TSubscriber>>()
+                : serviceProvider.GetRequiredKeyedService<ServiceBusReceiver<TSubscriber>>(_serviceKey);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure <see cref="ServiceBusReceiverHostedService{TReceiver}"/> keyed service that will be executed as a hosted service (i.e. in the background).
+            /// </summary>
+            /// <param name="serviceKey">The keyed singleton and health check key.</param>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusReceiverHostedService{TReceiver}"/> instance.</param>
+            /// <returns>The <see cref="WithHostedServiceService{TReceiver}"/> instance for fluent-style method-chaining.</returns>
+            /// <remarks>No services are added until the chained <see cref="WithHostedServiceService{TReceiver}.Build"/> method is called.</remarks>
+            public WithHostedServiceService<ServiceBusReceiver<TSubscriber>> WithHostedService(string serviceKey = "azure-service-bus-receiver", Action<IServiceProvider, ServiceBusReceiverHostedService<ServiceBusReceiver<TSubscriber>>>? configure = null)
+                => new(_owner.Services, serviceKey.ThrowIfNullOrEmpty(), configure, Build, GetReceiverInstance);
+        }
+
+        /// <summary>
+        /// Provides the <see cref="ServiceBusSessionReceiver{TSubscriber}"/> service registration.
+        /// </summary>
+        public sealed class AzureServiceBusSessionReceiverService
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="AzureServiceBusSessionReceiverService"/> class.
+            /// </summary>
+            /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="optionsFactory">The factory to create the required <see cref="CoreEx.Azure.Messaging.ServiceBus.ServiceBusSessionReceiverOptions"/>.</param>
+            internal AzureServiceBusSessionReceiverService(IServiceCollection services, object? serviceKey, Func<IServiceProvider, CoreEx.Azure.Messaging.ServiceBus.ServiceBusSessionReceiverOptions> optionsFactory)
+            {
+                Services = services.ThrowIfNull();
+                ServiceKey = serviceKey;
+                OptionsFactory = optionsFactory.ThrowIfNull();
+            }
+
+            /// <summary>
+            /// Gets the <see cref="IServiceCollection"/>.
+            /// </summary>
+            internal IServiceCollection Services { get; }
+
+            /// <summary>
+            /// Gets the service key.
+            /// </summary>
+            internal object? ServiceKey { get; }
+
+            /// <summary>
+            /// Gets the options factory.
+            /// </summary>
+            internal Func<IServiceProvider, CoreEx.Azure.Messaging.ServiceBus.ServiceBusSessionReceiverOptions> OptionsFactory { get; }
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure Service Bus <typeparamref name="TSubscriber"/> (see <see cref="CoreEx.Azure.Messaging.ServiceBus.Abstractions.ServiceBusReceiverBase"/>).
+            /// </summary>
+            /// <typeparam name="TSubscriber">The Azure <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/>.</typeparam>
+            /// <param name="configure">An optional action to configure the <typeparamref name="TSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSessionSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSessionSubscriberService<TSubscriber> WithSubscriber<TSubscriber>(Action<IServiceProvider, TSubscriber>? configure = null) where TSubscriber : ServiceBusSubscriberBase
+                => new(this, null, configure);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure Service Bus <typeparamref name="TSubscriber"/> (see <see cref="CoreEx.Azure.Messaging.ServiceBus.Abstractions.ServiceBusReceiverBase"/>).
+            /// </summary>
+            /// <typeparam name="TSubscriber">The Azure <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/>.</typeparam>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <typeparamref name="TSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSessionSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSessionSubscriberService<TSubscriber> WithKeyedSubscriber<TSubscriber>(object serviceKey, Action<IServiceProvider, TSubscriber>? configure = null) where TSubscriber : ServiceBusSubscriberBase
+                => new(this, serviceKey, configure);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure <see cref="ServiceBusSubscribedSubscriber"/> as the subscriber.
+            /// </summary>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusSubscribedSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSessionSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSessionSubscriberService<ServiceBusSubscribedSubscriber> WithSubscribedSubscriber(Action<IServiceProvider, ServiceBusSubscribedSubscriber>? configure = null) => WithSubscriber(configure);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure <see cref="ServiceBusSubscribedSubscriber"/> as the subscriber.
+            /// </summary>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusSubscribedSubscriber"/> instance.</param>
+            /// <returns>The <see cref="WithSessionSubscriberService{TSubscriber}"/> for fluent-style method-chaining.</returns>
+            public WithSessionSubscriberService<ServiceBusSubscribedSubscriber> WithKeyedSubscribedSubscriber(object serviceKey, Action<IServiceProvider, ServiceBusSubscribedSubscriber>? configure = null) => WithKeyedSubscriber(serviceKey, configure);
+        }
+
+        /// <summary>
+        /// Provides the <typeparamref name="TSubscriber"/> service registration.
+        /// </summary>
+        /// <typeparam name="TSubscriber">The <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/>.</typeparam>
+        public sealed class WithSessionSubscriberService<TSubscriber> where TSubscriber : ServiceBusSubscriberBase
+        {
+            private readonly AzureServiceBusSessionReceiverService _owner;
+            private readonly object? _serviceKey;
+            private readonly Action<IServiceProvider, TSubscriber>? _configure;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="WithSubscriberService{TSubscriber}"/> class.
+            /// </summary>
+            /// <param name="owner">The owner <see cref="AzureServiceBusSessionReceiverService"/> instance.</param>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <typeparamref name="TSubscriber"/> instance.</param>
+            internal WithSessionSubscriberService(AzureServiceBusSessionReceiverService owner, object? serviceKey, Action<IServiceProvider, TSubscriber>? configure)
+            {
+                _owner = owner.ThrowIfNull();
+                _serviceKey = serviceKey;
+                _configure = configure;
+            }
+
+            /// <summary>
+            /// Builds and registers all of the chained services.
+            /// </summary>
+            /// <remarks>Where a hosted service is also required then the chained <see cref="WithHostedService"/> should be used instead.</remarks>
+            public void Build()
+            {
+                // Add the subscriber service.
+                if (_serviceKey is null)
+                    _owner.Services.AddSingleton(sp =>
+                    {
+                        var subscriber = ActivatorUtilities.CreateInstance<TSubscriber>(sp);
+                        _configure?.Invoke(sp, subscriber);
+                        return subscriber;
+                    });
+                else
+                    _owner.Services.AddKeyedSingleton(_serviceKey, (sp, _) =>
+                    {
+                        var subscriber = ActivatorUtilities.CreateInstance<TSubscriber>(sp);
+                        _configure?.Invoke(sp, subscriber);
+                        return subscriber;
+                    });
+
+                // Add the receiver service.
+                if (_owner.ServiceKey is null)
+                    _owner.Services.AddSingleton(sp =>
+                    {
+                        var options = _owner.OptionsFactory(sp) ?? throw new InvalidOperationException("The options factory must return a non-null.");
+                        options.SubscriberServiceKey = _serviceKey;
+                        var receiver = ActivatorUtilities.CreateInstance<ServiceBusSessionReceiver<TSubscriber>>(sp, options);
+                        return receiver;
+                    });
+                else
+                    _owner.Services.AddKeyedSingleton(_owner.ServiceKey, (sp, _) =>
+                    {
+                        var options = _owner.OptionsFactory(sp) ?? throw new InvalidOperationException("The options factory must return a non-null.");
+                        options.SubscriberServiceKey = _serviceKey;
+                        var receiver = ActivatorUtilities.CreateInstance<ServiceBusSessionReceiver<TSubscriber>>(sp, options);
+                        return receiver;
+                    });
+            }
+
+            /// <summary>
+            /// Create the receiver instance.
+            /// </summary>
+            private ServiceBusSessionReceiver<TSubscriber> GetReceiverInstance(IServiceProvider serviceProvider) => _serviceKey is null
+                ? serviceProvider.GetRequiredService<ServiceBusSessionReceiver<TSubscriber>>()
+                : serviceProvider.GetRequiredKeyedService<ServiceBusSessionReceiver<TSubscriber>>(_serviceKey);
+
+            /// <summary>
+            /// Adds a <b>singleton</b> Azure <see cref="ServiceBusReceiverHostedService{TReceiver}"/> keyed service that will be executed as a hosted service (i.e. in the background).
+            /// </summary>
+            /// <param name="serviceKey">The keyed singleton and health check key.</param>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusReceiverHostedService{TReceiver}"/> instance.</param>
+            /// <returns>The <see cref="WithHostedServiceService{TReceiver}"/> instance for fluent-style method-chaining.</returns>
+            /// <remarks>No services are added until the chained <see cref="WithHostedServiceService{TReceiver}.Build"/> method is called.</remarks>
+            public WithHostedServiceService<ServiceBusSessionReceiver<TSubscriber>> WithHostedService(string serviceKey = "azure-service-bus-session-receiver", Action<IServiceProvider, ServiceBusReceiverHostedService<ServiceBusSessionReceiver<TSubscriber>>>? configure = null)
+                => new(_owner.Services, serviceKey.ThrowIfNullOrEmpty(), configure, Build, GetReceiverInstance);
+        }
+
+        /// <summary>
+        /// Provides the <see cref="ServiceBusReceiverHostedService{TReceiver}"/> service registration.
+        /// </summary>
+        /// <typeparam name="TReceiver">The Azure <see cref="ServiceBusReceiverBase"/> <see cref="Type"/>.</typeparam>
+        public sealed class WithHostedServiceService<TReceiver> where TReceiver : ServiceBusReceiverBase
+        {
+            private readonly IServiceCollection _services;
+            private readonly string _serviceKey;
+            private readonly Action<IServiceProvider, ServiceBusReceiverHostedService<TReceiver>>? _configure;
+            private readonly Action _buildParentServices;
+            private readonly Func<IServiceProvider, object> _createReceiverInstance;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="WithHostedServiceService{TReceiver}"/> class.
+            /// </summary>
+            /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+            /// <param name="serviceKey">The service key.</param>
+            /// <param name="configure">An optional action to configure the <see cref="ServiceBusReceiverHostedService{TReceiver}"/> instance.</param>
+            /// <param name="buildParentServices">The action to build the parent services (i.e. the subscriber and receiver).</param>
+            /// <param name="createReceiverInstance">The function to create the receiver instance.</param>
+            internal WithHostedServiceService(IServiceCollection services, string serviceKey, Action<IServiceProvider, ServiceBusReceiverHostedService<TReceiver>>? configure, Action buildParentServices, Func<IServiceProvider, object> createReceiverInstance)
+            {
+                _services = services.ThrowIfNull();
+                _serviceKey = serviceKey.ThrowIfNullOrEmpty();
+                _configure = configure;
+                _buildParentServices = buildParentServices;
+                _createReceiverInstance = createReceiverInstance;
+            }
+
+            /// <summary>
+            /// Builds and registers all of the chained services.
+            /// </summary>
+            public void Build()
+            {
+                // Adds the parent service registrations.
+                _buildParentServices();
+
+                // Adds the hosted service registration.
+                _services.AddHostedService(_serviceKey, sp =>
+                {
+                    var receiver = _createReceiverInstance(sp);
+                    return ActivatorUtilities.CreateInstance<ServiceBusReceiverHostedService<TReceiver>>(sp, receiver);
+                });
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/CoreExServiceBusExtensions.OpenTelemetry.cs b/src/CoreEx.Azure.Messaging.ServiceBus/CoreExServiceBusExtensions.OpenTelemetry.cs
new file mode 100644
index 00000000..fc3efa33
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/CoreExServiceBusExtensions.OpenTelemetry.cs
@@ -0,0 +1,21 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace OpenTelemetry.Trace;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExServiceBusExtensions
+{
+    /// <summary>
+    /// Enables <i>CoreEx</i> OpenTelemetry instrumentation.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static OpenTelemetryBuilder WithCoreExServiceBusTelemetry(this OpenTelemetryBuilder builder) => builder.ThrowIfNull()
+        .WithCoreExEventsSources()
+        .WithTracing(t => t.AddInvokerAsSource<CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiverInvoker>()
+                           .AddSource("Azure.Messaging.ServiceBus")
+                           .AddSource("Azure.Messaging.ServiceBus.*"))
+        .WithMetrics(m => m.AddMeter(ServiceBusMetrics.Meter.Name));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/GlobalUsing.cs b/src/CoreEx.Azure.Messaging.ServiceBus/GlobalUsing.cs
new file mode 100644
index 00000000..c828e27e
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/GlobalUsing.cs
@@ -0,0 +1,27 @@
+global using Azure.Messaging.ServiceBus;
+global using CloudNative.CloudEvents;
+global using CloudNative.CloudEvents.Extensions;
+global using CoreEx;
+global using CoreEx.Abstractions;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Azure.Messaging.ServiceBus.Abstractions;
+global using CoreEx.Data;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Events.Subscribing.Exceptions;
+global using CoreEx.Hosting;
+global using CoreEx.Invokers;
+global using CoreEx.Localization;
+global using CoreEx.Results;
+global using CoreEx.Security;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Logging;
+global using Polly;
+global using Polly.CircuitBreaker;
+global using Polly.Retry;
+global using System.Diagnostics;
+global using System.Diagnostics.Metrics;
+global using Amqp = Azure.Core.Amqp;
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/IServiceBusMessageActions.cs b/src/CoreEx.Azure.Messaging.ServiceBus/IServiceBusMessageActions.cs
new file mode 100644
index 00000000..fd3eb475
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/IServiceBusMessageActions.cs
@@ -0,0 +1,37 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Enables the standard actions for a <see cref="ServiceBusReceivedMessage"/>.
+/// </summary>
+public interface IServiceBusMessageActions
+{
+    /// <summary>
+    /// Gets the entity path that represents the source of the message; e.g. topic or queue name.
+    /// </summary>
+    string EntityPath { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Amqp.AmqpAnnotatedMessage"/> representation.
+    /// </summary>
+    Amqp.AmqpAnnotatedMessage AmqpMessage { get; }
+
+    /// <summary>
+    /// Marks the current message as completed, indicating that it has been processed successfully.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task CompleteMessageAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Marks the current message as abandoned, indicating that it could not be processed successfully, and records the specified <paramref name="exception"/> as the reason.
+    /// </summary>
+    /// <param name="exception">The <see cref="Exception"/> that describes the reason for abandoning the message.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task AbandonMessageAsync(Exception exception, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Marks the current message as dead-lettered, indicating that it cannot be processed successfully, and records the specified <paramref name="exception"/> as the reason.
+    /// </summary>
+    /// <param name="exception">The <see cref="Exception"/> that describes the reason for dead-lettering the message.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task DeadLetterMessageAsync(Exception exception, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/MessageProcessedEventArgs.cs b/src/CoreEx.Azure.Messaging.ServiceBus/MessageProcessedEventArgs.cs
new file mode 100644
index 00000000..0a150075
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/MessageProcessedEventArgs.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides <see cref="ServiceBusReceiverBase.MessageProcessed"/> event data.
+/// </summary>
+/// <param name="result">The <see cref="Result"/>.</param>
+public class MessageProcessedEventArgs(Result result) : EventArgs()
+{
+    /// <summary>
+    /// Gets the <see cref="Result"/>.
+    /// </summary>
+    public Result Result { get; } = result;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/README.md b/src/CoreEx.Azure.Messaging.ServiceBus/README.md
new file mode 100644
index 00000000..09326f1c
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/README.md
@@ -0,0 +1,59 @@
+# CoreEx.Azure.Messaging.ServiceBus
+
+> Provides Azure Service Bus integration for CoreEx: a `ServiceBusPublisher` implementing `IEventPublisher`, subscriber bases wired to `EventSubscriberBase`, and receiver hosts with built-in resiliency, metrics, and session support.
+
+## Overview
+
+`CoreEx.Azure.Messaging.ServiceBus` is the Azure Service Bus transport binding for the CoreEx events pipeline. It maps the CloudEvents-based `IEventPublisher` / `EventSubscriberBase` abstractions defined in `CoreEx.Events` directly onto the Azure Service Bus SDK, so no application-level code needs to reference Service Bus types directly.
+
+**Publishing** is handled by `ServiceBusPublisher`, which inherits `EventPublisherBase` and implements `OnPublishAsync` using the SDK's safe-batch send API. Each `DestinationEvent` is converted from a `CloudEvent` to a `ServiceBusMessage` (structured or binary content mode), with CloudEvents attributes optionally written to message application properties. Session-ID assignment is controlled by the `ServiceBusSessionStrategy` enum.
+
+**Subscribing** is layered: `ServiceBusSubscriberBase` extends `EventSubscriberBase` to accept a raw `ServiceBusReceivedMessage`, converting it to a `CloudEvent` before delegating upward. `ServiceBusSubscribedSubscriber` adds `SubscribedManager` dispatch so that `[Subscribe]`-decorated handlers are resolved automatically from the message subject and source. The `ServiceBusReceiver<TSubscriber>` and `ServiceBusSessionReceiver<TSubscriber>` classes wrap the SDK `ServiceBusProcessor` / `ServiceBusSessionProcessor` lifetimes, and `ServiceBusReceiverHostedService<TReceiver>` integrates them with the .NET hosted-service model including pause/resume and health-check support.
+
+Resiliency is provided out-of-the-box: `ServiceBusReceiverResiliency` supplies factory methods for a receiver-level circuit breaker and a per-message retry pipeline (via Polly), both of which are applied by default in `ServiceBusReceiverOptionsBase`.
+
+## Key capabilities
+
+- 📤 **Safe-batch publishing**: `ServiceBusPublisher` groups `DestinationEvent` by destination and sends via the SDK batch API, recording send/fail counters and duration histograms via `ServiceBusMetrics`.
+- 🛡 **CloudEvents — Service Bus bridge**: `ServiceBusExtensions` converts `CloudEvent` — `ServiceBusMessage` (structured or binary) and back, propagating distributed-tracing headers and CloudEvents attributes as application properties.
+- 📥 **Subscriber dispatch**: `ServiceBusSubscribedSubscriber` uses `SubscribedManager` to route each received message to the correct `[Subscribe]`-decorated handler by subject and source.
+- 🔄 **Session support**: `ServiceBusSessionReceiver<TSubscriber>` wraps `ServiceBusSessionProcessor`; `ServiceBusSessionStrategy` controls how `EventData.PartitionKey` is mapped to a `SessionId` (none, as-is, or converted to a bounded partition ID).
+- 🔧 **Hosted-service lifecycle**: `ServiceBusReceiverHostedService<TReceiver>` integrates the receiver with `IHostedService`, forwarding start/pause/resume/stop to the underlying processor and reporting degraded health during pause.
+- 🛡 **Built-in resiliency**: `ServiceBusReceiverResiliency` provides a circuit-breaker pipeline (`ReceiverResiliency`) and a per-message retry pipeline (`MessageResiliency`) pre-wired into every `ServiceBusReceiverOptionsBase` instance.
+- 📊 **OpenTelemetry metrics**: `ServiceBusMetrics` exposes a `CoreEx.Azure.Messaging.ServiceBus` meter with counters for sent, failed, completed, dead-lettered, and abandoned messages, plus a send-duration histogram; `ServiceBusReceiverInvoker` wraps receive operations in activity spans.
+- 📡 **Dependency injection helpers**: `CoreExServiceBusExtensions` (`AddAzureServiceBusPublisher`, `AddAzureServiceBusSubscribedSubscriber`, `AzureServiceBusReceiving()`) and `CoreExServiceBusExtensions.AddAzureServiceBusOpenTelemetry` wire everything into the DI container with a single fluent call each.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ServiceBusPublisher`](./ServiceBusPublisher.cs)** | `IEventPublisher` implementation for Azure Service Bus; sends batched `ServiceBusMessage` objects, supports structured/binary CloudEvents content mode and session-ID strategies. |
+| _[`ServiceBusSubscriberBase`](./ServiceBusSubscriberBase.cs)_ | Abstract `EventSubscriberBase` for Service Bus; accepts a raw `ServiceBusReceivedMessage`, converts it to a `CloudEvent`, and provides an `OnBeforeReceiveAsync` hook. |
+| **[`ServiceBusSubscribedSubscriber`](./ServiceBusSubscribedSubscriber.cs)** | Concrete `ServiceBusSubscriberBase` that uses `SubscribedManager` to dispatch each message to the matching `[Subscribe]`-decorated handler. |
+| **[`ServiceBusReceiver<TSubscriber>`](./ServiceBusReceiver.cs)** | Manages a `ServiceBusProcessor` lifetime (start/pause/resume/stop) and delegates each received message to the scoped `TSubscriber`. |
+| **[`ServiceBusSessionReceiver<TSubscriber>`](./ServiceBusSessionReceiver.cs)** | Session-enabled variant of `ServiceBusReceiver<TSubscriber>`; wraps `ServiceBusSessionProcessor`. |
+| **[`ServiceBusReceiverHostedService<TReceiver>`](./ServiceBusReceiverHostedService.cs)** | `IHostedService` adapter for any `ServiceBusReceiverBase`; supports pause/resume and reports degraded health while paused. |
+| **[`ServiceBusReceiverOptions`](./ServiceBusReceiverOptions.cs)** | Options for `ServiceBusReceiver<TSubscriber>`; factory methods `CreateForQueue` / `CreateForTopicSubscription`; defaults to `PeekLock`, `AutoCompleteMessages=false`, `MaxConcurrentCalls=1`. |
+| **[`ServiceBusSessionReceiverOptions`](./ServiceBusSessionReceiverOptions.cs)** | Session-specific options for `ServiceBusSessionReceiver<TSubscriber>`. |
+| **[`ServiceBusReceiverResiliency`](./ServiceBusReceiverResiliency.cs)** | Factory for Polly `ResiliencePipeline<Result>` — `CreateReceiverCircuitBreakerResiliency` and `CreateMessageRetryResiliency`; applied by default in `ServiceBusReceiverOptionsBase`. |
+| **[`ServiceBusSessionStrategy`](./ServiceBusSessionStrategy.cs)** | Enum: `None`, `UsePartitionKeyAsIs`, `UsePartitionKeyConvertedToAnId`; controls how the publisher assigns a `SessionId` to each outbound message. |
+| [IServiceBusMessageActions](./IServiceBusMessageActions.cs) | Defines complete/abandon/dead-letter/defer actions for a received message; implemented by `ProcessMessageEventArgsActions` and `ProcessSessionMessageEventArgsActions` in the Abstractions folder. |
+| **[`ServiceBusMetrics`](./ServiceBusMetrics.cs)** | Static class exposing the `CoreEx.Azure.Messaging.ServiceBus` `Meter` with send/receive counters and a send-duration histogram. |
+| **[`ServiceBusExtensions`](./ServiceBusExtensions.cs)** | Extension methods for converting `CloudEvent` to/from `ServiceBusMessage` in structured or binary content mode. |
+
+## Namespaces
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.Azure.Messaging.ServiceBus.Abstractions`** | Base receiver infrastructure: `ServiceBusReceiverBase`, typed `ServiceBusReceiverBase<TSubscriber>`, `ServiceBusReceiverOptionsBase`, `ServiceBusMessageActionsBase`, message-actions adapters, and `ServiceBusErrorClassifier`. | [📖 README](./Abstractions/README.md) |
+
+## Related namespaces
+
+- **[`CoreEx.Events`](../CoreEx.Events/README.md)** - Defines `IEventPublisher`, `EventPublisherBase`, `EventSubscriberBase`, `SubscribedManager`, and `IEventFormatter` that this package binds to Azure Service Bus.
+- **[`CoreEx.Events.Publishing`](../CoreEx.Events/Publishing/README.md)** - `IDestinationProvider` and `DestinationEvent` used by `ServiceBusPublisher` during batched dispatch.
+- **[`CoreEx.Events.Subscribing`](../CoreEx.Events/Subscribing/README.md)** - `ErrorHandling`, `ErrorHandler`, and subscriber exception types consumed by the receiver pipeline.
+- **[`CoreEx.Database.Outbox`](../CoreEx.Database/Outbox/README.md)** - Outbox relay publisher that produces events later consumed by a `ServiceBusReceiver`-based relay host.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusExtensions.CloudEvent.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusExtensions.CloudEvent.cs
new file mode 100644
index 00000000..39880e89
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusExtensions.CloudEvent.cs
@@ -0,0 +1,147 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+public static partial class ServiceBusExtensions
+{
+    /// <summary>
+    /// Gets the <see cref="CloudEvent"/> attribute prefix.
+    /// </summary>
+    public const string CloudEventPrefix = "ce_";
+
+    /// <summary>
+    /// Gets the <see cref="CloudEvent"/> specification version (<see cref="CloudEvent.SpecVersion"/>) property name: '<c>ce_specversion</c>'.
+    /// </summary>
+    public const string CloudEventSpecVersionPropertyName = CloudEventPrefix + "specversion";
+
+    /// <summary>
+    /// Gets the <see cref="CloudEvent"/> source (<see cref="CloudEvent.Source"/>) property name: '<c>ce_source</c>'.
+    /// </summary>
+    public const string CloudEventSourcePropertyName = CloudEventPrefix + "source";
+
+    /// <summary>
+    /// Gets the <see cref="CloudEvent"/> trace parent property name: '<c>ce_traceparent</c>'.
+    /// </summary>
+    public const string CloudEventTraceParentPropertyName = CloudEventPrefix + "traceparent";
+
+    /// <summary>
+    /// Gets the <see cref="CloudEvent"/> trace state property name: '<c>ce_tracestate</c>'.
+    /// </summary>
+    public const string CloudEventTraceStatePropertyName = CloudEventPrefix + "tracestate";
+
+    /// <summary>
+    /// Gets the <see cref="CloudEvent"/> trace baggage property name: '<c>ce_baggage</c>'.
+    /// </summary>
+    public const string CloudEventTraceBaggagePropertyName = CloudEventPrefix + "baggage";
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusMessage"/> trace parent property name: '<c>traceparent</c>'.
+    /// </summary>
+    public const string MessageTraceParentPropertyName = "traceparent";
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusMessage"/> trace state property name: '<c>tracestate</c>'.
+    /// </summary>
+    public const string MessageTraceStatePropertyName = "tracestate";
+    
+    /// <summary>
+    /// Gets the <see cref="ServiceBusMessage"/> trace baggage property name: '<c>baggage</c>'.
+    /// </summary>
+    public const string MessageTraceBaggagePropertyName = "baggage";
+
+    /// <summary>
+    /// Converts a <see cref="CloudEvent"/> to a <see cref="ServiceBusMessage"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <param name="contentMode">The <see cref="ContentMode"/> to use; defaults to <see cref="ContentMode.Structured"/>.</param>
+    /// <param name="includeAttributes">Indicates whether to include all <see cref="CloudEvent.GetPopulatedAttributes"/> as <see cref="ServiceBusMessage.ApplicationProperties"/>; defaults to <see langword="true"/>.</param>
+    /// <returns>The <see cref="ServiceBusMessage"/>.</returns>
+    /// <remarks>The <see cref="ServiceBusMessage.Subject"/> is set to the <see cref="CloudEvent.Type"/>.</remarks>
+    public static ServiceBusMessage ToServiceBusMessage(this CloudEvent cloudEvent, ContentMode contentMode = ContentMode.Structured, bool includeAttributes = true)
+    {
+        var bd = cloudEvent.ThrowIfNull().EncodeToBinaryData(contentMode);
+
+        var msg = new ServiceBusMessage(bd)
+        {
+            ContentType = bd.MediaType,
+            Subject = cloudEvent.Type,
+            MessageId = cloudEvent.Id,
+            PartitionKey = cloudEvent.GetPartitionKey()
+        };
+
+        if (includeAttributes)
+        {
+            msg.ApplicationProperties.TryAdd(CloudEventSpecVersionPropertyName, cloudEvent.SpecVersion.VersionId);
+
+            foreach (var attr in cloudEvent.GetPopulatedAttributes())
+            {
+                msg.ApplicationProperties.TryAdd($"{CloudEventPrefix}{attr.Key.Name}", attr.Value);
+            }
+        }
+
+        foreach (var attr in cloudEvent.GetPopulatedAttributes())
+        {
+            if (attr.Key.Name == CloudEventTraceParentPropertyName)
+                msg.ApplicationProperties.TryAdd(MessageTraceParentPropertyName, attr.Value);
+
+            if (attr.Key.Name == CloudEventTraceStatePropertyName)
+                msg.ApplicationProperties.TryAdd(MessageTraceStatePropertyName, attr.Value);
+
+            if (attr.Key.Name == CloudEventTraceBaggagePropertyName)
+                msg.ApplicationProperties.TryAdd(MessageTraceBaggagePropertyName, attr.Value);
+        }
+
+        return msg;
+    }
+
+    /// <summary>
+    /// Indicates whether the <see cref="ServiceBusReceivedMessage"/> is a <see cref="CloudEvent"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
+    /// <returns><see langword="true"/> where the <see cref="ServiceBusReceivedMessage"/> is a <see cref="CloudEvent"/>; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Determines if the <see cref="ServiceBusReceivedMessage"/> contains the <see cref="CloudEvent.SpecVersion"/> property.</remarks>
+    public static bool IsCloudEvent(this ServiceBusReceivedMessage message)
+    {
+        message.ThrowIfNull();
+        return message.ApplicationProperties.ContainsKey(CloudEventSpecVersionPropertyName);
+    }
+
+    /// <summary>
+    /// Converts a <see cref="ServiceBusReceivedMessage"/> to a <see cref="CloudEvent"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
+    /// <param name="contentMode">The <see cref="ContentMode"/> to use; defaults to <see langword="null"/>.</param>
+    /// <returns>The <see cref="CloudEvent"/>.</returns>
+    /// <remarks>Where <paramref name="contentMode"/> is <see langword="null"/>, the <see cref="ContentMode"/> is inferred from the <see cref="ServiceBusReceivedMessage.ContentType"/> (see <see cref="EventsExtensions.InferContentMode"/>).</remarks>
+    public static CloudEvent ToCloudEvent(this ServiceBusReceivedMessage message, ContentMode? contentMode = null)
+    {
+        var bd = message.ThrowIfNull().Body.WithMediaType(message.ContentType);
+        contentMode ??= bd.InferContentMode();
+        var ce = bd.DecodeToCloudEvent(contentMode.Value);
+
+        if (contentMode == ContentMode.Binary && message.IsCloudEvent())
+        {
+            // Manually populate CloudEvent properties from ApplicationProperties for Binary mode.
+            ce.Id = message.MessageId;
+            ce.Type = message.Subject;
+            ce.Time = message.EnqueuedTime;
+
+            foreach (var ap in message.ApplicationProperties)
+            {
+                if (ap.Key.StartsWith(CloudEventPrefix) && ap.Key != CloudEventSpecVersionPropertyName)
+                {
+                    ce[ap.Key[CloudEventPrefix.Length..]] = ap.Value;
+                }
+
+                if (ap.Key == MessageTraceParentPropertyName)
+                    ce[CloudEventTraceParentPropertyName] = ap.Value;
+
+                if (ap.Key == MessageTraceStatePropertyName)
+                    ce[CloudEventTraceStatePropertyName] = ap.Value;
+
+                if (ap.Key == MessageTraceBaggagePropertyName)
+                    ce[CloudEventTraceBaggagePropertyName] = ap.Value;
+            }
+        }
+
+        return ce;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusExtensions.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusExtensions.cs
new file mode 100644
index 00000000..177b3992
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusExtensions.cs
@@ -0,0 +1,21 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides standard extensions for Azure Service Bus.
+/// </summary>
+public static partial class ServiceBusExtensions
+{
+    private const string MessageKey = "CoreEx:ServiceBusMessage";
+
+    extension(EventSubscriberArgs args)
+    {
+        /// <summary>
+        /// Gets or sets the originating <see cref="ServiceBusReceivedMessage"/>.
+        /// </summary>
+        public ServiceBusReceivedMessage Message
+        {
+            get => args.Properties.TryGetValue(MessageKey, out var value) && value is ServiceBusReceivedMessage sbm ? sbm : throw new InvalidOperationException($"The {MessageKey} property has not been set.");
+            internal set => args.Properties[MessageKey] = value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusMetrics.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusMetrics.cs
new file mode 100644
index 00000000..c2c6b853
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusMetrics.cs
@@ -0,0 +1,62 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Defines the <see href="https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview">Azure Service Bus</see> metrics.
+/// </summary>
+public static class ServiceBusMetrics
+{
+    /// <summary>
+    /// Gets the source tag name used for all Azure Service Bus metrics; represents the entity path that represents the source of the message; e.g. topic or queue name.
+    /// </summary>
+    public const string SourceTagName = "source";
+    
+    /// <summary>
+    /// Gets the destination tag name used for all Azure Service Bus metrics; represents the entity path that represents the destination of the message; e.g. topic or queue name.
+    /// </summary>
+    public const string DestinationTagName = "destination";
+
+    /// <summary>
+    /// Gets the <see cref="Meter"/> used for recording metrics related to Azure Service Bus operations.
+    /// </summary>
+    public static Meter Meter { get; } = new("CoreEx.Azure.Messaging.ServiceBus");
+
+    /// <summary>
+    /// Gets the counter that tracks the number of Azure Service Bus messages sent successfully.
+    /// </summary>
+    public static Counter<long> MessagesSendSent { get; } = Meter.CreateCounter<long>("servicebus.messages.send.sent", unit: "{message}", description: "Number of Azure Service Bus messages sent successfully.");
+
+    /// <summary>
+    /// Gets the counter that tracks the number of Azure Service Bus messages sent successfully.
+    /// </summary>
+    public static Counter<long> MessagesSendFailed { get; } = Meter.CreateCounter<long>("servicebus.messages.send.failed", unit: "{message}", description: "Number of Azure Service Bus messages that failed to send.");
+
+    /// <summary>
+    /// Gets the histogram that tracks the duration, in milliseconds, of Azure Service Bus message send operations, regardless of success or failure.
+    /// </summary>
+    public static Histogram<double> MessagesSendDuration { get; } = Meter.CreateHistogram<double>("servicebus.messages.send.duration", unit: "ms", description: "Duration of Azure Service Bus messages send (success or failure).");
+
+    /// <summary>
+    /// Gets the counter that tracks the number of Azure Service Bus messages received and completed.
+    /// </summary>
+    public static Counter<long> MessagesReceivedComplete { get; } = Meter.CreateCounter<long>("servicebus.messages.received.completed", unit: "{message}", description: "Number of Azure Service Bus messages received and completed.");
+
+    /// <summary>
+    /// Gets the counter that tracks the number of Azure Service Bus messages received and dead-lettered.
+    /// </summary>
+    public static Counter<long> MessagesReceivedDeadLetter { get; } = Meter.CreateCounter<long>("servicebus.messages.received.deadlettered", unit: "{message}", description: "Number of Azure Service Bus messages received and dead-lettered.");
+
+    /// <summary>
+    /// Gets the counter that tracks the number of Azure Service Bus messages received and abandoned.
+    /// </summary>
+    public static Counter<long> MessagesReceivedAbandoned { get; } = Meter.CreateCounter<long>("servicebus.messages.received.abandoned", unit: "{message}", description: "Number of Azure Service Bus messages received and abandoned.");
+
+    /// <summary>
+    /// Gets the histogram that tracks the duration, in milliseconds, of Azure Service Bus message receive operations, regardless of success or failure.
+    /// </summary>
+    public static Histogram<double> MessagesReceivedDuration { get; } = Meter.CreateHistogram<double>("servicebus.messages.received.duration", unit: "ms", description: "Duration of Azure Service Bus messages receive processing (success or failure).");
+
+    /// <summary>
+    /// Gets the histogram that tracks the lag duration (now - enqueued time), in milliseconds, of Azure Service Bus message receive operations, regardless of success or failure.
+    /// </summary>
+    public static Histogram<double> MessagesReceivedLagDuration { get; } = Meter.CreateHistogram<double>("servicebus.messages.received.lag_duration", unit: "ms", description: "Lag duration (now - enqueued time) of Azure Service Bus messages receive processing (success or failure).");
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusPublisher.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusPublisher.cs
new file mode 100644
index 00000000..ebd34244
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusPublisher.cs
@@ -0,0 +1,148 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the <see cref="IEventPublisher"/> implementation for <see href="https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview">Azure Service Bus</see>.
+/// </summary>
+/// <param name="serviceBusClient">The <see cref="ServiceBusClient"/>.</param>
+/// <param name="destinationProvider">The optional <see cref="IDestinationProvider"/>.</param>
+/// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The optional logger.</param>
+/// <remarks>Sends using <see href="https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/servicebus/Azure.Messaging.ServiceBus#sending-a-batch-of-messages">safe-batching</see>.
+/// <para>This implementation enables at-least once delivery; i.e. there are no guarantees that events are not delivered more than once where an underlying <see cref="Exception"/> is thrown.</para>
+/// <para>Where <see href="https://learn.microsoft.com/en-us/azure/service-bus-messaging/message-sessions"></see> are required then the <see cref="ServiceBusSessionStrategy"/> must be configured accordingly.</para></remarks>
+public sealed class ServiceBusPublisher(ServiceBusClient serviceBusClient, IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<ServiceBusPublisher>? logger = null) : EventPublisherBase(destinationProvider, formatter, logger)
+{
+    private readonly ServiceBusClient _serviceBusClient = serviceBusClient.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the default service key used when registering the service.
+    /// </summary>
+    /// <remarks>See related <see cref="CoreExServiceBusExtensions.AddAzureServiceBusPublisher"/>.</remarks>
+    public const string DefaultServiceKey = "AzureServiceBus";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudNative.CloudEvents.ContentMode"/> to use when sending a <see cref="CloudEvent"/> as a <see cref="ServiceBusMessage"/>; defaults to <see cref="ContentMode.Structured"/>.
+    /// </summary>
+    /// <remarks>See also <see cref="ServiceBusExtensions.ToServiceBusMessage"/>.</remarks>
+    public ContentMode ContentMode { get; set; } = ContentMode.Structured;
+
+    /// <summary>
+    /// Indicates whether to include all <see cref="CloudEvent.GetPopulatedAttributes"/> as <see cref="ServiceBusMessage.ApplicationProperties"/>; defaults to <see langword="true"/>.
+    /// </summary>
+    /// <remarks>See also <see cref="ServiceBusExtensions.ToServiceBusMessage"/>.</remarks>
+    public bool IncludeCloudEventAttributes { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ServiceBusMessage.SessionId"/> strategy to use when sending messages; defaults to <see cref="ServiceBusSessionStrategy.None"/>.
+    /// </summary>
+    public ServiceBusSessionStrategy SessionIdStrategy { get; set; } = ServiceBusSessionStrategy.None;
+
+    /// <summary>
+    /// Gets or sets the size of the partition used for when the <see cref="SessionIdStrategy"/> is <see cref="ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId"/>.
+    /// </summary>
+    /// <remarks>Where not specified the <see cref="PartitionKey.DefaultPartitionSize"/> is used.</remarks>
+    public int? SessionIdPartitionSize { get; set; }
+
+    /// <inheritdoc/>
+    protected async override Task OnPublishAsync(DestinationEvent[] events, CancellationToken cancellationToken = default)
+    {
+        var groups = events
+            .GroupBy(e => e.Destination ?? string.Empty, StringComparer.Ordinal)
+            .ToDictionary(g => g.Key, g => new Queue<DestinationEvent>(g), StringComparer.Ordinal);
+
+        if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+            Logger.LogDebug("Preparing to send {EventCount} event(s) to {DestinationCount} destination(s).", events.Length, groups.Count);
+
+        foreach (var group in groups)
+        {
+            await SendBatchAsync(events.Length, group.Key, group.Value, cancellationToken).ConfigureAwait(false);
+        }
+
+        if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+            Logger.LogDebug("Published {Count} event(s) to Azure Service Bus.", events.Length);
+    }
+
+    /// <summary>
+    /// Send using safe-batching.
+    /// </summary>
+    private async Task SendBatchAsync(int totalEventCount, string destination, Queue<DestinationEvent> events, CancellationToken cancellationToken)
+    {
+        var eventsSent = 0;
+
+        // Create a sender for the queue/topic (destination).
+        await using var sender = _serviceBusClient.CreateSender(destination);
+
+        while (events.Count > 0)
+        {
+            // Start a new batch.
+            using var batch = await sender.CreateMessageBatchAsync(cancellationToken).ConfigureAwait(false);
+
+            // Add first message to the batch.
+            if (batch.TryAddMessage(SetSessionId(events.Peek().Event.ToServiceBusMessage(ContentMode, IncludeCloudEventAttributes))))
+            {
+                events.Dequeue();
+
+                // Keep adding messages until we run out of messages or batch is full.
+                while (events.Count > 0 && batch.TryAddMessage(SetSessionId(events.Peek().Event.ToServiceBusMessage(ContentMode, IncludeCloudEventAttributes))))
+                {
+                    events.Dequeue();
+                }
+            }
+            else
+            {
+                if (Logger?.IsEnabled(LogLevel.Error) ?? false)
+                {
+                    var ce = events.Peek().Event;
+                    Logger.LogError("A single event (Id={MessageId}, Type='{MessageType}') is too large to fit in the Azure Service Bus message batch for destination '{Destination}'; {EventsSent} of the {EventsCount} event(s) have already been successfully sent.", ce.Id, ce.Type, destination, eventsSent, totalEventCount);
+                }
+
+                throw new InvalidOperationException("A single event is too large to fit in the Azure Service Bus message batch.");
+            }
+
+            // Send the batch of messages.
+            if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+                Logger.LogDebug("Sending batch of {BatchCount} event(s) to destination '{Destination}'.", batch.Count, destination);
+
+            await Invoker.InvokeAsync(this, async (tracer, cancellationToken) =>
+            {
+                tracer.Activity?.AddTag("servicebus.destination", destination);
+                var stopwatch = Stopwatch.StartNew();
+
+                try
+                {
+                    await sender.SendMessagesAsync(batch, cancellationToken).ConfigureAwait(false);
+                    ServiceBusMetrics.MessagesSendSent.Add(batch.Count, [ new (ServiceBusMetrics.DestinationTagName, destination) ]);
+                }
+                catch (Exception)
+                {
+                    ServiceBusMetrics.MessagesSendFailed.Add(batch.Count, [new(ServiceBusMetrics.DestinationTagName, destination)]);
+                    throw;
+                }
+                finally
+                {
+                    stopwatch.Stop();
+                    ServiceBus.ServiceBusMetrics.MessagesSendDuration.Record(stopwatch.Elapsed.TotalMilliseconds, [new(ServiceBusMetrics.DestinationTagName, destination)]);
+                }
+
+                tracer.Activity?.AddTag("servicebus.messages.sent", batch.Count);
+            }, cancellationToken).ConfigureAwait(false);
+
+            eventsSent += batch.Count;
+        }
+    }
+
+    /// <summary>
+    /// Sets the <see cref="ServiceBusMessage"/> <see cref="ServiceBusMessage.SessionId"/> based on the configured <see cref="SessionIdStrategy"/>.
+    /// </summary>
+    private ServiceBusMessage SetSessionId(ServiceBusMessage message)
+    {
+        message.ThrowIfNull();
+
+        return SessionIdStrategy switch
+        {
+            ServiceBusSessionStrategy.UsePartitionKeyAsIs => message.Adjust(message => message.SessionId = message.PartitionKey ?? Guid.NewGuid().ToString()),
+            ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId => message.Adjust(message => message.SessionId = message.PartitionKey = PartitionKey.GetPartitionIdAsString(message.PartitionKey ?? Guid.NewGuid().ToString(), SessionIdPartitionSize ?? PartitionKey.DefaultPartitionSize)),
+            _ => message
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiver.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiver.cs
new file mode 100644
index 00000000..68c60416
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiver.cs
@@ -0,0 +1,71 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Encapsulates the <see cref="ServiceBusProcessor"/> lifetime and message receiving management.
+/// </summary>
+/// <typeparam name="TSubscriber">The <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/> to be used for receiving each <see cref="ServiceBusReceivedMessage"/>.</typeparam>
+public sealed class ServiceBusReceiver<TSubscriber> : ServiceBusReceiverBase<TSubscriber> where TSubscriber : ServiceBusSubscriberBase
+{
+    private readonly ServiceBusProcessor _processor;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ServiceBusReceiver{TSubscriber}"/> class.
+    /// </summary>
+    /// <param name="client">The <see cref="ServiceBusClient"/>.</param>
+    /// <param name="options">The <see cref="ServiceBusReceiverOptions"/>.</param>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public ServiceBusReceiver(ServiceBusClient client, ServiceBusReceiverOptions options, IServiceProvider serviceProvider, ILogger<ServiceBusReceiver<TSubscriber>> logger)
+        : base(client, options, serviceProvider, logger)
+    {
+        var config = serviceProvider.GetRequiredService<IConfiguration>();
+        var queueOrTopicName = Internal.GetValueFromConfigurationWhereApplicable(options.QueueOrTopicName, config);
+
+        _processor = options.IsSubscription
+            ? client.CreateProcessor(queueOrTopicName, Internal.GetValueFromConfigurationWhereApplicable(options.SubscriptionName!, config), options.ProcessorOptions)
+            : client.CreateProcessor(queueOrTopicName, options.ProcessorOptions);
+
+        _processor.ProcessMessageAsync += OnProcessMessageAsync;
+        _processor.ProcessErrorAsync += OnProcessErrorAsync;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusReceiverOptions"/> to be used when creating the <see cref="ServiceBusReceiver"/> instance.
+    /// </summary>
+    public new ServiceBusReceiverOptions Options => (ServiceBusReceiverOptions)base.Options;
+
+    /// <inheritdoc/>
+    protected override Task OnStartAsync(CancellationToken cancellationToken) => _processor.StartProcessingAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnPauseAsync(CancellationToken cancellationToken) => _processor.StopProcessingAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnResumeAsync(CancellationToken cancellationToken) => _processor.StartProcessingAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnStopAsync(CancellationToken cancellationToken) => _processor.StopProcessingAsync(cancellationToken);
+
+    /// <summary>
+    /// Handles the processing of a message.
+    /// </summary>
+    private Task OnProcessMessageAsync(ProcessMessageEventArgs args) => ProcessMessageAsync(args.Message, new ProcessMessageEventArgsActions(args), args.CancellationToken);
+
+    /// <summary>
+    /// Handles the processing of an error/exception.
+    /// </summary>
+    private Task OnProcessErrorAsync(ProcessErrorEventArgs args)
+    {
+        ServiceBusErrorClassifier.ClassifyAndLogError(Logger, args);
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    protected async override ValueTask DisposeAsync(bool disposing)
+    {
+        if (disposing)
+            await _processor.DisposeAsync().ConfigureAwait(false);
+
+        await base.DisposeAsync(disposing).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverHostedService.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverHostedService.cs
new file mode 100644
index 00000000..9b551716
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverHostedService.cs
@@ -0,0 +1,50 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the Azure Service Bus receiver hosted service functionality.
+/// </summary>
+/// <typeparam name="TReceiver">The <see cref="ServiceBusReceiverBase"/> <see cref="Type"/>.</typeparam>
+public sealed class ServiceBusReceiverHostedService<TReceiver> : HostedServiceBase where TReceiver : ServiceBusReceiverBase
+{
+    private readonly TReceiver _receiver;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TimerHostedServiceBase"/> class.
+    /// </summary>
+    /// <param name="receiver">The <see cref="ServiceCollectionServiceExtensions"/>.</param>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public ServiceBusReceiverHostedService(TReceiver receiver, IServiceProvider serviceProvider, ILogger<ServiceBusReceiverHostedService<TReceiver>> logger) : base(serviceProvider, logger)
+    {
+        _receiver = receiver.ThrowIfNull();
+        ArePauseAndResumeSupported = true;
+    }
+
+    /// <inheritdoc/>
+    protected async override Task<ServiceStatus> OnStartAsync(CancellationToken cancellationToken)
+    {
+        await _receiver.StartAsync(cancellationToken).ConfigureAwait(false);
+        return ServiceStatus.Running;
+    }
+
+    /// <inheritdoc/>
+    protected override Task OnPauseAsync(CancellationToken cancellationToken)
+        => _receiver.PauseAsync($"Hosted service externally paused by '{(ExecutionContext.TryGetCurrent(out var ec) ? ec.User ?? AuthenticationUser.EnvironmentUser : AuthenticationUser.EnvironmentUser)}.", cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnResumeAsync(CancellationToken cancellationToken) => _receiver.ResumeAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnStopAsync(CancellationToken cancellationToken) => _receiver.StopAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override HealthCheckResult OnReportHealthStatus(Dictionary<string, object> data)
+    {
+        if (_receiver.StatusReason is not null)
+            data.Add("statusReason", _receiver.StatusReason);
+
+        return Status.IsPause
+            ? HealthCheckResult.Degraded("Service is in a paused state.", null, data)
+            : HealthCheckResult.Healthy(null, data);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverInvoker.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverInvoker.cs
new file mode 100644
index 00000000..28a9b104
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverInvoker.cs
@@ -0,0 +1,61 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the <see cref="ServiceBusSubscriberBase"/> invoker and underlying resiliency management.
+/// </summary>
+[InvokerName("CoreEx.Azure.Messaging.ServiceBus.ServiceBusReceiver")]
+public class ServiceBusReceiverInvoker : InvokerBase<ServiceBusReceiverBase, IServiceBusMessageActions>
+{
+    /// <inheritdoc/>
+    protected override async Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, ServiceBusReceiverBase caller, IServiceBusMessageActions args, Func<InvokerTracer, IServiceBusMessageActions, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
+    {
+        var stopwatch = Stopwatch.StartNew();
+
+        // Get a resilience context from the pool to use for this execution.
+        var ctx = ResilienceContextPool.Shared.Get(cancellationToken);
+
+        try
+        {
+            // Set the resilience property within the context for access during processing.
+            ctx.Properties.Set(ServiceBusReceiverResiliency.ResiliencePropertyKey, caller);
+
+            // Execute the function within the resiliency policy.
+            var r = await caller.Options.ReceiverResiliency.ExecuteAsync<Result, (ServiceBusReceiverInvoker Self, InvokerTracer Tracer, ServiceBusReceiverBase Caller, IServiceBusMessageActions Args, Func <InvokerTracer, IServiceBusMessageActions, CancellationToken, Task<TResult>> Func)>(async static (ctx, state) =>
+            {
+                // Should always return a Result and never an unhandled exception.
+                var tresult = await state.Self.BaseOnInvokeAsync(state.Tracer, state.Caller, state.Args, state.Func, ctx.CancellationToken).ConfigureAwait(false);
+                var result = Internal.Cast<TResult, Result>(tresult);
+
+                if (result.IsFailure && result.Error is EventSubscriberUnhandledException)
+                    await Task.Delay(state.Caller.Options.PerUnhandledErrorDelayDuration, ctx.CancellationToken).ConfigureAwait(false);
+
+                return result;
+            }, ctx, (this, tracer, caller, args, func)).ConfigureAwait(false);
+
+            // Return the result of the execution.
+            return Internal.Cast<Result, TResult>(r);
+        }
+        finally
+        {
+            // Return the resilience context to the pool.
+            ResilienceContextPool.Shared.Return(ctx);
+
+            // Emit the received duration and lag metrics.
+            stopwatch.Stop();
+            ServiceBus.ServiceBusMetrics.MessagesReceivedDuration.Record(stopwatch.Elapsed.TotalMilliseconds, [new(ServiceBusMetrics.SourceTagName, args.EntityPath)]);
+            ServiceBus.ServiceBusMetrics.MessagesReceivedLagDuration.Record((DateTimeOffset.UtcNow - GetMessageEnqueuedTime(args)).TotalMilliseconds, [new(ServiceBusMetrics.SourceTagName, args.EntityPath)]);
+        }
+    }
+
+    /// <summary>
+    /// Wrapper to pass and avoid closure on the lambda.
+    /// </summary>
+    private Task<TResult> BaseOnInvokeAsync<TResult>(InvokerTracer tracer, ServiceBusReceiverBase caller, IServiceBusMessageActions args, Func<InvokerTracer, IServiceBusMessageActions, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
+        => base.OnInvokeAsync(tracer, caller, args, func, cancellationToken);
+
+    /// <summary>
+    /// Gets the message enqueued time from the AMQP message annotations, or returns the default value if not available.
+    /// </summary>
+    private static DateTimeOffset GetMessageEnqueuedTime(IServiceBusMessageActions args)
+        => args.AmqpMessage.MessageAnnotations.TryGetValue("x-opt-enqueued-time", out var enqueuedTime) && enqueuedTime is DateTime dt ? dt : default;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverOptions.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverOptions.cs
new file mode 100644
index 00000000..b549beb0
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverOptions.cs
@@ -0,0 +1,54 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the options to be used when creating a <see cref="ServiceBusReceiver"/> instance.
+/// </summary>
+/// <remarks>The <see cref="ProcessorOptions"/> defaults to a new <see cref="ServiceBusProcessorOptions"/> with:
+/// <list type="bullet">
+///   <item><description><see cref="ServiceBusProcessorOptions.ReceiveMode"/> = <see cref="ServiceBusReceiveMode.PeekLock"/>.</description></item>
+///   <item><description><see cref="ServiceBusProcessorOptions.AutoCompleteMessages"/> = <see langword="false"/>.</description></item>
+///   <item><description><see cref="ServiceBusProcessorOptions.MaxConcurrentCalls"/> = '<c>1</c>'.</description></item>
+///   <item><description><see cref="ServiceBusProcessorOptions.MaxAutoLockRenewalDuration"/> = '<c>00:05:00</c>' (five minutes).</description></item>
+///   <item><description><see cref="ServiceBusProcessorOptions.PrefetchCount"/> = '<c>0</c>'.</description></item>
+/// </list>
+/// </remarks>
+public sealed class ServiceBusReceiverOptions : ServiceBusReceiverOptionsBase
+{
+    /// <summary>
+    /// Create a <see cref="ServiceBusReceiverOptions"/> for the specified <paramref name="queueName"/>.
+    /// </summary>
+    /// <param name="queueName">The queue name.</param>
+    /// <returns>The <see cref="ServiceBusReceiverOptions"/>.</returns>
+    /// <remarks>Supports the retrieval of the <paramref name="queueName"/> from <see cref="IConfiguration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public static ServiceBusReceiverOptions CreateForQueue(string queueName = QueueOrTopicNameAsConfigKey) => new(queueName, null);
+
+    /// <summary>
+    /// Create a <see cref="ServiceBusReceiverOptions"/> for the specified <paramref name="topicName"/> and <paramref name="subscriptionName"/>.
+    /// </summary>
+    /// <param name="topicName">The topic name.</param>
+    /// <param name="subscriptionName">The subscription name.</param>
+    /// <returns>The <see cref="ServiceBusSessionReceiverOptions"/>.</returns>
+    /// <remarks>Supports the retrieval of the <paramref name="topicName"/> and <paramref name="subscriptionName"/> from <see cref="IConfiguration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public static ServiceBusReceiverOptions CreateForTopicSubscription(string topicName = QueueOrTopicNameAsConfigKey, string subscriptionName = SubscriptionNameAsConfigKey)
+        => new(topicName, subscriptionName.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ServiceBusReceiverOptions"/> class.
+    /// </summary>
+    private ServiceBusReceiverOptions(string queueOrTopicName, string? subscriptionName) : base(queueOrTopicName, subscriptionName)
+    {
+        ProcessorOptions = new ServiceBusProcessorOptions
+        {
+            ReceiveMode = ServiceBusReceiveMode.PeekLock,
+            AutoCompleteMessages = false,
+            MaxConcurrentCalls = 1,
+            MaxAutoLockRenewalDuration = TimeSpan.FromMinutes(5),
+            PrefetchCount = 0
+        };
+    }
+
+    /// <summary>
+    /// Gets or sets the <see cref="ServiceBusProcessorOptions"/> to be used when creating a <see cref="ServiceBusProcessor"/> instance.
+    /// </summary>
+    public ServiceBusProcessorOptions ProcessorOptions { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverResiliency.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverResiliency.cs
new file mode 100644
index 00000000..5f97c2a3
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusReceiverResiliency.cs
@@ -0,0 +1,127 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides factory methods for creating standardized resilience pipelines for service bus message receivers (<see cref="ServiceBusReceiverBase"/>) via either the <see cref="ServiceBusReceiverOptions"/>
+/// or <see cref="ServiceBusSessionReceiverOptions"/>.
+/// </summary>
+/// <remarks>Their usage is intended as follows:
+/// <list type="bullet">
+///  <item><see cref="CreateReceiverCircuitBreakerResiliency(int, TimeSpan?, TimeSpan?, TimeSpan?, double)"/> -> <see cref="ServiceBusReceiverOptionsBase.ReceiverResiliency"/>.</item>
+///  <item><see cref="CreateMessageRetryResiliency(TimeSpan?, int, DelayBackoffType)"/> -> <see cref="ServiceBusReceiverOptionsBase.MessageResiliency"/>.</item>
+/// </list></remarks>
+public static class ServiceBusReceiverResiliency
+{
+    /// <summary>
+    /// Creates a standardized <see cref="ResiliencePipeline{T}"/> with circuit breaker capabilities to protect the service bus receiver from unhandled exceptions and allow for automatic recovery.
+    /// </summary>
+    /// <param name="minimumThroughput">The <see cref="CircuitBreakerStrategyOptions{TResult}.MinimumThroughput"/>.</param>
+    /// <param name="samplingDuration">The <see cref="CircuitBreakerStrategyOptions{TResult}.SamplingDuration"/>.</param>
+    /// <param name="failureRatio">The <see cref="CircuitBreakerStrategyOptions{TResult}.FailureRatio"/>.</param>
+    /// <param name="breakDuration">The initial duration for which the circuit breaker remains open before attempting to reset (exponentially increasing with each subsequent open).</param>
+    /// <param name="maxBreakDuration">The maximum duration for which the circuit breaker can remain open.</param>
+    /// <returns>A configured <see cref="ResiliencePipeline{T}"/> instance.</returns>
+    /// <remarks>The circuit breaker strategy is configured to handle failures that are not of type <see cref="EventSubscriberDeadLetterException"/>. The breaker will open based on the specified minimum throughput,
+    /// sampling duration, failure ratio, and break duration settings, and will log events at the warning level.
+    /// <para>The default settings are: minimumThroughput = 5, samplingDuration = 30s, breakDuration = 15s, maxBreakDuration = 5m, failureRatio = 0.1</para></remarks>
+    public static ResiliencePipeline<Result> CreateReceiverCircuitBreakerResiliency(int minimumThroughput = 5, TimeSpan? samplingDuration = null, TimeSpan? breakDuration = null, TimeSpan? maxBreakDuration = null, double failureRatio = 0.1)
+    {
+        int circuitBreakerOpens = 0;
+
+        samplingDuration ??= TimeSpan.FromSeconds(30);
+        breakDuration ??= TimeSpan.FromSeconds(15);
+        maxBreakDuration ??= TimeSpan.FromMinutes(5);
+
+        return new ResiliencePipelineBuilder<Result>()
+            .AddCircuitBreaker<Result>(new CircuitBreakerStrategyOptions<Result>()
+            {
+                ShouldHandle = args => ValueTask.FromResult(args.Outcome.Result.IsFailure && args.Outcome.Result.Error is not EventSubscriberDeadLetterException),
+                MinimumThroughput = minimumThroughput,
+                SamplingDuration = samplingDuration.Value,
+                FailureRatio = failureRatio,
+                BreakDurationGenerator = args =>
+                {
+                    // Exponential backoff on each open, similar to: 15s, 30s, 60s, ... with a cap at 5 minutes (the default).
+                    var n = Interlocked.Increment(ref circuitBreakerOpens);
+                    var seconds = Math.Min(breakDuration.Value.TotalSeconds * Math.Pow(2, n - 1), maxBreakDuration.Value.TotalSeconds);
+                    return ValueTask.FromResult(TimeSpan.FromSeconds(seconds));
+                },
+                OnOpened = args =>
+                {
+                    // Breaker is open; pause the receiver.
+                    var owner = GetOwner(args.Context);
+                    if (owner.Logger.IsEnabled(LogLevel.Warning))
+                        owner.Logger.LogWarning("Service bus receiver circuit breaker has been tripped for {BreakDuration}ms due to unhandled errors; receiver will be paused.", args.BreakDuration.TotalMilliseconds);
+
+                    var pause = args.BreakDuration.Add(TimeSpan.FromMilliseconds(100)); // Add a small buffer to ensure the breaker has fully opened before resuming.
+
+                    _ = Task.Run(async () =>
+                    {
+                        await owner.PauseAsync($"Service bus receiver circuit breaker has been tripped; will resume automatically at: {DateTimeOffset.UtcNow.Add(pause):R}.").ConfigureAwait(false);
+                        await Task.Delay(pause).ConfigureAwait(false);
+                        await owner.ResumeAsync().ConfigureAwait(false);
+                    });
+
+                    return ValueTask.CompletedTask;
+                },
+                OnHalfOpened = args =>
+                {
+                    var owner = GetOwner(args.Context);
+                    if (owner.Logger.IsEnabled(LogLevel.Information))
+                        owner.Logger.LogInformation("Service bus receiver circuit breaker is attempting to recover in a limited state; receiver has been resumed.");
+
+                    return ValueTask.CompletedTask;
+                },
+                OnClosed = args =>
+                {
+                    var owner = GetOwner(args.Context);
+                    if (owner.Logger.IsEnabled(LogLevel.Information))
+                        owner.Logger.LogInformation("Service bus receiver circuit breaker has fully recovered; receiver is running.");
+
+                    // Reset after recovery.
+                    Interlocked.Exchange(ref circuitBreakerOpens, 0);
+                    return ValueTask.CompletedTask;
+                }
+            })
+            .Build();
+    }
+
+    /// <summary>
+    /// Creates a standardized <see cref="ResiliencePipeline{T}"/> with retry capabilities for transient message processing errors.
+    /// </summary>
+    /// <param name="delay">The delay between retry attempts.</param>
+    /// <param name="maxRetryAttempts">The maximum number of retry attempts.</param>
+    /// <param name="backoffType">The <see cref="DelayBackoffType"/> strategy.</param>
+    /// <returns>A configured <see cref="ResiliencePipeline{T}"/> instance.</returns>
+    /// <remarks>The retry strategy is configured to handle failures that are specifically of type <see cref="EventSubscriberRetryException"/>. The retry attempts will be made with a specified delay (defaults to two seconds) and
+    /// backoff strategy, and the retry attempts will be logged at the information level.</remarks>
+    public static ResiliencePipeline<Result> CreateMessageRetryResiliency(TimeSpan? delay = null, int maxRetryAttempts = 3, DelayBackoffType backoffType = DelayBackoffType.Exponential)
+    {
+        return new ResiliencePipelineBuilder<Result>()
+            .AddRetry<Result>(new RetryStrategyOptions<Result>()
+            {
+                ShouldHandle = args => ValueTask.FromResult(args.Outcome.Result.IsFailure && args.Outcome.Result.Error is EventSubscriberRetryException),
+                Delay = delay ?? TimeSpan.FromSeconds(2),
+                MaxRetryAttempts = maxRetryAttempts,
+                BackoffType = backoffType,
+                OnRetry = args =>
+                {
+                    var owner = GetOwner(args.Context);
+                    if (owner.Logger.IsEnabled(LogLevel.Information))
+                        owner.Logger.LogInformation("Service bus message retry attempt {AttemptCount} in {AttemptDelay}ms.", args.AttemptNumber + 1, args.RetryDelay.TotalMilliseconds);
+
+                    return ValueTask.CompletedTask;
+                }
+            })
+            .Build();
+    }
+
+    /// <summary>
+    /// Gets the <see cref="ResiliencePropertyKey"/> used to configure and manage resilience strategies for the <see cref="ServiceBusReceiverBase"/>.
+    /// </summary>
+    public static ResiliencePropertyKey<ServiceBusReceiverBase> ResiliencePropertyKey { get; } = new(nameof(ServiceBusReceiverBase));
+
+    /// <summary>
+    /// Gets the owning/invoking <see cref="ServiceBusReceiverBase"/> from the <paramref name="context"/>.
+    /// </summary>
+    public static ServiceBusReceiverBase GetOwner(ResilienceContext context) => context.Properties.GetValue(ResiliencePropertyKey, default!);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionReceiver.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionReceiver.cs
new file mode 100644
index 00000000..66c3ad97
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionReceiver.cs
@@ -0,0 +1,71 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Encapsulates the <see cref="ServiceBusSessionProcessor"/> lifetime and message receiving management.
+/// </summary>
+/// <typeparam name="TSubscriber">The <see cref="ServiceBusSubscriberBase"/> <see cref="Type"/> to be used for receiving each <see cref="ServiceBusReceivedMessage"/>.</typeparam>
+public sealed class ServiceBusSessionReceiver<TSubscriber> : ServiceBusReceiverBase<TSubscriber> where TSubscriber : ServiceBusSubscriberBase
+{
+    private readonly ServiceBusSessionProcessor _processor;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ServiceBusSessionReceiver{TSubscriber}"/> class.
+    /// </summary>
+    /// <param name="client">The <see cref="ServiceBusClient"/>.</param>
+    /// <param name="options">The <see cref="ServiceBusSessionReceiverOptions"/>.</param>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public ServiceBusSessionReceiver(ServiceBusClient client, ServiceBusSessionReceiverOptions options, IServiceProvider serviceProvider, ILogger<ServiceBusReceiver<TSubscriber>> logger)
+        : base(client, options, serviceProvider, logger)
+    {
+        var config = serviceProvider.GetRequiredService<IConfiguration>();
+        var queueOrTopicName = Internal.GetValueFromConfigurationWhereApplicable(options.QueueOrTopicName, config);
+
+        _processor = options.IsSubscription
+            ? client.CreateSessionProcessor(queueOrTopicName, Internal.GetValueFromConfigurationWhereApplicable(options.SubscriptionName!, config), options.SessionProcessorOptions)
+            : client.CreateSessionProcessor(queueOrTopicName, options.SessionProcessorOptions);
+
+        _processor.ProcessMessageAsync += OnProcessMessageAsync;
+        _processor.ProcessErrorAsync += OnProcessErrorAsync;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="ServiceBusSessionReceiverOptions"/> to be used when creating the <see cref="ServiceBusSessionReceiver{TSubscriber}"/> instance.
+    /// </summary>
+    public new ServiceBusSessionReceiverOptions Options => (ServiceBusSessionReceiverOptions)base.Options;
+
+    /// <inheritdoc/>
+    protected override Task OnStartAsync(CancellationToken cancellationToken) => _processor.StartProcessingAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnPauseAsync(CancellationToken cancellationToken) => _processor.StopProcessingAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnResumeAsync(CancellationToken cancellationToken) => _processor.StartProcessingAsync(cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnStopAsync(CancellationToken cancellationToken) => _processor.StopProcessingAsync(cancellationToken);
+
+    /// <summary>
+    /// Handles the processing of a message.
+    /// </summary>
+    private Task OnProcessMessageAsync(ProcessSessionMessageEventArgs args) => ProcessMessageAsync(args.Message, new ProcessSessionMessageEventArgsActions(args), args.CancellationToken);
+
+    /// <summary>
+    /// Handles the processing of an error/exception.
+    /// </summary>
+    private Task OnProcessErrorAsync(ProcessErrorEventArgs args)
+    {
+        ServiceBusErrorClassifier.ClassifyAndLogError(Logger, args);
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    protected async override ValueTask DisposeAsync(bool disposing)
+    {
+        if (disposing)
+            await _processor.DisposeAsync().ConfigureAwait(false);
+
+        await base.DisposeAsync(disposing).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionReceiverOptions.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionReceiverOptions.cs
new file mode 100644
index 00000000..c9a047ea
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionReceiverOptions.cs
@@ -0,0 +1,54 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the options to be used when creating a <see cref="ServiceBusSessionReceiver"/> instance.
+/// </summary>
+/// <remarks>The <see cref="SessionProcessorOptions"/> defaults to a new <see cref="ServiceBusSessionProcessorOptions"/> with:
+/// <list type="bullet">
+///   <item><description><see cref="ServiceBusSessionProcessorOptions.ReceiveMode"/> = <see cref="ServiceBusReceiveMode.PeekLock"/>.</description></item>
+///   <item><description><see cref="ServiceBusSessionProcessorOptions.AutoCompleteMessages"/> = <see langword="false"/>.</description></item>
+///   <item><description><see cref="ServiceBusSessionProcessorOptions.MaxConcurrentSessions"/> = '<c>4</c>'.</description></item>
+///   <item><description><see cref="ServiceBusSessionProcessorOptions.MaxAutoLockRenewalDuration"/> = '<c>00:05:00</c>' (five minutes).</description></item>
+///   <item><description><see cref="ServiceBusSessionProcessorOptions.PrefetchCount"/> = '<c>0</c>'.</description></item>
+/// </list>
+/// </remarks>
+public class ServiceBusSessionReceiverOptions : ServiceBusReceiverOptionsBase
+{
+    /// <summary>
+    /// Create a <see cref="ServiceBusReceiverOptions"/> for the specified <paramref name="queueName"/>.
+    /// </summary>
+    /// <param name="queueName">The queue name.</param>
+    /// <returns>The <see cref="ServiceBusReceiverOptions"/>.</returns>
+    /// <remarks>Supports the retrieval of the <paramref name="queueName"/> from <see cref="IConfiguration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public static ServiceBusSessionReceiverOptions CreateForQueue(string queueName = QueueOrTopicNameAsConfigKey) => new(queueName, null);
+
+    /// <summary>
+    /// Create a <see cref="ServiceBusReceiverOptions"/> for the specified <paramref name="topicName"/> and <paramref name="subscriptionName"/>.
+    /// </summary>
+    /// <param name="topicName">The topic name.</param>
+    /// <param name="subscriptionName">The subscription name.</param>
+    /// <returns>The <see cref="ServiceBusSessionReceiverOptions"/>.</returns>
+    /// <remarks>Supports the retrieval of the <paramref name="topicName"/> and <paramref name="subscriptionName"/> from <see cref="IConfiguration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public static ServiceBusSessionReceiverOptions CreateForTopicSubscription(string topicName = QueueOrTopicNameAsConfigKey, string subscriptionName = SubscriptionNameAsConfigKey)
+        => new(topicName, subscriptionName.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ServiceBusSessionReceiverOptions"/> class.
+    /// </summary>
+    private ServiceBusSessionReceiverOptions(string queueOrTopicName, string? subscriptionName) : base(queueOrTopicName, subscriptionName)
+    {
+        SessionProcessorOptions = new ServiceBusSessionProcessorOptions
+        {
+            ReceiveMode = ServiceBusReceiveMode.PeekLock,
+            AutoCompleteMessages = false,
+            MaxConcurrentSessions = 4,
+            MaxAutoLockRenewalDuration = TimeSpan.FromMinutes(5),
+            PrefetchCount = 0
+        };
+    }
+
+    /// <summary>
+    /// Gets or sets the <see cref="ServiceBusSessionProcessorOptions"/> to be used when creating a <see cref="ServiceBusSessionProcessor"/> instance.
+    /// </summary>
+    public ServiceBusSessionProcessorOptions SessionProcessorOptions { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionStrategy.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionStrategy.cs
new file mode 100644
index 00000000..2318314b
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSessionStrategy.cs
@@ -0,0 +1,29 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the <see cref="ServiceBusMessage.SessionId"/> publishing strategy.
+/// </summary>
+/// <remarks>See <see href="https://learn.microsoft.com/en-us/azure/service-bus-messaging/message-sessions"/> for more information on sessions.</remarks>
+public enum ServiceBusSessionStrategy
+{
+    /// <summary>
+    /// No <see cref="ServiceBusMessage.SessionId"/> is required; i.e. messages are not session-enabled.
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// Uses the <see cref="ServiceBusMessage.PartitionKey"/> as-is (unchanged) as the <see cref="ServiceBusMessage.SessionId"/>.
+    /// </summary>
+    /// <remarks>The <see cref="ServiceBusMessage.PartitionKey"/> is generally set from the corresponding <see cref="EventData.PartitionKey"/>.</remarks>
+    UsePartitionKeyAsIs,
+
+    /// <summary>
+    /// Uses the <see cref="ServiceBusMessage.PartitionKey"/> converted to a <see cref="ServiceBusMessage.SessionId"/> using <see cref="Data.PartitionKey.GetPartitionId"/>.
+    /// </summary>
+    /// <remarks>Where the underlying partition-key value is such that there may be 100s/1000s/10000s+ of possible values, then leveraging this strategy with a sensible partition-size will help to ensure that the number of sessions is kept to a manageable level; e.g. 8, 16, 32, 64, etc.
+    /// This will aid the receiver-side where sessions are used to ensure that concurrent processing is spread across a smaller number of sessions (and thus more efficient) rather than having a large number of sessions with only a few messages in each. However,
+    /// note that there should be at least as many session receivers as the number of sessions to ensure that all sessions are being processed concurrently; in a fair and equable rate - this will avoid "hot" and "cold" sessions where some sessions are receiving more messages than
+    /// others and thus processing is not spread across the session receivers as well as it could be.
+    /// <para>The <see cref="ServiceBusMessage.PartitionKey"/> is generally set from the corresponding <see cref="EventData.PartitionKey"/>.</para></remarks>
+    UsePartitionKeyConvertedToAnId
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSubscribedSubscriber.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSubscribedSubscriber.cs
new file mode 100644
index 00000000..8e79a521
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSubscribedSubscriber.cs
@@ -0,0 +1,47 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the <see cref="SubscribedManager"/>-based <see href="https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview">Azure Service Bus</see> subscribing capabilities.
+/// </summary>
+/// <param name="subscribedManager">The <see cref="Events.Subscribing.SubscribedManager"/>.</param>
+/// <param name="formatter">The <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The <see cref="ILogger{ServiceBusSubscriber}"/>.</param>
+/// <remarks>Leverages the <see cref="Events.Subscribing.SubscribedManager"/> to determine the appropriate <see cref="Events.Subscribing.SubscribedBase"/> for processing the received event. The <see cref="ServiceBusReceivedMessage.Subject"/>
+/// is used as the <i>Title</i> and the <see cref="SourcePropertyName"/> (<see cref="ServiceBusReceivedMessage.ApplicationProperties"/>) as the <i>Source</i>.</remarks>
+public sealed class ServiceBusSubscribedSubscriber(SubscribedManager subscribedManager, IEventFormatter formatter, ILogger<ServiceBusSubscriberBase> logger) : ServiceBusSubscriberBase(formatter, logger)
+{
+    /// <summary>
+    /// Gets the <see cref="Events.Subscribing.SubscribedManager"/>.
+    /// </summary>
+    public SubscribedManager SubscribedManager { get; } = subscribedManager.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the name of the property within the <see cref="ServiceBusReceivedMessage.ApplicationProperties"/> that contains the source <see cref="Uri"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ServiceBusExtensions.CloudEventSourcePropertyName"/>.</remarks>
+    public string SourcePropertyName { get; set; } = ServiceBusExtensions.CloudEventSourcePropertyName;
+
+    /// <inheritdoc/>
+    protected override Task<Result> OnBeforeReceiveAsync(ServiceBusReceivedMessage message, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+    {
+        if (Logger.IsEnabled(LogLevel.Debug))
+            Logger.LogDebug("Received ServiceBusMessage with Id='{ServiceBusMessageId}', Subject='{ServiceBusMessageSubject}'.", message.MessageId, message.Subject);
+
+        // Determine the Source Uri where specified as a property.
+        var source = !string.IsNullOrEmpty(SourcePropertyName) && message.ApplicationProperties.TryGetValue(SourcePropertyName, out var src) && src is string s
+            ? (Uri.TryCreate(s, UriKind.RelativeOrAbsolute, out var uri) ? uri : null)
+            : null;
+
+        // Determine if subscribed; where no single subscriber then a failure is returned from the match to be handled as configured by the caller.
+        var subscribed = SubscribedManager.Match(ExecutionContext.TryGetCurrent(out var ctx, true) ? ctx : null!, args, message.Subject, source);
+        if (subscribed.IsFailure)
+            return subscribed.AsResult().AsTask();
+
+        return Result.SuccessTask;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Orchestrates the execution of the underlying <see cref="SubscribedManager.ReceiveAsync(ExecutionContext, SubscribedBase, EventData, EventSubscriberArgs, CancellationToken)"/>.</remarks>
+    protected override Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
+        => SubscribedManager.ReceiveAsync(ExecutionContext.TryGetCurrent(out var ctx, true) ? ctx : null!, args.Subscriber ?? throw new InvalidOperationException("The Subscriber cannot be null after a successful match; something in wrong internally."), @event, args, cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSubscriberBase.cs b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSubscriberBase.cs
new file mode 100644
index 00000000..07565a03
--- /dev/null
+++ b/src/CoreEx.Azure.Messaging.ServiceBus/ServiceBusSubscriberBase.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Azure.Messaging.ServiceBus;
+
+/// <summary>
+/// Provides the base <see href="https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview">Azure Service Bus</see> subscribing capabilities.
+/// </summary>
+/// <param name="formatter">The <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The <see cref="ILogger{ServiceBusSubscriber}"/>.</param>
+public abstract class ServiceBusSubscriberBase(IEventFormatter formatter, ILogger<ServiceBusSubscriberBase> logger) : EventSubscriberBase(formatter, logger)
+{
+    /// <summary>
+    /// Gets or sets the <see cref="CloudNative.CloudEvents.ContentMode"/> to use when receiving <see cref="CloudEvent"/> messages.
+    /// </summary>
+    /// <remarks>Where <see langword="null"/> (the default), then the <see cref="CloudNative.CloudEvents.ContentMode"/> will be inferred from the <see cref="ServiceBusReceivedMessage.ContentType"/> (see <see cref="EventsExtensions.InferContentMode"/>);
+    /// this offers the greatest flexibility and is the recommended value.</remarks>
+    public ContentMode? ContentMode { get; set; }
+
+    /// <summary>
+    /// Receives a <see cref="ServiceBusReceivedMessage"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
+    /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public Task<Result> ReceiveAsync(ServiceBusReceivedMessage message, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
+    {
+        args ??= new EventSubscriberArgs();
+        args.Owner ??= this;
+        args.Message = message.ThrowIfNull();
+
+        Activity.Current?.AddTag("messaging.subject", message.Subject);
+
+        return EventSubscriberMetrics.ReceiveMessageAsync(args, async () =>
+        {
+            // Pre-process.
+            var br = await OnBeforeReceiveAsync(message, args, cancellationToken).ConfigureAwait(false);
+            if (br.IsFailure)
+                return br;
+
+            // Convert to CloudEvent and process.
+            return await ReceiveAsync(message.ToCloudEvent(ContentMode), args, cancellationToken).ConfigureAwait(false);
+        });
+    }
+
+    /// <summary>
+    /// Receives the <see cref="ServiceBusReceivedMessage"/> providing an opportunity to perform actions before further processing as a converted <see cref="CloudEvent"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    protected virtual Task<Result> OnBeforeReceiveAsync(ServiceBusReceivedMessage message, EventSubscriberArgs args, CancellationToken cancellationToken = default) => Result.SuccessTask;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/AppConfig/Extensions.cs b/src/CoreEx.Azure/AppConfig/Extensions.cs
deleted file mode 100644
index 8a68c154..00000000
--- a/src/CoreEx.Azure/AppConfig/Extensions.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using System;
-using Azure.Identity;
-using Microsoft.Extensions.Configuration;
-
-namespace CoreEx.Azure.AppConfig;
-
-/// <summary>
-/// Extensions for using Azure App Configuration Service
-/// </summary>
-public static class Extensions
-{
-    /// <summary>
-    /// Adds the Azure App Configuration provider for services using configuration builder
-    /// </summary>
-    /// <param name="builder">The <see cref="IConfigurationBuilder"/>.</param>
-    /// <param name="connectionName">Name of the connection to use for Azure App Configuration in local configuration</param>
-    /// <param name="labelFilter">The label filter to use for Azure App Configuration in local configuration</param>
-    /// <param name="keyPrefixes">The application configuration key filters.</param>
-    /// <returns>The <see cref="IConfigurationBuilder"/> instance to support fluent-style method-chaining.</returns>
-    /// <exception cref="InvalidOperationException">Thrown when configuration value for provided key <param ref="AppConfigConnectionString"/> doesn't exist.</exception>
-    /// <remarks>Use "UseLocal=true" value for app configuration connection string to skip connecting to Azure Service and use local values only.</remarks>
-    /// <remarks>To use with Azure functions call it with <code>IFunctionsConfigurationBuilder.ConfigurationBuilder</code></remarks>
-    public static IConfigurationBuilder AddAzureAppConfiguration(this IConfigurationBuilder builder, string connectionName = "AppConfigConnectionString", string? labelFilter = null, params string[] keyPrefixes)
-    {
-        // build configuration and get connection string to Azure App Configuration (this most likely will be environment variable set in app service)
-        var config = builder.ThrowIfNull(nameof(builder)).Build();
-        var accs = config.GetValue<string?>(connectionName);
-
-        if (string.IsNullOrEmpty(accs))
-            throw new InvalidOperationException(@$"{nameof(AddAzureAppConfiguration)}: {connectionName} setting not found. If Azure App Service Configuration is not needed - 
-                    do not call {nameof(AddAzureAppConfiguration)}. For local development or unit testing, use ""UseLocal=true"" in the configuration.
-                    Custom connection string name can be provided by calling {nameof(AddAzureAppConfiguration)}(connectionName: ""AzureAppConfigurationConnection"").");
-
-        if (accs.Equals("UseLocal=true", StringComparison.OrdinalIgnoreCase))
-        {
-            System.Diagnostics.Debug.WriteLine("Using local configuration because UseLocal=true was set in Azure App Configuration connection string.");
-            return builder;
-        }
-
-        builder.AddAzureAppConfiguration(o =>
-        {
-            if (accs.Contains(";Secret=", StringComparison.OrdinalIgnoreCase))
-            {
-                // connect to Azure App Configuration with secret
-                o.Connect(accs);
-            }
-            else
-            {
-                // connect to Azure App Configuration with managed identity
-                o.Connect(new Uri(accs), new DefaultAzureCredential())
-                // since managed identity is used - let it resolve keyvault secrets
-                .ConfigureKeyVault(kv =>
-                {
-                    kv.SetCredential(new DefaultAzureCredential());
-                });
-            }
-
-            foreach (var prefix in keyPrefixes)
-            {
-                // note: azure app config doesn't like null/empty
-                o.Select(prefix + "*");
-
-                // if label filter is provided - use it, after default keys are loaded
-                // the idea is that labeled values override some (or all) values without label
-                if (!string.IsNullOrEmpty(labelFilter))
-                    o.Select(prefix + "*", labelFilter);
-            }
-        });
-
-        return builder;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/CoreEx.Azure.csproj b/src/CoreEx.Azure/CoreEx.Azure.csproj
deleted file mode 100644
index 248ca758..00000000
--- a/src/CoreEx.Azure/CoreEx.Azure.csproj
+++ /dev/null
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>CoreEx.Azure</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Azure Extensions.</Title>
-    <Description>CoreEx .NET Azure Extensions.</Description>
-    <PackageTags>coreex api function aspnet azure servicebus</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Azure.Data.Tables" Version="12.10.0" />
-    <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.3" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.23.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.2.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.0.0" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.3" />
-  </ItemGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-</Project>
diff --git a/src/CoreEx.Azure/README.md b/src/CoreEx.Azure/README.md
deleted file mode 100644
index 411c6d97..00000000
--- a/src/CoreEx.Azure/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# About
-
-tbd
-
-## Health Checks
-
-Popular health check library [AspNetCore.Diagnostics.HealthChecks](https://github.com/Xabaril/AspNetCore.Diagnostics.HealthChecks) provides checks for azure service bus.
-
-CoreEx.Azure has two checks, which use `SettingsBase` class for reading configuration:
-
-* `CoreEx.Azure.Health.AzureServiceBusQueueHealthCheck`
-* `CoreEx.Azure.Health.AzureServiceBusTopicHealthCheck`
-
-which can be registered using following code:
-
-```csharp
-builder.Services
-    .AddScoped<HealthService>()
-    .AddHealthChecks()
-    .AddServiceBusQueueHealthCheck("Health check for Service Bus trigger (inbound) connection", nameof(SampleSettings.ServiceBusConnection__fullyQualifiedNamespace), nameof(SampleSettings.QueueName))
-    .AddServiceBusQueueHealthCheck("Health check for Service Bus publisher (outbound) connection", nameof(SampleSettings.PublisherServiceBusConnection), nameof(SampleSettings.QueueName))
-```
diff --git a/src/CoreEx.Azure/ServiceBus/Abstractions/ServiceBusMessageActions.cs b/src/CoreEx.Azure/ServiceBus/Abstractions/ServiceBusMessageActions.cs
deleted file mode 100644
index 9326ddf4..00000000
--- a/src/CoreEx.Azure/ServiceBus/Abstractions/ServiceBusMessageActions.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using WebJobs = Microsoft.Azure.WebJobs.ServiceBus;
-using Worker = Microsoft.Azure.Functions.Worker;
-
-namespace CoreEx.Azure.ServiceBus.Abstractions
-{
-    /// <summary>
-    /// Provides the <see cref="ServiceBusReceivedMessage"/> message actions that can be performed in an implementation agnostic manner.
-    /// </summary>
-    /// <remarks>This is intended to encapsulate either a <see cref="WebJobs.ServiceBusMessageActions"/> or <see cref="Worker.ServiceBusMessageActions"/> providing a single means to manage.</remarks>
-    public class ServiceBusMessageActions
-    {
-        private readonly WebJobs.ServiceBusMessageActions? _webJobMessageActions;
-        private readonly Worker.ServiceBusMessageActions? _workerMessageActions;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBusMessageActions"/> class.
-        /// </summary>
-        /// <param name="webJobMessageActions">The <see cref="WebJobs.ServiceBusMessageActions"/>.</param>
-        public ServiceBusMessageActions(WebJobs.ServiceBusMessageActions webJobMessageActions) => _webJobMessageActions = webJobMessageActions.ThrowIfNull();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBusMessageActions"/> class.
-        /// </summary>
-        /// <param name="workerMessageActions">The <see cref="Worker.ServiceBusMessageActions"/>.</param>
-        public ServiceBusMessageActions(Worker.ServiceBusMessageActions workerMessageActions) => _workerMessageActions = workerMessageActions.ThrowIfNull();
-
-        /// <inheritdoc cref="ServiceBusReceiver.CompleteMessageAsync(ServiceBusReceivedMessage, CancellationToken)"/>
-        public virtual async Task CompleteMessageAsync(ServiceBusReceivedMessage message, CancellationToken cancellationToken = default)
-            => await (_webJobMessageActions?.CompleteMessageAsync(message, cancellationToken)
-                ?? _workerMessageActions?.CompleteMessageAsync(message, cancellationToken)
-                ?? Task.CompletedTask);
-
-        /// <inheritdoc cref="ServiceBusReceiver.AbandonMessageAsync(ServiceBusReceivedMessage, IDictionary{string, object}, CancellationToken)"/>
-        public virtual async Task AbandonMessageAsync(ServiceBusReceivedMessage message, IDictionary<string, object>? propertiesToModify = default, CancellationToken cancellationToken = default)
-            => await (_webJobMessageActions?.AbandonMessageAsync(message, propertiesToModify, cancellationToken)
-                ?? _workerMessageActions?.AbandonMessageAsync(message, propertiesToModify, cancellationToken) 
-                ?? Task.CompletedTask);
-
-        /// <inheritdoc cref="ServiceBusReceiver.DeadLetterMessageAsync(ServiceBusReceivedMessage, IDictionary{string, object}, string, string, CancellationToken)"/>
-        public virtual async Task DeadLetterMessageAsync(ServiceBusReceivedMessage message, Dictionary<string, object>? propertiesToModify = default, string? deadLetterReason = default, string? deadLetterErrorDescription = default, CancellationToken cancellationToken = default)
-            => await (_webJobMessageActions?.DeadLetterMessageAsync(message, propertiesToModify, deadLetterReason, deadLetterErrorDescription, cancellationToken) 
-                ?? _workerMessageActions?.DeadLetterMessageAsync(message, propertiesToModify, deadLetterReason, deadLetterErrorDescription, cancellationToken) 
-                ?? Task.CompletedTask);
-
-        /// <inheritdoc cref="ServiceBusReceiver.DeferMessageAsync(ServiceBusReceivedMessage, IDictionary{string, object}, CancellationToken)"/>.
-        public virtual async Task DeferMessageAsync(ServiceBusReceivedMessage message, IDictionary<string, object>? propertiesToModify = default, CancellationToken cancellationToken = default)
-            => await (_webJobMessageActions?.DeferMessageAsync(message, propertiesToModify, cancellationToken) 
-                ?? _workerMessageActions?.DeferMessageAsync(message, propertiesToModify, cancellationToken) 
-                ?? Task.CompletedTask);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="WebJobs.ServiceBusMessageActions"/> to a <see cref="ServiceBusMessageActions"/>.
-        /// </summary>
-        /// <param name="actions">The <see cref="WebJobs.ServiceBusMessageActions"/>.</param>
-        public static implicit operator ServiceBusMessageActions(WebJobs.ServiceBusMessageActions actions) => new(actions);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Worker.ServiceBusMessageActions"/> to a <see cref="ServiceBusMessageActions"/>.
-        /// </summary>
-        /// <param name="actions">The <see cref="Worker.ServiceBusMessageActions"/>.</param>
-        public static implicit operator ServiceBusMessageActions(Worker.ServiceBusMessageActions actions) => new(actions);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/EventDataToServiceBusConverter.cs b/src/CoreEx.Azure/ServiceBus/EventDataToServiceBusConverter.cs
deleted file mode 100644
index a76f13d3..00000000
--- a/src/CoreEx.Azure/ServiceBus/EventDataToServiceBusConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Invokers;
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using CoreEx.Text.Json;
-using System;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Converts an <see cref="EventData"/> to a <see cref="ServiceBusMessage"/>.
-    /// </summary>
-    /// <remarks>Internally converts an <see cref="EventData"/> to a corresponding <see cref="EventSendData"/> using the <see cref="EventSerializer"/>, then converts to the <see cref="ServiceBusMessage"/> using the <see cref="EventSendDataConverter"/>.</remarks>
-    /// <param name="eventSerializer">The <see cref="IEventSerializer"/> to serialize the <see cref="EventData"/> into a corresponding <see cref="EventSendData.Data"/>.</param>
-    /// <param name="valueConverter">The <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="ServiceBusMessage"/>.</param>
-    public class EventDataToServiceBusConverter(IEventSerializer? eventSerializer = null, IValueConverter<EventSendData, ServiceBusMessage>? valueConverter = null) : IValueConverter<EventData, ServiceBusMessage>
-    {
-        /// <summary>
-        /// Gets the <see cref="IEventSerializer"/> to serialize the <see cref="EventData"/> into <see cref="BinaryData"/> for the <see cref="EventSendData.Data"/>.
-        /// </summary>
-        protected IEventSerializer EventSerializer { get; } = eventSerializer ?? ExecutionContext.GetService<IEventSerializer>() ?? new EventDataSerializer();
-
-        /// <summary>
-        /// Gets the <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="ServiceBusMessage"/>.
-        /// </summary>
-        protected IValueConverter<EventSendData, ServiceBusMessage> EventSendDataConverter { get; } = valueConverter ?? ExecutionContext.GetService<IValueConverter<EventSendData, ServiceBusMessage>>() ?? new EventSendDataToServiceBusConverter();
-
-        /// <inheritdoc/>
-        public ServiceBusMessage Convert(EventData @event)
-        {
-            EventSerializer.EventDataFormatter.Format(@event);
-            var esd = new EventSendData(@event) { Data = Invoker.RunSync(() => EventSerializer.SerializeAsync(@event)) };
-            return EventSendDataConverter.Convert(esd);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/EventSendDataToServiceBusConverter.cs b/src/CoreEx.Azure/ServiceBus/EventSendDataToServiceBusConverter.cs
deleted file mode 100644
index 87c7ecfa..00000000
--- a/src/CoreEx.Azure/ServiceBus/EventSendDataToServiceBusConverter.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Linq;
-using System.Net.Mime;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Converts an <see cref="EventSendData"/> to a <see cref="ServiceBusMessage"/>.
-    /// </summary>
-    public class EventSendDataToServiceBusConverter : IValueConverter<EventSendData, ServiceBusMessage>
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="EventSendData"/> property selection; where a property is selected it will be set as one of the <see cref="ServiceBusMessage"/> properties.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="EventDataProperty.All"/>.</remarks>
-        public EventDataProperty PropertySelection { get; set; } = EventDataProperty.All;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Attributes"/> name for the <see cref="ServiceBusMessage.SessionId"/>.
-        /// </summary>
-        /// <remarks>Defaults to '<c>_SessionId</c>'.</remarks>
-        public string SessionIdAttributeName { get; set; } = $"_{nameof(ServiceBusMessage.SessionId)}";
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Attributes"/> name for the <see cref="ServiceBusMessage.TimeToLive"/>.
-        /// </summary>
-        /// <remarks>Defaults to '<c>_TimeToLive</c>'.</remarks>
-        public string TimeToLiveAttributeName { get; set; } = $"_{nameof(ServiceBusMessage.TimeToLive)}";
-
-        /// <summary>
-        /// Indicates whether to use the <see cref="EventDataBase.PartitionKey"/> as the <see cref="ServiceBusMessage.SessionId"/>.
-        /// </summary>
-        public bool UsePartitionKeyAsSessionId { get; set; } = true;
-
-        /// <inheritdoc/>
-        /// <remarks>By default the <see cref="SessionIdAttributeName"/> will be used to update the <see cref="ServiceBusMessage.SessionId"/> from the <see cref="EventDataBase.Attributes"/>, followed by the
-        /// <see cref="UsePartitionKeyAsSessionId"/> option, until not <c>null</c>; otherwise, will be left as <c>null</c>.
-        /// <para>Similarily, the <see cref="TimeToLiveAttributeName"/> will be used to update the <see cref="ServiceBusMessage.TimeToLive"/> from the <see cref="EventDataBase.Attributes"/>.</para></remarks>
-        public ServiceBusMessage Convert(EventSendData @event)
-        {
-            var message = new ServiceBusMessage(@event.Data)
-            {
-                MessageId = @event.Id,
-                ContentType = MediaTypeNames.Application.Json,
-                CorrelationId = @event.CorrelationId ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current.CorrelationId : null),
-                Subject = @event.Subject
-            };
-
-            if (@event.Action != null && PropertySelection.HasFlag(EventDataProperty.Action))
-                message.ApplicationProperties.Add(nameof(EventData.Action), @event.Action);
-
-            if (@event.Source != null && PropertySelection.HasFlag(EventDataProperty.Source))
-                message.ApplicationProperties.Add(nameof(EventData.Source), @event.Source.ToString());
-
-            if (@event.Type != null && PropertySelection.HasFlag(EventDataProperty.Type))
-                message.ApplicationProperties.Add(nameof(EventData.Type), @event.Type);
-
-            if (@event.TenantId != null && PropertySelection.HasFlag(EventDataProperty.TenantId))
-                message.ApplicationProperties.Add(nameof(EventData.TenantId), @event.TenantId);
-
-            if (@event.PartitionKey != null && PropertySelection.HasFlag(EventDataProperty.PartitionKey))
-                message.ApplicationProperties.Add(nameof(EventData.PartitionKey), @event.PartitionKey);
-
-            if (@event.ETag != null && PropertySelection.HasFlag(EventDataProperty.ETag))
-                message.ApplicationProperties.Add(nameof(EventData.ETag), @event.ETag);
-
-            if (@event.Key != null && PropertySelection.HasFlag(EventDataProperty.Key))
-                message.ApplicationProperties.Add(nameof(EventData.Key), @event.Key);
-
-            if (@event.Attributes != null && @event.Attributes.Count > 0 && PropertySelection.HasFlag(EventDataProperty.Attributes))
-            {
-                // Attrtibutes that start with an underscore are considered internal and will not be sent automatically; i.e. _SessionId and _TimeToLive.
-                foreach (var attribute in @event.Attributes.Where(x => !string.IsNullOrEmpty(x.Key) && !x.Key.StartsWith('_')))
-                {
-                    message.ApplicationProperties.Add(attribute.Key, attribute.Value);
-                }
-            }
-
-            if (message.SessionId == null)
-            {
-                if (@event.Attributes != null && @event.Attributes.TryGetValue(SessionIdAttributeName, out var sessionId))
-                    message.SessionId = sessionId;
-                else
-                    message.SessionId = UsePartitionKeyAsSessionId ? @event.PartitionKey : null;
-            }
-
-            if (@event.Attributes != null && @event.Attributes.TryGetValue(TimeToLiveAttributeName, out var ttl) && TimeSpan.TryParse(ttl, out var timeToLive))
-                message.TimeToLive = timeToLive;
-
-            return message;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/HealthChecks/ServiceBusReceiverHealthCheck.cs b/src/CoreEx.Azure/ServiceBus/HealthChecks/ServiceBusReceiverHealthCheck.cs
deleted file mode 100644
index 6d682c19..00000000
--- a/src/CoreEx.Azure/ServiceBus/HealthChecks/ServiceBusReceiverHealthCheck.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus.HealthChecks
-{
-    /// <summary>
-    /// Provides a <see cref="ServiceBusReceiver"/> <see cref="IHealthCheck"/> to verify the receiver is accessible by peeking a message.
-    /// </summary>
-    /// <param name="receiverFactory">The <see cref="ServiceBusReceiver"/> create factory.</param>
-    public class ServiceBusReceiverHealthCheck(Func<ServiceBusReceiver> receiverFactory) : IHealthCheck
-    {
-        private readonly Func<ServiceBusReceiver> _receiverFactory = receiverFactory.ThrowIfNull(nameof(receiverFactory));
-
-        /// <inheritdoc/>
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            await using var receiver = _receiverFactory() ?? throw new InvalidOperationException("The ServiceBusReceiver factory returned null.");
-            var msg = await receiver.PeekMessageAsync(null, cancellationToken).ConfigureAwait(false);
-            return HealthCheckResult.Healthy(null, new Dictionary<string, object>{ { "message", msg is null ? "none" : new Message { MessageId = msg.MessageId, CorrelationId = msg.CorrelationId, Subject = msg.Subject, SessionId = msg.SessionId, PartitionKey = msg.PartitionKey } } });
-        }
-
-        private class Message
-        {
-            public string? MessageId { get; set; }
-            public string? CorrelationId { get; set; }
-            public string? Subject { get; set; }
-            public string? SessionId { get; set; }
-            public string? PartitionKey { get; set; }
-        }
-    }
-}
diff --git a/src/CoreEx.Azure/ServiceBus/IEventPurger.cs b/src/CoreEx.Azure/ServiceBus/IEventPurger.cs
deleted file mode 100644
index 0009039e..00000000
--- a/src/CoreEx.Azure/ServiceBus/IEventPurger.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Defines the standardized <b>Event</b> purging via the actual messaging platform/protocol.
-    /// </summary>
-    public interface IEventPurger
-    {
-        /// <summary>
-        /// Purges the dead letter <paramref name="queueName"/> of all the messages.
-        /// </summary>
-        /// <param name="queueName">The queue name.</param>
-        /// <param name="messageAction">The optional action for each purged message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task PurgeDeadLetterAsync(string queueName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Purges the <paramref name="queueName"/>  of all the messages.
-        /// </summary>
-        /// <param name="queueName">The queue name.</param>
-        /// <param name="messageAction">The optional action for each purged message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task PurgeAsync(string queueName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Purges the dead letter <paramref name="topicName"/> and <paramref name="subscriptionName"/> of all the messages.
-        /// </summary>
-        /// <param name="topicName">The topic name.</param>
-        /// <param name="subscriptionName">The subscription name.</param>
-        /// <param name="messageAction">The optional action for each purged message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task PurgeDeadLetterAsync(string topicName, string subscriptionName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Purges the <paramref name="topicName"/> and <paramref name="subscriptionName"/> of all the messages.
-        /// </summary>
-        /// <param name="topicName">The topic name.</param>
-        /// <param name="subscriptionName">The subscription name.</param>
-        /// <param name="messageAction">The optional action for each purged message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task PurgeAsync(string topicName, string subscriptionName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/IServiceBusSender.cs b/src/CoreEx.Azure/ServiceBus/IServiceBusSender.cs
deleted file mode 100644
index bf2f8534..00000000
--- a/src/CoreEx.Azure/ServiceBus/IServiceBusSender.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Defines the standardized <b>Event</b> sending via Azure Service Bus.
-    /// </summary>
-    public interface IServiceBusSender : IEventSender { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/IServiceBusSubscriber.cs b/src/CoreEx.Azure/ServiceBus/IServiceBusSubscriber.cs
deleted file mode 100644
index a98edbb0..00000000
--- a/src/CoreEx.Azure/ServiceBus/IServiceBusSubscriber.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Abstractions;
-using System;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Defines the standardized Azure Service Bus subscriber properties.
-    /// </summary>
-    public interface IServiceBusSubscriber
-    {
-        /// <summary>
-        /// Indicates when <c>true</c> that an <see cref="Abstractions.ServiceBusMessageActions.AbandonMessageAsync"/> should be issued when a <see cref="IExtendedException.IsTransient"/> <see cref="Exception"/> is encounterd; otherwise, when <c>false</c> allow the <see cref="Exception"/> to bubble up the stack.
-        /// </summary>
-        bool AbandonOnTransient { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional maximum delivery count before a corresponding <see cref="Abstractions.ServiceBusMessageActions.DeadLetterMessageAsync"/> will be issued.
-        /// </summary>
-        /// <remarks>Where <c>null</c> this indicates that this checking is solely the responsibility of the Azure Service Bus infrastructure. This value can not exceed the corresponding Azure Service Bus configuration setting as that takes precedence.</remarks>
-        int? MaxDeliveryCount { get; set; }
-
-        /// <summary>
-        /// Get or sets the optional retry <see cref="TimeSpan"/> to define a multiplicative delay where an <see cref="IExtendedException.IsTransient"/> <see cref="Exception"/> is encounterd.
-        /// </summary>
-        /// <remarks>The <see cref="ServiceBusReceivedMessage.DeliveryCount"/> is multiplied by this value to achieve the final multiplicative delay value.
-        /// <para>This is performed after an unsuccessful transient processing attempt effectively continuing to lock the the <see cref="ServiceBusReceivedMessage"/> for the duration of the delay before finally handling as defined by <see cref="AbandonOnTransient"/>.</para></remarks>
-        TimeSpan? RetryDelay { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional maximum retry <see cref="TimeSpan"/> that represents the upper bounds of the multiplicative <see cref="RetryDelay"/>.
-        /// </summary>
-        /// <remarks>Where a value is specified and the corresponding <see cref="RetryDelay"/> is <c>null</c> this value will be used only achieving a fixed delay value.</remarks>
-        TimeSpan? MaxRetryDelay { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/IServiceCollectionExtensions.cs b/src/CoreEx.Azure/ServiceBus/IServiceCollectionExtensions.cs
deleted file mode 100644
index ab4ecafc..00000000
--- a/src/CoreEx.Azure/ServiceBus/IServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Azure.ServiceBus.HealthChecks;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using Asb = Azure.Messaging.ServiceBus;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extensions.
-    /// </summary>
-    public static class ServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds the Azure <see cref="ServiceBusSubscriber"/> as a scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="ServiceBusSubscriber"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddAzureServiceBusSubscriber(this IServiceCollection services, Action<IServiceProvider, ServiceBusSubscriber>? configure = null) => services.AddScoped<ServiceBusSubscriber>(sp =>
-        {
-            var sbs = new ServiceBusSubscriber(sp.GetRequiredService<ExecutionContext>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<ILogger<ServiceBusSubscriber>>(), sp.GetService<EventSubscriberInvoker>(), sp.GetService<ServiceBusSubscriberInvoker>(), sp.GetService<IEventDataConverter<Asb.ServiceBusReceivedMessage>>(), sp.GetService<IEventSerializer>());
-            configure?.Invoke(sp, sbs);
-            return sbs;
-        });
-
-        /// <summary>
-        /// Adds the Azure <see cref="ServiceBusOrchestratedSubscriber"/> as a scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="ServiceBusOrchestratedSubscriber"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddAzureServiceBusOrchestratedSubscriber(this IServiceCollection services, Action<IServiceProvider, ServiceBusOrchestratedSubscriber>? configure = null) => services.AddScoped<ServiceBusOrchestratedSubscriber>(sp =>
-        {
-            var sbos = new ServiceBusOrchestratedSubscriber(sp.GetRequiredService<EventSubscriberOrchestrator>(), sp.GetRequiredService<ExecutionContext>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<ILogger<ServiceBusSubscriber>>(), sp.GetService<EventSubscriberInvoker>(), sp.GetService<ServiceBusSubscriberInvoker>(), sp.GetService<IEventDataConverter<Asb.ServiceBusReceivedMessage>>(), sp.GetService<IEventSerializer>());
-            configure?.Invoke(sp, sbos);
-            return sbos;
-        });
-
-        /// <summary>
-        /// Adds the Azure <see cref="ServiceBusReceivedMessageEventDataConverter"/> as the <see cref="IEventDataConverter"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddAzureServiceBusReceivedMessageConverter(this IServiceCollection services) => services.AddScoped<IEventDataConverter, ServiceBusReceivedMessageEventDataConverter>();
-
-        /// <summary>
-        /// Adds the <see cref="ServiceBusSender"/> as the <see cref="IEventSender"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="ServiceBusSender"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddAzureServiceBusSender(this IServiceCollection services, Action<IServiceProvider, ServiceBusSender>? configure = null) => services.AddScoped<IEventSender>(sp =>
-        {
-            var sbs = new ServiceBusSender(sp.GetRequiredService<Asb.ServiceBusClient>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<ILogger<ServiceBusSender>>());
-            configure?.Invoke(sp, sbs);
-            return sbs;
-        });
-
-        /// <summary>
-        /// Adds the <see cref="ServiceBusPurger"/> as the <see cref="IEventSender"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="ServiceBusPurger"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddAzureServiceBusPurger(this IServiceCollection services, Action<IServiceProvider, ServiceBusPurger>? configure = null) => services.AddScoped<IEventPurger>(sp =>
-        {
-            var sbp = new ServiceBusPurger(sp.GetRequiredService<Asb.ServiceBusClient>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<ILogger<ServiceBusPurger>>());
-            configure?.Invoke(sp, sbp);
-            return sbp;
-        });
-
-        /// <summary>
-        /// Adds a <see cref="ServiceBusReceiverHealthCheck"/> that will peek a message from the Azure Service Bus receiver to confirm health.
-        /// </summary>
-        /// <param name="builder">The <see cref="IHealthChecksBuilder"/>.</param>
-        /// <param name="name">The health check name. Defaults to '<c>azure-service-bus-receiver</c>'.</param>
-        /// <param name="serviceBusReceiverFactory">The <see cref="Asb.ServiceBusReceiver"/> factory.</param>
-        /// <param name="failureStatus">The <see cref="HealthStatus"/> that should be reported when the health check reports a failure. If the provided value is <c>null</c>, then <see cref="HealthStatus.Unhealthy"/> will be reported.</param>
-        /// <param name="tags">A list of tags that can be used for filtering health checks.</param>
-        /// <param name="timeout">An optional <see cref="TimeSpan"/> representing the timeout of the check.</param>
-        public static IHealthChecksBuilder AddServiceBusReceiverHealthCheck(this IHealthChecksBuilder builder, Func<IServiceProvider, Asb.ServiceBusReceiver> serviceBusReceiverFactory, string? name = null, HealthStatus? failureStatus = default, IEnumerable<string>? tags = default, TimeSpan? timeout = default)
-        {
-            serviceBusReceiverFactory.ThrowIfNull(nameof(serviceBusReceiverFactory));
-
-            return builder.Add(new HealthCheckRegistration(name ?? "azure-service-bus-receiver", sp =>
-            {                 
-                return new ServiceBusReceiverHealthCheck(() => serviceBusReceiverFactory(sp));
-            }, failureStatus, tags, timeout));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/README.md b/src/CoreEx.Azure/ServiceBus/README.md
deleted file mode 100644
index f14177dd..00000000
--- a/src/CoreEx.Azure/ServiceBus/README.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# CoreEx.Azure.ServiceBus
-
-Provides the key [Azure Service Bus](https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) capabilities, leveraging and extending the [`Azure.Messaging.ServiceBus`](https://docs.microsoft.com/en-us/dotnet/api/overview/azure/messaging.servicebus-readme) library.
-
-<br/>
-
-## Publishing
-
-A _CoreEx_ [`ServiceBusSender`](./ServiceBusSender.cs) provides the [`IEventSender.SendAsync`](../../CoreEx/Events/IEventSender.cs) capabilities to batch send one or more events/mesages to Azure Service Bus.
-
-<br/>
-
-## Subscribing
-
-A _CoreEx_ [`ServiceBusSubscriber`](../../CoreEx.Azure/ServiceBus/ServiceBusSubscriber.cs) implementation is provided to encapsulate the standard capabilities to ensure consistency with respect to the processing and underlying management of the message.
-
-The `ReceiveAsync` method requires the [`ServiceBusReceivedMessage`](https://docs.microsoft.com/en-us/dotnet/api/azure.messaging.servicebus.servicebusreceivedmessage) and [`ServiceBusMessageActions`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.webjobs.servicebus.servicebusmessageactions) and performs the following steps:
-- Begins a logging scope to include the correlation identifier from the message.
-- Deserializes the `ServiceBusReceivedMessage` into the corresponding [`EventData`](../../CoreEx/Events/EventDataT.cs).
-- Invokes the processing logic for the event and where successful calls `ServiceBusMessageActions.CompleteMessageAsync`.
-- Handle all exceptions:
-  - Where the exception implements [`IExtendedException`](../../CoreEx/Abstractions/IExtendedException.cs) and `IsTransient` then log a warning and bubble the exception for the host process to manage a retry.
-  - Finally, log the error and invoke `ServiceBusMessageActions.DeadLetterMessageAsync`.
-
-<br/>
-
-### Azure ServiceBus-triggered Function example
-
-The following demonstrates usage when using the [`ServiceBusTrigger`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.azure.webjobs.servicebustriggerattribute) within an Azure Function:
-
-``` csharp
-public class ServiceBusExecuteVerificationFunction
-{
-    private readonly ServiceBusSubscriber _subscriber;
-    private readonly VerificationService _service;
-
-    public ServiceBusExecuteVerificationFunction(ServiceBusSubscriber subscriber, VerificationService service)
-    {
-        _subscriber = subscriber;
-        _service = service;
-    }
-
-    [FunctionName(nameof(ServiceBusExecuteVerificationFunction))]
-    public Task RunAsync([ServiceBusTrigger("%" + nameof(HrSettings.VerificationQueueName) + "%", Connection = nameof(HrSettings.ServiceBusConnection))] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions)
-        => _subscriber.ReceiveAsync<EmployeeVerificationRequest>(message, messageActions, ed => _service.VerifyAndPublish(ed.Value), validator: new EmployeeVerificationValidator().Wrap());
-}
-```
-
-<br/>
-
-### Instrumentation
-
-To get further insights into the processing of the messages an [`IEventSubscriberInstrumentation`](../../CoreEx/Events/IEventSubscriberInstrumentation.cs) can be implemented. The corresponding `EventSubscriberBase.Instrumentation` property should be set during construction; typically performed during dependency injection. Determine whether the instrumentation instance should also be registered as a _singleton_.
-
-An example implementation for Azure Application Insights would be similar to as follows:
-
-``` csharp
-public class AppInsightInstrumentation : EventSubscriberInstrumentationBase
-{
-    private readonly TelemetryClient _telemetryClient;
-
-    public AppInsightInstrumentation(TelemetryClient telemetryClient) 
-        => _telemetryClient = telemetryClient.ThrowIfNull(nameof(telemetryClient));
-
-    public override void Instrument(ErrorHandling? errorHandling = null, Exception? exception = null)
-        => _telemetryClient.TrackEvent(GetInstrumentName("Subscriber", errorHandling, exception));
-}
-```
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusOrchestratedSubscriber.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusOrchestratedSubscriber.cs
deleted file mode 100644
index 9a0797c5..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusOrchestratedSubscriber.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Abstractions;
-using CoreEx.Azure.ServiceBus.Abstractions;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Provides the <see cref="EventSubscriberOrchestrator"/>-managed <see cref="ServiceBusReceivedMessage"/> subscribe (receive) execution encapsulation to run the underlying function logic in a consistent manner.
-    /// </summary>
-    /// <remarks>The <c>ReceiveAsync</c> enables the standardized logic. The correlation identifier is set using the <see cref="ServiceBusReceivedMessage.CorrelationId"/>; where <c>null</c> a <see cref="Guid.NewGuid"/> will be used as the 
-    /// default. A <see cref="ILogger.BeginScope{TState}(TState)"/> with the <see cref="ExecutionContext.CorrelationId"/> and <see cref="ServiceBusReceivedMessage.MessageId"/> is performed to wrap the logic logging with the correlation and
-    /// message identifiers. Where the unhandled <see cref="Exception"/> is <see cref="IExtendedException.IsTransient"/> this will bubble out for the Azure Function runtime/fabric to retry and automatically deadletter; otherwise, it will be
-    /// immediately deadletted with a reason of <see cref="IExtendedException.ErrorType"/> or <see cref="ErrorType.UnhandledError"/> depending on the exception <see cref="Type"/>.
-    /// <para>The <see cref="ServiceBusSubscriber.UpdateEventSubscriberArgsWithServiceBusMessage(EventSubscriberArgs, ServiceBusReceivedMessage, ServiceBusMessageActions)"/> is invoked after each <see cref="EventData"/> deserialization.</para></remarks>
-    public class ServiceBusOrchestratedSubscriber : EventSubscriberBase, IServiceBusSubscriber
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBusOrchestratedSubscriber"/> class.
-        /// </summary>
-        /// <param name="orchestrator">The <see cref="EventSubscriberOrchestrator"/>.</param>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="eventSubscriberInvoker">The optional <see cref="EventSubscriberInvoker"/>.</param>
-        /// <param name="serviceBusSubscriberInvoker">The optional <see cref="ServiceBus.ServiceBusSubscriberInvoker"/>.</param>
-        /// <param name="eventDataConverter">The optional <see cref="IEventDataConverter{TMessage}"/>.</param>
-        /// <param name="eventSerializer">The optional <see cref="IEventSerializer"/>.</param>
-        public ServiceBusOrchestratedSubscriber(EventSubscriberOrchestrator orchestrator, ExecutionContext executionContext, SettingsBase settings, ILogger<ServiceBusSubscriber> logger, EventSubscriberInvoker? eventSubscriberInvoker = null, ServiceBusSubscriberInvoker? serviceBusSubscriberInvoker = null, IEventDataConverter<ServiceBusReceivedMessage>? eventDataConverter = null, IEventSerializer? eventSerializer = null)
-            : base(eventDataConverter ?? new ServiceBusReceivedMessageEventDataConverter(eventSerializer ?? new CoreEx.Text.Json.EventDataSerializer()), executionContext, settings, logger, eventSubscriberInvoker)
-        {
-            Orchestrator = orchestrator.ThrowIfNull(nameof(orchestrator));
-            ServiceBusSubscriberInvoker = serviceBusSubscriberInvoker ?? (ServiceBusSubscriber._invoker ??= new ServiceBusSubscriberInvoker());
-            AbandonOnTransient = settings.GetCoreExValue($"{GetType().Name}:{nameof(AbandonOnTransient)}", false);
-            MaxDeliveryCount = settings.GetCoreExValue<int?>($"{GetType().Name}:{nameof(MaxDeliveryCount)}");
-            RetryDelay = settings.GetCoreExValue<TimeSpan?>($"{GetType().Name}:{nameof(RetryDelay)}");
-            MaxRetryDelay = settings.GetCoreExValue<TimeSpan?>($"{GetType().Name}:{nameof(MaxRetryDelay)}");
-        }
-
-        /// <summary>
-        /// Gets the <see cref="EventSubscriberOrchestrator"/>.
-        /// </summary>
-        protected EventSubscriberOrchestrator Orchestrator { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ServiceBus.ServiceBusSubscriberInvoker"/>.
-        /// </summary>
-        protected ServiceBusSubscriberInvoker ServiceBusSubscriberInvoker { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IEventDataConverter{ServiceBusReceivedMessage}"/>.
-        /// </summary>
-        protected new IEventDataConverter<ServiceBusReceivedMessage> EventDataConverter => (IEventDataConverter<ServiceBusReceivedMessage>)base.EventDataConverter;
-
-        /// <inheritdoc/>
-        public bool AbandonOnTransient { get; set; }
-
-        /// <inheritdoc/>
-        public int? MaxDeliveryCount { get; set; }
-
-        /// <inheritdoc/>
-        public TimeSpan? RetryDelay { get; set; }
-
-        /// <inheritdoc/>
-        public TimeSpan? MaxRetryDelay { get; set; }
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> leveraging the underlying <see cref="Orchestrator"/> to receive and process the message.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-        {
-            message.ThrowIfNull(nameof(message));
-            messageActions.ThrowIfNull(nameof(messageActions));
-
-            return ServiceBusSubscriberInvoker.InvokeAsync(this, async (_, ct) =>
-            {
-                // Perform any pre-processing.
-                args ??= [];
-                var canProceed = await OnBeforeProcessingAsync(message.MessageId, message, args, cancellationToken).ConfigureAwait(false);
-                if (!canProceed)
-                    return;
-
-                // Get the event (without value as type unknown).
-                var @event = await DeserializeEventAsync(message.MessageId, message, cancellationToken);
-                if (@event is null)
-                    return;
-
-                ServiceBusSubscriber.UpdateEventSubscriberArgsWithServiceBusMessage(args, message, messageActions);
-
-                // Match subscriber to metadata.
-                var match = Orchestrator.TryMatchSubscriber(this, @event, args);
-                if (!match.Matched)
-                {
-                    var txt = $"Subject: {(string.IsNullOrEmpty(@event.Subject) ? "<none>" : @event.Subject)}, Action: {(string.IsNullOrEmpty(@event.Action) ? "<none>" : @event.Action)}, Type: {(string.IsNullOrEmpty(@event.Type) ? "<none>" : @event.Type)}";
-                    var esex = new EventSubscriberException(match.Subscriber == null ? $"No corresponding Subscriber could be matched; {txt}" : $"More than one Subscriber was matched (ambiguous); {txt}")
-                        { ExceptionSource = match.Subscriber == null ? EventSubscriberExceptionSource.OrchestratorNotSubscribed : EventSubscriberExceptionSource.OrchestratorAmbiquousSubscriber };
-
-                    await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(@event.Id, esex, match.Subscriber == null ? Orchestrator.NotSubscribedHandling : Orchestrator.AmbiquousSubscriberHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken);
-                    return;
-                }
-
-                // Deserialize the event (again) where there is a value as value not deserialized previously.
-                if (match.ValueType is not null)
-                {
-                    @event = await DeserializeEventAsync(message.MessageId, message, match.ValueType, cancellationToken).ConfigureAwait(false);
-                    if (@event is null)
-                        return;
-                }
-
-                // Execute subscriber receive with the event.
-                await Orchestrator.ReceiveAsync(this, match.Subscriber!, @event, args, cancellationToken).ConfigureAwait(false);
-            }, (message, messageActions), cancellationToken);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusPurger.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusPurger.cs
deleted file mode 100644
index d4713b05..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusPurger.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Messaging.ServiceBus;
-using CoreEx.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Provides the Azure ServiceBus purging capability.
-    /// </summary>
-    /// <param name="client">The underlying <see cref="ServiceBusClient"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public class ServiceBusPurger(ServiceBusClient client, SettingsBase settings, ILogger<ServiceBusPurger> logger) : IEventPurger
-    {
-        private readonly ServiceBusClient _client = client.ThrowIfNull(nameof(client));
-        private readonly SettingsBase Settings = settings.ThrowIfNull(nameof(settings));
-        private readonly ILogger Logger = logger.ThrowIfNull(nameof(logger));
-
-        /// <inheritdoc/>
-        public Task PurgeDeadLetterAsync(string queueName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default) 
-            => PurgeAsync(queueName, null, SubQueue.DeadLetter, messageAction, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task PurgeAsync(string queueName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default)
-            => PurgeAsync(queueName, null, SubQueue.None, messageAction, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task PurgeDeadLetterAsync(string topicName, string subscriptionName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default)
-            => PurgeAsync(topicName, subscriptionName, SubQueue.DeadLetter, messageAction, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task PurgeAsync(string topicName, string subscriptionName, Action<ServiceBusReceivedMessage>? messageAction = null, CancellationToken cancellationToken = default)
-            => PurgeAsync(topicName, subscriptionName, SubQueue.None, messageAction, cancellationToken);
-
-        /// <summary>
-        /// Purges the queue or topic subscription.
-        /// </summary>
-        private async Task PurgeAsync(string queueOrTopicName, string? subscriptionName, SubQueue subQueue, Action<ServiceBusReceivedMessage>? messageAction, CancellationToken cancellationToken)
-        {
-            queueOrTopicName.ThrowIfNullOrEmpty(nameof(queueOrTopicName));
-
-            // Get queue name and subscription name by checking settings override.
-            var qn = Settings.GetCoreExValue($"Publisher_ServiceBusQueueName_{queueOrTopicName}", defaultValue: queueOrTopicName);
-            var sn = string.IsNullOrEmpty(subscriptionName) ? null : Settings.GetCoreExValue($"Publisher_ServiceBusSubscriptionName_{subscriptionName}", defaultValue: subscriptionName);
-
-            // Receive from Dead letter
-            var o = new ServiceBusReceiverOptions { SubQueue = subQueue, PrefetchCount = 500, ReceiveMode = ServiceBusReceiveMode.ReceiveAndDelete };
-            await using var receiver = sn == null ? _client.CreateReceiver(qn, o) : _client.CreateReceiver(qn, sn, o);
-
-            // Purge messages.
-            try
-            {
-                var messages = await receiver.ReceiveMessagesAsync(500, maxWaitTime: TimeSpan.FromSeconds(3), cancellationToken).ConfigureAwait(false);
-
-                while (messages != null && messages.Count > 0)
-                {
-                    if (messageAction != null)
-                    {
-                        foreach (var message in messages)
-                        {
-                            messageAction(message);
-                        }
-                    }
-
-                    messages = await receiver.ReceiveMessagesAsync(500, maxWaitTime: TimeSpan.FromSeconds(3), cancellationToken).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogWarning(ex, $"Service Bus message(s) couldn't be purged from {qn} {(subscriptionName == null ? "" : $"{subscriptionName} ")}sub-queue: {subQueue}.");
-                throw;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusReceivedMessageEventDataConverter.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusReceivedMessageEventDataConverter.cs
deleted file mode 100644
index bab48686..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusReceivedMessageEventDataConverter.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Events;
-using CoreEx.Text.Json;
-using System;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Converts a <see cref="ServiceBusReceivedMessage"/> to an <see cref="EventData"/> or <see cref="EventData{T}"/>.
-    /// </summary>
-    /// <param name="eventSerializer">The  <see cref="IEventSerializer"/> to deserialize the <see cref="BinaryData"/> into the corresponding <see cref="EventData"/> or <see cref="EventData{T}"/>.</param>
-    public class ServiceBusReceivedMessageEventDataConverter(IEventSerializer? eventSerializer = null) : IEventDataConverter<ServiceBusReceivedMessage>
-    {
-        /// <summary>
-        /// Gets the <see cref="IEventSerializer"/> to deserialize the <see cref="BinaryData"/> into the corresponding <see cref="EventData"/> or <see cref="EventData{T}"/>.
-        /// </summary>
-        protected IEventSerializer EventSerializer { get; } = eventSerializer ?? ExecutionContext.GetService<IEventSerializer>() ?? new EventDataSerializer();
-
-        /// <inheritdoc/>
-        /// <exception cref="NotSupportedException">This method is not supported.</exception>
-        /// <remarks>This method is not supported; throws a <see cref="NotSupportedException"/>.</remarks>
-        public Task<ServiceBusReceivedMessage> ConvertToAsync(EventData @event, CancellationToken cancellationToken) => throw new NotSupportedException($"The {nameof(ServiceBusReceivedMessage)} constructor is internal; therefore, can not be instantiated.");
-
-        /// <inheritdoc/>
-        public Task<EventData> ConvertFromMetadataOnlyAsync(ServiceBusReceivedMessage message, CancellationToken cancellationToken)
-        {
-            var @event = new EventData();
-            UpdateMetaDataWhereApplicable(message, @event);
-            return Task.FromResult(@event);
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventData> ConvertFromAsync(ServiceBusReceivedMessage message, Type? valueType, CancellationToken cancellationToken)
-        {
-            EventData @event;
-            if (valueType is null)
-            {
-                if (message.ContentType == MediaTypeNames.Application.Json)
-                    @event = await EventSerializer.DeserializeAsync(message.Body, cancellationToken).ConfigureAwait(false);
-                else if (message.ContentType == MediaTypeNames.Text.Plain)
-                    @event = new EventData { Value = message.Body.ToString() };
-                else
-                    @event = new EventData();
-            }
-            else
-            {
-                if (message.ContentType == MediaTypeNames.Text.Plain && valueType == typeof(string))
-                    @event = new EventData<string> { Value = message.Body.ToString() };
-                else
-                    @event = await EventSerializer.DeserializeAsync(message.Body, valueType, cancellationToken).ConfigureAwait(false)!;
-            }
-
-            UpdateMetaDataWhereApplicable(message, @event);
-            return @event;
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventData<T>> ConvertFromAsync<T>(ServiceBusReceivedMessage message, CancellationToken cancellationToken)
-        {
-            EventData<T> @event = await EventSerializer.DeserializeAsync<T>(message.Body, cancellationToken).ConfigureAwait(false);
-            UpdateMetaDataWhereApplicable(message, @event);
-            return @event;
-        }
-
-        /// <summary>
-        /// Updates the metadata from the <paramref name="message"/> where the <paramref name="event"/> <see cref="EventDataBase.Id"/> is not <c>null</c>; otherwise, assume already updated.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/></param>
-        /// <param name="event">The <see cref="EventData"/>.</param>
-        private static void UpdateMetaDataWhereApplicable(ServiceBusReceivedMessage message, EventData @event)
-        {
-            if (@event.Id is not null)
-                return;
-
-            @event.Id = message.MessageId;
-            @event.CorrelationId = message.CorrelationId;
-            @event.Subject = message.Subject;
-            @event.PartitionKey = message.SessionId;
-
-            foreach (var p in message.ApplicationProperties)
-            {
-                switch (p.Key)
-                {
-                    case nameof(EventData.Action): @event.Action = p.Value?.ToString(); break;
-                    case nameof(EventData.Source): @event.Source = p.Value == null ? null : new Uri(p.Value.ToString()!, UriKind.RelativeOrAbsolute); break;
-                    case nameof(EventData.Type): @event.Type = p.Value?.ToString(); break;
-                    case nameof(EventData.TenantId): @event.Type = p.Value?.ToString(); break;
-                    case nameof(EventData.PartitionKey): @event.PartitionKey = p.Value?.ToString(); break;
-                    case nameof(EventData.ETag): @event.ETag = p.Value?.ToString(); break;
-                    case nameof(EventData.Key): @event.Key = p.Value?.ToString(); break;
-                    default: @event.AddAttribute(p.Key, p.Value?.ToString() ?? string.Empty); break;
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusReceiverActions.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusReceiverActions.cs
deleted file mode 100644
index e2940d04..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusReceiverActions.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Represents the set of message actions that can be performed on a <see cref="ServiceBusReceivedMessage"/> and related <see cref="ServiceBusReceiver"/>.
-    /// </summary>
-    /// <remarks>This is required as the base <see cref="ServiceBusMessageActions"/> contains internal constructor for <see cref="ServiceBusReceiver"/> therefore this is needed to override methods and implement same.</remarks>
-    /// <param name="serviceBusReceiver">The <see cref="ServiceBusReceiver"/>.</param>
-    /// <exception cref="ArgumentNullException"></exception>
-    public class ServiceBusReceiverActions(ServiceBusReceiver serviceBusReceiver) : ServiceBusMessageActions
-    {
-        private readonly ServiceBusReceiver _serviceBusReceiver = serviceBusReceiver.ThrowIfNull(nameof(serviceBusReceiver));
-
-        /// <inheritdoc/>
-        public override Task AbandonMessageAsync(ServiceBusReceivedMessage message, IDictionary<string, object> propertiesToModify = default!, CancellationToken cancellationToken = default)
-            => _serviceBusReceiver.AbandonMessageAsync(message, propertiesToModify, cancellationToken);
-
-        /// <inheritdoc/>
-        public override Task CompleteMessageAsync(ServiceBusReceivedMessage message, CancellationToken cancellationToken = default)
-            => _serviceBusReceiver.CompleteMessageAsync(message, cancellationToken);
-
-        /// <inheritdoc/>
-        public override Task DeadLetterMessageAsync(ServiceBusReceivedMessage message, Dictionary<string, object> propertiesToModify, string deadLetterReason, string deadLetterErrorDescription = default!, CancellationToken cancellationToken = default)
-            => _serviceBusReceiver.DeadLetterMessageAsync(message, propertiesToModify, deadLetterReason, deadLetterErrorDescription, cancellationToken);
-
-        /// <inheritdoc/>
-        public override Task DeadLetterMessageAsync(ServiceBusReceivedMessage message, IDictionary<string, object> propertiesToModify = default!, CancellationToken cancellationToken = default)
-            => _serviceBusReceiver.DeadLetterMessageAsync(message, propertiesToModify, cancellationToken);
-
-        /// <inheritdoc/>
-        public override Task DeadLetterMessageAsync(ServiceBusReceivedMessage message, string deadLetterReason, string deadLetterErrorDescription = default!, CancellationToken cancellationToken = default)
-            => _serviceBusReceiver.DeadLetterMessageAsync(message, deadLetterReason, deadLetterErrorDescription, cancellationToken);
-
-        /// <inheritdoc/>
-        public override Task DeferMessageAsync(ServiceBusReceivedMessage message, IDictionary<string, object> propertiesToModify = default!, CancellationToken cancellationToken = default)
-            => _serviceBusReceiver.DeferMessageAsync(message, propertiesToModify, cancellationToken);
-
-        /// <inheritdoc/>
-        public override Task RenewMessageLockAsync(ServiceBusReceivedMessage message, CancellationToken cancellationToken = default)
-            => base.RenewMessageLockAsync(message, cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusSender.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusSender.cs
deleted file mode 100644
index db9e3ead..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusSender.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Messaging.ServiceBus;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using Microsoft.Extensions.Logging;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Represents an Azure <see cref="ServiceBusClient"/> <see cref="IServiceBusSender"/> (see also <seealso cref="IEventSender"/>).
-    /// </summary>
-    /// <remarks>See <see cref="EventSendDataToServiceBusConverter"/> for details of automatic <see cref="ServiceBusMessage.SessionId"/> and <see cref="ServiceBusMessage.TimeToLive"/> allocation.
-    /// <para>Note, that any <see cref="EventDataBase.Attributes"/> where the <see cref="KeyValuePair{TKey, TValue}.Key"/> starts with an underscore character ('<c>_</c>') will <i>not</i> be included in the <see cref="ServiceBusMessage.ApplicationProperties"/>.</para></remarks>
-    /// <param name="client">The underlying <see cref="ServiceBusClient"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The optional <see cref="ServiceBusSenderInvoker"/>.</param>
-    /// <param name="converter">The optional <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="ServiceBusMessage"/>.</param>
-    public class ServiceBusSender(ServiceBusClient client, SettingsBase settings, ILogger<ServiceBusSender> logger, ServiceBusSenderInvoker? invoker = null, IValueConverter<EventSendData, ServiceBusMessage>? converter = null) : IServiceBusSender
-    {
-        private const string _unspecifiedQueueOrTopicName = "$default";
-        private static ServiceBusSenderInvoker? _invoker;
-        private readonly ServiceBusClient _client = client.ThrowIfNull(nameof(client));
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        protected SettingsBase Settings { get; } = settings.ThrowIfNull(nameof(settings));
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        protected ILogger Logger { get; } = logger.ThrowIfNull(nameof(logger));
-
-        /// <summary>
-        /// Gets the <see cref="ServiceBusSenderInvoker"/>.
-        /// </summary>
-        protected ServiceBusSenderInvoker Invoker { get; } = invoker ?? (_invoker ??= new ServiceBusSenderInvoker());
-
-        /// <summary>
-        /// Gets the <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="ServiceBusMessage"/>.
-        /// </summary>
-        protected IValueConverter<EventSendData, ServiceBusMessage> Converter { get; } = converter ?? new EventSendDataToServiceBusConverter();
-
-        /// <summary>
-        /// Gets or sets the default queue or topic name used by <see cref="SendAsync(IEnumerable{EventSendData}, CancellationToken)"/> where <see cref="EventSendData.Destination"/> is <c>null</c>.
-        /// </summary>
-        public string? DefaultQueueOrTopicName { get; set; }
-
-        /// <inheritdoc/>
-        public Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellationToken = default)
-        {
-            if (events == null || !events.Any())
-                return Task.CompletedTask;
-
-            return Invoker.InvokeAsync(this, events, async (_, events, cancellationToken) =>
-            {
-                var totalCount = events.Count();
-                Logger.LogDebug("{TotalCount} events in total are to be sent.", totalCount);
-
-                if (events.Count() != events.Select(x => x.Id).Distinct().Count())
-                    throw new EventSendException(PrependStats($"All events must have a unique identifier ({nameof(EventSendData)}.{nameof(EventSendData.Id)}).", totalCount, totalCount), events);
-
-                // Sets up the list of unsent events.
-                var unsentEvents = new List<EventSendData>(events);
-
-                // Why this logic: https://github.com/Azure/azure-sdk-for-net/tree/Azure.Messaging.ServiceBus_7.1.0/sdk/servicebus/Azure.Messaging.ServiceBus/#send-and-receive-a-batch-of-messages
-                var queueDict = new Dictionary<string, Queue<(ServiceBusMessage Message, int Index)>>();
-                var index = 0;
-                foreach (var @event in events)
-                {
-                    var message = Converter.Convert(@event) ?? throw new EventSendException($"The {nameof(Converter)} must return a {nameof(ServiceBusMessage)} instance.");
-                    var name = @event.Destination ?? DefaultQueueOrTopicName ?? _unspecifiedQueueOrTopicName;
-
-                    if (queueDict.TryGetValue(name, out var queue))
-                        queue.Enqueue((message, index++));
-                    else
-                    {
-                        queue = new Queue<(ServiceBusMessage, int)>();
-                        queue.Enqueue((message, index++));
-                        queueDict.Add(name, queue);
-                    }
-                }
-
-                Logger.LogDebug("There are {QueueTopicCount} queues/topics specified; as such there will be that many batches sent as a minimum.", queueDict.Keys.Count);
-
-                // Get queue name by checking configuration override.
-                foreach (var qitem in queueDict)
-                {
-                    var n = qitem.Key == _unspecifiedQueueOrTopicName ? null : qitem.Key;
-                    var key = $"{GetType().Name}_QueueOrTopicName{(n is null ? "" : $"_{n}")}";
-                    var qn = Settings.GetCoreExValue($"{GetType().Name}:QueueOrTopicName{(n is null ? "" : $"_{n}")}", defaultValue: n) ?? throw new EventSendException(PrependStats($"'{key}' configuration setting must have a non-null value.", totalCount, unsentEvents.Count), unsentEvents);
-                    var queue = qitem.Value;
-                    var sentIds = new List<string>();
-
-                    // Send in batches.
-                    await using var sender = _client.CreateSender(qn);
-                    while (queue.Count > 0)
-                    {
-                        sentIds.Clear();
-                        using var batch = await sender.CreateMessageBatchAsync(cancellationToken).ConfigureAwait(false);
-
-                        // Add the first message to the batch.
-                        var firstMsg = queue.Peek();
-                        if (batch.TryAddMessage(firstMsg.Message))
-                        {
-                            sentIds.Add(firstMsg.Message.MessageId);
-                            queue.Dequeue();
-                        }
-                        else
-                            throw new EventSendException(PrependStats("ServiceBusMessage is too large and cannot be sent.", totalCount, unsentEvents.Count), unsentEvents);
-
-                        // Keep adding until done or max size reached for batch.
-                        while (queue.Count > 0 && batch.TryAddMessage(queue.Peek().Message))
-                        {
-                            sentIds.Add(queue.Peek().Message.MessageId);
-                            queue.Dequeue();
-                        }
-
-                        try
-                        {
-                            Logger.LogDebug("Sending {Count} message(s) to {Name}.", batch.Count, qn);
-                            await sender.SendMessagesAsync(batch, cancellationToken).ConfigureAwait(false);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogDebug("{UnsentCount} of the total {TotalCount} events were not successfully sent.", unsentEvents.Count, totalCount);
-                            throw new EventSendException(PrependStats($"ServiceBusMessage cannot be sent: {ex.Message}", totalCount, unsentEvents.Count), ex, unsentEvents);
-                        }
-
-                        // Begin next batch after confirming sent events; continue ^ where any left.
-                        unsentEvents.RemoveAll(esd => sentIds.Contains(esd.Id ?? string.Empty));
-                    }
-                }
-
-                // Raise the event.
-                AfterSend?.Invoke(this, EventArgs.Empty);
-            }, cancellationToken, nameof(SendAsync));
-        }
-
-        /// <summary>
-        /// Prepend the sent stats to the message.
-        /// </summary>
-        private static string PrependStats(string message, int totalCount, int unsentCount) => $"{unsentCount} of the total {totalCount} events were not successfully sent. {message}";
-
-        /// <inheritdoc/>
-        public event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusSenderInvoker.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusSenderInvoker.cs
deleted file mode 100644
index ab17c2e0..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusSenderInvoker.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Transactions;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Provides the standard <see cref="ServiceBusSender"/> invoker functionality.
-    /// </summary>
-    /// <remarks>Suppresses the <see cref="TransactionScope"/> as Azure Service Bus does not support distributed transactions and this may be invoked in the context of an already enlisted transaction.</remarks>
-    public class ServiceBusSenderInvoker : InvokerBase<ServiceBusSender>
-    {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, ServiceBusSender invoker, Func<InvokeArgs, TResult> func) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        protected async override System.Threading.Tasks.Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, ServiceBusSender invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
-        {
-            TransactionScope? txn = null;
-            try
-            {
-                txn = new TransactionScope(TransactionScopeOption.Suppress, TransactionScopeAsyncFlowOption.Enabled);
-                return await base.OnInvokeAsync(invokeArgs, invoker, func, cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                txn?.Dispose();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusSubscriber.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusSubscriber.cs
deleted file mode 100644
index f85c26e7..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusSubscriber.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Abstractions;
-using CoreEx.Azure.ServiceBus.Abstractions;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.Results;
-using CoreEx.Validation;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Provides the standard <see cref="ServiceBusReceivedMessage"/> subscribe (receive) execution encapsulation to run the underlying function logic in a consistent manner.
-    /// </summary>
-    /// <remarks>The <c>ReceiveAsync</c> enables the standardized logic. The correlation identifier is set using the <see cref="ServiceBusReceivedMessage.CorrelationId"/>; where <c>null</c> a <see cref="Guid.NewGuid"/> will be used as the 
-    /// default. A <see cref="ILogger.BeginScope{TState}(TState)"/> with the <see cref="ExecutionContext.CorrelationId"/> and <see cref="ServiceBusReceivedMessage.MessageId"/> is performed to wrap the logic logging with the correlation and
-    /// message identifiers. Where the unhandled <see cref="Exception"/> is <see cref="IExtendedException.IsTransient"/> this will bubble out for the Azure Function runtime/fabric to retry and automatically deadletter; otherwise, it will be
-    /// immediately deadletted with a reason of <see cref="IExtendedException.ErrorType"/> or <see cref="ErrorType.UnhandledError"/> depending on the exception <see cref="Type"/>.
-    /// <para>The <see cref="UpdateEventSubscriberArgsWithServiceBusMessage(EventSubscriberArgs, ServiceBusReceivedMessage, ServiceBusMessageActions)"/> is invoked after each <see cref="EventData"/> deserialization.</para></remarks>
-    public class ServiceBusSubscriber : EventSubscriberBase, IServiceBusSubscriber
-    {
-        /// <summary>
-        /// Gets the <see cref="EventSubscriberArgs"/> name to access the <see cref="ServiceBusReceivedMessage"/>.
-        /// </summary>
-        public const string ServiceBusReceivedMessageName = nameof(ServiceBusReceivedMessage);
-
-        /// <summary>
-        /// Gets the <see cref="EventSubscriberArgs"/> name to access the <see cref="ServiceBusMessageActions"/>.
-        /// </summary>
-        public const string ServiceBusMessageActionsName = nameof(ServiceBusMessageActions);
-
-        internal static ServiceBusSubscriberInvoker? _invoker;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBusSubscriber"/> class.
-        /// </summary>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="eventSubscriberInvoker">The optional <see cref="EventSubscriberInvoker"/>.</param>
-        /// <param name="serviceBusSubscriberInvoker">The optional <see cref="ServiceBus.ServiceBusSubscriberInvoker"/>.</param>
-        /// <param name="eventDataConverter">The optional <see cref="IEventDataConverter{ServiceBusReceivedMessage}"/>.</param>
-        /// <param name="eventSerializer">The optional <see cref="IEventSerializer"/>.</param>
-        public ServiceBusSubscriber(ExecutionContext executionContext, SettingsBase settings, ILogger<ServiceBusSubscriber> logger, EventSubscriberInvoker? eventSubscriberInvoker = null, ServiceBusSubscriberInvoker? serviceBusSubscriberInvoker = null, IEventDataConverter<ServiceBusReceivedMessage>? eventDataConverter = null, IEventSerializer? eventSerializer = null)
-            : base(eventDataConverter ?? new ServiceBusReceivedMessageEventDataConverter(eventSerializer ?? new CoreEx.Text.Json.EventDataSerializer()), executionContext, settings, logger, eventSubscriberInvoker)
-        {
-            ServiceBusSubscriberInvoker = serviceBusSubscriberInvoker ?? (_invoker ??= new ServiceBusSubscriberInvoker());
-            AbandonOnTransient = settings.GetCoreExValue($"{GetType().Name}:{nameof(AbandonOnTransient)}", false);
-            MaxDeliveryCount = settings.GetCoreExValue<int?>($"{GetType().Name}:{nameof(MaxDeliveryCount)}");
-            RetryDelay = settings.GetCoreExValue<TimeSpan?>($"{GetType().Name}:{nameof(RetryDelay)}");
-            MaxRetryDelay = settings.GetCoreExValue<TimeSpan?>($"{GetType().Name}:{nameof(MaxRetryDelay)}");
-        }
-
-        /// <summary>
-        /// Gets the <see cref="ServiceBus.ServiceBusSubscriberInvoker"/>.
-        /// </summary>
-        protected ServiceBusSubscriberInvoker ServiceBusSubscriberInvoker { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IEventDataConverter{ServiceBusReceivedMessage}"/>.
-        /// </summary>
-        protected new IEventDataConverter<ServiceBusReceivedMessage> EventDataConverter => (IEventDataConverter<ServiceBusReceivedMessage>)base.EventDataConverter;
-
-        /// <inheritdoc/>
-        public bool AbandonOnTransient { get; set; }
-
-        /// <inheritdoc/>
-        public int? MaxDeliveryCount { get; set; }
-
-        /// <inheritdoc/>
-        public TimeSpan? RetryDelay { get; set; }
-
-        /// <inheritdoc/>
-        public TimeSpan? MaxRetryDelay { get; set; }
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData"/> (with no value) for processing.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData, EventSubscriberArgs, Task> function, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-            => ReceiveAsync(message, messageActions, (ed, ea, _) => Result.Success.ThenAsync(() => function(ed, ea)), args, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData"/> (with no value) for processing.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData, EventSubscriberArgs, CancellationToken, Task> function, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-            => ReceiveAsync(message, messageActions, (ed, ea, ct) => Result.Success.ThenAsync(() => function(ed, ea, ct)), args, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData"/> (with no value) for processing.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData, EventSubscriberArgs, Task<Result>> function, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-            => ReceiveAsync(message, messageActions, (ed, ea, _) => function(ed, ea), args, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData"/> (with no value) for processing.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData, EventSubscriberArgs, CancellationToken, Task<Result>> function, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-        {
-            message.ThrowIfNull(nameof(message));
-            messageActions.ThrowIfNull(nameof(messageActions));
-            function.ThrowIfNull(nameof(function));
-
-            return ServiceBusSubscriberInvoker.InvokeAsync(this, async (_, ct) =>
-            {
-                // Perform any pre-processing.
-                args ??= [];
-                var canProceed = await OnBeforeProcessingAsync(message.MessageId, message, args, cancellationToken).ConfigureAwait(false);
-                if (!canProceed)
-                    return;
-
-                // Deserialize the JSON into the selected type.
-                var @event = await DeserializeEventAsync(message.MessageId, message, cancellationToken).ConfigureAwait(false);
-                if (@event is null)
-                    return;
-
-                UpdateEventSubscriberArgsWithServiceBusMessage(args, message, messageActions);
-
-                // Invoke the actual function logic.
-                Result.Go(await function(@event!, args, ct).ConfigureAwait(false))
-                      .Then(() => Logger.LogDebug("{Type} executed successfully - Service Bus message '{Message}'.", GetType().Name, message.MessageId))
-                      .ThrowOnError();
-
-                // Perform the complete/success instrumentation.
-                if (WorkStateOrchestrator is not null)
-                    await WorkStateOrchestrator.CompleteAsync(@event.Id!, cancellationToken);
-                
-                Instrumentation?.Instrument();
-            }, (message, messageActions), cancellationToken);
-        }
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData{T}"/> for processing.
-        /// </summary>
-        /// <typeparam name="TValue">The event value <see cref="Type"/>.</typeparam>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where null.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync<TValue>(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData<TValue>, EventSubscriberArgs, Task> function, IValidator<TValue>? validator = null, bool valueIsRequired = true,
-            EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-            => ReceiveAsync(message, messageActions, (ed, ea, _) => Result.Success.ThenAsync(() => function(ed, ea)), validator, valueIsRequired, args, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData{T}"/> for processing.
-        /// </summary>
-        /// <typeparam name="TValue">The event value <see cref="Type"/>.</typeparam>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where null.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync<TValue>(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData<TValue>, EventSubscriberArgs, CancellationToken, Task> function, IValidator<TValue>? validator = null, bool valueIsRequired = true,
-            EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-            => ReceiveAsync(message, messageActions, (ed, ea, ct) => Result.Success.ThenAsync(() => function(ed, ea, ct)), validator, valueIsRequired, args, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData{T}"/> for processing.
-        /// </summary>
-        /// <typeparam name="TValue">The event value <see cref="Type"/>.</typeparam>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where null.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync<TValue>(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData<TValue>, EventSubscriberArgs, Task<Result>> function, IValidator<TValue>? validator = null, bool valueIsRequired = true,
-            EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-            => ReceiveAsync(message, messageActions, (ed, ea, _) => function(ed, ea), validator, valueIsRequired, args, cancellationToken);
-
-        /// <summary>
-        /// Encapsulates the execution of an <see cref="ServiceBusReceivedMessage"/> <paramref name="function"/> converting the <paramref name="message"/> into a corresponding <see cref="EventData{T}"/> for processing.
-        /// </summary>
-        /// <typeparam name="TValue">The event value <see cref="Type"/>.</typeparam>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <param name="function">The function logic to invoke.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where null.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task ReceiveAsync<TValue>(ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Func<EventData<TValue>, EventSubscriberArgs, CancellationToken, Task<Result>> function, IValidator<TValue>? validator = null, bool valueIsRequired = true,
-            EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-        {
-            message.ThrowIfNull(nameof(message));
-            messageActions.ThrowIfNull(nameof(messageActions));
-            function.ThrowIfNull(nameof(function));
-
-            return ServiceBusSubscriberInvoker.InvokeAsync(this, async (_, ct) =>
-            {
-                // Perform any pre-processing.
-                args ??= [];
-                var canProceed = await OnBeforeProcessingAsync(message.MessageId, message, args, cancellationToken).ConfigureAwait(false);
-                if (!canProceed)
-                    return;
-
-                // Deserialize the JSON into the selected type.
-                var @event = await DeserializeEventAsync(message.MessageId, message, valueIsRequired, validator, cancellationToken).ConfigureAwait(false);
-                if (@event is null)
-                    return;
-
-                UpdateEventSubscriberArgsWithServiceBusMessage(args, message, messageActions);
-
-                // Invoke the actual function logic.
-                Result.Go(await function(@event!, args, ct).ConfigureAwait(false))
-                      .Then(() => Logger.LogDebug("{Type} executed successfully - Service Bus message '{Message}'.", GetType().Name, message.MessageId))
-                      .ThrowOnError();
-
-                // Perform the complete/success instrumentation.
-                if (WorkStateOrchestrator is not null)
-                    await WorkStateOrchestrator.CompleteAsync(@event.Id!, cancellationToken);
-
-                Instrumentation?.Instrument();
-            }, (message, messageActions), cancellationToken);
-        }
-
-        /// <summary>
-        /// Updates the <paramref name="args"/> dictionary with the corresponding <paramref name="message"/> and <paramref name="messageActions"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="messageActions">The <see cref="ServiceBusMessageActions"/>.</param>
-        /// <remarks>This will allow access to these values from within the event processing logic and is intended for advanced scenarios only; care should be taken to not perform an action that would result in the underlying host to fail
-        /// unexpectantly.</remarks>
-        internal static void UpdateEventSubscriberArgsWithServiceBusMessage(EventSubscriberArgs args, ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions)
-        {
-            args.TryAdd(ServiceBusReceivedMessageName, message);
-            args.TryAdd(ServiceBusMessageActionsName, messageActions);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/ServiceBus/ServiceBusSubscriberInvoker.cs b/src/CoreEx.Azure/ServiceBus/ServiceBusSubscriberInvoker.cs
deleted file mode 100644
index d0e9aa44..00000000
--- a/src/CoreEx.Azure/ServiceBus/ServiceBusSubscriberInvoker.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Messaging.ServiceBus;
-using CoreEx.Abstractions;
-using CoreEx.Azure.ServiceBus.Abstractions;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.Invokers;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.ServiceBus
-{
-    /// <summary>
-    /// Provides the standard <see cref="ServiceBusReceivedMessage"/> <see cref="EventSubscriberBase"/> invoker functionality.
-    /// </summary>
-    public class ServiceBusSubscriberInvoker : InvokerBase<EventSubscriberBase, (ServiceBusReceivedMessage Message, ServiceBusMessageActions MessageActions)>
-    {
-        private const string SubscriberExceptionPropertyName = "SubscriberException";
-        private const string SubscriberAbandonReasonPropertyName = "SubscriberAbandonReason";
-
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, EventSubscriberBase invoker, Func<InvokeArgs, TResult> func, (ServiceBusReceivedMessage Message, ServiceBusMessageActions MessageActions) args) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, EventSubscriberBase invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, (ServiceBusReceivedMessage Message, ServiceBusMessageActions MessageActions) args, CancellationToken cancellationToken)
-        {
-            if (args.Message == null)
-                throw new ArgumentException($"The {nameof(ServiceBusReceivedMessage)} value is required.", nameof(args));
-
-            if (args.MessageActions == null)
-                throw new ArgumentException($"The {nameof(ServiceBusMessageActions)} value is required.", nameof(args));
-
-            var stopwatch = invoker.Logger.IsEnabled(LogLevel.Debug) ? System.Diagnostics.Stopwatch.StartNew() : null;
-            invoker.Logger.LogDebug("ServiceBusSubscriber start.");
-
-            if (!string.IsNullOrEmpty(args.Message.CorrelationId))
-                invoker.ExecutionContext.CorrelationId = args.Message.CorrelationId;
-
-            var state = new Dictionary<string, object?>
-            {
-                { nameof(ServiceBusReceivedMessage.MessageId), args.Message.MessageId },
-                { nameof(EventData.CorrelationId), invoker.ExecutionContext.CorrelationId }
-            };
-
-            // Convert to metadata only to enable logging of standard metadata.
-            var @event = await invoker.EventDataConverter.ConvertFromMetadataOnlyAsync(args.Message, cancellationToken).ConfigureAwait(false);
-            UpdateLoggerState(args.Message, @event, state);
-            var scope = invoker.Logger.BeginScope(state);
-
-            OnBeforeMessageProcessing(invoker, args.Message);
-
-            try
-            {
-                return await OnInvokeInternalAsync(invokeArgs, invoker, func, args, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                var keepThrowing = await HandleExceptionAsync(invoker, args.Message, args.MessageActions, ex, cancellationToken).ConfigureAwait(false);
-                OnAfterMessageProcessing(invoker, args.Message, ex);
-
-                if (keepThrowing)
-                    throw;
-
-                return default!;
-            }
-            finally
-            {
-                if (stopwatch is not null)
-                {
-                    stopwatch.Stop();
-                    invoker.Logger.LogDebug("ServiceBusSubscriber elapsed {Elapsed}ms.", stopwatch.Elapsed.TotalMilliseconds);
-                }
-
-                scope?.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Performs the internal service bus message processing and error handling.
-        /// </summary>
-        private async Task<TResult> OnInvokeInternalAsync<TResult>(InvokeArgs invokeArgs, EventSubscriberBase invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, (ServiceBusReceivedMessage Message, ServiceBusMessageActions MessageActions) args, CancellationToken cancellationToken)
-        {
-            TResult result = default!;
-
-            try
-            {
-                invoker.Logger.LogDebug("Received - Service Bus message '{Message}'.", args.Message.MessageId);
-
-                // Leverage the EventSubscriberInvoker to manage execution and standardized exception handling.
-                result = await invoker.EventSubscriberInvoker.InvokeAsync(invoker, async (_, ct) =>
-                {
-                    // Execute the logic.
-                    return await base.OnInvokeAsync(invokeArgs, invoker, func, args, cancellationToken).ConfigureAwait(false);
-                }, cancellationToken).ConfigureAwait(false);
-            }
-            catch (EventSubscriberException) { throw; }
-            catch (Exception ex) when (ex is IExtendedException eex)
-            {
-                // Handle the exception based on the subscriber configuration.
-                var handling = ErrorHandler.DetermineErrorHandling(invoker, eex);
-                if (handling == ErrorHandling.HandleByHost)
-                {
-                    if (invoker.WorkStateOrchestrator is not null)
-                        await invoker.WorkStateOrchestrator.IndeterminateAsync(args.Message.MessageId, ex.Message, cancellationToken).ConfigureAwait(false);
-
-                    invoker.Instrumentation?.Instrument(ErrorHandling.HandleByHost, ex);
-                    throw;
-                }
-
-                await invoker.ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(args.Message.MessageId, new EventSubscriberException(ex.Message, ex), handling, invoker.Logger) { Instrumentation = invoker.Instrumentation, WorkOrchestrator = invoker.WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex) when (invoker.UnhandledHandling != ErrorHandling.HandleByHost)
-            {
-                await invoker.ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(args.Message.MessageId, new EventSubscriberException(ex.Message, ex), invoker.UnhandledHandling, invoker.Logger) { Instrumentation = invoker.Instrumentation, WorkOrchestrator = invoker.WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex) when (invoker.UnhandledHandling == ErrorHandling.HandleByHost)
-            {
-                if (invoker.WorkStateOrchestrator is not null)
-                    await invoker.WorkStateOrchestrator.IndeterminateAsync(args.Message.MessageId!, ex.Message, cancellationToken).ConfigureAwait(false);
-
-                invoker.Instrumentation?.Instrument(ErrorHandling.HandleByHost, ex);
-                throw;
-            }
-            finally
-            {
-                OnAfterMessageProcessing(invoker, args.Message, null);
-            }
-
-            // Everything is good, so complete the message.
-            invoker.Logger.LogDebug("Completing - Service Bus message '{Message}'.", args.Message.MessageId);
-            await args.MessageActions.CompleteMessageAsync(args.Message, cancellationToken).ConfigureAwait(false);
-            invoker.Logger.LogDebug("Completed - Service Bus message '{Message}'.", args.Message.MessageId);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Handle the exception.
-        /// </summary>
-        private static async Task<bool> HandleExceptionAsync(EventSubscriberBase invoker, ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, Exception exception, CancellationToken cancellationToken)
-        {
-            // Handle a known exception type.
-            if (exception is EventSubscriberException eex)
-            {
-                if (eex.ErrorHandling == ErrorHandling.HandleByHost)
-                    return true; // Keep throwing; i.e. bubble exception.
-
-                // Where not considered transient then dead-letter.
-                if (!eex.IsTransient)
-                {
-                    await DeadLetterExceptionAsync(invoker, message, messageActions, eex.ErrorType, exception, cancellationToken).ConfigureAwait(false);
-                    if (invoker.WorkStateOrchestrator is not null)
-                        await invoker.WorkStateOrchestrator.FailAsync(message.MessageId, exception.Message, cancellationToken).ConfigureAwait(false);
-
-                    return false;
-                }
-
-                // Determine the delay, if any.
-                var sbs = invoker as IServiceBusSubscriber;
-                var delay = sbs is not null && sbs.RetryDelay.HasValue ? (int)(sbs.RetryDelay.Value.TotalMilliseconds * message.DeliveryCount) : -1;
-                if (sbs is not null && sbs.MaxRetryDelay.HasValue)
-                {
-                    if (delay < 0 || delay > sbs.MaxRetryDelay.Value.TotalMilliseconds)
-                        delay = (int)sbs.MaxRetryDelay.Value.TotalMilliseconds;
-                }
-
-                // Where the exception is known then exception and stack trace need not be logged.
-                var ex = eex.HasInnerExtendedException ? null : exception;
-
-                // Log the transient retry as a warning.
-                if (delay <= 0)
-                    invoker.Logger.LogWarning(ex, "Retry - Service Bus message '{Message}'. [{Reason}] Processing attempt {Count}. {Error}", message.MessageId, eex.ErrorType, message.DeliveryCount, exception.Message);
-                else
-                    invoker.Logger.LogWarning(ex, "Retry - Service Bus message '{Message}'. [{Reason}] Processing attempt {Count}; retry delay {Delay}ms. {Error}", message.MessageId, eex.ErrorType, message.DeliveryCount, delay, exception.Message);
-
-                if (sbs is not null)
-                {
-                    if (sbs.MaxDeliveryCount.HasValue && message.DeliveryCount >= sbs.MaxDeliveryCount.Value)
-                    {
-                        // Dead-letter when maximum delivery count achieved.
-                        var msg = $"Message could not be consumed after {sbs.MaxDeliveryCount.Value} attempts (as defined by {invoker.GetType().Name}).";
-                        await DeadLetterExceptionAsync(invoker, message, messageActions, "MaxDeliveryCountExceeded", new EventSubscriberException(msg, exception), cancellationToken).ConfigureAwait(false);
-                        if (invoker.WorkStateOrchestrator is not null)
-                            await invoker.WorkStateOrchestrator.FailAsync(message.MessageId, msg, cancellationToken).ConfigureAwait(false);
-
-                        return false;
-                    }
-
-                    if (delay > 0)
-                    {
-                        // Renew the lock to maximize time and then delay.
-                        invoker.Logger.LogDebug("Retry delaying - Service Bus message '{Message}'. Retry delay {Delay}ms.", message.MessageId, delay);
-                        await Task.Delay(delay, cancellationToken).ConfigureAwait(false);
-                        invoker.Logger.LogDebug("Retry delayed - Service Bus message '{Message}'.", message.MessageId, delay);
-                    }
-
-                    if (sbs.AbandonOnTransient)
-                    {
-                        // Abandon message versus bubbling.
-                        invoker.Logger.LogDebug("Abandoning - Service Bus message '{Message}'.", message.MessageId);
-                        await messageActions.AbandonMessageAsync(message, new Dictionary<string, object> { { SubscriberAbandonReasonPropertyName, FormatText(exception.Message) } }, cancellationToken).ConfigureAwait(false);
-                        invoker.Logger.LogDebug("Abandoned - Service Bus message '{Message}'.", message.MessageId);
-                        return false;
-                    }
-                }
-
-                return true; // Keep throwing; i.e. bubble exception.
-            }
-
-            // For the known exceptions it can be assumed that it only got this far because error handling for it was None so keep bubbling.
-            if (exception is IExtendedException)
-                return true;
-
-            // Where the unhandled handling is set to None then keep bubbling; do not dead-letter.
-            if (invoker.UnhandledHandling == ErrorHandling.HandleByHost)
-                return true; 
-
-            // Dead-letter the unhandled exception.
-            await DeadLetterExceptionAsync(invoker, message, messageActions, ErrorType.UnhandledError.ToString(), exception, cancellationToken).ConfigureAwait(false);
-            if (invoker.WorkStateOrchestrator is not null)
-                await invoker.WorkStateOrchestrator.FailAsync(message.MessageId, exception.Message, cancellationToken).ConfigureAwait(false);
-
-            return false;
-        }
-
-        /// <summary>
-        /// Performs the dead-lettering.
-        /// </summary>
-        public static async Task DeadLetterExceptionAsync(EventSubscriberBase invoker, ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions, string errorReason, Exception exception, CancellationToken cancellationToken)
-        {
-            var ex = exception is EventSubscriberException esex && esex.HasInnerExtendedException ? null : exception;
-
-            invoker.Logger.LogDebug("Dead Lettering - Service Bus message '{Message}'. [{Reason}] {Error}", message.MessageId, errorReason, exception.Message);
-            await messageActions.DeadLetterMessageAsync(message, new Dictionary<string, object> { { SubscriberExceptionPropertyName, FormatText(exception.ToString()) } }, errorReason, FormatText(exception.Message), cancellationToken).ConfigureAwait(false);
-            invoker.Logger.LogError(ex, "Dead Lettered - Service Bus message '{Message}'. [{Reason}] {Error}", message.MessageId, errorReason, exception.Message);
-        }
-
-        /// <summary>
-        /// Shortens the text to 2048 characters; should be enough to given context - otherwise, full context should have be written to the log.
-        /// </summary>
-        private static string FormatText(string? text) => text?[..Math.Min(text.Length, 2048)] ?? string.Empty;
-
-        /// <summary>
-        /// Update the <see cref="ILogger.BeginScope{TState}(TState)"/> <paramref name="state"/> from the <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The <see cref="ServiceBusMessage"/>.</param>
-        /// <param name="event">The <see cref="EventData"/> metadata only representation of the <paramref name="message"/>.</param>
-        /// <param name="state">The state <see cref="IDictionary{TKey, TValue}"/>.</param>
-        /// <remarks>The <see cref="ServiceBusReceivedMessage.MessageId"/> and <see cref="ServiceBusReceivedMessage.CorrelationId"/> are automatically added prior.
-        /// <para>The <see cref="ServiceBusReceivedMessage.Subject"/>, <see cref="EventDataBase.Action"/>, <see cref="EventDataBase.Source"/> and <see cref="EventDataBase.Type"/> properties represent the default implementation.</para></remarks>
-        protected virtual void UpdateLoggerState(ServiceBusReceivedMessage message, EventData @event, IDictionary<string, object?> state)
-        {
-            if (!string.IsNullOrEmpty(@event.Subject))
-                state.Add(nameof(EventData.Subject), @event.Subject);
-
-            if (!string.IsNullOrEmpty(@event.Action))
-                state.Add(nameof(EventData.Action), @event.Action);
-
-            if (@event.Source != null)
-                state.Add(nameof(EventData.Source), @event.Source.ToString());
-
-            if (!string.IsNullOrEmpty(@event.Type))
-                state.Add(nameof(EventData.Type), @event.Type);
-        }
-
-        /// <summary>
-        /// Provides an opportunity to perform additional logging/monitoring before the <paramref name="message"/> processing occurs.
-        /// </summary>
-        /// <param name="subscriber">The invoking <see cref="EventSubscriberBase"/>.</param>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <remarks>An <see cref="Exception"/> should not be thrown within as this may result in an unexpected error.</remarks>
-        protected virtual void OnBeforeMessageProcessing(EventSubscriberBase subscriber, ServiceBusReceivedMessage message) { }
-
-        /// <summary>
-        /// Provides an opportunity to perform additional logging/monitoring after the <paramref name="message"/> processing occurs (including any corresponding <see cref="ServiceBusReceivedMessage"/> invocation).
-        /// </summary>
-        /// <param name="subscriber">The invoking <see cref="EventSubscriberBase"/>.</param>
-        /// <param name="message">The <see cref="ServiceBusReceivedMessage"/>.</param>
-        /// <param name="exception">The corresponding <see cref="Exception"/> where an error occured.</param>
-        /// <remarks>An <see cref="Exception"/> should not be thrown within as this may result in an unexpected error.</remarks>
-        protected virtual void OnAfterMessageProcessing(EventSubscriberBase subscriber, ServiceBusReceivedMessage message, Exception? exception) { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/Storage/BlobAttachmentStorage.cs b/src/CoreEx.Azure/Storage/BlobAttachmentStorage.cs
deleted file mode 100644
index 71d2dae7..00000000
--- a/src/CoreEx.Azure/Storage/BlobAttachmentStorage.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Storage.Blobs;
-using CoreEx.Events;
-using CoreEx.Events.Attachments;
-using System;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.Storage
-{
-    /// <summary>
-    /// Provides the reading and writing of a <see cref="EventData.Value"/> attachment that exceeds the <see cref="MaxDataSize"/> as identified by a corresponding <see cref="EventAttachment"/> within 
-    /// <see href="https://learn.microsoft.com/en-us/azure/storage/blobs/storage-blobs-introduction">Azure Blob Storage</see>.
-    /// </summary>
-    /// <param name="blobContainerClient">The <see cref="BlobContainerClient"/>.</param>
-    public class BlobAttachmentStorage(BlobContainerClient blobContainerClient) : IAttachmentStorage
-    {
-        private readonly BlobContainerClient _blobContainerClient = blobContainerClient.ThrowIfNull(nameof(blobContainerClient));
-
-        /// <inheritdoc/>
-        public int MaxDataSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the content type of the attachment. 
-        /// </summary>
-        /// <remarks>Defaults to <see cref="MediaTypeNames.Application.Json"/></remarks>
-        public string ContentType { get; set; } = MediaTypeNames.Application.Json;
-
-        /// <inheritdoc/>
-        public async Task<BinaryData> ReadAync(EventAttachment attachment, CancellationToken cancellationToken)
-        {
-            var blobClient = _blobContainerClient.GetBlobClient(attachment.Attachment);
-            var blobDownloadInfo = await blobClient.DownloadAsync(cancellationToken).ConfigureAwait(false);
-
-            return BinaryData.FromStream(blobDownloadInfo.Value.Content);
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventAttachment> WriteAsync(EventData @event, BinaryData attachmentData, CancellationToken cancellationToken)
-        {
-            var blobName = @event.Id ?? Guid.NewGuid().ToString();
-            if (ContentType == MediaTypeNames.Application.Json)
-                blobName = $"{blobName}.json";
-
-            // Where @event.tenantId is set, prepend to create a tenant specific folder.
-            if (@event.TenantId != null)
-                blobName = $"{@event.TenantId}/{blobName}";
-
-            var blobClient = _blobContainerClient.GetBlobClient(blobName);
-            await blobClient.UploadAsync(attachmentData.ToStream(), cancellationToken).ConfigureAwait(false);
-
-            return new EventAttachment { Attachment = blobName, ContentType = ContentType };
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/Storage/BlobLeaseSynchronizer.cs b/src/CoreEx.Azure/Storage/BlobLeaseSynchronizer.cs
deleted file mode 100644
index 8ebc276e..00000000
--- a/src/CoreEx.Azure/Storage/BlobLeaseSynchronizer.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Blobs.Specialized;
-using CoreEx.Hosting;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading;
-
-namespace CoreEx.Azure.Storage
-{
-    /// <summary>
-    /// An <see cref="IServiceSynchronizer"/> that performs synchronization by acquiring a lease (see <see href="https://learn.microsoft.com/en-us/azure/storage/blobs/storage-blob-lease"/>) on a blob.
-    /// </summary>
-    /// <remarks>A blob is created per <see cref="Type"/> with a name of <see cref="Type.FullName"/> and extension of '.lock'; e.g. '<c>Namespace.Class.lock</c>'. For this to function correctly all running instances must be referencing the same blob container.
-    /// <para>The duration to acquire the lease is generally unknown and an <see cref="Enter{T}(string?)"/> and <see cref="Exit{T}(string?)"/> can not be guaranteed in the case of failure. Therefore, an infinite value can not be used as the lease
-    /// would then need to be released manually under a failure. To mitigate this a lease is taken for the specified <see cref="LeaseDuration"/>; with an internal <see cref="Timer"/> automatically renewing on <see cref="AutoRenewLeaseDuration"/>.
-    /// This will result in worst case a lease of <see cref="LeaseDuration"/> on failure.</para></remarks>
-    public class BlobLeaseSynchronizer : IServiceSynchronizer
-    {
-        private readonly BlobContainerClient _client;
-        private readonly string _leaseId = Guid.NewGuid().ToString();
-        private readonly ConcurrentDictionary<string, BlobLeaseClient> _dict = new();
-        private readonly Lazy<Timer> _timer;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BlobLeaseSynchronizer"/> class.
-        /// </summary>
-        /// <param name="client">The <see cref="BlobContainerClient"/>.</param>
-        /// <remarks>Performs a <see cref="BlobContainerClient.CreateIfNotExists(PublicAccessType, IDictionary{string, string}, BlobContainerEncryptionScopeOptions, CancellationToken)"/> to ensure the container exists.</remarks>
-        public BlobLeaseSynchronizer(BlobContainerClient client)
-        { 
-            _client = client.ThrowIfNull(nameof(client));
-            _timer = new Lazy<Timer>(() => new Timer(_ =>
-            {
-                foreach (var kvp in _dict.ToArray())
-                {
-                    try
-                    {
-                        kvp.Value.RenewAsync();
-                    }
-                    catch { } // Swallow and carry on. 
-                }
-            }, null, AutoRenewLeaseDuration, AutoRenewLeaseDuration), isThreadSafe: true);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="BlobLease"/> duration.
-        /// </summary>
-        /// <remarks>The value must be greater than the <see cref="AutoRenewLeaseDuration"/> to function correctly.</remarks>
-        public virtual TimeSpan LeaseDuration => TimeSpan.FromSeconds(60);
-
-        /// <summary>
-        /// Gets the <see cref="BlobLeaseClient.Renew(RequestConditions, CancellationToken)"/> duration.
-        /// </summary>
-        /// <remarks>The value must be less than the <see cref="LeaseDuration"/> to function correctly.</remarks>
-        public virtual TimeSpan AutoRenewLeaseDuration => TimeSpan.FromSeconds(30);
-
-        /// <inheritdoc/>
-        public bool Enter<T>(string? name = null)
-        {
-            try
-            {
-                // Is exclusive for this invocation only where genuinely creating.
-                bool exclusiveLock = false;
-
-                _dict.GetOrAdd(GetName<T>(name), fn =>
-                {
-                    _client.CreateIfNotExists();
-
-                    var blob = _client.GetBlobClient(GetName<T>(name));
-                    try
-                    {
-                        var bp = blob.GetProperties();
-                        switch (bp.Value.LeaseState)
-                        {
-                            case LeaseState.Available:
-                            case LeaseState.Expired:
-                            case LeaseState.Broken:
-                                break;
-
-                            default:
-                                throw new RequestFailedException((int)HttpStatusCode.Conflict, "Invalid lease state.");
-                        }
-                    }
-                    catch (RequestFailedException rfex) when (rfex.Status == (int)HttpStatusCode.NotFound)
-                    {
-                        // Does not exist, so create.
-                        using var s = blob.OpenWrite(true);
-                    }
-
-                    var lease = blob.GetBlobLeaseClient(_leaseId);
-                    lease.Acquire(LeaseDuration);
-                    exclusiveLock = true;
-                    return lease;
-                });
-
-                // Start timer on first enter.
-                if (!_timer.IsValueCreated)
-                    _ = _timer.Value;
-
-                return exclusiveLock;
-            }
-            catch (RequestFailedException rfex) when (rfex.Status == (int)HttpStatusCode.PreconditionFailed || rfex.Status == (int)HttpStatusCode.Conflict) { return false; } // Already exists and locked!
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Unexpected exception whilst attempting to get an exclusive lease on blob '{GetName<T>(name)}': {ex.Message}", ex);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Exit<T>(string? name = null)
-        {
-            if (_dict.TryRemove(GetName<T>(name), out var lease))
-                ReleaseLease(lease);
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="BlobLeaseSynchronizer"/> and optionally releases the managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing && !_disposed)
-            {
-                _disposed = true;
-                if (_timer.IsValueCreated)
-                    _timer.Value.Dispose();
-
-                _dict.Values.ForEach(ReleaseLease);
-            }
-        }
-
-        /// <summary>
-        /// Gets the full name.
-        /// </summary>
-        private static string GetName<T>(string? name) => $"{typeof(T).FullName}{(name == null ? "" : $".{name}")}.lock";
-
-        /// <summary>
-        /// Release the lease swallowing any and all exceptions.
-        /// </summary>
-        private static void ReleaseLease(BlobLeaseClient lease)
-        {
-            try { lease.Release(); }
-            catch (Exception) { /* Swallow and carry on. */ }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/Storage/BlobSasAttachmentStorage.cs b/src/CoreEx.Azure/Storage/BlobSasAttachmentStorage.cs
deleted file mode 100644
index 6caf4edc..00000000
--- a/src/CoreEx.Azure/Storage/BlobSasAttachmentStorage.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Storage.Blobs;
-using Azure.Storage.Sas;
-using CoreEx.Events;
-using CoreEx.Events.Attachments;
-using System;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.Storage
-{
-    /// <summary>
-    /// Provides the reading and writing of a <see cref="EventData.Value"/> attachment that exceeds the <see cref="MaxDataSize"/> as identified by a corresponding <see cref="EventAttachment"/> within 
-    /// <see href="https://learn.microsoft.com/en-us/azure/storage/blobs/storage-blobs-introduction">Azure Blob Storage</see> using a <see href="https://learn.microsoft.com/en-us/azure/storage/common/storage-sas-overview">SAS token</see>.
-    /// </summary>
-    public class BlobSasAttachmentStorage : IAttachmentStorage
-    {
-        private readonly BlobContainerClient? _blobContainerClient;
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="BlobSasAttachmentStorage"/> class with a <paramref name="blobContainerClient"/>
-        /// </summary>
-        /// <param name="blobContainerClient">The <see cref="BlobContainerClient"/>.</param>
-        public BlobSasAttachmentStorage(BlobContainerClient blobContainerClient) => _blobContainerClient = blobContainerClient.ThrowIfNull(nameof(blobContainerClient));
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="BlobSasAttachmentStorage"/> class.
-        /// </summary>
-        public BlobSasAttachmentStorage() { }
-
-        /// <inheritdoc/>
-        public int MaxDataSize { get; set; }
-
-        /// <summary>
-        /// Gets or sets the expiratation <see cref="TimeSpan"/> that is added to <see cref="DateTimeOffset.UtcNow"/> to create the SAS token.
-        /// </summary>
-        /// <remarks>Defaults to two (2) days.</remarks>
-        public TimeSpan Expiration { get; set; } = TimeSpan.FromDays(2);
-
-        /// <summary>
-        /// Gets or sets the content type of the attachment. 
-        /// </summary>
-        /// <remarks>Defaults to <see cref="MediaTypeNames.Application.Json"/></remarks>
-        public string ContentType { get; set; } = MediaTypeNames.Application.Json;
-
-        /// <inheritdoc/>
-        public async Task<BinaryData> ReadAync(EventAttachment attachment, CancellationToken cancellationToken)
-        {
-            var blobClient = new BlobClient(new Uri(attachment.Attachment!));
-            var blobDownloadInfo = await blobClient.DownloadAsync(cancellationToken).ConfigureAwait(false);
-
-            return BinaryData.FromStream(blobDownloadInfo.Value.Content);
-        }
-
-        /// <summary>
-        /// Writes the attachment data to Azure Blob Storage and returns a SAS token to the blob
-        /// </summary>
-        /// <param name="event"></param>
-        /// <param name="attachmentData"></param>
-        /// <param name="cancellationToken"></param>
-        /// <returns>Reference to Event Atttachment as <see cref="EventAttachment"/></returns>
-        public async Task<EventAttachment> WriteAsync(EventData @event, BinaryData attachmentData, CancellationToken cancellationToken)
-        {
-            if(_blobContainerClient == null)
-                throw new InvalidOperationException($"The {nameof(BlobContainerClient)} must be passed in the constructor in order to write.");
-
-            var blobName = @event.Id ?? Guid.NewGuid().ToString();
-            if (ContentType == MediaTypeNames.Application.Json)
-                blobName = $"{blobName}.json";
-
-            // Where @event.tenantId is set, prepend to create a tenant specific folder
-            if (@event.TenantId != null)
-                blobName = $"{@event.TenantId}/{blobName}";
-
-            var blobClient = _blobContainerClient.GetBlobClient(blobName);
-            var sasUri = blobClient.GenerateSasUri(BlobSasPermissions.Read, DateTimeOffset.UtcNow.Add(Expiration));
-            await blobClient.UploadAsync(attachmentData.ToStream(), cancellationToken).ConfigureAwait(false);
-
-            return new EventAttachment { Attachment = sasUri.ToString(), ContentType = ContentType };
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/Storage/TableWorkStatePersistence.cs b/src/CoreEx.Azure/Storage/TableWorkStatePersistence.cs
deleted file mode 100644
index 9c42c138..00000000
--- a/src/CoreEx.Azure/Storage/TableWorkStatePersistence.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure;
-using Azure.Data.Tables;
-using CoreEx.Hosting.Work;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Azure.Storage
-{
-    /// <summary>
-    /// An <see cref="IWorkStatePersistence"/> that persists the <see cref="WorkState"/> using an Azure <see cref="TableClient"/> and the related <see cref="BinaryData"/> to a separate <see cref="TableClient"/>.
-    /// </summary>
-    /// <remarks>The maximum <see cref="BinaryData"/> size currently supported is 960,000 bytes.</remarks>
-    public class TableWorkStatePersistence : IWorkStatePersistence
-    {
-        private readonly TableClient _workStateTableClient;
-        private readonly TableClient _workDataTableClient;
-        private readonly SemaphoreSlim _semaphore = new(1, 1);
-        private volatile bool _firstTime = true;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TableWorkStatePersistence"/> class.
-        /// </summary>
-        /// <param name="tableServiceClient">The <see cref="TableServiceClient"/>.</param>
-        /// <param name="workStateTableName">The work state table name.</param>
-        /// <param name="workDataTableName">The work data table name.</param>
-        public TableWorkStatePersistence(TableServiceClient tableServiceClient, string workStateTableName = "workstate", string workDataTableName = "workdata")
-            : this(tableServiceClient.ThrowIfNull(nameof(tableServiceClient)).GetTableClient(workStateTableName), tableServiceClient.GetTableClient(workDataTableName)) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TableWorkStatePersistence"/> class.
-        /// </summary>
-        /// <param name="workStateTableClient">The work state <see cref="TableClient"/>.</param>
-        /// <param name="workDataTableClient">The work data <see cref="TableClient"/>.</param>
-        public TableWorkStatePersistence(TableClient workStateTableClient, TableClient workDataTableClient)
-        {
-            if (workStateTableClient.ThrowIfNull(nameof(workStateTableClient)).Name == workDataTableClient.ThrowIfNull(nameof(workDataTableClient)).Name)
-                throw new ArgumentException("The work state and data table names must be different.", nameof(workDataTableClient));
-
-            _workDataTableClient = workDataTableClient;
-            _workStateTableClient = workStateTableClient;
-
-            _workDataTableClient.CreateIfNotExists();
-            _workStateTableClient.CreateIfNotExists();
-        }
-
-        private class WorkStateEntity() : WorkState, ITableEntity
-        {
-            public WorkStateEntity(WorkState state) : this()
-            {
-                RowKey = state.Id!;
-                TypeName = state.TypeName;
-                Key = state.Key;
-                CorrelationId = state.CorrelationId;
-                UserName = state.UserName;
-                Status = state.Status;
-                Created = state.Created;
-                Expiry = state.Expiry;
-                Started = state.Started;
-                Indeterminate = state.Indeterminate;
-                Finished = state.Finished;
-                Reason = state.Reason;
-            }
-
-            public string PartitionKey { get; set; } = GetPartitionKey();
-            public string RowKey { get; set; } = null!;
-            public DateTimeOffset? Timestamp { get; set; }
-            public ETag ETag { get; set; }
-        }
-
-        private class WorkDataEntity() : ITableEntity
-        {
-            private const int _chunkSize = 64000;
-            private const int _maxChunks = 15;
-            private const int _maxSize = _chunkSize * _maxChunks;
-            private readonly BinaryData?[] _data = new BinaryData?[_maxChunks];
-
-            public WorkDataEntity(BinaryData data) : this()
-            {
-                var arr = data.ToArray();
-                if (arr.Length <= _chunkSize)
-                {
-                    Data00 = data;
-                    return;
-                }
-                else if (arr.Length > _maxSize)
-                    throw new ArgumentException($"Data too large ({arr.Length}B versus {_maxSize}B) to store in Azure table storage.", nameof(data));
-
-                var i = 0;
-                foreach (var chunk in data.ToArray().Chunk(_chunkSize))
-                {
-                    _data[i++] = BinaryData.FromBytes(chunk);
-                }
-            }
-
-            public string PartitionKey { get; set; } = GetPartitionKey();
-            public string RowKey { get; set; } = null!;
-            public DateTimeOffset? Timestamp { get; set; }
-            public ETag ETag { get; set; }
-            public BinaryData? Data00 { get => _data[0]; set => _data[0] = value; }
-            public BinaryData? Data01 { get => _data[1]; set => _data[1] = value; }
-            public BinaryData? Data02 { get => _data[2]; set => _data[2] = value; }
-            public BinaryData? Data03 { get => _data[3]; set => _data[3] = value; }
-            public BinaryData? Data04 { get => _data[4]; set => _data[4] = value; }
-            public BinaryData? Data05 { get => _data[5]; set => _data[5] = value; }
-            public BinaryData? Data06 { get => _data[6]; set => _data[6] = value; }
-            public BinaryData? Data07 { get => _data[7]; set => _data[7] = value; }
-            public BinaryData? Data08 { get => _data[8]; set => _data[8] = value; }
-            public BinaryData? Data09 { get => _data[9]; set => _data[9] = value; }
-            public BinaryData? Data10 { get => _data[10]; set => _data[10] = value; }
-            public BinaryData? Data11 { get => _data[11]; set => _data[11] = value; }
-            public BinaryData? Data12 { get => _data[12]; set => _data[12] = value; }
-            public BinaryData? Data13 { get => _data[13]; set => _data[13] = value; }
-            public BinaryData? Data14 { get => _data[14]; set => _data[14] = value; }
-
-            /// <summary>
-            /// Unchunks the data properties into a single <see cref="BinaryData"/>.
-            /// </summary>
-            /// <returns>The <see cref="BinaryData"/>.</returns>
-            public BinaryData? ToSingleData()
-            {
-                if (Data00 is null || Data01 is null)
-                    return Data00;
-
-                using var ms = new MemoryStream();
-                for (int i = 0; i < _maxChunks; i++)
-                {
-                    if (_data[i] is null)
-                        break;
-
-                    ms.Write(_data[i]!.ToArray());
-                }
-
-                ms.Position = 0;
-                return BinaryData.FromStream(ms);
-            }
-        }
-
-        /// <summary>
-        /// Gets the partition key.
-        /// </summary>
-        private static string GetPartitionKey() => (ExecutionContext.HasCurrent ? ExecutionContext.Current.TenantId : null) ?? "default";
-
-        /// <summary>
-        /// Creates the tables if they do not already exist.
-        /// </summary>
-        private async Task CreateIfNotExistsAsync(CancellationToken cancellationToken)
-        {
-            if (_firstTime)
-            {
-                await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-                try
-                {
-                    if (_firstTime)
-                    {
-                        await _workDataTableClient.CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-                        await _workStateTableClient.CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-                        _firstTime = false;
-                    }
-                }
-                finally
-                {
-                    _semaphore.Release();
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken)
-        {
-            await CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-
-            var er = await _workStateTableClient.GetEntityIfExistsAsync<WorkStateEntity>(GetPartitionKey(), id, cancellationToken: cancellationToken).ConfigureAwait(false);
-            if (!er.HasValue)
-                return null;
-
-            return new WorkState
-            {
-                Id = er.Value!.RowKey,
-                TypeName = er.Value.TypeName,
-                Key = er.Value.Key,
-                CorrelationId = er.Value.CorrelationId,
-                UserName = er.Value.UserName,
-                Status = er.Value.Status,
-                Created = er.Value.Created,
-                Expiry = er.Value.Expiry,
-                Started = er.Value.Started,
-                Indeterminate = er.Value.Indeterminate,
-                Finished = er.Value.Finished,
-                Reason = er.Value.Reason
-            };
-        }
-
-        /// <inheritdoc/>
-        public Task CreateAsync(WorkState state, CancellationToken cancellationToken) => UpsertAsync(state, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task UpdateAsync(WorkState state, CancellationToken cancellationToken) => UpsertAsync(state, cancellationToken);
-
-        /// <summary>
-        /// Performs an upsert (create/update).
-        /// </summary>
-        private async Task UpsertAsync(WorkState state, CancellationToken cancellationToken)
-        {
-            await CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-            await _workStateTableClient.UpsertEntityAsync(new WorkStateEntity(state), TableUpdateMode.Replace, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task DeleteAsync(string id, CancellationToken cancellationToken)
-        {
-            await CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-            await _workDataTableClient.DeleteEntityAsync(GetPartitionKey(), id, cancellationToken: cancellationToken).ConfigureAwait(false);
-            await _workStateTableClient.DeleteEntityAsync(GetPartitionKey(), id, cancellationToken: cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken)
-        {
-            await CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-
-            var er = await _workDataTableClient.GetEntityIfExistsAsync<WorkDataEntity>(GetPartitionKey(), id, cancellationToken: cancellationToken).ConfigureAwait(false);
-            return er.HasValue ? er.Value!.ToSingleData() : null;
-        }
-
-        /// <inheritdoc/>
-        public async Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken)
-        {
-            await CreateIfNotExistsAsync(cancellationToken).ConfigureAwait(false);
-            await _workDataTableClient.UpsertEntityAsync(new WorkDataEntity(data) { PartitionKey = GetPartitionKey(), RowKey = id }, TableUpdateMode.Replace, cancellationToken: cancellationToken).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Azure/strong-name-key.snk b/src/CoreEx.Azure/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Azure/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Caching.FusionCache/AGENTS.md b/src/CoreEx.Caching.FusionCache/AGENTS.md
new file mode 100644
index 00000000..abf984a0
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/AGENTS.md
@@ -0,0 +1,53 @@
+# CoreEx.Caching.FusionCache — AI Usage Guide
+
+Binds the CoreEx `IHybridCache` abstraction to the FusionCache library, providing L1 (in-process) + L2 (Redis) hybrid caching with a multi-node backplane.
+
+## Registration
+
+```csharp
+// Program.cs — standard L1/L2 hybrid setup with Redis backplane
+builder.Services.AddMemoryCache();
+builder.AddRedisDistributedCache("redis");   // Aspire Redis resource name
+
+builder.Services.AddFusionCache()
+    .WithRegisteredMemoryCache()
+    .WithRegisteredDistributedCache()
+    .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions
+    {
+        Configuration = sp.GetRequiredService<IConnectionMultiplexer>().Configuration
+    }))
+    .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+builder.Services
+    .AddFusionHybridCache()           // registers FusionHybridCache as IHybridCache
+    .AddDefaultCacheKeyProvider()     // registers ICacheKeyProvider
+    .AddHybridCacheIdempotencyProvider(); // registers IIdempotencyProvider backed by IHybridCache
+```
+
+## Usage in Application Code
+
+Depend only on `IHybridCache` — never on `IFusionCache` directly in application/domain code.
+
+```csharp
+public class ReferenceDataService(IHybridCache cache)
+{
+    public async Task<IEnumerable<Status>> GetStatusesAsync(CancellationToken ct = default)
+        => await cache.GetOrCreateByKeyAsync("ref.statuses",
+            _ => LoadStatusesAsync(),
+            new HybridCacheEntryOptions { LocalExpiration = TimeSpan.FromMinutes(5) },
+            cancellationToken: ct).ConfigureAwait(false);
+}
+```
+
+## Do Not
+
+- Do not inject `IFusionCache` directly into application or domain services — use `IHybridCache`.
+- Do not configure FusionCache without `AddFusionHybridCache()` — the `IHybridCache` registration is separate from the FusionCache builder setup.
+
+## Further Reading
+
+- [README](./README.md) — options translation and entry-options escape-hatch reference.
+- [CoreEx](../CoreEx/README.md) — defines `IHybridCache` and `HybridCacheEntryOptions`.
+- [FusionCache](https://github.com/ZiggyCreatures/FusionCache) — underlying caching library.
+- [Hosts layer](../../samples/docs/hosts-layer.md) — `AddFusionCache()` / `AddFusionHybridCache()` registration in real API and subscriber hosts.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — Redis backplane configuration and idempotency provider wiring.
diff --git a/src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj b/src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj
new file mode 100644
index 00000000..fd270e8b
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/CoreEx.Caching.FusionCache.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx FusionCache .NET extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data caching fusioncache hybrid-cache in-memory distributed redis</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson" />
+    <PackageReference Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" />
+    <PackageReference Include="ZiggyCreatures.FusionCache.Backplane.Memory" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Caching.FusionCache/CoreExFusionCacheExtensions.DependencyInjection.cs b/src/CoreEx.Caching.FusionCache/CoreExFusionCacheExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..15de1334
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/CoreExFusionCacheExtensions.DependencyInjection.cs
@@ -0,0 +1,16 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class CoreExFusionCacheExtensions
+{
+    /// <summary>
+    /// Adds a <b>scoped</b> service for the <see cref="IHybridCache"/> using the <see cref="CoreEx.Caching.FusionCache.FusionHybridCache"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddFusionHybridCache(this IServiceCollection services) => services.ThrowIfNull().AddScoped<IHybridCache, CoreEx.Caching.FusionCache.FusionHybridCache>();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Caching.FusionCache/FusionCacheExtensions.cs b/src/CoreEx.Caching.FusionCache/FusionCacheExtensions.cs
new file mode 100644
index 00000000..1904d8ea
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/FusionCacheExtensions.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.Caching.FusionCache;
+
+/// <summary>
+/// Provides standard extensions for <i>FusionCache</i>.
+/// </summary>
+public static partial class FusionCacheExtensions
+{
+    /// <summary>
+    /// Converts the <see cref="HybridCacheEntryOptions"/> into a <see cref="FusionCacheEntryOptions"/> equivalent.
+    /// </summary>
+    /// <param name="options">The <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <returns>The resulting <see cref="FusionCacheEntryOptions"/>.</returns>
+    public static FusionCacheEntryOptions ToFusionCacheEntryOptions(this HybridCacheEntryOptions? options) => new()
+    {
+        Duration = options?.LocalExpiration ?? HybridCacheEntryOptions.DefaultLocalExpiration,
+        DistributedCacheDuration = options?.DistributedExpiration ?? HybridCacheEntryOptions.DefaultDistributedExpiration,
+        SkipDistributedCacheRead = (options?.Strategy ?? HybridCacheEntryOptions.DefaultStrategy) == CacheStrategy.Local,
+        SkipDistributedCacheWrite = (options?.Strategy ?? HybridCacheEntryOptions.DefaultStrategy) == CacheStrategy.Local,
+        SkipMemoryCacheRead = (options?.Strategy ?? HybridCacheEntryOptions.DefaultStrategy) == CacheStrategy.Distributed,
+        SkipMemoryCacheWrite = (options?.Strategy ?? HybridCacheEntryOptions.DefaultStrategy) == CacheStrategy.Distributed
+    };
+}
\ No newline at end of file
diff --git a/src/CoreEx.Caching.FusionCache/FusionHybridCache.cs b/src/CoreEx.Caching.FusionCache/FusionHybridCache.cs
new file mode 100644
index 00000000..cf978c34
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/FusionHybridCache.cs
@@ -0,0 +1,67 @@
+namespace CoreEx.Caching.FusionCache;
+
+/// <summary>
+/// Provides the <see cref="IHybridCache"/> implementation based on <i><see href="https://github.com/ZiggyCreatures/FusionCache">FusionCache</see></i>.
+/// </summary>
+/// <param name="fusionCache">The underlying <see cref="IFusionCache"/>.</param>
+/// <param name="cacheKeyProvider">The <see cref="ICacheKeyProvider"/>.</param>
+public class FusionHybridCache(IFusionCache fusionCache, ICacheKeyProvider cacheKeyProvider) : IHybridCache
+{
+    private readonly IFusionCache _fusionCache = fusionCache.ThrowIfNull();
+    private Action<FusionCacheEntryOptions>? _configure;
+
+    /// <inheritdoc/>
+    public ICacheKeyProvider KeyProvider { get; } = cacheKeyProvider.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public async Task<(bool Exists, T? Value)> TryGetByKeyAsync<T>(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        var fr = await _fusionCache.TryGetAsync<T>(KeyProvider.GetFullyQualifiedCacheKey(key), ConfigureEntryOptions(options), cancellationToken).ConfigureAwait(false);
+        return (fr.HasValue, fr.GetValueOrDefault());
+    }
+
+    /// <inheritdoc/>
+    public async Task<T?> GetOrDefaultByKeyAsync<T>(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+        => await _fusionCache.GetOrDefaultAsync<T>(KeyProvider.GetFullyQualifiedCacheKey(key), default, ConfigureEntryOptions(options), cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc/>
+    public async Task<T> GetOrCreateByKeyAsync<T>(string key, Func<CancellationToken, Task<T>> factory, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+        => await _fusionCache.GetOrSetAsync(KeyProvider.GetFullyQualifiedCacheKey(key), async ct => await factory(ct).ConfigureAwait(false), ConfigureEntryOptions(options), options?.Tags, cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc/>
+    public async Task SetByKeyAsync<T>(string key, T value, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+        => await _fusionCache.SetAsync(KeyProvider.GetFullyQualifiedCacheKey(key), value, ConfigureEntryOptions(options), options?.Tags, cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc/>
+    public async Task RemoveByKeyAsync(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+        => await _fusionCache.RemoveAsync(KeyProvider.GetFullyQualifiedCacheKey(key), ConfigureEntryOptions(options), cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc/>
+    public async Task RemoveByTagAsync(string tag, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+        => await _fusionCache.RemoveByTagAsync(tag, ConfigureEntryOptions(options), cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc/>
+    public async Task RemoveByTagAsync(IEnumerable<string> tags, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+        => await _fusionCache.RemoveByTagAsync(tags, ConfigureEntryOptions(options), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Convert and configure.
+    /// </summary>
+    private FusionCacheEntryOptions ConfigureEntryOptions(HybridCacheEntryOptions? options)
+    {
+        var fco = (options ?? HybridCacheEntryOptions.CreateDefault()).ToFusionCacheEntryOptions();
+        _configure?.Invoke(fco);
+        return fco;
+    }
+
+    /// <summary>
+    /// Provides an opportunity to further <paramref name="configure"/> the <see cref="FusionCacheEntryOptions"/> directly before use.
+    /// </summary>
+    /// <param name="configure">The action to configure the <see cref="FusionCacheEntryOptions"/>.</param>
+    /// <returns>The <see cref="FusionHybridCache"/> to support fluent-style method-chaining.</returns>
+    public FusionHybridCache ConfigureEntryOptions(Action<FusionCacheEntryOptions>? configure)
+    {
+        _configure = configure;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Caching.FusionCache/GlobalUsings.cs b/src/CoreEx.Caching.FusionCache/GlobalUsings.cs
new file mode 100644
index 00000000..67e83b15
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/GlobalUsings.cs
@@ -0,0 +1,3 @@
+global using CoreEx;
+global using CoreEx.Caching;
+global using ZiggyCreatures.Caching.Fusion;
\ No newline at end of file
diff --git a/src/CoreEx.Caching.FusionCache/README.md b/src/CoreEx.Caching.FusionCache/README.md
new file mode 100644
index 00000000..18039a97
--- /dev/null
+++ b/src/CoreEx.Caching.FusionCache/README.md
@@ -0,0 +1,38 @@
+# CoreEx.Caching.FusionCache
+
+> Provides a `FusionHybridCache` implementation of `IHybridCache` backed by the ZiggyCreatures FusionCache library, bridging CoreEx caching contracts to FusionCache's L1/L2 hybrid and backplane capabilities.
+
+## Overview
+
+`CoreEx.Caching.FusionCache` binds the `IHybridCache` abstraction defined in `CoreEx` to the open-source <a href="https://github.com/ZiggyCreatures/FusionCache">FusionCache</a> library. Application code that depends on `IHybridCache` requires no changes; swapping in `FusionHybridCache` upgrades the backing store from the built-in `MemoryOnlyHybridCache` to FusionCache's full feature set, including a configurable L1 in-memory cache, an optional L2 distributed cache (e.g. Redis), a memory backplane for multi-node cache coherence, and tag-based invalidation.
+
+The package is deliberately thin: `FusionHybridCache` delegates every cache operation to the underlying `IFusionCache` instance after applying key qualification via `ICacheKeyProvider` and translating `HybridCacheEntryOptions` into `FusionCacheEntryOptions` via `FusionCacheExtensions.ToFusionCacheEntryOptions`. The `CacheStrategy` enum governs which tiers participate in each operation — `Local` disables the distributed tier, `Distributed` disables the in-memory tier, and `Hybrid` (the default) uses both.
+
+## Key capabilities
+
+- 🧩 **`IHybridCache` implementation**: `FusionHybridCache` fulfils all `IHybridCache` contract methods — `TryGetByKeyAsync`, `GetOrDefaultByKeyAsync`, `GetOrCreateByKeyAsync`, `SetByKeyAsync`, `RemoveByKeyAsync`, and `RemoveByTagAsync` — against an `IFusionCache` instance.
+- 🔄 **Options translation**: `FusionCacheExtensions.ToFusionCacheEntryOptions` maps `HybridCacheEntryOptions` (`LocalExpiration`, `DistributedExpiration`, `CacheStrategy`, `Tags`) directly to a `FusionCacheEntryOptions` instance, including `SkipDistributedCache*` and `SkipMemoryCache*` flags derived from `CacheStrategy`.
+- 📦 **L1/L2 and backplane support**: relies on FusionCache's own backplane packages (`ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis`, `ZiggyCreatures.FusionCache.Backplane.Memory`) and serializer (`ZiggyCreatures.FusionCache.Serialization.SystemTextJson`) that are bundled as transitive dependencies.
+- 🏷 **Tag-based invalidation**: `RemoveByTagAsync` delegates to FusionCache's native tag-eviction API, allowing entire categories of cache entries to be invalidated by a single call.
+- 🔧 **Single-line DI registration**: `AddFusionHybridCache()` registers `FusionHybridCache` as the scoped `IHybridCache` service; composing it with FusionCache's own `AddFusionCache()` setup is the only wiring required.
+- **Entry-options escape hatch**: `FusionHybridCache.ConfigureEntryOptions(Action<FusionCacheEntryOptions>)` accepts a fluent callback invoked on every translated `FusionCacheEntryOptions` before use, giving access to any FusionCache-specific setting not covered by `HybridCacheEntryOptions`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`FusionHybridCache`](./FusionHybridCache.cs)** | `IHybridCache` implementation backed by `IFusionCache`; qualifies keys via `ICacheKeyProvider`, translates options, and supports a per-instance `ConfigureEntryOptions` callback for advanced FusionCache settings. |
+| **[`FusionCacheExtensions`](./FusionCacheExtensions.cs)** | Static extension class; `ToFusionCacheEntryOptions(HybridCacheEntryOptions?)` performs the `CacheStrategy`-aware options translation. |
+
+## Related namespaces
+
+- **[`CoreEx`](../CoreEx/README.md)** - Defines `IHybridCache`, `HybridCacheEntryOptions`, `CacheStrategy`, and `ICacheKeyProvider` that this package implements and consumes.
+
+## Additional resources
+
+- [ZiggyCreatures FusionCache](https://github.com/ZiggyCreatures/FusionCache) — the underlying caching library.
+- [FusionCache backplane documentation](https://github.com/ZiggyCreatures/FusionCache/blob/main/docs/Backplane.md) — configuring Redis or memory backplanes for multi-node coherence.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/AGENTS.md b/src/CoreEx.CodeGen/AGENTS.md
new file mode 100644
index 00000000..e892860d
--- /dev/null
+++ b/src/CoreEx.CodeGen/AGENTS.md
@@ -0,0 +1,52 @@
+# CoreEx.CodeGen — AI Usage Guide
+
+`CoreEx.CodeGen` is a **development-time** code generation tool — it is never deployed at runtime. It reads a `ref-data.yaml` file and generates the complete reference-data layer (contract, controller, service, repository, mapper) as `.g.cs` files.
+
+## Setup
+
+Create a console project (e.g. `MyApp.CodeGen`) and add a `Program.cs` with one line:
+
+```csharp
+await CoreEx.CodeGen.CodeGenConsole.Create().RunAsync(args);
+```
+
+Place `ref-data.yaml` alongside `Program.cs`.
+
+## ref-data.yaml Structure
+
+```yaml
+collectionSortOrder: Code     # default sort for all reference data collections
+
+entities:
+  - name: Status
+    idType: int               # Id property type; defaults to string
+    properties:
+      - name: IsExternal
+        type: bool
+        default: false
+  - name: Country
+  - name: Currency
+```
+
+Run the project (`dotnet run`) to regenerate all `.g.cs` files after changing the YAML.
+
+## Generated Outputs
+
+| Output | Layer | What changes it |
+|---|---|---|
+| `Contracts/**/*.g.cs` | Contracts | `ref-data.yaml` entity/property config |
+| `**/Controllers/**/*.g.cs` | Api | `ref-data.yaml` route/entity config |
+| `**/Services/**/*.g.cs` | Application | `ref-data.yaml` entity config |
+| `**/Repositories/**/*.g.cs` | Infrastructure | `ref-data.yaml` repository/mapper config |
+| `**/Mappers/**/*.g.cs` | Infrastructure | `ref-data.yaml` property config |
+
+## Do Not
+
+- Do not edit `*.g.cs` files — they are overwritten on every generation run. Edit `ref-data.yaml` or the Handlebars templates in the `CoreEx.CodeGen` package instead.
+- Do not add `CoreEx.CodeGen` as a runtime dependency — it is a development tool only.
+
+## Further Reading
+
+- [README](./README.md) — full YAML schema, script structure, and template customisation reference.
+- [Tooling](../../samples/docs/tooling.md) — how `*.CodeGen` and `*.Database` projects are used together in the sample solution, including run order and generated-file ownership.
+- [Contracts layer](../../samples/docs/contracts-layer.md) — shows generated reference-data contracts (`[ReferenceData]`) and how `ref-data.yaml` drives the controller/service/repository layer.
diff --git a/src/CoreEx.CodeGen/CodeGenConsole.cs b/src/CoreEx.CodeGen/CodeGenConsole.cs
new file mode 100644
index 00000000..09696d57
--- /dev/null
+++ b/src/CoreEx.CodeGen/CodeGenConsole.cs
@@ -0,0 +1,65 @@
+using McMaster.Extensions.CommandLineUtils;
+
+namespace CoreEx.CodeGen;
+
+/// <summary>
+/// <b>CoreEx</b>-specific code-generation console.
+/// </summary>
+/// <remarks>This is the main entry point for code generation and is responsible for processing the configuration and invoking the appropriate code generators.
+/// <para>Supported code generators include: <b>Reference-data</b> as determined by the existence of the <c>ref-data.yaml</c>.</para></remarks>
+public class CodeGenConsole : OnRamp.Console.CodeGenConsole
+{
+    private CommandArgument<CommandType>? _cmdArg;
+
+    /// <summary>
+    /// Gets the default masthead text.
+    /// </summary>
+    /// <remarks>Defaults to 'CoreEx Code-Gen Tool' formatted using <see href="https://www.patorjk.com/software/taag/#p=display&amp;f=Calvin+S&amp;t=CoreEx+Code-Gen+Tool%0A"/>.</remarks>
+    public const string DefaultMastheadText = @"
+╔═╗┌─┐┬─┐┌─┐╔═╗─┐ ┬  ╔═╗┌─┐┌┬┐┌─┐  ╔═╗┌─┐┌┐┌  ╔╦╗┌─┐┌─┐┬  
+║  │ │├┬┘├┤ ║╣ ┌┴┬┘  ║  │ │ ││├┤───║ ╦├┤ │││   ║ │ ││ ││  
+╚═╝└─┘┴└─└─┘╚═╝┴ └─  ╚═╝└─┘─┴┘└─┘  ╚═╝└─┘┘└┘   ╩ └─┘└─┘┴─┘
+";
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="CodeGenConsole"/> class using the calling assembly for code generation.
+    /// </summary>
+    /// <returns>The <see cref="CodeGenConsole"/> instance.</returns>
+    public static CodeGenConsole Create() => Create([Assembly.GetCallingAssembly()]);
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="CodeGenConsole"/> class using the specified assemblies for code generation.
+    /// </summary>
+    /// <param name="assemblies">The assemblies to use for code generation.</param>
+    /// <returns>The <see cref="CodeGenConsole"/> instance.</returns>
+    public static CodeGenConsole Create(Assembly[] assemblies)
+    {
+        var path = GetBaseExeDirectory();
+        var args = CodeGeneratorArgs.Create<CodeGenConsole>("ref-data-script.yaml", Path.Combine(path, "ref-data.yaml")).AddAssembly(typeof(CodeGenConsole).Assembly).AddAssembly(assemblies);
+        args.OutputDirectory = new DirectoryInfo(path);
+        return new CodeGenConsole(args);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CodeGenConsole"/> class.
+    /// </summary>
+    private CodeGenConsole(CodeGeneratorArgs args) : base(args, OnRamp.Console.SupportedOptions.AllExceptDatabase) => MastheadText = DefaultMastheadText;
+
+    /// <inheritdoc/>
+    protected override void OnBeforeExecute(CommandLineApplication app)
+    {
+        // Add the command argument.
+        _cmdArg = app.Argument<CommandType>("command", "The command to execute.");
+        _cmdArg.DefaultValue = CommandType.RefData;
+    }
+
+    /// <inheritdoc/>
+    protected override async Task<CodeGenStatistics> OnCodeGenerationAsync()
+    {
+        var cmd = _cmdArg?.ParsedValue ?? CommandType.RefData;
+        if (cmd == CommandType.RefData)
+            return await base.OnCodeGenerationAsync().ConfigureAwait(false);
+
+        return await new Counting.CodeGenCounter(Args).CountAsync().ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/CommandType.cs b/src/CoreEx.CodeGen/CommandType.cs
new file mode 100644
index 00000000..676010b8
--- /dev/null
+++ b/src/CoreEx.CodeGen/CommandType.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.CodeGen;
+
+/// <summary>
+/// Represents the command type.
+/// </summary>
+public enum CommandType
+{
+    /// <summary>
+    /// Execute the reference-data code generation (default).
+    /// </summary>
+    RefData,
+
+    /// <summary>
+    /// Counts the files and lines of code distinguishing between generated and non-generated.
+    /// </summary>
+    Count
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/CoreEx.CodeGen.csproj b/src/CoreEx.CodeGen/CoreEx.CodeGen.csproj
new file mode 100644
index 00000000..8299ef21
--- /dev/null
+++ b/src/CoreEx.CodeGen/CoreEx.CodeGen.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx .NET Code-Generation extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the code-generation of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data code-generation handlebars onramp</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="OnRamp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Scripts\**\*" />
+    <EmbeddedResource Include="**\Templates\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="docs\" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/CoreEx.CodeGen/Counting/CodeGenCounter.cs b/src/CoreEx.CodeGen/Counting/CodeGenCounter.cs
new file mode 100644
index 00000000..db6a7d35
--- /dev/null
+++ b/src/CoreEx.CodeGen/Counting/CodeGenCounter.cs
@@ -0,0 +1,62 @@
+namespace CoreEx.CodeGen.Counting;
+
+internal class CodeGenCounter(CodeGeneratorArgs args)
+{
+    private static readonly string[] _countExtensions = [".cs", ".json", ".jsn", ".yaml", ".yml", ".xml", ".sql", ".mysql", ".pgsql"];
+
+    public Task<CodeGenStatistics> CountAsync()
+    {
+        if (args is null || args.OutputDirectory?.Parent is null || args.Logger is null)
+            throw new ArgumentNullException(nameof(args), "Arguments, and its OutputDirectory, and Logger cannot be null.");
+
+        if (!args.Logger.IsEnabled(LogLevel.Information))
+            throw new ArgumentException("Logger must be enabled for Information level.", nameof(args));
+
+        args.Logger.LogInformation("{Content}", $"Counting: {args.OutputDirectory.Parent.FullName}");
+        args.Logger.LogInformation("{Content}", $"Include: {string.Join(", ", _countExtensions)}");
+        args.Logger.LogInformation("{Content}", string.Empty);
+
+        var sw = Stopwatch.StartNew();
+        var dcs = new DirectoryCountStatistics(args.OutputDirectory.Parent);
+        CountDirectoryAndItsChildren(dcs);
+
+        var columnLength = Math.Max(dcs.TotalLineCount.ToString().Length, 5);
+        dcs.Write(args.Logger, columnLength, 0, dcs.Directory.Parent is null ? 0 : dcs.Directory.Parent.FullName.Length + 1);
+
+        args.Logger.LogInformation("{Content}", string.Empty);
+        args.Logger.LogInformation("{Content}", "Note: Roslyn source generated files are excluded from the counts.");
+
+        sw.Stop();
+        return Task.FromResult(new CodeGenStatistics { ElapsedMilliseconds = sw.ElapsedMilliseconds });
+    }
+
+    /// <summary>
+    /// Count the directory and its children (recursive).
+    /// </summary>
+    private static void CountDirectoryAndItsChildren(DirectoryCountStatistics dcs)
+    {
+        foreach (var di in dcs.Directory.EnumerateDirectories())
+        {
+            if (di.Name.Equals("obj", StringComparison.InvariantCultureIgnoreCase) || di.Name.Equals("bin", StringComparison.InvariantCultureIgnoreCase) || di.Name.StartsWith('.'))
+                continue;
+
+            CountDirectoryAndItsChildren(dcs.AddChildDirectory(di));
+        }
+
+        foreach (var fi in dcs.Directory.EnumerateFiles())
+        {
+            if (!_countExtensions.Contains(fi.Extension, StringComparer.InvariantCultureIgnoreCase))
+                continue;
+
+            bool isGenerated = fi.Name.EndsWith($".g{fi.Extension}", StringComparison.OrdinalIgnoreCase);
+
+            using var sr = fi.OpenText();
+            while (sr.ReadLine() is not null)
+            {
+                dcs.IncrementLineCount(isGenerated);
+            }
+
+            dcs.IncrementFileCount(isGenerated);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/Counting/DirectoryCountStatistics.cs b/src/CoreEx.CodeGen/Counting/DirectoryCountStatistics.cs
new file mode 100644
index 00000000..59dd3ef0
--- /dev/null
+++ b/src/CoreEx.CodeGen/Counting/DirectoryCountStatistics.cs
@@ -0,0 +1,146 @@
+namespace CoreEx.CodeGen.Counting;
+
+/// <summary>
+/// Provides <see cref="DirectoryInfo"/> count statistics.
+/// </summary>
+internal class DirectoryCountStatistics(DirectoryInfo directory)
+{
+    /// <summary>
+    /// Gets the <see cref="DirectoryInfo"/>.
+    /// </summary>
+    public DirectoryInfo Directory { get; } = directory;
+
+    /// <summary>
+    /// Gets the file count.
+    /// </summary>
+    public int FileCount { get; private set; }
+
+    /// <summary>
+    /// Gets the total file count including children.
+    /// </summary>
+    public int TotalFileCount => FileCount + Children.Sum(x => x.TotalFileCount);
+
+    /// <summary>
+    /// Gets the generated file count.
+    /// </summary>
+    public int GeneratedFileCount { get; private set; }
+
+    /// <summary>
+    /// Gets the total generated file count including children.
+    /// </summary>
+    public int GeneratedTotalFileCount => GeneratedFileCount + Children.Sum(x => x.GeneratedTotalFileCount);
+
+    /// <summary>
+    /// Gets the line count;
+    /// </summary>
+    public int LineCount { get; private set; }
+
+    /// <summary>
+    /// Gets the total line count including children.
+    /// </summary>
+    public int TotalLineCount => LineCount + Children.Sum(x => x.TotalLineCount);
+
+    /// <summary>
+    /// Gets the generated line count.
+    /// </summary>
+    public int GeneratedLineCount { get; private set; }
+
+    /// <summary>
+    /// Gets the total line count including children.
+    /// </summary>
+    public int GeneratedTotalLineCount => GeneratedLineCount + Children.Sum(x => x.GeneratedTotalLineCount);
+
+    /// <summary>
+    /// Gets the child <see cref="DirectoryCountStatistics"/> instances.
+    /// </summary>
+    public List<DirectoryCountStatistics> Children { get; } = [];
+
+    /// <summary>
+    /// Increments the file count.
+    /// </summary>
+    public void IncrementFileCount(bool isGenerated)
+    {
+        FileCount++;
+        if (isGenerated)
+            GeneratedFileCount++;
+    }
+
+    /// <summary>
+    /// Increments the line count.
+    /// </summary>
+    public void IncrementLineCount(bool isGenerated)
+    {
+        LineCount++;
+        if (isGenerated)
+            GeneratedLineCount++;
+    }
+
+    /// <summary>
+    /// Adds a child <see cref="DirectoryCountStatistics"/> instance.
+    /// </summary>
+    public DirectoryCountStatistics AddChildDirectory(DirectoryInfo di)
+    {
+        var dcs = new DirectoryCountStatistics(di);
+        Children.Add(dcs);
+        return dcs;
+    }
+
+    /// <summary>
+    /// Write the count statistics.
+    /// </summary>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    /// <param name="columnLength">The maximum column length.</param>
+    /// <param name="indent">The indent size to show hierarchy.</param>
+    /// <param name="remove">The number of characters to remove from directory </param>
+    public void Write(ILogger logger, int columnLength, int indent, int remove)
+    {
+        if (indent == 0)
+        {
+            var hdrAll = string.Format("{0, " + columnLength + "}", "All");
+            var hdrGen = string.Format("{0, " + (columnLength + 5) + "}", "Generated");
+            var hdrfiles = string.Format("{0, " + columnLength + "}", "Files");
+            var hdrlines = string.Format("{0, " + columnLength + "}", "Lines");
+
+            logger.LogInformation("{Content}", $"{hdrAll} | {hdrAll} | {hdrGen} | {hdrGen} | Path/");
+            logger.LogInformation("{Content}", $"{hdrfiles} | {hdrlines} | {hdrfiles} Perc | {hdrlines} Perc | Directory");
+
+            int maxLength = 0;
+            DirectoryDepthAnalysis(this, 0, ref maxLength);
+            logger.LogInformation("{Content}", new string('-', (columnLength * 4) + 22 + maxLength - remove));
+        }
+
+        var totfiles = string.Format("{0, " + columnLength + "}", TotalFileCount);
+        var totlines = string.Format("{0, " + columnLength + "}", TotalLineCount);
+        var totgenFiles = string.Format("{0, " + columnLength + "}", GeneratedTotalFileCount);
+        var totgenFilesPerc = string.Format("{0, " + 3 + "}", GeneratedTotalFileCount == 0 ? 0 : Math.Round((double)GeneratedTotalFileCount / (double)TotalFileCount * 100.0, 0));
+        var totgenLines = string.Format("{0, " + columnLength + "}", GeneratedTotalLineCount);
+        var totgenLinesPerc = string.Format("{0, " + 3 + "}", GeneratedTotalLineCount == 0 ? 0 : Math.Round((double)GeneratedTotalLineCount / (double)TotalLineCount * 100.0, 0));
+
+        string spacer;
+        if (indent == 0)
+            spacer = string.Empty;
+        else
+            spacer = new string(' ', (indent - 1) * 2) + "- ";
+
+        logger.LogInformation("{Content}", $"{totfiles}   {totlines}   {totgenFiles} {totgenFilesPerc}%   {totgenLines} {totgenLinesPerc}%   {spacer}{Directory.FullName[remove..]}");
+
+        foreach (var dcs in Children)
+        {
+            if (dcs.TotalFileCount > 0)
+                dcs.Write(logger, columnLength, indent + 1, remove);
+        }
+    }
+
+    /// <summary>
+    /// Performs directory depth and length analysis.
+    /// </summary>
+    private static void DirectoryDepthAnalysis(DirectoryCountStatistics dcs, int depth, ref int maxLength)
+    {
+        maxLength = Math.Max(maxLength, dcs.Directory.FullName.Length + (depth * 2));
+
+        foreach (var d in dcs.Children)
+        {
+            DirectoryDepthAnalysis(d, depth + 1, ref maxLength);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/Counting/README.md b/src/CoreEx.CodeGen/Counting/README.md
new file mode 100644
index 00000000..367081b9
--- /dev/null
+++ b/src/CoreEx.CodeGen/Counting/README.md
@@ -0,0 +1,26 @@
+# CoreEx.CodeGen.Counting
+
+> Provides file and line counting utilities that report the proportion of generated vs. hand-authored code across the solution output directories.
+
+## Overview
+
+`CoreEx.CodeGen.Counting` implements the `Count` command exposed by `CodeGenConsole`. When invoked, `CodeGenCounter` walks the output directories that the code-generation run would target, classifies each `.cs` file as generated (`.g.cs` suffix) or hand-authored, and accumulates per-directory totals into a `DirectoryCountStatistics` tree. The tree is then rendered as a formatted table — columns for total files, total lines, generated file count with percentage, and generated line count with percentage — indented to reflect directory hierarchy.
+
+This is a diagnostic aid for understanding the relative investment in generated vs. bespoke code across a CoreEx solution.
+
+## Key capabilities
+
+- 🔍 **Generated-file detection**: classifies `.cs` files by the `.g.cs` suffix convention, matching the output pattern of the reference-data code-generation pipeline.
+- 📊 **Hierarchical statistics**: `DirectoryCountStatistics` accumulates counts at each directory level and aggregates totals recursively across children for roll-up reporting.
+- 🖨️ **Formatted table output**: `DirectoryCountStatistics.Write` renders a multi-column table (all files, all lines, generated files %, generated lines %) to the `ILogger`, with directory hierarchy shown through indentation.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`CodeGenCounter`](./CodeGenCounter.cs)** | Walks the solution output directories, classifies files, and builds the `DirectoryCountStatistics` tree; drives the `Count` command in `CodeGenConsole`. |
+| **[`DirectoryCountStatistics`](./DirectoryCountStatistics.cs)** | Holds file and line counts (total and generated) for one directory and its children; supports recursive totals and formatted log-table rendering via `Write`. |
+
+## Related namespaces
+
+- **[`CoreEx.CodeGen`](../README.md)** - Root package; the `Count` value of `CommandType` activates this pipeline via `CodeGenConsole`.
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/GlobalUsing.cs b/src/CoreEx.CodeGen/GlobalUsing.cs
new file mode 100644
index 00000000..5ca08673
--- /dev/null
+++ b/src/CoreEx.CodeGen/GlobalUsing.cs
@@ -0,0 +1,8 @@
+global using CoreEx.CodeGen.RefData.Config;
+global using Microsoft.Extensions.Logging;
+global using OnRamp;
+global using OnRamp.Config;
+global using OnRamp.Generators;
+global using System.Diagnostics;
+global using System.Reflection;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/README.md b/src/CoreEx.CodeGen/README.md
new file mode 100644
index 00000000..37e81204
--- /dev/null
+++ b/src/CoreEx.CodeGen/README.md
@@ -0,0 +1,111 @@
+# CoreEx.CodeGen
+
+> Provides the CoreEx development-time code-generation tooling: a deterministic, schema-driven pipeline that scaffolds the full reference-data implementation — contract, controller, service, repository interface, repository, and mapper — from a single YAML configuration file.
+
+## Overview
+
+`CoreEx.CodeGen` is a console-executable tooling package used **during development**, not at runtime. It reads a developer-authored `ref-data.yaml` file (validated against [`schema/coreex-refdata.json`](../../schema/coreex-refdata.json)) as its sole configuration source, then produces the `.g.cs` generated files that implement the complete reference-data layer across the Contracts, Api, Application, and Infrastructure projects of a CoreEx solution.
+
+Generation is orchestrated by [OnRamp](https://github.com/Avanade/OnRamp), which loads `ref-data-script.yaml` (embedded in the package) to discover the ordered sequence of generation steps. Each step binds a generator class to a Handlebars template and an output path; OnRamp resolves the template, evaluates it against the typed configuration model, and writes the result. Templates reside in `RefData/Templates/` and are also embedded so the package is entirely self-contained.
+
+The package exposes `CodeGenConsole`, a thin wrapper around `OnRamp.Console.CodeGenConsole`, as its entry point. A consuming project needs only a single `Program.cs` line to wire up the generator. A secondary `Count` command is available to report generated vs. hand-authored file and line counts across the solution directories.
+
+## Motivation
+
+- Reference data (lookup tables) follows a well-understood, deterministic pattern: each entity needs a contract class, a controller route, a service method, a repository interface, a repository implementation, and a mapper. Writing these by hand is repetitive and error-prone.
+- Centralising the pattern in code-generation ensures every entity is consistent — identical structure, naming conventions, route patterns, and EF mapping — with no room for per-entity drift.
+- The YAML input and JSON schema act as a concise, reviewable declaration of the domain's reference data catalogue; the generated output is an artefact, not something developers need to maintain.
+- Embedding the script and templates inside the NuGet package means consuming projects carry no additional files — only a `ref-data.yaml` and a one-line `Program.cs`.
+
+## Key capabilities
+
+- 📄 **Schema-validated YAML input**: `ref-data.yaml` is validated against `schema/coreex-refdata.json`; the schema covers root settings (`domain`, `idType`, `collectionSortOrder`, `route`, `routeConvention`, `repository`) and per-entity / per-property overrides.
+- 🔧 **Script-driven generation**: `ref-data-script.yaml` (embedded) defines the ordered generation steps — contract, controller, service, repository interface, repository, and mapper — each bound to a generator class and a Handlebars template.
+- 📐 **Handlebars templates**: six `.hbs` templates (embedded in `RefData/Templates/`) produce idiomatic CoreEx C# across all target layers; output files carry a `.g.cs` suffix to clearly distinguish generated from hand-authored code.
+- 🏗️ **Multi-layer output**: a single run generates artefacts across four project directories — Contracts, Api, Application, and Infrastructure — all resolved automatically from the CodeGen project's location by convention.
+- 🗺️ **EF Core mapper generation**: the `MapperGenerator` emits a typed mapper per entity, with per-property mapping directives derived from the `PropertyConfig`; entities can opt out via `excludeMapper: true`.
+- 📊 **Code-count reporting**: the `Count` command walks the solution output directories and reports total vs. generated file and line counts per directory, helping track the proportion of the codebase that is generated.
+
+## Usage
+
+A CodeGen project is a minimal console executable that references this package. Create a project at e.g. `My.App.Sales.CodeGen`, add the project reference, then write:
+
+**`Program.cs`**
+```csharp
+await CoreEx.CodeGen.CodeGenConsole.Create().RunAsync(args);
+```
+
+**`ref-data.yaml`** — place alongside `Program.cs`:
+```yaml
+collectionSortOrder: Code
+repository: EntityFramework
+entities:
+- name: Status
+- name: Region
+  properties:
+  - name: CountryCode
+    type: ^Country
+- name: Currency
+  plural: Currencies
+  idType: Guid
+```
+
+Run from the project directory:
+```
+dotnet run
+```
+
+The generator resolves the Contracts, Api, Application, and Infrastructure project directories relative to the CodeGen project's location by convention (e.g. `../My.App.Sales.Contracts`, `../My.App.Sales.Api`, etc.), then writes `.g.cs` files into the appropriate sub-folders.
+
+To report code counts instead of generating:
+```
+dotnet run -- count
+```
+
+## Schema
+
+The [`schema/coreex-refdata.json`](../../schema/coreex-refdata.json) JSON Schema defines the structure and validation rules for `ref-data.yaml`. 
+The hierarchy is as follows:
+
+```
+CodeGeneration
+└── Entity(s)
+  └── Property(s)
+```
+
+Configuration details for each of the above are as follows:
+
+- [`CodeGeneration`](./docs/CodeGeneration.md)
+- [`Entity`](./docs/Entity.md)
+- [`Property`](./docs/Property.md)
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`CodeGenConsole`](./CodeGenConsole.cs)** | Entry point for the code-generation tool; wraps `OnRamp.Console.CodeGenConsole`, loads `ref-data.yaml` and `ref-data-script.yaml`, and exposes the `RefData` and `Count` commands. |
+| **[`CommandType`](./CommandType.cs)** | Enum selecting the command to execute: `RefData` (default — runs code generation) or `Count` (reports file and line statistics). |
+| **[`CodeGenConfig`](./RefData/Config/CodeGenConfig.cs)** | Root configuration model for reference-data generation; maps directly to the top-level YAML and resolves all project directory paths, namespace defaults, and entity collection preparation. |
+| **[`EntityConfig`](./RefData/Config/EntityConfig.cs)** | Per-entity configuration: name, plural, text, `idType`, `collectionSortOrder`, route, repository mode, model name, mapper name, `excludeMapper`, and the property collection. |
+| **[`PropertyConfig`](./RefData/Config/PropertyConfig.cs)** | Per-property configuration: name, type (with `^`-prefix for reference-data and `?`-suffix for nullable), text, data model property name, and exclude flags for contract and mapping generation. |
+| **[`RootGenerator`](./RefData/Generators/RootGenerator.cs)** | `CodeGeneratorBase` implementation that selects `CodeGenConfig` as its single generation target; used for the controller, service, repository interface, and repository templates. |
+| **[`ContractGenerator`](./RefData/Generators/ContractGenerator.cs)** | `CodeGeneratorBase` implementation that iterates all `EntityConfig` entries to produce one contract file per entity. |
+| **[`MapperGenerator`](./RefData/Generators/MapperGenerator.cs)** | `CodeGeneratorBase` implementation that iterates `EntityConfig` entries where `excludeMapper` is not `true`, producing one mapper file per entity. |
+| **[`CodeGenCounter`](./Counting/CodeGenCounter.cs)** | Walks the solution output directories and counts total vs. generated files and lines; drives the `Count` command output. |
+| **[`DirectoryCountStatistics`](./Counting/DirectoryCountStatistics.cs)** | Aggregates file and line counts (total and generated) for a single directory and its children; renders a formatted hierarchy table to the logger. |
+
+## Namespaces
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.CodeGen.RefData`** | Reference-data generation pipeline: typed configuration models (`Config`), generator classes (`Generators`), and the embedded Handlebars templates (`Templates`). | [📖 README](./RefData/README.md) |
+| **`CoreEx.CodeGen.Counting`** | File and line counting utilities for reporting generated vs. hand-authored code proportions across solution directories. | [📖 README](./Counting/README.md) |
+
+## Additional Resources
+
+- [OnRamp](https://github.com/Avanade/OnRamp) — the underlying code-generation orchestration framework used to load the script, resolve templates, and manage file output.
+- [CoreEx ref-data schema](../../schema/coreex-refdata.json) — JSON Schema for `ref-data.yaml`; use it with IDE YAML language-server support for validation and auto-complete while authoring configuration.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Config/CodeGenConfig.cs b/src/CoreEx.CodeGen/RefData/Config/CodeGenConfig.cs
new file mode 100644
index 00000000..db39c1df
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Config/CodeGenConfig.cs
@@ -0,0 +1,279 @@
+namespace CoreEx.CodeGen.RefData.Config;
+
+/// <summary>
+/// Provides the root code-generation configuration.
+/// </summary>
+[CodeGenClass("CodeGeneration", Title = "Reference-data code-generation.", Description = "This configuration is used for generating reference-data related code. This is a well understood, deterministic pattern, that is best suited for scenarios where reference-data capabilities are required in a consistent manner.")]
+[CodeGenCategory("Primary", Title = "Provides the _primary_ configuration.")]
+[CodeGenCategory("API", Title = "Provides the configuration for the generated API code.")]
+[CodeGenCategory("Repository", Title = "Provides the configuration for the generated repository code.")]
+[CodeGenCategory("Paths", Title = "Provides the configuration for the paths used in code generation.")]
+[CodeGenCategory("Collections", Title = "Provides the collections configuration.")]
+public class CodeGenConfig : ConfigRootBase<CodeGenConfig>
+{
+    private readonly string _codeGenName = Assembly.GetEntryAssembly()?.GetName().Name ?? "??";
+
+    /// <summary>
+    /// Gets the entry assembly name for the initiating code-generation.
+    /// </summary>
+    public string CodeGenName => _codeGenName;
+
+    /// <summary>
+    /// Gets or sets the .NET domain name.
+    /// </summary>
+    [JsonPropertyName("domain")]
+    [CodeGenProperty("Primary", Title = "The domain name.", IsImportant = true, Description = "This is the .NET domain name. Attempts to default from the underlying data project file path; uses the second to last segment of the child-most sub-directory by convention. For example, `/xxx/yyy/My.App.Sales.CodeGen`, the domain would be `Sales`.")]
+    public string? Domain { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default identifier type.
+    /// </summary>
+    [JsonPropertyName("idType")]
+    [CodeGenProperty("Primary", Title = "The default reference data identifier type.", IsImportant = true, Options = ["String", "Guid", "Int32", "Int64"], Description = "Defaults to `String`.")]
+    public string? IdType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default collection sort order.
+    /// </summary>
+    [JsonPropertyName("collectionSortOrder")]
+    [CodeGenProperty("Primary", Title = "The default reference data collection sort order.", IsImportant = true, Options = ["Code", "Id", "Text", "SortOrder"], Description = "This is the default collection sort order. Defaults to `Code`.")]
+    public string? CollectionSortOrder { get; set; }
+
+    #region API
+
+    /// <summary>
+    /// Gets or sets the route prefix.
+    /// </summary>
+    [JsonPropertyName("route")]
+    [CodeGenProperty("API", Title = "The route prefix.", IsImportant = true, Description = "Defaults to `/api/refdata`.")]
+    public string? Route { get; set; }
+
+    /// <summary>
+    /// Gets or sets the route convention.
+    /// </summary>
+    [JsonPropertyName("routeConvention")]
+    [CodeGenProperty("API", Title = "The route naming convention where not directly specified.", IsImportant = true, Options = ["KebabCase", "SnakeCase", "CamelCase", "Lowercase"], Description = "Defaults to `KebabCase`.")]
+    public string? RouteConvention { get; set; }
+
+    #endregion
+
+    #region Repository
+
+    /// <summary>
+    /// Gets or sets the default repository implementation.
+    /// </summary>
+    [JsonPropertyName("repository")]
+    [CodeGenProperty("Repository", Title = "The default repository implementation.", IsMandatory = true, Options = ["None", "EntityFramework"])]
+    public string? Repository { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default Entity Framework repository parameter name.
+    /// </summary>
+    [JsonPropertyName("entityFrameworkRepositoryName")]
+    [CodeGenProperty("Repository", Title = "The default Entity Framework (EF) repository parameter name.", IsImportant = true, Description = "This is the .NET Entity Framework (EF) repository parameter name that should be used within the generated code. Defaults to `ef`.")]
+    public string? EntityFrameworkRepositoryName { get; set; }
+
+    #endregion
+
+    #region Paths
+
+    /// <summary>
+    /// Gets or sets the relative path to the contracts-related .NET project.
+    /// </summary>
+    [JsonPropertyName("contractsProjectPath")]
+    [CodeGenProperty("Paths", Title = "The relative path for the .NET contracts-related project.", Description = "Defaults to `Contracts`.")]
+    public string? ContractsProjectPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the relative path to the API-related .NET project.
+    /// </summary>
+    [JsonPropertyName("apiProjectPath")]
+    [CodeGenProperty("Paths", Title = "The relative path for the .NET API-related project.", Description = "Defaults to `Api`.")]
+    public string? ApiProjectPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the relative path to the application-related .NET project.
+    /// </summary>
+    [JsonPropertyName("applicationProjectPath")]
+    [CodeGenProperty("Paths", Title = "The relative path for the .NET application-related project.", Description = "Defaults to `Application`.")]
+    public string? ApplicationProjectPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the relative path to the data-related .NET project.
+    /// </summary>
+    [JsonPropertyName("dataProjectPath")]
+    [CodeGenProperty("Paths", Title = "The relative path for the .NET data-related project.", Description = "Defaults to automatic inference using expected name of `Infrastructure`.")]
+    public string? DataProjectPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to append to the <see cref="DataProjectPath"/> for the .NET generated repository code.
+    /// </summary>
+    [JsonPropertyName("dataRepositoriesPath")]
+    [CodeGenProperty("Paths", Title = "The path to append to the `{DotNetDataProjectPath}` for the .NET generated repository code.", Description = "Defaults to `Repositories`.")]
+    public string? DataRepositoriesPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to append to the <see cref="DataProjectPath"/> for the .NET data models code.
+    /// </summary>
+    [JsonPropertyName("dataModelsPath")]
+    [CodeGenProperty("Paths", Title = "The path to append to the `{DotNetDataProjectPath}` for the .NET generated models code.", Description = "Defaults to `Persistence`.")]
+    public string? DataModelsPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to append to the <see cref="DataProjectPath"/> for the .NET generated mapping code.
+    /// </summary>
+    [JsonPropertyName("dataMappingPath")]
+    [CodeGenProperty("Paths", Title = "The path to append to the `{DotNetDataProjectPath}` for the .NET generated mapping code.", Description = "Defaults to `Mapping`.")]
+    public string? DataMappingPath { get; set; }
+
+    #endregion
+
+    #region Collections
+
+    /// <summary>
+    /// Gets the list of configured entities.
+    /// </summary>
+    [JsonPropertyName("entities")]
+    [CodeGenPropertyCollection("Collections", Title = "The entity collection configuration.", IsImportant = true)]
+    public List<EntityConfig>? Entities { get; set; }
+
+    /// <summary>
+    /// Gets the list of configured entities that have a repository implementation specified (i.e. not 'None').
+    /// </summary>
+    public List<EntityConfig>? EntitiesWithRepository => Entities?.Where(x => x.Repository != "None").ToList();
+
+    /// <summary>
+    /// Gets the list of configured entities that have an API implementation specified (i.e. not excluded).
+    /// </summary>
+    public List<EntityConfig>? EntitiesWithApi => Entities?.Where(x => !(x.ExcludeApi ?? false)).ToList();
+
+    #endregion
+
+    /// <summary>
+    /// Gets the <see cref="DirectoryInfo"/> for the initiating code-generation project itself.
+    /// </summary>
+    public DirectoryInfo? CodeGenDirectory { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="DirectoryInfo"/> for the 'Contracts' project.
+    /// </summary>
+    public DirectoryInfo? ContractsDirectory { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="DirectoryInfo"/> for the 'API' project.
+    /// </summary>
+    public DirectoryInfo? ApiDirectory { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="DirectoryInfo"/> for the 'Application' project.
+    /// </summary>
+    public DirectoryInfo? ApplicationDirectory { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="DirectoryInfo"/> for the 'Data' project.
+    /// </summary>
+    public DirectoryInfo? DataDirectory { get; private set; }
+
+    /// <summary>
+    /// Gets the .NET namespace for the generated contracts code.
+    /// </summary>
+    public string? ContractsNamespace => ContractsDirectory?.Name;
+
+    /// <summary>
+    /// Gets the .NET namespace for the generated API code.
+    /// </summary>
+    public string? ApiNamespace => ApiDirectory?.Name;
+
+    /// <summary>
+    /// Gets the .NET namespace for the generated application code.
+    /// </summary>
+    public string? ApplicationNamespace => ApplicationDirectory?.Name;
+
+    /// <summary>
+    /// Gets or sets the .NET namespace for the generated data repositories code.
+    /// </summary>
+    public string? DataRepositoriesNamespace { get; set; }
+
+    /// <summary>
+    /// Gets or sets the .NET namespace for the generated data mapping code.
+    /// </summary>
+    public string? DataMappingNamespace { get; set; }
+
+    /// <inheritdoc/>
+    protected override async Task PrepareAsync()
+    {
+        // Get the base paths, etc.
+        CodeGenDirectory = CodeGenArgs?.OutputDirectory ?? throw new InvalidOperationException("The 'OutputDirectory' property of the 'CodeGenArgs' is not set.");
+        var parts = CodeGenDirectory.Name.Split('.');
+
+        // Using the Contracts project relative path, get the absolute path and ensure it exists.
+        if (ContractsProjectPath is not null)
+        {
+            if (!ContractsProjectPath.StartsWith('.'))
+                throw new CodeGenException(this, nameof(ContractsProjectPath), $"'{ContractsProjectPath}' should be a relative path to '{CodeGenArgs.OutputDirectory.FullName}'.");
+        }
+        else
+            ContractsProjectPath = Path.Combine("..", string.Join('.', parts.Take(parts.Length - 1).Append("Contracts")));
+
+        ContractsDirectory = new DirectoryInfo(Path.Combine(CodeGenArgs.OutputDirectory.FullName, ContractsProjectPath));
+        if (!ContractsDirectory.Exists)
+            throw new CodeGenException(this, nameof(ContractsProjectPath), $"'{ContractsProjectPath}' does not exist relative to '{CodeGenArgs.OutputDirectory.FullName}'.");
+
+        // Using the API project relative path, get the absolute path and ensure it exists.
+        if (ApiProjectPath is not null)
+        {
+            if (!ApiProjectPath.StartsWith('.'))
+                throw new CodeGenException(this, nameof(ApiProjectPath), $"'{ApiProjectPath}' should be a relative path to '{CodeGenArgs.OutputDirectory.FullName}'.");
+        }
+        else
+            ApiProjectPath = Path.Combine("..", string.Join('.', parts.Take(parts.Length - 1).Append("Api")));
+
+        ApiDirectory = new DirectoryInfo(Path.Combine(CodeGenArgs.OutputDirectory.FullName, ApiProjectPath));
+        if (!ApiDirectory.Exists)
+            CodeGenArgs.Logger!.LogWarning("The API project directory '{ApiDirectory}' does not exist relative to '{CodeGenDirectory}'. API-related code will not be generated.", ApiProjectPath, CodeGenDirectory.FullName);
+
+        // Using the Application project relative path, get the absolute path and ensure it exists.
+        if (ApplicationProjectPath is not null)
+        {
+            if (!ApplicationProjectPath.StartsWith('.'))
+                throw new CodeGenException(this, nameof(ApplicationProjectPath), $"'{ApplicationProjectPath}' should be a relative path to '{CodeGenArgs.OutputDirectory.FullName}'.");
+        }
+        else
+            ApplicationProjectPath = Path.Combine("..", string.Join('.', parts.Take(parts.Length - 1).Append("Application")));
+
+        ApplicationDirectory = new DirectoryInfo(Path.Combine(CodeGenArgs.OutputDirectory.FullName, ApplicationProjectPath));
+        if (!ApplicationDirectory.Exists)
+            throw new CodeGenException(this, nameof(ApplicationProjectPath), $"'{ApplicationProjectPath}' does not exist relative to '{CodeGenArgs.OutputDirectory.FullName}'.");
+
+        // Using the Data project relative path, get the absolute path and ensure it exists; also default the namespace(s).
+        if (DataProjectPath is not null)
+        {
+            if (!DataProjectPath.StartsWith('.'))
+                throw new CodeGenException(this, nameof(DataProjectPath), $"'{DataProjectPath}' should be a relative path to '{CodeGenArgs.OutputDirectory.FullName}'.");
+        }
+        else
+            DataProjectPath = Path.Combine("..", string.Join('.', parts.Take(parts.Length - 1).Append("Infrastructure")));
+
+        DataDirectory = new DirectoryInfo(Path.Combine(CodeGenArgs.OutputDirectory.FullName, DataProjectPath));
+        if (!DataDirectory.Exists)
+            throw new CodeGenException(this, nameof(DataProjectPath), $"'{DataProjectPath}' does not exist relative to '{CodeGenArgs.OutputDirectory.FullName}'.");
+
+        DataRepositoriesPath = DefaultWhereNull(DataRepositoriesPath, () => "Repositories");
+        DataModelsPath = DefaultWhereNull(DataModelsPath, () => "Persistence");
+        DataMappingPath = DefaultWhereNull(DataMappingPath, () => "Mapping");
+
+        DataRepositoriesNamespace = $"{DataDirectory.Name}.{DataRepositoriesPath}";
+        DataMappingNamespace = $"{DataDirectory.Name}.{DataMappingPath}";
+
+        // Default the domain name from the file path (2nd to last part) if not explicitly set.
+        Domain = DefaultWhereNull(Domain, () => parts.Length >= 2 ? parts[^2] : null) ?? throw new CodeGenException(this, nameof(Domain), $"Could not be defaulted from the file path; please explicitly set the property in the configuration.");
+        EntityFrameworkRepositoryName = DefaultWhereNull(EntityFrameworkRepositoryName, () => "ef");
+        IdType = DefaultWhereNull(IdType, () => "String");
+        CollectionSortOrder = DefaultWhereNull(CollectionSortOrder, () => "Code");
+        Route = DefaultWhereNull(Route, () => "/api/refdata");
+        RouteConvention = DefaultWhereNull(RouteConvention, () => "KebabCase");
+
+        // Load the entities configuration.
+        Entities = await PrepareCollectionAsync(Entities).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Config/EntityConfig.cs b/src/CoreEx.CodeGen/RefData/Config/EntityConfig.cs
new file mode 100644
index 00000000..00596b6b
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Config/EntityConfig.cs
@@ -0,0 +1,186 @@
+namespace CoreEx.CodeGen.RefData.Config;
+
+/// <summary>
+/// Provides the entity code-generation configuration.
+/// </summary>
+[CodeGenClass("Entity", Title = "Reference-data entity configuration.")]
+[CodeGenCategory("Primary", Title = "Provides the _primary_ configuration.")]
+[CodeGenCategory("API", Title = "Provides the configuration for the generated API code.")]
+[CodeGenCategory("Repository", Title = "Provides the configuration for the generated repository code.")]
+[CodeGenCategory("Mapping", Title = "Provides the configuration for the generated mapping code.")]
+[CodeGenCategory("Exclude", Title = "Provides the configuration for code generation exclusion.")]
+[CodeGenCategory("Collections", Title = "Provides the collections configuration.")]
+public class EntityConfig : ConfigBase<CodeGenConfig, CodeGenConfig>
+{
+    /// <summary>
+    /// Gets or sets the entity name.
+    /// </summary>
+    [JsonPropertyName("name")]
+    [CodeGenProperty("Primary", Title = "The reference-data entity (contract) name.", IsMandatory = true)]
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the pluralized entity name.
+    /// </summary>
+    [JsonPropertyName("plural")]
+    [CodeGenProperty("Primary", Title = "The pluralized reference-data entity (contract) name.", IsImportant = true, Description = "Defaults to `{Name}` with the last word pluralized.")]
+    public string? Plural { get; set; }
+
+    /// <summary>
+    /// Gets or sets the entity text.
+    /// </summary>
+    [JsonPropertyName("text")]
+    [CodeGenProperty("Primary", Title = "The reference-data entity friendly text.", Description = "Defaults to `{Name}` converted to sentence case. This is primarily used in generated code comments.")]
+    public string? Text { get; set; }
+
+    /// <summary>
+    /// Gets or sets the identifier type.
+    /// </summary>
+    [JsonPropertyName("idType")]
+    [CodeGenProperty("Primary", Title = "The reference-data identifier type.", IsImportant = true, Options = ["String", "Guid", "Int32", "Int64"], Description = "Defaults to root `{IdType}`.")]
+    public string? IdType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default collection sort order.
+    /// </summary>
+    [JsonPropertyName("collectionSortOrder")]
+    [CodeGenProperty("Primary", Title = "The collection sort order.", IsImportant = true, Options = ["Code", "Id", "Text", "SortOrder"], Description = "This is the collection sort order. Defaults to root `{CollectionSortOrder}`.")]
+    public string? CollectionSortOrder { get; set; }
+
+    #region API
+
+    /// <summary>
+    /// Gets or sets the route suffix.
+    /// </summary>
+    [JsonPropertyName("route")]
+    [CodeGenProperty("API", Title = "The route suffix.", IsImportant = true, Description = "Defaults to `{Plural}` and root `{RouteConvention}` configuration.")]
+    public string? Route { get; set; }
+
+    #endregion
+
+    #region Repository
+
+    /// <summary>
+    /// Gets or sets the repository implementation.
+    /// </summary>
+    [JsonPropertyName("repository")]
+    [CodeGenProperty("Repository", Title = "The repository implementation.", IsImportant = true, Options = ["None", "EntityFramework"], Description = "Defaults to root `{Repository}`.")]
+    public string? Repository { get; set; }
+
+    /// <summary>
+    /// Gets or sets the repository parameter name.
+    /// </summary>
+    [JsonPropertyName("repositoryName")]
+    [CodeGenProperty("Repository", Title = "The repository parameter name.", IsImportant = true, Description = "This is the .NET repository parameter name that should be used within the generated code. Defaults from root `{Repository}` and related configuration.")]
+    public string? RepositoryName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the corresponding repository model name.
+    /// </summary>
+    [JsonPropertyName("model")]
+    [CodeGenProperty("Repository", Title = "The corresponding repository model name.", IsImportant = true, Description = "Defaults to `{Name}` (assumes same).")]
+    public string? Model { get; set; }
+
+    #endregion
+
+    #region Mapping
+
+    /// <summary>
+    /// Gets or sets the mapper name.
+    /// </summary>
+    [JsonPropertyName("mapper")]
+    [CodeGenProperty("Mapping", Title = "The mapper name.", IsImportant = true, Description = "This is the .NET mapper name used within the generated code. Defaults to root `{Name}Mapper`.")]
+    public string? Mapper { get; set; }
+
+    #endregion
+
+    #region Exclude
+
+    /// <summary>
+    /// Indicates whether to exclude the generation of the API.
+    /// </summary>
+    [JsonPropertyName("excludeApi")]
+    [CodeGenProperty("Exclude", Title = "Indicates whether to exclude the generation of the API.", IsImportant = true, Description = "Defaults to `false`.")]
+    public bool? ExcludeApi { get; set; }
+
+    /// <summary>
+    /// Indicates whether to exclude the generation of the mapper.
+    /// </summary>
+    [JsonPropertyName("excludeMapper")]
+    [CodeGenProperty("Exclude", Title = "Indicates whether to exclude the generation of the mapper.", IsImportant = true, Description = "Defaults to `false`.")]
+    public bool? ExcludeMapper { get; set; }
+
+    #endregion
+
+    #region Collections
+
+    /// <summary>
+    /// Gets the list of configured properties.
+    /// </summary>
+    [JsonPropertyName("properties")]
+    [CodeGenPropertyCollection("Collections", Title = "The property collection configuration.")]
+    public List<PropertyConfig>? Properties { get; set; }
+
+    /// <summary>
+    /// Gets the list of properties that are not excluded from the generated contract code.
+    /// </summary>
+    public List<PropertyConfig>? ContractProperties => Properties?.Where(p => !(p.ExcludeContract ?? false)).ToList() ?? [];
+
+    /// <summary>
+    /// Gets the list of properties that are not excluded from the generated mapping code.
+    /// </summary>
+    public List<PropertyConfig>? MappingProperties => Properties?.Where(p => !(p.ExcludeMapping ?? false)).ToList() ?? [];
+
+    #endregion
+
+    /// <summary>
+    /// Gets or sets the contract inherits base class name.
+    /// </summary>
+    public string? Inherits { get; set; }
+
+    /// <inheritdoc/>
+    protected override async Task PrepareAsync()
+    {
+        Text = DefaultWhereNull(Text, () => OnRamp.Utility.StringConverter.ToSentenceCase(Name!));
+        Model = DefaultWhereNull(Model, () => Name);
+        IdType = DefaultWhereNull(IdType, () => Root?.IdType);
+        CollectionSortOrder = DefaultWhereNull(CollectionSortOrder, () => Root!.CollectionSortOrder);
+        Repository = DefaultWhereNull(Repository, () => Root!.Repository);
+        IdType = DefaultWhereNull(IdType, () => Root?.IdType);
+        Mapper = DefaultWhereNull(Mapper, () => $"{Name}Mapper");
+        ExcludeMapper = DefaultWhereNull(ExcludeMapper, () => false);
+
+        Plural = DefaultWhereNull(Plural, () =>
+        {
+            // Best guess by pluralizing the last word of the name.
+            var words = OnRamp.Utility.StringConverter.ToSentenceCase(Name!)!.Split(' ').ToList();
+            words[^1] = OnRamp.Utility.StringConverter.ToPlural(words[^1]);
+            return string.Concat(words);
+        });
+
+        RepositoryName = DefaultWhereNull(RepositoryName, () => Repository switch
+        {
+            "EntityFramework" => Root!.EntityFrameworkRepositoryName,
+            _ => "??"
+        });
+
+        Route = DefaultWhereNull(Route, () => Root!.RouteConvention switch
+        {
+            "KebabCase" => OnRamp.Utility.StringConverter.ToKebabCase(Plural!),
+            "SnakeCase" => OnRamp.Utility.StringConverter.ToSnakeCase(Plural!),
+            "CamelCase" => OnRamp.Utility.StringConverter.ToCamelCase(Plural!),
+            _ => Plural!.ToLower(),
+        });
+
+        Inherits = IdType switch
+        {
+            "Int32" => $"ReferenceData<int, {Name}>",
+            "Int64" => $"ReferenceData<long, {Name}>",
+            "Guid" => $"ReferenceData<Guid, {Name}>",
+            _ => $"ReferenceData<{Name}>"
+        };
+
+        // Load the properties configuration.
+        Properties = await PrepareCollectionAsync(Properties).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Config/PropertyConfig.cs b/src/CoreEx.CodeGen/RefData/Config/PropertyConfig.cs
new file mode 100644
index 00000000..5701c6a7
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Config/PropertyConfig.cs
@@ -0,0 +1,101 @@
+namespace CoreEx.CodeGen.RefData.Config;
+
+/// <summary>
+/// Provides the property code-generation configuration.
+/// </summary>
+[CodeGenClass("Property", Title = "Reference-data property configuration.")]
+[CodeGenCategory("Primary", Title = "Provides the _primary_ configuration.")]
+[CodeGenCategory("Repository", Title = "Provides the configuration for the generated repository code.")]
+[CodeGenCategory("Exclude", Title = "Provides the configuration for code generation exclusion.")]
+public class PropertyConfig : ConfigBase<CodeGenConfig, EntityConfig>
+{
+    /// <summary>
+    /// Gets or sets the property name.
+    /// </summary>
+    [JsonPropertyName("name")]
+    [CodeGenProperty("Primary", Title = "The property name.", IsMandatory = true)]
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property type.
+    /// </summary>
+    [JsonPropertyName("type")]
+    [CodeGenProperty("Primary", Title = "The property type.", IsImportant = true, Description = "Defaults to `string?`. Supports the following conventions: `^`-prefix for reference-data and `?`-suffix for nullable.")]
+    public string? Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property text.
+    /// </summary>
+    [JsonPropertyName("text")]
+    [CodeGenProperty("Primary", Title = "The property text.", Description = "Defaults to `{Name}` converted to sentence case. This is primarily used in generated code comments.")]
+    public string? Text { get; set; }
+
+    #region Repository
+
+    /// <summary>
+    /// Gets or sets the corresponding data model name.
+    /// </summary>
+    [JsonPropertyName("model")]
+    [CodeGenProperty("Repository", Title = "The corresponding data model property name.", Description = "Defaults to `{Name}` (assumes same).")]
+    public string? Model { get; set; }
+
+    #endregion
+
+    #region Exclude
+
+    /// <summary>
+    /// Indicates whether to exclude the property from the generated contract code.
+    /// </summary>
+    [JsonPropertyName("excludeContract")]
+    [CodeGenProperty("Exclude", Title = "Indicates whether to exclude the property from the generated contract code.", Description = "Defaults to `false`.")]
+    public bool? ExcludeContract { get; set; }
+
+    /// <summary>
+    /// Indicates whether to exclude the property from the generated mapping code.
+    /// </summary>
+    [JsonPropertyName("excludeMapping")]
+    [CodeGenProperty("Exclude", Title = "Indicates whether to exclude the property from the generated mapping code.", Description = "Defaults to `false`.")]
+    public bool? ExcludeMapping { get; set; }
+
+    #endregion
+
+    /// <summary>
+    /// Indicates whether the type is reference data.
+    /// </summary>
+    public bool IsRefData { get; set; }
+
+    /// <summary>
+    /// Indicates whether the type is nullable.
+    /// </summary>
+    public bool IsNullable { get; set; }
+
+    /// <inheritdoc/>
+    protected override Task PrepareAsync()
+    {
+        // Determine the type, reference-data and nullability information.
+        var orig = Type = DefaultWhereNull(Type, () => "string?");
+
+        if (!string.IsNullOrEmpty(Type) && Type.StartsWith('^'))
+        {
+            Type = Type[1..];
+            IsRefData = true;
+        }
+
+        if (!string.IsNullOrEmpty(Type) && Type.EndsWith('?'))
+        {
+            Type = Type[..^1];
+            IsNullable = true;
+        }
+
+        if (string.IsNullOrEmpty(Type))
+            throw new CodeGenException(this, nameof(Type), $"After reference-data and nullability processing, the resulting type cannot be null or empty; original value: {orig}.");
+
+        // Others...
+        Text = DefaultWhereNull(Text, () => OnRamp.Utility.StringConverter.ToSentenceCase(Name!));
+        Model = DefaultWhereNull(Model, () => Name);
+        ExcludeContract = DefaultWhereNull(ExcludeContract, () => false);
+        ExcludeMapping = DefaultWhereNull(ExcludeMapping, () => false);
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Generators/ApiGenerator.cs b/src/CoreEx.CodeGen/RefData/Generators/ApiGenerator.cs
new file mode 100644
index 00000000..0d54e7f4
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Generators/ApiGenerator.cs
@@ -0,0 +1,10 @@
+namespace CoreEx.CodeGen.RefData.Generators;
+
+/// <summary>
+/// Provides the API code-generator.
+/// </summary>
+public class ApiGenerator : CodeGeneratorBase<CodeGenConfig, CodeGenConfig>
+{
+    /// <inheritdoc/>
+    protected override IEnumerable<CodeGenConfig> SelectGenConfig(CodeGenConfig config) => (config.ApiDirectory?.Exists ?? false) ? [config] : [];
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Generators/ContractGenerator.cs b/src/CoreEx.CodeGen/RefData/Generators/ContractGenerator.cs
new file mode 100644
index 00000000..641f0d66
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Generators/ContractGenerator.cs
@@ -0,0 +1,10 @@
+namespace CoreEx.CodeGen.RefData.Generators;
+
+/// <summary>
+/// Provides the contracts code-generator.
+/// </summary>
+public class ContractGenerator : CodeGeneratorBase<CodeGenConfig, EntityConfig>
+{
+    /// <inheritdoc/>
+    protected override IEnumerable<EntityConfig> SelectGenConfig(CodeGenConfig config) => config.Entities ?? [];
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Generators/MapperGenerator.cs b/src/CoreEx.CodeGen/RefData/Generators/MapperGenerator.cs
new file mode 100644
index 00000000..c68a7b1e
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Generators/MapperGenerator.cs
@@ -0,0 +1,10 @@
+namespace CoreEx.CodeGen.RefData.Generators;
+
+/// <summary>
+/// Provides the mappers code-generator.
+/// </summary>
+public class MapperGenerator : CodeGeneratorBase<CodeGenConfig, EntityConfig>
+{
+    /// <inheritdoc/>
+    protected override IEnumerable<EntityConfig> SelectGenConfig(CodeGenConfig config) => config.Entities?.Where(e => !(e.ExcludeMapper ?? false)) ?? [];
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Generators/RootGenerator.cs b/src/CoreEx.CodeGen/RefData/Generators/RootGenerator.cs
new file mode 100644
index 00000000..f46f2f79
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Generators/RootGenerator.cs
@@ -0,0 +1,10 @@
+namespace CoreEx.CodeGen.RefData.Generators;
+
+/// <summary>
+/// Provides the root configuration code-generator.
+/// </summary>
+public class RootGenerator : CodeGeneratorBase<CodeGenConfig, CodeGenConfig>
+{
+    /// <inheritdoc/>
+    protected override IEnumerable<CodeGenConfig> SelectGenConfig(CodeGenConfig config) => [config];
+}
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/README.md b/src/CoreEx.CodeGen/RefData/README.md
new file mode 100644
index 00000000..9566556c
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/README.md
@@ -0,0 +1,32 @@
+# CoreEx.CodeGen.RefData
+
+> Provides the reference-data code-generation pipeline: typed configuration models, generator classes, and the embedded Handlebars templates that together produce the full reference-data layer from a `ref-data.yaml` input file.
+
+## Overview
+
+`CoreEx.CodeGen.RefData` contains all the moving parts of the reference-data generation workflow. The `Config` sub-namespace holds the three typed configuration models (`CodeGenConfig`, `EntityConfig`, `PropertyConfig`) that OnRamp deserialises from `ref-data.yaml` and enriches with defaults before passing to the generators. The `Generators` sub-namespace holds the three `CodeGeneratorBase` implementations that select the appropriate configuration nodes for each template pass. The `Templates` folder contains the embedded Handlebars (`.hbs`) templates, one per generated artefact type.
+
+OnRamp drives the overall orchestration: `ref-data-script.yaml` (also embedded in the package) lists the generation steps in order — contract, controller, service, repository interface, repository, mapper — binding each step to its generator class, template, output file name pattern, and output directory. The `RootGenerator` runs once against the whole `CodeGenConfig` for the single-file artefacts (controller, service, repository interface, repository). `ContractGenerator` and `MapperGenerator` each iterate over the entity collection to produce one file per entity.
+
+## Key capabilities
+
+- 🗂️ **Typed configuration hierarchy**: `CodeGenConfig` → `EntityConfig` → `PropertyConfig` mirrors the YAML structure exactly; all defaults are resolved during the `PrepareAsync` phase before any template is evaluated.
+- ⚙️ **Three-generator pattern**: `RootGenerator` (single-file artefacts), `ContractGenerator` (per-entity contracts), and `MapperGenerator` (per-entity mappers, with opt-out support) cleanly separate the generation concerns.
+- 📐 **Embedded templates**: `Contract_cs.hbs`, `Controller_cs.hbs`, `Service_cs.hbs`, `IRepository_cs.hbs`, `Repository_cs.hbs`, `Mapper_cs.hbs` — all embedded in the package so consuming projects carry no template files.
+- 🔀 **Property-level control**: `PropertyConfig` supports `^`-prefixed reference-data types, `?`-suffixed nullable types, per-property model name overrides, and per-property exclusion from contract or mapping generation.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`CodeGenConfig`](./Config/CodeGenConfig.cs)** | Root configuration model; deserialised from `ref-data.yaml` and enriched with defaults for domain name, project paths, namespace strings, `idType`, `collectionSortOrder`, `route`, `routeConvention`, and the entity collection. |
+| **[`EntityConfig`](./Config/EntityConfig.cs)** | Per-entity configuration: `name`, `plural`, `text`, `idType`, `collectionSortOrder`, `route`, repository mode and parameter name, EF model name, mapper name, `excludeMapper`, and the `properties` collection. |
+| **[`PropertyConfig`](./Config/PropertyConfig.cs)** | Per-property configuration: `name`, `type` (with `^`/`?` conventions), `text`, data model property name, `excludeContract`, and `excludeMapping`. |
+| **[`RootGenerator`](./Generators/RootGenerator.cs)** | Selects `CodeGenConfig` itself as the generation target; used by the controller, service, repository interface, and repository templates to produce one file for the entire entity set. |
+| **[`ContractGenerator`](./Generators/ContractGenerator.cs)** | Selects each `EntityConfig` in turn; produces one contract `.g.cs` file per reference-data entity. |
+| **[`MapperGenerator`](./Generators/MapperGenerator.cs)** | Selects each `EntityConfig` where `excludeMapper` is not `true`; produces one mapper `.g.cs` file per entity. |
+
+## Related namespaces
+
+- **[`CoreEx.CodeGen`](../README.md)** - Root package: `CodeGenConsole` entry point, `CommandType` enum, and the embedded `ref-data-script.yaml` that drives this pipeline.
+- **[`CoreEx.CodeGen.Counting`](../Counting/README.md)** - Companion utility for reporting generated vs. hand-authored file and line counts.
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Templates/Contract_cs.hbs b/src/CoreEx.CodeGen/RefData/Templates/Contract_cs.hbs
new file mode 100644
index 00000000..9cfa3a4c
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Templates/Contract_cs.hbs
@@ -0,0 +1,36 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.ContractsNamespace}};
+
+/// <summary>Represents the '{{Text}}' reference-data contract.</summary>
+[ReferenceData]
+public partial class {{Name}} : {{Inherits}} {{#ifeq ContractProperties.Count 0}}{ }{{/ifeq}}
+{{#ifne ContractProperties.Count 0}}
+{
+  {{#each ContractProperties}}
+    {{#unless @first}}
+
+    {{/unless}}
+    /// <summary>Gets or initializes the {{Text}}.</summary>
+    {{#if IsRefData}}
+    [ReferenceData<{{Type}}>]
+    public partial string{{#if IsNullable}}?{{/if}} {{Name}} { get; init; }
+    {{else}}
+    public {{Type}}{{#if IsNullable}}?{{/if}} {{Name}} { get; init; }{{#unless IsNullable}} = default!;{{/unless}}
+    {{/if}}
+  {{/each}}
+}
+{{/ifne}}
+
+/// <summary>
+/// Represents the '{{Name}}' reference-data contract collection.
+/// </summary>
+public partial class {{Name}}Collection() : ReferenceDataCollection<{{Name}}>(ReferenceDataSortOrder.{{CollectionSortOrder}}) { }
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Templates/Controller_cs.hbs b/src/CoreEx.CodeGen/RefData/Templates/Controller_cs.hbs
new file mode 100644
index 00000000..9035be3f
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Templates/Controller_cs.hbs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.ApiNamespace}}.Controllers;
+
+/// <summary>Represents the reference-data controller.</summary>
+[ApiController, Route("{{Route}}")]
+public partial class ReferenceDataController(CoreEx.AspNetCore.Mvc.WebApi webApi) : ControllerBase
+{
+    private readonly CoreEx.AspNetCore.Mvc.WebApi _webApi = webApi.ThrowIfNull();
+
+    private static readonly DataMap<string> _mapper = new(StringComparer.OrdinalIgnoreCase)
+    {
+{{#each EntitiesWithApi}}
+        { "{{Route}}", nameof({{Name}}) }{{#unless @last}},{{/unless}}
+{{/each}}
+    };
+{{#each EntitiesWithApi}}
+
+    [HttpGet("{{Route}}"), HttpHead("{{Route}}")]
+    [ProducesResponseType(typeof({{Name}}[]), 200)]
+    public Task<IActionResult> Get{{Plural}}Async([FromQuery] IEnumerable<string>? codes = default, string? text = default)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<{{Name}}>(codes, text, ro.IsIncludeInactive, ct));
+{{/each}}
+
+    [HttpGet]
+    [ProducesResponseType(typeof(ReferenceDataMultiDictionary), 200)]
+    public Task<IActionResult> GetNamedAsync([FromQuery] string[] name)
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetNamedAsync(name, ro.IsIncludeInactive, _mapper, ct));
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Templates/IRepository_cs.hbs b/src/CoreEx.CodeGen/RefData/Templates/IRepository_cs.hbs
new file mode 100644
index 00000000..fd1834b7
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Templates/IRepository_cs.hbs
@@ -0,0 +1,24 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.ApplicationNamespace}}.{{Root.DataRepositoriesPath}};
+
+/// <summary>Enables the underlying reference-data repository.</summary>
+public partial interface IReferenceDataRepository
+{
+{{#each Entities}}
+  {{#unless @first}}
+
+  {{/unless}}
+    /// <summary>Gets all <see cref="{{Name}}"/> items.</summary>
+    /// <returns>The <see cref="{{Name}}Collection"/>.</returns>
+    Task<{{Name}}Collection> GetAll{{Plural}}Async(CancellationToken cancellationToken = default);
+{{/each}}
+}
+    
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Templates/Mapper_cs.hbs b/src/CoreEx.CodeGen/RefData/Templates/Mapper_cs.hbs
new file mode 100644
index 00000000..00696048
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Templates/Mapper_cs.hbs
@@ -0,0 +1,41 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.DataMappingNamespace}};
+
+/// <summary>Provides mapping from <see cref="{{Root.DataModelsPath}}.{{Model}}"/> to <see cref="Contracts.{{Name}}"/>.</summary>
+internal partial class {{Mapper}} : Mapper<{{Root.DataModelsPath}}.{{Model}}, Contracts.{{Name}}, {{Mapper}}>
+{
+    /// <inheritdoc/>
+    protected override Contracts.{{Name}} OnMap({{Root.DataModelsPath}}.{{Model}} source)
+    {
+        var destination = new Contracts.{{Name}}
+        {
+            Id = source.Id!,
+            Code = source.Code,
+            Text = source.Text,
+            Description = source.Description,
+            SortOrder = source.SortOrder,
+            IsInactive = !source.IsActive,
+            StartsOn = source.StartsOn,
+            EndsOn = source.EndsOn,
+            ETag = source.ETag{{#ifne MappingProperties.Count 0}},{{/ifne}}
+{{#each MappingProperties}}
+            {{Name}} = source.{{Model}}{{#unless @last}},{{/unless}}
+{{/each}}
+        };
+
+        OnMapExtend(source, destination);
+        return destination;
+    }
+
+    /// <summary>Provides the opportunity to extend the <see cref="OnMap" /> method.</summary>
+    partial void OnMapExtend({{Root.DataModelsPath}}.{{Model}} source, Contracts.{{Name}} destination);
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Templates/Repository_cs.hbs b/src/CoreEx.CodeGen/RefData/Templates/Repository_cs.hbs
new file mode 100644
index 00000000..eb95b1b8
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Templates/Repository_cs.hbs
@@ -0,0 +1,27 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.DataRepositoriesNamespace}};
+
+/// <summary>Provides the underlying reference-data repository.</summary>
+[ScopedService<IReferenceDataRepository>]
+public partial class ReferenceDataRepository : IReferenceDataRepository
+{
+{{#each EntitiesWithRepository}}
+  {{#unless @first}}
+
+  {{/unless}}
+    /// <inheritdoc/>
+    public Task<Contracts.{{Name}}Collection> GetAll{{Plural}}Async(CancellationToken cancellationToken = default)
+  {{#ifeq Repository 'EntityFramework'}}
+        => {{RepositoryName}}.ThrowIfNull().Model<{{Root.DataModelsPath}}.{{Name}}>().Query().ToMappedItemsAsync<{{Root.DataModelsPath}}.{{Name}}, Contracts.{{Name}}Collection, Contracts.{{Name}}>({{Mapper}}.Map, cancellationToken);
+  {{/ifeq}}
+{{/each}}
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/RefData/Templates/Service_cs.hbs b/src/CoreEx.CodeGen/RefData/Templates/Service_cs.hbs
new file mode 100644
index 00000000..ee9402c8
--- /dev/null
+++ b/src/CoreEx.CodeGen/RefData/Templates/Service_cs.hbs
@@ -0,0 +1,35 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.ApplicationNamespace}};
+
+/// <summary>Provides the <see cref="IReferenceDataProvider"/> implementation.</summary>
+[ScopedService<IReferenceDataProvider>]
+public partial class ReferenceDataService(IReferenceDataRepository repository) : IReferenceDataProvider
+{
+    private readonly IReferenceDataRepository _repository = repository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public IEnumerable<(Type, Type)> Types =>
+    [
+{{#each Entities}}
+        (typeof({{Name}}), typeof({{Name}}Collection)),
+{{/each}}
+    ];
+
+    /// <inheritdoc/>
+    public virtual async Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+    {
+{{#each Entities}}
+        _ when type == typeof({{Name}}) => await _repository.GetAll{{Plural}}Async(cancellationToken).ConfigureAwait(false),
+{{/each}}
+        _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+    };
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/Scripts/ref-data-script.yaml b/src/CoreEx.CodeGen/Scripts/ref-data-script.yaml
new file mode 100644
index 00000000..04ca8a28
--- /dev/null
+++ b/src/CoreEx.CodeGen/Scripts/ref-data-script.yaml
@@ -0,0 +1,8 @@
+configType: CoreEx.CodeGen.RefData.Config.CodeGenConfig, CoreEx.CodeGen
+generators:
+- { type: 'CoreEx.CodeGen.RefData.Generators.ContractGenerator, CoreEx.CodeGen', template: 'Contract_cs', file: '{{Name}}.g.cs', directory: '{{Root.ContractsDirectory.FullName}}', text: Contract(s) generation }  
+- { type: 'CoreEx.CodeGen.RefData.Generators.ApiGenerator, CoreEx.CodeGen', template: 'Controller_cs', file: 'ReferenceDataController.g.cs', directory: '{{Root.ApiDirectory.FullName}}/Controllers', text: ReferenceDataController generation }  
+- { type: 'CoreEx.CodeGen.RefData.Generators.RootGenerator, CoreEx.CodeGen', template: 'Service_cs', file: 'ReferenceDataService.g.cs', directory: '{{Root.ApplicationDirectory.FullName}}', text: ReferenceDataService generation }  
+- { type: 'CoreEx.CodeGen.RefData.Generators.RootGenerator, CoreEx.CodeGen', template: 'IRepository_cs', file: 'IReferenceDataRepository.g.cs', directory: '{{Root.ApplicationDirectory.FullName}}/{{Root.DataRepositoriesPath}}', text: IReferenceDataRepository generation }
+- { type: 'CoreEx.CodeGen.RefData.Generators.RootGenerator, CoreEx.CodeGen', template: 'Repository_cs', file: 'ReferenceDataRepository.g.cs', directory: '{{Root.DataDirectory.FullName}}/{{Root.DataRepositoriesPath}}', text: ReferenceDataRepository generation }
+- { type: 'CoreEx.CodeGen.RefData.Generators.MapperGenerator, CoreEx.CodeGen', template: 'Mapper_cs', file: '{{Name}}Mapper.g.cs', directory: '{{Root.DataDirectory.FullName}}/{{Root.DataMappingPath}}', text: Mapper(s) generation }
\ No newline at end of file
diff --git a/src/CoreEx.CodeGen/docs/CodeGeneration.md b/src/CoreEx.CodeGen/docs/CodeGeneration.md
new file mode 100644
index 00000000..9b72e3a7
--- /dev/null
+++ b/src/CoreEx.CodeGen/docs/CodeGeneration.md
@@ -0,0 +1,62 @@
+# Reference-data code-generation
+
+This configuration is used for generating reference-data related code. This is a well understood, deterministic pattern, that is best suited for scenarios where reference-data capabilities are required in a consistent manner.
+
+## Property categories
+The `CodeGeneration` object supports a number of properties that control the generated code output. These properties are separated into a series of logical categories.
+
+Category | Description
+-|-
+[`Primary`](#Primary) | Provides the _primary_ configuration.
+[`API`](#API) | Provides the configuration for the generated API code.
+[`Repository`](#Repository) | Provides the configuration for the generated repository code.
+[`Paths`](#Paths) | Provides the configuration for the paths used in code generation.
+[`Collections`](#Collections) | Provides the collections configuration.
+
+The properties with a bold name are those that are more typically used (considered more important).
+
+## Primary
+Provides the _primary_ configuration.
+
+Property | Description
+-|-
+**`domain`** | The domain name.<br/>&dagger; This is the .NET domain name. Attempts to default from the underlying data project file path; uses the second to last segment of the child-most sub-directory by convention. For example, `/xxx/yyy/My.App.Sales.CodeGen`, the domain would be `Sales`.
+**`idType`** | The default reference data identifier type. Valid options are: `String`, `Guid`, `Int32`, `Int64`.<br/>&dagger; Defaults to `String`.
+**`collectionSortOrder`** | The default reference data collection sort order. Valid options are: `Code`, `Id`, `Text`, `SortOrder`.<br/>&dagger; This is the default collection sort order. Defaults to `Code`.
+
+## API
+Provides the configuration for the generated API code.
+
+Property | Description
+-|-
+**`route`** | The route prefix.<br/>&dagger; Defaults to `/api/refdata`.
+**`routeConvention`** | The route naming convention where not directly specified. Valid options are: `KebabCase`, `SnakeCase`, `CamelCase`, `Lowercase`.<br/>&dagger; Defaults to `KebabCase`.
+
+## Repository
+Provides the configuration for the generated repository code.
+
+Property | Description
+-|-
+**`repository`** | The default repository implementation. Valid options are: `None`, `EntityFramework`. [Mandatory]
+**`entityFrameworkRepositoryName`** | The default Entity Framework (EF) repository parameter name.<br/>&dagger; This is the .NET Entity Framework (EF) repository parameter name that should be used within the generated code. Defaults to `ef`.
+
+## Paths
+Provides the configuration for the paths used in code generation.
+
+Property | Description
+-|-
+`contractsProjectPath` | The relative path for the .NET contracts-related project.<br/>&dagger; Defaults to `Contracts`.
+`apiProjectPath` | The relative path for the .NET API-related project.<br/>&dagger; Defaults to `Api`.
+`applicationProjectPath` | The relative path for the .NET application-related project.<br/>&dagger; Defaults to `Application`.
+`dataProjectPath` | The relative path for the .NET data-related project.<br/>&dagger; Defaults to automatic inference using expected name of `Infrastructure`.
+`dataRepositoriesPath` | The path to append to the `{DotNetDataProjectPath}` for the .NET generated repository code.<br/>&dagger; Defaults to `Repositories`.
+`dataModelsPath` | The path to append to the `{DotNetDataProjectPath}` for the .NET generated models code.<br/>&dagger; Defaults to `Persistence`.
+`dataMappingPath` | The path to append to the `{DotNetDataProjectPath}` for the .NET generated mapping code.<br/>&dagger; Defaults to `Mapping`.
+
+## Collections
+Provides the collections configuration.
+
+Property | Description
+-|-
+**`entities`** | The corresponding [`Entity`](Entity.md) collection.
+
diff --git a/src/CoreEx.CodeGen/docs/Entity.md b/src/CoreEx.CodeGen/docs/Entity.md
new file mode 100644
index 00000000..161a3b07
--- /dev/null
+++ b/src/CoreEx.CodeGen/docs/Entity.md
@@ -0,0 +1,66 @@
+# Reference-data entity configuration
+
+
+
+## Property categories
+The `Entity` object supports a number of properties that control the generated code output. These properties are separated into a series of logical categories.
+
+Category | Description
+-|-
+[`Primary`](#Primary) | Provides the _primary_ configuration.
+[`API`](#API) | Provides the configuration for the generated API code.
+[`Repository`](#Repository) | Provides the configuration for the generated repository code.
+[`Mapping`](#Mapping) | Provides the configuration for the generated mapping code.
+[`Exclude`](#Exclude) | Provides the configuration for code generation exclusion.
+[`Collections`](#Collections) | Provides the collections configuration.
+
+The properties with a bold name are those that are more typically used (considered more important).
+
+## Primary
+Provides the _primary_ configuration.
+
+Property | Description
+-|-
+**`name`** | The reference-data entity (contract) name. [Mandatory]
+**`plural`** | The pluralized reference-data entity (contract) name.<br/>&dagger; Defaults to `{Name}` with the last word pluralized.
+`text` | The reference-data entity friendly text.<br/>&dagger; Defaults to `{Name}` converted to sentence case. This is primarily used in generated code comments.
+**`idType`** | The reference-data identifier type. Valid options are: `String`, `Guid`, `Int32`, `Int64`.<br/>&dagger; Defaults to root `{IdType}`.
+**`collectionSortOrder`** | The collection sort order. Valid options are: `Code`, `Id`, `Text`, `SortOrder`.<br/>&dagger; This is the collection sort order. Defaults to root `{CollectionSortOrder}`.
+
+## API
+Provides the configuration for the generated API code.
+
+Property | Description
+-|-
+**`route`** | The route suffix.<br/>&dagger; Defaults to `{Plural}` and root `{RouteConvention}` configuration.
+
+## Repository
+Provides the configuration for the generated repository code.
+
+Property | Description
+-|-
+**`repository`** | The repository implementation. Valid options are: `None`, `EntityFramework`.<br/>&dagger; Defaults to root `{Repository}`.
+**`repositoryName`** | The repository parameter name.<br/>&dagger; This is the .NET repository parameter name that should be used within the generated code. Defaults from root `{Repository}` and related configuration.
+**`model`** | The corresponding repository model name.<br/>&dagger; Defaults to `{Name}` (assumes same).
+
+## Mapping
+Provides the configuration for the generated mapping code.
+
+Property | Description
+-|-
+**`mapper`** | The mapper name.<br/>&dagger; This is the .NET mapper name used within the generated code. Defaults to root `{Name}Mapper`.
+
+## Exclude
+Provides the configuration for code generation exclusion.
+
+Property | Description
+-|-
+**`excludeMapper`** | Indicates whether to exclude the generation of the mapper.<br/>&dagger; Defaults to `false`.
+
+## Collections
+Provides the collections configuration.
+
+Property | Description
+-|-
+`properties` | The corresponding [`Property`](Property.md) collection.
+
diff --git a/src/CoreEx.CodeGen/docs/Property.md b/src/CoreEx.CodeGen/docs/Property.md
new file mode 100644
index 00000000..e9fbfe39
--- /dev/null
+++ b/src/CoreEx.CodeGen/docs/Property.md
@@ -0,0 +1,39 @@
+# Reference-data property configuration
+
+
+
+## Property categories
+The `Property` object supports a number of properties that control the generated code output. These properties are separated into a series of logical categories.
+
+Category | Description
+-|-
+[`Primary`](#Primary) | Provides the _primary_ configuration.
+[`Repository`](#Repository) | Provides the configuration for the generated repository code.
+[`Exclude`](#Exclude) | Provides the configuration for code generation exclusion.
+
+The properties with a bold name are those that are more typically used (considered more important).
+
+## Primary
+Provides the _primary_ configuration.
+
+Property | Description
+-|-
+**`name`** | The property name. [Mandatory]
+**`type`** | The property type.<br/>&dagger; Defaults to `string?`. Supports the following conventions: `^`-prefix for reference-data and `?`-suffix for nullable.
+`text` | The property text.<br/>&dagger; Defaults to `{Name}` converted to sentence case. This is primarily used in generated code comments.
+
+## Repository
+Provides the configuration for the generated repository code.
+
+Property | Description
+-|-
+`model` | The corresponding data model property name.<br/>&dagger; Defaults to `{Name}` (assumes same).
+
+## Exclude
+Provides the configuration for code generation exclusion.
+
+Property | Description
+-|-
+`excludeContract` | Indicates whether to exclude the property from the generated contract code.<br/>&dagger; Defaults to `false`.
+`excludeMapping` | Indicates whether to exclude the property from the generated mapping code.<br/>&dagger; Defaults to `false`.
+
diff --git a/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs b/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs
deleted file mode 100644
index 4c2d0dae..00000000
--- a/src/CoreEx.Cosmos/Batch/CosmosDbBatch.cs
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Json.Data;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.Batch
-{
-    /// <summary>
-    /// Provides <b>CosmosDb</b>-related <i>batch</i> extension methods. The implementation is <b>bulk-ready</b> as per <see href="https://devblogs.microsoft.com/cosmosdb/introducing-bulk-support-in-the-net-sdk/"/>; to properly
-    /// enable use <c>new CosmosClientOptions() { AllowBulkExecution = true }</c> as described.
-    /// </summary>
-    public static class CosmosDbBatch
-    {
-        /// <summary>
-        /// Indicates whether the items in the batch are executed sequentially.
-        /// </summary>
-        /// <remarks><c>true</c> results in sequenital (order-based and slower) execution; otherwise, <c>false</c> results in parallel (no order guarantees and faster) execution. Also, see 
-        /// <see href="https://devblogs.microsoft.com/cosmosdb/introducing-bulk-support-in-the-net-sdk/"/> to further improve throughput.</remarks>
-        public static bool SequentialExecution { get; set; }
-
-        /// <summary>
-        /// Imports (creates) a batch of <paramref name="items"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container.Id"/>.</param>
-        /// <param name="items">The batch of items to create.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static async Task ImportBatchAsync<TModel>(this ICosmosDb cosmosDb, string containerId, IEnumerable<TModel> items, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where TModel : class, IEntityKey
-        {
-            var container = cosmosDb.ThrowIfNull(nameof(cosmosDb)).Database.GetContainer(containerId.ThrowIfNull(nameof(containerId)));
-
-            if (items == null)
-                return;
-
-            dbArgs ??= cosmosDb.DbArgs;
-            List<Task> tasks = [];
-            foreach (var item in items)
-            {
-                if (SequentialExecution)
-                    await container.CreateItemAsync(modelUpdater?.Invoke(item) ?? item, dbArgs.Value.PartitionKey, dbArgs.Value.ItemRequestOptions, cancellationToken).ConfigureAwait(false);
-                else
-                    tasks.Add(container.CreateItemAsync(modelUpdater?.Invoke(item) ?? item, dbArgs.Value.PartitionKey, dbArgs.Value.ItemRequestOptions, cancellationToken));
-            }
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of <paramref name="items"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="items">The batch of items to create.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task ImportBatchAsync<T, TModel>(this CosmosDbContainer container, IEnumerable<TModel> items, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportBatchAsync(container.ThrowIfNull(nameof(container)).CosmosDb!, container.CosmosContainer.Id!, items, modelUpdater, dbArgs ?? container.DbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of <paramref name="items"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer{T, TModel}"/>.</param>
-        /// <param name="items">The batch of items to create.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task ImportBatchAsync<T, TModel>(this CosmosDbContainer<T, TModel> container, IEnumerable<TModel> items, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportBatchAsync<T, TModel>(container.ThrowIfNull(nameof(container)).Container, items, modelUpdater, dbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of named items from the <paramref name="jsonDataReader"/> into the specified <paramref name="containerId"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container.Id"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed within the <paramref name="jsonDataReader"/>. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static async Task<bool> ImportBatchAsync<TModel>(this ICosmosDb cosmosDb, string containerId, JsonDataReader jsonDataReader, string? name = null, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            var container = cosmosDb.ThrowIfNull(nameof(cosmosDb)).Database.GetContainer(containerId.ThrowIfNull(nameof(containerId)));
-            if (!jsonDataReader.ThrowIfNull(nameof(jsonDataReader)).TryDeserialize<TModel>(name, out var items))
-                return false;
-
-            await ImportBatchAsync(cosmosDb, containerId, items, modelUpdater, dbArgs, cancellationToken).ConfigureAwait(false);
-            return true;
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of named items from the <paramref name="jsonDataReader"/> into the specified <paramref name="container"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed within the <paramref name="jsonDataReader"/>. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task<bool> ImportBatchAsync<T, TModel>(this CosmosDbContainer container, JsonDataReader jsonDataReader, string? name = null, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportBatchAsync(container.ThrowIfNull(nameof(container)).CosmosDb!, container.CosmosContainer.Id!, jsonDataReader, name, modelUpdater, dbArgs ?? container.DbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of named items from the <paramref name="jsonDataReader"/> into the specified <paramref name="container"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer{T, TModel}"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed within the <paramref name="jsonDataReader"/>. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task<bool> ImportBatchAsync<T, TModel>(this CosmosDbContainer<T, TModel> container, JsonDataReader jsonDataReader, string? name = null, Func<TModel, TModel>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportBatchAsync<T, TModel>(container.ThrowIfNull(nameof(container)).Container, jsonDataReader, name, modelUpdater, dbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of <see cref="CosmosDbValue{TModel}"/> <paramref name="items"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container.Id"/>.</param>
-        /// <param name="items">The batch of items to create.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static async Task ImportValueBatchAsync<TModel>(this ICosmosDb cosmosDb, string containerId, IEnumerable<TModel> items, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            var container = cosmosDb.ThrowIfNull(nameof(cosmosDb)).Database.GetContainer(containerId.ThrowIfNull(nameof(containerId)));
-
-            if (items == null)
-                return;
-
-            dbArgs ??= cosmosDb.DbArgs;
-            List<Task> tasks = [];
-            foreach (var item in items)
-            {
-                var cdv = new CosmosDbValue<TModel>(item);
-                ((ICosmosDbValue)cdv).PrepareBefore(dbArgs.Value, null);
-
-                if (SequentialExecution)
-                    await container.CreateItemAsync(modelUpdater?.Invoke(cdv) ?? cdv, dbArgs.Value.PartitionKey, dbArgs.Value.ItemRequestOptions, cancellationToken).ConfigureAwait(false);
-                else
-                    tasks.Add(container.CreateItemAsync(modelUpdater?.Invoke(cdv) ?? cdv, dbArgs.Value.PartitionKey, dbArgs.Value.ItemRequestOptions, cancellationToken));
-            }
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of <see cref="CosmosDbValue{TModel}"/> <paramref name="items"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="items">The batch of items to create.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task ImportValueBatchAsync<T, TModel>(this CosmosDbContainer container, IEnumerable<TModel> items, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            CosmosDbValue<TModel> func(CosmosDbValue<TModel> cvm)
-            {
-                cvm.Type = container.Model.GetModelName<TModel>();
-                return modelUpdater?.Invoke(cvm) ?? cvm;
-            }
-
-            return ImportValueBatchAsync(container.ThrowIfNull(nameof(container)).CosmosDb!, container.CosmosContainer.Id!, items, func, dbArgs ?? container.DbArgs, cancellationToken);
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of <see cref="CosmosDbValue{TModel}"/> <paramref name="items"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer{T, TModel}"/>.</param>
-        /// <param name="items">The batch of items to create.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task ImportValueBatchAsync<T, TModel>(this CosmosDbValueContainer<T, TModel> container, IEnumerable<TModel> items, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportValueBatchAsync<T, TModel>(container.ThrowIfNull(nameof(container)).Container, items, modelUpdater, dbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of named <see cref="CosmosDbValue{TModel}"/> items from the <paramref name="jsonDataReader"/> into the specified <paramref name="containerId"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container.Id"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed within the <paramref name="jsonDataReader"/>. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static async Task<bool> ImportValueBatchAsync<TModel>(this ICosmosDb cosmosDb, string containerId, JsonDataReader jsonDataReader, string? name = null, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            var container = cosmosDb.ThrowIfNull(nameof(cosmosDb)).Database.GetContainer(containerId.ThrowIfNull(nameof(containerId)));
-            if (!jsonDataReader.ThrowIfNull(nameof(jsonDataReader)).TryDeserialize<TModel>(name, out var items))
-                return false;
-
-            await ImportValueBatchAsync(cosmosDb, containerId, items, modelUpdater, dbArgs, cancellationToken).ConfigureAwait(false);
-            return true;
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of named <see cref="CosmosDbValue{TModel}"/> items from the <paramref name="jsonDataReader"/> into the specified <paramref name="container"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed within the <paramref name="jsonDataReader"/>. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task<bool> ImportValueBatchAsync<T, TModel>(this CosmosDbContainer container, JsonDataReader jsonDataReader, string? name = null, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            CosmosDbValue<TModel> func(CosmosDbValue<TModel> cvm)
-            {
-                cvm.Type = container.Model.GetModelName<TModel>();
-                return modelUpdater?.Invoke(cvm) ?? cvm;
-            }
-
-            return ImportValueBatchAsync(container.ThrowIfNull(nameof(container)).CosmosDb!, container.CosmosContainer.Id!, jsonDataReader, name ?? container.Model.GetModelName<TModel>(), (Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>)func, dbArgs ?? container.DbArgs, cancellationToken);
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of named <see cref="CosmosDbValue{TModel}"/> items from the <paramref name="jsonDataReader"/> into the specified <paramref name="container"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed within the <paramref name="jsonDataReader"/>. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task<bool> ImportValueBatchAsync<T, TModel>(this CosmosDbValueContainer<T, TModel> container, JsonDataReader jsonDataReader, string? name = null, Func<CosmosDbValue<TModel>, CosmosDbValue<TModel>>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => ImportValueBatchAsync<T, TModel>(container.ThrowIfNull(nameof(container)).Container, jsonDataReader, name, modelUpdater, dbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of named <see cref="CosmosDbValue{TModel}"/> items from the <paramref name="jsonDataReader"/> into the specified <paramref name="containerId"/>.
-        /// </summary>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container.Id"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="types">The <see cref="Type"/> list to find and import.</param>
-        /// <param name="modelUpdater">The function that enables the deserialized model value to be further updated.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static async Task<bool> ImportValueBatchAsync(this ICosmosDb cosmosDb, string containerId, JsonDataReader jsonDataReader, IEnumerable<Type> types, Func<object, object>? modelUpdater = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default)
-        {
-            var container = cosmosDb.ThrowIfNull(nameof(cosmosDb)).Database.GetContainer(containerId.ThrowIfNull(nameof(containerId)));
-            jsonDataReader.ThrowIfNull(nameof(jsonDataReader));
-
-            dbArgs ??= cosmosDb.DbArgs;
-            var tasks = new List<Task>();
-
-            foreach (var type in types)
-            {
-                if (jsonDataReader.TryDeserialize(type, type.Name, out var items))
-                {
-                    var t = typeof(CosmosDbValue<>).MakeGenericType(type);
-
-                    foreach (var item in items.Where(x => x is not null))
-                    {
-                        var cdv = Activator.CreateInstance(t, item)!;
-                        ((ICosmosDbValue)cdv).PrepareBefore(dbArgs.Value, null);
-
-                        if (SequentialExecution)
-                            await container.CreateItemAsync(modelUpdater?.Invoke(cdv) ?? cdv, dbArgs.Value.PartitionKey, dbArgs.Value.ItemRequestOptions, cancellationToken).ConfigureAwait(false);
-                        else
-                            tasks.Add(container.CreateItemAsync(modelUpdater?.Invoke(cdv) ?? cdv, dbArgs.Value.PartitionKey, dbArgs.Value.ItemRequestOptions, cancellationToken));
-                    }
-                }
-            }
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-            return tasks.Count > 0;
-        }
-
-        /// <summary>
-        /// Imports (creates) a batch of JSON items from the <paramref name="jsonDataReader"/> as-is into the specified <paramref name="container"/>.
-        /// </summary>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items are housed within the <paramref name="jsonDataReader"/>. Defaults to the underlying <see cref="Container.Id"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static Task<bool> ImportJsonBatchAsync(this CosmosDbContainer container, JsonDataReader jsonDataReader, string? name = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default)
-            => ImportJsonBatchAsync(container.CosmosDb, container.CosmosContainer.Id, jsonDataReader, name, dbArgs, cancellationToken);
-
-        /// <summary>
-        /// Imports (creates) a batch of JSON items from the <paramref name="jsonDataReader"/> as-is into the specified <paramref name="containerId"/>.
-        /// </summary>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container.Id"/>.</param>
-        /// <param name="jsonDataReader">The <see cref="JsonDataReader"/>.</param>
-        /// <param name="name">The element name where the array of items are housed within the <paramref name="jsonDataReader"/>. Defaults to the <paramref name="containerId"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized and imported; otherwise, <c>false</c> for none found.</returns>
-        /// <remarks>Each item is added individually and is not transactional.</remarks>
-        public static async Task<bool> ImportJsonBatchAsync(this ICosmosDb cosmosDb, string containerId, JsonDataReader jsonDataReader, string? name = null, CosmosDbArgs? dbArgs = null, CancellationToken cancellationToken = default)
-        {
-            var container = cosmosDb.ThrowIfNull(nameof(cosmosDb)).Database.GetContainer(containerId.ThrowIfNull(nameof(containerId)));
-            jsonDataReader.ThrowIfNull(nameof(jsonDataReader));
-
-            dbArgs ??= cosmosDb.DbArgs;
-            var pk = dbArgs.Value.PartitionKey ?? PartitionKey.None;
-
-            var tasks = new List<Task>();
-
-            var result = await jsonDataReader.EnumerateJsonAsync(name ?? containerId, async json =>
-            { 
-                using var ms = new MemoryStream(Encoding.UTF8.GetBytes(json.ToString()));
-
-                if (SequentialExecution)
-                {
-                    var resp = await container.CreateItemStreamAsync(ms, pk, dbArgs.Value.ItemRequestOptions, cancellationToken).ConfigureAwait(false);
-                    resp.EnsureSuccessStatusCode();
-                }
-                else
-                    tasks.Add(container.CreateItemAsync(ms, pk, dbArgs.Value.ItemRequestOptions, cancellationToken));
-            });
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-            return result;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CoreEx.Cosmos.csproj b/src/CoreEx.Cosmos/CoreEx.Cosmos.csproj
deleted file mode 100644
index 9f92eaed..00000000
--- a/src/CoreEx.Cosmos/CoreEx.Cosmos.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Cosmos</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Cosmos DB extras.</Title>
-    <Description>CoreEx .NET Cosmos DB extras.</Description>
-    <PackageTags>coreex api data nosql documentdb cosmos cosmosdb</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.46.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx.Data\CoreEx.Data.csproj" />
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/CoreEx.Cosmos/CosmosDb.cs b/src/CoreEx.Cosmos/CosmosDb.cs
deleted file mode 100644
index f9214e3f..00000000
--- a/src/CoreEx.Cosmos/CosmosDb.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Collections.Concurrent;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides extended <b>CosmosDb</b> data access.
-    /// </summary>
-    /// <param name="database">The <see cref="Microsoft.Azure.Cosmos.Database"/>.</param>
-    /// <param name="mapper">The <see cref="IMapper"/>; defaults to <see cref="Mapping.Mapper.Empty"/>.</param>
-    /// <param name="invoker">Enables the <see cref="Invoker"/> to be overridden; defaults to <see cref="CosmosDbInvoker"/>.</param>
-    /// <remarks>It is recommended that the <see cref="CosmosDb"/> is registered as a scoped service to enable capabilities such as <see cref="CosmosDbArgs.FilterByTenantId"/> that <i>must</i> be scoped. 
-    /// Use <see cref="Microsoft.Extensions.DependencyInjection.CosmosDbServiceCollectionExtensions.AddCosmosDb{TCosmosDb}(Microsoft.Extensions.DependencyInjection.IServiceCollection, Func{IServiceProvider, TCosmosDb}, string?)"/> to 
-    /// register the scoped <see cref="CosmosDb"/> instance.
-    /// <para>The dependent <see cref="CosmosClient"/> should however be registered as a singleton as is <see href="https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/best-practice-dotnet">best practice</see>.</para></remarks>
-    public class CosmosDb(Database database, IMapper? mapper = null, CosmosDbInvoker? invoker = null) : ICosmosDb
-    {
-        private static CosmosDbInvoker? _invoker;
-        private readonly ConcurrentDictionary<string, CosmosDbContainer> _containers = new();
-
-        /// <inheritdoc/>
-        public Database Database { get; } = database.ThrowIfNull(nameof(database));
-
-        /// <inheritdoc/>
-        public IMapper Mapper { get; } = mapper ?? Mapping.Mapper.Empty;
-
-        /// <inheritdoc/>
-        public CosmosDbInvoker Invoker { get; } = invoker ?? (_invoker ??= new CosmosDbInvoker());
-
-        /// <inheritdoc/>
-        public CosmosDbArgs DbArgs { get; set; } = new CosmosDbArgs();
-
-        /// <inheritdoc/>
-        public Container GetCosmosContainer(string containerId) => Database.GetContainer(containerId);
-
-        /// <summary>
-        /// Gets the named <see cref="CosmosDbContainer"/> leveraging the <see cref="Container(string)"/> method.
-        /// </summary>
-        /// <param name="containerId">The <see cref="Microsoft.Azure.Cosmos.Container"/> identifier.</param>
-        /// <returns>The <see cref="CosmosDbContainer"/>.</returns>
-        /// <remarks>Provides indexing to the <see cref="Container(string)"/> method; note that the configuration is expected to have been previously specified where required.</remarks>
-        public CosmosDbContainer this[string containerId] => Container(containerId);
-
-        /// <inheritdoc/>
-        public CosmosDbContainer Container(string containerId) => _containers.GetOrAdd(containerId.ThrowIfNullOrEmpty(nameof(containerId)), containerId => new CosmosDbContainer(this, containerId));
-
-        /// <inheritdoc/>
-        public CosmosDbContainer<T, TModel> Container<T, TModel>(string containerId) where T : class, IEntityKey, new () where TModel : class, IEntityKey, new ()
-            => Container(containerId).AsTyped<T, TModel>();
-
-        /// <inheritdoc/>
-        public CosmosDbValueContainer<T, TModel> ValueContainer<T, TModel>(string containerId) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => Container(containerId).AsValueTyped<T, TModel>();
-
-        /// <inheritdoc/>
-        public Result? HandleCosmosException(CosmosException cex) => OnCosmosException(cex);
-
-        /// <summary>
-        /// Provides the <see cref="CosmosException"/> handling as a result of <see cref="HandleCosmosException(CosmosException)"/>.
-        /// </summary>
-        /// <param name="cex">The <see cref="CosmosException"/>.</param>
-        /// <returns>The <see cref="Result"/> containing the appropriate <see cref="IResult.Error"/>.</returns>
-        /// <remarks>Where overridding and the <see cref="CosmosException"/> is not specifically handled then invoke the base to ensure any standard handling is executed.</remarks>
-        protected virtual Result? OnCosmosException(CosmosException cex) => cex.ThrowIfNull(nameof(cex)).StatusCode switch
-        {
-            System.Net.HttpStatusCode.NotFound => Result.Fail(new NotFoundException(null, cex)),
-            System.Net.HttpStatusCode.Conflict => Result.Fail(new DuplicateException(null, cex)),
-            System.Net.HttpStatusCode.PreconditionFailed => Result.Fail(new ConcurrencyException(null, cex)),
-            _ => Result.Fail(cex)
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbArgs.cs b/src/CoreEx.Cosmos/CosmosDbArgs.cs
deleted file mode 100644
index 322f188c..00000000
--- a/src/CoreEx.Cosmos/CosmosDbArgs.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using Microsoft.Azure.Cosmos;
-using Microsoft.Azure.Cosmos.Linq;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides the <b>CosmosDb Container</b> arguments.
-    /// </summary>
-    public struct CosmosDbArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbArgs"/> struct.
-        /// </summary>
-        public CosmosDbArgs() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbArgs"/> struct.
-        /// </summary>
-        /// <param name="template">The template <see cref="CosmosDbArgs"/> to copy from.</param>
-        /// <param name="partitionKey">The override <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.</param>
-        public CosmosDbArgs(CosmosDbArgs template, PartitionKey? partitionKey = null)
-        {
-            PartitionKey = partitionKey ?? template.PartitionKey;
-            ItemRequestOptions = template.ItemRequestOptions;
-            QueryRequestOptions = template.QueryRequestOptions;
-            NullOnNotFound = template.NullOnNotFound;
-            AutoMapETag = template.AutoMapETag;
-            CleanUpResult = template.CleanUpResult;
-            FilterByTenantId = template.FilterByTenantId;
-            FilterByIsDeleted = template.FilterByIsDeleted;
-            GetTenantId = template.GetTenantId;
-            FormatIdentifier = template.FormatIdentifier;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbArgs"/> struct.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.</param>
-        public CosmosDbArgs(PartitionKey partitionKey) => PartitionKey = partitionKey;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbArgs"/> struct for <b>Get</b>, <b>Create</b>, <b>Update</b>, and <b>Delete</b> operations with the specified <see cref="ItemRequestOptions"/>.
-        /// </summary>
-        /// <param name="requestOptions">The <see cref="ItemRequestOptions"/>.</param>
-        /// <param name="partitionKey">The <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.</param>
-        public CosmosDbArgs(ItemRequestOptions requestOptions, PartitionKey? partitionKey = null)
-        {
-            ItemRequestOptions = requestOptions;
-            PartitionKey = partitionKey;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbArgs"/> struct for <b>Query</b> operations with the specified <see cref="QueryRequestOptions"/>.
-        /// </summary>
-        /// <param name="requestOptions">The <see cref="QueryRequestOptions"/>.</param>
-        /// <param name="partitionKey">The <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.</param>
-        public CosmosDbArgs(QueryRequestOptions requestOptions, PartitionKey? partitionKey = null)
-        {
-            QueryRequestOptions = requestOptions;
-            PartitionKey = partitionKey;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.PartitionKey"/>.
-        /// </summary>
-        public PartitionKey? PartitionKey { get; } = null;
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.ItemRequestOptions"/> used for <b>Get</b>, <b>Create</b>, <b>Update</b>, and <b>Delete</b> (<seealso cref="QueryRequestOptions"/>).
-        /// </summary>
-        public ItemRequestOptions? ItemRequestOptions { get; } = null;
-
-        /// <summary>
-        /// Gets (or creates new) the <see cref="ItemRequestOptions"/>.
-        /// </summary>
-        public readonly ItemRequestOptions GetItemRequestOptions() => ItemRequestOptions ?? new ItemRequestOptions();
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.QueryRequestOptions"/> used for <b>Query</b> (<seealso cref="ItemRequestOptions"/>).
-        /// </summary>
-        public QueryRequestOptions? QueryRequestOptions { get; } = null;
-
-        /// <summary>
-        /// Gets (or creates new) the <see cref="QueryRequestOptions"/>.
-        /// </summary>
-        public readonly QueryRequestOptions GetQueryRequestOptions() => UpdateQueryRequestionOptionsPartitionKey(QueryRequestOptions ?? new QueryRequestOptions());
-
-        /// <summary>
-        /// Updates the <see cref="QueryRequestOptions"/> with the <see cref="PartitionKey"/> where not already set.
-        /// </summary>
-        private readonly QueryRequestOptions UpdateQueryRequestionOptionsPartitionKey(QueryRequestOptions qro)
-        {
-            qro.PartitionKey ??= PartitionKey;
-            return qro;
-        }
-
-        /// <summary>
-        /// Indicates whether a <c>null</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> on <b>Get</b>. Defaults to <c>true</c>.
-        /// </summary>
-        public bool NullOnNotFound { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether when mapping the model to the corresponding entity that the <see cref="IETag.ETag"/> is to be automatically mapped. Defaults to <c>true</c>.
-        /// </summary>
-        public bool AutoMapETag { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether the result should be <see cref="Entities.Cleaner.Clean{T}(T)">cleaned up</see>. Defaults to <c>false</c>.
-        /// </summary>
-        public bool CleanUpResult { get; set; } = false;
-
-        /// <summary>
-        /// Indicates that when the underlying model implements <see cref="Entities.ITenantId.TenantId"/> it is to be filtered by the corresponding <see cref="GetTenantId"/> value. Defaults to <c>true</c>.
-        /// </summary>
-        public bool FilterByTenantId { get; set; }
-
-        /// <summary>
-        /// Indicates that when the underlying model implements <see cref="ILogicallyDeleted"/> it should filter out any models where the <see cref="ILogicallyDeleted.IsDeleted"/> equals <c>true</c>. Defaults to <c>true</c>.
-        /// </summary>
-        public bool FilterByIsDeleted { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the <i>get</i> tenant identifier function; defaults to <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.TenantId"/>.
-        /// </summary>
-        public Func<string?> GetTenantId { get; set; } = () => ExecutionContext.HasCurrent ? ExecutionContext.Current.TenantId : null;
-
-        /// <summary>
-        /// Formats a <see cref="CompositeKey"/> to a <see cref="string"/> representation (used by <see cref="CosmosDbContainer.GetCosmosId(CompositeKey)"/> and <see cref="ICosmosDbValue.PrepareBefore"/>).
-        /// </summary>
-        /// <returns>The identifier as a <see cref="string"/>.</returns>
-        /// <remarks>Defaults to <see cref="DefaultFormatIdentifier"/>.</remarks>
-        public Func<CompositeKey, string?> FormatIdentifier { get; set; } = DefaultFormatIdentifier;
-
-        /// <summary>
-        /// Provides the default <see cref="FormatIdentifier"/> implementation; being the <see cref="CompositeKey"/> <see cref="object.ToString"/>.
-        /// </summary>
-        public static Func<CompositeKey, string?> DefaultFormatIdentifier { get; } = key => key.ToString();
-
-        /// <summary>
-        /// Determines whether the model is considered valid; i.e. is not <c>null</c>, and where applicable, checks the <see cref="ITenantId.TenantId"/> and <see cref="ILogicallyDeleted.IsDeleted"/> properties.
-        /// </summary>
-        /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <param name="checkIsDeleted">Indicates whether to perform the <see cref="ILogicallyDeleted"/> check.</param>
-        /// <param name="checkTenantId">Indicates whether to perform the <see cref="ITenantId"/> check.</param>
-        /// <returns><c>true</c> indicates that the model is valid; otherwise, <c>false</c>.</returns>
-        /// <remarks>This is used by the underlying <see cref="Model.CosmosDbModelContainer"/> operations to ensure the model is considered valid or not, and then handled accordingly. The query-based operations leverage the corresponding <see cref="WhereModelValid"/> filter.
-        /// <para>This leverages the <see cref="WhereModelValid"/> to perform the check to ensure consistency of implementation.</para></remarks>
-        public readonly bool IsModelValid<TModel>([NotNullWhen(true)] TModel? model, bool checkIsDeleted = true, bool checkTenantId = true) where TModel : class
-            => model != default && WhereModelValid(new[] { model }.AsQueryable(), checkIsDeleted, checkTenantId).Any();
-
-        /// <summary>
-        /// Filters the <paramref name="query"/> to include only valid models; i.e. checks the <see cref="ITenantId.TenantId"/> and <see cref="ILogicallyDeleted.IsDeleted"/> properties.
-        /// </summary>
-        /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
-        /// <param name="query">The current query.</param>
-        /// <param name="checkIsDeleted">Indicates whether to perform the <see cref="ILogicallyDeleted"/> check.</param>
-        /// <param name="checkTenantId">Indicates whether to perform the <see cref="ITenantId"/> check.</param>
-        /// <returns>The updated query.</returns>
-        /// <remarks>This is used by the underlying <see cref="CosmosDbQuery{T, TModel}"/>, <see cref="CosmosDbValueQuery{T, TModel}"/>, <see cref="Model.CosmosDbModelQuery{TModel}"/> and <see cref="Model.CosmosDbValueModelQuery{TModel}"/> to apply standardized filtering.</remarks>
-        public readonly IQueryable<TModel> WhereModelValid<TModel>(IQueryable<TModel> query, bool checkIsDeleted = true, bool checkTenantId = true) where TModel : class
-        {
-            query = query.ThrowIfNull(nameof(query));
-
-            if (checkTenantId && FilterByTenantId && typeof(ITenantId).IsAssignableFrom(typeof(TModel)))
-            {
-                var tenantId = GetTenantId();
-                query = query.Where(x => ((ITenantId)x).TenantId == tenantId);
-            }
-
-            if (checkIsDeleted && FilterByIsDeleted && typeof(ILogicallyDeleted).IsAssignableFrom(typeof(TModel)))
-                query = query.Where(x => !((ILogicallyDeleted)x).IsDeleted.IsDefined() || ((ILogicallyDeleted)x).IsDeleted == null || ((ILogicallyDeleted)x).IsDeleted == false);
-
-            return query;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbContainer.cs b/src/CoreEx.Cosmos/CosmosDbContainer.cs
deleted file mode 100644
index 281eeed9..00000000
--- a/src/CoreEx.Cosmos/CosmosDbContainer.cs
+++ /dev/null
@@ -1,965 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Cosmos.Model;
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides <see cref="CosmosDb"/> <see cref="Container"/> capabilities.
-    /// </summary>
-    /// <remarks>The <see cref="Model"/> property (<see cref="CosmosDbModelContainer"/>) provides the underlying capabilities for direct model-based access.</remarks>
-    public partial class CosmosDbContainer
-    {
-        private readonly Lazy<CosmosDbModelContainer> _model;
-        private Func<CosmosDbArgs>? _dbArgsFactory;
-        private readonly ConcurrentDictionary<(Type, Type), object> _containers = new();
-        private readonly ConcurrentDictionary<(Type, Type), object> _valueContainers = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        /// <param name="cosmosDb">The <see cref="ICosmosDb"/>.</param>
-        /// <param name="containerId">The <see cref="Container"/> identifier.</param>
-        public CosmosDbContainer(ICosmosDb cosmosDb, string containerId)
-        {
-            CosmosDb = cosmosDb.ThrowIfNull(nameof(cosmosDb));
-            CosmosContainer = cosmosDb.GetCosmosContainer(containerId.ThrowIfNullOrEmpty(nameof(containerId)));
-            _model = new(() => new(this));
-        }
-
-        /// <summary>
-        /// Gets the owning <see cref="ICosmosDb"/>.
-        /// </summary>
-        public ICosmosDb CosmosDb { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Container"/>.
-        /// </summary>
-        public Container CosmosContainer { get; }
-
-        /// <summary>
-        /// Gets the Container-specific <see cref="CosmosDbArgs"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="UseDbArgs(Func{CosmosDbArgs})"/>; otherwise, <see cref="CosmosDb.DbArgs"/>.</remarks>
-        public CosmosDbArgs DbArgs => _dbArgsFactory?.Invoke() ?? new CosmosDbArgs(CosmosDb.DbArgs);
-
-        /// <summary>
-        /// Sets the container-specific <see cref="CosmosDbArgs"/>.
-        /// </summary>
-        /// <param name="dbArgsFactory">The <see cref="CosmosDbArgs"/> creation factory.</param>
-        /// <remarks>This can only be set once; otherwise, a <see cref="InvalidOperationException"/> will be thrown.</remarks>
-        public CosmosDbContainer UseDbArgs(Func<CosmosDbArgs> dbArgsFactory)
-        {
-            dbArgsFactory.ThrowIfNull(nameof(dbArgsFactory));
-            if (_dbArgsFactory is not null)
-                throw new InvalidOperationException($"The {nameof(UseDbArgs)} can only be specified once.");
-
-            _dbArgsFactory = dbArgsFactory;
-            return this;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbModelContainer"/> that encapsulates the direct-to-model operations.
-        /// </summary>
-        public CosmosDbModelContainer Model => _model.Value;
-
-        /// <summary>
-        /// Gets or sets the SQL statement format for the <b>MultiSet</b> operation.
-        /// </summary>
-        /// <remarks>The SQL statement format must have the <c>{0}</c>> place holder for the list of types represented as comma-separated strings; e.g. <c>"Customer", "Address"</c>.</remarks>
-        public string MultiSetSqlStatementFormat { get; private set; } = "SELECT * FROM c WHERE c.type in ({0})";
-
-        /// <summary>
-        /// Sets the <see cref="MultiSetSqlStatementFormat"/> for the <b>MultiSet</b> operations.
-        /// </summary>
-        /// <param name="format">The SQL statement format.</param>
-        public CosmosDbContainer UseMultiSetSqlStatement(string format)
-        {
-            if (!format.ThrowIfNullOrEmpty(nameof(format)).Contains("{0}"))
-                throw new ArgumentException("The format must contain '{0}' to insert the 'in' list (contents).", nameof(format));
-
-            return this;
-        }
-
-        /// <summary>
-        /// Gets the <b>CosmosDb</b> identifier from the <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <returns>The <b>CosmosDb</b> identifier.</returns>
-        /// <remarks>Uses the <see cref="CosmosDbArgs.FormatIdentifier"/> to format the <paramref name="key"/> as a string (as required).</remarks>
-        public virtual string GetCosmosId(CompositeKey key) => DbArgs.FormatIdentifier(key) ?? throw new InvalidOperationException("The CompositeKey formatting into an identifier must not result in a null.");
-
-        /// <summary>
-        /// Gets the <b>CosmosDb</b> identifier from the <paramref name="model"/> <see cref="IEntityKey.EntityKey"/>.
-        /// </summary>
-        /// <param name="model">The model value.</param>
-        /// <returns>The <b>CosmosDb</b> identifier.</returns>
-        public string GetCosmosId<TModel>(TModel model) where TModel : class, IEntityKey => GetCosmosId(model.ThrowIfNull(nameof(model)).EntityKey);
-
-        /// <summary>
-        /// Gets the <see cref="PartitionKey"/>.
-        /// </summary>
-        public PartitionKey GetPartitionKey(PartitionKey? partitionKey) => partitionKey ?? DbArgs.PartitionKey ?? PartitionKey.None;
-
-        /// <summary>
-        /// Sets the function to get the <see cref="PartitionKey"/> from the model used by the <see cref="CosmosDbModelContainer.GetPartitionKey{TModel}(TModel, CosmosDbArgs)"/> (used by only by the <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="getPartitionKey">The function to get the <see cref="PartitionKey"/> from the model.</param>
-        /// <remarks>This can only be set once; otherwise, a <see cref="InvalidOperationException"/> will be thrown.</remarks>
-        public CosmosDbContainer UsePartitionKey<TModel>(Func<TModel, PartitionKey>? getPartitionKey) where TModel : class, IEntityKey, new()
-        {
-            Model.UsePartitionKey(getPartitionKey);
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the function to get the <see cref="PartitionKey"/> from the <see cref="CosmosDbValue{TModel}"/> used by the <see cref="CosmosDbModelContainer.GetPartitionKey{TModel}(CosmosDbValue{TModel}, CosmosDbArgs)"/> (used by only by the <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="getPartitionKey">The function to get the <see cref="PartitionKey"/> from the model.</param>
-        /// <remarks>This can only be set once; otherwise, a <see cref="InvalidOperationException"/> will be thrown.</remarks>
-        public CosmosDbContainer UseValuePartitionKey<TModel>(Func<CosmosDbValue<TModel>, PartitionKey>? getPartitionKey) where TModel : class, IEntityKey, new()
-        {
-            Model.UsePartitionKey(getPartitionKey);
-            return this;
-        }
-
-        /// <summary>
-        /// Sets (overrides) the name for the model <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="name">The model name.</param>
-        public CosmosDbContainer UseModelName<TModel>(string name) where TModel : class, IEntityKey, new()
-        {
-            Model.UseModelName<TModel>(name);
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the filter for all operations performed on the <typeparamref name="TModel"/> to ensure authorisation is applied. Applies automatically to all queries, plus create, update, delete and get operations.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="filter">The authorization filter query.</param>
-        public CosmosDbContainer UseAuthorizeFilter<TModel>(Func<IQueryable<TModel>, IQueryable<TModel>>? filter) where TModel : class, IEntityKey, new()
-        {
-            Model.UseAuthorizeFilter(filter);
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the filter for all operations performed on the <see cref="CosmosDbValue{TModel}"/> to ensure authorisation is applied. Applies automatically to all queries, plus create, update, delete and get operations.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="filter">The authorization filter query.</param>
-        public CosmosDbContainer UseValueAuthorizeFilter<TModel>(Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? filter) where TModel : class, IEntityKey, new()
-        {
-            Model.UseAuthorizeFilter(filter);
-            return this;
-        }
-
-        /// <summary>
-        /// Maps <paramref name="model"/> to the entity <b>value</b> formatting/updating any special properties as required.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <returns>The entity value.</returns>
-        [return: NotNullIfNotNull(nameof(model))]
-        public T? MapToValue<T, TModel>(TModel? model, CosmosDbArgs dbArgs) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            if (model is null)
-                return default;
-
-            // Map the model to the entity value.
-            var val = CosmosDb.Mapper.Map<TModel, T>(model, OperationTypes.Get)!;
-            if (dbArgs.AutoMapETag && val is IETag et && et.ETag != null)
-                et.ETag = ETagGenerator.ParseETag(et.ETag);
-
-            return dbArgs.CleanUpResult ? Cleaner.Clean(val) : val;
-        }
-
-        /// <summary>
-        /// Maps <paramref name="model"/> to the entity <b>value</b> formatting/updating any special properties as required.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The <see cref="CosmosDbValue{TModel}"/> value.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <returns>The entity value.</returns>
-        [return: NotNullIfNotNull(nameof(model))]
-        public T? MapToValue<T, TModel>(CosmosDbValue<TModel>? model, CosmosDbArgs dbArgs) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            if (model is null)
-                return default;
-
-            ((ICosmosDbValue)model).PrepareAfter(dbArgs);
-            var val = CosmosDb.Mapper.Map<TModel, T>(model.Value, OperationTypes.Get)!;
-            if (dbArgs.AutoMapETag && val is IETag et)
-            {
-                if (et.ETag is not null)
-                    et.ETag = ETagGenerator.ParseETag(et.ETag);
-                else
-                    et.ETag = ETagGenerator.ParseETag(model.ETag);
-            }
-
-            return DbArgs.CleanUpResult ? Cleaner.Clean(val) : val;
-        }
-
-        /// <summary>
-        /// Gets (or adds) the typed <see cref="CosmosDbContainer{T, TModel}"/> for the specified <typeparamref name="T"/> and <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="configure">An optional action to perform one-off configuration on initial access.</param>
-        /// <returns>The typed <see cref="CosmosDbContainer{T, TModel}"/></returns>
-        public CosmosDbContainer<T, TModel> AsTyped<T, TModel>(Action<CosmosDbContainer<T, TModel>>? configure = null) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (CosmosDbContainer<T, TModel>)_containers.GetOrAdd((typeof(T), typeof(TModel)), _ =>
-            {
-                var c = new CosmosDbContainer<T, TModel>(this);
-                configure?.Invoke(c);
-                return c;
-            });
-
-        /// <summary>
-        /// Gets (or adds) the typed <see cref="CosmosDbValueContainer{T, TModel}"/> for the specified <typeparamref name="T"/> and <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="configure">An optional action to perform one-off configuration on initial access.</param>
-        /// <returns>The typed <see cref="CosmosDbValueContainer{T, TModel}"/></returns>
-        public CosmosDbValueContainer<T, TModel> AsValueTyped<T, TModel>(Action<CosmosDbValueContainer<T, TModel>>? configure = null) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (CosmosDbValueContainer<T, TModel>)_valueContainers.GetOrAdd((typeof(T), typeof(TModel)), _ =>
-            {
-                var c = new CosmosDbValueContainer<T, TModel>(this);
-                configure?.Invoke(c);
-                return c;
-            });
-
-        #region Query
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query<T, TModel>(Func<IQueryable<TModel>, IQueryable<TModel>>? query) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => Query<T, TModel>(new CosmosDbArgs(DbArgs), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query<T, TModel>(PartitionKey? partitionKey = null, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => Query<T, TModel>(new CosmosDbArgs(DbArgs, partitionKey), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query<T, TModel>(CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => new(this, dbArgs, query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueQuery{T, TModel}"/>.</returns>
-        public CosmosDbValueQuery<T, TModel> ValueQuery<T, TModel>(Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => ValueQuery<T, TModel>(new CosmosDbArgs(DbArgs), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueQuery{T, TModel}"/>.</returns>
-        public CosmosDbValueQuery<T, TModel> ValueQuery<T, TModel>(PartitionKey? partitionKey = null, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => ValueQuery<T, TModel>(new CosmosDbArgs(DbArgs, partitionKey), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueQuery{T, TModel}"/>.</returns>
-        public CosmosDbValueQuery<T, TModel> ValueQuery<T, TModel>(CosmosDbArgs dbArgs, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => new(this, dbArgs, query);
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<T?> GetAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await GetWithResultAsync<T, TModel>(key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => GetWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<T?> GetAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await GetWithResultAsync<T, TModel>(key, partitionKey, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => GetWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<T?> GetAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await GetWithResultAsync<T, TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<Result<T?>> GetWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            var result = await Model.GetWithResultAsync<TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(m => MapToValue<T, TModel>(m, dbArgs));
-        }
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<T?> GetValueAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await GetValueWithResultAsync<T, TModel>(key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetValueWithResultAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => GetValueWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<T?> GetValueAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await GetValueWithResultAsync<T, TModel>(key, partitionKey, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetValueWithResultAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => GetValueWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>..
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<T?> GetValueAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await GetValueWithResultAsync<T, TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<Result<T?>> GetValueWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            var result = await Model.GetValueWithResultAsync<TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(m => MapToValue<T, TModel>(m, dbArgs));
-        }
-
-        #endregion
-
-        #region Create
-
-        /// <summary>
-        /// Creates the entity.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public async Task<T> CreateAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await CreateWithResultAsync<T, TModel>(value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<T>> CreateWithResultAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => CreateWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public async Task<T> CreateAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (await CreateWithResultAsync<T, TModel>(dbArgs, value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public async Task<Result<T>> CreateWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            TModel model = CosmosDb.Mapper.Map<T, TModel>(Cleaner.PrepareCreate(value.ThrowIfNull(nameof(value))), OperationTypes.Create)!;
-
-            var result = await Model.CreateWithResultAsync(dbArgs, Cleaner.PrepareCreate(model), cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(model => MapToValue<T, TModel>(model, dbArgs)!);
-        }
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public async Task<T> CreateValueAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await CreateValueWithResultAsync<T, TModel>(value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<T>> CreateValueWithResultAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => CreateValueWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public async Task<T> CreateValueAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await CreateValueWithResultAsync<T, TModel>(dbArgs, value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public async Task<Result<T>> CreateValueWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            TModel model = CosmosDb.Mapper.Map<T, TModel>(Cleaner.PrepareCreate(value.ThrowIfNull(nameof(value))), OperationTypes.Create);
-            var cdv = new CosmosDbValue<TModel>(Model.GetModelName<TModel>(), Cleaner.PrepareCreate(model)!);
-
-            var result = await Model.CreateValueWithResultAsync(dbArgs, cdv, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(model => MapToValue<T, TModel>(model, dbArgs)!);
-        }
-
-        #endregion
-
-        #region Update
-
-        /// <summary>
-        /// Updates the entity.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public async Task<T> UpdateAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (await UpdateWithResultAsync<T, TModel>(value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<T>> UpdateWithResultAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => UpdateWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public async Task<T> UpdateAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (await UpdateWithResultAsync<T, TModel>(dbArgs, value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public async Task<Result<T>> UpdateWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            var model = CosmosDb.Mapper.Map<T, TModel>(Cleaner.PrepareUpdate(value.ThrowIfNull(nameof(value))), OperationTypes.Update);
-            var result = await Model.UpdateWithResultInternalAsync(dbArgs, Cleaner.PrepareUpdate(model), m => CosmosDb.Mapper.Map(value, m, OperationTypes.Update), cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(model => MapToValue<T, TModel>(model, dbArgs)!);
-        }
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public async Task<T> UpdateValueAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await UpdateValueWithResultAsync<T, TModel>(value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<T>> UpdateValueWithResultAsync<T, TModel>(T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => UpdateValueWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public async Task<T> UpdateValueAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await UpdateValueWithResultAsync<T, TModel>(dbArgs, value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public async Task<Result<T>> UpdateValueWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-        {
-            var model = CosmosDb.Mapper.Map<T, TModel>(Cleaner.PrepareUpdate(value.ThrowIfNull(nameof(value))), OperationTypes.Update)!;
-            var cdv = new CosmosDbValue<TModel>(Model.GetModelName<TModel>(), Cleaner.PrepareUpdate(model!));
-
-            var result = await Model.UpdateValueWithResultInternalAsync<TModel>(dbArgs, cdv, cdv => CosmosDb.Mapper.Map(value, cdv.Value, OperationTypes.Update), cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(model => MapToValue<T, TModel>(model, dbArgs)!);
-        }
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (await DeleteWithResultAsync<T, TModel>(key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => DeleteWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (await DeleteWithResultAsync<T, TModel>(key, partitionKey, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => DeleteWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new() 
-            => (await DeleteWithResultAsync<T, TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => Model.DeleteWithResultAsync<TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteValueAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await DeleteValueWithResultAsync<T, TModel>(key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteValueWithResultAsync<T, TModel>(CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => DeleteValueWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteValueAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await DeleteValueWithResultAsync<T, TModel>(key, partitionKey, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteValueWithResultAsync<T, TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => DeleteValueWithResultAsync<T, TModel>(new CosmosDbArgs(DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteValueAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => (await DeleteValueWithResultAsync<T, TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteValueWithResultAsync<T, TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-            => Model.DeleteValueWithResultAsync<TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-
-        #region MultiSet
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task SelectValueMultiSetAsync(PartitionKey partitionKey, params IMultiSetValueArgs[] multiSetArgs) => SelectValueMultiSetAsync(partitionKey, multiSetArgs, default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task SelectValueMultiSetAsync(PartitionKey partitionKey, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectValueMultiSetAsync(partitionKey, null, multiSetArgs, cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="sql">The override SQL statement; will default where not specified.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public async Task SelectValueMultiSetAsync(PartitionKey partitionKey, string? sql, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => (await SelectValueMultiSetWithResultAsync(partitionKey, sql, multiSetArgs, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task<Result> SelectValueMultiSetWithResultAsync(PartitionKey partitionKey, params IMultiSetValueArgs[] multiSetArgs) => SelectValueMultiSetWithResultAsync(partitionKey, multiSetArgs, default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task<Result> SelectValueMultiSetWithResultAsync(PartitionKey partitionKey, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectValueMultiSetWithResultAsync(partitionKey, null, multiSetArgs, cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="sql">The override SQL statement; will default to <see cref="MultiSetSqlStatementFormat"/> where not specified.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <paramref name="multiSetArgs"/> must be of type <see cref="CosmosDbValue{TModel}"/>. Each <paramref name="multiSetArgs"/> is verified and executed in the order specified.
-        /// <para>The underlying SQL will be automatically created from the specified <paramref name="multiSetArgs"/> where not explicitly supplied. Essentially, it is a simple query where all <i>types</i> inferred from the <paramref name="multiSetArgs"/>
-        /// are included, for example: <c>SELECT * FROM c WHERE c.type in ("TypeNameA", "TypeNameB")</c></para>
-        /// </remarks>
-        public async Task<Result> SelectValueMultiSetWithResultAsync(PartitionKey partitionKey, string? sql, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default)
-        {
-            // Verify that the multi set arguments are valid for this type of get query.
-            var multiSetList = multiSetArgs?.ToArray() ?? null;
-            if (multiSetList == null || multiSetList.Length == 0)
-                throw new ArgumentException($"At least one {nameof(IMultiSetValueArgs)} must be supplied.", nameof(multiSetArgs));
-
-            // Build the Cosmos SQL statement.
-            var name = multiSetList[0].GetModelName(this);
-            var types = new Dictionary<string, IMultiSetValueArgs>([new KeyValuePair<string, IMultiSetValueArgs>(name, multiSetList[0])]);
-            var sb = string.IsNullOrEmpty(sql) ? new StringBuilder($"\"{name}\"") : null;
-
-            if (sb is not null)
-            {
-                for (int i = 1; i < multiSetList.Length; i++)
-                {
-                    name = multiSetList[i].GetModelName(this);
-                    if (!types.TryAdd(name, multiSetList[i]))
-                        throw new ArgumentException($"All {nameof(IMultiSetValueArgs)} must be of different model type.", nameof(multiSetArgs));
-
-                    sb.Append($", \"{name}\"");
-                }
-
-                sql = string.Format(MultiSetSqlStatementFormat, sb.ToString());
-            }
-
-            // Execute the Cosmos DB query.
-            var result = await CosmosDb.Invoker.InvokeAsync(CosmosDb, this, sql, types, async (_, container, sql, types, ct) =>
-            {
-                // Set up for work.
-                var da = new CosmosDbArgs(container.DbArgs, partitionKey);
-                var qsi = container.CosmosContainer.GetItemQueryStreamIterator(sql, requestOptions: da.GetQueryRequestOptions());
-                IJsonSerializer js = ExecutionContext.GetService<IJsonSerializer>() ?? CoreEx.Json.JsonSerializer.Default;
-                var isStj = js is Text.Json.JsonSerializer;
-
-                while (qsi.HasMoreResults)
-                {
-                    var rm = await qsi.ReadNextAsync(ct).ConfigureAwait(false);
-                    if (!rm.IsSuccessStatusCode)
-                        return Result.Fail(new InvalidOperationException(rm.ErrorMessage));
-
-                    var json = Stj.JsonDocument.Parse(rm.Content);
-                    if (!json.RootElement.TryGetProperty("Documents", out var jds) || jds.ValueKind != Stj.JsonValueKind.Array)
-                        return Result.Fail(new InvalidOperationException("Cosmos response JSON 'Documents' property either not found in result or is not an array."));
-
-                    foreach (var jd in jds.EnumerateArray())
-                    {
-                        if (!jd.TryGetProperty("type", out var jt) || jt.ValueKind != Stj.JsonValueKind.String)
-                            return Result.Fail(new InvalidOperationException("Cosmos response documents item 'type' property either not found in result or is not a string."));
-
-                        if (!types.TryGetValue(jt.GetString()!, out var msa))
-                            continue;   // Ignore any unexpected type.
-
-                        var model = isStj
-                            ? jd.Deserialize(msa.Type, (Stj.JsonSerializerOptions)js.Options)
-                            : js.Deserialize(jd.ToString(), msa.Type);
-
-                        if (model is null)
-                            return Result.Fail(new InvalidOperationException($"Cosmos response documents item type '{jt.GetRawText()}' deserialization resulted in a null."));
-
-                        var result = msa.AddItem(container, da, model);
-                        if (result.IsFailure)
-                            return result;
-                    }
-                }
-
-                return Result.Success;
-            }, cancellationToken).ConfigureAwait(false);
-
-            if (result.IsFailure)
-                return result;
-
-            // Validate the multi-set args and action each accordingly.
-            foreach (var msa in multiSetList)
-            {
-                var r = msa.Verify();
-                if (r.IsFailure)
-                    return r.AsResult();
-
-                if (!r.Value && msa.StopOnNull)
-                    break;
-
-                msa.Invoke();
-            }
-
-            return Result.Success;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbContainerT.cs b/src/CoreEx.Cosmos/CosmosDbContainerT.cs
deleted file mode 100644
index c4c6497c..00000000
--- a/src/CoreEx.Cosmos/CosmosDbContainerT.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Cosmos.Model;
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides a typed interface for the primary <see cref="CosmosDbContainer"/> operations.
-    /// </summary>
-    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public sealed class CosmosDbContainer<T, TModel> where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-    {
-        private CosmosDbModelContainer<TModel>? _model;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbContainer{T, TModel}"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="CosmosDbContainer"/>.</param>
-        internal CosmosDbContainer(CosmosDbContainer owner)
-        {
-            Container = owner.ThrowIfNull(nameof(owner));
-            CosmosContainer = Container.CosmosContainer;
-        }
-
-        /// <summary>
-        /// Gets the owning <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        public CosmosDbContainer Container { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.Container"/>.
-        /// </summary>
-        public Container CosmosContainer { get; }
-
-        /// <summary>
-        /// Gets the typed <see cref="CosmosDbModelContainer{TModel}"/>.
-        /// </summary>
-        public CosmosDbModelContainer<TModel> Model => _model ??= new(Container);
-
-        #region Query
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query(Func<IQueryable<TModel>, IQueryable<TModel>>? query) => Container.Query<T, TModel>(query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query(PartitionKey? partitionKey = null, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Container.Query<T, TModel>(partitionKey, query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbQuery<T, TModel> Query(CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Container.Query<T, TModel>(dbArgs, query);
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<T?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.GetAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.GetWithResultAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<T?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.GetAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.GetWithResultAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<T?> GetAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.GetAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.GetWithResultAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-
-        #region Create
-
-        /// <summary>
-        /// Creates the entity.
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<T> CreateAsync(T value, CancellationToken cancellationToken = default) => Container.CreateAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<T>> CreateWithResultAsync(T value, CancellationToken cancellationToken = default) => Container.CreateWithResultAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<T> CreateAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.CreateAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<T>> CreateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.CreateWithResultAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Update
-
-        /// <summary>
-        /// Updates the entity.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<T> UpdateAsync(T value, CancellationToken cancellationToken = default) => Container.UpdateAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<T>> UpdateWithResultAsync(T value, CancellationToken cancellationToken = default) => Container.UpdateWithResultAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<T> UpdateAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.UpdateAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<T>> UpdateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.UpdateWithResultAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteWithResultAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.DeleteAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.DeleteWithResultAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteWithResultAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbInvoker.cs b/src/CoreEx.Cosmos/CosmosDbInvoker.cs
deleted file mode 100644
index 35f93519..00000000
--- a/src/CoreEx.Cosmos/CosmosDbInvoker.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides the standard <see cref="ICosmosDb"/> invoker functionality.
-    /// </summary>
-    /// <remarks>Catches any unhandled <see cref="CosmosException"/> and invokes <see cref="ICosmosDb.HandleCosmosException(CosmosException)"/> to handle before bubbling up.</remarks>
-    public class CosmosDbInvoker : InvokerBase<ICosmosDb>
-    {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, ICosmosDb cosmos, Func<InvokeArgs, TResult> func) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, ICosmosDb cosmos, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
-        {
-            try
-            {
-                return await base.OnInvokeAsync(invokeArgs, cosmos, func, cancellationToken).ConfigureAwait(false);
-            }
-            catch (CosmosException cex)
-            {
-                var eresult = cosmos.HandleCosmosException(cex);
-                if (eresult.HasValue && eresult.Value.IsFailure && eresult.Value.Error is CoreEx.Abstractions.IExtendedException)
-                {
-                    var dresult = default(TResult);
-                    if (dresult is IResult dir)
-                        return (TResult)dir.ToFailure(eresult.Value.Error);
-                    else
-                        eresult.Value.ThrowOnError();
-                }
-
-                throw;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbQuery.cs b/src/CoreEx.Cosmos/CosmosDbQuery.cs
deleted file mode 100644
index 709260f0..00000000
--- a/src/CoreEx.Cosmos/CosmosDbQuery.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos.Linq;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Encapsulates a <b>CosmosDb</b> query enabling all select-like capabilities.
-    /// </summary>
-    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-    /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-    /// <param name="query">A function to modify the underlying <see cref="IQueryable{T}"/>.</param>
-    public class CosmosDbQuery<T, TModel>(CosmosDbContainer container, CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query) : CosmosDbQueryBase<T, TModel, CosmosDbQuery<T, TModel>>(container, dbArgs) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-    {
-        private readonly Func<IQueryable<TModel>, IQueryable<TModel>>? _query = query;
-
-        /// <summary>
-        /// Instantiates the <see cref="IQueryable"/>.
-        /// </summary>
-        private IQueryable<TModel> AsQueryable(bool allowSynchronousQueryExecution, bool pagingSupported)
-        {
-            if (!pagingSupported && Paging is not null)
-                throw new NotSupportedException("Paging is not supported when accessing AsQueryable directly; paging must be applied directly to the resulting IQueryable instance.");
-
-            IQueryable<TModel> query = Container.CosmosContainer.GetItemLinqQueryable<TModel>(allowSynchronousQueryExecution: allowSynchronousQueryExecution, requestOptions: QueryArgs.GetQueryRequestOptions());
-            query = _query == null ? query : _query(query);
-
-            var filter = Container.Model.GetAuthorizeFilter<TModel>();
-            if (filter != null)
-                query = filter(query);
-
-            return QueryArgs.WhereModelValid(query);
-        }
-
-        /// <summary>
-        /// Gets a pre-prepared <see cref="IQueryable"/> with filtering applied as applicable.
-        /// </summary>
-        /// <returns>The <see cref="IQueryable"/>.</returns>
-        /// <remarks>The <see cref="CosmosDbQueryBase{T, TModel, TSelf}.Paging"/> is not supported. The query will <i>not</i> be automatically included within an <see cref="CosmosDb.Invoker"/> execution.</remarks>
-        public IQueryable<TModel> AsQueryable() => AsQueryable(true, false);
-
-        /// <inheritdoc/>
-        public override Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) => Container.CosmosDb.Invoker.InvokeAsync(Container.CosmosDb, coll, async (_, items, ct) =>
-        {
-            var q = AsQueryable(false, true);
-
-            using var iterator = q.WithPaging(Paging).ToFeedIterator();
-            while (iterator.HasMoreResults)
-            {
-                foreach (var item in await iterator.ReadNextAsync(ct).ConfigureAwait(false))
-                {
-                    if (item is not null)
-                        items.Add(Container.MapToValue<T, TModel>(item, QueryArgs)!);
-                }
-            }
-
-            if (Paging != null && Paging.IsGetCount)
-                Paging.TotalCount = (await q.CountAsync(cancellationToken).ConfigureAwait(false)).Resource;
-
-            return Result.Success;
-        }, cancellationToken, nameof(SelectQueryWithResultAsync));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbQueryBase.cs b/src/CoreEx.Cosmos/CosmosDbQueryBase.cs
deleted file mode 100644
index d40f4e1c..00000000
--- a/src/CoreEx.Cosmos/CosmosDbQueryBase.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Enables the common <b>CosmosDb</b> query capabilities.
-    /// </summary>
-    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="Type"/> itself.</typeparam>
-    /// <param name="container">The owning <see cref="CosmosDbContainer"/>.</param>
-    /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-    public abstract class CosmosDbQueryBase<T, TModel, TSelf>(CosmosDbContainer container, CosmosDbArgs dbArgs) where T : class, new() where TModel : class, new() where TSelf : CosmosDbQueryBase<T, TModel, TSelf>
-    {
-        /// <summary>
-        /// Gets the owning <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        public CosmosDbContainer Container { get; } = container.ThrowIfNull(nameof(container));
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbArgs"/>.
-        /// </summary>
-        public CosmosDbArgs QueryArgs = dbArgs;
-
-        /// <summary>
-        /// Gets the <see cref="PagingResult"/>.
-        /// </summary>
-        public PagingResult? Paging { get; protected set; }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to suport fluent-style method-chaining.</returns>
-        public TSelf WithPaging(PagingArgs? paging)
-        {
-            Paging = paging == null ? null : (paging is PagingResult pr ? pr : new PagingResult(paging));
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to suport fluent-style method-chaining.</returns>
-        public TSelf WithPaging(long skip, long? take = null) => WithPaging(PagingArgs.CreateSkipAndTake(skip, take));
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<T> SelectSingleAsync(CancellationToken cancellationToken = default) => await SelectSingleWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<T>> SelectSingleWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectSingleAsync), 2, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => coll.Single());
-        }
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<T?> SelectSingleOrDefaultAsync(CancellationToken cancellationToken = default) => await SelectSingleOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<T?>> SelectSingleOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectSingleOrDefaultAsync), 2, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => Result<T?>.Ok(coll.SingleOrDefault()));
-        }
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<T> SelectFirstAsync(CancellationToken cancellationToken = default) => await SelectFirstWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<T>> SelectFirstWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectFirstAsync), 1, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => coll.First());
-        }
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<T?> SelectFirstOrDefaultAsync(CancellationToken cancellationToken = default) => await SelectFirstOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<T?>> SelectFirstOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectFirstOrDefaultAsync), 1, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => Result<T?>.Ok(coll.FirstOrDefault()));
-        }
-
-        /// <summary>
-        /// Selects an array by limiting the data retrieved.
-        /// </summary>
-        private Task<Result<T[]>> SelectArrayWithResultAsync(string caller, long take, CancellationToken cancellationToken)
-        {
-            if (Paging != null)
-                throw new InvalidOperationException($"The {nameof(Paging)} must be null for a {caller}; internally applied paging is needed to limit unnecessary data retrieval.");
-
-            WithPaging(0, take);
-            return ToArrayWithResultAsync(cancellationToken);
-        }
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant collection.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<TColl> SelectQueryAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new() => await SelectQueryWithResultAsync<TColl>(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant collection.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-        {
-            var coll = new TColl();
-            var result = await SelectQueryWithResultAsync(coll, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => coll);
-        }
-
-        /// <summary>
-        /// Executes the query adding to the passed collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="coll">The collection to add items to.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task SelectQueryAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) where TColl : ICollection<T> => (await SelectQueryWithResultAsync(coll, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes the query adding to the passed collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="coll">The collection to add items to.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public abstract Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) where TColl : ICollection<T>;
-
-        /// <summary>
-        /// Executes the query command creating a resultant array.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant array.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<T[]> ToArrayAsync(CancellationToken cancellationToken = default) => await ToArrayWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a resultant array with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant array.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<Result<T[]>> ToArrayWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var list = new List<T>();
-            var result = await SelectQueryWithResultAsync(list, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(list.ToArray);
-        }
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<TCollResult> SelectResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new()
-            => await SelectResultWithResultAsync<TCollResult, TColl>(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<Result<TCollResult>> SelectResultWithResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new()
-        {
-            var result = await SelectQueryWithResultAsync<TColl>(cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => new TCollResult { Items = coll, Paging = Paging ?? new PagingResult() });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbServiceCollectionExtensions.cs b/src/CoreEx.Cosmos/CosmosDbServiceCollectionExtensions.cs
deleted file mode 100644
index e4aaa348..00000000
--- a/src/CoreEx.Cosmos/CosmosDbServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Cosmos;
-using CoreEx.Cosmos.HealthChecks;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extension methods.
-    /// </summary>
-    public static class CosmosDbServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds an <see cref="ICosmosDb"/> as a scoped service.
-        /// </summary>
-        /// <typeparam name="TCosmosDb">The <see cref="ICosmosDb"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="create">The function to create the <see cref="ICosmosDb"/> instance.</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="CosmosDbHealthCheck{TCosmosDb}"/> should be configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddCosmosDb<TCosmosDb>(this IServiceCollection services, Func<IServiceProvider, TCosmosDb> create, bool healthCheck = true) where TCosmosDb : class, ICosmosDb
-        {
-            services.ThrowIfNull(nameof(services)).AddScoped(sp => create.ThrowIfNull(nameof(create)).Invoke(sp));
-            if (healthCheck)
-                services.AddHealthChecks().AddCosmosDbHealthCheck<TCosmosDb>();
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds an <see cref="ICosmosDb"/> as a scoped service including a corresponding health check.
-        /// </summary>
-        /// <typeparam name="TCosmosDb">The <see cref="ICosmosDb"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="create">The function to create the <see cref="ICosmosDb"/> instance.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>cosmos-db</c>'.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddCosmosDb<TCosmosDb>(this IServiceCollection services, Func<IServiceProvider, TCosmosDb> create, string? healthCheckName) where TCosmosDb : class, ICosmosDb
-        {
-            services.ThrowIfNull(nameof(services)).AddScoped(sp => create.ThrowIfNull(nameof(create)).Invoke(sp));
-            services.AddHealthChecks().AddCosmosDbHealthCheck<TCosmosDb>(healthCheckName);
-            return services;
-        }
-
-        /// <summary>
-        /// Adds an <see cref="CosmosDbHealthCheck{TCosmosDb}"/> to verify that the <see cref="ICosmosDb"/> database is accessible by performing a read operation.
-        /// </summary>
-        /// <typeparam name="TCosmosDb">The <see cref="ICosmosDb"/> <see cref="Type"/>.</typeparam>
-        /// <param name="builder">The <see cref="IHealthChecksBuilder"/>.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>cosmos-db</c>'.</param>
-        /// <returns>The <see cref="IHealthChecksBuilder"/> to support fluent-style method-chaining.</returns>
-        public static IHealthChecksBuilder AddCosmosDbHealthCheck<TCosmosDb>(this IHealthChecksBuilder builder, string? healthCheckName = null) where TCosmosDb : class, ICosmosDb
-        {
-            builder.ThrowIfNull(nameof(builder)).AddTypeActivatedCheck<CosmosDbHealthCheck<TCosmosDb>>(healthCheckName ?? "cosmos-db", HealthStatus.Unhealthy, tags: default!, timeout: TimeSpan.FromSeconds(30));
-            return builder;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbValue.cs b/src/CoreEx.Cosmos/CosmosDbValue.cs
deleted file mode 100644
index 0dbe10f4..00000000
--- a/src/CoreEx.Cosmos/CosmosDbValue.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Cosmos.Model;
-using CoreEx.Entities;
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Represents a special-purpose <b>CosmosDb</b> object that houses an underlying model-<see cref="Value"/>, including <see cref="System.Type"/> name, and flexible <see cref="IEntityKey"/>, for persistence.
-    /// </summary>
-    /// <typeparam name="TModel">The model <see cref="Value"/> <see cref="System.Type"/>.</typeparam>
-    /// <remarks>The <see cref="CosmosDbModelBase.Id"/>, <see cref="System.Type"/> and <see cref="CosmosDbModelBase.ETag"/> are updated internally, where possible, when interacting directly with <b>CosmosDB</b>.</remarks>
-    public sealed class CosmosDbValue<TModel> : CosmosDbModelBase, ICosmosDbValue where TModel : class, IEntityKey, new()
-    {
-        private TModel _value;
-        private string _type;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbValue{TModel}"/> class.
-        /// </summary>
-        public CosmosDbValue()
-        {
-            _type = typeof(TModel).Name;
-            _value = new();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbValue{TModel}"/> class with a <paramref name="value"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public CosmosDbValue(TModel value)
-        {
-            _type = typeof(TModel).Name;
-            _value = value.ThrowIfNull(nameof(value));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbValue{TModel}"/> class with a <paramref name="type"/> and <paramref name="value"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="System.Type"/> name override.</param>
-        /// <param name="value">The value.</param>
-        public CosmosDbValue(string? type, TModel value)
-        {
-            _type = type ?? typeof(TModel).Name;
-            _value = value.ThrowIfNull(nameof(value));
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="System.Type"/> name.
-        /// </summary>
-        [JsonProperty("type")]
-        [JsonPropertyName("type")]
-        public string Type { get => _type; set => _type = value.ThrowIfNullOrEmpty(nameof(Type)); }
-
-        /// <summary>
-        /// Gets or sets the value.
-        /// </summary>
-        [JsonProperty("value")]
-        [JsonPropertyName("value")]
-        public TModel Value { get => _value; set => _value = value.ThrowIfNull(nameof(Value)); }
-
-        /// <summary>
-        /// Gets the value.
-        /// </summary>
-        object ICosmosDbValue.Value => _value;
-
-        /// <inheritdoc/>
-        void ICosmosDbValue.PrepareBefore(CosmosDbArgs dbArgs, string? type)
-        {
-            if (Value != default)
-            {
-                Id = dbArgs.FormatIdentifier(Value.EntityKey);
-
-                if (Value is IETag etag)
-                    ETag = ETagGenerator.FormatETag(etag.ETag);
-
-                if (Value is IPartitionKey pk)
-                    PartitionKey = pk.PartitionKey;
-            }
-
-            if (string.IsNullOrEmpty(type))
-                Type ??= typeof(TModel).Name;
-            else
-                Type = type;
-        }
-
-        /// <inheritdoc/>
-        void ICosmosDbValue.PrepareAfter(CosmosDbArgs dbArgs)
-        {
-            if (Value == default)
-                return;
-
-            if (Value is IETag etag)
-                etag.ETag = ETagGenerator.ParseETag(ETag);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbValueContainerT.cs b/src/CoreEx.Cosmos/CosmosDbValueContainerT.cs
deleted file mode 100644
index 006b93d4..00000000
--- a/src/CoreEx.Cosmos/CosmosDbValueContainerT.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Cosmos.Model;
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides a typed interface for the primary <see cref="CosmosDbContainer"/> <see cref="CosmosDbValueQuery{T, TModel}"/> operations.
-    /// </summary>
-    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public sealed class CosmosDbValueContainer<T, TModel> where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-    {
-        private CosmosDbValueModelContainer<TModel>? _model;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbValueContainer{T, TModel}"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="CosmosDbContainer"/>.</param>
-        internal CosmosDbValueContainer(CosmosDbContainer owner)
-        {
-            Container = owner.ThrowIfNull(nameof(owner));
-            CosmosContainer = owner.CosmosContainer;
-        }
-
-        /// <summary>
-        /// Gets the owning <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        public CosmosDbContainer Container { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.Container"/>.
-        /// </summary>
-        public Container CosmosContainer { get; }
-
-        /// <summary>
-        /// Gets the typed <see cref="CosmosDbValueModelContainer{TModel}"/>.
-        /// </summary>
-        public CosmosDbValueModelContainer<TModel> Model => _model ??= new(Container);
-
-        #region Query
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueQuery{T, TModel}"/>.</returns>
-        public CosmosDbValueQuery<T, TModel> Query(Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query) => Container.ValueQuery<T, TModel>(query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueQuery{T, TModel}"/>.</returns>
-        public CosmosDbValueQuery<T, TModel> Query(PartitionKey? partitionKey = null, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) => Container.ValueQuery<T, TModel>(partitionKey, query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueQuery{T, TModel}"/>.</returns>
-        public CosmosDbValueQuery<T, TModel> Query(CosmosDbArgs dbArgs, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) => Container.ValueQuery<T, TModel>(dbArgs, query);
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<T?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.GetValueAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.GetValueWithResultAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<T?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.GetValueAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.GetValueWithResultAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<T?> GetAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.GetValueAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<T?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.GetValueWithResultAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-
-        #region Create
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<T> CreateAsync(T value, CancellationToken cancellationToken = default) => Container.CreateValueAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<T>> CreateWithResultAsync(T value, CancellationToken cancellationToken = default) => Container.CreateValueWithResultAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<T> CreateAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.CreateValueAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<T>> CreateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.CreateValueWithResultAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Update
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<T> UpdateAsync(T value, CancellationToken cancellationToken = default) => Container.UpdateValueAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<T>> UpdateWithResultAsync(T value, CancellationToken cancellationToken = default) => Container.UpdateValueWithResultAsync<T, TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<T> UpdateAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.UpdateValueAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<T>> UpdateWithResultAsync(CosmosDbArgs dbArgs, T value, CancellationToken cancellationToken = default) => Container.UpdateValueWithResultAsync<T, TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteValueAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteValueWithResultAsync<T, TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.DeleteValueAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Container.DeleteValueWithResultAsync<T, TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteValueAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Container.DeleteValueWithResultAsync<T, TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbValueQuery.cs b/src/CoreEx.Cosmos/CosmosDbValueQuery.cs
deleted file mode 100644
index 5edd51a9..00000000
--- a/src/CoreEx.Cosmos/CosmosDbValueQuery.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos.Linq;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Encapsulates a <b>CosmosDb</b> query enabling all select-like capabilities.
-    /// </summary>
-    /// <typeparam name="T">The resultant <see cref="CosmosDbValue{T}"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-    /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-    /// <param name="query">A function to modify the underlying <see cref="IQueryable{T}"/>.</param>
-    public class CosmosDbValueQuery<T, TModel>(CosmosDbContainer container, CosmosDbArgs dbArgs, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query) : CosmosDbQueryBase<T, TModel, CosmosDbValueQuery<T, TModel>>(container, dbArgs) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-    {
-        private readonly Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? _query = query;
-
-        /// <summary>
-        /// Instantiates the <see cref="IQueryable"/>.
-        /// </summary>
-        private IQueryable<CosmosDbValue<TModel>> AsQueryable(bool allowSynchronousQueryExecution, bool pagingSupported)
-        {
-            if (!pagingSupported && Paging is not null)
-                throw new NotSupportedException("Paging is not supported when accessing AsQueryable directly; paging must be applied directly to the resulting IQueryable instance.");
-
-            IQueryable<CosmosDbValue<TModel>> query = Container.CosmosContainer.GetItemLinqQueryable<CosmosDbValue<TModel>>(allowSynchronousQueryExecution: allowSynchronousQueryExecution, requestOptions: QueryArgs.GetQueryRequestOptions());
-            query = (_query == null ? query : _query(query)).WhereType(Container.Model.GetModelName<TModel>());
-
-            var filter = Container.Model.GetValueAuthorizeFilter<TModel>();
-            if (filter != null)
-                query = filter(query);
-
-            return QueryArgs.WhereModelValid(query);
-        }
-
-        /// <summary>
-        /// Gets a pre-prepared <see cref="IQueryable"/> with filtering applied as applicable.
-        /// </summary>
-        /// <returns>The <see cref="IQueryable"/>.</returns>
-        /// <remarks>The <see cref="CosmosDbQueryBase{T, TModel, TSelf}.Paging"/> is not supported. The query will <i>not</i> be automatically included within an <see cref="CosmosDb.Invoker"/> execution.</remarks>
-        public IQueryable<CosmosDbValue<TModel>> AsQueryable() => AsQueryable(true, false);
-
-        /// <inheritdoc/>
-        public override Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) => Container.CosmosDb.Invoker.InvokeAsync(Container.CosmosDb, coll, async (_, items, ct) =>
-        {
-            var q = AsQueryable(false, true);
-
-            using var iterator = q.WithPaging(Paging).ToFeedIterator();
-            while (iterator.HasMoreResults)
-            {
-                foreach (var item in await iterator.ReadNextAsync(ct).ConfigureAwait(false))
-                {
-                    items.Add(Container.MapToValue<T, TModel>(item, QueryArgs)!);
-                }
-            }
-
-            if (Paging != null && Paging.IsGetCount)
-                Paging.TotalCount = (await q.CountAsync(cancellationToken).ConfigureAwait(false)).Resource;
-
-            return Result.Success;
-        }, cancellationToken, nameof(SelectQueryWithResultAsync));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosDbValueQueryableExtensions.cs b/src/CoreEx.Cosmos/CosmosDbValueQueryableExtensions.cs
deleted file mode 100644
index d4b2638f..00000000
--- a/src/CoreEx.Cosmos/CosmosDbValueQueryableExtensions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Adds additional extension methods to <see cref="IQueryable{T}"/> for where <i>T</i> is <see cref="CosmosDbValue{TModel}"/>.
-    /// </summary>
-    public static class CosmosDbValueQueryableExtensions
-    {
-        /// <summary>
-        /// Filters a sequence of values based on the <see cref="CosmosDbValue{TModel}.Type"/> equalling the <paramref name="typeName"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="typeName">The <see cref="CosmosDbValue{TModel}.Type"/> name.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<CosmosDbValue<T>> WhereType<T>(this IQueryable<CosmosDbValue<T>> query, string? typeName = null) where T : class, IEntityKey, new() => query.Where("type = @0", string.IsNullOrEmpty(typeName) ? typeof(T).Name : typeName);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/CosmosExtensions.cs b/src/CoreEx.Cosmos/CosmosExtensions.cs
deleted file mode 100644
index 8eba5f8f..00000000
--- a/src/CoreEx.Cosmos/CosmosExtensions.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Azure.Cosmos;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides <b>CosmosDb</b>-related extension methods.
-    /// </summary>
-    public static class CosmosExtensions
-    {
-        /// <summary>
-        /// Deletes the <see cref="Container"/> from the <see cref="Database"/>.
-        /// </summary>
-        /// <param name="database">The <see cref="Database"/>.</param>
-        /// <param name="containerId">The container identifier.</param>
-        /// <param name="requestOptions">The <see cref="ContainerRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ContainerResponse"/>.</returns>
-        public static Task<ContainerResponse> DeleteContainerAsync(this Database database, string containerId, ContainerRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            database.ThrowIfNull(nameof(database));
-            containerId.ThrowIfNull(nameof(containerId));
-
-            var container = database.GetContainer(containerId);
-            return container.DeleteContainerAsync(requestOptions, cancellationToken);
-        }
-
-        /// <summary>
-        /// Replace or create the <see cref="Container"/>.
-        /// </summary>
-        /// <param name="database">The <see cref="Database"/>.</param>
-        /// <param name="containerProperties">The <see cref="ContainerProperties"/>.</param>
-        /// <param name="throughput">The throughput (RU/S).</param>
-        /// <param name="requestOptions">The <see cref="RequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Container"/>.</returns>
-        public static async Task<Container> ReplaceOrCreateContainerAsync(this Database database, ContainerProperties containerProperties, int? throughput = null, RequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            database.ThrowIfNull(nameof(database));
-            containerProperties.ThrowIfNull(nameof(containerProperties));
-
-            try
-            {
-                await database.DeleteContainerAsync(containerProperties.Id, null, cancellationToken).ConfigureAwait(false);
-            }
-            catch (CosmosException cex)
-            {
-                if (cex.StatusCode != System.Net.HttpStatusCode.NotFound)
-                    throw;
-            }
-
-            return await database.CreateContainerAsync(containerProperties, throughput, requestOptions, cancellationToken).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/HealthChecks/CosmosDbHealthCheck.cs b/src/CoreEx.Cosmos/HealthChecks/CosmosDbHealthCheck.cs
deleted file mode 100644
index 030b7211..00000000
--- a/src/CoreEx.Cosmos/HealthChecks/CosmosDbHealthCheck.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.HealthChecks
-{
-    /// <summary>
-    /// Provides a generic <see cref="ICosmosDb"/> <see cref="IHealthCheck"/> to verify that the database is accessible by performing a read operation.
-    /// </summary>
-    /// <typeparam name="TCosmosDb">The <see cref="ICosmosDb"/> <see cref="Type"/>.</typeparam>
-    /// <param name="cosmosDb">The <see cref="ICosmosDb"/> to health check.</param>
-    public class CosmosDbHealthCheck<TCosmosDb>(TCosmosDb cosmosDb) : IHealthCheck where TCosmosDb : class, ICosmosDb
-    {
-        private readonly TCosmosDb _cosmosDb = cosmosDb = cosmosDb.ThrowIfNull(nameof(cosmosDb));
-
-        /// <inheritdoc/>
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            var data = new Dictionary<string, object> { { "database-id", _cosmosDb.Database.Id } };
-
-            try
-            {
-                var dr = await _cosmosDb.Database.ReadAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-                return HealthCheckResult.Healthy(null, data);
-            }
-            catch (Exception ex)
-            {
-                return new HealthCheckResult(context.Registration.FailureStatus, $"An unexpected CosmosDB database error has occurred: {ex.Message}", ex, data);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/ICosmosDb.cs b/src/CoreEx.Cosmos/ICosmosDb.cs
deleted file mode 100644
index 19b37526..00000000
--- a/src/CoreEx.Cosmos/ICosmosDb.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides the <b>CosmosDb</b> capabilities.
-    /// </summary>
-    public interface ICosmosDb
-    {
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.Database"/>.
-        /// </summary>
-        Database Database { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        IMapper Mapper { get; }
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbInvoker"/>.
-        /// </summary>
-        CosmosDbInvoker Invoker { get; }
-
-        /// <summary>
-        /// Gets the default <see cref="CosmosDbArgs"/> used where not expliticly specified for an operation.
-        /// </summary>
-        CosmosDbArgs DbArgs { get; }
-
-        /// <summary>
-        /// Gets the specified <see cref="Container"/>.
-        /// </summary>
-        /// <param name="containerId">The <see cref="Container"/> identifier.</param>
-        /// <returns>The selected <see cref="Container"/>.</returns>
-        Container GetCosmosContainer(string containerId);
-
-        /// <summary>
-        /// Gets (or adds) the <see cref="CosmosDbContainer"/> for the specified <paramref name="containerId"/>.
-        /// </summary>
-        /// <param name="containerId">The <see cref="Container"/> identifier.</param>
-        /// <returns>The <see cref="CosmosDbContainer"/>.</returns>
-        CosmosDbContainer Container(string containerId);
-
-        /// <summary>
-        /// Gets (or adds) the typed <see cref="CosmosDbContainer{T, TModel}"/> for the specified <typeparamref name="T"/> and <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="containerId">The <see cref="Container"/> identifier.</param>
-        /// <returns>The typed <see cref="CosmosDbContainer{T, TModel}"/></returns>
-        CosmosDbContainer<T, TModel> Container<T, TModel>(string containerId) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new();
-
-        /// <summary>
-        /// Gets (or adds) the typed <see cref="CosmosDbValueContainer{T, TModel}"/> for the specified <typeparamref name="T"/> and <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="containerId">The <see cref="Container"/> identifier.</param>
-        /// <returns>The typed <see cref="CosmosDbValueContainer{T, TModel}"/></returns>
-        CosmosDbValueContainer<T, TModel> ValueContainer<T, TModel>(string containerId) where T : class, IEntityKey, new() where TModel : class, IEntityKey, new();
-
-        /// <summary>
-        /// Invoked where a <see cref="CosmosException"/> has been thrown.
-        /// </summary>
-        /// <param name="cex">The <see cref="CosmosException"/>.</param>
-        /// <returns>The <see cref="Result"/> containing the appropriate <see cref="IResult.Error"/> where handled; otherwise, <c>null</c> indicating that the exception is unexpected and will continue to be thrown as such.</returns>
-        /// <remarks>Provides an opportunity to inspect and handle the exception before it is returned. A resulting <see cref="Result"/> that is <see cref="Result.IsSuccess"/> is not considered sensical; therefore, will result in the originating
-        /// exception being thrown.</remarks>
-        Result? HandleCosmosException(CosmosException cex);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/ICosmosDbType.cs b/src/CoreEx.Cosmos/ICosmosDbType.cs
deleted file mode 100644
index 23070c96..00000000
--- a/src/CoreEx.Cosmos/ICosmosDbType.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Defines the <see cref="Type"/> property.
-    /// </summary>
-    public interface ICosmosDbType
-    {
-        /// <summary>
-        /// Gets the model <see cref="System.Type"/> name.
-        /// </summary>
-        /// <remarks>Enables multiple models to be managed within a single container leveraging different types.</remarks>
-        string Type { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/ICosmosDbValue.cs b/src/CoreEx.Cosmos/ICosmosDbValue.cs
deleted file mode 100644
index 7d4022d9..00000000
--- a/src/CoreEx.Cosmos/ICosmosDbValue.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Defines the core capabilities for the special-purpose <b>CosmosDb</b> object that houses an underlying model-<see cref="Value"/>.
-    /// </summary>
-    public interface ICosmosDbValue : IIdentifier<string>, ICosmosDbType
-    {
-        /// <summary>
-        /// Gets the model value.
-        /// </summary>
-        object Value { get; }
-
-        /// <summary>
-        /// Prepares the object before sending to Cosmos.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="type">The model <see cref="Type"/> name override.</param>
-        void PrepareBefore(CosmosDbArgs dbArgs, string? type);
-
-        /// <summary>
-        /// Prepares the object after getting from Cosmos.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        void PrepareAfter(CosmosDbArgs dbArgs);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/IMultiSetValueArgs.cs b/src/CoreEx.Cosmos/IMultiSetValueArgs.cs
deleted file mode 100644
index ebaec70b..00000000
--- a/src/CoreEx.Cosmos/IMultiSetValueArgs.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Cosmos.Model;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Enables the <see cref="CosmosDbValue{TModel}"/> multi-set arguments.
-    /// </summary>
-    public interface IMultiSetValueArgs : IMultiSetArgs { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelBase.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelBase.cs
deleted file mode 100644
index dbd04ce8..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelBase.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using Newtonsoft.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Provides the base <b>CosmosDb</b> <b>model</b> capabilities.
-    /// </summary>
-    public abstract class CosmosDbModelBase : IIdentifier<string>, IETag, IPartitionKey
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="IIdentifier{TId}.Id"/>.
-        /// </summary>
-        [JsonProperty("id")]
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IETag"/>.
-        /// </summary>
-        [JsonProperty("_etag")]
-        [JsonPropertyName("_etag")]
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the time-to-live (https://docs.microsoft.com/en-us/azure/cosmos-db/time-to-live).
-        /// </summary>
-        [JsonProperty("ttl", DefaultValueHandling = DefaultValueHandling.Ignore)]
-        [JsonPropertyName("ttl")]
-        public int? TimeToLive { get; set; }
-
-        /// <summary>
-        /// Gets or sets an optional <b>CosmosDb</b> <b>partition key</b> that can be used when required.
-        /// </summary>
-        /// <remarks>This property exists to support scenarios where the partition key is not represented in the underlying <see cref="ICosmosDbValue.Value"/> itself.</remarks>
-        [JsonProperty("_partitionKey")]
-        [JsonPropertyName("_partitionKey")]
-        public string? PartitionKey { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs
deleted file mode 100644
index 67ec6143..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelContainer.cs
+++ /dev/null
@@ -1,1120 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Provides the underlying operations for model-based access within the <see cref="CosmosDbContainer"/>.
-    /// </summary>
-    public sealed class CosmosDbModelContainer
-    {
-        private readonly CosmosDbContainer _owner;
-        private readonly Lazy<ConcurrentDictionary<Type, Func<object, PartitionKey?>>> _partitionKeyGets = new();
-        private readonly Lazy<ConcurrentDictionary<Type, string>> _typeNames = new();
-        private readonly Lazy<ConcurrentDictionary<Type, object>> _filters = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbModelContainer"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="CosmosDbContainer"/>.</param>
-        internal CosmosDbModelContainer(CosmosDbContainer owner) => _owner = owner;
-
-        /// <summary>
-        /// Checks whether the <paramref name="model"/> is in a valid state for the operation.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <param name="dbArgs">The specific <see cref="CosmosDbArgs"/> for the operation.</param>
-        /// <param name="checkAuthorized">Indicates whether an additional authorization check should be performed against the <paramref name="model"/>.</param>
-        /// <returns><c>true</c> indicates that the model is in a valid state; otherwise, <c>false</c>.</returns>
-        public bool IsModelValid<TModel>(TModel? model, CosmosDbArgs dbArgs, bool checkAuthorized) where TModel : class, IEntityKey, new()
-            => !(!dbArgs.IsModelValid(model)
-                || (model is ICosmosDbType mt && mt.Type != GetModelName<TModel>())
-                || (checkAuthorized && IsAuthorized(model).IsFailure));
-
-        /// <summary>
-        /// Checks whether the <paramref name="model"/> is in a valid state for the operation.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <param name="dbArgs">The specific <see cref="CosmosDbArgs"/> for the operation.</param>
-        /// <param name="checkAuthorized">Indicates whether an additional authorization check should be performed against the <paramref name="model"/>.</param>
-        /// <returns><c>true</c> indicates that the model is in a valid state; otherwise, <c>false</c>.</returns>
-        public bool IsModelValid<TModel>(CosmosDbValue<TModel>? model, CosmosDbArgs dbArgs, bool checkAuthorized) where TModel : class, IEntityKey, new()
-            => !(model is null
-                || !dbArgs.IsModelValid(model.Value)
-                || model.Type != GetModelName<TModel>()
-                || (checkAuthorized && IsAuthorized(model).IsFailure));
-
-        /// <summary>
-        /// Sets the function to get the <see cref="PartitionKey"/> from the model used by the <see cref="GetPartitionKey{TModel}(TModel, CosmosDbArgs)"/> (used by only the <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="getPartitionKey">The function to get the <see cref="PartitionKey"/> from the model.</param>
-        internal void UsePartitionKey<TModel>(Func<TModel, PartitionKey>? getPartitionKey) where TModel : class, IEntityKey, new()
-        {
-            // Where the function is null we should ignore unless previously set.
-            if (getPartitionKey is null)
-            {
-                if (_partitionKeyGets.IsValueCreated && _partitionKeyGets.Value.ContainsKey(typeof(TModel)))
-                    throw new InvalidOperationException($"PartitionKey already set for {typeof(TModel).Name}.");
-
-                return;
-            }
-
-            if (!_partitionKeyGets.Value.TryAdd(typeof(TModel), model => getPartitionKey.ThrowIfNull(nameof(getPartitionKey)).Invoke((TModel)model)))
-                throw new InvalidOperationException($"PartitionKey already set for {typeof(TModel).Name}.");
-        }
-
-        /// <summary>
-        /// Gets the <see cref="PartitionKey"/> from the <paramref name="model"/> (used by only by the <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <param name="model">The cosmos model <see cref="Type"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <returns>The <see cref="PartitionKey"/>.</returns>
-        /// <exception cref="AuthorizationException">Will be thrown where the infered <see cref="PartitionKey"/> is not equal to <see cref="CosmosDbContainer.DbArgs"/> (where not <c>null</c>).</exception>
-        public PartitionKey GetPartitionKey<TModel>(TModel model, CosmosDbArgs dbArgs) where TModel : class, IEntityKey, new()
-        {
-            var dbpk = _owner.DbArgs.PartitionKey;
-            var pk = _partitionKeyGets.IsValueCreated && _partitionKeyGets.Value.TryGetValue(typeof(TModel), out var gpk) ? gpk(model!) : null;
-            
-            if (!pk.HasValue)
-                pk = dbArgs.PartitionKey ?? _owner.DbArgs.PartitionKey ?? PartitionKey.None;
-
-            if (dbpk is not null && dbpk != PartitionKey.None && dbpk != pk)
-                throw new AuthorizationException();
-
-            return pk.Value;
-        }
-
-        /// <summary>
-        /// Sets the function to get the <see cref="PartitionKey"/> from the <see cref="CosmosDbValue{TModel}"/> used by the <see cref="GetPartitionKey{TModel}(TModel, CosmosDbArgs)"/> (used by only the <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="getPartitionKey">The function to get the <see cref="PartitionKey"/> from the model.</param>
-        internal void UsePartitionKey<TModel>(Func<CosmosDbValue<TModel>, PartitionKey>? getPartitionKey) where TModel : class, IEntityKey, new()
-        {
-            // Where the function is null we should ignore unless previously set.
-            if (getPartitionKey is null)
-            {
-                if (_partitionKeyGets.IsValueCreated && _partitionKeyGets.Value.ContainsKey(typeof(CosmosDbValue<TModel>)))
-                    throw new InvalidOperationException($"PartitionKey already set for {typeof(CosmosDbValue<TModel>).Name}.");
-
-                return;
-            }
-
-            if (!_partitionKeyGets.Value.TryAdd(typeof(CosmosDbValue<TModel>), model => getPartitionKey.ThrowIfNull(nameof(getPartitionKey)).Invoke((CosmosDbValue<TModel>)model)))
-                throw new InvalidOperationException($"PartitionKey already set for {typeof(CosmosDbValue<TModel>).Name}.");
-        }
-
-        /// <summary>
-        /// Gets the <see cref="PartitionKey"/> from the <paramref name="model"/> (used by only by the <b>Create</b> and <b>Update</b> operations).
-        /// </summary>
-        /// <param name="model">The cosmos model <see cref="Type"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <returns>The <see cref="PartitionKey"/>.</returns>
-        /// <exception cref="AuthorizationException">Will be thrown where the infered <see cref="PartitionKey"/> is not equal to <see cref="CosmosDbContainer.DbArgs"/> (where not <c>null</c>).</exception>
-        public PartitionKey GetPartitionKey<TModel>(CosmosDbValue<TModel> model, CosmosDbArgs dbArgs) where TModel : class, IEntityKey, new()
-        {
-            var dbpk = _owner.DbArgs.PartitionKey;
-            var pk = _partitionKeyGets.IsValueCreated && _partitionKeyGets.Value.TryGetValue(typeof(CosmosDbValue<TModel>), out var gpk) ? gpk(model!) : null;
-
-            if (!pk.HasValue)
-                pk = dbArgs.PartitionKey ?? _owner.DbArgs.PartitionKey ?? PartitionKey.None;
-
-            if (dbpk is not null && dbpk != PartitionKey.None && dbpk != pk)
-                throw new AuthorizationException();
-
-            return pk.Value;
-        }
-
-        /// <summary>
-        /// Sets the name for the model <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="name">The model name.</param>
-        internal void UseModelName<TModel>(string name) where TModel : class, IEntityKey, new()
-        {
-            if (!_typeNames.Value.TryAdd(typeof(TModel), name))
-                throw new InvalidOperationException($"Model Type Name already set for {typeof(TModel).Name}.");
-        }
-
-        /// <summary>
-        /// Gets the name for the model <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <returns>The model name where configured (see <see cref="CosmosDbContainer.UseModelName{TModel}(string)"/>); otherwise, defaults to <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>.</returns>
-        public string GetModelName<TModel>() where TModel : class, IEntityKey, new() => _typeNames.IsValueCreated && _typeNames.Value.TryGetValue(typeof(TModel), out var name) ? name : typeof(TModel).Name;
-
-        /// <summary>
-        /// Sets the filter for all operations performed on the <typeparamref name="TModel"/> to ensure authorisation is applied. Applies automatically to all queries, plus create, update, delete and get operations.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="filter">The authorization filter query.</param>
-        internal void UseAuthorizeFilter<TModel>(Func<IQueryable<TModel>, IQueryable<TModel>>? filter) where TModel : class, IEntityKey, new()
-        {
-            if (filter is null)
-            {
-                if (_filters.IsValueCreated && _filters.Value.ContainsKey(typeof(TModel)))
-                    throw new InvalidOperationException($"Filter already set for {typeof(TModel).Name}.");
-
-                return;
-            }
-
-            if (!_filters.Value.TryAdd(typeof(TModel), filter))
-                throw new InvalidOperationException($"Filter already set for {typeof(TModel).Name}.");
-        }
-
-        /// <summary>
-        /// Checks the value to determine whether the user is authorized with the <see cref="GetAuthorizeFilter{TModel}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <remarks>Either <see cref="Result.Success"/> or <see cref="Result.AuthorizationError"/>.</remarks>
-        public Result IsAuthorized<TModel>(TModel model) where TModel : class, IEntityKey, new()
-        {
-            if (model != default)
-            {
-                var filter = GetAuthorizeFilter<TModel>();
-                if (filter != null && !filter(new [] { model }.AsQueryable()).Any())
-                    return Result.AuthorizationError();
-            }
-
-            return Result.Success;
-        }
-
-        /// <summary>
-        /// Gets the authorization filter for the <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <returns>The authorization filter query where configured; otherwise, <c>null</c>.</returns>
-        public Func<IQueryable<TModel>, IQueryable<TModel>>? GetAuthorizeFilter<TModel>() where TModel : class, IEntityKey, new() 
-            => _filters.IsValueCreated && _filters.Value.TryGetValue(typeof(TModel), out var filter) ? (Func<IQueryable<TModel>, IQueryable<TModel>>)filter : null;
-
-        /// <summary>
-        /// Sets the filter for all operations performed on the <see cref="CosmosDbValue{TModel}"/> to ensure authorization is applied. Applies automatically to all queries, plus create, update, delete and get operations.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="filter">The authorization filter query.</param>
-        internal void UseAuthorizeFilter<TModel>(Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? filter) where TModel : class, IEntityKey, new()
-        {
-            if (filter is null)
-            {
-                if (_filters.IsValueCreated && _filters.Value.ContainsKey(typeof(CosmosDbValue<TModel>)))
-                    throw new InvalidOperationException($"Filter already set for {typeof(CosmosDbValue<TModel>).Name}.");
-
-                return;
-            }
-
-            if (!_filters.Value.TryAdd(typeof(CosmosDbValue<TModel>), filter))
-                throw new InvalidOperationException($"Filter already set for {typeof(CosmosDbValue<TModel>).Name}.");
-        }
-
-        /// <summary>
-        /// Gets the authorization filter for the <see cref="CosmosDbValue{TModel}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <returns>The authorization filter query where configured; otherwise, <c>null</c>.</returns>
-        public Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? GetValueAuthorizeFilter<TModel>() where TModel : class, IEntityKey, new() 
-            => _filters.IsValueCreated && _filters.Value.TryGetValue(typeof(CosmosDbValue<TModel>), out var filter) ? (Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>)filter : null;
-
-        /// <summary>
-        /// Checks the value to determine whether the user is authorized with the <see cref="GetValueAuthorizeFilter{TModel}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <remarks>Either <see cref="Result.Success"/> or <see cref="Result.AuthorizationError"/>.</remarks>
-        public Result IsAuthorized<TModel>(CosmosDbValue<TModel> model) where TModel : class, IEntityKey, new()
-        {
-            if (model != null && model.Value != default)
-            {
-                var filter = GetValueAuthorizeFilter<TModel>();
-                if (filter != null && !filter(new CosmosDbValue<TModel>[] { model }.AsQueryable()).Any())
-                    return Result.AuthorizationError();
-            }
-
-            return Result.Success;
-        }
-
-        /// <summary>
-        /// Gets the <b>value</b> from the response updating any special properties as required.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="resp">The response value.</param>
-        /// <returns>The entity value.</returns>
-        internal static TModel? GetResponseValue<TModel>(Response<TModel> resp) where TModel : class, IEntityKey, new() => resp?.Resource == null ? default : resp.Resource;
-
-        /// <summary>
-        /// Gets the <b>value</b> from the response updating any special properties as required.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="resp">The response value.</param>
-        /// <returns>The entity value.</returns>
-        internal static CosmosDbValue<TModel>? GetResponseValue<TModel>(Response<CosmosDbValue<TModel>> resp) where TModel : class, IEntityKey, new() => resp?.Resource == null ? default : resp.Resource;
-
-        #region Query
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbModelQuery{TModel}"/>.</returns>
-        public CosmosDbModelQuery<TModel> Query<TModel>(Func<IQueryable<TModel>, IQueryable<TModel>>? query) where TModel : class, IEntityKey, new() => Query(new CosmosDbArgs(_owner.DbArgs), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbModelQuery{TModel}"/>.</returns>
-        public CosmosDbModelQuery<TModel> Query<TModel>(PartitionKey? partitionKey = null, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where TModel : class, IEntityKey, new() => Query(new CosmosDbArgs(_owner.DbArgs, partitionKey), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbModelQuery{TModel}"/>.</returns>
-        public CosmosDbModelQuery<TModel> Query<TModel>(CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where TModel : class, IEntityKey, new() => new(_owner, dbArgs, query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbModelQuery{TModel}"/>.</returns>
-        public CosmosDbValueModelQuery<TModel> ValueQuery<TModel>(Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query) where TModel : class, IEntityKey, new() => ValueQuery(new CosmosDbArgs(_owner.DbArgs), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbModelQuery{TModel}"/>.</returns>
-        public CosmosDbValueModelQuery<TModel> ValueQuery<TModel>(PartitionKey? partitionKey = null, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) where TModel : class, IEntityKey, new() => ValueQuery(new CosmosDbArgs(_owner.DbArgs, partitionKey), query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbModelQuery{TModel}"/>.</returns>
-        public CosmosDbValueModelQuery<TModel> ValueQuery<TModel>(CosmosDbArgs dbArgs, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) where TModel : class, IEntityKey, new() => new(_owner, dbArgs, query);
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<TModel?> GetAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await GetWithResultAsync<TModel>(key, cancellationToken)).Value;
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => GetWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<TModel?> GetAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await GetWithResultAsync<TModel>(key, partitionKey, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => GetWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<TModel?> GetAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await GetWithResultAsync<TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, _owner.GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
-            {
-                try
-                {
-                    var pk = _owner.GetPartitionKey(dbArgs.PartitionKey);
-                    var resp = await _owner.CosmosContainer.ReadItemAsync<TModel>(id, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
-                    if (!IsModelValid(resp.Resource, args, false))
-                        return args.NullOnNotFound ? Result<TModel?>.None : Result<TModel?>.NotFoundError();
-
-                    return Result.Go(IsAuthorized<TModel>(resp)).ThenAs(() => GetResponseValue(resp));
-                }
-                catch (CosmosException dcex) when (args.NullOnNotFound && dcex.StatusCode == System.Net.HttpStatusCode.NotFound) { return args.NullOnNotFound ? Result<TModel?>.None : Result<TModel?>.NotFoundError(); }
-            }, cancellationToken, nameof(GetWithResultAsync));
-        }
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="CosmosDbValue{TModel}"/> value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<CosmosDbValue<TModel>?> GetValueAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await GetValueWithResultAsync<TModel>(key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="CosmosDbValue{TModel}"/> value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetValueWithResultAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => GetValueWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="CosmosDbValue{TModel}"/> value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<CosmosDbValue<TModel>?> GetValueAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await GetValueWithResultAsync<TModel>(key, partitionKey, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="CosmosDbValue{TModel}"/> value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetValueWithResultAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => GetValueWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="CosmosDbValue{TModel}"/> value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public async Task<CosmosDbValue<TModel>?> GetValueAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await GetValueWithResultAsync<TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="CosmosDbValue{TModel}"/> value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetValueWithResultAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, _owner.GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
-            {
-                try
-                {
-                    var pk = _owner.GetPartitionKey(dbArgs.PartitionKey);
-                    var resp = await _owner.CosmosContainer.ReadItemAsync<CosmosDbValue<TModel>>(id, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
-                    if (!IsModelValid(resp.Resource, args, false))
-                        return args.NullOnNotFound ? Result<CosmosDbValue<TModel>?>.None : Result<CosmosDbValue<TModel>?>.NotFoundError();
-
-                    return Result.Go(IsAuthorized<TModel>(resp)).ThenAs(() => GetResponseValue(resp));
-                }
-                catch (CosmosException dcex) when (args.NullOnNotFound && dcex.StatusCode == System.Net.HttpStatusCode.NotFound) { return args.NullOnNotFound ? Result<CosmosDbValue<TModel>?>.None : Result<CosmosDbValue<TModel>?>.NotFoundError(); }
-            }, cancellationToken, nameof(GetWithResultAsync));
-        }
-
-        #endregion
-
-        #region Create
-
-        /// <summary>
-        /// Creates the model.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public async Task<TModel> CreateAsync<TModel>(TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await CreateWithResultAsync(new CosmosDbArgs(_owner.DbArgs), model, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the model.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public async Task<TModel> CreateAsync<TModel>(CosmosDbArgs dbArgs, TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await CreateWithResultAsync(dbArgs, model, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public Task<Result<TModel>> CreateWithResultAsync<TModel>(TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => CreateWithResultAsync(new CosmosDbArgs(_owner.DbArgs), model, cancellationToken);
-
-        /// <summary>
-        /// Creates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public Task<Result<TModel>> CreateWithResultAsync<TModel>(CosmosDbArgs dbArgs, TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, Cleaner.PrepareCreate(model.ThrowIfNull(nameof(model))), dbArgs, async (_, m, args, ct) =>
-            {
-                var pk = GetPartitionKey(m, args);
-                return await Result
-                    .Go(IsAuthorized(model))
-                    .ThenAsAsync(() => _owner.CosmosContainer.CreateItemAsync(Cleaner.PrepareCreate(model), pk, args.GetItemRequestOptions(), ct))
-                    .ThenAs(resp => GetResponseValue(resp!)!);
-            }, cancellationToken, nameof(CreateWithResultAsync));
-        }
-
-        /// <summary>
-        /// Creates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public async Task<CosmosDbValue<TModel>> CreateValueAsync<TModel>(CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await CreateValueWithResultAsync(new CosmosDbArgs(_owner.DbArgs), model, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public async Task<CosmosDbValue<TModel>> CreateValueAsync<TModel>(CosmosDbArgs dbArgs, CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await CreateValueWithResultAsync(dbArgs, model, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> CreateValueWithResultAsync<TModel>(CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => CreateValueWithResultAsync(new CosmosDbArgs(_owner.DbArgs), model, cancellationToken);
-
-        /// <summary>
-        /// Creates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created model.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> CreateValueWithResultAsync<TModel>(CosmosDbArgs dbArgs, CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, Cleaner.PrepareCreate(model.ThrowIfNull(nameof(model))), dbArgs, async (_, m, args, ct) =>
-            {
-                var pk = GetPartitionKey(m, args);
-                return await Result
-                    .Go(IsAuthorized(m))
-                    .ThenAsAsync(async () =>
-                    {
-                        ((ICosmosDbValue)m).PrepareBefore(args, typeof(TModel).Name);
-                        Cleaner.PrepareCreate(m.Value);
-                        var resp = await _owner.CosmosContainer.CreateItemAsync(m, pk, args.GetItemRequestOptions(), ct).ConfigureAwait(false);
-                        return GetResponseValue(resp)!;
-                    });
-            }, cancellationToken, nameof(CreateWithResultAsync));
-        }
-
-        #endregion
-
-        #region Update
-
-        /// <summary>
-        /// Updates the model.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public async Task<TModel> UpdateAsync<TModel>(TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await UpdateWithResultInternalAsync(new CosmosDbArgs(_owner.DbArgs), model, null, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the model.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public async Task<TModel> UpdateAsync<TModel>(CosmosDbArgs dbArgs, TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await UpdateWithResultInternalAsync(dbArgs, model, null, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public Task<Result<TModel>> UpdateWithResultAsync<TModel>(TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => UpdateWithResultInternalAsync(new CosmosDbArgs(_owner.DbArgs), model, null, cancellationToken);
-
-        /// <summary>
-        /// Updates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public Task<Result<TModel>> UpdateWithResultAsync<TModel>(CosmosDbArgs dbArgs, TModel model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => UpdateWithResultInternalAsync(dbArgs, model, null, cancellationToken);
-
-        /// <summary>
-        /// Updates the model with a <see cref="Result{T}"/> (internal).
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to update.</param>
-        /// <param name="modelUpdater">The action to update the model after the read.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        internal Task<Result<TModel>> UpdateWithResultInternalAsync<TModel>(CosmosDbArgs dbArgs, TModel model, Action<TModel>? modelUpdater, CancellationToken cancellationToken) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, Cleaner.PrepareUpdate(model.ThrowIfNull(nameof(model))), dbArgs, async (_, m, args, ct) =>
-            {
-                // Where supporting etag then use IfMatch for concurrency.
-                var ro = args.GetItemRequestOptions();
-                if (ro.IfMatchEtag == null && m is IETag etag && etag.ETag != null)
-                    ro.IfMatchEtag = ETagGenerator.FormatETag(etag.ETag);
-
-                // Must read existing to update.
-                var id = _owner.GetCosmosId(m);
-                var pk = GetPartitionKey(model, dbArgs);
-                var resp = await _owner.CosmosContainer.ReadItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
-                if (!IsModelValid(resp.Resource, args, false))
-                    return Result<TModel>.NotFoundError();
-
-                return await Result
-                    .Go(IsAuthorized<TModel>(resp))
-                    .When(() => m is IETag etag2 && etag2.ETag != null && ETagGenerator.FormatETag(etag2.ETag) != resp.ETag, () => Result.ConcurrencyError())
-                    .Then(() =>
-                    {
-                        ro.SessionToken = resp.Headers?.Session;
-                        modelUpdater?.Invoke(resp.Resource);
-                        Cleaner.ResetTenantId(resp.Resource);
-
-                        // Re-check auth to make sure not updating to something not allowed.
-                        return IsAuthorized<TModel>(resp);
-                    })
-                    .ThenAsAsync(async () =>
-                    {
-                        resp = await _owner.CosmosContainer.ReplaceItemAsync(Cleaner.PrepareUpdate(resp.Resource), id, pk, ro, ct).ConfigureAwait(false);
-                        return GetResponseValue(resp)!;
-                    });
-            }, cancellationToken, nameof(UpdateWithResultAsync));
-        }
-
-        /// <summary>
-        /// Updates the <see cref="CosmosDbValue{TModel}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public async Task<CosmosDbValue<TModel>> UpdateValueAsync<TModel>(CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await UpdateWithResultAsync(new CosmosDbArgs(_owner.DbArgs), model, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the <see cref="CosmosDbValue{TModel}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public async Task<CosmosDbValue<TModel>> UpdateValueAsync<TModel>(CosmosDbArgs dbArgs, CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await UpdateWithResultAsync(dbArgs, model, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> UpdateValueWithResultAsync<TModel>(CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => UpdateValueWithResultInternalAsync(new CosmosDbArgs(_owner.DbArgs), model, null, cancellationToken);
-
-        /// <summary>
-        /// Updates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> UpdateValueWithResultAsync<TModel>(CosmosDbArgs dbArgs, CosmosDbValue<TModel> model, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => UpdateValueWithResultInternalAsync(dbArgs, model, null, cancellationToken);
-
-        /// <summary>
-        /// Updates the <see cref="CosmosDbValue{TModel}"/> with a <see cref="Result{T}"/> (internal).
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The model to update.</param>
-        /// <param name="modelUpdater">The action to update the model after the read.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated model.</returns>
-        internal Task<Result<CosmosDbValue<TModel>>> UpdateValueWithResultInternalAsync<TModel>(CosmosDbArgs dbArgs, CosmosDbValue<TModel> model, Action<CosmosDbValue<TModel>>? modelUpdater, CancellationToken cancellationToken) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, Cleaner.PrepareUpdate(model.ThrowIfNull(nameof(model))), dbArgs, async (_, m, args, ct) =>
-            {
-                // Where supporting etag then use IfMatch for concurrency.
-                var ro = args.GetItemRequestOptions();
-                if (ro.IfMatchEtag == null && m is IETag etag && etag.ETag != null)
-                    ro.IfMatchEtag = ETagGenerator.FormatETag(etag.ETag);
-
-                // Must read existing to update.
-                ((ICosmosDbValue)m).PrepareBefore(dbArgs, GetModelName<TModel>());
-                var id = m.Id;
-                var pk = GetPartitionKey(m, dbArgs);
-                var resp = await _owner.CosmosContainer.ReadItemAsync<CosmosDbValue<TModel>>(id, pk, ro, ct).ConfigureAwait(false);
-                if (!IsModelValid(resp.Resource, args, false))
-                    return Result<CosmosDbValue<TModel>>.NotFoundError();
-
-                return await Result
-                    .Go(IsAuthorized(resp.Resource))
-                    .When(() => m is IETag etag2 && etag2.ETag != null && ETagGenerator.FormatETag(etag2.ETag) != resp.ETag, () => Result.ConcurrencyError())
-                    .Then(() =>
-                    {
-                        ro.SessionToken = resp.Headers?.Session;
-                        modelUpdater?.Invoke(resp.Resource);
-                        Cleaner.ResetTenantId(m.Value);
-                        ((ICosmosDbValue)resp.Resource).PrepareBefore(dbArgs, GetModelName<TModel>());
-
-                        // Re-check auth to make sure not updating to something not allowed.
-                        return IsAuthorized<TModel>(resp);
-                    })
-                    .ThenAsAsync(async () =>
-                    {
-                        Cleaner.PrepareUpdate(resp.Resource.Value);
-                        resp = await _owner.CosmosContainer.ReplaceItemAsync(resp.Resource, id, pk, ro, ct).ConfigureAwait(false);
-                        return GetResponseValue(resp)!;
-                    });
-            }, cancellationToken, nameof(UpdateValueWithResultAsync));
-        }
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await DeleteWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs), key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => DeleteWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await DeleteWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs, partitionKey), key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => DeleteWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await DeleteWithResultAsync<TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, _owner.GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
-            {
-                try
-                {
-                    // Must read the existing to validate.
-                    var ro = args.GetItemRequestOptions();
-                    var pk = _owner.GetPartitionKey(dbArgs.PartitionKey);
-                    var resp = await _owner.CosmosContainer.ReadItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
-                    if (!IsModelValid(resp.Resource, args, false))
-                        return Result.Success;
-
-                    // Delete; either logically or physically.
-                    if (resp.Resource is ILogicallyDeleted ild)
-                    {
-                        if (ild.IsDeleted.HasValue && ild.IsDeleted.Value)
-                            return Result.Success;
-
-                        ild.IsDeleted = true;
-                        return await Result
-                            .Go(IsAuthorized(resp.Resource))
-                            .ThenAsync(async () =>
-                            {
-                                ro.SessionToken = resp.Headers?.Session;
-                                await _owner.CosmosContainer.ReplaceItemAsync(Cleaner.PrepareUpdate(resp.Resource), id, pk, ro, ct).ConfigureAwait(false);
-                                return Result.Success;
-                            });
-                    }
-
-                    return await Result
-                        .Go(IsAuthorized(resp.Resource))
-                        .ThenAsync(async () =>
-                        {
-                            ro.SessionToken = resp.Headers?.Session;
-                            await _owner.CosmosContainer.DeleteItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
-                            return Result.Success;
-                        });
-                }
-                catch (CosmosException cex) when (cex.StatusCode == System.Net.HttpStatusCode.NotFound) { return Result.NotFoundError(); }
-            }, cancellationToken, nameof(DeleteWithResultAsync));
-        }
-
-        /// <summary>
-        /// Deletes the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteValueAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await DeleteWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs), key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteValueWithResultAsync<TModel>(CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => DeleteValueWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteValueAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await DeleteValueWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs, partitionKey), key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteValueWithResultAsync<TModel>(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => DeleteValueWithResultAsync<TModel>(new CosmosDbArgs(_owner.DbArgs, partitionKey), key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteValueAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-            => (await DeleteValueWithResultAsync<TModel>(dbArgs, key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the <see cref="CosmosDbValue{TModel}"/> for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteValueWithResultAsync<TModel>(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, IEntityKey, new()
-        {
-            return _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, _owner.GetCosmosId(key), dbArgs, async (_, id, args, ct) =>
-            {
-                try
-                {
-                    // Must read existing to delete and to make sure we are deleting for the correct Type; don't just trust the key.
-                    var ro = args.GetItemRequestOptions();
-                    var pk = _owner.GetPartitionKey(dbArgs.PartitionKey);
-                    var resp = await _owner.CosmosContainer.ReadItemAsync<CosmosDbValue<TModel>>(id, pk, ro, ct).ConfigureAwait(false);
-                    if (!IsModelValid(resp.Resource, args, false))
-                        return Result.Success;
-
-                    // Delete; either logically or physically.
-                    if (resp.Resource.Value is ILogicallyDeleted ild)
-                    {
-                        if (ild.IsDeleted.HasValue && ild.IsDeleted.Value)
-                            return Result.Success;
-
-                        ild.IsDeleted = true;
-                        return await Result
-                            .Go(IsAuthorized(resp.Resource))
-                            .ThenAsync(async () =>
-                            {
-                                ro.SessionToken = resp.Headers?.Session;
-                                Cleaner.PrepareUpdate(resp.Resource.Value);
-                                await _owner.CosmosContainer.ReplaceItemAsync(resp.Resource, id, pk, ro, ct).ConfigureAwait(false);
-                                return Result.Success;
-                            });
-                    }
-
-                    return await Result
-                        .Go(IsAuthorized(resp.Resource))
-                        .ThenAsync(async () =>
-                        {
-                            ro.SessionToken = resp.Headers?.Session;
-                            await _owner.CosmosContainer.DeleteItemAsync<TModel>(id, pk, ro, ct).ConfigureAwait(false);
-                            return Result.Success;
-                        });
-                }
-                catch (CosmosException cex) when (cex.StatusCode == System.Net.HttpStatusCode.NotFound) { return Result.NotFoundError(); }
-            }, cancellationToken, nameof(DeleteValueWithResultAsync));
-        }
-
-        #endregion
-
-        #region MultiSet
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetModelArgs"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetModelArgs"/>.</param>
-        /// <remarks>See <see cref="SelectMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetModelArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task SelectMultiSetAsync(PartitionKey partitionKey, params IMultiSetModelArgs[] multiSetArgs) => SelectMultiSetAsync(partitionKey, multiSetArgs, default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetModelArgs"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetModelArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetModelArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task SelectMultiSetAsync(PartitionKey partitionKey, IEnumerable<IMultiSetModelArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectMultiSetAsync(partitionKey, null, multiSetArgs, cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetModelArgs"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="sql">The override SQL statement; will default where not specified.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetModelArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetModelArgs}, CancellationToken)"/> for further details.</remarks>
-        public async Task SelectMultiSetAsync(PartitionKey partitionKey, string? sql, IEnumerable<IMultiSetModelArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => (await SelectMultiSetWithResultAsync(partitionKey, sql, multiSetArgs, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetModelArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetModelArgs"/>.</param>
-        /// <remarks>See <see cref="SelectMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetModelArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task<Result> SelectMultiSetWithResultAsync(PartitionKey partitionKey, params IMultiSetModelArgs[] multiSetArgs) => SelectMultiSetWithResultAsync(partitionKey, multiSetArgs, default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetModelArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetModelArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetModelArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task<Result> SelectMultiSetWithResultAsync(PartitionKey partitionKey, IEnumerable<IMultiSetModelArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectMultiSetWithResultAsync(partitionKey, null, multiSetArgs, cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetModelArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="sql">The override SQL statement; will default where not specified.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetModelArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <paramref name="multiSetArgs"/> must be of type <see cref="CosmosDbValue{TModel}"/>. Each <paramref name="multiSetArgs"/> is verified and executed in the order specified.
-        /// <para>The underlying SQL will be automatically created from the specified <paramref name="multiSetArgs"/> where not explicitly supplied. Essentially, it is a simple query where all <i>types</i> inferred from the <paramref name="multiSetArgs"/>
-        /// are included, for example: <c>SELECT * FROM c WHERE c.type in ("TypeNameA", "TypeNameB")</c></para>
-        /// </remarks>
-        public async Task<Result> SelectMultiSetWithResultAsync(PartitionKey partitionKey, string? sql, IEnumerable<IMultiSetModelArgs> multiSetArgs, CancellationToken cancellationToken = default)
-        {
-            // Verify that the multi set arguments are valid for this type of get query.
-            var multiSetList = multiSetArgs?.ToArray() ?? null;
-            if (multiSetList == null || multiSetList.Length == 0)
-                throw new ArgumentException($"At least one {nameof(IMultiSetModelArgs)} must be supplied.", nameof(multiSetArgs));
-
-            // Build the Cosmos SQL statement.
-            var name = multiSetList[0].GetModelName(_owner);
-            var types = new Dictionary<string, IMultiSetModelArgs>([new KeyValuePair<string, IMultiSetModelArgs>(name, multiSetList[0])]);
-            var sb = string.IsNullOrEmpty(sql) ? new StringBuilder($"\"{name}\"") : null;
-
-            if (sb is not null)
-            {
-                for (int i = 1; i < multiSetList.Length; i++)
-                {
-                    name = multiSetList[i].GetModelName(_owner);
-                    if (!types.TryAdd(name, multiSetList[i]))
-                        throw new ArgumentException($"All {nameof(IMultiSetValueArgs)} must be of different model type.", nameof(multiSetArgs));
-
-                    sb.Append($", \"{name}\"");
-                }
-
-                sql = string.Format(_owner.MultiSetSqlStatementFormat, sb.ToString());
-            }
-
-            // Execute the Cosmos DB query.
-            var result = await _owner.CosmosDb.Invoker.InvokeAsync(_owner.CosmosDb, _owner, sql, types, async (_, container, sql, types, ct) =>
-            {
-                // Set up for work.
-                var da = new CosmosDbArgs(container.DbArgs, partitionKey);
-                var qsi = container.CosmosContainer.GetItemQueryStreamIterator(sql, requestOptions: da.GetQueryRequestOptions());
-                IJsonSerializer js = ExecutionContext.GetService<IJsonSerializer>() ?? CoreEx.Json.JsonSerializer.Default;
-                var isStj = js is Text.Json.JsonSerializer;
-
-                while (qsi.HasMoreResults)
-                {
-                    var rm = await qsi.ReadNextAsync(ct).ConfigureAwait(false);
-                    if (!rm.IsSuccessStatusCode)
-                        return Result.Fail(new InvalidOperationException(rm.ErrorMessage));
-
-                    var json = Stj.JsonDocument.Parse(rm.Content);
-                    if (!json.RootElement.TryGetProperty("Documents", out var jds) || jds.ValueKind != Stj.JsonValueKind.Array)
-                        return Result.Fail(new InvalidOperationException("Cosmos response JSON 'Documents' property either not found in result or is not an array."));
-
-                    foreach (var jd in jds.EnumerateArray())
-                    {
-                        if (!jd.TryGetProperty("type", out var jt) || jt.ValueKind != Stj.JsonValueKind.String)
-                            return Result.Fail(new InvalidOperationException("Cosmos response documents item 'type' property either not found in result or is not a string."));
-
-                        if (!types.TryGetValue(jt.GetString()!, out var msa))
-                            continue;   // Ignore any unexpected type.
-
-                        var model = isStj
-                            ? jd.Deserialize(msa.Type, (Stj.JsonSerializerOptions)js.Options)
-                            : js.Deserialize(jd.ToString(), msa.Type);
-
-                        if (model is null)
-                            return Result.Fail(new InvalidOperationException($"Cosmos response documents item type '{jt.GetRawText()}' deserialization resulted in a null."));
-
-                        var result = msa.AddItem(container, da, model);
-                        if (result.IsFailure)
-                            return result;
-                    }
-                }
-
-                return Result.Success;
-            }, cancellationToken).ConfigureAwait(false);
-
-            if (result.IsFailure)
-                return result;
-
-            // Validate the multi-set args and action each accordingly.
-            foreach (var msa in multiSetList)
-            {
-                var r = msa.Verify();
-                if (r.IsFailure)
-                    return r.AsResult();
-
-                if (!r.Value && msa.StopOnNull)
-                    break;
-
-                msa.Invoke();
-            }
-
-            return Result.Success;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelContainerT.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelContainerT.cs
deleted file mode 100644
index 3538f65b..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelContainerT.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Provides a typed interface for the primary <see cref="CosmosDbModelContainer"/> operations.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public class CosmosDbModelContainer<TModel> where TModel : class, IEntityKey, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbModelContainer{TModel}"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="CosmosDbContainer"/>.</param>
-        internal CosmosDbModelContainer(CosmosDbContainer owner) => Owner = owner.ThrowIfNull(nameof(owner));
-
-        /// <summary>
-        /// Gets the owning <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        public CosmosDbContainer Owner { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.Container"/>.
-        /// </summary>
-        public Container CosmosContainer => Owner.CosmosContainer;
-
-        #region Query
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbModelQuery<TModel> Query(Func<IQueryable<TModel>, IQueryable<TModel>>? query) => Owner.Model.Query<TModel>(query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbModelQuery<TModel> Query(PartitionKey? partitionKey = null, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Owner.Model.Query<TModel>(partitionKey, query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbQuery{T, TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbQuery{T, TModel}"/>.</returns>
-        public CosmosDbModelQuery<TModel> Query(CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Owner.Model.Query<TModel>(dbArgs, query);
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<TModel?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetWithResultAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<TModel?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.GetAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.GetWithResultAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<TModel?> GetAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetAsync<TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<TModel?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetWithResultAsync<TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-
-        #region Create
-
-        /// <summary>
-        /// Creates the model.
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<TModel> CreateAsync(TModel value, CancellationToken cancellationToken = default) => Owner.Model.CreateAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<TModel>> CreateWithResultAsync(TModel value, CancellationToken cancellationToken = default) => Owner.Model.CreateWithResultAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the model.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<TModel> CreateAsync(CosmosDbArgs dbArgs, TModel value, CancellationToken cancellationToken = default) => Owner.Model.CreateAsync<TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Creates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<TModel>> CreateWithResultAsync(CosmosDbArgs dbArgs, TModel value, CancellationToken cancellationToken = default) => Owner.Model.CreateWithResultAsync<TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Update
-
-        /// <summary>
-        /// Updates the model.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<TModel> UpdateAsync(TModel value, CancellationToken cancellationToken = default) => Owner.Model.UpdateAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the model with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<TModel>> UpdateWithResultAsync(TModel value, CancellationToken cancellationToken = default) => Owner.Model.UpdateWithResultAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the model.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<TModel> UpdateAsync(CosmosDbArgs dbArgs, TModel value, CancellationToken cancellationToken = default) => Owner.Model.UpdateAsync<TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteWithResultAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.DeleteAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.DeleteWithResultAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteAsync<TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteWithResultAsync<TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelQuery.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelQuery.cs
deleted file mode 100644
index 45d36e62..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelQuery.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos.Linq;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Encapsulates a <b>CosmosDb</b> model-only query enabling all select-like capabilities.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-    /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-    /// <param name="query">A function to modify the underlying <see cref="IQueryable{T}"/>.</param>
-    public class CosmosDbModelQuery<TModel>(CosmosDbContainer container, CosmosDbArgs dbArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query) : CosmosDbModelQueryBase<TModel, CosmosDbModelQuery<TModel>>(container, dbArgs) where TModel : class, IEntityKey, new()
-    {
-        private readonly Func<IQueryable<TModel>, IQueryable<TModel>>? _query = query;
-
-        /// <summary>
-        /// Instantiates the <see cref="IQueryable"/>.
-        /// </summary>
-        private IQueryable<TModel> AsQueryable(bool allowSynchronousQueryExecution, bool pagingSupported)
-        {
-            if (!pagingSupported && Paging is not null)
-                throw new NotSupportedException("Paging is not supported when accessing AsQueryable directly; paging must be applied directly to the resulting IQueryable instance.");
-
-            IQueryable<TModel> query = Container.CosmosContainer.GetItemLinqQueryable<TModel>(allowSynchronousQueryExecution: allowSynchronousQueryExecution, requestOptions: QueryArgs.GetQueryRequestOptions());
-            query = _query == null ? query : _query(query);
-
-            var filter = Container.Model.GetAuthorizeFilter<TModel>();
-            if (filter != null)
-                query = filter(query);
-
-            return QueryArgs.WhereModelValid(query);
-        }
-
-        /// <summary>
-        /// Gets a pre-prepared <see cref="IQueryable"/> with filtering applied as applicable.
-        /// </summary>
-        /// <returns>The <see cref="IQueryable"/>.</returns>
-        /// <remarks>The <see cref="CosmosDbModelQueryBase{TModel, TSelf}.Paging"/> is not supported. The query will <i>not</i> be automatically included within an <see cref="CosmosDb.Invoker"/> execution.</remarks>
-        public IQueryable<TModel> AsQueryable() => AsQueryable(true, false);
-
-        /// <inheritdoc/>
-        public override Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) => Container.CosmosDb.Invoker.InvokeAsync(Container.CosmosDb, coll, async (_, items, ct) =>
-        {
-            var q = AsQueryable(false, true);
-
-            using var iterator = q.WithPaging(Paging).ToFeedIterator();
-            while (iterator.HasMoreResults)
-            {
-                foreach (var item in await iterator.ReadNextAsync(ct).ConfigureAwait(false))
-                {
-                    items.Add(item);
-                }
-            }
-
-            if (Paging != null && Paging.IsGetCount)
-                Paging.TotalCount = (await q.CountAsync(cancellationToken).ConfigureAwait(false)).Resource;
-
-            return Result.Success;
-        }, cancellationToken, nameof(SelectQueryWithResultAsync));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbModelQueryBase.cs b/src/CoreEx.Cosmos/Model/CosmosDbModelQueryBase.cs
deleted file mode 100644
index c1f7fc89..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbModelQueryBase.cs
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Enables the common <b>CosmosDb</b> model-only query capabilities.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="Type"/> itself.</typeparam>
-    /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-    /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-    public abstract class CosmosDbModelQueryBase<TModel, TSelf>(CosmosDbContainer container, CosmosDbArgs dbArgs) where TModel : new() where TSelf : CosmosDbModelQueryBase<TModel, TSelf>
-    {
-        /// <summary>
-        /// Gets the <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        public CosmosDbContainer Container { get; } = container.ThrowIfNull(nameof(container));
-
-        /// <summary>
-        /// Gets the <see cref="CosmosDbArgs"/>.
-        /// </summary>
-        public CosmosDbArgs QueryArgs = dbArgs;
-
-        /// <summary>
-        /// Gets the <see cref="PagingResult"/>.
-        /// </summary>
-        public PagingResult? Paging { get; protected set; }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to suport fluent-style method-chaining.</returns>
-        public TSelf WithPaging(PagingArgs? paging)
-        {
-            Paging = paging == null ? null : paging is PagingResult pr ? pr : new PagingResult(paging);
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to suport fluent-style method-chaining.</returns>
-        public TSelf WithPaging(long skip, long? take = null) => WithPaging(PagingArgs.CreateSkipAndTake(skip, take));
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<TModel> SelectSingleAsync(CancellationToken cancellationToken = default) => await SelectSingleWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<TModel>> SelectSingleWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectSingleAsync), 2, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => coll.Single());
-        }
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<TModel?> SelectSingleOrDefaultAsync(CancellationToken cancellationToken = default) => await SelectSingleOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<TModel?>> SelectSingleOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectSingleOrDefaultAsync), 2, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => Result<TModel?>.Ok(coll.SingleOrDefault()));
-        }
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<TModel> SelectFirstAsync(CancellationToken cancellationToken = default) => await SelectFirstWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<TModel>> SelectFirstWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectFirstAsync), 1, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => coll.First());
-        }
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<TModel?> SelectFirstOrDefaultAsync(CancellationToken cancellationToken = default) => await SelectFirstOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        /// <remarks><see cref="Paging"/> is not supported for this operation.</remarks>
-        public async Task<Result<TModel?>> SelectFirstOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var result = await SelectArrayWithResultAsync(nameof(SelectFirstOrDefaultAsync), 1, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => Result<TModel?>.Ok(coll.FirstOrDefault()));
-        }
-
-        /// <summary>
-        /// Selects an array by limiting the data retrieved.
-        /// </summary>
-        private Task<Result<TModel[]>> SelectArrayWithResultAsync(string caller, long take, CancellationToken cancellationToken)
-        {
-            if (Paging != null)
-                throw new InvalidOperationException($"The {nameof(Paging)} must be null for a {caller}; internally applied paging is needed to limit unnecessary data retrieval.");
-
-            WithPaging(0, take);
-            return ToArrayWithResultAsync(cancellationToken);
-        }
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant collection.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<TColl> SelectQueryAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<TModel>, new() => await SelectQueryWithResultAsync<TColl>(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant collection.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<TModel>, new()
-        {
-            var coll = new TColl();
-            var result = await SelectQueryWithResultAsync(coll, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => coll);
-        }
-
-        /// <summary>
-        /// Executes the query adding to the passed collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="coll">The collection to add items to.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task SelectQueryAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) where TColl : ICollection<TModel> => (await SelectQueryWithResultAsync(coll, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes the query adding to the passed collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="coll">The collection to add items to.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public abstract Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) where TColl : ICollection<TModel>;
-
-        /// <summary>
-        /// Executes the query command creating a resultant array.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant array.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<TModel[]> ToArrayAsync(CancellationToken cancellationToken = default) => await ToArrayWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a resultant array with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant array.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<Result<TModel[]>> ToArrayWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var list = new List<TModel>();
-            var result = await SelectQueryWithResultAsync(list, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => list.ToArray());
-        }
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<TCollResult> SelectResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, TModel>, new() where TColl : ICollection<TModel>, new()
-            => await SelectResultWithResultAsync<TCollResult, TColl>(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        /// <remarks>The <see cref="Paging"/> is also applied, including <see cref="PagingArgs.IsGetCount"/> where requested.</remarks>
-        public async Task<Result<TCollResult>> SelectResultWithResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, TModel>, new() where TColl : ICollection<TModel>, new()
-        {
-            var result = await SelectQueryWithResultAsync<TColl>(cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(coll => new TCollResult { Items = coll, Paging = Paging ?? new PagingResult() });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainerT.cs b/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainerT.cs
deleted file mode 100644
index 8385d21f..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbValueModelContainerT.cs
+++ /dev/null
@@ -1,394 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Provides a typed interface for the primary <see cref="CosmosDbContainer"/> <see cref="CosmosDbValueModelQuery{TModel}"/> operations.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public sealed class CosmosDbValueModelContainer<TModel> where TModel : class, IEntityKey, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CosmosDbValueModelContainer{TModel}"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="CosmosDbContainer"/>.</param>
-        internal CosmosDbValueModelContainer(CosmosDbContainer owner) => Owner = owner.ThrowIfNull(nameof(owner)); 
-
-        /// <summary>
-        /// Gets the owning <see cref="CosmosDbContainer"/>.
-        /// </summary>
-        public CosmosDbContainer Owner { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Microsoft.Azure.Cosmos.Container"/>.
-        /// </summary>
-        public Container CosmosContainer => Owner.CosmosContainer;
-
-        #region Query
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueModelQuery{TModel}"/>.</returns>
-        public CosmosDbValueModelQuery<TModel> Query(Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query) => Owner.Model.ValueQuery<TModel>(query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueModelQuery{TModel}"/>.</returns>
-        public CosmosDbValueModelQuery<TModel> Query(PartitionKey? partitionKey = null, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) => Owner.Model.ValueQuery<TModel>(partitionKey, query);
-
-        /// <summary>
-        /// Gets (creates) a <see cref="CosmosDbValueModelQuery{TModel}"/> to enable LINQ-style queries.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="query">The function to perform additional query execution.</param>
-        /// <returns>The <see cref="CosmosDbValueModelQuery{TModel}"/>.</returns>
-        public CosmosDbValueModelQuery<TModel> Query(CosmosDbArgs dbArgs, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query = null) => Owner.Model.ValueQuery<TModel>(dbArgs, query);
-
-        #endregion
-
-        #region Get
-
-        /// <summary>
-        /// Gets the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<CosmosDbValue<TModel>?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetValueAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetValueWithResultAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<CosmosDbValue<TModel>?> GetAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.GetValueAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.GetValueWithResultAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Gets the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<CosmosDbValue<TModel>?> GetAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetValueAsync<TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c> (see <see cref="CosmosDbArgs.NullOnNotFound"/>).</returns>
-        public Task<Result<CosmosDbValue<TModel>?>> GetWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.GetValueWithResultAsync<TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-
-        #region Create
-
-        /// <summary>
-        /// Creates the model (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<CosmosDbValue<TModel>> CreateAsync(CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.CreateValueAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the model (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> CreateWithResultAsync(CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.CreateValueWithResultAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Creates the model (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<CosmosDbValue<TModel>> CreateAsync(CosmosDbArgs dbArgs, CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.CreateValueAsync<TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Creates the model (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The created value.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> CreateWithResultAsync(CosmosDbArgs dbArgs, CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.CreateValueWithResultAsync<TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Update
-
-        /// <summary>
-        /// Updates the model (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<CosmosDbValue<TModel>> UpdateAsync(CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.UpdateValueAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the model (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> UpdateWithResultAsync(CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.UpdateValueWithResultAsync<TModel>(value, cancellationToken);
-
-        /// <summary>
-        /// Updates the model (using underlying <see cref="CosmosDbValue{TModel}"/>).
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<CosmosDbValue<TModel>> UpdateAsync(CosmosDbArgs dbArgs, CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.UpdateValueAsync<TModel>(dbArgs, value, cancellationToken);
-
-        /// <summary>
-        /// Updates the model (using underlying <see cref="CosmosDbValue{TModel}"/>) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated value.</returns>
-        public Task<Result<CosmosDbValue<TModel>>> UpdateWithResultAsync(CosmosDbArgs dbArgs, CosmosDbValue<TModel> value, CancellationToken cancellationToken = default) => Owner.Model.UpdateValueWithResultAsync<TModel>(dbArgs, value, cancellationToken);
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Deletes the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteValueAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteValueWithResultAsync<TModel>(key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.DeleteValueAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>. Defaults to <see cref="CosmosDbContainer.DbArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, PartitionKey? partitionKey, CancellationToken cancellationToken = default) => Owner.Model.DeleteValueWithResultAsync<TModel>(key, partitionKey, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task DeleteAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteValueAsync<TModel>(dbArgs, key, cancellationToken);
-
-        /// <summary>
-        /// Deletes the model (using underlying <see cref="CosmosDbValue{TModel}"/>) for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>..</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> DeleteWithResultAsync(CosmosDbArgs dbArgs, CompositeKey key, CancellationToken cancellationToken = default) => Owner.Model.DeleteValueWithResultAsync<TModel>(dbArgs, key, cancellationToken);
-
-        #endregion
-
-        #region MultiSet
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task SelectValueMultiSetAsync(PartitionKey partitionKey, params IMultiSetValueArgs[] multiSetArgs) => SelectValueMultiSetAsync(partitionKey, multiSetArgs, default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task SelectValueMultiSetAsync(PartitionKey partitionKey, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectValueMultiSetAsync(partitionKey, null, multiSetArgs, cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="sql">The override SQL statement; will default where not specified.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public async Task SelectValueMultiSetAsync(PartitionKey partitionKey, string? sql, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => (await SelectValueMultiSetWithResultAsync(partitionKey, sql, multiSetArgs, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task<Result> SelectValueMultiSetWithResultAsync(PartitionKey partitionKey, params IMultiSetValueArgs[] multiSetArgs) => SelectValueMultiSetWithResultAsync(partitionKey, multiSetArgs, default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SelectValueMultiSetWithResultAsync(PartitionKey, string?, IEnumerable{IMultiSetValueArgs}, CancellationToken)"/> for further details.</remarks>
-        public Task<Result> SelectValueMultiSetWithResultAsync(PartitionKey partitionKey, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectValueMultiSetWithResultAsync(partitionKey, null, multiSetArgs, cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetValueArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="partitionKey">The <see cref="PartitionKey"/>.</param>
-        /// <param name="sql">The override SQL statement; will default where not specified.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetValueArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <paramref name="multiSetArgs"/> must be of type <see cref="CosmosDbValue{TModel}"/>. Each <paramref name="multiSetArgs"/> is verified and executed in the order specified.
-        /// <para>The underlying SQL will be automatically created from the specified <paramref name="multiSetArgs"/> where not explicitly supplied. Essentially, it is a simple query where all <i>types</i> inferred from the <paramref name="multiSetArgs"/>
-        /// are included, for example: <c>SELECT * FROM c WHERE c.type in ("TypeNameA", "TypeNameB")</c></para>
-        /// </remarks>
-        public async Task<Result> SelectValueMultiSetWithResultAsync(PartitionKey partitionKey, string? sql, IEnumerable<IMultiSetValueArgs> multiSetArgs, CancellationToken cancellationToken = default)
-        {
-            // Verify that the multi set arguments are valid for this type of get query.
-            var multiSetList = multiSetArgs?.ToArray() ?? null;
-            if (multiSetList == null || multiSetList.Length == 0)
-                throw new ArgumentException($"At least one {nameof(IMultiSetValueArgs)} must be supplied.", nameof(multiSetArgs));
-
-            // Build the Cosmos SQL statement.
-            var name = multiSetList[0].GetModelName(Owner);
-            var types = new Dictionary<string, IMultiSetValueArgs>([new KeyValuePair<string, IMultiSetValueArgs>(name, multiSetList[0])]);
-            var sb = string.IsNullOrEmpty(sql) ? new StringBuilder($"SELECT * FROM c WHERE c.type in (\"{name}\"") : null;
-
-            for (int i = 1; i < multiSetList.Length; i++)
-            {
-                name = multiSetList[i].GetModelName(Owner);
-                if (!types.TryAdd(name, multiSetList[i]))
-                    throw new ArgumentException($"All {nameof(IMultiSetValueArgs)} must be of different model type.", nameof(multiSetArgs));
-
-                sb?.Append($", \"{name}\"");
-            }
-
-            sb?.Append(')');
-
-            // Execute the Cosmos DB query.
-            var result = await Owner.CosmosDb.Invoker.InvokeAsync(Owner.CosmosDb, Owner, sb?.ToString() ?? sql, types, async (_, container, sql, types, ct) =>
-            {
-                // Set up for work.
-                var da = new CosmosDbArgs(container.DbArgs, partitionKey);
-                var qsi = CosmosContainer.GetItemQueryStreamIterator(sql, requestOptions: da.GetQueryRequestOptions());
-                IJsonSerializer js = ExecutionContext.GetService<IJsonSerializer>() ?? CoreEx.Json.JsonSerializer.Default;
-                var isStj = js is Text.Json.JsonSerializer;
-
-                while (qsi.HasMoreResults)
-                {
-                    var rm = await qsi.ReadNextAsync(ct).ConfigureAwait(false);
-                    if (!rm.IsSuccessStatusCode)
-                        return Result.Fail(new InvalidOperationException(rm.ErrorMessage));
-
-                    var json = Stj.JsonDocument.Parse(rm.Content);
-                    if (!json.RootElement.TryGetProperty("Documents", out var jds) || jds.ValueKind != Stj.JsonValueKind.Array)
-                        return Result.Fail(new InvalidOperationException("Cosmos response JSON 'Documents' property either not found in result or is not an array."));
-
-                    foreach (var jd in jds.EnumerateArray())
-                    {
-                        if (!jd.TryGetProperty("type", out var jt) || jt.ValueKind != Stj.JsonValueKind.String)
-                            return Result.Fail(new InvalidOperationException("Cosmos response documents item 'type' property either not found in result or is not a string."));
-
-                        if (!types.TryGetValue(jt.GetString()!, out var msa))
-                            continue;   // Ignore any unexpected type.
-
-                        var model = isStj
-                            ? jd.Deserialize(msa.Type, (Stj.JsonSerializerOptions)js.Options)
-                            : js.Deserialize(jd.ToString(), msa.Type);
-
-                        if (model is null)
-                            return Result.Fail(new InvalidOperationException($"Cosmos response documents item type '{jt.GetRawText()}' deserialization resulted in a null."));
-
-                        var result = msa.AddItem(Owner, da, model);
-                        if (result.IsFailure)
-                            return result;
-                    }
-                }
-
-                return Result.Success;
-            }, cancellationToken).ConfigureAwait(false);
-
-            if (result.IsFailure)
-                return result;
-
-            // Validate the multi-set args and action each accordingly.
-            foreach (var msa in multiSetList)
-            {
-                var r = msa.Verify();
-                if (r.IsFailure)
-                    return r.AsResult();
-
-                if (!r.Value && msa.StopOnNull)
-                    break;
-
-                msa.Invoke();
-            }
-
-            return Result.Success;
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/CosmosDbValueModelQuery.cs b/src/CoreEx.Cosmos/Model/CosmosDbValueModelQuery.cs
deleted file mode 100644
index 0b0e2629..00000000
--- a/src/CoreEx.Cosmos/Model/CosmosDbValueModelQuery.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.Azure.Cosmos.Linq;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Encapsulates a <b>CosmosDb</b> model-only query enabling all select-like capabilities.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-    /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-    /// <param name="query">A function to modify the underlying <see cref="IQueryable{T}"/>.</param>
-    public class CosmosDbValueModelQuery<TModel>(CosmosDbContainer container, CosmosDbArgs dbArgs, Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? query) : CosmosDbModelQueryBase<CosmosDbValue<TModel>, CosmosDbValueModelQuery<TModel>>(container, dbArgs) where TModel : class, IEntityKey, new()
-    {
-        private readonly Func<IQueryable<CosmosDbValue<TModel>>, IQueryable<CosmosDbValue<TModel>>>? _query = query;
-
-        /// <summary>
-        /// Instantiates the <see cref="IQueryable"/>.
-        /// </summary>
-        private IQueryable<CosmosDbValue<TModel>> AsQueryable(bool allowSynchronousQueryExecution, bool pagingSupported)
-        {
-            if (!pagingSupported && Paging is not null)
-                throw new NotSupportedException("Paging is not supported when accessing AsQueryable directly; paging must be applied directly to the resulting IQueryable instance.");
-
-            IQueryable<CosmosDbValue<TModel>> query = Container.CosmosContainer.GetItemLinqQueryable<CosmosDbValue<TModel>>(allowSynchronousQueryExecution: allowSynchronousQueryExecution, requestOptions: QueryArgs.GetQueryRequestOptions());
-            query = (_query == null ? query : _query(query)).WhereType(Container.Model.GetModelName<TModel>());
-
-            var filter = Container.Model.GetValueAuthorizeFilter<TModel>();
-            if (filter != null)
-                query = filter(query);
-
-            return QueryArgs.WhereModelValid(query);
-        }
-
-        /// <summary>
-        /// Gets a pre-prepared <see cref="IQueryable"/> with filtering applied as applicable.
-        /// </summary>
-        /// <returns>The <see cref="IQueryable"/>.</returns>
-        /// <remarks>The <see cref="CosmosDbModelQueryBase{TModel, TSelf}.Paging"/> is not supported. The query will <i>not</i> be automatically included within an <see cref="CosmosDb.Invoker"/> execution.</remarks>
-        public IQueryable<CosmosDbValue<TModel>> AsQueryable() => AsQueryable(true, false);
-
-        /// <inheritdoc/>
-        public override Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) => Container.CosmosDb.Invoker.InvokeAsync(Container.CosmosDb, coll, async (_, items, ct) =>
-        {
-            var q = AsQueryable(false, true);
-
-            using var iterator = q.WithPaging(Paging).ToFeedIterator();
-            while (iterator.HasMoreResults)
-            {
-                foreach (var item in await iterator.ReadNextAsync(ct).ConfigureAwait(false))
-                {
-                    items.Add(item);
-                }
-            }
-
-            if (Paging != null && Paging.IsGetCount)
-                Paging.TotalCount = (await q.CountAsync(cancellationToken).ConfigureAwait(false)).Resource;
-
-            return Result.Success;
-        }, cancellationToken, nameof(SelectQueryWithResultAsync));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/IMultiSetArgs.cs b/src/CoreEx.Cosmos/Model/IMultiSetArgs.cs
deleted file mode 100644
index 77e0d99d..00000000
--- a/src/CoreEx.Cosmos/Model/IMultiSetArgs.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Results;
-using System;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Enables the <b>CosmosDb</b> multi-set arguments.
-    /// </summary>
-    public interface IMultiSetArgs
-    {
-        /// <summary>
-        /// Gets the minimum number of items allowed.
-        /// </summary>
-        int MinItems { get; }
-
-        /// <summary>
-        /// Gets the maximum number of items allowed.
-        /// </summary>
-        int? MaxItems { get; }
-
-        /// <summary>
-        /// Indicates whether to stop further result set processing where the current set has resulted in a null (i.e. no items).
-        /// </summary>
-        bool StopOnNull { get; }
-
-        /// <summary>
-        /// Gets the model <see cref="System.Type"/>.
-        /// </summary>
-        Type Type { get; }
-
-        /// <summary>
-        /// Adds a model <paramref name="item"/> for its respective dataset.
-        /// </summary>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="item">The model item.</param>
-        Result AddItem(CosmosDbContainer container, CosmosDbArgs dbArgs, object item);
-
-        /// <summary>
-        /// Verify against contraints.
-        /// </summary>
-        /// <returns><c>true</c> indicates that at least one item exists to action; otherwise, <c>false</c>.</returns>
-        Result<bool> Verify();
-
-        /// <summary>
-        /// Invokes the underlying action.
-        /// </summary>
-        void Invoke();
-
-        /// <summary>
-        /// Gets the name for the model <see cref="System.Type"/>.
-        /// </summary>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <returns>The model name.</returns>
-        string GetModelName(CosmosDbContainer container);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/IMultiSetModelArgs.cs b/src/CoreEx.Cosmos/Model/IMultiSetModelArgs.cs
deleted file mode 100644
index 8ba74e4d..00000000
--- a/src/CoreEx.Cosmos/Model/IMultiSetModelArgs.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Enables the model with <see cref="ICosmosDbType"/> multi-set arguments.
-    /// </summary>
-    public interface IMultiSetModelArgs : IMultiSetArgs { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/MultiSetModelCollArgs.cs b/src/CoreEx.Cosmos/Model/MultiSetModelCollArgs.cs
deleted file mode 100644
index c1cadd1d..00000000
--- a/src/CoreEx.Cosmos/Model/MultiSetModelCollArgs.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Provides the <b>CosmosDb</b> <see cref="IMultiSetModelArgs"/> when expecting a collection of items.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public class MultiSetModelCollArgs<TModel> : IMultiSetModelArgs where TModel : class, ICosmosDbType, IEntityKey, new()
-    {
-        private List<TModel>? _items;
-        private readonly Action<IEnumerable<TModel>> _result;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MultiSetModelCollArgs{TModel}"/> class.
-        /// </summary>
-        /// <param name="result">The action that will be invoked with the result of the set.</param>
-        /// <param name="minItems">The minimum number of items allowed.</param>
-        /// <param name="maxItems">The maximum numner of items allowed.</param>
-        /// <param name="stopOnNull">Indicates whether to stop further result set processing where the current set has resulted in a null (i.e. no items).</param>
-        public MultiSetModelCollArgs(Action<IEnumerable<TModel>> result, int minItems = 0, int? maxItems = null, bool stopOnNull = false)
-        {
-            _result = result.ThrowIfNull(nameof(result));
-            if (maxItems.HasValue && minItems <= maxItems.Value)
-                throw new ArgumentException("Max Items is less than Min Items.", nameof(maxItems));
-
-            MinItems = minItems;
-            MaxItems = maxItems;
-            StopOnNull = stopOnNull;
-        }
-
-        /// <inheritdoc/>
-        public int MinItems { get; }
-
-        /// <inheritdoc/>
-        public int? MaxItems { get; }
-
-        /// <inheritdoc/>
-        public bool StopOnNull { get; set; }
-
-        /// <inheritdoc/>
-        Type IMultiSetArgs.Type => typeof(TModel);
-
-        /// <inheritdoc/>
-        Result IMultiSetArgs.AddItem(CosmosDbContainer container, CosmosDbArgs dbArgs, object item)
-            => MultiSetModelSingleArgs<TModel>.Validate(container, dbArgs, (TModel)item)
-                .WhenAs(m => m is not null, m =>
-                {
-                    _items ??= [];
-                    _items.Add(m);
-                    return !MaxItems.HasValue || _items.Count <= MaxItems.Value
-                        ? Result.Success
-                        : Result.Fail(new InvalidOperationException($"MultiSetCollArgs has returned more items ({_items.Count}) than expected ({MaxItems.Value})."));
-                });
-
-        /// <inheritdoc/>
-        Result<bool> IMultiSetArgs.Verify()
-        {
-            var count = _items?.Count ?? 0;
-            if (count < MinItems)
-                return Result.Fail(new InvalidOperationException($"MultiSetCollArgs has returned less items ({count}) than expected ({MinItems})."));
-
-            return count > 0;
-        }
-
-        /// <inheritdoc/>
-        void IMultiSetArgs.Invoke()
-        {
-            if (_items is not null)
-                _result(_items.AsEnumerable());
-        }
-
-        /// <inheritdoc/>
-        string IMultiSetArgs.GetModelName(CosmosDbContainer container) => container.Model.GetModelName<TModel>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/Model/MultiSetModelSingleArgs.cs b/src/CoreEx.Cosmos/Model/MultiSetModelSingleArgs.cs
deleted file mode 100644
index a5b67502..00000000
--- a/src/CoreEx.Cosmos/Model/MultiSetModelSingleArgs.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Cosmos.Model
-{
-    /// <summary>
-    /// Provides the <b>CosmosDb</b> <see cref="IMultiSetModelArgs"/> when expecting a single item only.
-    /// </summary>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <param name="result">The action that will be invoked with the result of the set.</param>
-    /// <param name="isMandatory">Indicates whether the value is mandatory; defaults to <c>true</c>.</param>
-    /// <param name="stopOnNull">Indicates whether to stop further result set processing where the current set has resulted in a null (i.e. no items).</param>
-    public class MultiSetModelSingleArgs<TModel>(Action<TModel> result, bool isMandatory = true, bool stopOnNull = false) : IMultiSetModelArgs where TModel : class, ICosmosDbType, IEntityKey, new()
-    {
-        private List<TModel>? _items;
-        private readonly Action<TModel> _result = result.ThrowIfNull(nameof(result));
-
-        /// <summary>
-        /// Indicates whether the value is mandatory; i.e. a corresponding record must be read.
-        /// </summary>
-        public bool IsMandatory { get; set; } = isMandatory;
-
-        /// <inheritdoc/>
-        public int MinItems => IsMandatory ? 1 : 0;
-
-        /// <inheritdoc/>
-        public int? MaxItems => 1;
-
-        /// <inheritdoc/>
-        public bool StopOnNull { get; set; } = stopOnNull;
-
-        /// <inheritdoc/>
-        Type IMultiSetArgs.Type => typeof(TModel);
-
-        /// <inheritdoc/>
-        Result IMultiSetArgs.AddItem(CosmosDbContainer container, CosmosDbArgs dbArgs, object item)
-            => Validate(container, dbArgs, (TModel)item)
-                .WhenAs(v => v is not null, v =>
-                {
-                    _items ??= [];
-                    _items.Add(v);
-                    return !MaxItems.HasValue || _items.Count <= MaxItems.Value
-                        ? Result.Success
-                        : Result.Fail(new InvalidOperationException($"MultiSetSingleArgs has returned more items ({_items.Count}) than expected ({MaxItems.Value})."));
-                });
-
-        /// <summary>
-        /// Validate and map the <paramref name="model"/> to the <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The <typeparamref name="TModel"/> value.</param>
-        /// <returns>The validated and converted value.</returns>
-        internal static Result<TModel> Validate(CosmosDbContainer container, CosmosDbArgs dbArgs, TModel model)
-        {
-            if (!container.Model.IsModelValid(model, dbArgs, true))
-                return Result.Success;
-
-            return model;
-        }
-
-        /// <inheritdoc/>
-        Result<bool> IMultiSetArgs.Verify()
-        {
-            var count = _items?.Count ?? 0;
-            if (count < MinItems)
-                return Result.Fail(new InvalidOperationException($"MultiSetSingleArgs has returned less items ({count}) than expected ({MinItems})."));
-
-            return count > 0;
-        }
-
-        /// <inheritdoc/>
-        void IMultiSetArgs.Invoke()
-        {
-            if (_items is not null && _items.Count == 1)
-                _result(_items[0]);
-        }
-
-        /// <inheritdoc/>
-        string IMultiSetArgs.GetModelName(CosmosDbContainer container) => container.Model.GetModelName<TModel>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/MultiSetValueCollArgs.cs b/src/CoreEx.Cosmos/MultiSetValueCollArgs.cs
deleted file mode 100644
index df64215f..00000000
--- a/src/CoreEx.Cosmos/MultiSetValueCollArgs.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Cosmos.Model;
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides the <b>CosmosDb</b> <see cref="IMultiSetValueArgs"/> when expecting a collection of items.
-    /// </summary>
-    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    public class MultiSetValueCollArgs<T, TModel> : IMultiSetValueArgs where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-    {
-        private List<T>? _items;
-        private readonly Action<IEnumerable<T>> _result;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MultiSetValueCollArgs{T, TModel}"/> class.
-        /// </summary>
-        /// <param name="result">The action that will be invoked with the result of the set.</param>
-        /// <param name="minItems">The minimum number of items allowed.</param>
-        /// <param name="maxItems">The maximum numner of items allowed.</param>
-        /// <param name="stopOnNull">Indicates whether to stop further result set processing where the current set has resulted in a null (i.e. no items).</param>
-        public MultiSetValueCollArgs(Action<IEnumerable<T>> result, int minItems = 0, int? maxItems = null, bool stopOnNull = false)
-        {
-            _result = result.ThrowIfNull(nameof(result));
-            if (maxItems.HasValue && minItems <= maxItems.Value)
-                throw new ArgumentException("Max Items is less than Min Items.", nameof(maxItems));
-
-            MinItems = minItems;
-            MaxItems = maxItems;
-            StopOnNull = stopOnNull;
-        }
-
-        /// <inheritdoc/>
-        public int MinItems { get; }
-
-        /// <inheritdoc/>
-        public int? MaxItems { get; }
-
-        /// <inheritdoc/>
-        public bool StopOnNull { get; set; }
-
-        /// <inheritdoc/>
-        Type IMultiSetArgs.Type => typeof(CosmosDbValue<TModel>);
-
-        /// <inheritdoc/>
-        Result IMultiSetArgs.AddItem(CosmosDbContainer container, CosmosDbArgs dbArgs, object item)
-            => MultiSetValueSingleArgs<T, TModel>.ValidateAndMap(container, dbArgs, (CosmosDbValue<TModel>)item)
-                .WhenAs(v => v is not null, v =>
-                {
-                    _items ??= [];
-                    _items.Add(v);
-                    return !MaxItems.HasValue || _items.Count <= MaxItems.Value
-                        ? Result.Success
-                        : Result.Fail(new InvalidOperationException($"MultiSetCollArgs has returned more items ({_items.Count}) than expected ({MaxItems.Value})."));
-                });
-
-        /// <inheritdoc/>
-        Result<bool> IMultiSetArgs.Verify()
-        {
-            var count = _items?.Count ?? 0;
-            if (count < MinItems)
-                return Result.Fail(new InvalidOperationException($"MultiSetCollArgs has returned less items ({count}) than expected ({MinItems})."));
-
-            return count > 0;
-        }
-
-        /// <inheritdoc/>
-        void IMultiSetArgs.Invoke()
-        {
-            if (_items is not null)
-                _result(_items.AsEnumerable());
-        }
-
-        /// <inheritdoc/>
-        string IMultiSetArgs.GetModelName(CosmosDbContainer container) => container.Model.GetModelName<TModel>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/MultiSetValueSingleArgs.cs b/src/CoreEx.Cosmos/MultiSetValueSingleArgs.cs
deleted file mode 100644
index c9d15a04..00000000
--- a/src/CoreEx.Cosmos/MultiSetValueSingleArgs.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Cosmos.Model;
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Cosmos
-{
-    /// <summary>
-    /// Provides the <b>CosmosDb</b> <see cref="IMultiSetValueArgs"/> when expecting a single item only.
-    /// </summary>
-    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The cosmos model <see cref="Type"/>.</typeparam>
-    /// <param name="result">The action that will be invoked with the result of the set.</param>
-    /// <param name="isMandatory">Indicates whether the value is mandatory; defaults to <c>true</c>.</param>
-    /// <param name="stopOnNull">Indicates whether to stop further result set processing where the current set has resulted in a null (i.e. no items).</param>
-    public class MultiSetValueSingleArgs<T, TModel>(Action<T> result, bool isMandatory = true, bool stopOnNull = false) : IMultiSetValueArgs where T : class, IEntityKey, new() where TModel : class, IEntityKey, new()
-    {
-        private List<T>? _items;
-        private readonly Action<T> _result = result.ThrowIfNull(nameof(result));
-
-        /// <summary>
-        /// Indicates whether the value is mandatory; i.e. a corresponding record must be read.
-        /// </summary>
-        public bool IsMandatory { get; set; } = isMandatory;
-
-        /// <inheritdoc/>
-        public int MinItems => IsMandatory ? 1 : 0;
-
-        /// <inheritdoc/>
-        public int? MaxItems => 1;
-
-        /// <inheritdoc/>
-        public bool StopOnNull { get; set; } = stopOnNull;
-
-        /// <inheritdoc/>
-        Type IMultiSetArgs.Type => typeof(CosmosDbValue<TModel>);
-
-        /// <inheritdoc/>
-        Result IMultiSetArgs.AddItem(CosmosDbContainer container, CosmosDbArgs dbArgs, object item)
-            => ValidateAndMap(container, dbArgs, (CosmosDbValue<TModel>)item)
-                .WhenAs(v => v is not null, v =>
-                {
-                    _items ??= [];
-                    _items.Add(v);
-                    return !MaxItems.HasValue || _items.Count <= MaxItems.Value
-                        ? Result.Success
-                        : Result.Fail(new InvalidOperationException($"MultiSetSingleArgs has returned more items ({_items.Count}) than expected ({MaxItems.Value})."));
-                });
-
-        /// <summary>
-        /// Validate and map the <paramref name="model"/> to the <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="container">The <see cref="CosmosDbContainer"/>.</param>
-        /// <param name="dbArgs">The <see cref="CosmosDbArgs"/>.</param>
-        /// <param name="model">The <see cref="CosmosDbValue{TModel}"/>.</param>
-        /// <returns>The validated and converted value.</returns>
-        internal static Result<T> ValidateAndMap(CosmosDbContainer container, CosmosDbArgs dbArgs, CosmosDbValue<TModel> model)
-        {
-            if (!container.Model.IsModelValid(model, dbArgs, true))
-                return Result.Success;
-
-            return container.MapToValue<T, TModel>(model, dbArgs);
-        }
-
-        /// <inheritdoc/>
-        Result<bool> IMultiSetArgs.Verify()
-        {
-            var count = _items?.Count ?? 0;
-            if (count < MinItems)
-                return Result.Fail(new InvalidOperationException($"MultiSetSingleArgs has returned less items ({count}) than expected ({MinItems})."));
-
-            return count > 0;
-        }
-
-        /// <inheritdoc/>
-        void IMultiSetArgs.Invoke()
-        {
-            if (_items is not null && _items.Count == 1)
-                _result(_items[0]);
-        }
-
-        /// <inheritdoc/>
-        string IMultiSetArgs.GetModelName(CosmosDbContainer container) => container.Model.GetModelName<TModel>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/README.md b/src/CoreEx.Cosmos/README.md
deleted file mode 100644
index f79f80c8..00000000
--- a/src/CoreEx.Cosmos/README.md
+++ /dev/null
@@ -1,218 +0,0 @@
-# CoreEx.Cosmos
-
-The `CoreEx.Cosmos` namespace provides extended [_Azure Cosmos DB_](https://learn.microsoft.com/en-us/azure/cosmos-db/) capabilities, specifically focused on the [API for NoSQL](https://learn.microsoft.com/en-us/azure/cosmos-db/choose-api#api-for-nosql).
-
-<br/>
-
-## Motivation
-
-The motivation is to provide supporting Cosmos DB capabilities for [CRUD](https://en.wikipedia.org/wiki/Create,_read,_update_and_delete) related access that support standardized _CoreEx_ data access patterns. This for the most part will simplify and unify the approach to ensure consistency of implementation where needed.
-
-<br/>
-
-## Requirements
-
-The requirements for usage are as follows.
-- An **entity** (DTO) that represents the data that must as a minimum implement [`IEntityKey`](../CoreEx/Entities/IEntityKey.cs); generally via either the implementation of [`IIdentifier`](../CoreEx/Entities/IIdentifierT.cs) or [`IPrimaryKey`](../CoreEx/Entities/IPrimaryKey.cs).
-- A **model** being the underlying data representation that will be persisted within Cosmos DB itself.
-- An [`IMapper`](../CoreEx/Mapping/IMapper.cs) that contains the mapping logic to map to and from the **entity** and **model**.
-
-The **entity** and **model** are different types to encourage separation between the externalized **entity** representation and the underlying **model**; which may be shaped differently, and have different property naming conventions, internalized properties, etc.
-
-<br/>
-
-## Railway-oriented programming
-
-To support [railway-oriented programming](../CoreEx/Results/README.md) whenever a method name includes `WithResult` this indicates that it will return a `Result` or `Result<T>` including the resulting success or failure information. In these instances an `Exception` will only be thrown when considered truly exceptional.
-
-<br/>
-
-## Resource model
-
-This article provides a good overview of the [Azure Cosmos DB resource model](https://learn.microsoft.com/en-us/azure/cosmos-db/resource-model); these concepts are important to understand when working with Cosmos DB.
-
-_CoreEx_ provides encapsulated capabilities for each of the following:
-- [Databases](#Database) - contains one-or-more Containers.
-- [Containers](#Containers) (Collections) - contains one-or-more Items.
-- [Items](#Items) (Documents) - the JSON object being persisted.
-
-Each of the above are further described, in reverse order, as this is intended to make it easier to understand.
-
-<br/>
-
-## Items
-
-From a Cosmos DB perspective, an Item (aka Document) is a JSON object that represents the data that is being persisted. The are two key patterns for persisting a Document that _CoreEx_ enables:
-
-- **Untyped** - where a single Document _type_ is persisted within the Container; being one or more Documents of the same _type_ (schema/structure). This is the simpliest pattern, and requires no special support to enable; i.e. works out-of-the-box.
-- **Typed** - where one or more Document _types_ are persisted within the Container; being one or more Documents of different _types_ (schema/structure). This is a more complex pattern, and requires additional support to enable - this is enabled in a consistent manner via the [`CosmosDbValue<TModel>`](./CosmosDbValue.cs) class.
-
-The **Typed** document JSON structure is as follows (standard Cosmos DB properties have been removed for brevity purposes):
-
-``` json
-{
-  "type": "document-type-name",  # The unique name of the document type; used to query/filter the documents.
-  "value": {                     # The actual document _model_ data.
-    "property1": "value1",
-    "property2": "value2"
-  }
-}
-```
-
-<br/>
-
-## Containers
-
-From a Cosmos DB perspective, a [Container](https://learn.microsoft.com/en-us/azure/cosmos-db/resource-model#azure-cosmos-db-containers) is a logical entity that represents a collection of items. The are two key patterns for interacting with a container that _CoreEx_ enables:
-- **Entity** - pattern in which there is separation between the externalized **entity** and the underlying **model**, and the requisite mapping between the two is fully integrated. This is the preferred pattern as it allows for a clear separation of concerns. These capabilities largely exist in the root `CoreEx.Cosmos` namespace.
-- **Model** - pattern in which the persisted **model** is directly interacted with, with the expectation that the developer would handle any mapping manually. This is useful in scenarios where the full **entity** is an overhead to the operations that needs to be performed. These capabilities largely exist in the `CoreEx.Cosmos.Model` namespace.
-
-A Cosmos DB Container is encapsulated within one of the following _CoreEx_ capabilities depending on the patterns required:
-
-Type | Container Pattern | Document Pattern | [`IMapper`](../CoreEx/Mapping/IMapper.cs) support
--|-|-|-
-[`CosmosDbContainer`](CosmosDbContainer.cs) | Entity | Untyped | Yes
-[`CosmosDbValueContainer`](CosmosDbValueContainer.cs) | Entity | Typed | Yes
-[`CosmosDbModelContainer`](Model/CosmosDbModelContainer.cs) | Model | Untyped | No
-[`CosmosDbValueModelContainer`](Model/CosmosDbValueModelContainer.cs) | Model | Typed | No
-
-Where more advanced CosmosDB capabilities are required, for example, Partitioning, etc., then the [`CosmosDbArgs`](./CosmosDbArgs.cs) enables the configuration of these capabilities, as well as other extended _CoreEx_ capabilities such as multi-tenancy support.
-
-Additionally, given how important Partitioning is to Cosmos DB performance, many methods have been provided with an optional `partitionKey` parameter to enable the developer to specify the partition key for the operation. 
-
-Finally, where a Container contains multiple typed documents, an advanced query capability is provided to select and return one-or-more types in a single performant operation; see [`CosmosDb.SelectMultiSetWithResultAsync`](./CosmosDb.cs). The [`SelectMultiSetAsync`](../../tests/CoreEx.Cosmos.Test/CosmosDbContainerPartitioningTest.cs) unit test provides example usage.
-
-<br/>
-
-## Database
-
-From a Cosmos DB perspective, a [Database](https://learn.microsoft.com/en-us/azure/cosmos-db/resource-model#azure-cosmos-db-databases) is a means to group one-or-more Containers. 
-
-The [`ICosmoDb`](./ICosmosDb.cs) and corresponding [`CosmosDb`](./CosmosDb.cs) provides the base Database capabilities:
-- `Container<T, TModel>()` - instantiates a `CosmosDbContainer` instance.
-- `ValueContainer<T, TModel>()` - instantiates a `CosmosDbValueContainer` instance.
-- `ModelContainer<TModel>()` - instantiates a `CosmosDbModelContainer` instance.
-- `ValueModelContainer<TModel>()` - instantiates a `CosmosDbValueModelContainer` instance.
-- `UserAuhtorizeFilter<TModel>()` - enables an authorization filter to be applied to a specified Container.
-
-The following represents an example usage of the [`CosmosDb`](https://github.com/Avanade/Beef/blob/master/samples/Cdr.Banking/Cdr.Banking.Business/Data/CosmosDb.cs) class:
-
-``` csharp
-public class CosmosDb : CoreEx.Cosmos.CosmosDb
-{
-    private readonly Lazy<CosmosDbContainer<Account, Model.Account>> _accounts;
-    private readonly Lazy<CosmosDbContainer<AccountDetail, Model.Account>> _accountDetails;
-    private readonly Lazy<CosmosDbContainer<Transaction, Model.Transaction>> _transactions;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="CosmosDb"/> class.
-    /// </summary>
-    public CosmosDb(Mac.Database database, IMapper mapper) : base(database, mapper)
-    {
-        // Apply an authorization filter to all operations to ensure only the valid data is available based on the users context; i.e. only allow access to Accounts within list defined on ExecutionContext.
-        UseAuthorizeFilter<Model.Account>("Account", (q) => ((IQueryable<Model.Account>)q).Where(x => ExecutionContext.Current.Accounts.Contains(x.Id!)));
-        UseAuthorizeFilter<Model.Account>("Transaction", (q) => ((IQueryable<Model.Transaction>)q).Where(x => ExecutionContext.Current.Accounts.Contains(x.AccountId!)));
-
-        // Lazy create the containers.
-        _accounts = new(() => Container<Account, Model.Account>("Account"));
-        _accountDetails = new(() => Container<AccountDetail, Model.Account>("Account"));
-        _transactions = new(() => Container<Transaction, Model.Transaction>("Transaction"));
-    }
-
-    /// <summary>
-    /// Exposes <see cref="Account"/> entity from <b>Account</b> container.
-    /// </summary>
-    public CosmosDbContainer<Account, Model.Account> Accounts => _accounts.Value;
-
-    /// <summary>
-    /// Exposes <see cref="AccountDetail"/> entity from <b>Account</b> container.
-    /// </summary>
-    public CosmosDbContainer<AccountDetail, Model.Account> AccountDetails => _accountDetails.Value;
-
-    /// <summary>
-    /// Exposes <see cref="AccountDetail"/> entity from <b>Account</b> container.
-    /// </summary>
-    public CosmosDbContainer<Transaction, Model.Transaction> Transactions => _transactions.Value;
-}
-```
-
-<br/>
-
-## CRUD capabilities
-
-The **entity** [`ICosmosDbContainer<T, TModel>`](./ICosmosDbContainerT.cs) and **model** [`CosmosDbModelContainer<TModel>`](./Model/CosmosDbModelContainer.cs) provides the base CRUD capabilities as follows.
-
-<br/>
-
-### Query (Read)
-
-A query is actioned using the [`CosmosDbQuery<T, TModel>`](./CosmosDbQuery.cs) and [`CosmosDbModelQuery<TModel>`](./Model/CosmosDbModelQuery.cs) which is ostensibly a lightweight wrapper over an `IQueryable<TModel>` that automatically maps from the **model** to the **entity** (where applicable).
-
-Uses the [`Container.GetItemLinqQueryable`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.getitemlinqqueryable?view=azure-dotnet) internally to create.
-
-The following methods provide additional capabilities:
-
-Method | Description
--|-
-`WithPaging` | Adds `Skip` and `Take` paging to the query.
-`SelectSingleAsync`, `SelectSingleWithResult` | Selects a single item.
-`SelectSingleOrDefaultAsync`, `SelectSingleOrDefaultWithResultAsync` | Selects a single item or default.
-`SelectFirstAsync`, `SelectFirstWithResultAsync` | Selects first item.
-`SelectFirstOrDefaultAsync`, `SelectFirstOrDefaultWithResultAsync` | Selects first item or default.
-`SelectQueryAsync`, `SelectQueryWithResultAsync` | Select items into or creating a resultant collection.
-`SelectResultAsync`, `SelectResultWithResultAsync` | Select items creating a [`ICollectionResult`](../CoreEx/Entities/ICollectionResultT2.cs) which also contains corresponding [`PagingResult`](../CoreEx/Entities/PagingResult.cs).
-`ToArrayAsync`, `ToArrayWithResultAsync` | Select items into a resulting array.
-
-<br/>
-
-### Get (Read)
-
-Gets (`GetAsync` or `GetWithResultAsync`) the **entity** for the specified key mapping from the **model**. Uses the [`Container.ReadItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.readitemasync?view=azure-dotnet) internally for the **model** and specified key.
-
-Where the data is not found, then a `null` will be returned. Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) and `IsDeleted` then this acts as if not found and returns a `null`.
-
-<br/>
-
-### Create
-
-Creates (`CreateAsync` or `CreateWithResultAsync`) the **entity** by firstly mapping to the **model**. Uses the [`Container.CreateItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.createitemasync?view=azure-dotnet) internally to create.
-
-Where the **entity** implements [`IChangeLogAuditLog`](../CoreEx/Entities/IChangeLogAuditLog.cs) generally via [`ChangeLog`](../CoreEx/Entities/IChangeLog.cs) or [`ChangeLogEx`](../CoreEx/Entities/Extended/IChangeLogEx.cs), then the `CreatedBy` and `CreatedDate` properties will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Where the **entity** and/or **model** implements [`ITenantId`](../CoreEx/Entities/ITenantId.cs) then the `TenantId` property will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-The inserted **model** is then re-mapped to the **entity** and returned; this will ensure all properties updated as part of the _insert_ are included in the refreshed **entity**.
-
-<br/>
-
-### Update
-
-Updates (`UpdateAsync` or `UpdateWithResultAsync`) the **entity** by firstly mapping to the **model**. Uses the [`Container.ReplaceItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.replaceitemasync?view=azure-dotnet) internally to update.
-
-First will check existence of the **model** by performing a [`Container.ReadItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.readitemasync?view=azure-dotnet). Where the data is not found, then a [`NotFoundException`](../CoreEx/NotFoundException.cs) will be thrown. Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) and `IsDeleted` then this acts as if not found and will also result in a `NotFoundException`.
-
-Where the entity implements [`IETag`](../CoreEx/Entities/IETag.cs) this will be checked against the just read version, and where not matched a  [`ConcurrencyException`](../CoreEx/ConcurrencyException.cs) will be thrown. Also, any [`CosmosException`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.cosmosexception?view=azure-dotnet) with a `HttpStatusCode.PreconditionFailed` thrown will be converted to a corresponding `ConcurrencyException` for consistency.
-
-Where the **entity** implements [`IChangeLogAuditLog`](../CoreEx/Entities/IChangeLogAuditLog.cs) generally via [`ChangeLog`](../CoreEx/Entities/IChangeLog.cs) or [`ChangeLogEx`](../CoreEx/Entities/Extended/IChangeLogEx.cs), then the `UpdatedBy` and `UpdatedDate` properties will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Where the **entity** and/or **model** implements [`ITenantId`](../CoreEx/Entities/ITenantId.cs) then the `TenantId` property will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-The updated **model** is then re-mapped to the **entity** and returned; this will ensure all properties updated as part of the _update_ are included in the refreshed **entity**.
-
-<br/>
-
-### Delete
-
-Deletes (`DeleteAsync` or `DeleteWithResultAsync`) the **entity**/**model** either physically or logically.
-
-First will check existence of the **model** by performing a [`Container.ReadItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.readitemasync?view=azure-dotnet). Where the data is not found, then a [`NotFoundException`](../CoreEx/NotFoundException.cs) will be thrown. Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) and `IsDeleted` then this acts as if not found and will also result in a `NotFoundException`.
-
-Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) then an update will occur after setting `IsDeleted` to `true`. Uses the [`Container.ReplaceItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.replaceitemasync?view=azure-dotnet) internally to update.
-
-Otherwise, will physically delete. Uses the [`Container.DeleteItemAsync`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.cosmos.container.deleteitemasync?view=azure-dotnet) internally to delete.
-
-<br/>
-
-## Usage
-
-Review the unit tests and/or _Beef_ [Cdr.Banking](https://github.com/Avanade/Beef/tree/master/samples/Cdr.Banking) sample implementation.
\ No newline at end of file
diff --git a/src/CoreEx.Cosmos/strong-name-key.snk b/src/CoreEx.Cosmos/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Cosmos/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Data/AGENTS.md b/src/CoreEx.Data/AGENTS.md
new file mode 100644
index 00000000..e19058f8
--- /dev/null
+++ b/src/CoreEx.Data/AGENTS.md
@@ -0,0 +1,76 @@
+# CoreEx.Data — AI Usage Guide
+
+Provides `IUnitOfWork` (the transactional boundary), `DataResult` mutation outcomes, and the `QueryArgsConfig` safe dynamic-query pipeline.
+
+## IUnitOfWork — Transactional Boundary
+
+Wrap all database mutations **and** event publishing inside `TransactionAsync`. Both the database write and the outbox event are committed atomically or rolled back together.
+
+```csharp
+public class OrderService(IUnitOfWork uow, IOrderRepository repo)
+{
+    public async Task<Order> CreateAsync(Order order, CancellationToken ct = default)
+    {
+        // validate first (outside the transaction)
+        await _validator.ValidateAndThrowAsync(order, ct).ConfigureAwait(false);
+
+        return await uow.TransactionAsync(async () =>
+        {
+            var created = await repo.CreateAsync(order, ct).ConfigureAwait(false);
+
+            // enqueue event — published atomically with the DB commit via the outbox
+            uow.Events.Add(EventData.CreateEventWith(created, EventAction.Created));
+
+            return created;
+        }).ConfigureAwait(false);
+    }
+}
+```
+
+## QueryArgsConfig — Safe Dynamic Filter / OrderBy
+
+Configure an explicit allow-list of filterable and sortable fields. Never expose raw `$filter` strings to LINQ without this.
+
+```csharp
+private static readonly QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
+    .WithFilter(f => f
+        .AddField<string>(nameof(Order.Status), c => c.WithDefault("A"))
+        .AddField<DateTimeOffset>(nameof(Order.CreatedOn)))
+    .WithOrderBy(o => o
+        .AddField(nameof(Order.CreatedOn))
+        .WithDefault($"{nameof(Order.CreatedOn)} desc"));
+
+// In the repository
+public async Task<ItemsResult<Order>> GetAllAsync(QueryArgs args, CancellationToken ct = default)
+    => await _efDb.Model<OrderModel>()
+        .Query(new EfDbArgs(args, _queryConfig))
+        .ToItemsResultAsync(MapToEntity, ct).ConfigureAwait(false);
+```
+
+## DataResult
+
+Return `DataResult` (no value) or `DataResult<T>` from mutation operations to distinguish "mutated" from "not found" without throwing.
+
+```csharp
+public async Task<DataResult> DeleteAsync(Guid id, CancellationToken ct = default)
+    => await uow.TransactionAsync(async () =>
+    {
+        var dr = await repo.DeleteAsync(id, ct).ConfigureAwait(false);
+        dr.WhereMutated(() =>
+            uow.Events.Add(EventData.CreateEvent<Order>(EventAction.Deleted).WithKey(id)));
+        return dr;
+    }).ConfigureAwait(false);
+```
+
+## Do Not
+
+- Prefer enqueuing events inside `TransactionAsync` so they are committed or rolled back atomically with the database write. Events added outside a transaction scope are still published but will not be rolled back if a subsequent operation fails — only do this intentionally when at-least-once delivery without rollback is the desired behaviour.
+- Do not expose raw `$filter` or `$orderby` strings to LINQ — always use `QueryArgsConfig`.
+
+## Further Reading
+
+- [README](./README.md) — full `IUnitOfWork`, `QueryArgsConfig`, and `DataResult` API reference.
+- [CoreEx.Database.SqlServer](../CoreEx.Database.SqlServer/README.md) / [CoreEx.Database.Postgres](../CoreEx.Database.Postgres/README.md) — concrete `IUnitOfWork` implementations.
+- [CoreEx.EntityFrameworkCore](../CoreEx.EntityFrameworkCore/README.md) — `QueryArgsConfig` consumption via `EfDbModel`.
+- [Application layer](../../samples/docs/application-layer.md) — real-world `TransactionAsync` usage, event enqueuing inside the unit-of-work, and service orchestration patterns.
+- [Patterns](../../samples/docs/patterns.md) — transactional outbox, atomic commit with event publishing, and dynamic query patterns.
diff --git a/src/CoreEx.Data/CoreEx.Data.csproj b/src/CoreEx.Data/CoreEx.Data.csproj
index a3660597..826e6c4e 100644
--- a/src/CoreEx.Data/CoreEx.Data.csproj
+++ b/src/CoreEx.Data/CoreEx.Data.csproj
@@ -1,22 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Data</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Data extras.</Title>
-    <Description>CoreEx .NET Data extras.</Description>
-    <PackageTags>coreex api data odata filter order linq</PackageTags>
+    <Title>CoreEx .NET Data extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data data query odata filter order paging unit-of-work</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
   <ItemGroup>
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.1" />
+    <PackageReference Include="System.Linq.Dynamic.Core" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\CoreEx.Events\CoreEx.Events.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/CoreEx.Data/DataResult.cs b/src/CoreEx.Data/DataResult.cs
new file mode 100644
index 00000000..8d19eb82
--- /dev/null
+++ b/src/CoreEx.Data/DataResult.cs
@@ -0,0 +1,44 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Represents the result of a data mutation without a value; typically, a <see cref="OperationType.Delete"/>.
+/// </summary>
+public readonly record struct DataResult
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataResult"/> struct.
+    /// </summary>
+    /// <param name="wasMutated">Indicates whether the value was mutated; e.g. created, updated or deleted. </param>
+    public DataResult(bool wasMutated) => WasMutated = wasMutated;
+
+    /// <summary>
+    /// Gets a <see cref="DataResult"/> indicating <see cref="WasMutated"/> is <see langword="true"/>.
+    /// </summary>
+    public static DataResult True { get; } = new DataResult(true);
+
+    /// <summary>
+    /// Gets a <see cref="DataResult"/> indicating <see cref="WasMutated"/> is <see langword="false"/>.
+    /// </summary>
+    public static DataResult False { get; } = new DataResult(false);
+
+    /// <summary>
+    /// Indicates whether the value was mutated; e.g. created, updated or deleted. 
+    /// </summary>
+    /// <remarks>A <see langword="false"/> would be returned, for example, as follows:
+    /// <list type="bullet">
+    /// <item>A <see cref="OperationType.Delete"/> operation where the specified item to delete was not found.</item>
+    /// <item>An <see cref="OperationType.Update"/> operation where no changes were made to the underlying data.</item>
+    /// </list></remarks>
+    public bool WasMutated { get; }
+
+    /// <summary>
+    /// Invokes the specified <paramref name="action"/> where the result <see cref="WasMutated"/> is <see langword="true"/>.
+    /// </summary>
+    /// <param name="action">The action to execute.</param>
+    /// <remarks>This is a convenience method to allow fluent-style method-chaining.</remarks>
+    public readonly void WhereMutated(Action action)
+    {
+        if (WasMutated)
+            action?.Invoke();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/DataResultT.cs b/src/CoreEx.Data/DataResultT.cs
new file mode 100644
index 00000000..f9df4572
--- /dev/null
+++ b/src/CoreEx.Data/DataResultT.cs
@@ -0,0 +1,54 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Represents the result of a data mutation with a <see cref="Value"/>; typically, a <see cref="OperationType.Create"/> or <see cref="OperationType.Update"/>.
+/// </summary>
+public readonly record struct DataResult<T>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataResult{T}"/> struct.
+    /// </summary>
+    /// <param name="value">The data operation result value.</param>
+    /// <param name="wasMutated">Indicates whether the value was mutated; e.g. created, updated or deleted. </param>
+    public DataResult(T value, bool wasMutated = true)
+    {
+        Value = value;
+        WasMutated = wasMutated;
+    }
+
+    /// <summary>
+    /// Gets the data operation result value.
+    /// </summary>
+    public T Value { get; }
+
+    /// <summary>
+    /// Indicates whether the value was mutated; e.g. created, updated or deleted. 
+    /// </summary>
+    /// <remarks>A <see langword="false"/> would be returned, for example, as follows:
+    /// <list type="bullet">
+    /// <item>A <see cref="OperationType.Delete"/> operation where the specified item to delete was not found.</item>
+    /// <item>An <see cref="OperationType.Update"/> operation where no changes were made to the underlying data.</item>
+    /// </list></remarks>
+    public bool WasMutated { get; }
+
+    /// <summary>
+    /// Invokes the specified <paramref name="action"/> where the result <see cref="WasMutated"/> is <see langword="true"/>.
+    /// </summary>
+    /// <param name="action">The action to execute.</param>
+    /// <returns>The <see cref="Value"/>.</returns>
+    /// <remarks>This is a convenience method to allow fluent-style method-chaining.</remarks>
+    public readonly T WhereMutated(Action<T> action)
+    {
+        if (WasMutated)
+            action?.Invoke(Value);
+
+        return Value;
+    }
+
+    /// <summary>
+    /// Implicitly converts a <see cref="DataResult{T}"/> to a <see cref="Value"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="DataResult{T}"/>.</param>
+    /// <returns>The <see cref="Value"/>.</returns>
+    public static implicit operator T(DataResult<T> result) => result.Value;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/GlobalUsing.cs b/src/CoreEx.Data/GlobalUsing.cs
new file mode 100644
index 00000000..42c4a66e
--- /dev/null
+++ b/src/CoreEx.Data/GlobalUsing.cs
@@ -0,0 +1,14 @@
+global using CoreEx.Abstractions;
+global using CoreEx.Data.Querying;
+global using CoreEx.Data.Querying.Expressions;
+global using CoreEx.Entities;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Http;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Results.Abstractions;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Linq.Dynamic.Core;
+global using System.Text;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/src/CoreEx.Data/IDataArgs.cs b/src/CoreEx.Data/IDataArgs.cs
new file mode 100644
index 00000000..f48f99b5
--- /dev/null
+++ b/src/CoreEx.Data/IDataArgs.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables data respository specific arguments.
+/// </summary>
+public interface IDataArgs { }
\ No newline at end of file
diff --git a/src/CoreEx.Data/IUnitOfWork.WithoutCancellation.cs b/src/CoreEx.Data/IUnitOfWork.WithoutCancellation.cs
new file mode 100644
index 00000000..97d36f7b
--- /dev/null
+++ b/src/CoreEx.Data/IUnitOfWork.WithoutCancellation.cs
@@ -0,0 +1,34 @@
+namespace CoreEx.Data;
+
+public partial interface IUnitOfWork
+{
+    /// <summary>
+    /// Executes either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution.
+    /// </summary>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    public Task TransactionAsync(Func<Task> work) => TransactionAsync(async _ => await work().ConfigureAwait(false), default);
+
+    /// <summary>
+    /// Executes either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution that returns a value.
+    /// </summary>
+    /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    /// <returns>The resulting value.</returns>
+    public Task<T> TransactionAsync<T>(Func<Task<T>> work) => TransactionAsync(async _ => await work().ConfigureAwait(false), default);
+
+    /// <summary>
+    /// Executes either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution.
+    /// </summary>
+    /// <param name="args">The <see cref="IDataArgs"/>.</param>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    public Task TransactionAsync(IDataArgs args, Func<Task> work) => TransactionAsync(args, async _ => await work().ConfigureAwait(false), default);
+
+    /// <summary>
+    /// Executes either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution that returns a value.
+    /// </summary>
+    /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
+    /// <param name="args">The <see cref="IDataArgs"/>.</param>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    /// <returns>The resulting value.</returns>
+    public Task<T> TransactionAsync<T>(IDataArgs args, Func<Task<T>> work) => TransactionAsync(args, async _ => await work().ConfigureAwait(false), default);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/IUnitOfWork.cs b/src/CoreEx.Data/IUnitOfWork.cs
new file mode 100644
index 00000000..27ab21e4
--- /dev/null
+++ b/src/CoreEx.Data/IUnitOfWork.cs
@@ -0,0 +1,56 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables standardized repository-agnostic transactional <i>unit-of-work</i> orchestration.
+/// </summary>
+/// <remarks>Also, includes <see cref="Events"/> where <see cref="AreEventsSupported">supporting</see> a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+/// <para>The <see cref="IDataArgs"/> method overloads are enabled for specific advanced/configurable scenarios which would typically be rare. The consumer will need to ensure that the correct <see cref="IDataArgs"/> <see cref="Type"/> is provided.</para>
+/// <para>Where implementing this interface the resulting value should be checked to determines if it is an <see cref="IResult"/>; if so, and <see cref="IResult.IsFailure"/> then this should rollback in the same manner
+/// that would occur where an <see cref="Exception"/> had been thrown.</para></remarks>
+public partial interface IUnitOfWork
+{
+    /// <summary>
+    /// Indicates whether <see cref="Events"/> are supported; i.e. a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+    /// </summary>
+    bool AreEventsSupported { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IEventQueue"/> for managing events (<see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>) within the <i>unit-of-work</i>.
+    /// </summary>
+    /// <remarks>Should throw a <see cref="NotSupportedException"/> where <see cref="AreEventsSupported"/> is <see langword="false"/>.</remarks>
+    IEventQueue Events { get; }
+
+    /// <summary>
+    /// Orchestrates either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution.
+    /// </summary>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task TransactionAsync(Func<CancellationToken, Task> work, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Orchestrates either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution that returns a value.
+    /// </summary>
+    /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting value.</returns>
+    Task<T> TransactionAsync<T>(Func<CancellationToken, Task<T>> work, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Orchestrates either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution.
+    /// </summary>
+    /// <param name="args">The <see cref="IDataArgs"/>.</param>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task TransactionAsync(IDataArgs args, Func<CancellationToken, Task> work, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Orchestrates either a new or <i>flows</i> an existing transaction managing its lifetime and underlying <paramref name="work"/> execution that returns a value.
+    /// </summary>
+    /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
+    /// <param name="args">The <see cref="IDataArgs"/>.</param>
+    /// <param name="work">The work to be executed within the transaction.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting value.</returns>
+    Task<T> TransactionAsync<T>(IDataArgs args, Func<CancellationToken, Task<T>> work, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Models/ModelBase.cs b/src/CoreEx.Data/Models/ModelBase.cs
new file mode 100644
index 00000000..5fddc565
--- /dev/null
+++ b/src/CoreEx.Data/Models/ModelBase.cs
@@ -0,0 +1,29 @@
+namespace CoreEx.Data.Models;
+
+/// <summary>
+/// Provides a convenience base class for data models implementing the common properties and interfaces such as <see cref="IIdentifier{T}"/>, <see cref="IChangeLogEx"/>, and <see cref="IETag"/>.
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+/// <remarks>Usage is purely optional; there is no other specific requirement for its use.</remarks>
+public abstract class ModelBase<TId> : IIdentifier<TId>, IChangeLogEx, IETag
+{
+    /// <summary>
+    /// Gets or sets the identifier.
+    /// </summary>
+    public TId Id { get; set; } = default!;
+
+    /// <inheritdoc/>
+    public string? CreatedBy { get; set; }
+
+    /// <inheritdoc/>
+    public DateTimeOffset? CreatedOn { get; set; }
+
+    /// <inheritdoc/>
+    public string? UpdatedBy { get; set; }
+
+    /// <inheritdoc/>
+    public DateTimeOffset? UpdatedOn { get; set; }
+
+    /// <inheritdoc/>
+    public string? ETag { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Models/ReferenceDataModelBase.cs b/src/CoreEx.Data/Models/ReferenceDataModelBase.cs
new file mode 100644
index 00000000..c8abfbb4
--- /dev/null
+++ b/src/CoreEx.Data/Models/ReferenceDataModelBase.cs
@@ -0,0 +1,45 @@
+namespace CoreEx.Data.Models;
+
+/// <summary>
+/// Provides a convenience base class for reference data models implementing the common <see cref="IReferenceData"/> properties (extends <see cref="ModelBase{T}"/>).
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+/// <remarks>Usage is purely optional; there is no other specific requirement for its use.
+/// <para>Does not implement <see cref="IReferenceData"/> by design, as it is not intended to support the base functionality.</para></remarks>
+public abstract class ReferenceDataModelBase<TId> : ModelBase<TId>
+{
+    /// <summary>
+    /// Gets or sets the unique code.
+    /// </summary>
+    public string Code { get; set; } = default!;
+
+    /// <summary>
+    /// Gets or sets the text.
+    /// </summary>
+    public string? Text { get; set; }
+
+    /// <summary>
+    /// Gets or sets the description.
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the sort order.
+    /// </summary>
+    public int SortOrder { get; set; }
+
+    /// <summary>
+    /// Indicates whether the reference data is active.
+    /// </summary>
+    public bool IsActive { get; set; }
+
+    /// <summary>
+    /// Gets or sets the validity start <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset? StartsOn { get; init; }
+
+    /// <summary>
+    /// Gets or sets the validity end <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset? EndsOn { get; init; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/IQueryFilterFieldStatementExpression.cs b/src/CoreEx.Data/Querying/Expressions/IQueryFilterFieldStatementExpression.cs
index 64edf7e5..08010ab0 100644
--- a/src/CoreEx.Data/Querying/Expressions/IQueryFilterFieldStatementExpression.cs
+++ b/src/CoreEx.Data/Querying/Expressions/IQueryFilterFieldStatementExpression.cs
@@ -1,20 +1,17 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Identifies a query filter statement expression.
+/// </summary>
+public interface IQueryFilterFieldStatementExpression 
 {
     /// <summary>
-    /// Identifies a query filter statement expression.
+    /// Gets the field <see cref="IQueryFilterFieldConfig"/>.
     /// </summary>
-    public interface IQueryFilterFieldStatementExpression 
-    {
-        /// <summary>
-        /// Gets the field <see cref="IQueryFilterFieldConfig"/>.
-        /// </summary>
-        IQueryFilterFieldConfig FieldConfig { get; }
+    IQueryFilterFieldConfig FieldConfig { get; }
 
-        /// <summary>
-        /// Gets the field <see cref="QueryFilterToken"/>.
-        /// </summary>
-        QueryFilterToken Field { get; }
-    }
+    /// <summary>
+    /// Gets the field <see cref="QueryFilterToken"/>.
+    /// </summary>
+    QueryFilterToken Field { get; }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterCloseParenthesisExpression.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterCloseParenthesisExpression.cs
index 017a51eb..8442f21a 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterCloseParenthesisExpression.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterCloseParenthesisExpression.cs
@@ -1,21 +1,18 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Represents a query filter <see cref="QueryFilterTokenKind.CloseParenthesis"/> expression.
+/// </summary>
+/// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
+/// <param name="filter">The originating query filter.</param>
+/// <param name="syntax">The syntax <see cref="QueryFilterToken"/>.</param>
+public sealed class QueryFilterCloseParenthesisExpression(QueryFilterParser parser, string filter, QueryFilterToken syntax) : QueryFilterExpressionBase(parser, filter, syntax)
 {
-    /// <summary>
-    /// Represents a query filter <see cref="QueryFilterTokenKind.CloseParenthesis"/> expression.
-    /// </summary>
-    /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
-    /// <param name="filter">The originating query filter.</param>
-    /// <param name="syntax">The syntax <see cref="QueryFilterToken"/>.</param>
-    public sealed class QueryFilterCloseParenthesisExpression(QueryFilterParser parser, string filter, QueryFilterToken syntax) : QueryFilterExpressionBase(parser, filter, syntax)
-    {
-        private QueryFilterToken _syntax;
+    private QueryFilterToken _syntax;
 
-        /// <inheritdoc/>
-        protected override void AddToken(int index, QueryFilterToken token) => _syntax = token;
+    /// <inheritdoc/>
+    protected override void AddToken(int index, QueryFilterToken token) => _syntax = token;
 
-        /// <inheritdoc/>
-        public override void WriteToResult(QueryFilterParserResult result) => result.FilterBuilder.Append(_syntax.ToLinq(Filter));
-    }
+    /// <inheritdoc/>
+    public override void WriteAsDynamicLinq(QueryFilterParserWriter result) => result.Append(_syntax.ToLinq(Filter));
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterExpressionBase.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterExpressionBase.cs
index 8e9d2f53..bf08748b 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterExpressionBase.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterExpressionBase.cs
@@ -1,74 +1,71 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Provides a query filter expression.
+/// </summary>
+public abstract class QueryFilterExpressionBase
 {
     /// <summary>
-    /// Provides a query filter expression.
+    /// Initlializes a new instance of the <see cref="QueryFilterExpressionBase"/>.
     /// </summary>
-    public abstract class QueryFilterExpressionBase
+    /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
+    /// <param name="filter">The originating query filter.</param>
+    /// <param name="first">The first <see cref="QueryFilterToken"/> to be added.</param>
+    public QueryFilterExpressionBase(QueryFilterParser parser, string filter, QueryFilterToken first)
     {
-        /// <summary>
-        /// Initlializes a new instance of the <see cref="QueryFilterExpressionBase"/>.
-        /// </summary>
-        /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
-        /// <param name="filter">The originating query filter.</param>
-        /// <param name="first">The first <see cref="QueryFilterToken"/> to be added.</param>
-        public QueryFilterExpressionBase(QueryFilterParser parser, string filter, QueryFilterToken first)
-        {
-            Parser = parser.ThrowIfNull(nameof(parser));
-            Filter = filter.ThrowIfNull(nameof(filter));
-            AddToken(first);
-        }
+        Parser = parser.ThrowIfNull();
+        Filter = filter.ThrowIfNull();
+        AddToken(first);
+    }
 
-        /// <summary>
-        /// Gets the owning <see cref="QueryFilterParser"/>.
-        /// </summary>
-        public QueryFilterParser Parser { get; }
+    /// <summary>
+    /// Gets the owning <see cref="QueryFilterParser"/>.
+    /// </summary>
+    public QueryFilterParser Parser { get; }
 
-        /// <summary>
-        /// Gets the originating query filter.
-        /// </summary>
-        public string Filter { get; }
+    /// <summary>
+    /// Gets the originating query filter.
+    /// </summary>
+    public string Filter { get; }
 
-        /// <summary>
-        /// Gets the count of tokens added.
-        /// </summary>
-        public int TokenCount { get; private set; }
+    /// <summary>
+    /// Gets the count of tokens added.
+    /// </summary>
+    public int TokenCount { get; private set; }
 
-        /// <summary>
-        /// Indicates whether the expression is considered in a complete and valid state.
-        /// </summary>
-        public virtual bool IsComplete => true;
+    /// <summary>
+    /// Indicates whether the expression is considered in a complete and valid state.
+    /// </summary>
+    public virtual bool IsComplete => true;
 
-        /// <summary>
-        /// Indicates whether the <paramref name="token"/> can be added to the expression.
-        /// </summary>
-        /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
-        /// <returns><see langword="true"/> indicates that the <paramref name="token"/> can and should be added; otherwise, <see langword="false"/> signifies that the <paramref name="token"/> is for the next expression.</returns>
-        /// <remarks>Used to determine whether the next <paramref name="token"/> can be added; allows an expression to support multiple complete states.</remarks>
-        public virtual bool CanAddToken(QueryFilterToken token) => !IsComplete;
+    /// <summary>
+    /// Indicates whether the <paramref name="token"/> can be added to the expression.
+    /// </summary>
+    /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
+    /// <returns><see langword="true"/> indicates that the <paramref name="token"/> can and should be added; otherwise, <see langword="false"/> signifies that the <paramref name="token"/> is for the next expression.</returns>
+    /// <remarks>Used to determine whether the next <paramref name="token"/> can be added; allows an expression to support multiple complete states.</remarks>
+    public virtual bool CanAddToken(QueryFilterToken token) => !IsComplete;
 
-        /// <summary>
-        /// Adds the <paramref name="token"/> to the expression.
-        /// </summary>
-        /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
-        public void AddToken(QueryFilterToken token)
-        {
-            AddToken(TokenCount, token);
-            TokenCount++;
-        }
+    /// <summary>
+    /// Adds the <paramref name="token"/> to the expression.
+    /// </summary>
+    /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
+    public void AddToken(QueryFilterToken token)
+    {
+        AddToken(TokenCount, token);
+        TokenCount++;
+    }
 
-        /// <summary>
-        /// Adds the <paramref name="token"/> to the expression.
-        /// </summary>
-        /// <param name="index">The <paramref name="token"/> index.</param>
-        /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
-        protected abstract void AddToken(int index, QueryFilterToken token);
+    /// <summary>
+    /// Adds the <paramref name="token"/> to the expression.
+    /// </summary>
+    /// <param name="index">The <paramref name="token"/> index.</param>
+    /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
+    protected abstract void AddToken(int index, QueryFilterToken token);
 
-        /// <summary>
-        /// Converts the query filter expression into the corresponding dynamic LINQ appending to the <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="QueryFilterParserResult"/>.</param>
-        public abstract void WriteToResult(QueryFilterParserResult result);
-    }
+    /// <summary>
+    /// Writes the query filter expression into the corresponding dynamic LINQ.
+    /// </summary>
+    /// <param name="writer">The <see cref="QueryFilterParserWriter"/>.</param>
+    public abstract void WriteAsDynamicLinq(QueryFilterParserWriter writer);
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterLogicalExpression.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterLogicalExpression.cs
index 7a0849f3..f4953834 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterLogicalExpression.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterLogicalExpression.cs
@@ -1,54 +1,51 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Represents a query filter <see cref="QueryFilterTokenKind.Logical"/> expression.
+/// </summary>
+/// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
+/// <param name="filter">The originating query filter.</param>
+/// <param name="logical">The logical <see cref="QueryFilterOperatorExpression"/></param>
+public class QueryFilterLogicalExpression(QueryFilterParser parser, string filter, QueryFilterToken logical) : QueryFilterExpressionBase(parser, filter, logical)
 {
-    /// <summary>
-    /// Represents a query filter <see cref="QueryFilterTokenKind.Logical"/> expression.
-    /// </summary>
-    /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
-    /// <param name="filter">The originating query filter.</param>
-    /// <param name="logical">The logical <see cref="QueryFilterOperatorExpression"/></param>
-    public class QueryFilterLogicalExpression(QueryFilterParser parser, string filter, QueryFilterToken logical) : QueryFilterExpressionBase(parser, filter, logical)
-    {
-        private QueryFilterToken _logical = QueryFilterToken.Unspecified;
-        private QueryFilterToken _not = QueryFilterToken.Unspecified;
-        private bool _isComplete = true;
+    private QueryFilterToken _logical = QueryFilterToken.Unspecified;
+    private QueryFilterToken _not = QueryFilterToken.Unspecified;
+    private bool _isComplete = true;
 
-        /// <inheritdoc/>
-        public override bool IsComplete => _isComplete;
+    /// <inheritdoc/>
+    public override bool IsComplete => _isComplete;
 
-        /// <inheritdoc/>
-        public override bool CanAddToken(QueryFilterToken token)
-        {
-            if (TokenCount == 1)
-                return token.Kind == QueryFilterTokenKind.Not;
+    /// <inheritdoc/>
+    public override bool CanAddToken(QueryFilterToken token)
+    {
+        if (TokenCount == 1)
+            return token.Kind == QueryFilterTokenKind.Not;
 
-            _isComplete = token.Kind == QueryFilterTokenKind.OpenParenthesis;
-            return _isComplete
-                ? false
-                : throw new QueryFilterParserException($"A '{_not.GetRawToken(Filter).ToString()}' expects an opening '(' to start an expression versus a syntactically incorrect '{token.GetValueToken(Filter)}' token.");
-        }
+        _isComplete = token.Kind == QueryFilterTokenKind.OpenParenthesis;
+        return _isComplete
+            ? false
+            : throw new QueryFilterParserException($"A '{_not.GetRawToken(Filter)}' expects an opening '(' to start an expression versus a syntactically incorrect '{token.GetValueToken(Filter)}' token.");
+    }
 
-        /// <inheritdoc/>
-        protected override void AddToken(int index, QueryFilterToken token)
+    /// <inheritdoc/>
+    protected override void AddToken(int index, QueryFilterToken token)
+    {
+        if (index == 0 && token.Kind != QueryFilterTokenKind.Not)
+            _logical = token;
+        else
         {
-            if (index == 0 && token.Kind != QueryFilterTokenKind.Not)
-                _logical = token;
-            else
-            {
-                _not = token;
-                _isComplete = false;
-            }
+            _not = token;
+            _isComplete = false;
         }
+    }
 
-        /// <inheritdoc/>
-        public override void WriteToResult(QueryFilterParserResult result)
-        {
-            if (_logical.Kind != QueryFilterTokenKind.Unspecified)
-                result.Append(_logical.ToLinq(Filter));
+    /// <inheritdoc/>
+    public override void WriteAsDynamicLinq(QueryFilterParserWriter writer)
+    {
+        if (_logical.Kind != QueryFilterTokenKind.Unspecified)
+            writer.AppendWithSpacing(_logical.ToLinq(Filter));
 
-            if (_not.Kind != QueryFilterTokenKind.Unspecified)
-                result.Append(_not.ToLinq(Filter));
-        }
+        if (_not.Kind != QueryFilterTokenKind.Unspecified)
+            writer.AppendWithSpacing(_not.ToLinq(Filter));
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterOpenParenthesisExpression.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterOpenParenthesisExpression.cs
index 9658d929..f5d9698c 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterOpenParenthesisExpression.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterOpenParenthesisExpression.cs
@@ -1,21 +1,18 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Represents a query filter <see cref="QueryFilterTokenKind.OpenParenthesis"/> expression.
+/// </summary>
+/// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
+/// <param name="filter">The originating query filter.</param>
+/// <param name="syntax">The syntax <see cref="QueryFilterToken"/>.</param>
+public sealed class QueryFilterOpenParenthesisExpression(QueryFilterParser parser, string filter, QueryFilterToken syntax) : QueryFilterExpressionBase(parser, filter, syntax)
 {
-    /// <summary>
-    /// Represents a query filter <see cref="QueryFilterTokenKind.OpenParenthesis"/> expression.
-    /// </summary>
-    /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
-    /// <param name="filter">The originating query filter.</param>
-    /// <param name="syntax">The syntax <see cref="QueryFilterToken"/>.</param>
-    public sealed class QueryFilterOpenParenthesisExpression(QueryFilterParser parser, string filter, QueryFilterToken syntax) : QueryFilterExpressionBase(parser, filter, syntax)
-    {
-        private QueryFilterToken _syntax;
+    private QueryFilterToken _syntax;
 
-        /// <inheritdoc/>
-        protected override void AddToken(int index, QueryFilterToken token) => _syntax = token;
+    /// <inheritdoc/>
+    protected override void AddToken(int index, QueryFilterToken token) => _syntax = token;
 
-        /// <inheritdoc/>
-        public override void WriteToResult(QueryFilterParserResult result) => result.Append(_syntax.ToLinq(Filter));
-    }
+    /// <inheritdoc/>
+    public override void WriteAsDynamicLinq(QueryFilterParserWriter writer) => writer.AppendWithSpacing(_syntax.ToLinq(Filter));
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterOperatorExpression.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterOperatorExpression.cs
index 4af0f2f5..ebb9879f 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterOperatorExpression.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterOperatorExpression.cs
@@ -1,173 +1,180 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
+
+/// <summary>
+/// Represents a query filter <see cref="QueryFilterTokenKind.ComparisonOperators"/> expression.
+/// </summary>
+/// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
+/// <param name="filter">The originating query filter.</param>
+/// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
+public sealed class QueryFilterOperatorExpression(QueryFilterParser parser, string filter, QueryFilterToken field) : QueryFilterExpressionBase(parser, filter, field), IQueryFilterFieldStatementExpression
+{
+    private IQueryFilterFieldConfig? _fieldConfig;
+    private bool _isComplete;
 
-using System;
-using System.Collections.Generic;
+    /// <summary>
+    /// Gets the field <see cref="IQueryFilterFieldConfig"/>.
+    /// </summary>
+    public IQueryFilterFieldConfig FieldConfig => _fieldConfig ?? throw new InvalidOperationException($"{nameof(FieldConfig)} must be set before it can be accessed.");
 
-namespace CoreEx.Data.Querying.Expressions
-{
     /// <summary>
-    /// Represents a query filter <see cref="QueryFilterTokenKind.ComparisonOperators"/> expression.
+    /// Gets the field <see cref="QueryFilterToken"/>.
     /// </summary>
-    /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
-    /// <param name="filter">The originating query filter.</param>
-    /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
-    public sealed class QueryFilterOperatorExpression(QueryFilterParser parser, string filter, QueryFilterToken field) : QueryFilterExpressionBase(parser, filter, field), IQueryFilterFieldStatementExpression
-    {
-        private IQueryFilterFieldConfig? _fieldConfig;
-        private bool _isComplete;
+    public QueryFilterToken Field { get; private set; }
 
-        /// <summary>
-        /// Gets the field <see cref="IQueryFilterFieldConfig"/>.
-        /// </summary>
-        public IQueryFilterFieldConfig FieldConfig => _fieldConfig ?? throw new InvalidOperationException($"{nameof(FieldConfig)} must be set before it can be accessed.");
+    /// <summary>
+    /// Gets the operator <see cref="QueryFilterToken"/>.
+    /// </summary>
+    public QueryFilterToken Operator { get; private set; }
 
-        /// <summary>
-        /// Gets the field <see cref="QueryFilterToken"/>.
-        /// </summary>
-        public QueryFilterToken Field { get; private set; }
+    /// <summary>
+    /// Gets the constant <see cref="QueryFilterToken"/> list.
+    /// </summary>
+    public List<QueryFilterToken> Constants { get; } = [];
 
-        /// <summary>
-        /// Gets the operator <see cref="QueryFilterToken"/>.
-        /// </summary>
-        public QueryFilterToken Operator { get; private set; }
+    /// <inheritdoc/>
+    public override bool IsComplete => _isComplete;
 
-        /// <summary>
-        /// Gets the constant <see cref="QueryFilterToken"/> list.
-        /// </summary>
-        public List<QueryFilterToken> Constants { get; } = [];
+    /// <inheritdoc/>
+    public override bool CanAddToken(QueryFilterToken token) => !_isComplete || TokenCount == 1 && QueryFilterTokenKind.ComparisonOperators.HasFlag(token.Kind);
 
-        /// <inheritdoc/>
-        public override bool IsComplete => _isComplete;
+    /// <inheritdoc/>
+    protected override void AddToken(int index, QueryFilterToken token)
+    {
+        switch (index)
+        {
+            case 0:
+                Field = token;
+                _fieldConfig = Parser.GetFieldConfig(Field, Filter);
+                _isComplete = FieldConfig.FieldType == QueryFilterFieldType.Boolean;
+                break;
 
-        /// <inheritdoc/>
-        public override bool CanAddToken(QueryFilterToken token) => !_isComplete || TokenCount == 1 && QueryFilterTokenKind.ComparisonOperators.HasFlag(token.Kind);
+            case 1:
+                if (!QueryFilterTokenKind.AllStringOperators.HasFlag(token.Kind))
+                    throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' does not support '{token.GetRawToken(Filter)}' as an operator.");
 
-        /// <inheritdoc/>
-        protected override void AddToken(int index, QueryFilterToken token)
-        {
-            switch (index)
-            {
-                case 0:
-                    Field = token;
-                    _fieldConfig = Parser.GetFieldConfig(Field, Filter);
-                    _isComplete = FieldConfig.IsTypeBoolean;
-                    break;
+                var op = (QueryFilterOperator)(int)token.Kind; 
+                if (!FieldConfig.Operators.HasFlag(op))
+                    throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' does not support the '{token.GetRawToken(Filter)}' operator.");
 
-                case 1:
-                    if (!QueryFilterTokenKind.AllStringOperators.HasFlag(token.Kind))
-                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' does not support '{token.GetRawToken(Filter).ToString()}' as an operator.");
+                _isComplete = false;
+                Operator = token;
+                break;
 
-                    var op = (QueryFilterOperator)(int)token.Kind; 
-                    if (!FieldConfig.Operators.HasFlag(op))
-                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' does not support the '{token.GetRawToken(Filter).ToString()}' operator.");
+            case 2:
+                if (Operator.Kind == QueryFilterTokenKind.In)
+                {
+                    if (token.Kind != QueryFilterTokenKind.OpenParenthesis)
+                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' must specify an opening '(' for the '{Operator.GetRawToken(Filter)}' operator.");
 
-                    _isComplete = false;
-                    Operator = token;
                     break;
+                }
 
-                case 2:
-                    if (Operator.Kind == QueryFilterTokenKind.In)
-                    {
-                        if (token.Kind != QueryFilterTokenKind.OpenParenthesis)
-                            throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' must specify an opening '(' for the '{Operator.GetRawToken(Filter).ToString()}' operator.");
+                if (token.Kind == QueryFilterTokenKind.Null && !QueryFilterTokenKind.EqualityOperators.HasFlag(Operator.Kind))
+                    throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' constant must not be null for an '{Operator.GetRawToken(Filter)}' operator.");
 
-                        break;
-                    }
+                FieldConfig.ValidateConstant(Field, token, Filter);
+                Constants.Add(token);
+                _isComplete = true;
+                break;
+
+            default:
+                if (index % 2 != 0)
+                {
+                    if (token.Kind == QueryFilterTokenKind.CloseParenthesis)
+                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' constant must be specified before the closing ')' for the '{Operator.GetRawToken(Filter)}' operator.");
 
-                    if (token.Kind == QueryFilterTokenKind.Null && !QueryFilterTokenKind.EqualityOperators.HasFlag(Operator.Kind))
-                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' constant must not be null for an '{Operator.GetRawToken(Filter).ToString()}' operator.");
+                    if (token.Kind == QueryFilterTokenKind.OpenParenthesis)
+                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' must close ')' the '{Operator.GetRawToken(Filter)}' operator before specifying a further open '('.");
+
+                    if (token.Kind == QueryFilterTokenKind.Null)
+                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' constant must not be null for an '{Operator.GetRawToken(Filter)}' operator.");
 
                     FieldConfig.ValidateConstant(Field, token, Filter);
                     Constants.Add(token);
-                    _isComplete = true;
-                    break;
-
-                default:
-                    if (index % 2 != 0)
+                }
+                else
+                {
+                    if (token.Kind == QueryFilterTokenKind.CloseParenthesis)
                     {
-                        if (token.Kind == QueryFilterTokenKind.CloseParenthesis)
-                            throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' constant must be specified before the closing ')' for the '{Operator.GetRawToken(Filter).ToString()}' operator.");
-
-                        if (token.Kind == QueryFilterTokenKind.OpenParenthesis)
-                            throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' must close ')' the '{Operator.GetRawToken(Filter).ToString()}' operator before specifying a further open '('.");
+                        if (Constants.Count == 0)
+                            throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' expects at least one constant value for an '{Operator.GetRawToken(Filter)}' operator.");
 
-                        if (token.Kind == QueryFilterTokenKind.Null)
-                            throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' constant must not be null for an '{Operator.GetRawToken(Filter).ToString()}' operator.");
-
-                        FieldConfig.ValidateConstant(Field, token, Filter);
-                        Constants.Add(token);
+                        _isComplete = true;
+                        break;
                     }
-                    else
-                    {
-                        if (token.Kind == QueryFilterTokenKind.CloseParenthesis)
-                        {
-                            if (Constants.Count == 0)
-                                throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' expects at least one constant value for an '{Operator.GetRawToken(Filter).ToString()}' operator.");
 
-                            _isComplete = true;
-                            break;
-                        }
+                    if (token.Kind != QueryFilterTokenKind.Comma)
+                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' expects a ',' separator between constant values for an '{Operator.GetRawToken(Filter)}' operator.");
+                }
 
-                        if (token.Kind != QueryFilterTokenKind.Comma)
-                            throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' expects a ',' separator between constant values for an '{Operator.GetRawToken(Filter).ToString()}' operator.");
-                    }
+                break;
+        }
+    }
 
-                    break;
-            }
+    /// <summary>
+    /// Gets the converted <see cref="Constants"/> value using the specified <paramref name="index"/>.
+    /// </summary>
+    /// <param name="index">The <see cref="Constants"/> index.</param>
+    /// <returns>The converted value.</returns>
+    public object GetConstantValue(int index) => Constants[index].GetConvertedValue(Operator, Field, FieldConfig, Filter);
+
+    /// <inheritdoc/>
+    public override void WriteAsDynamicLinq(QueryFilterParserWriter writer)
+    {
+        // Handle the prepended check for null.
+        if (Operator.Kind != QueryFilterTokenKind.In && (Constants.Count == 0 || Constants[0].Kind != QueryFilterTokenKind.Null) && FieldConfig.IsCheckForNotNull)
+        {
+            writer.AppendWithSpacing("(");
+            writer.Config.WriteNullFilterExpression(writer, FieldConfig, QueryFilterTokenKind.NotEqual);
+            writer.Append(" && ");
+        }      
+        else if (Constants.Count == 1 && Constants[0].Kind == QueryFilterTokenKind.Null)
+        {
+            // Handle the simple straight-up check for null.
+            writer.Config.WriteNullFilterExpression(writer, FieldConfig, Operator.Kind);
+            return;
         }
 
-        /// <summary>
-        /// Gets the converted <see cref="Constants"/> value using the specified <paramref name="index"/>.
-        /// </summary>
-        /// <param name="index">The <see cref="Constants"/> index.</param>
-        /// <returns>The converted value.</returns>
-        public object GetConstantValue(int index) => Constants[index].GetConvertedValue(Operator, Field, FieldConfig, Filter);
+        // Handle the generic expression.
+        writer.AppendWithSpacing(FieldConfig.FullyQualifiedModelName);
 
-        /// <inheritdoc/>
-        public override void WriteToResult(QueryFilterParserResult result)
+        if (Constants.Count > 0)
         {
-            if (Operator.Kind != QueryFilterTokenKind.In && (Constants.Count == 0 || Constants[0].Kind != QueryFilterTokenKind.Null) && FieldConfig.IsCheckForNotNull)
+            if (FieldConfig.FieldType == QueryFilterFieldType.String && FieldConfig.IsToUpper.HasValue)
             {
-                result.Append("(");
-                result.FilterBuilder.Append(FieldConfig.Model);
-                result.FilterBuilder.Append(" != null && ");
+                if (FieldConfig.IsToUpper.Value)
+                    writer.Append(".ToUpper()");
+                else
+                    writer.Append(".ToLower()");
             }
 
-            result.Append(FieldConfig.Model);
+            writer.Append(' ');
+            writer.Append(Operator.ToLinq(Filter));
+            writer.Append(' ');
 
-            if (Constants.Count > 0)
+            if (Operator.Kind == QueryFilterTokenKind.In)
             {
-                if (FieldConfig.IsTypeString && FieldConfig.IsToUpper)
-                    result.FilterBuilder.Append(".ToUpper()");
-
-                result.FilterBuilder.Append(' ');
-                result.FilterBuilder.Append(Operator.ToLinq(Filter));
-                result.FilterBuilder.Append(' ');
-
-                if (Operator.Kind == QueryFilterTokenKind.In)
+                writer.Append('(');
+                for (int i = 0; i < Constants.Count; i++)
                 {
-                    result.FilterBuilder.Append('(');
-                    for (int i = 0; i < Constants.Count; i++)
-                    {
-                        if (i > 0)
-                            result.FilterBuilder.Append(", ");
-
-                        result.AppendValue(GetConstantValue(i));
-                    }
+                    if (i > 0)
+                        writer.Append(", ");
 
-                    result.FilterBuilder.Append(')');
+                    writer.AppendValue(GetConstantValue(i));
                 }
+
+                writer.Append(')');
+            }
+            else
+            {
+                if (Constants[0].Kind == QueryFilterTokenKind.Value || Constants[0].Kind == QueryFilterTokenKind.Literal)
+                    writer.AppendValue(GetConstantValue(0));
                 else
-                {
-                    if (Constants[0].Kind == QueryFilterTokenKind.Value || Constants[0].Kind == QueryFilterTokenKind.Literal)
-                        result.AppendValue(GetConstantValue(0));
-                    else
-                        result.FilterBuilder.Append(Constants[0].ToLinq(Filter));
-                }
+                    writer.Append(Constants[0].ToLinq(Filter));
             }
-
-            if (Operator.Kind != QueryFilterTokenKind.In && (Constants.Count == 0 || Constants[0].Kind != QueryFilterTokenKind.Null) && FieldConfig.IsCheckForNotNull)
-                result.FilterBuilder.Append(')');
         }
+
+        if (Operator.Kind != QueryFilterTokenKind.In && (Constants.Count == 0 || Constants[0].Kind != QueryFilterTokenKind.Null) && FieldConfig.IsCheckForNotNull)
+            writer.Append(')');
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterStringFunctionExpression.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterStringFunctionExpression.cs
index 4510bedb..4f5194db 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterStringFunctionExpression.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterStringFunctionExpression.cs
@@ -1,122 +1,122 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Data.Querying.Expressions
+namespace CoreEx.Data.Querying.Expressions;
+
+/// <summary>
+/// Represents a query filter <see cref="QueryFilterTokenKind.StringFunctions"/> expression.
+/// </summary>
+/// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
+/// <param name="filter">The originating query filter.</param>
+/// <param name="function">The function <see cref="QueryFilterOperatorExpression"/></param>
+public sealed class QueryFilterStringFunctionExpression(QueryFilterParser parser, string filter, QueryFilterToken function) : QueryFilterExpressionBase(parser, filter, function), IQueryFilterFieldStatementExpression
 {
+    private IQueryFilterFieldConfig? _fieldConfig;
+    private bool _isComplete;
+
     /// <summary>
-    /// Represents a query filter <see cref="QueryFilterTokenKind.StringFunctions"/> expression.
+    /// Gets the function <see cref="QueryFilterToken"/>.
     /// </summary>
-    /// <param name="parser">The <see cref="QueryFilterParser"/>.</param>
-    /// <param name="filter">The originating query filter.</param>
-    /// <param name="function">The function <see cref="QueryFilterOperatorExpression"/></param>
-    public sealed class QueryFilterStringFunctionExpression(QueryFilterParser parser, string filter, QueryFilterToken function) : QueryFilterExpressionBase(parser, filter, function), IQueryFilterFieldStatementExpression
-    {
-        private IQueryFilterFieldConfig? _fieldConfig;
-        private bool _isComplete;
-
-        /// <summary>
-        /// Gets the function <see cref="QueryFilterToken"/>.
-        /// </summary>
-        public QueryFilterToken Function { get; private set; }
+    public QueryFilterToken Function { get; private set; }
 
-        /// <summary>
-        /// Gets the <see cref="IQueryFilterFieldConfig"/>.
-        /// </summary>
-        public IQueryFilterFieldConfig FieldConfig => _fieldConfig ?? throw new InvalidOperationException($"{nameof(FieldConfig)} must be set before it can be accessed.");
+    /// <summary>
+    /// Gets the <see cref="IQueryFilterFieldConfig"/>.
+    /// </summary>
+    public IQueryFilterFieldConfig FieldConfig => _fieldConfig ?? throw new InvalidOperationException($"{nameof(FieldConfig)} must be set before it can be accessed.");
 
-        /// <summary>
-        /// Gets the field <see cref="QueryFilterToken"/>.
-        /// </summary>
-        public QueryFilterToken Field { get; private set; }
+    /// <summary>
+    /// Gets the field <see cref="QueryFilterToken"/>.
+    /// </summary>
+    public QueryFilterToken Field { get; private set; }
 
-        /// <summary>
-        /// Gets the constant <see cref="QueryFilterToken"/>.
-        /// </summary>
-        public QueryFilterToken Constant { get; private set; }
+    /// <summary>
+    /// Gets the constant <see cref="QueryFilterToken"/>.
+    /// </summary>
+    public QueryFilterToken Constant { get; private set; }
 
-        /// <inheritdoc/>
-        public override bool IsComplete => _isComplete;
+    /// <inheritdoc/>
+    public override bool IsComplete => _isComplete;
 
-        /// <inheritdoc/>
-        public override bool CanAddToken(QueryFilterToken token) => !_isComplete;
+    /// <inheritdoc/>
+    public override bool CanAddToken(QueryFilterToken token) => !_isComplete;
 
-        /// <inheritdoc/>
-        protected override void AddToken(int index, QueryFilterToken token)
+    /// <inheritdoc/>
+    protected override void AddToken(int index, QueryFilterToken token)
+    {
+        switch (index)
         {
-            switch (index)
-            {
-                case 0:
-                    Function = token;
-                    break;
+            case 0:
+                Function = token;
+                break;
 
-                case 1:
-                    if (token.Kind != QueryFilterTokenKind.OpenParenthesis)
-                        throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter).ToString()}' function expects an opening '(' not a '{token.GetValueToken(Filter)}'.");
+            case 1:
+                if (token.Kind != QueryFilterTokenKind.OpenParenthesis)
+                    throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter)}' function expects an opening '(' not a '{token.GetValueToken(Filter)}'.");
 
-                    break;
+                break;
 
-                case 2:
-                    Field = token;
-                    _fieldConfig = Parser.GetFieldConfig(Field, Filter);
+            case 2:
+                Field = token;
+                _fieldConfig = Parser.GetFieldConfig(Field, Filter);
 
-                    var op = (QueryFilterOperator)(int)Function.Kind;
-                    if (!FieldConfig.Operators.HasFlag(op))
-                        throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter).ToString()}' does not support the '{Function.GetRawToken(Filter).ToString()}' function.");
+                var op = (QueryFilterOperator)(int)Function.Kind;
+                if (!FieldConfig.Operators.HasFlag(op))
+                    throw new QueryFilterParserException($"Field '{Field.GetRawToken(Filter)}' does not support the '{Function.GetRawToken(Filter)}' function.");
 
-                    break;
+                break;
 
-                case 3:
-                    if (token.Kind != QueryFilterTokenKind.Comma)
-                        throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter).ToString()}' function expects a ',' separator between the field and its constant.");
+            case 3:
+                if (token.Kind != QueryFilterTokenKind.Comma)
+                    throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter)}' function expects a ',' separator between the field and its constant.");
 
-                    break;
+                break;
 
-                case 4:
-                    if (token.Kind == QueryFilterTokenKind.Null)
-                        throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter).ToString()}' function references a null constant which is not supported.");
+            case 4:
+                if (token.Kind == QueryFilterTokenKind.Null)
+                    throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter)}' function references a null constant which is not supported.");
 
-                    FieldConfig.ValidateConstant(Field, token, Filter);
-                    Constant = token;
-                    break;
+                FieldConfig.ValidateConstant(Field, token, Filter);
+                Constant = token;
+                break;
 
-                case 5:
-                    if (token.Kind != QueryFilterTokenKind.CloseParenthesis)
-                        throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter).ToString()}' function expects a closing ')' not a '{token.GetValueToken(Filter)}'.");
+            case 5:
+                if (token.Kind != QueryFilterTokenKind.CloseParenthesis)
+                    throw new QueryFilterParserException($"A '{Function.GetRawToken(Filter)}' function expects a closing ')' not a '{token.GetValueToken(Filter)}'.");
 
-                    _isComplete = true;
-                    break;
-            }
+                _isComplete = true;
+                break;
         }
+    }
+
+    /// <summary>
+    /// Gets the converted <see cref="Constant"/> value.
+    /// </summary>
+    /// <returns>The converted value.</returns>
+    public object GetConstantValue() => Constant!.GetConvertedValue(Function, Field, FieldConfig, Filter);
 
-        /// <summary>
-        /// Gets the converted <see cref="Constant"/> value.
-        /// </summary>
-        /// <returns>The converted value.</returns>
-        public object GetConstantValue() => Constant!.GetConvertedValue(Function, Field, FieldConfig, Filter);
+    /// <inheritdoc/>
+    public override void WriteAsDynamicLinq(QueryFilterParserWriter writer)
+    {
+        if (FieldConfig.IsCheckForNotNull)
+        {
+            writer.AppendWithSpacing('(');
+            writer.Append(FieldConfig.FullyQualifiedModelName);
+            writer.Append(" != null &&");
+        }
 
-        /// <inheritdoc/>
-        public override void WriteToResult(QueryFilterParserResult result)
+        writer.AppendWithSpacing(FieldConfig!.FullyQualifiedModelName);
+        if (FieldConfig.FieldType == QueryFilterFieldType.String && FieldConfig.IsToUpper.HasValue)
         {
-            if (FieldConfig.IsCheckForNotNull)
-            {
-                result.Append('(');
-                result.FilterBuilder.Append(FieldConfig.Model);
-                result.FilterBuilder.Append(" != null &&");
-            }
-
-            result.Append(FieldConfig!.Model);
-            if (FieldConfig.IsTypeString && FieldConfig.IsToUpper)
-                result.FilterBuilder.Append(".ToUpper()");
-
-            result.FilterBuilder.Append('.');
-            result.FilterBuilder.Append(Function.ToLinq(Filter));
-            result.FilterBuilder.Append('(');
-            result.AppendValue(Constant.GetConvertedValue(Function, Field, FieldConfig, Filter));
-            result.FilterBuilder.Append(')');
-
-            if (FieldConfig.IsCheckForNotNull)
-                result.FilterBuilder.Append(')');
+            if (FieldConfig.IsToUpper.Value)
+                writer.Append(".ToUpper()");
+            else
+                writer.Append(".ToLower()");
         }
+
+        writer.Append('.');
+        writer.Append(Function.ToLinq(Filter));
+        writer.Append('(');
+        writer.AppendValue(Constant.GetConvertedValue(Function, Field, FieldConfig, Filter));
+        writer.Append(')');
+
+        if (FieldConfig.IsCheckForNotNull)
+            writer.Append(')');
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterToken.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterToken.cs
index 1b4b03f4..eabb41de 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterToken.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterToken.cs
@@ -1,120 +1,119 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-using System;
-
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Represents a <see cref="QueryFilterParser"/> token.
+/// </summary>
+/// <param name="kind">The token kind.</param>
+/// <param name="index">The token index.</param>
+/// <param name="length">The token length.</param>
+public readonly struct QueryFilterToken(QueryFilterTokenKind kind, int index, int length)
 {
     /// <summary>
-    /// Represents a <see cref="QueryFilterParser"/> token.
+    /// Gets an unspecified <see cref="QueryFilterToken"/>.
     /// </summary>
-    /// <param name="kind">The token kind.</param>
-    /// <param name="index">The token index.</param>
-    /// <param name="length">The token length.</param>
-    public readonly struct QueryFilterToken(QueryFilterTokenKind kind, int index, int length)
-    {
-        /// <summary>
-        /// Gets an unspecified <see cref="QueryFilterToken"/>.
-        /// </summary>
-        public static QueryFilterToken Unspecified { get; } = new QueryFilterToken(QueryFilterTokenKind.Unspecified, 0, 0);
+    public static QueryFilterToken Unspecified { get; } = new QueryFilterToken(QueryFilterTokenKind.Unspecified, 0, 0);
 
-        /// <summary>
-        /// Gets the token kind.
-        /// </summary>
-        public QueryFilterTokenKind Kind { get; } = kind;
+    /// <summary>
+    /// Gets the token kind.
+    /// </summary>
+    public QueryFilterTokenKind Kind { get; } = kind;
 
-        /// <summary>
-        /// Gets the token start position.
-        /// </summary>
-        public int Index { get; } = index;
+    /// <summary>
+    /// Gets the token start position.
+    /// </summary>
+    public int Index { get; } = index;
+
+    /// <summary>
+    /// Gets the token length.
+    /// </summary>
+    public int Length { get; } = length;
 
-        /// <summary>
-        /// Gets the token length.
-        /// </summary>
-        public int Length { get; } = length;
+    /// <summary>
+    /// Gets the raw token from the <paramref name="filter"/>.
+    /// </summary>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The raw token.</returns>
+    public readonly ReadOnlySpan<char> GetRawToken(string filter) => filter.ThrowIfNull().AsSpan(Index, Length);
 
-        /// <summary>
-        /// Gets the raw token from the <paramref name="filter"/>.
-        /// </summary>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The raw token.</returns>
-        public readonly ReadOnlySpan<char> GetRawToken(string filter) => filter.ThrowIfNull(nameof(filter)).AsSpan(Index, Length);
+    /// <summary>
+    /// Gets the value from the token removing leading and trailing quotes, and replacing all escaped quotes where applicable.
+    /// </summary>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The value token.</returns>
+    public readonly string GetValueToken(string filter)
+    {
+        var raw = GetRawToken(filter);
+        return raw.Length >= 2 && raw[0] == '\'' && raw[^1] == '\'' ? raw[1..^1].ToString().Replace("''", "'") : raw.ToString();
+    }
 
-        /// <summary>
-        /// Gets the value from the token removing leading and trailing quotes, and replacing all escaped quotes where applicable.
-        /// </summary>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The value token.</returns>
-        public readonly string GetValueToken(string filter)
+    /// <summary>
+    /// Performs a <see cref="GetValueToken"/> and converts using the <paramref name="config">configured</paramref> <see cref="QueryFilterFieldConfigBase.ConvertToValue(QueryFilterToken, QueryFilterToken, string)"/>.
+    /// </summary>
+    /// <param name="operation">The operation <see cref="QueryFilterToken"/> being performed on the <paramref name="field"/>.</param>
+    /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
+    /// <param name="config">The <see cref="QueryFilterFieldConfigBase"/>.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The converted value.</returns>
+    public readonly object GetConvertedValue(QueryFilterToken operation, QueryFilterToken field, IQueryFilterFieldConfig config, string filter)
+    {
+        if (Kind != QueryFilterTokenKind.Value && Kind != QueryFilterTokenKind.Literal)
+            throw new InvalidOperationException($"A {nameof(GetConvertedValue)} for a token with a {nameof(Kind)} of '{Kind}' is not supported.");
+
+        try
         {
-            var raw = GetRawToken(filter);
-            return raw.Length >= 2 && raw[0] == '\'' && raw[^1] == '\'' ? raw[1..^1].ToString().Replace("''", "'") : raw.ToString();
+            return config.ConvertToValue(operation, this, filter) ?? throw new InvalidOperationException($"Field '{field.GetRawToken(filter)}' has a value '{GetValueToken(filter)}' which has been converted to null.");
         }
-
-        /// <summary>
-        /// Performs a <see cref="GetValueToken"/> and converts using the <paramref name="config">configured</paramref> <see cref="QueryFilterFieldConfigBase.ConvertToValue(QueryFilterToken, QueryFilterToken, string)"/>.
-        /// </summary>
-        /// <param name="operation">The operation <see cref="QueryFilterToken"/> being performed on the <paramref name="field"/>.</param>
-        /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
-        /// <param name="config">The <see cref="QueryFilterFieldConfigBase"/>.</param>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The converted value.</returns>
-        public readonly object GetConvertedValue(QueryFilterToken operation, QueryFilterToken field, IQueryFilterFieldConfig config, string filter)
+        catch (QueryFilterParserException)
         {
-            if (Kind != QueryFilterTokenKind.Value && Kind != QueryFilterTokenKind.Literal)
-                throw new InvalidOperationException($"A {nameof(GetConvertedValue)} for a token with a {nameof(Kind)} of '{Kind}' is not supported.");
-
-            try
-            {
-                return config.ConvertToValue(operation, this, filter) ?? throw new InvalidOperationException($"Field '{field.GetRawToken(filter).ToString()}' has a value '{GetValueToken(filter)}' which has been converted to null.");
-            }
-            catch (QueryFilterParserException)
-            {
-                throw;
-            }
-            catch (Exception ex) when (ex is FormatException || ex is InvalidCastException || ex is ValidationException)
-            {
-                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' with value '{GetValueToken(filter)}' is invalid: {ex.Message}");
-            }
-            catch (Exception)
-            {
-                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' has a value '{GetValueToken(filter)}' that is not a valid {config.Type.Name}.");
-            }
+            throw;
         }
-
-        /// <summary>
-        /// Clones and updates the token with the specified <paramref name="kind"/>.
-        /// </summary>
-        /// <param name="kind">The overridding <see cref="QueryFilterTokenKind"/>.</param>
-        /// <returns>The new <see cref="QueryFilterToken"/>.</returns>
-        public readonly QueryFilterToken CloneAs(QueryFilterTokenKind kind) => new(kind, Index, Length);
-
-        /// <summary>
-        /// Converts the token to the dynamic LINQ equivalent.
-        /// </summary>
-        /// <param name="filter">The originating filter.</param>
-        /// <returns>The dynamic LINQ expression.</returns>
-        public readonly string ToLinq(string filter) => Kind switch
+        catch (ValidationException vex)
+        {
+            throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' with value '{GetValueToken(filter)}' is invalid: {vex.Message}");
+        }
+        catch (FormatException fex)
+        {
+            throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' has a value '{GetValueToken(filter)}' that is not a valid {config.Type.Name}: {fex.Message}");
+        }
+        catch (Exception)
         {
-            QueryFilterTokenKind.Field => GetRawToken(filter).ToString(),
-            QueryFilterTokenKind.True => "true",
-            QueryFilterTokenKind.False => "false",
-            QueryFilterTokenKind.Null => "null",
-            QueryFilterTokenKind.And => "&&",
-            QueryFilterTokenKind.Or => "||",
-            QueryFilterTokenKind.Not => "!",
-            QueryFilterTokenKind.Equal => "==",
-            QueryFilterTokenKind.NotEqual => "!=",
-            QueryFilterTokenKind.GreaterThan => ">",
-            QueryFilterTokenKind.GreaterThanOrEqual => ">=",
-            QueryFilterTokenKind.LessThan => "<",
-            QueryFilterTokenKind.LessThanOrEqual => "<=",
-            QueryFilterTokenKind.In => "in",
-            QueryFilterTokenKind.OpenParenthesis => "(",
-            QueryFilterTokenKind.CloseParenthesis => ")",
-            QueryFilterTokenKind.StartsWith => nameof(QueryFilterTokenKind.StartsWith),
-            QueryFilterTokenKind.EndsWith => nameof(QueryFilterTokenKind.EndsWith),
-            QueryFilterTokenKind.Contains => nameof(QueryFilterTokenKind.Contains),
-            _ => throw new InvalidOperationException($"A {nameof(ToLinq)} for a token with a {nameof(Kind)} of '{Kind}' is not supported."),
-        };
+            throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' has a value '{GetValueToken(filter)}' that is not a valid {config.Type.Name}.");
+        }
     }
+
+    /// <summary>
+    /// Clones and updates the token with the specified <paramref name="kind"/>.
+    /// </summary>
+    /// <param name="kind">The overriding <see cref="QueryFilterTokenKind"/>.</param>
+    /// <returns>The new <see cref="QueryFilterToken"/>.</returns>
+    public readonly QueryFilterToken CloneAs(QueryFilterTokenKind kind) => new(kind, Index, Length);
+
+    /// <summary>
+    /// Converts the token to the dynamic LINQ equivalent.
+    /// </summary>
+    /// <param name="filter">The originating filter.</param>
+    /// <returns>The dynamic LINQ expression.</returns>
+    public readonly string ToLinq(string filter) => Kind switch
+    {
+        QueryFilterTokenKind.Field => GetRawToken(filter).ToString(),
+        QueryFilterTokenKind.True => "true",
+        QueryFilterTokenKind.False => "false",
+        QueryFilterTokenKind.Null => "null",
+        QueryFilterTokenKind.And => "&&",
+        QueryFilterTokenKind.Or => "||",
+        QueryFilterTokenKind.Not => "!",
+        QueryFilterTokenKind.Equal => "==",
+        QueryFilterTokenKind.NotEqual => "!=",
+        QueryFilterTokenKind.GreaterThan => ">",
+        QueryFilterTokenKind.GreaterThanOrEqual => ">=",
+        QueryFilterTokenKind.LessThan => "<",
+        QueryFilterTokenKind.LessThanOrEqual => "<=",
+        QueryFilterTokenKind.In => "in",
+        QueryFilterTokenKind.OpenParenthesis => "(",
+        QueryFilterTokenKind.CloseParenthesis => ")",
+        QueryFilterTokenKind.StartsWith => nameof(QueryFilterTokenKind.StartsWith),
+        QueryFilterTokenKind.EndsWith => nameof(QueryFilterTokenKind.EndsWith),
+        QueryFilterTokenKind.Contains => nameof(QueryFilterTokenKind.Contains),
+        _ => throw new InvalidOperationException($"A {nameof(ToLinq)} for a token with a {nameof(Kind)} of '{Kind}' is not supported."),
+    };
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/Expressions/QueryFilterTokenKind.cs b/src/CoreEx.Data/Querying/Expressions/QueryFilterTokenKind.cs
index d0852bbf..93b5e43e 100644
--- a/src/CoreEx.Data/Querying/Expressions/QueryFilterTokenKind.cs
+++ b/src/CoreEx.Data/Querying/Expressions/QueryFilterTokenKind.cs
@@ -1,163 +1,158 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying.Expressions;
 
-using System;
-
-namespace CoreEx.Data.Querying.Expressions
+/// <summary>
+/// Provides the <see cref="QueryFilterToken"/> kind.
+/// </summary>
+[Flags]
+public enum QueryFilterTokenKind
 {
     /// <summary>
-    /// Provides the <see cref="QueryFilterToken"/> kind.
-    /// </summary>
-    [Flags]
-    public enum QueryFilterTokenKind
-    {
-        /// <summary>
-        /// An unspecified/undetermined token.
-        /// </summary>
-        Unspecified = 1,
-
-        /// <summary>
-        /// The field token.
-        /// </summary>
-        Field = 2,
-
-        /// <summary>
-        /// The equal operator token.
-        /// </summary>
-        Equal = 4,
-
-        /// <summary>
-        /// The not equal operator token.
-        /// </summary>
-        NotEqual = 8,
-
-        /// <summary>
-        /// The less than operator token.
-        /// </summary>
-        LessThan = 16,
-
-        /// <summary>
-        /// The less than or equal operator token.
-        /// </summary>
-        LessThanOrEqual = 32,
-
-        /// <summary>
-        /// The greater than or equal operator token.
-        /// </summary>
-        GreaterThanOrEqual = 64,
-
-        /// <summary>
-        /// The greater than operator token.
-        /// </summary>
-        GreaterThan = 128,
-
-        /// <summary>
-        /// The logical IN operator token.
-        /// </summary>
-        In = 256,
-
-        /// <summary>
-        /// The value token.
-        /// </summary>
-        Value = 512,
-
-        /// <summary>
-        /// The string literal token.
-        /// </summary>
-        Literal = 1024,
-
-        /// <summary>
-        /// The <see langword="true"/> token.
-        /// </summary>
-        True = 2048,
-
-        /// <summary>
-        /// The <see langword="false"/> token.
-        /// </summary>
-        False = 4096,
-
-        /// <summary>
-        /// The <see langword="null"/> token.
-        /// </summary>
-        Null = 8192,
-
-        /// <summary>
-        /// The logical AND operator token.
-        /// </summary>
-        And = 16384,
-
-        /// <summary>
-        /// The logical OR operator token.
-        /// </summary>
-        Or = 32768,
-
-        /// <summary>
-        /// The open parenthesis token.
-        /// </summary>
-        OpenParenthesis = 65536,
-
-        /// <summary>
-        /// The close parenthesis token.
-        /// </summary>
-        CloseParenthesis = 131072,
-
-        /// <summary>
-        /// The comma token.
-        /// </summary>
-        Comma = 262144,
-
-        /// <summary>
-        /// The starts with token.
-        /// </summary>
-        StartsWith = 524288,
-
-        /// <summary>
-        /// The contains token.
-        /// </summary>
-        Contains = 1048576,
-
-        /// <summary>
-        /// The ends with token.
-        /// </summary>
-        EndsWith = 2097152,
-
-        /// <summary>
-        /// The logical NOT operator token.
-        /// </summary>
-        Not = 4194304,
-
-        /// <summary>
-        /// An expression operator token.
-        /// </summary>
-        ComparisonOperators = Equal | NotEqual | GreaterThan | GreaterThanOrEqual | LessThan | LessThanOrEqual | In,
-
-        /// <summary>
-        /// An expression equality operator token.
-        /// </summary>
-        EqualityOperators = Equal | NotEqual | In,
-
-        /// <summary>
-        /// An expression constant token.
-        /// </summary>
-        Constant = Value | Literal | True | False | Null,
-
-        /// <summary>
-        /// A logical operator token.
-        /// </summary>
-        Logical = And | Or,
-
-        /// <summary>
-        /// A general syntax token.
-        /// </summary>
-        Syntax = OpenParenthesis | CloseParenthesis | Comma,
-
-        /// <summary>
-        /// A string oriented function-based operator.
-        /// </summary>
-        StringFunctions = StartsWith | EndsWith | Contains,
-
-        /// <summary>
-        /// All string oriented operators.
-        /// </summary>
-        AllStringOperators = ComparisonOperators | StringFunctions
-    }
+    /// An unspecified/undetermined token.
+    /// </summary>
+    Unspecified = 1,
+
+    /// <summary>
+    /// The field token.
+    /// </summary>
+    Field = 2,
+
+    /// <summary>
+    /// The equal operator token.
+    /// </summary>
+    Equal = 4,
+
+    /// <summary>
+    /// The not equal operator token.
+    /// </summary>
+    NotEqual = 8,
+
+    /// <summary>
+    /// The less than operator token.
+    /// </summary>
+    LessThan = 16,
+
+    /// <summary>
+    /// The less than or equal operator token.
+    /// </summary>
+    LessThanOrEqual = 32,
+
+    /// <summary>
+    /// The greater than or equal operator token.
+    /// </summary>
+    GreaterThanOrEqual = 64,
+
+    /// <summary>
+    /// The greater than operator token.
+    /// </summary>
+    GreaterThan = 128,
+
+    /// <summary>
+    /// The logical IN operator token.
+    /// </summary>
+    In = 256,
+
+    /// <summary>
+    /// The value token.
+    /// </summary>
+    Value = 512,
+
+    /// <summary>
+    /// The string literal token.
+    /// </summary>
+    Literal = 1024,
+
+    /// <summary>
+    /// The <see langword="true"/> token.
+    /// </summary>
+    True = 2048,
+
+    /// <summary>
+    /// The <see langword="false"/> token.
+    /// </summary>
+    False = 4096,
+
+    /// <summary>
+    /// The <see langword="null"/> token.
+    /// </summary>
+    Null = 8192,
+
+    /// <summary>
+    /// The logical AND operator token.
+    /// </summary>
+    And = 16384,
+
+    /// <summary>
+    /// The logical OR operator token.
+    /// </summary>
+    Or = 32768,
+
+    /// <summary>
+    /// The open parenthesis token.
+    /// </summary>
+    OpenParenthesis = 65536,
+
+    /// <summary>
+    /// The close parenthesis token.
+    /// </summary>
+    CloseParenthesis = 131072,
+
+    /// <summary>
+    /// The comma token.
+    /// </summary>
+    Comma = 262144,
+
+    /// <summary>
+    /// The starts with token.
+    /// </summary>
+    StartsWith = 524288,
+
+    /// <summary>
+    /// The contains token.
+    /// </summary>
+    Contains = 1048576,
+
+    /// <summary>
+    /// The ends with token.
+    /// </summary>
+    EndsWith = 2097152,
+
+    /// <summary>
+    /// The logical NOT operator token.
+    /// </summary>
+    Not = 4194304,
+
+    /// <summary>
+    /// An expression operator token.
+    /// </summary>
+    ComparisonOperators = Equal | NotEqual | GreaterThan | GreaterThanOrEqual | LessThan | LessThanOrEqual | In,
+
+    /// <summary>
+    /// An expression equality operator token.
+    /// </summary>
+    EqualityOperators = Equal | NotEqual | In,
+
+    /// <summary>
+    /// An expression constant token.
+    /// </summary>
+    Constant = Value | Literal | True | False | Null,
+
+    /// <summary>
+    /// A logical operator token.
+    /// </summary>
+    Logical = And | Or,
+
+    /// <summary>
+    /// A general syntax token.
+    /// </summary>
+    Syntax = OpenParenthesis | CloseParenthesis | Comma,
+
+    /// <summary>
+    /// A string-specific oriented function-based operator.
+    /// </summary>
+    StringFunctions = StartsWith | EndsWith | Contains,
+
+    /// <summary>
+    /// All string oriented operators.
+    /// </summary>
+    AllStringOperators = ComparisonOperators | StringFunctions
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/IQueryFilterFieldConfig.cs b/src/CoreEx.Data/Querying/IQueryFilterFieldConfig.cs
index 90a5030a..7dc874f1 100644
--- a/src/CoreEx.Data/Querying/IQueryFilterFieldConfig.cs
+++ b/src/CoreEx.Data/Querying/IQueryFilterFieldConfig.cs
@@ -1,108 +1,119 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Data.Querying.Expressions;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Text;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents the base <see cref="QueryFilterParser"/> field configuration.
+/// </summary>
+public interface IQueryFilterFieldConfig
 {
     /// <summary>
-    /// Represents the base <see cref="QueryFilterParser"/> field configuration.
-    /// </summary>
-    public interface IQueryFilterFieldConfig
-    {
-        /// <summary>
-        /// Gets the owning <see cref="QueryFilterParser"/>.
-        /// </summary>
-        QueryFilterParser Parser { get; }
-
-        /// <summary>
-        /// Gets the field type.
-        /// </summary>
-        Type Type { get; }
-
-        /// <summary>
-        /// Indicates whether the field type is a <see cref="string"/>.
-        /// </summary>
-        bool IsTypeString { get; }
-
-        /// <summary>
-        /// Indicates whether the field type is a <see cref="bool"/>.
-        /// </summary>
-        bool IsTypeBoolean { get; }
-
-        /// <summary>
-        /// Gets the field name.
-        /// </summary>
-        string Field { get; }
-
-        /// <summary>
-        /// Gets or sets model name to be used for the dynamic LINQ expression.
-        /// </summary>
-        /// <remarks>Defaults to the <see cref="Field"/> name.</remarks>
-        string? Model { get; }
-
-        /// <summary>
-        /// Gets the supported kinds.
-        /// </summary>
-        /// <remarks>Where <see cref="IsTypeBoolean"/> defaults to both <see cref="QueryFilterOperator.Equal"/> and <see cref="QueryFilterOperator.NotEqual"/> only; otherwise, defaults to <see cref="QueryFilterOperator.ComparisonOperators"/>.</remarks>
-        QueryFilterOperator Operators { get; }
-
-        /// <summary>
-        /// Indicates whether the comparison should ignore case or not; will use <see cref="string.ToUpper()"/> when selected for comparisons.
-        /// </summary>
-        /// <remarks>This is only applicable where the <see cref="IsTypeString"/>.</remarks>
-        bool IsToUpper { get; }
-
-        /// <summary>
-        /// Indicates whether the field can be <see langword="null"/> or not.
-        /// </summary>
-        bool IsNullable { get; }
-
-        /// <summary>
-        /// Indicates whether a not-<see langword="null"/> check should also be performed before the comparion occurs.
-        /// </summary>
-        bool IsCheckForNotNull { get; }
-
-        /// <summary>
-        /// Gets the default LINQ <see cref="QueryStatement"/> function to be used where no filtering is specified.
-        /// </summary>
-        Func<QueryStatement>? DefaultStatement { get; }
-
-        /// <summary>
-        /// Gets the additional help text.
-        /// </summary>
-        string? HelpText { get; }
-
-        /// <summary>
-        /// Converts <paramref name="field"/> to the destination type using the <see cref="Converter"/> configurations where specified.
-        /// </summary>
-        /// <param name="operation">The operation <see cref="QueryFilterTokenKind"/> being performed on the <paramref name="field"/>.</param>
-        /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The converted value.</returns>
-        /// <remarks></remarks>
-        object? ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter);
-
-        /// <summary>
-        /// Validate the <paramref name="constant"/> token against the field configuration.
-        /// </summary>
-        /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
-        /// <param name="constant">The constant <see cref="QueryFilterToken"/>.</param>
-        /// <param name="filter">The query filter.</param>
-        void ValidateConstant(QueryFilterToken field, QueryFilterToken constant, string filter);
-
-        /// <summary>
-        /// Gets the <see cref="QueryFilterFieldResultWriter"/>.
-        /// </summary>
-        QueryFilterFieldResultWriter? ResultWriter { get; }
-
-        /// <summary>
-        /// Appends the field configuration to the <paramref name="stringBuilder"/>.
-        /// </summary>
-        /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
-        /// <returns>The <paramref name="stringBuilder"/>.</returns>
-        StringBuilder AppendToString(StringBuilder stringBuilder);
-    }
+    /// Gets the owning <see cref="QueryFilterParser"/>.
+    /// </summary>
+    QueryFilterParser Parser { get; }
+
+    /// <summary>
+    /// Gets the field type.
+    /// </summary>
+    Type Type { get; }
+
+    /// <summary>
+    /// Gets the <see cref="QueryFilterFieldType"/>.
+    /// </summary>
+    QueryFilterFieldType FieldType { get; }
+
+    /// <summary>
+    /// Gets the field name.
+    /// </summary>
+    string Field { get; }
+
+    /// <summary>
+    /// Gets the model name to be used for the dynamic LINQ expression.
+    /// </summary>
+    /// <remarks>Defaults to the <see cref="Field"/> name.</remarks>
+    string Model { get; }
+
+    /// <summary>
+    /// Gets the optional prefix to be used where referencing the underlying <see cref="IQueryable{T}"/> model.
+    /// </summary>
+    /// <remarks>This will default from <see cref="QueryFilterParser.DefaultModelPrefix"/> when instantiated.</remarks>
+    string? ModelPrefix { get; }
+
+    /// <summary>
+    /// Gets the fully-qualified <see cref="Model"/> name (including any <see cref="ModelPrefix"/> where specified).
+    /// </summary>
+    string FullyQualifiedModelName { get; }
+
+    /// <summary>
+    /// Gets the supported kinds.
+    /// </summary>
+    QueryFilterOperator Operators { get; }
+
+    /// <summary>
+    /// Indicates whether the comparison should ignore case or not; will use <see cref="string.ToUpper()"/> (where <see langword="true"/>) or <see cref="string.ToLower()"/> (where <see langword="false"/>) when selected for comparisons.
+    /// </summary>
+    bool? IsToUpper { get; }
+
+    /// <summary>
+    /// Indicates whether the field can be <see langword="null"/> or not.
+    /// </summary>
+    bool IsNullable { get; }
+
+    /// <summary>
+    /// Indicates whether a not-<see langword="null"/> check should also be performed before the comparion occurs.
+    /// </summary>
+    bool IsCheckForNotNull { get; }
+
+    /// <summary>
+    /// Gets the default LINQ <see cref="QueryStatement"/> function to be used where no filtering is specified.
+    /// </summary>
+    Func<QueryStatement>? DefaultStatement { get; }
+
+    /// <summary>
+    /// Gets the <see cref="QueryFilterSchemaType"/>.
+    /// </summary>
+    QueryFilterSchemaType SchemaType { get; }
+
+    /// <summary>
+    /// Gets the corresponding format for the <see cref="SchemaType"/> (where applicable).
+    /// </summary>
+    /// <remarks></remarks>
+    string? SchemaFormat { get; }
+
+    /// <summary>
+    /// Gets the additional help text.
+    /// </summary>
+    string? HelpText { get; }
+
+    /// <summary>
+    /// Converts <paramref name="field"/> to the underlying type.
+    /// </summary>
+    /// <param name="operation">The operation <see cref="QueryFilterTokenKind"/> being performed on the <paramref name="field"/>.</param>
+    /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The converted value.</returns>
+    object? ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter);
+
+    /// <summary>
+    /// Validate the <paramref name="constant"/> token against the field configuration.
+    /// </summary>
+    /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
+    /// <param name="constant">The constant <see cref="QueryFilterToken"/>.</param>
+    /// <param name="filter">The query filter.</param>
+    void ValidateConstant(QueryFilterToken field, QueryFilterToken constant, string filter);
+
+    /// <summary>
+    /// Gets the <see cref="QueryFilterFieldResultWriter"/>.
+    /// </summary>
+    QueryFilterFieldResultWriter? ResultWriter { get; }
+
+    /// <summary>
+    /// Appends the field configuration to the <paramref name="stringBuilder"/>.
+    /// </summary>
+    /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
+    /// <returns>The <paramref name="stringBuilder"/>.</returns>
+    StringBuilder AppendToString(StringBuilder stringBuilder);
+
+    /// <summary>
+    /// Returns a dictionary representation of the schema configuration.
+    /// </summary>
+    IDictionary<string, object?> ToSchemaDictionary();
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/IQueryParseError.cs b/src/CoreEx.Data/Querying/IQueryParseError.cs
new file mode 100644
index 00000000..8df35afb
--- /dev/null
+++ b/src/CoreEx.Data/Querying/IQueryParseError.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Represents an <see cref="Error"/> that occurred during parsing.
+/// </summary>
+internal interface IQueryParseError
+{
+    /// <summary>
+    /// Indicates whether there was an <see cref="Error"/> during parsing.
+    /// </summary>
+    bool HasError { get; }
+
+    /// <summary>
+    /// Gets the error represented as an <see cref="ExtendedException"/> that occurred during parsing, if any.
+    /// </summary>
+    ExtendedException? Error { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryArgsConfig.cs b/src/CoreEx.Data/Querying/QueryArgsConfig.cs
index 71c13c1c..3dc77084 100644
--- a/src/CoreEx.Data/Querying/QueryArgsConfig.cs
+++ b/src/CoreEx.Data/Querying/QueryArgsConfig.cs
@@ -1,105 +1,137 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Provides the ODATA-esque dynamic LINQ queries <see cref="QueryArgs"/> execution configuration.
+/// </summary>
+public class QueryArgsConfig
 {
+    private QueryFilterParser? _filterParser;
+    private QueryOrderByParser? _orderByParser;
+
+    /// <summary>
+    /// Creates a new <see cref="QueryArgsConfig"/>.
+    /// </summary>
+    /// <returns>The <see cref="QueryArgsConfig"/>.</returns>
+    public static QueryArgsConfig Create() => new();
+
+    /// <summary>
+    /// Gets the <see cref="System.Linq.Dynamic.Core.ParsingConfig"/>.
+    /// </summary>
+    public ParsingConfig ParsingConfig { get; protected set; } = new ParsingConfig();
+
+    /// <summary>
+    /// Gets the <see cref="QueryFilterParser"/>.
+    /// </summary>
+    public QueryFilterParser FilterParser => _filterParser ??= new QueryFilterParser(this);
+
+    /// <summary>
+    /// Indicates whether there is a <see cref="FilterParser"/>.
+    /// </summary>
+    public bool HasFilterParser => _filterParser is not null;
+
+    /// <summary>
+    /// Gets the <see cref="QueryOrderByParser"/>.
+    /// </summary>
+    public QueryOrderByParser OrderByParser => _orderByParser ??= new QueryOrderByParser(this);
+
+    /// <summary>
+    /// Indicates whether there is an <see cref="OrderByParser"/>.
+    /// </summary>
+    public bool HasOrderByParser => _orderByParser is not null;
+
+    /// <summary>
+    /// Enables fluent-style method-chaining configuration for the <see cref="FilterParser"/>.
+    /// </summary>
+    /// <param name="filter">The <see cref="FilterParser"/>.</param>
+    /// <returns>The <see cref="QueryArgsConfig"/> instance to support fluent-style method-chaining.</returns>
+    public QueryArgsConfig WithFilter(Action<QueryFilterParser> filter)
+    {
+        filter.ThrowIfNull()(FilterParser);
+        return this;
+    }
+
+    /// <summary>
+    /// Enables fluent-style method-chaining configuration for the <see cref="OrderByParser"/>.
+    /// </summary>
+    /// <param name="orderBy">The <see cref="OrderByParser"/>.</param>
+    /// <returns>The <see cref="QueryArgsConfig"/> instance to support fluent-style method-chaining.</returns>
+    public QueryArgsConfig WithOrderBy(Action<QueryOrderByParser> orderBy)
+    {
+        orderBy.ThrowIfNull()(OrderByParser);
+        return this;
+    }
+
     /// <summary>
-    /// Provides the <see cref="QueryArgs"/> configuration.
+    /// Parses and converts the <see cref="QueryArgs.Filter"/> and <see cref="QueryArgs.OrderBy"/> to dynamic LINQ.
     /// </summary>
-    public class QueryArgsConfig
+    /// <param name="queryArgs">The <see cref="QueryArgs"/>.</param>
+    /// <returns>The <see cref="QueryArgsParseResult"/>.</returns>
+    public QueryArgsParseResult Parse(QueryArgs? queryArgs)
     {
-        private QueryFilterParser? _filterParser;
-        private QueryOrderByParser? _orderByParser;
-
-        /// <summary>
-        /// Creates a new <see cref="QueryArgsConfig"/>.
-        /// </summary>
-        /// <returns>The <see cref="QueryArgsConfig"/>.</returns>
-        public static QueryArgsConfig Create() => new();
-
-        /// <summary>
-        /// Gets the <see cref="QueryFilterParser"/>.
-        /// </summary>
-        public QueryFilterParser FilterParser => _filterParser ??= new QueryFilterParser(this);
-
-        /// <summary>
-        /// Indicates whether there is a <see cref="FilterParser"/>.
-        /// </summary>
-        public bool HasFilterParser => _filterParser is not null;
-
-        /// <summary>
-        /// Gets the <see cref="QueryOrderByParser"/>.
-        /// </summary>
-        public QueryOrderByParser OrderByParser => _orderByParser ??= new QueryOrderByParser(this);
-
-        /// <summary>
-        /// Indicates whether there is an <see cref="OrderByParser"/>.
-        /// </summary>
-        public bool HasOrderByParser => _orderByParser is not null;
-
-        /// <summary>
-        /// Enables fluent-style method-chaining configuration for the <see cref="FilterParser"/>.
-        /// </summary>
-        /// <param name="filter">The <see cref="FilterParser"/>.</param>
-        /// <returns>The <see cref="QueryArgsConfig"/> instance to support fluent-style method-chaining.</returns>
-        public QueryArgsConfig WithFilter(Action<QueryFilterParser> filter)
+        var result = new QueryArgsParseResult(this);
+        if (queryArgs is null)
+            return result;
+
+        QueryFilterParserResult? filterParserResult = null;
+        if (!string.IsNullOrEmpty(queryArgs.Filter))
         {
-            filter.ThrowIfNull(nameof(filter))(FilterParser);
-            return this;
+            if (HasFilterParser)
+            {
+                filterParserResult = FilterParser.Parse(queryArgs.Filter);
+                if (filterParserResult.HasError)
+                    return result.Adjust(x => x.Error = filterParserResult.Error);
+            }
+            else
+                return result.Adjust(x => x.Error = new QueryFilterParserException("Filter statement is not currently supported."));
         }
 
-        /// <summary>
-        /// Enables fluent-style method-chaining configuration for the <see cref="OrderByParser"/>.
-        /// </summary>
-        /// <param name="orderBy">The <see cref="OrderByParser"/>.</param>
-        /// <returns>The <see cref="QueryArgsConfig"/> instance to support fluent-style method-chaining.</returns>
-        public QueryArgsConfig WithOrderBy(Action<QueryOrderByParser> orderBy)
+        QueryOrderByParserResult? orderByParserResult = null;
+        if (HasOrderByParser)
         {
-            orderBy.ThrowIfNull(nameof(orderBy))(OrderByParser);
-            return this;
+            orderByParserResult = OrderByParser.Parse(queryArgs.OrderBy);
+            if (orderByParserResult.HasError)
+                return result.Adjust(x => x.Error = orderByParserResult.Error);
         }
+        else if (!string.IsNullOrEmpty(queryArgs.OrderBy))
+            return result.Adjust(x => x.Error = new QueryOrderByParserException("OrderBy statement is not currently supported."));
+            
+        return new QueryArgsParseResult(this, filterParserResult, orderByParserResult);
+    }
 
-        /// <summary>
-        /// Parses and converst the <see cref="QueryArgs.Filter"/> and <see cref="QueryArgs.OrderBy"/> to dynamic LINQ.
-        /// </summary>
-        /// <param name="queryArgs">The <see cref="QueryArgs"/>.</param>
-        /// <returns>The <see cref="QueryArgsParseResult"/>.</returns>
-        public Result<QueryArgsParseResult> Parse(QueryArgs? queryArgs)
-        {
-            if (queryArgs is null)
-                return new QueryArgsParseResult();
+    /// <summary>
+    /// Executes the underlying <see cref="OnWriteNullFilterExpression(QueryFilterParserWriter, IQueryFilterFieldConfig, QueryFilterTokenKind)"/> to write the <see langword="null"/> dynamic LINQ equality expression.
+    /// </summary>
+    /// <param name="writer">The <see cref="QueryFilterParserWriter"/></param>
+    /// <param name="fieldConfig">The <see cref="IQueryFilterFieldConfig"/>.</param>
+    /// <param name="filterOperator">The <see cref="QueryFilterTokenKind"/> (either <see cref="QueryFilterTokenKind.Equal"/> or <see cref="QueryFilterTokenKind.NotEqual"/>).</param>
+    internal void WriteNullFilterExpression(QueryFilterParserWriter writer, IQueryFilterFieldConfig fieldConfig, QueryFilterTokenKind filterOperator) => OnWriteNullFilterExpression(writer, fieldConfig, filterOperator);
+
+    /// <summary>
+    /// Provides an opportunity to override the <see langword="null"/> dynamic LINQ equality expression write. For some data sources, such as NoSQL, the existence of the field (has a value) and whether it is <see langword="null"/> 
+    /// are two different operations and may be data source specific. This method allows for this logic to be overridden to write the filter expression result that is data source specific.
+    /// </summary>
+    /// <param name="writer">The <see cref="QueryFilterParserWriter"/></param>
+    /// <param name="fieldConfig">The <see cref="IQueryFilterFieldConfig"/>.</param>
+    /// <param name="filterOperator">The <see cref="QueryFilterOperator"/> (either <see cref="QueryFilterTokenKind.Equal"/> or <see cref="QueryFilterTokenKind.NotEqual"/>).</param>
+    protected virtual void OnWriteNullFilterExpression(QueryFilterParserWriter writer, IQueryFilterFieldConfig fieldConfig, QueryFilterTokenKind filterOperator)
+    {
+        writer.Append(fieldConfig.FullyQualifiedModelName);
+        writer.Append($" {(filterOperator == QueryFilterTokenKind.Equal ? "==" : "!=")} null");
+    }
 
-            Result<QueryFilterParserResult> filterParserResult = default;
-            Result<QueryOrderByParserResult> orderByParserResult = default;
+    /// <summary>
+    /// Produces the JSON schema for the configuration.
+    /// </summary>
+    /// <returns>The <see cref="JsonElement"/>.</returns>
+    public JsonElement ToJsonSchema()
+    {
+        var dict = new Dictionary<string, JsonElement>();
+        if (HasFilterParser)
+            dict["filter"] = FilterParser.ToJsonSchema();
 
-            if (!string.IsNullOrEmpty(queryArgs.Filter))
-            {
-                if (HasFilterParser)
-                {
-                    filterParserResult = FilterParser.Parse(queryArgs.Filter);
-                    if (filterParserResult.IsFailure)
-                        return filterParserResult.AsResult();
-                }
-                else
-                    return new QueryFilterParserException("Filter statement is not currently supported.");
-            }
+        if (HasOrderByParser)
+            dict["orderby"] = OrderByParser.ToJsonSchema();
 
-            if (!string.IsNullOrEmpty(queryArgs.OrderBy))
-            {
-                if (HasOrderByParser)
-                {
-                    orderByParserResult = OrderByParser.Parse(queryArgs.OrderBy);
-                    if (orderByParserResult.IsFailure)
-                        return orderByParserResult.AsResult();
-                }
-                else
-                    return new QueryOrderByParserException("OrderBy statement is not currently supported.");
-            }
-            
-            return new QueryArgsParseResult(filterParserResult, orderByParserResult);
-        }
+        return JsonSerializer.SerializeToElement(dict);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryArgsParseResult.cs b/src/CoreEx.Data/Querying/QueryArgsParseResult.cs
index 2cb0b31e..55e831d6 100644
--- a/src/CoreEx.Data/Querying/QueryArgsParseResult.cs
+++ b/src/CoreEx.Data/Querying/QueryArgsParseResult.cs
@@ -1,31 +1,55 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents the <see cref="QueryArgsConfig.Parse"/> result.
+/// </summary>
+public sealed class QueryArgsParseResult : IQueryParseError, IToResult
 {
     /// <summary>
-    /// Represents the <see cref="QueryArgsConfig.Parse"/> result.
+    /// Initializes a new instance of the <see cref="QueryArgsParseResult"/> class.
     /// </summary>
-    public sealed class QueryArgsParseResult
+    /// <param name="config">The owning <see cref="QueryArgsConfig"/>.</param>
+    /// <param name="filterResult">The <see cref="QueryFilterParserResult"/>.</param>
+    /// <param name="orderByResult">The <see cref="QueryOrderByParserResult"/>.</param>
+    internal QueryArgsParseResult(QueryArgsConfig config, QueryFilterParserResult? filterResult = null, QueryOrderByParserResult? orderByResult = null)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryArgsParseResult"/> class.
-        /// </summary>
-        /// <param name="filterResult">The <see cref="QueryFilterParserResult"/>.</param>
-        /// <param name="orderByResult">The <see cref="QueryOrderByParserResult"/>.</param>
-        internal QueryArgsParseResult(QueryFilterParserResult? filterResult = null, QueryOrderByParserResult? orderByResult = null)
-        {
-            FilterResult = filterResult;
-            OrderByResult = orderByResult;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="QueryOrderByParserResult"/>.
-        /// </summary>
-        public QueryFilterParserResult? FilterResult { get; }
-
-        /// <summary>
-        /// Gets the <see cref="QueryOrderByParserResult"/>.
-        /// </summary>
-        public QueryOrderByParserResult? OrderByResult { get; }
+        Config = config;
+        FilterResult = filterResult;
+        OrderByResult = orderByResult;
     }
+
+    /// <summary>
+    /// Gets the owning <see cref="QueryArgsConfig"/>.
+    /// </summary>
+    public QueryArgsConfig Config { get; }
+
+    /// <summary>
+    /// Gets the <see cref="QueryOrderByParserResult"/>.
+    /// </summary>
+    public QueryFilterParserResult? FilterResult { get; }
+
+    /// <summary>
+    /// Gets the <see cref="QueryOrderByParserResult"/>.
+    /// </summary>
+    public QueryOrderByParserResult? OrderByResult { get; }
+
+    /// <inheritdoc/>
+    public bool HasError => Error is not null;
+
+    /// <inheritdoc/>
+    public ExtendedException? Error { get; internal set; }
+
+    /// <summary>
+    /// Throws the <see cref="Error"/> where <see cref="HasError"/>; otherwise, does nothing.
+    /// </summary>
+    public QueryArgsParseResult ThrowOnError()
+    {
+        if (HasError)
+            throw Error!;
+
+        return this;
+    }
+
+    /// <inheritdoc/>
+    public Result ToResult() => HasError ? Result.Fail(Error!) : Result.Success;
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryExtensions.cs b/src/CoreEx.Data/Querying/QueryExtensions.cs
new file mode 100644
index 00000000..079dc7c1
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryExtensions.cs
@@ -0,0 +1,105 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Provides query-oriented extension methods.
+/// </summary>
+public static class QueryExtensions
+{
+    /// <summary>
+    /// Adds a dynamic query <see cref="QueryArgs.Filter"/> (basic dynamic <i>OData-like</i> <c>$filter</c> statement).
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
+    /// <param name="queryArgs">The <see cref="QueryArgs"/>.</param>
+    /// <returns>The query.</returns>
+    public static IQueryable<TSource> Where<TSource>(this IQueryable<TSource> source, QueryArgsConfig queryConfig, QueryArgs? queryArgs = null) => Where(source, queryConfig, queryArgs?.Filter);
+
+    /// <summary>
+    /// Adds a dynamic query <paramref name="filter"/> (basic dynamic <i>OData-like</i> <c>$filter</c> statement).
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
+    /// <param name="filter">The basic dynamic <i>OData-like</i> <c>$filter</c> statement.</param>
+    /// <returns>The query.</returns>
+    public static IQueryable<TSource> Where<TSource>(this IQueryable<TSource> source, QueryArgsConfig queryConfig, string? filter)
+    {
+        queryConfig.ThrowIfNull();
+        if (!queryConfig.HasFilterParser && !string.IsNullOrEmpty(filter))
+            throw new QueryFilterParserException("Query filter statement is not currently supported.");
+
+        if (!queryConfig.HasFilterParser)
+            return source;
+
+        var result = queryConfig.FilterParser.Parse(filter).ThrowOnError();
+        var linq = result.ToLinqString(out var args);
+        return string.IsNullOrEmpty(linq) ? source : source.Where(result.Config.ParsingConfig, linq, [.. args]);
+    }
+
+    /// <summary>
+    /// Adds a dynamic query filter (basic dynamic <i>OData-like</i> <c>$filter</c> statement).
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="result">The <see cref="QueryArgsParseResult"/> that contains the parsed dynamic <i>OData-like</i> <c>$filter</c> statement.</param>
+    /// <returns>The query.</returns>
+    public static IQueryable<TSource> Where<TSource>(this IQueryable<TSource> source, QueryArgsParseResult result)
+    {
+        result.ThrowIfNull().ThrowOnError();
+        if (result.FilterResult is null)
+            return source;
+
+        var linq = result.FilterResult.ToLinqString(out var args);
+        return string.IsNullOrEmpty(linq) ? source : source.Where(result.Config.ParsingConfig, linq, [.. args]);
+    }
+
+    /// <summary>
+    /// Adds a dynamic query <see cref="QueryArgs.OrderBy"/> (basic dynamic <i>OData-like</i> <c>$orderby</c> statement).
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
+    /// <param name="queryArgs">The <see cref="QueryArgs"/>.</param>
+    /// <returns>The query.</returns>
+    public static IQueryable<TSource> OrderBy<TSource>(this IQueryable<TSource> source, QueryArgsConfig queryConfig, QueryArgs? queryArgs = null) => OrderBy(source, queryConfig, queryArgs?.OrderBy);
+
+    /// <summary>
+    /// Adds a dynamic query <paramref name="orderby"/> (basic dynamic <i>OData-like</i> <c>$orderby</c> statement).
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
+    /// <param name="orderby">The basic dynamic <i>OData-like</i> <c>$orderby</c> statement.</param>
+    /// <returns>The query.</returns>
+    public static IQueryable<TSource> OrderBy<TSource>(this IQueryable<TSource> source, QueryArgsConfig queryConfig, string? orderby)
+    {
+        queryConfig.ThrowIfNull();
+        if (!queryConfig.HasOrderByParser && !string.IsNullOrEmpty(orderby))
+            throw new QueryOrderByParserException("OrderBy filter is not currently supported.");
+
+        if (!queryConfig.HasOrderByParser)
+            return source;
+
+        var result = queryConfig.OrderByParser.Parse(orderby).ThrowOnError();
+        var linq = result.ToLinqString();
+        return string.IsNullOrEmpty(linq) ? source : source.OrderBy(linq);
+    }
+
+    /// <summary>
+    /// Adds a dynamic query order-by (basic dynamic <i>OData-like</i> <c>$orderby</c> statement).
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="result">The <see cref="QueryArgsParseResult"/> that contains the parsed dynamic <i>OData-like</i> <c>$orderby</c> statement.</param>
+    /// <returns>The query.</returns>
+    public static IQueryable<TSource> OrderBy<TSource>(this IQueryable<TSource> source, QueryArgsParseResult result)
+    {
+        result.ThrowIfNull().ThrowOnError();
+        if (result.OrderByResult is null)
+            return source;
+
+        var linq = result.OrderByResult.ToLinqString();
+        return string.IsNullOrEmpty(linq) ? source : source.OrderBy(linq);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterEnumFieldConfigT.cs b/src/CoreEx.Data/Querying/QueryFilterEnumFieldConfigT.cs
new file mode 100644
index 00000000..0b60f015
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryFilterEnumFieldConfigT.cs
@@ -0,0 +1,76 @@
+
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Provides the <see cref="QueryFilterParser"/> <see cref="Enum"/> field configuration.
+/// </summary>
+/// <typeparam name="T">The field type.</typeparam>
+/// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
+/// <param name="field">The field name.</param>
+/// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+public class QueryFilterEnumFieldConfig<T>(QueryFilterParser parser, string field, string? model) 
+    : QueryFilterFieldConfigBase<QueryFilterEnumFieldConfig<T>>(parser, typeof(T), field, model) where T : notnull, Enum
+{
+    private Func<string, T>? _converterFunc;
+    private Func<T, object>? _valueFunc;
+
+    /// <summary>
+    /// Sets (overrides) the operator <see cref="QueryFilterFieldConfigBase.Operators"/>.
+    /// </summary>
+    /// <param name="operators">The supported <see cref="QueryFilterOperator"/>(s).</param>
+    /// <returns>The <see cref="QueryFilterEnumFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Defaults to the <see cref="QueryFilterOperator.EqualityOperators"/>.</remarks>
+    public QueryFilterEnumFieldConfig<T> WithOperators(QueryFilterOperator operators)
+    {
+        Operators = operators;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="converter"/> to convert the field value from a <see cref="string"/> to the field type <typeparamref name="T"/>.
+    /// </summary>
+    /// <param name="converter">The converter function.</param>
+    /// <returns>The <see cref="QueryFilterEnumFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="converter"/> is invoked before the <see cref="WithValue(Func{T, object}?)"/> as the resulting value is passed through to enable further conversion and/or validation where applicable.</remarks>
+    public QueryFilterEnumFieldConfig<T> WithConverter(Func<string, T>? converter)
+    {
+        _converterFunc = converter;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="value"/> function to, a) further convert the field <typeparamref name="T"/> value to the final <see cref="object"/> value that will be used in the LINQ query; and/or, b) to provide additional validation.
+    /// </summary>
+    /// <param name="value">The value function.</param>
+    /// <returns>The final <see cref="object"/> value that will be used in the LINQ query.</returns>
+    /// <remarks>This is an opportunity to further validate the query as needed. Throw a <see cref="FormatException"/> to have the exception message formatted correctly and consistently.
+    /// <para>This in invoked after the <see cref="WithConverter(Func{string, T}?)"/> has been invoked.</para></remarks>
+    public QueryFilterEnumFieldConfig<T> WithValue(Func<T, object>? value)
+    {
+        _valueFunc = value;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter)
+    {
+        T value = default!;
+        var val = field.GetValueToken(filter);
+
+        if (_converterFunc is null)
+            value = val is null ? default! : (T)Enum.Parse(typeof(T), val, true);
+        else
+            value = _converterFunc(val);
+
+        // Convert the underlying type to the final value.
+        return _valueFunc?.Invoke(value) ?? value!;
+    }
+
+    /// <inheritdoc/>
+    public override IDictionary<string, object?> ToSchemaDictionary()
+    {
+        var dict = base.ToSchemaDictionary();
+        dict["enum"] = Enum.GetNames(typeof(T));
+        return dict;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterExtensions.cs b/src/CoreEx.Data/Querying/QueryFilterExtensions.cs
deleted file mode 100644
index 7a06d7b4..00000000
--- a/src/CoreEx.Data/Querying/QueryFilterExtensions.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Data.Querying;
-using CoreEx.Entities;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-
-namespace System.Linq
-{
-    /// <summary>
-    /// Adds additional extension methods to the <see cref="IQueryable{T}"/>.
-    /// </summary>
-    public static class QueryFilterExtensions
-    {
-        /// <summary>
-        /// Adds a dynamic query filter as specified by the <paramref name="result"/> (uses the <see cref="QueryArgsParseResult.FilterResult"/> where not <see langword="null"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="result">The <see cref="QueryArgsParseResult"/>.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> Where<T>(this IQueryable<T> query, QueryArgsParseResult result)
-        {
-            result.ThrowIfNull(nameof(result));
-            if (result.FilterResult is not null)
-            {
-                var linq = result.FilterResult.ToLinqString();
-                query = string.IsNullOrEmpty(linq) ? query : query.Where(linq, [.. result.FilterResult.Args]);
-            }
-
-            return query;
-        }
-
-        /// <summary>
-        /// Adds a dynamic query filter as specified by the <paramref name="queryArgs"/> (uses the <see cref="QueryArgs.Filter"/> where not <see langword="null"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
-        /// <param name="queryArgs">The <see cref="QueryArgs"/>.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> Where<T>(this IQueryable<T> query, QueryArgsConfig queryConfig, QueryArgs? queryArgs) => query.Where(queryConfig, queryArgs?.Filter);
-
-        /// <summary>
-        /// Adds a dynamic query <paramref name="filter"/> (basic dynamic <i>OData-like</i> <c>$filter</c> statement).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
-        /// <param name="filter">The basic dynamic <i>OData-like</i> <c>$filter</c> statement.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> Where<T>(this IQueryable<T> query, QueryArgsConfig queryConfig, string? filter)
-        {
-            queryConfig.ThrowIfNull(nameof(queryConfig));
-            if (!queryConfig.HasFilterParser && !string.IsNullOrEmpty(filter))
-                throw new QueryFilterParserException("Filter statement is not currently supported.");
-
-            var result = queryConfig.FilterParser.Parse(filter).ThrowOnError();
-            var linq = result.Value.ToLinqString();
-            return string.IsNullOrEmpty(linq) ? query : query.Where(linq, [.. result.Value.Args]);
-        }
-
-        /// <summary>
-        /// Adds a dynamic query order by as specified by the <paramref name="result"/> (uses the <see cref="QueryArgsParseResult.OrderByResult"/> where not <see langword="null"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="result">The <see cref="QueryArgsParseResult"/>.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> OrderBy<T>(this IQueryable<T> query, QueryArgsParseResult result)
-        {
-            result.ThrowIfNull(nameof(result));
-            if (result.OrderByResult is not null)
-            {
-                var linq = result.OrderByResult.ToLinqString();
-                query = string.IsNullOrEmpty(linq) ? query : query.OrderBy(linq);
-            }
-
-            return query;
-        }
-
-        /// <summary>
-        /// Adds a dynamic query order by as specified by the <paramref name="queryArgs"/> (uses the <see cref="QueryArgs.OrderBy"/> where not <see langword="null"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
-        /// <param name="queryArgs">The <see cref="QueryArgs"/>.</param>
-        /// <returns>The query.</returns>
-        /// <remarks>Where the <paramref name="queryArgs"/> is <see langword="null"/> or <see cref="QueryArgs.OrderBy"/> is <see langword="null"/>, then the <see cref="QueryOrderByParser.DefaultOrderBy"/> will be used (where also not <see langword="null"/>).</remarks>
-        public static IQueryable<T> OrderBy<T>(this IQueryable<T> query, QueryArgsConfig queryConfig, QueryArgs? queryArgs = null) => query.OrderBy(queryConfig, queryArgs?.OrderBy);
-
-        /// <summary>
-        /// Adds a dynamic query order <paramref name="orderby"/> (basic dynamic <i>OData-like</i> <c>$orderby</c> statement).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="queryConfig">The <see cref="QueryArgsConfig"/>.</param>
-        /// <param name="orderby">The basic dynamic <i>OData-like</i> <c>$orderby</c> statement.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> OrderBy<T>(this IQueryable<T> query, QueryArgsConfig queryConfig, string? orderby)
-        {
-            queryConfig.ThrowIfNull(nameof(queryConfig));
-            if (!queryConfig.HasOrderByParser && !string.IsNullOrEmpty(orderby))
-                throw new QueryOrderByParserException("OrderBy statement is not currently supported.");
-
-            var result = queryConfig.OrderByParser.Parse(orderby).ThrowOnError();
-            var linq = result.Value.ToLinqString();
-            return string.IsNullOrEmpty(linq) ? query : query.OrderBy(linq);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterFieldConfigBase.cs b/src/CoreEx.Data/Querying/QueryFilterFieldConfigBase.cs
index b310d7b0..8ae661be 100644
--- a/src/CoreEx.Data/Querying/QueryFilterFieldConfigBase.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterFieldConfigBase.cs
@@ -1,265 +1,322 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Data.Querying.Expressions;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Text;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Provides the base <see cref="QueryFilterParser"/> field configuration.
+/// </summary>
+public abstract class QueryFilterFieldConfigBase : IQueryFilterFieldConfig
 {
+    private readonly QueryFilterParser _parser;
+    private readonly Type _type;
+    private readonly string _field;
+    private readonly string? _model;
+
     /// <summary>
-    /// Provides the base <see cref="QueryFilterParser"/> field configuration.
+    /// Initializes a new instance of the <see cref="QueryFilterFieldConfigBase{TSelf}"/> class.
     /// </summary>
-    public abstract class QueryFilterFieldConfigBase : IQueryFilterFieldConfig
+    /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
+    /// <param name="type">The field type.</param>
+    /// <param name="field">The field name.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+    /// <remarks>The <see cref="Operators"/> defaults:
+    /// <list type="bullet">
+    /// <item>Where <see cref="FieldType"/> is <see cref="QueryFilterFieldType.Boolean"/> then defaults to <see cref="QueryFilterOperator.BooleanEqualityOperators"/>.</item>
+    /// <item>Where <see cref="FieldType"/> is <see cref="QueryFilterFieldType.Enum"/> then defaults to <see cref="QueryFilterOperator.EqualityOperators"/>.</item>
+    /// <item>Where <see cref="FieldType"/> is <see cref="QueryFilterFieldType.String"/> then defaults to <see cref="QueryFilterOperator.ComparisonOperators"/>.</item>
+    /// <item>Otherwise, <see cref="FieldType"/> is <see cref="QueryFilterFieldType.Other"/> then defaults to <see cref="QueryFilterOperator.ComparisonOperators"/>.</item>
+    /// </list></remarks>
+    public QueryFilterFieldConfigBase(QueryFilterParser parser, Type type, string field, string? model)
     {
-        private readonly QueryFilterParser _parser;
-        private readonly Type _type;
-        private readonly string _field;
-        private readonly string? _model;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryFilterFieldConfigBase{TSelf}"/> class.
-        /// </summary>
-        /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
-        /// <param name="type">The field type.</param>
-        /// <param name="field">The field name.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-        public QueryFilterFieldConfigBase(QueryFilterParser parser, Type type, string field, string? model)
+        _parser = parser.ThrowIfNull();
+        _type = type.ThrowIfNull();
+        _field = field.ThrowIfNullOrEmpty();
+        _model = model.ThrowIfEmpty();
+        ModelPrefix = parser.DefaultModelPrefix;
+
+        if (_type.IsEnum)
         {
-            _parser = parser.ThrowIfNull(nameof(parser));
-            _type = type.ThrowIfNull(nameof(type));
-            _field = field.ThrowIfNullOrEmpty(nameof(field));
-            _model = model;
-
-            IsTypeString = type == typeof(string);
-            IsTypeBoolean = type == typeof(bool);
-
-            if (IsTypeBoolean)
-                Operators = QueryFilterOperator.Equal | QueryFilterOperator.NotEqual;
-            else
-                Operators = QueryFilterOperator.ComparisonOperators;
+            FieldType = QueryFilterFieldType.Enum;
+            Operators = QueryFilterOperator.Equal | QueryFilterOperator.NotEqual | QueryFilterOperator.In;
         }
-
-        /// <inheritdoc/>
-        QueryFilterParser IQueryFilterFieldConfig.Parser => _parser;
-
-        /// <inheritdoc/>
-        Type IQueryFilterFieldConfig.Type => Type;
-
-        /// <summary>
-        /// Gets the field type.
-        /// </summary>
-        protected Type Type => _type;
-
-        /// <inheritdoc/>
-        string IQueryFilterFieldConfig.Field => Field;
-
-        /// <summary>
-        /// Gets the field name.
-        /// </summary>
-        protected string Field => _field;
-
-        /// <inheritdoc/>
-        string? IQueryFilterFieldConfig.Model => Model;
-
-        /// <summary>
-        /// Gets the model name to be used for the dynamic LINQ expression.
-        /// </summary>
-        protected string? Model => _model ?? _field;
-
-        /// <inheritdoc/>
-        bool IQueryFilterFieldConfig.IsTypeString => IsTypeString;
-
-        /// <summary>
-        /// Indicates whether the field type is a <see cref="string"/>.
-        /// </summary>
-        protected bool IsTypeString { get; set; }
-
-        /// <summary>
-        /// Indicates whether the field type is a <see cref="bool"/>.
-        /// </summary>
-        bool IQueryFilterFieldConfig.IsTypeBoolean => IsTypeBoolean;
-
-        /// <summary>
-        /// Indicates whether the field type is a <see cref="string"/>.
-        /// </summary>
-        protected bool IsTypeBoolean { get; set; }
-
-        /// <inheritdoc/>
-        QueryFilterOperator IQueryFilterFieldConfig.Operators => Operators;
-
-        /// <summary>
-        /// Gets the supported <see cref="QueryFilterOperator"/>(s).
-        /// </summary>
-        /// <remarks>Where <see cref="IQueryFilterFieldConfig.IsTypeBoolean"/> defaults to both <see cref="QueryFilterOperator.Equal"/> and <see cref="QueryFilterOperator.NotEqual"/>; otherwise, defaults to <see cref="QueryFilterOperator.ComparisonOperators"/>.</remarks>
-        protected QueryFilterOperator Operators { get; set; }
-
-        /// <inheritdoc/>
-        bool IQueryFilterFieldConfig.IsToUpper => IsToUpper;
-
-        /// <summary>
-        /// Indicates whether the comparison should ignore case or not (default); will use <see cref="string.ToUpper()"/> when selected for comparisons.
-        /// </summary>
-        /// <remarks>This is only applicable where the <see cref="IQueryFilterFieldConfig.IsTypeString"/>.</remarks>
-        protected bool IsToUpper { get; set; } = false;
-
-        /// <inheritdoc/>
-        bool IQueryFilterFieldConfig.IsNullable => IsNullable;
-
-        /// <summary>
-        /// Indicates whether the field can be <see langword="null"/> or not.
-        /// </summary>
-        protected bool IsNullable { get; set; } = false;
-
-        /// <inheritdoc/>
-        bool IQueryFilterFieldConfig.IsCheckForNotNull => IsCheckForNotNull;
-
-        /// <summary>
-        /// Indicates whether a not-<see langword="null"/> check should also be performed before the comparion occurs (defaults to <c>false</c>).
-        /// </summary>
-        protected bool IsCheckForNotNull { get; set; } = false;
-
-        /// <inheritdoc/>
-        Func<QueryStatement>? IQueryFilterFieldConfig.DefaultStatement => DefaultStatement;
-
-        /// <summary>
-        /// Gets or sets the default LINQ <see cref="QueryStatement"/> function to be used where no filtering is specified.
-        /// </summary>
-        protected Func<QueryStatement>? DefaultStatement { get; set; }
-
-        /// <inheritdoc/>
-        QueryFilterFieldResultWriter? IQueryFilterFieldConfig.ResultWriter => ResultWriter;
-
-        /// <summary>
-        /// Gets or sets the <see cref="QueryFilterFieldResultWriter"/>.
-        /// </summary>
-        protected QueryFilterFieldResultWriter? ResultWriter { get; set; }
-
-        /// <inheritdoc/>
-        string? IQueryFilterFieldConfig.HelpText => HelpText;
-
-        /// <summary>
-        /// Gets or sets the additional help text.
-        /// </summary>
-        protected string? HelpText { get; set; }
-
-        /// <inheritdoc/>
-        object? IQueryFilterFieldConfig.ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter) => ConvertToValue(operation, field, filter);
-
-        /// <summary>
-        /// Converts <paramref name="field"/> to the destination type using the <see cref="Converter"/> configurations where specified.
-        /// </summary>
-        /// <param name="operation">The operation <see cref="QueryFilterToken"/> being performed on the <paramref name="operation"/>.</param>
-        /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The converted value.</returns>
-        /// <remarks>Note: A converted value of <see langword="null"/> is considered invalid and will result in an <see cref="InvalidOperationException"/>.</remarks>
-        protected abstract object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter);
-
-        /// <summary>
-        /// Validate the <paramref name="constant"/> token against the field configuration.
-        /// </summary>
-        /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
-        /// <param name="constant">The constant <see cref="QueryFilterToken"/>.</param>
-        /// <param name="filter">The query filter.</param>
-        void IQueryFilterFieldConfig.ValidateConstant(QueryFilterToken field, QueryFilterToken constant, string filter)
+        else if (_type == typeof(string))
         {
-            if (!QueryFilterTokenKind.Constant.HasFlag(constant.Kind))
-                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' constant '{constant.GetValueToken(filter)}' is not considered valid.");
-
-            if (constant.Kind == QueryFilterTokenKind.Null && !IsNullable)
-                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' constant '{constant.GetValueToken(filter)}' is not supported.");
+            FieldType = QueryFilterFieldType.String;
+            Operators = QueryFilterOperator.ComparisonOperators;
+        }
+        else if (_type == typeof(bool))
+        {
+            FieldType = QueryFilterFieldType.Boolean;
+            Operators = QueryFilterOperator.Equal | QueryFilterOperator.NotEqual;
+            SchemaType = QueryFilterSchemaType.Boolean;
+        }
+        else
+        {
+            FieldType = QueryFilterFieldType.Other;
+            Operators = QueryFilterOperator.ComparisonOperators;
 
-            if (IsTypeString)
+            if (_type == typeof(DateTime) || _type == typeof(DateTimeOffset))
             {
-                if (!(constant.Kind == QueryFilterTokenKind.Literal || constant.Kind == QueryFilterTokenKind.Null))
-                    throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' constant '{constant.GetValueToken(filter)}' must be specified as a {QueryFilterTokenKind.Literal} where the underlying type is a string.");
+                SchemaType = QueryFilterSchemaType.String;
+                SchemaFormat = "date-time";
             }
-            else if (IsTypeBoolean)
+            else if (_type == typeof(DateOnly))
             {
-                if (!(constant.Kind == QueryFilterTokenKind.True || constant.Kind == QueryFilterTokenKind.False || constant.Kind == QueryFilterTokenKind.Null))
-                    throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' constant '{constant.GetValueToken(filter)}' is not considered a valid boolean.");
+                SchemaType = QueryFilterSchemaType.String;
+                SchemaFormat = "date";
             }
-            else
+            else if (IsIntegerType(_type))
             {
-                if (!(constant.Kind == QueryFilterTokenKind.Value || constant.Kind == QueryFilterTokenKind.Null))
-                    throw new QueryFilterParserException($"Field '{field.GetRawToken(filter).ToString()}' constant '{constant.GetValueToken(filter)}' must not be specified as a {QueryFilterTokenKind.Literal} where the underlying type is not a string.");
+                SchemaType = QueryFilterSchemaType.Integer;
+                SchemaFormat = _type.Name.ToLowerInvariant();
+            }
+            else if (IsNumberType(_type))
+            {
+                SchemaType = QueryFilterSchemaType.Number;
+                SchemaFormat = _type.Name.ToLowerInvariant();
             }
         }
+    }
 
-        /// <inheritdoc/>
-        public override string ToString() => AppendToString(new StringBuilder()).ToString();
+    /// <summary>
+    /// Indicates whether the specified <paramref name="type"/> is an integer type.
+    /// </summary>
+    private static bool IsIntegerType(Type type) => type == typeof(int) || type == typeof(long) || type == typeof(short) || type == typeof(byte) ||
+                                                    type == typeof(uint) || type == typeof(ulong) || type == typeof(ushort) ||
+                                                    type == typeof(int?) || type == typeof(long?) || type == typeof(short?) || type == typeof(byte?) ||
+                                                    type == typeof(uint?) || type == typeof(ulong?) || type == typeof(ushort?);
 
-        /// <summary>
-        /// Appends the field configuration to the <paramref name="stringBuilder"/>.
-        /// </summary>
-        /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
-        /// <returns>The <paramref name="stringBuilder"/>.</returns>
-        public virtual StringBuilder AppendToString(StringBuilder stringBuilder)
-        {
-            stringBuilder.Append(_field);
-            stringBuilder.Append(" (Type: ").Append(_type.Name);
-            stringBuilder.Append(", Null: ").Append(IsNullable ? "true" : "false");
-            stringBuilder.Append(", Operators: ");
+    /// <summary>
+    /// Indicates whether the specified <paramref name="type"/> is a number type.
+    /// </summary>
+    private static bool IsNumberType(Type type) => type == typeof(double) || type == typeof(decimal) || type == typeof(float) ||
+                                                   type == typeof(double?) || type == typeof(decimal?) || type == typeof(float?);
 
-            AppendOperatorsToString(stringBuilder);
+    /// <inheritdoc/>
+    QueryFilterParser IQueryFilterFieldConfig.Parser => _parser;
 
-            stringBuilder.Append(')');
-            if (!string.IsNullOrEmpty(HelpText))
-                stringBuilder.Append(" - ").Append(HelpText);
+    /// <inheritdoc/>
+    Type IQueryFilterFieldConfig.Type => Type;
 
-            return stringBuilder;
-        }
+    /// <summary>
+    /// Gets the field type.
+    /// </summary>
+    protected Type Type => _type;
 
-        /// <summary>
-        /// Appends the <see cref="Operators"/> to the <paramref name="stringBuilder"/>.
-        /// </summary>
-        /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
-        /// <returns>The <paramref name="stringBuilder"/>.</returns>
-        protected StringBuilder AppendOperatorsToString(StringBuilder stringBuilder)
-        {
-            var first = true;
-#if NET6_0_OR_GREATER
-            foreach (var e in Enum.GetValues<QueryFilterOperator>())
-#else
-            foreach (var e in Enum.GetValues(typeof(QueryFilterOperator)))
-#endif
-            {
-                if (Operators.HasFlag((QueryFilterOperator)e))
-                {
-                    var op = GetODataOperator((QueryFilterOperator)e);
-                    if (op is not null)
-                    {
-                        if (first)
-                            first = false;
-                        else
-                            stringBuilder.Append(", ");
-
-                        stringBuilder.Append(op);
-                    }
-                }
-            }
+    /// <inheritdoc/>
+    QueryFilterFieldType IQueryFilterFieldConfig.FieldType => FieldType;
+
+    /// <summary>
+    /// Gets the <see cref="QueryFilterFieldType"/>.
+    /// </summary>
+    protected QueryFilterFieldType FieldType { get; set; }
 
-            return stringBuilder;
+    /// <inheritdoc/>
+    string IQueryFilterFieldConfig.Field => Field;
+
+    /// <summary>
+    /// Gets the field name.
+    /// </summary>
+    protected string Field => _field;
+
+    /// <inheritdoc/>
+    string IQueryFilterFieldConfig.Model => Model;
+
+    /// <summary>
+    /// Gets the model name to be used for the dynamic LINQ expression.
+    /// </summary>
+    protected string Model => _model ?? _field;
+
+    /// <inheritdoc/>
+    public string? ModelPrefix { get; protected set; }
+
+    /// <inheritdoc/>
+    public string FullyQualifiedModelName => ModelPrefix is null ? Model : $"{ModelPrefix}.{Model}";
+
+    /// <inheritdoc/>
+    QueryFilterOperator IQueryFilterFieldConfig.Operators => Operators;
+
+    /// <summary>
+    /// Gets the supported <see cref="QueryFilterOperator"/>(s).
+    /// </summary>
+    protected QueryFilterOperator Operators { get; set; }
+
+    /// <inheritdoc/>
+    bool? IQueryFilterFieldConfig.IsToUpper => IsToUpper;
+
+    /// <summary>
+    /// Indicates whether the comparison should ignore case or not; will use <see cref="string.ToUpper()"/> (where <see langword="true"/>) or <see cref="string.ToLower()"/> (where <see langword="false"/>) when selected for comparisons.
+    /// </summary>
+    protected bool? IsToUpper { get; set; }
+
+    /// <inheritdoc/>
+    bool IQueryFilterFieldConfig.IsNullable => IsNullable;
+
+    /// <summary>
+    /// Indicates whether the field can be <see langword="null"/> or not.
+    /// </summary>
+    protected bool IsNullable { get; set; } = false;
+
+    /// <inheritdoc/>
+    bool IQueryFilterFieldConfig.IsCheckForNotNull => IsCheckForNotNull;
+
+    /// <summary>
+    /// Indicates whether a not-<see langword="null"/> check should also be performed before the comparion occurs (defaults to <see langword="false"/>).
+    /// </summary>
+    protected bool IsCheckForNotNull { get; set; } = false;
+
+    /// <inheritdoc/>
+    Func<QueryStatement>? IQueryFilterFieldConfig.DefaultStatement => DefaultStatement;
+
+    /// <summary>
+    /// Gets or sets the default LINQ <see cref="QueryStatement"/> function to be used where no filtering is specified.
+    /// </summary>
+    protected Func<QueryStatement>? DefaultStatement { get; set; }
+
+    /// <inheritdoc/>
+    QueryFilterFieldResultWriter? IQueryFilterFieldConfig.ResultWriter => ResultWriter;
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryFilterFieldResultWriter"/>.
+    /// </summary>
+    protected QueryFilterFieldResultWriter? ResultWriter { get; set; }
+
+    /// <inheritdoc/>
+    QueryFilterSchemaType IQueryFilterFieldConfig.SchemaType => SchemaType;
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryFilterSchemaType"/>.
+    /// </summary>
+    protected QueryFilterSchemaType SchemaType { get; set; } = QueryFilterSchemaType.String;
+
+    /// <inheritdoc/>
+    string? IQueryFilterFieldConfig.SchemaFormat => SchemaFormat;
+
+    /// <summary>
+    /// Gets or sets the corresponding format for the <see cref="SchemaType"/> (where applicable).
+    /// </summary>
+    protected string? SchemaFormat { get; set; }
+
+    /// <inheritdoc/>
+    string? IQueryFilterFieldConfig.HelpText => HelpText;
+
+    /// <summary>
+    /// Gets or sets the additional help text.
+    /// </summary>
+    protected string? HelpText { get; set; }
+
+    /// <inheritdoc/>
+    object? IQueryFilterFieldConfig.ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter) => ConvertToValue(operation, field, filter);
+
+    /// <summary>
+    /// Converts <paramref name="field"/> to the underlying type.
+    /// </summary>
+    /// <param name="operation">The operation <see cref="QueryFilterToken"/> being performed on the <paramref name="operation"/>.</param>
+    /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The converted value.</returns>
+    /// <remarks>Note: A converted value of <see langword="null"/> is considered invalid and will result in an <see cref="InvalidOperationException"/>.</remarks>
+    protected abstract object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter);
+
+    /// <summary>
+    /// Validate the <paramref name="constant"/> token against the field configuration.
+    /// </summary>
+    /// <param name="field">The field <see cref="QueryFilterToken"/>.</param>
+    /// <param name="constant">The constant <see cref="QueryFilterToken"/>.</param>
+    /// <param name="filter">The query filter.</param>
+    void IQueryFilterFieldConfig.ValidateConstant(QueryFilterToken field, QueryFilterToken constant, string filter)
+    {
+        if (!QueryFilterTokenKind.Constant.HasFlag(constant.Kind))
+            throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' constant '{constant.GetValueToken(filter)}' is not considered valid.");
+
+        if (constant.Kind == QueryFilterTokenKind.Null && !IsNullable)
+            throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' constant '{constant.GetValueToken(filter)}' is not supported.");
+
+        if (FieldType == QueryFilterFieldType.String || FieldType == QueryFilterFieldType.Enum)
+        {
+            if (!(constant.Kind == QueryFilterTokenKind.Literal || constant.Kind == QueryFilterTokenKind.Null))
+                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' constant '{constant.GetValueToken(filter)}' must be specified as a {QueryFilterTokenKind.Literal} where the underlying type is a string.");
         }
+        else if (FieldType == QueryFilterFieldType.Boolean)
+        {
+            if (!(constant.Kind == QueryFilterTokenKind.True || constant.Kind == QueryFilterTokenKind.False || constant.Kind == QueryFilterTokenKind.Null))
+                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' constant '{constant.GetValueToken(filter)}' is not considered a valid boolean.");
+        }
+        else
+        {
+            if (!(constant.Kind == QueryFilterTokenKind.Value || constant.Kind == QueryFilterTokenKind.Null))
+                throw new QueryFilterParserException($"Field '{field.GetRawToken(filter)}' constant '{constant.GetValueToken(filter)}' must not be specified as a {QueryFilterTokenKind.Literal} where the underlying type is not a string.");
+        }
+    }
+
+    /// <inheritdoc/>
+    public override string ToString() => AppendToString(new StringBuilder()).ToString();
+
+    /// <summary>
+    /// Appends the field configuration to the <paramref name="stringBuilder"/>.
+    /// </summary>
+    /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
+    /// <returns>The <paramref name="stringBuilder"/>.</returns>
+    public virtual StringBuilder AppendToString(StringBuilder stringBuilder)
+    {
+        stringBuilder.Append(_field);
+        stringBuilder.Append(" (Type: ").Append(_type.Name);
+        stringBuilder.Append(", Null: ").Append(IsNullable ? "true" : "false");
+        stringBuilder.Append(", Operators: ");
+
+        AppendOperatorsToString(stringBuilder);
+
+        stringBuilder.Append(')');
+        if (!string.IsNullOrEmpty(HelpText))
+            stringBuilder.Append(" - ").Append(HelpText);
+
+        return stringBuilder;
+    }
 
-        /// <summary>
-        /// Gets the ODATA operator for the specified <paramref name="operator"/>
-        /// </summary>
-        /// <param name="operator">The <see cref="QueryFilterOperator"/>.</param>
-        protected static string? GetODataOperator(QueryFilterOperator @operator) => @operator switch
+    /// <summary>
+    /// Appends the <see cref="Operators"/> to the <paramref name="stringBuilder"/>.
+    /// </summary>
+    /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
+    /// <returns>The <paramref name="stringBuilder"/>.</returns>
+    protected StringBuilder AppendOperatorsToString(StringBuilder stringBuilder) 
+        => stringBuilder.Append(String.Join(", ", Enum.GetValues<QueryFilterOperator>().Where(x => Operators.HasFlag(x)).Select(x => GetODataOperator(x)).Where(x => x is not null)));
+
+    /// <summary>
+    /// Gets the ODATA operator for the specified <paramref name="operator"/>
+    /// </summary>
+    /// <param name="operator">The <see cref="QueryFilterOperator"/>.</param>
+    protected static string? GetODataOperator(QueryFilterOperator @operator) => @operator switch
+    {
+        QueryFilterOperator.Equal => "EQ",
+        QueryFilterOperator.NotEqual => "NE",
+        QueryFilterOperator.GreaterThan => "GT",
+        QueryFilterOperator.GreaterThanOrEqual => "GE",
+        QueryFilterOperator.LessThan => "LT",
+        QueryFilterOperator.LessThanOrEqual => "LE",
+        QueryFilterOperator.In => "IN",
+        QueryFilterOperator.StartsWith => nameof(QueryFilterOperator.StartsWith),
+        QueryFilterOperator.EndsWith => nameof(QueryFilterOperator.EndsWith),
+        QueryFilterOperator.Contains => nameof(QueryFilterOperator.Contains),
+        _ => null
+    };
+
+    /// <inheritdoc/>
+    public virtual IDictionary<string, object?> ToSchemaDictionary()
+    {
+        var dict = new Dictionary<string, object?>
         {
-            QueryFilterOperator.Equal => "EQ",
-            QueryFilterOperator.NotEqual => "NE",
-            QueryFilterOperator.GreaterThan => "GT",
-            QueryFilterOperator.GreaterThanOrEqual => "GE",
-            QueryFilterOperator.LessThan => "LT",
-            QueryFilterOperator.LessThanOrEqual => "LE",
-            QueryFilterOperator.In => "IN",
-            QueryFilterOperator.StartsWith => nameof(QueryFilterOperator.StartsWith),
-            QueryFilterOperator.EndsWith => nameof(QueryFilterOperator.EndsWith),
-            QueryFilterOperator.Contains => nameof(QueryFilterOperator.Contains),
-            _ => null
+            { "type", SchemaType.ToString().ToLowerInvariant() },
         };
-    }
+
+        if (SchemaFormat is not null)
+            dict.Add("format", SchemaFormat);
+
+        if (IsNullable)
+            dict.Add("nullable", true);
+
+        dict.Add("operators", Enum.GetValues<QueryFilterOperator>().Where(x => Operators.HasFlag(x)).Select(x => GetODataOperator(x)?.ToLowerInvariant()).Where(x => x is not null).ToArray());
+
+        if (HelpText is not null)
+            dict.Add("description", HelpText);
+
+        return dict;
+    } 
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterFieldConfigBaseT.cs b/src/CoreEx.Data/Querying/QueryFilterFieldConfigBaseT.cs
index 0d59cc21..269ab6b7 100644
--- a/src/CoreEx.Data/Querying/QueryFilterFieldConfigBaseT.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterFieldConfigBaseT.cs
@@ -1,86 +1,113 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Data.Querying.Expressions;
-using System;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Provides the base <see cref="QueryFilterParser"/> field configuration extending <see cref="QueryFilterFieldConfigBase"/> with fluent-style method-chaining capabilities.
+/// </summary>
+/// <typeparam name="TSelf">The self <see cref="Type"/> for support fluent-style method-chaining.</typeparam>
+/// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
+/// <param name="type">The field type.</param>
+/// <param name="field">The field name.</param>
+/// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+public abstract class QueryFilterFieldConfigBase<TSelf>(QueryFilterParser parser, Type type, string field, string? model) 
+    : QueryFilterFieldConfigBase(parser, type, field, model) where TSelf : QueryFilterFieldConfigBase<TSelf>
 {
     /// <summary>
-    /// Provides the base <see cref="QueryFilterParser"/> field configuration extending <see cref="QueryFilterFieldConfigBase"/> with fluent-style method-chaining capabilities.
+    /// Sets (overrides) the optional <see cref="QueryFilterFieldConfigBase.ModelPrefix"/> to be used where referencing the underlying <see cref="IQueryable{T}"/> model.
     /// </summary>
-    /// <typeparam name="TSelf">The self <see cref="Type"/> for support fluent-style method-chaining.</typeparam>
-    /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
-    /// <param name="type">The field type.</param>
-    /// <param name="field">The field name.</param>
-    /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-    public abstract class QueryFilterFieldConfigBase<TSelf>(QueryFilterParser parser, Type type, string field, string? model)
-        : QueryFilterFieldConfigBase(parser, type, field, model) where TSelf : QueryFilterFieldConfigBase<TSelf>
+    /// <param name="modelPrefix">The model prefix.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public TSelf WithModelPrefix(string? modelPrefix = null)
     {
-        /// <summary>
-        /// Indicates that the field can be <see langword="null"/>.
-        /// </summary>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsNullable"/> to <see langword="true"/>.</remarks>
-        public TSelf AsNullable()
-        {
-            IsNullable = true;
-            return (TSelf)this;
-        }
+        ModelPrefix = modelPrefix;
+        return (TSelf)this;
+    }
 
-        /// <summary>
-        /// Indicates that a not-<see langword="null"/> check should also be performed before a comparion occurs.
-        /// </summary>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsCheckForNotNull"/> and <see cref="QueryFilterFieldConfigBase.IsNullable"/> to <see langword="true"/>.</remarks>
-        public TSelf AlsoCheckNotNull()
-        {
-            IsCheckForNotNull = true;
-            IsNullable = true;
-            return (TSelf)this;
-        }
+    /// <summary>
+    /// Indicates that the field can be <see langword="null"/>.
+    /// </summary>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsNullable"/> to <see langword="true"/>.</remarks>
+    public TSelf AsNullable()
+    {
+        IsNullable = true;
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Indicates that a not-<see langword="null"/> check should also be performed before a comparion occurs.
+    /// </summary>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsCheckForNotNull"/> and <see cref="QueryFilterFieldConfigBase.IsNullable"/> to <see langword="true"/>.</remarks>
+    public TSelf AlsoCheckNotNull()
+    {
+        IsCheckForNotNull = true;
+        IsNullable = true;
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the default LINQ statement to be used where no filtering is specified.
+    /// </summary>
+    /// <param name="statement">The LINQ <see cref="QueryStatement"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>To avoid unnecessary parsing this should be specified as a valid dynamic LINQ statement.
+    /// <para>This must be the required expression <b>only</b>. It will be appended as an <i>and</i> to the final LINQ statement.</para></remarks>
+    public TSelf WithDefault(QueryStatement? statement) => WithDefault(statement is null ? null : () => statement);
+
+    /// <summary>
+    /// Sets (overrides) the default LINQ statement function to be used where no filtering is specified.
+    /// </summary>
+    /// <param name="statement">The LINQ <see cref="QueryStatement"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>To avoid unnecessary parsing this should be specified as a valid dynamic LINQ statement.
+    /// <para>This must be the required expression <b>only</b>. It will be appended as an <i>and</i> to the final LINQ statement.</para></remarks>
+    public TSelf WithDefault(Func<QueryStatement>? statement)
+    {
+        DefaultStatement = statement;
+        return (TSelf)this;
+    }
 
-        /// <summary>
-        /// Sets (overrides) the default LINQ statement to be used where no filtering is specified.
-        /// </summary>
-        /// <param name="statement">The LINQ <see cref="QueryStatement"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>To avoid unnecessary parsing this should be specified as a valid dynamic LINQ statement.
-        /// <para>This must be the required expression <b>only</b>. It will be appended as an <i>and</i> to the final LINQ statement.</para></remarks>
-        public TSelf WithDefault(QueryStatement? statement) => WithDefault(statement is null ? null : () => statement);
+    /// <summary>
+    /// Sets (overrides) the function that will be used to write the <see cref="IQueryFilterFieldStatementExpression"/> dynamic LINQ statement.
+    /// </summary>
+    /// <param name="resultWriter">The <see cref="QueryFilterFieldResultWriter"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf WithResultWriter(QueryFilterFieldResultWriter? resultWriter)
+    {
+        ResultWriter = resultWriter;
+        return (TSelf)this;
+    }
 
-        /// <summary>
-        /// Sets (overrides) the default LINQ statement function to be used where no filtering is specified.
-        /// </summary>
-        /// <param name="statement">The LINQ <see cref="QueryStatement"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>To avoid unnecessary parsing this should be specified as a valid dynamic LINQ statement.
-        /// <para>This must be the required expression <b>only</b>. It will be appended as an <i>and</i> to the final LINQ statement.</para></remarks>
-        public TSelf WithDefault(Func<QueryStatement>? statement)
-        {
-            DefaultStatement = statement;
-            return (TSelf)this;
-        }
+    /// <summary>
+    /// Sets (overrides) the <see cref="IQueryFilterFieldConfig.SchemaType"/>.
+    /// </summary>
+    /// <param name="schemaType">The <see cref="QueryFilterSchemaType"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf WithSchemaType(QueryFilterSchemaType schemaType)
+    {
+        SchemaType = schemaType;
+        return (TSelf)this;
+    }
 
-        /// <summary>
-        /// Sets (overrides) the function that will be used to write the <see cref="IQueryFilterFieldStatementExpression"/> LINQ statement to the <see cref="QueryFilterParserResult.FilterBuilder"/>.
-        /// </summary>
-        /// <param name="resultWriter">The <see cref="QueryFilterFieldResultWriter"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        public TSelf WithResultWriter(QueryFilterFieldResultWriter? resultWriter)
-        {
-            ResultWriter = resultWriter;
-            return (TSelf)this;
-        }
+    /// <summary>
+    /// Sets (overrides) the <see cref="IQueryFilterFieldConfig.SchemaFormat"/>.
+    /// </summary>
+    /// <param name="schemaFormat">The schema format.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf WithSchemaFormat(string? schemaFormat)
+    {
+        SchemaFormat = schemaFormat;
+        return (TSelf)this; 
+    }
 
-        /// <summary>
-        /// Sets (overrides) the additional help text.
-        /// </summary>
-        /// <param name="text">The additional help text.</param>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        public TSelf WithHelpText(string text)
-        {
-            HelpText = text.ThrowIfNullOrEmpty(nameof(text));
-            return (TSelf)this;
-        }
+    /// <summary>
+    /// Sets (overrides) any additional help text.
+    /// </summary>
+    /// <param name="text">The additional help text.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf WithHelpText(string text)
+    {
+        HelpText = text.ThrowIfNullOrEmpty();
+        return (TSelf)this;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterFieldConfigT.cs b/src/CoreEx.Data/Querying/QueryFilterFieldConfigT.cs
deleted file mode 100644
index 431e6ff7..00000000
--- a/src/CoreEx.Data/Querying/QueryFilterFieldConfigT.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Data.Querying.Expressions;
-using CoreEx.Mapping.Converters;
-using System;
-
-namespace CoreEx.Data.Querying
-{
-    /// <summary>
-    /// Provides the <see cref="QueryFilterParser"/> field configuration.
-    /// </summary>
-    /// <typeparam name="T">The field type.</typeparam>
-    /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
-    /// <param name="field">The field name.</param>
-    /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-    public class QueryFilterFieldConfig<T>(QueryFilterParser parser, string field, string? model) : QueryFilterFieldConfigBase<QueryFilterFieldConfig<T>>(parser, typeof(T), field, model)
-    {
-        private IConverter<string, T> _converter = StringToTypeConverter<T>.Default;
-        private Func<T, object>? _valueFunc;
-
-        /// <summary>
-        /// Sets (overrides) the operator <see cref="QueryFilterFieldConfigBase.Operators"/>.
-        /// </summary>
-        /// <param name="operators">The supported <see cref="QueryFilterOperator"/>(s).</param>
-        /// <returns>The <see cref="QueryFilterFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The default is <see cref="QueryFilterTokenKind.ComparisonOperators"/>.</remarks>
-        public QueryFilterFieldConfig<T> WithOperators(QueryFilterOperator operators)
-        {
-            if (((IQueryFilterFieldConfig)this).IsTypeBoolean)
-                throw new NotSupportedException($"{nameof(WithOperators)} is not supported where {nameof(IQueryFilterFieldConfig.IsTypeBoolean)}.");
-
-            Operators = operators;
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates that the operation should ignore case by performing an explicit <see cref="string.ToUpper()"/> comparison and value conversion.
-        /// </summary>
-        /// <returns>The <see cref="QueryFilterFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsToUpper"/> to <see langword="true"/>.</remarks>
-        public QueryFilterFieldConfig<T> WithUpperCase()
-        {
-            if (!((IQueryFilterFieldConfig)this).IsTypeString)
-                throw new ArgumentException($"A {nameof(WithUpperCase)} can only be specified where the field type is a string.");
-
-            IsToUpper = true;
-            return this;
-        }
-
-        /// <summary>
-        /// Sets (overrides) the <paramref name="converter"/> to convert the field value from a <see cref="string"/> to the field type <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter{TSource, TDestination}"/>.</param>
-        /// <returns>The <see cref="QueryFilterFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <paramref name="converter"/> is invoked before the <see cref="WithValue(Func{T, object}?)"/> as the resulting value is passed through to enable further conversion and/or validation where applicable.</remarks>
-        public QueryFilterFieldConfig<T> WithConverter(IConverter<string, T> converter)
-        {
-            _converter = converter.ThrowIfNull(nameof(converter));
-            return this;
-        }
-
-        /// <summary>
-        /// Sets (overrides) the <paramref name="value"/> function to, a) further convert the field <typeparamref name="T"/> value to the final <see cref="object"/> value that will be used in the LINQ query; and/or, b) to provide additional validation.
-        /// </summary>
-        /// <param name="value">The value function.</param>
-        /// <returns>The final <see cref="object"/> value that will be used in the LINQ query.</returns>
-        /// <remarks>This is an opportunity to further validate the query as needed. Throw a <see cref="FormatException"/> to have the validation message formatted correctly and consistently.
-        /// <para>This in invoked after the <see cref="WithConverter(IConverter{string, T})"/> has been invoked.</para></remarks>
-        public QueryFilterFieldConfig<T> WithValue(Func<T, object>? value)
-        {
-            _valueFunc = value;
-            return this;
-        }
-
-        /// <inheritdoc/>
-        protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter)
-        {
-            // Convert from string to the underlying type and consider the upper case requirements.
-            T value = _converter.ConvertToDestination(field.GetValueToken(filter));
-            if (typeof(T) == typeof(string))
-            {
-                var str = value?.ToString();
-                if (str is null)
-                    return null!;
-
-                if (IsToUpper)
-                    str = str?.ToUpper(System.Globalization.CultureInfo.CurrentCulture);
-                
-                value = _converter.ConvertToDestination(str!);
-                return _valueFunc?.Invoke(value) ?? value!;
-            }
-
-            // Convert the underlying type to the final value.
-            return _valueFunc?.Invoke(value) ?? value!;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterFieldResultWriter.cs b/src/CoreEx.Data/Querying/QueryFilterFieldResultWriter.cs
index 6a004e58..80bfa636 100644
--- a/src/CoreEx.Data/Querying/QueryFilterFieldResultWriter.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterFieldResultWriter.cs
@@ -1,15 +1,9 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Data.Querying.Expressions;
-
-namespace CoreEx.Data.Querying
-{
-    /// <summary>
-    /// The <see cref="QueryFilterParserResult"/> writing function that will be used to write the <paramref name="expression"/> to the <see cref="QueryFilterParserResult.FilterBuilder"/>.
-    /// </summary>
-    /// <param name="expression">The <see cref="IQueryFilterFieldStatementExpression"/> expression.</param>
-    /// <param name="result">The <see cref="QueryFilterParserResult"/>.</param>
-    /// <returns><see langword="true"/> indicates that a LINQ statement has been written to the <see cref="QueryFilterParserResult.FilterBuilder"/> and that the standard writer should not be invoked;
-    /// otherwise, <see langword="false"/> indicates that the standard writer is to be invoked.</returns>
-    public delegate bool QueryFilterFieldResultWriter(IQueryFilterFieldStatementExpression expression, QueryFilterParserResult result);
-}
\ No newline at end of file
+/// <summary>
+/// The <see cref="QueryFilterParserWriter"/> function that will be used to write the <paramref name="expression"/> as dynamic LINQ.
+/// </summary>
+/// <param name="expression">The <see cref="IQueryFilterFieldStatementExpression"/> expression.</param>
+/// <param name="writer">The <see cref="QueryFilterParserResult"/>.</param>
+/// <returns><see langword="true"/> indicates that a LINQ statement has been written and that the standard writer should not be invoked; otherwise, <see langword="false"/> indicates that the standard writer is to be invoked.</returns>
+public delegate bool QueryFilterFieldResultWriter(IQueryFilterFieldStatementExpression expression, QueryFilterParserWriter writer);
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterFieldType.cs b/src/CoreEx.Data/Querying/QueryFilterFieldType.cs
new file mode 100644
index 00000000..a3e23f26
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryFilterFieldType.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Represents the field type for a <see cref="QueryFilterFieldConfigBase"/>.
+/// </summary>
+public enum QueryFilterFieldType
+{
+    /// <summary>
+    /// Indicates a <see cref="string"/>.
+    /// </summary>
+    String,
+
+    /// <summary>
+    /// Indicates a <see cref="Boolean"/>.
+    /// </summary>
+    Boolean,
+
+    /// <summary>
+    /// Indicates a <see cref="System.Enum"/>.
+    /// </summary>
+    Enum,
+
+    /// <summary>
+    /// Indicates another type.
+    /// </summary>
+    Other
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterNullFieldConfig.cs b/src/CoreEx.Data/Querying/QueryFilterNullFieldConfig.cs
index 2eb6d81c..f6b4651e 100644
--- a/src/CoreEx.Data/Querying/QueryFilterNullFieldConfig.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterNullFieldConfig.cs
@@ -1,52 +1,45 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using System;
-using System.Data;
-using System.Text;
-using CoreEx.Data.Querying.Expressions;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Provides the <see cref="QueryFilterParser"/> <i>null only</i> comparison field configuration.
+/// </summary>
+public class QueryFilterNullFieldConfig : QueryFilterFieldConfigBase<QueryFilterNullFieldConfig>
 {
     /// <summary>
-    /// Provides the <see cref="QueryFilterParser"/> <i>null only</i> comparison field configuration.
+    /// Initializes a new instance of the <see cref="QueryFilterNullFieldConfig"/> class.
     /// </summary>
-    public class QueryFilterNullFieldConfig : QueryFilterFieldConfigBase<QueryFilterNullFieldConfig>
+    /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
+    /// <param name="field">The field name.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
+    public QueryFilterNullFieldConfig(QueryFilterParser parser, string field, string? model) : base(parser, typeof(object), field, model)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryFilterNullFieldConfig"/> class.
-        /// </summary>
-        /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
-        /// <param name="field">The field name.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-        public QueryFilterNullFieldConfig(QueryFilterParser parser, string field, string? model) : base(parser, typeof(object), field, model)
-        {
-            Operators = QueryFilterOperator.Equal | QueryFilterOperator.NotEqual;
-            IsNullable = true;
-        }
+        Operators = QueryFilterOperator.Equal | QueryFilterOperator.NotEqual;
+        IsNullable = true;
+        SchemaType = QueryFilterSchemaType.Object;
+        SchemaFormat = null;
+    }
 
-        /// <inheritdoc/>
-        protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter)
-            => throw new FormatException("Only null comparisons are supported.");
+    /// <inheritdoc/>
+    protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter) => throw new ValidationException("Only null comparisons are supported.");
 
-        /// <summary>
-        /// Appends the field configuration to the <paramref name="stringBuilder"/>.
-        /// </summary>
-        /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
-        /// <returns>The <paramref name="stringBuilder"/>.</returns>
-        public override StringBuilder AppendToString(StringBuilder stringBuilder)
-        {
-            stringBuilder.Append(Field);
-            stringBuilder.Append(" (Type: <none>");
-            stringBuilder.Append(", Null: ").Append(IsNullable ? "true" : "false");
-            stringBuilder.Append(", Operators: ");
+    /// <summary>
+    /// Appends the field configuration to the <paramref name="stringBuilder"/>.
+    /// </summary>
+    /// <param name="stringBuilder">The <see cref="StringBuilder"/>.</param>
+    /// <returns>The <paramref name="stringBuilder"/>.</returns>
+    public override StringBuilder AppendToString(StringBuilder stringBuilder)
+    {
+        stringBuilder.Append(Field);
+        stringBuilder.Append(" (Type: <none>");
+        stringBuilder.Append(", Null: ").Append(IsNullable ? "true" : "false");
+        stringBuilder.Append(", Operators: ");
 
-            AppendOperatorsToString(stringBuilder);
+        AppendOperatorsToString(stringBuilder);
 
-            stringBuilder.Append(')');
-            if (!string.IsNullOrEmpty(HelpText))
-                stringBuilder.Append(" - ").Append(HelpText);
+        stringBuilder.Append(')');
+        if (!string.IsNullOrEmpty(HelpText))
+            stringBuilder.Append(" - ").Append(HelpText);
 
-            return stringBuilder;
-        }
+        return stringBuilder;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterOperator.cs b/src/CoreEx.Data/Querying/QueryFilterOperator.cs
index 9b8f3deb..ef428d16 100644
--- a/src/CoreEx.Data/Querying/QueryFilterOperator.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterOperator.cs
@@ -1,83 +1,84 @@
-using System;
-using CoreEx.Data.Querying.Expressions;
+namespace CoreEx.Data.Querying;
 
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Enables the <see cref="IQueryFilterFieldConfig.Operators"/>.
+/// </summary>
+/// <remarks>Values are the same as the <see cref="QueryFilterTokenKind"/> to simplify usage.</remarks>
+[Flags]
+public enum QueryFilterOperator
 {
     /// <summary>
-    /// Enables the <see cref="IQueryFilterFieldConfig.Operators"/>.
+    /// The equal operator.
     /// </summary>
-    /// <remarks>Values are the same as the <see cref="QueryFilterTokenKind"/> to simplify usage.</remarks>
-    [Flags]
-    public enum QueryFilterOperator
-    {
-        /// <summary>
-        /// The equal operator.
-        /// </summary>
-        Equal = 4,
+    Equal = 4,
 
-        /// <summary>
-        /// The not equal operator.
-        /// </summary>
-        NotEqual = 8,
+    /// <summary>
+    /// The not equal operator.
+    /// </summary>
+    NotEqual = 8,
 
-        /// <summary>
-        /// The less than operator.
-        /// </summary>
-        LessThan = 16,
+    /// <summary>
+    /// The less than operator.
+    /// </summary>
+    LessThan = 16,
 
-        /// <summary>
-        /// The less than or equal operator.
-        /// </summary>
-        LessThanOrEqual = 32,
+    /// <summary>
+    /// The less than or equal operator.
+    /// </summary>
+    LessThanOrEqual = 32,
 
-        /// <summary>
-        /// The greater than or equal operator.
-        /// </summary>
-        GreaterThanOrEqual = 64,
+    /// <summary>
+    /// The greater than or equal operator.
+    /// </summary>
+    GreaterThanOrEqual = 64,
 
-        /// <summary>
-        /// The greater than operator.
-        /// </summary>
-        GreaterThan = 128,
+    /// <summary>
+    /// The greater than operator.
+    /// </summary>
+    GreaterThan = 128,
 
-        /// <summary>
-        /// The logical IN operator.
-        /// </summary>
-        In = 256,
+    /// <summary>
+    /// The logical IN operator.
+    /// </summary>
+    In = 256,
 
-        /// <summary>
-        /// The starts with function.
-        /// </summary>
-        StartsWith = 524288,
+    /// <summary>
+    /// The starts with function.
+    /// </summary>
+    StartsWith = 524288,
 
-        /// <summary>
-        /// The contains function.
-        /// </summary>
-        Contains = 1048576,
+    /// <summary>
+    /// The contains function.
+    /// </summary>
+    Contains = 1048576,
 
-        /// <summary>
-        /// The ends with function.
-        /// </summary>
-        EndsWith = 2097152,
+    /// <summary>
+    /// The ends with function.
+    /// </summary>
+    EndsWith = 2097152,
 
-        /// <summary>
-        /// The <i>equality</i> operators.
-        /// </summary>
-        EqualityOperators = Equal | NotEqual | In,
+    /// <summary>
+    /// The <see cref="bool"/> <i>equality</i> operators.
+    /// </summary>
+    BooleanEqualityOperators = Equal | NotEqual,
+
+    /// <summary>
+    /// The <i>equality</i> operators.
+    /// </summary>
+    EqualityOperators = Equal | NotEqual | In,
 
-        /// <summary>
-        /// The <i>comparison</i> operators.
-        /// </summary>
-        ComparisonOperators = EqualityOperators | GreaterThan | GreaterThanOrEqual | LessThan | LessThanOrEqual,
+    /// <summary>
+    /// The <i>comparison</i> operators.
+    /// </summary>
+    ComparisonOperators = EqualityOperators | GreaterThan | GreaterThanOrEqual | LessThan | LessThanOrEqual,
 
-        /// <summary>
-        /// The string oriented function-based operators.
-        /// </summary>
-        StringFunctions = StartsWith | EndsWith | Contains,
+    /// <summary>
+    /// The <see cref="string"/>-specific function-based operators.
+    /// </summary>
+    StringFunctions = StartsWith | EndsWith | Contains,
 
-        /// <summary>
-        /// All string oriented operators and functions.
-        /// </summary>
-        AllStringOperators = ComparisonOperators | StringFunctions
-    }
+    /// <summary>
+    /// All <see cref="string"/>-specific operators and functions.
+    /// </summary>
+    AllStringOperators = ComparisonOperators | StringFunctions,
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterParseableFieldConfigT.cs b/src/CoreEx.Data/Querying/QueryFilterParseableFieldConfigT.cs
new file mode 100644
index 00000000..24fa031f
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryFilterParseableFieldConfigT.cs
@@ -0,0 +1,121 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Provides the <see cref="QueryFilterParser"/> <see cref="IParsable{TSelf}"/> field configuration.
+/// </summary>
+/// <typeparam name="T">The field type.</typeparam>
+/// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
+/// <param name="field">The field name.</param>
+/// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+public class QueryFilterParseableFieldConfig<T>(QueryFilterParser parser, string field, string? model) 
+    : QueryFilterFieldConfigBase<QueryFilterParseableFieldConfig<T>>(parser, typeof(T), field, model) where T : notnull, IParsable<T>
+{
+    private Func<string, T>? _converterFunc;
+    private Func<T, object>? _valueFunc;
+
+    /// <summary>
+    /// Sets (overrides) the operator <see cref="QueryFilterFieldConfigBase.Operators"/>.
+    /// </summary>
+    /// <param name="operators">The supported <see cref="QueryFilterOperator"/>(s).</param>
+    /// <returns>The <see cref="QueryFilterParseableFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The defaults are:
+    /// <list type="bullet">
+    /// <item>Where <see cref="QueryFilterFieldConfigBase.FieldType"/> is <see cref="QueryFilterFieldType.Boolean"/> then defaults to <see cref="QueryFilterOperator.BooleanEqualityOperators"/>.</item>
+    /// <item>Where <see cref="QueryFilterFieldConfigBase.FieldType"/> is <see cref="QueryFilterFieldType.String"/> then defaults to <see cref="QueryFilterOperator.ComparisonOperators"/>.</item>
+    /// <item>Otherwise, <see cref="QueryFilterFieldConfigBase.FieldType"/> is <see cref="QueryFilterFieldType.Other"/> then defaults to <see cref="QueryFilterOperator.ComparisonOperators"/>.</item>
+    /// </list></remarks>
+    public QueryFilterParseableFieldConfig<T> WithOperators(QueryFilterOperator operators)
+    {
+        if (((IQueryFilterFieldConfig)this).FieldType == QueryFilterFieldType.Boolean)
+            throw new NotSupportedException($"{nameof(WithOperators)} is not supported where {nameof(QueryFilterFieldType.Boolean)}.");
+
+        Operators = operators;
+        return this;
+    }
+
+    /// <summary>
+    /// Indicates that the operation should ignore case by performing an explicit <see cref="string.ToUpper()"/> comparison and value conversion.
+    /// </summary>
+    /// <returns>The <see cref="QueryFilterParseableFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsToUpper"/> to <see langword="true"/>.</remarks>
+    public QueryFilterParseableFieldConfig<T> AsUpperCase()
+    {
+        if (((IQueryFilterFieldConfig)this).FieldType != QueryFilterFieldType.String)
+            throw new ArgumentException($"A {nameof(AsUpperCase)} can only be specified where the field type is a string.");
+
+        IsToUpper = true;
+        return this;
+    }
+
+    /// <summary>
+    /// Indicates that the operation should ignore case by performing an explicit <see cref="string.ToLower()"/> comparison and value conversion.
+    /// </summary>
+    /// <returns>The <see cref="QueryFilterParseableFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Sets the <see cref="QueryFilterFieldConfigBase.IsToUpper"/> to <see langword="false"/>.</remarks>
+    public QueryFilterParseableFieldConfig<T> AsLowerCase()
+    {
+        if (((IQueryFilterFieldConfig)this).FieldType != QueryFilterFieldType.String)
+            throw new ArgumentException($"A {nameof(AsLowerCase)} can only be specified where the field type is a string.");
+
+        IsToUpper = false;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="converter"/> to convert the field value from a <see cref="string"/> to the field type <typeparamref name="T"/>.
+    /// </summary>
+    /// <param name="converter">The converter function.</param>
+    /// <returns>The <see cref="QueryFilterParseableFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="converter"/> is invoked before the <see cref="WithValue(Func{T, object}?)"/> as the resulting value is passed through to enable further conversion and/or validation where applicable.</remarks>
+    public QueryFilterParseableFieldConfig<T> WithConverter(Func<string, T>? converter)
+    {
+        _converterFunc = converter;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="value"/> function to, a) further convert the field <typeparamref name="T"/> value to the final <see cref="object"/> value that will be used in the LINQ query; and/or, b) to provide additional validation.
+    /// </summary>
+    /// <param name="value">The value function.</param>
+    /// <returns>The <see cref="QueryFilterParseableFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is an opportunity to further validate the query as needed. Throw a <see cref="FormatException"/> to have the exception message formatted correctly and consistently.
+    /// <para>This in invoked after the <see cref="WithConverter(Func{string, T}?)"/> has been invoked.</para></remarks>
+    public QueryFilterParseableFieldConfig<T> WithValue(Func<T, object>? value)
+    {
+        _valueFunc = value;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter)
+    {
+        T value = default!;
+        var val = field.GetValueToken(filter);
+
+        if (_converterFunc is null)
+            value = val is null ? default! : T.Parse(val, null);
+        else
+            value = _converterFunc(val);
+
+        // Convert from string to the underlying type and consider the casing requirements.
+        if (typeof(T) == typeof(string))
+        {
+            var str = value?.ToString();
+            if (str is null)
+                return null!;
+
+            if (IsToUpper.HasValue)
+            {
+                if (IsToUpper.Value)
+                    value = T.Parse(str!.ToUpperInvariant(), null)!;
+                else
+                    value = T.Parse(str!.ToLowerInvariant(), null)!;
+            }
+                
+            return _valueFunc?.Invoke(value!) ?? value!;
+        }
+
+        // Convert the underlying type to the final value.
+        return _valueFunc?.Invoke(value) ?? value!;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterParser.cs b/src/CoreEx.Data/Querying/QueryFilterParser.cs
index da69fe7e..d231c825 100644
--- a/src/CoreEx.Data/Querying/QueryFilterParser.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterParser.cs
@@ -1,481 +1,535 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Data.Querying.Expressions;
-using CoreEx.RefData;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
-
-namespace CoreEx.Data.Querying
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Represents a basic query filter parser and LINQ translator with explicitly defined field support.
+/// </summary>
+/// <remarks>Enables basic query filtering with similar syntax to the OData <c><see href="https://docs.oasis-open.org/odata/odata/v4.01/cs01/part2-url-conventions/odata-v4.01-cs01-part2-url-conventions.html#sec_SystemQueryOptionfilter">$filter</see></c>.
+/// Support is limited to the filter tokens as specified by the <see cref="QueryFilterTokenKind"/>.  
+/// <para>This is <b>not</b> intended to be a replacement for OData, GraphQL, etc. but to provide a limited, explicitly supported, dynamic capability to filter an underlying query.</para>
+/// <para>Example configuration is as follows:
+/// <code>
+/// private static readonly QueryArgsConfig _config = QueryArgsConfig.Create()
+///     .WithFilter(filter =&gt; filter
+///         .AddField&lt;string&gt;(nameof(Employee.LastName), c =&gt; c.Operators(QueryFilterTokenKind.AllStringOperators).UseUpperCase())
+///         .AddField&lt;string&gt;(nameof(Employee.FirstName), c =&gt; c.Operators(QueryFilterTokenKind.AllStringOperators).UseUpperCase())
+///         .AddField&lt;DateTime&gt;(nameof(Employee.StartDate))
+///         .AddNullField(nameof(Employee.Termination), nameof(EfModel.Employee.TerminationDate), c =&gt; c.Default(new QueryStatement($"{nameof(EfModel.Employee.TerminationDate)} is null"))));
+/// </code></para></remarks>
+/// <param name="owner">The owning <see cref="QueryArgsConfig"/>.</param>
+public sealed class QueryFilterParser(QueryArgsConfig owner)
 {
+    private readonly Dictionary<string, IQueryFilterFieldConfig> _fields = new(StringComparer.OrdinalIgnoreCase);
+    private Func<QueryStatement>? _defaultStatement;
+    private Action<QueryFilterParserResult>? _onQuery;
+    private string? _helpText;
+
+    /// <summary>
+    /// Gets the owning <see cref="QueryArgsConfig"/>.
+    /// </summary>
+    public QueryArgsConfig Owner => owner.ThrowIfNull();
+
     /// <summary>
-    /// Represents a basic query filter parser and LINQ translator with explicitly defined field support.
+    /// Indicates that at least a single field has been configured.
     /// </summary>
-    /// <remarks>Enables basic query filtering with similar syntax to the OData <c><see href="https://docs.oasis-open.org/odata/odata/v4.01/cs01/part2-url-conventions/odata-v4.01-cs01-part2-url-conventions.html#sec_SystemQueryOptionfilter">$filter</see></c>.
-    /// Support is limited to the filter tokens as specified by the <see cref="QueryFilterTokenKind"/>.  
-    /// <para>This is <b>not</b> intended to be a replacement for OData, GraphQL, etc. but to provide a limited, explicitly supported, dynamic capability to filter an underlying query.</para>
-    /// <para>Example configuration is as follows:
-    /// <code>
-    /// private static readonly QueryArgsConfig _config = QueryArgsConfig.Create()
-    ///     .WithFilter(filter =&gt; filter
-    ///         .AddField&lt;string&gt;(nameof(Employee.LastName), c =&gt; c.Operators(QueryFilterTokenKind.AllStringOperators).UseUpperCase())
-    ///         .AddField&lt;string&gt;(nameof(Employee.FirstName), c =&gt; c.Operators(QueryFilterTokenKind.AllStringOperators).UseUpperCase())
-    ///         .AddReferenceDataField&lt;Gender&gt;(nameof(Employee.Gender), nameof(EfModel.Employee.GenderCode), c =&gt; c.MustBeValid())
-    ///         .AddField&lt;DateTime&gt;(nameof(Employee.StartDate))
-    ///         .AddNullField(nameof(Employee.Termination), nameof(EfModel.Employee.TerminationDate), c =&gt; c.Default(new QueryStatement($"{nameof(EfModel.Employee.TerminationDate)} == null"))));
-    /// </code></para></remarks>
-    /// <param name="owner">The owning <see cref="QueryArgsConfig"/>.</param>
-    public sealed class QueryFilterParser(QueryArgsConfig owner)
+    public bool HasFields => _fields.Count > 0;
+
+    /// <summary>
+    /// Gets the default model prefix (if any).
+    /// </summary>
+    /// <remarks>This will be automatically applied to all subsequent field additions; for example <see cref="AddField{T}(string, string?, Action{QueryFilterParseableFieldConfig{T}}?)"/>.</remarks>
+    public string? DefaultModelPrefix { get; private set; }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="DefaultModelPrefix"/> (if any).
+    /// </summary>
+    /// <param name="modelPrefix"></param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser WithDefaultModelPrefix(string? modelPrefix = null)
     {
-        private readonly Dictionary<string, IQueryFilterFieldConfig> _fields = new(StringComparer.OrdinalIgnoreCase);
-        private Func<QueryStatement>? _defaultStatement;
-        private Action<QueryFilterParserResult>? _onQuery;
-        private string? _helpText;
-
-        /// <summary>
-        /// Gets the owning <see cref="QueryArgsConfig"/>.
-        /// </summary>
-        public QueryArgsConfig Owner => owner.ThrowIfNull(nameof(owner));
-
-        /// <summary>
-        /// Indicates that at least a single field has been configured.
-        /// </summary>
-        public bool HasFields => _fields.Count > 0;
-
-        /// <summary>
-        /// Adds a <see cref="QueryFilterFieldConfig{T}"/> to the parser for the specified <paramref name="field"/> as-is.
-        /// </summary>
-        /// <param name="field">The field name used in the query filter specified with the correct casing.</param>
-        /// <param name="configure">The optional action enabling further field configuration.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser AddField<T>(string field, Action<QueryFilterFieldConfig<T>>? configure = null) where T : notnull => AddField(field, null, configure);
-
-        /// <summary>
-        /// Adds a <see cref="QueryFilterFieldConfig{T}"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
-        /// </summary>
-        /// <param name="field">The field name used in the query filter.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
-        /// <param name="configure">The optional action to perform further field configuration.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser AddField<T>(string field, string? model, Action<QueryFilterFieldConfig<T>>? configure = null) where T : notnull
-        {
-            var config = new QueryFilterFieldConfig<T>(this, field, model);
-            configure?.Invoke(config);
-            _fields.Add(field, config);
-            return this;
-        }
+        DefaultModelPrefix = modelPrefix;
+        return this;
+    }
 
-        /// <summary>
-        /// Adds a <see cref="QueryFilterReferenceDataFieldConfig{T}"/> to the parser for the specified <paramref name="field"/> as-is.
-        /// </summary>
-        /// <param name="field">The field name used in the query filter specified with the correct casing.</param>
-        /// <param name="configure">The optional action enabling further field configuration.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser AddReferenceDataField<TRef>(string field, Action<QueryFilterReferenceDataFieldConfig<TRef>>? configure = null) where TRef : IReferenceData, new() => AddReferenceDataField(field, null, configure);
-
-        /// <summary>
-        /// Adds a <see cref="QueryFilterReferenceDataFieldConfig{T}"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
-        /// </summary>
-        /// <param name="field">The field name used in the query filter.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
-        /// <param name="configure">The optional action to perform further field configuration.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser AddReferenceDataField<TRef>(string field, string? model, Action<QueryFilterReferenceDataFieldConfig<TRef>>? configure = null) where TRef : IReferenceData, new()
-        {
-            var config = new QueryFilterReferenceDataFieldConfig<TRef>(this, field, model);
-            configure?.Invoke(config);
-            _fields.Add(field, config);
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryFilterEnumFieldConfig{T}"/> to the parser for the specified <paramref name="field"/> as-is.
+    /// </summary>
+    /// <param name="field">The field name used in the query filter specified with the correct casing.</param>
+    /// <param name="configure">The optional action enabling further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddField<T>(string field, Action<QueryFilterEnumFieldConfig<T>>? configure = null) where T : notnull, Enum => AddField(field, null, configure);
 
-        /// <summary>
-        /// Adds a <see cref="QueryFilterNullFieldConfig"/> to the parser using the specified <paramref name="field"/> as-is.
-        /// </summary>
-        /// <param name="field">The field name used in the query filter.</param>
-        /// <param name="configure">The optional action to perform further field configuration.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser AddNullField(string field, Action<QueryFilterNullFieldConfig>? configure = null) => AddNullField(field, null, configure);
-
-        /// <summary>
-        /// Adds a <see cref="QueryFilterNullFieldConfig"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
-        /// </summary>
-        /// <param name="field">The field name used in the query filter.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
-        /// <param name="configure">The optional action to perform further field configuration.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser AddNullField(string field, string? model, Action<QueryFilterNullFieldConfig>? configure = null)
-        {
-            var config = new QueryFilterNullFieldConfig(this, field, model);
-            configure?.Invoke(config);
-            _fields.Add(field, config);
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryFilterEnumFieldConfig{T}"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
+    /// </summary>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+    /// <param name="configure">The optional action to perform further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddField<T>(string field, string? model, Action<QueryFilterEnumFieldConfig<T>>? configure = null) where T : notnull, Enum 
+    {
+        var config = new QueryFilterEnumFieldConfig<T>(this, field, model);
+        configure?.Invoke(config);
+        _fields.Add(field, config);
+        return this;
+    }
 
-        /// <summary>
-        /// Sets (overrides) the default LINQ <see cref="QueryStatement"/> to be used where no field filtering is specified (including defaults).
-        /// </summary>
-        public QueryFilterParser WithDefault(QueryStatement? statement) => WithDefault(statement is null ? null : () => statement);
+    /// <summary>
+    /// Adds a <see cref="QueryFilterParseableFieldConfig{T}"/> to the parser for the specified <paramref name="field"/> as-is.
+    /// </summary>
+    /// <param name="field">The field name used in the query filter specified with the correct casing.</param>
+    /// <param name="configure">The optional action enabling further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddField<T>(string field, Action<QueryFilterParseableFieldConfig<T>>? configure = null) where T : notnull, IParsable<T> => AddField(field, null, configure);
 
-        /// <summary>
-        /// Sets (overrides) the default LINQ <see cref="QueryStatement"/> function to be used where no field filtering is specified (including defaults).
-        /// </summary>
-        public QueryFilterParser WithDefault(Func<QueryStatement>? statement)
-        {
-            _defaultStatement = statement;
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryFilterParseableFieldConfig{T}"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
+    /// </summary>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+    /// <param name="configure">The optional action to perform further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddField<T>(string field, string? model, Action<QueryFilterParseableFieldConfig<T>>? configure = null) where T : notnull, IParsable<T>
+    {
+        var config = new QueryFilterParseableFieldConfig<T>(this, field, model);
+        configure?.Invoke(config);
+        _fields.Add(field, config);
+        return this;
+    }
 
-        /// <summary>
-        /// Sets (overrides) the action to be invoked where the query has been successfully parsed and is ready for execution.
-        /// </summary>
-        /// <param name="onQuery">The action to invoke.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="QueryFilterParserResult"/> can be further maintained as required.
-        /// <para>Additionally, this is an opportunity to further validate the query as needed. Throw a <see cref="QueryFilterParserException"/> to have the validation message formatted correctly and consistently.</para></remarks>
-        public QueryFilterParser OnQuery(Action<QueryFilterParserResult>? onQuery)
-        {
-            _onQuery = onQuery;
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryFilterNullFieldConfig"/> to the parser using the specified <paramref name="field"/> as-is.
+    /// </summary>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="configure">The optional action to perform further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddNullField(string field, Action<QueryFilterNullFieldConfig>? configure = null) => AddNullField(field, null, configure);
 
-        /// <summary>
-        /// Sets (override) the additional help text.
-        /// </summary>
-        /// <param name="text">The additional help text.</param>
-        /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
-        public QueryFilterParser WithHelpText(string text)
-        {
-            _helpText = text;
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryFilterNullFieldConfig"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
+    /// </summary>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+    /// <param name="configure">The optional action to perform further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddNullField(string field, string? model, Action<QueryFilterNullFieldConfig>? configure = null)
+    {
+        var config = new QueryFilterNullFieldConfig(this, field, model);
+        configure?.Invoke(config);
+        _fields.Add(field, config);
+        return this;
+    }
 
-        /// <summary>
-        /// Trys and gets the specified <paramref name="field"/> <paramref name="config"/>.
-        /// </summary>
-        /// <param name="field">The field name used in the query filter.</param>
-        /// <param name="config">The <see cref="IQueryFilterFieldConfig"/> where found.</param>
-        /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
-        public bool TryGetField(string field, [NotNullWhen(true)] out IQueryFilterFieldConfig? config) => _fields.TryGetValue(field, out config);
-
-        /// <summary>
-        /// Gets the <see cref="IQueryFilterFieldConfig"/> for the specified <paramref name="token"/> and automatically throws a <see cref="QueryFilterParserException"/> where not found.
-        /// </summary>
-        /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The <see cref="IQueryFilterFieldConfig"/>.</returns>
-        public IQueryFilterFieldConfig GetFieldConfig(QueryFilterToken token, string filter)
-        {
-            if (token.Kind != QueryFilterTokenKind.Field)
-                throw new ArgumentException($"The token must have a Kind of {QueryFilterTokenKind.Field}.", nameof(token));
+    /// <summary>
+    /// Adds a <see cref="QueryFilterNullFieldConfig"/> to the parser using the specified <paramref name="field"/> as-is.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="configure">The optional action to perform further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddReferenceDataField<TRef>(string field, Action<QueryFilterReferenceDataFieldConfig<TRef>>? configure = null) where TRef : IReferenceData, new() => AddReferenceDataField<TRef>(field, null, configure);
 
-            var name = token.GetRawToken(filter).ToString();
-            return _fields.TryGetValue(name, out var config) 
-                ? config 
-                : throw new QueryFilterParserException($"{QueryFilterTokenKind.Field} '{name}' is not supported.");
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryFilterNullFieldConfig"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/> (overrides the <see cref="QueryFilterTokenKind.Field"/> <paramref name="field"/>).
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+    /// <param name="configure">The optional action to perform further field configuration.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser AddReferenceDataField<TRef>(string field, string? model, Action<QueryFilterReferenceDataFieldConfig<TRef>>? configure = null) where TRef : IReferenceData, new() 
+    {
+        var config = new QueryFilterReferenceDataFieldConfig<TRef>(this, field, model);
+        configure?.Invoke(config);
+        _fields.Add(field, config);
+        return this;
+    }
 
-        /// <summary>
-        /// Parses and converts the <paramref name="filter"/> to dynamic LINQ.
-        /// </summary>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The <see cref="QueryFilterParserResult"/>.</returns>
-        /// <remarks>Leverages the <see cref="GetExpressions(string?)"/> to perform the actual parsing.</remarks>
-        public Result<QueryFilterParserResult> Parse(string? filter)
-        {
-            if (!string.IsNullOrEmpty(filter) && filter.Equals("help", StringComparison.OrdinalIgnoreCase))
-                return new QueryFilterParserException(ToString());
+    /// <summary>
+    /// Sets (overrides) the default LINQ <see cref="QueryStatement"/> to be used where no field filtering is specified (including defaults).
+    /// </summary>
+    public QueryFilterParser WithDefault(QueryStatement? statement) => WithDefault(statement is null ? null : () => statement);
 
-            var result = new QueryFilterParserResult();
+    /// <summary>
+    /// Sets (overrides) the default LINQ <see cref="QueryStatement"/> function to be used where no field filtering is specified (including defaults).
+    /// </summary>
+    public QueryFilterParser WithDefault(Func<QueryStatement>? statement)
+    {
+        _defaultStatement = statement;
+        return this;
+    }
 
-            try
-            {
-                // Append all the expressions to the resulting LINQ whilst parsing.
-                foreach (var expression in GetExpressions(filter))
-                {
-                    if (expression is IQueryFilterFieldStatementExpression fse)
-                    {
-                        result.Fields.Add(fse.FieldConfig.Field);
-                        if (fse.FieldConfig.ResultWriter is not null && fse.FieldConfig.ResultWriter.Invoke(fse, result))
-                            continue;
-                    }
+    /// <summary>
+    /// Sets (overrides) the action to be invoked where the query has been successfully parsed and is ready for execution.
+    /// </summary>
+    /// <param name="onQuery">The action to invoke.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <see cref="QueryFilterParserResult"/> can be further maintained as required.
+    /// <para>Additionally, this is an opportunity to further validate the query as needed. Throw a <see cref="QueryFilterParserException"/> to have the validation message formatted correctly and consistently.</para></remarks>
+    public QueryFilterParser OnQuery(Action<QueryFilterParserResult>? onQuery)
+    {
+        _onQuery = onQuery;
+        return this;
+    }
 
-                    expression.WriteToResult(result);
-                }
+    /// <summary>
+    /// Sets (override) the additional help text.
+    /// </summary>
+    /// <param name="text">The additional help text.</param>
+    /// <returns>The <see cref="QueryFilterParser"/> to support fluent-style method-chaining.</returns>
+    public QueryFilterParser WithHelpText(string text)
+    {
+        _helpText = text;
+        return this;
+    }
+
+    /// <summary>
+    /// Tries and gets the specified <paramref name="field"/> <paramref name="config"/>.
+    /// </summary>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="config">The <see cref="IQueryFilterFieldConfig"/> where found.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    public bool TryGetField(string field, [NotNullWhen(true)] out IQueryFilterFieldConfig? config) => _fields.TryGetValue(field, out config);
+
+    /// <summary>
+    /// Gets the <see cref="IQueryFilterFieldConfig"/> for the specified <paramref name="token"/> and automatically throws a <see cref="QueryFilterParserException"/> where not found.
+    /// </summary>
+    /// <param name="token">The <see cref="QueryFilterToken"/>.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The <see cref="IQueryFilterFieldConfig"/>.</returns>
+    public IQueryFilterFieldConfig GetFieldConfig(QueryFilterToken token, string filter)
+    {
+        if (token.Kind != QueryFilterTokenKind.Field)
+            throw new ArgumentException($"The token must have a Kind of {QueryFilterTokenKind.Field}.", nameof(token));
+
+        var name = token.GetRawToken(filter).ToString();
+        return _fields.TryGetValue(name, out var config) 
+            ? config 
+            : throw new QueryFilterParserException($"{QueryFilterTokenKind.Field} '{name}' is not supported.");
+    }
+
+    /// <summary>
+    /// Parses and converts the <paramref name="filter"/> to dynamic LINQ.
+    /// </summary>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The <see cref="QueryFilterParserResult"/>.</returns>
+    /// <remarks>Leverages the <see cref="GetExpressions(string?)"/> to perform the actual parsing.</remarks>
+    public QueryFilterParserResult Parse(string? filter)
+    {
+        var result = new QueryFilterParserResult(Owner);
 
-                // Append any default statements where no fields are in the filter.
-                foreach (var statement in _fields.Where(x => x.Value.DefaultStatement is not null && !result.Fields.Contains(x.Key)).Select(x => x.Value.DefaultStatement!))
+        try
+        {
+            // Append all the expressions to the resulting LINQ whilst parsing.
+            foreach (var expression in GetExpressions(filter))
+            {
+                if (expression is IQueryFilterFieldStatementExpression fse)
                 {
-                    var stmt = statement();
-                    if (stmt is not null)
-                        result.AppendStatement(stmt);
+                    result.Fields.Add(fse.FieldConfig.Field);
+                    if (fse.FieldConfig.ResultWriter is not null && fse.FieldConfig.ResultWriter.Invoke(fse, result.Writer))
+                        continue;
                 }
 
-                // Uses the default statement where no fields were specified (or defaulted).
-                result.UseDefault(_defaultStatement);
-
-                // Last chance ;-)
-                _onQuery?.Invoke(result);
+                expression.WriteAsDynamicLinq(result.Writer);
             }
-            catch (QueryFilterParserException qfpex)
+
+            // Append any default statements where no fields are in the filter.
+            foreach (var statement in _fields.Where(x => x.Value.DefaultStatement is not null && !result.Fields.Contains(x.Key)).Select(x => x.Value.DefaultStatement!))
             {
-                return qfpex;
+                var stmt = statement();
+                if (stmt is not null)
+                    result.Writer.AppendStatement(stmt);
             }
 
-            return result;
+            // Uses the default statement where no fields were specified (or defaulted).
+            result.UseDefault(_defaultStatement);
+
+            // Last chance ;-)
+            _onQuery?.Invoke(result);
+        }
+        catch (QueryFilterParserException qfpex)
+        {
+            qfpex.WithExtension("schema", owner.ToJsonSchema());
+            result.Error = qfpex;
         }
 
-        /// <summary>
-        /// Parses and gets the expressions from the <paramref name="filter"/>.
-        /// </summary>
-        /// <param name="filter">The query filter.</param>
-        /// <returns>The <see cref="QueryFilterExpressionBase"/> <see cref="IEnumerable{T}"/>.</returns>
-        public IEnumerable<QueryFilterExpressionBase> GetExpressions(string? filter)
+        return result;
+    }
+
+    /// <summary>
+    /// Parses and gets the expressions from the <paramref name="filter"/>.
+    /// </summary>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The <see cref="QueryFilterExpressionBase"/> <see cref="IEnumerable{T}"/>.</returns>
+    public IEnumerable<QueryFilterExpressionBase> GetExpressions(string? filter)
+    {
+        if (!string.IsNullOrEmpty(filter) && !string.IsNullOrWhiteSpace(filter))
         {
-            if (!string.IsNullOrEmpty(filter))
+            QueryFilterExpressionBase? current = null;
+            int expressionCount = 0;
+            bool canOpenParen = true;
+            bool canLogical = false;
+            int parenDepth = 0;
+
+            foreach (var t in GetRawTokens(filter))
             {
-                QueryFilterExpressionBase? current = null;
-                int expressionCount = 0;
-                bool canOpenParen = true;
-                bool canLogical = false;
-                int parenDepth = 0;
+                if (current is not null && !current.CanAddToken(t))
+                {
+                    yield return current;
+                    expressionCount++;
+                    current = null;
+                }
 
-                foreach (var t in GetRawTokens(filter))
+                if (current is not null)
+                    current.AddToken(t);
+                else
                 {
-                    if (current is not null && !current.CanAddToken(t))
+                    if (t.Kind == QueryFilterTokenKind.Not && expressionCount == 0)
                     {
-                        yield return current;
-                        expressionCount++;
-                        current = null;
+                        current = new QueryFilterLogicalExpression(this, filter, t);
+                        canOpenParen = true;
+                        canLogical = false;
                     }
-
-                    if (current is not null)
-                        current.AddToken(t);
-                    else
+                    else if (t.Kind == QueryFilterTokenKind.Field)
                     {
-                        if (t.Kind == QueryFilterTokenKind.Not && expressionCount == 0)
-                        {
-                            current = new QueryFilterLogicalExpression(this, filter, t);
-                            canOpenParen = true;
-                            canLogical = false;
-                        }
-                        else if (t.Kind == QueryFilterTokenKind.Field)
-                        {
-                            current = new QueryFilterOperatorExpression(this, filter, t);
-                            canOpenParen = false;
-                            canLogical = true;
-                        }
-                        else if (QueryFilterTokenKind.StringFunctions.HasFlag(t.Kind))
-                        {
-                            current = new QueryFilterStringFunctionExpression(this, filter, t);
-                            canOpenParen = false;
-                            canLogical = true;
-                        }
-                        else if (t.Kind == QueryFilterTokenKind.OpenParenthesis)
-                        {
-                            if (!canOpenParen)
-                                throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter).ToString()}' positioning that is syntactically incorrect.");
-
-                            current = new QueryFilterOpenParenthesisExpression(this, filter, t);
-                            parenDepth++;
-                            canLogical = false;
-                        }
-                        else if (t.Kind == QueryFilterTokenKind.CloseParenthesis)
-                        {
-                            if (canOpenParen)
-                                throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter).ToString()}' positioning that is syntactically incorrect.");
-
-                            if (parenDepth == 0)
-                                throw new QueryFilterParserException($"There is a closing '{t.GetRawToken(filter).ToString()}' that has no matching opening '('.");
-
-                            current = new QueryFilterCloseParenthesisExpression(this, filter, t);
-                            parenDepth--;
-                            canOpenParen = false;
-                            canLogical = true;
-                        }
-                        else if (QueryFilterTokenKind.Logical.HasFlag(t.Kind))
-                        {
-                            if (!canLogical)
-                                throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter).ToString()}' positioning that is syntactically incorrect.");
-
-                            current = new QueryFilterLogicalExpression(this, filter, t);
-                            canOpenParen = true;
-                            canLogical = false;
-                        }
-                        else
-                            throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter).ToString()}' positioning that is syntactically incorrect.");
+                        current = new QueryFilterOperatorExpression(this, filter, t);
+                        canOpenParen = false;
+                        canLogical = true;
                     }
-                }
+                    else if (QueryFilterTokenKind.StringFunctions.HasFlag(t.Kind))
+                    {
+                        current = new QueryFilterStringFunctionExpression(this, filter, t);
+                        canOpenParen = false;
+                        canLogical = true;
+                    }
+                    else if (t.Kind == QueryFilterTokenKind.OpenParenthesis)
+                    {
+                        if (!canOpenParen)
+                            throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter)}' positioning that is syntactically incorrect.");
 
-                if (current is not null)
-                {
-                    if (!current.IsComplete)
-                        throw new QueryFilterParserException("The final expression is incomplete.");
+                        current = new QueryFilterOpenParenthesisExpression(this, filter, t);
+                        parenDepth++;
+                        canLogical = false;
+                    }
+                    else if (t.Kind == QueryFilterTokenKind.CloseParenthesis)
+                    {
+                        if (canOpenParen)
+                            throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter)}' positioning that is syntactically incorrect.");
 
-                    yield return current;
-                }
+                        if (parenDepth == 0)
+                            throw new QueryFilterParserException($"There is a closing '{t.GetRawToken(filter)}' that has no matching opening '('.");
 
-                if (parenDepth != 0)
-                    throw new QueryFilterParserException("There is an opening '(' that has no matching closing ')'.");
+                        current = new QueryFilterCloseParenthesisExpression(this, filter, t);
+                        parenDepth--;
+                        canOpenParen = false;
+                        canLogical = true;
+                    }
+                    else if (QueryFilterTokenKind.Logical.HasFlag(t.Kind))
+                    {
+                        if (!canLogical)
+                            throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter)}' positioning that is syntactically incorrect.");
 
-                if (!canLogical)
+                        current = new QueryFilterLogicalExpression(this, filter, t);
+                        canOpenParen = true;
+                        canLogical = false;
+                    }
+                    else
+                        throw new QueryFilterParserException($"There is a '{t.GetRawToken(filter)}' positioning that is syntactically incorrect.");
+                }
+            }
+
+            if (current is not null)
+            {
+                if (!current.IsComplete)
                     throw new QueryFilterParserException("The final expression is incomplete.");
+
+                yield return current;
             }
+
+            if (parenDepth != 0)
+                throw new QueryFilterParserException("There is an opening '(' that has no matching closing ')'.");
+
+            if (!canLogical)
+                throw new QueryFilterParserException("The final expression is incomplete.");
         }
+    }
 
-        /// <summary>
-        /// Parses and gets the raw tokens from the filter with limited validation.
-        /// </summary>
-        private IEnumerable<QueryFilterToken> GetRawTokens(string filter)
+    /// <summary>
+    /// Parses and gets the raw tokens from the filter with limited validation.
+    /// </summary>
+    private IEnumerable<QueryFilterToken> GetRawTokens(string filter)
+    {
+        for (int i = 0; i < filter.Length; i++)
         {
-            for (int i = 0; i < filter.Length; i++)
+            if (filter[i] == '(')
             {
-                if (filter[i] == '(')
-                {
-                    yield return new QueryFilterToken(QueryFilterTokenKind.OpenParenthesis, i, 1);
-                    continue;
-                }
+                yield return new QueryFilterToken(QueryFilterTokenKind.OpenParenthesis, i, 1);
+                continue;
+            }
 
-                if (filter[i] == ')')
-                {
-                    yield return new QueryFilterToken(QueryFilterTokenKind.CloseParenthesis, i, 1);
-                    continue;
-                }
+            if (filter[i] == ')')
+            {
+                yield return new QueryFilterToken(QueryFilterTokenKind.CloseParenthesis, i, 1);
+                continue;
+            }
 
-                if (filter[i] == ',')
-                {
-                    yield return new QueryFilterToken(QueryFilterTokenKind.Comma, i, 1);
-                    continue;
-                }
+            if (filter[i] == ',')
+            {
+                yield return new QueryFilterToken(QueryFilterTokenKind.Comma, i, 1);
+                continue;
+            }
 
-                if (filter[i] == '\'')
-                {
-                    var span = filter.AsSpan()[(i + 1)..];
-                    var j = FindEndOfLiteral(ref span);
-                    if (j == -1)
-                        throw new QueryFilterParserException($"A {QueryFilterTokenKind.Literal} has not been terminated.");
-
-                    yield return new QueryFilterToken(QueryFilterTokenKind.Literal, i, j + 1);
-                    i += j;
-                    continue;
-                }
+            if (filter[i] == '\'')
+            {
+                var span = filter.AsSpan()[(i + 1)..];
+                var j = FindEndOfLiteral(ref span);
+                if (j == -1)
+                    throw new QueryFilterParserException($"A {QueryFilterTokenKind.Literal} has not been terminated.");
+
+                yield return new QueryFilterToken(QueryFilterTokenKind.Literal, i, j + 1);
+                i += j;
+                continue;
+            }
+
+            if (filter[i] != ' ')
+            {
+                var start = i;
+                var j = i + 1;
+                var backup = false;
 
-                if (filter[i] != ' ')
+                for (; j < filter.Length; j++)
                 {
-                    var start = i;
-                    var j = i + 1;
-                    var backup = false;
+                    if (filter[j] == ' ')
+                        break;
 
-                    for (; j < filter.Length; j++)
+                    if (filter[j] == '(' || filter[j] == ')' || filter[j] == ',')
                     {
-                        if (filter[j] == ' ')
-                            break;
-
-                        if (filter[j] == '(' || filter[j] == ')' || filter[j] == ',')
-                        {
-                            backup = true;
-                            break;
-                        }
+                        backup = true;
+                        break;
                     }
+                }
 
-                    var token = filter.AsSpan()[start..j];
-                    var kind = QueryFilterTokenKind.Unspecified;
+                var token = filter.AsSpan()[start..j];
+                var kind = QueryFilterTokenKind.Unspecified;
 
-                    // Determine the kind of token where possible.
-                    if (token.Length <= 10)
-                    {
-                        Span<char> lower = new char[token.Length];
-                        token.ToLowerInvariant(lower);
-
-                        kind = lower switch
-                        {
-                            "eq" => QueryFilterTokenKind.Equal,
-                            "ne" => QueryFilterTokenKind.NotEqual,
-                            "gt" => QueryFilterTokenKind.GreaterThan,
-                            "ge" => QueryFilterTokenKind.GreaterThanOrEqual,
-                            "lt" => QueryFilterTokenKind.LessThan,
-                            "le" => QueryFilterTokenKind.LessThanOrEqual,
-                            "in" => QueryFilterTokenKind.In,
-                            "true" => QueryFilterTokenKind.True,
-                            "false" => QueryFilterTokenKind.False,
-                            "null" => QueryFilterTokenKind.Null,
-                            "and" => QueryFilterTokenKind.And,
-                            "or" => QueryFilterTokenKind.Or,
-                            "not" => QueryFilterTokenKind.Not,
-                            "startswith" => QueryFilterTokenKind.StartsWith,
-                            "endswith" => QueryFilterTokenKind.EndsWith,
-                            "contains" => QueryFilterTokenKind.Contains,
-                            _ => QueryFilterTokenKind.Unspecified
-                        };
-                    }
+                // Determine the kind of token where possible.
+                if (token.Length <= 10)
+                {
+                    Span<char> lower = new char[token.Length];
+                    token.ToLowerInvariant(lower);
 
-                    if (kind == QueryFilterTokenKind.Unspecified)
-                        kind = (token.Length == 32 && Guid.TryParse(token, out _))
-                            ? QueryFilterTokenKind.Value 
-                            : (char.IsLetter(token[0]) || token[0] == '_') 
-                                ? QueryFilterTokenKind.Field 
-                                : _fields.ContainsKey(token.ToString())
-                                    ? QueryFilterTokenKind.Field
-                                    : QueryFilterTokenKind.Value;
-
-                    yield return new QueryFilterToken(kind, start, token.Length);
-                    i = backup ? j - 1 : j;
-                    continue;
+                    kind = lower switch
+                    {
+                        "eq" => QueryFilterTokenKind.Equal,
+                        "ne" => QueryFilterTokenKind.NotEqual,
+                        "gt" => QueryFilterTokenKind.GreaterThan,
+                        "ge" => QueryFilterTokenKind.GreaterThanOrEqual,
+                        "lt" => QueryFilterTokenKind.LessThan,
+                        "le" => QueryFilterTokenKind.LessThanOrEqual,
+                        "in" => QueryFilterTokenKind.In,
+                        "true" => QueryFilterTokenKind.True,
+                        "false" => QueryFilterTokenKind.False,
+                        "null" => QueryFilterTokenKind.Null,
+                        "and" => QueryFilterTokenKind.And,
+                        "or" => QueryFilterTokenKind.Or,
+                        "not" => QueryFilterTokenKind.Not,
+                        "startswith" => QueryFilterTokenKind.StartsWith,
+                        "endswith" => QueryFilterTokenKind.EndsWith,
+                        "contains" => QueryFilterTokenKind.Contains,
+                        _ => QueryFilterTokenKind.Unspecified
+                    };
                 }
+
+                if (kind == QueryFilterTokenKind.Unspecified)
+                    kind = (token.Length == 32 && Guid.TryParse(token, out _))
+                        ? QueryFilterTokenKind.Value 
+                        : (char.IsLetter(token[0]) || token[0] == '_') 
+                            ? QueryFilterTokenKind.Field 
+                            : _fields.ContainsKey(token.ToString())
+                                ? QueryFilterTokenKind.Field
+                                : QueryFilterTokenKind.Value;
+
+                yield return new QueryFilterToken(kind, start, token.Length);
+                i = backup ? j - 1 : j;
+                continue;
             }
         }
+    }
 
-        /// <summary>
-        /// Finds the end of a literal.
-        /// </summary>
-        private static int FindEndOfLiteral(ref ReadOnlySpan<char> filter)
+    /// <summary>
+    /// Finds the end of a literal.
+    /// </summary>
+    private static int FindEndOfLiteral(ref ReadOnlySpan<char> filter)
+    {
+        var inQuote = true;
+        var i = 0;
+        for (; i < filter.Length; i++)
         {
-            var inQuote = true;
-            var i = 0;
-            for (; i < filter.Length; i++)
+            if (filter[i] == '\'')
             {
-                if (filter[i] == '\'')
+                if (i < filter.Length - 1)
                 {
-                    if (i < filter.Length - 1)
+                    if (filter[i + 1] == '\'')
                     {
-                        if (filter[i + 1] == '\'')
-                        {
-                            i++;
-                            continue;
-                        }
+                        i++;
+                        continue;
                     }
-
-                    inQuote = false;
                 }
-                else if (filter[i] == ' ' || filter[i] == '(' || filter[i] == ')' || filter[i] == ',')
-                {
-                    if (!inQuote)
-                        return i;
-                }
-            }
 
-            return inQuote ? -1 : i;
+                inQuote = false;
+            }
+            else if (filter[i] == ' ' || filter[i] == '(' || filter[i] == ')' || filter[i] == ',')
+            {
+                if (!inQuote)
+                    return i;
+            }
         }
 
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (!HasFields)
-                return "Filter statement is not currently supported.";
+        return inQuote ? -1 : i;
+    }
 
-            var sb = new StringBuilder("Filter field(s) are as follows:");
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        var sb = new StringBuilder();
+
+        if (HasFields)
+        {
+            sb.Append("Filter field(s) are as follows:");
             foreach (var field in _fields)
             {
                 sb.AppendLine();
                 field.Value.AppendToString(sb);
             }
+        }
+        else
+            sb.Append("Filter statement is not currently supported.");
+
+        if (!string.IsNullOrEmpty(_helpText))
+            sb.AppendLine().AppendLine("---").Append("Note: ").Append(_helpText);
 
-            if (!string.IsNullOrEmpty(_helpText))
-                sb.AppendLine().Append(_helpText);
+        return sb.ToString();
+    }
 
-            return sb.ToString();
+    /// <summary>
+    /// Produces the JSON schema for the configured fields.
+    /// </summary>
+    /// <returns>The <see cref="JsonElement"/>.</returns>
+    public JsonElement ToJsonSchema()
+    {
+        var dict = new Dictionary<string, object?>();
+        foreach (var field in _fields)
+        {
+            dict.Add(field.Key.ToLowerInvariant(), field.Value.ToSchemaDictionary());
         }
+
+        var root = new Dictionary<string, object?>
+        {
+            { "fields", HasFields ? dict : null }
+        };
+
+        if (!string.IsNullOrEmpty(_helpText))
+            root["description"] = _helpText;
+
+        return JsonSerializer.SerializeToElement(root);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterParserException.cs b/src/CoreEx.Data/Querying/QueryFilterParserException.cs
index 08eb3722..c34df44e 100644
--- a/src/CoreEx.Data/Querying/QueryFilterParserException.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterParserException.cs
@@ -1,22 +1,13 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Localization;
-using System;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents a <see cref="QueryFilterParser"/> <see cref="ValidationException"/>.
+/// </summary>
+/// <param name="message">The error message.</param>
+public sealed class QueryFilterParserException(string message) : ValidationException(new MessageItem(MessageType.Error, message, HttpNames.QueryFilterQueryStringName), FallbackMessage)
 {
     /// <summary>
-    /// Represents a <see cref="QueryFilterParser"/> <see cref="ValidationException"/>.
+    /// Gets the default/fallback <see cref="Exception.Message"/>
     /// </summary>
-    /// <param name="message">The error message.</param>
-    public sealed class QueryFilterParserException(string message) 
-        : ValidationException(MessageItem.CreateErrorMessage(HttpConsts.QueryArgsFilterQueryStringName, message), new LText(typeof(QueryFilterParserException).FullName, FallbackMessage))
-    {
-        /// <summary>
-        /// Gets the <see cref="LText.FallbackText"/> <see cref="Exception.Message"/>
-        /// </summary>
-        internal const string FallbackMessage = "A query parsing error occurred.";
-    }
+    internal const string FallbackMessage = "A query filter parsing error occurred.";
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterParserResult.cs b/src/CoreEx.Data/Querying/QueryFilterParserResult.cs
index cc616c82..8e52b950 100644
--- a/src/CoreEx.Data/Querying/QueryFilterParserResult.cs
+++ b/src/CoreEx.Data/Querying/QueryFilterParserResult.cs
@@ -1,122 +1,79 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents the result of a <see cref="QueryFilterParser.Parse(string?)"/>.
+/// </summary>
+public sealed class QueryFilterParserResult : IQueryParseError
 {
     /// <summary>
-    /// Represents the result of a <see cref="QueryFilterParser.Parse(string?)"/>.
+    /// Initializes a new instance of the <see cref="QueryFilterParserResult"/> class.
     /// </summary>
-    public sealed class QueryFilterParserResult
+    internal QueryFilterParserResult(QueryArgsConfig config)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryFilterParserResult"/> that is a success.
-        /// </summary>
-        internal QueryFilterParserResult() { }
-
-        /// <summary>
-        /// Gets the field names referenced within the resulting LINQ query.
-        /// </summary>
-        public HashSet<string> Fields { get; } = [];
-
-        /// <summary>
-        /// Gets the resulting dynamic LINQ filter <see cref="StringBuilder"/>.
-        /// </summary>
-        internal StringBuilder FilterBuilder { get; } = new StringBuilder();
-
-        /// <summary>
-        /// Gets the resulting arguments referenced by the <see cref="FilterBuilder"/>.
-        /// </summary>
-        public List<object?> Args { get; } = [];
+        Config = config.ThrowIfNull();
+        Writer = new(Config);
+    }
 
-        /// <summary>
-        /// Provides the resulting dynamic LINQ filter.
-        /// </summary>
-        public string? ToLinqString() => FilterBuilder.ToString();
+    /// <summary>
+    /// Gets the owning <see cref="QueryArgsConfig"/>.
+    /// </summary>
+    public QueryArgsConfig Config { get; }
 
-        /// <summary>
-        /// Appends a value to the <see cref="FilterBuilder"/> as a placeholder and adds into the <see cref="Args"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        public void AppendValue(object? value)
-        {
-            Args.Add(value);
-            FilterBuilder.Append($"@{Args.Count - 1}");
-        }
+    /// <inheritdoc/>
+    public bool HasError => Error is not null;
 
-        /// <summary>
-        /// Appends a <paramref name="char"/> to the <see cref="FilterBuilder"/>.
-        /// </summary>
-        /// <param name="char">The chararater to append.</param>
-        /// <remarks>Also appends a space if required.</remarks>
-        internal void Append(char @char)
-        {
-            if (FilterBuilder.Length > 0 && FilterBuilder[^1] != ' ' && FilterBuilder[^1] != '!' && FilterBuilder[^1] != '(')
-            {
-                if (!(@char == ')' && FilterBuilder[^1] == ')'))
-                    FilterBuilder.Append(' ');
-            }
+    /// <summary>
+    /// Throws the <see cref="Error"/> where <see cref="HasError"/>; otherwise, does nothing.
+    /// </summary>
+    public QueryFilterParserResult ThrowOnError() => HasError ? throw Error! : this;
 
-            FilterBuilder.Append(@char);
-        }
+    /// <inheritdoc/>
+    ExtendedException? IQueryParseError.Error => Error;
 
-        /// <summary>
-        /// Appends a <paramref name="span"/> to the <see cref="FilterBuilder"/>.
-        /// </summary>
-        /// <param name="span">The span.</param>
-        /// <remarks>Also appends a space if required.</remarks>
-        internal void Append(ReadOnlySpan<char> span)
-        {
-            if (FilterBuilder.Length > 0 && FilterBuilder[^1] != ' ' && FilterBuilder[^1] != '!' && FilterBuilder[^1] != '(')
-                FilterBuilder.Append(' ');
+    /// <summary>
+    /// Gets the error represented as an <see cref="QueryFilterParserException"/> that occurred during parsing, if any.
+    /// </summary>
+    public QueryFilterParserException? Error { get; internal set; }
 
-            FilterBuilder.Append(span);
-        }
+    /// <summary>
+    /// Gets the field names referenced within the resulting LINQ query.
+    /// </summary>
+    public HashSet<string> Fields { get; } = [];
 
-        /// <summary>
-        /// Appends a <paramref name="statement"/> to the <see cref="FilterBuilder"/>.
-        /// </summary>
-        /// <param name="statement">The <see cref="QueryStatement"/>.</param>
-        /// <remarks>Also appends an '<c> &amp;&amp; </c>' (and) prior to the <paramref name="statement"/> where neccessary.</remarks>
-        public void AppendStatement(QueryStatement statement)
-        {
-            statement.ThrowIfNull(nameof(statement));
-            if (FilterBuilder.Length > 0)
-                FilterBuilder.Append(" && ");
+    /// <summary>
+    /// Gets the <see cref="QueryFilterParserWriter"/>.
+    /// </summary>
+    public QueryFilterParserWriter Writer { get; }
 
-            var sb = new StringBuilder(statement.Statement);
-            for (int i = 0; i < statement.Args.Length; i++)
-            {
-                sb.Replace($"@{i}", $"@{Args.Count}");
-                Args.Add(statement.Args[i]);
-            }
+    /// <summary>
+    /// Provides the resulting dynamic LINQ filter and corresponding <paramref name="args"/>.
+    /// </summary>
+    public string? ToLinqString(out object?[] args)
+    {
+        args = [.. Writer.Args];
+        return Writer.ToString();
+    }
 
-            FilterBuilder.Append(sb);
-        }
+    /// <summary>
+    /// Defaults the dynamic LINQ (see <see cref="ToLinqString(out object?[])"/>) with the specified <paramref name="statement"/> where not already set.
+    /// </summary>
+    /// <param name="statement">The <see cref="QueryStatement"/>.</param>
+    public void UseDefault(QueryStatement? statement) => UseDefault(statement is null ? null : () => statement);
 
-        /// <summary>
-        /// Defaults the <see cref="FilterBuilder"/> with the specified <paramref name="statement"/> where not already set.
-        /// </summary>
-        /// <param name="statement">The <see cref="QueryStatement"/>.</param>
-        public void UseDefault(QueryStatement? statement) => UseDefault(statement is null ? null : () => statement);
+    /// <summary>
+    /// Defaults the dynamic LINQ (see <see cref="ToLinqString(out object?[])"/>) with the specified <paramref name="statement"/> function where not already set.
+    /// </summary>
+    /// <param name="statement">The <see cref="QueryStatement"/> function.</param>
+    public void UseDefault(Func<QueryStatement>? statement)
+    {
+        if (Writer.FilterBuilder.Length > 0)
+            return;
 
-        /// <summary>
-        /// Defaults the <see cref="FilterBuilder"/> with the specified <paramref name="statement"/> function where not already set.
-        /// </summary>
-        /// <param name="statement">The <see cref="QueryStatement"/> function.</param>
-        public void UseDefault(Func<QueryStatement>? statement)
+        var stmt = statement?.Invoke();
+        if (stmt is not null)
         {
-            if (FilterBuilder.Length > 0)
-                return;
-
-            var stmt = statement?.Invoke();
-            if (stmt is not null)
-            {
-                FilterBuilder.Append(stmt.Statement);
-                Args.AddRange(stmt.Args);
-            }
+            Writer.Append(stmt.Statement);
+            Writer.Args.AddRange(stmt.Args);
         }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterParserWriter.cs b/src/CoreEx.Data/Querying/QueryFilterParserWriter.cs
new file mode 100644
index 00000000..dff5e356
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryFilterParserWriter.cs
@@ -0,0 +1,103 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Represents the resulting dynamic LINQ filter writer.
+/// </summary>
+public class QueryFilterParserWriter
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="QueryFilterParserWriter"/> class.
+    /// </summary>
+    /// <param name="config">The owning <see cref="QueryArgsConfig"/>.</param>
+    internal QueryFilterParserWriter(QueryArgsConfig config) => Config = config.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the owning <see cref="QueryArgsConfig"/>.
+    /// </summary>
+    public QueryArgsConfig Config { get; }
+
+    /// <summary>
+    /// Gets the resulting dynamic LINQ filter <see cref="StringBuilder"/>.
+    /// </summary>
+    internal StringBuilder FilterBuilder { get; } = new();
+
+    /// <summary>
+    /// Gets the resulting arguments referenced by the <see cref="FilterBuilder"/>.
+    /// </summary>
+    internal List<object?> Args { get; } = [];
+
+    /// <summary>
+    /// Appends a <paramref name="char"/> to the <see cref="FilterBuilder"/> prepended with a space if required.
+    /// </summary>
+    /// <param name="char">The chararater to append.</param>
+    /// <remarks>Also appends a space if required.</remarks>
+    internal void AppendWithSpacing(char @char)
+    {
+        if (FilterBuilder.Length > 0 && FilterBuilder[^1] != ' ' && FilterBuilder[^1] != '!' && FilterBuilder[^1] != '(')
+        {
+            if (!(@char == ')' && FilterBuilder[^1] == ')'))
+                FilterBuilder.Append(' ');
+        }
+
+        FilterBuilder.Append(@char);
+    }
+
+    /// <summary>
+    /// Appends a <paramref name="span"/> to the <see cref="FilterBuilder"/> prepended with a space if required.
+    /// </summary>
+    /// <param name="span">The span.</param>
+    /// <remarks>Also appends a space if required.</remarks>
+    internal void AppendWithSpacing(ReadOnlySpan<char> span)
+    {
+        if (FilterBuilder.Length > 0 && FilterBuilder[^1] != ' ' && FilterBuilder[^1] != '!' && FilterBuilder[^1] != '(')
+            FilterBuilder.Append(' ');
+
+        FilterBuilder.Append(span);
+    }
+
+    /// <summary>
+    /// Appends a <paramref name="value"/> to the underlying dynamic LINQ statement as a placeholder, and captures the corresponding argument value.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    public void AppendValue(object? value)
+    {
+        Args.Add(value);
+        FilterBuilder.Append($"@{Args.Count - 1}");
+    }
+
+    /// <summary>
+    /// Appends the <paramref name="char"/> as-is to the underlying dynamic LINQ statement.
+    /// </summary>
+    /// <param name="char">The character.</param>
+    public void Append(char @char) => FilterBuilder.Append(@char);
+
+    /// <summary>
+    /// Appends the <paramref name="span"/> as-is to the underlying dynamic LINQ statement.
+    /// </summary>
+    /// <param name="span">The span.</param>
+    public void Append(ReadOnlySpan<char> span) => FilterBuilder.Append(span);
+
+    /// <summary>
+    /// Appends a <paramref name="statement"/> to the underlying dynamic LINQ statement.
+    /// </summary>
+    /// <param name="statement">The <see cref="QueryStatement"/>.</param>
+    /// <remarks>Also appends an '<c> &amp;&amp; </c>' (and) prior to the <paramref name="statement"/> where neccessary.</remarks>
+    public void AppendStatement(QueryStatement statement)
+    {
+        statement.ThrowIfNull();
+        if (FilterBuilder.Length > 0)
+            FilterBuilder.Append(" && ");
+
+        var sb = new StringBuilder(statement.Statement);
+        for (int i = 0; i < statement.Args.Length; i++)
+        {
+            sb.Replace($"@{i}", $"@{Args.Count}");
+            Args.Add(statement.Args[i]);
+        }
+
+        FilterBuilder.Append(sb);
+    }
+
+    /// <inheritdoc/>
+    public override string? ToString() => FilterBuilder.Length == 0 ? null : FilterBuilder.ToString();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterReferenceDataFieldConfig.cs b/src/CoreEx.Data/Querying/QueryFilterReferenceDataFieldConfig.cs
deleted file mode 100644
index 9ca6f9f0..00000000
--- a/src/CoreEx.Data/Querying/QueryFilterReferenceDataFieldConfig.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Data.Querying.Expressions;
-using CoreEx.Entities;
-using CoreEx.RefData;
-using System;
-
-namespace CoreEx.Data.Querying
-{
-    /// <summary>
-    /// Provides the <see cref="QueryFilterParser"/> <see cref="IReferenceData"/> field configuration.
-    /// </summary>
-    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    /// <remarks>Defaults the <see cref="QueryFilterFieldConfigBase.Operators"/> to <see cref="QueryFilterOperator.EqualityOperators"/> only.</remarks>
-    public class QueryFilterReferenceDataFieldConfig<TRef> : QueryFilterFieldConfigBase<QueryFilterFieldConfig<TRef>> where TRef : IReferenceData, new()
-    {
-        private bool _useIdentifier;
-        private bool _mustBeValid = true;
-        private Func<TRef, TRef>? _valueFunc;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryFilterReferenceDataFieldConfig{TRef}"/> class.
-        /// </summary>
-        /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
-        /// <param name="field">The field name.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-        public QueryFilterReferenceDataFieldConfig(QueryFilterParser parser, string field, string? model) : base(parser, typeof(TRef), field, model)
-        {
-            Operators = QueryFilterOperator.EqualityOperators;
-            IsTypeString = true;
-        }
-
-        /// <summary>
-        /// Indicates that the <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> is to be used as the value for the query (versus the originating filter value being the <see cref="IReferenceData.Code"/>).
-        /// </summary>
-        /// <returns>The <see cref="QueryFilterFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This will automatically set the <see cref="QueryFilterFieldConfigBase.Operators"/> to be <see cref="QueryFilterOperator.EqualityOperators"/> only as other operators are nonsensical in this context.</remarks>
-        public QueryFilterReferenceDataFieldConfig<TRef> UseIdentifier()
-        {
-            _useIdentifier = true;
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates that the resulting converted value must be <see cref="IReferenceData.IsValid"/>.
-        /// </summary>
-        /// <param name="mustBeValid"><see langword="true"/> indicates that an error will occur where not valid; otherwise, <see langword="false"/>.</param>
-        /// <returns>The <see cref="QueryFilterFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Defaults to <see langword="true"/>.</remarks>
-        public QueryFilterReferenceDataFieldConfig<TRef> MustBeValid(bool mustBeValid = true)
-        {
-            _mustBeValid = mustBeValid;
-            return this;
-        }
-
-        /// <summary>
-        /// Sets (overrides) the <paramref name="value"/> function to, a) further convert the field <typeparamref name="TRef"/> value; and/or, b) to provide additional validation.
-        /// </summary>
-        /// <param name="value">The value function.</param>
-        /// <returns>The final value that will be used in the LINQ query.</returns>
-        /// <remarks>This is an opportunity to further validate the query as needed. Throw a <see cref="FormatException"/> to have the validation message formatted correctly and consistently.</remarks>
-        public QueryFilterReferenceDataFieldConfig<TRef> WithValue(Func<TRef, TRef>? value)
-        {
-            _valueFunc = value;
-            return this;
-        }
-
-        /// <inheritdoc/>
-        protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter)
-        {
-            var text = field.GetValueToken(filter);
-            TRef value = ReferenceDataOrchestrator.ConvertFromCode<TRef>(text);
-
-            if (_mustBeValid && !value.IsValid)
-                throw new FormatException($"Not a valid {typeof(TRef).Name}.");
-
-            if (_valueFunc is not null)
-                value = _valueFunc.Invoke(value) ?? throw new FormatException($"Not a valid {typeof(TRef).Name}.");
-
-            return _useIdentifier
-                ? (value.Id is null ? string.Empty : value.Id)
-                : value.Code!;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterReferenceDataFieldConfigT.cs b/src/CoreEx.Data/Querying/QueryFilterReferenceDataFieldConfigT.cs
new file mode 100644
index 00000000..6a87db5b
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryFilterReferenceDataFieldConfigT.cs
@@ -0,0 +1,48 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Provides the <see cref="QueryFilterParser"/> <see cref="IReferenceData"/> field configuration.
+/// </summary>
+/// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+/// <remarks>Defaults the <see cref="QueryFilterFieldConfigBase.Operators"/> to <see cref="QueryFilterOperator.EqualityOperators"/> only.</remarks>
+public class QueryFilterReferenceDataFieldConfig<TRef> : QueryFilterFieldConfigBase<QueryFilterReferenceDataFieldConfig<TRef>> where TRef : IReferenceData, new()
+{
+    private bool _mustBeActive;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="QueryFilterReferenceDataFieldConfig{TRef}"/> class.
+    /// </summary>
+    /// <param name="parser">The owning <see cref="QueryFilterParser"/>.</param>
+    /// <param name="field">The field name.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>).</param>
+    public QueryFilterReferenceDataFieldConfig(QueryFilterParser parser, string field, string? model) : base(parser, typeof(TRef), field, model)
+    {
+        Operators = QueryFilterOperator.EqualityOperators;
+        FieldType = QueryFilterFieldType.String;
+    }
+
+    /// <summary>
+    /// Indicates that the resulting converted value must be <see cref="IReferenceData.IsActive"/>.
+    /// </summary>
+    /// <param name="mustBeActive"><see langword="true"/> indicates that an error will occur where not active; otherwise, <see langword="false"/>.</param>
+    /// <returns>The <see cref="QueryFilterReferenceDataFieldConfig{T}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Defaults to <see langword="true"/>.</remarks>
+    public QueryFilterReferenceDataFieldConfig<TRef> MustBeActive(bool mustBeActive = true)
+    {
+        _mustBeActive = mustBeActive;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    protected override object ConvertToValue(QueryFilterToken operation, QueryFilterToken field, string filter)
+    {
+        var code = field.GetValueToken(filter);
+        if (!ReferenceDataOrchestrator.TryGetByCode<TRef>(code, out var rd) || !rd.IsValid)
+            throw new FormatException($"Not a valid {typeof(TRef).Name}.");
+
+        if (!rd.IsActive && _mustBeActive)
+            throw new FormatException($"Not an active {typeof(TRef).Name}.");
+
+        return rd.Code!;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryFilterSchemaType.cs b/src/CoreEx.Data/Querying/QueryFilterSchemaType.cs
new file mode 100644
index 00000000..b1926927
--- /dev/null
+++ b/src/CoreEx.Data/Querying/QueryFilterSchemaType.cs
@@ -0,0 +1,34 @@
+namespace CoreEx.Data.Querying;
+
+/// <summary>
+/// Represents the schema type for a <see cref="QueryFilterFieldType"/>.
+/// </summary>
+/// <remarks>This is used to define the schema data type of the field in the query filter similar to the <see href="https://swagger.io/docs/specification/v3_0/data-models/data-types/">OpenAPI specification</see>.</remarks>
+public enum QueryFilterSchemaType
+{
+    /// <summary>
+    /// Indicates a <see cref="string"/>.
+    /// </summary>
+    String,
+
+    /// <summary>
+    /// Indicates a <see cref="double"/> or <see cref="decimal"/>.
+    /// </summary>
+    Number,
+    
+    /// <summary>
+    /// Indicates a <see cref="int"/> or <see cref="long"/>.
+    /// </summary>
+    Integer,
+
+    /// <summary>
+    /// Indicates a <see cref="bool"/>.
+    /// </summary>
+    Boolean,
+
+    /// <summary>
+    /// Indicates an object; as distinct from primitive types.
+    /// </summary>
+    /// <remarks>This is a special case specifically for <see cref="QueryFilterNullFieldConfig"/>.</remarks>
+    Object
+}
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryOrderByDirection.cs b/src/CoreEx.Data/Querying/QueryOrderByDirection.cs
index 1609091f..f3cc4404 100644
--- a/src/CoreEx.Data/Querying/QueryOrderByDirection.cs
+++ b/src/CoreEx.Data/Querying/QueryOrderByDirection.cs
@@ -1,28 +1,23 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using System;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Provides the query order-by direction.
+/// </summary>
+[Flags]
+public enum QueryOrderByDirection
 {
     /// <summary>
-    /// Provides the query order-by direction.
+    /// Ascending order.
     /// </summary>
-    [Flags]
-    public enum QueryOrderByDirection
-    {
-        /// <summary>
-        /// Ascending order.
-        /// </summary>
-        Ascending = 1,
+    Ascending = 1,
 
-        /// <summary>
-        /// Descending order.
-        /// </summary>
-        Descending = 2,
+    /// <summary>
+    /// Descending order.
+    /// </summary>
+    Descending = 2,
 
-        /// <summary>
-        /// Both <see cref="Ascending"/> and <see cref="Descending"/> order.
-        /// </summary>
-        Both = Ascending | Descending
-    }
+    /// <summary>
+    /// Both <see cref="Ascending"/> and <see cref="Descending"/> order.
+    /// </summary>
+    Both = Ascending | Descending
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryOrderByFieldConfig.cs b/src/CoreEx.Data/Querying/QueryOrderByFieldConfig.cs
index fda009fb..51d52ca2 100644
--- a/src/CoreEx.Data/Querying/QueryOrderByFieldConfig.cs
+++ b/src/CoreEx.Data/Querying/QueryOrderByFieldConfig.cs
@@ -1,65 +1,124 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Provides the <see cref="QueryOrderByParser"/> field configuration.
+/// </summary>
+/// <param name="parser">The owning <see cref="QueryOrderByParser"/>.</param>
+/// <param name="field">The field name.</param>
+/// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
+public sealed class QueryOrderByFieldConfig(QueryOrderByParser parser, string field, string? model)
 {
+    private readonly string? _model = model;
+
+    /// <summary>
+    /// Gets the owning <see cref="QueryFilterParser"/>.
+    /// </summary>
+    public QueryOrderByParser Parser { get; internal set; } = parser.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the field name.
+    /// </summary>
+    public string Field { get; } = field.ThrowIfNullOrEmpty(nameof(field));
+
+    /// <summary>
+    /// Gets or sets model name to be used for the dynamic LINQ expression.
+    /// </summary>
+    /// <remarks>Defaults to the <see cref="Field"/> name.</remarks>
+    public string? Model => _model ?? Field;
+
+    /// <summary>
+    /// Gets the optional prefix to be used where referencing the underlying <see cref="IQueryable{T}"/> model.
+    /// </summary>
+    /// <remarks>This will default from <see cref="QueryOrderByParser.DefaultModelPrefix"/> when instantiated.</remarks>
+    public string? ModelPrefix { get; private set; }
+
+    /// <summary>
+    /// Gets the fully-qualified <see cref="Model"/> name (including any <see cref="ModelPrefix"/> where specified).
+    /// </summary>
+    public string FullyQualifiedModelName => (ModelPrefix is null ? string.Empty : ModelPrefix + ".") + Model;
+
+    /// <summary>
+    /// Gets the supported <see cref="QueryOrderByDirection"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="QueryOrderByDirection.Both"/>.</remarks>
+    public QueryOrderByDirection Direction { get; private set; } = QueryOrderByDirection.Both;
+
+    /// <summary>
+    /// Gets the default <see cref="QueryOrderByDirection"/>.
+    /// </summary>
+    public QueryOrderByDirection? DefaultDirection { get; private set; }
+
+    /// <summary>
+    /// Indicates whether the field is to always be included in the query ordering.
+    /// </summary>
+    /// <remarks>Where not explicitly specified in the order by statement, this field will be included as the last order-by field.</remarks>
+    public bool IsAlwaysInclude => AlwaysIncludeDirection.HasValue;
+
+    /// <summary>
+    /// Gets the <see cref="QueryOrderByDirection"/> to be always included in the query ordering.
+    /// </summary>
+    /// <remarks>Where not explicitly specified in the order by statement, this field will be included as the last order-by field.</remarks>
+    public QueryOrderByDirection? AlwaysIncludeDirection { get; private set; }
+
+    /// <summary>
+    /// Gets the additional help text.
+    /// </summary>
+    public string? HelpText { get; private set; }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="Direction"/>.
+    /// </summary>
+    /// <param name="supportedDirection">The <see cref="QueryOrderByDirection"/>.</param>
+    /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The default is <see cref="QueryOrderByDirection.Both"/>.</remarks>
+    public QueryOrderByFieldConfig WithDirection(QueryOrderByDirection supportedDirection)
+    {
+        Direction = supportedDirection;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the optional <see cref="ModelPrefix"/> to be used where referencing the underlying <see cref="IQueryable{T}"/> model.
+    /// </summary>
+    /// <param name="modelPrefix">The model prefix.</param>
+    /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
+    public QueryOrderByFieldConfig WithModelPrefix(string? modelPrefix = null)
+    {
+        ModelPrefix = modelPrefix;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the default order-by and its <see cref="QueryOrderByDirection"/>.
+    /// </summary>
+    /// <param name="defaultDirection">The default <see cref="QueryOrderByDirection"/>.</param>
+    /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is used to define the overall default query ordering when none is specified; each field must also be defined in the order in which they are applied. By not specifying a field then this denotes
+    /// that it is not to be included in the default query ordering.</remarks>
+    public QueryOrderByFieldConfig WithDefault(QueryOrderByDirection defaultDirection = QueryOrderByDirection.Ascending)
+    {
+        DefaultDirection = defaultDirection.ThrowWhen(defaultDirection => defaultDirection == QueryOrderByDirection.Both, $"Default direction cannot be '{QueryOrderByDirection.Both}'.");
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the always included in the query ordering and its <see cref="QueryOrderByDirection"/>.
+    /// </summary>
+    /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
+    public QueryOrderByFieldConfig WithAlwaysInclude(QueryOrderByDirection alwaysDirection = QueryOrderByDirection.Ascending)
+    {
+        AlwaysIncludeDirection = alwaysDirection.ThrowWhen(alwaysDirection => alwaysDirection == QueryOrderByDirection.Both, $"Always include direction cannot be '{QueryOrderByDirection.Both}'.");
+        return this;
+    }
+
     /// <summary>
-    /// Provides the <see cref="QueryOrderByParser"/> field configuration.
+    /// Sets (overrides) the additional help text.
     /// </summary>
-    /// <param name="parser">The owning <see cref="QueryOrderByParser"/>.</param>
-    /// <param name="field">The field name.</param>
-    /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-    public sealed class QueryOrderByFieldConfig(QueryOrderByParser parser, string field, string? model)
+    /// <param name="text">The additional help text.</param>
+    /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
+    public QueryOrderByFieldConfig WithHelpText(string text)
     {
-        private readonly string? _model = model;
-
-        /// <summary>
-        /// Gets the owning <see cref="QueryFilterParser"/>.
-        /// </summary>
-        public QueryOrderByParser Parser { get; internal set; } = parser.ThrowIfNull(nameof(parser));
-
-        /// <summary>
-        /// Gets the field name.
-        /// </summary>
-        public string Field { get; } = field.ThrowIfNullOrEmpty(nameof(field));
-
-        /// <summary>
-        /// Gets or sets model name to be used for the dynamic LINQ expression.
-        /// </summary>
-        /// <remarks>Defaults to the <see cref="Field"/> name.</remarks>
-        public string? Model => _model ?? Field;
-
-        /// <summary>
-        /// Gets the supported <see cref="QueryOrderByDirection"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="QueryOrderByDirection.Both"/>.</remarks>
-        public QueryOrderByDirection Direction { get; private set; } = QueryOrderByDirection.Both;
-
-        /// <summary>
-        /// Gets the additional help text.
-        /// </summary>
-        public string? HelpText { get; private set; }
-
-        /// <summary>
-        /// Sets (overrides) the <see cref="Direction"/>.
-        /// </summary>
-        /// <param name="supportedDirection">The <see cref="QueryOrderByDirection"/>.</param>
-        /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The default is <see cref="QueryOrderByDirection.Both"/>.</remarks>
-        public QueryOrderByFieldConfig WithDirection(QueryOrderByDirection supportedDirection)
-        {
-            Direction = supportedDirection;
-            return this;
-        }
-
-        /// <summary>
-        /// Sets (overrides) the additional help text.
-        /// </summary>
-        /// <param name="text">The additional help text.</param>
-        /// <returns>The <see cref="QueryOrderByFieldConfig"/> to support fluent-style method-chaining.</returns>
-        public QueryOrderByFieldConfig WithHelpText(string text)
-        {
-            HelpText = text.ThrowIfNullOrEmpty(nameof(text));
-            return this;
-        }
+        HelpText = text.ThrowIfNullOrEmpty(nameof(text));
+        return this;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryOrderByParser.cs b/src/CoreEx.Data/Querying/QueryOrderByParser.cs
index c7c792ae..90c682eb 100644
--- a/src/CoreEx.Data/Querying/QueryOrderByParser.cs
+++ b/src/CoreEx.Data/Querying/QueryOrderByParser.cs
@@ -1,140 +1,145 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents a basic query sort order by parser and LINQ translator with explicitly defined field support.
+/// </summary>
+/// <remarks>This is <b>not</b> intended to be a replacement for OData, GraphQL, etc. but to provide a limited, explicitly supported, dynamic capability to sort an underlying query.</remarks>
+/// <param name="owner">The owning <see cref="QueryArgsConfig"/>.</param>
+public sealed class QueryOrderByParser(QueryArgsConfig owner)
 {
+    private readonly List<QueryOrderByFieldConfig> _fields = [];
+    private Action<string[]>? _validator;
+    private string? _helpText;
+    private string? _defaultOrderBy;
+    private string? _defaultOrderByStatement;
+
+    /// <summary>
+    /// Gets the owning <see cref="QueryArgsConfig"/>.
+    /// </summary>
+    public QueryArgsConfig Owner => owner.ThrowIfNull();
+
+    /// <summary>
+    /// Indicates that at least a single field has been configured.
+    /// </summary>
+    public bool HasFields => _fields.Count > 0;
+
+    /// <summary>
+    /// Gets the default <i>OData-like</i> <c>$orderby</c> statement.
+    /// </summary>
+    public string? DefaultOrderBy => _defaultOrderBy ??= string.Join(", ", _fields.Where(f => f.DefaultDirection is not null).Select(f => f.Field.ToLowerInvariant() + (f.DefaultDirection == QueryOrderByDirection.Ascending ? " asc" : "desc")));
+
     /// <summary>
-    /// Represents a basic query sort order by parser and LINQ translator with explicitly defined field support.
+    /// Gets the default model prefix (if any).
     /// </summary>
-    /// <remarks>This is <b>not</b> intended to be a replacement for OData, GraphQL, etc. but to provide a limited, explicitly supported, dynamic capability to sort an underlying query.</remarks>
-    /// <param name="owner">The owning <see cref="QueryArgsConfig"/>.</param>
-    public sealed class QueryOrderByParser(QueryArgsConfig owner)
+    /// <remarks>This will be automatically applied to all subsequent field additions; for example <see cref="AddField(string, string?, Action{QueryOrderByFieldConfig}?)"/>.</remarks>
+    public string? DefaultModelPrefix { get; private set; }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="DefaultModelPrefix"/> (if any).
+    /// </summary>
+    /// <param name="modelPrefix"></param>
+    /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
+    public QueryOrderByParser WithDefaultModelPrefix(string? modelPrefix = null)
     {
-        private readonly Dictionary<string, QueryOrderByFieldConfig> _fields = new(StringComparer.OrdinalIgnoreCase);
-        private Action<string[]>? _validator;
-        private string? _helpText;
-
-        /// <summary>
-        /// Gets the owning <see cref="QueryArgsConfig"/>.
-        /// </summary>
-        public QueryArgsConfig Owner => owner.ThrowIfNull(nameof(owner));
-
-        /// <summary>
-        /// Gets the default order-by dynamic LINQ statement.
-        /// </summary>
-        /// <remarks>To avoid unnecessary parsing this should be specified as a valid dynamic LINQ statement.</remarks>
-        public string? DefaultOrderBy { get; private set; }
-
-        /// <summary>
-        /// Indicates that at least a single field has been configured.
-        /// </summary>
-        public bool HasFields => _fields.Count > 0;
-
-        /// <summary>
-        /// Adds a <see cref="QueryOrderByFieldConfig"/> to the parser for the specified <paramref name="field"/> as-is.
-        /// </summary>
-        /// <param name="field">The field name used in the order by specified with the correct casing.</param>
-        /// <param name="configure">The optional action enabling further field configuration.</param>
-        /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>To avoid unnecessary parsing this should be the valid dynamic LINQ statement.</remarks>
-        public QueryOrderByParser AddField(string field, Action<QueryOrderByFieldConfig>? configure = null) => AddField(field, null, configure);
-
-        /// <summary>
-        /// Adds a <see cref="QueryOrderByFieldConfig"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/>.
-        /// </summary>
-        /// <param name="field">The field name used in the query filter.</param>
-        /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
-        /// <param name="configure">The optional action enabling further field configuration.</param>
-        /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
-        public QueryOrderByParser AddField(string field, string? model, Action<QueryOrderByFieldConfig>? configure = null)
-        {
-            var config = new QueryOrderByFieldConfig(this, field, model);
-            configure?.Invoke(config);
-            _fields.Add(field, config);
-            return this;
-        }
+        DefaultModelPrefix = modelPrefix;
+        return this;
+    }
 
-        /// <summary>
-        /// Sets (overrides) the default order-by dynamic LINQ statement.
-        /// </summary>
-        /// <param name="defaultOrderBy">The default order-by statement used where not explicitly specified (see <see cref="CoreEx.Entities.QueryArgs.OrderBy"/>.).</param>
-        /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>To avoid unnecessary parsing this should be specified as a valid dynamic LINQ statement.</remarks>
-        public QueryOrderByParser WithDefault(string? defaultOrderBy)
-        {
-            DefaultOrderBy = defaultOrderBy.ThrowIfEmpty(nameof(defaultOrderBy));
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryOrderByFieldConfig"/> to the parser for the specified <paramref name="field"/> as-is.
+    /// </summary>
+    /// <param name="field">The field name used in the order by specified with the correct casing.</param>
+    /// <param name="configure">The optional action enabling further field configuration.</param>
+    /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>To avoid unnecessary parsing this should be the valid dynamic LINQ statement.</remarks>
+    public QueryOrderByParser AddField(string field, Action<QueryOrderByFieldConfig>? configure = null) => AddField(field, null, configure);
 
-        /// <summary>
-        /// Sets (override) the additional help text.
-        /// </summary>
-        /// <param name="text">The additional help text.</param>
-        /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
-        public QueryOrderByParser WithHelpText(string text)
-        {
-            _helpText = text;
-            return this;
-        }
+    /// <summary>
+    /// Adds a <see cref="QueryOrderByFieldConfig"/> to the parser using the specified <paramref name="field"/> and <paramref name="model"/>.
+    /// </summary>
+    /// <param name="field">The field name used in the query filter.</param>
+    /// <param name="model">The model name (defaults to <paramref name="field"/>.</param>
+    /// <param name="configure">The optional action enabling further field configuration.</param>
+    /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
+    public QueryOrderByParser AddField(string field, string? model, Action<QueryOrderByFieldConfig>? configure = null)
+    {
+        var config = new QueryOrderByFieldConfig(this, field, model);
 
-        /// <summary>
-        /// Sets (overrides) a <paramref name="validator"/> that can be used to further validate the fields specified in the order by.
-        /// </summary>
-        /// <param name="validator">The validator action.</param>
-        /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Throw a <see cref="QueryOrderByParserException"/> to have the validation message formatted correctly and consistently.
-        /// <para>The <c>string[]</c> passed into the validator will contain the parsed fields (names) in the order in which they were specified.</para></remarks>
-        public QueryOrderByParser WithValidator(Action<string[]>? validator)
-        {
-            _validator = validator;
-            return this;
-        }
+        field.ThrowWhen(field => _fields.Any(f => f.Field.Equals(field, StringComparison.OrdinalIgnoreCase)), $"The order-by field '{field}' has already been added and must be unique.");
+
+        config.WithModelPrefix(DefaultModelPrefix);
+        configure?.Invoke(config);
+        _fields.Add(config);
+
+        _defaultOrderBy = null;
+        _defaultOrderByStatement = null;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (override) the additional help text.
+    /// </summary>
+    /// <param name="text">The additional help text.</param>
+    /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
+    public QueryOrderByParser WithHelpText(string text)
+    {
+        _helpText = text;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) a <paramref name="validator"/> that can be used to further validate the fields specified in the order by.
+    /// </summary>
+    /// <param name="validator">The validator action.</param>
+    /// <returns>The <see cref="QueryOrderByParser"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Throw a <see cref="QueryOrderByParserException"/> to have the validation message formatted correctly and consistently.
+    /// <para>The <c>string[]</c> passed into the validator will contain the parsed fields (names) in the order in which they were specified.</para></remarks>
+    public QueryOrderByParser WithValidator(Action<string[]>? validator)
+    {
+        _validator = validator;
+        return this;
+    }
 
-        /// <summary>
-        /// Parses and converts the <paramref name="orderBy"/> to dynamic LINQ.
-        /// </summary>
-        /// <param name="orderBy">The query order-by.</param>
-        /// <returns>The <see cref="QueryOrderByParserResult"/>.</returns>
-        public Result<QueryOrderByParserResult> Parse(string? orderBy)
+    /// <summary>
+    /// Parses and converts the <paramref name="orderBy"/> to dynamic LINQ.
+    /// </summary>
+    /// <param name="orderBy">The query order-by.</param>
+    /// <returns>The <see cref="QueryOrderByParserResult"/>.</returns>
+    public QueryOrderByParserResult Parse(string? orderBy)
+    {
+        var usingDefault = false;
+        if (string.IsNullOrEmpty(orderBy))
         {
-            if (!string.IsNullOrEmpty(orderBy) && orderBy.Equals("help", StringComparison.OrdinalIgnoreCase))
-                return new QueryOrderByParserException(ToString());
+            if (_defaultOrderByStatement is not null)
+                return new QueryOrderByParserResult(_defaultOrderByStatement);
 
-            if (string.IsNullOrEmpty(orderBy))
-                return new QueryOrderByParserResult(DefaultOrderBy);
+            usingDefault = true;
+            orderBy = DefaultOrderBy;
+            if (orderBy is null)
+                return new QueryOrderByParserResult(orderBy);
+        }
 
-            var fields = new List<string>();
-            var sb = new StringBuilder();
+        var fields = new List<string>();
+        var sb = new StringBuilder();
 
-#if NET6_0_OR_GREATER
+        try
+        {
             foreach (var sort in orderBy.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
             {
                 var parts = sort.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-#else
-            foreach (var sort in orderBy.ThrowIfNullOrEmpty(nameof(orderBy)).Split(',', StringSplitOptions.RemoveEmptyEntries ))
-            {
-                var parts = sort.Trim().Split(' ', StringSplitOptions.RemoveEmptyEntries);
-#endif
+
                 if (parts.Length == 0)
                     continue;
                 else if (parts.Length > 2)
                     throw new QueryOrderByParserException("Statement is syntactically incorrect.");
 
-#if NET6_0_OR_GREATER
                 var field = parts[0];
-#else
-                var field = parts[0].Trim();
-#endif
-                var config = _fields.TryGetValue(field, out var fc) ? fc : throw new QueryOrderByParserException($"Field '{field}' is not supported.");
+                var config = _fields.FirstOrDefault(f => f.Field.Equals(field, StringComparison.OrdinalIgnoreCase)) ?? throw new QueryOrderByParserException($"Field '{field}' is not supported.");
 
                 if (sb.Length > 0)
                     sb.Append(", ");
 
-                sb.Append(config.Model);
+                sb.Append(config.FullyQualifiedModelName);
 
                 var dir = parts.Length == 2 ? parts[1].Trim() : null;
                 if (dir is not null)
@@ -146,46 +151,112 @@ public Result<QueryOrderByParserResult> Parse(string? orderBy)
                         direction = QueryOrderByDirection.Descending;
                     }
                     else if (!(dir.Length > 2 && nameof(QueryOrderByDirection.Ascending).StartsWith(dir, StringComparison.OrdinalIgnoreCase)))
-                        return new QueryOrderByParserException($"Field '{field}' direction '{dir}' is invalid; must be either 'asc' (ascending) or 'desc' (descending).");
+                        throw new QueryOrderByParserException($"Field '{field}' direction '{dir}' is invalid; must be either 'asc' (ascending) or 'desc' (descending).");
 
                     if (!config.Direction.HasFlag(direction))
-                        return new QueryOrderByParserException($"Field '{field}' direction '{dir}' is invalid; not supported.");
+                        throw new QueryOrderByParserException($"Field '{field}' direction '{dir}' is invalid; not supported.");
                 }
 
                 if (fields.Contains(config.Field))
-                    return new QueryOrderByParserException($"Field '{field}' must not be specified more than once.");
+                    throw new QueryOrderByParserException($"Field '{field}' must not be specified more than once.");
 
                 fields.Add(config.Field);
             }
 
-            try
-            {
-                _validator?.Invoke([.. fields]);
-            }
-            catch (QueryOrderByParserException qobpex)
+            foreach (var config in _fields.Where(x => x.IsAlwaysInclude))
             {
-                return qobpex;
+                if (fields.Contains(config.Field))
+                    continue;
+
+                if (sb.Length > 0)
+                    sb.Append(", ");
+
+                sb.Append(config.FullyQualifiedModelName);
+                if (config.AlwaysIncludeDirection == QueryOrderByDirection.Descending)
+                    sb.Append(" desc");
             }
 
-            return new QueryOrderByParserResult(sb.ToString());
+            _validator?.Invoke([.. fields]);
+        }
+        catch (QueryOrderByParserException qobpex)
+        {
+            qobpex.WithExtension("schema", owner.ToJsonSchema());
+            return new QueryOrderByParserResult(qobpex);
         }
 
-        /// <inheritdoc/>
-        public override string ToString()
+        if (usingDefault)
         {
-            if (!HasFields)
-                return "Order-By statement is not currently supported.";
+            _defaultOrderByStatement = sb.ToString();
+            return new QueryOrderByParserResult(_defaultOrderByStatement);
+        }
+        else
+            return new QueryOrderByParserResult(sb.ToString());
+    }
 
-            var sb = new StringBuilder("Order-by field(s) are as follows:");
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        var sb = new StringBuilder();
+
+        if (HasFields)
+        {
+            sb.Append("Order-by field(s) are as follows:");
             foreach (var field in _fields)
             {
-                sb.AppendLine().Append(field.Key).Append(" (Direction: ").Append(field.Value.Direction).Append(')');
+                sb.AppendLine().Append(field.Field.ToLowerInvariant()).Append(" (Direction: ");
+                if (field.Direction == QueryOrderByDirection.Ascending)
+                    sb.Append("asc");
+                else if (field.Direction == QueryOrderByDirection.Descending)
+                    sb.Append("desc");
+                else
+                    sb.Append("asc or desc");
+
+                sb.Append(')');
             }
+        }
+        else
+            sb.Append("Order-By statement is not currently supported.");
+
+        if (!string.IsNullOrEmpty(DefaultOrderBy))
+            sb.AppendLine().AppendLine("---").Append("Default: ").Append(DefaultOrderBy);
+
+        if (!string.IsNullOrEmpty(_helpText))
+            sb.AppendLine().AppendLine("---").Append("Note: ").Append(_helpText);
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// Produces the JSON schema for the configured fields.
+    /// </summary>
+    /// <returns>The <see cref="JsonElement"/>.</returns>
+    public JsonElement ToJsonSchema()
+    {
+        var dict = new Dictionary<string, object?>();
+        foreach (var field in _fields)
+        {
+            string[] directions = field.Direction switch
+            {
 
-            if (!string.IsNullOrEmpty(_helpText))
-                sb.AppendLine().Append(_helpText);
+                QueryOrderByDirection.Ascending => ["asc"],
+                QueryOrderByDirection.Descending => ["desc"],
+                _ => ["asc", "desc"]
+            };
 
-            return sb.ToString();
+            dict.Add(field.Field.ToLowerInvariant(), new { direction = directions });
         }
+
+        var root = new Dictionary<string, object?>
+        {
+            { "fields", HasFields ? dict : null }
+        };
+
+        if (!string.IsNullOrEmpty(DefaultOrderBy))
+            root["default"] = DefaultOrderBy;
+
+        if (!string.IsNullOrEmpty(_helpText))
+            root["description"] = _helpText;
+
+        return JsonSerializer.SerializeToElement(root);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryOrderByParserException.cs b/src/CoreEx.Data/Querying/QueryOrderByParserException.cs
index fc3cb175..a4377d5d 100644
--- a/src/CoreEx.Data/Querying/QueryOrderByParserException.cs
+++ b/src/CoreEx.Data/Querying/QueryOrderByParserException.cs
@@ -1,15 +1,13 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Localization;
-
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents a <see cref="QueryOrderByParser"/> <see cref="ValidationException"/>.
+/// </summary>
+/// <param name="message">The error message.</param>
+public sealed class QueryOrderByParserException(string message) : ValidationException(new MessageItem(MessageType.Error, message, HttpNames.QueryOrderByQueryStringName), FallbackMessage)
 {
     /// <summary>
-    /// Represents a <see cref="QueryOrderByParser"/> <see cref="ValidationException"/>.
+    /// Gets the default/fallback <see cref="Exception.Message"/>
     /// </summary>
-    /// <param name="message">The error message.</param>
-    public class QueryOrderByParserException(string message) 
-        : ValidationException(MessageItem.CreateErrorMessage(HttpConsts.QueryArgsOrderByQueryStringName, message), new LText(typeof(QueryFilterParserException).FullName, QueryFilterParserException.FallbackMessage)) { }
+    internal const string FallbackMessage = "A query order-by parsing error occurred.";
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryOrderByParserResult.cs b/src/CoreEx.Data/Querying/QueryOrderByParserResult.cs
index 009e7500..cdeb4701 100644
--- a/src/CoreEx.Data/Querying/QueryOrderByParserResult.cs
+++ b/src/CoreEx.Data/Querying/QueryOrderByParserResult.cs
@@ -1,23 +1,42 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents the result of <see cref="QueryOrderByParser.Parse(string?)"/>.
+/// </summary>
+public sealed class QueryOrderByParserResult : IQueryParseError
 {
+    private readonly string? _orderByStatement;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="QueryOrderByParserResult"/> class.
+    /// </summary>
+    /// <param name="orderByStatement">The resulting dynamic LINQ order by statement.</param>
+    internal QueryOrderByParserResult(string? orderByStatement) => _orderByStatement = orderByStatement;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="QueryOrderByParserResult"/> class with an error.
+    /// </summary>
+    /// <param name="error">The error <see cref="QueryOrderByParserException"/>.</param>
+    internal QueryOrderByParserResult(QueryOrderByParserException error) => Error = error.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public bool HasError => Error is not null;
+
+    /// <inheritdoc/>
+    ExtendedException? IQueryParseError.Error => Error;
+
+    /// <summary>
+    /// Gets the error represented as an <see cref="QueryOrderByParserException"/> that occurred during parsing, if any.
+    /// </summary>
+    public QueryOrderByParserException? Error { get; internal set; }
+
+    /// <summary>
+    /// Throws the <see cref="Error"/> where <see cref="HasError"/>; otherwise, does nothing.
+    /// </summary>
+    public QueryOrderByParserResult ThrowOnError() => HasError ? throw Error!: this;
+
     /// <summary>
-    /// Represents the result of <see cref="QueryOrderByParser.Parse(string?)"/>.
+    /// Provides the resulting dynamic LINQ order by.
     /// </summary>
-    public sealed class QueryOrderByParserResult
-    {
-        private readonly string? _orderByStatement;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QueryOrderByParserResult"/> class.
-        /// </summary>
-        /// <param name="orderByStatement">The resulting dynamic LINQ order by statement.</param>
-        internal QueryOrderByParserResult(string? orderByStatement) => _orderByStatement = orderByStatement;
-
-        /// <summary>
-        /// Provides the resulting dynamic LINQ order by.
-        /// </summary>
-        public string? ToLinqString() => _orderByStatement;
-    }
+    public string? ToLinqString() => _orderByStatement;
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/QueryStatement.cs b/src/CoreEx.Data/Querying/QueryStatement.cs
index 4c27720c..029f0d56 100644
--- a/src/CoreEx.Data/Querying/QueryStatement.cs
+++ b/src/CoreEx.Data/Querying/QueryStatement.cs
@@ -1,29 +1,26 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Data.Querying;
 
-namespace CoreEx.Data.Querying
+/// <summary>
+/// Represents a dynamic LINQ statement with optional arguments.
+/// </summary>
+/// <remarks>The LINQ <see cref="Statement"/> may contain placeholders referencing the <see cref="Args"/> by its zero-based index.
+/// <para>Note: no parsing or validation is performed prior to use and as such may result in an internal error.</para>
+/// <para>An example is as follows: 
+/// <code>
+/// new QueryStatement("City == @0", "Brisbane");
+/// </code></para></remarks>
+/// <param name="statement">The dynamic LINQ statement.</param>
+/// <param name="args">The placeholder arguments.</param>
+public class QueryStatement(string statement, params IEnumerable<object?> args)
 {
     /// <summary>
-    /// Represents a dynamic LINQ statement with optional arguments.
+    /// Gets the dynamic LINQ statement.
     /// </summary>
-    /// <remarks>The LINQ <see cref="Statement"/> may contain placeholders referencing the <see cref="Args"/> by its zero-based index.
-    /// <para>Note: no parsing or validation is performed prior to use and as such may result in an internal error.</para>
-    /// <para>An example is as follows: 
-    /// <code>
-    /// new QueryStatement("City == @0", "Brisbane");
-    /// </code></para></remarks>
-    /// <param name="statement">The dynamic LINQ statement.</param>
-    /// <param name="args">The placeholder arguments.</param>
-    public class QueryStatement(string statement, params object?[] args)
-    {
-        /// <summary>
-        /// Gets the dynamic LINQ statement.
-        /// </summary>
-        /// <remarks>The dynamic LINQ statement may contain placeholders referencing the <see cref="Args"/> by its zero-based index.</remarks>
-        public string Statement { get; } = statement;
+    /// <remarks>The dynamic LINQ statement may contain placeholders referencing the <see cref="Args"/> by its zero-based index.</remarks>
+    public string Statement { get; } = statement;
 
-        /// <summary>
-        /// Gets the placeholder arguments.
-        /// </summary>
-        public object?[] Args { get; } = args;
-    }
+    /// <summary>
+    /// Gets the placeholder arguments.
+    /// </summary>
+    public object?[] Args { get; } = [ ..args];
 }
\ No newline at end of file
diff --git a/src/CoreEx.Data/Querying/README.md b/src/CoreEx.Data/Querying/README.md
new file mode 100644
index 00000000..f206defe
--- /dev/null
+++ b/src/CoreEx.Data/Querying/README.md
@@ -0,0 +1,52 @@
+# CoreEx.Data.Querying
+
+> Provides the safe, explicitly-configured OData-like `$filter` and `$orderby` LINQ query translation pipeline: `QueryArgsConfig`, `QueryFilterParser`, `QueryOrderByParser`, field configurations, expression AST types, and the `IQueryable<T>.Where` and `OrderBy` extensions.
+
+## Overview
+
+`CoreEx.Data.Querying` implements a constrained, secure dynamic query layer. Unlike full OData or GraphQL, it does not expose arbitrary model properties: every filterable and sortable field must be explicitly registered in a `QueryArgsConfig` instance. This design prevents accidental data leakage, index misuse, and injection-style attacks while still delivering flexible client-driven queries via the `$filter` and `$orderby` query-string arguments from `QueryArgs`.
+
+The parse pipeline is: `QueryArgs.Filter` string → `QueryFilterParser.Parse()` → expression token AST → LINQ `QueryStatement` (a `System.Linq.Dynamic.Core`-compatible predicate string + parameter array). `QueryExtensions.Where` and `OrderBy` drives both parsers, validates errors, and applies the resulting predicates to the `IQueryable<T>`.
+
+Field configurations (`QueryFilterFieldConfig<T>`, `QueryFilterParseableFieldConfig<T>`, `QueryFilterNullFieldConfig`, `QueryFilterReferenceDataFieldConfig<T>`, `QueryFilterEnumFieldConfig<T>`) map each registered field name to its underlying model property, allowed operators, value transformations, and custom statement generators.
+
+## Key capabilities
+
+- ⚙️ **Explicit field allow-listing**: Only fields registered via `QueryFilterParser.AddField<T>` or `QueryOrderByParser.AddField` are accepted; all others produce a structured parse error (`IQueryParseError`) rather than a runtime exception.
+- 🔍 **Filter operator support**: String fields support `eq`, `ne`, `startswith`, `endswith`, `contains`, `in`; numeric/date fields support `eq`, `ne`, `lt`, `le`, `gt`, `ge`, `in`; null fields support `eq null` / `ne null`.
+- 📐 **Order-by support**: `$orderby` accepts comma-separated `field asc|desc` pairs; each field's model name and direction are validated and translated to LINQ `.OrderBy()`/`.ThenBy()`.
+- 🔠 **Value normalization**: `UseUpperCase()` / `UseLowerCase()` on string fields apply `ToUpper`/`ToLower` transforms to both the filter value and the model field in the LINQ predicate, enabling case-insensitive matching at the data layer.
+- 🏷️ **Reference data fields**: `AddReferenceDataField<TRef>` resolves a `Code` string in the filter to the reference data `Id`, so callers filter by code while the query runs against the numeric/GUID identifier column.
+- 🔢 **Enum fields**: `AddEnumField<TEnum>` parses enum name strings to their underlying numeric value for persistence queries.
+- 🔲 **Null fields**: `AddNullField` maps an abstract nullable concept (e.g. `terminated`) to a model property null-check expression, hiding physical schema detail from the caller.
+- 🛑 **Structured parse errors**: `IQueryParseError` carries the error message and field name; `QueryFilterParserException` / `QueryOrderByParserException` are thrown when parsing fails, translating cleanly to `400 Bad Request` in `WebApi`.
+- 🔗 **Dynamic LINQ integration**: Generated `QueryStatement` objects are applied via `System.Linq.Dynamic.Core` `.Where(predicate, args)` and `.OrderBy(statement)`, keeping the translation generic across EF Core, Cosmos, and in-memory queryables, etc.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`QueryArgsConfig`](./QueryArgsConfig.cs)** | Root builder: `Create()`, `WithFilter(Action<QueryFilterParser>)`, `WithOrderBy(Action<QueryOrderByParser>)`; holds `FilterParser`, `OrderByParser`, and `ParsingConfig`. |
+| **[`QueryFilterParser`](./QueryFilterParser.cs)** | Registers filterable fields and parses `$filter` strings: `AddField<T>`, `AddNullField`, `AddReferenceDataField<T>`, `AddEnumField<T>`, `WithDefault`, `OnQuery`, `Parse(string)`. |
+| **[`QueryOrderByParser`](./QueryOrderByParser.cs)** | Registers sortable fields and parses `$orderby` strings: `AddField`, `WithDefault`, `Parse(string)`. |
+| **[`QueryExtensions`](./QueryExtensions.cs)** | `IQueryable<T>.Where` and `OrderBy` — drives both parsers, applies filter and order-by to the queryable, and throws on parse errors. |
+| **[`QueryArgsParseResult`](./QueryArgsParseResult.cs)** | Combined parse output: `FilterResult`, `OrderByResult`, `HasErrors` and resulting `Error` (where applicable). |
+| **[`QueryStatement`](./QueryStatement.cs)** | Carries a Dynamic LINQ predicate string and its parameter array, applied to `IQueryable<T>` via `.Where(statement.Predicate, statement.Args)`. |
+| [`QueryFilterParserResult`](./QueryFilterParserResult.cs) | `$filter` parse output: `QueryStatement`, per-field parsed values dictionary, and `ParseErrors`. |
+| [`QueryOrderByParserResult`](./QueryOrderByParserResult.cs) | `$orderby` parse output: `QueryStatement` and `ParseErrors`. |
+| _[`QueryFilterFieldConfigBase<T>`](./QueryFilterFieldConfigBaseT.cs)_ | Abstract base for all filter field configurations: model name, model prefix, default value, allowed operators, `ResultWriter`. |
+| [`QueryFilterParseableFieldConfig<T>`](./QueryFilterParseableFieldConfigT.cs) | Concrete string/numeric/date field config: `Operators(...)`, `UseUpperCase()`, `UseLowerCase()`, `Default(value)`. |
+| [`QueryFilterNullFieldConfig`](./QueryFilterNullFieldConfig.cs) | Null-concept field config: maps `eq null` / `ne null` to a model property null-check expression. |
+| [`QueryFilterReferenceDataFieldConfig<TRef>`](./QueryFilterReferenceDataFieldConfigT.cs) | Reference data field config: resolves `Code` → `Id` before emitting the LINQ predicate. |
+| [`QueryFilterEnumFieldConfig<TEnum>`](./QueryFilterEnumFieldConfigT.cs) | Enum field config: parses enum name strings to their underlying numeric value. |
+| [`QueryOrderByFieldConfig`](./QueryOrderByFieldConfig.cs) | Sortable field config: model property name, allowed directions, default direction. |
+| [`QueryFilterOperator`](./QueryFilterOperator.cs) | Enum of supported filter operators: `Equal`, `NotEqual`, `LessThan`, `LessOrEqual`, `GreaterThan`, `GreaterOrEqual`, `StartsWith`, `EndsWith`, `Contains`, `In`. |
+| [`IQueryFilterFieldConfig`](./IQueryFilterFieldConfig.cs) | Interface implemented by all filter field configurations; consumed by `QueryFilterParser` for field lookup. |
+| [`IQueryParseError`](./IQueryParseError.cs) | Parse error contract: `Message` and `Field` name. |
+
+## Related Namespaces
+
+- **[`CoreEx.Data`](../README.md)** - Root package; `QueryArgs` (filter/orderby strings) and `PagingArgs` are defined there and passed into the `IQueryable<T>.Where` and `OrderBy` extensions.
+- **[`CoreEx.RefData`](../../CoreEx/RefData/README.md)** - `QueryFilterReferenceDataFieldConfig<TRef>` calls `ReferenceDataOrchestrator` to resolve codes to IDs during filter parsing.
+- **[`CoreEx.Database`](../../CoreEx.Database/README.md)** - ADO.NET query builders call `Where`/`OrderBy` to apply filter/orderby to SQL-backed `IQueryable<T>`.
+- **[`CoreEx.EntityFrameworkCore`](../../CoreEx.EntityFrameworkCore/README.md)** - EF Core query extensions consume `QueryArgsConfig` identically via the same `Where`/`OrderBy` extension methods.
\ No newline at end of file
diff --git a/src/CoreEx.Data/README.md b/src/CoreEx.Data/README.md
index 0b461db6..7e5d2d28 100644
--- a/src/CoreEx.Data/README.md
+++ b/src/CoreEx.Data/README.md
@@ -1,187 +1,57 @@
 # CoreEx.Data
 
-The `CoreEx.Data` namespace provides extended data-related capabilities. 
+> Provides the `IUnitOfWork` transactional orchestration contract, `DataResult` mutation outcome types, data model base classes, and the `QueryArgsConfig` / `QueryFilterParser` / `QueryOrderByParser` pipeline for safe, explicitly-configured OData-style `$filter` and `$orderby` LINQ query translation.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Data` sits between the domain layer and persistence backends (SQL, EF Core, Cosmos). It defines the contracts and utilities that keep application services free of storage-specific types while still enabling rich, safe dynamic querying.
 
-The motivation is to simplify and improve the data access experience.
+`IUnitOfWork` is the primary transactional boundary abstraction. Application services call `TransactionAsync` to scope a sequence of mutations and event enqueuing inside one transaction — regardless of whether the underlying store is SQL Server, PostgreSQL, or EF Core. The `Events` (`IEventQueue`) property on `IUnitOfWork` enables the transactional outbox pattern without coupling the service to any messaging infrastructure.
 
-<br/>
+`QueryArgsConfig` is a configuration object that defines which fields a caller is allowed to filter and sort on, what operators each field supports, and how each field maps to the underlying model property. At request time, `QueryExtensions.BuildQuery(IQueryable<T>, QueryArgs, QueryArgsConfig)` parses the `$filter` and `$orderby` strings, validates them against the configuration, and appends the equivalent `System.Linq.Dynamic.Core` predicates to the `IQueryable<T>` — safely, with no arbitrary field exposure.
 
-## OData-like Querying
+## Key capabilities
 
-It is not always possible to implement the likes of OData and/or GraphQL on an underlying data source. This could be related to the complexity of the implementation, the desire to hide the underlying data structure, and/or limit the types of operations performed to manage the underlying performance.
+- 🔁 **Unit-of-work contract**: `IUnitOfWork` provides `TransactionAsync` and the `Events` (`IEventQueue`) property for transactional outbox event enqueuing; storage implementations are injected and swappable.
+- 📦 **Mutation result types**: `DataResult` (no value) and `DataResult<T>` carry a `WasMutated` flag and optional mutated value, distinguishing "found and deleted" from "not found" without throwing exceptions.
+- 🗄️ **Data model base classes**: `ModelBase<TId>` and `ReferenceDataModelBase` provide ready-made persistence model types implementing `IIdentifier<T>`, `IChangeLogEx`, `IETag`, and common `IReferenceData` properties respectively.
+- 🔍 **Safe dynamic filter parsing**: `QueryFilterParser` parses OData-like `$filter` expressions against an explicit field allow-list, translates them to LINQ predicates, and rejects unknown fields or disallowed operators with structured parse errors.
+- 📐 **Safe dynamic order-by parsing**: `QueryOrderByParser` parses `$orderby` expressions against an explicit field allow-list and translates them to LINQ `.OrderBy()`/`.ThenBy()` calls.
+- ⚙️ **Field-level configuration**: Each field is configured with its CLR type, allowed operators, model property name/prefix, case normalization, null handling, and custom statement override via a fluent `QueryArgsConfig.WithFilter` / `WithOrderBy` builder.
+- 🏷️ **Reference data filter fields**: `QueryFilterReferenceDataFieldConfig<T>` maps a reference data `Code` string in the filter to its underlying `Id` for persistence queries.
+- 🔗 **IQueryable integration**: `QueryExtensions.Where` and `OrderBy` applies the filter and order-by to any `IQueryable<T>`.
 
-However, the desire to provide a similar experience to the client remains. The `CoreEx.Data.Querying` namespace enables the client to perform OData-like queries (limited to [`$filter`](https://docs.oasis-open.org/odata/odata/v4.01/cs01/part2-url-conventions/odata-v4.01-cs01-part2-url-conventions.html#sec_SystemQueryOptionfilter) and [`$orderby`](https://docs.oasis-open.org/odata/odata/v4.01/cs01/part2-url-conventions/odata-v4.01-cs01-part2-url-conventions.html#_Toc505773299)) on an underlying data source, in a structured and controlled manner.
+## Key types
 
-_Note:_ This is **not** intended to be a replacement for [OData](https://learn.microsoft.com/en-us/odata/webapi-8/overview), [GraphQL](https://github.com/graphql-dotnet/graphql-dotnet), etc. but to provide a limited, explicitly supported, dynamic capability to filter an underlying query.
+| Type | Description |
+|------|-------------|
+| **[`IUnitOfWork`](./IUnitOfWork.cs)** | Transactional unit-of-work contract: `TransactionAsync`, `ExecuteAsync`, `AreEventsSupported`, and `Events` (`IEventQueue`) for transactional outbox support. |
+| **[`DataResult`](./DataResult.cs)** | Readonly record struct carrying `WasMutated` for valueless mutation outcomes (e.g. delete). |
+| **[`DataResult<T>`](./DataResultT.cs)** | Generic variant of `DataResult` adding the mutated `Value`; returned by create/update operations. |
+| [`IDataArgs`](./IDataArgs.cs) | Marker interface for strongly-typed data argument objects passed to `IUnitOfWork` overloads. |
+| **[`QueryArgsConfig`](./Querying/QueryArgsConfig.cs)** | Root configuration builder for `$filter` and `$orderby` parsing; holds `FilterParser`, `OrderByParser`, and `ParsingConfig`; entry point via `QueryArgsConfig.Create()`. |
+| **[`QueryFilterParser`](./Querying/QueryFilterParser.cs)** | Configures and executes `$filter` parsing: `AddField<T>`, `AddNullField`, `AddReferenceDataField<T>`, `WithDefault`, `OnQuery` hooks, and `Parse(filterString)`. |
+| **[`QueryOrderByParser`](./Querying/QueryOrderByParser.cs)** | Configures and executes `$orderby` parsing: `AddField`, `WithDefault`, and `Parse(orderByString)`. |
+| **[`QueryExtensions`](./Querying/QueryExtensions.cs)** | `IQueryable<T>` extension methods `Where` and `OrderBy` apply the filter and order-by (respectively). |
+| **[`QueryArgsParseResult`](./Querying/QueryArgsParseResult.cs)** | Combined result of filter + order-by parsing: `FilterResult`, `OrderByResult`, `HasErrors`, and `QueryStatement`. |
+| [`QueryFilterParserResult`](./Querying/QueryFilterParserResult.cs) | Result of `QueryFilterParser.Parse()`: LINQ `QueryStatement`, parsed field values, and any `ParseErrors`. |
+| [`QueryOrderByParserResult`](./Querying/QueryOrderByParserResult.cs) | Result of `QueryOrderByParser.Parse()`: ordered `QueryStatement` and any parse errors. |
+| _[`ModelBase<TId>`](./Models/ModelBase.cs)_ | Abstract persistence model base implementing `IIdentifier<T>`, `IChangeLogEx`, `IETag`. |
+| _[`ReferenceDataModelBase`](./Models/ReferenceDataModelBase.cs)_ | Persistence model base for reference data tables with `Id`, `Code`, `Text`, `IsActive`, `SortOrder`, `StartDate`, `EndDate`. |
 
-Where this capability is different is that the separation from the API contract and the underlying data source schema is maintained. This is achieved by using configuration to explicitly define the fields that can be filtered and ordered, whilst also defining their relationship to the data source. This is in contrast to OData and GraphQL where the data source schema is largely exposed to the client.
+## Namespaces
 
-<br/>
+| Namespace | Description |
+|-----------|-------------|
+| [**`Models`**](./Models/) | `ModelBase<TId>` and `ReferenceDataModelBase` persistence model base classes. |
+| [**`Querying`**](./Querying/) | `QueryArgsConfig`, `QueryFilterParser`, `QueryOrderByParser`, field configuration types, expression AST types, and `QueryExtensions`. |
 
-### Features
+## Related Namespaces
 
-The following features are supported:
+- **[`CoreEx`](../CoreEx/README.md)** - `QueryArgs` (filter/orderby strings and paging), `PagingArgs`, and `IEventQueue` are defined in the root `CoreEx` package and consumed here.
+- **[`CoreEx.Database`](../CoreEx.Database/README.md)** - `IUnitOfWork` is implemented by the database unit-of-work; `QueryArgsConfig` is used by database query builders.
+- **[`CoreEx.EntityFrameworkCore`](../CoreEx.EntityFrameworkCore/README.md)** - EF Core `IQueryable<T>` extensions consume `QueryArgsConfig` via `Where`/`OrderBy`.
 
-- `$filter` - the ability to filter the underlying query based on a set of conditions. The following is supported:
-  - `eq` - equal to; expressed as `field eq 'value'`
-  - `ne` - not equal to; expressed as `field ne 'value'`
-  - `gt` - greater than; expressed as `field gt 'value'`
-  - `ge` - greater than or equal to; expressed as `field ge 'value'`
-  - `lt` - less than; expressed as `field lt 'value'`
-  - `le` - less than or equal to; expressed as `field le 'value'`
-  - `in` - in list; expressed as `field in ('value1', 'value2', ...)`
-  - `startswith` - starts with; expressed as `startswith(field, 'value')`
-  - `endswith` - ends with; expressed as `endswith(field, 'value')`
-  - `contains` - contains; expressed as `contains(field, 'value')`
-  - `and` - logical and; expressed as `field1 eq 'value1' and field2 eq 'value2'`
-  - `or` - logical or; expressed as `field1 eq 'value1' or field2 eq 'value2'`
-  - `not` - logical not; expressed as `not field eq 'value'`
-  - `null` - is null; expressed as `field eq null`
-  - `(` and `)` - grouping; expressed as `(field1 eq 'value1' and field2 eq 'value2') or field3 eq 'value3'`)`
+## AI Usage Guide
 
-- `$orderby` - the ability to order the underlying query based on a set of fields. The following is supported:
-  - `asc` - ascending; expressed as `field asc`
-  - `desc` - descending; expressed as `field desc`
-  - `,` - multiple fields; expressed as `field1 asc, field2 desc`
-
-Where the `'value'` is expressed as a string it must be enclosed in single quotes. A number, boolean, date, date and time, or `null` should be expressed as a constant, as expected for the underlying field type.
-
-The following are examples of supported queries:
-
-```
-$filter=lastname eq 'Doe' and startswith(firstname, 'a')
-$filter=salary gt 100000 and salary le 200000
-$filter=(lastname eq 'Doe' and firstname eq 'John') or (lastname eq 'Smith' and firstname eq 'Jane')
-$filter=state in ('CA', 'NY', 'TX')
-$filter=isactive eq true
-$filter=terminated eq null
-$filter=startdate ge 2020-01-01
-$orderby=lastname desc, firstname
-```
-
-<br/>
-
-### Configuration
-
-The [`QueryArgsConfig`](./Querying/QueryArgsConfig.cs) provides the means to configure the desired support; the model is an _explicit_ opt-in, versus an opt-out, of the capabilities.
-
-This contains the following key capabilities:
-
-- [`FilterParser`](./Querying/QueryFilterParser.cs) - this is the `$filter` parser and LINQ translator.
-- [`OrderByParser`](./Querying/QueryOrderByParser.cs) - this is the `$orderby` parser and LINQ translator.
-
-Each of these properties have the ability to _explicitly_ add fields and their corresponding configuration. An example is as follows:
-
-``` csharp
-private static readonly QueryArgsConfig _config = QueryArgsConfig.Create()
-    .WithFilter(filter => filter
-        .AddField<string>(nameof(Employee.LastName), c => c.WithOperators(QueryFilterOperator.AllStringOperators).WithUpperCase())
-        .AddField<string>(nameof(Employee.FirstName), c => c.WithOperators(QueryFilterOperator.AllStringOperators).WithUpperCase())
-        .AddReferenceDataField<Gender>(nameof(Employee.Gender), nameof(EfModel.Employee.GenderCode))
-        .AddField<DateTime>(nameof(Employee.StartDate))
-        .AddNullField(nameof(Employee.Termination), nameof(EfModel.Employee.TerminationDate), c => c.WithDefault(new QueryStatement($"{nameof(EfModel.Employee.TerminationDate)} == null"))))
-    .WithOrderBy(orderby => orderby
-        .AddField(nameof(Employee.LastName))
-        .AddField(nameof(Employee.FirstName))
-        .WithDefault($"{nameof(Employee.LastName)}, {nameof(Employee.FirstName)}"));
-```
-
-There are a number of different field configurations that can be added:
-
-Method | Description
-|-|-|
-`AddField<T>` | Adds a field of the specified type `T`. See [`QueryFilterFieldConfig<T>`](./Querying/QueryFilterFieldConfigT.cs).
-`AddNullField` | Adds a field that only supports `null` checking operations; limits to `EQ` and `NE`. See [`QueryFilterNullFieldConfig`](./Querying/QueryFilterNullFieldConfig.cs).
-`AddReferenceDataField<TRef>` | Adds a reference data field of the specified type `TRef`. Automatically includes the requisite `IReferenceData.Code` validation, and limits operations to `EQ`, `NE` and `IN`. See [`QueryFilterReferenceDataFieldConfig<TRef>`](./Querying/QueryFilterReferenceDataFieldConfig.cs).
-
-Each of the above methods support the following parameters:
-- `field` - the name of the field (using the correct casing) that can be referenced within the `$filter`.
-- `model` - the optional model name of the field (using the correct casing)  to be used in the underlying LINQ operation (defaults to `field`).
-- `configure` - an optional configuration action to further define the field configuration.
-
-Depending on the field type being added (as above), the following related configuration options are available:
-
-Method | Description
-|-|-|
-`AlsoCheckNotNull` | Indicates that a not-null check should also be performed when performing the operation.
-`AsNullable` | Indicates that the field is nullable and therefore supports null equality operations.
-`MustBeValid` | Indicates that the reference data field value must exist and be considered valid; i.e. it is `IReferenceData.IsValid`.
-`UseIdentifier` | Indicates that the `IReferenceData.Id` should be used in the underlying LINQ operation instead of the `IReferenceData.Code`.
-`WithConverter` | Provides the `IConverter<string, T>` to convert the filer value string to the underlying field type of `T`.
-`WithDefault` | Provides a default LINQ statement to be used for the field when no filtering is specified by the client.
-`WithHelpText` | Provides additional help text for the field to be used where help is requested.
-`WithOperators` | Overrides the supported operators for the field. See [`QueryFilterOperator`](./Querying/QueryFilterOperator.cs).
-`WithResultWriter` | Provides an opportunity to override the default result writer; i.e. LINQ expression.
-`WithUpperCase` | Indicates that the operation should be case-insensitive by performing an explicit `ToUpper()` on the field value.
-`WithValue` | Provides an opportunity to override the converted field value when the filter is applied.
-
-<br/>
-
-### Usage
-
-The configuration is then used to parse and apply the filter and/or order-by to the underlying query using the new `IQueryable<T>.Where` and `IQueryable<T>.OrderBy` extension methods.
-
-``` csharp
-var query = new QueryArgs
-{
-    Filter = "LastName eq 'Doe' and startswith(firstname, 'a')",
-    OrderBy = "LastName desc, FirstName"
-};
-
-return _dbContext.Employees.Where(_queryConfig, query).OrderBy(_queryConfig, query).ToCollectionResultAsync<EmployeeCollectionResult, EmployeeCollection, Employee>(paging);
-```
-
-The [`QueryArgs`](../CoreEx/Entities/QueryArgs.cs), demonstrated above, is a simple class that is used to house the `Filter` and `OrderBy` properties in a consistent fashion. Additionally, the [`WebApiRequestOptions`](../CoreEx.AspNetCore/CoreEx.AspNetCore.WebApis.WebApiRequestOptions) automatically creates an instance of this class from the originating query string (i.e. `$filter` and `$orderby`).
-
-``` csharp
-public Task<IActionResult> GetAllAsync()
-    => _webApi.GetAsync(Request, p => _service.GetAllAsync(p.RequestOptions.Query, p.RequestOptions.Paging));
-```
-
-<br/>
-
-### Enablement
-
-The `CoreEx.Data.Querying` capabilities described above essentially parses the OData-like syntax and then translates it into the equivalent dynamic LINQ statements. This statement is then passed through the [Dynamic LINQ](https://dynamic-linq.net/) NuGet [library](https://dynamic-linq.net/).
-
-For example, the following OData-like filters would be translated into the equivalent dynamic LINQ statements:
-
-```
-$filter: code eq 'A'
-LINQ: Where("Code == @0", ["A"])
----
-$filter: startswith(firstName, 'abc'), 
-LINQ: Where("FirstName.ToUpper().StartsWith(@0)", ["ABC"])
-```
-
-<br/>
-
-### Help
-
-To aid the consumers (clients) of the OData-like endpoints a *help* request can be issued. This is performed by using either `$filter=help` or `$orderby=help` and will result in a `400-BadRequest` with help-like contents similar to the following:
-
-``` json
-{
-  "$filter": [
-    "Filter field(s) are as follows:
-     LastName (Type: String, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN, StartsWith, Contains, EndsWith)
-     FirstName (Type: String, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN, StartsWith, Contains, EndsWith)
-     Gender (Type: Gender, Null: false, Operators: EQ, NE, IN)
-     StartDate (Type: DateTime, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN)
-     Termination (Type: <none>, Null: true, Operators: EQ, NE)"
-  ]
-}
-
-{
-  "$orderby": [
-    "Order-by field(s) are as follows:
-    LastName (Direction: Both)
-    FirstName (Direction: Both)"
-  ]
-}
-
-```
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Data/strong-name-key.snk b/src/CoreEx.Data/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Data/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Database.MySql/CoreEx.Database.MySql.csproj b/src/CoreEx.Database.MySql/CoreEx.Database.MySql.csproj
deleted file mode 100644
index 0d1731ed..00000000
--- a/src/CoreEx.Database.MySql/CoreEx.Database.MySql.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Database.MySql</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET MySQL Database extras.</Title>
-    <Description>CoreEx .NET MySQL Database extras.</Description>
-    <PackageTags>coreex db database sql mysql ado.net relational</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="MySql.Data" Version="9.2.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="MySql.Data" Version="9.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="MySql.Data" Version="9.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="MySql.Data" Version="9.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx.Database\CoreEx.Database.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/CoreEx.Database.MySql/MySqlDatabase.cs b/src/CoreEx.Database.MySql/MySqlDatabase.cs
deleted file mode 100644
index 335a94e6..00000000
--- a/src/CoreEx.Database.MySql/MySqlDatabase.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping.Converters;
-using CoreEx.Results;
-using Microsoft.Extensions.Logging;
-using MySql.Data.MySqlClient;
-using System;
-using System.Linq;
-using System.Data.Common;
-
-namespace CoreEx.Database.MySql
-{
-    /// <summary>
-    /// Provides <see href="https://dev.mysql.com/">MySQL</see> database access functionality.
-    /// </summary>
-    /// <param name="create">The function to create the <see cref="MySqlConnection"/>.</param>
-    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The optional <see cref="DatabaseInvoker"/>.</param>
-    public class MySqlDatabase(Func<MySqlConnection> create, ILogger<MySqlDatabase>? logger = null, DatabaseInvoker? invoker = null) : Database<MySqlConnection>(create, MySqlClientFactory.Instance, logger, invoker)
-    {
-        /// <summary>
-        /// Gets the default <see cref="DuplicateErrorNumbers"/>.
-        /// </summary>
-        /// <remarks>See <see href="https://dev.mysql.com/doc/mysql-errors/8.0/en/server-error-reference.html"/>.</remarks>
-        public static int[] DefaultDuplicateErrorNumbers { get; } = [1022, 1062, 1088, 1291, 1586, 1859];
-
-        /// <inheritdoc/>
-        public override IConverter RowVersionConverter => EncodedStringToDateTimeConverter.Default;
-
-        /// <summary>
-        /// Indicates whether to transform the <see cref="MySqlException"/> into an <see cref="Abstractions.IExtendedException"/> equivalent based on the <see cref="MySqlException.Number"/>.
-        /// </summary>
-        /// <remarks>Transforms and throws the <see cref="Abstractions.IExtendedException"/> equivalent from the <see cref="MySqlException"/> known list.</remarks>
-        public bool ThrowTransformedException { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="DuplicateErrorNumbers"/> when catching the <see cref="MySqlException"/>.
-        /// </summary>
-        public bool CheckDuplicateErrorNumbers { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the list of known <see cref="MySqlException.Number"/> values that are considered a duplicate error.
-        /// </summary>
-        /// <remarks>Overrides the <see cref="DefaultDuplicateErrorNumbers"/>.</remarks>
-        public int[]? DuplicateErrorNumbers { get; set; }
-
-        /// <inheritdoc/>
-        protected override Result? OnDbException(DbException dbex)
-        {
-            if (ThrowTransformedException && dbex is MySqlException sex)
-            {
-                var msg = sex.Message?.TrimEnd();
-                if (string.IsNullOrEmpty(msg))
-                    msg = null;
-
-                switch (sex.Number)
-                {
-                    case 56001: return Result.Fail(new ValidationException(msg, sex));
-                    case 56002: return Result.Fail(new BusinessException(msg, sex));
-                    case 56003: return Result.Fail(new AuthorizationException(msg, sex));
-                    case 56004: return Result.Fail(new ConcurrencyException(msg, sex));
-                    case 56005: return Result.Fail(new NotFoundException(msg, sex));
-                    case 56006: return Result.Fail(new ConflictException(msg, sex));
-                    case 56007: return Result.Fail(new DuplicateException(msg, sex));
-                    case 56010: return Result.Fail(new DataConsistencyException(msg, sex));
-
-                    default:
-                        if (CheckDuplicateErrorNumbers && (DuplicateErrorNumbers ?? DefaultDuplicateErrorNumbers).Contains(sex.Number))
-                            return Result.Fail(new DuplicateException(null, sex));
-
-                        break;
-                }
-            }
-
-            return base.OnDbException(dbex);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.MySql/strong-name-key.snk b/src/CoreEx.Database.MySql/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Database.MySql/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Database.Postgres/AGENTS.md b/src/CoreEx.Database.Postgres/AGENTS.md
new file mode 100644
index 00000000..7ab076c5
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/AGENTS.md
@@ -0,0 +1,63 @@
+# CoreEx.Database.Postgres — AI Usage Guide
+
+PostgreSQL implementation of `IDatabase` / `IUnitOfWork` with transactional outbox support.
+
+## Registration
+
+```csharp
+// Program.cs
+builder.AddAzureNpgsqlDataSource("Postgres");   // Aspire resource name
+builder.Services
+    .AddPostgresDatabase()
+    .AddPostgresUnitOfWork()
+    .AddPostgresOutboxPublisher()               // transactional outbox publisher
+    .AddDbContext<MyDbContext>()
+    .AddEfDb<MyEfDb>();
+```
+
+## Error Code Convention
+
+Functions/procedures raise `SQLSTATE` values to signal domain exceptions — no application-layer switch statements.
+
+| SQLSTATE | CoreEx exception |
+|---|---|
+| 56001 | `ValidationException` |
+| 56002 | `BusinessException` |
+| 56004 | `ConcurrencyException` |
+| 56005 | `NotFoundException` |
+| 56006 | `ConflictException` |
+| 56007 | `DuplicateException` |
+
+## Outbox
+
+`PostgresOutboxPublisher` writes events to the outbox table within the current `TransactionAsync` scope. The `PostgresOutboxRelayHostedService` polls and forwards them to `IEventPublisher` (typically Azure Service Bus).
+
+```csharp
+// Relay host Program.cs
+builder.Services
+    .AddPostgresDatabase()
+    .AddPostgresUnitOfWork()
+    .AddPostgresOutboxRelay();
+
+builder.AddPostgresOutboxRelayHostedService();  // called on builder, not builder.Services
+```
+
+## OpenTelemetry
+
+```csharp
+builder.WithCoreExTelemetry()
+    .WithCoreExPostgresTelemetry()
+    .UseOtlpExporter();
+```
+
+## Do Not
+
+- Do not mix `UseExpectedSqlServerOutboxPublisher` / `ExpectSqlServerOutboxEvents` in tests for a Postgres-backed domain — use the Postgres equivalents.
+- Do not call `AddPostgresOutboxRelayHostedService()` on `builder.Services` — call it on `builder`.
+
+## Further Reading
+
+- [README](./README.md) — full API reference including `PostgresDatabase`, metrics, and Npgsql extensions.
+- [CoreEx.Database](../CoreEx.Database/README.md) — abstract base types.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — PostgreSQL-specific repository, mapper, and outbox wiring in the Products sample.
+- [Tooling](../../samples/docs/tooling.md) — `*.Database` project (DbEx) for PostgreSQL schema generation and outbox infrastructure setup.
diff --git a/src/CoreEx.Database.Postgres/CoreEx.Database.Postgres.csproj b/src/CoreEx.Database.Postgres/CoreEx.Database.Postgres.csproj
index 3df57401..3c79941e 100644
--- a/src/CoreEx.Database.Postgres/CoreEx.Database.Postgres.csproj
+++ b/src/CoreEx.Database.Postgres/CoreEx.Database.Postgres.csproj
@@ -1,22 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>CoreEx.Database.Postgres</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Postgres Database extras.</Title>
-    <Description>CoreEx .NET Postgres Database extras.</Description>
-    <PackageTags>coreex db database sql postgres ado.net relational</PackageTags>
+    <Title>CoreEx .NET PostgreSQL extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data postgresql postgres database</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="9.0.2" />
+    <PackageReference Include="Aspire.Azure.Npgsql" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\CoreEx.Data\CoreEx.Data.csproj" />
     <ProjectReference Include="..\CoreEx.Database\CoreEx.Database.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.ApplicationBuilder.cs b/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.ApplicationBuilder.cs
new file mode 100644
index 00000000..beca3603
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.ApplicationBuilder.cs
@@ -0,0 +1,34 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.Hosting;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="PostgresDatabase"/> and related extensions.
+/// </summary>
+public static class CoreExPostgresExtensions
+{
+    /// <summary>
+    /// Adds <b>singleton</b> <see cref="PostgresOutboxRelayHostedService"/> keyed service(s) (as per <paramref name="servicesCount"/>) that will be executed as a hosted service (in the background).
+    /// </summary>
+    /// <param name="builder">The <see cref="IHostApplicationBuilder"/>.</param>
+    /// <param name="servicesCount">The number of hosted services to start to enable concurrency of processing across partitions.</param>
+    /// <param name="serviceKeyPrefix">The keyed singleton and health check key prefix; defaults to '<c>postgres-outbox-relay-</c>'.</param>
+    /// <param name="configure">An optional action to configure each <see cref="PostgresOutboxRelayHostedService"/> instance.</param>
+    /// <returns>The <see cref="IHostApplicationBuilder"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Where the <paramref name="servicesCount"/> is not specified it will, attempt to get the value from configuration using '<c>CoreEx:Host:Services:OutboxRelay:ServicesCount</c>' as the key; otherwise,
+    /// defaults to '<c>4</c>'.
+    /// <para>Uses the <see cref="Microsoft.Extensions.DependencyInjection.CoreExExtensions.AddHostedService{THostedService}(IServiceCollection, string, Action{IServiceProvider, THostedService}?)"/> to enable.</para></remarks>
+    public static IHostApplicationBuilder AddPostgresOutboxRelayHostedService(this IHostApplicationBuilder builder, int? servicesCount = null, string serviceKeyPrefix = "postgres-outbox-relay-", Action<IServiceProvider, PostgresOutboxRelayHostedService>? configure = null)
+    {
+        // Determine the number of services to add.
+        builder.ThrowIfNull();
+        servicesCount ??= CoreEx.Abstractions.Internal.GetConfigurationValue<int>($"CoreEx:Host:Services:OutboxRelay:ServicesCount", 4, builder.Configuration);
+        servicesCount.ThrowWhen(servicesCount => servicesCount <= 0 || servicesCount > 32);
+
+        // Add the services as per count.
+        for (int i = 0; i < servicesCount; i++)
+            builder.Services.ThrowIfNull().AddHostedService<PostgresOutboxRelayHostedService>($"{serviceKeyPrefix}{i:00}", configure);
+
+        return builder;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.DependencyInjection.cs b/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..e017d3d6
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.DependencyInjection.cs
@@ -0,0 +1,124 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure - this is by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="PostgresDatabase"/> and related extensions.
+/// </summary>
+public static partial class CoreExPostgresExtensions
+{
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="PostgresDatabase"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the database instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPostgresDatabase(this IServiceCollection services, Action<IServiceProvider, PostgresDatabase>? configure = null)
+        => AddPostgresDatabase<PostgresDatabase>(services, configure);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="PostgresDatabase"/> <typeparamref name="TDatabase"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the database instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPostgresDatabase<TDatabase>(this IServiceCollection services, Action<IServiceProvider, TDatabase>? configure = null) where TDatabase : PostgresDatabase
+    {
+        return services.ThrowIfNull().AddScoped<TDatabase>(sp =>
+        {
+            var db = ActivatorUtilities.CreateInstance<TDatabase>(sp);
+            configure?.Invoke(sp, db);
+            return db;
+        });
+    }
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="PostgresUnitOfWork"/> service for the <see cref="PostgresDatabase"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="addAsIUnitOfWork">Indicates whether to also register as the <see cref="IUnitOfWork"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPostgresUnitOfWork(this IServiceCollection services, bool addAsIUnitOfWork = true)
+        => AddPostgresUnitOfWork<PostgresDatabase>(services, addAsIUnitOfWork);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="PostgresUnitOfWork"/> service for the specified <see cref="PostgresDatabase"/> <typeparamref name="TDatabase"/>.
+    /// </summary>
+    /// <typeparam name="TDatabase">The <see cref="PostgresDatabase"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="addAsIUnitOfWork">Indicates whether to also register as the <see cref="IUnitOfWork"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPostgresUnitOfWork<TDatabase>(this IServiceCollection services, bool addAsIUnitOfWork = true) where TDatabase : PostgresDatabase
+    {
+        services.ThrowIfNull().AddScoped<PostgresUnitOfWork>(sp =>
+        {
+            var sql = sp.GetRequiredService<TDatabase>();
+            return ActivatorUtilities.CreateInstance<PostgresUnitOfWork>(sp, sql);
+        });
+
+        if (addAsIUnitOfWork)
+            services.AddScoped<IUnitOfWork>(sp => sp.GetRequiredService<PostgresUnitOfWork>());
+
+        return services;
+    }
+
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> <see cref="PostgresOutboxPublisher"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="PostgresOutboxPublisher"/> instance.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Microsoft.Extensions.DependencyInjection.CoreExEventsExtensions.AddEventPublisher(IServiceCollection, string, Func{IServiceProvider, IEventPublisher}, bool)"/> for more information
+    /// related to the underlying registration implementation.</remarks>
+    public static IServiceCollection AddPostgresOutboxPublisher(this IServiceCollection services, Action<IServiceProvider, PostgresOutboxPublisher>? configure = null, bool addAsDefaultIEventPublisher = true, string serviceKey = PostgresOutboxPublisher.DefaultServiceKey)
+        => services.AddPostgresOutboxPublisher<PostgresOutboxPublisher>(configure, addAsDefaultIEventPublisher, serviceKey);
+
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> <typeparamref name="TOutbox"/> <see cref="PostgresOutboxPublisher"/> service.
+    /// </summary>
+    /// <typeparam name="TOutbox">The <see cref="PostgresOutboxPublisher"/> <see cref="Type"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <typeparamref name="TOutbox"/> instance.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Microsoft.Extensions.DependencyInjection.CoreExEventsExtensions.AddEventPublisher(IServiceCollection, string, Func{IServiceProvider, IEventPublisher}, bool)"/> for more information
+    /// related to the underlying registration implementation.</remarks>
+    public static IServiceCollection AddPostgresOutboxPublisher<TOutbox>(this IServiceCollection services, Action<IServiceProvider, TOutbox>? configure = null, bool addAsDefaultIEventPublisher = true, string serviceKey = PostgresOutboxPublisher.DefaultServiceKey) where TOutbox : PostgresOutboxPublisher
+        => services.ThrowIfNull().AddEventPublisher(serviceKey, sp =>
+        {
+            var outbox = ActivatorUtilities.CreateInstance<TOutbox>(sp);
+            configure?.Invoke(sp, outbox);
+            return outbox;
+        }, addAsDefaultIEventPublisher);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="PostgresOutboxRelay"/> service for the <see cref="PostgresDatabase"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="PostgresOutboxRelay"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPostgresOutboxRelay(this IServiceCollection services, Action<IServiceProvider, PostgresOutboxRelay>? configure = null)
+        => services.AddPostgresOutboxRelay<PostgresOutboxRelay, PostgresDatabase>(configure);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="PostgresOutboxRelay"/> service for the <see cref="PostgresDatabase"/>.
+    /// </summary>
+    /// <typeparam name="TOutboxRelay">The <see cref="PostgresOutboxRelay"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDatabase">The <see cref="PostgresDatabase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <typeparamref name="TOutboxRelay"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPostgresOutboxRelay<TOutboxRelay, TDatabase>(this IServiceCollection services, Action<IServiceProvider, TOutboxRelay>? configure = null) where TOutboxRelay : PostgresOutboxRelay where TDatabase : PostgresDatabase
+    {
+        return services.ThrowIfNull().AddScoped<TOutboxRelay>(sp =>
+        {
+            var db = sp.GetRequiredService<TDatabase>();
+            var relay = ActivatorUtilities.CreateInstance<TOutboxRelay>(sp, db);
+            configure?.Invoke(sp, relay);
+            return relay;
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.OpenTelemetry.cs b/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.OpenTelemetry.cs
new file mode 100644
index 00000000..a2493288
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/CoreExPostgresExtensions.OpenTelemetry.cs
@@ -0,0 +1,21 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace OpenTelemetry.Trace;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExPostgresExtensions
+{
+    /// <summary>
+    /// Enables <i>CoreEx</i> OpenTelemetry instrumentation.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static OpenTelemetryBuilder WithCoreExPostgresTelemetry(this OpenTelemetryBuilder builder) => builder.ThrowIfNull()
+        .WithCoreExEventsSources()  // Included here as they are leveraged by the Postgres Outbox capabilities.
+        .WithTracing(t => t.AddInvokerAsSource<CoreEx.Database.Postgres.Extended.PostgresInvoker>()
+                           .AddInvokerAsSource<CoreEx.Database.Postgres.Extended.PostgresUnitOfWorkInvoker>()
+                           .AddSource("CoreEx.Database.Outbox.Relay"))
+        .WithMetrics(m => m.AddMeter(PostgresMetrics.Meter.Name));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/Extended/PostgresDatabaseColumns.cs b/src/CoreEx.Database.Postgres/Extended/PostgresDatabaseColumns.cs
new file mode 100644
index 00000000..006cb02a
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/Extended/PostgresDatabaseColumns.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Database.Postgres.Extended;
+
+/// <summary>
+/// Extends the <see cref="DatabaseColumns"/> configuring/adding PostgreSQL specific columns.
+/// </summary>
+/// <remarks>All are initialized using the de facto PostgreSQL snake_case convention.
+/// <para>The <see cref="DatabaseColumns.RowVersionName"/> is mapped to the PostgreSQL-specific column name <c>xmin</c>. This is a PostgreSQL system column (hidden); see <see href="https://www.postgresql.org/docs/current/ddl-system-columns.html#DDL-SYSTEM-COLUMNS"/> 
+/// and <see href="https://www.npgsql.org/efcore/modeling/concurrency.html"/> for more information.</para></remarks>
+public record PostgresDatabaseColumns : DatabaseColumns
+{
+    /// <summary>
+    /// Gets or sets the default <see cref="PostgresDatabaseColumns"/>.
+    /// </summary>
+    public static PostgresDatabaseColumns Default { get; set; } = new PostgresDatabaseColumns();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PostgresDatabaseColumns"/> class.
+    /// </summary>
+    public PostgresDatabaseColumns()
+    {
+        CreatedOnName = "created_on";
+        CreatedByName = "created_by";
+        UpdatedOnName = "updated_on";
+        UpdatedByName = "updated_by";
+        ReselectRecordName = "reselect_record";
+        PagingSkipName = "paging_skip";
+        PagingTakeName = "paging_take";
+        PagingCountName = "paging_count";
+        RowVersionName = "xmin";
+        TenantIdName = "tenant_id";
+        IsDeletedName = "is_deleted";
+        RefDataIdName = "id";
+        RefDataCodeName = "code";
+        RefDataTextName = "text";
+        RefDataDescriptionName = "description";
+        RefDataSortOrderName = "sort_order";
+        RefDataIsActiveName = "is_active";
+        RefDataStartsOnName = "starts_on";
+        RefDataEndsOnName = "ends_on";
+        PartitionKeyName = "partition_key";
+        PartitionIdName = "partition_id";
+        OutboxDestinationName = "destination";
+        OutboxEventName = "event";
+        OutboxEnqueuedUtcName = "enqueued_utc";
+        OutboxBatchSizeName = "batch_size";
+        OutboxLeaseIdName = "lease_id";
+        OutboxLeaseDurationName = "lease_seconds";
+        OutboxDequeuedUtcName = "dequeued_utc";
+        OutboxBackoffDurationName = "backoff_seconds";
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/Extended/PostgresInvoker.cs b/src/CoreEx.Database.Postgres/Extended/PostgresInvoker.cs
new file mode 100644
index 00000000..18a5e0a4
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/Extended/PostgresInvoker.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Database.Postgres.Extended;
+
+/// <summary>
+/// Provides the <see cref="PostgresDatabase"/> invoker functionality.
+/// </summary>
+[InvokerName("CoreEx.Database.Postgres.Postgres")]
+public class PostgresInvoker : DatabaseInvoker
+{
+    private static PostgresInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="PostgresInvoker"/> instance.
+    /// </summary>
+    public static PostgresInvoker Default => ExecutionContext.GetService<PostgresInvoker>() ?? (_default ??= new PostgresInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/Extended/PostgresUnitOfWorkInvoker.cs b/src/CoreEx.Database.Postgres/Extended/PostgresUnitOfWorkInvoker.cs
new file mode 100644
index 00000000..a55b5911
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/Extended/PostgresUnitOfWorkInvoker.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Database.Postgres.Extended;
+
+/// <summary>
+/// Provides the underlying <see cref="PostgresDatabase"/> <see cref="IUnitOfWork"/> invoker functionality.
+/// </summary>
+/// <remarks>Implements transaction handling including automatic save-point support for nested unit-of-work invocations. Also, where the underlying work returns an <see cref="IResult"/>, 
+/// then an <see cref="IResult.IsFailure"/> will trigger a rollback similar to an unhandled exception.
+/// <para>Where a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see> is supported (<see cref="IUnitOfWork.AreEventsSupported"/>) then the <see cref="IUnitOfWork.Events"/> will
+/// automatically be included within the root (top-most) transaction. This is achieved by executing the <see cref="IEventPublisher.PublishAsync(CancellationToken)"/>. Nested (child) transactional rollbacks are also supported by the <see cref="IEventPublisher.Rollback(int)"/>.</para>
+/// <para>Note that the underlying <see cref="IUnitOfWork"/> implementation is not thread-safe.</para></remarks>
+[InvokerName("CoreEx.Database.Postgres.PostgresUnitOfWork")]
+public class PostgresUnitOfWorkInvoker : InvokerBase<PostgresUnitOfWork, PostgresDatabaseArgs>
+{
+    private static PostgresUnitOfWorkInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="PostgresUnitOfWorkInvoker"/> instance.
+    /// </summary>
+    public static PostgresUnitOfWorkInvoker Default => ExecutionContext.GetService<PostgresUnitOfWorkInvoker>() ?? (_default ??= new PostgresUnitOfWorkInvoker());
+
+    /// <inheritdoc/>
+    protected async override Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, PostgresUnitOfWork unitOfWork, PostgresDatabaseArgs args, Func<InvokerTracer, PostgresDatabaseArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
+        => await DatabaseInvoker.OrchestrateUnitOfWorkTransactionAsync(tracer, unitOfWork,
+            () => base.OnInvokeAsync(tracer, unitOfWork, args, func, cancellationToken),
+            outboxEnqueued => PostgresMetrics.OutboxEnqueued.Add(outboxEnqueued),
+            cancellationToken).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/GlobalUsing.cs b/src/CoreEx.Database.Postgres/GlobalUsing.cs
new file mode 100644
index 00000000..ddc2f1a7
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/GlobalUsing.cs
@@ -0,0 +1,27 @@
+global using CloudNative.CloudEvents.Extensions;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.Database.Abstractions;
+global using CoreEx.Database.Extended;
+global using CoreEx.Database.Outbox;
+global using CoreEx.Database.Postgres;
+global using CoreEx.Database.Postgres.Extended;
+global using CoreEx.Database.Postgres.Outbox;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Hosting;
+global using CoreEx.Invokers;
+global using CoreEx.Mapping.Converters;
+global using CoreEx.Mapping.Converters.Abstractions;
+global using CoreEx.Results.Abstractions;
+global using CoreEx.Text;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using Npgsql;
+global using NpgsqlTypes;
+global using System.Collections.Immutable;
+global using System.Data;
+global using System.Data.Common;
+global using System.Diagnostics.Metrics;
+global using System.Text;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxPublisher.cs b/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxPublisher.cs
new file mode 100644
index 00000000..c5268ecb
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxPublisher.cs
@@ -0,0 +1,90 @@
+namespace CoreEx.Database.Postgres.Outbox;
+
+/// <summary>
+/// Provides the <see href="https://www.postgresql.org/docs/">PostgreSQL</see> <see cref="IEventPublisher"/> to be used as a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+/// </summary>
+/// <remarks>As the <see cref="PostgresDatabase"/> is used, the <see cref="PostgresOutboxPublisher"/> should participate in the same transaction. It is the responsibility of the caller to manage this transaction.
+/// <para>Note: The <see cref="DatabaseOutboxPublisherBase{TDatabase}.Statement"/> should be set to a SQL function that enqueues the outbox events; the function must accept parameters (positionally, in the order specified) for the partition ID, destination, event data, enqueued UTC, and optional tenant.</para></remarks>
+public class PostgresOutboxPublisher : DatabaseOutboxPublisherBase<PostgresDatabase>
+{
+    /// <summary>
+    /// Gets the default service key used when registering the service.
+    /// </summary>
+    /// <remarks>See related <see cref="CoreExPostgresExtensions.AddPostgresOutboxPublisher(IServiceCollection, Action{IServiceProvider, PostgresOutboxPublisher}?, bool, string)"/>.</remarks>
+    public const string DefaultServiceKey = "PostgresOutbox";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PostgresOutboxPublisher"/> class.
+    /// </summary>
+    /// <param name="database">The <see cref="PostgresDatabase"/>.</param>
+    /// <param name="destinationProvider">The optional <see cref="IDestinationProvider"/>.</param>
+    /// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
+    public PostgresOutboxPublisher(PostgresDatabase database, IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<PostgresOutboxPublisher>? logger = null)
+        : base(database, destinationProvider, formatter, logger)
+    {
+        // Attempt to automatically set the statement by convention, if possible.
+        var schema = ExecutionContext.GetService<IHostSettings>()?.DomainName;
+        if (schema is not null)
+            Statement = SqlStatement.FromText($"SELECT \"{SentenceCase.ToSnakeCase(schema)}\".\"fn_outbox_enqueue\"");
+    }
+
+    /// <inheritdoc/>
+    protected async override Task OnPublishAsync(DestinationEvent[] events, CancellationToken cancellationToken = default)
+    {
+        var utc = Runtime.UtcNow.UtcDateTime;
+        var ec = ExecutionContext.HasCurrent ? ExecutionContext.Current : null;
+        var hasTenantId = !string.IsNullOrEmpty(ec?.TenantId);
+
+        // The statement must be SQL text; which in turn should (assumes) executes a function.
+        if (Statement.CommandType != CommandType.Text)
+            throw new InvalidOperationException($"The {nameof(Statement)}.{nameof(Statement.CommandType)} must be {nameof(CommandType.Text)}.");
+
+        // For each into batch of up to 'StatementBatchSize' events to persist, to eke out better performance by reducing the number of round trips to the database.
+        foreach (var chunk in events.Chunk(StatementBatchSize))
+        {
+            var sb = new StringBuilder();
+            var dpc = new DatabaseParameterCollection(Database);
+
+            for (var i = 0; i < chunk.Length; i++)
+            {
+                // Add each event to the batch statement and parameters collection.
+                var pk = chunk[i].Event.GetPartitionKey();
+                var partitionId = PartitionKey.GetPartitionId(string.IsNullOrEmpty(pk) ? Guid.NewGuid().ToString() : pk, PartitionSize);
+
+                sb.Append($"{Statement.CommandText}(");
+
+                // Parameters in PostgreSQL are positional; so we need to emit in the correct order and with the correct types.
+                AddParameter(sb, dpc, Database.NamedColumns.PartitionIdName, partitionId, NpgsqlDbType.Integer, i);
+                AddParameter(sb, dpc, Database.NamedColumns.OutboxDestinationName, chunk[i].Destination, NpgsqlDbType.Varchar, i);
+                AddParameter(sb, dpc, Database.NamedColumns.OutboxEventName, chunk[i].Event.EncodeToJsonElement(), NpgsqlDbType.Text, i);
+                AddParameter(sb, dpc, Database.NamedColumns.OutboxEnqueuedUtcName, utc, NpgsqlDbType.TimestampTz, i, hasTenantId);
+
+                if (hasTenantId)
+                    AddParameter(sb, dpc, Database.NamedColumns.TenantIdName, ec!.TenantId, NpgsqlDbType.Varchar, i, false);
+            }
+
+            if (Logger?.IsEnabled(LogLevel.Debug) is true)
+                Logger.LogDebug("Executing batch statement to persist {Count} event(s) as a single database command.", chunk.Length);
+
+            // Execute the batch statement with the parameters collection.
+            var ds = Database.Statement(new SqlStatement(CommandType.Text, sb.ToString()));
+            ds.Parameters.AddRange(dpc);
+            await ds.NonQueryAsync(cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    /// Adds the parameter to the <see cref="StringBuilder"/> and <see cref="DatabaseParameterCollection"/>.
+    /// </summary>
+    private static void AddParameter(StringBuilder sb, DatabaseParameterCollection dpc, string name, object? value, NpgsqlDbType dbType, int index, bool appendComma = true)
+    {
+        sb.Append(DatabaseParameterCollection.ParameterizeName($"{name}_{index}"));
+        if (appendComma)
+            sb.Append(", ");
+        else
+            sb.AppendLine(");");
+
+        dpc.AddParameter($"{name}_{index}", value, dbType);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxRelay.cs b/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxRelay.cs
new file mode 100644
index 00000000..91a78988
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxRelay.cs
@@ -0,0 +1,65 @@
+namespace CoreEx.Database.Postgres.Outbox;
+
+/// <summary>
+/// Provides the <see href="https://www.postgresql.org/docs/">PostgreSQL</see> <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see> <i>relay</i> using the destination <see cref="IEventPublisher"/>.
+/// </summary>
+/// <param name="database">The <see cref="PostgresDatabase"/>.</param>
+/// <param name="eventPublisher">The destination <see cref="IEventPublisher"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public class PostgresOutboxRelay(PostgresDatabase database, IEventPublisher eventPublisher, ILogger<PostgresOutboxRelay>? logger = null)
+    : DatabaseOutboxRelayBase<PostgresDatabase, PostgresOutboxRelay>(database, eventPublisher, logger)
+{
+    /// <summary><inheritdoc/></summary>
+    /// <param name="schema"><inheritdoc/></param>
+    /// <remarks>The <paramref name="schema"/> (converted to <c>snake_case</c>) is used to qualify the database function names. The by-convention names used are as follows:
+    /// <list type="bullet">
+    /// <item><description><see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}.ClaimBatchStatement"/> = '<c>SELECT * FROM "schema"."fn_outbox_batch_claim"(...</c>'</description></item>
+    /// <item><description><see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}.CompleteBatchStatement"/> = '<c>SELECT "schema"."fn_outbox_batch_complete"(...</c>'</description></item>
+    /// <item><description><see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}.CancelBatchStatement"/> = '<c>SELECT "schema"."fn_outbox_batch_cancel"(...</c>'</description></item>
+    /// </list>
+    /// The parameters are positional and must match the expected order in the database functions.</remarks>
+    public override void SetStatementsByConvention(string? schema = null)
+    {
+        schema ??= ExecutionContext.GetService<IHostSettings>()?.DomainName;
+        if (schema is not null)
+        {
+            schema = SentenceCase.ToSnakeCase(schema);
+
+            ClaimBatchStatement = SqlStatement.FromText($"SELECT * FROM \"{schema}\".\"fn_outbox_batch_claim\"(@{Database.NamedColumns.PartitionIdName}, @{Database.NamedColumns.OutboxBatchSizeName}, @{Database.NamedColumns.OutboxLeaseIdName}, @{Database.NamedColumns.OutboxLeaseDurationName}, @{Database.NamedColumns.TenantIdName})");
+            CompleteBatchStatement = SqlStatement.FromText($"SELECT \"{schema}\".\"fn_outbox_batch_complete\"(@{Database.NamedColumns.OutboxLeaseIdName}, @{Database.NamedColumns.OutboxDequeuedUtcName})");
+            CancelBatchStatement = SqlStatement.FromText($"SELECT \"{schema}\".\"fn_outbox_batch_cancel\"(@{Database.NamedColumns.OutboxLeaseIdName}, @{Database.NamedColumns.OutboxBackoffDurationName})");
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override bool IsTransientException(Exception exception)
+    {
+        if (exception is NpgsqlException nex)
+        {
+            if (nex.IsTransient)
+                return true;
+
+            switch (nex.SqlState)
+            {
+                case "40P01": return true;  // deadlock_detected: https://www.postgresql.org/docs/current/errcodes-appendix.html
+                case "55P03": return true;  // lock_not_available: https://www.postgresql.org/docs/current/errcodes-appendix.html
+            }
+        }
+
+        return base.IsTransientException(exception);
+    }
+
+    /// <inheritdoc/>
+    protected async override Task CompleteBatchAsync(DatabaseOutboxRelayArgs args, Guid leaseId, CancellationToken cancellationToken)
+    {
+        await base.CompleteBatchAsync(args, leaseId, cancellationToken);
+
+        if (EventPublisher.IsEmpty)
+            return;
+
+        // Capture metrics; no need to capture each as this would be diminishing returns, as the oldest and newest are the most important.
+        PostgresMetrics.OutboxRelayBatchSize.Add(EventPublisher.Count);
+        PostgresMetrics.OutboxRelayOldestLagDuration.Record((DateTimeOffset.UtcNow - (EventPublisher.GetEvents()[0].Event.Time ?? default)).TotalMilliseconds);
+        PostgresMetrics.OutboxRelayNewestLagDuration.Record((DateTimeOffset.UtcNow - (EventPublisher.GetEvents()[^1].Event.Time ?? default)).TotalMilliseconds);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxRelayHostedService.cs b/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxRelayHostedService.cs
new file mode 100644
index 00000000..10c0c343
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/Outbox/PostgresOutboxRelayHostedService.cs
@@ -0,0 +1,10 @@
+namespace CoreEx.Database.Postgres.Outbox;
+
+/// <summary>
+/// Provides the <see href="https://www.postgresql.org/docs/">PostgreSQL</see> <see cref="IDatabaseOutboxRelay.RelayAsync"/> execution leveraging an underlying <see cref="TimerHostedServiceBase"/>.
+/// </summary>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public sealed class PostgresOutboxRelayHostedService(IServiceProvider serviceProvider, ILogger logger)
+    : DatabaseOutboxRelayHostedServiceBase<PostgresOutboxRelay>(serviceProvider, logger)
+{ }
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresCommand.cs b/src/CoreEx.Database.Postgres/PostgresCommand.cs
new file mode 100644
index 00000000..e3dd53b5
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/PostgresCommand.cs
@@ -0,0 +1,9 @@
+namespace CoreEx.Database.Postgres;
+
+/// <summary>
+/// Provides extended <see href="https://www.npgsql.org/">Npgsql (PostgreSQL)</see> <see cref="DatabaseCommand{TDatabaseArgs, TSelf}"/> capabilities.
+/// </summary>
+/// <param name="db">The <see cref="IDatabase"/>.</param>
+/// <param name="statement">The <see cref="SqlStatement"/>.</param>
+/// <remarks>As the underlying <see cref="DbCommand"/> implements <see cref="IDisposable"/> this is only created (and automatically disposed) where executing the command proper.</remarks>
+public sealed class PostgresCommand(PostgresDatabase db, SqlStatement statement) : DatabaseCommand<PostgresDatabaseArgs, PostgresCommand>(db, statement) { }
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresDatabase.cs b/src/CoreEx.Database.Postgres/PostgresDatabase.cs
index 5093fc78..88bedda2 100644
--- a/src/CoreEx.Database.Postgres/PostgresDatabase.cs
+++ b/src/CoreEx.Database.Postgres/PostgresDatabase.cs
@@ -1,134 +1,91 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping.Converters;
-using CoreEx.Results;
-using Microsoft.Extensions.Logging;
-using Npgsql;
-using System;
-using System.Linq;
-using System.Data.Common;
-using System.Threading.Tasks;
-using System.Threading;
-
-namespace CoreEx.Database.Postgres
+namespace CoreEx.Database.Postgres;
+
+/// <summary>
+/// Provides the <see href="https://www.npgsql.org/">Npgsql (PostgreSQL)</see> <see cref="IDatabase"/> functionality.
+/// </summary>
+/// <remarks>The <see cref="OnDbException(DbException)"/> override implements transformation of pre-determined PostgreSQL error codes, as follows:
+///  <list type="bullet">
+///   <item><c>56001</c> -> <see cref="ValidationException"/>.</item>
+///   <item><c>56002</c> -> <see cref="BusinessException"/>.</item>
+///   <item><c>56003</c> -> <see cref="AuthorizationException"/>.</item>
+///   <item><c>56004</c> -> <see cref="ConcurrencyException"/>.</item>
+///   <item><c>56005</c> -> <see cref="NotFoundException"/>.</item>
+///   <item><c>56006</c> -> <see cref="ConflictException"/>.</item>
+///   <item><c>56007</c> -> <see cref="DuplicateException"/>.</item>
+///   <item><c>56010</c> -> <see cref="DataConsistencyException"/>.</item>
+///  </list>
+///  <para>This is in addition to the <see cref="CheckDuplicateErrorNumbers"/> with the corresponding <see cref="DuplicateErrorNumbers"/> that will also result in a <see cref="DuplicateException"/>.</para>
+///  <para>This class also implements the <see cref="IUnitOfWork"/> including a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>. The <see cref="IUnitOfWork"/> 
+///  functionality is enabled by the <see cref="PostgresUnitOfWorkInvoker"/>; note, this is not thread-safe.</para>
+/// </remarks>
+/// <param name="dataSource">The <see cref="NpgsqlDataSource"/>.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public partial class PostgresDatabase(NpgsqlDataSource dataSource, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<PostgresDatabase>? logger = null) : Database<NpgsqlConnection, PostgresCommand, PostgresDatabaseArgs, PostgresDatabaseColumns>(dataSource.CreateConnection(), PostgresInvoker.Default, PostgresDatabaseColumns.Default, jsonSerializerOptions, logger)
 {
     /// <summary>
-    /// Provides <see href="https://www.npgsql.org/">Npgsql (PostgreSQL)</see> database access functionality.
+    /// Gets the default <see cref="DuplicateErrorNumbers"/>.
     /// </summary>
-    /// <param name="create">The function to create the <see cref="NpgsqlConnection"/>.</param>
-    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The optional <see cref="DatabaseInvoker"/>.</param>
-    public class PostgresDatabase(Func<NpgsqlConnection> create, ILogger<PostgresDatabase>? logger = null, DatabaseInvoker? invoker = null) : Database<NpgsqlConnection>(create, NpgsqlFactory.Instance, logger, invoker)
-    {
-        private static readonly PostgresDatabaseColumns _defaultColumns = new();
+    /// <remarks>See <see href="https://www.postgresql.org/docs/current/errcodes-appendix.html"/>.</remarks>
+    public static string[] DefaultDuplicateErrorNumbers { get; } = ["23505"];
 
-        /// <summary>
-        /// Gets the default <see cref="DuplicateErrorNumbers"/>.
-        /// </summary>
-        /// <remarks>See <see href="https://dev.Npgsql.com/doc/Npgsql-errors/8.0/en/server-error-reference.html"/>.</remarks>
-        public static string[] DefaultDuplicateErrorNumbers { get; } = ["23505"];
+    /// <inheritdoc/>
+    public override ISourceConverter<string?> RowVersionConverter => EncodedStringToUInt32Converter.Default;
 
-        /// <summary>
-        /// Gets or sets the names of the pre-configured <see cref="PostgresDatabaseColumns"/>.
-        /// </summary>
-        /// <remarks>Do not update the default properties directly as a shared static instance is used (unless this is the desired behaviour); create a new <see cref="PostgresDatabaseColumns"/> instance for overridding.</remarks>
-        public new PostgresDatabaseColumns DatabaseColumns { get; set; } = _defaultColumns;
-
-        /// <summary>
-        /// Gets or sets the stored procedure name used by <see cref="SetPostgresSessionContextAsync(string?, DateTime?, string?, string?, CancellationToken)"/>.
-        /// </summary>
-        /// <remarks>Defaults to '<c>"public"."sp_set_session_context"</c>'.</remarks>
-        public string SessionContextStoredProcedure { get; set; } = "\"public\".\"sp_set_session_context\"";
-
-        /// <inheritdoc/>
-        public override IConverter RowVersionConverter => EncodedStringToUInt32Converter.Default;
+    /// <summary>
+    /// Indicates whether to check the <see cref="DuplicateErrorNumbers"/> when catching the <see cref="PostgresException"/>.
+    /// </summary>
+    public bool CheckDuplicateErrorNumbers { get; set; } = true;
 
-        /// <summary>
-        /// Indicates whether to transform the <see cref="PostgresException"/> into an <see cref="Abstractions.IExtendedException"/> equivalent based on the <see cref="PostgresException.SqlState"/>.
-        /// </summary>
-        /// <remarks>Transforms and throws the <see cref="Abstractions.IExtendedException"/> equivalent from the <see cref="PostgresException"/> known list.</remarks>
-        public bool ThrowTransformedException { get; set; } = true;
+    /// <summary>
+    /// Gets or sets the list of known <see cref="PostgresException.SqlState"/> values that are considered a duplicate error.
+    /// </summary>
+    /// <remarks>Overrides the <see cref="DefaultDuplicateErrorNumbers"/>.</remarks>
+    public string[]? DuplicateErrorNumbers { get; set; }
 
-        /// <summary>
-        /// Indicates whether to check the <see cref="DuplicateErrorNumbers"/> when catching the <see cref="PostgresException"/>.
-        /// </summary>
-        public bool CheckDuplicateErrorNumbers { get; set; } = true;
+    /// <inheritdoc/>
+    public override PostgresCommand Statement(SqlStatement statement) => new(this, statement);
 
-        /// <summary>
-        /// Gets or sets the list of known <see cref="PostgresException.SqlState"/> values that are considered a duplicate error.
-        /// </summary>
-        /// <remarks>Overrides the <see cref="DefaultDuplicateErrorNumbers"/>.</remarks>
-        public string[]? DuplicateErrorNumbers { get; set; }
+    /// <inheritdoc/>
+    public override DbParameter CreateParameter() => new NpgsqlParameter();
 
-        /// <summary>
-        /// Sets the PostgreSQL context using the specified values by invoking the <see cref="SessionContextStoredProcedure"/> using parameters named <see cref="PostgresDatabaseColumns.SessionContextUsernameName"/>, 
-        /// <see cref="PostgresDatabaseColumns.SessionContextTimestampName"/>, <see cref="PostgresDatabaseColumns.SessionContextTenantIdName"/> and <see cref="PostgresDatabaseColumns.SessionContextUserIdName"/>.
-        /// </summary>
-        /// <param name="username">The username (where <c>null</c> the value will default to <see cref="ExecutionContext.EnvironmentUserName"/>).</param>
-        /// <param name="timestamp">The timestamp <see cref="DateTime"/> (where <c>null</c> the value will default to <see cref="SystemTime.Timestamp"/>).</param>
-        /// <param name="tenantId">The tenant identifer (where <c>null</c> the value will not be used).</param>
-        /// <param name="userId">The unique user identifier (where <c>null</c> the value will not be used).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-set-session-context-transact-sql"/>.</remarks>
-        public Task SetPostgresSessionContextAsync(string? username, DateTime? timestamp, string? tenantId = null, string? userId = null, CancellationToken cancellationToken = default)
+    /// <inheritdoc/>
+    protected override Exception? OnDbException(DbException dbex)
+    {
+        if (dbex is PostgresException pex)
         {
-            if (string.IsNullOrEmpty(SessionContextStoredProcedure))
-                throw new InvalidOperationException("The SessionContextStoredProcedure property must have a value.");
+            var msg = pex.Message?.TrimEnd();
+            if (string.IsNullOrEmpty(msg))
+                msg = null;
 
-            return Invoker.InvokeAsync(this, username, timestamp, tenantId, userId, async (_, username, timestamp, tenantId, userId, ct) =>
+            switch (pex.SqlState)
             {
-                return await StoredProcedure(SessionContextStoredProcedure)
-                    .Param($"@{DatabaseColumns.SessionContextUsernameName}", username ?? ExecutionContext.EnvironmentUserName)
-                    .Param($"@{DatabaseColumns.SessionContextTimestampName}", timestamp ?? SystemTime.Timestamp)
-                    .ParamWith(tenantId, $"@{DatabaseColumns.SessionContextTenantIdName}")
-                    .ParamWith(userId, $"@{DatabaseColumns.SessionContextUserIdName}")
-                    .NonQueryAsync(ct).ConfigureAwait(false);
-            }, cancellationToken, nameof(SetPostgresSessionContextAsync));
-        }
-
-        /// <summary>
-        /// Sets the PostgreSQL session context using the <see cref="ExecutionContext"/>.
-        /// </summary>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>. Defaults to <see cref="ExecutionContext.Current"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SetPostgresSessionContextAsync(string, DateTime?, string?, string?, CancellationToken)"/> for more information.</remarks>
-        public Task SetPostgresSessionContextAsync(ExecutionContext? executionContext = null, CancellationToken cancellationToken = default)
-        {
-            var ec = executionContext ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current : null);
-            return (ec == null)
-                ? SetPostgresSessionContextAsync(null!, null, cancellationToken: cancellationToken)
-                : SetPostgresSessionContextAsync(ec.UserName, ec.Timestamp, ec.TenantId, ec.UserId, cancellationToken);
+                case "56001": return new ValidationException(msg, pex);
+                case "56002": return new BusinessException(msg, pex);
+                case "56003": return new AuthorizationException(msg, pex);
+                case "56004": return new ConcurrencyException(msg, pex);
+                case "56005": return new NotFoundException(msg, pex);
+                case "56006": return new ConflictException(msg, pex);
+                case "56007": return new DuplicateException(msg, pex);
+                case "56010": return new DataConsistencyException(msg, pex);
+
+                default:
+                    if (CheckDuplicateErrorNumbers && (DuplicateErrorNumbers ?? DefaultDuplicateErrorNumbers).Contains(pex.SqlState))
+                        return new DuplicateException(null, pex);
+
+                    break;
+            }
         }
 
-        /// <inheritdoc/>
-        protected override Result? OnDbException(DbException dbex)
-        {
-            if (ThrowTransformedException && dbex is PostgresException pex)
-            {
-                var msg = pex.MessageText?.TrimEnd();
-                if (string.IsNullOrEmpty(msg))
-                    msg = null;
-
-                switch (pex.SqlState)
-                {
-                    case "56001": return Result.Fail(new ValidationException(msg, pex));
-                    case "56002": return Result.Fail(new BusinessException(msg, pex));
-                    case "56003": return Result.Fail(new AuthorizationException(msg, pex));
-                    case "56004": return Result.Fail(new ConcurrencyException(msg, pex));
-                    case "56005": return Result.Fail(new NotFoundException(msg, pex));
-                    case "56006": return Result.Fail(new ConflictException(msg, pex));
-                    case "56007": return Result.Fail(new DuplicateException(msg, pex));
-                    case "56010": return Result.Fail(new DataConsistencyException(msg, pex));
-
-                    default:
-                        if (CheckDuplicateErrorNumbers && (DuplicateErrorNumbers ?? DefaultDuplicateErrorNumbers).Contains(pex.SqlState))
-                            return Result.Fail(new DuplicateException(null, pex));
+        return base.OnDbException(dbex);
+    }
 
-                        break;
-                }
-            }
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+            ((IDatabase)this).Connection?.Dispose(); // We created it, so we dispose of it!
 
-            return base.OnDbException(dbex);
-        }
+        base.Dispose(disposing);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresDatabaseArgs.cs b/src/CoreEx.Database.Postgres/PostgresDatabaseArgs.cs
new file mode 100644
index 00000000..f982f1cf
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/PostgresDatabaseArgs.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Database.Postgres;
+
+/// <summary>
+/// Provides the <see cref="PostgresDatabase"/> arguments.
+/// </summary>
+public record class PostgresDatabaseArgs : DatabaseArgs { }
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresDatabaseColumns.cs b/src/CoreEx.Database.Postgres/PostgresDatabaseColumns.cs
deleted file mode 100644
index 5732bf01..00000000
--- a/src/CoreEx.Database.Postgres/PostgresDatabaseColumns.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Database.Extended;
-using CoreEx.Entities;
-
-namespace CoreEx.Database.Postgres
-{
-    /// <summary>
-    /// Extends the <see cref="DatabaseColumns"/> adding additional SQL Server specific.
-    /// </summary>
-    /// <remarks>Overrides the <see cref="DatabaseColumns.RowVersionName"/> to '<c>xmin</c>'. This is a PostgreSQL system column (hidden); see <see href="https://www.postgresql.org/docs/current/ddl-system-columns.html#DDL-SYSTEM-COLUMNS"/> 
-    /// and <see href="https://www.npgsql.org/efcore/modeling/concurrency.html"/> for more information.</remarks>
-    public class PostgresDatabaseColumns : DatabaseColumns
-    {
-        /// <summary>
-        /// Gets or sets the session context '<c>Username</c>' column name.
-        /// </summary>
-        public string SessionContextUsernameName { get; set; } = "Username";
-
-        /// <summary>
-        /// Gets or sets the session context '<c>Timestamp</c>' column name.
-        /// </summary>
-        public string SessionContextTimestampName { get; set; } = "Timestamp";
-
-        /// <summary>
-        /// Gets or sets the <see cref="ITenantId.TenantId"/> column name.
-        /// </summary>
-        public string SessionContextTenantIdName { get; set; } = "TenantId";
-
-        /// <summary>
-        /// Gets or sets the session context '<c>UserId</c>' column name.
-        /// </summary>
-        public string SessionContextUserIdName { get; set; } = "UserId";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PostgresDatabaseColumns"/> class.
-        /// </summary>
-        public PostgresDatabaseColumns() => RowVersionName = "xmin";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresExtensions.Parameters.cs b/src/CoreEx.Database.Postgres/PostgresExtensions.Parameters.cs
new file mode 100644
index 00000000..972863e6
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/PostgresExtensions.Parameters.cs
@@ -0,0 +1,95 @@
+namespace CoreEx.Database.Postgres;
+
+public static partial class PostgresExtensions
+{
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <see cref="NpgsqlDbType"/> and <see cref="ParameterDirection"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="npgsqlDbType">The parameter <see cref="NpgsqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>A <see cref="DbParameter"/>.</returns>
+    public static NpgsqlParameter AddParameter<T>(this DatabaseParameterCollection parameters, string name, T? value, NpgsqlDbType? npgsqlDbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        var p = (NpgsqlParameter)parameters.ThrowIfNull().Database.CreateParameter();
+        p.ParameterName = DatabaseParameterCollection.ParameterizeName(name);
+        if (npgsqlDbType.HasValue)
+            p.NpgsqlDbType = npgsqlDbType.Value;
+
+        p.Value = DatabaseParameterCollection.ConvertToDbValue(value, parameters.Database);
+        p.Direction = direction;
+
+        parameters.Add(p);
+        return p;
+    }
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <see cref="NpgsqlDbType"/> and <see cref="ParameterDirection"/>.
+    /// </summary>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="npgsqlDbType">The parameter <see cref="NpgsqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns></returns>
+    public static TSelf Param<TSelf, T>(this IDatabaseParameters<TSelf> parameters, string name, T? value, NpgsqlDbType? npgsqlDbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull().Parameters.AddParameter(name, value, npgsqlDbType, direction);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named parameter and value <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="when">Adds the parameter when <see langword="true"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="npgsqlDbType">The parameter <see cref="NpgsqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T> value, NpgsqlDbType npgsqlDbType, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull();
+        value.ThrowIfNull();
+
+        if (when == true)
+            parameters.Parameters.AddParameter(name, value(), npgsqlDbType, direction);
+
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="npgsqlDbType">The parameter <see cref="NpgsqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
+    public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, string name, Func<T> value, NpgsqlDbType npgsqlDbType, ParameterDirection direction = ParameterDirection.Input)
+        => ParamWhen(parameters, with is not null && Comparer<T>.Default.Compare((T)with, default!) != 0, name, value, npgsqlDbType, direction);
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value; where not specified the <paramref name="with"/> value will be used.</param>
+    /// <param name="npgsqlDbType">The parameter <see cref="NpgsqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
+    public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name, Func<T>? value, NpgsqlDbType npgsqlDbType, ParameterDirection direction = ParameterDirection.Input)
+        => ParamWhen(parameters, with is not null && Comparer<T>.Default.Compare(with, default!) != 0, name, value ?? (() => with!), npgsqlDbType, direction);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresExtensions.cs b/src/CoreEx.Database.Postgres/PostgresExtensions.cs
new file mode 100644
index 00000000..f231377e
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/PostgresExtensions.cs
@@ -0,0 +1,8 @@
+namespace CoreEx.Database.Postgres;
+
+/// <summary>
+/// Provides <see cref="PostgresDatabase"/> and related extensions.
+/// </summary>
+public static partial class PostgresExtensions
+{
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresMetrics.cs b/src/CoreEx.Database.Postgres/PostgresMetrics.cs
new file mode 100644
index 00000000..b833480e
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/PostgresMetrics.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.Database.Postgres;
+
+/// <summary>
+/// Provides the <see href="https://www.postgresql.org/docs/">PostgreSQL</see> metrics.
+/// </summary>
+public static class PostgresMetrics
+{
+    /// <summary>
+    /// Gets the meter used for the database outbox metrics.
+    /// </summary>
+    public static Meter Meter { get; } = new("CoreEx.Database.Postgres.Outbox");
+
+    /// <summary>
+    /// Gets the counter representing the total number of messages enqueued successfully.
+    /// </summary>
+    public static Counter<long> OutboxEnqueued { get; } = Meter.CreateCounter<long>("postgres.outbox.enqueue", unit: "{message}", description: "Number of PostgreSQL outbox messages enqueued successfully.");
+
+    /// <summary>
+    /// Gets the counter representing the total number of messages (batch) dequeued (relayed) successfully.
+    /// </summary>
+    public static Counter<long> OutboxRelayBatchSize { get; } = Meter.CreateCounter<long>("postgres.outbox.relay.batch.size", unit: "{message}", description: "Number of PostgreSQL outbox messages (batch) relayed successfully.");
+
+    /// <summary>
+    /// Gets the histogram that tracks the oldest lag duration (now - enqueued time of first message in batch), in milliseconds, of successful PostgreSQL outbox relay operations; i.e. end-to-end relay lag.
+    /// </summary>
+    public static Histogram<double> OutboxRelayOldestLagDuration { get; } = Meter.CreateHistogram<double>("postgres.outbox.batch.oldest_lag", unit: "ms", description: "Oldest lag duration (now - enqueued time of first message in batch) of PostgreSQL outbox relay.");
+
+    /// <summary>
+    /// Gets the histogram that tracks the newest lag duration (now - enqueued time of last message in batch), in milliseconds, of successful PostgreSQL outbox relay operations; i.e. end-to-end relay lag.
+    /// </summary>
+    public static Histogram<double> OutboxRelayNewestLagDuration { get; } = Meter.CreateHistogram<double>("postgres.outbox.batch.newest_lag", unit: "ms", description: "Newest lag duration (now - enqueued time of last message in batch) of PostgreSQL outbox relay.");
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/PostgresUnitOfWork.cs b/src/CoreEx.Database.Postgres/PostgresUnitOfWork.cs
new file mode 100644
index 00000000..39ac5d00
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/PostgresUnitOfWork.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Database.Postgres;
+
+/// <summary>
+/// Provides the transactional <see cref="IUnitOfWork"/> implementation for <see cref="PostgresDatabase"/> including support for a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+/// </summary>
+/// <param name="database">The <see cref="PostgresDatabase"/>.</param>
+/// <param name="outbox">The optional <see cref="IEventPublisher"/>.</param>
+/// <param name="invoker">The optional <see cref="PostgresUnitOfWorkInvoker"/> used to orchestrate the <see cref="IUnitOfWork"/> functionality.</param>
+public sealed class PostgresUnitOfWork(PostgresDatabase database, IEventPublisher? outbox = null, PostgresUnitOfWorkInvoker? invoker = null) : IDatabaseUnitOfWork
+{
+    /// <inheritdoc/>
+    IDatabase IDatabaseUnitOfWork.Database => Database;
+
+    /// <summary>
+    /// Gets the underlying <see cref="PostgresDatabase"/>.
+    /// </summary>
+    public PostgresDatabase Database { get; } = database.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the optional <see cref="IEventPublisher"/> to be used as a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+    /// </summary>
+    /// <remarks>Where provided, the <see cref="IEventPublisher.PublishAsync(CancellationToken)"/> is invoked as part of the underlying <see cref="IUnitOfWork"/> transaction functionality. It is expected that the <see cref="IEventPublisher"/> implementation
+    /// uses the same <see cref="PostgresDatabase"/> instance to ensure that the transactional outbox functionality works as expected.</remarks>
+    public IEventPublisher? Outbox { get; } = outbox;
+
+    /// <summary>
+    /// Gets the underlying <see cref="PostgresUnitOfWorkInvoker"/> used to orchestrate the <see cref="IUnitOfWork"/> functionality.
+    /// </summary>
+    public PostgresUnitOfWorkInvoker UnitOfWorkInvoker { get; } = invoker ??= PostgresUnitOfWorkInvoker.Default;
+
+    /// <inheritdoc/>
+    /// <remarks>The <see cref="Outbox"/> is required to enable.</remarks>
+    public bool AreEventsSupported => Outbox is not null;
+
+    /// <inheritdoc/>
+    public IEventQueue Events => Outbox ?? throw new NotSupportedException($"A Transaction {nameof(Outbox)} has not been provided to enable {nameof(Events)}.");
+
+    /// <inheritdoc/>
+    public Task TransactionAsync(Func<CancellationToken, Task> work, CancellationToken cancellationToken = default) => TransactionAsync(Database.DbArgs, work, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<T> TransactionAsync<T>(Func<CancellationToken, Task<T>> work, CancellationToken cancellationToken = default) => TransactionAsync(Database.DbArgs, work, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task TransactionAsync(IDataArgs args, Func<CancellationToken, Task> work, CancellationToken cancellationToken = default)
+        => UnitOfWorkInvoker.InvokeAsync(this, (PostgresDatabaseArgs)args, async (_, _, cancellationToken) => await work(cancellationToken).ConfigureAwait(false), cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<T> TransactionAsync<T>(IDataArgs args, Func<CancellationToken, Task<T>> work, CancellationToken cancellationToken = default)
+        => UnitOfWorkInvoker.InvokeAsync(this, (PostgresDatabaseArgs)args, async (_, _, cancellationToken) => await work(cancellationToken).ConfigureAwait(false), cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/README.md b/src/CoreEx.Database.Postgres/README.md
new file mode 100644
index 00000000..c2ccd9f2
--- /dev/null
+++ b/src/CoreEx.Database.Postgres/README.md
@@ -0,0 +1,54 @@
+# CoreEx.Database.Postgres
+
+> Provides the PostgreSQL (Npgsql) implementation of `IDatabase`: `PostgresDatabase`, `PostgresUnitOfWork`, outbox relay, Postgres-specific parameter extensions, and OpenTelemetry metrics for outbox operations.
+
+## Overview
+
+`CoreEx.Database.Postgres` is the PostgreSQL provider package built on top of `CoreEx.Database`. It supplies concrete implementations of every abstract type in that package — `PostgresDatabase`, `PostgresCommand`, `PostgresDatabaseArgs`, `PostgresDatabaseColumns` — and adds PostgreSQL-specific capabilities: structured error-code mapping from PostgreSQL `SqlState` strings to CoreEx semantic exceptions, and `PostgresUnitOfWork` for transactional outbox support.
+
+The error-code mapping convention mirrors the SQL Server convention: stored procedures and functions raise well-known `SQLSTATE` codes (56001–56010) to signal domain exceptions without any application-layer switch statements. Unique-violation errors (`23505` by default) are automatically converted to `DuplicateException`.
+
+The outbox sub-namespace provides ready-to-use `PostgresOutboxPublisher`, `PostgresOutboxRelay`, and `PostgresOutboxRelayHostedService` with .NET Meter-backed counters and histograms for enqueue throughput and relay lag.
+
+## Key capabilities
+
+- 🗃️ **PostgresDatabase**: Concrete `IDatabase` for `NpgsqlConnection` (constructed from `NpgsqlDataSource`); maps PostgreSQL `SqlState` strings to CoreEx semantic exceptions; configurable `DuplicateErrorNumbers`; `RowVersion` encoded via `EncodedStringToUInt32Converter`.
+- 🔢 **Error-code convention**: `SQLSTATE` values 56001–56007 and 56010 map to `ValidationException`, `BusinessException`, `AuthorizationException`, `ConcurrencyException`, `NotFoundException`, `ConflictException`, `DuplicateException`, and `DataConsistencyException` respectively — identical to the SQL Server convention.
+- 🔁 **PostgresUnitOfWork**: `IDatabaseUnitOfWork` implementation wrapping `TransactionAsync` with `PostgresUnitOfWorkInvoker`; optionally accepts an `IEventPublisher` outbox for transactional event enqueuing.
+- 📤 **Outbox relay**: `PostgresOutboxPublisher` (writes to outbox table), `PostgresOutboxRelay` (polls and publishes), and `PostgresOutboxRelayHostedService` (timer-driven hosted service) — all PostgreSQL-specific subclasses of the base `CoreEx.Database.Outbox` types.
+- 📊 **Outbox metrics**: `PostgresMetrics` exposes .NET `Meter` instruments: `postgres.outbox.enqueue` (counter), `postgres.outbox.relay.batch.size` (counter), `postgres.outbox.batch.oldest_lag` and `postgres.outbox.batch.newest_lag` (histograms in ms).
+- 📡 **OpenTelemetry**: `CoreExPostgresExtensions.AddCoreExPostgresOpenTelemetry` wires `PostgresInvoker` activity sources and the outbox meter into the OTEL tracer and meter providers.
+- ⚙️ **DI registration**: `AddPostgresDatabase<TDatabase>(services, configure?)` registers `PostgresDatabase` as a scoped service; `AddPostgresUnitOfWork(services, configure?)` registers `PostgresUnitOfWork`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`PostgresDatabase`](./PostgresDatabase.cs)** | Concrete `IDatabase` for `NpgsqlConnection`; `SqlState` string to exception mapping; `RowVersion` → `EncodedStringToUInt32Converter`; accepts `NpgsqlDataSource` for connection-pool management. |
+| **[`PostgresUnitOfWork`](./PostgresUnitOfWork.cs)** | `IDatabaseUnitOfWork` implementation; wraps `TransactionAsync` with `PostgresUnitOfWorkInvoker`; optional transactional outbox via `IEventPublisher Outbox`. |
+| **[`PostgresCommand`](./PostgresCommand.cs)** | `DatabaseCommand` subclass for `NpgsqlCommand`; adds Postgres-specific parameter handling. |
+| **[`PostgresDatabaseArgs`](./PostgresDatabaseArgs.cs)** | `DatabaseArgs` subclass with PostgreSQL-specific defaults. |
+| **[`PostgresDatabaseColumns`](./Extended/PostgresDatabaseColumns.cs)** | `DatabaseColumns` subclass with PostgreSQL-specific convention column name defaults (e.g. snake_case names). |
+| **[`PostgresMetrics`](./PostgresMetrics.cs)** | Static .NET Meter with counters and histograms for outbox enqueue throughput and relay lag. |
+| **[`PostgresOutboxPublisher`](./Outbox/PostgresOutboxPublisher.cs)** | `DatabaseOutboxPublisherBase` for PostgreSQL; inserts event rows into the outbox table via a configurable function/procedure. |
+| **[`PostgresOutboxRelay`](./Outbox/PostgresOutboxRelay.cs)** | `DatabaseOutboxRelayBase<PostgresDatabase, PostgresOutboxRelay>` with PostgreSQL-specific dequeue/complete SQL; records outbox metrics per batch. |
+| **[`PostgresOutboxRelayHostedService`](./Outbox/PostgresOutboxRelayHostedService.cs)** | `DatabaseOutboxRelayHostedServiceBase<PostgresOutboxRelay>` timer-driven hosted service for the PostgreSQL outbox relay. |
+| [`PostgresExtensions`](./PostgresExtensions.cs) | `IDatabase` / `DatabaseCommand` extensions specific to PostgreSQL: `Param` helpers for `NpgsqlDbType`-typed parameters. |
+| [`PostgresInvoker`](./Extended/PostgresInvoker.cs) | `DatabaseInvoker` subclass for PostgreSQL; the `Default` singleton used by `PostgresDatabase`. |
+| [`PostgresUnitOfWorkInvoker`](./Extended/PostgresUnitOfWorkInvoker.cs) | `InvokerBase<PostgresUnitOfWork>` wrapping `TransactionAsync` with OpenTelemetry spans and begin/commit/rollback log entries. |
+
+## Related Namespaces
+
+- **[`CoreEx.Database`](../CoreEx.Database/README.md)** - Abstract base types (`Database<TConn>`, `DatabaseCommand`, `DatabaseRecord`, `DatabaseOutboxRelayBase`, `IDatabaseMapper`) that all PostgreSQL types extend.
+- **[`CoreEx.Data`](../CoreEx.Data/README.md)** - `IUnitOfWork` and `IDatabaseUnitOfWork` interfaces implemented by `PostgresUnitOfWork`.
+- **[`CoreEx.Events`](../CoreEx.Events/README.md)** - `IEventPublisher` is the relay's publication target; `PostgresOutboxPublisher` implements `IEventPublisher`.
+- **[`CoreEx.Invokers`](../CoreEx/Invokers/README.md)** - `PostgresInvoker` and `PostgresUnitOfWorkInvoker` extend `InvokerBase` for OpenTelemetry tracing.
+
+## Additional Resources
+
+- [Npgsql](https://www.npgsql.org/) - The PostgreSQL ADO.NET driver this package uses.
+- [PostgreSQL Error Codes](https://www.postgresql.org/docs/current/errcodes-appendix.html) - Reference for `SqlState` values including the CoreEx convention codes.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Database.Postgres/strong-name-key.snk b/src/CoreEx.Database.Postgres/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Database.Postgres/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Database.SqlServer/AGENTS.md b/src/CoreEx.Database.SqlServer/AGENTS.md
new file mode 100644
index 00000000..7563b02f
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/AGENTS.md
@@ -0,0 +1,72 @@
+# CoreEx.Database.SqlServer — AI Usage Guide
+
+SQL Server implementation of `IDatabase` / `IUnitOfWork` with session-context stamping and transactional outbox support.
+
+## Registration
+
+```csharp
+// Program.cs
+builder.AddSqlServerClient("SqlServer");   // Aspire resource name
+builder.Services
+    .AddSqlServerDatabase()
+    .AddSqlServerUnitOfWork()
+    .AddSqlServerOutboxPublisher()         // transactional outbox publisher
+    .AddDbContext<MyDbContext>()
+    .AddEfDb<MyEfDb>();
+```
+
+## Session Context
+
+Call `SetSqlSessionContextAsync` at the start of the unit-of-work to stamp `Username`, `Timestamp`, `TenantId`, and `UserId` into the SQL Server session context for audit triggers and row-level security.
+
+```csharp
+// Typically called inside the unit-of-work invoker (automatic in SqlServerUnitOfWorkInvoker)
+await _db.SetSqlSessionContextAsync(executionContext).ConfigureAwait(false);
+```
+
+## Error Number Convention
+
+Stored procedures raise user error numbers 56001–56007/56010 to signal domain exceptions.
+
+| Error number | CoreEx exception |
+|---|---|
+| 56001 | `ValidationException` |
+| 56002 | `BusinessException` |
+| 56004 | `ConcurrencyException` |
+| 56005 | `NotFoundException` |
+| 56006 | `ConflictException` |
+| 56007 | `DuplicateException` |
+
+## Outbox
+
+`SqlServerOutboxPublisher` writes events to the outbox table within the current `TransactionAsync` scope. `SqlServerOutboxRelayHostedService` polls and forwards to `IEventPublisher` (typically Azure Service Bus).
+
+```csharp
+// Relay host Program.cs
+builder.Services
+    .AddSqlServerDatabase()
+    .AddSqlServerUnitOfWork()
+    .AddSqlServerOutboxRelay();
+
+builder.AddSqlServerOutboxRelayHostedService();  // called on builder, not builder.Services
+```
+
+## OpenTelemetry
+
+```csharp
+builder.WithCoreExTelemetry()
+    .WithCoreExSqlServerTelemetry()
+    .UseOtlpExporter();
+```
+
+## Do Not
+
+- Do not mix `UseExpectedPostgresOutboxPublisher` / `ExpectPostgresOutboxEvents` in tests for a SQL Server-backed domain — use the SQL Server equivalents.
+- Do not call `AddSqlServerOutboxRelayHostedService()` on `builder.Services` — call it on `builder`.
+
+## Further Reading
+
+- [README](./README.md) — full API reference including `SqlServerDatabase`, session context, metrics, and TVP extensions.
+- [CoreEx.Database](../CoreEx.Database/README.md) — abstract base types.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — SQL Server-specific repository, mapper, and outbox wiring in the Shopping sample.
+- [Tooling](../../samples/docs/tooling.md) — `*.Database` project (DbEx) for SQL Server schema generation, session-context setup, and outbox infrastructure.
diff --git a/src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj b/src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj
index 709bbc63..7fd75ff6 100644
--- a/src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj
+++ b/src/CoreEx.Database.SqlServer/CoreEx.Database.SqlServer.csproj
@@ -1,22 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Database.SqlServer</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET SQL Server Database extras.</Title>
-    <Description>CoreEx .NET SQL Server Database extras.</Description>
-    <PackageTags>coreex db database sql sqlserver ado.net relational</PackageTags>
+    <Title>CoreEx .NET SQL Server extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data sqlserver sql database</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
+    <PackageReference Include="Aspire.Microsoft.Data.SqlClient" />
   </ItemGroup>
-
+  
   <ItemGroup>
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\CoreEx.Data\CoreEx.Data.csproj" />
     <ProjectReference Include="..\CoreEx.Database\CoreEx.Database.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.ApplicationBuilder.cs b/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.ApplicationBuilder.cs
new file mode 100644
index 00000000..0d8aec44
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.ApplicationBuilder.cs
@@ -0,0 +1,34 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.Hosting;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="SqlServerDatabase"/> and related extensions.
+/// </summary>
+public static class CoreExSqlServerExtensions
+{
+    /// <summary>
+    /// Adds <b>singleton</b> <see cref="SqlServerOutboxRelayHostedService"/> keyed service(s) (as per <paramref name="servicesCount"/>) that will be executed as a hosted service (in the background).
+    /// </summary>
+    /// <param name="builder">The <see cref="IHostApplicationBuilder"/>.</param>
+    /// <param name="servicesCount">The number of hosted services to start to enable concurrency of processing across partitions.</param>
+    /// <param name="serviceKeyPrefix">The keyed singleton and health check key prefix; defaults to '<c>sqlserver-outbox-relay-</c>'.</param>
+    /// <param name="configure">An optional action to configure each <see cref="SqlServerOutboxRelayHostedService"/> instance.</param>
+    /// <returns>The <see cref="IHostApplicationBuilder"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Where the <paramref name="servicesCount"/> is not specified it will, attempt to get the value from configuration using '<c>CoreEx:Host:Services:OutboxRelay:ServicesCount</c>' as the key; otherwise,
+    /// defaults to '<c>4</c>'.
+    /// <para>Uses the <see cref="Microsoft.Extensions.DependencyInjection.CoreExExtensions.AddHostedService{THostedService}(IServiceCollection, string, Action{IServiceProvider, THostedService}?)"/> to enable.</para></remarks>
+    public static IHostApplicationBuilder AddSqlServerOutboxRelayHostedService(this IHostApplicationBuilder builder, int? servicesCount = null, string serviceKeyPrefix = "sqlserver-outbox-relay-", Action<IServiceProvider, SqlServerOutboxRelayHostedService>? configure = null)
+    {
+        // Determine the number of services to add.
+        builder.ThrowIfNull();
+        servicesCount ??= CoreEx.Abstractions.Internal.GetConfigurationValue<int>($"CoreEx:Host:Services:OutboxRelay:ServicesCount", 4, builder.Configuration);
+        servicesCount.ThrowWhen(servicesCount => servicesCount <= 0 || servicesCount > 32);
+
+        // Add the services as per count.
+        for (int i = 0; i < servicesCount; i++)
+            builder.Services.ThrowIfNull().AddHostedService<SqlServerOutboxRelayHostedService>($"{serviceKeyPrefix}{i:00}", configure);
+
+        return builder;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.DependencyInjection.cs b/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..a863b47b
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.DependencyInjection.cs
@@ -0,0 +1,124 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure - this is by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="SqlServerDatabase"/> and related extensions.
+/// </summary>
+public static partial class CoreExSqlServerExtensions
+{
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="SqlServerDatabase"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the database instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSqlServerDatabase(this IServiceCollection services, Action<IServiceProvider, SqlServerDatabase>? configure = null)
+        => AddSqlServerDatabase<SqlServerDatabase>(services, configure);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="SqlServerDatabase"/> <typeparamref name="TDatabase"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the database instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSqlServerDatabase<TDatabase>(this IServiceCollection services, Action<IServiceProvider, TDatabase>? configure = null) where TDatabase : SqlServerDatabase
+    {
+        return services.ThrowIfNull().AddScoped<TDatabase>(sp =>
+        {
+            var db = ActivatorUtilities.CreateInstance<TDatabase>(sp);
+            configure?.Invoke(sp, db);
+            return db;
+        });
+    }
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="SqlServerUnitOfWork"/> service for the <see cref="SqlServerDatabase"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="addAsIUnitOfWork">Indicates whether to also register as the <see cref="IUnitOfWork"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSqlServerUnitOfWork(this IServiceCollection services, bool addAsIUnitOfWork = true)
+        => AddSqlServerUnitOfWork<SqlServerDatabase>(services, addAsIUnitOfWork);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="SqlServerUnitOfWork"/> service for the specified <see cref="SqlServerDatabase"/> <typeparamref name="TDatabase"/>.
+    /// </summary>
+    /// <typeparam name="TDatabase">The <see cref="SqlServerDatabase"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="addAsIUnitOfWork">Indicates whether to also register as the <see cref="IUnitOfWork"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSqlServerUnitOfWork<TDatabase>(this IServiceCollection services, bool addAsIUnitOfWork = true) where TDatabase : SqlServerDatabase
+    {
+        services.ThrowIfNull().AddScoped<SqlServerUnitOfWork>(sp =>
+        {
+            var sql = sp.GetRequiredService<TDatabase>();
+            return ActivatorUtilities.CreateInstance<SqlServerUnitOfWork>(sp, sql);
+        });
+
+        if (addAsIUnitOfWork)
+            services.AddScoped<IUnitOfWork>(sp => sp.GetRequiredService<SqlServerUnitOfWork>());
+
+        return services;
+    }
+
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> <see cref="SqlServerOutboxPublisher"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="SqlServerOutboxPublisher"/> instance.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Microsoft.Extensions.DependencyInjection.CoreExEventsExtensions.AddEventPublisher(IServiceCollection, string, Func{IServiceProvider, IEventPublisher}, bool)"/> for more information
+    /// related to the underlying registration implementation.</remarks>
+    public static IServiceCollection AddSqlServerOutboxPublisher(this IServiceCollection services, Action<IServiceProvider, SqlServerOutboxPublisher>? configure = null, bool addAsDefaultIEventPublisher = true, string serviceKey = SqlServerOutboxPublisher.DefaultServiceKey)
+        => services.AddSqlServerOutboxPublisher<SqlServerOutboxPublisher>(configure, addAsDefaultIEventPublisher, serviceKey);
+
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> <typeparamref name="TOutbox"/> <see cref="SqlServerOutboxPublisher"/> service.
+    /// </summary>
+    /// <typeparam name="TOutbox">The <see cref="SqlServerOutboxPublisher"/> <see cref="Type"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <typeparamref name="TOutbox"/> instance.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Microsoft.Extensions.DependencyInjection.CoreExEventsExtensions.AddEventPublisher(IServiceCollection, string, Func{IServiceProvider, IEventPublisher}, bool)"/> for more information
+    /// related to the underlying registration implementation.</remarks>
+    public static IServiceCollection AddSqlServerOutboxPublisher<TOutbox>(this IServiceCollection services, Action<IServiceProvider, TOutbox>? configure = null, bool addAsDefaultIEventPublisher = true, string serviceKey = SqlServerOutboxPublisher.DefaultServiceKey) where TOutbox : SqlServerOutboxPublisher
+        => services.ThrowIfNull().AddEventPublisher(serviceKey, sp =>
+        {
+            var outbox = ActivatorUtilities.CreateInstance<TOutbox>(sp);
+            configure?.Invoke(sp, outbox);
+            return outbox;
+        }, addAsDefaultIEventPublisher);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="SqlServerOutboxRelay"/> service for the <see cref="SqlServerDatabase"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <see cref="SqlServerOutboxRelay"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSqlServerOutboxRelay(this IServiceCollection services, Action<IServiceProvider, SqlServerOutboxRelay>? configure = null)
+        => services.AddSqlServerOutboxRelay<SqlServerOutboxRelay, SqlServerDatabase>(configure);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="SqlServerOutboxRelay"/> service for the <see cref="SqlServerDatabase"/>.
+    /// </summary>
+    /// <typeparam name="TOutboxRelay">The <see cref="SqlServerOutboxRelay"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDatabase">The <see cref="SqlServerDatabase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">An optional action to configure the <typeparamref name="TOutboxRelay"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSqlServerOutboxRelay<TOutboxRelay, TDatabase>(this IServiceCollection services, Action<IServiceProvider, TOutboxRelay>? configure = null) where TOutboxRelay : SqlServerOutboxRelay where TDatabase : SqlServerDatabase
+    {
+        return services.ThrowIfNull().AddScoped<TOutboxRelay>(sp =>
+        {
+            var db = sp.GetRequiredService<TDatabase>();
+            var relay = ActivatorUtilities.CreateInstance<TOutboxRelay>(sp, db);
+            configure?.Invoke(sp, relay);
+            return relay;
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.OpenTelemetry.cs b/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.OpenTelemetry.cs
new file mode 100644
index 00000000..c70bf92c
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/CoreExSqlServerExtensions.OpenTelemetry.cs
@@ -0,0 +1,21 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace OpenTelemetry.Trace;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExSqlServerExtensions
+{
+    /// <summary>
+    /// Enables <i>CoreEx</i> OpenTelemetry instrumentation.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static OpenTelemetryBuilder WithCoreExSqlServerTelemetry(this OpenTelemetryBuilder builder) => builder.ThrowIfNull()
+        .WithCoreExEventsSources()  // Included here as they are leveraged by the Sql Server Outbox capabilities.
+        .WithTracing(t => t.AddInvokerAsSource<CoreEx.Database.SqlServer.Extended.SqlServerInvoker>()
+                           .AddInvokerAsSource<CoreEx.Database.SqlServer.Extended.SqlServerUnitOfWorkInvoker>()
+                           .AddSource("CoreEx.Database.Outbox.Relay"))
+        .WithMetrics(m => m.AddMeter(SqlServerMetrics.Meter.Name));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/DatabaseServiceCollectionExtensions.cs b/src/CoreEx.Database.SqlServer/DatabaseServiceCollectionExtensions.cs
deleted file mode 100644
index 15851e53..00000000
--- a/src/CoreEx.Database.SqlServer/DatabaseServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Configuration;
-using CoreEx.Database.SqlServer.Outbox;
-using CoreEx.Hosting;
-using CoreEx.Hosting.HealthChecks;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Text;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extension methods.
-    /// </summary>
-    public static class DatabaseServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds the <see cref="EventOutboxHostedService"/> using the <see cref="ServiceCollectionHostedServiceExtensions.AddHostedService{THostedService}(IServiceCollection)"/>. 
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="eventOutboxDequeueFactory">The function to create an instance of <see cref="EventOutboxDequeueBase"/> (used to set the underlying <see cref="EventOutboxHostedService.EventOutboxDequeueFactory"/> property).</param>
-        /// <param name="partitionKey">The optional partition key.</param>
-        /// <param name="destination">The optional destination name (i.e. queue or topic).</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="TimerHostedServiceHealthCheck"/> should be configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        /// <remarks>To turn off the execution of the <see cref="EventOutboxHostedService"/>(s) at runtime set the '<c>EventOutboxHostedService:Enabled</c>' configuration setting to <c>false</c>.</remarks>
-        public static IServiceCollection AddSqlServerEventOutboxHostedService(this IServiceCollection services, Func<IServiceProvider, EventOutboxDequeueBase> eventOutboxDequeueFactory, string? partitionKey = null, string? destination = null, bool healthCheck = true)
-        {
-            var exe = services.BuildServiceProvider().GetRequiredService<SettingsBase>().GetCoreExValue<bool?>("EventOutboxHostedService:Enabled");
-            if (!exe.HasValue || exe.Value)
-            {
-                // Add the health check.
-                var hc = healthCheck ? new TimerHostedServiceHealthCheck() : null;
-                if (hc is not null)
-                {
-                    var sb = new StringBuilder("sql-server-event-outbox");
-                    if (partitionKey is not null)
-                        sb.Append($"-PartitionKey-{partitionKey}");
-
-                    if (destination is not null)
-                        sb.Append($"-Destination-{destination}");
-
-                    services.AddHealthChecks().AddCheck(sb.ToString(), hc);
-                }
-
-                // Add the hosted service with the health check where applicable.
-                services.AddHostedService(sp => new EventOutboxHostedService(sp, sp.GetRequiredService<ILogger<EventOutboxHostedService>>(), sp.GetRequiredService<SettingsBase>(), sp.GetRequiredService<IServiceSynchronizer>(), hc, partitionKey, destination)
-                {
-                    EventOutboxDequeueFactory = eventOutboxDequeueFactory.ThrowIfNull(nameof(eventOutboxDequeueFactory))
-                });
-            }
-
-            return services;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Extended/SqlServerDatabaseColumns.cs b/src/CoreEx.Database.SqlServer/Extended/SqlServerDatabaseColumns.cs
new file mode 100644
index 00000000..28922cab
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/Extended/SqlServerDatabaseColumns.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.Database.SqlServer.Extended;
+
+/// <summary>
+/// Extends the <see cref="DatabaseColumns"/> configuring/adding SQL Server specific columns.
+/// </summary>
+public record class SqlServerDatabaseColumns : DatabaseColumns
+{
+    /// <summary>
+    /// Gets or sets the default <see cref="SqlServerDatabaseColumns"/>.
+    /// </summary>
+    public static SqlServerDatabaseColumns Default { get; set; } = new SqlServerDatabaseColumns();
+
+    /// <summary>
+    /// Gets or sets the session context '<c>Username</c>' column name.
+    /// </summary>
+    public string SessionContextUsernameName { get; set; } = "Username";
+
+    /// <summary>
+    /// Gets or sets the session context '<c>Timestamp</c>' column name.
+    /// </summary>
+    public string SessionContextTimestampName { get; set; } = "Timestamp";
+
+    /// <summary>
+    /// Gets or sets the '<c>TenantId</c>' column name.
+    /// </summary>
+    public string SessionContextTenantIdName { get; set; } = "TenantId";
+
+    /// <summary>
+    /// Gets or sets the session context '<c>UserId</c>' column name.
+    /// </summary>
+    public string SessionContextUserIdName { get; set; } = "UserId";
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Extended/SqlServerInvoker.cs b/src/CoreEx.Database.SqlServer/Extended/SqlServerInvoker.cs
new file mode 100644
index 00000000..b591da83
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/Extended/SqlServerInvoker.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Database.SqlServer.Extended;
+
+/// <summary>
+/// Provides the <see cref="SqlServerDatabase"/> invoker functionality.
+/// </summary>
+[InvokerName("CoreEx.Database.SqlServer.SqlServer")]
+public class SqlServerInvoker : DatabaseInvoker
+{
+    private static SqlServerInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="SqlServerInvoker"/> instance.
+    /// </summary>
+    public static SqlServerInvoker Default => ExecutionContext.GetService<SqlServerInvoker>() ?? (_default ??= new SqlServerInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Extended/SqlServerUnitOfWorkInvoker.cs b/src/CoreEx.Database.SqlServer/Extended/SqlServerUnitOfWorkInvoker.cs
new file mode 100644
index 00000000..e9423e74
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/Extended/SqlServerUnitOfWorkInvoker.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Database.SqlServer.Extended;
+
+/// <summary>
+/// Provides the underlying <see cref="SqlServerDatabase"/> <see cref="IUnitOfWork"/> invoker functionality.
+/// </summary>
+/// <remarks>Implements transaction handling including automatic save-point support for nested unit-of-work invocations. Also, where the underlying work returns an <see cref="IResult"/>, 
+/// then an <see cref="IResult.IsFailure"/> will trigger a rollback similar to an unhandled exception.
+/// <para>Where a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see> is supported (<see cref="IUnitOfWork.AreEventsSupported"/>) then the <see cref="IUnitOfWork.Events"/> will
+/// automatically be included within the root (top-most) transaction. This is achieved by executing the <see cref="IEventPublisher.PublishAsync(CancellationToken)"/>. Nested (child) transactional rollbacks are also supported by the <see cref="IEventPublisher.Rollback(int)"/>.</para>
+/// <para>Note that the underlying <see cref="IUnitOfWork"/> implementation is not thread-safe.</para></remarks>
+[InvokerName("CoreEx.Database.SqlServer.SqlServerUnitOfWork")]
+public class SqlServerUnitOfWorkInvoker : InvokerBase<SqlServerUnitOfWork, SqlServerDatabaseArgs>
+{
+    private static SqlServerUnitOfWorkInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="SqlServerUnitOfWorkInvoker"/> instance.
+    /// </summary>
+    public static SqlServerUnitOfWorkInvoker Default => ExecutionContext.GetService<SqlServerUnitOfWorkInvoker>() ?? (_default ??= new SqlServerUnitOfWorkInvoker());
+
+    /// <inheritdoc/>
+    protected async override Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, SqlServerUnitOfWork unitOfWork, SqlServerDatabaseArgs args, Func<InvokerTracer, SqlServerDatabaseArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
+        => await DatabaseInvoker.OrchestrateUnitOfWorkTransactionAsync(tracer, unitOfWork,
+            () => base.OnInvokeAsync(tracer, unitOfWork, args, func, cancellationToken),
+            outboxEnqueued => SqlServerMetrics.OutboxEnqueued.Add(outboxEnqueued),
+            cancellationToken).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/GlobalUsing.cs b/src/CoreEx.Database.SqlServer/GlobalUsing.cs
new file mode 100644
index 00000000..92e820ff
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/GlobalUsing.cs
@@ -0,0 +1,26 @@
+global using CloudNative.CloudEvents.Extensions;
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.Database.Abstractions;
+global using CoreEx.Database.Extended;
+global using CoreEx.Database.Outbox;
+global using CoreEx.Database.SqlServer;
+global using CoreEx.Database.SqlServer.Extended;
+global using CoreEx.Database.SqlServer.Outbox;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Hosting;
+global using CoreEx.Invokers;
+global using CoreEx.Mapping.Converters;
+global using CoreEx.Mapping.Converters.Abstractions;
+global using CoreEx.Results.Abstractions;
+global using CoreEx.Security;
+global using Microsoft.Data.SqlClient;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using System.Collections.Immutable;
+global using System.Data;
+global using System.Data.Common;
+global using System.Diagnostics.Metrics;
+global using System.Text;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxDequeueBase.cs b/src/CoreEx.Database.SqlServer/Outbox/EventOutboxDequeueBase.cs
deleted file mode 100644
index fbed039f..00000000
--- a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxDequeueBase.cs
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Json;
-using CoreEx.Mapping;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Transactions;
-
-namespace CoreEx.Database.SqlServer.Outbox
-{
-    /// <summary>
-    /// Provides the base <see cref="EventSendData"/> <see cref="IDatabase">database</see> <i>outbox dequeue</i>.
-    /// </summary>
-    /// <remarks>The <see cref="EventDataBase.Id"/> (being the unique event identifier) can be leveraged by the underlying messaging platform to perform duplicate checking. There is no guarantee that a dequeued event is <i>on</i> published more
-    /// than once, the guarantee is at best <i>at-least</i> once semantics based on the implementation of the final <see cref="IEventSender"/>.
-    /// </remarks>
-    /// <param name="database">The <see cref="IDatabase"/>.</param>
-    /// <param name="eventSender">The <see cref="IEventSender"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public abstract class EventOutboxDequeueBase(IDatabase database, IEventSender eventSender, ILogger<EventOutboxDequeueBase> logger) : IDatabaseMapper<EventSendData>
-    {
-        /// <summary>
-        /// Gets the <see cref="IDatabase"/>.
-        /// </summary>
-        protected IDatabase Database { get; } = database.ThrowIfNull(nameof(database));
-
-        /// <summary>
-        /// Gets the <see cref="IEventSender"/>.
-        /// </summary>
-        protected IEventSender EventSender { get; } = eventSender.ThrowIfNull(nameof(eventSender));
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        protected ILogger Logger { get; } = logger.ThrowIfNull(nameof(logger));
-
-        /// <summary>
-        /// Gets the event outbox <i>dequeue</i> stored procedure name.
-        /// </summary>
-        protected abstract string DequeueStoredProcedure { get; }
-
-        /// <summary>
-        /// Gets the column name for the <see cref="EventDataBase.Id"/> property within the event outbox table.
-        /// </summary>
-        /// <remarks>Defaults to '<c>EventId</c>'.</remarks>
-        protected virtual string EventIdColumnName => "EventId";
-
-        /// <summary>
-        /// Gets or sets the default partition key.
-        /// </summary>
-        /// <remarks>Defaults to '<c>$default</c>'. This will ensure that value is nullified when reading from the database.</remarks>
-        public string DefaultPartitionKey { get; set; } = "$default";
-
-        /// <summary>
-        /// Gets or sets the default destination name.
-        /// </summary>
-        /// <remarks>Defaults to '<c>$default</c>'. This will ensure that value is nullified when reading from the database.</remarks>
-        public string DefaultDestination { get; set; } = "$default";
-
-        /// <summary>
-        /// Performs the dequeue of the events (up to <paramref name="maxDequeueSize"/>) from the database outbox and then sends (via <see cref="EventSender"/>).
-        /// </summary>
-        /// <param name="maxDequeueSize">The maximum dequeue size. Defaults to 50.</param>
-        /// <param name="partitionKey">The partition key.</param>
-        /// <param name="destination">The destination name (i.e. queue or topic).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The number of dequeued and sent events.</returns>
-        public async Task<int> DequeueAndSendAsync(int maxDequeueSize = 50, string? partitionKey = null, string? destination = null, CancellationToken cancellationToken = default)
-        {
-            Stopwatch sw;
-            maxDequeueSize = maxDequeueSize > 0 ? maxDequeueSize : 1;
-
-            // Where a cancel has been requested then this is a convenient time to do it.
-            if (cancellationToken.IsCancellationRequested)
-                return 0;
-
-            // Manage a transaction to ensure that the dequeue only commits after successful publish.
-            var txn = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled);
-
-            try
-            {
-                // Dequeue the events; where there are none to send, then simply exit and try again later.
-                Logger.LogTrace("Dequeue events. [MaxDequeueSize={MaxDequeueSize}, PartitionKey={PartitionKey}, Destination={Destination}]", maxDequeueSize, partitionKey, destination);
-
-                sw = Stopwatch.StartNew();
-                var events = await DequeueAsync(maxDequeueSize, partitionKey, destination, cancellationToken).ConfigureAwait(false);
-                sw.Stop();
-
-                if (events == null || !events.Any())
-                {
-                    txn.Complete();
-                    return 0;
-                }
-
-                Logger.LogDebug("{EventCount} event(s) were dequeued. [Elapsed={Elapsed}ms]", events.Count(), sw.Elapsed.TotalMilliseconds);
-
-                // Send the events.
-                sw = Stopwatch.StartNew();
-                await EventSender.SendAsync(events.ToArray(), cancellationToken).ConfigureAwait(false);
-                sw.Stop();
-                Logger.LogDebug("{EventCount} event(s) were sent successfully. [Sender={Sender}, Elapsed={Elapsed}ms]", events.Count(), EventSender.GetType().Name, sw.Elapsed.TotalMilliseconds);
-
-                // Commit the transaction.
-                txn.Complete();
-                return events.Count();
-            }
-            finally
-            {
-                txn?.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Dequeues the <see cref="EventSendData"/> list.
-        /// </summary>
-        private Task<IEnumerable<EventSendData>> DequeueAsync(int maxDequeueSize, string? partitionKey, string? destination, CancellationToken cancellationToken)
-            => Database.StoredProcedure(DequeueStoredProcedure)
-                       .Param("@MaxDequeueSize", maxDequeueSize)
-                       .Param("@PartitionKey", partitionKey)
-                       .Param("@Destination", destination)
-                       .SelectQueryAsync(this, cancellationToken);
-
-        /// <inheritdoc/>
-        public EventSendData MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            var source = record.GetValue<string?>(nameof(EventSendData.Source));
-            var attributes = record.GetValue<byte[]>(nameof(EventSendData.Attributes));
-            var data = record.GetValue<byte[]>(nameof(EventSendData.Data));
-            var destination = record.GetValue<string?>(nameof(EventSendData.Destination));
-            var partitionKey = record.GetValue<string?>(nameof(EventSendData.PartitionKey));
-
-            return new()
-            {
-                Id = record.GetValue<string?>(EventIdColumnName),
-                Destination = destination == DefaultDestination ? null : destination,
-                Subject = record.GetValue<string?>(nameof(EventSendData.Subject)),
-                Action = record.GetValue<string?>(nameof(EventSendData.Action)),
-                Type = record.GetValue<string?>(nameof(EventSendData.Type)),
-                Source = string.IsNullOrEmpty(source) ? null : new Uri(source, UriKind.RelativeOrAbsolute),
-                Timestamp = record.GetValue<DateTimeOffset>(nameof(EventSendData.Timestamp)),
-                CorrelationId = record.GetValue<string?>(nameof(EventSendData.CorrelationId)),
-                Key = record.GetValue<string?>(nameof(EventSendData.Key)),
-                TenantId = record.GetValue<string?>(nameof(EventSendData.TenantId)),
-                PartitionKey = partitionKey == DefaultPartitionKey ? null : partitionKey,
-                ETag = record.GetValue<string?>(nameof(EventSendData.ETag)),
-                Attributes = attributes == null || attributes.Length == 0 ? null : JsonSerializer.Default.Deserialize<Dictionary<string, string>>(new BinaryData(attributes)),
-                Data = data == null || data.Length == 0 ? null : new BinaryData(data)
-            };
-        }
-
-        /// <inheritdoc/>
-        /// <remarks>This method will result in a <see cref="NotSupportedException"/>.</remarks>
-        void IDatabaseMapper<EventSendData>.MapToDb(EventSendData? value, DatabaseParameterCollection parameters, OperationTypes operationType) => throw new NotSupportedException();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxEnqueueBase.cs b/src/CoreEx.Database.SqlServer/Outbox/EventOutboxEnqueueBase.cs
deleted file mode 100644
index ea88c562..00000000
--- a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxEnqueueBase.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.SqlServer.Outbox
-{
-    /// <summary>
-    /// Provides the base <see cref="EventSendData"/> <see cref="IDatabase">database</see> <i>outbox enqueue</i> <see cref="IEventSender.SendAsync(IEnumerable{EventSendData}, CancellationToken)"/>. 
-    /// </summary>
-    /// <remarks>By default the events are first sent/enqueued to the database outbox, then a secondary process dequeues and sends. Also, by enqueing to a single database outbox the event publishing order is preserved.
-    /// <para>This can however introduce unwanted latency depending on the frequency in which the secondary process performs the dequeue and send, as this is essentially a polling-based operation. To improve (minimize) latency, the primary
-    /// <see cref="IEventSender"/> can be specified using <see cref="SetPrimaryEventSender(IEventSender)"/>. This will then be used to send the events immediately, and where successful, they will be audited in the database as dequeued 
-    /// event(s); versus on error (as a backup), where they will be enqueued for the out-of-process dequeue and send (as per default). Note: the challenge this primary sender introduces is in-order publishing; there is no means to guarantee order for the 
-    /// events that are processed on error.</para></remarks>
-    /// <param name="database">The <see cref="IDatabase"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public abstract class EventOutboxEnqueueBase(IDatabase database, ILogger<EventOutboxEnqueueBase> logger) : IEventSender
-    {
-        private IEventSender? _eventSender;
-
-        /// <summary>
-        /// Gets the <see cref="IDatabase"/>.
-        /// </summary>
-        protected IDatabase Database { get; } = database.ThrowIfNull(nameof(database));
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        protected ILogger Logger { get; } = logger.ThrowIfNull(nameof(logger));
-
-        /// <summary>
-        /// Gets the event outbox <i>enqueue</i> stored procedure name.
-        /// </summary>
-        protected abstract string EnqueueStoredProcedure { get; }
-
-        /// <summary>
-        /// Gets the column name for the <see cref="EventDataBase.Id"/> property within the event outbox table.
-        /// </summary>
-        /// <remarks>Defaults to '<c>EventId</c>'.</remarks>
-        protected virtual string EventIdColumnName => "EventId";
-
-        /// <summary>
-        /// Gets or sets the default partition key.
-        /// </summary>
-        /// <remarks>Defaults to '<c>$default</c>'. This will ensure that there is always a value recorded in the database.</remarks>
-        public string DefaultPartitionKey { get; set; } = "$default";
-
-        /// <summary>
-        /// Gets or sets the default destination name.
-        /// </summary>
-        /// <remarks>Defaults to '<c>$default</c>'. This will ensure that there is always a value recorded in the database.</remarks>
-        public string DefaultDestination { get; set; } = "$default";
-
-        /// <summary>
-        /// Sets the <see cref="IEventSender"/> to act as the primary <see cref="IEventSender"/> where <i>outbox enqueue</i> is to provide backup/audit capabilities.
-        /// </summary>
-        public void SetPrimaryEventSender(IEventSender eventSender)
-        {
-            if (eventSender != null & eventSender is EventOutboxEnqueueBase)
-                throw new ArgumentException($"{nameof(SetPrimaryEventSender)} value must not be of Type {nameof(EventOutboxEnqueueBase)}.", nameof(eventSender));
-
-            _eventSender = eventSender;
-        }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <param name="events"><inheritdoc/></param>
-        /// <param name="cancellationToken"><inheritdoc/></param>
-        /// <remarks>Executes the <see cref="EnqueueStoredProcedure"/> to <i>send / enqueue</i> the <paramref name="events"/> to the underlying database outbox tables.</remarks>
-        public async Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellationToken = default)
-        {
-            if (events == null || !events.Any())
-                return;
-
-            Stopwatch sw = Stopwatch.StartNew();
-            var unsentEvents = new List<EventSendData>(events);
-
-            if (_eventSender != null)
-            {
-                try
-                {
-                    await _eventSender!.SendAsync(events, cancellationToken).ConfigureAwait(false);
-                    sw.Stop();
-                    unsentEvents.Clear();
-                    Logger.LogDebug("{EventCount} event(s) were sent successfully; will be forwarded (sent/enqueued) to the datatbase outbox as sent. [Sender={Sender}, Elapsed={Elapsed}ms]",
-                        events.Count(), _eventSender.GetType().Name, sw.Elapsed.TotalMilliseconds);
-                }
-                catch (EventSendException esex)
-                {
-                    sw.Stop();
-                    Logger.LogWarning(esex, "{UnsentCount} of {EventCount} event(s) were unable to be sent successfully; will be forwarded (sent/enqueued) to the datatbase outbox for an out-of-process send: {ErrorMessage} [Sender={Sender}, Elapsed={Elapsed}ms]",
-                        esex.NotSentEvents?.Count() ?? unsentEvents.Count, events.Count(), esex.Message, _eventSender!.GetType().Name, sw.Elapsed.TotalMilliseconds);
-
-                    if (esex.NotSentEvents != null)
-                        unsentEvents = esex.NotSentEvents.ToList();
-                }
-                catch (Exception ex)
-                {
-                    sw.Stop();
-                    Logger.LogWarning(ex, "{EventCount} event(s) were unable to be sent successfully; will be forwarded (sent/enqueued) to the datatbase outbox for an out-of-process send: {ErrorMessage} [Sender={Sender}, Elapsed={Elapsed}ms]",
-                        events.Count(), ex.Message, _eventSender!.GetType().Name, sw.Elapsed.TotalMilliseconds);
-                }
-            }
-
-            sw = Stopwatch.StartNew();
-            await Database.StoredProcedure(EnqueueStoredProcedure)
-                          .Param("@EventList", CreateEventsJsonForDatabase(events, unsentEvents))
-                          .NonQueryAsync(cancellationToken).ConfigureAwait(false);
-
-            sw.Stop();
-            Logger.LogDebug("{EventCount} event(s) were enqueued; {SuccessCount} as sent, {ErrorCount} to be sent. [Sender={Sender}, Elapsed={Elapsed}ms]",
-                events.Count(), events.Count() - unsentEvents.Count, unsentEvents.Count, GetType().Name, sw.Elapsed.TotalMilliseconds);
-
-            AfterSend?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Creates the events JSON to send to the database.
-        /// </summary>
-        private string CreateEventsJsonForDatabase(IEnumerable<EventSendData> list, IEnumerable<EventSendData> unsentList)
-        {
-            using var stream = new MemoryStream();
-            using var json = new Utf8JsonWriter(stream);
-
-            json.WriteStartArray();
-
-            foreach (var item in list)
-            {
-                json.WriteStartObject();
-                if (item.Id is not null)
-                    json.WriteString(EventIdColumnName, item.Id);
-
-                json.WriteBoolean("EventDequeued", !unsentList.Contains(item));
-                json.WriteString(nameof(EventSendData.Destination), item.Destination ?? DefaultDestination ?? throw new InvalidOperationException($"The {nameof(DefaultDestination)} must have a non-null value."));
-
-                if (item.Subject is not null)
-                    json.WriteString(nameof(EventSendData.Subject), item.Subject);
-
-                if (item.Action is not null)
-                    json.WriteString(nameof(EventSendData.Action), item.Action);
-
-                if (item.Type is not null)
-                    json.WriteString(nameof(EventSendData.Type), item.Type);
-
-                if (item.Source is not null)
-                    json.WriteString(nameof(EventSendData.Source), item.Source?.ToString());
-
-                if (item.Timestamp is not null)
-                    json.WriteString(nameof(EventSendData.Timestamp), (DateTimeOffset)item.Timestamp);
-
-                if (item.CorrelationId is not null)
-                    json.WriteString(nameof(EventSendData.CorrelationId), item.CorrelationId);
-
-                if (item.Key is not null)
-                    json.WriteString(nameof(EventSendData.Key), item.Key);
-
-                if (item.TenantId is not null)
-                    json.WriteString(nameof(EventSendData.TenantId), item.TenantId);
-
-                json.WriteString(nameof(EventSendData.PartitionKey), item.PartitionKey ?? DefaultPartitionKey ?? throw new InvalidOperationException($"The {nameof(DefaultPartitionKey)} must have a non-null value."));
-
-                if (item.ETag is not null)
-                    json.WriteString(nameof(EventSendData.ETag), item.ETag);
-
-                json.WriteBase64String(nameof(EventSendData.Attributes), item.Attributes == null || item.Attributes.Count == 0 ? new BinaryData([]) : Json.JsonSerializer.Default.SerializeToBinaryData(item.Attributes));
-                json.WriteBase64String(nameof(EventSendData.Data), item.Data ?? new BinaryData([]));
-                json.WriteEndObject();
-            }
-
-            json.WriteEndArray();
-            json.Flush();
-
-            return Encoding.UTF8.GetString(stream.ToArray());
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxHostedService.cs b/src/CoreEx.Database.SqlServer/Outbox/EventOutboxHostedService.cs
deleted file mode 100644
index f78c6a72..00000000
--- a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxHostedService.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Hosting;
-using CoreEx.Hosting.HealthChecks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.SqlServer.Outbox
-{
-    /// <summary>
-    /// Provides the <see cref="EventOutboxDequeueBase"/> dequeue and publish (<see cref="SynchronizedTimerHostedServiceBase{TSync}"/>) capabilities.
-    /// </summary>
-    /// <remarks>This will instantiate an <see cref="EventOutboxDequeueBase"/> using the underlying <see cref="ServiceProvider"/> and invoke <see cref="EventOutboxDequeueBase.DequeueAndSendAsync(int, string?, string?, CancellationToken)"/>.</remarks>
-    public class EventOutboxHostedService : SynchronizedTimerHostedServiceBase<EventOutboxHostedService>
-    {
-        private TimeSpan? _interval;
-        private int? _maxDequeueSize;
-        private string? _name;
-
-        /// <summary>
-        /// Provides an opportunity to make a one-off change to the underlying timer to trigger using the specified <paramref name="oneOffInterval"/> to the registered <see cref="EventOutboxHostedService"/>.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/> used to get the registered <see cref="EventOutboxHostedService"/>.</param>
-        /// <param name="oneOffInterval">The one-off interval before triggering; defaults to <c>null</c> which represents an immediate trigger.</param>
-        /// <param name="leaveWhereTimeRemainingIsLess">Indicates whether to <i>not</i> adjust the time where the time remaining is less than the one-off interval specified.</param>
-        /// <remarks>Where there is more than one instance registered, or none, then no action will be taken.
-        /// <para>This functionality is intended for low volume event publishing where there is need to bring forward the configured interval for a one-off execution. This is particularly useful where there is a need to publish
-        /// an event immediately versus waiting for the next scheduled execution.</para></remarks>
-        public static void OneOffTrigger(IServiceProvider serviceProvider, TimeSpan? oneOffInterval = null, bool leaveWhereTimeRemainingIsLess = true)
-        {
-            var services = serviceProvider.ThrowIfNull(nameof(serviceProvider)).GetServices<IHostedService>().OfType<EventOutboxHostedService>();
-            if (services.Count() == 1)
-                services.First().OneOffTrigger(oneOffInterval, leaveWhereTimeRemainingIsLess);
-        }
-
-        /// <summary>
-        /// Get or sets the configuration name for <see cref="Interval"/>. Defaults to '<c>Interval</c>'.
-        /// </summary>
-        public string IntervalName { get; set; } = "Interval";
-
-        /// <summary>
-        /// Gets or sets the configuration name for <see cref="MaxDequeueSize"/>. Defaults to '<c>MaxDequeueSize</c>'.
-        /// </summary>
-        public string MaxDequeueSizeName { get; set; } = "MaxDequeueSize";
-
-        /// <summary>
-        /// Gets or sets the default interval seconds used where the specified <see cref="Interval"/> is not configured/specified. Defaults to <b>thirty</b> seconds.
-        /// </summary>
-        public static TimeSpan DefaultInterval { get; set; } = TimeSpan.FromSeconds(30);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventOutboxHostedService"/> class.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-        /// <param name="synchronizer">The <see cref="IServiceSynchronizer"/>.</param>
-        /// <param name="healthCheck">The optional <see cref="TimerHostedServiceHealthCheck"/> to report health.</param>
-        /// <param name="partitionKey">The optional partition key.</param>
-        /// <param name="destination">The optional destination name (i.e. queue or topic).</param>
-        public EventOutboxHostedService(IServiceProvider serviceProvider, ILogger<EventOutboxHostedService> logger, SettingsBase settings, IServiceSynchronizer synchronizer, TimerHostedServiceHealthCheck? healthCheck = null, string? partitionKey = null, string? destination = null)
-            : base(serviceProvider, logger, settings, synchronizer, healthCheck)
-        {
-            PartitionKey = partitionKey;
-            Destination = destination;
-
-            // Build the synchronization name.
-            var sb = new StringBuilder();
-            if (partitionKey != null)
-                sb.Append($"PartitionKey-{partitionKey}");
-
-            if (destination != null)
-            {
-                if (sb.Length > 0)
-                    sb.Append('-');
-
-                SynchronizationName = $"Destination-{destination}";
-            }
-
-            SynchronizationName = sb.Length > 0 ? sb.ToString() : null;
-        }
-
-        /// <summary>
-        /// Gets the optional partition key.
-        /// </summary>
-        public string? PartitionKey { get; }
-
-        /// <summary>
-        /// Gets the optional destination name (i.e. queue or topic).
-        /// </summary>
-        public string? Destination { get; }
-
-        /// <summary>
-        /// Gets the service name (used for the likes of configuration and logging).
-        /// </summary>
-        public override string ServiceName => _name ??= $"{GetType().Name}{(PartitionKey == null ? "" : $".{PartitionKey}")}";
-
-        /// <summary>
-        /// Gets or sets the interval between each execution.
-        /// </summary>
-        /// <remarks>Will default to <see cref="SettingsBase"/> configuration, a) <see cref="TimerHostedServiceBase.ServiceName"/> : <see cref="IntervalName"/>, then b) <see cref="IntervalName"/>, where specified; otherwise, <see cref="DefaultInterval"/>.</remarks>
-        public override TimeSpan Interval
-        {
-            get => _interval ?? Settings.GetCoreExValue<TimeSpan?>($"{ServiceName}:{IntervalName}".Replace(".", "_")) ?? Settings.GetCoreExValue<TimeSpan?>(IntervalName.Replace(".", "_")) ?? DefaultInterval;
-            set => _interval = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum dequeue size to limit the number of events that are dequeued within a single operation.
-        /// </summary>
-        /// <remarks>Will default to <see cref="SettingsBase"/> configuration, a) <see cref="TimerHostedServiceBase.ServiceName"/> : <see cref="MaxDequeueSizeName"/>, then b) <see cref="MaxDequeueSizeName"/>, where specified; otherwise, 10.</remarks>
-        public int MaxDequeueSize
-        {
-            get => _maxDequeueSize ?? Settings.GetCoreExValue<int?>($"{ServiceName}:{MaxDequeueSizeName}".Replace(".", "_")) ?? Settings.GetCoreExValue<int?>(MaxDequeueSizeName.Replace(".", "_")) ?? 10;
-            set => _maxDequeueSize = value;
-        }
-
-        /// <summary>
-        /// Get or sets the function to create an instance of <see cref="EventOutboxDequeueBase"/>.
-        /// </summary>
-        public Func<IServiceProvider, EventOutboxDequeueBase>? EventOutboxDequeueFactory { get; set; }
-
-        /// <summary>
-        /// Executes the <see cref="EventOutboxDequeueFactory"/> instance to perform the <see cref="EventOutboxDequeueBase.DequeueAndSendAsync(int, string?, string?, CancellationToken)"/> until queue is empty.
-        /// </summary>
-        /// <param name="scopedServiceProvider"><inheritdoc/></param>
-        /// <param name="cancellationToken"><inheritdoc/></param>
-        protected override async Task SynchronizedExecuteAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken = default)
-        {
-            if (EventOutboxDequeueFactory == null)
-                throw new InvalidOperationException($"The {nameof(EventOutboxDequeueFactory)} property must be configured to create an instance of the {nameof(EventOutboxDequeueBase)}.");
-
-            int sent;
-
-            do
-            {
-                // As we want to tight loop the execution where there may be more in the queue, a new 'Scope' is used to ensure new instances of dependencies are used otherwise a disposed error may occur for the underlying transaction.
-                using var scope = scopedServiceProvider.CreateScope();
-                ExecutionContext.Reset();
-                var eod = EventOutboxDequeueFactory(scope.ServiceProvider) ?? throw new InvalidOperationException($"The {nameof(EventOutboxDequeueFactory)} function must return an instance of {nameof(EventOutboxDequeueBase)}.");
-                sent = await eod.DequeueAndSendAsync(MaxDequeueSize, PartitionKey, Destination, cancellationToken).ConfigureAwait(false);
-            }
-            while (sent > 0) ;
-        }
-
-        /// <inheritdoc/>
-        protected override HealthCheckResult OnReportHealthStatus(Dictionary<string, object> data)
-        {
-            data.Add("maxDequeueSize", MaxDequeueSize);
-            data.Add("partitionKey", PartitionKey ?? "<all>");
-            data.Add("destination", Destination ?? "<all>");
-            data.Add("synchronizer", SynchronizationName ?? "<none>");
-
-            return base.OnReportHealthStatus(data);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxService.cs b/src/CoreEx.Database.SqlServer/Outbox/EventOutboxService.cs
deleted file mode 100644
index 9cb9083a..00000000
--- a/src/CoreEx.Database.SqlServer/Outbox/EventOutboxService.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.SqlServer.Outbox
-{
-    /// <summary>
-    /// Provides the <see cref="EventOutboxDequeueBase"/> dequeue and publish self-service capabilities.
-    /// </summary>
-    /// <remarks>This will instantiate an <see cref="EventOutboxDequeueBase"/> using the underlying <see cref="ServiceProvider"/> and invoke <see cref="EventOutboxDequeueBase.DequeueAndSendAsync(int, string?, string?, CancellationToken)"/>.</remarks>
-    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="partitionKey">The optional partition key.</param>
-    /// <param name="destination">The optional destination name (i.e. queue or topic).</param>
-    public class EventOutboxService(IServiceProvider serviceProvider, ILogger<EventOutboxService> logger, SettingsBase? settings = null, string? partitionKey = null, string? destination = null) : ServiceBase(serviceProvider, logger, settings)
-    {
-        private string? _name;
-        private int? _maxIterations;
-        private int? _maxDequeueSize;
-
-        /// <summary>
-        /// Gets or sets the configuration name for <see cref="MaxDequeueSize"/>. Defaults to '<c>MaxDequeueSize</c>'.
-        /// </summary>
-        public string MaxDequeueSizeName { get; set; } = "MaxDequeueSize";
-
-        /// <summary>
-        /// Gets the optional partition key.
-        /// </summary>
-        public string? PartitionKey { get; } = partitionKey;
-
-        /// <summary>
-        /// Gets the optional destination name (i.e. queue or topic).
-        /// </summary>
-        public string? Destination { get; } = destination;
-
-        /// <summary>
-        /// Gets the service name (used for the likes of configuration and logging).
-        /// </summary>
-        public override string ServiceName => _name ??= $"{GetType().Name}{(PartitionKey == null ? "" : $".{PartitionKey}")}";
-
-        /// <inheritdoc/>
-        /// <remarks>Will default to <see cref="SettingsBase"/> configuration, a) <see cref="ServiceBase.ServiceName"/> : <see cref="ServiceBase.MaxIterationsName"/>, then b) <see cref="ServiceBase.MaxIterationsName"/>, where specified; otherwise, <see cref="ServiceBase.DefaultMaxIterations"/>.</remarks>
-        public override int MaxIterations
-        {
-            get => _maxIterations ?? Settings.GetCoreExValue<int?>($"{ServiceName}:{MaxIterationsName}".Replace(".", "_")) ?? Settings.GetCoreExValue<int?>(MaxIterationsName.Replace(".", "_")) ?? DefaultMaxIterations;
-            set => _maxIterations = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the maximum dequeue size to limit the number of events that are dequeued within a single operation.
-        /// </summary>
-        /// <remarks>Will default to <see cref="SettingsBase"/> configuration, a) <see cref="ServiceBase.ServiceName"/> : <see cref="MaxDequeueSizeName"/>, then b) <see cref="MaxDequeueSizeName"/>, where specified; otherwise, 10.</remarks>
-        public int MaxDequeueSize
-        {
-            get => _maxDequeueSize ?? Settings.GetCoreExValue<int?>($"{ServiceName}:{MaxDequeueSizeName}".Replace(".", "_")) ?? Settings.GetCoreExValue<int?>(MaxDequeueSizeName.Replace(".", "_")) ?? 10;
-            set => _maxDequeueSize = value;
-        }
-
-        /// <summary>
-        /// Get or sets the function to create an instance of <see cref="EventOutboxDequeueBase"/>.
-        /// </summary>
-        public Func<IServiceProvider, EventOutboxDequeueBase>? EventOutboxDequeueFactory { get; set; }
-
-        /// <summary>
-        /// Executes the <see cref="EventOutboxDequeueFactory"/> instance to perform the <see cref="EventOutboxDequeueBase.DequeueAndSendAsync(int, string?, string?, CancellationToken)"/>.
-        /// </summary>
-        /// <param name="scopedServiceProvider">The scoped <see cref="IServiceProvider"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates to execute the next iteration (i.e. continue); otherwise, <c>false</c> to stop.</returns>
-        protected override async Task<bool> ExecuteAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken)
-        {
-            if (EventOutboxDequeueFactory == null)
-                throw new InvalidOperationException($"The {nameof(EventOutboxDequeueFactory)} property must be configured to create an instance of the {nameof(EventOutboxDequeueBase)}.");
-
-            var eod = EventOutboxDequeueFactory(scopedServiceProvider) ?? throw new InvalidOperationException($"The {nameof(EventOutboxDequeueFactory)} function must return an instance of {nameof(EventOutboxDequeueBase)}.");
-            var sent = await eod.DequeueAndSendAsync(MaxDequeueSize, PartitionKey, Destination, cancellationToken).ConfigureAwait(false);
-            return sent > 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxPublisher.cs b/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxPublisher.cs
new file mode 100644
index 00000000..48159c64
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxPublisher.cs
@@ -0,0 +1,88 @@
+namespace CoreEx.Database.SqlServer.Outbox;
+
+/// <summary>
+/// Provides the <see href="https://learn.microsoft.com/en-us/sql/">SQL Server</see> <see cref="IEventPublisher"/> to be used as a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+/// </summary>
+/// <remarks>As the <see cref="SqlServerDatabase"/> is used, the <see cref="SqlServerOutboxPublisher"/> should participate in the same transaction. It is the responsibility of the caller to manage this transaction.</remarks>
+public class SqlServerOutboxPublisher : DatabaseOutboxPublisherBase<SqlServerDatabase>
+{
+    /// <summary>
+    /// Gets the default service key used when registering the service.
+    /// </summary>
+    /// <remarks>See related <see cref="CoreExSqlServerExtensions.AddSqlServerOutboxPublisher(IServiceCollection, Action{IServiceProvider, SqlServerOutboxPublisher}?, bool, string)"/>.</remarks>
+    public const string DefaultServiceKey = "SqlServerOutbox";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SqlServerOutboxPublisher"/> class.
+    /// </summary>
+    /// <param name="database">The <see cref="SqlServerDatabase"/>.</param>
+    /// <param name="destinationProvider">The optional <see cref="IDestinationProvider"/>.</param>
+    /// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
+    public SqlServerOutboxPublisher(SqlServerDatabase database, IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<SqlServerOutboxPublisher>? logger = null)
+        : base(database, destinationProvider, formatter, logger)
+    {
+        // Attempt to automatically set the statement by convention, if possible.
+        var schema = ExecutionContext.GetService<IHostSettings>()?.DomainName;
+        if (schema is not null)
+            Statement = SqlStatement.StoredProcedure($"[{schema}].[spOutboxEnqueue]");
+    }
+
+    /// <inheritdoc/>
+    protected async override Task OnPublishAsync(DestinationEvent[] events, CancellationToken cancellationToken = default)
+    {
+        var utc = Runtime.UtcNow.UtcDateTime;
+        var ec = ExecutionContext.HasCurrent ? ExecutionContext.Current : null;
+        var hasTenantId = !string.IsNullOrEmpty(ec?.TenantId);
+
+        // The statement must be a stored procedure.
+        if (Statement.CommandType != CommandType.StoredProcedure)
+            throw new InvalidOperationException($"The {nameof(Statement)}.{nameof(Statement.CommandType)} must be {nameof(CommandType.StoredProcedure)}.");
+
+        // For each into batch of up to 'StatementBatchSize' events to persist, to eke out better performance by reducing the number of round trips to the database.
+        foreach (var chunk in events.Chunk(StatementBatchSize))
+        {
+            var sb = new StringBuilder();
+            var dpc = new DatabaseParameterCollection(Database);
+
+            for (var i = 0; i < chunk.Length; i++)
+            {
+                // Add each event to the batch statement and parameters collection.
+                var pk = chunk[i].Event.GetPartitionKey();
+                var partitionId = PartitionKey.GetPartitionId(string.IsNullOrEmpty(pk) ? Guid.NewGuid().ToString() : pk, PartitionSize);
+
+                sb.Append($"EXEC {Statement.CommandText} ");
+
+                if (hasTenantId)
+                    AddParameter(sb, dpc, Database.NamedColumns.TenantIdName, ec!.TenantId, i);
+
+                AddParameter(sb, dpc, Database.NamedColumns.PartitionIdName, partitionId, i);
+                AddParameter(sb, dpc, Database.NamedColumns.OutboxDestinationName, chunk[i].Destination, i);
+                AddParameter(sb, dpc, Database.NamedColumns.OutboxEventName, chunk[i].Event.EncodeToJsonElement(), i);
+                AddParameter(sb, dpc, Database.NamedColumns.OutboxEnqueuedUtcName, utc, i, false);
+            }
+
+            if (Logger?.IsEnabled(LogLevel.Debug) is true)
+                Logger.LogDebug("Executing batch statement to persist {Count} event(s) as a single database command.", chunk.Length);
+
+            // Execute the batch statement with the parameters collection.
+            var ds = Database.Statement(new SqlStatement(CommandType.Text, sb.ToString()));
+            ds.Parameters.AddRange(dpc);
+            await ds.NonQueryAsync(cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    /// <summary>
+    /// Adds the parameter to the <see cref="StringBuilder"/> and <see cref="DatabaseParameterCollection"/>.
+    /// </summary>
+    private static void AddParameter(StringBuilder sb, DatabaseParameterCollection dpc, string name, object? value, int index, bool appendComma = true)
+    {
+        sb.Append(DatabaseParameterCollection.ParameterizeName(name)).Append(" = ").Append(DatabaseParameterCollection.ParameterizeName($"{name}_{index}"));
+        if (appendComma)
+            sb.Append(", ");
+        else
+            sb.AppendLine(";");
+
+        dpc.AddParameter($"{name}_{index}", value);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxRelay.cs b/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxRelay.cs
new file mode 100644
index 00000000..510c534a
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxRelay.cs
@@ -0,0 +1,58 @@
+namespace CoreEx.Database.SqlServer.Outbox;
+
+/// <summary>
+/// Provides the <see href="https://learn.microsoft.com/en-us/sql/">SQL Server</see> <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see> <i>relay</i> using the destination <see cref="IEventPublisher"/>.
+/// </summary>
+/// <param name="database">The <see cref="SqlServerDatabase"/>.</param>
+/// <param name="eventPublisher">The destination <see cref="IEventPublisher"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public class SqlServerOutboxRelay(SqlServerDatabase database, IEventPublisher eventPublisher, ILogger<SqlServerOutboxRelay>? logger = null)
+    : DatabaseOutboxRelayBase<SqlServerDatabase, SqlServerOutboxRelay>(database, eventPublisher, logger)
+{
+    /// <summary><inheritdoc/></summary>
+    /// <param name="schema"><inheritdoc/></param>
+    /// <remarks>The <paramref name="schema"/> is used to qualify the stored procedure names. The by-convention names used are as follows:
+    /// <list type="bullet">
+    /// <item><description><see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}.ClaimBatchStatement"/> = '<c>[schema].[spOutboxBatchClaim]</c>'</description></item>
+    /// <item><description><see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}.CompleteBatchStatement"/> = '<c>[schema].[spOutboxBatchComplete]</c>'</description></item>
+    /// <item><description><see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}.CancelBatchStatement"/> = '<c>[schema].[spOutboxBatchCancel]</c>'</description></item>
+    /// </list></remarks>
+    public override void SetStatementsByConvention(string? schema = null)
+    {
+        schema ??= ExecutionContext.GetService<IHostSettings>()?.DomainName;
+        if (schema is not null)
+        {
+            ClaimBatchStatement = SqlStatement.StoredProcedure($"[{schema}].[spOutboxBatchClaim]");
+            CompleteBatchStatement = SqlStatement.StoredProcedure($"[{schema}].[spOutboxBatchComplete]");
+            CancelBatchStatement = SqlStatement.StoredProcedure($"[{schema}].[spOutboxBatchCancel]");
+        }
+    }
+
+    /// <inheritdoc/>
+    protected override bool IsTransientException(Exception exception)
+    {
+        if (exception is SqlException sex && sex.Errors.Count > 0)
+        {
+            switch (sex.Errors[0].Number)
+            {
+                case 1205: return true;  // Deadlock: https://learn.microsoft.com/en-us/sql/relational-databases/errors-events/mssqlserver-1205-database-engine-error
+            }
+        }
+
+        return base.IsTransientException(exception);
+    }
+
+    /// <inheritdoc/>
+    protected async override Task CompleteBatchAsync(DatabaseOutboxRelayArgs args, Guid leaseId, CancellationToken cancellationToken)
+    {
+        await base.CompleteBatchAsync(args, leaseId, cancellationToken);
+
+        if (EventPublisher.IsEmpty)
+            return;
+
+        // Capture metrics; no need to capture each as this would be diminishing returns, as the oldest and newest are the most important.
+        SqlServerMetrics.OutboxRelayBatchSize.Add(EventPublisher.Count);
+        SqlServerMetrics.OutboxRelayOldestLagDuration.Record((DateTimeOffset.UtcNow - (EventPublisher.GetEvents()[0].Event.Time ?? default)).TotalMilliseconds);
+        SqlServerMetrics.OutboxRelayNewestLagDuration.Record((DateTimeOffset.UtcNow - (EventPublisher.GetEvents()[^1].Event.Time ?? default)).TotalMilliseconds);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxRelayHostedService.cs b/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxRelayHostedService.cs
new file mode 100644
index 00000000..aa11aa27
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/Outbox/SqlServerOutboxRelayHostedService.cs
@@ -0,0 +1,10 @@
+namespace CoreEx.Database.SqlServer.Outbox;
+
+/// <summary>
+/// Provides the <see href="https://learn.microsoft.com/en-us/sql/">SQL Server</see> <see cref="IDatabaseOutboxRelay.RelayAsync"/> execution leveraging an underlying <see cref="TimerHostedServiceBase"/>.
+/// </summary>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public sealed class SqlServerOutboxRelayHostedService(IServiceProvider serviceProvider, ILogger logger)
+    : DatabaseOutboxRelayHostedServiceBase<SqlServerOutboxRelay>(serviceProvider, logger)
+{ }
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/README.md b/src/CoreEx.Database.SqlServer/README.md
new file mode 100644
index 00000000..1ed4f653
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/README.md
@@ -0,0 +1,55 @@
+# CoreEx.Database.SqlServer
+
+> Provides the SQL Server (`Microsoft.Data.SqlClient`) implementation of `IDatabase`: `SqlServerDatabase`, `SqlServerUnitOfWork`, session-context stamping, outbox relay, SQL Server-specific parameter extensions, and OpenTelemetry metrics for outbox operations.
+
+## Overview
+
+`CoreEx.Database.SqlServer` is the SQL Server provider package built on top of `CoreEx.Database`. It supplies concrete implementations of every abstract type in that package — `SqlServerDatabase`, `SqlServerCommand`, `SqlServerDatabaseArgs`, `SqlServerDatabaseColumns` — and adds SQL Server-specific capabilities: session context propagation via `sp_set_session_context`, structured error-code mapping from SQL Server error numbers to CoreEx semantic exceptions, and `SqlServerUnitOfWork` for transactional outbox support.
+
+The error-code mapping convention means stored procedures can raise well-known user error numbers (56001–56010) to signal domain exceptions without any application-layer switch statements. Duplicate-constraint violations (error numbers 2601, 2627 by default) are automatically converted to `DuplicateException`.
+
+The outbox sub-namespace provides ready-to-use `SqlServerOutboxPublisher`, `SqlServerOutboxRelay`, and `SqlServerOutboxRelayHostedService` with .NET Meter-backed counters and histograms for enqueue throughput and relay lag.
+
+## Key capabilities
+
+- 🗃️ **SqlServerDatabase**: Concrete `IDatabase` for `SqlConnection`; maps SQL Server error numbers to CoreEx semantic exceptions; configurable `DuplicateErrorNumbers`; `RowVersion` encoded as Base64 string via `StringBase64Converter`.
+- 🔢 **Error-code convention**: SQL user error numbers 56001–56007 and 56010 map to `ValidationException`, `BusinessException`, `AuthorizationException`, `ConcurrencyException`, `NotFoundException`, `ConflictException`, `DuplicateException`, and `DataConsistencyException` respectively.
+- 👤 **Session context**: `SetSqlSessionContextAsync(ExecutionContext?)` invokes `[dbo].[spSetSessionContext]` (configurable) to stamp `Username`, `Timestamp`, `TenantId`, and `UserId` into the SQL Server session context for row-level security and audit triggers.
+- 🔁 **SqlServerUnitOfWork**: `IDatabaseUnitOfWork` implementation wrapping `TransactionAsync` with `SqlServerUnitOfWorkInvoker`; optionally accepts an `IEventPublisher` outbox for transactional event enqueuing.
+- 📤 **Outbox relay**: `SqlServerOutboxPublisher` (writes to outbox table), `SqlServerOutboxRelay` (polls and publishes), and `SqlServerOutboxRelayHostedService` (timer-driven hosted service) — all SQL Server-specific subclasses of the base `CoreEx.Database.Outbox` types.
+- 📊 **Outbox metrics**: `SqlServerMetrics` exposes .NET `Meter` instruments: `sqlserver.outbox.enqueue` (counter), `sqlserver.outbox.relay.batch.size` (counter), `sqlserver.outbox.batch.oldest_lag` and `sqlserver.outbox.batch.newest_lag` (histograms in ms).
+- 📡 **OpenTelemetry**: `CoreExSqlServerExtensions.AddCoreExSqlServerOpenTelemetry` wires `SqlServerInvoker` activity sources and the outbox meter into the OTEL tracer and meter providers.
+- ⚙️ **DI registration**: `AddSqlServerDatabase<TDatabase>(services, configure?)` registers `SqlServerDatabase` as a scoped service; `AddSqlServerUnitOfWork(services, configure?)` registers `SqlServerUnitOfWork`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`SqlServerDatabase`](./SqlServerDatabase.cs)** | Concrete `IDatabase` for `SqlConnection`; error-number to exception mapping; `RowVersion` → `StringBase64Converter`; `SetSqlSessionContextAsync`. |
+| **[`SqlServerUnitOfWork`](./SqlServerUnitOfWork.cs)** | `IDatabaseUnitOfWork` implementation; wraps `TransactionAsync` with `SqlServerUnitOfWorkInvoker`; optional transactional outbox via `IEventPublisher Outbox`. |
+| **[`SqlServerCommand`](./SqlServerCommand.cs)** | `DatabaseCommand` subclass for `SqlCommand`; adds SQL Server-specific parameter handling and `CommandTimeout` support. |
+| **[`SqlServerDatabaseArgs`](./SqlServerDatabaseArgs.cs)** | `DatabaseArgs` subclass with SQL Server-specific defaults (e.g. `CommandTimeout`). |
+| **[`SqlServerDatabaseColumns`](./Extended/SqlServerDatabaseColumns.cs)** | `DatabaseColumns` subclass adding `SessionContextUsernameName`, `SessionContextTimestampName`, `SessionContextTenantIdName`, `SessionContextUserIdName` constants for session-context parameters. |
+| **[`SqlServerMetrics`](./SqlServerMetrics.cs)** | Static .NET Meter with counters and histograms for outbox enqueue throughput and relay lag. |
+| **[`SqlServerOutboxPublisher`](./Outbox/SqlServerOutboxPublisher.cs)** | `DatabaseOutboxPublisherBase` for SQL Server; inserts event rows into the outbox table via a configurable stored procedure. |
+| **[`SqlServerOutboxRelay`](./Outbox/SqlServerOutboxRelay.cs)** | `DatabaseOutboxRelayBase<SqlServerDatabase, SqlServerOutboxRelay>` with SQL Server-specific dequeue/complete SQL; records outbox metrics per batch. |
+| **[`SqlServerOutboxRelayHostedService`](./Outbox/SqlServerOutboxRelayHostedService.cs)** | `DatabaseOutboxRelayHostedServiceBase<SqlServerOutboxRelay>` timer-driven hosted service for the SQL Server outbox relay. |
+| [`SqlServerExtensions`](./SqlServerExtensions.cs) | `IDatabase` / `DatabaseCommand` extensions specific to SQL Server: `Param` helpers for `SqlDbType`-typed parameters and TVP (table-valued parameter) support. |
+| [`SqlServerInvoker`](./Extended/SqlServerInvoker.cs) | `DatabaseInvoker` subclass for SQL Server; the `Default` singleton used by `SqlServerDatabase`. |
+| [`SqlServerUnitOfWorkInvoker`](./Extended/SqlServerUnitOfWorkInvoker.cs) | `InvokerBase<SqlServerUnitOfWork>` wrapping `TransactionAsync` with OpenTelemetry spans and begin/commit/rollback log entries. |
+
+## Related Namespaces
+
+- **[`CoreEx.Database`](../CoreEx.Database/README.md)** - Abstract base types (`Database<TConn>`, `DatabaseCommand`, `DatabaseRecord`, `DatabaseOutboxRelayBase`, `IDatabaseMapper`) that all SQL Server types extend.
+- **[`CoreEx.Data`](../CoreEx.Data/README.md)** - `IUnitOfWork` and `IDatabaseUnitOfWork` interfaces implemented by `SqlServerUnitOfWork`.
+- **[`CoreEx.Events`](../CoreEx.Events/README.md)** - `IEventPublisher` is the relay's publication target; `SqlServerOutboxPublisher` implements `IEventPublisher`.
+- **[`CoreEx.Invokers`](../CoreEx/Invokers/README.md)** - `SqlServerInvoker` and `SqlServerUnitOfWorkInvoker` extend `InvokerBase` for OpenTelemetry tracing.
+
+## Additional Resources
+
+- [Microsoft.Data.SqlClient](https://github.com/dotnet/SqlClient) - The ADO.NET driver this package uses.
+- [sp_set_session_context](https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-set-session-context-transact-sql) - SQL Server session-context stored procedure used by `SetSqlSessionContextAsync`.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerCommand.cs b/src/CoreEx.Database.SqlServer/SqlServerCommand.cs
new file mode 100644
index 00000000..c9e3a83c
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/SqlServerCommand.cs
@@ -0,0 +1,9 @@
+namespace CoreEx.Database.SqlServer;
+
+/// <summary>
+/// Provides extended <see href="https://learn.microsoft.com/en-us/sql/">SQL Server</see> <see cref="DatabaseCommand{TDatabaseArgs, TSelf}"/> capabilities.
+/// </summary>
+/// <param name="db">The <see cref="IDatabase"/>.</param>
+/// <param name="statement">The <see cref="SqlStatement"/>.</param>
+/// <remarks>As the underlying <see cref="DbCommand"/> implements <see cref="IDisposable"/> this is only created (and automatically disposed) where executing the command proper.</remarks>
+public sealed class SqlServerCommand(SqlServerDatabase db, SqlStatement statement) : DatabaseCommand<SqlServerDatabaseArgs, SqlServerCommand>(db, statement) { }
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerDatabase.SessionContext.cs b/src/CoreEx.Database.SqlServer/SqlServerDatabase.SessionContext.cs
new file mode 100644
index 00000000..dbaf0215
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/SqlServerDatabase.SessionContext.cs
@@ -0,0 +1,47 @@
+namespace CoreEx.Database.SqlServer;
+
+public partial class SqlServerDatabase
+{
+    /// <summary>
+    /// Gets or sets the <see cref="SqlStatement"/> used by <see cref="SetSqlSessionContextAsync(ExecutionContext?, CancellationToken)"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="SqlStatement.StoredProcedure(string)"/> to invoke '<c>[dbo].[spSetSessionContext]</c>'.</remarks>
+    public SqlStatement SessionContextStatement { get; set => field = value.ThrowIfNull(); } = SqlStatement.StoredProcedure("[dbo].[spSetSessionContext]");
+
+    /// <summary>
+    /// Sets the SQL session context using the specified values by invoking the <see cref="SessionContextStatement"/> using parameters named <see cref="SqlServerDatabaseColumns.SessionContextUsernameName"/>, 
+    /// <see cref="SqlServerDatabaseColumns.SessionContextTimestampName"/>, <see cref="SqlServerDatabaseColumns.SessionContextTenantIdName"/> and <see cref="SqlServerDatabaseColumns.SessionContextUserIdName"/>.
+    /// </summary>
+    /// <param name="username">The username (where <see langword="null"/> the value will default to <see cref="ExecutionContext.User"/> <see cref="AuthenticationUser.UserName"/>).</param>
+    /// <param name="timestamp">The timestamp <see cref="DateTimeOffset"/> (where <see langword="null"/> the value will default to <see cref="Runtime.UtcNow"/>).</param>
+    /// <param name="tenantId">The tenant identifer (where <see langword="null"/> the value will not be used).</param>
+    /// <param name="userId">The unique user identifier (where <see langword="null"/> the value will not be used).</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-set-session-context-transact-sql"/>.</remarks>
+    public Task SetSqlSessionContextAsync(string? username, DateTimeOffset? timestamp, string? tenantId = null, string? userId = null, CancellationToken cancellationToken = default)
+    {
+        return Invoker.InvokeAsync(this, DbArgs, async (_, _, cancellationToken) =>
+        {
+            var r = await Statement(SessionContextStatement)
+                .Param(NamedColumns.SessionContextUsernameName, username ?? AuthenticationUser.EnvironmentUser.UserName)
+                .Param(NamedColumns.SessionContextTimestampName, timestamp ?? Runtime.UtcNow)
+                .ParamWith(tenantId, NamedColumns.SessionContextTenantIdName)
+                .ParamWith(userId, NamedColumns.SessionContextUserIdName)
+                .NonQueryAsync(cancellationToken).ConfigureAwait(false);
+        }, cancellationToken, nameof(SetSqlSessionContextAsync));
+    }
+
+    /// <summary>
+    /// Sets the SQL session context using the <see cref="ExecutionContext"/>.
+    /// </summary>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/>. Defaults to <see cref="ExecutionContext.Current"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>See <see cref="SetSqlSessionContextAsync(string?, DateTimeOffset?, string?, string?, CancellationToken)"/> for more information.</remarks>
+    public async Task SetSqlSessionContextAsync(ExecutionContext? executionContext = null, CancellationToken cancellationToken = default)
+    {
+        if (executionContext is not null || ExecutionContext.TryGetCurrent(out executionContext))
+            await SetSqlSessionContextAsync(executionContext.User?.UserName, executionContext.Timestamp, executionContext.TenantId, executionContext.User?.Id, cancellationToken).ConfigureAwait(false);
+        else
+            await SetSqlSessionContextAsync(null, null, cancellationToken: cancellationToken).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerDatabase.cs b/src/CoreEx.Database.SqlServer/SqlServerDatabase.cs
index b9c6de76..e03e9300 100644
--- a/src/CoreEx.Database.SqlServer/SqlServerDatabase.cs
+++ b/src/CoreEx.Database.SqlServer/SqlServerDatabase.cs
@@ -1,135 +1,83 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping.Converters;
-using CoreEx.Results;
-using Microsoft.Data.SqlClient;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Linq;
-using System.Data.Common;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.SqlServer
+namespace CoreEx.Database.SqlServer;
+
+/// <summary>
+/// Provides the <see href="https://learn.microsoft.com/en-us/sql/">SQL Server</see> <see cref="IDatabase"/> functionality.
+/// </summary>
+/// <remarks>The <see cref="OnDbException(DbException)"/> override implements transformation of pre-determined SQL Server error codes, as follows:
+///  <list type="bullet">
+///   <item><c>56001</c> -> <see cref="ValidationException"/>.</item>
+///   <item><c>56002</c> -> <see cref="BusinessException"/>.</item>
+///   <item><c>56003</c> -> <see cref="AuthorizationException"/>.</item>
+///   <item><c>56004</c> -> <see cref="ConcurrencyException"/>.</item>
+///   <item><c>56005</c> -> <see cref="NotFoundException"/>.</item>
+///   <item><c>56006</c> -> <see cref="ConflictException"/>.</item>
+///   <item><c>56007</c> -> <see cref="DuplicateException"/>.</item>
+///   <item><c>56010</c> -> <see cref="DataConsistencyException"/>.</item>
+///  </list>
+///  <para>This is in addition to the <see cref="CheckDuplicateErrorNumbers"/> with the corresponding <see cref="DuplicateErrorNumbers"/> that will also result in a <see cref="DuplicateException"/>.</para>
+///  <para>This class also implements the <see cref="IUnitOfWork"/> including a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>. The <see cref="IUnitOfWork"/> 
+///  functionality is enabled by the <see cref="SqlServerUnitOfWorkInvoker"/>; note, this is not thread-safe.</para>
+/// </remarks>
+/// <param name="connection">The <see cref="SqlConnection"/>.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public partial class SqlServerDatabase(SqlConnection connection, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<SqlServerDatabase>? logger = null) : Database<SqlConnection, SqlServerCommand, SqlServerDatabaseArgs, SqlServerDatabaseColumns>(connection, SqlServerInvoker.Default, SqlServerDatabaseColumns.Default, jsonSerializerOptions, logger)
 {
     /// <summary>
-    /// Provides <see href="https://learn.microsoft.com/en-us/sql/?view=sql-server-ver16">SQL Server</see> database access functionality.
+    /// Gets the default <see cref="DuplicateErrorNumbers"/>.
     /// </summary>
-    /// <param name="create">The function to create the <see cref="SqlConnection"/>.</param>
-    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The optional <see cref="DatabaseInvoker"/>.</param>
-    public class SqlServerDatabase(Func<SqlConnection> create, ILogger<SqlServerDatabase>? logger = null, DatabaseInvoker? invoker = null) : Database<SqlConnection>(create, SqlClientFactory.Instance, logger, invoker)
-    {
-        private static readonly SqlServerDatabaseColumns _defaultColumns = new();
-
-        /// <summary>
-        /// Gets the default <see cref="DuplicateErrorNumbers"/>.
-        /// </summary>
-        /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors"/>
-        /// and <see href="https://docs.microsoft.com/en-us/azure/sql-database/sql-database-develop-error-messages"/>.</remarks>
-        public static int[] DefaultDuplicateErrorNumbers { get; } = [2601, 2627];
-
-        /// <summary>
-        /// Gets or sets the names of the pre-configured <see cref="SqlServerDatabaseColumns"/>.
-        /// </summary>
-        /// <remarks>Do not update the default properties directly as a shared static instance is used (unless this is the desired behaviour); create a new <see cref="SqlServerDatabaseColumns"/> instance for overridding.</remarks>
-        public new SqlServerDatabaseColumns DatabaseColumns { get; set; } = _defaultColumns;
-
-        /// <inheritdoc/>
-        public override IConverter RowVersionConverter => StringToBase64Converter.Default;
+    /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/relational-databases/errors-events/database-engine-events-and-errors"/>
+    /// and <see href="https://docs.microsoft.com/en-us/azure/sql-database/sql-database-develop-error-messages"/>.</remarks>
+    public static int[] DefaultDuplicateErrorNumbers { get; } = [2601, 2627];
 
-        /// <summary>
-        /// Gets or sets the stored procedure name used by <see cref="SetSqlSessionContextAsync(string?, DateTime?, string?, string?, CancellationToken)"/>.
-        /// </summary>
-        /// <remarks>Defaults to '<c>[dbo].[spSetSessionContext]</c>'.</remarks>
-        public string SessionContextStoredProcedure { get; set; } = "[dbo].[spSetSessionContext]";
+    /// <inheritdoc/>
+    public override ISourceConverter<string?> RowVersionConverter => StringBase64Converter.Default;
 
-        /// <summary>
-        /// Indicates whether to transform the <see cref="SqlException"/> into an <see cref="Abstractions.IExtendedException"/> equivalent based on the <see cref="SqlException.Number"/>.
-        /// </summary>
-        /// <remarks>Transforms and throws the <see cref="Abstractions.IExtendedException"/> equivalent from the <see cref="SqlException"/> known list.</remarks>
-        public bool ThrowTransformedException { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="DuplicateErrorNumbers"/> when catching the <see cref="SqlException"/>.
-        /// </summary>
-        public bool CheckDuplicateErrorNumbers { get; set; } = true;
+    /// <summary>
+    /// Indicates whether to check the <see cref="DuplicateErrorNumbers"/> when catching the <see cref="SqlException"/>.
+    /// </summary>
+    public bool CheckDuplicateErrorNumbers { get; set; } = true;
 
-        /// <summary>
-        /// Gets or sets the list of known <see cref="SqlException.Number"/> values that are considered a duplicate error.
-        /// </summary>
-        /// <remarks>Overrides the <see cref="DefaultDuplicateErrorNumbers"/>.</remarks>
-        public int[]? DuplicateErrorNumbers { get; set; }
+    /// <summary>
+    /// Gets or sets the list of known <see cref="SqlException.Number"/> values that are considered a duplicate error.
+    /// </summary>
+    /// <remarks>Overrides the <see cref="DefaultDuplicateErrorNumbers"/>.</remarks>
+    public int[]? DuplicateErrorNumbers { get; set; }
 
-        /// <summary>
-        /// Sets the SQL session context using the specified values by invoking the <see cref="SessionContextStoredProcedure"/> using parameters named <see cref="SqlServerDatabaseColumns.SessionContextUsernameName"/>, 
-        /// <see cref="SqlServerDatabaseColumns.SessionContextTimestampName"/>, <see cref="SqlServerDatabaseColumns.SessionContextTenantIdName"/> and <see cref="SqlServerDatabaseColumns.SessionContextUserIdName"/>.
-        /// </summary>
-        /// <param name="username">The username (where <c>null</c> the value will default to <see cref="ExecutionContext.EnvironmentUserName"/>).</param>
-        /// <param name="timestamp">The timestamp <see cref="DateTime"/> (where <c>null</c> the value will default to <see cref="SystemTime.Timestamp"/>).</param>
-        /// <param name="tenantId">The tenant identifer (where <c>null</c> the value will not be used).</param>
-        /// <param name="userId">The unique user identifier (where <c>null</c> the value will not be used).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-set-session-context-transact-sql"/>.</remarks>
-        public Task SetSqlSessionContextAsync(string? username, DateTime? timestamp, string? tenantId = null, string? userId = null, CancellationToken cancellationToken = default)
-        {
-            if (string.IsNullOrEmpty(SessionContextStoredProcedure))
-                throw new InvalidOperationException("The SessionContextStoredProcedure property must have a value.");
+    /// <inheritdoc/>
+    public override SqlServerCommand Statement(SqlStatement statement) => new(this, statement);
 
-            return Invoker.InvokeAsync(this, username, timestamp, tenantId, userId, async (_, username, timestamp, tenantId, userId, ct) =>
-            {
-                return await StoredProcedure(SessionContextStoredProcedure)
-                    .Param($"@{DatabaseColumns.SessionContextUsernameName}", username ?? ExecutionContext.EnvironmentUserName)
-                    .Param($"@{DatabaseColumns.SessionContextTimestampName}", timestamp ?? SystemTime.Timestamp)
-                    .ParamWith(tenantId, $"@{DatabaseColumns.SessionContextTenantIdName}")
-                    .ParamWith(userId, $"@{DatabaseColumns.SessionContextUserIdName}")
-                    .NonQueryAsync(ct).ConfigureAwait(false);
-            }, cancellationToken, nameof(SetSqlSessionContextAsync));
-        }
+    /// <inheritdoc/>
+    public override DbParameter CreateParameter() => new SqlParameter();
 
-        /// <summary>
-        /// Sets the SQL session context using the <see cref="ExecutionContext"/>.
-        /// </summary>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>. Defaults to <see cref="ExecutionContext.Current"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>See <see cref="SetSqlSessionContextAsync(string, DateTime?, string?, string?, CancellationToken)"/> for more information.</remarks>
-        public Task SetSqlSessionContextAsync(ExecutionContext? executionContext = null, CancellationToken cancellationToken = default)
+    /// <inheritdoc/>
+    protected override Exception? OnDbException(DbException dbex)
+    {
+        if (dbex is SqlException sex)
         {
-            var ec = executionContext ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current : null);
-            return (ec == null)
-                ? SetSqlSessionContextAsync(null!, null, cancellationToken: cancellationToken)
-                : SetSqlSessionContextAsync(ec.UserName, ec.Timestamp, ec.TenantId, ec.UserId, cancellationToken);
-        }
+            var msg = sex.Message?.TrimEnd();
+            if (string.IsNullOrEmpty(msg))
+                msg = null;
 
-        /// <inheritdoc/>
-        protected override Result? OnDbException(DbException dbex)
-        {
-            if (ThrowTransformedException && dbex is SqlException sex)
+            switch (sex.Number)
             {
-                var msg = sex.Message?.TrimEnd();
-                if (string.IsNullOrEmpty(msg))
-                    msg = null;
-
-                switch (sex.Number)
-                {
-                    case 56001: return Result.Fail(new ValidationException(msg, sex));
-                    case 56002: return Result.Fail(new BusinessException(msg, sex));
-                    case 56003: return Result.Fail(new AuthorizationException(msg, sex));
-                    case 56004: return Result.Fail(new ConcurrencyException(msg, sex));
-                    case 56005: return Result.Fail(new NotFoundException(msg, sex));
-                    case 56006: return Result.Fail(new ConflictException(msg, sex));
-                    case 56007: return Result.Fail(new DuplicateException(msg, sex));
-                    case 56010: return Result.Fail(new DataConsistencyException(msg, sex));
-
-                    default:
-                        if (CheckDuplicateErrorNumbers && (DuplicateErrorNumbers ?? DefaultDuplicateErrorNumbers).Contains(sex.Number))
-                            return Result.Fail(new DuplicateException(null, sex));
-
-                        break;
-                }
+                case 56001: return new ValidationException(msg, sex);
+                case 56002: return new BusinessException(msg, sex);
+                case 56003: return new AuthorizationException(msg, sex);
+                case 56004: return new ConcurrencyException(msg, sex);
+                case 56005: return new NotFoundException(msg, sex);
+                case 56006: return new ConflictException(msg, sex);
+                case 56007: return new DuplicateException(msg, sex);
+                case 56010: return new DataConsistencyException(msg, sex);
+
+                default:
+                    if (CheckDuplicateErrorNumbers && (DuplicateErrorNumbers ?? DefaultDuplicateErrorNumbers).Contains(sex.Number))
+                        return new DuplicateException(null, sex);
+
+                    break;
             }
-
-            return base.OnDbException(dbex);
         }
+
+        return base.OnDbException(dbex);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerDatabaseArgs.cs b/src/CoreEx.Database.SqlServer/SqlServerDatabaseArgs.cs
new file mode 100644
index 00000000..c7016c8c
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/SqlServerDatabaseArgs.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Database.SqlServer;
+
+/// <summary>
+/// Provides the <see cref="SqlServerDatabase"/> arguments.
+/// </summary>
+public record class SqlServerDatabaseArgs : DatabaseArgs { }
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerDatabaseColumns.cs b/src/CoreEx.Database.SqlServer/SqlServerDatabaseColumns.cs
deleted file mode 100644
index e2132fc8..00000000
--- a/src/CoreEx.Database.SqlServer/SqlServerDatabaseColumns.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Database.Extended;
-using CoreEx.Entities;
-using System.Collections.Generic;
-using System.Data;
-
-namespace CoreEx.Database.SqlServer
-{
-    /// <summary>
-    /// Extends the <see cref="DatabaseColumns"/> adding additional SQL Server specific.
-    /// </summary>
-    public class SqlServerDatabaseColumns : DatabaseColumns
-    {
-        /// <summary>
-        /// Gets or sets the session context '<c>Username</c>' column name.
-        /// </summary>
-        public string SessionContextUsernameName { get; set; } = "Username";
-
-        /// <summary>
-        /// Gets or sets the session context '<c>Timestamp</c>' column name.
-        /// </summary>
-        public string SessionContextTimestampName { get; set; } = "Timestamp";
-
-        /// <summary>
-        /// Gets or sets the <see cref="ITenantId.TenantId"/> column name.
-        /// </summary>
-        public string SessionContextTenantIdName { get; set; } = "TenantId";
-
-        /// <summary>
-        /// Gets or sets the session context '<c>UserId</c>' column name.
-        /// </summary>
-        public string SessionContextUserIdName { get; set; } = "UserId";
-
-        /// <summary>
-        /// Gets or sets the table-value parameter type name for an <see cref="IEnumerable{String}"/>.
-        /// </summary>
-        public string TvpStringListTypeName { get; set; } = "[dbo].[udtNVarCharList]";
-
-        /// <summary>
-        /// Gets or sets the table-value parameter type name for an <see cref="IEnumerable{Int32}"/>.
-        /// </summary>
-        public string TvpInt32ListTypeName { get; set; } = "[dbo].[udtIntList]";
-
-        /// <summary>
-        /// Gets or sets the table-value parameter type name for an <see cref="IEnumerable{Int64}"/>.
-        /// </summary>
-        public string TvpInt64ListTypeName { get; set; } = "[dbo].[udtBigIntList]";
-
-        /// <summary>
-        /// Gets or sets the table-value parameter type name for an <see cref="IEnumerable{Guid}"/>.
-        /// </summary>
-        public string TvpGuidListTypeName { get; set; } = "[dbo].[udtUniqueIdentifierList]";
-
-        /// <summary>
-        /// Gets or sets the table-value parameter type name for an <see cref="IEnumerable{DateTime}"/>.
-        /// </summary>
-        public string TvpDateTimeListTypeName { get; set; } = "[dbo].[udtDateTime2]";
-
-        /// <summary>
-        /// Gets or sets the table-value parameter <see cref="DataTable"/> column name for list values.
-        /// </summary>
-        public string TvpListValueColumnName { get; set; } = "Value";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerExtensions.Parameters.cs b/src/CoreEx.Database.SqlServer/SqlServerExtensions.Parameters.cs
new file mode 100644
index 00000000..86e252c1
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/SqlServerExtensions.Parameters.cs
@@ -0,0 +1,95 @@
+namespace CoreEx.Database.SqlServer;
+
+public static partial class SqlServerExtensions
+{
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <see cref="SqlDbType"/> and <see cref="ParameterDirection"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>A <see cref="DbParameter"/>.</returns>
+    public static SqlParameter AddParameter<T>(this DatabaseParameterCollection parameters, string name, T? value, SqlDbType? sqlDbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        var p = (SqlParameter)parameters.ThrowIfNull().Database.CreateParameter();
+        p.ParameterName = DatabaseParameterCollection.ParameterizeName(name);
+        if (sqlDbType.HasValue)
+            p.SqlDbType = sqlDbType.Value;
+
+        p.Value = DatabaseParameterCollection.ConvertToDbValue(value, parameters.Database);
+        p.Direction = direction;
+
+        parameters.Add(p);
+        return p;
+    }
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <see cref="SqlDbType"/> and <see cref="ParameterDirection"/>.
+    /// </summary>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns></returns>
+    public static TSelf Param<TSelf, T>(this IDatabaseParameters<TSelf> parameters, string name, T? value, SqlDbType? sqlDbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull().Parameters.AddParameter(name, value, sqlDbType, direction);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named parameter and value <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="when">Adds the parameter when <see langword="true"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T> value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull();
+        value.ThrowIfNull();
+
+        if (when == true)
+            parameters.Parameters.AddParameter(name, value(), sqlDbType, direction);
+
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
+    public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, string name, Func<T> value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
+        => ParamWhen(parameters, with is not null && Comparer<T>.Default.Compare((T)with, default!) != 0, name, value, sqlDbType, direction);
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value; where not specified the <paramref name="with"/> value will be used.</param>
+    /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
+    public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name, Func<T>? value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
+        => ParamWhen(parameters, with is not null && Comparer<T>.Default.Compare(with, default!) != 0, name, value ?? (() => with!), sqlDbType, direction);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerExtensions.cs b/src/CoreEx.Database.SqlServer/SqlServerExtensions.cs
index 7c6861e6..4f7796f3 100644
--- a/src/CoreEx.Database.SqlServer/SqlServerExtensions.cs
+++ b/src/CoreEx.Database.SqlServer/SqlServerExtensions.cs
@@ -1,402 +1,8 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Database.SqlServer;
 
-using CoreEx.Database.Mapping;
-using Microsoft.Data.SqlClient;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-
-namespace CoreEx.Database.SqlServer
+/// <summary>
+/// Provides <see cref="SqlServerDatabase"/> and related extensions.
+/// </summary>
+public static partial class SqlServerExtensions 
 {
-    /// <summary>
-    /// Provides <see href="https://docs.microsoft.com/en-us/sql/connect/ado-net/microsoft-ado-net-sql-server">SQL Server</see> extension methods.
-    /// </summary>
-    public static class SqlServerExtensions
-    {
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <see cref="DbType"/> and <see cref="ParameterDirection"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <param name="dpc">The <see cref="DatabaseParameterCollection"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        public static SqlParameter AddParameter(this DatabaseParameterCollection dpc, string name, object? value, SqlDbType? sqlDbType = null, ParameterDirection direction = ParameterDirection.Input)
-        {
-            var p = (SqlParameter)(dpc.ThrowIfNull(nameof(dpc)).Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null."));
-            p.ParameterName = DatabaseParameterCollection.ParameterizeName(name);
-            if (sqlDbType.HasValue)
-                p.SqlDbType = sqlDbType.Value;
-
-            p.Value = value;
-            p.Direction = direction;
-
-            dpc.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <param name="dpc">The <see cref="DatabaseParameterCollection"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static SqlParameter AddTableValuedParameter(this DatabaseParameterCollection dpc, string name, TableValuedParameter tvp)
-        {
-            var p = (SqlParameter)(dpc.ThrowIfNull(nameof(dpc)).Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null."));
-            p.ParameterName = DatabaseParameterCollection.ParameterizeName(name);
-            p.SqlDbType = SqlDbType.Structured;
-            p.TypeName = tvp.ThrowIfNull(nameof(tvp)).TypeName;
-            p.Value = tvp.Value;
-            p.Direction = ParameterDirection.Input;
-
-            dpc.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds a named parameter and value <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T> value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
-        {
-            parameters.ThrowIfNull(nameof(parameters));
-            value.ThrowIfNull(nameof(value));
-
-            if (when == true)
-                parameters.Parameters.AddParameter(name, value(), sqlDbType, direction);
-
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds a named parameter and value <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, IPropertyColumnMapper mapper, Func<T> value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, when, mapper?.ParameterName!, value, sqlDbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, string name, Func<T> value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, with != null && Comparer<T>.Default.Compare((T)with, default!) != 0, name, value, sqlDbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value; where not specified the <paramref name="with"/> vaue will be used.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name, Func<T>? value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, with != null && Comparer<T>.Default.Compare(with, default!) != 0, name, value ?? (() => with!), sqlDbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, IPropertyColumnMapper mapper, Func<T> value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, with, mapper?.ParameterName!, value, sqlDbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value; where not specified the <paramref name="with"/> vaue will be used.</param>
-        /// <param name="sqlDbType">The parameter <see cref="SqlDbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, IPropertyColumnMapper mapper, Func<T>? value, SqlDbType sqlDbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, with, mapper?.ParameterName!, value, sqlDbType, direction);
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static TSelf TableValuedParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, TableValuedParameter tvp)
-        {
-            AddTableValuedParameter(parameters.Parameters, name, tvp);
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/> <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static TSelf TableValuedParamWhen<TSelf>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<TableValuedParameter> tvp)
-        {
-            if (when == true)
-                TableValuedParam(parameters, name, tvp());
-
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/> <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static TSelf TableValuedParamWith<TSelf>(this IDatabaseParameters<TSelf> parameters, object? with, string name, Func<TableValuedParameter> tvp)
-            => TableValuedParamWhen(parameters, with != null, name, tvp);
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static TSelf TableValuedParam<TSelf>(this IDatabaseParameters<TSelf> parameters, IPropertyColumnMapper mapper, TableValuedParameter tvp)
-            => TableValuedParam(parameters, mapper?.ParameterName!, tvp);
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/> <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static TSelf TableValuedParamWhen<TSelf>(this IDatabaseParameters<TSelf> parameters, bool? when, IPropertyColumnMapper mapper, Func<TableValuedParameter> tvp)
-            => TableValuedParamWhen(parameters, when, mapper?.ParameterName!, tvp);
-
-        /// <summary>
-        /// Adds the named <see cref="TableValuedParameter"/> value to the <see cref="DbCommand.Parameters"/> <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="tvp">The <see cref="TableValuedParameter"/> value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This specifically implies that the <see cref="SqlParameter"/> is being used; if not then an exception will be thrown.</remarks>
-        public static TSelf TableValuedParamWith<TSelf>(this IDatabaseParameters<TSelf> parameters, object? with, IPropertyColumnMapper mapper, Func<TableValuedParameter> tvp)
-            => TableValuedParamWith(parameters, with != null, mapper?.ParameterName!, tvp);
-
-        #region CreateTableValuedParameter
-
-        /// <summary>
-        /// Creates a <see cref="SqlServerDatabaseColumns.TvpStringListTypeName"/> <see cref="TableValuedParameter"/> for the <see cref="string"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, IEnumerable<string?> list) => CreateTableValuedParameter(database, ((SqlServerDatabase)database).DatabaseColumns.TvpStringListTypeName, list);
-
-        /// <summary>
-        /// Creates a <see cref="TableValuedParameter"/> for the <see cref="string"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="typeName">The SQL type name of the table-valued parameter.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, string typeName, IEnumerable<string?> list)
-        {
-            using var dt = new DataTable();
-            dt.Columns.Add(((SqlServerDatabase)database).DatabaseColumns.TvpListValueColumnName, typeof(string));
-
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    dt.Rows.Add(item);
-                }
-            }
-
-            return new TableValuedParameter(typeName, dt);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="SqlServerDatabaseColumns.TvpInt32ListTypeName"/> <see cref="TableValuedParameter"/> for the <see cref="int"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, IEnumerable<int> list) => CreateTableValuedParameter(database, ((SqlServerDatabase)database).DatabaseColumns.TvpInt32ListTypeName, list);
-
-        /// <summary>
-        /// Creates a <see cref="TableValuedParameter"/> for the <see cref="int"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="typeName">The SQL type name of the table-valued parameter.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, string typeName, IEnumerable<int> list)
-        {
-            using var dt = new DataTable();
-            dt.Columns.Add(((SqlServerDatabase)database).DatabaseColumns.TvpListValueColumnName, typeof(int));
-
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    dt.Rows.Add(item);
-                }
-            }
-
-            return new TableValuedParameter(typeName, dt);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="SqlServerDatabaseColumns.TvpInt64ListTypeName"/> <see cref="TableValuedParameter"/> for the <see cref="long"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, IEnumerable<long> list) => CreateTableValuedParameter(database, ((SqlServerDatabase)database).DatabaseColumns.TvpInt64ListTypeName, list);
-
-        /// <summary>
-        /// Creates a <see cref="TableValuedParameter"/> for the <see cref="long"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="typeName">The SQL type name of the table-valued parameter.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, string typeName, IEnumerable<long> list)
-        {
-            using var dt = new DataTable();
-            dt.Columns.Add(((SqlServerDatabase)database).DatabaseColumns.TvpListValueColumnName, typeof(long));
-
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    dt.Rows.Add(item);
-                }
-            }
-
-            return new TableValuedParameter(typeName, dt);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="SqlServerDatabaseColumns.TvpGuidListTypeName"/> <see cref="TableValuedParameter"/> for the <see cref="Guid"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, IEnumerable<Guid> list) => CreateTableValuedParameter(database, ((SqlServerDatabase)database).DatabaseColumns.TvpGuidListTypeName, list);
-
-        /// <summary>
-        /// Creates a <see cref="TableValuedParameter"/> for the <see cref="Guid"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="typeName">The SQL type name of the table-valued parameter.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, string typeName, IEnumerable<Guid> list)
-        {
-            using var dt = new DataTable();
-            dt.Columns.Add(((SqlServerDatabase)database).DatabaseColumns.TvpListValueColumnName, typeof(Guid));
-
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    dt.Rows.Add(item);
-                }
-            }
-
-            return new TableValuedParameter(typeName, dt);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="SqlServerDatabaseColumns.TvpDateTimeListTypeName"/> <see cref="TableValuedParameter"/> for the <see cref="DateTime"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, IEnumerable<DateTime> list) => CreateTableValuedParameter(database, ((SqlServerDatabase)database).DatabaseColumns.TvpGuidListTypeName, list);
-
-        /// <summary>
-        /// Creates a <see cref="TableValuedParameter"/> for the <see cref="DateTime"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="database">The<see cref="IDatabase"/>.</param>
-        /// <param name="typeName">The SQL type name of the table-valued parameter.</param>
-        /// <param name="list">The list.</param>
-        /// <returns>The <see cref="TableValuedParameter"/>.</returns>
-        public static TableValuedParameter CreateTableValuedParameter(this IDatabase database, string typeName, IEnumerable<DateTime> list)
-        {
-            using var dt = new DataTable();
-            dt.Columns.Add(((SqlServerDatabase)database).DatabaseColumns.TvpListValueColumnName, typeof(DateTime));
-
-            if (list != null)
-            {
-                foreach (var item in list)
-                {
-                    dt.Rows.Add(item);
-                }
-            }
-
-            return new TableValuedParameter(typeName, dt);
-        }
-
-        #endregion
-    }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerMetrics.cs b/src/CoreEx.Database.SqlServer/SqlServerMetrics.cs
new file mode 100644
index 00000000..b1d1ca78
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/SqlServerMetrics.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.Database.SqlServer;
+
+/// <summary>
+/// Provides the <see href="https://learn.microsoft.com/en-us/sql/">SQL Server</see> metrics.
+/// </summary>
+public static class SqlServerMetrics
+{
+    /// <summary>
+    /// Gets the meter used for the database outbox metrics.
+    /// </summary>
+    public static Meter Meter { get; } = new("CoreEx.Database.SqlServer.Outbox");
+
+    /// <summary>
+    /// Gets the counter representing the total number of messages enqueued successfully.
+    /// </summary>
+    public static Counter<long> OutboxEnqueued { get; } = Meter.CreateCounter<long>("sqlserver.outbox.enqueue", unit: "{message}", description: "Number of SQL Server outbox messages enqueued successfully.");
+
+    /// <summary>
+    /// Gets the counter representing the total number of messages (batch) dequeued (relayed) successfully.
+    /// </summary>
+    public static Counter<long> OutboxRelayBatchSize { get; } = Meter.CreateCounter<long>("sqlserver.outbox.relay.batch.size", unit: "{message}", description: "Number of SQL Server outbox messages (batch) relayed successfully.");
+
+    /// <summary>
+    /// Gets the histogram that tracks the oldest lag duration (now - enqueued time of first message in batch), in milliseconds, of successful SQL Server outbox relay operations; i.e. end-to-end relay lag.
+    /// </summary>
+    public static Histogram<double> OutboxRelayOldestLagDuration { get; } = Meter.CreateHistogram<double>("sqlserver.outbox.batch.oldest_lag", unit: "ms", description: "Oldest lag duration (now - enqueued time of first message in batch) of SQL Server outbox relay.");
+
+    /// <summary>
+    /// Gets the histogram that tracks the newest lag duration (now - enqueued time of last message in batch), in milliseconds, of successful SQL Server outbox relay operations; i.e. end-to-end relay lag.
+    /// </summary>
+    public static Histogram<double> OutboxRelayNewestLagDuration { get; } = Meter.CreateHistogram<double>("sqlserver.outbox.batch.newest_lag", unit: "ms", description: "Newest lag duration (now - enqueued time of last message in batch) of SQL Server outbox relay.");
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/SqlServerUnitOfWork.cs b/src/CoreEx.Database.SqlServer/SqlServerUnitOfWork.cs
new file mode 100644
index 00000000..eaa50df1
--- /dev/null
+++ b/src/CoreEx.Database.SqlServer/SqlServerUnitOfWork.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Database.SqlServer;
+
+/// <summary>
+/// Provides the transactional <see cref="IUnitOfWork"/> implementation for <see cref="SqlServerDatabase"/> including support for a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+/// </summary>
+/// <param name="database">The <see cref="SqlServerDatabase"/>.</param>
+/// <param name="outbox">The optional <see cref="IEventPublisher"/>.</param>
+/// <param name="invoker">The optional <see cref="SqlServerUnitOfWorkInvoker"/> used to orchestrate the <see cref="IUnitOfWork"/> functionality.</param>
+public sealed class SqlServerUnitOfWork(SqlServerDatabase database, IEventPublisher? outbox = null, SqlServerUnitOfWorkInvoker? invoker = null) : IDatabaseUnitOfWork
+{
+    /// <inheritdoc/>
+    IDatabase IDatabaseUnitOfWork.Database => Database;
+
+    /// <summary>
+    /// Gets the underlying <see cref="SqlServerDatabase"/>.
+    /// </summary>
+    public SqlServerDatabase Database { get; } = database.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the optional <see cref="IEventPublisher"/> to be used as a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+    /// </summary>
+    /// <remarks>Where provided, the <see cref="IEventPublisher.PublishAsync(CancellationToken)"/> is invoked as part of the underlying <see cref="IUnitOfWork"/> transaction functionality. It is expected that the <see cref="IEventPublisher"/> implementation
+    /// uses the same <see cref="SqlServerDatabase"/> instance to ensure that the transactional outbox functionality works as expected.</remarks>
+    public IEventPublisher? Outbox { get; } = outbox;
+
+    /// <summary>
+    /// Gets the underlying <see cref="SqlServerUnitOfWorkInvoker"/> used to orchestrate the <see cref="IUnitOfWork"/> functionality.
+    /// </summary>
+    public SqlServerUnitOfWorkInvoker UnitOfWorkInvoker { get; } = invoker ??= SqlServerUnitOfWorkInvoker.Default;
+
+    /// <inheritdoc/>
+    /// <remarks>The <see cref="Outbox"/> is required to enable.</remarks>
+    public bool AreEventsSupported => Outbox is not null;
+
+    /// <inheritdoc/>
+    public IEventQueue Events => Outbox ?? throw new NotSupportedException($"A Transaction {nameof(Outbox)} has not been provided to enable {nameof(Events)}.");
+
+    /// <inheritdoc/>
+    public Task TransactionAsync(Func<CancellationToken, Task> work, CancellationToken cancellationToken = default) => TransactionAsync(Database.DbArgs, work, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<T> TransactionAsync<T>(Func<CancellationToken, Task<T>> work, CancellationToken cancellationToken = default) => TransactionAsync(Database.DbArgs, work, cancellationToken);
+
+    /// <inheritdoc/>
+    public Task TransactionAsync(IDataArgs args, Func<CancellationToken, Task> work, CancellationToken cancellationToken = default)
+        => UnitOfWorkInvoker.InvokeAsync(this, (SqlServerDatabaseArgs)args, async (_, _, cancellationToken) => await work(cancellationToken).ConfigureAwait(false), cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<T> TransactionAsync<T>(IDataArgs args, Func<CancellationToken, Task<T>> work, CancellationToken cancellationToken = default)
+        => UnitOfWorkInvoker.InvokeAsync(this, (SqlServerDatabaseArgs)args, async (_, _, cancellationToken) => await work(cancellationToken).ConfigureAwait(false), cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/TableValuedParameter.cs b/src/CoreEx.Database.SqlServer/TableValuedParameter.cs
deleted file mode 100644
index 848cdd19..00000000
--- a/src/CoreEx.Database.SqlServer/TableValuedParameter.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Linq;
-
-namespace CoreEx.Database.SqlServer
-{
-    /// <summary>
-    /// Represents a SQL-Server table-valued parameter (see <see href="https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/sql/table-valued-parameters"/>).
-    /// </summary>
-    /// <param name="typeName">The SQL type name of the table-valued parameter.</param>
-    /// <param name="value">The <see cref="DataTable"/> value.</param>
-    public class TableValuedParameter(string typeName, DataTable value)
-    {
-        /// <summary>
-        /// Gets or sets the SQL type name of the table-valued parameter.
-        /// </summary>
-        public string TypeName { get; } = typeName.ThrowIfNull(nameof(typeName));
-
-        /// <summary>
-        /// Gets or sets the <see cref="DataTable"/> value.
-        /// </summary>
-        public DataTable Value { get; } = value.ThrowIfNull(nameof(value));
-
-        /// <summary>
-        /// Adds a new <see cref="DataRow"/> to the <see cref="Value"/> using the specified <paramref name="columnValues"/>.
-        /// </summary>
-        /// <param name="columnValues">The column values.</param>
-        public void AddRow(params object?[] columnValues)
-        {
-            var r = Value.NewRow();
-            for (int i = 0; i < columnValues.Length; i++)
-            {
-                r[i] = columnValues[i] ?? DBNull.Value;
-            }
-
-            Value.Rows.Add(r);
-        }
-
-        /// <summary>
-        /// Adds a <see cref="DataRow"/> per each of the <paramref name="items"/> using the <paramref name="mapper"/> to get each of the column values. 
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <param name="database">The <see cref="IDatabase"/>.</param>
-        /// <param name="mapper">The corresponding <see cref="IDatabaseMapper{TSource}"/>.</param>
-        /// <param name="items">Zero or more items to add.</param>
-        public void AddRows<T>(IDatabase database, IDatabaseMapper<T> mapper, IEnumerable<T>? items)
-        {
-            database.ThrowIfNull(nameof(database));
-            mapper.ThrowIfNull(nameof(mapper));
-
-            if (items == null)
-                return;
-
-            var dpc = new DatabaseParameterCollection(database);
-            foreach (var item in items)
-            {
-                dpc.Clear();
-                mapper.MapToDb(item, dpc);
-                AddRow(dpc.Select(x => x.Value).ToArray());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database.SqlServer/strong-name-key.snk b/src/CoreEx.Database.SqlServer/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Database.SqlServer/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Database/AGENTS.md b/src/CoreEx.Database/AGENTS.md
new file mode 100644
index 00000000..90d8475a
--- /dev/null
+++ b/src/CoreEx.Database/AGENTS.md
@@ -0,0 +1,73 @@
+# CoreEx.Database — AI Usage Guide
+
+Provides the `IDatabase` ADO.NET abstraction, `DatabaseCommand` fluent builder, explicit column mapping, and the transactional outbox relay base infrastructure.
+
+## IDatabase and DatabaseCommand
+
+Use `DatabaseCommand` for all ADO.NET queries. Never write raw `DbCommand` code.
+
+```csharp
+// Single row
+var order = await _db.SqlStatement("SELECT * FROM orders WHERE id = @id")
+    .Param("@id", id)
+    .SelectSingleAsync(OrderMapper.Default)
+    .ConfigureAwait(false);
+
+// Collection
+var orders = await _db.StoredProcedure("spGetOrders")
+    .SelectQueryAsync(OrderMapper.Default)
+    .ConfigureAwait(false);
+```
+
+## Explicit Mappers
+
+Extend `DatabaseMapper<T>` for each entity. Hand-write column assignments — do not use reflection or AutoMapper.
+
+```csharp
+public class OrderMapper : DatabaseMapper<Order>
+{
+    public static readonly OrderMapper Default = new();
+
+    protected override Order OnMapFromDb(DatabaseRecord r, OperationType operationType)
+    {
+        var order = new Order
+        {
+            Id   = r.GetValue<Guid>("order_id"),
+            Code = r.GetValue<string>("code")!,
+        };
+        MapStandardFromDb(r, order);   // reads RowVersion→ETag, change-log columns
+        return order;
+    }
+
+    protected override void OnMapToDb(Order value, DatabaseParameterCollection p, OperationType operationType)
+    {
+        p.AddParameter("@code", value.Code);
+        MapStandardToDb(value, p, operationType);
+    }
+}
+```
+
+## Error Number Convention
+
+Stored procedures raise user error numbers 56001–56007/56010 to signal domain exceptions — no application-layer switch statements required.
+
+| Error number | CoreEx exception |
+|---|---|
+| 56001 | `ValidationException` |
+| 56002 | `BusinessException` |
+| 56004 | `ConcurrencyException` |
+| 56005 | `NotFoundException` |
+| 56006 | `ConflictException` |
+| 56007 | `DuplicateException` |
+
+## Do Not
+
+- Do not write raw `DbCommand` or `SqlCommand` code — use `DatabaseCommand`.
+- Do not use reflection-based mappers — extend `DatabaseMapper<T>` with explicit column reads.
+
+## Further Reading
+
+- [README](./README.md) — full `IDatabase`, `DatabaseCommand`, and outbox relay API reference.
+- [CoreEx.Database.SqlServer](../CoreEx.Database.SqlServer/README.md) / [CoreEx.Database.Postgres](../CoreEx.Database.Postgres/README.md) — concrete implementations.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — repository implementation, mapper patterns, and outbox table wiring in real sample code.
+- [Tooling](../../samples/docs/tooling.md) — how `*.Database` projects (DbEx) generate outbox infrastructure, schema, and seed scripts.
diff --git a/src/CoreEx.Database/Abstractions/DatabaseArgs.cs b/src/CoreEx.Database/Abstractions/DatabaseArgs.cs
new file mode 100644
index 00000000..e8b62a51
--- /dev/null
+++ b/src/CoreEx.Database/Abstractions/DatabaseArgs.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Database.Abstractions;
+
+/// <summary>
+/// Provides <see cref="IDatabase"/> arguments.
+/// </summary>
+/// <remarks>The <see cref="DatabaseArgs"/> is intended, and expected, to be immutable. Therefore, when implementing/extending, please ensure additional properties are enabled as such to ensure there are
+/// not any unintended side-effects.</remarks>
+public abstract record class DatabaseArgs : DatabaseArgsBase
+{
+    /// <summary>
+    /// Gets or sets the <see cref="DbTransaction"/> <see cref="System.Data.IsolationLevel"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="IsolationLevel.ReadCommitted"/>.
+    /// <para>This is used to specify the transaction isolation level for the likes of the <see cref="IUnitOfWork"/>.</para></remarks>
+    public IsolationLevel IsolationLevel { get; init; } = IsolationLevel.ReadCommitted;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Abstractions/DatabaseArgsBase.cs b/src/CoreEx.Database/Abstractions/DatabaseArgsBase.cs
new file mode 100644
index 00000000..683bd8f2
--- /dev/null
+++ b/src/CoreEx.Database/Abstractions/DatabaseArgsBase.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.Database.Abstractions;
+
+/// <summary>
+/// Provides <see cref="IDatabase"/> arguments.
+/// </summary>
+/// <remarks>The <see cref="DatabaseArgsBase"/> is intended, and expected, to be immutable. Therefore, when implementing/extending, please ensure additional properties are enabled as such to ensure there are
+/// not any unintended side-effects.</remarks>
+public abstract record class DatabaseArgsBase : IDataArgs
+{
+    /// <summary>
+    /// Indicates whether the data should be refreshed (reselected where applicable) after a <b>save</b> operation.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/>.</remarks>
+    public bool Refresh { get; init; } = false;
+
+    /// <summary>
+    /// Indicates whether to transform the underlying <see cref="DbException"/> into an <see cref="IExtendedException"/> equivalent.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="true"/>.
+    /// <para>The <see cref="Database{TConnection, TCommand, TDatabaseArgs, TDatabaseColumns}.OnDbException(DbException)"/> will be skipped where set to <see langword="false"/>.</para></remarks>
+    public bool TransformException { get; init; } = true;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Abstractions/DatabaseInvoker.cs b/src/CoreEx.Database/Abstractions/DatabaseInvoker.cs
new file mode 100644
index 00000000..ddf04524
--- /dev/null
+++ b/src/CoreEx.Database/Abstractions/DatabaseInvoker.cs
@@ -0,0 +1,182 @@
+namespace CoreEx.Database.Abstractions;
+
+/// <summary>
+/// Provides the standard <see cref="IDatabase"/> invoker functionality.
+/// </summary>
+/// <remarks>Catches any unhandled <see cref="DbException"/> and invokes <see cref="IDatabase.HandleDbException(DbException)"/> to handle (where <see cref="DatabaseArgsBase.TransformException"/>) is <see langword="true"/>
+/// before bubbling up.</remarks>
+public abstract class DatabaseInvoker : InvokerBase<IDatabase, DatabaseArgs>
+{
+    /// <inheritdoc/>
+    protected override async Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, IDatabase database, DatabaseArgs dbArgs, Func<InvokerTracer, DatabaseArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
+    {
+        try
+        {
+            return await base.OnInvokeAsync(tracer, database, dbArgs, func, cancellationToken).ConfigureAwait(false);
+        }
+        catch (DbException dbex) when (dbArgs.TransformException)
+        {
+            var hex = database.HandleDbException(dbex);
+            if (hex is not null)
+            {
+                if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                    tracer.Logger.LogDebug(dbex, "Database exception converted to '{ExceptionType}': {Message} [DatabaseId: {DatabaseId}]", hex.GetType().Name, hex.Message, database.DatabaseId);
+
+                // Where the result is an IResult (ROP) and the exception is considered an error then return as an IResult _failure_.
+                if (ExtendedException.TryConvertExceptionToResult<TResult>(hex, out var res))
+                    return res;
+
+                throw hex;
+            }
+
+            throw;
+        }
+    }
+
+    /// <summary>
+    /// Provides standardized database transaction handling for a unit-of-work, including support for nested transactions via save-points, and outbox/event publishing where supported.
+    /// </summary>
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="tracer">The <see cref="InvokerTracer"/>.</param>
+    /// <param name="unitOfWork">The <see cref="IDatabaseUnitOfWork"/>.</param>
+    /// <param name="work">The work to be performed within the unit-of-work.</param>
+    /// <param name="emitOutboxMetrics">The action to emit outbox metrics (where applicable).</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The result of the <paramref name="work"/>.</returns>
+    /// <remarks>This is intended to be used by the <see cref="IUnitOfWork"/> invoker to provide database-agnostic transaction handling (where applicable).</remarks>
+    public static async Task<TResult> OrchestrateUnitOfWorkTransactionAsync<TResult>(InvokerTracer tracer, IDatabaseUnitOfWork unitOfWork, Func<Task<TResult>> work, Action<int>? emitOutboxMetrics, CancellationToken cancellationToken)
+    {
+        var txn = unitOfWork.Database.CurrentTransaction;
+        var isRootTxn = txn is null;
+        var savePoint = isRootTxn ? string.Empty : unitOfWork.Database.GetNextSavePointName();
+        var eventStartCount = unitOfWork.Outbox?.Count ?? 0;
+
+        tracer.Activity?.AddTag("database.id", unitOfWork.Database.DatabaseId);
+
+        // Reusable rollback logic.
+        async Task RollbackAsync(Exception exception)
+        {
+            if (txn is not null)
+            {
+                if (isRootTxn)
+                {
+                    await txn.RollbackAsync(cancellationToken).ConfigureAwait(false);
+
+                    // Where a known/expected error, then log as debug; otherwise, log as a genuine error (exception).
+                    if (exception is IExtendedException iex && iex.IsError)
+                    {
+                        if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                            tracer.Logger.LogDebug("Unit-of-work transaction rolled back due to error: {Error} [DatabaseId: {DatabaseId}]", exception.Message, unitOfWork.Database.DatabaseId);
+                    }
+                    else
+                    {
+                        if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Error))
+                            tracer.Logger.LogError(exception, "Unit-of-work transaction rolled back due to an unexpected error: {Error} [DatabaseId: {DatabaseId}]", exception.Message, unitOfWork.Database.DatabaseId);
+                    }
+                }
+                else
+                {
+                    await txn.RollbackAsync(savePoint, cancellationToken).ConfigureAwait(false);
+
+                    // Where a known/expected error, then log as debug; otherwise, log as a genuine error (exception).
+                    if (exception is IExtendedException iex && iex.IsError)
+                    {
+                        if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                            tracer.Logger.LogDebug("Unit-of-work transaction save-point '{SavePoint}' rolled back due to error: {Error} [DatabaseId: {DatabaseId}]", savePoint, exception.Message, unitOfWork.Database.DatabaseId);
+                    }
+                    else
+                    {
+                        if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Error))
+                            tracer.Logger.LogError(exception, "Unit-of-work transaction save-point '{SavePoint}' rolled back due to an unexpected error: {Error} [DatabaseId: {DatabaseId}]", savePoint, exception.Message, unitOfWork.Database.DatabaseId);
+                    }
+                }
+            }
+
+            // Where outbox/events are supported then also rollback any added events.
+            unitOfWork.Outbox?.Rollback(Math.Max(0, unitOfWork.Outbox.Count - eventStartCount));
+        }
+
+        // Perform the unit-of-work within a transaction or save-point as appropriate.
+        try
+        {
+            // Where root, begin new transaction; otherwise, create save-point.
+            if (isRootTxn)
+            {
+                if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                    tracer.Logger.LogDebug("Unit-of-work transaction; creating (root) transaction. [DatabaseId: {DatabaseId}]", unitOfWork.Database.DatabaseId);
+
+                var conn = await unitOfWork.Database.GetConnectionAsync(cancellationToken).ConfigureAwait(false);
+                txn = await conn.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
+                unitOfWork.Database.UseTransaction(txn);
+            }
+            else
+            {
+                if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                    tracer.Logger.LogDebug("Unit-of-work transaction; creating save-point '{SavePoint}'. [DatabaseId: {DatabaseId}]", savePoint, unitOfWork.Database.DatabaseId);
+
+                await txn!.SaveAsync(savePoint, cancellationToken).ConfigureAwait(false);
+            }
+
+            // Invoke the "work".
+            var result = await work().ConfigureAwait(false);
+
+            // Where a failure, rollback transaction or save-point as appropriate, and return.
+            if (result is IResult ir && ir.IsFailure)
+            {
+                // Rollback transaction or save-point as appropriate; then return the failure result.
+                await RollbackAsync(ir.Error!).ConfigureAwait(false);
+                return result;
+            }
+
+            // Commit transaction or complete save-point as appropriate.
+            if (isRootTxn)
+            {
+                // Where outbox/events are supported then publish.
+                var outboxEnqueued = 0;
+                if (unitOfWork.AreEventsSupported && !unitOfWork.Events.IsEmpty)
+                {
+                    await unitOfWork.Outbox!.PublishAsync(cancellationToken).ConfigureAwait(false);
+                    outboxEnqueued = unitOfWork.Outbox.Count;
+                }
+
+                // Commit the work and outbox.
+                await txn!.CommitAsync(cancellationToken).ConfigureAwait(false);
+
+                if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                    tracer.Logger.LogDebug("Unit-of-work transaction committed successfully. [DatabaseId: {DatabaseId}]", unitOfWork.Database.DatabaseId);
+
+                // Record metrics for enqueued outbox messages.
+                if (outboxEnqueued > 0)
+                    emitOutboxMetrics?.Invoke(outboxEnqueued);
+            }
+            else if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                tracer.Logger.LogDebug("Unit-of-work transaction save-point '{SavePoint}' completed successfully. [DatabaseId: {DatabaseId}]", savePoint, unitOfWork.Database.DatabaseId);
+
+            // Sweet, we made it. Happy times!
+            return result;
+        }
+        catch (Exception ex)
+        {
+            // Rollback transaction or save-point as appropriate.
+            await RollbackAsync(ex).ConfigureAwait(false);
+
+            // Where extended exception, and the result is an IResult then convert to a failure result.
+            if (ExtendedException.TryConvertExceptionToResult<TResult>(ex, out var result))
+                return result;
+
+            // Keep on bubbling.
+            throw;
+        }
+        finally
+        {
+            // Dispose and reset transaction where root.
+            if (isRootTxn)
+            {
+                if (txn is not null)
+                    await txn.DisposeAsync().ConfigureAwait(false);
+
+                unitOfWork.Database.UseTransaction(null);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Abstractions/IDatabaseParameters.cs b/src/CoreEx.Database/Abstractions/IDatabaseParameters.cs
new file mode 100644
index 00000000..c7a3c700
--- /dev/null
+++ b/src/CoreEx.Database/Abstractions/IDatabaseParameters.cs
@@ -0,0 +1,18 @@
+namespace CoreEx.Database.Abstractions;
+
+/// <summary>
+/// Enables standardized access to the underlying <see cref="Parameters"/>.
+/// </summary>
+/// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+public interface IDatabaseParameters<TSelf>
+{
+    /// <summary>
+    /// Gets the <see cref="IDatabase"/>.
+    /// </summary>
+    IDatabase Database { get; }
+
+    /// <summary>
+    /// Gets the <see cref="DatabaseParameterCollection"/>.
+    /// </summary>
+    DatabaseParameterCollection Parameters { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Abstractions/README.md b/src/CoreEx.Database/Abstractions/README.md
new file mode 100644
index 00000000..643b5f94
--- /dev/null
+++ b/src/CoreEx.Database/Abstractions/README.md
@@ -0,0 +1,27 @@
+# CoreEx.Database.Abstractions
+
+> Provides `DatabaseArgs` per-operation configuration, `DatabaseInvoker` for OpenTelemetry-traced command execution, and `IDatabaseParameters<T>` for fluent parameter accumulation.
+
+## Overview
+
+`CoreEx.Database.Abstractions` holds the supporting types that every `DatabaseCommand` execution depends on but that don't belong in the core `DatabaseCommand` class itself.
+
+`DatabaseArgs` carries per-operation settings — such as the transaction `IsolationLevel` — that flow from the repository method down to the command execution without polluting the `IDatabase` interface.
+
+`DatabaseInvoker` is the `InvokerBase<IDatabase>` that wraps every command in an OpenTelemetry `Activity` span, writes Start/Complete/Error structured log entries, and tags the span with the SQL statement text, operation result, and error details.
+
+`IDatabaseParameters<T>` is the fluent parameter-builder interface implemented by `DatabaseCommand` and `DatabaseParameterCollection`, allowing extension methods to add typed parameters in a chainable style.
+
+## Key types
+
+| Type | Description |
+|------|--------------|
+| **[`DatabaseArgs`](./DatabaseArgs.cs)** | Per-operation options: `IsolationLevel` applied during command execution. |
+| _[`DatabaseArgsBase`](./DatabaseArgsBase.cs)_ | Abstract base for `DatabaseArgs`; holds defaults for `Refresh` and `TransformException` extended by `DatabaseArgs`, and used by the `DatabaseCommand`. |
+| **[`DatabaseInvoker`](./DatabaseInvoker.cs)** | `InvokerBase<IDatabase>` — wraps every command execution with an `Activity` span tagged with the SQL text, result, and error details; writes structured Start/Complete/Error log entries. |
+| [`IDatabaseParameters<T>`](./IDatabaseParameters.cs) | Fluent interface exposing `Parameters` (`DatabaseParameterCollection`) and `Database` (`IDatabase`); implemented by `DatabaseCommand` to enable chained `AddParameter` calls. |
+
+## Related Namespaces
+
+- **[`CoreEx.Database`](../README.md)** - `DatabaseCommand` and `Database` consume these types directly.
+- **[`CoreEx.Invokers`](../../CoreEx/Invokers/README.md)** - `DatabaseInvoker` extends `InvokerBase<IDatabase>` using the standard tracing/logging pipeline.
\ No newline at end of file
diff --git a/src/CoreEx.Database/CoreEx.Database.csproj b/src/CoreEx.Database/CoreEx.Database.csproj
index 851cd5cc..16075e24 100644
--- a/src/CoreEx.Database/CoreEx.Database.csproj
+++ b/src/CoreEx.Database/CoreEx.Database.csproj
@@ -1,19 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Database</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Relational Database extras.</Title>
-    <Description>CoreEx .NET Relational Database extras.</Description>
-    <PackageTags>coreex db database sql ado.net relational</PackageTags>
+    <Title>CoreEx .NET Database extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data database outbox multi-select</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
   <ItemGroup>
-    <ProjectReference Include="..\CoreEx.Data\CoreEx.Data.csproj" />
     <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\CoreEx.Data\CoreEx.Data.csproj" />
   </ItemGroup>
-
-</Project>
+  
+  <ItemGroup>
+    <EmbeddedResource Include="Templates\**\*" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Database/Database.cs b/src/CoreEx.Database/Database.cs
index 3a66fea0..adeaa9c6 100644
--- a/src/CoreEx.Database/Database.cs
+++ b/src/CoreEx.Database/Database.cs
@@ -1,209 +1,187 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Database.Extended;
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Mapping.Converters;
-using CoreEx.Results;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Data;
-using System.Data.Common;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database
+namespace CoreEx.Database;
+
+/// <summary>
+/// Provides the common/base <see cref="IDatabase"/> access functionality.
+/// </summary>
+/// <typeparam name="TConnection">The <see cref="DbConnection"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TCommand">The <see cref="DatabaseCommand{TDatabaseArgs, TSelf}"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDatabaseArgs">The <see cref="DatabaseArgs"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDatabaseColumns">The <see cref="DatabaseColumns"/> <see cref="Type"/>.</typeparam>
+/// <param name="connection">The <typeparamref name="TConnection"/> <see cref="DbConnection"/>.</param>
+/// <param name="invoker">The <see cref="DatabaseInvoker"/>.</param>
+/// <param name="namedColumns">The convention-based column names.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public abstract class Database<TConnection, TCommand, TDatabaseArgs, TDatabaseColumns>(TConnection connection, DatabaseInvoker invoker, TDatabaseColumns namedColumns, JsonSerializerOptions? jsonSerializerOptions = null, ILogger<Database<TConnection, TCommand, TDatabaseArgs, TDatabaseColumns>>? logger = null) : IDatabase, IDisposable
+    where TConnection : DbConnection where TCommand : DatabaseCommand<TDatabaseArgs, TCommand> where TDatabaseArgs : DatabaseArgs, new() where TDatabaseColumns : DatabaseColumns
 {
+    private static readonly TDatabaseArgs _defaultDbArgs = new();
+    private static readonly DatabaseWildcard _defaultWildcard = new();
+
+    private readonly SemaphoreSlim _semaphore = new(1, 1);
+    private readonly TConnection _dbConn = connection.ThrowIfNull().ThrowWhen(connection => connection.State != ConnectionState.Closed && connection.State != ConnectionState.Open);
+    private int _savePointCounter = 0;
+    private bool _disposed;
+
+    /// <inheritdoc/>
+    public string DatabaseId { get; } = Guid.NewGuid().ToString();
+
+    /// <inheritdoc/>
+    public ILogger? Logger { get; } = logger ?? ExecutionContext.GetService<ILogger<Database<TConnection, TCommand, TDatabaseArgs, TDatabaseColumns>>>();
+
+    /// <inheritdoc/>
+    public DatabaseInvoker Invoker { get; } = invoker.ThrowIfNull();
+
+    /// <inheritdoc/>
+    DatabaseArgs IDatabase.DbArgs => DbArgs;
+
     /// <summary>
-    /// Provides the common/base database access functionality.
+    /// Gets or sets the default <typeparamref name="TDatabaseArgs"/> used where not explicitly specified for an operation.
     /// </summary>
-    /// <typeparam name="TConnection">The <see cref="DbConnection"/> <see cref="Type"/>.</typeparam>
-    /// <param name="create">The function to create the <typeparamref name="TConnection"/> <see cref="DbConnection"/>.</param>
-    /// <param name="provider">The underlying <see cref="DbProviderFactory"/>.</param>
-    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
-    /// <param name="invoker">The optional <see cref="DatabaseInvoker"/>.</param>
-    public class Database<TConnection>(Func<TConnection> create, DbProviderFactory provider, ILogger<Database<TConnection>>? logger = null, DatabaseInvoker? invoker = null) : IDatabase where TConnection : DbConnection
-    {
-        private static readonly DatabaseColumns _defaultColumns = new();
-        private static readonly DatabaseWildcard _defaultWildcard = new();
-        private static DatabaseInvoker? _invoker;
+    public TDatabaseArgs DbArgs { get; set; } = _defaultDbArgs;
 
-        private readonly Func<TConnection> _dbConnCreate = create.ThrowIfNull(nameof(create));
-        private TConnection? _dbConn;
-        private readonly SemaphoreSlim _semaphore = new(1, 1);
+    /// <inheritdoc/>
+    public DateTimeTransform DateTimeTransform { get; set; } = DateTimeTransform.UseDefault;
 
-        /// <inheritdoc/>
-        public DbProviderFactory Provider { get; } = provider.ThrowIfNull(nameof(provider));
+    /// <inheritdoc/>
+    public bool DateTimeOffsetTransform { get; set; } = true;
 
-        /// <inheritdoc/>
-        public Guid DatabaseId { get; } = Guid.NewGuid();
+    /// <inheritdoc/>
+    DatabaseColumns IDatabase.NamedColumns => NamedColumns;
+
+    /// <summary>
+    /// Gets or sets the names of the convention-based <see cref="Extended.DatabaseColumns"/>.
+    /// </summary>
+    public TDatabaseColumns NamedColumns { get; set; } = namedColumns.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the <see cref="DatabaseWildcard"/> to enable wildcard replacement.
+    /// </summary>
+    public DatabaseWildcard Wildcard { get; set; } = _defaultWildcard;
 
-        /// <inheritdoc/>
-        public ILogger? Logger { get; } = logger ?? ExecutionContext.GetService<ILogger<Database<TConnection>>>();
+    /// <inheritdoc/>
+    public abstract ISourceConverter<string?> RowVersionConverter { get; }
 
-        /// <inheritdoc/>
-        public DatabaseInvoker Invoker { get; } = invoker ?? (_invoker ??= new DatabaseInvoker());
+    /// <inheritdoc/>
+    public JsonSerializerOptions JsonSerializerOptions { get; } = jsonSerializerOptions ?? JsonDefaults.SerializerOptions;
 
-        /// <inheritdoc/>
-        public DatabaseArgs DbArgs { get; set; } = new DatabaseArgs();
+    /// <inheritdoc/>
+    public DbTransaction? CurrentTransaction { get; protected set; }
 
-        /// <inheritdoc/>
-        public DateTimeTransform DateTimeTransform { get; set; } = DateTimeTransform.UseDefault;
+    /// <inheritdoc/>
+    public bool IsInTransaction => CurrentTransaction is not null;
 
-        /// <inheritdoc/>
-        /// <remarks>Do not update the default properties directly as a shared static instance is used (unless this is the desired behaviour); create a new <see cref="Extended.DatabaseColumns"/> instance for overridding.</remarks>
-        public DatabaseColumns DatabaseColumns { get; set; } = _defaultColumns;
+    /// <inheritdoc/>
+    public void UseTransaction(DbTransaction? transaction)
+    {
+        if (CurrentTransaction != transaction)
+        {
+            CurrentTransaction = transaction;
+            UseTransactionChanged?.Invoke(this, EventArgs.Empty);
+        }
+    }
 
-        /// <summary>
-        /// Gets or sets the <see cref="DatabaseWildcard"/> to enable wildcard replacement.
-        /// </summary>
-        /// <remarks>Do not update the default properties directly as a shared static instance is used (unless this is the desired behaviour); create a new <see cref="DatabaseWildcard"/> instance for overridding.</remarks>
-        public DatabaseWildcard Wildcard { get; set; } = _defaultWildcard;
+    /// <inheritdoc/>
+    public event EventHandler? UseTransactionChanged;
 
-        /// <inheritdoc/>
-        public bool EnableChangeLogMapperToDb { get; }
+    /// <inheritdoc/>
+    DbConnection IDatabase.Connection => _dbConn;
 
-        /// <inheritdoc/>
-        public virtual IConverter RowVersionConverter => throw new NotImplementedException();
+    /// <inheritdoc/>
+    async Task<DbConnection> IDatabase.GetConnectionAsync(CancellationToken cancellationToken) => await GetConnectionAsync(cancellationToken).ConfigureAwait(false);
 
-        /// <inheritdoc/>
-        public IJsonSerializer JsonSerializer { get; set; } = ExecutionContext.GetService<IJsonSerializer>() ?? CoreEx.Json.JsonSerializer.Default;
+    /// <summary>
+    /// Gets the <typeparamref name="TConnection"/>.
+    /// </summary>
+    /// <remarks>The connection is opened on first use.</remarks>
+    public async Task<TConnection> GetConnectionAsync(CancellationToken cancellationToken = default)
+    {
+        if (_dbConn.State == ConnectionState.Open)
+            return _dbConn;
 
-        /// <inheritdoc/>
-        public DbConnection GetConnection() => _dbConn is not null ? _dbConn : Invokers.Invoker.RunSync(() => GetConnectionAsync());
+        await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-        /// <inheritdoc/>
-        public async Task<TConnection> GetConnectionAsync(CancellationToken cancellationToken = default)
+        try
         {
-            if (_dbConn == null)
-            {
-                await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-                try
-                {
-                    if (_dbConn != null)
-                        return _dbConn;
-
-                    Logger?.LogDebug("Creating and opening the database connection. DatabaseId: {DatabaseId}", DatabaseId);
-                    _dbConn = _dbConnCreate() ?? throw new InvalidOperationException($"The create function must create a valid {nameof(TConnection)} instance.");
-                    await OnBeforeConnectionOpenAsync(_dbConn, cancellationToken).ConfigureAwait(false);
-                    await _dbConn.OpenAsync(cancellationToken).ConfigureAwait(false);
-                    await OnConnectionOpenAsync(_dbConn, cancellationToken).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    Logger?.LogError(ex, "Error occured whilst creating and opening the database connection. DatabaseId: {DatabaseId}", DatabaseId);
-                    _dbConn = null;
-                    throw;
-                }
-                finally
-                {
-                    _semaphore.Release();
-                }
-            }
+            if (_dbConn.State == ConnectionState.Open)
+                return _dbConn;
+
+            if (_dbConn.State != ConnectionState.Closed)
+                throw new InvalidOperationException($"The database connection is in an invalid state: {_dbConn.State}.");
+
+            if (Logger is not null && Logger.IsEnabled(LogLevel.Debug))
+                Logger.LogDebug("Opening the database connection. [DatabaseId: {DatabaseId}]", DatabaseId);
 
+            await _dbConn.OpenAsync(cancellationToken).ConfigureAwait(false);
             return _dbConn;
         }
-
-        /// <summary>
-        /// Occurs before a connection is opened.
-        /// </summary>
-        /// <param name="connection">The <see cref="DbConnection"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected virtual Task OnBeforeConnectionOpenAsync(DbConnection connection, CancellationToken cancellationToken) => Task.CompletedTask;
-
-        /// <summary>
-        /// Occurs when a connection is opened before any corresponding data access is performed.
-        /// </summary>
-        /// <param name="connection">The <see cref="DbConnection"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected virtual Task OnConnectionOpenAsync(DbConnection connection, CancellationToken cancellationToken) => Task.CompletedTask;
-
-        /// <summary>
-        /// Occurs before a connection is closed.
-        /// </summary>
-        /// <param name="connection">The <see cref="DbConnection"/>.</param>
-        protected virtual Task OnConnectionCloseAsync(DbConnection connection) => Task.CompletedTask;
-
-        /// <inheritdoc/>
-        async Task<DbConnection> IDatabase.GetConnectionAsync(CancellationToken cancellationToken) => await GetConnectionAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <inheritdoc/>
-        public DatabaseCommand StoredProcedure(string storedProcedure)
-            => new(this, CommandType.StoredProcedure, storedProcedure.ThrowIfNull(nameof(storedProcedure)));
-
-        /// <inheritdoc/>
-        public DatabaseCommand SqlStatement(string sqlStatement)
-            => new(this, CommandType.Text, sqlStatement.ThrowIfNull(nameof(sqlStatement)));
-
-        /// <inheritdoc/>
-        public DatabaseCommand SqlFromResource(string resourceName, Assembly? assembly = null)
-            => SqlStatement(Abstractions.Resource.GetStreamReader(resourceName, assembly ?? Assembly.GetCallingAssembly()).ReadToEnd());
-
-        /// <inheritdoc/>
-        public DatabaseCommand SqlFromResource<TResource>(string resourceName)
-            => SqlFromResource(resourceName, typeof(TResource).Assembly);
-
-        /// <inheritdoc/>
-        public Result? HandleDbException(DbException dbex)
+        catch (Exception ex)
         {
-            var result = OnDbException(dbex);
-            return !result.HasValue || result.Value.IsSuccess ? Result.Fail(dbex) : result;
-        }
+            if (Logger is not null && Logger.IsEnabled(LogLevel.Error))
+                Logger.LogError(ex, "Error occurred whilst opening the database connection. [DatabaseId: {DatabaseId}]", DatabaseId);
 
-        /// <summary>
-        /// Provides the <see cref="DbException"/> handling as a result of <see cref="HandleDbException(DbException)"/>.
-        /// </summary>
-        /// <param name="dbex">The <see cref="DbException"/>.</param>
-        /// <returns>The <see cref="Result"/> containing the appropriate <see cref="IResult.Error"/> where handled; otherwise, <c>null</c> indicating that the exception is unexpected and will continue to be thrown as such.</returns>
-        /// <remarks>Provides an opportunity to inspect and handle the exception before it is returned. A resulting <see cref="Result"/> that is <see cref="Result.IsSuccess"/> is not considered sensical; therefore, will result in the originating
-        /// exception being thrown.
-        /// <para>Where overridding and the <see cref="DbException"/> is not specifically handled then invoke the base to ensure any standard handling is executed.</para></remarks>
-        protected virtual Result? OnDbException(DbException dbex) => null;
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            throw;
         }
-
-        /// <summary>
-        /// Dispose of the resources.
-        /// </summary>
-        /// <param name="disposing">Indicates whether to dispose.</param>
-        protected virtual void Dispose(bool disposing)
+        finally
         {
-            if (disposing && _dbConn != null)
-            {
-                Logger?.LogDebug("Closing and disposing the database connection. DatabaseId: {DatabaseId}", DatabaseId);
-                Invokers.Invoker.RunSync(() => OnConnectionCloseAsync(_dbConn));
-                _dbConn.Dispose();
-                _dbConn = null;
-            }
+            _semaphore.Release();
         }
+    }
 
-        /// <inheritdoc/>
-        public async ValueTask DisposeAsync()
-        {
-            await DisposeAsyncCore().ConfigureAwait(false);
-            GC.SuppressFinalize(this);
-        }
+    /// <inheritdoc/>
+    DatabaseCommand IDatabase.Statement(SqlStatement statement) => Statement(statement);
+
+    /// <summary>
+    /// Creates a<typeparamref name="TCommand"/> for the <see cref="SqlStatement"/>.
+    /// </summary>
+    /// <param name="statement">The <see cref="SqlStatement"/>.</param>
+    /// <returns>The <typeparamref name="TCommand"/>.</returns>
+    public abstract TCommand Statement(SqlStatement statement);
 
-        /// <summary>
-        /// Dispose of the resources asynchronously.
-        /// </summary>
-        public virtual async ValueTask DisposeAsyncCore()
+    /// <inheritdoc/>
+    public abstract DbParameter CreateParameter();
+
+    /// <inheritdoc/>
+    public Exception? HandleDbException(DbException dbex) => OnDbException(dbex);
+
+    /// <summary>
+    /// Provides the <see cref="DbException"/> handling as a result of <see cref="HandleDbException(DbException)"/>.
+    /// </summary>
+    /// <param name="dbex">The <see cref="DbException"/>.</param>
+    /// <returns>The <see cref="Exception"/> where handled (converted); otherwise, <see langword="null"/> indicating that the exception is unexpected and will continue to be thrown/bubbled as such.</returns>
+    /// <remarks>Provides an opportunity to inspect and convert the exception before it continues to bubble.
+    /// <para>Where overriding and the <see cref="DbException"/> is not specifically handled then invoke the base to ensure any standard handling is executed.</para></remarks>
+    protected virtual Exception? OnDbException(DbException dbex) => null;
+
+    /// <summary>
+    /// Gets the next (monotonic counter) save-point name.
+    /// </summary>
+    /// <returns>The save-point name.</returns>
+    public string GetNextSavePointName()
+    {
+        var counter = Interlocked.Increment(ref _savePointCounter);
+        return $"SP_{counter}";
+    }
+
+    /// <summary>
+    /// Dispose of resources.
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Releases the unmanaged resources used by the <see cref="Database"/> and optionally releases the managed resources.
+    /// </summary>
+    /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing && !_disposed)
         {
-            if (_dbConn != null)
-            {
-                Logger?.LogDebug("Closing and disposing the database connection. DatabaseId: {DatabaseId}", DatabaseId);
-                await OnConnectionCloseAsync(_dbConn).ConfigureAwait(false);
-                await _dbConn.DisposeAsync().ConfigureAwait(false);
-                _dbConn = null;
-            }
-
-            Dispose();
+            _disposed = true;
+            _semaphore.Dispose();
         }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.NonQuery.cs b/src/CoreEx.Database/DatabaseCommand.NonQuery.cs
new file mode 100644
index 00000000..4447f979
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommand.NonQuery.cs
@@ -0,0 +1,24 @@
+namespace CoreEx.Database;
+
+public abstract partial class DatabaseCommand
+{
+    /// <summary>
+    /// Executes a non-query command.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The number of rows affected.</returns>
+    public Task<int> NonQueryAsync(CancellationToken cancellationToken = default) => NonQueryAsync(null, cancellationToken);
+
+    /// <summary>
+    /// Executes a non-query command.
+    /// </summary>
+    /// <param name="parameters">The post-execution delegate to enable parameter access.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The number of rows affected.</returns>
+    public async Task<int> NonQueryAsync(Action<DbParameterCollection>? parameters, CancellationToken cancellationToken = default) => await Database.Invoker.InvokeAsync(Database, DbArgs, async (_, _, cancellationToken) =>
+    {
+        using var cmd = await CreateCommandAsync(cancellationToken).ConfigureAwait(false);
+        parameters?.Invoke(cmd.Parameters);
+        return await LogCommand(cmd).ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
+    }, cancellationToken).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.Scalar.cs b/src/CoreEx.Database/DatabaseCommand.Scalar.cs
new file mode 100644
index 00000000..3fd4e54b
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommand.Scalar.cs
@@ -0,0 +1,50 @@
+namespace CoreEx.Database;
+
+public abstract partial class DatabaseCommand
+{
+    /// <summary>
+    /// Executes the query and returns the first column of the first row in the result set returned by the query.
+    /// </summary>
+    /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value of the first column of the first row in the result set.</returns>
+    public Task<T> ScalarAsync<T>(CancellationToken cancellationToken = default) => ScalarAsync<T>(null, cancellationToken);
+
+    /// <summary>
+    /// Executes the query and returns the first column of the first row in the result set returned by the query.
+    /// </summary>
+    /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The post-execution delegate to enable parameter access.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value of the first column of the first row in the result set.</returns>
+    public async Task<T> ScalarAsync<T>(Action<DbParameterCollection>? parameters, CancellationToken cancellationToken = default) => await Database.Invoker.InvokeAsync(Database, DbArgs, async (_, _, cancellationToken) =>
+    {
+        using var cmd = await CreateCommandAsync(cancellationToken).ConfigureAwait(false);
+        parameters?.Invoke(cmd.Parameters);
+        var result = await LogCommand(cmd).ExecuteScalarAsync(cancellationToken).ConfigureAwait(false);
+
+        if (result is null || result == DBNull.Value)
+            return default!;
+
+        if (result is DateTime dt)
+        {
+            dt = Cleaner.Clean(dt, Database.DateTimeTransform);
+
+            if (typeof(T) == typeof(DateTimeOffset))
+            {
+                var dto = new DateTimeOffset(dt);
+                return Internal.Cast<DateTimeOffset, T>(dto);
+            }
+
+            if (typeof(T) == typeof(DateTimeOffset?))
+            {
+                DateTimeOffset? dto = new DateTimeOffset(dt);
+                return Internal.Cast<DateTimeOffset?, T>(dto);
+            }
+
+            result = dt;
+        }
+
+        return (T)result;
+    }, cancellationToken).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.Select.cs b/src/CoreEx.Database/DatabaseCommand.Select.cs
new file mode 100644
index 00000000..b0b329ae
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommand.Select.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Database;
+
+public abstract partial class DatabaseCommand
+{
+    /// <summary>
+    /// Selects from the first result set using a <paramref name="func"/> to handle each <see cref="DatabaseRecord"/>.
+    /// </summary>
+    /// <param name="func">The <see cref="DatabaseRecord"/> handling function.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The <paramref name="func"/> returns a <see cref="bool"/> that controls whether the next <see cref="DatabaseRecord"/> should be read. A value of <see langword="true"/> indicates that 
+    /// reading should continue; otherwise, <see langword="false"/> to stop.</remarks>
+    public Task SelectAsync(Func<DatabaseRecord, bool> func, CancellationToken cancellationToken = default) => SelectInternalAsync(func, nameof(SelectAsync), cancellationToken);
+
+    /// <summary>
+    /// Select the rows from the query (interna)l.
+    /// </summary>
+    private async Task SelectInternalAsync(Func<DatabaseRecord, bool> func, string memberName, CancellationToken cancellationToken)
+    {
+        func.ThrowIfNull();
+
+        await Database.Invoker.InvokeAsync(Database, DbArgs, async (_, _, cancellationToken) =>
+        {
+            using var cmd = await CreateCommandAsync(cancellationToken).ConfigureAwait(false);
+            using var dr = await LogCommand(cmd).ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
+
+            while (await dr.ReadAsync(cancellationToken).ConfigureAwait(false))
+            {
+                if (!func(new DatabaseRecord(Database, dr)))
+                    break;
+            }
+        }, cancellationToken, memberName).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.SelectFirstSingle.cs b/src/CoreEx.Database/DatabaseCommand.SelectFirstSingle.cs
new file mode 100644
index 00000000..ea5bfc85
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommand.SelectFirstSingle.cs
@@ -0,0 +1,97 @@
+namespace CoreEx.Database;
+
+public abstract partial class DatabaseCommand
+{
+    /// <summary>
+    /// Selects a single item.
+    /// </summary>
+    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The single item.</returns>
+    public async Task<T> SelectSingleAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
+    {
+        var result = await SelectSingleFirstInternalAsync(mapper, true, nameof(SelectSingleAsync), cancellationToken).ConfigureAwait(false);
+        return result ?? throw new InvalidOperationException($"{nameof(SelectSingleAsync)} has not returned a row.");
+    }
+
+    /// <summary>
+    /// Selects a single item or default.
+    /// </summary>
+    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The single item or default.</returns>
+    public async Task<T?> SelectSingleOrDefaultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
+        => await SelectSingleFirstInternalAsync(mapper, true, nameof(SelectSingleOrDefaultAsync), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Selects first item.
+    /// </summary>
+    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The single item.</returns>
+    public async Task<T> SelectFirstAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
+    {
+        var result = await SelectSingleFirstInternalAsync(mapper, false, nameof(SelectFirstAsync), cancellationToken).ConfigureAwait(false);
+        return result ?? throw new InvalidOperationException($"{nameof(SelectFirstAsync)} has not returned a row.");
+    }
+
+    /// <summary>
+    /// Selects first item or default.
+    /// </summary>
+    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The single item or default.</returns>
+    public async Task<T?> SelectFirstOrDefaultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
+        => await SelectSingleFirstInternalAsync(mapper, false, nameof(SelectFirstOrDefaultAsync), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Select first row result only (where exists) internal.
+    /// </summary>
+    private async Task<T> SelectSingleFirstInternalAsync<T>(IDatabaseMapper<T> mapper, bool throwWhereMulti, string memberName, CancellationToken cancellationToken)
+    {
+        var coll = new List<T>();
+        await SelectInternalAsync(coll, mapper, throwWhereMulti, false, 2, memberName, cancellationToken).ConfigureAwait(false);
+        return coll.Count == 0 ? default! : coll[0];
+    }
+
+    /// <summary>
+    /// Select the rows from the query internal.
+    /// </summary>
+    private async Task SelectInternalAsync<T, TColl>(TColl coll, IDatabaseMapper<T> mapper, bool throwWhereMulti, bool stopAfterOneRow, int maxRows, string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>
+    {
+        mapper.ThrowIfNull();
+
+        await Database.Invoker.InvokeAsync(Database, DbArgs, async (_, _, cancellationToken) =>
+        {
+            int i = 0;
+
+            using var cmd = await CreateCommandAsync(cancellationToken).ConfigureAwait(false);
+            using var dr = await LogCommand(cmd).ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
+
+            while (await dr.ReadAsync(cancellationToken).ConfigureAwait(false))
+            {
+                if (++i == 2)
+                {
+                    if (throwWhereMulti)
+                        throw new InvalidOperationException($"{memberName} has returned more than one row.");
+
+                    if (stopAfterOneRow)
+                        return;
+                }
+
+                if (i - 1 >= maxRows)
+                    return;
+
+                coll.Add(mapper.MapFromDb(new DatabaseRecord(Database, dr)) ?? throw new InvalidOperationException("A null must not be returned from the mapper."));
+                if (!throwWhereMulti && stopAfterOneRow)
+                    return;
+            }
+
+            return;
+        }, cancellationToken, memberName).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.SelectMultiSet.cs b/src/CoreEx.Database/DatabaseCommand.SelectMultiSet.cs
new file mode 100644
index 00000000..cc715dc0
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommand.SelectMultiSet.cs
@@ -0,0 +1,131 @@
+namespace CoreEx.Database;
+
+public abstract partial class DatabaseCommand
+{
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>.
+    /// </summary>
+    /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
+    /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
+    public Task SelectMultiSetAsync(params IMultiSetArgs[] multiSetArgs) => SelectMultiSetAsync(multiSetArgs, default);
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>.
+    /// </summary>
+    /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
+    public Task SelectMultiSetAsync(IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default) => SelectMultiSetInternalAsync(multiSetArgs, nameof(SelectMultiSetAsync), cancellationToken);
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> (internal).
+    /// </summary>
+    private async Task SelectMultiSetInternalAsync(IEnumerable<IMultiSetArgs> multiSetArgs, string memberName, CancellationToken cancellationToken = default)
+    {
+        var multiSetList = multiSetArgs?.ToList();
+        if (multiSetList is null || multiSetList.Count == 0)
+            throw new ArgumentException($"At least one {nameof(IMultiSetArgs)} must be supplied.", nameof(multiSetArgs));
+
+        await Database.Invoker.InvokeAsync(Database, DbArgs, async (_, _, cancellationToken) =>
+        {
+            // Create and execute the command. 
+            using var cmd = await CreateCommandAsync(cancellationToken).ConfigureAwait(false);
+            using var dr = await LogCommand(cmd).ExecuteReaderAsync(cancellationToken).ConfigureAwait(false);
+
+            // Iterate through the dataset(s).
+            var index = 0;
+            var records = 0;
+            IMultiSetArgs? multiSetArg = null;
+            do
+            {
+                if (index >= multiSetList.Count)
+                    throw new InvalidOperationException($"{nameof(SelectMultiSetAsync)} has returned more record sets than expected ({multiSetList.Count}).");
+
+                if (multiSetList[index] is not null)
+                {
+                    records = 0;
+                    multiSetArg = multiSetList[index];
+                    while (await dr.ReadAsync(cancellationToken).ConfigureAwait(false))
+                    {
+                        records++;
+                        if (multiSetArg.MaximumRows.HasValue && records > multiSetArg.MaximumRows.Value)
+                            throw new InvalidOperationException($"{nameof(SelectMultiSetAsync)} (msa[{index}]) has returned more records than expected ({multiSetArg.MaximumRows.Value}).");
+
+                        multiSetArg.DatasetRecord(new DatabaseRecord(Database, dr));
+                    }
+
+                    if (records < multiSetArg.MinimumRows)
+                        throw new InvalidOperationException($"{nameof(SelectMultiSetAsync)} (msa[{index}]) has returned less records ({records}) than expected ({multiSetArg.MinimumRows}).");
+
+                    if (records == 0 && multiSetArg.StopOnNull)
+                        return;
+
+                    multiSetArg.InvokeResult();
+                }
+
+                index++;
+            } while (dr.NextResult());
+
+            if (index < multiSetList.Count && !multiSetList[index].StopOnNull)
+                throw new InvalidOperationException($"{nameof(SelectMultiSetAsync)} has returned less ({index}) record sets than expected ({multiSetList.Count}).");
+        }, cancellationToken, memberName).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/> or <see cref="PagingResult"/> to add to the <see cref="Parameters"/>.</param>
+    /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
+    /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
+    public Task SelectMultiSetAsync(PagingArgs? paging, params IMultiSetArgs[] multiSetArgs) => SelectMultiSetAsync(paging, multiSetArgs, default);
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/> or <see cref="PagingResult"/> to add to the <see cref="Parameters"/>.</param>
+    /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
+    public Task SelectMultiSetAsync(PagingArgs? paging, IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
+        => SelectMultiSetInternalAsync(paging, multiSetArgs, nameof(SelectMultiSetAsync), cancellationToken);
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/> (internal);
+    /// </summary>
+    private async Task SelectMultiSetInternalAsync(PagingArgs? paging, IEnumerable<IMultiSetArgs> multiSetArgs, string memberName, CancellationToken cancellationToken)
+    {
+        Parameters.PagingParams(paging);
+
+        var result = await SelectMultiSetWithValueInternalAsync(multiSetArgs, memberName, cancellationToken).ConfigureAwait(false);
+        if (paging is PagingResult pr && pr.IsCountRequested && result >= 0)
+            pr.WithTotalCount(result);
+    }
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/>.
+    /// </summary>
+    /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
+    /// <returns>The resultant return value.</returns>
+    /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
+    public Task<int> SelectMultiSetWithValueAsync(params IMultiSetArgs[] multiSetArgs) => SelectMultiSetWithValueAsync(multiSetArgs, default);
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/>.
+    /// </summary>
+    /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resultant return value.</returns>
+    /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
+    public Task<int> SelectMultiSetWithValueAsync(IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
+        => SelectMultiSetWithValueInternalAsync(multiSetArgs, nameof(SelectMultiSetWithValueAsync), cancellationToken);
+
+    /// <summary>
+    /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/> (internal).
+    /// </summary>
+    private async Task<int> SelectMultiSetWithValueInternalAsync(IEnumerable<IMultiSetArgs> multiSetArgs, string memberName, CancellationToken cancellationToken)
+    {
+        var rvp = Parameters.AddReturnValueParameter();
+        await SelectMultiSetInternalAsync(multiSetArgs, memberName, cancellationToken).ConfigureAwait(false);
+        return rvp.Value is null ? -1 : (int)rvp.Value;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.SelectQuery.cs b/src/CoreEx.Database/DatabaseCommand.SelectQuery.cs
new file mode 100644
index 00000000..4f3616f2
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommand.SelectQuery.cs
@@ -0,0 +1,50 @@
+namespace CoreEx.Database;
+
+public abstract partial class DatabaseCommand
+{
+    /// <summary>
+    /// Selects none or more items from the first result set.
+    /// </summary>
+    /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
+    /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting set.</returns>
+    public Task<IEnumerable<T>> SelectQueryAsync<T>(Func<DatabaseRecord, OperationType, T> func, CancellationToken cancellationToken = default)
+        => SelectQueryAsync(new DatabaseMapper<T>(func.ThrowIfNull()), cancellationToken);
+
+    /// <summary>
+    /// Selects none or more items from the first result set using a <paramref name="mapper"/>.
+    /// </summary>
+    /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The item sequence.</returns>
+    public async Task<IEnumerable<T>> SelectQueryAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
+    {
+        var coll = new List<T>();
+        await SelectQueryAsync(coll, mapper, cancellationToken).ConfigureAwait(false);
+        return coll;
+    }
+
+    /// <summary>
+    /// Selects none or more items from the first result set and adds to the <paramref name="collection"/>.
+    /// </summary>
+    /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
+    /// <param name="collection">The collection.</param>
+    /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public Task SelectQueryAsync<T, TColl>(TColl collection, Func<DatabaseRecord, OperationType, T> func, CancellationToken cancellationToken = default) where TColl : ICollection<T>
+        => SelectQueryAsync(collection, new DatabaseMapper<T>(func), cancellationToken);
+
+    /// <summary>
+    /// Selects none or more items from the first result set and adds to the <paramref name="collection"/>.
+    /// </summary>
+    /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
+    /// <param name="collection">The collection.</param>
+    /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public Task SelectQueryAsync<T, TColl>(TColl collection, IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default) where TColl : ICollection<T>
+        => SelectInternalAsync(collection, mapper, false, false, int.MaxValue, nameof(SelectQueryAsync), cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommand.cs b/src/CoreEx.Database/DatabaseCommand.cs
index c083ac6d..5a4c64a4 100644
--- a/src/CoreEx.Database/DatabaseCommand.cs
+++ b/src/CoreEx.Database/DatabaseCommand.cs
@@ -1,639 +1,57 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Database;
+
+/// <summary>
+/// Provides extended database command capabilities.
+/// </summary>
+/// <param name="db">The <see cref="IDatabase"/>.</param>
+/// <param name="statement">The <see cref="SqlStatement"/>.</param>
+/// <remarks>As the underlying <see cref="DbCommand"/> implements <see cref="IDisposable"/> this is only created (and automatically disposed) where executing the command proper.</remarks>
+public abstract partial class DatabaseCommand(IDatabase db, SqlStatement statement) : IDatabaseParameters<DatabaseCommand>
+{
+    /// <inheritdoc/>
+    public IDatabase Database { get; } = db.ThrowIfNull();
 
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+    /// <inheritdoc/>
+    public DatabaseParameterCollection Parameters { get; } = new DatabaseParameterCollection(db);
 
-namespace CoreEx.Database
-{
     /// <summary>
-    /// Provides extended database command capabilities.
+    /// Gets the <see cref="SqlStatement"/>.
     /// </summary>
-    /// <remarks>As the underlying <see cref="DbCommand"/> implements <see cref="IDisposable"/> this is only created (and automatically disposed) where executing the command proper.</remarks>
-    /// <param name="db">The <see cref="IDatabase"/>.</param>
-    /// <param name="commandType">The <see cref="System.Data.CommandType"/>.</param>
-    /// <param name="commandText">The command text.</param>
-    public sealed class DatabaseCommand(IDatabase db, CommandType commandType, string commandText) : IDatabaseParameters<DatabaseCommand>
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="IDatabase"/>.
-        /// </summary>
-        public IDatabase Database { get; } = db.ThrowIfNull(nameof(db));
-
-        /// <inheritdoc/>
-        public DatabaseParameterCollection Parameters { get; } = new DatabaseParameterCollection(db);
-
-        /// <summary>
-        /// Gets the <see cref="System.Data.CommandType"/>.
-        /// </summary>
-        public CommandType CommandType { get; } = commandType;
-
-        /// <summary>
-        /// Gets the command text.
-        /// </summary>
-        public string CommandText { get; } = commandText.ThrowIfNull(nameof(commandText));
-
-        /// <summary>
-        /// Creates the corresponding <see cref="DbCommand"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="DbCommand"/>.</returns>
-        private async Task<DbCommand> CreateDbCommandAsync(CancellationToken cancellationToken = default)
-        {
-            var cmd = (await Database.GetConnectionAsync(cancellationToken).ConfigureAwait(false)).CreateCommand();
-            cmd.CommandType = CommandType;
-            cmd.CommandText = CommandText;
-            cmd.Parameters.AddRange(Parameters.ToArray());
-            return cmd;
-        }
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public async Task SelectMultiSetAsync(params IMultiSetArgs[] multiSetArgs) 
-            => (await SelectMultiSetWithResultInternalAsync(multiSetArgs, nameof(SelectMultiSetAsync), default).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public Task<Result> SelectMultiSetWithResultAsync(params IMultiSetArgs[] multiSetArgs) 
-            => SelectMultiSetWithResultInternalAsync(multiSetArgs, nameof(SelectMultiSetWithResultAsync), default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public async Task SelectMultiSetAsync(IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => (await SelectMultiSetWithResultInternalAsync(multiSetArgs, nameof(SelectMultiSetAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public Task<Result> SelectMultiSetWithResultAsync(IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => SelectMultiSetWithResultInternalAsync(multiSetArgs, nameof(SelectMultiSetWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private Task<Result> SelectMultiSetWithResultInternalAsync(IEnumerable<IMultiSetArgs> multiSetArgs, string memberName, CancellationToken cancellationToken = default)
-        {
-            var multiSetList = multiSetArgs?.ToList() ?? null;
-            if (multiSetList == null || multiSetList.Count == 0)
-                throw new ArgumentException($"At least one {nameof(IMultiSetArgs)} must be supplied.", nameof(multiSetArgs));
-
-            return Database.Invoker.InvokeAsync(Database, multiSetArgs, multiSetList, async (_, multiSetArgs, multiSetList, ct) =>
-            {
-                // Create and execute the command. 
-                using var cmd = await CreateDbCommandAsync(ct).ConfigureAwait(false);
-                using var dr = await cmd.ExecuteReaderAsync(ct).ConfigureAwait(false);
-
-                // Iterate through the dataset(s).
-                var index = 0;
-                var records = 0;
-                IMultiSetArgs? multiSetArg = null;
-                do
-                {
-                    if (index >= multiSetList.Count)
-                        return Result.Fail(new InvalidOperationException($"{nameof(SelectMultiSetAsync)} has returned more record sets than expected ({multiSetList.Count})."));
-
-                    if (multiSetList[index] != null)
-                    {
-                        records = 0;
-                        multiSetArg = multiSetList[index];
-                        while (await dr.ReadAsync(ct).ConfigureAwait(false))
-                        {
-                            records++;
-                            if (multiSetArg.MaxRows.HasValue && records > multiSetArg.MaxRows.Value)
-                                return Result.Fail(new InvalidOperationException($"{nameof(SelectMultiSetAsync)} (msa[{index}]) has returned more records than expected ({multiSetArg.MaxRows.Value})."));
-
-                            multiSetArg.DatasetRecord(new DatabaseRecord(Database, dr));
-                        }
-
-                        if (records < multiSetArg.MinRows)
-                            return Result.Fail(new InvalidOperationException($"{nameof(SelectMultiSetAsync)} (msa[{index}]) has returned less records ({records}) than expected ({multiSetArg.MinRows})."));
-
-                        if (records == 0 && multiSetArg.StopOnNull)
-                            return Result.Success;
-
-                        multiSetArg.InvokeResult();
-                    }
-
-                    index++;
-                } while (dr.NextResult());
-
-                return index < multiSetList.Count && !multiSetList[index].StopOnNull 
-                    ? Result.Fail(new InvalidOperationException($"{nameof(SelectMultiSetAsync)} has returned less ({index}) record sets than expected ({multiSetList.Count})."))
-                    : Result.Success;
-            }, cancellationToken, memberName);
-        }
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/> or <see cref="PagingResult"/> to add to the <see cref="Parameters"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public async Task SelectMultiSetAsync(PagingArgs? paging, params IMultiSetArgs[] multiSetArgs) 
-            => (await SelectMultiSetWithResultInternalAsync(paging, multiSetArgs, nameof(SelectMultiSetAsync), default).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/> or <see cref="PagingResult"/> to add to the <see cref="Parameters"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public Task<Result> SelectMultiSetWithResultAsync(PagingArgs? paging, params IMultiSetArgs[] multiSetArgs) 
-            => SelectMultiSetWithResultInternalAsync(paging, multiSetArgs, nameof(SelectMultiSetWithResultAsync), default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/> or <see cref="PagingResult"/> to add to the <see cref="Parameters"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public async Task SelectMultiSetAsync(PagingArgs? paging, IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => (await SelectMultiSetWithResultInternalAsync(paging, multiSetArgs, nameof(SelectMultiSetAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/> or <see cref="PagingResult"/> to add to the <see cref="Parameters"/>.</param>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public Task<Result> SelectMultiSetWithResultAsync(PagingArgs? paging, IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => SelectMultiSetWithResultInternalAsync(paging, multiSetArgs, nameof(SelectMultiSetWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/> that supports <paramref name="paging"/> with a <see cref="Result"/> internal.
-        /// </summary>
-        private async Task<Result> SelectMultiSetWithResultInternalAsync(PagingArgs? paging, IEnumerable<IMultiSetArgs> multiSetArgs, string memberName, CancellationToken cancellationToken)
-        {
-            Parameters.PagingParams(paging);
-
-            var result = await SelectMultiSetWithValueResultInternalAsync(multiSetArgs, memberName, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(rv =>
-            {
-                if (paging is PagingResult pr && pr.IsGetCount && rv >= 0)
-                    pr.TotalCount = rv;
-            });
-        }
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <returns>The resultant return value.</returns>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public async Task<int> SelectMultiSetWithValueAsync(params IMultiSetArgs[] multiSetArgs)
-            => await SelectMultiSetWithValueResultInternalAsync(multiSetArgs, nameof(SelectMultiSetWithValueAsync), default).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <returns>The resultant return value.</returns>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public Task<Result<int>> SelectMultiSetWithValueResultAsync(params IMultiSetArgs[] multiSetArgs)
-            => SelectMultiSetWithValueResultInternalAsync(multiSetArgs, nameof(SelectMultiSetWithValueResultAsync), default);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resultant return value.</returns>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public async Task<int> SelectMultiSetWithValueAsync(IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => await SelectMultiSetWithValueResultInternalAsync(multiSetArgs, nameof(SelectMultiSetWithValueAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="multiSetArgs">One or more <see cref="IMultiSetArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resultant return value.</returns>
-        /// <remarks>The number of <see cref="IMultiSetArgs"/> specified must match the number of returned datasets. A null dataset indicates to ignore (skip) a dataset.</remarks>
-        public Task<Result<int>> SelectMultiSetWithValueResultAsync(IEnumerable<IMultiSetArgs> multiSetArgs, CancellationToken cancellationToken = default)
-            => SelectMultiSetWithValueResultInternalAsync(multiSetArgs, nameof(SelectMultiSetWithValueResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a multi-dataset query command with one or more <see cref="IMultiSetArgs"/>; whilst also outputing the resulting <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/> with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<int>> SelectMultiSetWithValueResultInternalAsync(IEnumerable<IMultiSetArgs> multiSetArgs, string memberName, CancellationToken cancellationToken)
-        {
-            var rvp = Parameters.AddReturnValueParameter();
-            var result = await SelectMultiSetWithResultInternalAsync(multiSetArgs, memberName, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => rvp.Value == null ? -1 : (int)rvp.Value);
-        }
-
-        /// <summary>
-        /// Executes a non-query command.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The number of rows affected.</returns>
-        public async Task<int> NonQueryAsync(CancellationToken cancellationToken = default) 
-            => await NonQueryWithResultInternalAsync(null, nameof(NonQueryAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes a non-query command with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The number of rows affected.</returns>
-        public Task<Result<int>> NonQueryWithResultAsync(CancellationToken cancellationToken = default) 
-            => NonQueryWithResultInternalAsync(null, nameof(NonQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a non-query command.
-        /// </summary>
-        /// <param name="parameters">The post-execution delegate to enable parameter access.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The number of rows affected.</returns>
-        public async Task<int> NonQueryAsync(Action<DbParameterCollection>? parameters, CancellationToken cancellationToken = default) 
-            => await NonQueryWithResultInternalAsync(parameters, nameof(NonQueryAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes a non-query command with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="parameters">The post-execution delegate to enable parameter access.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The number of rows affected.</returns>
-        public Task<Result<int>> NonQueryWithResultAsync(Action<DbParameterCollection>? parameters, CancellationToken cancellationToken = default)
-            => NonQueryWithResultInternalAsync(parameters, nameof(NonQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a non-query command with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private Task<Result<int>> NonQueryWithResultInternalAsync(Action<DbParameterCollection>? parameters, string memberName, CancellationToken cancellationToken = default) => Database.Invoker.InvokeAsync(Database, parameters, async (_, parameters, ct) =>
-        {
-            using var cmd = await CreateDbCommandAsync(ct).ConfigureAwait(false);
-            parameters?.Invoke(cmd.Parameters);
-            var result = await cmd.ExecuteNonQueryAsync(ct).ConfigureAwait(false);
-            return Result.Ok(result);
-        }, cancellationToken, memberName);
-
-        /// <summary>
-        /// Executes the query and returns the first column of the first row in the result set returned by the query.
-        /// </summary>
-        /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value of the first column of the first row in the result set.</returns>
-        public async Task<T> ScalarAsync<T>(CancellationToken cancellationToken = default) 
-            => await ScalarWithResultInternalAsync<T>(null, nameof(ScalarAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query and returns the first column of the first row in the result set returned by the query with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value of the first column of the first row in the result set.</returns>
-        public Task<Result<T>> ScalarWithResultAsync<T>(CancellationToken cancellationToken = default) 
-            => ScalarWithResultInternalAsync<T>(null, nameof(ScalarWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes the query and returns the first column of the first row in the result set returned by the query.
-        /// </summary>
-        /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The post-execution delegate to enable parameter access.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value of the first column of the first row in the result set.</returns>
-        public async Task<T> ScalarAsync<T>(Action<DbParameterCollection>? parameters, CancellationToken cancellationToken = default)
-            => await ScalarWithResultInternalAsync<T>(parameters, nameof(ScalarAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query and returns the first column of the first row in the result set returned by the query with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The post-execution delegate to enable parameter access.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value of the first column of the first row in the result set.</returns>
-        public Task<Result<T>> ScalarWithResultAsync<T>(Action<DbParameterCollection>? parameters, CancellationToken cancellationToken = default)
-            => ScalarWithResultInternalAsync<T>(parameters, nameof(ScalarWithResultAsync), cancellationToken);
+    public SqlStatement Statement { get; } = statement.ThrowIfNull();
 
-        /// <summary>
-        /// Executes the query and returns the first column of the first row in the result set returned by the query with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private Task<Result<T>> ScalarWithResultInternalAsync<T>(Action<DbParameterCollection>? parameters, string memberName, CancellationToken cancellationToken = default) => Database.Invoker.InvokeAsync(Database, parameters, async (_, parameters, ct) =>
-        {
-            using var cmd = await CreateDbCommandAsync(ct).ConfigureAwait(false);
-            parameters?.Invoke(cmd.Parameters);
-            var result = await cmd.ExecuteScalarAsync(ct).ConfigureAwait(false);
-            T value = result is null ? default! : result is DBNull ? default! : (T)result;
-            return Result.Ok(value);
-        }, cancellationToken, memberName);
-
-        /// <summary>
-        /// Selects none or more items from the first result set using a <paramref name="mapper"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The item sequence.</returns>
-        public async Task<IEnumerable<T>> SelectQueryAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => (await SelectQueryWithResultInternalAsync<T>(mapper, nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects none or more items from the first result set using a <paramref name="mapper"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The item sequence.</returns>
-        public Task<Result<IEnumerable<T>>> SelectQueryWithResultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => SelectQueryWithResultInternalAsync(mapper, nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Selects none or more items from the first result set using a <paramref name="mapper"/> with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<IEnumerable<T>>> SelectQueryWithResultInternalAsync<T>(IDatabaseMapper<T> mapper, string memberName, CancellationToken cancellationToken)
-        {
-            var coll = new List<T>();
-            var result = await SelectQueryWithResultInternalAsync(coll, mapper, memberName, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => (IEnumerable<T>)coll);
-        }
-
-        /// <summary>
-        /// Selects none or more items from the first result set.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting set.</returns>
-        public async Task<IEnumerable<T>> SelectQueryAsync<T>(Func<DatabaseRecord, T> func, CancellationToken cancellationToken = default)
-            => (await SelectQueryWithResultInternalAsync<T>(func, nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects none or more items from the first result set with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting set.</returns>
-        public Task<Result<IEnumerable<T>>> SelectQueryWithResultAsync<T>(Func<DatabaseRecord, T> func, CancellationToken cancellationToken = default)
-            => SelectQueryWithResultInternalAsync(func, nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Selects none or more items from the first result set with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<IEnumerable<T>>> SelectQueryWithResultInternalAsync<T>(Func<DatabaseRecord, T> func, string memberName, CancellationToken cancellationToken = default)
-        {
-            var coll = new List<T>();
-            var result = await SelectInternalAsync(coll, new DatabaseRecordMapper<T>(func), false, false, memberName, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => (IEnumerable<T>)coll);
-        }
-
-        /// <summary>
-        /// Selects none or more items from the first result set and adds to the <paramref name="collection"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="collection">The collection.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task SelectQueryAsync<T, TColl>(TColl collection, IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => (await SelectQueryWithResultInternalAsync(collection, mapper, nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Selects none or more items from the first result set and adds to the <paramref name="collection"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="collection">The collection.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task<Result> SelectQueryWithResultAsync<T, TColl>(TColl collection, IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => await SelectQueryWithResultInternalAsync(collection, mapper, nameof(SelectQueryWithResultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects none or more items from the first result set and adds to the <paramref name="collection"/> with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result> SelectQueryWithResultInternalAsync<T, TColl>(TColl collection, IDatabaseMapper<T> mapper, string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>
-            => await SelectInternalAsync(collection, mapper, false, false, memberName, cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects none or more items from the first result set and adds to the <paramref name="collection"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="collection">The collection.</param>
-        /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task SelectQueryAsync<T, TColl>(TColl collection, Func<DatabaseRecord, T> func, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => (await SelectInternalAsync(collection, new DatabaseRecordMapper<T>(func), false, false, nameof(SelectQueryAsync), cancellationToken)).ThrowOnError();
-
-        /// <summary>
-        /// Selects none or more items from the first result set and adds to the <paramref name="collection"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="collection">The collection.</param>
-        /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task<Result> SelectQueryWithResultAsync<T, TColl>(TColl collection, Func<DatabaseRecord, T> func, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => SelectInternalAsync(collection, new DatabaseRecordMapper<T>(func), false, false, nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<T> SelectSingleAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => (await SelectSingleWithResultInternalAsync(mapper, nameof(SelectSingleAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public Task<Result<T>> SelectSingleWithResultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => SelectSingleWithResultInternalAsync(mapper, nameof(SelectSingleWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<T>> SelectSingleWithResultInternalAsync<T>(IDatabaseMapper<T> mapper, string memberName, CancellationToken cancellationToken)
-        {
-            var result = await SelectSingleFirstWithResultInternalAsync(mapper, true, memberName, cancellationToken).ConfigureAwait(false);
-            return result.When(item => Comparer<T>.Default.Compare(item, default!) == 0, _ => Result<T>.Fail(new InvalidOperationException("SelectSingle request has not returned a row.")));
-        }
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<T?> SelectSingleOrDefaultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => await SelectSingleFirstWithResultInternalAsync(mapper, false, nameof(SelectSingleOrDefaultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<Result<T?>> SelectSingleOrDefaultWithResultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => await SelectSingleFirstWithResultInternalAsync(mapper, false, nameof(SelectSingleOrDefaultWithResultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<T> SelectFirstAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => await SelectFirstWithResultInternalAsync(mapper, nameof(SelectFirstAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public Task<Result<T>> SelectFirstWithResultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => SelectFirstWithResultInternalAsync(mapper, nameof(SelectFirstWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<T>> SelectFirstWithResultInternalAsync<T>(IDatabaseMapper<T> mapper, string memberName, CancellationToken cancellationToken = default)
-        {
-            var result = await SelectSingleFirstWithResultInternalAsync(mapper, false, memberName, cancellationToken).ConfigureAwait(false);
-            return result.When(item => Comparer<T>.Default.Compare(item, default!) == 0, _ => new InvalidOperationException("SelectFirst request has not returned a row."));
-        }
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<T?> SelectFirstOrDefaultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default)
-            => await SelectSingleFirstWithResultInternalAsync(mapper, false, nameof(SelectFirstOrDefaultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<Result<T?>> SelectFirstOrDefaultWithResultAsync<T>(IDatabaseMapper<T> mapper, CancellationToken cancellationToken = default) 
-            => await SelectSingleFirstWithResultInternalAsync(mapper, false, nameof(SelectFirstOrDefaultWithResultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Select first row result only (where exists) internal.
-        /// </summary>
-        private async Task<Result<T>> SelectSingleFirstWithResultInternalAsync<T>(IDatabaseMapper<T> mapper, bool throwWhereMulti, string memberName, CancellationToken cancellationToken)
-        {
-            var coll = new List<T>();
-            var result = await SelectInternalAsync(coll, mapper, throwWhereMulti, true, memberName, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => coll.Count == 0 ? default! : coll[0]);
-        }
-
-        /// <summary>
-        /// Select the rows from the query internal.
-        /// </summary>
-        private async Task<Result> SelectInternalAsync<T, TColl>(TColl coll, IDatabaseMapper<T> mapper, bool throwWhereMulti, bool stopAfterOneRow, string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>
-        {
-            mapper.ThrowIfNull(nameof(mapper));
-
-            return await Database.Invoker.InvokeAsync(Database, mapper, throwWhereMulti, stopAfterOneRow, async (_, mapper, throwWhereMulti, stopAfterOneRow, ct) =>
-            {
-                int i = 0;
-
-                using var cmd = await CreateDbCommandAsync(ct).ConfigureAwait(false);
-                using var dr = await cmd.ExecuteReaderAsync(ct).ConfigureAwait(false);
-
-                while (await dr.ReadAsync(ct).ConfigureAwait(false))
-                {
-                    if (++i == 2)
-                    {
-                        if (throwWhereMulti)
-                            Result.Fail(new InvalidOperationException("SelectSingle request has returned more than one row."));
-
-                        if (stopAfterOneRow)
-                            return Result.Success;
-                    }
-
-                    var val = mapper.MapFromDb(new DatabaseRecord(Database, dr));
-                    if (val == null)
-                        return Result.Fail(new InvalidOperationException("A null must not be returned from the mapper."));
-
-                    coll.Add(val);
-                    if (!throwWhereMulti && stopAfterOneRow)
-                        return Result.Success;
-                }
-
-                return Result.Success;
-            }, cancellationToken, memberName).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Selects from the first result set using a <paramref name="func"/> to handle each <see cref="DatabaseRecord"/>.
-        /// </summary>
-        /// <param name="func">The <see cref="DatabaseRecord"/> handling function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <paramref name="func"/> returns a <see cref="bool"/> that controls whether the next <see cref="DatabaseRecord"/> should be read. A value of <c>true</c> indicates that 
-        /// reading should continue; otherwise, <c>false</c> to stop.</remarks>
-        public async Task SelectAsync(Func<DatabaseRecord, bool> func, CancellationToken cancellationToken = default)
-            => (await SelectInternalAsync(func, nameof(SelectAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
+    /// <summary>
+    /// Gets the <see cref="DatabaseArgs"/> for the command.
+    /// </summary>
+    /// <remarks>Defaults to the underlying <see cref="IDatabase.DbArgs"/>.</remarks>
+    public DatabaseArgs DbArgs { get; protected set; } = db.DbArgs;
 
-        /// <summary>
-        /// Selects from the first result set using a <paramref name="func"/> to handle each <see cref="DatabaseRecord"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="func">The <see cref="DatabaseRecord"/> handling function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <paramref name="func"/> returns a <see cref="bool"/> that controls whether the next <see cref="DatabaseRecord"/> should be read. A value of <c>true</c> indicates that 
-        /// reading should continue; otherwise, <c>false</c> to stop.</remarks>
-        public Task<Result> SelectWithResultAsync(Func<DatabaseRecord, bool> func, CancellationToken cancellationToken = default)
-            => SelectInternalAsync(func, nameof(SelectWithResultAsync), cancellationToken);
+    /// <summary>
+    /// Creates the corresponding <see cref="DbCommand"/>.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DbCommand"/>.</returns>
+    private async Task<DbCommand> CreateCommandAsync(CancellationToken cancellationToken)
+    {
+        var conn = await Database.GetConnectionAsync(cancellationToken).ConfigureAwait(false);
+        var cmd = conn.CreateCommand();
 
-        /// <summary>
-        /// Select the rows from the query internal.
-        /// </summary>
-        private async Task<Result> SelectInternalAsync(Func<DatabaseRecord, bool> func, string memberName, CancellationToken cancellationToken)
-        {
-            func.ThrowIfNull(nameof(func));
+        if (Database.CurrentTransaction is not null)
+            cmd.Transaction = Database.CurrentTransaction;
 
-            return await Database.Invoker.InvokeAsync(Database, func, async (_, action, ct) =>
-            {
-                using var cmd = await CreateDbCommandAsync(ct).ConfigureAwait(false);
-                using var dr = await cmd.ExecuteReaderAsync(ct).ConfigureAwait(false);
+        cmd.CommandType = Statement.CommandType;
+        cmd.CommandText = Statement.CommandText;
+        cmd.Parameters.AddRange(Parameters.ToArray());
+        return cmd;
+    }
 
-                while (await dr.ReadAsync(ct).ConfigureAwait(false))
-                {
-                    if (!action(new DatabaseRecord(Database, dr)))
-                        break;
-                }
+    /// <summary>
+    /// Logs the command type and text at debug level.
+    /// </summary>
+    private DbCommand LogCommand(DbCommand command)
+    {
+        if (Database.Logger?.IsEnabled(LogLevel.Debug) is true)
+            Database.Logger.LogDebug("Executing DbCommand [CommandType='{CommandType}']:{NewLine}{CommandText}", command.CommandType, Environment.NewLine, command.CommandText);
 
-                return Result.Success;
-            }, cancellationToken, memberName).ConfigureAwait(false);
-        }
+        return command;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseCommandT.cs b/src/CoreEx.Database/DatabaseCommandT.cs
new file mode 100644
index 00000000..13987171
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseCommandT.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.Database;
+
+/// <summary>
+/// Provides extended database command capabilities.
+/// </summary>
+/// <typeparam name="TDatabaseArgs">The <see cref="DatabaseArgs"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="DatabaseCommand{TDatabaseArgs, TSelf}"/> <see cref="Type"/>.</typeparam>
+/// <param name="db">The <see cref="IDatabase"/>.</param>
+/// <param name="statement">The <see cref="SqlStatement"/>.</param>
+/// <remarks>As the underlying <see cref="DbCommand"/> implements <see cref="IDisposable"/> this is only created (and automatically disposed) where executing the command proper.</remarks>
+public abstract class DatabaseCommand<TDatabaseArgs, TSelf>(IDatabase db, SqlStatement statement) : DatabaseCommand(db, statement) 
+    where TDatabaseArgs : DatabaseArgs
+    where TSelf : DatabaseCommand<TDatabaseArgs, TSelf>
+{
+    /// <summary>
+    /// Gets the <typeparamref name="TDatabaseArgs"/> for the command.
+    /// </summary>
+    /// <remarks>Defaults to the underlying <see cref="IDatabase.DbArgs"/>.
+    /// <para>See also <see cref="WithDbArgs(TDatabaseArgs)"/>.</para></remarks>
+    public new TDatabaseArgs DbArgs { get; protected set; } = (TDatabaseArgs)db.DbArgs;
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="DbArgs"/> for the command.
+    /// </summary>
+    /// <param name="dbArgs">The <typeparamref name="TDatabaseArgs"/>.</param>
+    /// <returns></returns>
+    public TSelf WithDbArgs(TDatabaseArgs dbArgs)
+    {
+        DbArgs = dbArgs;
+        return (TSelf)this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseExtensions.Parameters.cs b/src/CoreEx.Database/DatabaseExtensions.Parameters.cs
new file mode 100644
index 00000000..dae3e807
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseExtensions.Parameters.cs
@@ -0,0 +1,386 @@
+namespace CoreEx.Database;
+
+public static partial class DatabaseExtensions
+{
+    /// <summary>
+    /// Add one or more parameters by invoking a delegate.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="action">The delegate to enable parameter addition.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf Params<TSelf>(this IDatabaseParameters<TSelf> parameters, Action<DatabaseParameterCollection> action)
+    {
+        action.ThrowIfNull()(parameters.ThrowIfNull().Parameters);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="DbParameter"/> <paramref name="list"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="list">The <see cref="DbParameter"/> list.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf Params<TSelf>(this IDatabaseParameters<TSelf> parameters, params IEnumerable<DbParameter> list)
+    {
+        if (list is not null && list != parameters.Parameters)
+            parameters.Parameters.AddRange(list);
+
+        return (TSelf)parameters;
+    }
+
+    #region Param
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, object? value = null, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull().Parameters.AddParameter(name, value, dbType, direction);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf Param<TSelf, T>(this IDatabaseParameters<TSelf> parameters, string name, T? value, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull().Parameters.AddParameter(name, value, dbType, direction);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds the named parameter using the specified <paramref name="dbType"/>, <paramref name="size"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="size">The maximum size (in bytes).</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, DbType dbType, int size, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull().Parameters.AddParameter(name, dbType, size, direction);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds the named parameter and value serialized as a JSON <see cref="string"/> to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf JsonParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, object? value)
+    {
+        parameters.ThrowIfNull().Parameters.AddJsonParameter(name, value);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds the named <paramref name="wildcard"/> parameter to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="wildcard">The wildcard value.</param>
+    /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
+    public static TSelf WildCardParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, string? wildcard)
+    {
+        parameters.ThrowIfNull().Parameters.AddWildcardParameter(name, wildcard);
+        return (TSelf)parameters;
+    }
+
+    #endregion
+
+    #region ParamWhen
+
+    /// <summary>
+    /// Adds a named parameter and value <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="when">Adds the parameter when <see langword="true"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T> value, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        value.ThrowIfNull();
+
+        if (when is true)
+            parameters.ThrowIfNull().Parameters.AddParameter(name, value(), dbType, direction);
+
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named parameter and value serialized as a JSON <see cref="string"/> <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="when">Adds the parameter when <see langword="true"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf JsonParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T?> value)
+    {
+        value.ThrowIfNull();
+
+        if (when is true)
+            parameters.ThrowIfNull().Parameters.AddJsonParameter(name, value());
+
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named <paramref name="wildcard"/> parameter <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="when">Adds the parameter when <see langword="true"/>.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="wildcard">The wildcard parameter value.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf WildcardParamWhen<TSelf>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<string?> wildcard)
+    {
+        wildcard.ThrowIfNull();
+        if (when is true)
+            parameters.ThrowIfNull().Parameters.AddWildcardParameter(name, wildcard());
+
+        return (TSelf)parameters;
+    }
+
+    #endregion
+
+    #region ParamWith
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default that is also used as the parameter value.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
+        => ParamWhen(parameters, with is not null && Comparer<T>.Default.Compare(with, default!) != 0, name, () => with!, dbType, direction);
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TWith">The with <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The parameter <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ParamWith<TSelf, TWith, TValue>(this IDatabaseParameters<TSelf> parameters, TWith? with, string name, Func<TValue?> value, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
+        => ParamWhen(parameters, with is not null && Comparer<TWith>.Default.Compare(with, default!) != 0, name, value, dbType, direction);
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value serialized as a JSON <see cref="string"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The parameter value <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default that is also used as the parameter value.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf JsonParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name)
+        => JsonParamWhen(parameters, with is not null && Comparer<T>.Default.Compare(with, default!) != 0, name, () => with);
+
+    /// <summary>
+    /// Adds a named parameter when invoked <paramref name="with"/> a non-default value serialized as a JSON <see cref="string"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TWith">The with value <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The parameter value <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf JsonParamWith<TSelf, TWith, TValue>(this IDatabaseParameters<TSelf> parameters, TWith? with, string name, Func<TValue?> value)
+        => JsonParamWhen(parameters, with is not null && Comparer<TWith>.Default.Compare(with, default!) != 0, name, value);
+
+    /// <summary>
+    /// Adds a named parameter when invoked with a non-default <paramref name="wildcard"/> (converted for the database).
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="wildcard">The wildcard <b>with</b> which to verify is non-default that is also used as the parameter value.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf WildcardParamWith<TSelf>(this IDatabaseParameters<TSelf> parameters, string? wildcard, string name)
+        => WildcardParamWhen(parameters, !string.IsNullOrEmpty(wildcard), name, () => wildcard);
+
+    /// <summary>
+    /// Adds a named parameter when invoked with a non-default <paramref name="wildcard"/> (converted for the database).
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TWith">The with value <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
+    /// <param name="wildcard">The wildcard parameter value.</param>
+    /// <param name="name">The parameter name.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf WildcardParamWith<TSelf, TWith>(this IDatabaseParameters<TSelf> parameters, TWith? with, string name, Func<string?> wildcard)
+        => WildcardParamWhen(parameters, with is not null && Comparer<TWith>.Default.Compare(with, default!) != 0, name, wildcard);
+
+    #endregion
+
+    #region RowVersionParam
+
+    /// <summary>
+    /// Adds a named (<see cref="DatabaseColumns.RowVersionName"/>) parameter using the <see cref="IReadOnlyETag.ETag"/> <see cref="IDatabase.RowVersionConverter"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="value">The <see langword="string"/>-based <see cref="IReadOnlyETag.ETag"/> representation of the row version.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf RowVersionParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string? value, ParameterDirection direction = ParameterDirection.Input)
+    {
+        parameters.ThrowIfNull().Parameters.AddRowVersionParam(value, direction);
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named (<see cref="DatabaseColumns.RowVersionName"/>) parameter using the <see cref="IReadOnlyETag.ETag"/> <see cref="IDatabase.RowVersionConverter"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="when">Adds the parameter when <see langword="true"/>.</param>
+    /// <param name="value">The <see langword="string"/>-based <see cref="IReadOnlyETag.ETag"/> representation of the row version.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf RowVersionParamWhen<TSelf>(this IDatabaseParameters<TSelf> parameters, bool? when, string? value, ParameterDirection direction = ParameterDirection.Input)
+    {
+        if (when is true)
+            parameters.ThrowIfNull().Parameters.AddRowVersionParam(value, direction);
+
+        return (TSelf)parameters;
+    }
+
+    /// <summary>
+    /// Adds a named (<see cref="DatabaseColumns.RowVersionName"/>) parameter when invoked with a non-default value using the <see cref="IReadOnlyETag.ETag"/> <see cref="IDatabase.RowVersionConverter"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="value">The <see langword="string"/>-based <see cref="IReadOnlyETag.ETag"/> representation of the row version which to verify is non-default that is also used as the parameter value.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf RowVersionParamWith<TSelf>(this IDatabaseParameters<TSelf> parameters, string? value, ParameterDirection direction = ParameterDirection.Input)
+    {
+        if (!string.IsNullOrEmpty(value))
+            parameters.ThrowIfNull().Parameters.AddRowVersionParam(value, direction);
+
+        return (TSelf)parameters;
+    }
+
+    #endregion
+
+    #region ReselectRecordParam
+
+    /// <summary>
+    /// Adds a named parameter (<see cref="Extended.DatabaseColumns.ReselectRecordName"/>) to <paramref name="reselect"/> the data.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="reselect">Indicates whether to reselect after the operation.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ReselectRecordParam<TSelf>(this IDatabaseParameters<TSelf> parameters, bool reselect = true)
+    {
+        parameters.ThrowIfNull().Parameters.AddReselectRecordParam(reselect);
+        return (TSelf)parameters;
+    }
+
+    #endregion
+
+    #region PagingParams
+
+    /// <summary>
+    /// Adds the <see cref="PagingArgs"/> as parameters.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf PagingParams<TSelf>(this IDatabaseParameters<TSelf> parameters, PagingArgs? paging)
+    {
+        if (paging is not null)
+        {
+            parameters.Param(parameters.Database.NamedColumns.PagingSkipName, paging.Skip);
+            parameters.Param(parameters.Database.NamedColumns.PagingTakeName, paging.Take);
+            parameters.ParamWhen(paging.IsCountRequested, parameters.Database.NamedColumns.PagingCountName, () => paging.IsCountRequested);
+        }
+
+        return (TSelf)parameters;
+    }
+
+    #endregion
+
+    #region ReturnValue
+
+    /// <summary>
+    /// Adds a <see cref="ParameterDirection.ReturnValue"/> parameter to the <see cref="IDatabaseParameters{TSelf}"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
+    /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
+    /// <param name="returnValueParameter">The resulting <see cref="DbParameter"/>.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>; defaults to <see cref="DbType.Int32"/>.</param>
+    /// <returns>The <paramref name="parameters"/> to support fluent-style method-chaining.</returns>
+    public static TSelf ReturnValue<TSelf>(this IDatabaseParameters<TSelf> parameters, out DbParameter returnValueParameter, DbType dbType = DbType.Int32)
+    {
+        returnValueParameter = parameters.ThrowIfNull().Parameters.AddParameter(parameters.Database.NamedColumns.ReturnValueName, dbType, direction: ParameterDirection.ReturnValue);
+        return (TSelf)parameters;
+    }
+
+    #endregion
+
+    /// <summary>
+    /// Sets the <see cref="DbParameter.Direction"/> to the <paramref name="direction"/> when the <paramref name="operationType"/> is as expressed by the <paramref name="when"/>.
+    /// </summary>
+    /// <param name="parameter">The <see cref="DbParameter"/>.</param>
+    /// <param name="operationType">The single <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <param name="when">The single or multi <see cref="OperationType"/> expression.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <paramref name="parameter"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>When the <paramref name="operationType"/> is <i>not</i> as expressed by the <paramref name="when"/> then the existing <see cref="DbParameter.Direction"/> will remain unchanged.</remarks>
+    public static DbParameter SetDirectionWhenOperationType(this DbParameter parameter, OperationType operationType, OperationType when, ParameterDirection direction = ParameterDirection.Output)
+    {
+        if (when.HasFlag(operationType))
+            parameter.Direction = direction;
+
+        return parameter;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseExtensions.cs b/src/CoreEx.Database/DatabaseExtensions.cs
new file mode 100644
index 00000000..1b5b7093
--- /dev/null
+++ b/src/CoreEx.Database/DatabaseExtensions.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Database;
+
+/// <summary>
+/// Provides <see cref="IDatabase"/> and related extensions.
+/// </summary>
+public static partial class DatabaseExtensions { }
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseInvoker.cs b/src/CoreEx.Database/DatabaseInvoker.cs
deleted file mode 100644
index fe1864a5..00000000
--- a/src/CoreEx.Database/DatabaseInvoker.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using CoreEx.Results;
-using System;
-using System.Data.Common;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides the standard <see cref="Database{TConnection}"/> invoker functionality.
-    /// </summary>
-    /// <remarks>Catches any unhandled <see cref="DbException"/> and invokes <see cref="Database{TConnection}.OnDbException(DbException)"/> to handle before bubbling up.</remarks>
-    public class DatabaseInvoker : InvokerBase<IDatabase>
-    {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, IDatabase database, Func<InvokeArgs, TResult> func) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        protected override async Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, IDatabase database, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
-        {
-            try
-            {
-                return await base.OnInvokeAsync(invokeArgs, database, func, cancellationToken).ConfigureAwait(false);
-            }
-            catch (DbException dbex)
-            {
-                var eresult = database.HandleDbException(dbex);
-                if (eresult.HasValue && eresult.Value.IsFailure && eresult.Value.Error is CoreEx.Abstractions.IExtendedException)
-                {
-                    var dresult = default(TResult);
-                    if (dresult is IResult dir)
-                        return (TResult)dir.ToFailure(eresult.Value.Error);
-                    else
-                        eresult.Value.ThrowOnError();
-                }
-
-                throw;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseParameterCollection.cs b/src/CoreEx.Database/DatabaseParameterCollection.cs
index e9406fee..f29b9a54 100644
--- a/src/CoreEx.Database/DatabaseParameterCollection.cs
+++ b/src/CoreEx.Database/DatabaseParameterCollection.cs
@@ -1,183 +1,208 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+using CoreEx.Mapping.Converters;
 
-using CoreEx.Results;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-using System.Linq;
+namespace CoreEx.Database;
 
-namespace CoreEx.Database
+/// <summary>
+/// Provides a <see cref="DbParameter"/> collection used for a <see cref="DbCommand"/>.
+/// </summary>
+/// <param name="database">The <see cref="IDatabase"/>.</param>
+public sealed class DatabaseParameterCollection(IDatabase database) : ICollection<DbParameter>, IDatabaseParameters<DatabaseParameterCollection>
 {
+    private readonly List<DbParameter> _parameters = [];
+
     /// <summary>
-    /// Provides a <see cref="DbParameter"/> collection used for a <see cref="DbCommand"/>.
+    /// Gets the underlying <see cref="IDatabase"/>.
     /// </summary>
-    /// <param name="database">The <see cref="IDatabase"/>.</param>
-    public sealed class DatabaseParameterCollection(IDatabase database) : ICollection<DbParameter>, IDatabaseParameters<DatabaseParameterCollection>
+    public IDatabase Database { get; } = database.ThrowIfNull();
+
+    /// <inheritdoc/>
+    DatabaseParameterCollection IDatabaseParameters<DatabaseParameterCollection>.Parameters => this;
+
+    /// <inheritdoc/>
+    public int Count => _parameters.Count;
+
+    /// <inheritdoc/>
+    bool ICollection<DbParameter>.IsReadOnly => false;
+
+    /// <summary>
+    /// Indicates whether a <see cref="DbParameter"/> with the specified <paramref name="name"/> exists in the collection.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <returns><see langword="true"/> indicates that the parameter exists in the collection; otherwise, <see langword="false"/>.</returns>
+    public bool Contains(string name) => _parameters.Any(x => x.ParameterName == name);
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddParameter(string name, object? value = null, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        var p = Database.CreateParameter();
+        p.ParameterName = ParameterizeName(name);
+        p.Value = ConvertToDbValue(value, Database);
+        p.Direction = direction;
+        if (dbType.HasValue)
+            p.DbType = dbType.Value;
+
+        _parameters.Add(p);
+        return p;
+    }
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddParameter<T>(string name, T? value, DbType? dbType = null, ParameterDirection direction = ParameterDirection.Input)
     {
-        private readonly List<DbParameter> _parameters = [];
-
-        /// <summary>
-        /// Gets the underlying <see cref="IDatabase"/>.
-        /// </summary>
-        public IDatabase Database { get; } = database.ThrowIfNull(nameof(database));
-
-        /// <inheritdoc/>
-        DatabaseParameterCollection IDatabaseParameters<DatabaseParameterCollection>.Parameters => this;
-
-        /// <inheritdoc/>
-        public int Count => _parameters.Count;
-
-        /// <inheritdoc/>
-        bool ICollection<DbParameter>.IsReadOnly => false;
-
-        /// <summary>
-        /// Indicates whether a <see cref="DbParameter"/> with the specified <paramref name="name"/> exists in the collection.
-        /// </summary>
-        /// <param name="name">The parameter name.</param>
-        /// <returns><c>true</c> indicates that the parameter exists in the collection; otherwise, <c>false</c>.</returns>
-        public bool Contains(string name) => _parameters.Any(x => x.ParameterName == name);
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        public DbParameter AddParameter(string name, object? value, ParameterDirection direction = ParameterDirection.Input)
-        {
-            var p = Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null.");
-            p.ParameterName = ParameterizeName(name);
-            p.Value = value ?? DBNull.Value;
-            p.Direction = direction;
-
-            _parameters.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="dbType"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        public DbParameter AddParameter(string name, object? value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-        {
-            var p = Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null.");
-            p.ParameterName = ParameterizeName(name);
-            p.DbType = dbType;
-            p.Value = value ?? DBNull.Value;
-            p.Direction = direction;
-
-            _parameters.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="dbType"/>, <paramref name="size"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="size">The maximum size (in bytes).</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        public DbParameter AddParameter(string name, DbType dbType, int size, ParameterDirection direction = ParameterDirection.Input)
-        {
-            var p = Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null.");
-            p.ParameterName = ParameterizeName(name);
-            p.DbType = dbType;
-            p.Size = size;
-            p.Direction = direction;
-
-            _parameters.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds the named parameter and value serialized as a JSON <see cref="string"/> to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        /// <remarks>Where the <paramref name="value"/> is <see langword="null"/> then <see cref="DBNull.Value"/> will be used.</remarks>
-        public DbParameter AddJsonParameter(string name, object? value)
-        {
-            var p = Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null.");
-            p.ParameterName = ParameterizeName(name);
-            if (value is null)
-                p.Value = DBNull.Value;
-            else 
-                p.Value = Database.JsonSerializer.Serialize(value);
-
-            _parameters.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds an <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/> parameter.
-        /// </summary>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        public DbParameter AddReturnValueParameter()
-        {
-            var p = Database.Provider.CreateParameter() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateParameter)} returned a null.");
-            p.ParameterName = ParameterizeName(Database.DatabaseColumns.ReturnValueName);
-            p.DbType = DbType.Int32;
-            p.Direction = ParameterDirection.ReturnValue;
-
-            _parameters.Add(p);
-            return p;
-        }
-
-        /// <summary>
-        /// Adds a named parameter (<see cref="Extended.DatabaseColumns.ReselectRecordName"/>) to <paramref name="reselect"/> the data.
-        /// </summary>
-        /// <param name="reselect">Indicates whether to reselect after the operation.</param>
-        /// <returns>A <see cref="DbParameter"/>.</returns>
-        public DbParameter AddReselectRecordParam(bool reselect = true) => AddParameter(Database.DatabaseColumns.ReselectRecordName, reselect);
-
-        /// <summary>
-        /// Parameterizes the name by ensuring it starts with an '@' character.
-        /// </summary>
-        /// <param name="name">The parameter name.</param>
-        /// <returns>The parameterized name.</returns>
-        public static string ParameterizeName(string name) => name.ThrowIfNull(nameof(name)).StartsWith('@') ? name : $"@{name}";
-
-        /// <summary>
-        /// Gets or sets the <see cref="DbParameter"/> at the specified <paramref name="index"/>.
-        /// </summary>
-        /// <param name="index">The zero-based index.</param>
-        /// <returns>The <see cref="DbParameter"/>.</returns>
-        public DbParameter this[int index] => _parameters[index];
-
-        /// <inheritdoc/>
-        public void Add(DbParameter item) => _parameters.Add(item);
-
-        /// <summary>
-        /// Adds <see cref="DbParameter"/> <paramref name="list"/>.
-        /// </summary>
-        /// <param name="list">The <see cref="DbParameter"/> list to add.</param>
-        public void AddRange(IEnumerable<DbParameter> list) => _parameters.AddRange(list);
-
-        /// <inheritdoc/>
-        public void Clear() => _parameters.Clear();
-
-        /// <inheritdoc/>
-        public bool Contains(DbParameter item) => _parameters.Contains(item);
-
-        /// <inheritdoc/>
-        public void CopyTo(DbParameter[] array, int arrayIndex) => _parameters.CopyTo(array, arrayIndex);
-
-        /// <inheritdoc/>
-        public bool Remove(DbParameter item) => _parameters.Remove(item);
-
-        /// <inheritdoc/>
-        public IEnumerator<DbParameter> GetEnumerator() => _parameters.GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        var p = Database.CreateParameter();
+        p.ParameterName = ParameterizeName(name);
+        p.Value = ConvertToDbValue(value, Database);
+        p.Direction = direction;
+        if (dbType.HasValue)
+            p.DbType = dbType.Value;
+
+        _parameters.Add(p);
+        return p;
     }
+
+    /// <summary>
+    /// Adds the named parameter and value, using the specified <paramref name="dbType"/>, <paramref name="size"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
+    /// <param name="size">The optional maximum size (in bytes).</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddParameter(string name, DbType dbType, int? size = null, ParameterDirection direction = ParameterDirection.Input)
+    {
+        var p = Database.CreateParameter();
+        p.ParameterName = ParameterizeName(name);
+        p.DbType = dbType;
+        p.Direction = direction;
+        if (size.HasValue)
+            p.Size = size.Value;
+
+        _parameters.Add(p);
+        return p;
+    }
+
+    /// <summary>
+    /// Adds the named <paramref name="wildcard"/> parameter to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="wildcard">The wildcard value.</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddWildcardParameter(string name, string? wildcard) => AddParameter(name, wildcard is null ? null : Database.Wildcard.Replace(wildcard));
+
+    /// <summary>
+    /// Adds the named parameter and value serialized as a JSON <see cref="string"/> to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <param name="value">The parameter value.</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    /// <remarks>Where the <paramref name="value"/> is <see langword="null"/> then <see cref="DBNull.Value"/> will be used.</remarks>
+    public DbParameter AddJsonParameter<T>(string name, T? value)
+    {
+        var p = Database.CreateParameter();
+        p.ParameterName = ParameterizeName(name);
+        if (value is null)
+            p.Value = DBNull.Value;
+        else
+            p.Value = JsonSerializer.Serialize(value, Database.JsonSerializerOptions);
+
+        _parameters.Add(p);
+        return p;
+    }
+
+    /// <summary>
+    /// Adds an <see cref="int"/> <see cref="ParameterDirection.ReturnValue"/> parameter to the <see cref="DbCommand.Parameters"/>
+    /// </summary>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddReturnValueParameter()
+    {
+        var p = Database.CreateParameter();
+        p.ParameterName = ParameterizeName(Database.NamedColumns.ReturnValueName);
+        p.DbType = DbType.Int32;
+        p.Direction = ParameterDirection.ReturnValue;
+
+        _parameters.Add(p);
+        return p;
+    }
+
+    /// <summary>
+    /// Adds a named parameter (<see cref="DatabaseColumns.ReselectRecordName"/>) to <paramref name="reselect"/> the data to the <see cref="DbCommand.Parameters"/>
+    /// </summary>
+    /// <param name="reselect">Indicates whether to reselect after the operation.</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddReselectRecordParam(bool reselect = true) => AddParameter(Database.NamedColumns.ReselectRecordName, reselect);
+
+    /// <summary>
+    /// Adds a named parameter (<see cref="DatabaseColumns.RowVersionName"/>) using the <see cref="IReadOnlyETag.ETag"/> <see cref="IDatabase.RowVersionConverter"/> to the <see cref="DbCommand.Parameters"/>.
+    /// </summary>
+    /// <param name="value">The <see langword="string"/>-based <see cref="IReadOnlyETag.ETag"/> representation of the row version.</param>
+    /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter AddRowVersionParam(string? value, ParameterDirection direction = ParameterDirection.Input) 
+        => AddParameter(Database.NamedColumns.RowVersionName, Database.RowVersionConverter.ConvertToDestination(value), direction: direction);
+
+    /// <summary>
+    /// Parameterizes the name by ensuring it starts with an '@' character.
+    /// </summary>
+    /// <param name="name">The parameter name.</param>
+    /// <returns>The parameterized name.</returns>
+    public static string ParameterizeName(string name) => name.ThrowIfNull().StartsWith('@') ? name : $"@{name}";
+
+    /// <summary>
+    /// Converts the specified <paramref name="value"/> to a database-compatible value.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to convert.</param>
+    /// <param name="database">The <see cref="IDatabase"/>.</param>
+    /// <returns>The converted database-compatible value.</returns>
+    public static object? ConvertToDbValue<T>(T value, IDatabase database) => value is null
+        ? DBNull.Value
+        : (value is DateTimeOffset dto && database.DateTimeOffsetTransform ? dto.ToUniversalTime() // Convert to UTC. https://www.tinybird.co/blog/database-timestamps-timezone
+            : (value is JsonElement je ? JsonElementStringConverter.Default.ConvertToDestination(je) : value));
+
+    /// <summary>
+    /// Gets or sets the <see cref="DbParameter"/> at the specified <paramref name="index"/>.
+    /// </summary>
+    /// <param name="index">The zero-based index.</param>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    public DbParameter this[int index] => _parameters[index];
+
+    /// <inheritdoc/>
+    public void Add(DbParameter item) => _parameters.Add(item);
+
+    /// <summary>
+    /// Adds <see cref="DbParameter"/> <paramref name="list"/>.
+    /// </summary>
+    /// <param name="list">The <see cref="DbParameter"/> list to add.</param>
+    public void AddRange(IEnumerable<DbParameter> list) => _parameters.AddRange(list);
+
+    /// <inheritdoc/>
+    public void Clear() => _parameters.Clear();
+
+    /// <inheritdoc/>
+    public bool Contains(DbParameter item) => _parameters.Contains(item);
+
+    /// <inheritdoc/>
+    public void CopyTo(DbParameter[] array, int arrayIndex) => _parameters.CopyTo(array, arrayIndex);
+
+    /// <inheritdoc/>
+    public bool Remove(DbParameter item) => _parameters.Remove(item);
+
+    /// <inheritdoc/>
+    public IEnumerator<DbParameter> GetEnumerator() => _parameters.GetEnumerator();
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseQueryMapper.cs b/src/CoreEx.Database/DatabaseQueryMapper.cs
deleted file mode 100644
index acd7c220..00000000
--- a/src/CoreEx.Database/DatabaseQueryMapper.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Enables a database query only <see cref="IDatabaseMapper{T}"/>.
-    /// </summary>
-    /// <typeparam name="T">The resulting <see cref="Type"/>.</typeparam>
-    public abstract class DatabaseQueryMapper<T> : IDatabaseMapper<T>
-    {
-        /// <inheritdoc/>
-        /// <remarks>This method will result in a <see cref="NotSupportedException"/>.</remarks>
-        public abstract T MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <inheritdoc/>
-        /// <remarks>This method will result in a <see cref="NotSupportedException"/>.</remarks>
-        void IDatabaseMapper<T>.MapToDb(T? value, DatabaseParameterCollection parameters, OperationTypes operationType) => throw new NotSupportedException();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseRecord.cs b/src/CoreEx.Database/DatabaseRecord.cs
index ccc6e718..e88dd30e 100644
--- a/src/CoreEx.Database/DatabaseRecord.cs
+++ b/src/CoreEx.Database/DatabaseRecord.cs
@@ -1,94 +1,183 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+using CoreEx.Mapping.Converters;
 
-using CoreEx.Entities;
-using System;
-using System.Data.Common;
+namespace CoreEx.Database;
 
-namespace CoreEx.Database
+/// <summary>
+/// Encapsulates the <see cref="DbDataReader"/> to provide requisite column value capabilities.
+/// </summary>
+/// <param name="database">The owning <see cref="IDatabase"/>.</param>
+/// <param name="dataReader">The underlying <see cref="DbDataReader"/>.</param>
+public class DatabaseRecord(IDatabase database, DbDataReader dataReader)
 {
+    private Dictionary<string, int>? _fields;
+
+    /// <summary>
+    /// Gets the owning <see cref="IDatabase"/>.
+    /// </summary>
+    public IDatabase Database { get; } = database.ThrowIfNull();
+
     /// <summary>
-    /// Encapsulates the <see cref="DbDataReader"/> to provide requisite column value capabilities.
+    /// Gets the underlying <see cref="DbDataReader"/>.
     /// </summary>
-    /// <param name="database">The owning <see cref="IDatabase"/>.</param>
-    /// <param name="dataReader">The underlying <see cref="DbDataReader"/>.</param>
-    public class DatabaseRecord(IDatabase database, DbDataReader dataReader)
+    public DbDataReader DataReader { get; } = dataReader.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the named column value.
+    /// </summary>
+    /// <param name="columnName">The column name.</param>
+    /// <returns>The value.</returns>
+    public object? GetValue(string columnName) => GetValue(DataReader.GetOrdinal(columnName.ThrowIfNull()));
+
+    /// <summary>
+    /// Gets the specified column value.
+    /// </summary>
+    /// <param name="ordinal">The ordinal index.</param>
+    /// <returns>The value.</returns>
+    public object? GetValue(int ordinal)
     {
-        /// <summary>
-        /// Gets the underlying <see cref="IDatabase"/>.
-        /// </summary>
-        public IDatabase Database { get; } = database.ThrowIfNull(nameof(database));
-
-        /// <summary>
-        /// Gets the underlying <see cref="DbDataReader"/>.
-        /// </summary>
-        public DbDataReader DataReader { get; } = dataReader.ThrowIfNull(nameof(dataReader));
-
-        /// <summary>
-        /// Gets the named column value.
-        /// </summary>
-        /// <param name="columnName">The column name.</param>
-        /// <returns>The value.</returns>
-        public object? GetValue(string columnName) => GetValue(DataReader.GetOrdinal(columnName.ThrowIfNull(nameof(columnName))));
-
-        /// <summary>
-        /// Gets the specified column value.
-        /// </summary>
-        /// <param name="ordinal">The ordinal index.</param>
-        /// <returns>The value.</returns>
-        public object? GetValue(int ordinal)
-        {
-            if (DataReader.IsDBNull(ordinal))
-                return default;
+        // Handle DBNull.
+        if (DataReader.IsDBNull(ordinal))
+            return default;
 
-            var val = DataReader.GetValue(ordinal);
-            return val is DateTime dt ? Cleaner.Clean(dt, Database.DateTimeTransform) : val;
-        }
+        // Good to go!
+        var val = DataReader.GetValue(ordinal);
+        return val is DateTime dt ? Cleaner.Clean(dt, Database.DateTimeTransform) : val;
+    }
 
-        /// <summary>
-        /// Gets the named column value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="columnName">The column name.</param>
-        /// <returns>The value.</returns>
-        public T GetValue<T>(string columnName) => GetValue<T>(DataReader.GetOrdinal(columnName.ThrowIfNull(nameof(columnName))));
-
-        /// <summary>
-        /// Gets the specified column value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="ordinal">The ordinal index.</param>
-        /// <returns>The value.</returns>
-        public T GetValue<T>(int ordinal)
-        {
-            if (DataReader.IsDBNull(ordinal))
-                return default!;
+    /// <summary>
+    /// Gets the named column value.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="columnName">The column name.</param>
+    /// <returns>The value.</returns>
+    public T GetValue<T>(string columnName) => GetValue<T>(DataReader.GetOrdinal(columnName.ThrowIfNull()));
 
-            T val = DataReader.GetFieldValue<T>(ordinal);
-            return val is DateTime dt ? (T)Convert.ChangeType(Cleaner.Clean(dt, Database.DateTimeTransform), typeof(DateTime), System.Globalization.CultureInfo.InvariantCulture) : val;
-        }
+    /// <summary>
+    /// Gets the specified column value.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="ordinal">The ordinal index.</param>
+    /// <returns>The value.</returns>
+    public T GetValue<T>(int ordinal)
+    {
+        // Handle DBNull.
+        if (DataReader.IsDBNull(ordinal))
+            return default!;
+
+        // Handle Nullable<DateOnly>/Nullable<TimeOnly> as it is not directly supported by ADO.NET.
+        if (typeof(T) == typeof(Nullable<DateOnly>))
+            return Internal.Cast<DateOnly, T>(DataReader.GetFieldValue<DateOnly>(ordinal));
+        else if (typeof(T) == typeof(Nullable<TimeOnly>))
+            return Internal.Cast<TimeOnly, T>(DataReader.GetFieldValue<TimeOnly>(ordinal));
+        else if (typeof(T) == typeof(JsonElement))
+            return Internal.Cast<JsonElement?, T>(JsonElementStringConverter.Default.ConvertToSource(DataReader.GetFieldValue<string>(ordinal)));
+
+        // Good to go!
+        T val = DataReader.GetFieldValue<T>(ordinal);
+        return val is DateTime dt ? Internal.Cast<DateTime, T>(Cleaner.Clean(dt, Database.DateTimeTransform)) : val;
+    }
 
-        /// <summary>
-        /// Indicates whether the named column is <see cref="DBNull"/>.
-        /// </summary>
-        /// <param name="columnName">The column name.</param>
-        /// <param name="ordinal">The corresponding ordinal for the column name.</param>
-        /// <returns><c>true</c> indicates that the column value has a <see cref="DBNull"/> value; otherwise, <c>false</c>.</returns>
-        public bool IsDBNull(string columnName, out int ordinal)
+    /// <summary>
+    /// Tries to get the specified column value.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="columnName">The column name.</param>
+    /// <param name="val">The corresponding value where found.</param>
+    /// <returns><see langword="true"/> indicates that the column was found; otherwise, <see langword="false"/>.</returns>
+    public bool TryGetValue<T>(string columnName, out T val)
+    {
+        if (TryGetOrdinal(columnName, out var ordinal))
         {
-            ordinal = DataReader.GetOrdinal(columnName.ThrowIfNull(nameof(columnName)));
-            return DataReader.IsDBNull(ordinal);
+            val = GetValue<T>(ordinal);
+            return true;
         }
 
-        /// <summary>
-        /// Gets the named <c>RowVersion</c> column as a <see cref="string"/>.
-        /// </summary>
-        /// <param name="columnName">The name of the column.</param>
-        /// <returns>The resultant value.</returns>
-        /// <remarks>The <b>RowVersion</b> column will be converted to a <see cref="string"/> using the <see cref="IDatabase.RowVersionConverter"/>.</remarks>
-        public string GetRowVersion(string columnName)
+        val = default!;
+        return false;
+    }
+
+    /// <summary>
+    /// Gets the specified column value or the default value where not found.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="columnName">The column name.</param>
+    /// <param name="defaultValue">The optional default value.</param>
+    /// <returns>Tthe specified column value or the default value where not found.</returns>
+    public T GetValueOrDefault<T>(string columnName, T defaultValue = default!)
+    {
+        if (TryGetOrdinal(columnName, out var ordinal))
+            return GetValue<T>(ordinal);
+
+        return defaultValue;
+    }
+
+    /// <summary>
+    /// Gets the named column value as JSON deserialized to the specified <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="columnName">The column name.</param>
+    /// <returns>The value.</returns>
+    public T? GetValueFromJson<T>(string columnName) => GetValueFromJson<T>(DataReader.GetOrdinal(columnName.ThrowIfNull()));
+
+    /// <summary>
+    /// Gets the specified column value as JSON deserialized to the specified <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="ordinal">The ordinal index.</param>
+    /// <returns>The value.</returns>
+    public T? GetValueFromJson<T>(int ordinal)
+    {
+        if (DataReader.IsDBNull(ordinal))
+            return default!;
+
+        var json = DataReader.GetFieldValue<string>(ordinal);
+        return json is null ? default! : JsonSerializer.Deserialize<T>(json, Database.JsonSerializerOptions) ?? default!;
+    }
+
+    /// <summary>
+    /// Indicates whether the named column is <see cref="DBNull"/>.
+    /// </summary>
+    /// <param name="columnName">The column name.</param>
+    /// <param name="ordinal">The corresponding ordinal for the column name.</param>
+    /// <returns><see langword="true"/> indicates that the column value has a <see cref="DBNull"/> value; otherwise, <see langword="false"/>.</returns>
+    public bool IsDBNull(string columnName, out int ordinal)
+    {
+        ordinal = DataReader.GetOrdinal(columnName.ThrowIfNull());
+        return DataReader.IsDBNull(ordinal);
+    }
+
+    /// <summary>
+    /// Gets the named <c>RowVersion</c> column as a <see cref="string"/>.
+    /// </summary>
+    /// <param name="columnName">The name of the column; otherwise, uses <see cref="DatabaseColumns.RowVersionName"/>.</param>
+    /// <returns>The resultant value.</returns>
+    /// <remarks>The <b>RowVersion</b> column will be converted to a <see cref="string"/> using the <see cref="IDatabase.RowVersionConverter"/>.</remarks>
+    public string? GetRowVersion(string? columnName = null)
+    {
+        var i = DataReader.GetOrdinal(!string.IsNullOrEmpty(columnName) ? columnName : Database.NamedColumns.RowVersionName);
+        var v = DataReader.GetValue(i);
+        return Database.RowVersionConverter.ConvertToSource(v) ?? null;
+    }
+
+    /// <summary>
+    /// Tries to get the ordinal for the specified column name.
+    /// </summary>
+    /// <param name="columnName">The name of the column.</param>
+    /// <param name="ordinal">The corresponding ordinal index where found.</param>
+    /// <returns><see langword="true"/> indicates that the column was found; otherwise, <see langword="false"/>.</returns>
+    public bool TryGetOrdinal(string columnName, out int ordinal)
+    {
+        // Load the fields dictionary on first use.
+        if (_fields is null)
         {
-            var i = DataReader.GetOrdinal(columnName.ThrowIfNull(nameof(columnName)));
-            return (string)(Database.RowVersionConverter.ConvertToSource(DataReader.GetFieldValue<byte[]>(i)) ?? string.Empty);
+            _fields = [];
+            for (int i = 0; i < DataReader.FieldCount; i++)
+            {
+                _fields[DataReader.GetName(i)] = i;
+            }
         }
+
+        // Try to get the ordinal.
+        return _fields.TryGetValue(columnName, out ordinal);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseRecordMapper.cs b/src/CoreEx.Database/DatabaseRecordMapper.cs
deleted file mode 100644
index 3d586b85..00000000
--- a/src/CoreEx.Database/DatabaseRecordMapper.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides a per <see cref="DatabaseRecord"/> mapper that simulates a <see cref="IDatabaseMapper{T}.MapFromDb(DatabaseRecord, OperationTypes)"/> by invoking the function passed into the constructor.
-    /// </summary>
-    /// <param name="func">The <see cref="DatabaseRecord"/> mapping function.</param>
-    internal class DatabaseRecordMapper<T>(Func<DatabaseRecord, T> func) : IDatabaseMapper<T>
-    {
-        private readonly Func<DatabaseRecord, T> _func = func.ThrowIfNull(nameof(func));
-
-        /// <inheritdoc/>
-        T? IDatabaseMapper<T>.MapFromDb(DatabaseRecord record, OperationTypes operationType) => _func(record);
-
-        /// <inheritdoc/>
-        /// <remarks>This method will result in a <see cref="NotSupportedException"/>.</remarks>
-        void IDatabaseMapper<T>.MapToDb(T? value, DatabaseParameterCollection parameters, OperationTypes operationType) => throw new NotSupportedException();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseServiceCollectionExtensions.cs b/src/CoreEx.Database/DatabaseServiceCollectionExtensions.cs
deleted file mode 100644
index 14a26b82..00000000
--- a/src/CoreEx.Database/DatabaseServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Database;
-using CoreEx.Database.HealthChecks;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extension methods.
-    /// </summary>
-    public static class DatabaseServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds an <see cref="IDatabase"/> as a scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="create">The function to create the <see cref="IDatabase"/> instance.</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="DatabaseHealthCheck{TDatabase}"/> should be configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddDatabase(this IServiceCollection services, Func<IServiceProvider, IDatabase> create, bool healthCheck = true)
-        {
-            services.AddScoped(sp => create(sp) ?? throw new InvalidOperationException($"An {nameof(IDatabase)} instance must be instantiated."));
-            return AddHealthCheck(services, healthCheck, null);
-        }
-
-        /// <summary>
-        /// Adds an <see cref="IDatabase"/> as a scoped service including a corresponding health check.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="create">The function to create the <see cref="IDatabase"/> instance.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>database</c>'.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddDatabase(this IServiceCollection services, Func<IServiceProvider, IDatabase> create, string? healthCheckName)
-        {
-            services.AddScoped(sp => create(sp) ?? throw new InvalidOperationException($"An {nameof(IDatabase)} instance must be instantiated."));
-            return AddHealthCheck(services, true, healthCheckName);
-        }
-
-        /// <summary>
-        /// Adds an <see cref="IDatabase"/> as a scoped service.
-        /// </summary>
-        /// <typeparam name="TDb">The <see cref="IDatabase"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="DatabaseHealthCheck{TDatabase}"/> should be configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddDatabase<TDb>(this IServiceCollection services, bool healthCheck = true) where TDb : class, IDatabase
-        {
-            services.AddScoped<IDatabase, TDb>();
-            return AddHealthCheck(services, healthCheck, null);
-        }
-
-        /// <summary>
-        /// Adds an <see cref="IDatabase"/> as a scoped service including a corresponding health check.
-        /// </summary>
-        /// <typeparam name="TDb">The <see cref="IDatabase"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>database</c>'.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddDatabase<TDb>(this IServiceCollection services, string? healthCheckName) where TDb : class, IDatabase
-        {
-            services.AddScoped<IDatabase, TDb>();
-            return AddHealthCheck(services, true, healthCheckName);
-        }
-
-        /// <summary>
-        /// Adds the <see cref="DatabaseHealthCheck{TDatabase}"/> where configured to do so.
-        /// </summary>
-        private static IServiceCollection AddHealthCheck(this IServiceCollection services, bool healthCheck, string? healthCheckName)
-        {
-            if (healthCheck)
-                services.AddHealthChecks().AddTypeActivatedCheck<DatabaseHealthCheck<IDatabase>>(healthCheckName ?? "database", HealthStatus.Unhealthy, tags: default!, timeout: TimeSpan.FromSeconds(30));
-
-            return services;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/DatabaseWildcard.cs b/src/CoreEx.Database/DatabaseWildcard.cs
deleted file mode 100644
index 455d9090..00000000
--- a/src/CoreEx.Database/DatabaseWildcard.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Wildcards;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides database <see cref="Wildcards.Wildcard"/> capabilities.
-    /// </summary>
-    public class DatabaseWildcard
-    {
-        /// <summary>
-        /// Gets the default database multi (zero or more) wildcard character.
-        /// </summary>
-        public const char MultiWildcardCharacter = '%';
-
-        /// <summary>
-        /// Gets the default database single wildcard character.
-        /// </summary>
-        public const char SingleWildcardCharacter = '_';
-
-        /// <summary>
-        /// Gets the default list of characters that are to be escaped.
-        /// </summary>
-        /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/t-sql/language-elements/like-transact-sql"/> for more detail on escape characters.</remarks>
-        public static readonly char[] DefaultCharactersToEscape = ['%', '_', '['];
-
-        /// <summary>
-        /// Gets the default escaping format string when one of the <see cref="CharactersToEscape"/> is found.
-        /// </summary>
-        public const string DefaultEscapeFormat = "[{0}]";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseWildcard"/> class.
-        /// </summary>
-        /// <param name="wildcard">The <see cref="Wildcards.Wildcard"/> configuration.</param>
-        /// <param name="multiWildcard">The database multi (zero or more) wildcard character.</param>
-        /// <param name="singleWildcard">The database single wildcard character.</param>
-        /// <param name="charactersToEscape">The list of characters that are to be escaped (defaults to <see cref="DefaultCharactersToEscape"/>).</param>
-        /// <param name="escapeFormat">The escaping format string when one of the <see cref="CharactersToEscape"/> is found (defaults to <see cref="DefaultEscapeFormat"/>).</param>
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Somehow the compiler thinks CharactersToEscape can be null; so not true.
-        public DatabaseWildcard(Wildcard? wildcard = null, char multiWildcard = MultiWildcardCharacter, char singleWildcard = SingleWildcardCharacter, char[]? charactersToEscape = null, string? escapeFormat = null)
-#pragma warning restore CS8618
-        {
-            Wildcard = wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
-            MultiWildcard = multiWildcard;
-            SingleWildcard = singleWildcard;
-            CharactersToEscape = new List<char>(charactersToEscape ?? DefaultCharactersToEscape);
-            EscapeFormat = escapeFormat ?? DefaultEscapeFormat;
-
-            if (MultiWildcard != char.MinValue && SingleWildcard != char.MinValue && MultiWildcard == SingleWildcard)
-                throw new ArgumentException("A Wildcard cannot be configured with the same character for the MultiWildcard and SingleWildcard.", nameof(multiWildcard));
-
-            if (Wildcard.Supported.HasFlag(WildcardSelection.MultiWildcard) && multiWildcard == char.MinValue)
-                throw new ArgumentException("A Wildcard that supports MultiWildcard must also define the database MultiWildcard character.");
-
-            if (Wildcard.Supported.HasFlag(WildcardSelection.SingleWildcard) && singleWildcard == char.MinValue)
-                throw new ArgumentException("A Wildcard that supports SingleWildcard must also define the database SingleWildcard character.");
-
-            if (CharactersToEscape != null && CharactersToEscape.Count > 0 && string.IsNullOrEmpty(EscapeFormat))
-                throw new InvalidOperationException("The EscapeFormat must be provided where CharactersToEscape have been defined.");
-        }
-
-        /// <summary>
-        /// Gets or sets the underlying <see cref="Wildcards.Wildcard"/> configuration.
-        /// </summary>
-        public Wildcard Wildcard { get; }
-
-        /// <summary>
-        /// Gets or sets the database multi (zero or more) wildcard character.
-        /// </summary>
-        public char MultiWildcard { get; }
-
-        /// <summary>
-        /// Gets or sets the database single wildcard character.
-        /// </summary>
-        public char SingleWildcard { get; }
-
-        /// <summary>
-        /// Gets or sets the list of characters that are to be escaped.
-        /// </summary>
-        public List<char> CharactersToEscape { get; }
-
-        /// <summary>
-        /// Gets or sets the escaping format when one of the <see cref="CharactersToEscape"/> is found.
-        /// </summary>
-        /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/t-sql/language-elements/like-transact-sql"/> for more detail on escape characters.</remarks>
-        public string EscapeFormat { get; }
-
-        /// <summary>
-        /// Replaces the wildcard text with the appropriate database representative characters to enable the corresponding SQL LIKE wildcard.
-        /// </summary>
-        /// <param name="text">The wildcard text.</param>
-        /// <returns>The SQL LIKE wildcard.</returns>
-        public string? Replace(string? text)
-        {
-            var wc = Wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
-            var wr = wc.Parse(text).ThrowOnError();
-
-            if (wr.Selection.HasFlag(WildcardSelection.None) || (wr.Selection.HasFlag(WildcardSelection.Single) && wr.Selection.HasFlag(WildcardSelection.MultiWildcard)))
-                return new string(MultiWildcard, 1);
-
-            var sb = new StringBuilder();
-            foreach (var c in wr.Text!)
-            {
-                if (wr.Selection.HasFlag(WildcardSelection.MultiWildcard) && c == Wildcard.MultiWildcardCharacter)
-                    sb.Append(MultiWildcard);
-                else if (wr.Selection.HasFlag(WildcardSelection.SingleWildcard) && c == Wildcard.SingleWildcardCharacter)
-                    sb.Append(SingleWildcard);
-                else if (CharactersToEscape != null && CharactersToEscape.Contains(c))
-                    sb.Append(string.Format(System.Globalization.CultureInfo.InvariantCulture, EscapeFormat, c));
-                else
-                    sb.Append(c);
-            }
-
-            return Cleaner.Clean(sb.ToString(), StringTrim.None, wc.Transform);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/DatabaseArgs.cs b/src/CoreEx.Database/Extended/DatabaseArgs.cs
deleted file mode 100644
index 4491d2d2..00000000
--- a/src/CoreEx.Database/Extended/DatabaseArgs.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database.Extended
-{
-    /// <summary>
-    /// Provides the extended <see cref="IDatabase"/> arguments.
-    /// </summary>
-    public struct DatabaseArgs
-    {
-        private readonly IDatabaseMapper? _mapper = null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseArgs"/> struct.
-        /// </summary>
-        public DatabaseArgs() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseArgs"/> struct.
-        /// </summary>
-        /// <param name="template">The template <see cref="DatabaseArgs"/> to copy from.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper"/>.</param>
-        public DatabaseArgs(DatabaseArgs template, IDatabaseMapper mapper)
-        {
-            _mapper = mapper.ThrowIfNull(nameof(mapper));
-            Refresh = template.Refresh;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseArgs"/> struct.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IDatabaseMapper"/>.</param>
-        public DatabaseArgs(IDatabaseMapper mapper) => _mapper = mapper.ThrowIfNull(nameof(mapper));
-
-        /// <summary>
-        /// Gets the <see cref="IDatabaseMapper"/>.
-        /// </summary>
-        public readonly IDatabaseMapper Mapper => _mapper ?? throw new InvalidOperationException("Mapper must have been specified for it to be referenced.");
-
-        /// <summary>
-        /// Indicates whether the <see cref="Mapper"/> has been specified.
-        /// </summary>
-        public readonly bool HasMapper => _mapper != null;
-
-        /// <summary>
-        /// Indicates whether the data should be refreshed (reselected where applicable) after a <b>save</b> operation (defaults to <c>true</c>).
-        /// </summary>
-        public bool Refresh { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether the result should be <see cref="Entities.Cleaner.Clean{T}(T)">cleaned up</see>.
-        /// </summary>
-        public bool CleanUpResult { get; set; } = false;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/DatabaseColumns.cs b/src/CoreEx.Database/Extended/DatabaseColumns.cs
index be4c0ab0..d5486c48 100644
--- a/src/CoreEx.Database/Extended/DatabaseColumns.cs
+++ b/src/CoreEx.Database/Extended/DatabaseColumns.cs
@@ -1,109 +1,159 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Database.Extended;
 
-using CoreEx.Entities;
-using CoreEx.RefData;
-
-namespace CoreEx.Database.Extended
+/// <summary>
+/// Represents the standard database column and/or parameters names.
+/// </summary>
+/// <remarks>These are used internally to map .NET properties to/from database column and/or parameter names.</remarks>
+public record class DatabaseColumns
 {
     /// <summary>
-    /// Represents the standard database column names.
-    /// </summary>
-    /// <remarks>These are used internally to map .NET properties to database column names.</remarks>
-    public class DatabaseColumns
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="ChangeLog.CreatedDate"/> column name (defaults to <see cref="ChangeLog.CreatedDate"/>).
-        /// </summary>
-        public string CreatedDateName { get; set; } = nameof(ChangeLog.CreatedDate);
-
-        /// <summary>
-        /// Gets or sets the <see cref="ChangeLog.CreatedBy"/> column name (defaults to <see cref="ChangeLog.CreatedBy"/>).
-        /// </summary>
-        public string CreatedByName { get; set; } = nameof(ChangeLog.CreatedBy);
-
-        /// <summary>
-        /// Gets or sets the <see cref="ChangeLog.UpdatedDate"/> column name (defaults to <see cref="ChangeLog.UpdatedDate"/>).
-        /// </summary>
-        public string UpdatedDateName { get; set; } = nameof(ChangeLog.UpdatedDate);
-
-        /// <summary>
-        /// Gets or sets the <see cref="ChangeLog.UpdatedBy"/> column name (defaults to <see cref="ChangeLog.UpdatedBy"/>).
-        /// </summary>
-        public string UpdatedByName { get; set; } = nameof(ChangeLog.UpdatedBy);
-
-        /// <summary>
-        /// Gets or sets the '<c>ReselectRecord</c>' column name (defaults to '<c>ReselectRecord</c>'").
-        /// </summary>
-        public string ReselectRecordName { get; set; } = "ReselectRecord";
-
-        /// <summary>
-        /// Gets or sets the <see cref="PagingArgs.Skip"/> column name (defaults to '<c>PagingSkip</c>'").
-        /// </summary>
-        public string PagingSkipName { get; set; } = "PagingSkip";
-
-        /// <summary>
-        /// Gets or sets the <see cref="PagingArgs.Take"/> column name (defaults to '<c>PagingTake</c>'").
-        /// </summary>
-        public string PagingTakeName { get; set; } = "PagingTake";
-
-        /// <summary>
-        /// Gets or sets the <see cref="PagingArgs.IsGetCount"/> column name (defaults to '<c>PagingCount</c>'").
-        /// </summary>
-        public string PagingCountName { get; set; } = "PagingCount";
-
-        /// <summary>
-        /// Gets or sets the '<c>RowVersion</c>' column name (defaults to '<c>RowVersion</c>'").
-        /// </summary>
-        public string RowVersionName { get; set; } = "RowVersion";
-
-        /// <summary>
-        /// Gets or sets the <see cref="IETag.ETag"/> database column name (defaults to '<c>RowVersion</c>'").
-        /// </summary>
-        public string ETagName { get; set; } = "RowVersion";
-
-        /// <summary>
-        /// Gets or sets the '<c>ReturnValue</c>' column name.
-        /// </summary>
-        public string ReturnValueName { get; set; } = "ReturnValue";
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> database column name (defaults to <see cref="IIdentifier.Id"/>).
-        /// </summary>
-        public string RefDataIdName { get; set; } = nameof(IReferenceData.Id);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.Code"/> database column name (defaults to <see cref="IReferenceData.Code"/>).
-        /// </summary>
-        public string RefDataCodeName { get; set; } = nameof(IReferenceData.Code);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.Text"/> database column name (defaults to <see cref="IReferenceData.Text"/>).
-        /// </summary>
-        public string RefDataTextName { get; set; } = nameof(IReferenceData.Text);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.Description"/> database column name (defaults to <see cref="IReferenceData.Description"/>).
-        /// </summary>
-        public string RefDataDescriptionName { get; set; } = nameof(IReferenceData.Description);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.SortOrder"/> database column name (defaults to <see cref="IReferenceData.SortOrder"/>).
-        /// </summary>
-        public string RefDataSortOrderName { get; set; } = nameof(IReferenceData.SortOrder);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.IsActive"/> database column name (defaults to <see cref="IReferenceData.IsActive"/>).
-        /// </summary>
-        public string RefDataIsActiveName { get; set; } = nameof(IReferenceData.IsActive);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.StartDate"/> database column name (defaults to <see cref="IReferenceData.StartDate"/>).
-        /// </summary>
-        public string RefDataStartDateName { get; set; } = nameof(IReferenceData.StartDate);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData.EndDate"/> database column name (defaults to <see cref="IReferenceData.EndDate"/>).
-        /// </summary>
-        public string RefDataEndDateName { get; set; } = nameof(IReferenceData.EndDate);
-    }
+    /// Gets or sets the <see cref="ChangeLog.CreatedOn"/> column name.
+    /// </summary>
+    public string CreatedOnName { get; init; } = nameof(ChangeLog.CreatedOn);
+
+    /// <summary>
+    /// Gets or sets the <see cref="ChangeLog.CreatedBy"/> column name.
+    /// </summary>
+    public string CreatedByName { get; init; } = nameof(ChangeLog.CreatedBy);
+
+    /// <summary>
+    /// Gets or sets the <see cref="ChangeLog.UpdatedOn"/> column name.
+    /// </summary>
+    public string UpdatedOnName { get; init; } = nameof(ChangeLog.UpdatedOn);
+
+    /// <summary>
+    /// Gets or sets the <see cref="ChangeLog.UpdatedBy"/> column name.
+    /// </summary>
+    public string UpdatedByName { get; init; } = nameof(ChangeLog.UpdatedBy);
+
+    /// <summary>
+    /// Gets or sets the '<c>ReselectRecord</c>' parameter name.
+    /// </summary>
+    public string ReselectRecordName { get; init; } = "ReselectRecord";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.Skip"/> parameter name.
+    /// </summary>
+    public string PagingSkipName { get; init; } = "PagingSkip";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.Take"/> parameter name.
+    /// </summary>
+    public string PagingTakeName { get; init; } = "PagingTake";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.IsCountRequested"/> parameter name.
+    /// </summary>
+    public string PagingCountName { get; init; } = "PagingCount";
+
+    /// <summary>
+    /// Gets or sets the '<c>RowVersion</c>' (ETag) column name.
+    /// </summary>
+    /// <remarks>Also see <see cref="IReadOnlyETag"/>.</remarks>
+    public string RowVersionName { get; init; } = "RowVersion";
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReadOnlyTenantId.TenantId"/> database column name.
+    /// </summary>
+    public string TenantIdName { get; init; } = "TenantId";
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReadOnlyLogicallyDeleted.IsDeleted"/> database column name.
+    /// </summary>
+    public string IsDeletedName { get; init; } = "IsDeleted";
+
+    /// <summary>
+    /// Gets or sets the '<c>ReturnValue</c>' parameter name.
+    /// </summary>
+    public string ReturnValueName { get; init; } = "ReturnValue";
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData"/> <see cref="IReferenceData.Id"/> database column name (defaults to <see cref="IReferenceData.Id"/>).
+    /// </summary>
+    public string RefDataIdName { get; init; } = nameof(IReferenceData.Id);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.Code"/> database column name (defaults to <see cref="IReferenceData.Code"/>).
+    /// </summary>
+    public string RefDataCodeName { get; init; } = nameof(IReferenceData.Code);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.Text"/> database column name (defaults to <see cref="IReferenceData.Text"/>).
+    /// </summary>
+    public string RefDataTextName { get; init; } = nameof(IReferenceData.Text);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.Description"/> database column name (defaults to <see cref="IReferenceData.Description"/>).
+    /// </summary>
+    public string RefDataDescriptionName { get; init; } = nameof(IReferenceData.Description);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.SortOrder"/> database column name (defaults to <see cref="IReferenceData.SortOrder"/>).
+    /// </summary>
+    public string RefDataSortOrderName { get; init; } = nameof(IReferenceData.SortOrder);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.IsActive"/> database column name (defaults to <see cref="IReferenceData.IsActive"/>).
+    /// </summary>
+    public string RefDataIsActiveName { get; init; } = nameof(IReferenceData.IsActive);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.StartsOn"/> database column name (defaults to <see cref="IReferenceData.StartsOn"/>).
+    /// </summary>
+    public string RefDataStartsOnName { get; init; } = nameof(IReferenceData.StartsOn);
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData.EndsOn"/> database column name (defaults to <see cref="IReferenceData.EndsOn"/>).
+    /// </summary>
+    public string RefDataEndsOnName { get; init; } = nameof(IReferenceData.EndsOn);
+
+    /// <summary>
+    /// Gets or sets the partition key '<c>PartitionKey</c>' database column name.
+    /// </summary>
+    public string PartitionKeyName { get; init; } = "PartitionKey";
+
+    /// <summary>
+    /// Gets or sets the partition identifier/number '<c>PartitionId</c>' database column name.
+    /// </summary>
+    public string PartitionIdName { get; init; } = "PartitionId";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>Destination</c>' database column name.
+    /// </summary>
+    public string OutboxDestinationName { get; init; } = "Destination";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>Event</c>' database column name.
+    /// </summary>
+    public string OutboxEventName { get; init; } = "Event";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>EnqueuedUtc</c>' database column name.
+    /// </summary>
+    public string OutboxEnqueuedUtcName { get; init; } = "EnqueuedUtc";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>BatchSize</c>' database column name.
+    /// </summary>
+    public string OutboxBatchSizeName { get; init; } = "BatchSize";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>LeaseId</c>' database column name.
+    /// </summary>
+    public string OutboxLeaseIdName { get; init; } = "LeaseId";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>LeaseSeconds</c>' database column name.
+    /// </summary>
+    public string OutboxLeaseDurationName { get; init; } = "LeaseSeconds";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>DequeuedUtc</c>' database column name.
+    /// </summary>
+    public string OutboxDequeuedUtcName { get; init; } = "DequeuedUtc";
+
+    /// <summary>
+    /// Gets or sets the outbox '<c>BackoffSeconds</c>' database column name.
+    /// </summary>
+    public string OutboxBackoffDurationName { get; init; } = "BackoffSeconds";
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/DatabaseExtendedExtensions.cs b/src/CoreEx.Database/Extended/DatabaseExtendedExtensions.cs
deleted file mode 100644
index d1c1933b..00000000
--- a/src/CoreEx.Database/Extended/DatabaseExtendedExtensions.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.RefData;
-using CoreEx.Results;
-using System;
-using System.Data.Common;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.Extended
-{
-    /// <summary>
-    /// Provides database extension methods.
-    /// </summary>
-    public static class DatabaseExtendedExtensions
-    {
-        /// <summary>
-        /// Creates a <see cref="RefDataLoader{TColl, TItem, TId}"/> (for <see cref="IReferenceDataCollection"/> loading).
-        /// </summary>
-        /// <typeparam name="TColl">The <see cref="IReferenceDataCollection"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The <see cref="IReferenceData"/> item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <returns>The <see cref="RefDataLoader{TColl, TItem, TId}"/>.</returns>
-        public static RefDataLoader<TColl, TItem, TId> ReferenceData<TColl, TItem, TId>(this DatabaseCommand command)
-            where TColl : class, IReferenceDataCollection<TId, TItem>, new()
-            where TItem : class, IReferenceData<TId>, new()
-            where TId : IComparable<TId>, IEquatable<TId>
-            => new(command);
-
-        /// <summary>
-        /// Creates a <see cref="RefDataLoader{TColl, TItem, TId}"/> (for <see cref="IReferenceDataCollection"/> loading) using the specified <paramref name="storedProcedure"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The <see cref="IReferenceDataCollection"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The <see cref="IReferenceData"/> item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-        /// <param name="database">The <see cref="IDatabase"/>.</param>
-        /// <param name="storedProcedure">The stored procedure name.</param>
-        /// <returns>The <see cref="RefDataLoader{TColl, TItem, TId}"/>.</returns>
-        public static RefDataLoader<TColl, TItem, TId> ReferenceData<TColl, TItem, TId>(this IDatabase database, string storedProcedure)
-            where TColl : class, IReferenceDataCollection<TId, TItem>, new()
-            where TItem : class, IReferenceData<TId>, new()
-            where TId : IComparable<TId>, IEquatable<TId>
-            => ReferenceData<TColl, TItem, TId>(database.ThrowIfNull(nameof(database)).StoredProcedure(storedProcedure));
-
-        /// <summary>
-        /// Creates a <see cref="RefDataLoader{TColl, TItem, TId}"/> (for <see cref="IReferenceDataCollection"/> loading) using a '<c>SELECT * FROM [<paramref name="schemaName"/>].[<paramref name="tableName"/>]</c>' SQL statement.
-        /// </summary>
-        /// <typeparam name="TColl">The <see cref="IReferenceDataCollection"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The <see cref="IReferenceData"/> item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-        /// <param name="database">The <see cref="IDatabase"/>.</param>
-        /// <param name="schemaName">The database schema name (optional).</param>
-        /// <param name="tableName">The database table name.</param>
-        /// <returns>The <see cref="RefDataLoader{TColl, TItem, TId}"/>.</returns>
-        /// <remarks>The <paramref name="schemaName"/> and <paramref name="tableName"/> should not be escaped/quoted as this is performed internally to minimize SQL injection opportunity.</remarks>
-        public static RefDataLoader<TColl, TItem, TId> ReferenceData<TColl, TItem, TId>(this IDatabase database, string? schemaName, string tableName)
-            where TColl : class, IReferenceDataCollection<TId, TItem>, new()
-            where TItem : class, IReferenceData<TId>, new()
-            where TId : IComparable<TId>, IEquatable<TId>
-        {
-            if (!database.Provider.CanCreateCommandBuilder)
-                throw new NotSupportedException("Database Provider can not CreateCommandBuilder which is required to quote the identifiers to minimize SQL inject possibility.");
-
-            var cb = database.Provider.CreateCommandBuilder() ?? throw new InvalidOperationException($"The {nameof(DbProviderFactory)}.{nameof(DbProviderFactory.CreateCommandBuilder)} returned a null.");
-            if (string.IsNullOrEmpty(schemaName))
-                return ReferenceData<TColl, TItem, TId>(database.ThrowIfNull(nameof(database))
-                    .SqlStatement($"SELECT * FROM {cb.QuoteIdentifier(tableName.ThrowIfNull(nameof(tableName)))}"));
-            else
-                return ReferenceData<TColl, TItem, TId>(database.ThrowIfNull(nameof(database))
-                    .SqlStatement($"SELECT * FROM {cb.QuoteIdentifier(schemaName)}.{cb.QuoteIdentifier(tableName.ThrowIfNull(nameof(tableName)))}"));
-        }
-
-        /// <summary>
-        /// Creates a <see cref="DatabaseQuery{T}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="queryParams">The query <see cref="DatabaseParameterCollection"/> action to enable additional filtering.</param>
-        /// <returns>The <see cref="DatabaseQuery{T}"/></returns>
-        public static DatabaseQuery<T> Query<T>(this DatabaseCommand command, DatabaseArgs args, Action<DatabaseParameterCollection>? queryParams = null) where T : class, new() => new(command, args, queryParams);
-
-        /// <summary>
-        /// Creates a <see cref="DatabaseQuery{T}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="queryParams">The query <see cref="DatabaseParameterCollection"/> action to enable additional filtering.</param>
-        /// <returns>The <see cref="DatabaseQuery{T}"/></returns>
-        public static DatabaseQuery<T> Query<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, Action<DatabaseParameterCollection>? queryParams = null) where T : class, new() => new(command, new DatabaseArgs(command.Database.DbArgs, mapper), queryParams);
-
-        /// <summary>
-        /// Performs the save (create or update) operation.
-        /// </summary>
-        private static async Task<Result<T>> SaveWithResultAsync<T>(this DatabaseCommand command, DatabaseArgs args, T value, OperationTypes operationType, CancellationToken cancellationToken = default) where T : class, new()
-        {
-            command.ThrowIfNull(nameof(command));
-            value.ThrowIfNull(nameof(value));
-
-            // Set ChangeLog properties where appropriate.
-            if (operationType == OperationTypes.Create)
-                Cleaner.PrepareCreate(value);
-            else
-                Cleaner.PrepareUpdate(value);
-
-            // Map the parameters.
-            var map = (IDatabaseMapper<T>)args.Mapper;
-            map.MapToDb(value, command.Parameters, operationType);
-
-            if (args.Refresh)
-            {
-                var result = await command.ReselectRecordParam().SelectFirstOrDefaultWithResultAsync(map, cancellationToken).ConfigureAwait(false);
-                return result.ThenAs(v => v is null ? Result<T>.NotFoundError() : Result.Ok(v));
-            }
-
-            // NOTE: without refresh, fields like IDs and RowVersion are not automatically updated.
-            var nqresult = await command.NonQueryWithResultAsync(cancellationToken).ConfigureAwait(false);
-            return nqresult.ThenAs(_ => value);
-        }
-
-        #region Standard
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T>(this DatabaseCommand command, DatabaseArgs args, object[] key, CancellationToken cancellationToken = default) where T : class, new()
-            => GetAsync<T>(command, args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, object? key, CancellationToken cancellationToken = default) where T : class, new()
-            => GetAsync<T>(command, new DatabaseArgs(command.Database.DbArgs, mapper), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static async Task<T?> GetAsync<T>(this DatabaseCommand command, DatabaseArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, new()
-            => await GetWithResultAsync<T>(command, args, key, cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, CompositeKey key, CancellationToken cancellationToken = default) where T : class, new()
-            => GetAsync<T>(command, new DatabaseArgs(command.Database.DbArgs, mapper), key, cancellationToken);
-
-        /// <summary>
-        /// Performs a create using the specified stored procedure and value (reselects where specified).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static async Task<T> CreateAsync<T>(this DatabaseCommand command, DatabaseArgs args, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => await SaveWithResultAsync(command, args, value, OperationTypes.Create, cancellationToken);
-
-        /// <summary>
-        /// Performs a create using the specified stored procedure and value (reselects where specified).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public async static Task<T> CreateAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => await SaveWithResultAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), value, OperationTypes.Create, cancellationToken);
-
-        /// <summary>
-        /// Performs an update using the specified stored procedure and value (reselects where specified).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static async Task<T> UpdateAsync<T>(this DatabaseCommand command, DatabaseArgs args, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => await SaveWithResultAsync(command, args, value, OperationTypes.Update, cancellationToken);
-
-        /// <summary>
-        /// Performs an update using the specified stored procedure and value (reselects where specified).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static async Task<T> UpdateAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => await SaveWithResultAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), value, OperationTypes.Update, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static Task DeleteAsync(this DatabaseCommand command, DatabaseArgs args, object? key, CancellationToken cancellationToken = default)
-            => DeleteAsync(command, args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static Task DeleteAsync(this DatabaseCommand command, IDatabaseMapper mapper, object? key, CancellationToken cancellationToken = default)
-            => DeleteAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static async Task DeleteAsync(this DatabaseCommand command, DatabaseArgs args, CompositeKey key, CancellationToken cancellationToken = default)
-            => (await DeleteWithResultAsync(command, args, key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static Task DeleteAsync(this DatabaseCommand command, IDatabaseMapper mapper, CompositeKey key, CancellationToken cancellationToken = default)
-            => DeleteAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), key, cancellationToken);
-
-        #endregion
-
-        #region WithResult
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T>(this DatabaseCommand command, DatabaseArgs args, object[] key, CancellationToken cancellationToken = default) where T : class, new()
-            => GetWithResultAsync<T>(command, args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, object? key, CancellationToken cancellationToken = default) where T : class, new()
-            => GetWithResultAsync<T>(command, new DatabaseArgs(command.Database.DbArgs, mapper), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T>(this DatabaseCommand command, DatabaseArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, new()
-            => command.ThrowIfNull(nameof(command))
-                .Params(p => args.Mapper.MapKeyToDb(key, p))
-                .SelectFirstOrDefaultWithResultAsync((IDatabaseMapper<T>)args.Mapper, cancellationToken);
-
-        /// <summary>
-        /// Gets the value for the specified <paramref name="key"/> mapping to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, CompositeKey key, CancellationToken cancellationToken = default) where T : class, new()
-            => GetWithResultAsync<T>(command, new DatabaseArgs(command.Database.DbArgs, mapper), key, cancellationToken);
-
-        /// <summary>
-        /// Performs a create using the specified stored procedure and value (reselects where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static Task<Result<T>> CreateWithResultAsync<T>(this DatabaseCommand command, DatabaseArgs args, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => SaveWithResultAsync(command, args, value, OperationTypes.Create, cancellationToken);
-
-        /// <summary>
-        /// Performs a create using the specified stored procedure and value (reselects where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static Task<Result<T>> CreateWithResultAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => SaveWithResultAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), value, OperationTypes.Create, cancellationToken);
-
-        /// <summary>
-        /// Performs an update using the specified stored procedure and value (reselects where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static Task<Result<T>> UpdateWithResultAsync<T>(this DatabaseCommand command, DatabaseArgs args, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => SaveWithResultAsync(command, args, value, OperationTypes.Update, cancellationToken);
-
-        /// <summary>
-        /// Performs an update using the specified stored procedure and value (reselects where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (reselected where specified).</returns>
-        public static Task<Result<T>> UpdateWithResultAsync<T>(this DatabaseCommand command, IDatabaseMapper<T> mapper, T value, CancellationToken cancellationToken = default) where T : class, new()
-            => SaveWithResultAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), value, OperationTypes.Update, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static Task<Result> DeleteWithResultAsync(this DatabaseCommand command, DatabaseArgs args, object? key, CancellationToken cancellationToken = default)
-            => DeleteWithResultAsync(command, args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static Task<Result> DeleteWithResultAsync(this DatabaseCommand command, IDatabaseMapper mapper, object? key, CancellationToken cancellationToken = default)
-            => DeleteWithResultAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static async Task<Result> DeleteWithResultAsync(this DatabaseCommand command, DatabaseArgs args, CompositeKey key, CancellationToken cancellationToken = default)
-        {
-            var rowsAffectedResult = await command.ThrowIfNull(nameof(command))
-                .Params(p => args.Mapper.MapKeyToDb(key, p))
-                .ScalarWithResultAsync<int>(cancellationToken).ConfigureAwait(false);
-
-            return rowsAffectedResult.WhenAs(rowsAffected => rowsAffected < 1, _ => Result.NotFoundError());
-        }
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="mapper">The <see cref="IDatabaseMapper{T}"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public static Task<Result> DeleteWithResultAsync(this DatabaseCommand command, IDatabaseMapper mapper, CompositeKey key, CancellationToken cancellationToken = default)
-            => DeleteWithResultAsync(command, new DatabaseArgs(command.Database.DbArgs, mapper), key, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/DatabaseQuery.cs b/src/CoreEx.Database/Extended/DatabaseQuery.cs
deleted file mode 100644
index 9a32fb85..00000000
--- a/src/CoreEx.Database/Extended/DatabaseQuery.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.Extended
-{
-    /// <summary>
-    /// Encapsulates a SQL query enabling select-like capabilities.
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    public class DatabaseQuery<T> : IDatabaseParameters<DatabaseQuery<T>> where T : class, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseQuery{T}"/> class.
-        /// </summary>
-        /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-        /// <param name="args">The <see cref="DatabaseArgs"/>.</param>
-        /// <param name="queryParams">The query <see cref="DatabaseParameterCollection"/> action to enable additional filtering.</param>
-        internal DatabaseQuery(DatabaseCommand command, DatabaseArgs args, Action<DatabaseParameterCollection>? queryParams)
-        {
-            Command = command.ThrowIfNull(nameof(command));
-            Parameters = new DatabaseParameterCollection(Database);
-            QueryArgs = args;
-            Mapper = (IDatabaseMapper<T>)args.Mapper;
-
-            queryParams?.Invoke(Parameters);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="DatabaseCommand"/>.
-        /// </summary>
-        public DatabaseCommand Command { get; }
-
-        /// <inheritdoc/>
-        public IDatabase Database => Command.Database;
-
-        /// <inheritdoc/>
-        public DatabaseParameterCollection Parameters { get; }
-
-        /// <summary>
-        /// Gets the <see cref="DatabaseArgs"/>.
-        /// </summary>
-        public DatabaseArgs QueryArgs { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IDatabaseMapper{TSource}"/>.
-        /// </summary>
-        public IDatabaseMapper<T> Mapper { get; }
-
-        /// <summary>
-        /// Gets the <see cref="PagingResult"/>.
-        /// </summary>
-        public PagingResult? Paging { get; private set; }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <see cref="DatabaseQuery{T}"/> to suport fluent-style method-chaining.</returns>
-        public DatabaseQuery<T> WithPaging(PagingArgs? paging)
-        {
-            Paging = paging == null ? null : (paging is PagingResult pr ? pr : new PagingResult(paging));
-            return this;
-        }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The <see cref="DatabaseQuery{T}"/> to suport fluent-style method-chaining.</returns>
-        public DatabaseQuery<T> WithPaging(long skip, long? take = null) => WithPaging(PagingArgs.CreateSkipAndTake(skip, take));
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<T> SelectSingleAsync(CancellationToken cancellationToken = default) => await SelectSingleWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public Task<Result<T>> SelectSingleWithResultAsync(CancellationToken cancellationToken = default) => SelectWrapperWithResultAsync((cmd, ct) => cmd.SelectSingleWithResultAsync(Mapper, ct), cancellationToken);
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<T?> SelectSingleOrDefaultAsync(CancellationToken cancellationToken = default) => await SelectSingleOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public Task<Result<T?>> SelectSingleOrDefaultWithResultAsync(CancellationToken cancellationToken = default) => SelectWrapperWithResultAsync((cmd, ct) => cmd.SelectSingleOrDefaultWithResultAsync(Mapper, ct), cancellationToken);
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        public async Task<T> SelectFirstAsync(CancellationToken cancellationToken = default) => await SelectFirstWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        public Task<Result<T>> SelectFirstWithResultAsync(CancellationToken cancellationToken = default) => SelectWrapperWithResultAsync((cmd, ct) => cmd.SelectFirstWithResultAsync(Mapper, ct), cancellationToken);
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<T?> SelectFirstOrDefaultAsync(CancellationToken cancellationToken = default) => await SelectFirstOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public Task<Result<T?>> SelectFirstOrDefaultWithResultAsync(CancellationToken cancellationToken = default) => SelectWrapperWithResultAsync((cmd, ct) => cmd.SelectFirstOrDefaultWithResultAsync(Mapper, ct), cancellationToken);
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async Task<TCollResult> SelectResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new() 
-            => (await SelectResultWithResultAsync<TCollResult, TColl>(cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async Task<Result<TCollResult>> SelectResultWithResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new()
-        {
-            var result = await SelectQueryWithResultAsync<TColl>(cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(items => new TCollResult { Items = items, Paging = Paging });
-        }
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant collection.</returns>
-        public async Task<TColl> SelectQueryAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-            => await SelectQueryWithResultAsync<TColl>(cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A resultant collection.</returns>
-        public async Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-        {
-            var coll = new TColl();
-            var result = await SelectQueryWithResultAsync(coll, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => coll);
-        }
-
-        /// <summary>
-        /// Executes a query adding to the passed collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="coll">The collection to add items to.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task SelectQueryAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => (await SelectQueryWithResultAsync(coll, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="coll">The collection to add items to.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task<Result> SelectQueryWithResultAsync<TColl>(TColl coll, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-        {
-            var result = await SelectWrapperWithResultAsync(async (cmd, ct) =>
-            {
-                var result = await cmd.SelectQueryWithResultAsync(coll, Mapper, ct).ConfigureAwait(false);
-                return result.ThenAs(() => coll);
-            }, cancellationToken).ConfigureAwait(false);
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Wraps the select query to perform standard logic.
-        /// </summary>
-        private async Task<Result<TResult>> SelectWrapperWithResultAsync<TResult>(Func<DatabaseCommand, CancellationToken, Task<Result<TResult>>> func, CancellationToken cancellationToken)
-        {
-            var rvp = Paging != null && Paging.IsGetCount ? Parameters.AddReturnValueParameter() : null;
-            var cmd = Command.Params(Parameters).PagingParams(Paging);
-
-            return await Result.GoAsync(func(cmd, cancellationToken))
-                               .When(_ => rvp != null && rvp.Value != null, _ => { Paging!.TotalCount = (long)rvp!.Value!; })
-                               .Then(res => QueryArgs.CleanUpResult ? Cleaner.Clean(res) : res);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/DatabaseWildcard.cs b/src/CoreEx.Database/Extended/DatabaseWildcard.cs
new file mode 100644
index 00000000..8f2ae264
--- /dev/null
+++ b/src/CoreEx.Database/Extended/DatabaseWildcard.cs
@@ -0,0 +1,112 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Provides database <see cref="Wildcards.Wildcard"/> capabilities.
+/// </summary>
+public class DatabaseWildcard
+{
+    /// <summary>
+    /// Gets the default database multi (zero or more) wildcard character.
+    /// </summary>
+    public const char MultiWildcardCharacter = '%';
+
+    /// <summary>
+    /// Gets the default database single wildcard character.
+    /// </summary>
+    public const char SingleWildcardCharacter = '_';
+
+    /// <summary>
+    /// Gets the default list of characters that are to be escaped.
+    /// </summary>
+    /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/t-sql/language-elements/like-transact-sql"/> for more detail on escape characters.</remarks>
+    public static readonly char[] DefaultCharactersToEscape = ['%', '_', '['];
+
+    /// <summary>
+    /// Gets the default escaping format string when one of the <see cref="CharactersToEscape"/> is found.
+    /// </summary>
+    public const string DefaultEscapeFormat = "[{0}]";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DatabaseWildcard"/> class.
+    /// </summary>
+    /// <param name="wildcard">The <see cref="Wildcards.Wildcard"/> configuration.</param>
+    /// <param name="multiWildcard">The database multi (zero or more) wildcard character.</param>
+    /// <param name="singleWildcard">The database single wildcard character.</param>
+    /// <param name="charactersToEscape">The list of characters that are to be escaped (defaults to <see cref="DefaultCharactersToEscape"/>).</param>
+    /// <param name="escapeFormat">The escaping format string when one of the <see cref="CharactersToEscape"/> is found (defaults to <see cref="DefaultEscapeFormat"/>).</param>
+    public DatabaseWildcard(Wildcard? wildcard = null, char multiWildcard = MultiWildcardCharacter, char singleWildcard = SingleWildcardCharacter, char[]? charactersToEscape = null, string? escapeFormat = null)
+    {
+        Wildcard = wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
+        MultiWildcard = multiWildcard;
+        SingleWildcard = singleWildcard;
+        CharactersToEscape = [.. charactersToEscape ?? DefaultCharactersToEscape];
+        EscapeFormat = escapeFormat ?? DefaultEscapeFormat;
+
+        if (MultiWildcard != char.MinValue && SingleWildcard != char.MinValue && MultiWildcard == SingleWildcard)
+            throw new ArgumentException("A Wildcard cannot be configured with the same character for the MultiWildcard and SingleWildcard.", nameof(multiWildcard));
+
+        if (Wildcard.SupportedSelection.HasFlag(WildcardSelection.MultiWildcard) && multiWildcard == char.MinValue)
+            throw new ArgumentException("A Wildcard that supports MultiWildcard must also define the database MultiWildcard character.");
+
+        if (Wildcard.SupportedSelection.HasFlag(WildcardSelection.SingleWildcard) && singleWildcard == char.MinValue)
+            throw new ArgumentException("A Wildcard that supports SingleWildcard must also define the database SingleWildcard character.");
+
+        if (CharactersToEscape.Count > 0 && string.IsNullOrEmpty(EscapeFormat))
+            throw new InvalidOperationException("The EscapeFormat must be provided where CharactersToEscape have been defined.");
+    }
+
+    /// <summary>
+    /// Gets or sets the underlying <see cref="Wildcards.Wildcard"/> configuration.
+    /// </summary>
+    public Wildcard Wildcard { get; }
+
+    /// <summary>
+    /// Gets or sets the database multi (zero or more) wildcard character.
+    /// </summary>
+    public char MultiWildcard { get; }
+
+    /// <summary>
+    /// Gets or sets the database single wildcard character.
+    /// </summary>
+    public char SingleWildcard { get; }
+
+    /// <summary>
+    /// Gets or sets the list of characters that are to be escaped.
+    /// </summary>
+    public List<char> CharactersToEscape { get; }
+
+    /// <summary>
+    /// Gets or sets the escaping format when one of the <see cref="CharactersToEscape"/> is found.
+    /// </summary>
+    /// <remarks>See <see href="https://docs.microsoft.com/en-us/sql/t-sql/language-elements/like-transact-sql"/> for more detail on escape characters.</remarks>
+    public string EscapeFormat { get; }
+
+    /// <summary>
+    /// Replaces the wildcard text with the appropriate database representative characters to enable the corresponding SQL LIKE wildcard.
+    /// </summary>
+    /// <param name="text">The wildcard text.</param>
+    /// <returns>The SQL LIKE wildcard.</returns>
+    public string? Replace(string? text)
+    {
+        var wc = Wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
+        var wr = wc.Parse(text).ThrowOnError();
+
+        if (wr.Selection.HasFlag(WildcardSelection.None) || wr.Selection.HasFlag(WildcardSelection.Single) && wr.Selection.HasFlag(WildcardSelection.MultiWildcard))
+            return new string(MultiWildcard, 1);
+
+        var sb = new StringBuilder();
+        foreach (var c in wr.Text!)
+        {
+            if (wr.Selection.HasFlag(WildcardSelection.MultiWildcard) && c == Wildcard.MultiWildcardCharacter)
+                sb.Append(MultiWildcard);
+            else if (wr.Selection.HasFlag(WildcardSelection.SingleWildcard) && c == Wildcard.SingleWildcardCharacter)
+                sb.Append(SingleWildcard);
+            else if (CharactersToEscape is not null && CharactersToEscape.Contains(c))
+                sb.Append(string.Format(CultureInfo.InvariantCulture, EscapeFormat, c));
+            else
+                sb.Append(c);
+        }
+
+        return sb.ToString();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/IMultiSetArgs.cs b/src/CoreEx.Database/Extended/IMultiSetArgs.cs
new file mode 100644
index 00000000..4c4268d4
--- /dev/null
+++ b/src/CoreEx.Database/Extended/IMultiSetArgs.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Enables the <see cref="IDatabase"/> multi-set arguments
+/// </summary>
+public interface IMultiSetArgs
+{
+    /// <summary>
+    /// Gets the minimum number of rows allowed.
+    /// </summary>
+    int MinimumRows { get; }
+
+    /// <summary>
+    /// Gets the maximum number of rows allowed.
+    /// </summary>
+    int? MaximumRows { get; }
+
+    /// <summary>
+    /// Indicates whether to stop further query result set processing where the current set has resulted in a <see langword="null"/> (i.e. no records).
+    /// </summary>
+    bool StopOnNull { get; }
+
+    /// <summary>
+    /// The <see cref="DatabaseRecord"/> method invoked for each record for its respective dataset.
+    /// </summary>
+    /// <param name="dr">The <see cref="DatabaseRecord"/>.</param>
+    void DatasetRecord(DatabaseRecord dr);
+
+    /// <summary>
+    /// Invokes the corresponding result function.
+    /// </summary>
+    void InvokeResult();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/IMultiSetArgsT.cs b/src/CoreEx.Database/Extended/IMultiSetArgsT.cs
new file mode 100644
index 00000000..dcfbc26d
--- /dev/null
+++ b/src/CoreEx.Database/Extended/IMultiSetArgsT.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Enables the <see cref="IDatabase"/> multi-set arguments with a <see cref="Mapper"/>.
+/// </summary>
+/// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
+public interface IMultiSetArgs<T> : IMultiSetArgs where T : class, new()
+{
+    /// <summary>
+    /// Gets the <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.
+    /// </summary>
+    IDatabaseMapper<T> Mapper { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/MultiSetArgs.cs b/src/CoreEx.Database/Extended/MultiSetArgs.cs
new file mode 100644
index 00000000..16735ab3
--- /dev/null
+++ b/src/CoreEx.Database/Extended/MultiSetArgs.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Provides <see cref="IMultiSetArgs"/> helpers.
+/// </summary>
+public static class MultiSetArgs
+{
+    /// <summary>
+    /// Creates an <see cref="IMultiSetArgs"/> <see cref="IEnumerable{T}"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="IMultiSetArgs"/> arguments.</param>
+    /// <returns>The <see cref="IEnumerable{T}"/> <see cref="IMultiSetArgs"/>.</returns>
+    public static IEnumerable<IMultiSetArgs> Create(params IEnumerable<IMultiSetArgs> args) => args.AsEnumerable();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/MultiSetCollArgs.cs b/src/CoreEx.Database/Extended/MultiSetCollArgs.cs
new file mode 100644
index 00000000..59d42e13
--- /dev/null
+++ b/src/CoreEx.Database/Extended/MultiSetCollArgs.cs
@@ -0,0 +1,38 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Provides the base <see cref="IDatabase"/> multi-set arguments when expecting a collection of items/records.
+/// </summary>
+public abstract class MultiSetCollArgs : IMultiSetArgs
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MultiSetCollArgs"/> class.
+    /// </summary>
+    /// <param name="minimumRows">The minimum number of rows allowed.</param>
+    /// <param name="maximumRows">The maximum number of rows allowed.</param>
+    /// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a <see langword="null"/> (i.e. no records).</param>
+    public MultiSetCollArgs(int minimumRows = 0, int? maximumRows = null, bool stopOnNull = false)
+    {
+        if (maximumRows.HasValue && minimumRows <= maximumRows.Value)
+            throw new ArgumentException("Max Rows is less than Min Rows.", nameof(maximumRows));
+
+        MinimumRows = minimumRows;
+        MaximumRows = maximumRows;
+        StopOnNull = stopOnNull;
+    }
+
+    /// <inheritdoc/>
+    public int MinimumRows { get; }
+
+    /// <inheritdoc/>
+    public int? MaximumRows { get; }
+
+    /// <inheritdoc/>
+    public bool StopOnNull { get; set; }
+
+    /// <inheritdoc/>
+    public abstract void DatasetRecord(DatabaseRecord dr);
+
+    /// <inheritdoc/>
+    public virtual void InvokeResult() { }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/MultiSetCollArgsT.cs b/src/CoreEx.Database/Extended/MultiSetCollArgsT.cs
new file mode 100644
index 00000000..2021f0ad
--- /dev/null
+++ b/src/CoreEx.Database/Extended/MultiSetCollArgsT.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Provides the <see cref="IDatabase"/> multi-set arguments when expecting a collection of items/records.
+/// </summary>
+/// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
+/// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+/// <param name="mapper">The <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.</param>
+/// <param name="result">The action that will be invoked with the result of the set.</param>
+/// <param name="minimumRows">The minimum number of rows allowed.</param>
+/// <param name="maximumRows">The maximum number of rows allowed.</param>
+/// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a <see langword="null"/> (i.e. no records).</param>
+public class MultiSetCollArgs<TColl, TItem>(IDatabaseMapper<TItem> mapper, Action<TColl> result, int minimumRows = 0, int? maximumRows = null, bool stopOnNull = false) : MultiSetCollArgs(minimumRows, maximumRows, stopOnNull), IMultiSetArgs<TItem>
+    where TItem : class, new()
+    where TColl : class, ICollection<TItem>, new()
+{
+    private TColl? _coll;
+    private readonly Action<TColl> _result = result.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="IDatabaseMapper{TSource}"/> for the <see cref="DatabaseRecord"/>.
+    /// </summary>
+    public IDatabaseMapper<TItem> Mapper { get; } = mapper.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public override void DatasetRecord(DatabaseRecord dr)
+    {
+        dr.ThrowIfNull();
+        _coll ??= new TColl();
+
+        var item = Mapper.MapFromDb(dr);
+        if (item is not null)
+            _coll.Add(item);
+    }
+
+    /// <inheritdoc/>
+    public override void InvokeResult()
+    {
+        if (_coll is not null)
+            _result(_coll);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/MultiSetSingleArgs.cs b/src/CoreEx.Database/Extended/MultiSetSingleArgs.cs
new file mode 100644
index 00000000..9e45d0fd
--- /dev/null
+++ b/src/CoreEx.Database/Extended/MultiSetSingleArgs.cs
@@ -0,0 +1,29 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Provides the base <see cref="IDatabase"/> multi-set arguments when expecting a single item/record only.
+/// </summary>
+/// <param name="isMandatory">Indicates whether the value is mandatory; defaults to <see langword="true"/>.</param>
+/// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).</param>
+public abstract class MultiSetSingleArgs(bool isMandatory = true, bool stopOnNull = false) : IMultiSetArgs
+{
+    /// <summary>
+    /// Indicates whether the value is mandatory; i.e. a corresponding record must be read.
+    /// </summary>
+    public bool IsMandatory { get; set; } = isMandatory;
+
+    /// <inheritdoc/>
+    public int MinimumRows => IsMandatory ? 1 : 0;
+
+    /// <inheritdoc/>
+    public int? MaximumRows => 1;
+
+    /// <inheritdoc/>
+    public bool StopOnNull { get; set; } = stopOnNull;
+
+    /// <inheritdoc/>
+    public abstract void DatasetRecord(DatabaseRecord dr);
+
+    /// <inheritdoc/>
+    public virtual void InvokeResult() { }
+}
diff --git a/src/CoreEx.Database/Extended/MultiSetSingleArgsT.cs b/src/CoreEx.Database/Extended/MultiSetSingleArgsT.cs
new file mode 100644
index 00000000..ce4399ba
--- /dev/null
+++ b/src/CoreEx.Database/Extended/MultiSetSingleArgsT.cs
@@ -0,0 +1,30 @@
+namespace CoreEx.Database.Extended;
+
+/// <summary>
+/// Provides the <see cref="IDatabase"/> multi-set arguments when expecting a single item/record only.
+/// </summary>
+/// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
+/// <param name="mapper">The <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.</param>
+/// <param name="result">The action that will be invoked with the result of the set.</param>
+/// <param name="isMandatory">Indicates whether the value is mandatory; defaults to <see langword="true"/>.</param>
+/// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).</param>
+public class MultiSetSingleArgs<T>(IDatabaseMapper<T> mapper, Action<T> result, bool isMandatory = true, bool stopOnNull = false) : MultiSetSingleArgs(isMandatory, stopOnNull), IMultiSetArgs<T> where T : class, new()
+{
+    private T? _value;
+    private readonly Action<T> _result = result.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="IDatabaseMapper{T}"/> for the <see cref="DatabaseRecord"/>.
+    /// </summary>
+    public IDatabaseMapper<T> Mapper { get; } = mapper.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public override void DatasetRecord(DatabaseRecord dr) => _value = Mapper.MapFromDb(dr);
+
+    /// <inheritdoc/>
+    public override void InvokeResult()
+    {
+        if (_value is not null)
+            _result(_value);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/README.md b/src/CoreEx.Database/Extended/README.md
new file mode 100644
index 00000000..1520ccf7
--- /dev/null
+++ b/src/CoreEx.Database/Extended/README.md
@@ -0,0 +1,29 @@
+# CoreEx.Database.Extended
+
+> Provides `DatabaseColumns` convention column names, `DatabaseWildcard` LIKE-pattern translation, and the `IMultiSetArgs` / `MultiSetSingleArgs<T>` / `MultiSetCollArgs<T>` descriptors for reading multiple result sets in a single round-trip.
+
+## Overview
+
+`CoreEx.Database.Extended` contains the opt-in capabilities that most database operations rely on without being core ADO.NET primitives.
+
+`DatabaseColumns` centralizes the convention-based column names (`RowVersion`, `TenantId`, `IsDeleted`, `CreatedBy`, `CreatedDate`, `UpdatedBy`, `UpdatedDate`) as overridable properties. Mappers and the `DatabaseMapper` static utility reference these names so a single configuration change renames a column application-wide.
+
+`DatabaseWildcard` takes a CoreEx `WildcardResult` and produces the database `LIKE` pattern string (`%`, `_`, escaped), abstracting the difference between `StartsWith`, `EndsWith`, `Contains`, and exact-match patterns so query builders don't scatter `% + value + %` strings.
+
+The multi-result-set types allow a single stored procedure or multi-statement SQL call to return several result sets; `DatabaseCommand.SelectMultiSetAsync` reads each set in order, invoking the appropriate `IMultiSetArgs` descriptor to map rows and collect results.
+
+## Key types
+
+| Type | Description |
+|------|--------------|
+| **[`DatabaseColumns`](./DatabaseColumns.cs)** | Convention column name properties (`RowVersionName`, `TenantIdName`, `IsDeletedName`, change-log column names); instances on `IDatabase.NamedColumns` are overridable per database. |
+| **[`DatabaseWildcard`](./DatabaseWildcard.cs)** | Translates `WildcardResult` to a database `LIKE` pattern with configurable multi-char (`%`), single-char (`_`), and escape character; exposes `Replace(string)` for raw wildcard text. |
+| **[`MultiSetSingleArgs<T>`](./MultiSetSingleArgsT.cs)** | `IMultiSetArgs` for a single-row result set: invokes `IDatabaseMapper<T>.MapFromDb` once and stores the mapped value; supports `IsMandatory` / `StopOnNull`. |
+| **[`MultiSetCollArgs<T>`](./MultiSetCollArgsT.cs)** | `IMultiSetArgs` for a collection result set: invokes mapper for each row, accumulates into a list; supports `MinimumRows`, `MaximumRows`, `StopOnNull`. |
+| [`IMultiSetArgs`](./IMultiSetArgs.cs) | Base interface for multi-result-set descriptors: `MinimumRows`, `MaximumRows`, `StopOnNull`, `DatasetRecord(DatabaseRecord)`. |
+| [`IMultiSetArgs<T>`](./IMultiSetArgsT.cs) | Generic variant adding a `Mapper` property and `GetResult()` for retrieving the mapped output after dataset processing. |
+
+## Related Namespaces
+
+- **[`CoreEx.Database`](../README.md)** - `DatabaseCommand.SelectMultiSetAsync` consumes `IMultiSetArgs` descriptors; `IDatabase.NamedColumns` returns a `DatabaseColumns` instance; `IDatabase.Wildcard` is a `DatabaseWildcard`.
+- **[`CoreEx.Wildcards`](../../CoreEx/Wildcards/README.md)** - `WildcardResult` is the input type consumed by `DatabaseWildcard.Replace`.
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/RefDataLoader.cs b/src/CoreEx.Database/Extended/RefDataLoader.cs
deleted file mode 100644
index 4a79ca15..00000000
--- a/src/CoreEx.Database/Extended/RefDataLoader.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.RefData;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.Extended
-{
-    /// <summary>
-    /// Provides dynamic <see cref="IReferenceDataCollection"/> loading capabilities.
-    /// </summary>
-    /// <typeparam name="TColl">The <see cref="IReferenceDataCollection"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The <see cref="IReferenceData"/> item <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-    /// <param name="command">The <see cref="DatabaseCommand"/>.</param>
-    public class RefDataLoader<TColl, TItem, TId>(DatabaseCommand command)
-        where TColl : class, IReferenceDataCollection<TId, TItem>, new()
-        where TItem : class, IReferenceData<TId>, new()
-        where TId : IComparable<TId>, IEquatable<TId>
-    {
-
-        /// <summary>
-        /// Gets the <see cref="IDatabase"/>.
-        /// </summary>
-        public DatabaseCommand Command { get; } = command.ThrowIfNull(nameof(command));
-
-        /// <summary>
-        /// Executes a dynamic <see cref="IReferenceDataCollection"/> query updating the <paramref name="coll"/>.
-        /// </summary>
-        /// <param name="coll">The <see cref="IReferenceDataCollection"/>.</param>
-        /// <param name="idColumnName">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> column name override; defaults to <see cref="Extended.DatabaseColumns.RefDataIdName"/>.</param>
-        /// <param name="additionalProperties">The additional properties action that enables non-standard properties to be updated from the <see cref="DatabaseRecord"/>.</param>
-        /// <param name="multiSetArgs">The additional <see cref="IMultiSetArgs"/> where additional datasets are returned.</param>
-        /// <param name="confirmItemIsToBeAdded">The action to confirm whether the item is to be added (defaults to <c>true</c>).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task LoadAsync(TColl coll, string? idColumnName = null, Action<DatabaseRecord, TItem>? additionalProperties = null, IEnumerable<IMultiSetArgs>? multiSetArgs = null,
-            Func<DatabaseRecord, TItem, bool>? confirmItemIsToBeAdded = null, CancellationToken cancellationToken = default)
-            => (await LoadWithResultAsync(coll, idColumnName, additionalProperties, multiSetArgs, confirmItemIsToBeAdded, cancellationToken)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a dynamic <see cref="IReferenceDataCollection"/> query updating the <paramref name="coll"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="coll">The <see cref="IReferenceDataCollection"/>.</param>
-        /// <param name="idColumnName">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> column name override; defaults to <see cref="Extended.DatabaseColumns.RefDataIdName"/>.</param>
-        /// <param name="additionalProperties">The additional properties action that enables non-standard properties to be updated from the <see cref="DatabaseRecord"/>.</param>
-        /// <param name="multiSetArgs">The additional <see cref="IMultiSetArgs"/> where additional datasets are returned.</param>
-        /// <param name="confirmItemIsToBeAdded">The action to confirm whether the item is to be added (defaults to <c>true</c>).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task<Result> LoadWithResultAsync(TColl coll, string? idColumnName = null, Action<DatabaseRecord, TItem>? additionalProperties = null, IEnumerable<IMultiSetArgs>? multiSetArgs = null,
-            Func<DatabaseRecord, TItem, bool>? confirmItemIsToBeAdded = null, CancellationToken cancellationToken = default)
-        {
-            coll.ThrowIfNull(nameof(coll));
-
-            var list = new List<IMultiSetArgs> { new RefDataMultiSetCollArgs<TColl, TItem, TId>(Command.Database, coll.Add, idColumnName, additionalProperties, confirmItemIsToBeAdded) };
-            if (multiSetArgs != null)
-                list.AddRange(multiSetArgs);
-
-            var result = await Command.SelectMultiSetWithResultAsync(list, cancellationToken).ConfigureAwait(false);
-            return result.Then(() => Cleaner.Clean(coll));
-        }
-
-        /// <summary>
-        /// Executes a dynamic <see cref="IReferenceDataCollection"/> query.
-        /// </summary>
-        /// <param name="idColumnName">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> column name override; defaults to <see cref="Extended.DatabaseColumns.RefDataIdName"/>.</param>
-        /// <param name="additionalProperties">The additional properties action that enables non-standard properties to be updated from the <see cref="DatabaseRecord"/>.</param>
-        /// <param name="multiSetArgs">The additional <see cref="IMultiSetArgs"/> where additional datasets are returned.</param>
-        /// <param name="confirmItemIsToBeAdded">The action to confirm whether the item is to be added (defaults to <c>true</c>).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IReferenceDataCollection"/>.</returns>
-        public async Task<TColl> LoadAsync(string? idColumnName = null, Action<DatabaseRecord, TItem>? additionalProperties = null, IEnumerable<IMultiSetArgs>? multiSetArgs = null,
-            Func<DatabaseRecord, TItem, bool>? confirmItemIsToBeAdded = null, CancellationToken cancellationToken = default)
-            => (await LoadWithResultAsync(idColumnName, additionalProperties, multiSetArgs, confirmItemIsToBeAdded, cancellationToken)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a dynamic <see cref="IReferenceDataCollection"/> query with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="idColumnName">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> column name override; defaults to <see cref="Extended.DatabaseColumns.RefDataIdName"/>.</param>
-        /// <param name="additionalProperties">The additional properties action that enables non-standard properties to be updated from the <see cref="DatabaseRecord"/>.</param>
-        /// <param name="multiSetArgs">The additional <see cref="IMultiSetArgs"/> where additional datasets are returned.</param>
-        /// <param name="confirmItemIsToBeAdded">The action to confirm whether the item is to be added (defaults to <c>true</c>).</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IReferenceDataCollection"/>.</returns>
-        public async Task<Result<TColl>> LoadWithResultAsync(string? idColumnName = null, Action<DatabaseRecord, TItem>? additionalProperties = null, IEnumerable<IMultiSetArgs>? multiSetArgs = null,
-            Func<DatabaseRecord, TItem, bool>? confirmItemIsToBeAdded = null, CancellationToken cancellationToken = default)
-        {
-            var coll = new TColl();
-            var result = await LoadWithResultAsync(coll, idColumnName, additionalProperties, multiSetArgs, confirmItemIsToBeAdded, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(() => coll);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/RefDataMapper.cs b/src/CoreEx.Database/Extended/RefDataMapper.cs
deleted file mode 100644
index 557e7615..00000000
--- a/src/CoreEx.Database/Extended/RefDataMapper.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.RefData;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Database.Extended
-{
-    /// <summary>
-    /// Represents a dynamic <see cref="IReferenceData"/> query-only mapper.
-    /// </summary>
-    /// <typeparam name="TItem">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-    internal class RefDataMapper<TItem, TId> : DatabaseQueryMapper<TItem> where TItem : class, IReferenceData<TId>, new() where TId : IComparable<TId>, IEquatable<TId>
-    {
-        private readonly DatabaseColumns _cols;
-        private readonly string _idCol;
-        private readonly Action<DatabaseRecord, TItem>? _additionalProperties;
-        private Dictionary<string, int>? _fields;
-
-        /// <summary>
-        /// Initializes a new instanace of the <see cref="RefDataMapper{TItem, TId}"/>.
-        /// </summary>
-        /// <param name="database">The <see cref="IDatabase"/>.</param>
-        /// <param name="idColumnName">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> column name.</param>
-        /// <param name="additionalProperties"></param>
-        public RefDataMapper(IDatabase database, string? idColumnName = null, Action<DatabaseRecord, TItem>? additionalProperties = null)
-        {
-            _cols = database.DatabaseColumns;
-            _idCol = idColumnName ?? _cols.RefDataIdName;
-            _additionalProperties = additionalProperties;
-        }
-
-        /// <inheritdoc/>
-        public override TItem MapFromDb(DatabaseRecord dr, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            if (_fields == null)
-            {
-                _fields = [];
-                for (var i = 0; i < dr.DataReader.FieldCount; i++)
-                {
-                    _fields.Add(dr.DataReader.GetName(i), i);
-                }
-
-                if (!_fields.ContainsKey(_idCol) || !_fields.ContainsKey(_cols.RefDataCodeName))
-                    throw new InvalidOperationException($"The reference data query must return as a minimum the Id and Code columns as per the configured names.");
-            }
-
-            var item = new TItem()
-            {
-                Id = dr.GetValue<TId>(_idCol),
-                Code = dr.GetValue<string?>(_cols.RefDataCodeName),
-                Text = _fields.ContainsKey(_cols.RefDataTextName) ? dr.GetValue<string?>(_cols.RefDataTextName) : null,
-                Description = _fields.ContainsKey(_cols.RefDataDescriptionName) ? dr.GetValue<string?>(_cols.RefDataDescriptionName) : null,
-                SortOrder = _fields.ContainsKey(_cols.RefDataSortOrderName) ? dr.GetValue<int>(_cols.RefDataSortOrderName) : 0,
-                IsActive = _fields.ContainsKey(_cols.RefDataIsActiveName) && dr.GetValue<bool>(_cols.RefDataIsActiveName),
-                StartDate = _fields.ContainsKey(_cols.RefDataStartDateName) ? dr.GetValue<DateTime?>(_cols.RefDataStartDateName) : null,
-                EndDate = _fields.ContainsKey(_cols.RefDataEndDateName) ? dr.GetValue<DateTime?>(_cols.RefDataEndDateName) : null,
-                ETag = _fields.ContainsKey(_cols.ETagName) ? dr.GetRowVersion(_cols.ETagName) : null
-            };
-
-            _additionalProperties?.Invoke(dr, item);
-
-            return item;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Extended/RefDataMultiSetCollArgs.cs b/src/CoreEx.Database/Extended/RefDataMultiSetCollArgs.cs
deleted file mode 100644
index fbc4591a..00000000
--- a/src/CoreEx.Database/Extended/RefDataMultiSetCollArgs.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.RefData;
-using System;
-
-namespace CoreEx.Database.Extended
-{
-    /// <summary>
-    /// Provides the <see cref="IReferenceData"/> <see cref="MultiSetCollArgs"/>.
-    /// </summary>
-    /// <typeparam name="TColl">The <see cref="IReferenceDataCollection"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The <see cref="IReferenceData"/> item <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-    /// <param name="database">The <see cref="IDatabase"/>.</param>
-    /// <param name="item">The action that will be invoked with the result of each item.</param>
-    /// <param name="idColumnName">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> column name override; defaults to <see cref="DatabaseColumns.RefDataIdName"/>.</param>
-    /// <param name="additionalProperties">The additional properties action that enables non-standard properties to be updated from the <see cref="DatabaseRecord"/>.</param>
-    /// <param name="confirmItemIsToBeAdded">The action to confirm whether the item is to be added (defaults to <c>true</c>).</param>
-    internal class RefDataMultiSetCollArgs<TColl, TItem, TId>(IDatabase database, Action<TItem> item, string? idColumnName = null, Action<DatabaseRecord, TItem>? additionalProperties = null, Func<DatabaseRecord, TItem, bool>? confirmItemIsToBeAdded = null) : MultiSetCollArgs(stopOnNull: true)
-        where TColl : class, IReferenceDataCollection<TId, TItem>
-        where TItem : class, IReferenceData<TId>, new()
-        where TId : IComparable<TId>, IEquatable<TId>
-    {
-        private readonly Action<TItem> _item = item;
-        private readonly RefDataMapper<TItem, TId> _refDataMapper = new(database, idColumnName, additionalProperties);
-        private readonly Func<DatabaseRecord, TItem, bool>? _confirmItemIsToBeAdded = confirmItemIsToBeAdded;
-
-        /// <inheritdoc/>
-        public override void DatasetRecord(DatabaseRecord dr)
-        {
-            var rdi = _refDataMapper.MapFromDb(dr.ThrowIfNull(nameof(dr)));
-            if (_confirmItemIsToBeAdded == null || _confirmItemIsToBeAdded(dr, rdi))
-                _item(rdi);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/GlobalUsing.cs b/src/CoreEx.Database/GlobalUsing.cs
new file mode 100644
index 00000000..a5fc3688
--- /dev/null
+++ b/src/CoreEx.Database/GlobalUsing.cs
@@ -0,0 +1,30 @@
+global using CloudNative.CloudEvents.Extensions;
+global using CoreEx.Abstractions;
+global using CoreEx.Data;
+global using CoreEx.Database.Abstractions;
+global using CoreEx.Database.Extended;
+global using CoreEx.Database.Mapping;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Hosting;
+global using CoreEx.Invokers;
+global using CoreEx.Json;
+global using CoreEx.Mapping.Converters.Abstractions;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Results.Abstractions;
+global using CoreEx.Wildcards;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Logging;
+global using OpenTelemetry;
+global using System.Collections;
+global using System.Data;
+global using System.Data.Common;
+global using System.Diagnostics;
+global using System.Globalization;
+global using System.Linq.Dynamic.Core;
+global using System.Reflection;
+global using System.Text;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/src/CoreEx.Database/HealthChecks/DatabaseHealthCheck.cs b/src/CoreEx.Database/HealthChecks/DatabaseHealthCheck.cs
deleted file mode 100644
index ac5f7f2f..00000000
--- a/src/CoreEx.Database/HealthChecks/DatabaseHealthCheck.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database.HealthChecks
-{
-    /// <summary>
-    /// Provides a generic <see cref="IDatabase"/> <see cref="IHealthCheck"/> to verify the database is accessible by executing a simple <c>SELECT 1</c> statement.
-    /// </summary>
-    /// <typeparam name="TDatabase">The <see cref="IDatabase"/> type.</typeparam>
-    /// <param name="database">The <see cref="IDatabase"/> to health check.</param>
-    public class DatabaseHealthCheck<TDatabase>(TDatabase database) : IHealthCheck where TDatabase : IDatabase
-    {
-        private readonly IDatabase _database = database.ThrowIfNull(nameof(database));
-
-        /// <inheritdoc/>
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            var conn = _database.GetConnection();
-            var data = new Dictionary<string, object> { { "database", conn.Database ?? "<unknown>" }, { "dataSource", conn.DataSource ?? "<unknown>" } };
-            var result = await _database.SqlStatement("SELECT 1").NonQueryWithResultAsync(cancellationToken).ConfigureAwait(false);
-            return result.IsSuccess ? HealthCheckResult.Healthy(null, data) : new HealthCheckResult(context.Registration.FailureStatus, $"An unexpected database error has occurred.", result.Error, data);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IDatabase.cs b/src/CoreEx.Database/IDatabase.cs
index c2a9a4a2..c35979be 100644
--- a/src/CoreEx.Database/IDatabase.cs
+++ b/src/CoreEx.Database/IDatabase.cs
@@ -1,130 +1,121 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Database.Extended;
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Mapping.Converters;
-using CoreEx.Results;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Data.Common;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Database
+namespace CoreEx.Database;
+
+/// <summary>
+/// Enables database (relational) access.
+/// </summary>
+public interface IDatabase
 {
     /// <summary>
-    /// Defines the database access.
-    /// </summary>
-    public interface IDatabase : IAsyncDisposable, IDisposable
-    {
-        /// <summary>
-        /// Gets the <see cref="DbProviderFactory"/>.
-        /// </summary>
-        DbProviderFactory Provider { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        ILogger? Logger { get; }
-
-        /// <summary>
-        /// Gets the <see cref="DatabaseInvoker"/>.
-        /// </summary>
-        DatabaseInvoker Invoker { get; }
-
-        /// <summary>
-        /// Gets the default <see cref="DatabaseArgs"/> used where not expliticly specified for an operation.
-        /// </summary>
-        DatabaseArgs DbArgs { get; }
-
-        /// <summary>
-        /// Gets the unique database instance identifier.
-        /// </summary>
-        Guid DatabaseId { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Entities.DateTimeTransform"/> to be used when retrieving (see <see cref="DatabaseRecord.GetValue{T}(string)"/>) a <see cref="DateTime"/> value from a <see cref="DatabaseRecord"/>.
-        /// </summary>
-        DateTimeTransform DateTimeTransform { get; set; }
-
-        /// <summary>
-        /// Gets or sets the names of the pre-configured <see cref="Extended.DatabaseColumns"/>.
-        /// </summary>
-        DatabaseColumns DatabaseColumns { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="DatabaseWildcard"/> to enable wildcard replacement.
-        /// </summary>
-        DatabaseWildcard Wildcard { get; set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="Mapping.ChangeLogDatabaseMapper.MapToDb(ChangeLog?, DatabaseParameterCollection, CoreEx.Mapping.OperationTypes)"/> and 
-        /// <see cref="Mapping.ChangeLogExDatabaseMapper.MapToDb(Entities.Extended.ChangeLogEx?, DatabaseParameterCollection, CoreEx.Mapping.OperationTypes)"/> pass values via parameters.
-        /// </summary>
-        bool EnableChangeLogMapperToDb { get; }
-
-        /// <summary>
-        /// Gets the <see cref="DatabaseColumns.RowVersionName"/> converter.
-        /// </summary>
-        IConverter RowVersionConverter { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/> used to automatically serialize complex objects and <see cref="System.Collections.IEnumerable"/> parameters types to JSON.
-        /// </summary>
-        /// <remarks>See <see cref="DatabaseParameterCollection.AddParameter(string, object?, System.Data.ParameterDirection)"/>.</remarks>
-        IJsonSerializer JsonSerializer => CoreEx.ExecutionContext.GetService<IJsonSerializer>() ?? CoreEx.Json.JsonSerializer.Default;
-
-        /// <summary>
-        /// Gets the <see cref="DbConnection"/>.
-        /// </summary>
-        /// <remarks>The connection is created and opened on first use, and closed on <see cref="IAsyncDisposable.DisposeAsync()"/> or <see cref="IDisposable.Dispose()"/>.</remarks>
-        DbConnection GetConnection();
-
-        /// <summary>
-        /// Gets the <see cref="DbConnection"/>.
-        /// </summary>
-        /// <remarks>The connection is created and opened on first use, and closed on <see cref="IAsyncDisposable.DisposeAsync()"/> or <see cref="IDisposable.Dispose()"/>.</remarks>
-        Task<DbConnection> GetConnectionAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Creates a stored procedure <see cref="DatabaseCommand"/>.
-        /// </summary>
-        /// <param name="storedProcedure">The stored procedure name.</param>
-        /// <returns>The <see cref="DatabaseCommand"/>.</returns>
-        DatabaseCommand StoredProcedure(string storedProcedure);
-
-        /// <summary>
-        /// Creates a SQL statement <see cref="DatabaseCommand"/>.
-        /// </summary>
-        /// <param name="sqlStatement">The SQL statement.</param>
-        /// <returns>The <see cref="DatabaseCommand"/>.</returns>
-        DatabaseCommand SqlStatement(string sqlStatement);
-
-        /// <summary>
-        /// Creates a SQL statement <see cref="DatabaseCommand"/> from the named embedded resource within the specified <paramref name="assembly"/>.
-        /// </summary>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
-        /// <returns>The <see cref="DatabaseCommand"/>.</returns>
-        DatabaseCommand SqlFromResource(string resourceName, Assembly? assembly = null);
-
-        /// <summary>
-        /// Creates a SQL statement <see cref="DatabaseCommand"/> from the named embedded resource within the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> that contains the embedded resource.</typeparam>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <returns>The <see cref="DatabaseCommand"/>.</returns>
-        DatabaseCommand SqlFromResource<TResource>(string resourceName);
-
-        /// <summary>
-        /// Invoked where a <see cref="DbException"/> has been thrown.
-        /// </summary>
-        /// <param name="dbex">The <see cref="DbException"/>.</param>
-        /// <returns>The <see cref="Result"/> containing the appropriate <see cref="IResult.Error"/> where handled; otherwise, <c>null</c> indicating that the exception is unexpected and will continue to be thrown as such.</returns>
-        /// <remarks>Provides an opportunity to inspect and handle the exception before it is returned. A resulting <see cref="Result"/> that is <see cref="Result.IsSuccess"/> is not considered sensical; therefore, will result in the originating
-        /// exception being thrown.</remarks>
-        Result? HandleDbException(DbException dbex);
-    }
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    ILogger? Logger { get; }
+
+    /// <summary>
+    /// Gets the <see cref="DatabaseInvoker"/>.
+    /// </summary>
+    DatabaseInvoker Invoker { get; }
+
+    /// <summary>
+    /// Gets the default <see cref="DatabaseArgs"/> used where not expliticly specified for an operation.
+    /// </summary>
+    DatabaseArgs DbArgs { get; }
+
+    /// <summary>
+    /// Gets the unique database instance identifier.
+    /// </summary>
+    string DatabaseId { get; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="Entities.DateTimeTransform"/> to be used when retrieving (see <see cref="DatabaseRecord.GetValue{T}(string)"/>) a <see cref="DateTime"/> value from a <see cref="DatabaseRecord"/>.
+    /// </summary>
+    DateTimeTransform DateTimeTransform { get; set; }
+
+    /// <summary>
+    /// Indicates whether to transform a <see cref="DateTimeOffset"/> when adding as a parameter (see <see cref="DatabaseParameterCollection.AddParameter{T}"/> using the <see cref="DateTimeOffset.ToUniversalTime"/>).
+    /// </summary>
+    /// <remarks>See <see href="https://www.tinybird.co/blog/database-timestamps-timezone"/> for more information. As such, the default will typically be <see langword="true"/>.</remarks>
+    bool DateTimeOffsetTransform { get; set; }
+
+    /// <summary>
+    /// Gets the names of the convention-based <see cref="Extended.DatabaseColumns"/>.
+    /// </summary>
+    DatabaseColumns NamedColumns { get; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="DatabaseWildcard"/> to enable wildcard replacement.
+    /// </summary>
+    DatabaseWildcard Wildcard { get; set; }
+
+    /// <summary>
+    /// Gets the <see cref="DatabaseColumns.RowVersionName"/> converter.
+    /// </summary>
+    ISourceConverter<string?> RowVersionConverter { get; }
+
+    /// <summary>
+    /// Gets the <see cref="JsonSerializerOptions"/> used to serialize database parameters to JSON.
+    /// </summary>
+    /// <remarks>See <see cref="DatabaseParameterCollection.AddJsonParameter{T}(string, T)"/>.</remarks>
+    JsonSerializerOptions JsonSerializerOptions { get;  }
+
+    /// <summary>
+    /// Gets the current <see cref="DbTransaction"/>, where one exists.
+    /// </summary>
+    DbTransaction? CurrentTransaction { get; }
+
+    /// <summary>
+    /// Indicates whether a transaction is currently in progress.
+    /// </summary>
+    /// <remarks>See <see cref="CurrentTransaction"/>.</remarks>
+    bool IsInTransaction { get; }
+
+    /// <summary>
+    /// Uses (overrides/resets) the <see cref="IDatabase.CurrentTransaction"/>.
+    /// </summary>
+    /// <param name="transaction">The <see cref="DbTransaction"/>.</param>
+    /// <remarks>Raises the <see cref="UseTransactionChanged"/> event to ensure all interested parties are included (where applicable).</remarks>
+    void UseTransaction(DbTransaction? transaction);
+
+    /// <summary>
+    /// Raised when the <see cref="UseTransaction(DbTransaction?)"/> results in an underlying <see cref="DbTransaction"/> change.
+    /// </summary>
+    event EventHandler? UseTransactionChanged;
+
+    /// <summary>
+    /// Gets the <see cref="DbConnection"/>.
+    /// </summary>
+    /// <remarks>Gets the <see cref="DbConnection"/> in its current state; to have it automatically opened use <see cref="GetConnectionAsync(CancellationToken)"/>.</remarks>
+    DbConnection Connection { get; }
+
+    /// <summary>
+    /// Gets the <see cref="DbConnection"/>.
+    /// </summary>
+    /// <remarks>The connection will be automatically opened where not already open. The connection will <i>not</i> be closed, that is the responsibility of the caller.</remarks>
+    Task<DbConnection> GetConnectionAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Creates a <see cref="DatabaseCommand"/> for the <see cref="SqlStatement"/>.
+    /// </summary>
+    /// <param name="statement">The <see cref="SqlStatement"/>.</param>
+    /// <returns>The <see cref="DatabaseCommand"/>.</returns>
+    DatabaseCommand Statement(SqlStatement statement);
+
+    /// <summary>
+    /// Invoked where a <see cref="DbException"/> has been thrown.
+    /// </summary>
+    /// <param name="dbex">The <see cref="DbException"/>.</param>
+    /// <returns>The <see cref="Exception"/> where handled (converted); otherwise, <see langword="null"/> indicating that the exception is unexpected and will continue to be thrown/bubbled as such.</returns>
+    /// <remarks>Provides an opportunity to inspect and convert the exception before it continues to bubble.</remarks>
+    Exception? HandleDbException(DbException dbex);
+
+    /// <summary>
+    /// Creates a new database parameter.
+    /// </summary>
+    /// <returns>The <see cref="DbParameter"/>.</returns>
+    DbParameter CreateParameter();
+
+    /// <summary>
+    /// Gets the next (monotonic counter) save-point name used for nested transactions.
+    /// </summary>
+    /// <returns>The save-point name.</returns>
+    string GetNextSavePointName();
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/IDatabaseMapper.cs b/src/CoreEx.Database/IDatabaseMapper.cs
deleted file mode 100644
index f2cc5cb7..00000000
--- a/src/CoreEx.Database/IDatabaseMapper.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Defines a database mapper.
-    /// </summary>
-    public interface IDatabaseMapper
-    {
-        /// <summary>
-        /// Gets the source <see cref="Type"/> being mapped from/to the database.
-        /// </summary>
-        Type SourceType { get; }
-
-        /// <summary>
-        /// Maps from a <paramref name="record"/> creating a corresponding instance of the <see cref="SourceType"/>.
-        /// </summary>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of the <see cref="SourceType"/>.</returns>
-        object? MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="parameters"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToDb(object? value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps the <paramref name="key"/> and adds to the <paramref name="parameters"/>.
-        /// </summary>
-        /// <param name="key">The primary <see cref="CompositeKey"/>.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
-        /// <remarks>This is used to map the only the key parameters; for example a <b>Get</b> or <b>Delete</b> operation.</remarks>
-        void MapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IDatabaseMapperT.cs b/src/CoreEx.Database/IDatabaseMapperT.cs
deleted file mode 100644
index c936fe48..00000000
--- a/src/CoreEx.Database/IDatabaseMapperT.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Defines a database mapper.
-    /// </summary>
-    /// <typeparam name="TSource">The <see cref="IDatabaseMapper.SourceType"/>.</typeparam>
-    public interface IDatabaseMapper<TSource> : IDatabaseMapper
-    {
-        /// <inheritdoc/>
-        Type IDatabaseMapper.SourceType => typeof(TSource);
-
-        /// <inheritdoc/>
-        object? IDatabaseMapper.MapFromDb(DatabaseRecord record, OperationTypes operationType) => MapFromDb(record, operationType)!;
-
-        /// <inheritdoc/>
-        void IDatabaseMapper.MapToDb(object? value, DatabaseParameterCollection parameters, OperationTypes operationType) => MapToDb((TSource?)value, parameters, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="record"/> creating a corresponding instance of <typeparamref name="TSource"/>.
-        /// </summary>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of <typeparamref name="TSource"/>.</returns>
-        new TSource? MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="parameters"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToDb(TSource? value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <inheritdoc/>
-        void IDatabaseMapper.MapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters) => throw new NotSupportedException();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IDatabaseParameters.cs b/src/CoreEx.Database/IDatabaseParameters.cs
deleted file mode 100644
index 5b363bfc..00000000
--- a/src/CoreEx.Database/IDatabaseParameters.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Enables standardized access to the underlying <see cref="Parameters"/>.
-    /// </summary>
-    /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-    public interface IDatabaseParameters<TSelf>
-    {
-        /// <summary>
-        /// Gets the <see cref="IDatabase"/>.
-        /// </summary>
-        IDatabase Database { get; }
-
-        /// <summary>
-        /// Gets the <see cref="DatabaseParameterCollection"/>.
-        /// </summary>
-        DatabaseParameterCollection Parameters { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IDatabaseParametersExtensions.cs b/src/CoreEx.Database/IDatabaseParametersExtensions.cs
deleted file mode 100644
index c67cff36..00000000
--- a/src/CoreEx.Database/IDatabaseParametersExtensions.cs
+++ /dev/null
@@ -1,518 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Database.Mapping;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.Common;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides <see cref="IDatabaseParameters{TSelf}"/> extension methods.
-    /// </summary>
-    public static class IDatabaseParametersExtensions
-    {
-        /// <summary>
-        /// Add one or more parameters by invoking a delegate.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="action">The delegate to enable parameter addition.</param>
-        /// <returns>The current <see cref="DatabaseCommand"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf Params<TSelf>(this IDatabaseParameters<TSelf> parameters, Action<DatabaseParameterCollection> action)
-        {
-            action.ThrowIfNull(nameof(action))(parameters.ThrowIfNull(nameof(parameters)).Parameters);
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="DbParameter"/> <paramref name="list"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="list">The <see cref="DbParameter"/> list.</param>
-        /// <returns>The current <see cref="DatabaseCommand"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf Params<TSelf>(this IDatabaseParameters<TSelf> parameters, IEnumerable<DbParameter> list)
-        {
-            if (list != null && list != parameters.Parameters)
-                parameters.Parameters.AddRange(list);
-
-            return (TSelf)parameters;
-        }
-
-        #region Param
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, object? value, ParameterDirection direction = ParameterDirection.Input)
-        {
-            parameters.ThrowIfNull(nameof(parameters)).Parameters.AddParameter(name, value, direction);
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="dbType"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, object? value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-        {
-            parameters.ThrowIfNull(nameof(parameters)).Parameters.AddParameter(name, value, dbType, direction);
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="dbType"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="size">The maximum size (in bytes).</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, DbType dbType, int size, ParameterDirection direction = ParameterDirection.Input)
-        {
-            parameters.ThrowIfNull(nameof(parameters)).Parameters.AddParameter(name, dbType, size, direction);
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, IPropertyColumnMapper mapper, object? value, ParameterDirection direction = ParameterDirection.Input)
-            => Param(parameters, mapper?.ParameterName!, value, direction);
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="dbType"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, IPropertyColumnMapper mapper, object? value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-            => Param(parameters, mapper?.ParameterName!, value, dbType, direction);
-
-        /// <summary>
-        /// Adds the named parameter and value, using the specified <paramref name="dbType"/> and <paramref name="direction"/>, to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="size">The maximum size (in bytes).</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf Param<TSelf>(this IDatabaseParameters<TSelf> parameters, IPropertyColumnMapper mapper, DbType dbType, int size, ParameterDirection direction = ParameterDirection.Input)
-            => Param(parameters, mapper?.ParameterName!, dbType, size, direction);
-
-        /// <summary>
-        /// Adds the named parameter and value serialized as a JSON <see cref="string"/> to the <see cref="DbCommand.Parameters"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf JsonParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, object? value)
-        {
-            parameters.ThrowIfNull(nameof(parameters)).Parameters.AddJsonParameter(name, value);
-            return (TSelf)parameters;
-        }
-
-        #endregion
-
-        #region ParamWhen
-
-        /// <summary>
-        /// Adds a named parameter and value <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T> value, ParameterDirection direction = ParameterDirection.Input)
-        {
-            value.ThrowIfNull(nameof(value));
-
-            if (when == true)
-                parameters.ThrowIfNull(nameof(parameters)).Parameters.AddParameter(name, value(), direction);
-
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds a named parameter and value <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T> value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-        {
-            value.ThrowIfNull(nameof(value));
-
-            if (when == true)
-                parameters.ThrowIfNull(nameof(parameters)).Parameters.AddParameter(name, value(), dbType, direction);
-
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds a named parameter and value <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, IPropertyColumnMapper mapper, Func<T> value, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, when, mapper?.ParameterName!, value, direction);
-
-        /// <summary>
-        /// Adds a named parameter and value <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf ParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, IPropertyColumnMapper mapper, Func<T> value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, when, mapper?.ParameterName!, value, dbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter and value serialized as a JSON <see cref="string"/> <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <returns>The <see cref="DatabaseParameterCollection"/> to support fluent-style method-chaining.</returns>
-        public static TSelf JsonParamWhen<TSelf, T>(this IDatabaseParameters<TSelf> parameters, bool? when, string name, Func<T?> value)
-        {
-            value.ThrowIfNull(nameof(value));
-
-            if (when == true)
-                parameters.ThrowIfNull(nameof(parameters)).Parameters.AddJsonParameter(name, value());
-
-            return (TSelf)parameters;
-        }
-
-        #endregion
-
-        #region ParamWith
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-<see langword="null"/> value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TWith">The parameter <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, TWith, TValue>(this IDatabaseParameters<TSelf> parameters, TWith? with, string name, Func<TValue> value, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, with != null && Comparer<TWith>.Default.Compare(with, default!) != 0, name, value, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, with != null && Comparer<T>.Default.Compare(with, default!) != 0, name, () => with!, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, string name, Func<T> value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, with != null && Comparer<T>.Default.Compare((T)with, default!) != 0, name, value, dbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value; where not specified the <paramref name="with"/> value will be used.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, string name, Func<T>? value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWhen(parameters, with != null && Comparer<T>.Default.Compare(with, default!) != 0, name, value ?? (() => with!), dbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, IPropertyColumnMapper mapper, Func<T> value, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, with, mapper, value, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value; where not specified the <paramref name="with"/> value will be used.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, IPropertyColumnMapper mapper, Func<T>? value = null, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, with, mapper, value ?? (() => with!), direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, object? with, IPropertyColumnMapper mapper, Func<T> value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, with, mapper, value, dbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The parameter <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The parameter value; where not specified the <paramref name="with"/> value will be used.</param>
-        /// <param name="dbType">The parameter <see cref="DbType"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWith<TSelf, T>(this IDatabaseParameters<TSelf> parameters, T? with, IPropertyColumnMapper mapper, Func<T>? value, DbType dbType, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, with, mapper, value ?? (() => with!), dbType, direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked <paramref name="with"/> a non-default value serialized as a JSON <see cref="string"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TWith">The with value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The parameter value <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="with">The value <b>with</b> which to verify is non-default.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The parameter value.</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf JsonParamWith<TSelf, TWith, TValue>(this IDatabaseParameters<TSelf> parameters, TWith? with, string name, Func<TValue?> value)
-            => JsonParamWhen(parameters, with != null && Comparer<TWith>.Default.Compare(with, default!) != 0, name, value);
-
-        #endregion
-
-        #region ParamWithWildcard
-
-        /// <summary>
-        /// Adds a named parameter when invoked with a non-default <paramref name="wildcard"/> (converted for the database).
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="wildcard">The wildcard <b>with</b> which to verify is non-default and apply.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWithWildcard<TSelf>(this IDatabaseParameters<TSelf> parameters, string? wildcard, string name, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWith(parameters, wildcard, name, () => parameters.Database.Wildcard.Replace(wildcard), direction);
-
-        /// <summary>
-        /// Adds a named parameter when invoked with a non-default <paramref name="wildcard"/> (converted for the database).
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="wildcard">The wildcard <b>with</b> which to verify is non-default and apply.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ParamWithWildcard<TSelf>(this IDatabaseParameters<TSelf> parameters, string? wildcard, IPropertyColumnMapper mapper, ParameterDirection direction = ParameterDirection.Input)
-            => ParamWithWildcard(parameters, wildcard, mapper?.ParameterName!, direction);
-
-        #endregion
-
-        #region RowVersionParam
-
-        /// <summary>
-        /// Adds a named parameter with a <b>RowVersion</b> value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="name">The parameter name.</param>
-        /// <param name="value">The row version value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf RowVersionParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string name, string? value, ParameterDirection direction = ParameterDirection.Input)
-            => Param(parameters, name ?? parameters.Database.DatabaseColumns.RowVersionName, parameters.Database.RowVersionConverter.ConvertToDestination(value), direction);
-
-        /// <summary>
-        /// Adds a named parameter with a <b>RowVersion</b> value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="mapper">The <see cref="IPropertyColumnMapper"/>.</param>
-        /// <param name="value">The row version value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf RowVersionParam<TSelf>(this IDatabaseParameters<TSelf> parameters, IPropertyColumnMapper mapper, string? value, ParameterDirection direction = ParameterDirection.Input)
-            => RowVersionParam(parameters, mapper?.ParameterName!, value, direction);
-
-        /// <summary>
-        /// Adds a named (<see cref="Extended.DatabaseColumns.RowVersionName"/>) parameter with a <b>RowVersion</b> value.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="value">The row version value.</param>
-        /// <param name="direction">The <see cref="ParameterDirection"/> (default to <see cref="ParameterDirection.Input"/>).</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf RowVersionParam<TSelf>(this IDatabaseParameters<TSelf> parameters, string? value, ParameterDirection direction = ParameterDirection.Input)
-            => RowVersionParam(parameters, parameters.Database.DatabaseColumns.RowVersionName, value, direction);
-
-        #endregion
-
-        #region ReselectRecordParam
-
-        /// <summary>
-        /// Adds a named parameter (<see cref="Extended.DatabaseColumns.ReselectRecordName"/>) to <paramref name="reselect"/> the data.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="reselect">Indicates whether to reselect after the operation.</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ReselectRecordParam<TSelf>(this IDatabaseParameters<TSelf> parameters, bool reselect = true)
-        {
-            parameters.ThrowIfNull(nameof(parameters)).Parameters.AddReselectRecordParam(reselect);
-            return (TSelf)parameters;
-        }
-
-        /// <summary>
-        /// Adds a named parameter (<see cref="Extended.DatabaseColumns.ReselectRecordName"/>) to <paramref name="reselect"/> the data <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="when">Adds the parameter when <c>true</c>.</param>
-        /// <param name="reselect">Indicates whether to reselect after the operation.</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf ReselectRecordParamWhen<TSelf>(this IDatabaseParameters<TSelf> parameters, bool? when, bool reselect = true)
-        {
-            if (when == true)
-                ReselectRecordParam(parameters, reselect);
-
-            return (TSelf)parameters;
-        }
-
-        #endregion
-
-        #region PagingParams
-
-        /// <summary>
-        /// Adds the <see cref="PagingArgs"/> as parameters.
-        /// </summary>
-        /// <typeparam name="TSelf">The owning <see cref="Type"/>.</typeparam>
-        /// <param name="parameters">The <see cref="IDatabaseParameters{TSelf}"/>.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The current <see cref="DatabaseParameterCollection"/> instance to support chaining (fluent interface).</returns>
-        public static TSelf PagingParams<TSelf>(this IDatabaseParameters<TSelf> parameters, PagingArgs? paging)
-        {
-            if (paging != null)
-            {
-                parameters.Param(parameters.Database.DatabaseColumns.PagingSkipName, paging.Skip);
-                parameters.Param(parameters.Database.DatabaseColumns.PagingTakeName, paging.Take);
-                parameters.ParamWhen(paging.IsGetCount, parameters.Database.DatabaseColumns.PagingCountName, () => paging.IsGetCount);
-            }
-
-            return (TSelf)parameters;
-        }
-
-        #endregion 
-
-        /// <summary>
-        /// Sets the <see cref="DbParameter.Direction"/> to <see cref="ParameterDirection.Output"/> when the <paramref name="operationType"/> is <see cref="OperationTypes.Create"/>.
-        /// </summary>
-        /// <param name="parameter">The <see cref="DbParameter"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The <paramref name="parameter"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Where not <see cref="OperationTypes.Create"/> then the <see cref="DbParameter.Direction"/> will remain unchanged.</remarks>
-        public static DbParameter SetDirectionToOutputOnCreate(this DbParameter parameter, OperationTypes operationType)
-        {
-            if (operationType == OperationTypes.Create)
-                parameter.Direction = ParameterDirection.Output;
-
-            return parameter;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IDatabaseUnitOfWork.cs b/src/CoreEx.Database/IDatabaseUnitOfWork.cs
new file mode 100644
index 00000000..ac7e644c
--- /dev/null
+++ b/src/CoreEx.Database/IDatabaseUnitOfWork.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Database;
+
+/// <summary>
+/// Extends the <see cref="IUnitOfWork"/> to provide database-specific functionality.
+/// </summary>
+public interface IDatabaseUnitOfWork : IUnitOfWork
+{
+    /// <summary>
+    /// Gets the underlying <see cref="IDatabase"/>.
+    /// </summary>
+    public IDatabase Database { get; }
+
+    /// <summary>
+    /// Gets the optional <see cref="IEventPublisher"/> to be used as a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+    /// </summary>
+    public IEventPublisher? Outbox { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IMultiSetArgs.cs b/src/CoreEx.Database/IMultiSetArgs.cs
deleted file mode 100644
index 7cbc4028..00000000
--- a/src/CoreEx.Database/IMultiSetArgs.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Enables the <b>Database</b> multi-set arguments
-    /// </summary>
-    public interface IMultiSetArgs
-    {
-        /// <summary>
-        /// Gets the minimum number of rows allowed.
-        /// </summary>
-        int MinRows { get; }
-
-        /// <summary>
-        /// Gets the maximum number of rows allowed.
-        /// </summary>
-        int? MaxRows { get; }
-
-        /// <summary>
-        /// Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).
-        /// </summary>
-        bool StopOnNull { get; }
-
-        /// <summary>
-        /// The <see cref="DatabaseRecord"/> method invoked for each record for its respective dataset.
-        /// </summary>
-        /// <param name="dr">The <see cref="DatabaseRecord"/>.</param>
-        void DatasetRecord(DatabaseRecord dr);
-
-        /// <summary>
-        /// Invokes the corresponding result function.
-        /// </summary>
-        void InvokeResult();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/IMultiSetArgsT.cs b/src/CoreEx.Database/IMultiSetArgsT.cs
deleted file mode 100644
index 785d9ff7..00000000
--- a/src/CoreEx.Database/IMultiSetArgsT.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Enables the <b>Database</b> multi-set arguments with a <see cref="Mapper"/>.
-    /// </summary>
-    /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-    public interface IMultiSetArgs<T> : IMultiSetArgs where T : class, new()
-    {
-        /// <summary>
-        /// Gets the <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.
-        /// </summary>
-        IDatabaseMapper<T> Mapper { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/ChangeLogDatabaseMapper.cs b/src/CoreEx.Database/Mapping/ChangeLogDatabaseMapper.cs
deleted file mode 100644
index b403ebf5..00000000
--- a/src/CoreEx.Database/Mapping/ChangeLogDatabaseMapper.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Represents a <see cref="ChangeLog"/> <see cref="IDatabaseMapper"/>.
-    /// </summary>
-    public readonly struct ChangeLogDatabaseMapper : IDatabaseMapper<ChangeLog>
-    {
-        private static readonly Lazy<ChangeLogDatabaseMapper> _default = new(() => new(), true);
-
-        /// <summary>
-        /// Gets the default (singleton) instance.
-        /// </summary>
-        public static ChangeLogDatabaseMapper Default => _default.Value;
-
-        /// <inheritdoc/>
-        public ChangeLog? MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            if (OperationTypes.AnyExceptGet.HasFlag(operationType))
-            {
-                var changeLog = new ChangeLog
-                {
-                    CreatedBy = record.GetValue<string?>(record.Database.DatabaseColumns.CreatedByName),
-                    CreatedDate = record.GetValue<DateTime?>(record.Database.DatabaseColumns.CreatedDateName),
-                    UpdatedBy = record.GetValue<string?>(record.Database.DatabaseColumns.UpdatedByName),
-                    UpdatedDate = record.GetValue<DateTime?>(record.Database.DatabaseColumns.UpdatedDateName)
-                };
-
-                return ((IChangeLogAudit)changeLog).IsInitial ? null : changeLog;
-            }
-
-            return null;
-        }
-
-        /// <inheritdoc/>
-        public void MapToDb(ChangeLog? value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            if (value == null || !parameters.Database.EnableChangeLogMapperToDb)
-                return;
-
-            if (OperationTypes.AnyExceptUpdate.HasFlag(operationType))
-            {
-                parameters.Param(parameters.Database.DatabaseColumns.CreatedByName, value.CreatedBy);
-                parameters.Param(parameters.Database.DatabaseColumns.CreatedDateName, value.CreatedDate);
-            }
-
-            if (OperationTypes.AnyExceptCreate.HasFlag(operationType))
-            {
-                parameters.Param(parameters.Database.DatabaseColumns.UpdatedByName, value.UpdatedBy);
-                parameters.Param(parameters.Database.DatabaseColumns.UpdatedDateName, value.UpdatedDate);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/ChangeLogExDatabaseMapper.cs b/src/CoreEx.Database/Mapping/ChangeLogExDatabaseMapper.cs
deleted file mode 100644
index c6fa88ff..00000000
--- a/src/CoreEx.Database/Mapping/ChangeLogExDatabaseMapper.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities.Extended;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Represents a <see cref="ChangeLogEx"/> <see cref="IDatabaseMapper"/>.
-    /// </summary>
-    public readonly struct ChangeLogExDatabaseMapper : IDatabaseMapper<ChangeLogEx>
-    {
-        private static readonly Lazy<ChangeLogExDatabaseMapper> _default = new(() => new(), true);
-
-        /// <summary>
-        /// Gets the default (singleton) instance.
-        /// </summary>
-        public static ChangeLogExDatabaseMapper Default => _default.Value;
-
-        /// <inheritdoc/>
-        public ChangeLogEx? MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            if (OperationTypes.AnyExceptGet.HasFlag(operationType))
-            {
-                var ChangeLogEx = new ChangeLogEx
-                {
-                    CreatedBy = record.GetValue<string?>(record.Database.DatabaseColumns.CreatedByName),
-                    CreatedDate = record.GetValue<DateTime?>(record.Database.DatabaseColumns.CreatedDateName),
-                    UpdatedBy = record.GetValue<string?>(record.Database.DatabaseColumns.UpdatedByName),
-                    UpdatedDate = record.GetValue<DateTime?>(record.Database.DatabaseColumns.UpdatedDateName)
-                };
-
-                return ((Entities.IChangeLogAudit)ChangeLogEx).IsInitial ? null : ChangeLogEx;
-            }
-
-            return null;
-        }
-
-        /// <inheritdoc/>
-        public void MapToDb(ChangeLogEx? value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            if (value == null || !parameters.Database.EnableChangeLogMapperToDb)
-                return;
-
-            if (OperationTypes.AnyExceptUpdate.HasFlag(operationType))
-            {
-                parameters.Param(parameters.Database.DatabaseColumns.CreatedByName, value.CreatedBy);
-                parameters.Param(parameters.Database.DatabaseColumns.CreatedDateName, value.CreatedDate);
-            }
-
-            if (OperationTypes.AnyExceptCreate.HasFlag(operationType))
-            {
-                parameters.Param(parameters.Database.DatabaseColumns.UpdatedByName, value.UpdatedBy);
-                parameters.Param(parameters.Database.DatabaseColumns.UpdatedDateName, value.UpdatedDate);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/DatabaseMapper.cs b/src/CoreEx.Database/Mapping/DatabaseMapper.cs
index 45f18a76..25de62be 100644
--- a/src/CoreEx.Database/Mapping/DatabaseMapper.cs
+++ b/src/CoreEx.Database/Mapping/DatabaseMapper.cs
@@ -1,36 +1,184 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Database.Mapping;
 
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database.Mapping
+/// <summary>
+/// Provides utility capabilities for database mapping.
+/// </summary>
+public static class DatabaseMapper
 {
     /// <summary>
-    /// Enables <see cref="Create{TSource}"/> or <see cref="CreateAuto{TSource}(string[])"/> of a <see cref="DatabaseMapper{TSource}"/>.
+    /// Maps the database record values to the standard properties of the specified item.
+    /// </summary>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="item">The item to map into.</param>
+    /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <param name="strict">Indicates whether the underlying <paramref name="record"/> column value is strictly required or not.</param>
+    /// <returns>The <paramref name="item"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Standard properties are mapped based on whether the <typeparamref name="TItem"/> implements the following respectively:
+    ///   <list type="bullet">
+    ///     <item><see cref="DatabaseColumns.RowVersionName"/> -> <see cref="IReadOnlyETag"/></item>
+    ///     <item><see cref="DatabaseColumns.TenantIdName"/> -> <see cref="IReadOnlyTenantId"/></item>
+    ///     <item><see cref="DatabaseColumns.IsDeletedName"/> -> <see cref="IReadOnlyLogicallyDeleted"/></item>
+    ///     <item>* -> <see cref="IReadOnlyChangeLog"/></item>
+    ///     <item>* -> <see cref="IReadOnlyChangeLogEx"/></item>
+    ///   </list>
+    /// </remarks>    
+    public static TItem MapStandardFromDb<TItem>(this TItem item, DatabaseRecord record, OperationType operationType = OperationType.Unspecified, bool strict = true)
+    {
+        MapStandardFromDb(record, item.ThrowIfNull(), operationType, strict);
+        return item;
+    }
+
+    /// <summary>
+    /// Maps the database record values to the standard properties of the specified item.
+    /// </summary>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
+    /// <param name="item">The item to map into.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <param name="strict">Indicates whether the underlying <paramref name="record"/> column value is strictly required or not.</param>
+    /// <remarks>Standard properties are mapped based on whether the <typeparamref name="TItem"/> implements the following respectively:
+    ///   <list type="bullet">
+    ///     <item><see cref="DatabaseColumns.RowVersionName"/> -> <see cref="IReadOnlyETag"/></item>
+    ///     <item><see cref="DatabaseColumns.TenantIdName"/> -> <see cref="IReadOnlyTenantId"/></item>
+    ///     <item><see cref="DatabaseColumns.IsDeletedName"/> -> <see cref="IReadOnlyLogicallyDeleted"/></item>
+    ///     <item>* -> <see cref="IReadOnlyChangeLog"/></item>
+    ///     <item>* -> <see cref="IReadOnlyChangeLogEx"/></item>
+    ///   </list>
+    /// </remarks>    
+    public static void MapStandardFromDb<TItem>(DatabaseRecord record, TItem? item, OperationType operationType = OperationType.Unspecified, bool strict = true)
+    {
+        if (record is null || item is null)
+            return;
+
+        if (item is IETag et)
+            et.ETag = strict || record.TryGetOrdinal(record.Database.NamedColumns.RowVersionName, out _) ? record.GetRowVersion() : default;
+
+        if (item is ITenantId ti)
+            ti.TenantId = strict ? record.GetValue<string?>(record.Database.NamedColumns.TenantIdName) : record.GetValueOrDefault<string?>(record.Database.NamedColumns.TenantIdName);
+
+        if (item is ILogicallyDeleted ld)
+            ld.IsDeleted = (strict ? record.GetValue<bool?>(record.Database.NamedColumns.IsDeletedName) : record.GetValueOrDefault<bool?>(record.Database.NamedColumns.IsDeletedName)) ?? false;
+
+        MapChangeLogFromDb(record, item, operationType, strict);
+    }
+
+    /// <summary>
+    /// Maps the database record values to the standard change log properties of the specified item.
+    /// </summary>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
+    /// <param name="item">The item to map into.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <param name="strict">Indicates whether the underlying <paramref name="record"/> column value is strictly required or not.</param>
+    /// <returns>The <paramref name="item"/> to support fluent-style method-chaining.</returns>
+    public static TItem MapChangeLogFromDb<TItem>(this TItem item, DatabaseRecord record, OperationType operationType = OperationType.Unspecified, bool strict = true)
+    {
+        MapChangeLogFromDb(record, item.ThrowIfNull(), operationType, strict);
+        return item;
+    }
+
+    /// <summary>
+    /// Maps the database record values to the standard change log properties of the specified item.
     /// </summary>
-    public static class DatabaseMapper
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
+    /// <param name="item">The item to map into.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <param name="strict">Indicates whether the underlying <paramref name="record"/> column value is strictly required or not.</param>
+    public static void MapChangeLogFromDb<TItem>(DatabaseRecord record, TItem? item, OperationType operationType = OperationType.Unspecified, bool strict = true)
     {
-        /// <summary>
-        /// Creates a <see cref="DatabaseMapper{TSource}"/> where properties are added manually (leverages reflection).
-        /// </summary>
-        /// <returns>A <see cref="DatabaseMapper{TSource}"/>.</returns>
-        /// <remarks>Where performance is critical consider using <see cref="CreateExtended{TSource}"/>.</remarks>
-        public static DatabaseMapper<TSource> Create<TSource>() where TSource : class, new() => new(false);
-
-        /// <summary>
-        /// Creates a <see cref="DatabaseMapper{TSource}"/> where properties are added automatically using reflection (assumes the property, column and parameter names share the same name).
-        /// </summary>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        /// <returns>A <see cref="DatabaseMapper{TSource}"/>.</returns>
-        /// <remarks>Where performance is critical consider using <see cref="CreateExtended{TSource}"/>.</remarks>
-        public static DatabaseMapper<TSource> CreateAuto<TSource>(params string[] ignoreSrceProperties) where TSource : class, new() => new(true, ignoreSrceProperties);
-
-        /// <summary>
-        /// Creates a <see cref="DatabaseMapperEx{TSource}"/> where the underlying implementation is added explicitly (extended, offers potential performance benefits).
-        /// </summary>
-        /// <returns>A <see cref="DatabaseMapperEx{TSource}"/>.</returns>
-        public static DatabaseMapperEx<TSource> CreateExtended<TSource>(Action<DatabaseRecord, TSource, OperationTypes>? mapFromDb = null, Action<CompositeKey, DatabaseParameterCollection>? mapKeyToDb = null, Action<TSource?, DatabaseParameterCollection, OperationTypes>? mapToDb = null) where TSource : class, new()
-            => new(mapFromDb, mapKeyToDb, mapToDb);
+        if (record is null || item is null)
+            return;
+
+        if (item is IChangeLog cl)
+        {
+            if (cl.ChangeLog is null)
+            {
+                // Only update where there is a legit value.
+                var changeLog = new ChangeLog();
+                MapChangeLogFromDb(record, changeLog, operationType, strict);
+                if (!changeLog.IsDefault())
+                    cl.ChangeLog = changeLog;
+            }
+            else
+                MapChangeLogFromDb(record, cl.ChangeLog, operationType, strict);
+        }
+
+        if (item is not IChangeLogEx cle)
+            return;
+
+        cle.CreatedBy = strict ? record.GetValue<string?>(record.Database.NamedColumns.CreatedByName) : record.GetValueOrDefault<string?>(record.Database.NamedColumns.CreatedByName);
+        cle.CreatedOn = strict ? record.GetValue<DateTimeOffset?>(record.Database.NamedColumns.CreatedOnName) : record.GetValueOrDefault<DateTimeOffset?>(record.Database.NamedColumns.CreatedOnName);
+        cle.UpdatedBy = strict ? record.GetValue<string?>(record.Database.NamedColumns.UpdatedByName) : record.GetValueOrDefault<string?>(record.Database.NamedColumns.UpdatedByName);
+        cle.UpdatedOn = strict ? record.GetValue<DateTimeOffset?>(record.Database.NamedColumns.UpdatedOnName) : record.GetValueOrDefault<DateTimeOffset?>(record.Database.NamedColumns.UpdatedOnName);
+    }
+
+    /// <summary>
+    /// Maps the standard properties of the specified item to the database parameters.
+    /// </summary>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="item">The item value.</param>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="item"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <remarks>Standard properties are mapped based on whether the <typeparamref name="TItem"/> implements the following respectively:
+    ///   <list type="bullet">
+    ///     <item><see cref="IReadOnlyETag"/> -> <see cref="DatabaseColumns.RowVersionName"/></item>
+    ///     <item><see cref="IReadOnlyTenantId"/> -> <see cref="DatabaseColumns.TenantIdName"/></item>
+    ///     <item><see cref="IReadOnlyLogicallyDeleted"/> -> <see cref="DatabaseColumns.IsDeletedName"/></item>
+    ///     <item><see cref="IReadOnlyChangeLog"/> -> *</item>
+    ///     <item><see cref="IReadOnlyChangeLogEx"/> -> *</item>
+    ///   </list>
+    /// </remarks>
+    public static void MapStandardToDb<TItem>(TItem item, DatabaseParameterCollection parameters, OperationType operationType = OperationType.Unspecified)
+    {
+        if (item is null)
+            return;
+
+        if (item is IReadOnlyETag et)
+            parameters.AddParameter(parameters.Database.NamedColumns.RowVersionName, et.ETag);
+
+        if (item is IReadOnlyTenantId ti)
+            parameters.AddParameter(parameters.Database.NamedColumns.TenantIdName, ti.TenantId);
+
+        if (item is IReadOnlyLogicallyDeleted ld)
+            parameters.AddParameter(parameters.Database.NamedColumns.IsDeletedName, ld.IsDeleted);
+
+        MapChangeLogToDb(item, parameters, operationType);
+    }
+
+    /// <summary>
+    /// Maps the change log properties of the specified item to the database parameters.
+    /// </summary>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="item">The item value.</param>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="item"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <remarks>This maps both <see cref="IChangeLog"/> and <see cref="IChangeLogEx"/> using the corresponding the <see cref="IDatabase.NamedColumns"/>.</remarks>
+    public static void MapChangeLogToDb<TItem>(TItem item, DatabaseParameterCollection parameters, OperationType operationType = OperationType.Unspecified)
+    {
+        if (item is null)
+            return;
+
+        if (item is IChangeLog cl && cl.ChangeLog is not null)
+        {
+            MapChangeLogToDb(cl.ChangeLog, parameters, operationType);
+            return;
+        }
+
+        if (item is IChangeLogEx cle)
+        {
+            if (operationType == OperationType.Unspecified || operationType == OperationType.Create)
+            {
+                parameters.AddParameter(parameters.Database.NamedColumns.CreatedByName, cle.CreatedBy);
+                parameters.AddParameter(parameters.Database.NamedColumns.CreatedOnName, cle.CreatedOn);
+            }
+
+            if (operationType == OperationType.Unspecified || operationType == OperationType.Update)
+            {
+                parameters.AddParameter(parameters.Database.NamedColumns.UpdatedByName, cle.UpdatedBy);
+                parameters.AddParameter(parameters.Database.NamedColumns.UpdatedOnName, cle.UpdatedOn);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/DatabaseMapperExT.cs b/src/CoreEx.Database/Mapping/DatabaseMapperExT.cs
deleted file mode 100644
index 97f1efd2..00000000
--- a/src/CoreEx.Database/Mapping/DatabaseMapperExT.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Provides mapping from a <typeparamref name="TSource"/> <see cref="Type"/> and database with the extended/explicitly provided logic.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <param name="mapFromDb">The <see cref="MapFromDb(DatabaseRecord, OperationTypes)"/> implementation.</param>
-    /// <param name="mapKeyToDb">The <see cref="IDatabaseMapper.MapKeyToDb(CompositeKey, DatabaseParameterCollection)"/> implementation.</param>
-    /// <param name="mapToDb">The <see cref="MapToDb(TSource?, DatabaseParameterCollection, OperationTypes)"/> implementation.</param>
-    /// <remarks>This enables the most optimized performance by enabling explicit code to be specified.</remarks>
-    public class DatabaseMapperEx<TSource>(Action<DatabaseRecord, TSource, OperationTypes>? mapFromDb = null, Action<CompositeKey, DatabaseParameterCollection>? mapKeyToDb = null, Action<TSource?, DatabaseParameterCollection, OperationTypes>? mapToDb = null) : IDatabaseMapperEx<TSource> where TSource : class, new()
-    {
-        private readonly Action<DatabaseRecord, TSource, OperationTypes>? _mapFromDb = mapFromDb;
-        private readonly Action<TSource?, DatabaseParameterCollection, OperationTypes>? _mapToDb = mapToDb;
-        private readonly Action<CompositeKey, DatabaseParameterCollection>? _mapKeyToDb = mapKeyToDb;
-        private IDatabaseMapperEx? _extendMapper;
-
-        /// <summary>
-        /// Indicates that a <c>null</c> should be returned from <see cref="MapFromDb(DatabaseRecord, OperationTypes)"/> where the resulting value <see cref="IInitial.IsInitial"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>.</remarks>
-        public bool NullWhenInitial { get; set; } = true;
-
-        /// <summary>
-        /// Inherits (includes) the mappings from the selected <paramref name="baseMapper"/>.
-        /// </summary>
-        /// <typeparam name="TBase">The <paramref name="baseMapper"/> source <see cref="Type"/>; <typeparamref name="TSource"/> must inherit from <typeparamref name="TBase"/>.</typeparam>
-        /// <param name="baseMapper">The <see cref="IDatabaseMapperEx{TSource}"/> to inherit from.</param>
-        /// <returns>The <see cref="DatabaseMapperEx{TSource}"/> to support fluent-style method-chaining.</returns>
-        public DatabaseMapperEx<TSource> InheritMapper<TBase>(IDatabaseMapperEx<TBase> baseMapper) where TBase : class, new()
-        {
-            if (_extendMapper is not null)
-                throw new InvalidOperationException($"An {nameof(InheritMapper)} may only be invoked once for a mapper.");
-
-            if (!typeof(TSource).IsSubclassOf(typeof(TBase)))
-                throw new ArgumentException($"Type {typeof(TSource).Name} must inherit from {typeof(TBase).Name}.", nameof(baseMapper));
-
-            _extendMapper = baseMapper.ThrowIfNull(nameof(baseMapper));
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public void MapFromDb(DatabaseRecord record, TSource value, OperationTypes operationType)
-        {
-            record.ThrowIfNull(nameof(record));
-            value.ThrowIfNull(nameof(value));
-
-            _extendMapper?.MapFromDb(record, value, operationType);
-            _mapFromDb?.Invoke(record, value, operationType);
-            OnMapFromDb(record, value, operationType);
-        }
-
-        /// <inheritdoc/>
-        public TSource? MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            var value = new TSource();
-            MapFromDb(record, value, operationType);
-            return NullWhenInitial ? ((value is not null && value is IInitial ii && ii.IsInitial) ? null : value) : null;
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapFromDb(DatabaseRecord, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The source value.</param>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The source value.</returns>
-        protected virtual void OnMapFromDb(DatabaseRecord record, TSource value, OperationTypes operationType) { }
-
-        /// <inheritdoc/>
-        public void MapToDb(TSource? value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            parameters.ThrowIfNull(nameof(parameters));
-            if (value is not null)
-            {
-                _extendMapper?.MapToDb(value, parameters, operationType);
-                _mapToDb?.Invoke(value, parameters, operationType);
-                OnMapToDb(value, parameters, operationType);
-            }
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapToDb(TSource, DatabaseParameterCollection, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        protected virtual void OnMapToDb(TSource value, DatabaseParameterCollection parameters, OperationTypes operationType) { }
-
-        /// <inheritdoc/>
-        void IDatabaseMapper.MapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters)
-        {
-            parameters.ThrowIfNull(nameof(parameters));
-            _extendMapper?.MapKeyToDb(key, parameters);
-            _mapKeyToDb?.Invoke(key, parameters);
-            OnMapKeyToDb(key, parameters);
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="IDatabaseMapper.MapKeyToDb"/>.
-        /// </summary>
-        /// <param name="key">The primary <see cref="CompositeKey"/>.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
-        /// <remarks>This is used to map the only the key parameters; for example a <b>Get</b> or <b>Delete</b> operation.</remarks>
-        protected virtual void OnMapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters) { }
-
-        #region When*
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.Get"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenGet(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Get, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.Create"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenCreate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Create, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is an <see cref="OperationTypes.Update"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenUpdate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Update, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.Delete"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenDelete(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Delete, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.AnyExceptGet"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenAnyExceptGet(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.AnyExceptGet, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.AnyExceptCreate"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenAnyExceptCreate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.AnyExceptCreate, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.AnyExceptUpdate"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenAnyExceptUpdate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.AnyExceptUpdate, operationType, action);
-
-        /// <summary>
-        /// When the <paramref name="operationType"/> matches the <paramref name="expectedOperationTypes"/> then the <paramref name="action"/> is invoked.
-        /// </summary>
-        private static void WhenOperationType(OperationTypes expectedOperationTypes, OperationTypes operationType, Action action)
-        {
-            if (expectedOperationTypes.HasFlag(operationType))
-                action?.Invoke();
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/DatabaseMapperExT2.cs b/src/CoreEx.Database/Mapping/DatabaseMapperExT2.cs
deleted file mode 100644
index 8e22e36c..00000000
--- a/src/CoreEx.Database/Mapping/DatabaseMapperExT2.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Provides <see cref="DatabaseMapperEx{TSource}"/> with a singleton <see cref="Default"/>.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TMapper">The mapper <see cref="Type"/>.</typeparam>
-    public abstract class DatabaseMapperEx<TSource, TMapper> : DatabaseMapperEx<TSource> where TSource : class, new() where TMapper : DatabaseMapperEx<TSource, TMapper>, new()
-    {
-        private static readonly TMapper _default = new();
-
-        /// <summary>
-        /// Gets the current instance of the mapper.
-        /// </summary>
-        public static TMapper Default => _default ?? throw new InvalidOperationException("An instance of this Mapper cannot be referenced as it is still being constructed; beware that you may have a circular reference within the constructor.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/DatabaseMapperT.cs b/src/CoreEx.Database/Mapping/DatabaseMapperT.cs
index 853e192c..4f062cac 100644
--- a/src/CoreEx.Database/Mapping/DatabaseMapperT.cs
+++ b/src/CoreEx.Database/Mapping/DatabaseMapperT.cs
@@ -1,289 +1,21 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.Database.Mapping
+namespace CoreEx.Database.Mapping;
+
+/// <summary>
+/// Provides a <see cref="IDatabaseMapper{TItem}"/> using optional mapping functions.
+/// </summary>
+/// <typeparam name="TItem">The resulting item <see cref="Type"/>.</typeparam>
+/// <param name="mapFromDb">The optional <see cref="DatabaseRecord"/> to <typeparamref name="TItem"/> mapping function.</param>
+/// <param name="mapToDb">The optional <typeparamref name="TItem"/> to <see cref="DatabaseParameterCollection"/> mapping action.</param>
+/// <remarks>The <see cref="MapFromDb(CoreEx.Database.DatabaseRecord, CoreEx.OperationType)"/> and <see cref="MapToDb(TItem?, CoreEx.Database.DatabaseParameterCollection, CoreEx.OperationType)"/>
+/// methods will throw a <see cref="NotImplementedException"/> unless overridden or provided via the constructor.</remarks>
+public class DatabaseMapper<TItem>(Func<DatabaseRecord, OperationType, TItem>? mapFromDb = null, Action<TItem?, DatabaseParameterCollection, OperationType>? mapToDb = null) : IDatabaseMapper<TItem>
 {
-    /// <summary>
-    /// Provides mapping from a <typeparamref name="TSource"/> <see cref="Type"/> and database using reflection.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <remarks>Where performance is critical consider using <see cref="DatabaseMapperEx{TSource}"/>.</remarks>
-    public class DatabaseMapper<TSource> : IDatabaseMapper<TSource>, IDatabaseMapperMappings where TSource : class, new()
-    {
-        private readonly List<IPropertyColumnMapper> _mappings = [];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DatabaseMapper{TSource}"/> class.
-        /// </summary>
-        /// <param name="autoMap">Indicates whether the entity should automatically map all public get/set properties, where the property, column and parameter names are all assumed to share the same name.</param>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        public DatabaseMapper(bool autoMap = false, params string[] ignoreSrceProperties)
-        {
-            if (typeof(TSource) == typeof(string)) throw new InvalidOperationException("TSource must not be a String.");
-
-            if (autoMap)
-                AutomagicallyMap(ignoreSrceProperties);
-        }
-
-        /// <inheritdoc/>
-        IEnumerable<IPropertyColumnMapper> IDatabaseMapperMappings.Mappings => _mappings.AsEnumerable();
-
-        /// <inheritdoc/>
-        public IPropertyColumnMapper this[string propertyName] => TryGetProperty(propertyName, out var pcm) ? pcm : throw new ArgumentException($"Property '{propertyName}' does not exist.", nameof(propertyName));
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> for the specified source <paramref name="propertyExpression"/>.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        public IPropertyColumnMapper this[Expression<Func<TSource, object?>> propertyExpression]
-        {
-            get
-            {
-                propertyExpression.ThrowIfNull(nameof(propertyExpression));
-
-                MemberExpression? me = null;
-                if (propertyExpression.Body.NodeType == ExpressionType.MemberAccess)
-                    me = propertyExpression.Body as MemberExpression;
-                else if (propertyExpression.Body.NodeType == ExpressionType.Convert)
-                {
-                    if (propertyExpression.Body is UnaryExpression ue)
-                        me = ue.Operand as MemberExpression;
-                }
-
-                if (me == null)
-                    throw new InvalidOperationException("Only Member access expressions are supported.");
-
-                return this[me.Member.Name];
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyColumnMapper? propertyColumnMapper)
-        {
-            propertyColumnMapper = _mappings.Where(x => x.PropertyName == propertyName).FirstOrDefault();
-            return propertyColumnMapper != null;
-        }
-
-        /// <inheritdoc/>
-        public string GetParameterName(string propertyName) => this[propertyName].ParameterName;
-
-        /// <inheritdoc/>
-        public string GetColumnName(string propertyName) => this[propertyName].ColumnName;
-
-        /// <summary>
-        /// Automatically add each public get/set property.
-        /// </summary>
-        private void AutomagicallyMap(string[] ignoreSrceProperties)
-        {
-            foreach (var sp in TypeReflector.GetProperties(typeof(TSource)))
-            {
-                // Do not auto-map where ignore has been specified.
-                if (ignoreSrceProperties.Contains(sp.Name))
-                    continue;
-
-                // Create the lambda expression for the property and add to the mapper.
-                var spe = Expression.Parameter(typeof(TSource), "x");
-                var sex = Expression.Lambda(Expression.Property(spe, sp), spe);
-                typeof(DatabaseMapper<TSource>)
-                    .GetMethod("Property", BindingFlags.Public | BindingFlags.Instance)!
-                    .MakeGenericMethod([sp.PropertyType])
-                    .Invoke(this, [sex, null, null, OperationTypes.Any]);
-            }
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper.
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The database column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="parameterName">The database parameter name. Defaults to <paramref name="columnName"/> prefixed with '<c>@</c>'.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> Property<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, string? parameterName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            var pcm = new PropertyColumnMapper<TSource, TSourceProperty>(propertyExpression, columnName, parameterName, operationTypes);
-            AddMapping(pcm);
-            return pcm;
-        }
-
-        /// <summary>
-        /// Validates and adds a new IPropertyColumnMapper.
-        /// </summary>
-        private void AddMapping<TSourceProperty>(PropertyColumnMapper<TSource, TSourceProperty> propertyColumnMapper)
-        {
-            if (_mappings.Any(x => x.PropertyName == propertyColumnMapper.PropertyName))
-                throw new ArgumentException($"Source property '{propertyColumnMapper.PropertyName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            if (_mappings.Any(x => x.ColumnName == propertyColumnMapper.ColumnName))
-                throw new ArgumentException($"Column '{propertyColumnMapper.ColumnName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            if (_mappings.Any(x => x.ParameterName == propertyColumnMapper.ParameterName))
-                throw new ArgumentException($"Parameter '{propertyColumnMapper.ParameterName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            _mappings.Add(propertyColumnMapper);
-        }
-
-        /// <summary>
-        /// Adds or updates <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper.
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The database column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="parameterName">The database parameter name. Defaults to <paramref name="columnName"/> prefixed with '<c>@</c>'.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <param name="property">An <see cref="Action"/> enabling access to the created <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</param>
-        /// <returns></returns>
-        /// <remarks>Where updating an existing the <paramref name="columnName"/>, <paramref name="parameterName"/> and <paramref name="operationTypes"/> where specified will override the previous values.</remarks>
-        public DatabaseMapper<TSource> HasProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, string? parameterName = null, OperationTypes? operationTypes = null, Action<PropertyColumnMapper<TSource, TSourceProperty>>? property = null)
-        {
-            var tmp = new PropertyColumnMapper<TSource, TSourceProperty>(propertyExpression, columnName, parameterName, operationTypes ?? OperationTypes.Any);
-            var pcm = _mappings.Where(x => x.PropertyName == tmp.PropertyName).OfType<PropertyColumnMapper<TSource, TSourceProperty>>().SingleOrDefault();
-            if (pcm == null)
-                AddMapping(pcm = tmp);
-            else
-            {
-                if (columnName != null && tmp.ColumnName != pcm.ColumnName)
-                {
-                    if (_mappings.Any(x => x.ColumnName == pcm.ColumnName))
-                        throw new ArgumentException($"Column '{pcm.ColumnName}' must not be specified more than once.", nameof(columnName));
-                    else
-                        pcm.ColumnName = tmp.ColumnName;
-                }
-
-                if (parameterName != null && tmp.ParameterName != pcm.ParameterName)
-                {
-                    if (_mappings.Any(x => x.ParameterName == tmp.ParameterName))
-                        throw new ArgumentException($"Parameter '{pcm.ParameterName}' must not be specified more than once.", nameof(parameterName));
-                    else
-                        pcm.ParameterName = tmp.ParameterName;
-                }
-
-                if (operationTypes != null)
-                    pcm.OperationTypes = operationTypes.Value;
-            }
-
-            property?.Invoke(pcm);
-            return this;
-        }
-
-        /// <summary>
-        /// Inherits the property mappings from the selected <paramref name="inheritMapper"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="inheritMapper"/> source <see cref="Type"/>. Must inherit from <typeparamref name="TSource"/>.</typeparam>
-        /// <param name="inheritMapper">The <see cref="IDatabaseMapper{T}"/> to inherit from. Must also implement <see cref="IDatabaseMapperMappings"/>.</param>
-        public void InheritPropertiesFrom<T>(IDatabaseMapper<T> inheritMapper) where T : class, new()
-        {
-            inheritMapper.ThrowIfNull(nameof(inheritMapper));
-            if (!typeof(TSource).IsSubclassOf(typeof(T))) throw new ArgumentException($"Type {typeof(TSource).Name} must inherit from {typeof(T).Name}.", nameof(inheritMapper));
-            if (inheritMapper is not IDatabaseMapperMappings inheritMappings) throw new ArgumentException($"Type {typeof(T).Name} must implement {typeof(IDatabaseMapperMappings).Name} to copy the mappings.", nameof(inheritMapper));
-
-            var pe = Expression.Parameter(typeof(TSource), "x");
-            var type = typeof(DatabaseMapper<>).MakeGenericType(typeof(TSource));
-
-            foreach (var p in inheritMappings.Mappings)
-            {
-                var lex = Expression.Lambda(Expression.Property(pe, p.PropertyName), pe);
-                var pmap = (IPropertyColumnMapper)type
-                    .GetMethod("Property", BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)!
-                    .MakeGenericMethod(p.PropertyType)
-                    .Invoke(this, [lex, p.ColumnName, p.ParameterName, p.OperationTypes])!;
-
-                if (p.IsPrimaryKey)
-                    pmap.SetPrimaryKey(p.IsPrimaryKeyGeneratedOnCreate);
-
-                if (p.DbType != null)
-                    pmap.SetDbType(p.DbType.Value);
-
-                if (p.Converter != null)
-                    pmap.SetConverter(p.Converter);
-
-                if (p.Mapper != null)
-                    pmap.SetMapper(p.Mapper);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void MapToDb(TSource? value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            parameters.ThrowIfNull(nameof(parameters));
-            if (value == null) return;
-
-            foreach (var p in _mappings)
-            {
-                p.MapToDb(value, parameters, operationType);
-            }
-
-            OnMapToDb(value, parameters, operationType);
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapToDb(TSource, DatabaseParameterCollection, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        protected virtual void OnMapToDb(TSource value, DatabaseParameterCollection parameters, OperationTypes operationType) { }
-
-        /// <inheritdoc/>
-        public TSource? MapFromDb(DatabaseRecord record, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            record.ThrowIfNull(nameof(record));
-            var value = new TSource();
-
-            foreach (var p in _mappings)
-            {
-                p.MapFromDb(record, value, operationType);
-            }
-
-            value = OnMapFromDb(value, record, operationType);
-            return (value != null && value is IInitial ii && ii.IsInitial) ? null : value;
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapFromDb(DatabaseRecord, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The source value.</param>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The source value.</returns>
-        protected virtual TSource? OnMapFromDb(TSource value, DatabaseRecord record, OperationTypes operationType) => value;
-
-        /// <summary>
-        /// Converts the property value for the database.
-        /// </summary>
-        private static object? ConvertPropertyValueForDb(IPropertyColumnMapper pcm, object? value) => pcm.Converter == null ? value : pcm.Converter.ConvertToDestination(value);
-
-        /// <inheritdoc/>
-        void IDatabaseMapper.MapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters)
-        {
-            parameters.ThrowIfNull(nameof(parameters));
-            var pk = _mappings.Where(x => x.IsPrimaryKey).ToArray();
-            if (key.Args == null || key.Args.Length != pk.Length)
-                throw new ArgumentException($"The number of keys supplied must equal the number of properties identified as {nameof(IPropertyColumnMapper.IsPrimaryKey)}.", nameof(key));
+    private readonly Func<DatabaseRecord, OperationType, TItem>? _mapFromDb = mapFromDb;
+    private readonly Action<TItem?, DatabaseParameterCollection, OperationType>? _mapToDb = mapToDb;
 
-            for (int i = 0; i < key.Args.Length; i++)
-            {
-                var p = pk[i];
-                var pval = DatabaseMapper<TSource>.ConvertPropertyValueForDb(p, key.Args[i]);
+    /// <inheritdoc/>
+    public virtual TItem MapFromDb(DatabaseRecord record, OperationType operationType) => (_mapFromDb ?? throw new NotImplementedException())(record, operationType);
 
-                if (p.DbType.HasValue)
-                    parameters.AddParameter(p.ParameterName, pval, p.DbType.Value);
-                else
-                    parameters.AddParameter(p.ParameterName, pval);
-            }
-        }
-    }
+    /// <inheritdoc/>
+    public virtual void MapToDb(TItem? value, DatabaseParameterCollection parameters, OperationType operationType) => (_mapToDb ?? throw new NotImplementedException())(value, parameters, operationType);
 }
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/DatabaseMapperT2.cs b/src/CoreEx.Database/Mapping/DatabaseMapperT2.cs
deleted file mode 100644
index a2a01d7b..00000000
--- a/src/CoreEx.Database/Mapping/DatabaseMapperT2.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Provides <see cref="DatabaseMapper{TSource}"/> with a singleton <see cref="Default"/>.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TMapper">The mapper <see cref="Type"/>.</typeparam>
-    /// <remarks>Where performance is critical consider using <see cref="DatabaseMapperEx{TSource, TMapper}"/>.</remarks>
-    public abstract class DatabaseMapper<TSource, TMapper> : DatabaseMapper<TSource> where TSource : class, new() where TMapper : DatabaseMapper<TSource, TMapper>, new()
-    {
-        private static readonly TMapper _default = new();
-
-        /// <summary>
-        /// Gets the current instance of the mapper.
-        /// </summary>
-        public static TMapper Default => _default ?? throw new InvalidOperationException("An instance of this Mapper cannot be referenced as it is still being constructed; beware that you may have a circular reference within the constructor.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/IDatabaseMapper.cs b/src/CoreEx.Database/Mapping/IDatabaseMapper.cs
new file mode 100644
index 00000000..556e7f9f
--- /dev/null
+++ b/src/CoreEx.Database/Mapping/IDatabaseMapper.cs
@@ -0,0 +1,36 @@
+namespace CoreEx.Database.Mapping;
+
+/// <summary>
+/// Enables an <see cref="IDatabase"/> mapper.
+/// </summary>
+public interface IDatabaseMapper
+{
+    /// <summary>
+    /// Gets the item <see cref="Type"/> being mapped from/to the database.
+    /// </summary>
+    Type ItemType { get; }
+
+    /// <summary>
+    /// Maps from a <paramref name="record"/> creating a corresponding instance of the <see cref="ItemType"/>.
+    /// </summary>
+    /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <returns>The corresponding instance of the <see cref="ItemType"/>.</returns>
+    object? MapFromDb(DatabaseRecord record, OperationType operationType = OperationType.Unspecified);
+
+    /// <summary>
+    /// Maps from a <paramref name="value"/> updating the <paramref name="parameters"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    void MapToDb(object? value, DatabaseParameterCollection parameters, OperationType operationType = OperationType.Unspecified);
+
+    /// <summary>
+    /// Maps the <paramref name="key"/> adding the corresponding <paramref name="parameters"/>.
+    /// </summary>
+    /// <param name="key">The primary <see cref="CompositeKey"/>.</param>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/>.</param>
+    /// <remarks>This is used to map only the key parameters; for example, used for a <b>Get</b> or <b>Delete</b> operation.</remarks>
+    void MapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/IDatabaseMapperEx.cs b/src/CoreEx.Database/Mapping/IDatabaseMapperEx.cs
deleted file mode 100644
index 55dd8e9f..00000000
--- a/src/CoreEx.Database/Mapping/IDatabaseMapperEx.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Defines a database extended/explicit mapper.
-    /// </summary>
-    public interface IDatabaseMapperEx : IDatabaseMapper
-    {
-        /// <summary>
-        /// Maps from a <paramref name="record"/> into the <paramref name="value"/>
-        /// </summary>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="value">The value to map into.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapFromDb(DatabaseRecord record, object value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/IDatabaseMapperExT.cs b/src/CoreEx.Database/Mapping/IDatabaseMapperExT.cs
deleted file mode 100644
index bb5ac910..00000000
--- a/src/CoreEx.Database/Mapping/IDatabaseMapperExT.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Defines a database extended/explicit mapper.
-    /// </summary>
-    /// <typeparam name="TSource">The <see cref="IDatabaseMapper.SourceType"/>.</typeparam>
-    public interface IDatabaseMapperEx<TSource> : IDatabaseMapperEx, IDatabaseMapper<TSource>
-    {
-        /// <inheritdoc/>
-        void IDatabaseMapperEx.MapFromDb(DatabaseRecord record, object value, OperationTypes operationType)
-            => MapFromDb(record, (TSource)value, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="record"/> into the <paramref name="value"/>
-        /// </summary>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="value">The value to extend map into.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The updated <paramref name="value"/>.</returns>
-        void MapFromDb(DatabaseRecord record, TSource value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/IDatabaseMapperMappings.cs b/src/CoreEx.Database/Mapping/IDatabaseMapperMappings.cs
deleted file mode 100644
index 856ea6b9..00000000
--- a/src/CoreEx.Database/Mapping/IDatabaseMapperMappings.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Gets the <see cref="IPropertyColumnMapper"/> mappings.
-    /// </summary>
-    public interface IDatabaseMapperMappings
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> mappings.
-        /// </summary>
-        IEnumerable<IPropertyColumnMapper> Mappings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> from the <see cref="Mappings"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        IPropertyColumnMapper this[string propertyName] { get; }
-
-        /// <summary>
-        /// Attempts to get the <see cref="IPropertyColumnMapper"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <param name="propertyColumnMapper">The corresponding <see cref="IPropertyColumnMapper"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyColumnMapper? propertyColumnMapper);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper.ParameterName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper.ParameterName"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        string GetParameterName(string propertyName);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper.ColumnName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper.ColumnName"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        string GetColumnName(string propertyName);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/IDatabaseMapperT.cs b/src/CoreEx.Database/Mapping/IDatabaseMapperT.cs
new file mode 100644
index 00000000..3414b8b4
--- /dev/null
+++ b/src/CoreEx.Database/Mapping/IDatabaseMapperT.cs
@@ -0,0 +1,36 @@
+namespace CoreEx.Database.Mapping;
+
+/// <summary>
+/// Enables an <see cref="IDatabase"/> mapper.
+/// </summary>
+/// <typeparam name="TItem">The <see cref="IDatabaseMapper.ItemType"/>.</typeparam>
+public interface IDatabaseMapper<TItem> : IDatabaseMapper
+{
+    /// <inheritdoc/>
+    Type IDatabaseMapper.ItemType => typeof(TItem);
+
+    /// <inheritdoc/>
+    object? IDatabaseMapper.MapFromDb(DatabaseRecord record, OperationType operationType) => MapFromDb(record, operationType)!;
+
+    /// <inheritdoc/>
+    void IDatabaseMapper.MapToDb(object? value, DatabaseParameterCollection parameters, OperationType operationType) => MapToDb((TItem?)value, parameters, operationType);
+
+    /// <summary>
+    /// Maps from a <paramref name="record"/> creating a corresponding instance of <typeparamref name="TItem"/>.
+    /// </summary>
+    /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    /// <returns>The corresponding instance of <typeparamref name="TItem"/>.</returns>
+    new TItem? MapFromDb(DatabaseRecord record, OperationType operationType = OperationType.Unspecified);
+
+    /// <summary>
+    /// Maps from a <paramref name="value"/> updating the <paramref name="parameters"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
+    /// <param name="operationType">The <see cref="OperationType"/> value being performed to enable conditional execution where appropriate.</param>
+    void MapToDb(TItem? value, DatabaseParameterCollection parameters, OperationType operationType = OperationType.Unspecified);
+
+    /// <inheritdoc/>
+    void IDatabaseMapper.MapKeyToDb(CompositeKey key, DatabaseParameterCollection parameters) => throw new NotSupportedException();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/IPropertyColumnMapper.cs b/src/CoreEx.Database/Mapping/IPropertyColumnMapper.cs
deleted file mode 100644
index 485ffea7..00000000
--- a/src/CoreEx.Database/Mapping/IPropertyColumnMapper.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Data;
-using System.Data.Common;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Enables bi-directional property and database column mapping.
-    /// </summary>
-    public interface IPropertyColumnMapper
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyExpression"/>.
-        /// </summary>
-        IPropertyExpression PropertyExpression { get; }
-
-        /// <summary>
-        /// Gets the source property name.
-        /// </summary>
-        string PropertyName { get; }
-
-        /// <summary>
-        /// Gets the source property <see cref="Type"/>.
-        /// </summary>
-        Type PropertyType { get; }
-
-        /// <summary>
-        /// Indicates whether the underlying source property is a complex type.
-        /// </summary>
-        bool IsSrcePropertyComplex { get; }
-
-        /// <summary>
-        /// Gets the destination database column name.
-        /// </summary>
-        string ColumnName { get; }
-
-        /// <summary>
-        /// Gets the destination <see cref="DbParameter.ParameterName"/>.
-        /// </summary>
-        string ParameterName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property (default to <see cref="OperationTypes.Any"/>).
-        /// </summary>
-        OperationTypes OperationTypes { get; }
-
-        /// <summary>
-        /// Indicates whether the property forms part of the primary key. 
-        /// </summary>
-        bool IsPrimaryKey { get; }
-
-        /// <summary>
-        /// Indicates whether the primary key value is generated on create. 
-        /// </summary>
-        bool IsPrimaryKeyGeneratedOnCreate { get; }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/> and <see cref="IsPrimaryKeyGeneratedOnCreate"/>).
-        /// </summary>
-        /// <param name="generatedOnCreate">Indicates whether the column value is generated on create (defaults to <c>true</c>).</param>
-        void SetPrimaryKey(bool generatedOnCreate = true);
-
-        /// <summary>
-        /// Gets the <see cref="System.Data.DbType"/>.
-        /// </summary>
-        DbType? DbType { get; }
-
-        /// <summary>
-        /// Sets the <see cref="DbType"/>.
-        /// </summary>
-        /// <param name="dbType">The <see cref="System.Data.DbType"/></param>
-        void SetDbType(DbType dbType);
-
-        /// <summary>
-        /// Gets the <see cref="IConverter"/> (used where a specific source and destination type conversion is required).
-        /// </summary>
-        IConverter? Converter { get; }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        void SetConverter(IConverter converter);
-
-        /// <summary>
-        /// Gets the <see cref="IDatabaseMapper"/> to map complex types.
-        /// </summary>
-        IDatabaseMapper? Mapper { get; }
-
-        /// <summary>
-        /// Set the <see cref="IDatabaseMapper"/> to map complex types.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IDatabaseMapper"/>.</param>
-        /// <remarks>The <see cref="Mapper"/> and <see cref="Converter"/> are mutually exclusive.</remarks>
-        void SetMapper(IDatabaseMapper mapper);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="parameters"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToDb(object value, DatabaseParameterCollection parameters, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="record"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapFromDb(DatabaseRecord record, object value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/PropertyColumnMapper.cs b/src/CoreEx.Database/Mapping/PropertyColumnMapper.cs
deleted file mode 100644
index ed296914..00000000
--- a/src/CoreEx.Database/Mapping/PropertyColumnMapper.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Data;
-using System.Linq.Expressions;
-
-namespace CoreEx.Database.Mapping
-{
-    /// <summary>
-    /// Provides bi-directional property and database column mapping.
-    /// </summary>
-    /// <typeparam name="TSource">The source entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSourceProperty">The corresponding source property <see cref="Type"/>.</typeparam>
-    public class PropertyColumnMapper<TSource, TSourceProperty> : IPropertyColumnMapper where TSource : class, new()
-    {
-        private readonly PropertyExpression<TSource, TSourceProperty> _propertyExpression;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> class.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The database column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="parameterName">The database parameter name. Defaults to <paramref name="columnName"/> prefixed with '<c>@</c>'.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        public PropertyColumnMapper(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, string? parameterName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            _propertyExpression = Abstractions.Reflection.PropertyExpression.Create(propertyExpression);
-            ColumnName = columnName ?? PropertyName;
-            ParameterName = parameterName ?? $"@{columnName ?? PropertyName}";
-            OperationTypes = operationTypes;
-        }
-
-        /// <inheritdoc/>
-        public IPropertyExpression PropertyExpression => _propertyExpression;
-
-        /// <inheritdoc/>
-        public string PropertyName => _propertyExpression.Name;
-
-        /// <inheritdoc/>
-        public Type PropertyType => typeof(TSourceProperty);
-
-        /// <inheritdoc/>
-        public bool IsSrcePropertyComplex => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public string ColumnName { get; internal set; }
-
-        /// <inheritdoc/>
-        public string ParameterName { get; internal set; }
-
-        /// <inheritdoc/>
-        public OperationTypes OperationTypes { get; internal set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKey { get; private set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKeyGeneratedOnCreate { get; private set; }
-
-        /// <inheritdoc/>
-        public DbType? DbType { get; private set; }
-
-        /// <inheritdoc/>
-        public IConverter? Converter { get; private set; }
-
-        /// <inheritdoc/>
-        public IDatabaseMapper? Mapper { get; private set; }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetDbType(DbType dbType) => SetDbType(dbType);
-
-        /// <summary>
-        /// Sets the <see cref="DbType"/>.
-        /// </summary>
-        /// <param name="dbType">The <see cref="System.Data.DbType"/></param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetDbType(DbType dbType)
-        {
-            DbType = dbType;
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetConverter(IConverter converter)
-        {
-            converter.ThrowIfNull(nameof(converter));
-
-            if (Mapper != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (converter.SourceType != typeof(TSourceProperty))
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' and IConverter.SourceType '{converter.SourceType.Name}' must match.");
-
-            Converter = converter;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetConverter<TDestinationProperty>(IConverter<TSourceProperty, TDestinationProperty> converter)
-        {
-            ((IPropertyColumnMapper)this).SetConverter(converter);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetMapper(IDatabaseMapper mapper)
-        {
-            mapper.ThrowIfNull(nameof(mapper));
-
-            if (Converter != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (!_propertyExpression.IsClass)
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' must be a class to set a Mapper.");
-
-            if (mapper.SourceType != typeof(TSourceProperty))
-                throw new ArgumentException($"The PropertyType '{PropertyType.Name}' and IDatabaseMapper.SourceType '{mapper.SourceType.Name}' must match.", nameof(mapper));
-
-            if (IsPrimaryKey)
-                throw new InvalidOperationException("A Mapper can not be set for a primary key.");
-
-            Mapper = mapper;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Mapper"/>.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IDatabaseMapper"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetMapper<TDestinationProperty>(IDatabaseMapper<TDestinationProperty> mapper)
-        {
-            ((IPropertyColumnMapper)this).SetMapper(mapper);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetPrimaryKey(bool generatedOnCreate)
-        {
-            if (Mapper != null) throw new InvalidOperationException("A primary key must not contain a Mapper.");
-
-            IsPrimaryKey = true;
-            IsPrimaryKeyGeneratedOnCreate = generatedOnCreate;
-        }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/> and <see cref="IsPrimaryKeyGeneratedOnCreate"/>).
-        /// </summary>
-        /// <param name="generatedOnCreate">Indicates whether the column value is generated on create. Defaults to <c>true</c>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetPrimaryKey(bool generatedOnCreate = true)
-        {
-            ((IPropertyColumnMapper)this).SetPrimaryKey(generatedOnCreate);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.MapToDb(object? value, DatabaseParameterCollection parameters, OperationTypes operationType) => MapToDb((TSource?)value, parameters, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="parameters"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="parameters">The <see cref="DatabaseParameterCollection"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapToDb(TSource? value, DatabaseParameterCollection parameters, OperationTypes operationType)
-        {
-            if (value == null || !OperationTypes.HasFlag(operationType))
-                return;
-
-            if (parameters.Contains(ParameterName))
-                return;
-
-            var val = _propertyExpression.GetValue(value);
-            if (Mapper != null)
-            {
-                if (val != null)
-                    Mapper.MapToDb(val, parameters, operationType);
-            }
-            else
-            {
-                if (DbType.HasValue)
-                    parameters.AddParameter(ParameterName, Converter == null ? val : Converter.ConvertToDestination(val), DbType.Value);
-                else
-                    parameters.AddParameter(ParameterName, Converter == null ? val : Converter.ConvertToDestination(val));
-            }
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.MapFromDb(DatabaseRecord record, object value, OperationTypes operationType) => MapFromDb(record, (TSource)value, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="record"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="record">The <see cref="DatabaseRecord"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapFromDb(DatabaseRecord record, TSource value, OperationTypes operationType)
-        {
-            if (!OperationTypes.HasFlag(operationType))
-                return;
-
-            TSourceProperty? pval;
-            if (Mapper != null)
-                pval = (TSourceProperty?)Mapper.MapFromDb(record, operationType);
-            else
-            {
-                if (!record.IsDBNull(ColumnName, out var ordinal))
-                {
-                    if (Converter == null)
-                        pval = record.GetValue<TSourceProperty>(ordinal);
-                    else
-                        pval = (TSourceProperty)Converter.ConvertToSource(record.DataReader.GetValue(ordinal))!;
-                }
-                else
-                    pval = default;
-            }
-
-            _propertyExpression.SetValue(value, pval);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Mapping/README.md b/src/CoreEx.Database/Mapping/README.md
new file mode 100644
index 00000000..379a5aae
--- /dev/null
+++ b/src/CoreEx.Database/Mapping/README.md
@@ -0,0 +1,24 @@
+# CoreEx.Database.Mapping
+
+> Provides `IDatabaseMapper<T>` / `IDatabaseMapper<TSource, TDestination>` mapper interfaces, the `DatabaseMapper<T>` abstract base, and the `DatabaseMapper` static utility for reading and writing convention-based columns (`RowVersion`, `TenantId`, `IsDeleted`, change-log).
+
+## Overview
+
+`CoreEx.Database.Mapping` defines the explicit mapping contracts between CoreEx entity types and ADO.NET `DatabaseRecord` / `DatabaseParameterCollection`. Rather than using reflection or convention scanning, each entity type has a dedicated mapper class that overrides `OnMapFromDb` and `OnMapToDb`, calling `record.GetValue<T>("ColumnName")` and `parameters.AddParameter("ColumnName", value)` for each property.
+
+The `DatabaseMapper` static utility provides `MapStandardFromDb` and `MapStandardToDb` extension methods that handle the cross-cutting columns — `RowVersion` → `IETag`, `TenantId`, `IsDeleted`, and the four change-log columns — so individual mapper implementations only write their entity-specific columns. These are called once per mapper as part of the `FromDb`/`ToDb` chain.
+
+## Key types
+
+| Type | Description |
+|------|--------------|
+| **[`IDatabaseMapper<T>`](./IDatabaseMapperT.cs)** | Bidirectional mapper: `MapFromDb(DatabaseRecord, OperationType) → T` and `MapToDb(T, DatabaseParameterCollection, OperationType)`. |
+| **[`IDatabaseMapper<TSource, TDestination>`](./IDatabaseMapper.cs)** | Two-type variant: maps `TSource` → `TDestination` (e.g. entity → database model) and `TDestination` → `TSource`. |
+| **[`DatabaseMapper<T>`](./DatabaseMapperT.cs)** | Abstract base for `IDatabaseMapper<T>`; implements both direction methods by delegating to `OnMapFromDb` and `OnMapToDb` virtuals; calls `MapStandardFromDb` / `MapStandardToDb` for convention columns. |
+| **[`DatabaseMapper`](./DatabaseMapper.cs)** | Static utility: `MapStandardFromDb(item, record, operationType)` reads `RowVersion`/`TenantId`/`IsDeleted`/change-log columns; `MapStandardToDb(item, parameters, operationType)` writes them. |
+
+## Related Namespaces
+
+- **[`CoreEx.Database`](../README.md)** - `DatabaseRecord` and `DatabaseParameterCollection` are the ADO.NET wrappers consumed by mappers.
+- **[`CoreEx.Mapping`](../../CoreEx/Mapping/README.md)** - `Mapper.MapStandardFrom` is the in-memory equivalent of `DatabaseMapper.MapStandardFromDb` for entity-to-entity mapping.
+- **[`CoreEx.Entities`](../../CoreEx/Entities/README.md)** - `IETag`, `ITenantId`, `ILogicallyDeleted`, `IChangeLog`, and `IChangeLogEx` are the entity contracts whose properties are mapped by `MapStandardFromDb`/`MapStandardToDb`.
\ No newline at end of file
diff --git a/src/CoreEx.Database/MultiSetArgs.cs b/src/CoreEx.Database/MultiSetArgs.cs
deleted file mode 100644
index c2a901b9..00000000
--- a/src/CoreEx.Database/MultiSetArgs.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides <see cref="IMultiSetArgs"/> helpers.
-    /// </summary>
-    public static class MultiSetArgs
-    {
-        /// <summary>
-        /// Creates an <see cref="IMultiSetArgs"/> <see cref="IEnumerable{T}"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="IMultiSetArgs"/> arguments.</param>
-        /// <returns>The <see cref="IEnumerable{T}"/> <see cref="IMultiSetArgs"/>.</returns>
-        public static IEnumerable<IMultiSetArgs> Create(params IMultiSetArgs[] args) => args.AsEnumerable();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/MultiSetCollArgs.cs b/src/CoreEx.Database/MultiSetCollArgs.cs
deleted file mode 100644
index 3d4cd9d7..00000000
--- a/src/CoreEx.Database/MultiSetCollArgs.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides the base <b>Database</b> multi-set arguments when expecting a collection of items/records.
-    /// </summary>
-    public abstract class MultiSetCollArgs : IMultiSetArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MultiSetCollArgs"/> class.
-        /// </summary>
-        /// <param name="minRows">The minimum number of rows allowed.</param>
-        /// <param name="maxRows">The maximum number of rows allowed.</param>
-        /// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).</param>
-        public MultiSetCollArgs(int minRows = 0, int? maxRows = null, bool stopOnNull = false)
-        {
-            if (maxRows.HasValue && minRows <= maxRows.Value)
-                throw new ArgumentException("Max Rows is less than Min Rows.", nameof(maxRows));
-
-            MinRows = minRows;
-            MaxRows = maxRows;
-            StopOnNull = stopOnNull;
-        }
-
-        /// <summary>
-        /// Gets the minimum number of rows allowed.
-        /// </summary>
-        public int MinRows { get; }
-
-        /// <summary>
-        /// Gets the maximum number of rows allowed.
-        /// </summary>
-        public int? MaxRows { get; }
-
-        /// <summary>
-        /// Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).
-        /// </summary>
-        public bool StopOnNull { get; set; }
-
-        /// <summary>
-        /// The <see cref="DatabaseRecord"/> method invoked for each record for its respective dataset.
-        /// </summary>
-        /// <param name="dr">The <see cref="DatabaseRecord"/>.</param>
-        public abstract void DatasetRecord(DatabaseRecord dr);
-
-        /// <summary>
-        /// Invokes the corresponding result function.
-        /// </summary>
-        public virtual void InvokeResult() { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/MultiSetCollArgsT.cs b/src/CoreEx.Database/MultiSetCollArgsT.cs
deleted file mode 100644
index 0d3dec8b..00000000
--- a/src/CoreEx.Database/MultiSetCollArgsT.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides the <b>Database</b> multi-set arguments when expecting a collection of items/records.
-    /// </summary>
-    /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-    /// <param name="mapper">The <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.</param>
-    /// <param name="result">The action that will be invoked with the result of the set.</param>
-    /// <param name="minRows">The minimum number of rows allowed.</param>
-    /// <param name="maxRows">The maximum number of rows allowed.</param>
-    /// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).</param>
-    public class MultiSetCollArgs<TColl, TItem>(IDatabaseMapper<TItem> mapper, Action<TColl> result, int minRows = 0, int? maxRows = null, bool stopOnNull = false) : MultiSetCollArgs(minRows, maxRows, stopOnNull), IMultiSetArgs<TItem>
-        where TItem : class, new()
-        where TColl : class, ICollection<TItem>, new()
-    {
-        private TColl? _coll;
-        private readonly Action<TColl> _result = result.ThrowIfNull(nameof(result));
-
-        /// <summary>
-        /// Gets the <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.
-        /// </summary>
-        public IDatabaseMapper<TItem> Mapper { get; private set; } = mapper.ThrowIfNull(nameof(mapper));
-
-        /// <summary>
-        /// The <see cref="DatabaseRecord"/> method invoked for each record for its respective dataset.
-        /// </summary>
-        /// <param name="dr">The <see cref="DatabaseRecord"/>.</param>
-        public override void DatasetRecord(DatabaseRecord dr)
-        {
-            dr.ThrowIfNull(nameof(dr));
-            _coll ??= new TColl();
-
-            var item = Mapper.MapFromDb(dr);
-            if (item != null)
-                _coll.Add(item);
-        }
-
-        /// <summary>
-        /// Invokes the corresponding result function.
-        /// </summary>
-        public override void InvokeResult()
-        {
-            if (_coll != null)
-                _result(_coll);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/MultiSetSingleArgs.cs b/src/CoreEx.Database/MultiSetSingleArgs.cs
deleted file mode 100644
index 7dabf5aa..00000000
--- a/src/CoreEx.Database/MultiSetSingleArgs.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides the base <b>Database</b> multi-set arguments when expecting a single item/record only.
-    /// </summary>
-    /// <param name="isMandatory">Indicates whether the value is mandatory; defaults to <c>true</c>.</param>
-    /// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).</param>
-    public abstract class MultiSetSingleArgs(bool isMandatory = true, bool stopOnNull = false) : IMultiSetArgs
-    {
-        /// <summary>
-        /// Indicates whether the value is mandatory; i.e. a corresponding record must be read.
-        /// </summary>
-        public bool IsMandatory { get; set; } = isMandatory;
-
-        /// <summary>
-        /// Gets the minimum number of rows allowed.
-        /// </summary>
-        public int MinRows => IsMandatory ? 1 : 0;
-
-        /// <summary>
-        /// Gets the maximum number of rows allowed.
-        /// </summary>
-        public int? MaxRows => 1;
-
-        /// <summary>
-        /// Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).
-        /// </summary>
-        public bool StopOnNull { get; set; } = stopOnNull;
-
-        /// <summary>
-        /// The <see cref="DatabaseRecord"/> method invoked for each record for its respective dataset.
-        /// </summary>
-        /// <param name="dr">The <see cref="DatabaseRecord"/>.</param>
-        public abstract void DatasetRecord(DatabaseRecord dr);
-
-        /// <summary>
-        /// Invokes the corresponding result function.
-        /// </summary>
-        public virtual void InvokeResult() { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/MultiSetSingleArgsT.cs b/src/CoreEx.Database/MultiSetSingleArgsT.cs
deleted file mode 100644
index 609c3bfa..00000000
--- a/src/CoreEx.Database/MultiSetSingleArgsT.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Database
-{
-    /// <summary>
-    /// Provides the <b>Database</b> multi-set arguments when expecting a single item/record only.
-    /// </summary>
-    /// <typeparam name="T">The item <see cref="Type"/>.</typeparam>
-    /// <param name="mapper">The <see cref="IDatabaseMapper{TItem}"/> for the <see cref="DatabaseRecord"/>.</param>
-    /// <param name="result">The action that will be invoked with the result of the set.</param>
-    /// <param name="isMandatory">Indicates whether the value is mandatory; defaults to <c>true</c>.</param>
-    /// <param name="stopOnNull">Indicates whether to stop further query result set processing where the current set has resulted in a null (i.e. no records).</param>
-    public class MultiSetSingleArgs<T>(IDatabaseMapper<T> mapper, Action<T> result, bool isMandatory = true, bool stopOnNull = false) : MultiSetSingleArgs(isMandatory, stopOnNull), IMultiSetArgs<T>
-        where T : class, new()
-    {
-        private T? _value;
-        private readonly Action<T> _result = result.ThrowIfNull(nameof(result));
-
-        /// <summary>
-        /// Gets the <see cref="IDatabaseMapper{T}"/> for the <see cref="DatabaseRecord"/>.
-        /// </summary>
-        public IDatabaseMapper<T> Mapper { get; private set; } = mapper.ThrowIfNull(nameof(mapper));
-
-        /// <summary>
-        /// The <see cref="DatabaseRecord"/> method invoked for each record for its respective dataset.
-        /// </summary>
-        /// <param name="dr">The <see cref="DatabaseRecord"/>.</param>
-        public override void DatasetRecord(DatabaseRecord dr) => _value = Mapper.MapFromDb(dr);
-
-        /// <summary>
-        /// Invokes the corresponding result function.
-        /// </summary>
-        public override void InvokeResult()
-        {
-            if (_value != null)
-                _result(_value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/DatabaseOutboxPublisherBase.cs b/src/CoreEx.Database/Outbox/DatabaseOutboxPublisherBase.cs
new file mode 100644
index 00000000..43adde0d
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/DatabaseOutboxPublisherBase.cs
@@ -0,0 +1,37 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Provides the base <see cref="IEventPublisher"/> to be used as a <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see>.
+/// </summary>
+/// <param name="database">The <see cref="IDatabase"/>.</param>
+/// <param name="destinationProvider">The optional <see cref="IDestinationProvider"/>.</param>
+/// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The optional <see cref="ILogger"/>.</param>
+public abstract class DatabaseOutboxPublisherBase<TDatabase>(TDatabase database, IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<DatabaseOutboxPublisherBase<TDatabase>>? logger = null)
+    : EventPublisherBase(destinationProvider, formatter, logger) where TDatabase : IDatabase
+{
+    /// <summary>
+    /// Gets the underlying <typeparamref name="TDatabase"/>.
+    /// </summary>
+    protected TDatabase Database { get; } = database.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the <see cref="SqlStatement"/> used to persist each event to the underlying outbox store.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="SqlStatement.Indeterminate"/>.</remarks>
+    public virtual SqlStatement Statement { get; set; } = SqlStatement.Indeterminate;
+
+    /// <summary>
+    /// Gets or sets the maximum number of statements to include in a single batch operation.
+    /// </summary>
+    /// <remarks><para>Defaults to '<c>10</c>'.</para>
+    /// Increasing the batch size may improve performance by reducing the number of round trips; however, larger batches may require more memory and could result in a timeout or other resource-related issues.
+    /// <para>This is only leveraged where the <see cref="Statement"/> is a <see cref="SqlStatement.CommandType"/> of <see cref="CommandType.StoredProcedure"/>; otherwise, they are executed individually.</para></remarks>
+    public int StatementBatchSize { get; set => field = value.ThrowIfLessThanOrEqualToZero(); } = 10;
+
+    /// <summary>
+    /// Gets or sets the partition size to use when calculating the partition id for each event.
+    /// </summary>
+    /// <remarks>This is used to ensure that events with the same partition key are stored in the same partition, which guarantees that events are processed in order within a partition.</remarks>
+    public int PartitionSize { get; set; } = PartitionKey.DefaultPartitionSize;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/DatabaseOutboxRelayArgs.cs b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayArgs.cs
new file mode 100644
index 00000000..ca21f9a2
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayArgs.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Provides the <see cref="IDatabaseOutboxRelay.RelayAsync"/> arguments.
+/// </summary>
+public class DatabaseOutboxRelayArgs
+{
+    /// <summary>
+    /// Gets the <see cref="Data.PartitionPicker"/>.
+    /// </summary>
+    public required PartitionPicker PartitionPicker { get; init; }
+
+    /// <summary>
+    /// Gets the batch size.
+    /// </summary>
+    public int BatchSize { get; init => field = value <= 0 ? 1 : value; }
+
+    /// <summary>
+    /// Gets the lease duration used to lock when claiming a batch.
+    /// </summary>
+    public TimeSpan LeaseDuration { get; init; }
+
+    /// <summary>
+    /// Gets the backoff duration used to push out availability of the underlying event within the outbox when cancelling a batch.
+    /// </summary>
+    public TimeSpan BackOffDuration { get; init; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/DatabaseOutboxRelayBase.cs b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayBase.cs
new file mode 100644
index 00000000..412b8363
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayBase.cs
@@ -0,0 +1,307 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Provides the base <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see> <i>relay</i> using the destination <see cref="IEventPublisher"/>.
+/// </summary>
+/// <typeparam name="TDatabase">The <see cref="IDatabase"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}"/> instance (self) <see cref="Type"/>.</typeparam>
+/// <remarks>The <see cref="SetStatementsByConvention(string?)"/> is used by the constructor to default where possible.</remarks>
+public abstract class DatabaseOutboxRelayBase<TDatabase, TSelf> : IDatabaseOutboxRelay where TDatabase : IDatabase where TSelf : DatabaseOutboxRelayBase<TDatabase, TSelf>
+{
+    private readonly Lazy<DatabaseOutboxRelayInvoker<TDatabase, TSelf>> _invoker = new(() => new DatabaseOutboxRelayInvoker<TDatabase, TSelf>());
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}"/> class.
+    /// </summary>
+    /// <param name="database">The <see cref="IDatabase"/>.</param>
+    /// <param name="eventPublisher">The destination <see cref="IEventPublisher"/>.</param>
+    /// <param name="logger">The optional <see cref="ILogger"/>.</param>
+    public DatabaseOutboxRelayBase(TDatabase database, IEventPublisher eventPublisher, ILogger<DatabaseOutboxRelayBase<TDatabase, TSelf>>? logger = null)
+    {
+        Database = database.ThrowIfNull();
+        EventPublisher = eventPublisher.ThrowIfNull();
+        Logger = logger;
+
+        // Default the statements by convention.
+        SetStatementsByConvention();
+    }
+
+    /// <summary>
+    /// Gets the underlying <typeparamref name="TDatabase"/>.
+    /// </summary>
+    protected TDatabase Database { get; }
+
+    /// <summary>
+    /// Gets the destination <see cref="IEventPublisher"/>.
+    /// </summary>
+    protected IEventPublisher EventPublisher { get; }
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    protected ILogger? Logger { get; }
+
+    /// <summary>
+    /// Gets the <see cref="DatabaseOutboxRelayInvoker{TDatabase, TSelf}"/>.
+    /// </summary>
+    protected DatabaseOutboxRelayInvoker<TDatabase, TSelf> Invoker => _invoker.Value;
+
+    /// <summary>
+    /// Gets or sets the <see cref="SqlStatement"/> used to <i>claim</i> the next batch of events from the <see cref="Database"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="SqlStatement.Indeterminate"/>.</remarks>
+    public virtual SqlStatement ClaimBatchStatement { get; set; } = SqlStatement.Indeterminate;
+
+    /// <summary>
+    /// Gets or sets the <see cref="SqlStatement"/> used to <i>complete</i> the batch of events from the <see cref="Database"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="SqlStatement.Indeterminate"/>.</remarks>
+    public virtual SqlStatement CompleteBatchStatement { get; set; } = SqlStatement.Indeterminate;
+
+    /// <summary>
+    /// Gets or sets the <see cref="SqlStatement"/> used to <i>cancel</i> the batch of events from the <see cref="Database"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="SqlStatement.Indeterminate"/>.</remarks>
+    public virtual SqlStatement CancelBatchStatement { get; set; } = SqlStatement.Indeterminate;
+
+    /// <summary>
+    /// Indicates whether instrumentation is enabled for the polling.
+    /// </summary>
+    /// <remarks><para>Default is <see langword="false"/>.</para>
+    /// The underlying polling is likely to occur frequently and as such causes instrumentation noise; therefore, is disabled by default.</remarks>
+    public bool IsInstrumentationEnabledForPolling { get; set; } = false;
+
+    /// <summary>
+    /// Indicates whether instrumentation is enabled for the publishing.
+    /// </summary>
+    /// <remarks><para>Default is <see langword="true"/>.</para>
+    /// The underlying publishing is considered more interesting; therefore, is enabled by default. However, may create noise and as such is configurable.</remarks>
+    public bool IsInstrumentationEnabledForPublishing { get; set; } = true;
+
+    /// <summary>
+    /// Sets the <see cref="ClaimBatchStatement"/>, <see cref="CompleteBatchStatement"/>, and <see cref="CancelBatchStatement"/> by convention using the optional <paramref name="schema"/>.
+    /// </summary>
+    /// <param name="schema">The optional database schema name.</param>
+    /// <remarks>Where the schema is not specified, and the database supports schema, then the <see cref="IHostSettings.DomainName"/> will be used by default.</remarks>
+    public abstract void SetStatementsByConvention(string? schema = null);
+
+    /// <inheritdoc/>
+    public async Task<bool> RelayAsync(DatabaseOutboxRelayArgs args, CancellationToken cancellationToken = default)
+    {
+        // Guard against being in a transaction already as this is not allowed!
+        if (Database.CurrentTransaction is not null)
+            throw new InvalidOperationException($"The {typeof(TSelf).Name} cannot be executed within an existing database transaction.");
+
+        bool relayed = false;
+
+        // Iterate through the allocated partitions and relay accordingly.
+        var partitions = args.PartitionPicker.GetNextPartitions(DateTimeOffset.UtcNow);
+        foreach (var partitionId in partitions)
+        {
+            // To minimize the risk of the relay being inadvertently disrupted during execution the cancellation token is not passed to the RelayAsync method;
+            // the cancellation token is only used here to determine whether to continue with the next partition or not.
+            if (cancellationToken.IsCancellationRequested)
+                break;
+
+            // Perform the relay for the partition using a new timer-based cancellation token that is based on the lease duration to ensure it completes within the lease window to minimize the risk of the batch
+            // being cancelled due to exceeding the lease duration before the relay operation has had a chance to complete.
+            var leaseCancellationTokenSource = new CancellationTokenSource(args.LeaseDuration);
+            try
+            {
+                var relay = await RelayAsync(args, partitionId, leaseCancellationTokenSource.Token).ConfigureAwait(false);
+                if (relay)
+                    relayed = true;
+            }
+            catch (Exception ex) when (ex.IsCanceled())
+            {
+                if (Logger?.IsEnabled(LogLevel.Warning) is true)
+                    Logger.LogWarning("The relay operation for partition '{PartitionId}' was cancelled due to exceeding lease-duration timeout; cancellation exception will continue to throw.", partitionId);
+
+                // Keep throwing as the cancellation is likely to be due to exceeding the lease duration which is a serious failure that should be surfaced and not treated as a transient exception.
+                throw;
+            }
+        }
+
+        return relayed;
+    }
+
+    /// <summary>
+    /// Performs the relay for the specified <paramref name="partitionId"/>.
+    /// </summary>
+    private async Task<bool> RelayAsync(DatabaseOutboxRelayArgs args, int partitionId, CancellationToken cancellationToken)
+    {
+        // New lease identifier per relay invocation.
+        var leaseId = Guid.NewGuid();
+
+        // Grab the next batch of events.
+        using (SuppressInstrumentationScope.Begin(!IsInstrumentationEnabledForPolling))
+        {
+            // Claim a batch.
+            var events = await ClaimNextBatchAsync(args, leaseId, partitionId, cancellationToken).ConfigureAwait(false);
+            if (events.Count == 0)
+            {
+                if (Logger?.IsEnabled(LogLevel.Debug) is true)
+                    Logger.LogDebug("No events were found to relay from the Outbox.");
+
+                return false;
+            }
+
+            // Need a try/catch so we can rollback the claim where necessary.
+            try
+            {
+                // Add the events.
+                EventPublisher.Add(events);
+
+                // Publish the events; i.e. the actual "relay".
+                using (SuppressInstrumentationScope.Begin(!IsInstrumentationEnabledForPublishing))
+                {
+                    await Invoker.InvokeAsync(this, async (tracer, cancellationToken) =>
+                    { 
+                        if (tracer.Activity is not null)
+                        {
+                            tracer.Activity.AddTag("outbox.partition", partitionId);
+                            tracer.Activity.AddTag("outbox.events.count", events.Count);
+
+                            foreach (var e in events)
+                            {
+                                if (!e.Event.TryGetExtensionAttribute<string>("traceparent", out var traceParent) || string.IsNullOrEmpty(traceParent))
+                                    continue;
+
+                                e.Event.TryGetExtensionAttribute<string>("tracestate", out var traceState);
+                                if (ActivityContext.TryParse(traceParent, traceState, out var ac))
+                                    tracer.Activity.AddLink(new ActivityLink(ac));
+
+                                if (e.Event.TryGetExtensionAttribute<string>("baggage", out var baggageHeader) && !string.IsNullOrEmpty(baggageHeader))
+                                {
+                                    // Parse W3C Baggage format: "key1=value1,key2=value2;property1;property2"
+                                    // Note: OpenTelemetry doesn't expose a public baggage parser, so we implement per W3C spec.
+                                    foreach (var member in baggageHeader.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
+                                    {
+                                        // Take only the key-value part (before any optional properties after semicolon).
+                                        var keyValue = member.Split(';', 2)[0].Trim();
+                                        var parts = keyValue.Split('=', 2);
+                                        if (parts.Length == 2 && !string.IsNullOrWhiteSpace(parts[0]))
+                                        {
+                                            // Decode URL-encoded values per W3C Baggage spec.
+                                            var key = Uri.UnescapeDataString(parts[0].Trim());
+                                            var value = Uri.UnescapeDataString(parts[1].Trim());
+                                            tracer.Activity.AddBaggage(key, value);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        await EventPublisher.PublishAsync(cancellationToken).ConfigureAwait(false);
+                    }, cancellationToken).ConfigureAwait(false);
+                }
+
+                // Complete the batch.
+                await CompleteBatchAsync(args, leaseId, cancellationToken).ConfigureAwait(false);
+
+                // Report success to encourage consideration in the next round pick where a full batch was claimed.
+                if (events.Count == args.BatchSize)
+                    args.PartitionPicker.PrioritizePartition(partitionId);
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                // Cancel the batch.
+                await CancelBatchAsync(args, leaseId, cancellationToken).ConfigureAwait(false);
+
+                if (Logger?.IsEnabled(LogLevel.Debug) is true)
+                    Logger.LogDebug("Outbox batch was cancelled due to error: {Error}", ex.Message);
+
+                // Keep bubbling the exception.
+                throw;
+            }
+            finally
+            {
+                // Reset the event publisher events to ensure no events accidently bleed out of this operation.
+                EventPublisher.Reset();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Claims the next batch of events for the specified <paramref name="partitionId"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="DatabaseOutboxRelayArgs"/>.</param>
+    /// <param name="leaseId">The lease <see cref="Guid"/>.</param>
+    /// <param name="partitionId">The assigned partition identifier/number.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>Zero or more <see cref="DestinationEvent"/> entries within a list.</returns>
+    protected virtual async Task<List<DestinationEvent>> ClaimNextBatchAsync(DatabaseOutboxRelayArgs args, Guid leaseId, int partitionId, CancellationToken cancellationToken)
+    {
+        var ec = ExecutionContext.HasCurrent ? ExecutionContext.Current : null;
+        var events = new List<DestinationEvent>();
+
+        // Add 10% more to ensure the lease duration is slightly longer than the cancellation token used for the relay operation to minimize the risk of the batch being cancelled due to exceeding the lease duration
+        // before the relay operation has had a chance to complete.
+        var leaseDurationSeconds = ConvertDurationToSeconds(args.LeaseDuration);
+        leaseDurationSeconds += Math.Min(1, (int)Math.Round(leaseDurationSeconds * 0.1, MidpointRounding.AwayFromZero));
+
+        try
+        {
+            await Database.Statement(ClaimBatchStatement)
+                .Param(Database.NamedColumns.PartitionIdName, partitionId)
+                .Param(Database.NamedColumns.OutboxBatchSizeName, args.BatchSize)
+                .Param(Database.NamedColumns.OutboxLeaseIdName, leaseId)
+                .Param(Database.NamedColumns.OutboxLeaseDurationName, leaseDurationSeconds)
+                .Param(Database.NamedColumns.TenantIdName, ec?.TenantId)
+                .SelectQueryAsync(events, (dr, _) =>
+                {
+                    return new DestinationEvent
+                    (
+                        dr.GetValue<string>(Database.NamedColumns.OutboxDestinationName),
+                        dr.GetValue<JsonElement>(Database.NamedColumns.OutboxEventName).DecodeToCloudEvent(Database.JsonSerializerOptions)
+                    );
+                }, cancellationToken);
+        }
+        catch (Exception ex)
+        {
+            if (!IsTransientException(ex))
+                throw;
+        }
+
+        return events;
+    }
+
+    /// <summary>
+    /// Completes the batch.
+    /// </summary>
+    /// <param name="args">The <see cref="DatabaseOutboxRelayArgs"/>.</param>
+    /// <param name="leaseId">The lease <see cref="Guid"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected virtual Task CompleteBatchAsync(DatabaseOutboxRelayArgs args, Guid leaseId, CancellationToken cancellationToken)
+        => Database.Statement(CompleteBatchStatement)
+            .Param(Database.NamedColumns.OutboxLeaseIdName, leaseId)
+            .Param(Database.NamedColumns.OutboxDequeuedUtcName, DateTime.UtcNow)
+            .NonQueryAsync(cancellationToken);
+
+    /// <summary>
+    /// Cancels the batch.
+    /// </summary>
+    /// <param name="args">The <see cref="DatabaseOutboxRelayArgs"/>.</param>
+    /// <param name="leaseId">The lease <see cref="Guid"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected virtual Task CancelBatchAsync(DatabaseOutboxRelayArgs args, Guid leaseId, CancellationToken cancellationToken)
+        => Database.Statement(CancelBatchStatement)
+            .Param(Database.NamedColumns.OutboxLeaseIdName, leaseId)
+            .Param(Database.NamedColumns.OutboxBackoffDurationName, ConvertDurationToSeconds(args.BackOffDuration))
+            .NonQueryAsync(cancellationToken);
+
+    /// <summary>
+    /// Indicates whether the specified <paramref name="exception"/> is an expected exception that should not be logged as an error.
+    /// </summary>
+    /// <param name="exception">The <see cref="Exception"/>.</param>
+    /// <returns><see langword="true"/> where the exception is considered transient; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>For example, a timeout or deadlock exception that may occur during the claim of the batch and is expected to be transient in nature.</remarks>
+    protected virtual bool IsTransientException(Exception exception) => false;
+
+    /// <summary>
+    /// Converts a duration time-span into a rounded number of seconds where the minimum allowed is one second.
+    /// </summary>
+    private static int ConvertDurationToSeconds(TimeSpan duration) => Math.Min((int)Math.Round(duration.TotalSeconds, MidpointRounding.AwayFromZero), 1);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/DatabaseOutboxRelayHostedServiceBase.cs b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayHostedServiceBase.cs
new file mode 100644
index 00000000..aaab9052
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayHostedServiceBase.cs
@@ -0,0 +1,83 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Provides the base <see cref="IDatabaseOutboxRelay.RelayAsync(CoreEx.Database.Outbox.DatabaseOutboxRelayArgs, CancellationToken)"/> execution leveraging a <see cref="TimerHostedServiceBase"/>.
+/// </summary>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public abstract class DatabaseOutboxRelayHostedServiceBase(IServiceProvider serviceProvider, ILogger logger) : TimerHostedServiceBase(serviceProvider, logger)
+{
+    private PartitionPicker? _partitionPicker;
+
+    /// <summary>
+    /// Gets or sets the batch size.
+    /// </summary>
+    /// <remarks>Defaults to '<c>25</c>'.</remarks>
+    public int BatchSize { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Gets or sets the lease duration used to lock when claiming a batch.
+    /// </summary>
+    /// <remarks>Defaults to '<c>5</c>' minutes.</remarks>
+    public TimeSpan LeaseDuration { get; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Gets or sets the backoff duration used to push out availability when cancelling a batch.
+    /// </summary>
+    /// <remarks>Defaults to '<c>5</c>' seconds.</remarks>
+    public TimeSpan BackOffDuration { get; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Gets or sets the partition size.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="PartitionKey.DefaultPartitionSize"/>.</remarks>
+    public int PartitionSize { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Gets or sets the per-worker partition count.
+    /// </summary>
+    /// <remarks>Defaults to '<c>6</c>'.
+    /// <para>Represents the number of partitions that will be relayed per <see cref="TimerHostedServiceBase.OnExecuteAsync(ExecutionContext, CancellationToken)"/>.</para></remarks>
+    public int PerWorkerPartitionCount { get; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Gets the <see cref="Data.PartitionPicker"/> used to determine partition selection during processing.
+    /// </summary>
+    /// <remarks>This is instantiated during <see cref="OnInitializeAsync(CancellationToken)"/> and leverages configuration to determine its settings.</remarks>
+    protected PartitionPicker PartitionPicker => _partitionPicker ?? throw new InvalidOperationException("PartitionPicker has not yet been initialized; this should not be accessed before the OnInitializeAsync.");
+
+    /// <inheritdoc/>
+    protected async override Task OnInitializeAsync(CancellationToken cancellationToken)
+    {
+        await base.OnInitializeAsync(cancellationToken).ConfigureAwait(false);
+
+        BatchSize = Internal.GetConfigurationValueWithFallback<int>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:OutboxRelay:BatchSize", "CoreEx:Host:Services:OutboxRelay:BatchSize", 25, Configuration);
+        LeaseDuration = Internal.GetConfigurationValueWithFallback<TimeSpan>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:OutboxRelay:LeaseDuration", "CoreEx:Host:Services:OutboxRelay:LeaseDuration", TimeSpan.FromMinutes(5), Configuration);
+        BackOffDuration = Internal.GetConfigurationValueWithFallback<TimeSpan>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:OutboxRelay:BackOffDuration", "CoreEx:Host:Services:OutboxRelay:BackOffDuration", TimeSpan.FromSeconds(5), Configuration);
+        PartitionSize = Internal.GetConfigurationValueWithFallback<int>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:OutboxRelay:PartitionSize", "CoreEx:Host:Services:OutboxRelay:PartitionSize", PartitionKey.DefaultPartitionSize, Configuration);
+        PerWorkerPartitionCount = Internal.GetConfigurationValueWithFallback<int>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:OutboxRelay:PerWorkerPartitionCount", "CoreEx:Host:Services:OutboxRelay:PerWorkerPartitionCount", 6, Configuration);
+
+        _partitionPicker = new PartitionPicker(PartitionKey.DefaultPartitionSize, PerWorkerPartitionCount);
+
+        if (Logger.IsEnabled(LogLevel.Information))
+            Logger.LogInformation("{ServiceName} settings: BatchSize={BatchSize}, LeaseDuration={LeaseDuration}, BackOffDuration={BackOffDuration}, PartitionSize={PartitionSize}, PerWorkerPartitionCount={PerWorkerPartitionCount}",
+                ServiceName, BatchSize, LeaseDuration, BackOffDuration, PartitionSize, PerWorkerPartitionCount);
+    }
+
+    /// <inheritdoc/>
+    protected override HealthCheckResult OnReportHealthStatus(Dictionary<string, object> data)
+    {
+        var rd = new Dictionary<string, object>()
+        {
+            ["BatchSize"] = BatchSize,
+            ["LeaseDuration"] = LeaseDuration,
+            ["BackOffDuration"] = BackOffDuration,
+            ["PartitionSize"] = PartitionSize,
+            ["PerWorkerPartitionCount"] = PerWorkerPartitionCount
+        };
+
+        data.Add("OutboxRelay", rd);
+
+        return base.OnReportHealthStatus(data);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/DatabaseOutboxRelayHostedServiceBaseT.cs b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayHostedServiceBaseT.cs
new file mode 100644
index 00000000..f7a0f068
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayHostedServiceBaseT.cs
@@ -0,0 +1,39 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Provides the <see cref="IDatabaseOutboxRelay.RelayAsync(CoreEx.Database.Outbox.DatabaseOutboxRelayArgs, CancellationToken)"/> execution leveraging a <see cref="TimerHostedServiceBase"/>.
+/// </summary>
+/// <typeparam name="TOutboxRelay">The <see cref="IDatabaseOutboxRelay"/> <see cref="Type"/>.</typeparam>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public abstract class DatabaseOutboxRelayHostedServiceBase<TOutboxRelay>(IServiceProvider serviceProvider, ILogger logger) : DatabaseOutboxRelayHostedServiceBase(serviceProvider, logger) where TOutboxRelay : IDatabaseOutboxRelay
+{
+    /// <summary>
+    /// Gets or sets the factory method to create the <typeparamref name="TOutboxRelay"/>.
+    /// </summary>
+    public Func<IServiceProvider, TOutboxRelay>? RelayFactory { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <inheritdoc/>
+    protected override async Task<bool> OnExecuteAsync(ExecutionContext executionContext, CancellationToken cancellationToken)
+    {
+        // Instantiate the relay via the factory where specified.
+        var relay = RelayFactory is null
+            ? ExecutionContext.GetRequiredService<TOutboxRelay>()
+            : RelayFactory(executionContext.ServiceProvider.ThrowIfNull()) ?? throw new InvalidOperationException($"The {typeof(TOutboxRelay).Name} was not be created using the specified {nameof(RelayFactory)}.");
+
+        // Create the arguments.
+        var args = new DatabaseOutboxRelayArgs
+        {
+            PartitionPicker = PartitionPicker,
+            BatchSize = BatchSize,
+            LeaseDuration = LeaseDuration,
+            BackOffDuration = BackOffDuration
+        };
+
+        // Execute the relay.
+        var relayed = await relay.RelayAsync(args, cancellationToken).ConfigureAwait(false);
+
+        // Immediately re-execute where work was done (doesn't matter how much); otherwise, sleep.
+        return relayed;   
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/DatabaseOutboxRelayInvoker.cs b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayInvoker.cs
new file mode 100644
index 00000000..5d7d1bb2
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/DatabaseOutboxRelayInvoker.cs
@@ -0,0 +1,9 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Provides the standard <see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}"/> invoker functionality.
+/// </summary>
+/// <typeparam name="TDatabase">The <see cref="IDatabase"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="DatabaseOutboxRelayBase{TDatabase, TSelf}"/> instance (self) <see cref="Type"/>.</typeparam>
+[InvokerName("CoreEx.Database.Outbox.Relay")]
+public class DatabaseOutboxRelayInvoker<TDatabase, TSelf> : InvokerBase<DatabaseOutboxRelayBase<TDatabase, TSelf>> where TDatabase : IDatabase where TSelf : DatabaseOutboxRelayBase<TDatabase, TSelf> { }
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/IDatabaseOutboxRelay.cs b/src/CoreEx.Database/Outbox/IDatabaseOutboxRelay.cs
new file mode 100644
index 00000000..fdd5f424
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/IDatabaseOutboxRelay.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Database.Outbox;
+
+/// <summary>
+/// Enables the <see cref="RelayAsync(DatabaseOutboxRelayArgs, CancellationToken)"/> operation for performing the <see href="https://microservices.io/patterns/data/transactional-outbox.html">transactional outbox</see> relay.
+/// </summary>
+public interface IDatabaseOutboxRelay
+{
+    /// <summary>
+    /// Performs the relay operation.
+    /// </summary>
+    /// <param name="args">The <see cref="DatabaseOutboxRelayArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> indicates that at least one event was relayed; otherwise, <see langword="false"/>.</returns>
+    Task<bool> RelayAsync(DatabaseOutboxRelayArgs args, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Outbox/README.md b/src/CoreEx.Database/Outbox/README.md
new file mode 100644
index 00000000..fe7b6f0b
--- /dev/null
+++ b/src/CoreEx.Database/Outbox/README.md
@@ -0,0 +1,41 @@
+# CoreEx.Database.Outbox
+
+> Implements the [Transactional Outbox pattern](https://microservices.io/patterns/data/transactional-outbox.html): `DatabaseOutboxPublisherBase` writes events to a database outbox table within the business transaction, and `DatabaseOutboxRelayBase` / `DatabaseOutboxRelayHostedServiceBase` poll and forward them to an `IEventPublisher`.
+
+## Overview
+
+The transactional outbox pattern ensures that domain events are reliably published even in the face of network or messaging failures. The pattern works in two parts:
+
+1. **Write**: When a business mutation is committed, `DatabaseOutboxPublisherBase` (an `IEventPublisher`) inserts serialized `EventData` rows into an outbox table inside the same database transaction. Because the event write and the business write are in the same transaction, both succeed or both roll back atomically.
+
+2. **Relay**: `DatabaseOutboxRelayHostedServiceBase` is a `TimerHostedServiceBase` that periodically polls the outbox table, deserializes the pending events, forwards them to the configured `IEventPublisher` (e.g. Azure Service Bus), and marks them as sent — in a separate transaction with idempotency protection.
+
+`DatabaseOutboxRelayBase<TDatabase, TSelf>` contains the relay logic and is parameterized by both the `IDatabase` type and the self-referencing relay type, enabling per-deployment SQL statement customization via `SetStatementsByConvention(schemaName?)`.
+
+## Key capabilities
+
+- ⚛️ **Atomic write**: `DatabaseOutboxPublisherBase.PublishAsync` inserts serialized events into the outbox table within the calling `IUnitOfWork` transaction — no two-phase commit required.
+- ⏱️ **Timer-driven relay**: `DatabaseOutboxRelayHostedServiceBase` inherits `TimerHostedServiceBase`'s configurable `Interval`, `FirstInterval`, error back-off, and pause/resume behavior.
+- 📦 **Batch publishing**: The relay reads a configurable `MaxDequeueSize` of pending rows per poll, publishes them as a batch to `IEventPublisher`, then marks all as sent in a single update.
+- 🔒 **Idempotent relay**: Each outbox row has a `Status` sentinel; the relay skips already-sent rows, enabling safe replay after partial failures.
+- ⚙️ **Convention SQL**: `SetStatementsByConvention(schemaName?)` derives the dequeue and complete stored procedure names from the schema name (e.g. `[Outbox].[EventOutboxDequeue]`), reducing boilerplate for standard deployments.
+- 📡 **Relay invoker tracing**: `DatabaseOutboxRelayInvoker` wraps each relay batch with an OpenTelemetry span tagging batch size and result.
+
+## Key types
+
+| Type | Description |
+|------|--------------|
+| **[`DatabaseOutboxPublisherBase`](./DatabaseOutboxPublisherBase.cs)** | Abstract `IEventPublisher` that inserts `EventData` rows into the outbox table within the current database transaction via a configured SQL statement. |
+| **[`DatabaseOutboxRelayBase<TDatabase, TSelf>`](./DatabaseOutboxRelayBase.cs)** | Abstract relay implementation: dequeues pending outbox rows, deserializes `EventData`, publishes to `IEventPublisher`, marks as sent. Configure SQL via `SetStatementsByConvention(schema?)` or set `DequeueStatement` / `CompleteStatement` directly. |
+| **[`DatabaseOutboxRelayHostedServiceBase`](./DatabaseOutboxRelayHostedServiceBase.cs)** | `TimerHostedServiceBase` that drives `IDatabaseOutboxRelay.RelayAsync` on a configurable interval. |
+| **[`DatabaseOutboxRelayHostedServiceBase<TRelay>`](./DatabaseOutboxRelayHostedServiceBaseT.cs)** | Generic variant accepting the `IDatabaseOutboxRelay` implementation via DI. |
+| **[`DatabaseOutboxRelayArgs`](./DatabaseOutboxRelayArgs.cs)** | Configuration for the relay: `MaxDequeueSize`, `PartitionKey`, and whether to partition dequeue by partition key. |
+| **[`DatabaseOutboxRelayInvoker`](./DatabaseOutboxRelayInvoker.cs)** | `InvokerBase<DatabaseOutboxRelayBase<TDatabase, TSelf>>` emitting OpenTelemetry spans for relay batch executions. |
+| [`IDatabaseOutboxRelay`](./IDatabaseOutboxRelay.cs) | Interface with single `RelayAsync(CancellationToken)` method implemented by `DatabaseOutboxRelayBase`. |
+
+## Related Namespaces
+
+- **[`CoreEx.Database`](../README.md)** - `IDatabase` and `DatabaseCommand` are used by relay and publisher implementations to execute outbox SQL.
+- **[`CoreEx.Events`](../../CoreEx.Events/README.md)** - `IEventPublisher` is the relay's publication target; `EventData` is the serialized event payload stored in the outbox table.
+- **[`CoreEx.Hosting`](../../CoreEx/Hosting/README.md)** - `TimerHostedServiceBase` is the base class for `DatabaseOutboxRelayHostedServiceBase`, providing timer, pause/resume, and health-check integration.
+- **[`CoreEx.Invokers`](../../CoreEx/Invokers/README.md)** - `DatabaseOutboxRelayInvoker` extends `InvokerBase` for relay-batch OpenTelemetry tracing.
\ No newline at end of file
diff --git a/src/CoreEx.Database/README.md b/src/CoreEx.Database/README.md
index 45b200f0..f4392043 100644
--- a/src/CoreEx.Database/README.md
+++ b/src/CoreEx.Database/README.md
@@ -1,186 +1,71 @@
 # CoreEx.Database
 
-The `CoreEx.Database` namespace provides extended [_ADO.NET_](https://learn.microsoft.com/en-Us/dotnet/framework/data/adonet/) capabilities. 
-
-<br/>
-
-## Motivation
-
-The motivation is to simplify and unify the approach to _ADO.NET_ (database) access.
-
-<br/>
-
-## Railway-oriented programming
-
-To support [railway-oriented programming](../CoreEx/Results/README.md) whenever a method name includes `WithResult` this indicates that it will return a `Result` or `Result<T>` including the resulting success or failure information. In these instances an `Exception` will only be thrown when considered truly exceptional.
-
-<br/>
-
-## Database
-
-The [`Database`](./Database.cs) is the base (common) implementation for the [`IDatabase`](./IDatabase.cs) interface that provides the standardized access to the underlying database.
-
-The following additional [`IDatabase`](./IDatabase.cs) key capabilities exist.
-
-Capability | Description
--|-
-[`DatabaseColumns`](./Extended/DatabaseColumns.cs) | Enables the specification of special database columns used for extended built-in capabilities.
-[`Wildcard`](./DatabaseWildcard.cs) | Provides configuration to manage _wildcard_ transformation.
-[`DateTimeTransform`](../CoreEx/Entities/DateTimeTransform.cs) | Specifies the `DateTime` transformation when reading from the database.
-
-<br/>
-
-### Provider specific
-
-The following specific database provider implementations further extend the capabilities.
-
-Database | Implementation
--|-
-[Microsoft SQL Server](https://learn.microsoft.com/en-us/sql/sql-server) | [`SqlServerDatabase`](../CoreEx.Database.SqlServer/SqlServerDatabase.cs)
-[Oracle MySQL](https://www.oracle.com/mysql/what-is-mysql/) | [`MySqlDatabase`](../CoreEx.Database.MySql/MySqlDatabase.cs)
-
-<br/>
-
-### Usage
-
-To use the `Database` a connection creation function parameter is required that is leveraged at runtime (lazy instantiation) to get (create or provide) the underlying [`DbConnection`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbconnection). The `IDatabase` implements [`IDisposable`](https://learn.microsoft.com/en-us/dotnet/api/system.idisposable); the `Dispose` is the primary mechanism to close the connection where automatically opened.
-
-The following demonstrates [usage](../../samples/My.Hr/My.Hr.Business/Data/HrDb.cs).
-
-``` csharp
-    public class HrDb : SqlServerDatabase
-    {
-        public HrDb(SettingsBase settings) : base(() => new SqlConnection(settings.GetRequiredValue<string>("ConnectionStrings:Database"))) { }
-    }
-```
-
-Additionally, review the _Beef_ repo [sample](https://github.com/Avanade/Beef/blob/master/samples/My.Hr/My.Hr.Business/Data/HrDb.cs).
-
-<br/>
-
-## Commands
-
-The _CoreEx_ [`IDatabase`](./IDatabase.cs) encapsulates an _ADO.NET_ [`DbCommand`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbcommand) within a [`DatabaseCommand`](./DatabaseCommand.cs); via the following methods:
-
-Method | Description
--|-
-`StoredProcedure` | Creates a command for a stored procedure; (see [`CommandType.StoredProcedure`](https://learn.microsoft.com/en-us/dotnet/api/system.data.commandtype#system-data-commandtype-storedprocedure))
-`SqlStatement` | Creates a command for a SQL statement; (see [`CommandType.Text`](https://learn.microsoft.com/en-us/dotnet/api/system.data.commandtype#system-data-commandtype-text))
-`SqlFromResource` | Creates a command for a SQL statement within the specified embedded resource.
-
-or `IDatabase.SqlStatement` method passing the appropriate content.
-
-The following [`DatabaseCommand`](./DatabaseCommand.cs) methods provide additional capabilities. The query-based methods optionally leverage the rich [Mapping](#Mapping) capabilities.
-
-Method | Description
--|-
-`NonQueryAsync`, `NonQueryWithResultAsync` | Executes a non-query command.
-`ScalarAsync<T>`, `ScalarWithResultAsync<T>` | Executes the query and returns the first column of the first row in the result set returned by the query.
-`SelectSingleAsync`, `SelectSingleWithResultAsync` | Selects a single item.
-`SelectSingleOrDefaultAsync` | Selects a single item or default.
-`SelectFirstAsync`, `SelectFirstWithResultAsync` | Selects first item.
-`SelectFirstOrDefaultAsync`, `SelectFirstOrDefaultWithResultAsync` | Selects first item or default.
-`SelectQueryAsync`, `SelectQueryWithResultAsync` | Select items into or creating a resultant collection.
-`SelectMultiSetAsync`, `SelectMultiSetWithResulAsync` | Executes a multi-dataset query command with one or more [multi-set arguments](#Multi-set-arguments).
-
-The _DbEx_ [`DatabaseExtensions`](https://github.com/Avanade/DbEx/blob/main/src/DbEx/DatabaseExtensions.cs) class demonstrates usage of the `SelectQueryAsync` (_without_ [Mapping](#Mapping)) within the `SelectSchemaAsync` method.
-
-<br/>
-
-### Query
-
-The [`Extended`](./Extended) namespace provides a `DatabaseCommand.Query<T>` that provides a [`DatabaseQuery<T>`](./Extended/DatabaseQuery.cs) to encapsulate the following.
-
-Method | Description
--|-
-`WithPaging` | Adds `Skip` and `Take` paging to the query.
-`SelectSingleAsync`, `SelectSingleWithResultAsync` | Selects a single item.
-`SelectSingleOrDefaultAsync`, `SelectSingleOrDefaultWithResultAsync` | Selects a single item or default.
-`SelectFirstAsync`, `SelectFirstWithResultAsync` | Selects first item.
-`SelectFirstOrDefaultAsync`, `SelectFirstOrDefaultWithResultAsync` | Selects first item or default.
-`SelectQueryAsync`, `SelectQueryWithResultAsync` | Select items into or creating a resultant collection.
-`SelectResultAsync`, `SelectResultWithResultAsync` | Select items creating a [`ICollectionResult`](../CoreEx/Entities/ICollectionResultT2.cs) which also contains corresponding [`PagingResult`](../CoreEx/Entities/PagingResult.cs).
-
-<br/>
-
-### Reference data
-
-The [`Extended`](./Extended) namespace provides a `DatabaseCommand.ReferenceData<TColl, TItem, TId>` that provides a [`RefDataLoader<TColl, TItem, TId>`](./Extended/RefDataLoader.cs) (via the `LoadAsync` and `LoadWithResultAsync` methods) to simplify the loading of a reference data collection.
-
-The [`ReferenceDataService`](../../samples/My.Hr/My.Hr.Business/Services/ReferenceDataService.cs) within the `My.Hr` smaple demonstrates usage.
-
-``` csharp
-await _db.ReferenceData<GenderCollection, Gender, Guid>("Hr", "Gender").LoadAsync("GenderId", cancellationToken: cancellationToken).ConfigureAwait(false)
-```
-
-<br/>
-
-## Parameters
-
-The [`DatabaseCommand`](./DatabaseCommand.cs) provides a [`Parameters`](./DatabaseParameterCollection.cs) property that primarily enables the following core parameter capabilities.
-
-Method | Description
--|-
-`AddParameter` | Adds a [`DbParameter`](); there are a number of overloads enabled.
-`AddReturnValueParameter` | Adds an `int` return value [`DbParameter`]() (see [`DatabaseColumns.ReturnValueName`](./Extended/DatabaseColumns.cs)).
-`AddReselectRecordParam` | Adds a `bool` reselect record [`DbParameter`]() (see [`DatabaseColumns.ReselectRecordName`](./Extended/DatabaseColumns.cs)).
-
-Additionally, the `DatabaseCommand` supports a set of [extension methods](./IDatabaseParametersExtensions.cs) to further enable, and simplify, the specification of parameters that leverage the aforementioned `Parameters`.
-
-Method | Description
--|-
-`Param` | Adds a [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter); there are a number of overloads enabled.
-`ParamWhen` | Adds a [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter) _when_ the specified condition is `true`; there are a number of overloads enabled.
-`ParamWith` | Adds a [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter) when invoked with a non-default value; there are a number of overloads enabled.
-`ParamWithWildcard` | Adds a _wildcard_ [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter) when invoked with a non-default value; there are a number of overloads enabled.
-`RowVersionParam` | Adds a _row version_ [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter) (see [`DatabaseColumns.RowVersionName`](./Extended/DatabaseColumns.cs)). Note that the underlying implementation is database specific.
-`ReselectRecordParam` | Adds a `bool` reselect record [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter) (see [`DatabaseColumns.ReselectRecordName`](./Extended/DatabaseColumns.cs)).
-`ReselectRecordParamWhen` | Adds a `bool` reselect record [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter) (see [`DatabaseColumns.ReselectRecordName`](./Extended/DatabaseColumns.cs)) _when_ `true`.
-`PagingParams` | Adds the [`PagingArgs`](../CoreEx/Entities/PagingArgs.cs) [`DbParameter`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter)(s) being [`DatabaseColumns.PagingSkipName`](./Extended/DatabaseColumns.cs), `DatabaseColumns.PagingTakeName` and `DatabaseColumns.PagingCountName`.
-
-<br/>
-
-## Database record
-
-_CoreEx_ encapsulates an _ADO.NET_ [`DbDataReader`](https://learn.microsoft.com/en-us/dotnet/api/system.data.common.dbdatareader) within a [`DatabaseRecord`](./DatabaseRecord.cs); this primarily provides the `GetValue<T>` method that provides extended capabilites to retrieve a column value from the underlying `DbDataReader`.
-
-<br/>
-
-## Mapping
-
-To support the mapping _from_ and/or _to_ a .NET Type and the underlying database, the [`IDatabaseMapper`](./IDatabaseMapper.cs) and corresponding [`IDatabaseMapper<TSource>`](./IDatabaseMapperT.cs) interface enable (also see [`DatabaseQueryMapper`](./DatabaseQueryMapper.cs) for query only (`MapFromDb`) support).
-- `MapToDb` - maps the .NET Type to the database by adding the properties as database [parameters](#Parameters).
-- `MapFromDb` - maps the database columns to the properties of a .NET Type.
-
-The [`Mapping` namespace](./Mapping) provides the primary mapping capabilities.
-
-Class | Description
--|-
-[`DatabaseMapper`](./Mapping/DatabaseMapper.cs) | Enables the `Create` and `CreateAuto` of a `DatabaseMapper<TSource>`.
-[`DatabaseMapper<TSource>`](./Mapping/DatabaseMapperT.cs) | Provides the to/from mapping configuration.
-[`PropertyColumnMapper`]() | Provides the property to/from mapping configuration.
-
-The [`ChangeLogDatabaseMapper`](./Mapping/ChangeLogDatabaseMapper.cs) is a _CoreEx_ implementation example. Additionally, see the _Beef_ `My.Hr` sample which further demonstrates usage within the [`EmployeeBaseData.DbMapper`](https://github.com/Avanade/Beef/blob/master/samples/My.Hr/My.Hr.Business/Data/Generated/EmployeeBaseData.cs) class.
-
-<br/>
-
-## Multi-set arguments
-
-To simplify the support for the [retrieval of multiple result sets](https://learn.microsoft.com/en-us/dotnet/framework/data/adonet/retrieving-data-using-a-datareader#retrieving-multiple-result-sets-using-nextresult) the [`IMultiSetArgs`](./IMultiSetArgs.cs) is provided. This is useful where a single command will result in multiple result sets reducing the chattiness between application and database, improving performance, reducing execution latency.
-
-The following `IMultiSetArgs` implementations are provided. The `StopOnNull` property indicates whether to stop further query result set processing where the current set has resulted in a `null` (i.e. no records).
-
-Class | Description
--|-
-[`MultiSetCollArgs<TColl, TItem>`](./MultiSetCollArgsT.cs) | Provides the multi-set arguments when expecting a collection of items/records. The `MinRows` and `MaxRows` properties can also be specified to ensure/validate correctness of returned rows.
-[`MultiSetSingleArgs<T>`](./MultiSetSingleArgsT.cs) | Provides the multi-set arguments when expecting a single item/record only. The `IsMandatory` property indicates whether the value is mandatory.
-
-The [`DatabaseCommannd.SelectMultiSetAsync`](./DatabaseCommand.cs) method supports one or more [`IMultiSetArgs`](./IMultiSetArgs.cs) when invoked; leveraging the configuration within to create the resulting output. Note also, the `IMultiSetArgs` count must not be less that the number of result sets returned from the database.
-
-The _Beef_ `My.Hr` sample demonstrates usage within the [`EmployeeData`](https://github.com/Avanade/Beef/blob/master/samples/My.Hr/My.Hr.Business/Data/EmployeeData.cs) class.
-
-``` csharp
-await db.SelectMultiSetAsync(
-    new MultiSetSingleArgs<Employee>(DbMapper.Default, r => employee = r, isMandatory: false, stopOnNull: true),
-    new MultiSetCollArgs<EmergencyContactCollection, EmergencyContact>(EmergencyContactData.DbMapper.Default, r => employee!.EmergencyContacts = r)).ConfigureAwait(false);
-```
\ No newline at end of file
+> Provides the `IDatabase` / `Database` ADO.NET abstraction, `DatabaseCommand` fluent query builder, `DatabaseRecord` row reader, multi-result-set support, convention-based column mapping, database wildcard translation, typed mapper contracts, and the transactional outbox relay infrastructure for publishing events from a relational database.
+
+## Overview
+
+`CoreEx.Database` wraps ADO.NET (`DbConnection`, `DbCommand`, `DbDataReader`) with a fluent, OpenTelemetry-instrumented API that integrates tightly with CoreEx entity contracts. Every operation flows through `DatabaseCommand`, which accumulates a `DatabaseParameterCollection`, opens the connection on demand, and executes via `DatabaseInvoker` to emit spans and structured log entries.
+
+The package follows an explicit-mapping philosophy: `IDatabaseMapper<TSource, TDestination>` implementations hand-write the column-to-property assignments (calling `DatabaseRecord.GetValue<T>(columnName)` and `DatabaseParameterCollection.AddParameter`). The `DatabaseMapper` static utility handles the cross-cutting columns (`RowVersion` → `IETag`, `TenantId`, `IsDeleted`, `CreatedBy`/`CreatedOn`/`UpdatedBy`/`UpdatedOn`) so individual mappers only write their entity-specific columns.
+
+The outbox sub-namespace implements the [Transactional Outbox pattern](https://microservices.io/patterns/data/transactional-outbox.html): events are written to an outbox table within the same database transaction as the business mutation; the relay hosted service polls the table and publishes to the configured `IEventPublisher`.
+
+## Key capabilities
+
+- 🔌 **IDatabase abstraction**: `IDatabase` / `Database<TConn>` manage connection lifetime, transaction enlistment, `DateTimeTransform`, `DateTimeOffsetTransform`, `DatabaseColumns` naming conventions, and `DatabaseWildcard` configuration.
+- 📝 **Fluent command builder**: `DatabaseCommand` accumulates parameters via `IDatabaseParameters<T>` fluent methods, then executes as non-query, scalar, single-row, first-or-default, collection, or multi-result-set.
+- 📖 **DatabaseRecord**: Wraps `DbDataReader` with named and ordinal `GetValue<T>` accessors that apply `DateTimeTransform`, null-safety, and `RowVersion` decoding.
+- 🗂️ **Multi-result-set**: `SelectMultiSetAsync` reads multiple result sets in a single round-trip using `IMultiSetArgs` / `MultiSetSingleArgs<T>` / `MultiSetCollArgs<T>` descriptors.
+- 🗃️ **Typed mapper contracts**: `IDatabaseMapper<TSource, TDestination>` / `IDatabaseMapper<T>` define the mapping surface; `DatabaseMapper<T>` provides an abstract base with `MapFromDb` / `MapToDb` override points.
+- 🏷️ **Standard column mapping**: `DatabaseMapper.MapStandardFromDb` automatically reads `RowVersion` → `IETag`, `TenantId`, `IsDeleted`, and change-log columns from `DatabaseRecord`; `MapStandardToDb` writes them to parameters.
+- 🦁 **Database wildcard**: `DatabaseWildcard` translates CoreEx `WildcardResult` selections into database `LIKE` patterns (`%`, `_`) with configurable escape character.
+- 📡 **DatabaseInvoker tracing**: Every command execution is wrapped by `DatabaseInvoker` (an `InvokerBase<IDatabase>`) emitting OpenTelemetry spans tagged with command text, operation result, and error details.
+- 📤 **Transactional outbox relay**: `DatabaseOutboxRelayBase<TDatabase, TSelf>` polls an outbox table, deserializes events, publishes them via `IEventPublisher`, and marks them as sent — all within a configurable polling hosted service.
+- 🔢 **SQL statement abstraction**: `SqlStatement` carries `CommandText`, `CommandType` (`Text` or `StoredProcedure`), and convenience factory methods for inline SQL and stored procedure calls.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`IDatabase`](./IDatabase.cs)** | Core database interface: `GetConnectionAsync`, `CreateCommand(SqlStatement)`, `CurrentTransaction`, `BeginTransactionAsync`, `DateTimeTransform`, `NamedColumns`, `Wildcard`. |
+| **[`Database`](./Database.cs)** | Abstract base `IDatabase` implementation for a specific `DbConnection` type; manages connection pooling, transaction stack, and `DatabaseInvoker` invocation. |
+| **[`DatabaseCommand`](./DatabaseCommand.cs)** | Fluent command builder: `Parameters` (`DatabaseParameterCollection`), `NonQueryAsync`, `ScalarAsync`, `SelectSingleAsync`, `SelectFirstOrDefaultAsync`, `SelectQueryAsync`, `SelectMultiSetAsync`. |
+| **[`DatabaseRecord`](./DatabaseRecord.cs)** | Wraps `DbDataReader`: `GetValue<T>(string/int)`, `GetRowVersion()`, ordinal caching, and null-safe typed reads with `DateTimeTransform` applied. |
+| **[`DatabaseParameterCollection`](./DatabaseParameterCollection.cs)** | `DbParameterCollection` wrapper with `AddParameter<T>`, `AddRowVersionParameter`, `AddReturnValueParameter`, and batch helpers; fluent via `IDatabaseParameters<T>`. |
+| **[`SqlStatement`](./SqlStatement.cs)** | Carries `CommandText` and `CommandType`; factory methods `StoredProcedure(name)`, `FromText(text)` (in-line) and `FromResource(resourceName)` (embedded resource). |
+| **[`DatabaseArgs`](./Abstractions/DatabaseArgs.cs)** | Per-operation options: transaction `IsolationLevel`, `Refresh`, and `TransformException` behavior overrides. |
+| **[`DatabaseInvoker`](./Abstractions/DatabaseInvoker.cs)** | `InvokerBase<IDatabase>` emitting OpenTelemetry spans and structured log entries for every command execution. |
+| **[`IDatabaseMapper<T>`](./Mapping/IDatabaseMapperT.cs)** | Bidirectional mapper interface: `MapFromDb(DatabaseRecord, OperationType)` → `T`; `MapToDb(T, DatabaseParameterCollection, OperationType)`. |
+| **[`DatabaseMapper<T>`](./Mapping/DatabaseMapperT.cs)** | Abstract base for `IDatabaseMapper<T>`; override `OnMapFromDb` and `OnMapToDb`; call `MapStandardFromDb` / `MapStandardToDb` for convention columns. |
+| **[`DatabaseMapper`](./Mapping/DatabaseMapper.cs)** | Static utility: `MapStandardFromDb` reads `RowVersion`/`TenantId`/`IsDeleted`/change-log columns; `MapStandardToDb` writes them as parameters. |
+| **[`DatabaseWildcard`](./Extended/DatabaseWildcard.cs)** | Translates `WildcardResult` to a database `LIKE` pattern with configurable wildcard (`%`) and single-char (`_`) tokens and escape character. |
+| **[`DatabaseColumns`](./Extended/DatabaseColumns.cs)** | Convention column name constants and overrides: `RowVersionName`, `TenantIdName`, `IsDeletedName`, and change-log column names. |
+| **[`MultiSetSingleArgs<T>`](./Extended/MultiSetSingleArgsT.cs)** | `IMultiSetArgs` for a single-row result set within `SelectMultiSetAsync`; invokes mapper and stores the mapped value. |
+| **[`MultiSetCollArgs<T>`](./Extended/MultiSetCollArgsT.cs)** | `IMultiSetArgs` for a collection result set within `SelectMultiSetAsync`; invokes mapper for each row and stores the collection. |
+| **[`IDatabaseUnitOfWork`](./IDatabaseUnitOfWork.cs)** | Extends `IUnitOfWork` with `Database` property for direct database access within a unit-of-work. |
+| **[`DatabaseOutboxRelayBase<TDatabase, TSelf>`](./Outbox/DatabaseOutboxRelayBase.cs)** | Abstract base for the outbox relay: polls an outbox table, publishes events via `IEventPublisher`, marks entries as sent, with configurable batch size and SQL statements. |
+| **[`DatabaseOutboxRelayHostedServiceBase`](./Outbox/DatabaseOutboxRelayHostedServiceBase.cs)** | `TimerHostedServiceBase` subclass that drives `IDatabaseOutboxRelay.RelayAsync` on a timer. |
+| **[`DatabaseOutboxPublisherBase`](./Outbox/DatabaseOutboxPublisherBase.cs)** | Abstract base `IEventPublisher` that writes `EventData` entries to the outbox table within the current database transaction. |
+
+## Namespaces
+
+| Namespace | Description |
+|-----------|-------------|
+| [**`Abstractions`**](./Abstractions/) | `DatabaseArgs`, `DatabaseArgsBase`, `DatabaseInvoker`, and `IDatabaseParameters` interface. |
+| [**`Extended`**](./Extended/) | `DatabaseColumns`, `DatabaseWildcard`, `IMultiSetArgs`, `MultiSetSingleArgs<T>`, `MultiSetCollArgs<T>`. |
+| [**`Mapping`**](./Mapping/) | `IDatabaseMapper<T>`, `DatabaseMapper<T>` abstract base, and `DatabaseMapper` static utility. |
+| [**`Outbox`**](./Outbox/) | Transactional outbox relay: `DatabaseOutboxRelayBase`, `DatabaseOutboxRelayHostedServiceBase`, `DatabaseOutboxPublisherBase`, `DatabaseOutboxRelayArgs`. |
+
+## Related Namespaces
+
+- **[`CoreEx.Data`](../CoreEx.Data/README.md)** - `IUnitOfWork`, `DataResult`, `QueryArgsConfig`; `IDatabaseUnitOfWork` extends `IUnitOfWork`.
+- **[`CoreEx.Mapping`](../CoreEx/Mapping/README.md)** - `Mapper.MapStandardFrom` pattern mirrored by `DatabaseMapper.MapStandardFromDb` for the database layer.
+- **[`CoreEx.Wildcards`](../CoreEx/Wildcards/README.md)** - `WildcardResult` produced by `Wildcard.Parse()` is translated to LIKE patterns by `DatabaseWildcard`.
+- **[`CoreEx.Invokers`](../CoreEx/Invokers/README.md)** - `DatabaseInvoker` and `DatabaseOutboxRelayInvoker` extend `InvokerBase` for OpenTelemetry tracing.
+- **[`CoreEx.Events`](../CoreEx.Events/README.md)** - `IEventPublisher` is the outbox relay's publication target; `EventData` is what the outbox table stores.
+- **[`CoreEx.Database.SqlServer`](../CoreEx.Database.SqlServer/README.md)** - SQL Server-specific `Database` implementation, `SqlServerDatabaseExtensions`, and stored-procedure conventions.
+- **[`CoreEx.Database.Postgres`](../CoreEx.Database.Postgres/README.md)** - PostgreSQL-specific `Database` implementation and Npgsql extensions.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Database/SqlStatement.cs b/src/CoreEx.Database/SqlStatement.cs
new file mode 100644
index 00000000..0a168344
--- /dev/null
+++ b/src/CoreEx.Database/SqlStatement.cs
@@ -0,0 +1,90 @@
+namespace CoreEx.Database;
+
+/// <summary>
+/// Represents a database SQL statement, including its command type and  text, for use with data access operations.
+/// </summary>
+public record class SqlStatement
+{
+    private string? _commandText; 
+
+    /// <summary>
+    /// Gets an indeterminate <see cref="SqlStatement"/>.
+    /// </summary>
+    public static SqlStatement Indeterminate { get; } = new SqlStatement();
+
+    /// <summary>
+    /// Creates a stored procedure <see cref="SqlStatement"/>.
+    /// </summary>
+    /// <param name="storedProcedure">The stored procedure name.</param>
+    /// <returns>The <see cref="SqlStatement"/>.</returns>
+    public static SqlStatement StoredProcedure(string storedProcedure) => new(CommandType.StoredProcedure, storedProcedure);
+
+    /// <summary>
+    /// Creates a SQL text <see cref="SqlStatement"/> from the <paramref name="text"/>.
+    /// </summary>
+    /// <param name="text">The SQL statement text.</param>
+    /// <returns>The <see cref="SqlStatement"/>.</returns>
+    public static SqlStatement FromText(string text) => new(CommandType.Text, text);
+
+    /// <summary>
+    /// Creates a SQL text <see cref="SqlStatement"/> from the named embedded resource within the specified <paramref name="assembly"/>.
+    /// </summary>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
+    /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
+    /// <returns>The <see cref="SqlStatement"/>.</returns>
+    public static SqlStatement FromResource(string resourceName, Assembly? assembly = null)
+    {
+        using var s = Resource.GetStream(resourceName, assembly ?? Assembly.GetCallingAssembly());
+        using var sr = new StreamReader(s);
+        return FromText(sr.ReadToEnd());
+    }
+
+    /// <summary>
+    /// Creates a SQL text <see cref="SqlStatement"/> from the named embedded resource within the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> that contains the embedded resource.</typeparam>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
+    /// <returns>The <see cref="SqlStatement"/>.</returns>
+    public static SqlStatement FromResource<TResource>(string resourceName) => FromResource(resourceName, typeof(TResource).Assembly);
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SqlStatement"/> class.
+    /// </summary>
+    /// <param name="commandType">The <see cref="System.Data.CommandType"/>.</param>
+    /// <param name="commandText">The command text.</param>
+    public SqlStatement(CommandType commandType, string commandText)
+    {
+        CommandType = commandType;
+        CommandText = commandText.ThrowIfNullOrEmpty();
+    }
+
+    /// <summary>
+    /// Initializes a new <see cref="Indeterminate"/> instance of the <see cref="SqlStatement"/> struct.
+    /// </summary>
+    private SqlStatement() { }
+
+    /// <summary>
+    /// Gets the <see cref="System.Data.CommandType"/>.
+    /// </summary>
+    public CommandType CommandType { get; }
+
+    /// <summary>
+    /// Gets the command text.
+    /// </summary>
+    public string CommandText
+    {
+        get => _commandText ?? throw new InvalidOperationException($"{nameof(CommandText)} is not initialized; the {nameof(SqlStatement)} is indeterminate.");
+        private init => _commandText = value;
+    }
+
+    /// <summary>
+    /// Indicates whether the <see cref="SqlStatement"/> is indeterminate (i.e. has not been initialized with a <see cref="CommandText"/>).
+    /// </summary>
+    public bool IsIndeterminate => _commandText is null;
+
+    /// <summary>
+    /// An implicit cast from a text <see cref="string"/> to a <see cref="SqlStatement"/> (<see cref="System.Data.CommandType.Text"/>).
+    /// </summary>
+    /// <param name="text">The SQL statement text.</param>
+    public static implicit operator SqlStatement(string text) => FromText(text);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Database/Templates/EfModelBuilder_cs.hbs b/src/CoreEx.Database/Templates/EfModelBuilder_cs.hbs
new file mode 100644
index 00000000..8385c24b
--- /dev/null
+++ b/src/CoreEx.Database/Templates/EfModelBuilder_cs.hbs
@@ -0,0 +1,75 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.DotNetDataEfRepositoriesNamespace}};
+
+public partial class {{Domain}}DbContext
+{
+    /// <summary>Adds the generated models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="Microsoft.EntityFrameworkCore.ModelBuilder"/>.</param>
+    partial void AddGeneratedModels(Microsoft.EntityFrameworkCore.ModelBuilder modelBuilder)
+    {
+{{#each EfModels}}
+  {{#unless @first}}
+
+  {{/unless}}
+        // Add the entity/model configuration for the {{DbTable.QualifiedName}} database table.
+        modelBuilder.Entity<{{Root.DotNetDataEfModelsNamespace}}.{{EfModelName}}>(e =>
+        {
+            e.{{#if DbTable.IsAView}}ToView{{else}}ToTable{{/if}}("{{Name}}"{{#ifne Schema ''}}, "{{Schema}}"{{/ifne}});
+  {{#if HasPrimaryKeyIdentifier}}
+            e.HasKey(p => p.Id);
+            e.Property(p => p.Id).HasColumnName("{{PrimaryKeyIdentifierColumn.Name}}").HasColumnType("{{PrimaryKeyIdentifierColumn.DbColumn.SqlType2}}"){{#if PrimaryKeyIdentifierColumn.DbColumn.IsComputed}}.ValueGeneratedOnAddOrUpdate(){{/if}};
+    {{#each StandardColumns}}
+            e.Property(p => p.{{Property}}).HasColumnName("{{Name}}").HasColumnType("{{DbColumn.SqlType2}}"){{#if DbColumn.IsComputed}}.ValueGeneratedOnAddOrUpdate(){{/if}}{{#if DbColumn.IsRowVersionColumn}}.IsRowVersion(){{/if}}{{#if DbColumn.IsCreatedAudit}}.ValueGeneratedOnUpdate(){{/if}}{{#if DbColumn.IsUpdatedAudit}}.ValueGeneratedOnAdd(){{/if}}{{#if ValueConverter}}.HasConversion({{ValueConverter}}){{/if}};
+    {{/each}}
+    {{#if HasColumnCreatedBy}}
+            e.Property(p => p.CreatedBy).HasColumnName("{{ColumnCreatedBy.Name}}").HasColumnType("{{ColumnCreatedBy.DbColumn.SqlType2}}");
+    {{/if}}
+    {{#if HasColumnCreatedOn}}
+            e.Property(p => p.CreatedOn).HasColumnName("{{ColumnCreatedOn.Name}}").HasColumnType("{{ColumnCreatedOn.DbColumn.SqlType2}}");
+    {{/if}}
+    {{#if HasColumnUpdatedBy}}
+            e.Property(p => p.UpdatedBy).HasColumnName("{{ColumnUpdatedBy.Name}}").HasColumnType("{{ColumnUpdatedBy.DbColumn.SqlType2}}");
+    {{/if}}
+    {{#if HasColumnUpdatedOn}}
+            e.Property(p => p.UpdatedOn).HasColumnName("{{ColumnUpdatedOn.Name}}").HasColumnType("{{ColumnUpdatedOn.DbColumn.SqlType2}}");
+    {{/if}}
+    {{#if HasColumnRowVersion}}
+            e.Property(p => p.ETag).HasColumnName("{{ColumnRowVersion.Name}}").HasColumnType("{{ColumnRowVersion.DbColumn.SqlType2}}").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, {{ColumnRowVersion.Type}}>(BaseDatabase.RowVersionConverter));
+    {{/if}}
+    {{#if HasColumnTenantId}}
+            e.Property(p => p.TenantId).HasColumnName("{{ColumnTenantId.Name}}").HasColumnType("{{ColumnTenantId.DbColumn.SqlType2}}");
+    {{/if}}
+    {{#if HasColumnIsDeleted}}
+            e.Property(p => p.IsDeleted).HasColumnName("{{ColumnIsDeleted.Name}}").HasColumnType("{{ColumnIsDeleted.DbColumn.SqlType2}}");
+    {{/if}}
+    {{#if DbTable.IsRefData}}
+       {{#ifval RefData.TextProperty RefData.DescriptionProperty RefData.SortOrderProperty RefData.IsActiveProperty RefData.StartsOnProperty RefData.EndsOnProperty}}
+       {{else}}
+            e{{#ifnull RefData.TextProperty}}.Ignore(p => p.Text){{/ifnull}}{{#ifnull RefData.DescriptionProperty}}.Ignore(p => p.Description){{/ifnull}}{{#ifnull RefData.SortOrderProperty}}.Ignore(p => p.SortOrder){{/ifnull}}{{#ifnull RefData.IsActiveProperty}}.Ignore(p => p.IsActive){{/ifnull}}{{#ifnull RefData.StartsOnProperty}}.Ignore(p => p.StartsOn){{/ifnull}}{{#ifnull RefData.EndsOnProperty}}.Ignore(p => p.EndsOn){{/ifnull}};
+       {{/ifval}}
+    {{/if}}
+    {{#ifval ColumnCreatedBy ColumnCreatedOn ColumnUpdatedBy ColumnUpdatedOn ColumnRowVersion}}
+    {{else}}
+            e{{#unless HasColumnCreatedBy}}.Ignore(p => p.CreatedBy){{/unless}}{{#unless HasColumnCreatedOn}}.Ignore(p => p.CreatedOn){{/unless}}{{#unless HasColumnUpdatedBy}}.Ignore(p => p.UpdatedBy){{/unless}}{{#unless HasColumnUpdatedOn}}.Ignore(p => p.UpdatedOn){{/unless}}{{#unless HasColumnRowVersion}}.Ignore(p => p.ETag){{/unless}};
+    {{/ifval}}
+  {{else}}
+    {{#ifne PrimaryKeyColumns.Count 0}}
+            e.HasKey({{#ifeq PrimaryKeyColumns.Count 1}}p => p.{{#each PrimaryKeyColumns}}{{Property}}{{/each}}{{else}}{{#each PrimaryKeyColumns}}"{{Property}}"{{#unless @last}}, {{/unless}}{{/each}}{{/ifeq}});
+    {{/ifne}}
+    {{#each Columns}}
+            e.Property(p => p.{{Property}}).HasColumnName("{{Name}}").HasColumnType("{{DbColumn.SqlType2}}"){{#if DbColumn.IsComputed}}.ValueGeneratedOnAddOrUpdate(){{/if}}{{#if DbColumn.IsRowVersionColumn}}.IsRowVersion(){{/if}}{{#if DbColumn.IsCreatedAudit}}.ValueGeneratedOnUpdate(){{/if}}{{#if DbColumn.IsUpdatedAudit}}.ValueGeneratedOnAdd(){{/if}}{{#if ValueConverter}}.HasConversion({{ValueConverter}}){{/if}};
+    {{/each}}
+  {{/if}}
+        });
+{{/each}}
+    }
+}
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.Database/Templates/EfModel_cs.hbs b/src/CoreEx.Database/Templates/EfModel_cs.hbs
new file mode 100644
index 00000000..92059adb
--- /dev/null
+++ b/src/CoreEx.Database/Templates/EfModel_cs.hbs
@@ -0,0 +1,68 @@
+// <auto-generated/>
+
+/*
+ * This file is automatically generated by '{{Root.CodeGenName}}'; any changes will be lost.
+ */
+
+#nullable enable
+
+namespace {{Root.DotNetDataEfModelsNamespace}};
+
+{{#if DbTable.IsRefData}}
+/// <summary>Persistence reference-data model representing the '<c>{{DbTable.QualifiedName}}</c>' database table.</summary>
+public partial class {{EfModelName}} : ReferenceDataModelBase<{{PrimaryKeyIdentifierColumn.Type}}>{{#ifeq RefData.AdditionalProperties.Count 0}} { }{{/ifeq}}
+  {{#ifne RefData.AdditionalProperties.Count 0}}
+{
+    {{#each RefData.AdditionalProperties}}
+      {{#unless @first}}
+
+      {{/unless}}
+    /// <summary>Gets or sets the value of the '<c>{{DbColumn.Name}}</c>' column (type '<c>{{DbColumn.SqlType}}</c>').</summary>
+    public {{Type}} {{Property}} { get; set; }{{#ifval Default}} = {{Default}};{{else}}{{#unless DbColumn.IsNullable}}{{#ifeq DbColumn.DotNetType "string"}} = default!;{{/ifeq}}{{/unless}}{{/ifval}}
+    {{/each}}
+}
+  {{/ifne}}
+{{else}}
+/// <summary>Persistence model representing the '<c>{{DbTable.QualifiedName}}</c>' database table.</summary>
+  {{#if HasPrimaryKeyIdentifier}}
+/// <remarks>The <see cref="Id"/> primary key column is '<c>{{PrimaryKeyIdentifierColumn.Name}}</c>' (type '<c>{{PrimaryKeyIdentifierColumn.DbColumn.SqlType}}</c>').</remarks>
+  {{/if}}
+public partial class {{EfModelName}}{{#if HasPrimaryKeyIdentifier}} : ModelBase<{{PrimaryKeyIdentifierColumn.Type}}>{{#if HasColumnIsDeleted}}, ILogicallyDeleted{{/if}}{{#if HasColumnTenantId}}, ITenantId{{/if}}{{/if}}
+{
+  {{#if HasPrimaryKeyIdentifier}}
+    {{#each StandardColumns}}
+      {{#unless @first}}
+
+      {{/unless}}
+    /// <summary>Gets or sets the value of the '<c>{{DbColumn.Name}}</c>' column (type '<c>{{DbColumn.SqlType}}</c>').</summary>
+      {{#if DbColumn.IsPrimaryKey}}
+    /// <remarks>This is {{#ifeq Parent.DbTable.PrimaryKeyColumns.Count 1}}the primary key{{else}}part of the primary key{{/ifeq}}.</remarks>
+      {{/if}}
+    public {{Type}} {{Property}} { get; set; }{{#ifval Default}} = {{Default}};{{else}}{{#unless DbColumn.IsNullable}}{{#ifeq DbColumn.DotNetType "string"}} = default!;{{/ifeq}}{{/unless}}{{/ifval}}
+    {{/each}}
+    {{#if HasColumnIsDeleted}}
+
+    /// <summary>Gets or sets the value of the '<c>{{ColumnIsDeleted.Name}}</c>' column (type '<c>{{ColumnIsDeleted.DbColumn.SqlType}}</c>'); see <see cref="ILogicallyDeleted.IsDeleted"/>.</summary>
+    public bool IsDeleted { get; set; }
+    {{/if}}
+    {{#if HasColumnTenantId}}
+
+    /// <summary>Gets or sets the value of the '<c>{{ColumnTenantId.Name}}</c>' column (type '<c>{{ColumnTenantId.DbColumn.SqlType}}</c>'); see <see cref="ITenantId.TenantId"/>.</summary>
+    public string? TenantId { get; set; }
+    {{/if}}
+  {{else}}
+    {{#each Columns}}
+      {{#unless @first}}
+
+      {{/unless}}
+    /// <summary>Gets or sets the value of the '<c>{{DbColumn.Name}}</c>' column (type '<c>{{DbColumn.SqlType}}</c>').</summary>
+      {{#if DbColumn.IsPrimaryKey}}
+    /// <remarks>This is {{#ifeq Parent.DbTable.PrimaryKeyColumns.Count 1}}the primary key{{else}}part of the primary key{{/ifeq}}.</remarks>
+      {{/if}}
+    public {{Type}} {{Property}} { get; set; }{{#ifval Default}} = {{Default}};{{else}}{{#unless DbColumn.IsNullable}}{{#ifeq DbColumn.DotNetType "string"}} = default!;{{/ifeq}}{{/unless}}{{/ifval}}
+    {{/each}}
+  {{/if}}
+}
+{{/if}}
+
+#nullable restore
\ No newline at end of file
diff --git a/src/CoreEx.Database/strong-name-key.snk b/src/CoreEx.Database/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Database/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Dataverse/CoreEx.Dataverse.csproj b/src/CoreEx.Dataverse/CoreEx.Dataverse.csproj
deleted file mode 100644
index 1c5a23c2..00000000
--- a/src/CoreEx.Dataverse/CoreEx.Dataverse.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>CoreEx.Dataverse</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Microsoft Dataverse extras.</Title>
-    <Description>CoreEx Microsoft Dataverse extras.</Description>
-    <PackageTags>coreex dataverse power-platform</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.PowerPlatform.Dataverse.Client" Version="1.2.2" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="System.Formats.Asn1" Version="9.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Formats.Asn1" Version="6.0.1" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/CoreEx.Dataverse/IDataverseMapper.cs b/src/CoreEx.Dataverse/IDataverseMapper.cs
deleted file mode 100644
index 1d40b8f0..00000000
--- a/src/CoreEx.Dataverse/IDataverseMapper.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using Microsoft.Xrm.Sdk;
-using System;
-
-namespace CoreEx.Dataverse
-{
-    /// <summary>
-    /// Defines a <i>Dataverse</i> mapper.
-    /// </summary>
-    public interface IDataverseMapper
-    {
-        /// <summary>
-        /// Gets the source <see cref="Type"/> being mapped from/to the <i>Dataverse</i> <see cref="Entity"/>.
-        /// </summary>
-        Type SourceType { get; }
-
-        /// <summary>
-        /// Maps from an <paramref name="entity"/> creating a corresponding instance of the <see cref="SourceType"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of the <see cref="SourceType"/>.</returns>
-        object? MapFromDataverse(Entity entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="Entity"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToDataverse(object? value, Entity entity, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/IDataverseMapperT.cs b/src/CoreEx.Dataverse/IDataverseMapperT.cs
deleted file mode 100644
index da62db0f..00000000
--- a/src/CoreEx.Dataverse/IDataverseMapperT.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using Microsoft.Xrm.Sdk;
-using System;
-
-namespace CoreEx.Dataverse
-{
-    /// <summary>
-    /// Defines a <i>Dataverse</i> mapper.
-    /// </summary>
-    /// <typeparam name="TSource">The <see cref="IDataverseMapper.SourceType"/>.</typeparam>
-    public interface IDataverseMapper<TSource> : IDataverseMapper
-    {
-        /// <inheritdoc/>
-        Type IDataverseMapper.SourceType => typeof(TSource);
-
-        /// <inheritdoc/>
-        object? IDataverseMapper.MapFromDataverse(Entity entity, OperationTypes operationType) => MapFromDataverse(entity, operationType)!;
-
-        /// <inheritdoc/>
-        void IDataverseMapper.MapToDataverse(object? value, Entity entity, OperationTypes operationType) => MapToDataverse((TSource?)value, entity, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="entity"/> creating a corresponding instance of <typeparamref name="TSource"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of <typeparamref name="TSource"/>.</returns>
-        new TSource? MapFromDataverse(Entity entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="Entity"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToDataverse(TSource? value, Entity entity, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/Mapping/DataverseMapper.cs b/src/CoreEx.Dataverse/Mapping/DataverseMapper.cs
deleted file mode 100644
index f2d7f06d..00000000
--- a/src/CoreEx.Dataverse/Mapping/DataverseMapper.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Dataverse.Mapping
-{
-    /// <summary>
-    /// Enables <see cref="Create{TSource}"/> or <see cref="CreateAuto{TSource}(string[])"/> of a <see cref="DataverseMapper{TSource}"/>.
-    /// </summary>
-    public class DataverseMapper
-    {
-        /// <summary>
-        /// Creates a <see cref="DataverseMapper{TSource}"/> where properties are added manually.
-        /// </summary>
-        /// <returns>A <see cref="DataverseMapper{TSource}"/>.</returns>
-        public static DataverseMapper<TSource> Create<TSource>() where TSource : class, new() => new(false);
-
-        /// <summary>
-        /// Creates a <see cref="DataverseMapper{TSource}"/> where properties are added automatically (assumes the property and column names share the same name).
-        /// </summary>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        /// <returns>A <see cref="DataverseMapper{TSource}"/>.</returns>
-        public static DataverseMapper<TSource> CreateAuto<TSource>(params string[] ignoreSrceProperties) where TSource : class, new() => new(true, ignoreSrceProperties);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/Mapping/DataverseMapperT.cs b/src/CoreEx.Dataverse/Mapping/DataverseMapperT.cs
deleted file mode 100644
index 3032b8e1..00000000
--- a/src/CoreEx.Dataverse/Mapping/DataverseMapperT.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using Microsoft.Xrm.Sdk;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.Dataverse.Mapping
-{
-    /// <summary>
-    /// Provides mapping from a <typeparamref name="TSource"/> <see cref="Type"/> and <i>Dataverse</i> <see cref="Entity"/>.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    public class DataverseMapper<TSource> : IDataverseMapper<TSource>, IDataverseMapperMappings where TSource : class, new()
-    {
-        private readonly List<IPropertyColumnMapper> _mappings = [];
-        private readonly bool _implementsIIdentifier = typeof(IIdentifier).IsAssignableFrom(typeof(TSource));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataverseMapper{TSource}"/> class.
-        /// </summary>
-        /// <param name="autoMap">Indicates whether the entity should automatically map all public get/set properties, where the property and column names are all assumed to share the same name.</param>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        public DataverseMapper(bool autoMap = false, params string[] ignoreSrceProperties)
-        {
-            if (typeof(TSource) == typeof(string)) throw new InvalidOperationException("TSource must not be a String.");
-
-            if (autoMap)
-                AutomagicallyMap(ignoreSrceProperties);
-        }
-
-        /// <inheritdoc/>
-        IEnumerable<IPropertyColumnMapper> IDataverseMapperMappings.Mappings => _mappings.AsEnumerable();
-
-        /// <inheritdoc/>
-        public IPropertyColumnMapper this[string propertyName] => TryGetProperty(propertyName, out var pcm) ? pcm : throw new ArgumentException($"Property '{propertyName}' does not exist.", nameof(propertyName));
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> for the specified source <paramref name="propertyExpression"/>.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        public IPropertyColumnMapper this[Expression<Func<TSource, object?>> propertyExpression]
-        {
-            get
-            {
-                propertyExpression.ThrowIfNull(nameof(propertyExpression));
-
-                MemberExpression? me = null;
-                if (propertyExpression.Body.NodeType == ExpressionType.MemberAccess)
-                    me = propertyExpression.Body as MemberExpression;
-                else if (propertyExpression.Body.NodeType == ExpressionType.Convert)
-                {
-                    if (propertyExpression.Body is UnaryExpression ue)
-                        me = ue.Operand as MemberExpression;
-                }
-
-                if (me == null)
-                    throw new InvalidOperationException("Only Member access expressions are supported.");
-
-                return this[me.Member.Name];
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyColumnMapper? propertyColumnMapper)
-        {
-            propertyColumnMapper = _mappings.Where(x => x.PropertyName == propertyName).FirstOrDefault();
-            return propertyColumnMapper != null;
-        }
-
-        /// <inheritdoc/>
-        public string GetColumnName(string propertyName) => this[propertyName].ColumnName;
-
-        /// <summary>
-        /// Automatically add each public get/set property.
-        /// </summary>
-        private void AutomagicallyMap(string[] ignoreSrceProperties)
-        {
-            foreach (var sp in TypeReflector.GetProperties(typeof(TSource)))
-            {
-                // Do not auto-map where ignore has been specified.
-                if (ignoreSrceProperties.Contains(sp.Name))
-                    continue;
-
-                // Create the lambda expression for the property and add to the mapper.
-                var spe = Expression.Parameter(typeof(TSource), "x");
-                var sex = Expression.Lambda(Expression.Property(spe, sp), spe);
-                typeof(DataverseMapper<TSource>)
-                    .GetMethod(nameof(AutoProperty), BindingFlags.NonPublic | BindingFlags.Instance)!
-                    .MakeGenericMethod([sp.PropertyType])
-                    .Invoke(this, [sex, null, OperationTypes.Any]);
-            }
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper with additiional auto-logic.
-        /// </summary>
-        private PropertyColumnMapper<TSource, TSourceProperty> AutoProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            var pcm  = Property(propertyExpression, columnName, operationTypes);
-
-            // Automatically set primary key where IIdentifier.
-            if (_implementsIIdentifier && pcm.PropertyName == nameof(IIdentifier.Id))
-                pcm.SetPrimaryKey(pcm.PropertyType == typeof(Guid) || pcm.PropertyType == typeof(Guid?) || pcm.PropertyType == typeof(string));
-
-            return pcm;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper.
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>Dataverse</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> Property<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            var pcm = new PropertyColumnMapper<TSource, TSourceProperty>(propertyExpression, columnName, operationTypes);
-            AddMapping(pcm);
-            return pcm;
-        }
-
-        /// <summary>
-        /// Validates and adds a new IPropertyColumnMapper.
-        /// </summary>
-        private void AddMapping<TSourceProperty>(PropertyColumnMapper<TSource, TSourceProperty> propertyColumnMapper)
-        {
-            if (_mappings.Any(x => x.PropertyName == propertyColumnMapper.PropertyName))
-                throw new ArgumentException($"Source property '{propertyColumnMapper.PropertyName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            if (_mappings.Any(x => x.ColumnName == propertyColumnMapper.ColumnName))
-                throw new ArgumentException($"Column '{propertyColumnMapper.ColumnName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            _mappings.Add(propertyColumnMapper);
-        }
-
-        /// <summary>
-        /// Adds or updates <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper.
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>Dataverse</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <param name="property">An <see cref="Action"/> enabling access to the created <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</param>
-        /// <returns></returns>
-        /// <remarks>Where updating an existing the <paramref name="columnName"/> and <paramref name="operationTypes"/> where specified will override the previous values.</remarks>
-        public DataverseMapper<TSource> HasProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes? operationTypes = null, Action<PropertyColumnMapper<TSource, TSourceProperty>>? property = null)
-        {
-            var tmp = new PropertyColumnMapper<TSource, TSourceProperty>(propertyExpression, columnName, operationTypes ?? OperationTypes.Any);
-            var pcm = _mappings.Where(x => x.PropertyName == tmp.PropertyName).OfType<PropertyColumnMapper<TSource, TSourceProperty>>().SingleOrDefault();
-            if (pcm == null)
-                AddMapping(pcm = tmp);
-            else
-            {
-                if (columnName != null && tmp.ColumnName != pcm.ColumnName)
-                {
-                    if (_mappings.Any(x => x.ColumnName == pcm.ColumnName))
-                        throw new ArgumentException($"Column '{pcm.ColumnName}' must not be specified more than once.", nameof(columnName));
-                    else
-                        pcm.ColumnName = tmp.ColumnName;
-                }
-
-                if (operationTypes != null)
-                    pcm.OperationTypes = operationTypes.Value;
-            }
-
-            property?.Invoke(pcm);
-            return this;
-        }
-
-        /// <summary>
-        /// Inherits the property mappings from the selected <paramref name="inheritMapper"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="inheritMapper"/> source <see cref="Type"/>. Must inherit from <typeparamref name="TSource"/>.</typeparam>
-        /// <param name="inheritMapper">The <see cref="IDataverseMapper{T}"/> to inherit from. Must also implement <see cref="IDataverseMapperMappings"/>.</param>
-        public void InheritPropertiesFrom<T>(IDataverseMapper<T> inheritMapper) where T : class, new()
-        {
-            inheritMapper.ThrowIfNull(nameof(inheritMapper));
-            if (!typeof(TSource).IsSubclassOf(typeof(T))) throw new ArgumentException($"Type {typeof(TSource).Name} must inherit from {typeof(T).Name}.", nameof(inheritMapper));
-            if (inheritMapper is not IDataverseMapperMappings inheritMappings) throw new ArgumentException($"Type {typeof(T).Name} must implement {typeof(IDataverseMapperMappings).Name} to copy the mappings.", nameof(inheritMapper));
-
-            var pe = Expression.Parameter(typeof(TSource), "x");
-            var type = typeof(DataverseMapper<>).MakeGenericType(typeof(TSource));
-
-            foreach (var p in inheritMappings.Mappings)
-            {
-                var lex = Expression.Lambda(Expression.Property(pe, p.PropertyName), pe);
-                var pmap = (IPropertyColumnMapper)type
-                    .GetMethod("Property", BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)!
-                    .MakeGenericMethod(p.PropertyType)
-                    .Invoke(this, [lex, p.ColumnName, p.OperationTypes])!;
-
-                if (p.IsPrimaryKey)
-                    pmap.SetPrimaryKey(p.IsPrimaryKeyUseEntityIdentifier);
-
-                if (p.Converter != null)
-                    pmap.SetConverter(p.Converter);
-
-                if (p.Mapper != null)
-                    pmap.SetMapper(p.Mapper);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void MapToDataverse(TSource? value, Entity entity, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            entity.ThrowIfNull(nameof(entity));
-            if (value == null) return;
-
-            foreach (var p in _mappings)
-            {
-                p.MapToDataverse(value, entity, operationType);
-            }
-
-            OnMapToDataverse(value, entity, operationType);
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapToDataverse(TSource, Entity, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="Entity"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        protected virtual void OnMapToDataverse(TSource value, Entity entity, OperationTypes operationType) { }
-
-        /// <inheritdoc/>
-        public TSource? MapFromDataverse(Entity entity, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            entity.ThrowIfNull(nameof(entity));
-            var value = new TSource();
-
-            foreach (var p in _mappings)
-            {
-                p.MapFromDataverse(entity, value, operationType);
-            }
-
-            value = OnMapFromDataverse(value, entity, operationType);
-            return (value != null && value is IInitial ii && ii.IsInitial) ? null : value;
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapFromDataverse(Entity, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The source value.</param>
-        /// <param name="entity">The <see cref="Entity"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The source value.</returns>
-        protected virtual TSource? OnMapFromDataverse(TSource value, Entity entity, OperationTypes operationType) => value;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/Mapping/IDataverseMapperMappings.cs b/src/CoreEx.Dataverse/Mapping/IDataverseMapperMappings.cs
deleted file mode 100644
index fd0d3a34..00000000
--- a/src/CoreEx.Dataverse/Mapping/IDataverseMapperMappings.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Dataverse.Mapping
-{
-    /// <summary>
-    /// Gets the <see cref="IPropertyColumnMapper"/> mappings.
-    /// </summary>
-    public interface IDataverseMapperMappings
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> mappings.
-        /// </summary>
-        IEnumerable<IPropertyColumnMapper> Mappings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> from the <see cref="Mappings"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        IPropertyColumnMapper this[string propertyName] { get; }
-
-        /// <summary>
-        /// Attempts to get the <see cref="IPropertyColumnMapper"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <param name="propertyColumnMapper">The corresponding <see cref="IPropertyColumnMapper"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyColumnMapper? propertyColumnMapper);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper.ColumnName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper.ColumnName"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        string GetColumnName(string propertyName);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/Mapping/IPropertyColumnMapper.cs b/src/CoreEx.Dataverse/Mapping/IPropertyColumnMapper.cs
deleted file mode 100644
index 02ff9aa6..00000000
--- a/src/CoreEx.Dataverse/Mapping/IPropertyColumnMapper.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping.Converters;
-using CoreEx.Mapping;
-using System;
-using Microsoft.Xrm.Sdk;
-
-namespace CoreEx.Dataverse.Mapping
-{
-    /// <summary>
-    /// Enables bi-directional property and <i>Dataverse</i> column mapping.
-    /// </summary>
-    public interface IPropertyColumnMapper
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyExpression"/>.
-        /// </summary>
-        IPropertyExpression PropertyExpression { get; }
-
-        /// <summary>
-        /// Gets the source property name.
-        /// </summary>
-        string PropertyName { get; }
-
-        /// <summary>
-        /// Gets the source property <see cref="Type"/>.
-        /// </summary>
-        Type PropertyType { get; }
-
-        /// <summary>
-        /// Indicates whether the underlying source property is a complex type.
-        /// </summary>
-        bool IsSrcePropertyComplex { get; }
-
-        /// <summary>
-        /// Gets the destination <i>Dataverse</i> column name.
-        /// </summary>
-        string ColumnName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property (default to <see cref="OperationTypes.Any"/>).
-        /// </summary>
-        OperationTypes OperationTypes { get; }
-
-        /// <summary>
-        /// Indicates whether the property forms part of the primary key. 
-        /// </summary>
-        bool IsPrimaryKey { get; }
-
-        /// <summary>
-        /// Indicates whether the primary key value maps to the underlying <see cref="Entity.Id"/> versus <see cref="Entity.KeyAttributes"/>.
-        /// </summary>
-        bool IsPrimaryKeyUseEntityIdentifier { get; }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/>).
-        /// </summary>
-        /// <param name="useEntityIdentifier">Indicates whether the primary key value maps to the underlying <see cref="Entity.Id"/> versus <see cref="Entity.KeyAttributes"/>.</param>
-        void SetPrimaryKey(bool useEntityIdentifier = true);
-
-        /// <summary>
-        /// Gets the <see cref="IConverter"/> (used where a specific source and destination type conversion is required).
-        /// </summary>
-        IConverter? Converter { get; }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        void SetConverter(IConverter converter);
-
-        /// <summary>
-        /// Gets the <see cref="IDataverseMapper"/> to map complex types.
-        /// </summary>
-        IDataverseMapper? Mapper { get; }
-
-        /// <summary>
-        /// Set the <see cref="IDataverseMapper"/> to map complex types.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IDataverseMapper"/>.</param>
-        /// <remarks>The <see cref="Mapper"/> and <see cref="Converter"/> are mutually exclusive.</remarks>
-        void SetMapper(IDataverseMapper mapper);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="Entity"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToDataverse(object value, Entity entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="entity"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapFromDataverse(Entity entity, object value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/Mapping/PropertyColumnMapper.cs b/src/CoreEx.Dataverse/Mapping/PropertyColumnMapper.cs
deleted file mode 100644
index 05d9fb47..00000000
--- a/src/CoreEx.Dataverse/Mapping/PropertyColumnMapper.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping;
-using CoreEx.Mapping.Converters;
-using Microsoft.Xrm.Sdk;
-using System;
-using System.ComponentModel;
-using System.Linq.Expressions;
-
-namespace CoreEx.Dataverse.Mapping
-{
-    /// <summary>
-    /// Provides bi-directional property and <i>Dataverse</i> column mapping.
-    /// </summary>
-    /// <typeparam name="TSource">The source entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSourceProperty">The corresponding source property <see cref="Type"/>.</typeparam>
-    public class PropertyColumnMapper<TSource, TSourceProperty> : IPropertyColumnMapper where TSource : class, new()
-    {
-        private readonly PropertyExpression<TSource, TSourceProperty> _propertyExpression;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> class.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>Dataverse</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        internal PropertyColumnMapper(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            _propertyExpression = Abstractions.Reflection.PropertyExpression.Create(propertyExpression);
-            ColumnName = columnName ?? PropertyName;
-            OperationTypes = operationTypes;
-        }
-
-        /// <inheritdoc/>
-        public IPropertyExpression PropertyExpression => _propertyExpression;
-
-        /// <inheritdoc/>
-        public string PropertyName => _propertyExpression.Name;
-
-        /// <inheritdoc/>
-        public Type PropertyType => typeof(TSourceProperty);
-
-        /// <inheritdoc/>
-        public bool IsSrcePropertyComplex => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public string ColumnName { get; internal set; }
-
-        /// <inheritdoc/>
-        public OperationTypes OperationTypes { get; internal set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKey { get; private set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKeyUseEntityIdentifier { get; private set; }
-
-        /// <inheritdoc/>
-        public IConverter? Converter { get; private set; }
-
-        /// <inheritdoc/>
-        public IDataverseMapper? Mapper { get; private set; }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetConverter(IConverter converter)
-        {
-            converter.ThrowIfNull(nameof(converter));
-
-            if (Mapper != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (converter.SourceType != typeof(TSourceProperty))
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' and IConverter.SourceType '{converter.SourceType.Name}' must match.");
-
-            Converter = converter;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetConverter<TDestinationProperty>(IConverter<TSourceProperty, TDestinationProperty> converter)
-        {
-            ((IPropertyColumnMapper)this).SetConverter(converter);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetMapper(IDataverseMapper mapper)
-        {
-            mapper.ThrowIfNull(nameof(mapper));
-
-            if (Converter != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (!_propertyExpression.IsClass)
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' must be a class to set a Mapper.");
-
-            if (mapper.SourceType != typeof(TSourceProperty))
-                throw new ArgumentException($"The PropertyType '{PropertyType.Name}' and IDataverseMapper.SourceType '{mapper.SourceType.Name}' must match.", nameof(mapper));
-
-            if (IsPrimaryKey)
-                throw new InvalidOperationException("A Mapper can not be set for a primary key.");
-
-            Mapper = mapper;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Mapper"/>.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IDataverseMapper"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetMapper<TDestinationProperty>(IDataverseMapper<TDestinationProperty> mapper)
-        {
-            ((IPropertyColumnMapper)this).SetMapper(mapper);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetPrimaryKey(bool useEntityIdentifier)
-        {
-            if (Mapper != null) throw new InvalidOperationException("A primary key must not contain a Mapper.");
-
-            if (useEntityIdentifier)
-            {
-                if (PropertyType == typeof(Guid) || PropertyType == typeof(Guid?) || PropertyType == typeof(string))
-                    IsPrimaryKeyUseEntityIdentifier = true;
-                else
-                    throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' must be a Guid or String to use the Entity.Id.");
-            }
-
-            IsPrimaryKey = true;
-        }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/>).
-        /// </summary>
-        /// <param name="useEntityIdentifier">Indicates whether the primary key value maps to the underlying <see cref="Entity.Id"/> versus <see cref="Entity.KeyAttributes"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetPrimaryKey(bool useEntityIdentifier = true)
-        {
-            ((IPropertyColumnMapper)this).SetPrimaryKey(useEntityIdentifier);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.MapToDataverse(object? value, Entity entity, OperationTypes operationType) => MapToDataverse((TSource?)value, entity, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="Entity"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapToDataverse(TSource? value, Entity entity, OperationTypes operationType)
-        {
-            if (value == null || !OperationTypes.HasFlag(operationType))
-                return;
-
-            var val = _propertyExpression.GetValue(value);
-            if (Mapper != null)
-            {
-                if (val != null)
-                    Mapper.MapToDataverse(val, entity, operationType);
-            }
-            else
-            {
-                if (IsPrimaryKey && IsPrimaryKeyUseEntityIdentifier)
-                {
-                    entity.Id = PropertyType == typeof(string) ? Guid.Parse(val?.ToString() ?? string.Empty) : (Guid)Convert.ChangeType(val, typeof(Guid))!;
-                    return;
-                }
-
-                var aval = Converter == null ? val : Converter.ConvertToDestination(val);
-                if (IsPrimaryKey)
-                    entity.KeyAttributes.Add(ColumnName, aval);
-                else
-                    entity.Attributes.Add(ColumnName, aval);
-            }
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.MapFromDataverse(Entity entity, object value, OperationTypes operationType) => MapFromDataverse(entity, (TSource)value, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="entity"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="Entity"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapFromDataverse(Entity entity, TSource value, OperationTypes operationType)
-        {
-            if (!OperationTypes.HasFlag(operationType))
-                return;
-
-            TSourceProperty? pval;
-            if (Mapper != null)
-                pval = (TSourceProperty?)Mapper.MapFromDataverse(entity, operationType);
-            else
-            {
-                if (IsPrimaryKey)
-                {
-                    if (IsPrimaryKeyUseEntityIdentifier)
-                        pval = (TSourceProperty?)TypeDescriptor.GetConverter(PropertyType).ConvertFromInvariantString(entity.Id.ToString());
-                    else
-                    {
-                        if (Converter is null)
-                            pval = (TSourceProperty)entity.KeyAttributes[ColumnName];
-                        else
-                            pval = (TSourceProperty)Converter.ConvertToSource(entity.KeyAttributes[ColumnName])!;
-                    }
-                }
-                else
-                {
-                    if (Converter is null)
-                        pval = entity.GetAttributeValue<TSourceProperty>(ColumnName);
-                    else
-                        pval = (TSourceProperty)Converter.ConvertToSource(entity.Attributes[ColumnName])!;
-                }
-            }
-
-            _propertyExpression.SetValue(value, pval);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Dataverse/strong-name-key.snk b/src/CoreEx.Dataverse/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Dataverse/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.DomainDriven/AGENTS.md b/src/CoreEx.DomainDriven/AGENTS.md
new file mode 100644
index 00000000..182674fc
--- /dev/null
+++ b/src/CoreEx.DomainDriven/AGENTS.md
@@ -0,0 +1,94 @@
+# CoreEx.DomainDriven — AI Usage Guide
+
+Provides DDD building blocks: aggregate roots (with integration events), typed entities, persistence-state tracking, and mutation-guard helpers.
+
+## Aggregate Root
+
+`Aggregate<TId, TSelf>` is an `Entity<TId, TSelf>` with an `Events` collection for accumulating integration events. The aggregate owns its invariants; the application service is responsible for forwarding any accumulated events to `IUnitOfWork.Events` after a successful repository operation.
+
+```csharp
+public sealed class Basket : Aggregate<string, Basket>
+{
+    public Result Checkout()
+    {
+        if (Status == BasketStatus.Empty)
+            return Result.BusinessError("An empty basket cannot be checked out.",
+                c => c.WithKey(Id).WithErrorCode("empty-basket"));
+
+        Modify(() => Status = BasketStatus.CheckedOut);
+        return Result.Success;
+    }
+
+    protected override Result OnCheckCanMutate() => Status.CanBeMutated
+        ? Result.Success
+        : Result.BusinessError($"Basket has a status of '{Status}' and cannot be modified.",
+            c => c.WithKey(Id).WithErrorCode("invalid-status"));
+}
+```
+
+In the application service, events are added to `IUnitOfWork.Events` after the repository update — typically using `EventData.CreateEventWith` on the mapped contract, not inside the aggregate itself:
+
+```csharp
+// Application service — events added by the service, not the aggregate
+return await _unitOfWork.TransactionAsync(async () =>
+{
+    var ur = await _repository.UpdateAsync(basket).ConfigureAwait(false);
+    return ur.ThenAs(b =>
+    {
+        var contract = BasketMapper.Map(b);
+        _unitOfWork.Events.Add(EventData.CreateEventWith(contract, EventAction.CheckedOut));
+        return contract;
+    });
+}).ConfigureAwait(false);
+```
+
+> `Aggregate<TId, TSelf>` also exposes `AddEvent` / `ClearEvents` for cases where the aggregate itself needs to accumulate events internally, but this is not the primary pattern used in the sample domains.
+
+## Entity Base
+
+`Entity<TId, TSelf>` provides identity-based equality, `PersistenceState` tracking, and mutation guards. All state changes go through `Modify()` or `Remove()` so the framework can track whether an entity is new, modified, or deleted.
+
+```csharp
+public class BasketItem : Entity<string, BasketItem>
+{
+    public decimal Quantity { get; private set; }
+
+    public Result OverrideQuantity(decimal quantity) =>
+        Modify(() => Quantity = quantity);
+
+    protected override Result OnCheckCanMutate() =>
+        PersistenceState.IsDeleted
+            ? Result.BusinessError("Cannot modify a deleted item.")
+            : Result.Success;
+}
+```
+
+## PersistenceState
+
+Infrastructure layers use `AsNew()`, `AsNotModified()`, and `SetPersistenceState()` to hydrate entities from the database — never `Modify()`.
+
+```csharp
+// Infrastructure mapper — hydrating from DB
+entity.AsNotModified()
+      .SetChangeLog(changeLog)
+      .SetETag(etag);
+```
+
+## Do Not
+
+- Do not call `Modify()` or `Remove()` from infrastructure or persistence code — they are for domain mutations only.
+- Do not set `IsReadOnly` from outside the entity; call `MakeReadOnly()` on the entity itself.
+- Do not add domain events to this package — it intentionally supports only integration events (`EventData`).
+
+## Domain Events — Intentionally Not Supported
+
+CoreEx does not provide a native in-process domain-event bus. Use `IUnitOfWork.Events` and the transactional outbox for integration events instead. See [README — Domain Events](./README.md#domain-events--intentionally-not-supported) for the full rationale.
+
+## Further Reading
+
+- [README](./README.md) — full `Entity`, `Aggregate`, `PersistenceState`, and mutation-guard API reference.
+- [CoreEx](../CoreEx/README.md) — `IIdentifier`, `IChangeLog`, `IETag`, `EventData`, and `Result<T>`.
+- [CoreEx.EntityFrameworkCore](../CoreEx.EntityFrameworkCore/README.md) — persists `Entity`/`Aggregate` types using `PersistenceState`.
+- [Domain layer](../../samples/docs/domain-layer.md) — real-world aggregate design, mutation guards, integration-event accumulation, and `Result<T>` pipeline usage in the Shopping sample.
+- [Patterns](../../samples/docs/patterns.md) — aggregate-oriented service patterns, domain event flow, and mutation-state tracking.
+
diff --git a/src/CoreEx.DomainDriven/Aggregate.cs b/src/CoreEx.DomainDriven/Aggregate.cs
new file mode 100644
index 00000000..92827e45
--- /dev/null
+++ b/src/CoreEx.DomainDriven/Aggregate.cs
@@ -0,0 +1,43 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Provides the typed <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven</see> aggregate functionality.
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="Aggregate{TId, TSelf}"/> <see cref="Type"/> itself.</typeparam>
+/// <param name="id">The identifier.</param>
+/// <remarks>An aggregate is ostensibly an entity with additional <see cref="Events"/> support as enabled by the <see cref="IAggregateRoot"/>. The events are typically used for <i>integration</i> purposes to inform other systems of 
+/// changes that have occurred to/within the aggregate root. The events are not to be confused with <i>domain</i> events; which are not natively supported (this is by design).
+/// <para>The <see cref="Events"/> collection is a temporary storage for events that have been raised during the lifetime of the aggregate; these would then need to be forwarded (by the implementor) to the appropriate <see cref="Events.Publishing.IEventQueue">event handlers</see> for processing.</para> 
+/// <para>It is expected that the implementor will adhere to the principles of domain-driven design and only expose read-only properties, and enable modification through methods, ensuring the invariant nature of the aggregate.</para></remarks>
+public class Aggregate<TId, TSelf>(TId id) : Entity<TId, TSelf>(id), IAggregateRoot where TSelf : Aggregate<TId, TSelf>
+{
+    private readonly ICollection<EventData> _events = [];
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public IReadOnlyCollection<EventData> Events => (IReadOnlyCollection<EventData>)_events;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public bool HasEvents => _events.Count > 0;
+
+    /// <summary>
+    /// Adds the specified <see cref="EventData"/> to the aggregate.
+    /// </summary>
+    /// <param name="eventData">The <see cref="EventData"/>.</param>
+    protected TSelf AddEvent(EventData eventData)
+    {
+        _events.Add(eventData);
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Clears all events from the aggregate.
+    /// </summary>
+    protected TSelf ClearEvents()
+    {
+        _events.Clear();
+        return (TSelf)this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/CoreEx.DomainDriven.csproj b/src/CoreEx.DomainDriven/CoreEx.DomainDriven.csproj
new file mode 100644
index 00000000..de4cb7b2
--- /dev/null
+++ b/src/CoreEx.DomainDriven/CoreEx.DomainDriven.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx .NET Domain-Driven extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data domain-driven ddd entity value-object aggregate aggregate-root events</PackageTags>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\CoreEx.Events\CoreEx.Events.csproj" />
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.DomainDriven/DomainDrivenExtensions.cs b/src/CoreEx.DomainDriven/DomainDrivenExtensions.cs
new file mode 100644
index 00000000..6faf00d2
--- /dev/null
+++ b/src/CoreEx.DomainDriven/DomainDrivenExtensions.cs
@@ -0,0 +1,40 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Provides standard extension methods for domain-driven design (DDD) related functionality.
+/// </summary>
+public static class DomainDrivenExtensions
+{
+    extension(PersistenceState persistenceState)
+    {
+        /// <summary>
+        /// Indicates whether the <paramref name="persistenceState"/> is <see cref="PersistenceState.New"/>.
+        /// </summary>
+        public bool IsNew => persistenceState == PersistenceState.New;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="persistenceState"/> is <see cref="PersistenceState.NotModified"/>.
+        /// </summary>
+        public bool IsNotModified => persistenceState == PersistenceState.NotModified;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="persistenceState"/> is <see cref="PersistenceState.Modified"/>.
+        /// </summary>
+        public bool IsModified => persistenceState == PersistenceState.Modified;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="persistenceState"/> is <see cref="PersistenceState.Removed"/>.
+        /// </summary>
+        public bool IsRemoved => persistenceState == PersistenceState.Removed;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="persistenceState"/> is <i>not</i> <see cref="PersistenceState.Removed"/>.
+        /// </summary>
+        public bool IsNotRemoved => persistenceState != PersistenceState.Removed;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="persistenceState"/> is <see cref="PersistenceState.New"/> or <see cref="PersistenceState.Modified"/>.
+        /// </summary>
+        public bool IsNewOrModified => persistenceState == PersistenceState.New || persistenceState == PersistenceState.Modified;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/Entity.cs b/src/CoreEx.DomainDriven/Entity.cs
new file mode 100644
index 00000000..6ee16c26
--- /dev/null
+++ b/src/CoreEx.DomainDriven/Entity.cs
@@ -0,0 +1,110 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Provides the typed <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven</see> entity functionality.
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="Entity{TId, TSelf}"/> <see cref="Type"/> itself.</typeparam>
+/// <remarks>As stated by the <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven design</see> literature, an entity is identified by its identity, not its attributes. Therefore, the underlying
+/// <see cref="Equals(CoreEx.DomainDriven.Entity{TId, TSelf}?)"/> only considers the <see cref="Id"/> value.
+/// <para>It is expected that the implementor will adhere to the principles of domain-driven design and only expose read-only properties, and enable modification through methods, ensuring the invariant nature of the entity.</para></remarks>
+/// <param name="id">The identifier.</param>
+public abstract class Entity<TId, TSelf>(TId id) : EntityBase, IEntity, IReadOnlyIdentifier<TId>, IEquatable<Entity<TId, TSelf>> where TSelf : Entity<TId, TSelf>
+{
+    /// <inheritdoc/>
+    public TId Id { get; } = id;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    object? IIdentifierCore.Id => Id;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    Type IIdentifierCore.IdType => typeof(TId);
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public override CompositeKey EntityKey => CompositeKey.Create(Id);
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="PersistenceState"/>.
+    /// </summary>
+    /// <param name="state">The new <see cref="DomainDriven.PersistenceState"/>.</param>
+    /// <remarks>This method does not check <see cref="EntityBase.IsReadOnly"/> by design as this is considered independent to.</remarks>
+    protected new TSelf SetPersistenceState(PersistenceState state)
+    {
+        base.SetPersistenceState(state);
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="PersistenceState"/> to <see cref="PersistenceState.New"/>.
+    /// </summary>
+    /// <remarks>This method does not check <see cref="EntityBase.IsReadOnly"/> by design as this is considered independent to.</remarks>
+    protected TSelf AsNew() => SetPersistenceState(PersistenceState.New);
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="PersistenceState"/> to <see cref="PersistenceState.NotModified"/>.
+    /// </summary>
+    /// <remarks>This method does not check <see cref="EntityBase.IsReadOnly"/> by design as this is considered independent to.</remarks>
+    protected TSelf AsNotModified() => SetPersistenceState(PersistenceState.NotModified);
+
+    /// <summary>
+    /// Makes the entity read-only.
+    /// </summary>
+    /// <remarks>See <see cref="EntityBase.IsReadOnly"/>.</remarks>
+    protected new TSelf MakeReadOnly()
+    {
+        base.MakeReadOnly();
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="ChangeLog"/>.
+    /// </summary>
+    /// <param name="changeLog">The <see cref="Entities.ChangeLog"/>.</param>
+    /// <remarks>Bypasses <see cref="EntityBase.IsReadOnly"/> checking and will not result in an <see cref="EntityBase.PersistenceState"/> change by design; intended to enable setting during hydration from a data source.</remarks>
+    protected new TSelf SetChangeLog(ChangeLog? changeLog)
+    {
+        base.SetChangeLog(changeLog);
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="ETag"/>.
+    /// </summary>
+    /// <param name="eTag">The entity tag.</param>
+    /// <remarks>Bypasses <see cref="EntityBase.IsReadOnly"/> checking and will not result in an <see cref="EntityBase.PersistenceState"/> change by design; intended to enable setting during hydration from a data source.</remarks>
+    protected new TSelf SetETag(string? eTag)
+    {
+        base.SetETag(eTag);
+        return (TSelf)this;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Uses <see cref="Entities.CompositeKeyComparer.Default"/> for equality comparison leveraging the <see cref="Id"/> value (see underlying <see cref="IEntityKey.EntityKey"/>). As stated by the
+    /// <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven design</see> literature, an entity is identified by its identity, not its attributes.</remarks>
+    public bool Equals(Entity<TId, TSelf>? other) => ReferenceEquals(this, other) || Entities.CompositeKeyComparer.Default.Equals(this, other);
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj) => ReferenceEquals(this, obj) || Entities.CompositeKeyComparer.Default.Equals(this, obj);
+
+    /// <inheritdoc/>
+    public override int GetHashCode() => Entities.CompositeKeyComparer.Default.GetHashCode(this);
+
+    /// <summary>
+    /// Determines whether two <see cref="Entity{TId, TSelf}"/> instances are equal.
+    /// </summary>
+    /// <param name="a">The first entity to compare.</param>
+    /// <param name="b">The second entity to compare.</param>
+    /// <returns><see langword="true"/> where <see cref="Equals(Entity{TId, TSelf}?)"/>; otherwise, <see langword="false"/>.</returns>
+    public static bool operator ==(Entity<TId, TSelf>? a, Entity<TId, TSelf>? b) => object.Equals(a, null) ? object.Equals(b, null) : a.Equals(b);
+
+    /// <summary>
+    /// Determines whether two <see cref="Entity{TId, TSelf}"/> instances are not equal.
+    /// </summary>
+    /// <param name="a">The first entity to compare.</param>
+    /// <param name="b">The second entity to compare.</param>
+    /// <returns><see langword="true"/> where not <see cref="Equals(Entity{TId, TSelf}?)"/>; otherwise, <see langword="false"/>.</returns>
+    public static bool operator !=(Entity<TId, TSelf>? a, Entity<TId, TSelf>? b) => !(a == b);
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/EntityBase.cs b/src/CoreEx.DomainDriven/EntityBase.cs
new file mode 100644
index 00000000..2256713c
--- /dev/null
+++ b/src/CoreEx.DomainDriven/EntityBase.cs
@@ -0,0 +1,289 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Provides the base <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven</see> entity functionality.
+/// </summary>
+public abstract class EntityBase : IEntity
+{
+    /// <summary>
+    /// Gets the read-only error message.
+    /// </summary>
+    public const string ReadOnlyErrorMessage = "The operation is not valid due to the current state being read-only.";
+
+    /// <inheritdoc/>
+    object? IIdentifierCore.Id => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public abstract CompositeKey EntityKey { get; }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    Type IIdentifierCore.IdType => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    bool IIdentifierCore.IsIdReadOnly => true;
+
+    /// <inheritdoc/>
+    void IIdentifierCore.SetIdentifier(object? id) => throw new InvalidOperationException("Identifier is read-only.");
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public bool IsReadOnly { get; private set; }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public PersistenceState PersistenceState { get; private set; }
+
+    /// <summary>
+    /// Gets the <see cref="ChangeLog"/>.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; protected set; }
+
+    /// <summary>
+    /// Gets the entity tag.
+    /// </summary>
+    public string? ETag { get; protected set; }
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="PersistenceState"/>.
+    /// </summary>
+    /// <param name="state">The new <see cref="DomainDriven.PersistenceState"/>.</param>
+    /// <remarks>This method does not check <see cref="IsReadOnly"/> by design as this is considered independent to.</remarks>
+    protected void SetPersistenceState(PersistenceState state)
+    {
+        // Nothing doing!
+        if (state == PersistenceState)
+            return;
+
+        // Validate state transition.
+        state.ThrowWhen(state => state == PersistenceState.Unknown, $"The {nameof(PersistenceState)} cannot be set to '{PersistenceState.Unknown}'.");
+        state.ThrowWhen(state => state == PersistenceState.NotModified && PersistenceState != PersistenceState.Unknown, $"The {nameof(PersistenceState)} can only be set to '{PersistenceState.NotModified}' from '{PersistenceState.Unknown}' state.");
+
+        // Transition to the new state.
+        PersistenceState = state;
+    }
+
+    /// <summary>
+    /// Encapsulates modification to the entity.
+    /// </summary>
+    /// <param name="action">The action that performs the entity modification.</param>
+    /// <remarks>Wraps the invocation of the <paramref name="action"/> by performing the following:
+    ///  <list type="bullet">
+    ///   <item><see cref="CheckCanMutate"/>.</item>
+    ///   <item><see cref="CheckReadOnly"/>.</item>
+    ///   <item>Invokes the <paramref name="action"/>.</item>
+    ///   <item>Sets to <see cref="PersistenceState.Modified"/> (where <see cref="PersistenceState.NotModified"/>).</item>
+    ///   <item><see cref="OnMutate"/>.</item>
+    ///   <item>Raises <see cref="Mutated"/> event.</item>
+    ///  </list>
+    /// </remarks>
+    protected void Modify(Action? action = null)
+    {
+        CheckCanMutate();
+        CheckReadOnly();
+
+        action?.Invoke();
+
+        if (PersistenceState.IsNotModified)
+            SetPersistenceState(PersistenceState.Modified);
+
+        OnMutate();
+        Mutated?.Invoke(this, EventArgs.Empty);
+    }
+
+    /// <summary>
+    /// Encapsulates modification to the entity with a corresponding result.
+    /// </summary>
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="function">The function that performs the entity modification.</param>
+    /// <returns>The resulting value.</returns>
+    /// <remarks>Wraps the invocation of the <paramref name="function"/> by performing the following:
+    ///  <list type="bullet">
+    ///   <item><see cref="CheckCanMutate"/>.</item>
+    ///   <item><see cref="CheckReadOnly"/>.</item>
+    ///   <item>Invokes the <paramref name="function"/>.</item>
+    ///   <item>Sets to <see cref="PersistenceState.Modified"/> (where <see cref="PersistenceState.NotModified"/>).</item>
+    ///   <item><see cref="OnMutate"/>.</item>
+    ///   <item>Raises <see cref="Mutated"/> event.</item>
+    ///  </list>
+    /// </remarks>
+    protected TResult Modify<TResult>(Func<TResult> function)
+    {
+        CheckCanMutate();
+        CheckReadOnly();
+
+        var result = function.ThrowIfNull()();
+
+        if (PersistenceState.IsNotModified)
+            SetPersistenceState(PersistenceState.Modified);
+
+        OnMutate();
+        Mutated?.Invoke(this, EventArgs.Empty);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Encapsulates modification to the entity, finally setting to read-only.
+    /// </summary>
+    /// <param name="action">The optional action that performs the entity modification.</param>
+    /// <remarks>Wraps the invocation of the <paramref name="action"/> by performing the following:
+    ///  <list type="bullet">
+    ///   <item><see cref="CheckCanMutate"/>.</item>
+    ///   <item><see cref="CheckReadOnly"/>.</item>
+    ///   <item>Invokes the <paramref name="action"/>.</item>
+    ///   <item>Sets to <see cref="PersistenceState.Modified"/> (where <see cref="PersistenceState.NotModified"/>).</item>
+    ///   <item><see cref="OnMutate"/>.</item>
+    ///   <item>Raises <see cref="Mutated"/> event.</item>
+    ///   <item><see cref="MakeReadOnly"/>.</item>
+    ///  </list>
+    /// </remarks>
+    protected void ModifyAndMakeReadOnly(Action? action = null)
+    {
+        Modify(action);
+        MakeReadOnly();
+    }
+
+    /// <summary>
+    /// Encapsulates modification to the entity with a corresponding result, finally setting to read-only.
+    /// </summary>
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="function">The function that performs the entity modification.</param>
+    /// <returns>The resulting value.</returns>
+    /// <remarks>Wraps the invocation of the <paramref name="function"/> by performing the following:
+    ///  <list type="bullet">
+    ///   <item><see cref="CheckCanMutate"/>.</item>
+    ///   <item><see cref="CheckReadOnly"/>.</item>
+    ///   <item>Invokes the <paramref name="function"/>.</item>
+    ///   <item>Sets to <see cref="PersistenceState.Modified"/> (where <see cref="PersistenceState.NotModified"/>).</item>
+    ///   <item><see cref="OnMutate"/>.</item>
+    ///   <item>Raises <see cref="Mutated"/> event.</item>
+    ///   <item><see cref="MakeReadOnly"/>.</item>
+    ///  </list>
+    /// </remarks>
+    protected TResult ModifyAndMakeReadOnly<TResult>(Func<TResult> function)
+    {
+        var result = Modify(function);
+        MakeReadOnly();
+        return result;
+    }
+
+    /// <summary>
+    /// Encapsulates marking for removal (deletion) of the entity, finally setting to read-only.
+    /// </summary>
+    /// <param name="action">The optional action that performs any entity modification.</param>
+    /// <remarks>Wraps the invocation of the <paramref name="action"/> by performing the following:
+    ///  <list type="bullet">
+    ///   <item><see cref="CheckCanMutate"/>.</item>
+    ///   <item><see cref="CheckReadOnly"/>.</item>
+    ///   <item>Invokes the optional <paramref name="action"/>.</item>
+    ///   <item>Sets to <see cref="PersistenceState.Removed"/>.</item>
+    ///   <item><see cref="OnMutate"/>.</item>
+    ///   <item>Raises <see cref="Mutated"/> event.</item>
+    ///   <item><see cref="MakeReadOnly"/>.</item>
+    ///  </list>
+    /// </remarks>
+    protected void Remove(Action? action = null)
+    {
+        CheckCanMutate();
+        CheckReadOnly();
+
+        action?.Invoke();
+
+        SetPersistenceState(PersistenceState.Removed);
+
+        OnMutate();
+        MakeReadOnly();
+        Mutated?.Invoke(this, EventArgs.Empty);
+    }
+
+    /// <summary>
+    /// Encapsulates marking for removal (deletion) of the entity, finally setting to read-only.
+    /// </summary>
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="function">The function that performs any entity modification.</param>
+    /// <returns>The resulting value.</returns>
+    /// <remarks>Wraps the invocation of the <paramref name="function"/> by performing the following:
+    ///  <list type="bullet">
+    ///   <item><see cref="CheckCanMutate"/>.</item>
+    ///   <item><see cref="CheckReadOnly"/>.</item>
+    ///   <item>Invokes the <paramref name="function"/>.</item>
+    ///   <item>Sets to <see cref="PersistenceState.Removed"/>.</item>
+    ///   <item><see cref="OnMutate"/>.</item>
+    ///   <item>Raises <see cref="Mutated"/> event.</item>
+    ///   <item><see cref="MakeReadOnly"/>.</item>
+    ///  </list>
+    /// </remarks>
+    protected TResult Remove<TResult>(Func<TResult> function)
+    {
+        CheckCanMutate();
+        CheckReadOnly();
+
+        var result = function.ThrowIfNull()();
+
+        SetPersistenceState(PersistenceState.Removed);
+
+        OnMutate();
+        Mutated?.Invoke(this, EventArgs.Empty);
+        MakeReadOnly();
+
+        return result;
+    }
+
+    /// <summary>
+    /// Makes the entity read-only.
+    /// </summary>
+    /// <remarks>See <see cref="IsReadOnly"/>.</remarks>
+    protected void MakeReadOnly() => IsReadOnly = true;
+
+    /// <summary>
+    /// Checks whether the entity <see cref="IsReadOnly"/> and if so throws an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    protected void CheckReadOnly()
+    {
+        if (IsReadOnly)
+            throw new InvalidOperationException(ReadOnlyErrorMessage);
+    }
+
+    /// <summary>
+    /// Checkes whether the entity can be mutated by invoking <see cref="OnCheckCanMutate"/> and throwing on error.
+    /// </summary>
+    protected void CheckCanMutate() => OnCheckCanMutate().ThrowOnError();
+
+    /// <summary>
+    /// Provides an opportunity to perform pre-checks prior to mutation of the entity; i.e. within the <see cref="Modify(Action?)"/> and <see cref="Remove(Action?)"/> methods.
+    /// </summary>
+    /// <returns>A <see cref="Result"/> indicating the outcome of the pre-checks.</returns>
+    /// <remarks>This is invoked by <see cref="CheckCanMutate"/>.</remarks>
+    protected virtual Result OnCheckCanMutate() => Result.Success;
+
+    /// <summary>
+    /// Provides an opportunity to perform additional actions after mutation of the entity; i.e. within the <see cref="Modify(Action?)"/> and <see cref="Remove(Action?)"/> methods.
+    /// </summary>
+    /// <remarks>This is invoked by the <see cref="Modify(Action?)"/> and <see cref="Remove(Action?)"/> methods.</remarks>
+    protected virtual void OnMutate() { }
+
+    /// <summary>
+    /// Occurs when the entity is mutated.
+    /// </summary>
+    public event EventHandler? Mutated;
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="ChangeLog"/>.
+    /// </summary>
+    /// <param name="changeLog">The <see cref="Entities.ChangeLog"/>.</param>
+    /// <remarks>Bypasses <see cref="IsReadOnly"/> checking and will not result in an <see cref="PersistenceState"/> change by design; intended to enable setting during hydration from a data source.</remarks>
+    public void SetChangeLog(ChangeLog? changeLog) => ChangeLog = changeLog;
+
+    /// <summary>
+    /// Sets (overrides) the <see cref="ETag"/>.
+    /// </summary>
+    /// <param name="eTag">The entity tag.</param>
+    /// <remarks>Bypasses <see cref="IsReadOnly"/> checking and will not result in an <see cref="PersistenceState"/> change by design; intended to enable setting during hydration from a data source.</remarks>
+    public void SetETag(string? eTag) => ETag = eTag;
+
+    /// <inheritdoc/>
+    public override string? ToString() => ((IEntityKey)this).EntityKey.ToString();
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/GlobalUsing.cs b/src/CoreEx.DomainDriven/GlobalUsing.cs
new file mode 100644
index 00000000..b5277973
--- /dev/null
+++ b/src/CoreEx.DomainDriven/GlobalUsing.cs
@@ -0,0 +1,5 @@
+global using CoreEx.Entities;
+global using CoreEx.Entities.Abstractions;
+global using CoreEx.Events;
+global using CoreEx.Results;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/IAggregateRoot.cs b/src/CoreEx.DomainDriven/IAggregateRoot.cs
new file mode 100644
index 00000000..7102dcfc
--- /dev/null
+++ b/src/CoreEx.DomainDriven/IAggregateRoot.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Enables the <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven</see> aggregate functionality.
+/// </summary>
+/// <remarks>An <see cref="IAggregateRoot"/> is an <see cref="IEntity"/> that acts as the root for a cluster of associated objects (entities and value objects). The aggregate supports related <i>integration</i> <see cref="Events"/>;
+/// however, the aggregate root does <i>not</i> support <i>domain</i> events (this is by design).</remarks>
+public interface IAggregateRoot : IEntity
+{
+    /// <summary>
+    ///    Gets a read-only collection of <see cref="EventData">events</see>.
+    /// </summary>
+    /// <remarks>Events are typically used for <i>integration</i> purposes to inform other systems of changes that have occurred to/within the aggregate root. These events are not to be confused with <i>domain</i> events; which are not natively supported (this is by design).</remarks>
+    [JsonIgnore]
+    IReadOnlyCollection<EventData> Events { get; }
+
+    /// <summary>
+    /// Indicates whether the aggregate has any events.
+    /// </summary>
+    [JsonIgnore]
+    bool HasEvents { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/IEntity.cs b/src/CoreEx.DomainDriven/IEntity.cs
new file mode 100644
index 00000000..50bca7c4
--- /dev/null
+++ b/src/CoreEx.DomainDriven/IEntity.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Enables the core <see href="https://en.wikipedia.org/wiki/Domain-driven_design">domain-driven</see> entity functionality.
+/// </summary>
+public interface IEntity : IReadOnlyIdentifier, IReadOnlyChangeLog, IReadOnlyETag
+{
+    /// <summary>
+    /// Gets the internal persistence state of the entity.
+    /// </summary>
+    [JsonIgnore]
+    PersistenceState PersistenceState { get; }
+
+    /// <summary>
+    /// Indicates whether the entity is read-only.
+    /// </summary>
+    [JsonIgnore]
+    bool IsReadOnly { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/PersistenceState.cs b/src/CoreEx.DomainDriven/PersistenceState.cs
new file mode 100644
index 00000000..daf32ce2
--- /dev/null
+++ b/src/CoreEx.DomainDriven/PersistenceState.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.DomainDriven;
+
+/// <summary>
+/// Represents the internal persistence state of an entity.
+/// </summary>
+public enum PersistenceState
+{
+    /// <summary>
+    /// Unknown, i.e. not determined.
+    /// </summary>
+    Unknown,
+
+    /// <summary>
+    /// New entity, i.e. not yet persisted.
+    /// </summary>
+    New,
+
+    /// <summary>
+    /// Not modified, i.e. unchanged since last persisted.
+    /// </summary>
+    NotModified,
+
+    /// <summary>
+    /// Modified, i.e. changed since last persisted.
+    /// </summary>
+    Modified,
+
+    /// <summary>
+    /// Removed, i.e. marked for deletion; will be deleted upon next persistence.
+    /// </summary>
+    Removed
+}
\ No newline at end of file
diff --git a/src/CoreEx.DomainDriven/README.md b/src/CoreEx.DomainDriven/README.md
new file mode 100644
index 00000000..0f145e24
--- /dev/null
+++ b/src/CoreEx.DomainDriven/README.md
@@ -0,0 +1,52 @@
+# CoreEx.DomainDriven
+
+> Provides the foundational Domain-Driven Design (DDD) building blocks for CoreEx: typed entities, aggregate roots with integration-event support, persistence-state tracking, and mutation-guard helpers.
+
+## Overview
+
+`CoreEx.DomainDriven` implements the core DDD concepts referenced throughout the CoreEx framework. It supplies base classes and interfaces for **entities** and **aggregate roots** that are identity-based, change-tracked, and mutation-guarded, integrating cleanly with CoreEx contracts (`IIdentifier`, `IChangeLog`, `IETag`) and the broader `Result<T>` pipeline.
+
+The package intentionally stays minimal: it does not dictate a persistence strategy, an ORM, or an event bus. Instead it establishes the behavioural invariants — read-only enforcement, persistence state transitions, event accumulation — that the application and infrastructure layers rely on. Higher-level packages such as `CoreEx.EntityFrameworkCore` and `CoreEx.Database` consume these contracts when mapping and persisting domain objects.
+
+## Key capabilities
+
+- 🆔 **Typed entity base**: `Entity<TId, TSelf>` enforces identity-based equality (`Equals` considers `Id` only) and carries a fluent self-typed API for state manipulation.
+- 🔄 **Persistence state machine**: `PersistenceState` (`Unknown → New / NotModified → Modified → Removed`) with extension helpers (`IsNew`, `IsModified`, `IsNewOrModified`, `IsRemoved`, …) and validated one-way transitions that prevent illegal state changes.
+- 🛡 **Mutation guards**: `Modify(action)`, `Remove(action)`, `ModifyAndMakeReadOnly`, and `ModifyAndMakeReadOnly<TResult>` wrappers enforce `CheckReadOnly` and `OnCheckCanMutate` before any state change, then advance `PersistenceState` automatically and fire the `Mutated` event.
+- 🔒 **Read-only enforcement**: `MakeReadOnly()` / `IsReadOnly` locks an entity after hydration or after terminal mutations; all `Modify`/`Remove` paths throw `InvalidOperationException` when violated.
+- 📢 **Aggregate root with integration events**: `Aggregate<TId, TSelf>` adds `AddEvent(EventData)` / `ClearEvents()` and the `Events` / `HasEvents` members for transient integration-event accumulation inside a unit-of-work scope.
+- 🔧 **Override hooks**: `OnCheckCanMutate()` returns a `Result` for pre-mutation business-rule validation; `OnMutate()` is a post-mutation extension point; both are called inside every `Modify`/`Remove` wrapper.
+- 💧 **Hydration helpers**: `SetChangeLog`, `SetETag`, and `SetPersistenceState` bypass read-only and state-change logic by design, allowing infrastructure layers to rehydrate an entity from persistence without triggering mutation semantics.
+- 🔑 **CompositeKey support**: `EntityKey` exposes the entity identity as a `CompositeKey` for infrastructure layers that need a key independent of the typed `Id`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| [`IEntity`](./IEntity.cs) | Core DDD entity contract: `PersistenceState`, `IsReadOnly`, `IReadOnlyIdentifier`, `IReadOnlyChangeLog`, `IReadOnlyETag`. |
+| [`IAggregateRoot`](./IAggregateRoot.cs) | Extends `IEntity` with `Events` (read-only collection of `EventData`) and `HasEvents`; integration events only — domain events are not supported by design. |
+| _[`EntityBase`](./EntityBase.cs)_ | Abstract base implementing `IEntity`; provides the full mutation-guard (`Modify`, `Remove`), read-only, state-machine, `SetChangeLog`/`SetETag` hydration, `Mutated` event, and `OnCheckCanMutate`/`OnMutate` hooks. |
+| _[`Entity<TId, TSelf>`](./Entity.cs)_ | Abstract typed, self-referential entity (`TSelf` pattern) with identity-based equality; re-exposes `SetPersistenceState`, `AsNew`, `AsNotModified`, `MakeReadOnly`, `SetChangeLog`, and `SetETag` as fluent `TSelf`-returning methods. |
+| **[`Aggregate<TId, TSelf>`](./Aggregate.cs)** | Extends `Entity<TId, TSelf>` with `AddEvent(EventData)` / `ClearEvents()` for integration-event accumulation within the aggregate lifetime. |
+| **[`PersistenceState`](./PersistenceState.cs)** | Enum: `Unknown`, `New`, `NotModified`, `Modified`, `Removed`; governs the entity lifecycle from creation through persistence to deletion. |
+| **[`DomainDrivenExtensions`](./DomainDrivenExtensions.cs)** | Extension methods on `PersistenceState`: `IsNew`, `IsNotModified`, `IsModified`, `IsRemoved`, `IsNotRemoved`, `IsNewOrModified`. |
+
+## Domain Events — Intentionally Not Supported
+
+CoreEx deliberately does not provide a native domain-event mechanism (e.g. MediatR `INotification` dispatch or an in-process event bus). This is a conscious architectural decision:
+
+- **Chatty emission** — fine-grained domain events (`PropertyChanged`, `ItemAdded`, etc.) generate high volumes of events that produce implicit, hard-to-trace side-effects throughout the application layer.
+- **Non-explicit side-effects** — handler chains driven by in-process events obscure control flow, making it difficult to reason about what happens as a result of a single aggregate mutation.
+- **Integration events are sufficient** — coarse-grained integration events via `IUnitOfWork.Events` and the transactional outbox communicate meaningful state changes to other systems in an explicit, auditable, and transactional way.
+
+A developer can extend CoreEx with a domain-event mechanism if a genuine use case exists — for example, by raising events from aggregate mutations and dispatching them via MediatR after the transaction commits. This is an opt-in extension, not a framework default.
+
+## Related namespaces
+
+- **[`CoreEx`](../CoreEx/README.md)** - Provides `IIdentifier`, `IChangeLog`, `IETag`, `CompositeKey`, `EventData`, and `Result<T>` consumed by the DDD types.
+- **[`CoreEx.EntityFrameworkCore`](../CoreEx.EntityFrameworkCore/README.md)** - Persists `Entity<TId, TSelf>` and `Aggregate<TId, TSelf>` via `EfDbModel<TModel>`; uses `PersistenceState` to determine insert/update/delete operations.
+- **[`CoreEx.Validation`](../CoreEx.Validation/README.md)** - Validates entity state; `OnCheckCanMutate` can delegate to a CoreEx validator for pre-mutation rule checks.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/AGENTS.md b/src/CoreEx.EntityFrameworkCore/AGENTS.md
new file mode 100644
index 00000000..b067c8ca
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/AGENTS.md
@@ -0,0 +1,81 @@
+# CoreEx.EntityFrameworkCore — AI Usage Guide
+
+Wraps EF Core's `DbContext` with the CoreEx data conventions: `ETag`/concurrency checking, multi-tenancy, logical delete, change-log stamping, paging, and `QueryArgsConfig` dynamic filter/orderby.
+
+## Registration
+
+```csharp
+// Program.cs
+builder.Services
+    .AddDbContext<MyDbContext>(o => o.UseNpgsql(connectionString))
+    .AddEfDb<MyEfDb>();               // registers EfDb<MyDbContext> and bridges IDatabase
+```
+
+## EfDb — Entry Point
+
+Inject `EfDb<TDbContext>` (or your `IEfDb<TDbContext>`) into repositories. Access typed CRUD via `Model<TModel>()`.
+
+```csharp
+[ScopedService<IProductRepository>]
+public class ProductRepository(EfDb<MyDbContext> efDb) : IProductRepository
+{
+    private readonly EfDbModel<ProductModel> _model = efDb.Model<ProductModel>();
+
+    public Task<Product?> GetAsync(Guid id, CancellationToken ct = default) =>
+        _model.GetAsync(new EfDbArgs(OperationType.Get), id, ProductMapper.Default.MapToEntity, ct);
+
+    public Task<Product> CreateAsync(Product product, CancellationToken ct = default) =>
+        _model.CreateAsync(new EfDbArgs(OperationType.Create), product, ProductMapper.Default, ct);
+}
+```
+
+## Mapped Model (Separate EF Model Type)
+
+Use `EfDbMappedModel<TValue, TModel, TMapper>` when the domain entity type differs from the EF persistence model type.
+
+```csharp
+private readonly EfDbMappedModel<Order, OrderModel, OrderMapper> _model =
+    efDb.Model<Order, OrderModel, OrderMapper>();
+```
+
+## Dynamic Query with Paging
+
+Use `Query(args)` for paged, filtered list endpoints. Combine with `EfDbExtensions.ToItemsResultAsync`.
+
+```csharp
+private static readonly QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
+    .WithFilter(f => f.AddField<string>(nameof(ProductModel.Status)))
+    .WithOrderBy(o => o.AddField(nameof(ProductModel.Name)).WithDefault("Name"));
+
+public Task<ItemsResult<Product>> GetAllAsync(QueryArgs? args, PagingArgs? paging,
+    CancellationToken ct = default)
+    => _model.Query(new EfDbArgs(args ?? new QueryArgs(), _queryConfig, paging))
+             .ToMappedItemsResultAsync(ProductMapper.Default.MapToEntity, ct);
+```
+
+## ValueConverter Bridge
+
+Use `ValueConverterBridge<TModel, TProvider>` in `OnModelCreating` to reuse CoreEx `IConverter<T, U>` instances as EF value converters.
+
+```csharp
+protected override void OnModelCreating(ModelBuilder builder)
+{
+    builder.Entity<ProductModel>()
+           .Property(p => p.Status)
+           .HasConversion(new ValueConverterBridge<StatusEnum, string>(new StatusEnumConverter()));
+}
+```
+
+## Do Not
+
+- Do not inject `DbContext` directly into application services — use the repository behind an interface.
+- Do not use EF `DbContext.Add`/`Update`/`Remove` directly — use `EfDbModel` methods so CoreEx cross-cutting (ETag, change-log, logical delete) runs correctly.
+- Do not use AutoMapper — use explicit `IBiDirectionMapper<TValue, TModel>` implementations.
+
+## Further Reading
+
+- [README](./README.md) — full `EfDb`, `EfDbModel`, `EfDbArgs`, `EfDbOptions`, and extension-method API reference.
+- [CoreEx.Data](../CoreEx.Data/README.md) — `IUnitOfWork`, `QueryArgsConfig`, and `DataResult`.
+- [CoreEx.Database](../CoreEx.Database/README.md) — `IDatabase` bridged into `EfDb<TDbContext>` for transaction sharing.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — EF Core repository implementation, `IBiDirectionMapper` usage, `DbContext` configuration, and dynamic query wiring in real sample code.
+- [Patterns](../../samples/docs/patterns.md) — repository patterns, explicit mapping conventions, and paged query construction.
diff --git a/src/CoreEx.EntityFrameworkCore/Converters/JsonElementStringEfConverter.cs b/src/CoreEx.EntityFrameworkCore/Converters/JsonElementStringEfConverter.cs
new file mode 100644
index 00000000..0538c628
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/Converters/JsonElementStringEfConverter.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.EntityFrameworkCore.Converters;
+
+/// <summary>
+/// Provides a <see cref="JsonElement"/> and <see cref="string"/> entity-framework (EF) <see cref="ValueConverter{TModel, TProvider}"/>.
+/// </summary>
+public sealed class JsonElementStringEfConverter() : ValueConverterBridge<JsonElement?, string?>(Mapping.Converters.JsonElementStringConverter.Default)
+{
+    /// <summary>
+    /// Gets the default <see cref="JsonElementStringEfConverter"/>.
+    /// </summary>
+    public static JsonElementStringEfConverter Default { get; } = new();
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/Converters/README.md b/src/CoreEx.EntityFrameworkCore/Converters/README.md
new file mode 100644
index 00000000..daa5e814
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/Converters/README.md
@@ -0,0 +1,42 @@
+# CoreEx.EntityFrameworkCore.Converters
+
+> Provides EF Core `ValueConverter` bridges that allow CoreEx `IConverter<TModel, TProvider>` implementations to be used directly in EF model configuration, including a built-in `JsonElement` ↔ `string` converter.
+
+## Overview
+
+EF Core's `ValueConverter<TModel, TProvider>` type is the standard extension point for translating .NET property values to and from database column values. The `Converters` namespace wires CoreEx's own `IConverter<TModel, TProvider>` abstraction into that EF pipeline so that any CoreEx converter can be registered in `OnModelCreating` without duplication.
+
+`ValueConverterBridge<TModel, TProvider>` inherits directly from EF Core's `ValueConverter<TModel, TProvider>` and delegates its `ConvertToProvider`/`ConvertFromProvider` expressions to the supplied CoreEx converter. The static `ValueConverterBridge.Create<TModel, TProvider>(converter)` factory removes the need to name the generic type explicitly at the call site.
+
+`JsonElementStringEfConverter` is a ready-made specialization that serializes `JsonElement?` property values to `string?` columns using `JsonElementStringConverter.Default`, covering the common pattern of storing JSON fragments in a single text column.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ValueConverterBridge<TModel, TProvider>`](./ValueConverterBridgeT2.cs)** | EF Core `ValueConverter<TModel, TProvider>` that delegates to a CoreEx `IConverter<TModel, TProvider>`; use `ValueConverterBridge.Create(converter)` for concise construction. |
+| **[`ValueConverterBridge`](./ValueConverterBridge.cs)** | Static factory with two `Create<TModel, TProvider>` overloads — one accepting a typed `IConverter<TModel, TProvider>` and one accepting the non-generic `IConverter` base (validated at runtime). |
+| **[`JsonElementStringEfConverter`](./JsonElementStringEfConverter.cs)** | Pre-built `ValueConverterBridge<JsonElement?, string?>` using `JsonElementStringConverter.Default`; exposes a `Default` singleton for direct use in model configuration. |
+
+## Usage
+
+Register a CoreEx converter in `OnModelCreating`:
+
+```csharp
+modelBuilder.Entity<Order>()
+    .Property(o => o.Metadata)
+    .HasConversion(JsonElementStringEfConverter.Default);
+```
+
+Or wire any custom CoreEx converter:
+
+```csharp
+modelBuilder.Entity<Product>()
+    .Property(p => p.Status)
+    .HasConversion(ValueConverterBridge.Create(MyStatusConverter.Default));
+```
+
+## Related namespaces
+
+- **[`CoreEx.EntityFrameworkCore`](../README.md)** - Parent package; `ValueConverterBridge` types are applied during EF `OnModelCreating`.
+- **[`CoreEx.Mapping.Converters`](../../CoreEx/Mapping/README.md)** - `IConverter<TModel, TProvider>` is the CoreEx converter contract wrapped by `ValueConverterBridge`.
diff --git a/src/CoreEx.EntityFrameworkCore/Converters/ValueConverterBridge.cs b/src/CoreEx.EntityFrameworkCore/Converters/ValueConverterBridge.cs
new file mode 100644
index 00000000..f06af604
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/Converters/ValueConverterBridge.cs
@@ -0,0 +1,26 @@
+namespace CoreEx.EntityFrameworkCore.Converters;
+
+/// <summary>
+/// Provides <see cref="ValueConverterBridge{TModel, TProvider}"/> convenience methods.
+/// </summary>
+public static class ValueConverterBridge
+{
+    /// <summary>
+    /// Creates a new instance of the <see cref="ValueConverterBridge{TModel, TProvider}"/> class using the specified converter.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProvider">The provider <see cref="Type"/>.</typeparam>
+    /// <param name="converter">The <see cref="Mapping.Converters.IConverter{TModel, TProvider}"/>.</param>
+    /// <returns>The <see cref="ValueConverterBridge{TModel, TProvider}"/> instance.</returns>
+    public static ValueConverterBridge<TModel, TProvider> Create<TModel, TProvider>(Mapping.Converters.IConverter<TModel, TProvider> converter) => new(converter);
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="ValueConverterBridge{TModel, TProvider}"/> class using the specified converter.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProvider">The provider <see cref="Type"/>.</typeparam>
+    /// <param name="converter">The <see cref="Mapping.Converters.IConverter{TModel, TProvider}"/>.</param>
+    /// <returns>The <see cref="ValueConverterBridge{TModel, TProvider}"/> instance.</returns>
+    public static ValueConverterBridge<TModel, TProvider> Create<TModel, TProvider>(CoreEx.Mapping.Converters.IConverter converter)
+        => new(converter is Mapping.Converters.IConverter<TModel, TProvider> vc ? vc : throw new InvalidCastException("Invalid converter type."));
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/Converters/ValueConverterBridgeT2.cs b/src/CoreEx.EntityFrameworkCore/Converters/ValueConverterBridgeT2.cs
new file mode 100644
index 00000000..4fbbca3c
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/Converters/ValueConverterBridgeT2.cs
@@ -0,0 +1,11 @@
+namespace CoreEx.EntityFrameworkCore.Converters;
+
+/// <summary>
+/// Provides a <see cref="ValueConverter{TModel, TProvider}"/> implementation that uses the specified <see cref="Mapping.Converters.IConverter{TModel, TProvider}"/> bridging the conversion logic.
+/// </summary>
+/// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProvider">The provider <see cref="Type"/>.</typeparam>
+/// <param name="converter">The <see cref="Mapping.Converters.IConverter{TModel, TProvider}"/>.</param>
+public class ValueConverterBridge<TModel, TProvider>(Mapping.Converters.IConverter<TModel, TProvider> converter) : ValueConverter<TModel, TProvider>(
+    model => converter.ThrowIfNull().ConvertToDestination(model),
+    provider => converter.ThrowIfNull().ConvertToSource(provider)) { }
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj b/src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj
index f4385028..f074ecda 100644
--- a/src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj
+++ b/src/CoreEx.EntityFrameworkCore/CoreEx.EntityFrameworkCore.csproj
@@ -1,31 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>CoreEx.EntityFrameworkCore</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Entity Framework Core (EF) extras.</Title>
-    <Description>CoreEx .NET Entity Framework (EF) Core extras.</Description>
-    <PackageTags>coreex api db database sql sqlserver ado.net entityframework entityframeworkcore ef efcore</PackageTags>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <Title>CoreEx .NET Entity Framework (EF) Core extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data entity-framework ef efcore</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.36" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.1" />
-  </ItemGroup>
-
   <ItemGroup>
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\CoreEx.Data\CoreEx.Data.csproj" />
     <ProjectReference Include="..\CoreEx.Database\CoreEx.Database.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/CoreExEfDbExtensions.DependencyInjection.cs b/src/CoreEx.EntityFrameworkCore/CoreExEfDbExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..7f40a9ae
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/CoreExEfDbExtensions.DependencyInjection.cs
@@ -0,0 +1,17 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure - this is by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> extensions.
+/// </summary>
+public static partial class CoreExEfDbExtensions
+{
+    /// <summary>
+    /// Adds a <b>scoped</b> service for the <typeparamref name="TEfDb"/>.
+    /// </summary>
+    /// <typeparam name="TEfDb">The <see cref="IEfDb"/> <see cref="Type"/>.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddEfDb<TEfDb>(this IServiceCollection services) where TEfDb : class, IEfDb => services.ThrowIfNull().AddScoped<TEfDb>();
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDb.cs b/src/CoreEx.EntityFrameworkCore/EfDb.cs
index c7235af2..147d1da7 100644
--- a/src/CoreEx.EntityFrameworkCore/EfDb.cs
+++ b/src/CoreEx.EntityFrameworkCore/EfDb.cs
@@ -1,258 +1,76 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.EntityFrameworkCore;
 
-using CoreEx.Database;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.EntityFrameworkCore;
-
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Provides the extended <see cref="IDatabase"/>-based <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> capabilities.
+/// </summary>
+/// <typeparam name="TDbContext">The <see cref="DbContext"/> <see cref="Type"/>.</typeparam>
+public class EfDb<TDbContext> : IEfDb, IDisposable where TDbContext : DbContext, IEfDbContext
 {
+    private readonly TDbContext _dbContext;
+    private bool _disposed;
+
     /// <summary>
-    /// Provides the extended <b>Entity Framework</b> <see cref="IEfDbContext"/> functionality.
+    /// Initializes a new instance of the <see cref="EfDb{TDbContext}"/> class.
     /// </summary>
-    /// <typeparam name="TDbContext">The <see cref="DbContext"/> <see cref="Type"/>.</typeparam>
-    /// <remarks>Provides extended functionality to simply basic CRUD activities whilst also providing encapsuled <see cref="IMapper">mapping</see> between an entity and the underlying model to minimise tight-coupling to the 
-    /// underlying data source (and minimise the <see href="https://en.wikipedia.org/wiki/Object%E2%80%93relational_impedance_mismatch">object-relational impedence mismatch</see>.
-    /// <para>Additionally, extended functionality is performed where the entity implements any of the following:
-    ///   <list type="bullet">
-    ///     <item><see cref="IEntityKey"/> - Will use the <see cref="IEntityKey.EntityKey"/> as the underlying entity key.</item>
-    ///     <item><see cref="IChangeLog"/> - Will automatically update the corresponding properties depending on where performing a <see cref="CreateAsync{T, TModel}(EfDbArgs, T, CancellationToken)">Create</see> or an <see cref="UpdateAsync{T, TModel}(EfDbArgs, T, CancellationToken)">Update</see>.</item>
-    ///     <item><see cref="ITenantId"/> - Will automatically update the <see cref="ITenantId.TenantId"/> from the <see cref="ExecutionContext.TenantId"/> to ensure not overridden.</item>
-    ///     </list>
-    /// </para>
-    /// <para>Additionally, extended functionality is performed where the EF model implements any of the following:
-    ///   <list type="bullet">
-    ///     <item><see cref="ILogicallyDeleted"/> - <see cref="Query{T, TModel}">Query</see>, <see cref="GetAsync{T, TModel}(EfDbArgs, CompositeKey, CancellationToken)">Get</see> and <see cref="UpdateAsync{T, TModel}(EfDbArgs, T, CancellationToken)">Update</see> will automatically 
-    ///     filter out previously deleted items. On a <see cref="DeleteAsync{T, TModel}(EfDbArgs, CompositeKey, CancellationToken)">Delete</see> the <see cref="ILogicallyDeleted.IsDeleted"/> property will be automatically set and updated, 
-    ///     versus, performing a physical delete. Although the <see cref="Query{T, TModel}">Query</see> will automatically filter; it is also recommended to use the EF native filtering to
-    ///     achieve; for example: <c>entity.HasQueryFilter(v => v.IsDeleted != true);</c>.</item>
-    ///   </list>
-    /// </para>
-    /// </remarks>
     /// <param name="dbContext">The <see cref="DbContext"/>.</param>
-    /// <param name="mapper">The <see cref="IMapper"/>; defaults to <see cref="Mapping.Mapper.Empty"/>.</param>
-    /// <param name="invoker">Enables the <see cref="Invoker"/> to be overridden; defaults to <see cref="EfDbInvoker"/>.</param>
-    public class EfDb<TDbContext>(TDbContext dbContext, IMapper? mapper = null, EfDbInvoker? invoker = null) : IEfDb where TDbContext : DbContext, IEfDbContext
+    /// <param name="options">The optional <see cref="EfDbOptions"/> (typically a singleton service or statically declared).</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    public EfDb(TDbContext dbContext, EfDbOptions? options = null, ExecutionContext? executionContext = null)
     {
-        /// <inheritdoc/>
-        DbContext IEfDb.DbContext => DbContext;
-
-        /// <inheritdoc/>
-        public TDbContext DbContext { get; } = dbContext.ThrowIfNull(nameof(dbContext));
-
-        /// <inheritdoc/>
-        public EfDbInvoker Invoker { get; } = invoker ?? new EfDbInvoker();
-
-        /// <inheritdoc/>
-        public IDatabase Database => DbContext.BaseDatabase;
-
-        /// <inheritdoc/>
-        public IMapper Mapper { get; } = mapper.ThrowIfNull(nameof(mapper));
-
-        /// <inheritdoc/>
-        public EfDbArgs DbArgs { get; set; } = new EfDbArgs();
-
-        /// <inheritdoc/>
-        public EfDbQuery<TModel> Query<TModel>(EfDbArgs args, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where TModel : class, new() => new(this, args, query);
-
-        /// <inheritdoc/>
-        public EfDbQuery<T, TModel> Query<T, TModel>(EfDbArgs args, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, new() => new(this, args, query);
-
-        /// <inheritdoc/>
-        public async Task<T?> GetAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await GetWithResultInternalAsync<T, TModel>(args, key, nameof(GetAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <inheritdoc/>
-        public Task<Result<T?>> GetWithResultAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => GetWithResultInternalAsync<T, TModel>(args, key, nameof(GetWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Performs the get internal.
-        /// </summary>
-        private Task<Result<T?>> GetWithResultInternalAsync<T, TModel>(EfDbArgs args, CompositeKey key, string memberName, CancellationToken cancellationToken) where T : class, IEntityKey, new() where TModel : class, new()
-            => Result.GoAsync(() => GetWithResultInternalAsync<TModel>(args, key, memberName, cancellationToken))
-                .WhenAs(model => model is not null, model =>
-                {
-                    var val = Mapper.Map<T>(model, OperationTypes.Get);
-                    if (val is null)
-                        return Result<T?>.Fail(new InvalidOperationException("Mapping from the EF model must not result in a null value."));
-                    else
-                        return Result<T?>.Ok(val);
-                });
-
-        /// <inheritdoc/>
-        async Task<TModel?> IEfDb.GetAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken) where TModel : class
-            => (await GetWithResultInternalAsync<TModel>(args, key, nameof(GetAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <inheritdoc/>
-        Task<Result<TModel?>> IEfDb.GetWithResultAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken) where TModel : class
-            => GetWithResultInternalAsync<TModel>(args, key, nameof(GetWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Performs the get internal (model-only).
-        /// </summary>
-        internal async Task<Result<TModel?>> GetWithResultInternalAsync<TModel>(EfDbArgs args, CompositeKey key, string memberName, CancellationToken cancellationToken) where TModel : class, new() => await Invoker.InvokeAsync(this, key, async (_, key, ct) =>
-        {
-            var model = await DbContext.FindAsync<TModel>([.. key.Args], cancellationToken).ConfigureAwait(false);
-            if (args.ClearChangeTrackerAfterGet)
-                DbContext.ChangeTracker.Clear();
-
-            if (!args.IsModelValid(model))
-                return Result<TModel?>.Ok(default!);
-
-            return Result<TModel?>.Ok(model);
-        }, cancellationToken, memberName).ConfigureAwait(false);
-
-        /// <inheritdoc/>
-        public async Task<T> CreateAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await CreateWithResultInternalAsync<T, TModel>(args, value, nameof(CreateAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <inheritdoc/>
-        public Task<Result<T>> CreateWithResultAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => CreateWithResultInternalAsync<T, TModel>(args, value, nameof(CreateWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Performs the create internal.
-        /// </summary>
-        private async Task<Result<T>> CreateWithResultInternalAsync<T, TModel>(EfDbArgs args, T value, string memberName, CancellationToken cancellationToken) where T : class, IEntityKey, new() where TModel : class, new()
-        {
-            args.CheckSaveArgs();
-
-            return await Invoker.InvokeAsync(this, args, Cleaner.PrepareCreate(value.ThrowIfNull(nameof(value))), async (_, args, value, ct) =>
-            {
-                TModel model = Mapper.Map<T, TModel>(value, Mapping.OperationTypes.Create);
-                if (model == null)
-                    return Result<T>.Fail(new InvalidOperationException("Mapping to the EF model must not result in a null value."));
-
-                DbContext.Add(Cleaner.PrepareCreate(model));
-
-                if (args.SaveChanges)
-                    await DbContext.SaveChangesAsync(true, ct).ConfigureAwait(false);
-
-                return Result.Ok(CleanUpResult(args.Refresh ? Mapper.Map<TModel, T>(model, OperationTypes.Get)! : value));
-            }, cancellationToken, memberName).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task<T> UpdateAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await UpdateWithResultInternalAsync<T, TModel>(args, value, nameof(UpdateAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <inheritdoc/>
-        public Task<Result<T>> UpdateWithResultAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => UpdateWithResultInternalAsync<T, TModel>(args, value, nameof(UpdateWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Performs the update internal.
-        /// </summary>
-        private async Task<Result<T>> UpdateWithResultInternalAsync<T, TModel>(EfDbArgs args, T value, string memberName, CancellationToken cancellationToken) where T : class, IEntityKey, new() where TModel : class, new()
-        {
-            args.CheckSaveArgs();
-
-            return await Invoker.InvokeAsync(this, args, Cleaner.PrepareUpdate(value.ThrowIfNull(nameof(value))), async (_, args, value, ct) =>
-            {
-                // Check (find) if the entity exists.
-                var model = await DbContext.FindAsync<TModel>(GetEfKeys(value), ct).ConfigureAwait(false);
-                if (!args.IsModelValid(model))
-                    return Result<T>.NotFoundError();
-
-                // Check optimistic concurrency of etag/rowversion to ensure valid. This is needed as underlying EF uses the row version from the find above ignoring the value.ETag where overridden; this is needed to achieve.
-                if (value is IETag etag && Mapper.Map<TModel, T>(model, OperationTypes.Get) is IETag etag2 && etag.ETag != etag2.ETag)
-                    return Result<T>.ConcurrencyError();
-
-                // Update (map) the model from the entity then perform a dbcontext update which will discover/track changes.
-                model = Mapper.Map(value, model, OperationTypes.Update);
-
-                DbContext.Update(Cleaner.PrepareUpdate(model));
-
-                if (args.SaveChanges)
-                    await DbContext.SaveChangesAsync(true, ct).ConfigureAwait(false);
-
-                return Result.Ok(CleanUpResult(args.Refresh ? Mapper.Map<TModel, T>(model, Mapping.OperationTypes.Get)! : value));
-            }, cancellationToken, memberName).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public Task DeleteAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => DeleteAsync<TModel>(args, key, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<Result> DeleteWithResultAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => DeleteWithResultAsync<TModel>(args, key, cancellationToken);
-
-        /// <inheritdoc/>
-        public async Task DeleteAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new()
-            => (await DeleteWithResultInternalAsync<TModel>(args, key, nameof(DeleteAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <inheritdoc/>
-        public Task<Result> DeleteWithResultAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new()
-            => DeleteWithResultInternalAsync<TModel>(args, key, nameof(DeleteWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Performs the delete internal.
-        /// </summary>
-        private async Task<Result> DeleteWithResultInternalAsync<TModel>(EfDbArgs args, CompositeKey key, string memberName, CancellationToken cancellationToken) where TModel : class, new()
-        {
-            args.CheckSaveArgs();
+        _dbContext = dbContext.ThrowIfNull();
+        Options = options ?? new EfDbOptions();
+        ExecutionContext = executionContext ?? ExecutionContext.Current;
+        Database.UseTransactionChanged += Database_UseTransactionChanged;
+    }
 
-            return await Invoker.InvokeAsync(this, args, key, async (_, args, key, ct) =>
-            {
-                // A pre-read is required to verify validity.
-                var model = await DbContext.FindAsync<TModel>([.. key.Args], ct).ConfigureAwait(false);
-                if (!args.IsModelValid(model, checkIsDeleted: false))
-                    return Result.NotFoundError();
+    /// <inheritdoc/>
+    public DbContext DbContext => _dbContext;
 
-                // Delete; either logically or physically.
-                if (model is ILogicallyDeleted ld)
-                {
-                    if (ld.IsDeleted.HasValue && ld.IsDeleted.Value)
-                        return Result.NotFoundError();
+    /// <inheritdoc/>
+    public IDatabase Database => _dbContext.BaseDatabase;
 
-                    ld.IsDeleted = true;
-                    DbContext.Update(Cleaner.PrepareUpdate(model));
-                }
-                else
-                    DbContext.Remove(model);
+    /// <inheritdoc/>
+    public EfDbOptions Options { get; }
 
-                if (args.SaveChanges)
-                    await DbContext.SaveChangesAsync(true, ct).ConfigureAwait(false);
+    /// <inheritdoc/>
+    public ExecutionContext ExecutionContext { get; }
 
-                return Result.Success;
-            }, cancellationToken, memberName).ConfigureAwait(false);
-        }
+    /// <inheritdoc/>
+    public EfDbInvoker Invoker { get; set => field = value.ThrowIfNull(); } = EfDbInvoker.Default;
 
-        /// <summary>
-        /// Gets the <b>Entity Framework</b> keys from the value.
-        /// </summary>
-        /// <param name="value">The entity value.</param>
-        /// <returns>The key values.</returns>
-        public virtual object?[] GetEfKeys<T>(T value) where T : IEntityKey => [.. value.EntityKey.Args];
+    /// <summary>
+    /// Gets the <see cref="EfDbModel{TModel}"/> for the specified <typeparamref name="TModel"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <returns>The <see cref="EfDbModel{TModel}"/>.</returns>
+    public EfDbModel<TModel> Model<TModel>() where TModel : class => new(this, Options.GetOrAddModelOptions<TModel>());
 
-        /// <summary>
-        /// Cleans up the result where specified within the args.
-        /// </summary>
-        private T CleanUpResult<T>(T value) => DbArgs.CleanUpResult ? Cleaner.Clean(value) : value;
+    /// <summary>
+    /// Wires up the current transaction to the <see cref="DbContext"/> when the transaction changes on the <see cref="Database"/>.
+    /// </summary>
+    private void Database_UseTransactionChanged(object? sender, EventArgs e) => _dbContext.Database.UseTransaction(Database.CurrentTransaction);
 
-        /// <inheritdoc/>
-        public void WithWildcard(string? with, Action<string> action)
-        {
-            if (with != null)
-            {
-                with = Database.Wildcard.Replace(with);
-                if (with != null)
-                    action?.Invoke(with);
-            }
-        }
+    /// <summary>
+    /// Dispose of resources.
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        /// <inheritdoc/>
-        public void With<T>(T with, Action action)
+    /// <summary>
+    /// Releases the unmanaged resources used by the <see cref="ExecutionContext"/> and optionally releases the managed resources.
+    /// </summary>
+    /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing && !_disposed)
         {
-            if (with is not null && Comparer<T>.Default.Compare(with, default!) != 0)
+            if (!_disposed)
             {
-                if (with is not string && with is System.Collections.IEnumerable ie && !ie.GetEnumerator().MoveNext())
-                    return;
-
-                action?.Invoke();
+                Database.UseTransactionChanged -= Database_UseTransactionChanged;
+                _disposed = true;
             }
         }
     }
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbArgs.cs b/src/CoreEx.EntityFrameworkCore/EfDbArgs.cs
index 63d5cc4e..3470e5eb 100644
--- a/src/CoreEx.EntityFrameworkCore/EfDbArgs.cs
+++ b/src/CoreEx.EntityFrameworkCore/EfDbArgs.cs
@@ -1,125 +1,43 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.EntityFrameworkCore;
 
-using CoreEx.Entities;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Provides the extended <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> arguments.
+/// </summary>
+public record class EfDbArgs : DatabaseArgsBase
 {
     /// <summary>
-    /// Provides the extended <b>Entity Framework</b> arguments.
+    /// Indicates whether the query results will be tracked or not (see <see cref="EntityFrameworkQueryableExtensions.AsNoTracking{TEntity}(IQueryable{TEntity})"/>.
     /// </summary>
-    public struct EfDbArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EfDbArgs"/> struct.
-        /// </summary>
-        public EfDbArgs() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EfDbArgs"/> struct.
-        /// </summary>
-        /// <param name="template">The template <see cref="EfDbArgs"/> to copy from.</param>
-        public EfDbArgs(EfDbArgs template)
-        {
-            SaveChanges = template.SaveChanges;
-            Refresh = template.Refresh;
-            QueryNoTracking = template.QueryNoTracking;
-            ClearChangeTrackerAfterGet = template.ClearChangeTrackerAfterGet;
-            CleanUpResult = template.CleanUpResult;
-            FilterByTenantId = template.FilterByTenantId;
-            FilterByIsDeleted = template.FilterByIsDeleted;
-            GetTenantId = template.GetTenantId;
-        }
-
-        /// <summary>
-        /// Indicates that the underlying <see cref="DbContext"/> <see cref="DbContext.SaveChanges()"/> is to be performed automatically. Defaults to <c>true</c>.
-        /// </summary>
-        public bool SaveChanges { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether the data should be refreshed (reselected where applicable) after a <b>save</b> operation (defaults to <c>true</c>); is dependent on <see cref="SaveChanges"/> being performed.
-        /// </summary>
-        public bool Refresh { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether the <see cref="EfDbQuery{T, TModel}"/> will <i>not</i> track entities (see <see cref="EntityFrameworkQueryableExtensions.AsNoTracking{TEntity}(IQueryable{TEntity})"/>. Defaults to <c>true</c> in that the queried entities will not be tracked.
-        /// </summary>
-        public bool QueryNoTracking { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether the <see cref="IEfDb.GetAsync{T, TModel}(EfDbArgs, Entities.CompositeKey, CancellationToken)"/> performs a <see cref="ChangeTracker.Clear"/> such that the retrieved entity is not tracked. Defaults to <c>false</c>.
-        /// </summary>
-        /// <remarks>The <see cref="EfDb{TDbContext}.GetAsync{T, TModel}(EfDbArgs, Entities.CompositeKey, CancellationToken)"/> implementation performs a <see cref="Microsoft.EntityFrameworkCore.DbContext.FindAsync{TEntity}(object?[], CancellationToken)"/> 
-        /// internally which automatically attaches and tracks the retrieved entity.</remarks>
-        public bool ClearChangeTrackerAfterGet { get; set; } = false;
-
-        /// <summary>
-        /// Indicates whether the result should be <see cref="Cleaner.Clean{T}(T)">cleaned up</see>.
-        /// </summary>
-        public bool CleanUpResult { get; set; } = false;
-
-        /// <summary>
-        /// Indicates that when the underlying model implements <see cref="ITenantId"/> it is to be filtered by the corresponding <see cref="GetTenantId"/> value. Defaults to <c>true</c>.
-        /// </summary>
-        public bool FilterByTenantId { get; set; } = true;
-
-        /// <summary>
-        /// Indicates that when the underlying model implements <see cref="ILogicallyDeleted"/> it should filter out any models where the <see cref="ILogicallyDeleted.IsDeleted"/> equals <c>true</c>. Defaults to <c>true</c>.
-        /// </summary>
-        public bool FilterByIsDeleted { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the <i>get</i> tenant identifier function; defaults to <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.TenantId"/>.
-        /// </summary>
-        public Func<string?> GetTenantId { get; set; } = () => ExecutionContext.HasCurrent ? ExecutionContext.Current.TenantId : null;
+    /// <remarks>Defaults to <see langword="false"/>; in that there will be <i>no</i> tracking.</remarks>
+    public bool QueryTracking { get; init; } = false;
 
-        /// <summary>
-        /// Checks the <see cref="SaveChanges"/> and <see cref="Refresh"/> properties to ensure that they are valid.
-        /// </summary>
-        public readonly void CheckSaveArgs()
-        {
-            if (Refresh && !SaveChanges)
-                throw new InvalidOperationException($"The {nameof(Refresh)} property cannot be set to true without the {nameof(SaveChanges)} also being set to true (given the save will occur after this method call).");
-        }
-
-        /// <summary>
-        /// Determines whether the model is considered valid; i.e. is not <c>null</c>, and where applicable, checks the <see cref="ITenantId.TenantId"/> and <see cref="ILogicallyDeleted.IsDeleted"/> properties.
-        /// </summary>
-        /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
-        /// <param name="model">The model value.</param>
-        /// <param name="checkIsDeleted">Indicates whether to perform the <see cref="ILogicallyDeleted"/> check.</param>
-        /// <param name="checkTenantId">Indicates whether to perform the <see cref="ITenantId"/> check.</param>
-        /// <returns><c>true</c> indicates that the model is valid; otherwise, <c>false</c>.</returns>
-        /// <remarks>This is used by the underlying <see cref="EfDb{TDbContext}"/> operations to ensure the model is considered valid or not, and then handled accordingly. The query-based operations leverage the corresponding <see cref="WhereModelValid"/> filter.
-        /// <para>This leverages the <see cref="WhereModelValid"/> to perform the check to ensure consistency of implementation.</para></remarks>
-        public readonly bool IsModelValid<TModel>([NotNullWhen(true)] TModel? model, bool checkIsDeleted = true, bool checkTenantId = true) where TModel : class
-            => model != default && WhereModelValid(new[] { model }.AsQueryable(), checkIsDeleted, checkTenantId).Any();
-
-        /// <summary>
-        /// Filters the <paramref name="query"/> to include only valid models; i.e. checks the <see cref="ITenantId.TenantId"/> and <see cref="ILogicallyDeleted.IsDeleted"/> properties.
-        /// </summary>
-        /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
-        /// <param name="query">The current query.</param>
-        /// <param name="checkIsDeleted">Indicates whether to perform the <see cref="ILogicallyDeleted"/> check.</param>
-        /// <param name="checkTenantId">Indicates whether to perform the <see cref="ITenantId"/> check.</param>
-        /// <returns>The updated query.</returns>
-        /// <remarks>This is used by the underlying <see cref="EfDbQuery{TModel}"/> and <see cref="EfDbQuery{T, TModel}"/> to apply standardized filtering.</remarks>
-        public readonly IQueryable<TModel> WhereModelValid<TModel>(IQueryable<TModel> query, bool checkIsDeleted = true, bool checkTenantId = true) where TModel : class
-        {
-            query = query.ThrowIfNull(nameof(query));
+    /// <summary>
+    /// Indicates whether the <see cref="EfDbModel{TModel}.GetAsync(CompositeKey, CancellationToken)"/> performs a <see cref="ChangeTracker.Clear"/> so that the model is not tracked.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/>; in that there <i>will</i> be tracking.
+    /// <para>The <see cref="EfDbModel{TModel}.GetAsync(CompositeKey, CancellationToken)"/> implementation performs a <see cref="Microsoft.EntityFrameworkCore.DbContext.FindAsync{TEntity}(object?[], CancellationToken)"/> 
+    /// internally which automatically attaches and tracks.</para></remarks>
+    public bool ClearChangeTrackerAfterGet { get; init; } = false;
 
-            if (checkTenantId && FilterByTenantId && typeof(ITenantId).IsAssignableFrom(typeof(TModel)))
-            {
-                var tenantId = GetTenantId();
-                query = query.Where(x => ((ITenantId)x).TenantId == tenantId);
-            }
+    /// <summary>
+    /// Indicates that the underlying <see cref="DbContext"/> <see cref="DbContext.SaveChanges()"/> is to be performed automatically once the mutation operation is complete.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="true"/>.
+    /// <para>This is generally required for a mutation where the changes need to be realized (persisted); i.e. to get the likes of the generated row-version, etc.</para></remarks>
+    public bool SaveChanges { get; set; } = true;
 
-            if (checkIsDeleted && FilterByIsDeleted && typeof(ILogicallyDeleted).IsAssignableFrom(typeof(TModel)))
-                query = query.Where(x => ((ILogicallyDeleted)x).IsDeleted == null || ((ILogicallyDeleted)x).IsDeleted == false);
+    /// <summary>
+    /// Indicates whether to bypass all configured filters (where allowed).
+    /// </summary>
+    /// <remarks>This is an advanced feature that should only be used where specifically desired, and/or applying the filtering manually, to avoid unintended side-effects.</remarks>
+    public bool BypassFilters { get; init; } = false;
 
-            return query;
-        }
+    /// <summary>
+    /// Checks the <see cref="DatabaseArgsBase.Refresh"/> and <see cref="SaveChanges"/> combination to ensure that they are valid for the operation.
+    /// </summary>
+    internal void CheckRefreshAndSaveChangesCombination()
+    {
+        if (Refresh && !SaveChanges)
+            throw new InvalidOperationException($"The {nameof(Refresh)} property cannot be set to true without the {nameof(SaveChanges)} also being set to true (as the refresh is predicated on the save occurring).");
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbEntity.cs b/src/CoreEx.EntityFrameworkCore/EfDbEntity.cs
deleted file mode 100644
index b9ce2fbd..00000000
--- a/src/CoreEx.EntityFrameworkCore/EfDbEntity.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-
-namespace CoreEx.EntityFrameworkCore
-{
-    /// <summary>
-    /// Provides a lightweight typed <b>Entity Framework</b> wrapper over the <see cref="IEfDb"/> operations mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> (and vice versa).
-    /// </summary>
-    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-    /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-    public readonly struct EfDbEntity<T, TModel>(IEfDb efDb) : IEfDbEntity where T : class, IEntityKey, new() where TModel : class, new()
-    {
-        /// <inheritdoc/>
-        public IEfDb EfDb { get; } = efDb.ThrowIfNull(nameof(efDb));
-
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{T, TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="EfDbQuery{T, TModel}"/>.</returns>
-        public EfDbQuery<T, TModel> Query(Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Query(new EfDbArgs(EfDb.DbArgs), query);
-
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{T, TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <param name="queryArgs">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="EfDbQuery{T, TModel}"/>.</returns>
-        public EfDbQuery<T, TModel> Query(EfDbArgs queryArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => new(EfDb, queryArgs, query);
-
-        #region Standard
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="keys"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<T?> GetAsync(params object?[] keys) => GetAsync(keys, default);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="keys"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<T?> GetAsync(object?[] keys, CancellationToken cancellationToken = default) => GetAsync(CompositeKey.Create(keys), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<T?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetAsync(new EfDbArgs(EfDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<T?> GetAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => EfDb.GetAsync<T, TModel>(args, key, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes where specified).
-        /// </summary>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<T> CreateAsync(T value, CancellationToken cancellationToken = default) => CreateAsync(new EfDbArgs(EfDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes where specified).
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<T> CreateAsync(EfDbArgs args, T value, CancellationToken cancellationToken = default) => EfDb.CreateAsync<T, TModel>(args, value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes where specified).
-        /// </summary>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<T> UpdateAsync(T value, CancellationToken cancellationToken = default) => UpdateAsync(new EfDbArgs(EfDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes where specified).
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<T> UpdateAsync(EfDbArgs args, T value, CancellationToken cancellationToken = default) => EfDb.UpdateAsync<T, TModel>(args, value, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task DeleteAsync(params object?[] keys) => DeleteAsync(keys, default);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task DeleteAsync(object?[] keys, CancellationToken cancellationToken = default) => DeleteAsync(CompositeKey.Create(keys), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => DeleteAsync(new EfDbArgs(EfDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task DeleteAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => EfDb.DeleteAsync<T, TModel>(args, key, cancellationToken);
-
-        #endregion
-
-        #region WithResult
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="keys"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<Result<T?>> GetWithResultAsync(params object?[] keys) => GetWithResultAsync(keys, default);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="keys"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<Result<T?>> GetWithResultAsync(object?[] keys, CancellationToken cancellationToken = default) => GetWithResultAsync(CompositeKey.Create(keys), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<Result<T?>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetWithResultAsync(new EfDbArgs(EfDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<Result<T?>> GetWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => EfDb.GetWithResultAsync<T, TModel>(args, key, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<Result<T>> CreateWithResultAsync(T value, CancellationToken cancellationToken = default) => CreateWithResultAsync(new EfDbArgs(EfDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<Result<T>> CreateWithResultAsync(EfDbArgs args, T value, CancellationToken cancellationToken = default) => EfDb.CreateWithResultAsync<T, TModel>(args, value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<Result<T>> UpdateWithResultAsync(T value, CancellationToken cancellationToken = default) => UpdateWithResultAsync(new EfDbArgs(EfDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public Task<Result<T>> UpdateWithResultAsync(EfDbArgs args, T value, CancellationToken cancellationToken = default) => EfDb.UpdateWithResultAsync<T, TModel>(args, value, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="keys"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task<Result> DeleteWithResultAsync(params object?[] keys) => DeleteWithResultAsync(keys, default);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="keys"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task<Result> DeleteWithResultAsync(object?[] keys, CancellationToken cancellationToken = default) => DeleteWithResultAsync(CompositeKey.Create(keys), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task<Result> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => DeleteWithResultAsync(new EfDbArgs(EfDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then a <see cref="NotFoundException"/> will be thrown.</remarks>
-        public Task<Result> DeleteWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => EfDb.DeleteWithResultAsync<T, TModel>(args, key, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbExtensions.cs b/src/CoreEx.EntityFrameworkCore/EfDbExtensions.cs
index ae0b42a4..ffec438a 100644
--- a/src/CoreEx.EntityFrameworkCore/EfDbExtensions.cs
+++ b/src/CoreEx.EntityFrameworkCore/EfDbExtensions.cs
@@ -1,446 +1,147 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.EntityFrameworkCore;
 
-using CoreEx.Entities;
-using CoreEx.RefData;
-using CoreEx.Results;
-
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Provides <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> extensions.
+/// </summary>
+public static partial class EfDbExtensions
 {
     /// <summary>
-    /// Provides the extended <b>Entity Framework</b> extension methods.
+    /// Creates a <typeparamref name="TColl"/> from a <typeparamref name="TSource"/> <see cref="IQueryable{TSource}"/> using the specified <paramref name="mapper"/>.
     /// </summary>
-    public static class EfDbExtensions
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TColl">The item collection <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TSource}"/>.</param>
+    /// <param name="mapper">The mapping <see cref="Func{TSource, TItem}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public static async Task<TColl> ToMappedItemsAsync<TSource, TColl, TItem>(this IQueryable<TSource> query, Func<TSource, TItem> mapper, CancellationToken cancellationToken = default) where TColl : ICollection<TItem>, new()
     {
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <param name="noTracking">Optionally override the specified/default <see cref="EfDbArgs.QueryNoTracking"/>.</param>
-        /// <returns>A <see cref="EfDbQuery{T, TModel}"/>.</returns>
-        public static EfDbQuery<TModel> Query<TModel>(this IEfDb efDb, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null, bool? noTracking = null) where TModel : class, new()
-        {
-            var ea = new EfDbArgs(efDb.DbArgs);
-            if (noTracking.HasValue)
-                ea.QueryNoTracking = noTracking.Value;
+        mapper.ThrowIfNull();
 
-            return efDb.Query<TModel>(ea, query);
-        }
+        var q = query.ThrowIfNull();
+        var items = new TColl();
 
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{T, TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <param name="noTracking">Optionally override the specified/default <see cref="EfDbArgs.QueryNoTracking"/>.</param>
-        /// <returns>A <see cref="EfDbQuery{T, TModel}"/>.</returns>
-        public static EfDbQuery<T, TModel> Query<T, TModel>(this IEfDb efDb, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null, bool? noTracking = null) where T : class, IEntityKey, new() where TModel : class, new()
+        await foreach (var source in q.AsAsyncEnumerable().WithCancellation(cancellationToken).ConfigureAwait(false))
         {
-            var ea = new EfDbArgs(efDb.DbArgs);
-            if (noTracking.HasValue)
-                ea.QueryNoTracking = noTracking.Value;
-
-            return efDb.Query<T, TModel>(ea, query);
+            items.Add(mapper(source));
         }
 
-        #region Standard
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T, TModel>(this IEfDb efDb, EfDbArgs args, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() 
-            => efDb.GetAsync<T, TModel>(args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T, TModel>(this IEfDb efDb, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() 
-            => efDb.GetAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T, TModel>(this IEfDb efDb, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() 
-            => efDb.GetAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<T> CreateAsync<T, TModel>(this IEfDb efDb, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() 
-            => efDb.CreateAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<T> UpdateAsync<T, TModel>(this IEfDb efDb, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() 
-            => efDb.UpdateAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task DeleteAsync<T, TModel>(this IEfDb efDb, EfDbArgs args, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new() 
-            => efDb.DeleteAsync<T, TModel>(args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task DeleteAsync<T, TModel>(this IEfDb efDb, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new() 
-            => efDb.DeleteAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task DeleteAsync<T, TModel>(this IEfDb efDb, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new() 
-            => efDb.DeleteAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), key, cancellationToken);
-
-        #endregion
-
-        #region WithResult
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T, TModel>(this IEfDb efDb, EfDbArgs args, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => efDb.GetWithResultAsync<T, TModel>(args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T, TModel>(this IEfDb efDb, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => efDb.GetWithResultAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T, TModel>(this IEfDb efDb, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => efDb.GetWithResultAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<Result<T>> CreateWithResultAsync<T, TModel>(this IEfDb efDb, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => efDb.CreateWithResultAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<Result<T>> UpdateWithResultAsync<T, TModel>(this IEfDb efDb, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => efDb.UpdateWithResultAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), value, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IEfDb efDb, EfDbArgs args, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => efDb.DeleteWithResultAsync<T, TModel>(args, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IEfDb efDb, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => efDb.DeleteWithResultAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IEfDb efDb, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => efDb.DeleteWithResultAsync<T, TModel>(new EfDbArgs(efDb.DbArgs), key, cancellationToken);
-
-        #endregion
-
-        #region With
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, string? with, Action<string> action) => efDb.With(with, () => action(with!));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, int? with, Action<int> action) => efDb.With(with, () => action(with!.Value));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, int with, Action<int> action) => efDb.With(with, () => action(with));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, short? with, Action<short> action) => efDb.With(with, () => action(with!.Value));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, short with, Action<short> action) => efDb.With(with, () => action(with));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, long? with, Action<long> action) => efDb.With(with, () => action(with!.Value));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, long with, Action<long> action) => efDb.With(with, () => action(with));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, decimal? with, Action<decimal> action) => efDb.With(with, () => action(with!.Value));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, decimal with, Action<decimal> action) => efDb.With(with, () => action(with));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, float? with, Action<float> action) => efDb.With(with, () => action(with!.Value));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, float with, Action<float> action) => efDb.With(with, () => action(with));
-
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, double? with, Action<double> action) => efDb.With(with, () => action(with!.Value));
+        return items;
+    }
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, double with, Action<double> action) => efDb.With(with, () => action(with));
+    /// <summary>
+    /// Creates a <typeparamref name="TColl"/> from a <typeparamref name="TSource"/> <see cref="IQueryable{TSource}"/> using the specified <paramref name="mapper"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TColl">The item collection <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TSource}"/>.</param>
+    /// <param name="mapper">The mapping <see cref="IMapper{TSource, TItem}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public static async Task<TColl> ToMappedItemsAsync<TSource, TColl, TItem>(this IQueryable<TSource> query, IMapper<TSource, TItem> mapper, CancellationToken cancellationToken = default) where TSource : class where TColl : ICollection<TItem>, new() where TItem : class
+        => await ToMappedItemsAsync<TSource, TColl, TItem>(query, source => mapper.Map(source)!, cancellationToken).ConfigureAwait(false);
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, DateTime? with, Action<DateTime> action) => efDb.With(with, () => action(with!.Value));
+    /// <summary>
+    /// Creates a <see cref="List{TItem}"/> from a <typeparamref name="TSource"/> <see cref="IQueryable{TSource}"/> using the specified <paramref name="mapper"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TSource}"/>.</param>
+    /// <param name="mapper">The mapping <see cref="Func{TSource, TItem}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public static async Task<List<TItem>> ToMappedItemsAsync<TSource, TItem>(this IQueryable<TSource> query, Func<TSource, TItem> mapper, CancellationToken cancellationToken = default)
+    {
+        mapper.ThrowIfNull();
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, DateTime with, Action<DateTime> action) => efDb.With(with, () => action(with));
+        var q = query.ThrowIfNull();
+        var items = new List<TItem>();
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, TimeSpan? with, Action<TimeSpan> action) => efDb.With(with, () => action(with!.Value));
+        await foreach (var source in q.AsAsyncEnumerable().WithCancellation(cancellationToken).ConfigureAwait(false))
+        {
+            items.Add(mapper(source));
+        }
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, TimeSpan with, Action<TimeSpan> action) => efDb.With(with, () => action(with));
+        return items;
+    }
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, bool? with, Action<bool> action) => efDb.With(with, () => action(with!.Value));
+    /// <summary>
+    /// Creates a <see cref="List{TItem}"/> from a <typeparamref name="TSource"/> <see cref="IQueryable{TSource}"/> using the specified <paramref name="mapper"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TSource}"/>.</param>
+    /// <param name="mapper">The mapping <see cref="IMapper{TSource, TItem}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public static async Task<List<TItem>> ToMappedItemsAsync<TSource, TItem>(this IQueryable<TSource> query, IMapper<TSource, TItem> mapper, CancellationToken cancellationToken = default) where TSource : class where TItem : class
+        => await ToMappedItemsAsync(query, source => mapper.Map(source)!, cancellationToken).ConfigureAwait(false);
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, bool with, Action<bool> action) => efDb.With(with, () => action(with));
+    /// <summary>
+    /// Creates a <see cref="ItemsResult{TItem}"/> from an <see cref="IQueryable{TItem}"/> applying <paramref name="paging"/> (including with <see cref="PagingResult.TotalCount"/> where requested).
+    /// </summary>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TItem}"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="autoCount">Indicates whether to perform the <see cref="PagingResult.TotalCount"/> query automatically.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="ItemsResult{TItem}"/>.</returns>
+    /// <remarks>The <paramref name="autoCount"/> indicates whether the <see cref="PagingResult.TotalCount"/> query should be automatically executed using the <paramref name="query"/> before the <paramref name="paging"/>
+    /// is applied and <see cref="PagingArgs.IsCountRequested"/>. This is opt-in as not all LINQ implementations support the reuse of the query, or allow counthing where ordering has previously been applied.</remarks>
+    public static async Task<ItemsResult<TItem>> ToItemsResultAsync<TItem>(this IQueryable<TItem> query, PagingArgs? paging = null, bool autoCount = true, CancellationToken cancellationToken = default)
+    {
+        var q = query.ThrowIfNull();
+        var ir = new ItemsResult<TItem>(paging)
+        {
+            Items = await q.WithPaging(paging).ToArrayAsync(cancellationToken).ConfigureAwait(false)
+        };
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, char? with, Action<char> action) => efDb.With(with, () => action(with!.Value));
+        // When auto-counting and requested to do so, then execute a count.
+        if (autoCount)
+            await ir.WithTotalCountAsync(async cancellationToken => await query.LongCountAsync(cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>default</c>.
-        /// </summary>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With(this IEfDb efDb, char with, Action<char> action) => efDb.With(with, () => action(with));
+        return ir;
+    }
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <param name="efDb"></param>
-        /// <param name="with"></param>
-        /// <param name="action"></param>
-        public static void With<TRef>(this IEfDb efDb, TRef? with, Action<TRef> action) where TRef : IReferenceData => efDb.With(with, () => action(with!));
+    /// <summary>
+    /// Creates a <see cref="ItemsResult{TItem}"/> from a <typeparamref name="TSource"/> <see cref="IQueryable{TSource}"/> applying <paramref name="paging"/> (including with <see cref="PagingResult.TotalCount"/> where requested).
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TSource}"/>.</param>
+    /// <param name="mapper">The mapping <see cref="Func{TSource, TItem}"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="autoCount">Indicates whether to perform the <see cref="PagingResult.TotalCount"/> query automatically.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="ItemsResult{TItem}"/>.</returns>
+    /// <remarks>The <paramref name="autoCount"/> indicates whether the <see cref="PagingResult.TotalCount"/> query should be automatically executed using the <paramref name="query"/> before the <paramref name="paging"/>
+    /// is applied and <see cref="PagingArgs.IsCountRequested"/>. This is opt-in as not all LINQ implementations support the reuse of the query, or allow counthing where ordering has previously been applied.</remarks>
+    public static async Task<ItemsResult<TItem>> ToMappedItemsResultAsync<TSource, TItem>(this IQueryable<TSource> query, Func<TSource, TItem> mapper, PagingArgs? paging = null, bool autoCount = true, CancellationToken cancellationToken = default)
+    {
+        var q = query.ThrowIfNull();
+        var ir = new ItemsResult<TItem>(paging)
+        {
+            Items = await ToMappedItemsAsync(q.WithPaging(paging), mapper, cancellationToken).ConfigureAwait(false)
+        };
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        public static void With<TRef>(this IEfDb efDb, ReferenceDataCodeList<TRef>? with, Action<ReferenceDataCodeList<TRef>> action) where TRef : class, IReferenceData, new() => efDb.With(with, () => action(with!));
+        // When auto-counting and requested to do so, then execute a count.
+        if (autoCount)
+            await ir.WithTotalCountAsync(async cancellationToken => await query.LongCountAsync(cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
 
-        #endregion
+        return ir;
     }
+
+    /// <summary>
+    /// Creates a <see cref="ItemsResult{TItem}"/> from a <typeparamref name="TSource"/> <see cref="IQueryable{TSource}"/> applying <paramref name="paging"/> (including with <see cref="PagingResult.TotalCount"/> where requested).
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="query">The <see cref="IQueryable{TSource}"/>.</param>
+    /// <param name="mapper">The mapping <see cref="IMapper{TSource, TItem}"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="autoCount">Indicates whether to perform the <see cref="PagingResult.TotalCount"/> query automatically.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="ItemsResult{TItem}"/>.</returns>
+    /// <remarks>The <paramref name="autoCount"/> indicates whether the <see cref="PagingResult.TotalCount"/> query should be automatically executed using the <paramref name="query"/> before the <paramref name="paging"/>
+    /// is applied and <see cref="PagingArgs.IsCountRequested"/>. This is opt-in as not all LINQ implementations support the reuse of the query, or allow counthing where ordering has previously been applied.</remarks>
+    public static async Task<ItemsResult<TItem>> ToMappedItemsResultAsync<TSource, TItem>(this IQueryable<TSource> query, IMapper<TSource, TItem> mapper, PagingArgs? paging = null, bool autoCount = true, CancellationToken cancellationToken = default) where TSource : class where TItem : class
+        => await query.ToMappedItemsResultAsync(source => mapper.Map(source)!, paging, autoCount, cancellationToken).ConfigureAwait(false);
 }
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbInvoker.cs b/src/CoreEx.EntityFrameworkCore/EfDbInvoker.cs
index bd622d5a..3f8cfa9c 100644
--- a/src/CoreEx.EntityFrameworkCore/EfDbInvoker.cs
+++ b/src/CoreEx.EntityFrameworkCore/EfDbInvoker.cs
@@ -1,53 +1,70 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+using Microsoft.Extensions.Logging;
 
-using CoreEx.Database;
-using CoreEx.Invokers;
-using CoreEx.Results;
-using Microsoft.EntityFrameworkCore;
-using System.Data.Common;
-using System.Reflection;
+namespace CoreEx.EntityFrameworkCore;
 
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Provides the standard <see cref="IEfDb"/> invoker functionality.
+/// </summary>
+/// <remarks>Catches any unhandled <see cref="DbException"/> and invokes <see cref="IDatabase.HandleDbException(DbException)"/> to handle (where <see cref="DatabaseArgsBase.TransformException"/>) is <see langword="true"/>
+/// before bubbling up. Also, catches and handles the <see cref="DbUpdateConcurrencyException"/> and <see cref="DbUpdateException"/> where applicable.</remarks>
+[InvokerName("CoreEx.EntityFrameworkCore.EfDb")]
+public class EfDbInvoker : InvokerBase<IEfDb, EfDbArgs>
 {
+    private static EfDbInvoker? _default;
+
     /// <summary>
-    /// Provides the standard <see cref="IEfDb"/> invoker functionality.
+    /// Gets the default <see cref="EfDbInvoker"/> instance.
     /// </summary>
-    /// <remarks>Catches any unhandled <see cref="DbUpdateConcurrencyException"/> or <see cref="DbException"/> and invokes <see cref="Database{TConnection}.HandleDbException(DbException)"/> to handle before bubbling up.</remarks>
-    public class EfDbInvoker : InvokerBase<IEfDb>
+    public static EfDbInvoker Default => ExecutionContext.GetService<EfDbInvoker>() ?? (_default ??= new EfDbInvoker());
+
+    /// <inheritdoc/>
+    public override bool IsTracingDisabled => true;
+
+    /// <inheritdoc/>
+    protected override async Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, IEfDb ef, EfDbArgs efArgs, Func<InvokerTracer, EfDbArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
     {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, IEfDb efDb, Func<InvokeArgs, TResult> func) => throw new NotSupportedException();
+        try
+        {
+            // Ensure any ambient transaction is used.
+            if (ef.Database.IsInTransaction && ef.DbContext.Database.CurrentTransaction is null)
+                await ef.DbContext.Database.UseTransactionAsync(ef.Database.CurrentTransaction, cancellationToken).ConfigureAwait(false);
 
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, IEfDb efdb, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
+            // Invoke the EF operation.
+            return await base.OnInvokeAsync(tracer, ef, efArgs, func, cancellationToken).ConfigureAwait(false);
+        }
+        catch (Exception ex) when (efArgs.TransformException)
         {
-            try
-            {
-                return await base.OnInvokeAsync(invokeArgs, efdb, func, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex)
+            var hex = HandleDbException(ef, ex);
+            if (hex is not null)
             {
-                Result? eresult = null;
-                if (ex is DbException dbex)
-                    eresult = efdb.Database.HandleDbException(dbex);
-                else if (ex is DbUpdateConcurrencyException)
-                    eresult = Result.Fail(new ConcurrencyException());
-                else if (ex is DbUpdateException deux && deux.InnerException != null && deux.InnerException is DbException dbex2)
-                    eresult = efdb.Database.HandleDbException(dbex2);
-                else if (ex is TargetInvocationException tiex && tiex.InnerException is DbException dbex3)
-                    eresult = efdb.Database.HandleDbException(dbex3);
-
-                if (eresult.HasValue && eresult.Value.IsFailure && eresult.Value.Error is CoreEx.Abstractions.IExtendedException)
-                {
-                    var dresult = default(TResult);
-                    if (dresult is IResult dir)
-                        return (TResult)dir.ToFailure(eresult.Value.Error);
-                    else
-                        eresult.Value.ThrowOnError();
-                }
-
-                throw;
+                if (tracer.Logger is not null && tracer.Logger.IsEnabled(LogLevel.Debug))
+                    tracer.Logger.LogDebug(ex, "Database exception converted to '{ExceptionType}': {Message} [DatabaseId: {DatabaseId}]", hex.GetType().Name, hex.Message, ef.Database.DatabaseId);
+
+                // Where the result is an IResult (ROP) and the exception is considered an error then return as an IResult _failure_.
+                if (ExtendedException.TryConvertExceptionToResult<TResult>(hex, out var res))
+                    return res;
+
+                throw hex;
             }
+
+            throw;
         }
     }
+
+    /// <summary>
+    /// Handle the various exceptions scenarios.
+    /// </summary>
+    private static Exception? HandleDbException(IEfDb ef, Exception ex)
+    {
+        if (ex is DbException dbex)
+            return ef.Database.HandleDbException(dbex);
+        else if (ex is DbUpdateConcurrencyException duex)
+            return new ConcurrencyException(null, duex);
+        else if (ex is DbUpdateException deux && deux.InnerException is not null && deux.InnerException is DbException dbex2)
+            return ef.Database.HandleDbException(dbex2);
+        else if (ex is TargetInvocationException tiex && tiex.InnerException is DbException dbex3)
+            return ef.Database.HandleDbException(dbex3);
+        else
+            return null;
+    }
 }
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Create.cs b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Create.cs
new file mode 100644
index 00000000..dc9a8c23
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Create.cs
@@ -0,0 +1,46 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbMappedModel<TValue, TModel, TBiDirectionMapper>
+{
+    /// <summary>
+    /// Creates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the created value.</returns>
+    public Task<DataResult<TValue>> CreateAsync(TValue value, CancellationToken cancellationToken = default) => CreateAsync(Model.Args, value, cancellationToken);
+
+    /// <summary>
+    /// Creates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the created value.</returns>
+    public async Task<DataResult<TValue>> CreateAsync(EfDbArgs args, TValue value, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.CreateAsync(args, Mapper.To.Map(value), cancellationToken).ConfigureAwait(false);
+        return new DataResult<TValue>(Mapper.From.Map(r.Value), r.WasMutated);
+    }
+
+    /// <summary>
+    /// Creates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the created value.</returns>
+    public Task<Result<DataResult<TValue>>> CreateWithResultAsync(TValue value, CancellationToken cancellationToken = default) => CreateWithResultAsync(Model.Args, value, cancellationToken);
+
+    /// <summary>
+    /// Creates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the created value.</returns>
+    public async Task<Result<DataResult<TValue>>> CreateWithResultAsync(EfDbArgs args, TValue value, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.CreateWithResultAsync(args, Mapper.To.Map(value), cancellationToken).ConfigureAwait(false);
+        return r.ThenAs(dr => new DataResult<TValue>(Mapper.From.Map(dr.Value)!, dr.WasMutated));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Delete.cs b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Delete.cs
new file mode 100644
index 00000000..01af443a
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Delete.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbMappedModel<TValue, TModel, TBiDirectionMapper>
+{
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<DataResult> DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => DeleteAsync(Model.Args, key, cancellationToken);
+
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<DataResult> DeleteAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => Model.DeleteAsync(args, key, cancellationToken);
+
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<Result<DataResult>> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => DeleteWithResultAsync(Model.Args, key, cancellationToken);
+
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<Result<DataResult>> DeleteWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => Model.DeleteWithResultAsync(args, key, cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Get.cs b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Get.cs
new file mode 100644
index 00000000..cfc84e4f
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Get.cs
@@ -0,0 +1,46 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbMappedModel<TValue, TModel, TBiDirectionMapper>
+{
+    /// <summary>
+    /// Gets the value for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value where found; otherwise, <see langword="null"/>.</returns>
+    public Task<TValue?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetAsync(Model.Args, key, cancellationToken);
+
+    /// <summary>
+    /// Gets the value for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value where found; otherwise, <see langword="null"/>.</returns>
+    public async Task<TValue?> GetAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default)
+    {
+        var m = await Model.GetAsync(args, key, cancellationToken).ConfigureAwait(false);
+        return Mapper.From.Map(m);
+    }
+
+    /// <summary>
+    /// Gets the value for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value.</returns>
+    public Task<Result<TValue>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetWithResultAsync(Model.Args, key, cancellationToken);
+
+    /// <summary>
+    /// Gets the value for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value.</returns>
+    public async Task<Result<TValue>> GetWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.GetWithResultAsync(args, key, cancellationToken).ConfigureAwait(false);
+        return r.IsSuccess ? Mapper.From.Map(r.Value) : r.Bind();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Update.cs b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Update.cs
new file mode 100644
index 00000000..af55ff5a
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Update.cs
@@ -0,0 +1,46 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbMappedModel<TValue, TModel, TBiDirectionMapper>
+{
+    /// <summary>
+    /// Updates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the updated value.</returns>
+    public Task<DataResult<TValue>> UpdateAsync(TValue value, CancellationToken cancellationToken = default) => UpdateAsync(Model.Args, value, cancellationToken);
+
+    /// <summary>
+    /// Updates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the updated value.</returns>
+    public async Task<DataResult<TValue>> UpdateAsync(EfDbArgs args, TValue value, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.UpdateAsync(args, Mapper.To.Map(value), cancellationToken).ConfigureAwait(false);
+        return new DataResult<TValue>(Mapper.From.Map(r.Value), r.WasMutated);
+    }
+
+    /// <summary>
+    /// Updates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the updated value.</returns>
+    public Task<Result<DataResult<TValue>>> UpdateWithResultAsync(TValue value, CancellationToken cancellationToken = default) => UpdateWithResultAsync(Model.Args, value, cancellationToken);
+
+    /// <summary>
+    /// Updates the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the updated value.</returns>
+    public async Task<Result<DataResult<TValue>>> UpdateWithResultAsync(EfDbArgs args, TValue value, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.UpdateWithResultAsync(args, Mapper.To.Map(value), cancellationToken).ConfigureAwait(false);
+        return r.ThenAs(dr => new DataResult<TValue>(Mapper.From.Map(dr.Value)!, dr.WasMutated));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Upsert.cs b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Upsert.cs
new file mode 100644
index 00000000..7814fd81
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.Upsert.cs
@@ -0,0 +1,50 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbMappedModel<TValue, TModel, TBiDirectionMapper>
+{
+    /// <summary>
+    /// Upserts the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the upserted value.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public Task<DataResult<TValue>> UpsertAsync(TValue value, CancellationToken cancellationToken = default) => UpsertAsync(Model.Args, value, cancellationToken);
+
+    /// <summary>
+    /// Upserts the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the upserted value.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public async Task<DataResult<TValue>> UpsertAsync(EfDbArgs args, TValue value, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.UpsertAsync(args, Mapper.To.Map(value), cancellationToken).ConfigureAwait(false);
+        return new DataResult<TValue>(Mapper.From.Map(r.Value), r.WasMutated);
+    }
+
+    /// <summary>
+    /// Upserts the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the upserted value.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public Task<Result<DataResult<TValue>>> UpsertWithResultAsync(TValue value, CancellationToken cancellationToken = default) => UpsertWithResultAsync(Model.Args, value, cancellationToken);
+
+    /// <summary>
+    /// Upserts the <paramref name="value"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TValue}"/> containing the upserted value.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public async Task<Result<DataResult<TValue>>> UpsertWithResultAsync(EfDbArgs args, TValue value, CancellationToken cancellationToken = default)
+    {
+        var r = await Model.UpsertWithResultAsync(args, Mapper.To.Map(value), cancellationToken).ConfigureAwait(false);
+        return r.ThenAs(dr => new DataResult<TValue>(Mapper.From.Map(dr.Value)!, dr.WasMutated));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.cs b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.cs
new file mode 100644
index 00000000..91fb8d1e
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbMappedModel.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.EntityFrameworkCore;
+
+/// <summary>
+/// Provides the extended <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> <i>mapped</i> value to/from model functionality.
+/// </summary>
+/// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+/// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+/// <typeparam name="TBiDirectionMapper">The <see cref="IBiDirectionMapper{TSource, TDestination}"/> <see cref="Type"/>.</typeparam>
+/// <remarks><i>Note</i>: the <see cref="EfDbMappedModel{TValue, TModel, TBiDirectionMapper}"/> does not provide a <c>Query</c> method equivalent to <see cref="EfDbModel{TModel}.Query(EfDbArgs?)"/> by design. This is because queries
+/// are tightly-coupled to the model and the <see cref="EfDbExtensions.ToMappedItemsResultAsync{TSource, TItem}(IQueryable{TSource}, IMapper{TSource, TItem}, PagingArgs?, bool, CancellationToken)"/> enables where applicable.</remarks>
+public partial class EfDbMappedModel<TValue, TModel, TBiDirectionMapper> where TValue : class where TModel : class where TBiDirectionMapper : IBiDirectionMapper<TValue, TModel>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EfDbMappedModel{T, TModel, TBiDirectionMapper}"/> class.
+    /// </summary>
+    /// <param name="efDbModel">The <see cref="EfDbModel{TModel}"/>.</param>
+    /// <param name="mapper">The <see cref="IBiDirectionMapper{TSource, TDestination}"/>.</param>
+    internal EfDbMappedModel(EfDbModel<TModel> efDbModel, TBiDirectionMapper mapper)
+    {
+        Model = efDbModel.ThrowIfNull();
+        Mapper = mapper.ThrowIfNull();
+    }
+
+    /// <summary>
+    /// Gets the underlying <see cref="EfDbModel{TModel}"/>.
+    /// </summary>
+    public EfDbModel<TModel> Model { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IBiDirectionMapper{TSource, TDestination}"/>.
+    /// </summary>
+    public TBiDirectionMapper Mapper { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.Create.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.Create.cs
new file mode 100644
index 00000000..4db82ecd
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.Create.cs
@@ -0,0 +1,77 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbModel<TModel>
+{
+    /// <summary>
+    /// Creates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the created model.</returns>
+    public Task<DataResult<TModel>> CreateAsync(TModel model, CancellationToken cancellationToken = default) => CreateAsync(Args, model, cancellationToken);
+
+    /// <summary>
+    /// Creates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the created model.</returns>
+    public async Task<DataResult<TModel>> CreateAsync(EfDbArgs args, TModel model, CancellationToken cancellationToken = default) => (await CreateWithResultInternalAsync(args, model, nameof(CreateAsync), cancellationToken).ConfigureAwait(false)).Value;
+
+    /// <summary>
+    /// Creates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the created model.</returns>
+    public Task<Result<DataResult<TModel>>> CreateWithResultAsync(TModel model, CancellationToken cancellationToken = default) => CreateWithResultAsync(Args, model, cancellationToken);
+
+    /// <summary>
+    /// Creates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the created model.</returns>
+    public Task<Result<DataResult<TModel>>> CreateWithResultAsync(EfDbArgs args, TModel model, CancellationToken cancellationToken = default) => CreateWithResultInternalAsync(args, model, nameof(CreateWithResultAsync), cancellationToken);
+
+    /// <summary>
+    /// Creates the model (internal).
+    /// </summary>
+    private async Task<Result<DataResult<TModel>>> CreateWithResultInternalAsync(EfDbArgs args, TModel model, string memberName, CancellationToken cancellationToken)
+    {
+        model.ThrowIfNull();
+
+        if (model is IReadOnlyLogicallyDeleted ld && ld.IsDeleted)
+            throw new InvalidOperationException($"Cannot create a model with a deleted state; {nameof(ILogicallyDeleted.IsDeleted)} must be false.");
+
+        args.CheckRefreshAndSaveChangesCombination();
+
+        return await EfDb.Invoker.InvokeAsync(EfDb, args, async (_, args, cancellationToken) =>
+        {
+            // Prepare the model.
+            var br = Options.OnBeforeCreateOrUpdate(model, OperationType.Create);
+            if (br.IsFailure)
+                return br;
+
+            Mapper.MapChangeLogInto(ChangeLog.Empty, model);
+            Model.PrepareCreate(model, EfDb.ExecutionContext);
+
+            // Check model is valid.
+            var r = CheckModel(args, model, OperationType.Create);
+            if (r.IsFailure)
+                return r.Bind();
+
+            // EF add (create).
+            EfDb.DbContext.Add(model);
+
+            if (args.SaveChanges)
+                await EfDb.DbContext.SaveChangesAsync(true, cancellationToken).ConfigureAwait(false);
+
+            // Refresh as required.
+            var pr = await RefreshPostMutationAsync(args, model, memberName, cancellationToken).ConfigureAwait(false);
+            return pr.ThenAs(m => new DataResult<TModel>(m, true));
+        }, cancellationToken, memberName).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.Delete.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.Delete.cs
new file mode 100644
index 00000000..a60ddb48
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.Delete.cs
@@ -0,0 +1,94 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbModel<TModel>
+{
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<DataResult> DeleteAsync(CompositeKey key, CancellationToken cancellationToken = default) => DeleteAsync(Args, key, cancellationToken);
+
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public async Task<DataResult> DeleteAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => (await DeleteWithResultInternalAsync(args, key, nameof(DeleteAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
+
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<Result<DataResult>> DeleteWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => DeleteWithResultAsync(Args, key, cancellationToken);
+
+    /// <summary>
+    /// Deletes the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="DataResult"/></returns>
+    /// <remarks>A delete is considered idempotent and as such no <see cref="NotFoundException"/> will be thrown. The returning <see cref="DataResult.WasMutated"/> is informational only.</remarks>
+    public Task<Result<DataResult>> DeleteWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => DeleteWithResultInternalAsync(args, key, nameof(DeleteWithResultAsync), cancellationToken);
+
+    /// <summary>
+    /// Deletes the model (internal).
+    /// </summary>
+    private async Task<Result<DataResult>> DeleteWithResultInternalAsync(EfDbArgs args, CompositeKey key, string memberName, CancellationToken cancellationToken = default) => await EfDb.Invoker.InvokeAsync(EfDb, args, async (_, args, cancellationToken) =>
+    {
+        // Check (find) to determine if the model exists.
+        var model = await EfDb.DbContext.FindAsync<TModel>([.. key.Args], cancellationToken).ConfigureAwait(false);
+        var cmr = CheckModel(args, model, OperationType.Delete, treatNullAsNotFound: true);
+
+        // Where not found, return false (a delete is considered idempotent).
+        if (cmr.IsNotFoundError)
+            return Result.Ok(DataResult.False);
+
+        if (cmr.IsFailure)
+            return cmr.Bind();
+
+        // Delete or logical delete as appropriate.
+        try
+        {
+            switch (Options.LogicalDeleteSupport)
+            {
+                // Physical delete.
+                case FeatureSupport.NotSupported:
+                    EfDb.DbContext.Remove(model!);
+                    break;
+
+                // Logical delete (ambiguous exception).
+                case FeatureSupport.ReadOnly:
+                    throw new InvalidOperationException($"The '{nameof(Options)}.{nameof(Options.LogicalDeleteSupport)}' is set to '{nameof(FeatureSupport.ReadOnly)}' which is ambiguous for a delete operation; the model must implement '{nameof(ILogicallyDeleted)}' not '{nameof(IReadOnlyLogicallyDeleted)}'.");
+
+                // Logical delete (update).
+                case FeatureSupport.Mutable:
+                    var ld = (ILogicallyDeleted)model!;
+                    ld.IsDeleted = true;
+                    Model.PrepareUpdate(model, EfDb.ExecutionContext);
+
+                    EfDb.DbContext.Update(model!);
+                    break;
+            }
+
+            if (args.SaveChanges)
+                await EfDb.DbContext.SaveChangesAsync(true, cancellationToken).ConfigureAwait(false);
+
+            return Result.Ok(DataResult.True);
+        }
+        catch (NotFoundException)
+        {
+            // A hopefully rare, but expected and OK behavior; swallowing is intended here.
+            return Result.Ok(DataResult.False);
+        }
+    }, cancellationToken, memberName).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.Get.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.Get.cs
new file mode 100644
index 00000000..404be74d
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.Get.cs
@@ -0,0 +1,52 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbModel<TModel>
+{
+    /// <summary>
+    /// Gets the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The model where found; otherwise, <see langword="null"/>.</returns>
+    public Task<TModel?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetAsync(Args, key, cancellationToken);
+
+    /// <summary>
+    /// Gets the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The model where found; otherwise, <see langword="null"/>.</returns>
+    public async Task<TModel?> GetAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default)
+        => (await GetWithResultInternalAsync(args, key, nameof(GetAsync), false, cancellationToken).ConfigureAwait(false)).Value;
+
+    /// <summary>
+    /// Gets the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The model.</returns>
+    public Task<Result<TModel>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetWithResultAsync(Args, key, cancellationToken);
+
+    /// <summary>
+    /// Gets the model for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The model.</returns>
+    public async Task<Result<TModel>> GetWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default)
+        => (await GetWithResultInternalAsync(args, key, nameof(GetWithResultAsync), true, cancellationToken).ConfigureAwait(false)).ThenAs(v => v!);
+
+    /// <summary>
+    /// Gets the model (internal).
+    /// </summary>
+    private async Task<Result<TModel?>> GetWithResultInternalAsync(EfDbArgs args, CompositeKey key, string memberName, bool treatNullAsNotFound, CancellationToken cancellationToken) => await EfDb.Invoker.InvokeAsync(EfDb, args.ThrowIfNull(), async (_, args, cancellationToken) =>
+    {
+        var model = await EfDb.DbContext.FindAsync<TModel>([.. key.Args], cancellationToken).ConfigureAwait(false);
+        if (args.ClearChangeTrackerAfterGet)
+            EfDb.DbContext.ChangeTracker.Clear();
+
+        return CheckModel(args, model, OperationType.Get, treatNullAsNotFound);
+    }, cancellationToken, memberName).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.Query.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.Query.cs
new file mode 100644
index 00000000..96424e84
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.Query.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbModel<TModel>
+{
+    /// <summary>
+    /// Gets the <see cref="IQueryable{T}"/> for the model.
+    /// </summary>
+    /// <param name="args">The optional <see cref="EfDbArgs"/>.</param>
+    /// <returns>The <see cref="IQueryable{T}"/> for the model.</returns>
+    /// <remarks>This automatically applies any applicable <see cref="Options"/> filters; see <see cref="EfDbModelOptions{TModel}.ApplyFilters"/>.</remarks>
+    public IQueryable<TModel> Query(EfDbArgs? args = null)
+    {
+        args ??= Args;
+        return Options.ApplyFilters(args, args.QueryTracking ? EfDb.DbContext.Set<TModel>() : EfDb.DbContext.Set<TModel>().AsNoTracking());
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IQueryable{T}"/> for the model with tracking explicitly enabled (i.e. <see cref="EfDbArgs.QueryTracking"/> is <see langword="true"/>).
+    /// </summary>
+    /// <param name="args">The optional <see cref="EfDbArgs"/>.</param>
+    /// <returns>The <see cref="IQueryable{T}"/> for the model with tracking enabled.</returns>
+    /// <remarks>This automatically applies any applicable <see cref="Options"/> filters; see <see cref="EfDbModelOptions{TModel}.ApplyFilters"/>. The <paramref name="args"/> <see cref="EfDbArgs.QueryTracking"/>
+    /// is set (overridden) to <see langword="true"/>.</remarks>
+    public IQueryable<TModel> QueryTracked(EfDbArgs? args = null) => Query((args ?? Args) with { QueryTracking = true });
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.Update.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.Update.cs
new file mode 100644
index 00000000..48a78ff8
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.Update.cs
@@ -0,0 +1,105 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbModel<TModel>
+{
+    /// <summary>
+    /// Updates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the updated model.</returns>
+    public Task<DataResult<TModel>> UpdateAsync(TModel model, CancellationToken cancellationToken = default) => UpdateAsync(Args, model, cancellationToken);
+
+    /// <summary>
+    /// Updates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the updated model.</returns>
+    public async Task<DataResult<TModel>> UpdateAsync(EfDbArgs args, TModel model, CancellationToken cancellationToken = default) => (await UpdateWithResultInternalAsync(args, model, nameof(UpdateAsync), cancellationToken).ConfigureAwait(false)).Value;
+
+    /// <summary>
+    /// Updates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the updated model.</returns>
+    public Task<Result<DataResult<TModel>>> UpdateWithResultAsync(TModel model, CancellationToken cancellationToken = default) => UpdateWithResultAsync(Args, model, cancellationToken);
+
+    /// <summary>
+    /// Updates the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the updated model.</returns>
+    public Task<Result<DataResult<TModel>>> UpdateWithResultAsync(EfDbArgs args, TModel model, CancellationToken cancellationToken = default) => UpdateWithResultInternalAsync(args, model, nameof(UpdateWithResultAsync), cancellationToken);
+
+    /// <summary>
+    /// Updates the model (internal).
+    /// </summary>
+    private async Task<Result<DataResult<TModel>>> UpdateWithResultInternalAsync(EfDbArgs args, TModel model, string memberName, CancellationToken cancellationToken)
+    {
+        model.ThrowIfNull();
+
+        if (model is IReadOnlyLogicallyDeleted ld && ld.IsDeleted)
+            throw new InvalidOperationException($"Cannot update a model and set to the deleted state ({nameof(ILogicallyDeleted.IsDeleted)} must be false); use the delete operation to perform.");
+
+        args.CheckRefreshAndSaveChangesCombination();
+
+        return await EfDb.Invoker.InvokeAsync(EfDb, args, async (_, args, cancellationToken) =>
+        {
+            // Determine whether the model is already being tracked by EF and handle accordingly.
+            switch (EfDb.DbContext.Entry(model).State)
+            {
+                // Where detached, we need to find the tracked entity and copy the values across.
+                case Microsoft.EntityFrameworkCore.EntityState.Detached:
+                    // Check (find) to ensure that the model exists.
+                    var found = await EfDb.DbContext.FindAsync<TModel>([.. Options.GetKeyFromModel(model).Args], cancellationToken).ConfigureAwait(false);
+                    var dr = CheckModel(args, found, OperationType.Get, treatNullAsNotFound: true);
+                    if (dr.IsFailure)
+                        return dr.Bind();
+
+                    // Guard against null; should never be null here.
+                    found.ThrowIfNull();
+
+                    // Check optimistic concurrency of etag/row-version to ensure valid.
+                    if (model is IReadOnlyETag etag && !ETag.TryCompare(etag, (IReadOnlyETag)found))
+                        return Result.ConcurrencyError();
+
+                    // Apply the updates into the found (tracked) entity.
+                    if (!Options.MapModelForUpdate(model, found))
+                        return Result.Ok(new DataResult<TModel>(model!, false));
+
+                    // Use the found (tracked) as the model going forward.
+                    model = found;
+                    break;
+
+                // Where attached and is unchanged then exit as there is nothing to do.
+                case Microsoft.EntityFrameworkCore.EntityState.Unchanged:
+                    return Result.Ok(new DataResult<TModel>(model!, false));
+            }
+
+            // Prepare the model.
+            var br = Options.OnBeforeCreateOrUpdate(model, OperationType.Update);
+            if (br.IsFailure)
+                return br;
+
+            Model.PrepareUpdate(model, EfDb.ExecutionContext);
+            var r = CheckModel(args, model, OperationType.Update);
+            if (r.IsFailure)
+                return r.Bind();
+
+            // EF update.
+            EfDb.DbContext.Update(model);
+
+            if (args.SaveChanges)
+                await EfDb.DbContext.SaveChangesAsync(true, cancellationToken).ConfigureAwait(false);
+
+            // Refresh as required.
+            var pr = await RefreshPostMutationAsync(args, model, memberName, cancellationToken).ConfigureAwait(false);
+            return pr.ThenAs(m => new DataResult<TModel>(m, true));
+        }, cancellationToken, memberName).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.Upsert.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.Upsert.cs
new file mode 100644
index 00000000..0aba2ad8
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.Upsert.cs
@@ -0,0 +1,56 @@
+namespace CoreEx.EntityFrameworkCore;
+
+public partial class EfDbModel<TModel>
+{
+    /// <summary>
+    /// Upserts the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the upserted model.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public Task<DataResult<TModel>> UpsertAsync(TModel model, CancellationToken cancellationToken = default) => UpsertAsync(Args, model, cancellationToken);
+
+    /// <summary>
+    /// Upserts the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the upserted model.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public async Task<DataResult<TModel>> UpsertAsync(EfDbArgs args, TModel model, CancellationToken cancellationToken = default) => (await UpsertWithResultInternalAsync(args, model, nameof(UpsertAsync), cancellationToken).ConfigureAwait(false)).Value;
+
+    /// <summary>
+    /// Upserts the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the upserted model.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public Task<Result<DataResult<TModel>>> UpsertWithResultAsync(TModel model, CancellationToken cancellationToken = default) => UpsertWithResultAsync(Args, model, cancellationToken);
+
+    /// <summary>
+    /// Upserts the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="DataResult{TModel}"/> containing the upserted model.</returns>
+    /// <remarks>An upsert operation will attempt to update the model if it exists, and then create a new model if it does not (i.e. the create results in a <see cref="NotFoundException"/>). Note: It is <i>not</i> a single atomic operation.</remarks>
+    public Task<Result<DataResult<TModel>>> UpsertWithResultAsync(EfDbArgs args, TModel model, CancellationToken cancellationToken = default) => UpsertWithResultInternalAsync(args, model, nameof(UpsertWithResultAsync), cancellationToken);
+
+    /// <summary>
+    /// Upserts the model (internal).
+    /// </summary>
+    private async Task<Result<DataResult<TModel>>> UpsertWithResultInternalAsync(EfDbArgs args, TModel model, string memberName, CancellationToken cancellationToken)
+    {
+        model.ThrowIfNull();
+
+        return await EfDb.Invoker.InvokeAsync(EfDb, args, (_, args, cancellationToken) =>
+        {
+            return Result.GoAsync(() => UpdateWithResultAsync(args, model, cancellationToken))
+                .OnFailureAsync(r => r.IsNotFoundError ? CreateWithResultAsync(args, model, cancellationToken) : r.AsTask());
+        }, cancellationToken, memberName).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModel.cs b/src/CoreEx.EntityFrameworkCore/EfDbModel.cs
index b1732a6c..c08a4df4 100644
--- a/src/CoreEx.EntityFrameworkCore/EfDbModel.cs
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModel.cs
@@ -1,110 +1,94 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.EntityFrameworkCore;
 
-using CoreEx.Entities;
-using CoreEx.Results;
-
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Provides the extended <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> model functionality.
+/// </summary>
+/// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+public sealed partial class EfDbModel<TModel> where TModel : class
 {
     /// <summary>
-    /// Provides a lightweight typed <b>Entity Framework</b> wrapper over the <see cref="IEfDb"/> operations that are <typeparamref name="TModel"/>-specific.
+    /// Initializes a new instance of the <see cref="EfDbModel{TModel}"/> class.
     /// </summary>
-    /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-    /// <param name="efDb">The <see cref="IEfDb"/>.</param>
-    public readonly struct EfDbModel<TModel>(IEfDb efDb) where TModel : class, new()
+    /// <param name="efDb">The owning <see cref="IEfDb"/></param>
+    /// <param name="options">The <see cref="EfDbModelOptions{TModel}"/>.</param>
+    internal EfDbModel(IEfDb efDb, EfDbModelOptions<TModel> options)
     {
-        /// <inheritdoc/>
-        public IEfDb EfDb { get; } = efDb.ThrowIfNull(nameof(efDb));
-
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="EfDbQuery{TModel}"/>.</returns>
-        public EfDbQuery<TModel> Query(Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => Query(new EfDbArgs(EfDb.DbArgs), query);
-
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <param name="queryArgs">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="EfDbQuery{TModel}"/>.</returns>
-        public EfDbQuery<TModel> Query(EfDbArgs queryArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => new(EfDb, queryArgs, query);
-
-        #region Standard
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<TModel?> GetAsync(params object?[] keys) => GetAsync(keys, default);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<TModel?> GetAsync(object?[] keys, CancellationToken cancellationToken = default) => GetAsync(CompositeKey.Create(keys), cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<TModel?> GetAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetAsync(new EfDbArgs(EfDb.DbArgs), key, cancellationToken);
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<TModel?> GetAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default)
-            => EfDb.GetAsync<TModel>(args, key, cancellationToken);
-
-        #endregion
+        EfDb = efDb.ThrowIfNull();
+        Options = options.ThrowIfNull();
+    }
 
-        #region WithResult
+    /// <summary>
+    /// Gets the <see cref="IEfDb"/>.
+    /// </summary>
+    public IEfDb EfDb { get; }
 
-        /// <summary>
-        /// Gets the model for the specified <paramref name="keys"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c>.</returns>
-        public Task<Result<TModel?>> GetWithResultAsync(params object?[] keys) => GetWithResultAsync(keys, default);
+    /// <summary>
+    /// Gets the <see cref="EfDbModelOptions{TModel}"/>.
+    /// </summary>
+    public EfDbModelOptions<TModel> Options { get; }
 
-        /// <summary>
-        /// Gets the model for the specified <paramref name="keys"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c>.</returns>
-        public Task<Result<TModel?>> GetWithResultAsync(object?[] keys, CancellationToken cancellationToken = default) => GetWithResultAsync(CompositeKey.Create(keys), cancellationToken);
+    /// <summary>
+    /// Gets the default <see cref="EfDbArgs"/>.
+    /// </summary>
+    /// <remarks>Uses the <see cref="EfDbModelOptions{TModel}.Args"/> where specified; otherwise, the <see cref="EfDbOptions.Args"/>.</remarks>
+    public EfDbArgs Args => Options.Args ?? EfDb.Options.Args;
 
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<Result<TModel?>> GetWithResultAsync(CompositeKey key, CancellationToken cancellationToken = default) => GetWithResultAsync(new EfDbArgs(EfDb.DbArgs), key, cancellationToken);
+    /// <summary>
+    /// Checks (ensures) that the <paramref name="model"/> is valid.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="operationType">The <see cref="OperationType"/>.</param>
+    /// <param name="treatNullAsNotFound">Indicates whether to treat a <see langword="null"/> model as a not found error.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    [return: NotNullIfNotNull(nameof(model))]
+    public Result<TModel?> CheckModel(EfDbArgs args, TModel? model, OperationType operationType, bool treatNullAsNotFound = false)
+    {
+        if (model is null)
+            return treatNullAsNotFound ? Result.NotFoundError() : Result.Ok<TModel?>(null);
+
+        // Check valid tenant where multi-tenancy is being used.
+        if (model is IReadOnlyTenantId tenant)
+        {
+            model.ThrowWhen(_ => string.IsNullOrEmpty(tenant.TenantId), $"{nameof(ITenantId.TenantId)} must be specified.");
+            if (tenant.TenantId != ExecutionContext.Current.TenantId)
+                return treatNullAsNotFound ? Result.NotFoundError() : Result.Ok<TModel?>(null);
+        }
+
+        // Check not logically deleted.
+        if (model is IReadOnlyLogicallyDeleted ld && ld.IsDeleted)
+            return treatNullAsNotFound ? Result.NotFoundError() : Result.Ok<TModel?>(null);
+
+        // Check filters.
+        return Options.CheckFilters(args, model, operationType)
+            .OnFailure(fr =>
+            {
+                if (fr.IsNotFoundError)
+                    return treatNullAsNotFound ? fr : Result.Ok<TModel?>(null);
+                else
+                    return fr;
+            });
+    }
 
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> and <see cref="ILogicallyDeleted.IsDeleted"/> is <c>true</c> then <c>null</c> will be returned.</remarks>
-        public Task<Result<TModel?>> GetWithResultAsync(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) => EfDb.GetWithResultAsync<TModel>(args, key, cancellationToken);
+    /// <summary>
+    /// Refreshes the model post-mutation (as required).
+    /// </summary>
+    private async Task<Result<TModel>> RefreshPostMutationAsync(EfDbArgs args, TModel model, string memberName, CancellationToken cancellationToken)
+    {
+        // Refresh the model as requested.
+        if (args.Refresh && Options.GetKeyFromModel(model) is CompositeKey key)
+            return Result.Go((await GetWithResultInternalAsync(args, key, memberName, treatNullAsNotFound: true, cancellationToken).ConfigureAwait(false)).ThenAs(v => v!));
 
-        #endregion
+        // Return the current model.
+        return Result.Ok(model);
     }
-}
\ No newline at end of file
+
+    /// <summary>
+    /// Creates a <see cref="EfDbMappedModel{T, TModel, TBiDirectionMapper}"/> that provides mapped <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> operations (Create, Read, Update and Delete).
+    /// </summary>
+    /// <typeparam name="T">The mapped <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TBiDirectionMapper">The <see cref="IBiDirectionMapper{TSource, TDestination}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="BiDirectionMapper{TSource, TDestination}"/>.</param>
+    /// <returns>The <see cref="EfDbMappedModel{T, TModel, TBiDirectionMapper}"/>.</returns>
+    public EfDbMappedModel<T, TModel, TBiDirectionMapper> ToMappedModel<T, TBiDirectionMapper>(TBiDirectionMapper mapper) where T : class  where TBiDirectionMapper : IBiDirectionMapper<T, TModel> => new(this, mapper);
+}
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModelOptions.cs b/src/CoreEx.EntityFrameworkCore/EfDbModelOptions.cs
new file mode 100644
index 00000000..5008deae
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbModelOptions.cs
@@ -0,0 +1,249 @@
+namespace CoreEx.EntityFrameworkCore;
+
+/// <summary>
+/// Provides options for the <see cref="EfDbModel{TModel}"/>.
+/// </summary>
+public class EfDbModelOptions<TModel> where TModel : class
+{
+    private readonly List<(Func<IQueryable<TModel>, IQueryable<TModel>> Filter, Func<TModel, OperationType, Result>? NonQueryResult, bool AllowFilterBypass)> _filters = [];
+    private Func<TModel, CompositeKey> _getKey = m => m is IEntityKey ek ? ek.EntityKey : throw new InvalidOperationException($"The model does not implement {nameof(IEntityKey)}; as such, the {nameof(WithGetKey)} must be specified to enable.");
+    private Func<TModel, OperationType, Result>? _onBeforeCreateOrUpdate;
+    private Func<TModel, TModel, bool>? _updateModelMapper;
+
+    /// <summary>
+    /// Indicates whether <see cref="ILogicallyDeleted"/> and/or <see cref="IReadOnlyLogicallyDeleted"/> is supported for the <typeparamref name="TModel"/>.
+    /// </summary>
+    public FeatureSupport LogicalDeleteSupport { get; } = FeatureSupport.Determine<TModel, ILogicallyDeleted, IReadOnlyLogicallyDeleted>();
+
+    /// <summary>
+    /// Indicates whether <see cref="ITenantId"/> and/or <see cref="IReadOnlyTenantId"/> is supported for the <typeparamref name="TModel"/>.
+    /// </summary>
+    public FeatureSupport TenantSupport { get; } = FeatureSupport.Determine<TModel, ITenantId, IReadOnlyTenantId>();
+
+    /// <summary>
+    /// Indicates whether <see cref="ITypeDiscriminator"/> and/or <see cref="IReadOnlyTypeDiscriminator"/> is supported for the <typeparamref name="TModel"/>.
+    /// </summary>
+    public FeatureSupport TypeDiscriminatorSupport { get; } = FeatureSupport.Determine<TModel, ITypeDiscriminator, IReadOnlyTypeDiscriminator>();
+
+    /// <summary>
+    /// Indicates whether <see cref="IETag"/> and/or <see cref="IReadOnlyETag"/> is supported for the <typeparamref name="TModel"/>.
+    /// </summary>
+    public FeatureSupport ETagSupport { get; } = FeatureSupport.Determine<TModel, IETag, IReadOnlyETag>();
+
+    /// <summary>
+    /// Indicates whether <see cref="Entities.Abstractions.IIdentifier"/> and/or <see cref="Entities.Abstractions.IReadOnlyIdentifier"/> is supported for the <typeparamref name="TModel"/>.
+    /// </summary>
+    public FeatureSupport IdentifierSupport { get; } = FeatureSupport.Determine<TModel, Entities.Abstractions.IIdentifier, Entities.Abstractions.IReadOnlyIdentifier>();
+
+    /// <summary>
+    /// Gets the default <see cref="EfDbArgs"/>.
+    /// </summary>
+    public EfDbArgs? Args { get; private set; }
+
+    /// <summary>
+    /// Sets (overrides) the default <see cref="Args"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    public EfDbModelOptions<TModel> WithArgs(EfDbArgs? args)
+    {
+        Args = args;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets (overrides) the function to get the <see cref="CompositeKey"/> for the <typeparamref name="TModel"/>.
+    /// </summary>
+    /// <param name="getKey">The function to get the key.</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>By default, where the <typeparamref name="TModel"/> implements <see cref="IEntityKey"/>, that is used; otherwise, an <see cref="InvalidOperationException"/> is thrown.</remarks>
+    public EfDbModelOptions<TModel> WithGetKey(Func<TModel, CompositeKey> getKey)
+    {
+        _getKey = getKey.ThrowIfNull();
+        return this;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="CompositeKey"/> from the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="model">The model.</param>
+    /// <returns>The <see cref="CompositeKey"/>.</returns>
+    public CompositeKey GetKeyFromModel(TModel model) => _getKey(model.ThrowIfNull());
+
+    /// <summary>
+    /// Adds a filter to be applied to all operations (get, create, update, delete, and query).
+    /// </summary>
+    /// <param name="filter">The filter query to apply.</param>
+    /// <param name="nonQueryResult">The optional <see cref="Result"/> to return for non-query operations when the filter excludes.</param>
+    /// <param name="allowFilterBypass">Indicates whether the filter can be bypassed via the <see cref="EfDbArgs.BypassFilters"/>; defaults to <see langword="false"/>.</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="nonQueryResult"/> enables different results to be returned for non-query operations when the filter excludes; for example, a <see cref="Result.AuthenticationError"/> 
+    /// could be returned for an authorization filter. Where a <paramref name="nonQueryResult"/> is <i>not</i> specified then the specified <paramref name="filter"/> is only applied for queries.
+    /// <para>This is not a replacement for EF Core's built-in filtering mechanisms (see <see href="https://learn.microsoft.com/en-us/ef/core/querying/filters"/>); but, should be considered additive. EF built-in filtering can be used
+    /// to enable the likes of logical delete and tenant support to ensure the broadest usage. Note that the <see cref="EfDbModel{TModel}"/> non-query operations handle the logical delete (<see cref="ILogicallyDeleted"/>) and
+    /// tenant (<see cref="ITenantId"/>) checks automatically internally.</para>
+    /// <para>The <see cref="EfDbArgs.BypassFilters"/> can be used to bypass these filters for queries as required.</para>
+    /// <para>Each filter is applied individually in the order specified.</para>
+    /// </remarks>
+    public EfDbModelOptions<TModel> WithFilter(Func<IQueryable<TModel>, IQueryable<TModel>> filter, Func<TModel, OperationType, Result>? nonQueryResult = null, bool allowFilterBypass = true)
+    {
+        _filters.Add((filter.ThrowIfNull(), nonQueryResult, allowFilterBypass));
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a logical delete (<see cref="ILogicallyDeleted.IsDeleted"/>) query-only filter (where <see cref="LogicalDeleteSupport"/> is supported).
+    /// </summary>
+    /// <param name="allowFilterBypass">Indicates whether the filter can be bypassed via the <see cref="EfDbArgs.BypassFilters"/>; defaults to <see langword="false"/>.</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    public EfDbModelOptions<TModel> WithLogicalDeleteFilter(bool allowFilterBypass = false)
+    {
+        if (LogicalDeleteSupport.IsSupported)
+            WithFilter(q => q.Where(m => !((IReadOnlyLogicallyDeleted)m).IsDeleted), allowFilterBypass: allowFilterBypass);
+        else
+            throw new NotSupportedException($"{nameof(WithLogicalDeleteFilter)} is not supported; model must implement {nameof(IReadOnlyLogicallyDeleted)} to enable.");
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a tenant (<see cref="IReadOnlyTenantId.TenantId"/>) query-only filter (where <see cref="TenantSupport"/> is supported).
+    /// </summary>
+    /// <param name="allowFilterBypass">Indicates whether the filter can be bypassed via the <see cref="EfDbArgs.BypassFilters"/>; defaults to <see langword="false"/>.</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    public EfDbModelOptions<TModel> WithTenantFilter(bool allowFilterBypass = false)
+    {
+        if (TenantSupport.IsSupported)
+        {
+            WithFilter(q =>
+            {
+                var tenantId = ExecutionContext.Current.TenantId;
+                return q.Where(m => ((IReadOnlyTenantId)m).TenantId == tenantId);
+            }, allowFilterBypass: allowFilterBypass);
+        }
+        else
+            throw new NotSupportedException($"{nameof(WithTenantFilter)} is not supported; model must implement {nameof(IReadOnlyTenantId)} to enable.");
+
+        return this;
+    }
+
+    /// <summary>
+    /// Indicates whether any filters have been specified.
+    /// </summary>
+    /// <returns><see langword="true"/> indicates that an authorization filter has been specified; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>See <see cref="WithFilter"/> for more information.</remarks>
+    public bool HasFilters => _filters.Count > 0;
+
+    /// <summary>
+    /// Applies the filters to the <paramref name="query"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="query">The <see cref="IQueryable{TModel}"/>.</param>
+    /// <returns>The filtered <see cref="IQueryable{TModel}"/>.</returns>
+    /// <remarks>This applies all specified filters to the <paramref name="query"/> excluding the non-query result handling; unless, <see cref="EfDbArgs.BypassFilters"/> is set to <see langword="true"/>.
+    /// <para>See <see cref="WithFilter"/> for more information.</para></remarks>
+    public IQueryable<TModel> ApplyFilters(EfDbArgs args, IQueryable<TModel> query)
+    {
+        query.ThrowIfNull();
+        if (!HasFilters)
+            return query;
+
+        foreach (var (filter, _, allowFilterBypass) in _filters)
+        {
+            // Bypass filter where selected to do so and allowed.
+            if (args.BypassFilters && allowFilterBypass)
+                continue;
+
+            // Apply the filter.
+            query = filter(query);
+        }
+
+        return query;
+    }
+
+    /// <summary>
+    /// Checks the non-query filters against the <paramref name="model"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <param name="model">The model.</param>
+    /// <param name="operationType">The <see cref="OperationType"/>.</param>
+    /// <returns>The <see cref="Result"/> of the filters check.</returns>
+    /// <remarks>This checks all specified filters against the <paramref name="model"/> and executes the corresponding non-query result handling.
+    /// <para>See <see cref="WithFilter"/> for more information.</para></remarks>
+    public Result<TModel?> CheckFilters(EfDbArgs args, TModel? model, OperationType operationType)
+    {
+        if (model is null || !HasFilters)
+            return Result.Ok(model);
+
+        var q = new[] { model.ThrowIfNull() }.AsQueryable();
+
+        foreach (var (filter, nonQueryResult, allowFilterBypass) in _filters)
+        {
+            // Bypass filter where selected to do so and allowed.
+            if (args.BypassFilters && allowFilterBypass)
+                continue;
+
+            // Apply the filter to the single model query; if no match, then carry on.
+            if (nonQueryResult is null || filter(q).Any())
+                continue;
+
+            // Match; so, return the non-query result (should be an error).
+            return nonQueryResult(model, operationType);
+        }
+
+        // Sweet!
+        return Result.Ok<TModel?>(model);
+    }
+
+    /// <summary>
+    /// Sets (or overrides) the function to perform processing on the model prior to create or update.
+    /// </summary>
+    /// <param name="onBeforeCreateOrUpdate">The function.</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    public EfDbModelOptions<TModel> WithOnBeforeCreateOrUpdate(Func<TModel, OperationType, Result> onBeforeCreateOrUpdate)
+    {
+        _onBeforeCreateOrUpdate = onBeforeCreateOrUpdate.ThrowIfNull();
+        return this;
+    }
+
+    /// <summary>
+    /// Indicates whether <see cref="WithOnBeforeCreateOrUpdate(Func{TModel, OperationType, Result})"/> has been set.
+    /// </summary>
+    public bool HasOnBeforeCreateOrUpdate => _onBeforeCreateOrUpdate != null;
+
+    /// <summary>
+    /// Executes the <see cref="WithOnBeforeCreateOrUpdate(Func{TModel, OperationType, Result})"/> where set.
+    /// </summary>
+    /// <param name="model">The model value.</param>
+    /// <param name="operationType">The <see cref="OperationType"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    internal Result OnBeforeCreateOrUpdate(TModel model, OperationType operationType) => _onBeforeCreateOrUpdate?.Invoke(model, operationType) ?? Result.Success;
+
+    /// <summary>
+    /// Sets (or overrides) the action to map the updated model into the existing (just read) model.
+    /// </summary>
+    /// <param name="updateModelMapper">The function to map the updated model (left) into the existing model (right).</param>
+    /// <returns>The <see cref="EfDbModelOptions{TModel}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>
+    /// The <paramref name="updateModelMapper"/> function takes two parameters: the updated model (first parameter) and the existing model (second parameter) and returns a <see cref="bool"/> indicating whether any changes were made.
+    /// <para>This enables custom mapping logic to be specified for update operations; otherwise, by default, <see cref="Metadata.RuntimeMetadata.TryCopyInto{TFrom, TInto}(TFrom, TInto)"/> is used internally.</para></remarks>
+    public EfDbModelOptions<TModel> WithUpdateModelMapper(Func<TModel, TModel, bool> updateModelMapper)
+    {
+        _updateModelMapper = updateModelMapper.ThrowIfNull();
+        return this;
+    }
+
+    /// <summary>
+    /// Maps the <paramref name="update"/> model into the <paramref name="existing"/> model.
+    /// </summary>
+    /// <param name="update">The updated model.</param>
+    /// <param name="existing">The existing model.</param>
+    /// <returns><see langword="true"/> where changes were made; otherwise, <see langword="false"/>.</returns>
+    internal bool MapModelForUpdate(TModel update, TModel existing)
+    {
+        if (_updateModelMapper is null)
+            return Metadata.RuntimeMetadata.TryCopyInto(update, existing);
+        else
+            return _updateModelMapper(update, existing);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbModelQuery.cs b/src/CoreEx.EntityFrameworkCore/EfDbModelQuery.cs
deleted file mode 100644
index 54837dae..00000000
--- a/src/CoreEx.EntityFrameworkCore/EfDbModelQuery.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using Microsoft.EntityFrameworkCore;
-
-namespace CoreEx.EntityFrameworkCore
-{
-    /// <summary>
-    /// Encapsulates an Entity Framework query enabling all select-like capabilities on a specified <typeparamref name="TModel"/>.
-    /// </summary>
-    /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-    /// <remarks>Queried entities by default are <see cref="EntityFrameworkQueryableExtensions.AsNoTracking{TEntity}(IQueryable{TEntity})">not tracked</see>; this behavior can be overridden using <see cref="EfDbArgs.QueryNoTracking"/>.
-    /// <para>Reminder: leverage <see cref="EntityFrameworkQueryableExtensions.IgnoreAutoIncludes{TEntity}(IQueryable{TEntity})"/> and then explictly include to improve performance where applicable.</para>
-    /// <para>Automatic filtering is applied using the <see cref="EfDbArgs.WhereModelValid"/>.</para></remarks>
-    public class EfDbQuery<TModel> where TModel : class, new()
-    {
-        private readonly Func<IQueryable<TModel>, IQueryable<TModel>>? _query;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EfDbQuery{T, TModel}"/> class.
-        /// </summary>
-        /// <param name="efdb">The <see cref="IEfDb"/>.</param>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="query">A function to modify the underlying <see cref="IQueryable{TModel}"/>.</param>
-        internal EfDbQuery(IEfDb efdb, EfDbArgs args, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null)
-        {
-            EfDb = efdb.ThrowIfNull(nameof(efdb));
-            Args = args;
-            _query = query;
-            Paging = null;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IEfDb"/>.
-        /// </summary>
-        public IEfDb EfDb { get; }
-
-        /// <summary>
-        /// Gets the <see cref="EfDbArgs"/>.
-        /// </summary>
-        public EfDbArgs Args { get; }
-
-        /// <summary>
-        /// Gets the <see cref="PagingResult"/>.
-        /// </summary>
-        public PagingResult? Paging { get; private set; }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <see cref="EfDbQuery{TModel}"/> to suport fluent-style method-chaining.</returns>
-        public EfDbQuery<TModel> WithPaging(PagingArgs? paging)
-        {
-            Paging = paging == null ? null : (paging is PagingResult pr ? pr : new PagingResult(paging));
-            return this;
-        }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The <see cref="EfDbQuery{TModel}"/> to suport fluent-style method-chaining.</returns>
-        public EfDbQuery<TModel> WithPaging(long skip, long? take = null) => WithPaging(PagingArgs.CreateSkipAndTake(skip, take));
-
-        /// <summary>
-        /// Manages the DbContext and underlying query construction and lifetime.
-        /// </summary>
-        private async Task<Result<TResult?>> ExecuteQueryAsync<TResult>(Func<IQueryable<TModel>, CancellationToken, Task<TResult?>> executeAsync, string memberName, CancellationToken cancellationToken) => await EfDb.Invoker.InvokeAsync(EfDb, EfDb, _query, Args, async (_, efdb, query, args, ct) =>
-        {
-            var dbSet = args.WhereModelValid(args.QueryNoTracking ? efdb.DbContext.Set<TModel>().AsNoTracking() : efdb.DbContext.Set<TModel>());
-            return Result<TResult?>.Ok(await executeAsync((query == null) ? dbSet : query(dbSet), ct).ConfigureAwait(false));
-        }, cancellationToken, memberName).ConfigureAwait(false);
-
-        /// <summary>
-        /// Executes the query and cleans.
-        /// </summary>
-        private async Task<Result<TModel?>> ExecuteQueryInternalAsync<TResult>(Func<IQueryable<TModel>, CancellationToken, Task<TResult?>> executeAsync, string memberName, CancellationToken cancellationToken)
-        {
-            var result = await ExecuteQueryAsync(executeAsync, memberName, cancellationToken).ConfigureAwait(false);
-            if (result.IsFailure)
-                return Result<TModel?>.Fail(result.Error);
-
-            return result.Value is TModel model ? model : default;
-        }
-
-        /// <summary>
-        /// Sets the paging from the <see cref="PagingArgs"/>.
-        /// </summary>
-        private static IQueryable<TModel> SetPaging(IQueryable<TModel> query, PagingArgs? paging)
-        {
-            if (paging == null)
-                return query;
-
-            var q = query;
-            if (paging.Skip > 0)
-                q = q.Skip((int)paging.Skip);
-
-            return q.Take((int)(paging == null ? PagingArgs.DefaultTake : paging.Take));
-        }
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<TModel> SelectSingleAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryInternalAsync(async (q, ct) => await q.SingleAsync(ct).ConfigureAwait(false), nameof(SelectSingleAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<Result<TModel>> SelectSingleWithResultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryInternalAsync(async (q, ct) => await q.SingleAsync(ct).ConfigureAwait(false), nameof(SelectSingleWithResultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<TModel?> SelectSingleOrDefaultAsync(CancellationToken cancellationToken = default)
-            => await ExecuteQueryInternalAsync((q, ct) => q.SingleOrDefaultAsync(ct), nameof(SelectSingleOrDefaultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public Task<Result<TModel?>> SelectSingleOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-            => ExecuteQueryInternalAsync((q, ct) => q.SingleOrDefaultAsync(ct), nameof(SelectSingleOrDefaultWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        public async Task<TModel> SelectFirstAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryInternalAsync(async (q, ct) => await q.FirstAsync(ct).ConfigureAwait(false), nameof(SelectFirstAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        public async Task<Result<TModel>> SelectFirstWithResultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryInternalAsync(async (q, ct) => await q.FirstAsync(ct).ConfigureAwait(false), nameof(SelectFirstWithResultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<TModel?> SelectFirstOrDefaultAsync(CancellationToken cancellationToken = default)
-            => await ExecuteQueryInternalAsync((q, ct) => q.FirstOrDefaultAsync(ct), nameof(SelectFirstOrDefaultAsync), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public Task<Result<TModel?>> SelectFirstOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-            => ExecuteQueryInternalAsync((q, ct) => q.FirstOrDefaultAsync(ct), nameof(SelectFirstOrDefaultWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async Task<TCollResult> SelectResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, TModel>, new() where TColl : ICollection<TModel>, new() => new TCollResult
-        {
-            Paging = Paging,
-            Items = (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectResultAsync), cancellationToken).ConfigureAwait(false)).Value
-        };
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async Task<Result<TCollResult>> SelectResultWithResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, TModel>, new() where TColl : ICollection<TModel>, new() => new TCollResult
-        {
-            Paging = Paging,
-            Items = (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectResultWithResultAsync), cancellationToken).ConfigureAwait(false)).Value
-        };
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <returns>A resultant collection.</returns>
-        public async Task<TColl> SelectQueryAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<TModel>, new()
-            => (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <returns>A resultant collection.</returns>
-        public Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<TModel>, new()
-            => SelectQueryWithResultInternalAsync<TColl>(nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<TColl>> SelectQueryWithResultInternalAsync<TColl>(string memberName, CancellationToken cancellationToken) where TColl : ICollection<TModel>, new()
-        {
-            var coll = new TColl();
-            return await SelectQueryWithResultInternalAsync(coll, memberName, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes a query adding to the passed collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="collection">The collection to add items to.</param>
-        /// <returns>The <paramref name="collection"/>.</returns>
-        public async Task<TColl> SelectQueryAsync<TColl>(TColl collection, CancellationToken cancellationToken = default) where TColl : ICollection<TModel>
-            => (await SelectQueryWithResultInternalAsync(collection, nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="collection">The collection to add items to.</param>
-        /// <returns>The <paramref name="collection"/>.</returns>
-        public Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(TColl collection, CancellationToken cancellationToken = default) where TColl : ICollection<TModel>
-            => SelectQueryWithResultInternalAsync(collection, nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<TColl>> SelectQueryWithResultInternalAsync<TColl>(TColl collection, string memberName, CancellationToken cancellationToken) where TColl : ICollection<TModel>
-        {
-            collection.ThrowIfNull(nameof(collection));
-
-            var result = await SelectQueryWithResultAsync(item =>
-            {
-                collection.Add(item);
-                return true;
-            }, memberName, cancellationToken).ConfigureAwait(false);
-
-            return result.ThenAs(() => collection);
-        }
-
-        /// <summary>
-        /// Executes a query with per <paramref name="item"/> processing
-        /// </summary>
-        /// <param name="item">The item function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>The <paramref name="item"/> returns a <see cref="bool"/> which indicates whether to continue enumerating. A <c>true</c> indicates
-        /// to continue, whilst a <c>false</c> indicates a stop. Where <see cref="Result{T}.IsFailure"/> then the error will be returned as-is.</remarks>
-        public async Task SelectQueryAsync(Func<TModel, bool> item, CancellationToken cancellationToken = default)
-            => (await SelectQueryWithResultAsync(model => item.ThrowIfNull(nameof(item))(model), nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Executes a query with per <paramref name="item"/> processing with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="item">The item function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>The <paramref name="item"/> returns a <see cref="Result{T}"/> where the corresponding <see cref="Result{T}.Value"/> <see cref="bool"/> indicates whether to continue enumerating. A <c>true</c> indicates
-        /// to continue, whilst a <c>false</c> indicates a stop. Where <see cref="Result{T}.IsFailure"/> then the error will be returned as-is.</remarks>
-        public Task<Result> SelectQueryWithResultAsync(Func<TModel, Result<bool>> item, CancellationToken cancellationToken = default)
-            => SelectQueryWithResultAsync(item.ThrowIfNull(nameof(item)), nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a query with per <paramref name="item"/> processing.
-        /// </summary>
-        /// <param name="item">The item function.</param>
-        /// <param name="memberName">The member name.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>The <paramref name="item"/> returns a <see cref="Result{T}"/> where the corresponding <see cref="Result{T}.Value"/> <see cref="bool"/> indicates whether to continue enumerating. A <c>true</c> indicates
-        /// to continue, whilst a <c>false</c> indicates a stop. Where <see cref="Result{T}.IsFailure"/> then the error will be returned as-is.</remarks>
-        internal async Task<Result> SelectQueryWithResultAsync(Func<TModel, Result<bool>> item, string memberName, CancellationToken cancellationToken)
-        {
-            var result = await ExecuteQueryAsync<bool>(async (query, ct) =>
-            {
-                var q = SetPaging(query, Paging);
-                Result<bool> r = Result<bool>.None;
-
-                await foreach (var model in q.AsAsyncEnumerable().WithCancellation(ct))
-                {
-                    r = item(model);
-                    if (r.IsFailure || !r.Value)
-                        break;
-                }
-
-                if (r.IsSuccess && Paging != null && Paging.IsGetCount)
-                    Paging.TotalCount = query.LongCount();
-
-                return r;
-            }, memberName, cancellationToken);
-
-            return result.AsResult();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbOptions.cs b/src/CoreEx.EntityFrameworkCore/EfDbOptions.cs
new file mode 100644
index 00000000..38311bf5
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/EfDbOptions.cs
@@ -0,0 +1,66 @@
+namespace CoreEx.EntityFrameworkCore;
+
+/// <summary>
+/// Provides options for the <see cref="IEfDb"/>.
+/// </summary>
+public class EfDbOptions
+{
+    private readonly Lazy<ConcurrentDictionary<Type, object>> _models = new();
+
+    /// <summary>
+    /// Gets the default <see cref="EfDbArgs"/>.
+    /// </summary>
+    public EfDbArgs Args { get; private set; } = new();
+
+    /// <summary>
+    /// Sets (overrides) the default <see cref="Args"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="EfDbArgs"/>.</param>
+    /// <returns>The <see cref="EfDbOptions"/> to support fluent-style method-chaining.</returns>
+    public EfDbOptions WithArgs(EfDbArgs args)
+    {
+        Args = args with { };
+        return this;
+    }
+
+    /// <summary>
+    /// Adds (or updates) the <see cref="EfDbModelOptions{TModel}"/> for the specified <typeparamref name="TModel"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="configureOptions">The action to configure the <see cref="EfDbModelOptions{TModel}"/>.</param>
+    /// <returns>The <see cref="EfDbOptions"/> to support fluent-style method-chaining.</returns>
+    public EfDbOptions WithModel<TModel>(Action<EfDbModelOptions<TModel>>? configureOptions = null) where TModel : class
+    {
+        if (configureOptions is null)
+            return this;
+
+        var mo = GetOrAddModelOptions<TModel>();
+        configureOptions?.Invoke(mo);
+        return this;
+    }
+
+    /// <summary>
+    /// Gets or adds the <see cref="EfDbModelOptions{TModel}"/> for the specified <typeparamref name="TModel"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <returns>he <see cref="EfDbModelOptions{TModel}"/>.</returns>
+    public EfDbModelOptions<TModel> GetOrAddModelOptions<TModel>() where TModel : class => (EfDbModelOptions<TModel>)_models.Value.GetOrAdd(typeof(TModel), _ => new EfDbModelOptions<TModel>());
+    
+    /// <summary>
+    /// Tries to get <see cref="EfDbModelOptions{TModel}"/> for the specified <typeparamref name="TModel"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="modelOptions">The <see cref="EfDbModelOptions{TModel}"/> where found.</param>
+    /// <returns><see langword="true"/> where the <see cref="EfDbModelOptions{TModel}"/> was found; otherwise, <see langword="false"/>.</returns>
+    public bool TryGetModelOptions<TModel>([NotNullWhen(true)] out EfDbModelOptions<TModel>? modelOptions) where TModel : class
+    {
+        if (_models.Value.TryGetValue(typeof(TModel), out var mo))
+        {
+            modelOptions = (EfDbModelOptions<TModel>)mo;
+            return true;
+        }
+
+        modelOptions = null;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbQuery.cs b/src/CoreEx.EntityFrameworkCore/EfDbQuery.cs
deleted file mode 100644
index ec4ededc..00000000
--- a/src/CoreEx.EntityFrameworkCore/EfDbQuery.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.EntityFrameworkCore;
-
-namespace CoreEx.EntityFrameworkCore
-{
-    /// <summary>
-    /// Encapsulates an Entity Framework query enabling all select-like capabilities on a specified <typeparamref name="TModel"/> automatically mapping to the resultant <typeparamref name="T"/>.
-    /// </summary>
-    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-    /// <remarks>Queried entities by default are <see cref="EntityFrameworkQueryableExtensions.AsNoTracking{TEntity}(IQueryable{TEntity})">not tracked</see>; this behavior can be overridden using <see cref="EfDbArgs.QueryNoTracking"/>.
-    /// <para>Reminder: leverage <see cref="EntityFrameworkQueryableExtensions.IgnoreAutoIncludes{TEntity}(IQueryable{TEntity})"/> and then explictly include to improve performance where applicable.</para></remarks>
-    public class EfDbQuery<T, TModel> where T : class, new() where TModel : class, new()
-    {
-        private readonly EfDbQuery<TModel> _query;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EfDbQuery{T, TModel}"/> struct.
-        /// </summary>
-        /// <param name="efdb">The <see cref="IEfDb"/>.</param>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="query">A function to modify the underlying <see cref="IQueryable{TModel}"/>.</param>
-        internal EfDbQuery(IEfDb efdb, EfDbArgs args, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) => _query = new EfDbQuery<TModel>(efdb, args, query);
-
-        /// <summary>
-        /// Gets the <see cref="IEfDb"/>.
-        /// </summary>
-        public IEfDb EfDb => _query.EfDb;
-
-        /// <summary>
-        /// Gets the <see cref="EfDbArgs"/>.
-        /// </summary>
-        public EfDbArgs Args => _query.Args;
-
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        public IMapper Mapper => EfDb.Mapper;
-
-        /// <summary>
-        /// Gets the <see cref="PagingResult"/>.
-        /// </summary>
-        public PagingResult? Paging => _query.Paging;
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <see cref="EfDbQuery{T, TModel}"/> to suport fluent-style method-chaining.</returns>
-        public EfDbQuery<T, TModel> WithPaging(PagingArgs? paging)
-        {
-            _query.WithPaging(paging);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The <see cref="EfDbQuery{T, TModel}"/> to suport fluent-style method-chaining.</returns>
-        public EfDbQuery<T, TModel> WithPaging(long skip, long? take = null) => WithPaging(PagingArgs.CreateSkipAndTake(skip, take));
-
-        /// <summary>
-        /// Executes the query and maps.
-        /// </summary>
-        private async Task<Result<TResult>> ExecuteQueryAndMapAsync<TResult, TModelResult>(Func<CancellationToken, Task<Result<TModelResult>>> executeAsync, CancellationToken cancellationToken)
-        {
-            var result = await executeAsync(cancellationToken).ConfigureAwait(false);
-            if (result.IsFailure)
-                return Result<TResult>.Fail(result.Error);
-
-            var val = result.Value == null ? default! : Mapper.Map<TResult>(result.Value, Mapping.OperationTypes.Get);
-            return Args.CleanUpResult ? Cleaner.Clean(val) : val;
-        }
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<T> SelectSingleAsync(CancellationToken cancellationToken = default)
-            => (await SelectSingleWithResultAsync(cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item.</returns>
-        public async Task<Result<T>> SelectSingleWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var q = _query;
-            return await ExecuteQueryAndMapAsync<T, TModel>(q.SelectSingleWithResultAsync, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<T?> SelectSingleOrDefaultAsync(CancellationToken cancellationToken = default)
-            => (await SelectSingleOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<Result<T?>> SelectSingleOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var q = _query;
-            return await ExecuteQueryAndMapAsync<T?, TModel?>(q.SelectSingleOrDefaultWithResultAsync, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        public async Task<T> SelectFirstAsync(CancellationToken cancellationToken = default)
-            => (await SelectFirstWithResultAsync(cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The first item.</returns>
-        public async Task<Result<T>> SelectFirstWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var q = _query;
-            return await ExecuteQueryAndMapAsync<T, TModel>(q.SelectFirstWithResultAsync, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<T?> SelectFirstOrDefaultAsync(CancellationToken cancellationToken = default)
-            => (await SelectFirstOrDefaultWithResultAsync(cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The single item or default.</returns>
-        public async Task<Result<T?>> SelectFirstOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-        {
-            var q = _query;
-            return await ExecuteQueryAndMapAsync<T?, TModel?>(q.SelectFirstOrDefaultWithResultAsync, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async Task<TCollResult> SelectResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new() => new TCollResult
-        {
-            Paging = _query.Paging,
-            Items = (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectResultAsync), cancellationToken).ConfigureAwait(false)).Value
-        };
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async Task<Result<TCollResult>> SelectResultWithResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new() => new TCollResult
-        {
-            Paging = _query.Paging,
-            Items = (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectResultWithResultAsync), cancellationToken).ConfigureAwait(false)).Value
-        };
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <returns>A resultant collection.</returns>
-        public async Task<TColl> SelectQueryAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-            => (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <returns>A resultant collection.</returns>
-        public Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-            => SelectQueryWithResultInternalAsync<TColl>(nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<TColl>> SelectQueryWithResultInternalAsync<TColl>(string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>, new()
-        {
-            var coll = new TColl();
-            return await SelectQueryWithResultInternalAsync(coll, memberName, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes a query adding to the passed collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="collection">The collection to add items to.</param>
-        /// <returns>The <paramref name="collection"/>.</returns>
-        public async Task<TColl> SelectQueryAsync<TColl>(TColl collection, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => (await SelectQueryWithResultInternalAsync(collection, nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="collection">The collection to add items to.</param>
-        /// <returns>The <paramref name="collection"/>.</returns>
-        public Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(TColl collection, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => SelectQueryWithResultInternalAsync(collection, nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async Task<Result<TColl>> SelectQueryWithResultInternalAsync<TColl>(TColl collection, string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>
-        {
-            collection.ThrowIfNull(nameof(collection));
-
-            var mapper = Mapper;
-
-            var result = await _query.SelectQueryWithResultAsync(item =>
-            {
-                var val = mapper.Map<TModel, T>(item, OperationTypes.Get);
-                if (val is null)
-                    return new InvalidOperationException("Mapping from the EF model must not result in a null value.");
-
-                collection.Add(val);
-                return true;
-            }, memberName, cancellationToken).ConfigureAwait(false);
-
-            return result.ThenAs(() => collection);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbQueryableExtensions.cs b/src/CoreEx.EntityFrameworkCore/EfDbQueryableExtensions.cs
deleted file mode 100644
index c7abacc1..00000000
--- a/src/CoreEx.EntityFrameworkCore/EfDbQueryableExtensions.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-
-namespace Microsoft.EntityFrameworkCore
-{
-    /// <summary>
-    /// Adds additional extension methods to <see cref="IQueryable{T}"/>.
-    /// </summary>
-    public static class EfDbQueryableExtensions
-    {
-        /// <summary>
-        /// Creates a <see cref="ICollectionResult"/> from a <see cref="IQueryable{TItem}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="query">The <see cref="IEnumerable{TItem}"/>.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A new collection that contains the elements from the input sequence.</returns>
-        public static async Task<TCollResult> ToCollectionResultAsync<TCollResult, TColl, TItem>(this IQueryable<TItem> query, PagingArgs? paging = null, CancellationToken cancellationToken = default)
-            where TCollResult : ICollectionResult<TItem>, new()
-            where TColl : ICollection<TItem>, new()
-        {
-            var result = new TCollResult { Paging = new PagingResult(paging) };
-
-            await foreach (var item in query.WithPaging(paging).AsAsyncEnumerable().WithCancellation(cancellationToken).ConfigureAwait(false))
-            {
-                result.Items.Add(item);
-            }
-
-            if (result.Paging.IsGetCount)
-                result.Paging.TotalCount = await query.LongCountAsync(cancellationToken).ConfigureAwait(false);
-
-            return result;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/EfDbServiceCollectionExtensions.cs b/src/CoreEx.EntityFrameworkCore/EfDbServiceCollectionExtensions.cs
deleted file mode 100644
index 598c2d5b..00000000
--- a/src/CoreEx.EntityFrameworkCore/EfDbServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.EntityFrameworkCore;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extenstion methods.
-    /// </summary>
-    public static class EfDbServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds the <typeparamref name="TEfDb"/> as a scoped service.
-        /// </summary>
-        /// <typeparam name="TEfDb">The corresponding entity framework <see cref="IEfDb"/> implementation <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
-        public static IServiceCollection AddEfDb<TEfDb>(this IServiceCollection services) where TEfDb : class, IEfDb => services.AddScoped<TEfDb>();
-
-        /// <summary>
-        /// Adds the <typeparamref name="TEfDb"/> as a scoped <typeparamref name="TIEfDb"/> service.
-        /// </summary>
-        /// <typeparam name="TIEfDb">The corresponding entity framework <see cref="IEfDb"/> service <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TEfDb">The corresponding entity framework <typeparamref name="TIEfDb"/> implementation <see cref="Type"/>.</typeparam>
-        /// <param name="services"></param>
-        /// <returns></returns>
-        public static IServiceCollection AddEfDb<TIEfDb, TEfDb>(this IServiceCollection services) where TIEfDb : class, IEfDb where TEfDb : class, TIEfDb => services.AddScoped<TIEfDb, TEfDb>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/GlobalUsing.cs b/src/CoreEx.EntityFrameworkCore/GlobalUsing.cs
new file mode 100644
index 00000000..9be21ba7
--- /dev/null
+++ b/src/CoreEx.EntityFrameworkCore/GlobalUsing.cs
@@ -0,0 +1,20 @@
+global using CoreEx;
+global using CoreEx.Abstractions;
+global using CoreEx.Data;
+global using CoreEx.Database;
+global using CoreEx.Database.Abstractions;
+global using CoreEx.Entities;
+global using CoreEx.EntityFrameworkCore;
+global using CoreEx.Invokers;
+global using CoreEx.Mapping;
+global using CoreEx.Results;
+global using Microsoft.EntityFrameworkCore;
+global using Microsoft.EntityFrameworkCore.ChangeTracking;
+global using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+global using Microsoft.Extensions.DependencyInjection;
+global using System.Collections.Concurrent;
+global using System.Data.Common;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Linq;
+global using System.Reflection;
+global using System.Text.Json;
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/IEfDb.cs b/src/CoreEx.EntityFrameworkCore/IEfDb.cs
index 823ce054..e1c70415 100644
--- a/src/CoreEx.EntityFrameworkCore/IEfDb.cs
+++ b/src/CoreEx.EntityFrameworkCore/IEfDb.cs
@@ -1,205 +1,32 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.EntityFrameworkCore;
 
-using CoreEx.Database;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using Microsoft.EntityFrameworkCore;
-
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Enables the extended <see cref="IDatabase"/>-based <see href="https://learn.microsoft.com/en-us/ef/core/">Entity Framework Core</see> capabilities.
+/// </summary>
+public interface IEfDb
 {
     /// <summary>
-    /// Enables the extended <b>Entity Framework</b> functionality.
+    /// Gets the underlying <see name="Microsoft.EntityFrameworkCore.DbContext"/>.
     /// </summary>
-    public interface IEfDb
-    {
-        /// <summary>
-        /// Gets the underlying <see name="Microsoft.EntityFrameworkCore.DbContext"/>.
-        /// </summary>
-        DbContext DbContext { get; }
-
-        /// <summary>
-        /// Gets the <see cref="EfDbInvoker"/>.
-        /// </summary>
-        EfDbInvoker Invoker { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IDatabase"/>.
-        /// </summary>
-        IDatabase Database { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        IMapper Mapper { get; }
-
-        /// <summary>
-        /// Gets the default <see cref="EfDbArgs"/> used where not expliticly specified for an operation.
-        /// </summary>
-        EfDbArgs DbArgs { get; }
-
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{TModel}"/> to enable select-like capabilities on a specified <typeparamref name="TModel"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="queryArgs">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="EfDbQuery{TModel}"/>.</returns>
-        EfDbQuery<TModel> Query<TModel>(EfDbArgs queryArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where TModel : class, new();
-
-        /// <summary>
-        /// Creates an <see cref="EfDbQuery{T, TModel}"/> to enable select-like capabilities on a specified <typeparamref name="TModel"/> automatically mapping to the resultant <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="queryArgs">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="EfDbQuery{T, TModel}"/>.</returns>
-        EfDbQuery<T, TModel> Query<T, TModel>(EfDbArgs queryArgs, Func<IQueryable<TModel>, IQueryable<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c>.</returns>
-        Task<TModel?> GetAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new();
-
-        /// <summary>
-        /// Gets the model for the specified <paramref name="key"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The model value where found; otherwise, <c>null</c>.</returns>
-        Task<Result<TModel?>> GetWithResultAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new();
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        Task<T?> GetAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        Task<Result<T?>> GetWithResultAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes where specified).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        Task<T> CreateAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        Task<Result<T>> CreateWithResultAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
+    DbContext DbContext { get; }
 
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes where specified).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        Task<T> UpdateAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes where specified) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        Task<Result<T>> UpdateWithResultAsync<T, TModel>(EfDbArgs args, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        Task DeleteAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new();
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        Task<Result> DeleteWithResultAsync<TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new();
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        Task DeleteAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new();
+    /// <summary>
+    /// Gets the <see cref="IDatabase"/>.
+    /// </summary>
+    IDatabase Database { get; }
 
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="EfDbArgs"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Result"/>.</returns>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        Task<Result> DeleteWithResultAsync<T, TModel>(EfDbArgs args, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new();
+    /// <summary>
+    /// Gets the <see cref="EfDbOptions"/>.
+    /// </summary>
+    EfDbOptions Options { get; }
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> whilst <see cref="DatabaseWildcard.Replace(string)">replacing</see> the <b>wildcard</b> characters when the <paramref name="with"/> is not <c>null</c>.
-        /// </summary>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value; passed the database specific wildcard value as the action argument.</param>
-        void WithWildcard(string? with, Action<string> action);
+    /// <summary>
+    /// Gets the <see cref="CoreEx.ExecutionContext"/>.
+    /// </summary>
+    ExecutionContext ExecutionContext { get; }
 
-        /// <summary>
-        /// Invokes the <paramref name="action"/> when the <paramref name="with"/> is not the default value for the <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="T">The with value <see cref="Type"/>.</typeparam>
-        /// <param name="with">The value with which to verify.</param>
-        /// <param name="action">The <see cref="Action"/> to invoke when there is a valid <paramref name="with"/> value.</param>
-        void With<T>(T with, Action action);
-    }
+    /// <summary>
+    /// Gets the <see cref="EfDbInvoker"/>.
+    /// </summary>
+    EfDbInvoker Invoker { get; }
 }
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/IEfDbContext.cs b/src/CoreEx.EntityFrameworkCore/IEfDbContext.cs
index 44285b52..11d704a6 100644
--- a/src/CoreEx.EntityFrameworkCore/IEfDbContext.cs
+++ b/src/CoreEx.EntityFrameworkCore/IEfDbContext.cs
@@ -1,17 +1,12 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.EntityFrameworkCore;
 
-using CoreEx.Database;
-
-namespace CoreEx.EntityFrameworkCore
+/// <summary>
+/// Enables access to the underlying <see cref="IDatabase"/> instance (see <see cref="BaseDatabase"/>).
+/// </summary>
+public interface IEfDbContext
 {
     /// <summary>
-    /// Enables access to the base <see cref="IDatabase"/> instance (see <see cref="BaseDatabase"/>).
+    /// Gets the base <see cref="IDatabase"/>.
     /// </summary>
-    public interface IEfDbContext
-    {
-        /// <summary>
-        /// Gets the base <see cref="IDatabase"/>.
-        /// </summary>
-        public IDatabase BaseDatabase { get; }
-    }
+    public IDatabase BaseDatabase { get; }
 }
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/IEfDbEntity.cs b/src/CoreEx.EntityFrameworkCore/IEfDbEntity.cs
deleted file mode 100644
index 3bda064d..00000000
--- a/src/CoreEx.EntityFrameworkCore/IEfDbEntity.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.EntityFrameworkCore
-{
-    /// <summary>
-    /// Enables the common <b>Entity Framework</b> entity capabilities.
-    /// </summary>
-    public interface IEfDbEntity
-    {
-        /// <summary>
-        /// Gets the owning <see cref="IEfDb"/>.
-        /// </summary>
-        IEfDb EfDb { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/README.md b/src/CoreEx.EntityFrameworkCore/README.md
index b4682aca..a7de12a9 100644
--- a/src/CoreEx.EntityFrameworkCore/README.md
+++ b/src/CoreEx.EntityFrameworkCore/README.md
@@ -1,138 +1,58 @@
-# CoreEx.EntityFrameworkCore
+# CoreEx.EntityFrameworkCore
 
-The `CoreEx.EntityFrameworkCore` namespace provides extended [_Entity Framework Core (EF)_](https://learn.microsoft.com/en-us/ef/core/) capabilities. 
+> Provides the Entity Framework Core integration layer: `EfDb<TDbContext>` as the CoreEx-EF bridge, `EfDbModel<TModel>` and `EfDbMappedModel<TValue, TModel, TMapper>` for typed CRUD + query operations, `EfDbExtensions` for paged `IQueryable<T>` mapping helpers, `EfDbInvoker` for OpenTelemetry tracing, and EF `ValueConverter` bridges for CoreEx converter types.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.EntityFrameworkCore` wraps EF Core's `DbContext` with the CoreEx data conventions: `IUnitOfWork` transaction management, `ETag`/concurrency-token checking, multi-tenancy filtering, logical-delete filtering, change-log stamping, `PagingArgs` paging, `QueryArgsConfig` dynamic filter/orderby, and `Result<T>` pipeline integration.
 
-The motivation is to provide supporting EF Core capabilities for [CRUD](https://en.wikipedia.org/wiki/Create,_read,_update_and_delete) related access that support standardized _CoreEx_ data access patterns. This for the most part will simplify and unify the approach to ensure consistency of implementation where needed.
+The central type is `EfDb<TDbContext>`, which holds the `DbContext`, bridges its `IDatabase` (for transaction sharing with raw SQL), and exposes `Model<TModel>()` as the entry point for all strongly-typed CRUD. `EfDbModel<TModel>` provides `GetAsync`, `CreateAsync`, `UpdateAsync`, `DeleteAsync`, and `Query` — each applying the full CoreEx cross-cutting pipeline. `EfDbMappedModel<TValue, TModel, TMapper>` adds a `IBiDirectionMapper` layer for use cases where the EF model type differs from the domain entity type.
 
-<br/>
+`EfDbExtensions` provides `IQueryable<T>` extension methods for mapping, paging, and `ItemsResult<T>` collection building, enabling consistent paged-list patterns across all EF-backed repositories without boilerplate.
 
-## Requirements
+## Key capabilities
 
-The requirements for usage are as follows.
-- An **entity** (DTO) that represents the data that must as a minimum implement [`IEntityKey`](../CoreEx/Entities/IEntityKey.cs); generally via either the implementation of [`IIdentifier`](../CoreEx/Entities/IIdentifierT.cs) or [`IPrimaryKey`](../CoreEx/Entities/IPrimaryKey.cs).
-- A **model** being the underlying configured EF Core [data source model](https://learn.microsoft.com/en-us/ef/core/modeling/).
-- An [`IMapper`](../CoreEx/Mapping/IMapper.cs) that contains the mapping logic to map to and from the **entity** and **model**.
+- 🔗 **EF + IDatabase bridge**: `EfDb<TDbContext>` synchronizes EF Core's transaction with the underlying `IDatabase.CurrentTransaction`, so raw SQL commands and EF operations participate in the same ADO.NET transaction.
+- 📖 **Typed CRUD**: `EfDbModel<TModel>` provides `GetAsync`, `CreateAsync`, `UpdateAsync`, `DeleteAsync` with automatic ETag/concurrency-token validation, tenant isolation, logical-delete filtering, and change-log stamping.
+- 🔁 **Mapped CRUD**: `EfDbMappedModel<TValue, TModel, TMapper>` layers a `IBiDirectionMapper<TValue, TModel>` over `EfDbModel<TModel>`, mapping between the domain entity type and the EF model type transparently for all CRUD operations.
+- 🔍 **Query with dynamic filter/orderby**: `EfDbModel<TModel>.Query(args?)` returns a fluent `EfDbQuery<TModel>` that applies `QueryArgsConfig` filter and orderby, tenant and logical-delete predicates, and paging.
+- 📄 **Paged IQueryable extensions**: `EfDbExtensions.ToMappedItemsResultAsync`, `ToItemsResultAsync`, `ToMappedCollectionAsync` convert an `IQueryable<TSource>` to paged `ItemsResult<T>` or collections with a mapper function or `IMapper<T>`.
+- 🏷️ **ETag / concurrency token**: `EfDbArgs.CheckETag` compares the incoming `ETag` against the current entity's concurrency token before update/delete, throwing `ConcurrencyException` on mismatch.
+- 🔒 **Multi-tenancy filtering**: `EfDbModel` automatically adds `TenantId == executionContext.TenantId` predicates for entities implementing `IReadOnlyTenantId`.
+- 🗑️ **Logical delete**: Entities implementing `IReadOnlyLogicallyDeleted` are soft-deleted (`IsDeleted = true`) on `DeleteAsync` rather than physically removed, and filtered out of `GetAsync` / `Query`.
+- 🔌 **ValueConverter bridge**: `ValueConverterBridge<TModel, TProvider>` and `JsonElementStringEfConverter` allow CoreEx `IConverter<T, U>` implementations to be used directly as EF Core `ValueConverter` instances in `OnModelCreating`.
+- 📡 **OpenTelemetry**: `EfDbInvoker` wraps every `EfDb` operation with an `Activity` span tagged with operation type, model type, and result.
 
-The **entity** and **model** are different types to encourage separation between the externalized **entity** representation and the underlying **model**; which may be shaped differently, and have different property to column naming conventions, internalized columns, etc.
+## Key types
 
-<br/>
+| Type | Description |
+|------|-------------|
+| **[`EfDb<TDbContext>`](./EfDb.cs)** | CoreEx EF bridge: holds `DbContext`, `IDatabase`, `EfDbOptions`, `ExecutionContext`; exposes `Model<TModel>()` entry point; synchronizes EF and ADO.NET transactions. |
+| **[`EfDbModel<TModel>`](./EfDbModel.cs)** | Strongly-typed CRUD + query for a single EF model type: `GetAsync`, `CreateAsync`, `UpdateAsync`, `DeleteAsync`, `Query(args?)`; applies full CoreEx cross-cutting pipeline. |
+| **[`EfDbMappedModel<TValue, TModel, TMapper>`](./EfDbMappedModel.cs)** | Adds a `IBiDirectionMapper<TValue, TModel>` layer over `EfDbModel<TModel>` for domain entity ↔ EF model type conversion; provides `GetAsync`, `CreateAsync`, `UpdateAsync`, `DeleteAsync`. |
+| **[`EfDbExtensions`](./EfDbExtensions.cs)** | `IQueryable<T>` extensions: `ToMappedItemsResultAsync`, `ToItemsResultAsync`, `ToMappedCollectionAsync`, `BuildQuery(QueryArgs, QueryArgsConfig)`. |
+| **[`EfDbArgs`](./EfDbArgs.cs)** | Per-operation options: `OperationType`, `CheckETag`, `Paging`, `ExceptionHandler`; defaults sourced from `EfDbModelOptions<TModel>` then `EfDbOptions`. |
+| **[`EfDbOptions`](./EfDbOptions.cs)** | Instance-level options for `EfDb<TDbContext>`: default `EfDbArgs`, per-model options registry via `GetOrAddModelOptions<TModel>()`. |
+| **[`EfDbModelOptions<TModel>`](./EfDbModelOptions.cs)** | Per-model configuration: optional `EfDbArgs` override, `OnQuery` hook, tenant/logical-delete filtering enable/disable. |
+| **[`EfDbInvoker`](./EfDbInvoker.cs)** | `InvokerBase<IEfDb>` emitting OpenTelemetry spans and structured log entries for every EfDb operation; `Default` singleton used by `EfDb<TDbContext>`. |
+| **[`ValueConverterBridge<TModel, TProvider>`](./Converters/ValueConverterBridgeT2.cs)** | EF Core `ValueConverter<TModel, TProvider>` that delegates to a CoreEx `IConverter<TModel, TProvider>`, bridging CoreEx converter types into EF model configuration. |
+| **[`JsonElementStringEfConverter`](./Converters/JsonElementStringEfConverter.cs)** | EF Core `ValueConverter` serializing `JsonElement` values to/from `string` for storing JSON fragments in a text column. |
+| [`IEfDb`](./IEfDb.cs) | Interface exposing `DbContext`, `IDatabase`, `EfDbOptions`, `ExecutionContext`, and `EfDbInvoker`; implemented by `EfDb<TDbContext>`. |
+| [`IEfDbContext`](./IEfDbContext.cs) | Marker interface for `DbContext` subclasses wiring the `IDatabase` bridge via `BaseDatabase`. |
 
-## Railway-oriented programming
+## Namespaces
 
-To support [railway-oriented programming](../CoreEx/Results/README.md) whenever a method name includes `WithResult` this indicates that it will return a `Result` or `Result<T>` including the resulting success or failure information. In these instances an `Exception` will only be thrown when considered truly exceptional.
+| Namespace | Description |
+|-----------|-------------|
+| [**`Converters`**](./Converters/) | `ValueConverterBridge<TModel, TProvider>` and `JsonElementStringEfConverter` for use in EF Core model configuration. |
 
-<br/>
+## Related Namespaces
 
-## CRUD capabilities
+- **[`CoreEx.Data`](../CoreEx.Data/README.md)** - `IUnitOfWork`, `DataResult`, `QueryArgsConfig`; EF unit-of-work is typically composed using `EfDb` with an outbox publisher.
+- **[`CoreEx.Database`](../CoreEx.Database/README.md)** - `IDatabase` is bridged into `EfDb<TDbContext>` for transaction sharing and raw SQL fallback; `IDatabaseUnitOfWork` can wrap `EfDb`.
+- **[`CoreEx.Mapping`](../CoreEx/Mapping/README.md)** - `IBiDirectionMapper<TValue, TModel>` is the mapper contract used by `EfDbMappedModel`; `Mapper.MapStandardFrom` handles standard entity-contract properties.
+- **[`CoreEx.Invokers`](../CoreEx/Invokers/README.md)** - `EfDbInvoker` extends `InvokerBase<IEfDb>` using the standard OpenTelemetry tracing and logging pipeline.
 
-The [`IEfDb`](./IEfDb.cs) and corresponding [`EfDb`](./EfDb.cs) provides the base CRUD capabilities as follows.
+## AI Usage Guide
 
-<br/>
-
-### Query (read)
-
-A query is actioned using the [`EfDbQuery`](./EfDbQuery.cs) which is ostensibly a lightweight wrapper over an `IQueryable<TModel>` that automatically maps from the **model** to the **entity**.
-
-Queried entities are not tracked by default; internally uses [`AsNoTracking`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.entityframeworkqueryableextensions.asnotracking); this behaviour can be overridden using [`EfDbArgs.QueryNoTracking`](./EfDbArgs.cs).
-
-Note: a consumer should also consider using [`IgnoreAutoIncludes`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.entityframeworkqueryableextensions.ignoreautoincludes) to exclude related data, where not required, to improve query performance.
-
-The following methods provide additional capabilities:
-
-Method | Description
--|-
-`WithPaging` | Adds `Skip` and `Take` paging to the query.
-`SelectSingleAsync`, `SelectSingleWithResult` | Selects a single item.
-`SelectSingleOrDefaultAsync`, `SelectSingleOrDefaultWithResultAsync` | Selects a single item or default.
-`SelectFirstAsync`, `SelectFirstWithResultAsync` | Selects first item.
-`SelectFirstOrDefaultAsync`, `SelectFirstOrDefaultWithResultAsync` | Selects first item or default.
-`SelectQueryAsync`, `SelectQueryWithResultAsync` | Select items into or creating a resultant collection.
-`SelectResultAsync`, `SelectResultWithResultAsync` | Select items creating a [`ICollectionResult`](../CoreEx/Entities/ICollectionResultT2.cs) which also contains corresponding [`PagingResult`](../CoreEx/Entities/PagingResult.cs).
-
-<br/>
-
-### Get (Read)
-
-Gets (`GetAsync` or `GetWithResultAsync`) the **entity** for the specified key mapping from the **model**. Uses the [`DbContext.Find`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.find) internally for the **model** and specified key.
-
-Where the data is not found, then a `null` will be returned. Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) and `IsDeleted` then this acts as if not found and returns a `null`.
-
-<br/>
-
-### Create
-
-Creates (`CreateAsync` or `CreateWithResultAsync`) the **entity** by firstly mapping to the **model**. Uses the [`DbContext.Add`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.add) to begin tracking the **model** which will be inserted into the database when [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called.
-
-Where the **entity** implements [`IChangeLogAuditLog`](../CoreEx/Entities/IChangeLogAuditLog.cs) generally via [`ChangeLog`](../CoreEx/Entities/IChangeLog.cs) or [`ChangeLogEx`](../CoreEx/Entities/Extended/IChangeLogEx.cs), then the `CreatedBy` and `CreatedDate` properties will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Where the **entity** and/or **model** implements [`ITenantId`](../CoreEx/Entities/ITenantId.cs) then the `TenantId` property will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Generally, the [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called to perform the _insert_; unless [`EfDbArgs.SaveChanges`](./EfDbArgs.cs) is set to `false` (defaults to `true`).
-
-The inserted **model** is then re-mapped to the **entity** and returned where [`EfDbArgs.Refresh`](./EfDbArgs.cs) is set to `true` (default); this will ensure all properties updated as part of the _insert_ are included in the refreshed **entity**.
-
-<br/>
-
-### Update
-
-Updates (`UpdateAsync` or `UpdateWithResultAsync`) the **entity** by firstly mapping to the **model**. Uses the [`DbContext.Update`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.add) to begin tracking the **model** which will be updated within the database when [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called.
-
-First will check existence of the **model** by performing a [`DbContext.Find`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.find). Where the data is not found, then a [`NotFoundException`](../CoreEx/NotFoundException.cs) will be thrown. Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) and `IsDeleted` then this acts as if not found and will also result in a `NotFoundException`.
-
-Where the entity implements [`IETag`](../CoreEx/Entities/IETag.cs) this will be checked against the just read version, and where not matched a  [`ConcurrencyException`](../CoreEx/ConcurrencyException.cs) will be thrown. Also, any [`DbUpdateConcurrencyException`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbupdateconcurrencyexception) thrown will be converted to a corresponding `ConcurrencyException` for consistency.
-
-Where the **entity** implements [`IChangeLogAuditLog`](../CoreEx/Entities/IChangeLogAuditLog.cs) generally via [`ChangeLog`](../CoreEx/Entities/IChangeLog.cs) or [`ChangeLogEx`](../CoreEx/Entities/Extended/IChangeLogEx.cs), then the `UpdatedBy` and `UpdatedDate` properties will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Where the **entity** and/or **model** implements [`ITenantId`](../CoreEx/Entities/ITenantId.cs) then the `TenantId` property will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Generally, the [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called to perform the _update_; unless [`EfDbArgs.SaveChanges`](./EfDbArgs.cs) is set to `false` (defaults to `true`).
-
-The updated **model** is then re-mapped to the **entity** and returned where [`EfDbArgs.Refresh`](./EfDbArgs.cs) is set to `true` (default); this will ensure all properties updated as part of the _update_ are included in the refreshed **entity**.
-
-<br/>
-
-### Delete
-
-Deletes (`DeleteAsync` or `DeleteWithResultAsync`) the **entity** either physically or logically.
-
-First will check existence of the **model** by performing a [`DbContext.Find`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.find). Where the data is not found, then a [`NotFoundException`](../CoreEx/NotFoundException.cs) will be thrown. Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) and `IsDeleted` then this acts as if not found and will also result in a `NotFoundException`.
-
-Where the **model** implements [`ILogicallyDeleted`](../CoreEx/Entities/ILogicallyDeleted.cs) then an update will occur after setting `IsDeleted` to `true`. Uses the [`DbContext.Update`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.add) to begin tracking the **model** which will be updated within the database when [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called.
-
-Otherwise, will physically delete. Uses the [`DbContext.Remove`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.remove) to begin tracking the **model** which will be deleted from the database when [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called.
-
-Generally, the [`DbContext.SaveChanges`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext.savechanges) is called to perform the _update_; unless [`EfDbArgs.SaveChanges`](./EfDbArgs.cs) is set to `false` (defaults to `true`).
-
-<br/>
-
-## Usage
-
-To use `EfDB` relationships to the EF Core [`DbContext`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.entityframeworkcore.dbcontext) must be established as follows.
-
-- [`Database`](../CoreEx.Database/Database.cs) must be defined; see [example](../../samples/My.Hr/My.Hr.Business/Data/HrDb.cs).
-- `DbContext` and [`Database`](../CoreEx.Database/Database.cs) relationship must be defined; see [example](../../samples/My.Hr/My.Hr.Business/Data/HrDbContext.cs).
-- [`EfDb`](./EfDb.cs) and `DbContext` relationship must be defined; see [example](../../samples/My.Hr/My.Hr.Business/Data/HrEfDb.cs).
-
-Alternatively, review the _Beef_ [MyEf.Hr data](https://github.com/Avanade/Beef/tree/master/samples/MyEf.Hr/MyEf.Hr.Business/Data) sample implementation.
-
-<br/>
-
-### MySql
-
-Where leveraging _MySQL_ it is recommended to use the [Pomelo.EntityFrameworkCore.MySql](https://www.nuget.org/packages/Pomelo.EntityFrameworkCore.MySql) package; this has greater uptake and community supporting than the Oracle-enabled [MySql.Data.EntityFrameworkCore](https://www.nuget.org/packages/MySql.Data.EntityFrameworkCore) package.
-
-The `DbContextOptionsBuilder` code within the `DbContext` implementation should be as follows (review version specification) to enable.
-
-```csharp
-protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-{
-    base.OnConfiguring(optionsBuilder);
-
-    if (!optionsBuilder.IsConfigured)
-        optionsBuilder.UseMySql(BaseDatabase.GetConnection(), ServerVersion.Create(new Version(8, 0, 33), Pomelo.EntityFrameworkCore.MySql.Infrastructure.ServerType.MySql));
-}
-```
\ No newline at end of file
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.EntityFrameworkCore/strong-name-key.snk b/src/CoreEx.EntityFrameworkCore/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.EntityFrameworkCore/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Events/AGENTS.md b/src/CoreEx.Events/AGENTS.md
new file mode 100644
index 00000000..97cc6564
--- /dev/null
+++ b/src/CoreEx.Events/AGENTS.md
@@ -0,0 +1,89 @@
+# CoreEx.Events — AI Usage Guide
+
+Provides the CoreEx event publishing and subscribing infrastructure: `EventData` ↔ CloudEvents formatting, a two-phase queue-then-publish pipeline, and configurable subscriber dispatch.
+
+## Publishing — Two-Phase Pattern
+
+Buffer events on `IUnitOfWork.Events` (the `IEventQueue`) inside `TransactionAsync`, then let the outbox publisher commit them with the database transaction. Do not call `PublishAsync()` directly from application code when using the outbox pattern.
+
+Use `EventData.CreateEventWith` to construct a single event and `EventData.CreateEventsWith` for multiple events. Pass an `EventAction` enum value (or a plain string) as the action.
+
+```csharp
+using CoreEx.Events;
+using CoreEx.Events.Publishing;
+
+// Single entity event — subject/entity derived automatically from SchemaAttribute or type name
+return dr.WhereMutated(v =>
+    _unitOfWork.Events.Add(EventData.CreateEventWith(v, EventAction.Created)));
+
+// Delete — no value; set the key explicitly
+dr.WhereMutated(() =>
+    _unitOfWork.Events.Add(
+        EventData.CreateEvent<Order>(EventAction.Deleted).WithKey(id)));
+
+// Multiple events from a collection
+_unitOfWork.Events.Add(
+    EventData.CreateEventsWith(items, EventAction.Updated, ConfigureEvent));
+
+// Custom action string and explicit destination topic
+_unitOfWork.Events.Add(
+    "orders-topic",
+    EventData.CreateEventWith(contract, "checkedout"));
+```
+
+`EventAction` provides the standard past-tense action values: `Created`, `Updated`, `Deleted`, `Activated`, `Deactivated`, `Cancelled`, `CheckedOut`, and more.
+
+## IEventPublisher Registration
+
+`IEventPublisher` is registered by the database outbox publisher in API/application hosts and by Azure Service Bus in relay hosts.
+
+```csharp
+// API host — outbox is the publisher; Service Bus is wired separately with addAsDefaultIEventPublisher: false
+builder.Services.AddSqlServerOutboxPublisher();
+
+// Relay host — Service Bus is the publisher
+builder.Services.AddAzureServiceBusPublisher();
+```
+
+## IEventFormatter
+
+Use the default `EventFormatter`; only customise when you need non-standard CloudEvents attribute mapping.
+
+```csharp
+builder.Services.AddEventFormatter();   // registers EventFormatter as IEventFormatter
+```
+
+## Subscribers
+
+Subscriber dispatch is handled by `SubscribedManager`. Subscriber classes are marked `[Subscribe("subject")]` and discovered automatically by `AddSubscribersUsing<T>()`.
+
+See [CoreEx.Azure.Messaging.ServiceBus](../CoreEx.Azure.Messaging.ServiceBus/README.md) for the full subscriber wiring example.
+
+## DestinationProvider
+
+Implement `IDestinationProvider` to derive topic/queue names from `EventData`. Return `null` to fall back to the next registered provider.
+
+```csharp
+public class MyDestinationProvider : IDestinationProvider
+{
+    public string? GetDestination(EventData @event)
+        => @event.Subject?.StartsWith("contoso.orders") == true
+            ? "orders-topic"
+            : null;
+}
+```
+
+## Do Not
+
+- Do not call `IEventPublisher.PublishAsync()` from application-service code — buffering via `IUnitOfWork.Events` is required so events are committed atomically with the database transaction.
+- Do not enqueue events outside of `TransactionAsync` — they will not be committed atomically.
+- Do not create `CloudEvent` objects manually — use `EventData` and let `IEventFormatter` handle CloudEvents serialization.
+
+## Further Reading
+
+- [README](./README.md) — `EventData`, `IEventFormatter`, `SubscribedManager`, `ErrorHandler`, and `ErrorHandling` reference.
+- [CoreEx.Azure.Messaging.ServiceBus](../CoreEx.Azure.Messaging.ServiceBus/README.md) — Service Bus transport binding.
+- [CoreEx.Database.SqlServer](../CoreEx.Database.SqlServer/README.md) / [CoreEx.Database.Postgres](../CoreEx.Database.Postgres/README.md) — outbox publisher implementations.
+- [Application layer](../../samples/docs/application-layer.md) — how events are enqueued on `IUnitOfWork.Events` inside `TransactionAsync` and drained from aggregates in real service code.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — outbox table wiring, relay host setup, and `IEventPublisher` registration.
+- [Patterns](../../samples/docs/patterns.md) — transactional outbox pattern, event naming conventions, and subscriber error-handling strategies.
diff --git a/src/CoreEx.Events/CoreEx.Events.csproj b/src/CoreEx.Events/CoreEx.Events.csproj
new file mode 100644
index 00000000..6e6839d0
--- /dev/null
+++ b/src/CoreEx.Events/CoreEx.Events.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx .NET Events extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data events publishing subscribing cloud-native cloud-events</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CloudNative.CloudEvents.SystemTextJson" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Events/CoreExEventsExtensions.DependencyInjection.cs b/src/CoreEx.Events/CoreExEventsExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..f3461cc1
--- /dev/null
+++ b/src/CoreEx.Events/CoreExEventsExtensions.DependencyInjection.cs
@@ -0,0 +1,86 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure - this is by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="CoreEx.Events"/> and related extensions.
+/// </summary>
+public static class CoreExEventsExtensions
+{
+    /// <summary>
+    /// Adds a <b>singleton</b> service for the <see cref="EventFormatter"/> as the <see cref="IEventFormatter"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="EventFormatter"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddEventFormatter(this IServiceCollection services, Action<EventFormatter>? configure = null)
+    {
+        return services.AddSingleton<IEventFormatter>(sp =>
+        {
+            var ef = ActivatorUtilities.CreateInstance<EventFormatter>(sp);
+            configure?.Invoke(ef);
+            return ef;
+        });
+    }
+
+    /// <summary>
+    /// Adds a <b>singleton</b> service for the <see cref="FixedDestinationProvider"/> as the <see cref="IDestinationProvider"/>
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="destination">The fixed destination name.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddFixedDestinationProvider(this IServiceCollection services, string destination)
+        => services.ThrowIfNull().AddSingleton<IDestinationProvider>(new FixedDestinationProvider { Destination = destination.ThrowIfNullOrEmpty() });
+
+    /// <summary>
+    /// Adds a <b>singleton</b> <see cref="SubscribedManager"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="SubscribedManager"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddSubscribedManager(this IServiceCollection services, Action<IServiceProvider, SubscribedManager>? configure = null)
+    {
+        return services.AddSingleton<SubscribedManager>(sp =>
+        {
+            var manager = new SubscribedManager(sp.GetService<SubscribedInvoker>());
+            configure?.Invoke(sp, manager);
+            return manager;
+        });
+    }
+
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> <see cref="IEventPublisher"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <param name="serviceFactory">The factory function to create the <see cref="IEventPublisher"/> instance.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>This method firstly registers the service with a root key (derived from the provided service key) and then registers the provided service key to resolve to the root service.
+    /// This ensures that the root service is always registered, even if the non-root is re-registered the root can be resolved - useful for testing scenarios where the service is re-registered with a test double (the root remains and is accessible).
+    /// <para>Where <paramref name="addAsDefaultIEventPublisher"/> is <see langword="true"/>, it also registers the provided service key as the default (primary / non-keyed) <see cref="IEventPublisher"/> service, allowing it to be resolved
+    /// without specifying a key simplifying usage in most scenarios. Note that only a single default <see cref="IEventPublisher"/> can be registered at a time.</para></remarks>
+    public static IServiceCollection AddEventPublisher(this IServiceCollection services, string serviceKey, Func<IServiceProvider, IEventPublisher> serviceFactory, bool addAsDefaultIEventPublisher = true)
+    {
+        serviceFactory.ThrowIfNull();
+        var rootKey = $"{serviceKey.ThrowIfNullOrEmpty()}_Root"; 
+
+        services.ThrowIfNull().AddKeyedScoped<IEventPublisher>(rootKey, (sp, _) => serviceFactory(sp) ?? throw new InvalidOperationException("The service factory must not return null."))
+                              .AddKeyedScoped<IEventPublisher>(serviceKey, (sp, _) => sp.GetRequiredKeyedService<IEventPublisher>(rootKey));
+
+        if (addAsDefaultIEventPublisher)
+            services.AddScoped<IEventPublisher>(sp => sp.GetRequiredKeyedService<IEventPublisher>(serviceKey));
+
+        return services;
+    }
+
+    /// <summary>
+    /// Adds a keyed <b>scoped</b> <see cref="NoOpEventPublisher"/> service for the specified service key.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The service key to use for the keyed registration.</param>
+    /// <param name="addAsDefaultIEventPublisher">Indicates whether to also register as the default (non-keyed) <see cref="IEventPublisher"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddNoOpEventPublisher(this IServiceCollection services, string serviceKey, bool addAsDefaultIEventPublisher = true)
+        => AddEventPublisher(services, serviceKey, sp => ActivatorUtilities.CreateInstance<NoOpEventPublisher>(sp), addAsDefaultIEventPublisher);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/CoreExEventsExtensions.OpenTelemetry.cs b/src/CoreEx.Events/CoreExEventsExtensions.OpenTelemetry.cs
new file mode 100644
index 00000000..b2d8b7e6
--- /dev/null
+++ b/src/CoreEx.Events/CoreExEventsExtensions.OpenTelemetry.cs
@@ -0,0 +1,21 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace OpenTelemetry.Trace;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExEventsExtensions
+{
+    /// <summary>
+    /// Enables <i>CoreEx</i> OpenTelemetry instrumentation.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static OpenTelemetryBuilder WithCoreExEventsSources(this OpenTelemetryBuilder builder) => builder.ThrowIfNull()
+        .WithTracing(t => t
+            .AddInvokerAsSource<CoreEx.Events.Publishing.EventPublisherInvoker>()
+            .AddInvokerAsSource<CoreEx.Events.Subscribing.SubscribedInvoker>())
+        .WithMetrics(m => m
+            .AddMeter(CoreEx.Events.Subscribing.EventSubscriberMetrics.Meter.Name));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventAction.cs b/src/CoreEx.Events/EventAction.cs
new file mode 100644
index 00000000..b4a13300
--- /dev/null
+++ b/src/CoreEx.Events/EventAction.cs
@@ -0,0 +1,88 @@
+namespace CoreEx.Events;
+
+/// <summary>
+/// Represents the action of an event; primarily: <see cref="Created"/>, <see cref="Updated"/>, and <see cref="Deleted"/>.
+/// </summary>
+/// <remarks>Other common actions are also provided.</remarks>
+public enum EventAction
+{
+    /// <summary>
+    /// A <c>created</c> event action.
+    /// </summary>
+    Created,
+
+    /// <summary>
+    /// An <c>updated</c> event action.
+    /// </summary>
+    Updated,
+
+    /// <summary>
+    /// A <c>deleted</c> event action.
+    /// </summary>
+    Deleted,
+
+    /// <summary>
+    /// An <c>activated</c> event action.
+    /// </summary>
+    Activated,
+    
+    /// <summary>
+    /// A <c>deactivated</c> event action.
+    /// </summary>
+    Deactivated,
+
+    /// <summary>
+    /// A <c>cancelled</c> event action.
+    /// </summary>
+    Cancelled,
+
+    /// <summary>
+    /// A <c>checked-out</c> event action.
+    /// </summary>
+    CheckedOut,
+
+    /// <summary>
+    /// A <c>completed</c> event action.
+    /// </summary>
+    Completed,
+
+    /// <summary>
+    /// A <c>submitted</c> event action.
+    /// </summary>
+    Submitted,
+
+    /// <summary>
+    /// An <c>approved</c> event action.
+    /// </summary>
+    Approved,
+
+    /// <summary>
+    /// A <c>rejected</c> event action.
+    /// </summary>
+    Rejected,
+
+    /// <summary>
+    /// A <c>sent</c> event action.
+    /// </summary>
+    Sent,
+
+    /// <summary>
+    /// A <c>received</c> event action.
+    /// </summary>
+    Received,
+
+    /// <summary>
+    /// A <c>published</c> event action.
+    /// </summary>
+    Published,
+
+    /// <summary>
+    /// A <c>processed</c> event action.
+    /// </summary>
+    Processed,
+
+    /// <summary>
+    /// A <c>failed</c> event action.
+    /// </summary>
+    Failed
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventData.Infra.cs b/src/CoreEx.Events/EventData.Infra.cs
new file mode 100644
index 00000000..1b2adb84
--- /dev/null
+++ b/src/CoreEx.Events/EventData.Infra.cs
@@ -0,0 +1,211 @@
+namespace CoreEx.Events;
+
+public partial class EventData
+{
+    #region CreateEvent
+
+    /// <summary>
+    /// Creates a new event-oriented <see cref="EventData"/> instance with the specified <paramref name="entity"/> (subject) and <paramref name="action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <param name="entity">The entity (subject) name.</param>
+    /// <param name="action">The action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    public static EventData CreateEvent(string entity, string? action) => new EventData { Action = action }.WithEntity(entity);
+
+    /// <summary>
+    /// Creates a new event-oriented <see cref="EventData"/> instance with the specified <paramref name="entity"/> (subject) and the <paramref name="action"/> as the <see cref="Action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <param name="entity">The entity (subject) name.</param>
+    /// <param name="action">The <see cref="Enum"/> value that represents the action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    public static EventData CreateEvent(string entity, Enum action) => new EventData().WithEntity(entity).WithAction(action);
+
+    /// <summary>
+    /// Creates a new event-oriented <see cref="EventData"/> instance with the specified <typeparamref name="TEntity"/> (subject) and <paramref name="action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type.</typeparam>
+    /// <param name="action">The action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    public static EventData CreateEvent<TEntity>(string? action) => new EventData { Action = action }.WithEntity<TEntity>();
+
+    /// <summary>
+    /// Creates a new event-oriented <see cref="EventData"/> instance with the specified <typeparamref name="TEntity"/> (subject) and the <paramref name="action"/> as the <see cref="Action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type.</typeparam>
+    /// <param name="action">The <see cref="Enum"/> value that represents the action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    public static EventData CreateEvent<TEntity>(Enum action) => new EventData().WithEntity<TEntity>().WithAction(action);
+
+    /// <summary>
+    /// Creates a new event-oriented <see cref="EventData"/> instance <see cref="WithValue{T}(T, IEnumerable{string})">with</see> the specified <paramref name="value"/> and <paramref name="action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="action">The action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <see cref="Entity"/> (subject) automatically defaults from the value's <see cref="SchemaAttribute.Name"/> or <see cref="Type"/> name.</remarks>
+    public static EventData CreateEventWith<T>(T? value, string? action)
+    {
+        var ed = new EventData().WithValue(value);
+        return action is null ? ed : ed.WithAction(action);
+    }
+
+    /// <summary>
+    /// Creates a new event-oriented <see cref="EventData"/> instance <see cref="WithValue{T}(T, IEnumerable{string})">with</see> the specified <paramref name="value"/> and the <paramref name="action"/> as the <see cref="Action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="action">The <see cref="Enum"/> value that represents the action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <see cref="Entity"/> (subject) automatically defaults from the value's <see cref="SchemaAttribute.Name"/> or <see cref="Type"/> name.</remarks>
+    public static EventData CreateEventWith<T>(T? value, Enum action) => new EventData().WithValue(value).WithAction(action);
+
+    /// <summary>
+    /// Creates new event-oriented <see cref="EventData"/> instances <see cref="WithValue{T}(T, IEnumerable{string})">with</see> the specified <paramref name="values"/> and <paramref name="action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="values">The values.</param>
+    /// <param name="action">The action.</param>
+    /// <param name="configure">An optional action to configure each <see cref="EventData"/> instance.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <see cref="Entity"/> (subject) automatically defaults from the value's <see cref="SchemaAttribute.Name"/> or <see cref="Type"/> name.</remarks>
+    public static EventData[] CreateEventsWith<T>(IEnumerable<T?> values, string? action, Action<T, EventData>? configure = null)
+    {
+        var list = new List<EventData>();
+        foreach (var value in values)
+        {
+            if (value is not null)
+            {
+                var ed = new EventData().WithValue(value);
+                configure?.Invoke(value, ed);
+                list.Add(action is null ? ed : ed.WithAction(action));
+            }
+        }
+
+        return [.. list];
+    }
+
+    /// <summary>
+    /// Creates new event-oriented <see cref="EventData"/> instances <see cref="WithValue{T}(T, IEnumerable{string})">with</see> the specified <paramref name="values"/> and the <paramref name="action"/> as the <see cref="Action"/> (typically a verb describing an <i>event</i> in past tense).
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="values">The values.</param>
+    /// <param name="action">The <see cref="Enum"/> value that represents the action.</param>
+    /// <param name="configure">An optional action to configure each <see cref="EventData"/> instance.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <see cref="Entity"/> (subject) automatically defaults from the value's <see cref="SchemaAttribute.Name"/> or <see cref="Type"/> name.</remarks>
+    public static EventData[] CreateEventsWith<T>(IEnumerable<T?> values, Enum action, Action<T, EventData>? configure = null)
+    {
+        var list = new List<EventData>();
+        foreach (var value in values)
+        {
+            if (value is not null)
+            {
+                var ed = new EventData().WithValue(value);
+                configure?.Invoke(value, ed);
+                list.Add(action is null ? ed : ed.WithAction(action));
+            }
+        }
+
+        return [.. list];
+    }
+
+    #endregion
+
+    #region CreateCommand
+
+    /// <summary>
+    /// Creates a new command-oriented <see cref="EventData"/> instance with the specified <paramref name="entity"/> (subject) and <paramref name="command"/> <see cref="Action"/> being requested.
+    /// </summary>
+    /// <param name="targetDomainName">The target domain name.</param>
+    /// <param name="entity">The entity (subject) name.</param>
+    /// <param name="command">The command action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <paramref name="targetDomainName"/> represents the name of the domain that is the intended target of the command.</remarks>
+    public static EventData CreateCommand(string targetDomainName, string entity, string command) => new EventData { MessageType = MessageType.Command }.WithDomain(targetDomainName).WithEntity(entity).WithAction(command);
+
+    /// <summary>
+    /// Creates a new command-oriented <see cref="EventData"/> instance with the specified <paramref name="entity"/> (subject) and the <paramref name="command"/> <see cref="Action"/> being requested.
+    /// </summary>
+    /// <param name="targetDomainName">The target domain name.</param>
+    /// <param name="entity">The entity (subject) name.</param>
+    /// <param name="command">The <see cref="Enum"/> value that represents the command action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    public static EventData CreateCommand(string targetDomainName, string entity, Enum command) => new EventData { MessageType = MessageType.Command }.WithDomain(targetDomainName).WithEntity(entity).WithAction(command);
+
+    /// <summary>
+    /// Creates a new command-oriented <see cref="EventData"/> instance with the specified <typeparamref name="TEntity"/> (subject) and <paramref name="command"/> <see cref="Action"/> being requested.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type.</typeparam>
+    /// <param name="targetDomainName">The target domain name.</param>
+    /// <param name="command">The command action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <paramref name="targetDomainName"/> represents the name of the domain that is the intended target of the command.</remarks>
+    public static EventData CreateCommand<TEntity>(string targetDomainName, string command) => new EventData { MessageType = MessageType.Command }.WithDomain(targetDomainName).WithEntity<TEntity>().WithAction(command);
+
+    /// <summary>
+    /// Creates a new command-oriented <see cref="EventData"/> instance with the specified <typeparamref name="TEntity"/> (subject) and the <paramref name="command"/> <see cref="Action"/> being requested.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type.</typeparam>
+    /// <param name="targetDomainName">The target domain name.</param>
+    /// <param name="command">The <see cref="Enum"/> value that represents the command action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    public static EventData CreateCommand<TEntity>(string targetDomainName, Enum command) => new EventData { MessageType = MessageType.Command }.WithDomain(targetDomainName).WithEntity<TEntity>().WithAction(command);
+
+    /// <summary>
+    /// Creates a new command-oriented <see cref="EventData"/> instance <see cref="WithValue{T}(T, IEnumerable{string})">with</see> the specified <paramref name="value"/> and <paramref name="command"/> <see cref="Action"/> being requested.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="targetDomainName">The target domain name.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="command">The command action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <see cref="Entity"/> (subject) automatically defaults from the value's <see cref="SchemaAttribute.Name"/> or <see cref="Type"/> name.</remarks>
+    public static EventData CreateCommandWith<T>(string targetDomainName, T value, string command) => new EventData { MessageType = MessageType.Command }.WithDomain(targetDomainName).WithValue(value).WithAction(command);
+
+    /// <summary>
+    /// Creates a new command-oriented <see cref="EventData"/> instance <see cref="WithValue{T}(T, IEnumerable{string})">with</see> the specified <paramref name="value"/> and the <paramref name="command"/> <see cref="Action"/> being requested.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="targetDomainName">The target domain name.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="command">The <see cref="Enum"/> value that represents the command action.</param>
+    /// <returns>The new <see cref="EventData"/>.</returns>
+    /// <remarks>The <see cref="Entity"/> (subject) automatically defaults from the value's <see cref="SchemaAttribute.Name"/> or <see cref="Type"/> name.</remarks>
+    public static EventData CreateCommandWith<T>(string targetDomainName, T value, Enum command) => new EventData { MessageType = MessageType.Command }.WithDomain(targetDomainName).WithValue(value).WithAction(command);
+
+    #endregion
+
+    #region ToObjectFromJson
+
+    /// <summary>
+    /// Converts (deserializes) the JSON-based <see cref="Data"/> to type of <typeparamref name="T"/>.
+    /// </summary>
+    /// <typeparam name="T">The resulting <see cref="Type"/>.</typeparam>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The resulting JSON deserialized value.</returns>
+    public T? ToObjectFromJson<T>(JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        if (Data is null || Data.IsEmpty)
+            return default;
+
+        return Data.ToObjectFromJson<T>(jsonSerializerOptions ?? JsonDefaults.SerializerOptions);
+    }
+
+    /// <summary>
+    /// Converts (deserializes) the JSON-based <see cref="Data"/> to type of <paramref name="type"/>.
+    /// </summary>
+    /// <param name="type">The resulting <see cref="Type"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The resulting JSON deserialized value.</returns>
+    public object? ToObjectFromJson(Type type, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        type.ThrowIfNull();
+        if (Data is null || Data.IsEmpty)
+            return default;
+
+        return JsonSerializer.Deserialize(Data, type, jsonSerializerOptions ?? JsonDefaults.SerializerOptions);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventData.With.cs b/src/CoreEx.Events/EventData.With.cs
new file mode 100644
index 00000000..8c27dbfe
--- /dev/null
+++ b/src/CoreEx.Events/EventData.With.cs
@@ -0,0 +1,196 @@
+namespace CoreEx.Events;
+
+public partial class EventData
+{
+    /// <summary>
+    /// Sets the <paramref name="entity"/> as the <see cref="Entity"/>.
+    /// </summary>
+    /// <param name="entity">The entity name.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithEntity(string entity) => this.Adjust(x => x.Entity = entity.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Sets the <see cref="Entity"/> based on the specified <typeparamref name="TEntity"/> (using <see cref="Schema.TryGetMetadata{TEntity}(out SchemaAttribute)"/>).
+    /// </summary>
+    /// <typeparam name="TEntity">The entity type.</typeparam>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithEntity<TEntity>()
+    {
+        Schema.TryGetMetadata<TEntity>(out var metadata);
+        return WithEntity(metadata.Name ?? typeof(TEntity).Name);
+    }
+
+    /// <summary>
+    /// Sets the <paramref name="action"/> as the <see cref="Action"/>.
+    /// </summary>
+    /// <param name="action">The action.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithAction(string action) => this.Adjust(x => x.Action = action.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Sets the <paramref name="enum"/> as the <see cref="Action"/>.
+    /// </summary>
+    /// <param name="enum">The <see cref="Enum"/> value that represents the action.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithAction(Enum @enum) => WithAction(@enum.ThrowIfNull().ToString());
+
+    /// <summary>
+    /// Sets the <paramref name="key"/> as the <see cref="Key"/>.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="key"/> <b>must</b> be a universal, deterministic, and culture-independent <see cref="string"/>; where in doubt use <see cref="WithKey(CompositeKey)"/> which will enable.</remarks>
+    public EventData WithKey(string key)
+    {
+        Key = key.ThrowIfNullOrEmpty();
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the <paramref name="key"/> as the <see cref="Key"/>.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithKey(CompositeKey key) => WithKey(key.ToString().ThrowIfNull());
+
+    /// <summary>
+    /// Sets the <paramref name="partitionKey"/> as the <see cref="PartitionKey"/>.
+    /// </summary>
+    /// <param name="partitionKey">The partition key.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>A <see langword="null"/> or empty <paramref name="partitionKey"/> will result in a <see cref="Guid.NewGuid"/> being set as the <see cref="PartitionKey"/>. This will ensure that at least a
+    /// partition key is set with a somewhat randomized value to ensure a level of distributed processing. Noting that there will be no guarantees of order; where order is required then a common/deterministic
+    /// value should be used.
+    /// <para>When using <see cref="WithValue{T}(T, IEnumerable{string})"/> this will be set automatically from the <see cref="IReadOnlyPartitionKey.PartitionKey"/> where applicable. Otherwise, the
+    /// <see cref="EventFormatter"/></para> will attempt to set.</remarks>
+    public EventData WithPartitionKey(string? partitionKey = null) => this.Adjust(x => x.PartitionKey = string.IsNullOrEmpty(partitionKey) ? Guid.NewGuid().ToString() : partitionKey);
+
+    /// <summary>
+    /// Sets the <paramref name="domainName"/> as the <see cref="DomainName"/>.
+    /// </summary>
+    /// <param name="domainName">The domain (DDD) name.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithDomain(string domainName) => this.Adjust(x => x.DomainName = domainName.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Sets the schema <paramref name="version"/> to be included.
+    /// </summary>
+    /// <param name="version">The schema <see cref="Version"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithVersion(Version version) => this.Adjust(x => x.DataSchemaVersion = version.ThrowIfNull());
+
+    /// <summary>
+    /// Sets the <paramref name="user"/> to be included.
+    /// </summary>
+    /// <param name="user">The <see cref="AuthenticationUser"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithUser(AuthenticationUser user)
+    {
+        UserType = user.ThrowIfNull().Type;
+        UserId = user.Id;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the <paramref name="schema"/> <see cref="Uri"/> to be included.
+    /// </summary>
+    /// <param name="schema">The schema <see cref="Uri"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    public EventData WithSchema(Uri schema) => this.Adjust(x => x.DataSchema = schema.ThrowIfNull());
+
+    /// <summary>
+    /// Sets the <paramref name="title"/> as the <see cref="Title"/> override.
+    /// </summary>
+    /// <param name="title">The title.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Title"/> documentation for more details on its intended usage.</remarks>
+    public EventData WithTitle(string title) => this.Adjust(x => x.Title = title.ThrowIfNull());
+
+    /// <summary>
+    /// Sets the <paramref name="source"/> as the <see cref="Source"/> override.
+    /// </summary>
+    /// <param name="source">The source <see cref="Uri"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="Source"/> documentation for more details on its intended usage.</remarks>
+    public EventData WithSource(Uri source) => this.Adjust(x => x.Source = source.ThrowIfNull());
+
+    /// <summary>
+    /// Sets the <paramref name="value"/> as serialized JSON (<see cref="MediaTypeNames.Application.Json"/>) to the <see cref="Data"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="excludePaths">The list of JSON paths to exclude from the serialized JSON.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Automatically sets the following:
+    /// <list type="bullet">
+    /// <item><see cref="Data"/> as JSON-serialized <paramref name="value"/> (excluding any <paramref name="excludePaths"/>).</item>
+    /// <item><see cref="DataSchemaVersion"/> as <see cref="SchemaAttribute.Version"/> (where specified); otherwise, <see cref="Schema.DefaultVersion"/>.</item>
+    /// <item><see cref="DataSchema"/> as <see cref="SchemaAttribute.SchemaUri"/> (where specified).</item>
+    /// <item><see cref="Entity"/> as <see cref="SchemaAttribute.Name"/> (where specified); otherwise, <paramref name="value"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>.</item>
+    /// <item><see cref="Key"/> as <paramref name="value"/> <see cref="IEntityKey.EntityKey"/> (where not previously set).</item>
+    /// <item><see cref="TenantId"/> as <paramref name="value"/> <see cref="IReadOnlyTenantId.TenantId"/> (where not previously set).</item>
+    /// <item><see cref="PartitionKey"/> as <paramref name="value"/> <see cref="IReadOnlyPartitionKey.PartitionKey"/> (where not previously set).</item>
+    /// </list>
+    /// </remarks>
+    public EventData WithValue<T>(T? value, IEnumerable<string>? excludePaths, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        // Where entity and related has not yet been specified see if it can be inferred from the value type.
+        Schema.TryGetMetadata<T>(out var metadata);
+        Entity ??= metadata.Name;
+        DataSchema ??= metadata.SchemaUri is null ? null : new Uri(metadata.SchemaUri, UriKind.RelativeOrAbsolute);
+        DataSchemaVersion ??= metadata.Version;
+
+        // Infer from value where possible.
+        if (Key is null && value is IEntityKey key)
+            Key = key.EntityKey.ToString();
+        
+        if (TenantId is null && value is IReadOnlyTenantId tenantId)
+            TenantId = tenantId.TenantId;
+
+        if (PartitionKey is null && value is IReadOnlyPartitionKey partitionKey)
+            PartitionKey = partitionKey.PartitionKey;
+
+        // Exit quickly where the value is null.
+        if (value is null)
+        {
+            Data = null;
+            return this;
+        }
+
+        // Serialize the value data.
+        jsonSerializerOptions ??= JsonDefaults.SerializerOptions;
+        if (!excludePaths?.Any() ?? false)
+            Data = BinaryData.FromObjectAsJson(value, jsonSerializerOptions);
+        else
+        {
+            JsonFilter.TryFilter(value, excludePaths, out JsonNode node, JsonFilterOption.Exclude, jsonSerializerOptions);
+            using var ms = new MemoryStream();
+            var jw = new Utf8JsonWriter(ms);
+            node.WriteTo(jw, jsonSerializerOptions);
+            jw.Flush();
+            ms.Position = 0;
+            Data = BinaryData.FromStream(ms, MediaTypeNames.Application.Json);
+        }
+
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the <paramref name="value"/> as serialized JSON (<see cref="MediaTypeNames.Application.Json"/>) to the <see cref="Data"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="excludePaths">The list of JSON paths to exclude from the serialized JSON.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Automatically sets the following:
+    /// <list type="bullet">
+    /// <item><see cref="Data"/> as JSON-serialized <paramref name="value"/> (excluding any <paramref name="excludePaths"/>).</item>
+    /// <item><see cref="DataSchemaVersion"/> as <see cref="SchemaAttribute.Version"/> (where specified); otherwise, <see cref="Schema.DefaultVersion"/>.</item>
+    /// <item><see cref="DataSchema"/> as <see cref="SchemaAttribute.SchemaUri"/> (where specified).</item>
+    /// <item><see cref="Entity"/> as <see cref="SchemaAttribute.Name"/> (where specified); otherwise, <paramref name="value"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>.</item>
+    /// <item><see cref="TenantId"/> as <paramref name="value"/> <see cref="IReadOnlyTenantId.TenantId"/> (where not previously set).</item>
+    /// <item><see cref="PartitionKey"/> as <paramref name="value"/> <see cref="IReadOnlyPartitionKey.PartitionKey"/> (where not previously set).</item>
+    /// </list>
+    /// </remarks>
+    public EventData WithValue<T>(T? value = default, params IEnumerable<string> excludePaths) => WithValue(value, excludePaths, null);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventData.cs b/src/CoreEx.Events/EventData.cs
new file mode 100644
index 00000000..143aebd2
--- /dev/null
+++ b/src/CoreEx.Events/EventData.cs
@@ -0,0 +1,176 @@
+namespace CoreEx.Events;
+
+/// <summary>
+/// Provides the core event (message) data in a format agnostic manner.
+/// </summary>
+/// <remarks>Although the <see cref="EventData"/> is <see langword="sealed"/> extensions are supported; these should be implemented as extension properties/methods leveraging the underlying <see cref="Attributes"/> where applicable.</remarks>
+public sealed partial class EventData : IIdentifier<string>, ITenantId, IPartitionKey
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventData"/> class.
+    /// </summary>
+    public EventData()
+    {
+        Id = Runtime.NewId();
+        Timestamp = Runtime.UtcNow;
+
+        if (ExecutionContext.TryGetCurrent(out var ec))
+        {
+            TenantId = ec.TenantId;
+            UserType = ec.User.Type;
+            UserId = ec.User.Id;
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the unique event identifier.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="Runtime.NewId"/>.</remarks>
+    public string Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the event timestamp.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="Runtime.UtcNow"/>.</remarks>
+    public DateTimeOffset Timestamp { get; set; }
+
+    /// <summary>
+    /// Gets or sets the domain (<see href="https://en.wikipedia.org/wiki/Domain-driven_design">DDD</see> bounded context) name.
+    /// </summary>
+    public string? DomainName { get; set; }
+
+    /// <inheritdoc/>
+    public string? TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the entity/command (subject) name.
+    /// </summary>
+    /// <remarks>This is typically a noun describing the <i>what</i> that is being acted upon such as '<c>Order</c>' or '<c>Customer</c>'.</remarks>
+    public string? Entity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the action name.
+    /// </summary>
+    /// <remarks>This is typically a verb describing an <i>event</i> in past tense such as '<c>Created</c>' or '<c>Updated</c>'; or, describing a <i>command</i> such as '<c>Send</c>'.</remarks>
+    public string? Action { get; set; }
+
+    /// <summary>
+    /// Gets or sets the unique key (or identifier) for the entity.
+    /// </summary>
+    public string? Key { get; set; }
+
+    /// <summary>
+    /// Gets or sets the trace parent (set to <see cref="System.Diagnostics.Activity.Id"/> via the <see cref="EventFormatter"/>).
+    /// </summary>
+    public string? TraceParent { get; set; }
+
+    /// <summary>
+    /// Gets or sets the trace state (set to <see cref="System.Diagnostics.Activity.TraceStateString"/> via the <see cref="EventFormatter"/>).
+    /// </summary>
+    public string? TraceState { get; set; }
+
+    /// <summary>
+    /// Gets or sets the trace baggage (set to <see cref="System.Diagnostics.Activity.Baggage"/> via the <see cref="EventFormatter"/>).
+    /// </summary>
+    public IEnumerable<KeyValuePair<string, string?>>? TraceBaggage { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user <see cref="AuthenticationType"/> (defaults to <see cref="ExecutionContext.User"/> <see cref="AuthenticationUser.Type"/>).
+    /// </summary>
+    public AuthenticationType? UserType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user (auth) identifier (defaults to <see cref="ExecutionContext.User"/> <see cref="AuthenticationUser.Id"/>).
+    /// </summary>
+    public string? UserId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the event data.
+    /// </summary>
+    /// <remarks>This is set automatically by the <see cref="WithValue{T}(T, IEnumerable{string})"/>.</remarks>
+    public BinaryData? Data { get; set; }
+
+    /// <summary>
+    /// Gets or sets the event data schema <see cref="Uri"/>.
+    /// </summary>
+    /// <remarks>This is set automatically by the <see cref="WithValue{T}(T, IEnumerable{string})"/>.</remarks>
+    public Uri? DataSchema { get; set; }
+
+    /// <summary>
+    /// Gets or sets the event data schema <see cref="Version"/>.
+    /// </summary>
+    /// <remarks>This is set automatically by the <see cref="WithValue{T}(T, IEnumerable{string})"/>.</remarks>
+    public Version? DataSchemaVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the partition key.
+    /// </summary>
+    /// <remarks>This is set automatically by the <see cref="WithValue{T}(T, IEnumerable{string})"/>; either with the implemented <see cref="IReadOnlyPartitionKey.PartitionKey"/> or falls back to the <see cref="Key"/> (see default <see cref="EventFormatter.Format(EventData)"/>).</remarks>
+    public string? PartitionKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reply-to destination.
+    /// </summary>
+    /// <remarks>This can be set to share a destination (i.e. topic) where a result is expected to be sent upon processing the event. For example, this can be used for commands to indicate where the result should be sent back to the caller.
+    /// <para>Note: sending does not guarantee usage; it is up to the consumer as to whether to respond accordingly.</para></remarks>
+    public string? ReplyTo { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title; being the fully qualified (segmented) value used for routing, observability, policy enforcement, etc.
+    /// </summary>
+    /// <remarks>This is typically set/formatted when the event is being published.</remarks>
+    public string? Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the source <see cref="Uri"/>; typically the originating system or service that produced the event.
+    /// </summary>
+    /// <remarks>This is typically set/formatted when the event is being published.</remarks>
+    public Uri? Source { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="Events.MessageType"/>.
+    /// </summary>
+    /// <remarks>This is set by either the <see cref="CreateEvent(string, string?)"/> or <see cref="CreateCommandWith{T}(string, T, string)"/> to distinguish which was used; otherwise, defaults to <see cref="MessageType.Event"/>.
+    /// <para>This property has no <see cref="CloudEvent"/> equivalence and is not converted by default.</para></remarks>
+    [JsonIgnore]
+    public MessageType MessageType { get; set; }
+
+    /// <summary>
+    /// Gets the additional attributes.
+    /// </summary>
+    /// <remarks>Any attribute key with an underscore ('<c>_</c>') prefix denotes that it is <i>not</i> intended to be published unless explicitly implemented.</remarks>
+    [JsonIgnore]
+    public ConcurrentDictionary<string, object?> Attributes { get; } = new(StringComparer.OrdinalIgnoreCase);
+
+    /// <summary>
+    /// Adds or updates the attribute using the specified <paramref name="key"/> and <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="key">The attribute key.</param>
+    /// <param name="value">The attribute value.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method chaining.</returns>
+    public EventData SetAttribute<T>(string key, T value)
+    {
+        Attributes.AddOrUpdate(key.ThrowIfNullOrEmpty(), _ => value, (_, __) => value);
+        return this;
+    }
+
+    /// <summary>
+    /// Tries to get the attribute using the specified <paramref name="key"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="key">The attribute key.</param>
+    /// <param name="value">The attribute value.</param>
+    /// <returns><see langword="true"/> indicates found; otherwise, <see langword="false"/>.</returns>
+    public bool TryGetAttribute<T>(string key, out T? value)
+    {
+        if (Attributes.TryGetValue(key, out var av))
+        {
+            value = (T?)av;
+            return true;
+        }
+
+        value = default;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventFormatter.cs b/src/CoreEx.Events/EventFormatter.cs
new file mode 100644
index 00000000..ecba3e99
--- /dev/null
+++ b/src/CoreEx.Events/EventFormatter.cs
@@ -0,0 +1,388 @@
+namespace CoreEx.Events;
+
+/// <summary>
+/// Provides the formatting (<see cref="Format"/>) and parsing (<see cref="Parse"/>) of an <see cref="EventData"/>, and its conversion to (<see cref="ConvertToCloudEvent"/>) and from (<see cref="ConvertFromCloudEvent"/>) a <see cref="CloudEvent"/>.
+/// </summary>
+/// <remarks>The <see cref="IEventFormatter"/> methods are <i>virtual</i> to allow this class to be easily extended; this is the <i>intended</i> behavior.</remarks>
+public class EventFormatter : IEventFormatter
+{
+    private const string _defaultSegment = "?";
+    private bool _initializeNameArray = true;
+    private string[] _nameArray = [];
+    private readonly BaggagePropagator _propagator = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventFormatter"/> class.
+    /// </summary>
+    /// <param name="hostSettings">The optional <see cref="Hosting.IHostSettings"/> used to default the <see cref="TitlePrefix"/> (<see cref="IHostSettings.SolutionName"/>), <see cref="DomainName"/> and <see cref="SourceBaseUri"/>.</param>
+    public EventFormatter(IHostSettings? hostSettings = null)
+    {
+        HostSettings = hostSettings ?? ExecutionContext.GetService<IHostSettings>();
+        TitlePrefix = HostSettings?.SolutionName;
+        SourceBaseUri = HostSettings?.Source;
+        DomainName = HostSettings?.DomainName;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="HostSettings"/>.
+    /// </summary>
+    /// <remarks>Enables the <see cref="TitlePrefix"/> (<see cref="IHostSettings.SolutionName"/>) and <see cref="DomainName"/> (<see cref="IHostSettings.DomainName"/>).</remarks>
+    public IHostSettings? HostSettings { get; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.TraceParent"/>.
+    /// </summary>
+    public string TraceParentAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "traceparent";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.TraceState"/>.
+    /// </summary>
+    public string TraceStateAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "tracestate";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.TraceBaggage"/>.
+    /// </summary>
+    public string TraceBaggageAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "baggage";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.TenantId"/>.
+    /// </summary>
+    public string TenantIdAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "tenantid";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.DataSchemaVersion"/>.
+    /// </summary>
+    public string DataSchemaVersionAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "dataschemaversion";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.UserType"/>.
+    /// </summary>
+    public string AuthTypeAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "authtype";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.UserId"/>.
+    /// </summary>
+    public string AuthIdAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "authid";
+
+    /// <summary>
+    /// Gets or sets the <see cref="CloudEvent"/> extension attribute name for the <see cref="EventData.ReplyTo"/>.
+    /// </summary>
+    public string ReplyToAttributeName { get; set => field = SetAndInitializeNameArray(value); } = "replyto";
+
+    /// <summary>
+    /// Gets or sets the casing to apply to the <see cref="EventData.Title"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="StringCase.Lower"/>.</remarks>
+    public StringCase TitleCase { get; set; } = StringCase.Lower;
+
+    /// <summary>
+    /// Gets or sets the casing to apply to the <see cref="EventData.Source"/>.
+    /// </summary>
+    public StringCase SourceCase { get; set; } = StringCase.Lower;
+
+    /// <summary>
+    /// Indicates whether to set the <see cref="EventData.PartitionKey"/> where <see langword="null"/> to the <see cref="EventData.Key"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="true"/>.</remarks>
+    public bool SetPartitionKeyToKey { get; set; } = true;
+
+    /// <summary>
+    /// Indicates whether to throw an <see cref="InvalidOperationException"/> during <see cref="Format(EventData)"/> when the <see cref="EventData.PartitionKey"/> is <see langword="null"/>.
+    /// </summary>
+    public bool PartitionKeyIsRequired { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the <see cref="EventData.Title"/> prefix used by the default formatting.
+    /// </summary>
+    /// <remarks>This should use the '<c>.</c>' to separate segments.
+    /// <para>This defaults to the <see cref="IHostSettings.SolutionName"/>.</para></remarks>
+    public string? TitlePrefix { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="EventData.Source"/> base <see cref="Uri"/> used by the default formatting.
+    /// </summary>
+    public Uri? SourceBaseUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default Domain (DDD) name to be used where not specified on the <see cref="EventData"/> (see <see cref="EventData.DomainName"/>).
+    /// </summary>
+    /// <remarks>This defaults to the <see cref="IHostSettings.DomainName"/>.</remarks>
+    public string? DomainName { get; set; }
+
+    /// <inheritdoc/>
+    /// <remarks>The <see cref="EventData.Title"/> is formatted by default using the following convention:
+    /// <code>[{EventFormatter.TitlePrefix}.]{EventData.DomainName}.{EventData.Entity}.{EventData.Action}[.v{EventData.DataSchemaVersion.Major}]</code></remarks>
+    public virtual EventData Format(EventData @event)
+    {
+        string[] tpa = TitlePrefix is null ? [] : [TitlePrefix];
+
+        if (@event.Title is null)
+        {
+            @event.Title = Cleaner.Clean(string.Join('.', [.. tpa, @event.DomainName ?? DomainName ?? _defaultSegment, @event.Entity ?? _defaultSegment, @event.Action ?? _defaultSegment]), casing: TitleCase);
+            if (@event.DataSchemaVersion is not null)
+                @event.Title += $".v{@event.DataSchemaVersion.Major}";
+        }
+
+        if (@event.Source is null)
+        {
+            if (@event.TenantId is null)
+            {
+                if (SourceBaseUri is not null)
+                    @event.Source = new Uri(SourceBaseUri.OriginalString);
+            }
+            else if (Uri.TryCreate(SourceBaseUri, Cleaner.Clean(@event.TenantId, casing: SourceCase), out var uri))
+                @event.Source = uri;
+
+            if (@event.Source is null)
+            {
+                if (SourceBaseUri is not null)
+                    throw new InvalidOperationException($"The {nameof(EventData)}.{nameof(EventData.Source)} URI could not be successfully created using the {nameof(SourceBaseUri)} and {nameof(EventData)}.{nameof(EventData.TenantId)}");
+                else
+                    @event.Source = SourceBaseUri;
+            }
+        }
+
+        if (SetPartitionKeyToKey)
+            @event.PartitionKey ??= @event.Key;
+
+        if (@event.PartitionKey is null && PartitionKeyIsRequired)
+            throw new InvalidOperationException($"A {nameof(EventData)}.{nameof(EventData.PartitionKey)} PartitionKey is required.");
+
+        return @event;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Parses with the following convention:
+    /// <code>[{EventFormatter.TitlePrefix}.]{EventData.DomainName}.{EventData.Entity}.{EventData.Action}[.v{EventData.DataSchemaVersion.Major}]</code>
+    /// <para>Updates the corresponding <see cref="EventData"/> properties where not currently set; however, where there is a mismatch with the convention during parsing no update will occur.</para></remarks>
+    public virtual EventData Parse(EventData @event)
+    {
+        var title = @event.Title?.Trim();
+        if (string.IsNullOrEmpty(title))
+            return @event;
+
+        if (TitlePrefix is not null)
+        {
+            if (title.Length <= TitlePrefix.Length + 1)
+                return @event;
+
+            if (title.StartsWith(TitlePrefix, StringComparison.OrdinalIgnoreCase))
+                title = title[TitlePrefix.Length..].TrimStart('.');
+            else
+                return @event;
+        }
+
+        var segments = title.Split('.');
+        if (segments.Length < 3)
+            return @event;
+
+        // At this point we believe we have at least 3 segments: DomainName, Entity, Action - which is enough to carry on.
+        @event.DomainName = segments[0];
+        @event.Entity = segments[1];
+        @event.Action = segments[2];
+
+        // The fourth segment is optional and represents the DataSchemaVersion.
+        if (segments.Length >= 4)
+        {
+            if (segments[3].Length > 1 && segments[3].StartsWith("v", StringComparison.OrdinalIgnoreCase) && int.TryParse(segments[3][1..], out var major))
+                @event.DataSchemaVersion ??= new Version(major, 0);
+        }
+
+        return @event;
+    }
+
+    /// <inheritdoc/>
+    public virtual CloudEvent ConvertToCloudEvent(EventData @event)
+    {
+        var ce = new CloudEvent
+        {
+            Id = @event.ThrowIfNull().Id,
+            Type = @event.Title,
+            Source = @event.Source,
+            Subject = @event.Key,
+            Time = @event.Timestamp
+        };
+
+        ce.SetExtensionAttribute(TenantIdAttributeName, @event.TenantId);
+
+        var pk = @event.PartitionKey ?? @event.Key;
+        if (pk is not null)
+            ce.SetPartitionKey(pk);
+
+        ce.SetExtensionAttribute(ReplyToAttributeName, @event.ReplyTo);
+        ce.SetExtensionAttribute(AuthTypeAttributeName, ConvertFromAuthenticationType(@event.UserType));
+        ce.SetExtensionAttribute(AuthIdAttributeName, @event.UserId);
+
+        AddTracing(ce, @event.TraceParent, @event.TraceState, @event.TraceBaggage);
+
+        foreach (var kvp in @event.Attributes.Where(x => !x.Key.StartsWith('_')).OrderBy(x => x.Key))
+        {
+            ce.SetExtensionAttribute(kvp.Key, kvp.Value);
+        }
+
+        if (@event.Data is not null)
+        {
+            ce.SetExtensionAttribute(DataSchemaVersionAttributeName, @event.DataSchemaVersion?.ToString());
+            ce.DataSchema = @event.DataSchema;
+            ce.DataContentType = @event.Data?.MediaType;
+            ce.Data = @event.Data;
+        }
+
+        return ce;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>The <see cref="CloudEvent.Data"/> must be of type <see cref="BinaryData"/> otherwise a <see cref="NotSupportedException"/> will be thrown.</remarks>
+    public virtual EventData ConvertFromCloudEvent(CloudEvent cloudEvent)
+    {
+        var @event = new EventData
+        {
+            Id = cloudEvent.ThrowIfNull().Id ?? string.Empty,
+            Timestamp = cloudEvent.Time ?? DateTimeOffset.MinValue,
+            DataSchema = cloudEvent.DataSchema,
+            Key = cloudEvent.Subject,
+            PartitionKey = cloudEvent.GetPartitionKey()
+        };
+
+        if (cloudEvent.Data is not null)
+            @event.Data = cloudEvent.Data is BinaryData ed ? ed : throw new NotSupportedException($"The {nameof(CloudEvent)}.{nameof(CloudEvent.Data)} type must be {nameof(BinaryData)}; not '{cloudEvent.Data.GetType().FullName}'.");
+
+        if (cloudEvent.TryGetExtensionAttribute(DataSchemaVersionAttributeName, out string? val))
+            @event.DataSchemaVersion = Version.TryParse(val, out var ver) ? ver : null;
+
+        if (cloudEvent.TryGetExtensionAttribute(TenantIdAttributeName, out val))
+            @event.TenantId = val;
+
+        if (cloudEvent.TryGetExtensionAttribute(ReplyToAttributeName, out val))
+            @event.ReplyTo = val;
+
+        if (cloudEvent.TryGetExtensionAttribute(AuthTypeAttributeName, out val))
+            @event.UserType = ConvertToAuthenticationType(val);
+
+        if (cloudEvent.TryGetExtensionAttribute(AuthIdAttributeName, out val))
+            @event.UserId = val;
+
+        if (cloudEvent.TryGetExtensionAttribute(TraceParentAttributeName, out val))
+            @event.TraceParent = val;
+
+        if (cloudEvent.TryGetExtensionAttribute(TraceStateAttributeName, out val))
+            @event.TraceState = val;
+
+        if (cloudEvent.TryGetExtensionAttribute(TraceBaggageAttributeName, out val) && !string.IsNullOrEmpty(val))
+        {
+            var carrier = new Dictionary<string, string?> { ["baggage"] = val };
+            var propagationContext = _propagator.Extract(default, carrier, (msg, key) => msg.TryGetValue(key, out var value) ? [value!] : []);
+
+            if (propagationContext.Baggage.Count > 0)
+                @event.TraceBaggage = Baggage.GetBaggage(propagationContext.Baggage).Select(x => new KeyValuePair<string, string?>(x.Key, x.Value));
+        }
+
+        if (cloudEvent.Source is not null)
+            @event.Source = cloudEvent.Source;
+
+        if (!string.IsNullOrEmpty(cloudEvent.Type))
+            @event.Title = cloudEvent.Type;
+
+        InitializeNameArray();
+        foreach (var kvp in cloudEvent.GetPopulatedAttributes().Where(x => !_nameArray.Contains(x.Key.Name, StringComparer.OrdinalIgnoreCase)))
+        {
+            @event.SetAttribute(kvp.Key.Name, kvp.Value);
+        }
+
+        return @event;
+    }
+
+    /// <summary>
+    /// Flags that the initialization of the name array is required.
+    /// </summary>
+    private string SetAndInitializeNameArray(string value)
+    {
+        _initializeNameArray = true;
+        return value.ThrowIfNullOrEmpty();
+    }
+
+    /// <summary>
+    /// (Re)initializes the name array used for attribute name checking.
+    /// </summary>
+    private void InitializeNameArray()
+    {
+        if (!_initializeNameArray)
+            return;
+
+        _initializeNameArray = false;
+        _nameArray = [.. CloudEventsSpecVersion.Default.AllAttributes.Select(x => x.Name), Partitioning.PartitionKeyAttribute.Name, TraceParentAttributeName, TraceStateAttributeName, TenantIdAttributeName, DataSchemaVersionAttributeName, AuthTypeAttributeName, AuthIdAttributeName, ReplyToAttributeName];
+    }
+
+    /// <inheritdoc/>
+    public void AddTracing(CloudEvent @event, string? traceParent = null, string? traceState = null, IEnumerable<KeyValuePair<string, string?>>? traceBaggage = null)
+    {
+        @event.ThrowIfNull();
+        if (@event.TryGetExtensionAttribute(TraceParentAttributeName, out string _))
+            return;
+
+        if (string.IsNullOrEmpty(traceParent) && Activity.Current is not null)
+        {
+            traceParent = Activity.Current.Id;
+            traceState = Activity.Current.TraceStateString;
+            traceBaggage ??= Activity.Current.Baggage;
+        }
+
+        if (string.IsNullOrEmpty(traceParent))  
+            return;
+
+        string? formattedBaggage = null;
+        if (traceBaggage is not null)
+        {
+            var baggage = default(Baggage);
+            foreach (var item in traceBaggage)
+                baggage = baggage.SetBaggage(item.Key, item.Value);
+
+            if (baggage.Count > 0)
+            {
+                var carrier = new Dictionary<string, string?>();
+                var ac = Activity.Current?.Context ?? (ActivityContext.TryParse(traceParent, traceState, out var context) ? context : default);
+                if (ac != default)
+                {
+                    _propagator.Inject(new PropagationContext(Activity.Current?.Context ?? ActivityContext.Parse(traceParent, traceState), baggage), carrier, (msg, key, value) => msg[key] = value);
+                    carrier.TryGetValue("baggage", out formattedBaggage);
+                }
+            }
+        }
+
+        @event.SetExtensionAttribute(TraceParentAttributeName, traceParent);
+        @event.SetExtensionAttribute(TraceStateAttributeName, traceState);
+        @event.SetExtensionAttribute(TraceBaggageAttributeName, formattedBaggage);
+    }
+
+    /// <summary>
+    /// Converts the <see cref="AuthenticationType"/> to a corresponding CloudEvent 'authtype' attribute value.
+    /// </summary>
+    /// <param name="type">The <see cref="AuthenticationType"/>.</param>
+    /// <returns>The corresponding CloudEvent 'authtype' attribute value.</returns>
+    protected string? ConvertFromAuthenticationType(AuthenticationType? type) => type switch
+    {
+        null => null,
+        AuthenticationType.Unknown => "unknown",
+        AuthenticationType.Unauthenticated => "unauthenticated",
+        AuthenticationType.ApplicationUser => "app_user",
+        AuthenticationType.AccountUser => "user",
+        AuthenticationType.SystemUser => "system",
+        _ => throw new InvalidOperationException($"{nameof(AuthenticationType)} of '{type}' is unable to be converted to a corresponding CloudEvent 'authtype' attribute.")
+    };
+
+    /// <summary>
+    /// Converts the CloudEvent 'authtype' attribute value to a corresponding <see cref="AuthenticationType"/>.
+    /// </summary>
+    /// <param name="type">The CloudEvent 'authtype' attribute value.</param>
+    /// <returns>The corresponding <see cref="AuthenticationType"/>.</returns>
+    protected AuthenticationType? ConvertToAuthenticationType(string? type) => type switch
+    {
+        null => null,
+        "unknown" => AuthenticationType.Unknown,
+        "unauthenticated" => AuthenticationType.Unauthenticated,
+        "app_user" => AuthenticationType.ApplicationUser,
+        "user" => AuthenticationType.AccountUser,
+        "system" => AuthenticationType.SystemUser,
+        _ => throw new InvalidOperationException($"The CloudEvent 'authtype' attribute value of '{type}' is unable to be converted to a corresponding {nameof(AuthenticationType)}.")
+    };
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventsExtensions.CloudEvent.cs b/src/CoreEx.Events/EventsExtensions.CloudEvent.cs
new file mode 100644
index 00000000..8f906c8f
--- /dev/null
+++ b/src/CoreEx.Events/EventsExtensions.CloudEvent.cs
@@ -0,0 +1,175 @@
+namespace CoreEx.Events;
+
+public static partial class EventsExtensions
+{
+    /// <summary>
+    /// Infers the <see cref="ContentMode"/> from the <see cref="BinaryData"/>'s <see cref="BinaryData.MediaType"/>.
+    /// </summary>
+    /// <param name="binaryData">The <see cref="BinaryData"/>.</param>
+    /// <returns>The inferred <see cref="ContentMode"/>.</returns>
+    public static ContentMode InferContentMode(this BinaryData binaryData)
+    {
+        if (binaryData is null || string.IsNullOrEmpty(binaryData.MediaType))
+            return ContentMode.Binary;
+
+        var contentType = new ContentType(binaryData.MediaType);
+        return contentType.MediaType.StartsWith("application/cloudevents", StringComparison.OrdinalIgnoreCase) ? ContentMode.Structured : ContentMode.Binary;
+    }
+
+    /// <summary>
+    /// Encodes the <see cref="CloudEvent"/> to a <see cref="BinaryData"/> using the specified <see cref="ContentMode"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <param name="contentMode">The <see cref="ContentMode"/>; defaults to <see cref="ContentMode.Structured"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The <paramref name="cloudEvent"/> encoded to <see cref="BinaryData"/>.</returns>
+    /// <remarks>This uses a customized <see cref="JsonEventFormatter"/> internally to enable.</remarks>
+    public static BinaryData EncodeToBinaryData(this CloudEvent cloudEvent, ContentMode contentMode = ContentMode.Structured, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        cloudEvent.ThrowIfNull();
+        var formatter = new InternalFormatter(jsonSerializerOptions ?? JsonDefaults.SerializerOptions, default);
+        return contentMode switch
+        {
+            ContentMode.Structured => new BinaryData(formatter.EncodeStructuredModeMessage(cloudEvent.ThrowIfNull(), out var contentType), contentType.ToString()),
+            ContentMode.Binary => new BinaryData(formatter.EncodeBinaryModeEventData(cloudEvent.ThrowIfNull()), cloudEvent.DataContentType),
+            _ => throw new ArgumentException("Invalid content mode specified.", nameof(contentMode))
+        };
+    }
+
+    /// <summary>
+    /// Decodes the <see cref="BinaryData"/> to a <see cref="CloudEvent"/> using the specified <see cref="ContentMode"/>.
+    /// </summary>
+    /// <param name="binaryData">The <see cref="BinaryData"/>.</param>
+    /// <param name="contentMode">The <see cref="ContentMode"/>; defaults to <see cref="ContentMode.Structured"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The <paramref name="binaryData"/> decoded to a <see cref="CloudEvent"/>.</returns>
+    public static CloudEvent DecodeToCloudEvent(this BinaryData binaryData, ContentMode contentMode = ContentMode.Structured, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        var formatter = new InternalFormatter(jsonSerializerOptions ?? JsonDefaults.SerializerOptions, default);
+        var contentType = string.IsNullOrEmpty(binaryData?.MediaType) ? null : new ContentType(binaryData.MediaType);
+
+        if (contentMode == ContentMode.Structured)
+            return formatter.DecodeStructuredModeMessage(binaryData, contentType, null);
+
+        var cex = new CloudEvent() { DataContentType = contentType?.MediaType };
+        if (formatter.IsJsonContentType(contentType))
+            cex.Data = binaryData;
+        else
+            formatter.DecodeBinaryModeEventData(binaryData, cex);
+
+        return cex;
+    }
+
+    /// <summary>
+    /// Encodes the <see cref="CloudEvent"/> to a <see cref="JsonElement"/> as <see cref="ContentMode.Structured"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonDefaults"/>.</param>
+    /// <returns>The <paramref name="cloudEvent"/> encoded to a <see cref="JsonElement"/>.</returns>
+    public static JsonElement EncodeToJsonElement(this CloudEvent cloudEvent, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        var formatter = new InternalFormatter(jsonSerializerOptions ?? JsonDefaults.SerializerOptions, default);
+        var jr = new Utf8JsonReader(formatter.EncodeStructuredModeMessage(cloudEvent.ThrowIfNull(), out var _).Span);
+        return JsonElement.ParseValue(ref jr);
+    }
+
+    /// <summary>
+    /// Decodes the <see cref="JsonElement"/> to a <see cref="CloudEvent"/> assuming <see cref="ContentMode.Structured"/>.
+    /// </summary>
+    /// <param name="jsonElement">The <see cref="JsonElement"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonDefaults"/>.</param>
+    /// <returns>The <paramref name="jsonElement"/> decoded to a <see cref="CloudEvent"/>.</returns>
+    public static CloudEvent DecodeToCloudEvent(this JsonElement jsonElement, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        var formatter = new InternalFormatter(jsonSerializerOptions ?? JsonDefaults.SerializerOptions, default);
+
+        using var stream = new MemoryStream();
+        using (var writer = new Utf8JsonWriter(stream))
+        {
+            jsonElement.WriteTo(writer);
+        }
+
+        stream.Position = 0;
+        return formatter.DecodeStructuredModeMessage(stream, new ContentType(MediaTypeNames.Application.Json), null);
+    }
+
+    /// <summary>
+    /// Customized internal <see cref="JsonEventFormatter"/>.
+    /// </summary>
+    private sealed class InternalFormatter(JsonSerializerOptions options, JsonDocumentOptions jsonDocumentOptions) : JsonEventFormatter(options, jsonDocumentOptions)
+    {
+        /// <summary>
+        /// Indicates whether the <see cref="ContentType"/> is considered JSON.
+        /// </summary>
+        public bool IsJsonContentType(ContentType? contentType) => contentType is not null && IsJsonMediaType(contentType.MediaType);
+
+        /// <inheritdoc/>
+        protected override void EncodeStructuredModeData(CloudEvent cloudEvent, Utf8JsonWriter writer)
+        {
+            if (cloudEvent.Data is BinaryData bd && !string.IsNullOrEmpty(cloudEvent.DataContentType) && IsJsonMediaType(cloudEvent.DataContentType))
+            {
+                writer.WritePropertyName(DataPropertyName);
+                writer.WriteRawValue(bd, true);
+            }
+            else
+                base.EncodeStructuredModeData(cloudEvent, writer);
+        }
+
+        /// <inheritdoc/>
+        public override ReadOnlyMemory<byte> EncodeBinaryModeEventData(CloudEvent cloudEvent)
+        {
+            if (cloudEvent is not null && cloudEvent.Data is BinaryData bd && !string.IsNullOrEmpty(cloudEvent.DataContentType) && IsJsonMediaType(cloudEvent.DataContentType))
+                return bd.ToArray();
+            else
+                return base.EncodeBinaryModeEventData(cloudEvent!);
+        }
+
+        protected override void DecodeStructuredModeDataProperty(JsonElement dataElement, CloudEvent cloudEvent)
+        {
+            cloudEvent.Data = new BinaryData(dataElement.GetRawText());
+        }
+
+        /// <inheritdoc/>
+        public override void DecodeBinaryModeEventData(ReadOnlyMemory<byte> body, CloudEvent cloudEvent)
+        {
+            base.DecodeBinaryModeEventData(body, cloudEvent);
+
+            if (cloudEvent.Data is not null && cloudEvent.Data is not BinaryData)
+                cloudEvent.Data = new BinaryData(cloudEvent.Data);
+        }
+    }
+
+    /// <summary>
+    /// Sets the <see cref="CloudEvent"/> extension attribute where not default value.
+    /// </summary>
+    /// <param name="ce">The <see cref="CloudEvent"/>.</param>
+    /// <param name="name">The attribute name.</param>
+    /// <param name="value">The attribute value.</param>
+    public static void SetExtensionAttribute<T>(this CloudEvent ce, string name, T value)
+    {
+        if (Comparer<T>.Default.Compare(value, default!) == 0)
+            return;
+
+        ce[name] = value;
+    }
+
+    /// <summary>
+    /// Tries to get the named <see cref="CloudEvent"/> extension attribute value.
+    /// </summary>
+    /// <param name="ce">The <see cref="CloudEvent"/>.</param>
+    /// <param name="name">The attribute name.</param>
+    /// <param name="value">The attribute value.</param>
+    /// <returns><see langword="true"/> indicates that the extension attribute exists; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetExtensionAttribute<T>(this CloudEvent ce, string name, [NotNullWhen(true)] out T value)
+    {
+        var val = ce[name];
+        if (val is null)
+        {
+            value = default!;
+            return false;
+        }
+
+        value = (T)val;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/EventsExtensions.cs b/src/CoreEx.Events/EventsExtensions.cs
new file mode 100644
index 00000000..1defcfd8
--- /dev/null
+++ b/src/CoreEx.Events/EventsExtensions.cs
@@ -0,0 +1,8 @@
+namespace CoreEx.Events;
+
+/// <summary>
+/// Provides event related extensions.
+/// </summary>
+public static partial class EventsExtensions
+{
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/GlobalUsing.cs b/src/CoreEx.Events/GlobalUsing.cs
new file mode 100644
index 00000000..71ba42e1
--- /dev/null
+++ b/src/CoreEx.Events/GlobalUsing.cs
@@ -0,0 +1,35 @@
+global using CloudNative.CloudEvents;
+global using CloudNative.CloudEvents.Extensions;
+global using CloudNative.CloudEvents.SystemTextJson;
+global using CoreEx;
+global using CoreEx.Abstractions;
+global using CoreEx.Data;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Events.Subscribing.Exceptions;
+global using CoreEx.Hosting;
+global using CoreEx.Invokers;
+global using CoreEx.Json;
+global using CoreEx.Results;
+global using CoreEx.Schemas;
+global using CoreEx.Security;
+global using CoreEx.Validation;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using OpenTelemetry;
+global using OpenTelemetry.Context.Propagation;
+global using System.Buffers;
+global using System.Collections.Concurrent;
+global using System.Collections.Immutable;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Diagnostics.Metrics;
+global using System.Net.Mime;
+global using System.Reflection;
+global using System.Runtime.CompilerServices;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
\ No newline at end of file
diff --git a/src/CoreEx.Events/IEventFormatter.cs b/src/CoreEx.Events/IEventFormatter.cs
new file mode 100644
index 00000000..0e20ff51
--- /dev/null
+++ b/src/CoreEx.Events/IEventFormatter.cs
@@ -0,0 +1,45 @@
+namespace CoreEx.Events;
+
+/// <summary>
+/// Enables the formatting (<see cref="Format"/>) and parsing (<see cref="Parse"/>) of an <see cref="EventData"/>, and its conversion to (<see cref="ConvertToCloudEvent"/>) and from (<see cref="ConvertFromCloudEvent"/>) a <see cref="CloudEvent"/>.
+/// </summary>
+public interface IEventFormatter
+{
+    /// <summary>
+    /// Formats the <paramref name="event"/>; this should be performed before the <see cref="ConvertToCloudEvent(EventData)"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    EventData Format(EventData @event);
+
+    /// <summary>
+    /// Parses the <paramref name="event"/>; this should be performed after the <see cref="ConvertFromCloudEvent(CloudEvent)"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <returns>The <see cref="EventData"/> to support fluent-style method-chaining.</returns>
+    EventData Parse(EventData @event);
+
+    /// <summary>
+    /// Adds tracing to the <see cref="CloudEvent"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <param name="traceParent">The optional trace parent; defaults to <see cref="Activity.TraceId"/>.</param>
+    /// <param name="traceState">The optional trace state; defaults to <see cref="Activity.TraceStateString"/>.</param>
+    /// <param name="traceBaggage">The optional trace baggage; defaults to <see cref="Activity.Baggage"/>.</param>
+    /// <remarks>To add, as a minimum the <paramref name="traceParent"/> must be specified.</remarks>
+    void AddTracing(CloudEvent cloudEvent, string? traceParent = null, string? traceState = null, IEnumerable<KeyValuePair<string, string?>>? traceBaggage = null);
+
+    /// <summary>
+    /// Converts an <see cref="EventData"/> <i>to</i> a <see cref="CloudEvent"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <returns>The resulting <see cref="CloudEvent"/>.</returns>
+    CloudEvent ConvertToCloudEvent(EventData @event);
+
+    /// <summary>
+    /// Converts <i>from</i> a <see cref="CloudEvent"/> to an <see cref="EventData"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <returns>The resulting <paramref name="cloudEvent"/>.</returns>
+    EventData ConvertFromCloudEvent(CloudEvent cloudEvent);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/MessageType.cs b/src/CoreEx.Events/MessageType.cs
new file mode 100644
index 00000000..c749f4d8
--- /dev/null
+++ b/src/CoreEx.Events/MessageType.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.Events;
+
+/// <summary>
+/// Represents the type of message.
+/// </summary>
+public enum MessageType
+{
+    /// <summary>
+    /// The message is an event.
+    /// </summary>
+    Event = 0,
+
+    /// <summary>
+    /// The message is a command.
+    /// </summary>
+    Command = 1,
+
+    /// <summary>
+    /// The message is a reply-to.
+    /// </summary>
+    ReplyTo = 2
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/DestinationEvent.cs b/src/CoreEx.Events/Publishing/DestinationEvent.cs
new file mode 100644
index 00000000..09864390
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/DestinationEvent.cs
@@ -0,0 +1,28 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Provides the <see cref="Destination"/> and <see cref="Event"/> pairing for the <see cref="EventPublisherBase.OnPublishAsync(CoreEx.Events.Publishing.DestinationEvent[], CancellationToken)"/>.
+/// </summary>
+public sealed record class DestinationEvent
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DestinationEvent"/> class.
+    /// </summary>
+    /// <param name="destination">The destination (i.e. topic) name.</param>
+    /// <param name="event">The <see cref="CloudNative.CloudEvents.CloudEvent"/>.</param>
+    public DestinationEvent(string destination, CloudEvent @event)
+    {
+        Destination = destination.ThrowIfNullOrEmpty();
+        Event = @event.ThrowIfNull();
+    }
+
+    /// <summary>
+    /// Gets the destination (i.e. topic) name.
+    /// </summary>
+    public string Destination { get; }
+
+    /// <summary>
+    /// Gets the <see cref="CloudNative.CloudEvents.CloudEvent"/>.
+    /// </summary>
+    public CloudEvent Event { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/EventPublisherBase.cs b/src/CoreEx.Events/Publishing/EventPublisherBase.cs
new file mode 100644
index 00000000..ab03fd72
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/EventPublisherBase.cs
@@ -0,0 +1,198 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Provides the base standardized <b>Event</b> publishing and sending orchestration.
+/// </summary>
+/// <param name="destinationProvider">The optional <see cref="IDestinationProvider"/>.</param>
+/// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The optional logger.</param>
+/// <remarks>The <paramref name="destinationProvider"/> <see cref="IDestinationProvider.CreateFrom(CoreEx.Events.EventData, bool)"/> is used to dynamically generate the <i>default</i> destination when adding events using <see cref="Add(IEnumerable{EventData})"/>.</remarks>
+public abstract class EventPublisherBase(IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<EventPublisherBase>? logger = null) : IEventPublisher
+{
+    private static JsonSerializerOptions? _debugJsonSerializerOptions;
+
+    private readonly LinkedList<DestinationEvent> _queue = new();
+    private readonly SemaphoreSlim _semaphore = new(1, 1);
+    private EventPublisherInvoker? _invoker;
+
+    /// <summary>
+    /// Gets the <see cref="IEventFormatter"/>.
+    /// </summary>
+    public IEventFormatter Formatter { get; } = formatter ?? new EventFormatter();
+
+    /// <summary>
+    /// Gets the <see cref="IDestinationProvider"/> that provides the destination (i.e. topic/queue) name for the events.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="FixedDestinationProvider.Default"/>.</remarks>
+    public IDestinationProvider DestinationProvider { get; } = destinationProvider ?? FixedDestinationProvider.Default;
+
+    /// <summary>
+    /// Gets the optional <see cref="ILogger"/> instance.
+    /// </summary>
+    public ILogger? Logger = logger;
+
+    /// <summary>
+    /// Gets the <see cref="EventPublisherInvoker"/>.
+    /// </summary>
+    protected EventPublisherInvoker Invoker => _invoker ??= EventPublisherInvoker.Default;
+
+    /// <inheritdoc/>
+    public bool IsEmpty => _queue.Count == 0;
+
+    /// <inheritdoc/>
+    public int Count => _queue.Count;
+
+    /// <inheritdoc/>
+    public bool HasBeenPublished { get; private set; }
+
+    /// <inheritdoc/>
+    public void Add(params IEnumerable<DestinationEvent> events)
+    {
+        Synchronize(() =>
+        {
+            foreach (var de in events)
+            {
+                if (de is not null)
+                    _queue.AddLast(de);
+            }
+        });
+    }
+
+    /// <inheritdoc/>
+    public void Add(params IEnumerable<EventData> events)
+    {
+        Synchronize(() =>
+        {
+            foreach (var @event in events)
+            {
+                if (@event is not null)
+                    _queue.AddLast(new DestinationEvent(DestinationProvider.CreateFrom(@event), Formatter.ConvertToCloudEvent(Formatter.Format(@event))));
+            }
+        });
+    }
+
+    /// <inheritdoc/>
+    public void Add(string destination, params IEnumerable<EventData> events)
+    {
+        destination.ThrowIfNullOrEmpty();
+        Synchronize(() =>
+        {
+            foreach (var @event in events)
+            {
+                if (@event is not null)
+                    _queue.AddLast(new DestinationEvent(destination, Formatter.ConvertToCloudEvent(Formatter.Format(@event))));
+            }
+        });
+    }
+
+    /// <inheritdoc/>
+    public void Add(string destination, params IEnumerable<CloudEvent> events)
+    {
+        destination.ThrowIfNullOrEmpty();
+        Synchronize(() =>
+        {
+            foreach (var @event in events)
+            {
+                if (@event is not null)
+                    _queue.AddLast(new DestinationEvent(destination, @event));
+            }
+        });
+    }
+
+    /// <summary>
+    /// Synchronizes the execution of the <paramref name="action"/> using a semaphore to ensure thread-safety.
+    /// </summary>
+    private void Synchronize(Action action, bool check = true)
+    {
+        _semaphore.Wait();
+        try
+        {
+            if (check && HasBeenPublished)
+                throw new InvalidOperationException("The event publisher has already been published; it cannot be reused by default. Use Reset() to continue using the publisher.");
+
+            action();
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    /// <inheritdoc/>
+    public void Clear() => Synchronize(_queue.Clear);
+
+    /// <inheritdoc/>
+    public void Reset() => Synchronize(() =>
+    {
+        _queue.Clear();
+        HasBeenPublished = false;
+    }, false);
+
+    /// <inheritdoc/>
+    public void Rollback(int count) => Synchronize(() =>
+    {
+        count.ThrowWhen(count => count > _queue.Count, $"A {nameof(Rollback)} count cannot exceed the current queue length/count.");
+
+        if (count > 0)
+        {
+            for (int i = 0; i < count; i++)
+            {
+                _queue.RemoveLast();
+            }
+        }
+    });
+
+    /// <inheritdoc/>
+    /// <remarks>This will also <see cref="IEventFormatter.AddTracing"/> prior to the underlying <see cref="OnPublishAsync(DestinationEvent[], CancellationToken)"/>.</remarks>
+    public async Task PublishAsync(CancellationToken cancellationToken = default)
+    {
+        await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+        try
+        {
+            if (HasBeenPublished)
+                throw new InvalidOperationException("The event publisher has already been published; it cannot be reused by default. Use Reset() to continue using the publisher.");
+
+            if (_queue.Count == 0)
+            {
+                HasBeenPublished = true;
+                return;
+            }
+
+            // We have something to publish, so do it.
+            await Invoker.InvokeAsync(this, async (tracer, cancellationToken) =>
+            {
+                var events = _queue.ToArray();
+                foreach (var de in events)
+                    Formatter.AddTracing(de.Event);
+
+                if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+                {
+                    var list = _queue.Select(kvp => new { destination = kvp.Destination, @event = kvp.Event.EncodeToJsonElement() });
+                    Logger.LogDebug("Preparing to send {Length} event(s):{NewLine}{Json}", events.Length, Environment.NewLine, JsonSerializer.Serialize(list, _debugJsonSerializerOptions ??= new JsonSerializerOptions { WriteIndented = true }));
+                }
+
+                await OnPublishAsync(events, cancellationToken).ConfigureAwait(false);
+
+                HasBeenPublished = true;
+                tracer.Activity?.AddTag("event.published.count", events.Length);
+            }, cancellationToken).ConfigureAwait(false);
+        }
+        finally
+        {
+            _semaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Publishes (sends) all previously added (queued) <paramref name="events"/> to the underlying eventing/persistence subsystem.
+    /// </summary>
+    /// <param name="events">One or more <see cref="DestinationEvent"/> objects.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>All <see cref="IEventFormatter.Format(EventData)"/>, <see cref="IEventFormatter.ConvertToCloudEvent(EventData)"/> and <see cref="IEventFormatter.AddTracing"/> operations have been performed prior.
+    /// <para>Note: the <see cref="OnPublishAsync(DestinationEvent[], CancellationToken)"/> will only be called where there is at least a single event to be published; i.e. the <paramref name="events"/> will never be empty.</para></remarks>
+    protected abstract Task OnPublishAsync(DestinationEvent[] events, CancellationToken cancellationToken = default);
+
+    /// <inheritdoc/>
+    public DestinationEvent[] GetEvents() => [.. _queue];
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/EventPublisherInvoker.cs b/src/CoreEx.Events/Publishing/EventPublisherInvoker.cs
new file mode 100644
index 00000000..798a8c96
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/EventPublisherInvoker.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Provides the <see cref="EventPublisherBase"/> invoker.
+/// </summary>
+[InvokerName("CoreEx.Events.Publishing.EventPublisher")]
+public class EventPublisherInvoker : InvokerBase<EventPublisherBase>
+{
+    private static EventPublisherInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="EventPublisherInvoker"/> instance.
+    /// </summary>
+    public static EventPublisherInvoker Default => ExecutionContext.GetService<EventPublisherInvoker>() ?? (_default ??= new EventPublisherInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/FixedDestinationProvider.cs b/src/CoreEx.Events/Publishing/FixedDestinationProvider.cs
new file mode 100644
index 00000000..99462f1f
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/FixedDestinationProvider.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Provides a <see cref="IDestinationProvider"/> where the same (fixed) <see cref="Destination"/> is used regardless of <see cref="EventData"/> contents; i.e. all messages are published to a single centralized destination.
+/// </summary>
+/// <remarks>The <see cref="Destination"/> will default to the value of the '<c>CoreEx.Events:Destination</c>' configuration setting or '<c>default</c>' as a fallback.</remarks>
+public class FixedDestinationProvider : IDestinationProvider
+{
+    private string? _destination = null;
+
+    /// <summary>
+    /// Gets the default <see cref="FixedDestinationProvider"/>.
+    /// </summary>
+    public static FixedDestinationProvider Default { get; } = new FixedDestinationProvider();
+
+    /// <summary>
+    /// Gets or sets the fixed destination name.
+    /// </summary>
+    public string Destination
+    {
+        get => _destination ??= Internal.GetConfigurationValue<string?>("CoreEx:Events:Destination", "default")!;
+        init => _destination = value.ThrowIfNullOrEmpty();
+    }
+
+    /// <inheritdoc/>
+    public string CreateFrom(EventData @event, bool isDeadLetter = false) => Destination;
+
+    /// <inheritdoc/>
+    public string CreateFrom(string destination, bool isDeadLetter = false) => Destination;
+
+    /// <inheritdoc/>
+    public string CreateNew(MessageType messageType = MessageType.Event, string? domainName = null, bool isDeadLetter = false) => Destination;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/IDestinationProvider.cs b/src/CoreEx.Events/Publishing/IDestinationProvider.cs
new file mode 100644
index 00000000..6f276dc7
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/IDestinationProvider.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Enables a standardized means to create/provide the destination (i.e. topic) name.
+/// </summary>
+/// <remarks>The dead-letter capabilities are only leveraged where this is not a native capability of the underlying messaging system (i.e. Kafka).</remarks>
+public interface IDestinationProvider
+{
+    /// <summary>
+    /// Creates the destination name from an <paramref name="event"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="isDeadLetter">Indicates whether to provide a dead-letter specific destination or not.</param>
+    /// <returns>The resulting destination name.</returns>
+    string CreateFrom(EventData @event, bool isDeadLetter = false);
+
+    /// <summary>
+    /// Creates the destination name from an existing <paramref name="destination"/>.  
+    /// </summary>
+    /// <param name="destination">The existing destination name.</param>
+    /// <param name="isDeadLetter">Indicates whether to provide a dead-letter specific destination or not.</param>
+    /// <returns>The resulting destination name.</returns>
+    string CreateFrom(string destination, bool isDeadLetter = false);
+
+    /// <summary>
+    /// Creates the destination name using the specified parameters.
+    /// </summary>
+    /// <param name="domainName">The recipient domain (DDD) name.</param>
+    /// <param name="messageType">The <see cref="MessageType"/>.</param>
+    /// <param name="isDeadLetter">Indicates whether to provide a dead-letter specific destination or not.</param>
+    /// <returns>The resulting destination name.</returns>
+    string CreateNew(MessageType messageType = MessageType.Event, string? domainName = null, bool isDeadLetter = false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/IEventPublisher.cs b/src/CoreEx.Events/Publishing/IEventPublisher.cs
new file mode 100644
index 00000000..c85bdec7
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/IEventPublisher.cs
@@ -0,0 +1,43 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Defines the standardized <i>event</i> adding (<see cref="IEventQueue"/>) and publishing orchestration. 
+/// </summary>
+/// <remarks>By default, the underlying implementation should support single use; i.e. can only publish once. Once, <see cref="HasBeenPublished"/> the publisher should be immutable, unless explicitly <see cref="Reset"/>.</remarks>
+public interface IEventPublisher : IEventQueue
+{
+    /// <summary>
+    /// Indicates whether the event publisher has previously published events.
+    /// </summary>
+    /// <remarks>Use <see cref="Reset"/> to re-enable the publishing of the events.
+    /// <para><i>Note:</i> The internal queue is not automatically emptied in case there is an unexpected error and the publishing needs to be retried.</para></remarks>
+    bool HasBeenPublished { get; }
+
+    /// <summary>
+    /// Publishes (sends) all previously added (queued) events to the underlying eventing/persistence subsystem.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Note that all existing events will remain within the internal queue unless a <see cref="IEventQueue.Clear"/> is explicitly performed.</remarks>
+    Task PublishAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Resets (and clears) the event publisher to re-enable adding and publishing.
+    /// </summary>
+    /// <remarks>Resets the <see cref="HasBeenPublished"/> to <see langword="false"/>.
+    /// <para>All existing events will also be cleared; see <see cref="IEventQueue.Clear"/>.</para></remarks>
+    void Reset();
+
+    /// <summary>
+    /// Rollback (i.e. dequeue) the specified number of previous <i>Add</i> operations.
+    /// </summary>
+    /// <param name="count">The number of <i>Add</i> operations to roll back.</param>
+    /// <remarks>The rollback will only function where <see cref="HasBeenPublished"/> is <see langword="false"/>.</remarks>
+    void Rollback(int count);
+
+    /// <summary>
+    /// Gets all destination events currently available.
+    /// </summary>
+    /// <returns>A <see cref="DestinationEvent"/> array that is a snapshot of the current state; empty where <see cref="IEventQueue.IsEmpty"/>.</returns>
+    /// <remarks>This is intended for inspection purposes only; the returned array is a snapshot of the current state. Do not modify the individual elements.</remarks>
+    DestinationEvent[] GetEvents();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/IEventQueue.cs b/src/CoreEx.Events/Publishing/IEventQueue.cs
new file mode 100644
index 00000000..83084e8c
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/IEventQueue.cs
@@ -0,0 +1,52 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Defines the standardized <i>event</i> adding/queueing. 
+/// </summary>
+public interface IEventQueue
+{
+    /// <summary>
+    /// Indicates whether the internal queue is empty.
+    /// </summary>
+    /// <returns><see langword="true"/> where empty; otherwise, <see langword="false"/>.</returns>
+    bool IsEmpty { get; }
+
+    /// <summary>
+    /// Gets the internal queue count.
+    /// </summary>
+    int Count { get; }
+
+    /// <summary>
+    /// Adds (queues in-process) one or more <see cref="EventData"/> <paramref name="events"/> to the default destination ready for <see cref="IEventPublisher.PublishAsync"/>.
+    /// </summary>
+    /// <param name="events">Zero or more <see cref="EventData"/> objects to publish.</param>
+    /// <remarks>A <i>destination</i> is synonymous with a <i>topic name</i> depending on the underlying messaging system.</remarks>
+    void Add(params IEnumerable<EventData> @events);
+
+    /// <summary>
+    /// Adds (queues in-process) one or more <see cref="EventData"/> <paramref name="events"/> to the specified <paramref name="destination"/> ready for <see cref="IEventPublisher.PublishAsync"/>.
+    /// </summary>
+    /// <param name="destination">The destination name.</param>
+    /// <param name="events">Zero or more <see cref="EventData"/> objects to publish.</param>
+    /// <remarks>A <paramref name="destination"/> is synonymous with a <i>topic name</i> depending on the underlying messaging system.</remarks>
+    void Add(string destination, params IEnumerable<EventData> @events);
+
+    /// <summary>
+    /// Adds (queues in-process) one or more <see cref="EventData"/> <paramref name="events"/> to the specified <paramref name="destination"/> ready for <see cref="IEventPublisher.PublishAsync"/>.
+    /// </summary>
+    /// <param name="destination">The destination name.</param>
+    /// <param name="events">Zero or more <see cref="CloudEvent"/> objects to publish.</param>
+    /// <remarks>A <paramref name="destination"/> is synonymous with a <i>topic name</i> depending on the underlying messaging system.</remarks>
+    void Add(string destination, params IEnumerable<CloudEvent> @events);
+
+    /// <summary>
+    /// Adds (queues in-process) one or more <see cref="DestinationEvent"/> <paramref name="events"/> ready for <see cref="IEventPublisher.PublishAsync"/>.
+    /// </summary>
+    /// <param name="events">Zero or more <see cref="DestinationEvent"/> objects to publish.</param>
+    void Add(params IEnumerable<DestinationEvent> @events);
+
+    /// <summary>
+    /// Clears the internal queue of all previously added (queued) events without publishing them.
+    /// </summary>
+    void Clear();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/NoOpEventPublisher.cs b/src/CoreEx.Events/Publishing/NoOpEventPublisher.cs
new file mode 100644
index 00000000..866030f2
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/NoOpEventPublisher.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Events.Publishing;
+
+/// <summary>
+/// Provides a no-operation event publisher; whereby the events are simply swallowed/discarded during final <see cref="OnPublishAsync(DestinationEvent[], CancellationToken)"/>.
+/// </summary>
+/// <param name="destinationProvider">The optional <see cref="IDestinationProvider"/>.</param>
+/// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The optional logger.</param>
+public class NoOpEventPublisher(IDestinationProvider? destinationProvider = null, IEventFormatter? formatter = null, ILogger<NoOpEventPublisher>? logger = null) : EventPublisherBase(destinationProvider, formatter, logger)
+{
+    /// <inheritdoc/>
+    protected override Task OnPublishAsync(DestinationEvent[] events, CancellationToken cancellationToken = default) => Task.CompletedTask;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Publishing/README.md b/src/CoreEx.Events/Publishing/README.md
new file mode 100644
index 00000000..fbb13436
--- /dev/null
+++ b/src/CoreEx.Events/Publishing/README.md
@@ -0,0 +1,39 @@
+# CoreEx.Events.Publishing
+
+> Provides the two-phase event publishing pipeline: an in-process queue (`IEventQueue`) drained by a single `PublishAsync()` call, with destination resolution and CloudEvents formatting wired in.
+
+## Overview
+
+The publishing namespace defines the end-to-end flow for dispatching `EventData` to an underlying messaging transport. Application and infrastructure code interacts solely with the `IEventQueue` / `IEventPublisher` abstractions, keeping business logic decoupled from any specific message broker.
+
+Events are first added to an in-process `LinkedList`-backed queue via the `Add(...)` overloads. When the unit of work commits, `PublishAsync()` drains the entire queue in one call to the transport-specific `OnPublishAsync` implementation. Before dispatch each `EventData` is formatted via `IEventFormatter` (which populates CloudEvents attributes and tracing headers) and paired with a resolved destination name via `IDestinationProvider`, producing a `DestinationEvent` record. `Rollback(count)` and `Reset()` allow the outbox relay or retry logic to undo or restart queued events without data loss.
+
+Transport-specific publisher implementations (e.g. Azure Service Bus, RabbitMQ) inherit from `EventPublisherBase` and only need to implement `OnPublishAsync(DestinationEvent[], CancellationToken)`.
+
+## Key capabilities
+
+- 📤 **In-process queue**: Thread-safe `Add(...)` overloads accept `EventData`, `CloudEvent`, named-destination variants, and `DestinationEvent` directly; `IsEmpty`, `Count`, and `GetEvents()` allow the host to inspect state before flushing.
+- 🔒 **Single-publish guard**: `HasBeenPublished` prevents accidental double-dispatch; `Reset()` clears the guard and queue for replay or retry scenarios.
+- ↩️ **Rollback support**: `Rollback(count)` removes the last _n_ Add operations from the queue without clearing earlier entries — useful for partial-failure recovery in outbox relays.
+- 📍 **Destination resolution**: `IDestinationProvider` maps each event to a topic/queue name via `CreateFrom(EventData)`, `CreateFrom(string)`, or `CreateNew(MessageType, domainName)`; `FixedDestinationProvider` routes all events to a single configurable destination, reading a default from configuration.
+- 📊 **OpenTelemetry instrumentation**: `EventPublisherInvoker` wraps `OnPublishAsync` in a diagnostic activity span.
+- 🔇 **No-op publisher**: `NoOpEventPublisher` silently discards all events — suitable for testing and stub environments.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| [`IEventQueue`](./IEventQueue.cs) | Core queuing contract: `Add(EventData)`, `Add(destination, EventData)`, `Add(destination, CloudEvent)`, `Add(DestinationEvent)`, `Clear()`, `IsEmpty`, `Count`. |
+| [`IEventPublisher`](./IEventPublisher.cs) | Extends `IEventQueue` with `PublishAsync()`, `HasBeenPublished`, `Reset()`, `Rollback(count)`, and `GetEvents()`. |
+| _[`EventPublisherBase`](./EventPublisherBase.cs)_ | Thread-safe abstract base; wires formatting, destination resolution, single-publish guard, and OpenTelemetry; implementors override `OnPublishAsync`. |
+| [`IDestinationProvider`](./IDestinationProvider.cs) | Resolves destination (topic/queue) names from `EventData`, a string, or `MessageType` + domain name. |
+| **[`FixedDestinationProvider`](./FixedDestinationProvider.cs)** | `IDestinationProvider` that routes all events to a single destination; defaults to the `CoreEx.Events:Destination` configuration key or `"default"`. |
+| **[`DestinationEvent`](./DestinationEvent.cs)** | Immutable record pairing a resolved destination name with a formatted `CloudEvent`; passed to `OnPublishAsync`. |
+| **[`EventPublisherInvoker`](./EventPublisherInvoker.cs)** | `InvokerBase` subclass that wraps publish operations with OpenTelemetry activity spans. |
+| **[`NoOpEventPublisher`](./NoOpEventPublisher.cs)** | Silent `IEventPublisher` implementation that discards all events without error. |
+
+## Related namespaces
+
+- **[`CoreEx.Events`](../README.md)** - Parent package; defines `EventData`, `IEventFormatter`, and `MessageType` consumed by this pipeline.
+- **[`CoreEx.Events.Subscribing`](../Subscribing/README.md)** - Complementary subscribing pipeline that receives and dispatches incoming events.
+- **[`CoreEx.Database.Outbox`](../../CoreEx.Database/Outbox/README.md)** - Outbox publisher wraps `IEventPublisher`; events are persisted transactionally then flushed to the transport by a relay host.
\ No newline at end of file
diff --git a/src/CoreEx.Events/README.md b/src/CoreEx.Events/README.md
new file mode 100644
index 00000000..5228c589
--- /dev/null
+++ b/src/CoreEx.Events/README.md
@@ -0,0 +1,47 @@
+# CoreEx.Events
+
+> Provides the CoreEx event publishing and subscribing infrastructure: `EventData` ↔ CloudEvents formatting, a two-phase queue-then-publish pipeline, and configurable subscriber dispatch with structured error handling.
+
+## Overview
+
+`CoreEx.Events` is the messaging backbone of the CoreEx framework. It defines the contracts and base implementations used by every host that sends or receives integration events — whether those are Azure Service Bus messages, outbox-relayed events, or any other transport.
+
+**Publishing** follows a two-phase pattern: application code buffers `EventData` (or `CloudEvent`) objects into a lightweight in-process queue, then a single `PublishAsync()` call drains the queue to the underlying transport atomically. An `IDestinationProvider` resolves topic/queue names from event metadata, and `IEventFormatter` converts between `EventData` and the CloudNative CloudEvents specification, attaching distributed tracing headers automatically.
+
+**Subscribing** is built around `EventSubscriberBase`, which receives a `CloudEvent` from the host transport, converts it back to `EventData` via `IEventFormatter`, and dispatches to the matching `SubscribedBase` handler registered with a `SubscribedManager`. Every error path — transient retries, dead-letter, silent completion, catastrophic failure — is expressed as a configurable `ErrorHandling` enum value, keeping subscriber code free of try/catch scaffolding.
+
+## Key capabilities
+
+- 🔄 **`EventData` ↔ CloudEvents bridge**: `IEventFormatter` / `EventFormatter` convert between the CoreEx `EventData` envelope and the CloudNative CloudEvents spec, including distributed-tracing header propagation (`traceparent`, `tracestate`, baggage).
+- 📤 **Queue-then-publish pipeline**: Events are buffered in-process and dispatched atomically via `PublishAsync()`; `Rollback(count)` and `Reset()` support outbox and retry patterns.
+- 📍 **Destination resolution**: `IDestinationProvider` dynamically generates topic/queue names from an `EventData`, an explicit destination string, or from `MessageType` and domain name.
+- 📥 **Structured subscriber dispatch**: `SubscribedManager` routes incoming events to `[Subscribe]`-decorated handlers, enforces inbox idempotency checks, and manages ambiguous- and not-subscribed outcomes.
+- 🛡️ **Configurable error handling**: `ErrorHandling` enum values (`CompleteAsSilent`, `Retry`, `DeadLetter`, `Catastrophic`, and more) are mapped per exception type via a fluent `ErrorHandler` configurator — no boilerplate try/catch in subscriber code.
+- 📊 **OpenTelemetry metrics**: `EventSubscriberMetrics` exposes a `messages.received` counter via `System.Diagnostics.Metrics`; `EventPublisherInvoker` and `SubscribedInvoker` wrap operations in activity spans.
+- 🧩 **`MessageType` discrimination**: Distinguishes `Event`, `Command`, and `ReplyTo` semantics for destination-name generation.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| [`IEventFormatter`](./IEventFormatter.cs) | Formats/parses `EventData`, converts to/from `CloudEvent`, adds distributed-tracing headers. |
+| **[`EventFormatter`](./EventFormatter.cs)** | Default `IEventFormatter` implementation; handles CloudEvents attribute mapping and trace propagation. |
+| **[`MessageType`](./MessageType.cs)** | Enum: `Event`, `Command`, `ReplyTo` — used in destination-name generation. |
+
+## Namespaces
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.Events.Publishing`** | Two-phase queue-then-publish pipeline: `IEventQueue`, `IEventPublisher`, `EventPublisherBase`, `IDestinationProvider`, `DestinationEvent`, `NoOpEventPublisher`. | [📖 README](./Publishing/README.md) |
+| **`CoreEx.Events.Subscribing`** | Subscriber dispatch and error handling: `EventSubscriberBase`, `SubscribedManager`, `SubscribedBase`, `ErrorHandler`, `ErrorHandling`, subscriber exceptions. | [📖 README](./Subscribing/README.md) |
+
+## Related namespaces
+
+- **[`CoreEx`](../CoreEx/README.md)** - Defines `EventData`, `CloudEvent` interop, `ExecutionContext`, and `Result<T>` used throughout the events pipeline.
+- **[`CoreEx.Database.Outbox`](../CoreEx.Database/Outbox/README.md)** - Outbox-pattern publisher that wraps `IEventPublisher`; persists events transactionally and relays them via a background relay host.
+- **[`CoreEx.DomainDriven`](../CoreEx.DomainDriven/README.md)** - `Aggregate<TId, TSelf>` accumulates `EventData` internally; the application layer forwards those to the publishing queue within the same unit-of-work.
+- **[`CoreEx.Invokers`](../CoreEx/Invokers/README.md)** - `EventPublisherInvoker` and `SubscribedInvoker` provide OpenTelemetry activity wrapping for publish and receive operations.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/ErrorHandler.cs b/src/CoreEx.Events/Subscribing/ErrorHandler.cs
new file mode 100644
index 00000000..ab1809b2
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/ErrorHandler.cs
@@ -0,0 +1,181 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides the standardized error handling to ensure/enable consistency of behavior.
+/// </summary>
+public sealed class ErrorHandler
+{
+    private const string _logFormat = "{Message} [Source: {Source}, Handling: {Handling}]";
+    private readonly List<HandlerConfig> _handlers = [];
+
+    /// <summary>
+    /// Indicates whether to automatically treat any <see cref="Exception"/> that implements <see cref="IExtendedException"/> that <see cref="IExtendedException.IsTransient"/> is <see langword="true"/>
+    /// as transient and handle with a <see cref="ErrorHandling.Retry"/>.
+    /// </summary>
+    /// <remarks>Default to <see langword="false"/>.
+    /// <para><i>Note:</i> the <see cref="EventSubscriberBase"/> overrides this to <see langword="true"/> to ensure this is the default desired functionality.</para></remarks>
+    public bool AutoTransientHandling { get; set; } = false;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> to use where the <see cref="Exception"/> implements <see cref="IExtendedException"/> that <see cref="IExtendedException.IsError"/> is <see langword="true"/>.
+    /// </summary>
+    /// <remarks>This acts as a catch-all after the individual exception checks have occurred.
+    /// <para><i>Note:</i> the <see cref="EventSubscriberBase"/> overrides this to <see cref="ErrorHandling.CompleteAsError"/> as it is assumes these should be treated as poison by default.</para></remarks>
+    public ErrorHandling? WhereIsExtendedErrorHandling { get; set; }
+
+    /// <summary>
+    /// Adds the <see cref="ErrorHandling"/> for the specified <typeparamref name="TException"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
+    /// <param name="errorHandling">The <see cref="ErrorHandling"/>.</param>
+    /// <returns>The current <see cref="ErrorHandler"/> to support fluent-style method chaining.</returns>
+    /// <remarks>Will be checked in the sequence added.</remarks>
+    public ErrorHandler Add<TException>(ErrorHandling errorHandling) where TException : Exception
+    {
+        _handlers.Add(new HandlerConfig { HandlingFactory = ex => ex is TException ? errorHandling : null });
+        return this;
+    }
+
+    /// <summary>
+    /// Adds the <paramref name="errorHandlingFactory"/> for the specified <typeparamref name="TException"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
+    /// <param name="errorHandlingFactory">The <see cref="ErrorHandling"/> factory.</param>
+    /// <returns>The current <see cref="ErrorHandler"/> to support fluent-style method chaining.</returns>
+    /// <remarks>Where a <see langword="null"/> is returned from the factory this indicates that the exception has not been handled and the next configured handler will be checked.
+    /// <para>Will be checked in the sequence added.</para></remarks>
+    public ErrorHandler Add<TException>(Func<TException, ErrorHandling?> errorHandlingFactory) where TException : Exception
+    {
+        _handlers.Add(new HandlerConfig { HandlingFactory = ex => ex is TException te ? errorHandlingFactory(te) : null });
+        return this;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="ErrorHandling"/> for the specified <see cref="Type.IsAssignableFrom(Type?)"/> <typeparamref name="TException"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
+    /// <param name="errorHandling">The <see cref="ErrorHandling"/>.</param>
+    /// <returns>The current <see cref="ErrorHandler"/> to support fluent-style method chaining.</returns>
+    /// <remarks>Will be checked in the sequence added.</remarks>
+    public ErrorHandler AddAssignableFrom<TException>(ErrorHandling errorHandling) where TException : Exception
+    {
+        _handlers.Add(new HandlerConfig { HandlingFactory = ex => typeof(TException).IsAssignableFrom(ex.GetType()) ? errorHandling : null });
+        return this;
+    }
+
+    /// <summary>
+    /// Adds the <paramref name="errorHandlingFactory"/> for the specified <see cref="Type.IsAssignableFrom(Type?)"/> <typeparamref name="TException"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
+    /// <param name="errorHandlingFactory">The <see cref="ErrorHandling"/> factory.</param>
+    /// <returns>The current <see cref="ErrorHandler"/> to support fluent-style method chaining.</returns>
+    /// <remarks>Where a <see langword="null"/> is returned from the factory this indicates that the exception has not been handled and the next configured handler will be checked.
+    /// <para>Will be checked in the sequence added.</para></remarks>
+    public ErrorHandler AddAssignableFrom<TException>(Func<TException, ErrorHandling?> errorHandlingFactory) where TException : Exception
+    {
+        _handlers.Add(new HandlerConfig { HandlingFactory = ex => ex is TException te && typeof(TException).IsAssignableFrom(ex.GetType()) ? errorHandlingFactory(te) : null });
+        return this;
+    }
+
+    /// <summary>
+    /// Handles the error based on the provided <see cref="ErrorHandlerArgs"/> and the configured error handling rules.
+    /// </summary>
+    /// <param name="args">The <see cref="ErrorHandlerArgs"/>.</param>
+    /// <param name="defaultErrorHandling">The default <see cref="ErrorHandling"/> where the error is not configured.</param>
+    /// <returns>The <see cref="Result"/> (will always be <see cref="Result.IsFailure"/>).</returns>
+    internal Result Handle(ErrorHandlerArgs args, ErrorHandling? defaultErrorHandling)
+    {
+        // Determine the error handling to use.
+        ErrorHandling? errorHandling = args.ErrorHandlingOverride;
+        if (errorHandling is null)
+        {
+            errorHandling = ResolveErrorHandling(args.Exception);
+            if (errorHandling is null)
+            {
+                if (defaultErrorHandling.HasValue)
+                    errorHandling = defaultErrorHandling.Value;
+                else
+                    return args.Exception;
+            }
+        }
+
+        // Action the configured error handling.
+        args.SubscriberArgs.ResultingException = args.Exception;
+        args.SubscriberArgs.ResultingErrorHandling = errorHandling;
+
+        var logArgs = new object[] { args.Exception.Message, args.SourceType.Name, errorHandling.Value.ToString() };
+
+        switch (errorHandling.Value)
+        {
+            case ErrorHandling.CompleteAsSilent:
+                args.Logger.LogDebug(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberHandledException(ErrorHandling.CompleteAsSilent, null, args.Exception);
+
+            case ErrorHandling.CompleteAsInformation:
+                args.Logger.LogInformation(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberHandledException(ErrorHandling.CompleteAsInformation, null, args.Exception);
+
+            case ErrorHandling.CompleteAsWarning:
+                args.Logger.LogWarning(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberHandledException(ErrorHandling.CompleteAsWarning, null, args.Exception);
+
+            case ErrorHandling.CompleteAsError:
+                args.Logger.LogError(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberHandledException(ErrorHandling.CompleteAsError, null, args.Exception);
+
+            case ErrorHandling.Retry:
+                args.Logger.LogDebug(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberRetryException(null, args.Exception);
+
+            case ErrorHandling.DeadLetter:
+                args.Logger.LogDebug(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberDeadLetterException(null, args.Exception);
+
+            case ErrorHandling.Catastrophic:
+                args.Logger.LogCritical(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberCatastrophicException(null, args.Exception);
+
+            case ErrorHandling.None:
+            default:
+                args.Logger.LogDebug(args.Exception, _logFormat, logArgs);
+                return new EventSubscriberUnhandledException(null, args.Exception);
+        }
+    }
+
+    /// <summary>
+    /// Attempts to resolve the <see cref="ErrorHandling"/> for the specified <paramref name="exception"/> using the underlying configuration.
+    /// </summary>
+    private ErrorHandling? ResolveErrorHandling(Exception exception)
+    {
+        // Loop-de-loop through the configured handlers to determine the handling to use.
+        foreach (var handler in _handlers)
+        {
+            var handling = handler.GetHandling(exception);
+            if (handling.HasValue)
+                return handling.Value;
+        }
+
+        // Check the extended exception configuration where applicable.
+        if (exception is IExtendedException extendedException)
+        {
+            if (extendedException.IsTransient && AutoTransientHandling)
+                return ErrorHandling.Retry;
+
+            if (extendedException.IsError && WhereIsExtendedErrorHandling.HasValue)
+                return WhereIsExtendedErrorHandling.Value;
+        }
+
+        // No configuration.
+        return null;
+    }
+
+    /// <summary>
+    /// Provides the per <see cref="Exception"/> <see cref="Type"/> <see cref="HandlingFactory"/> configuration for the <see cref="ErrorHandler"/>.
+    /// </summary>
+    private sealed class HandlerConfig()
+    {
+        public required Func<Exception, ErrorHandling?> HandlingFactory { get; init; }
+
+        public ErrorHandling? GetHandling(Exception ex) => HandlingFactory(ex);
+    }
+} 
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/ErrorHandlerArgs.cs b/src/CoreEx.Events/Subscribing/ErrorHandlerArgs.cs
new file mode 100644
index 00000000..ca723608
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/ErrorHandlerArgs.cs
@@ -0,0 +1,37 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// The <see cref="ErrorHandler"/> arguments.
+/// </summary>
+public sealed class ErrorHandlerArgs
+{
+    /// <summary>
+    /// Gets the corresponding <see cref="EventSubscriberArgs"/>.
+    /// </summary>
+    public required EventSubscriberArgs SubscriberArgs { get; init; }   
+    
+    /// <summary>
+    /// Gets the owning <see cref="EventSubscriberBase"/>.
+    /// </summary>
+    public EventSubscriberBase Subscriber => SubscriberArgs.Owner ?? throw new InvalidOperationException($"The {nameof(SubscriberArgs)}.{nameof(SubscriberArgs.Owner)} has not been set.");
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    public ILogger Logger => Subscriber.Logger;
+
+    /// <summary>
+    /// Gets the source <see cref="Type"/> of the subscriber that is handing the error.
+    /// </summary>
+    public required Type SourceType { get; init; }
+
+    /// <summary>
+    /// Gets the <see cref="Exception"/> that must be handled.
+    /// </summary>
+    public required Exception Exception { get; init; }
+
+    /// <summary>
+    /// Gets the optional <see cref="ErrorHandling"/> override (bypassing <see cref="ErrorHandler"/> configuration).
+    /// </summary>
+    public ErrorHandling? ErrorHandlingOverride { get; init; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/ErrorHandling.cs b/src/CoreEx.Events/Subscribing/ErrorHandling.cs
new file mode 100644
index 00000000..da33c637
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/ErrorHandling.cs
@@ -0,0 +1,52 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides the result <see cref="ErrorHandler"/> options.
+/// </summary>
+public enum ErrorHandling
+{
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs that no specific handling should occur and will result in an <see cref="EventSubscriberUnhandledException"/> which will bubble back up the stack for the invoking host to handle.
+    /// </summary>
+    /// <remarks>A <see cref="LogLevel.Debug"/> message will be logged, where applicable, to support debugging.</remarks>
+    None,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs this is expected and the current event/message should be completed without further processing (i.e. silently).
+    /// </summary>
+    /// <remarks>A <see cref="LogLevel.Debug"/> message will be logged, where applicable, to support debugging.</remarks>
+    CompleteAsSilent,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs this is expected and should be completed without further processing after logging as <see cref="LogLevel.Information"/>.
+    /// </summary>
+    CompleteAsInformation,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs this is expected and should be completed without further processing after logging as <see cref="LogLevel.Warning"/>.
+    /// </summary>
+    CompleteAsWarning,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs this is expected and should be completed without further processing after logging as <see cref="LogLevel.Error"/>.
+    /// </summary>
+    CompleteAsError,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs that it may be transient and should be retried (where possible).
+    /// </summary>
+    /// <remarks>A <see cref="LogLevel.Debug"/> message will be logged, where applicable, to support debugging.</remarks>
+    Retry,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs the current event/message should be forwarded as a dead-letter without further processing.
+    /// </summary>
+    /// <remarks>A <see cref="LogLevel.Debug"/> message will be logged, where applicable, to support debugging.</remarks>
+    DeadLetter,
+
+    /// <summary>
+    /// Indicates that when the corresponding <i>error</i> occurs that it is considered <b>catastrophic</b> and will result in an <see cref="EventSubscriberCatastrophicException"/>) which will bubble back up the stack for the invoking host to handle.
+    /// </summary>
+    /// <remarks>A <see cref="LogLevel.Critical"/> message will be logged.</remarks>
+    Catastrophic
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/EventSubscriberArgs.cs b/src/CoreEx.Events/Subscribing/EventSubscriberArgs.cs
new file mode 100644
index 00000000..d981eb89
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/EventSubscriberArgs.cs
@@ -0,0 +1,59 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides <see cref="EventSubscriberBase"/> arguments.
+/// </summary>
+/// <remarks>Where additional properties are required then leverage the <see cref="Properties"/> dictionary.</remarks>
+public sealed class EventSubscriberArgs
+{
+    /// <summary>
+    /// Gets or sets the owning <see cref="EventSubscriberBase"/>.
+    /// </summary>
+    public EventSubscriberBase? Owner { get; set => field = field is null ? value : throw new InvalidOperationException($"The {nameof(Owner)} is immutable."); }
+
+    /// <summary>
+    /// Gets the properties <see cref="IDictionary{TKey, TValue}"/>.
+    /// </summary>
+    public IDictionary<string, object?> Properties { get; } = new Dictionary<string, object?>();
+
+    /// <summary>
+    /// Gets or sets the messaging system unique key.
+    /// </summary>
+    /// <remarks>This is intended to provide a unique key related to the actual underlying messaging system receive/consume. For example, a log-based messaging system, such as Kafka, this may 
+    /// be the composition of the topic, partition and offset. And for a AMPQ-based messaging system, such as Azure Service Bus, this may be the composition of the topic (or subscription) and sequence number.
+    /// <para>This provides <i>uniqueness</i> beyond the likes of the <see cref="EventData.Id"/> which has no messaging system uniqueness guarantees.</para></remarks>
+    public string? MessageUniqueKey { get; set; }
+
+    /// <summary>
+    /// Gets or sets the resiliency attempt count (where applicable).
+    /// </summary>
+    /// <remarks>A value of zero indicates first execution; i.e. no retry performed.</remarks>
+    public int AttemptCount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the corresponding subscribed <see cref="CloudEvent"/> (where applicable).
+    /// </summary>
+    public CloudEvent? CloudEvent { get; set; }
+
+    /// <summary>
+    /// Gets the resulting <see cref="Exception"/> where there was an error processing the event.
+    /// </summary>
+    public Exception? ResultingException { get; internal set; }
+
+    /// <summary>
+    /// Gets the resulting <see cref="ErrorHandling"/> where there was a <see cref="ResultingException"/>.
+    /// </summary>
+    public ErrorHandling? ResultingErrorHandling { get; internal set; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="SubscribedManager"/> is being used.
+    /// </summary>
+    public bool UsesSubscribedManager { get; internal set; }
+
+    /// <summary>
+    /// Gets the matched <see cref="SubscribedBase"/> instance where the <see cref="SubscribedManager"/> is being used.
+    /// </summary>
+    /// <remarks>Where the <see cref="SubscribedManager"/> is not being used then this will always be <see langword="null"/>. Where the <see cref="UsesSubscribedManager"/> is <see langword="true"/>, this will
+    /// be the matched <see cref="SubscribedBase"/> instance; and in this case where <see langword="null"/> this indicates that no matching subscriber was found.</remarks>
+    public SubscribedBase? Subscriber { get; internal set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/EventSubscriberBase.cs b/src/CoreEx.Events/Subscribing/EventSubscriberBase.cs
new file mode 100644
index 00000000..4b50f450
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/EventSubscriberBase.cs
@@ -0,0 +1,192 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides the base event subscribing capabilities.
+/// </summary>
+/// <param name="formatter">The optional <see cref="IEventFormatter"/>.</param>
+/// <param name="logger">The <see cref="ILogger{EventSubscriberBase}"/>.</param>
+public abstract class EventSubscriberBase(IEventFormatter formatter, ILogger<EventSubscriberBase> logger)
+{
+    /// <summary>
+    /// Gets the <see cref="IEventFormatter"/>.
+    /// </summary>
+    public IEventFormatter Formatter { get; } = formatter.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    public ILogger Logger { get; } = logger.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the customizable <see cref="Subscribing.ErrorHandler"/> configuration.
+    /// </summary>
+    /// <remarks>The <see cref="ErrorHandler.AutoTransientHandling"/> is defaulted to <see langword="true"/> and the <see cref="ErrorHandler.WhereIsExtendedErrorHandling"/> is defaulted to <see cref="ErrorHandling.CompleteAsError"/>.</remarks>
+    public ErrorHandler ErrorHandler { get; set => field = value.ThrowIfNull(); } = new() { AutoTransientHandling = true, WhereIsExtendedErrorHandling = ErrorHandling.CompleteAsError };
+
+    /// <summary>
+    /// Gets or sets the unhandled <see cref="ErrorHandling"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.None"/>.
+    /// <para>This is a catch all for any <see cref="Exception"/> not explicity configured within the <see cref="ErrorHandler"/>.</para></remarks>
+    public ErrorHandling UnhandledErrorHandling { get; set; } = ErrorHandling.None;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> for when the <see cref="EventData.TenantId"/> does not equal the <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.TenantId"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.Catastrophic"/>.
+    /// <para>Set to <see langword="null"/> to bypass check.</para></remarks>
+    public ErrorHandling? TenantIdMismatchHandling { get; set; } = ErrorHandling.Catastrophic;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> where the <see cref="EventData.Data"/> is not considered <i>valid</i>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.CompleteAsError"/> as it is considered poison and as such is unable to be processed.
+    /// <para>This is used by <see cref="DeserializeValue{TValue}"/>.</para></remarks>
+    public ErrorHandling InvalidDataHandling { get; set; } = ErrorHandling.CompleteAsError;
+
+    /// <summary>
+    /// Gets or sets the optional <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    /// <remarks>This is used by <see cref="DeserializeValue{TValue}"/>.</remarks>
+    public JsonSerializerOptions? JsonSerializerOptions { get; set; }
+
+    /// <summary>
+    /// Receives a <see cref="CloudEvent"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    /// <remarks>This will <see cref="IEventFormatter.ConvertFromCloudEvent(CloudEvent)"/> the <paramref name="cloudEvent"/> into an <see cref="EventData"/> and invoke the <see cref="ReceiveAsync(EventData, EventSubscriberArgs?, CancellationToken)"/>
+    /// <para>Additionally, this method will specifically emit both the related tracing tags and the <see cref="EventSubscriberMetrics.MessagesReceived"/> for observability.</para></remarks>
+    protected async Task<Result> ReceiveAsync(CloudEvent cloudEvent, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
+    {
+        args ??= new EventSubscriberArgs();
+        if (this != args.Owner)
+            args.Owner = this;
+
+        args.CloudEvent = cloudEvent;
+
+        // Add tracing (where applicable).
+        if (Activity.Current is not null)
+        {
+            Activity.Current.SetTag("cloudevents.event_id", cloudEvent.Id);
+            Activity.Current.SetTag("cloudevents.event_source", cloudEvent.Source);
+            Activity.Current.SetTag("cloudevents.event_type", cloudEvent.Type);
+            Activity.Current.SetTag("cloudevents.event_subject", cloudEvent.Subject);
+            Activity.Current.SetTag("cloudevents.event_spec_version", cloudEvent.SpecVersion.VersionId);
+        }
+
+        if (Logger.IsEnabled(LogLevel.Debug))
+            Logger.LogDebug("Received CloudEvent with Id='{CloudEventId}', Source='{CloudEventSource}', Type='{CloudEventType}', Subject='{CloudEventSubject}'.", cloudEvent.Id, cloudEvent.Source, cloudEvent.Type, cloudEvent.Subject);
+
+        // Convert to an EventData and process.
+        return await ReceiveWrapperAsync(args, async () => await ReceiveAsync(Formatter.ConvertFromCloudEvent(cloudEvent), args, cancellationToken).ConfigureAwait(false)).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Receives an <see cref="EventData"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    /// <remarks>This invokes the <see cref="OnReceiveAsync(EventData, EventSubscriberArgs, CancellationToken)"/> to perform the specific receive work.
+    /// <para>This will also link the underlying <see cref="Activity.Current"/> to the originating <see cref="EventData.TraceParent"/> and <see cref="EventData.TraceState"/> where applicable.</para></remarks>
+    protected async Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
+    {
+        args ??= new EventSubscriberArgs();
+        if (this != args.Owner)
+            args.Owner = this;
+
+        // When the event has tracing we should link and include any baggage. We link as we don't want to override the current activity but rather link to the originating event's activity.
+        if (!string.IsNullOrEmpty(@event.TraceParent) && Activity.Current is not null)
+        {
+            if (ActivityContext.TryParse(@event.TraceParent, @event.TraceState, out var ac))
+            {
+                Activity.Current?.AddLink(new ActivityLink(ac));
+                if (@event.TraceBaggage is not null)
+                {
+                    foreach (var kvp in @event.TraceBaggage)
+                        Activity.Current?.AddBaggage(kvp.Key, kvp.Value);
+                }
+            }
+        }
+
+        return await ReceiveWrapperAsync(args, async () =>
+        {
+            // Where the tenant is specified then confirm is same.
+            if (TenantIdMismatchHandling.HasValue && !string.IsNullOrEmpty(@event.TenantId) && ExecutionContext.TryGetCurrent(out var ec) && ec.TenantId != @event.TenantId)
+                return new EventSubscriberReceiveException($"{nameof(ExecutionContext.TenantId)} mismatch: {nameof(EventData)}.{nameof(EventData.TenantId)} '{@event.TenantId}' does not equal {nameof(ExecutionContext)}.{nameof(ExecutionContext.TenantId)} '{ec.TenantId}'.", TenantIdMismatchHandling.Value);
+
+            return await OnReceiveAsync(@event, args ??= new EventSubscriberArgs(), cancellationToken).ConfigureAwait(false);
+        }).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Receives and processes the <see cref="EventData"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    protected abstract Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Receives and processes the <paramref name="receiveAsync"/> function with standardized execution and error/exception handling.
+    /// </summary>
+    private async Task<Result> ReceiveWrapperAsync(EventSubscriberArgs args, Func<Task<Result>> receiveAsync)
+    {
+        // Execute the internal receive logic.
+        Result result;
+        try
+        {
+            result = await receiveAsync().ConfigureAwait(false);
+            if (result.IsSuccess)
+                return result;
+        }
+        catch (Exception ex) // Capture any unhandled exception.
+        {
+            result = Result.Fail(ex);
+        }
+
+        // Apply standardized error/exception handling where applicable.
+        if (result.Error is EventSubscriberReceiveException rex) // Expected with self declared error handling.
+            return ErrorHandler.Handle(new ErrorHandlerArgs { SubscriberArgs = args, SourceType = GetType(), ErrorHandlingOverride = rex.ErrorHandling, Exception = rex }, defaultErrorHandling: UnhandledErrorHandling);
+        else if (result.Error is not IEventSubscriberException && !result.Error.IsCanceled()) // Ignore IEventSubscriberException's and *CanceledException as they are intended to bubble up!
+            return ErrorHandler.Handle(new ErrorHandlerArgs { SubscriberArgs = args, SourceType = GetType(), Exception = result.Error }, defaultErrorHandling: UnhandledErrorHandling);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Deserializes the <see cref="EventData.Data"/> value to the specified <typeparamref name="TValue"/> type.
+    /// </summary>
+    /// <typeparam name="TValue">The <see cref="EventData.Data"/> value <see cref="Type"/>.</typeparam>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="valueIsRequired">Indicates whether the <see cref="EventData.Data"/> value is required.</param>
+    /// <param name="invalidDataHandling">The optional <see cref="InvalidDataHandling"/> override.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/> override.</param>
+    /// <returns>The deserialized value as a <see cref="Result{T}.Value"/>.</returns>
+    /// <remarks>Where an invalid data, deserialization or required, error occurs an <see cref="EventSubscriberReceiveException"/> will be be returned via a <see cref="Result.Fail(Exception)"/>.</remarks>
+    public Result<TValue> DeserializeValue<TValue>(EventData @event, bool valueIsRequired = true, ErrorHandling? invalidDataHandling = null, JsonSerializerOptions? jsonSerializerOptions = null)
+    {
+        @event.ThrowIfNull();
+
+        TValue? value;
+        try
+        {
+            value = @event.ToObjectFromJson<TValue>(jsonSerializerOptions ?? JsonSerializerOptions ?? JsonDefaults.SerializerOptions)!;
+        }
+        catch (Exception ex)
+        {
+            return new EventSubscriberReceiveException("An error occurred in the event subscriber during event data deserialization.", invalidDataHandling ?? InvalidDataHandling, ex);
+        }
+
+        if (!valueIsRequired)
+            return value;
+
+        return Result.Go(value).Required()
+            .OnFailure(r => new EventSubscriberReceiveException("An error occurred in the event subscriber as the deserialized value is required.", invalidDataHandling ?? InvalidDataHandling, r.Error));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/EventSubscriberMetrics.cs b/src/CoreEx.Events/Subscribing/EventSubscriberMetrics.cs
new file mode 100644
index 00000000..29e9f970
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/EventSubscriberMetrics.cs
@@ -0,0 +1,70 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Defines the <see cref="EventSubscriberBase"/> metrics.
+/// </summary>
+public class EventSubscriberMetrics
+{
+    private const string ErrorUnhandledOutcome = "error-unhandled";
+
+    /// <summary>
+    /// Gets the <see cref="Meter"/> used for recording metrics related to event subscriber operations.
+    /// </summary>
+    public static Meter Meter { get; } = new("CoreEx.Events.Subscribing");
+
+    /// <summary>
+    /// Gets the counter that tracks the number of messages received for processing.
+    /// </summary>
+    public static Counter<long> MessagesReceived { get; } = Meter.CreateCounter<long>("messages.received", unit: "{message}", description: "Number of messages received for processing.");
+
+    /// <summary>
+    /// Wraps a message receive operation with metrics recording.
+    /// </summary>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="receiveFunc">The function to execute the receive operation.</param>
+    /// <returns>The <see cref="Result"/> of the receive operation.</returns>
+    /// <remarks>This should be used to add standardized metrics recording to a receive operation.</remarks>
+    public static async Task<Result> ReceiveMessageAsync(EventSubscriberArgs args, Func<Task<Result>> receiveFunc)
+    {
+        try
+        {
+            var result = await receiveFunc().ConfigureAwait(false);
+
+            string outcome;
+            if (result.IsSuccess)
+                outcome = "success";
+            else if (args.UsesSubscribedManager && args.Subscriber is null)
+                outcome = "not-subscribed";
+            else
+            {
+                if (result.Error is EventSubscriberHandledException rex)
+                {
+                    outcome = rex.ErrorHandling switch
+                    {
+                        ErrorHandling.None => ErrorUnhandledOutcome,
+                        ErrorHandling.CompleteAsSilent => "error-complete-silent",
+                        ErrorHandling.CompleteAsInformation => "error-complete-info",
+                        ErrorHandling.CompleteAsWarning => "error-complete-warning",
+                        ErrorHandling.CompleteAsError => "error-complete-error",
+                        ErrorHandling.Retry => "error-retry",
+                        ErrorHandling.DeadLetter => "error-dead-letter",
+                        ErrorHandling.Catastrophic => "error-catastrophic",
+                        _ => "error-completed"
+                    };
+                }
+                else
+                    outcome = "error-unhandled";
+            }
+
+            EventSubscriberMetrics.MessagesReceived.Add(1, new KeyValuePair<string, object?>("outcome", outcome));
+            Activity.Current?.AddTag("messaging.outcome", outcome);
+            return result;
+        }
+        catch (Exception)
+        {
+            EventSubscriberMetrics.MessagesReceived.Add(1, new KeyValuePair<string, object?>("outcome", ErrorUnhandledOutcome));
+            Activity.Current?.AddTag("messaging.outcome", ErrorUnhandledOutcome);
+            throw;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberCatastrophicException.cs b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberCatastrophicException.cs
new file mode 100644
index 00000000..7762ef72
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberCatastrophicException.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Represents an exception that occurs when an <see cref="EventSubscriberBase"/> encounters a <see cref="ErrorHandling.Catastrophic"/> error while processing a message/event.
+/// </summary>
+/// <remarks>This exception is intended primarily for internal use only and should not be thrown directly by user receiving/subscribing code.</remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The optional inner <see cref="Exception"/>.</param>
+public sealed class EventSubscriberCatastrophicException(string? message = null, Exception? innerException = null)
+    : Exception(message ?? "A catastrophic failure occurred during the event subscriber processing.", innerException), IEventSubscriberException
+{
+    /// <inheritdoc/>
+    public ErrorHandling ErrorHandling => ErrorHandling.Catastrophic;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberDeadLetterException.cs b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberDeadLetterException.cs
new file mode 100644
index 00000000..6187ae72
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberDeadLetterException.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Represents an exception that occurs when a message/event is unable to be processed and should be either flagged as or forwarded as a <see cref="ErrorHandling.DeadLetter"/>.
+/// </summary>
+/// <remarks>This exception is intended primarily for internal use only and should not be thrown directly by user receiving/subscribing code.</remarks>
+/// <param name="message">The optional message.</param>
+/// <param name="innerException">The optional inner <see cref="Exception"/>.</param>
+public sealed class EventSubscriberDeadLetterException(string? message = null, Exception? innerException = null)
+    : Exception(message ?? "An error occurred that is unable to be processed and has been flagged for dead-letter processing.", innerException), IEventSubscriberException
+{
+    /// <inheritdoc/>
+    public ErrorHandling ErrorHandling => ErrorHandling.DeadLetter;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberHandledException.cs b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberHandledException.cs
new file mode 100644
index 00000000..ce0502a1
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberHandledException.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Represents an exception that occurs when an <see cref="EventSubscriberBase"/> encounters an error that it is handled successfully.
+/// </summary>
+/// <remarks>This is an error which has handling that informs the receive as successful, appropriate logging will have occurred. See <see cref="ErrorHandling.CompleteAsSilent"/>, <see cref="ErrorHandling.CompleteAsInformation"/>,
+/// <see cref="ErrorHandling.CompleteAsWarning"/> and  <see cref="ErrorHandling.CompleteAsError"/>.
+/// <para>This exception is intended primarily for internal use only and should not be thrown directly by user receiving/subscribing code.</para></remarks>
+/// <param name="errorHandling">The <see cref="ErrorHandling"/>.</param>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The optional inner <see cref="Exception"/>.</param>
+public sealed class EventSubscriberHandledException(ErrorHandling errorHandling, string? message = null, Exception? innerException = null)
+    : Exception(message ?? "An exception occurred during the event subscriber processing and was successfully handled.", innerException), IEventSubscriberException
+{
+    /// <inheritdoc/>
+    public ErrorHandling ErrorHandling { get; } = errorHandling;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberReceiveException.cs b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberReceiveException.cs
new file mode 100644
index 00000000..bc7224a9
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberReceiveException.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Represents an exception that occurs when a message/event error occurs during a subscriber receive with an <paramref name="errorHandling"/> override.
+/// </summary>
+/// <param name="message">The message.</param>
+/// <param name="errorHandling">The <see cref="ErrorHandling"/>.</param>
+/// <param name="innerException">The optional inner <see cref="Exception"/>.</param>
+/// <remarks>This is an internal exception leveraged to manage an error during subscriber receive processing; this should eventually be converted to an external facing <see cref="IEventSubscriberException"/> type.</remarks>
+internal sealed class EventSubscriberReceiveException(string message, ErrorHandling errorHandling, Exception? innerException = null) : Exception(message.ThrowIfNullOrEmpty(), innerException)
+{
+    /// <summary>
+    /// Gets the <see cref="Subscribing.ErrorHandling"/>.
+    /// </summary>
+    public ErrorHandling ErrorHandling { get; } = errorHandling;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberRetryException.cs b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberRetryException.cs
new file mode 100644
index 00000000..7cc7b909
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberRetryException.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Represents an exception that occurs when an <see cref="EventSubscriberBase"/> needs to perform a <see cref="ErrorHandling.Retry"/>.
+/// </summary>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The optional inner <see cref="Exception"/>.</param>
+public sealed class EventSubscriberRetryException(string? message = null, Exception? innerException = null)
+    : Exception(message ?? "An error occurred in the event subscriber that is considered transient and is a candidate for a retry.", innerException), IEventSubscriberException
+{
+    /// <inheritdoc/>
+    public ErrorHandling ErrorHandling => ErrorHandling.Retry;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberUnhandledException.cs b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberUnhandledException.cs
new file mode 100644
index 00000000..f48115a1
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/EventSubscriberUnhandledException.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Represents an exception that occurs when an <see cref="EventSubscriberBase"/> encounters an error that it is unable to handle bubbling it up to the host process accordingly.
+/// </summary>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The optional inner <see cref="Exception"/>.</param>
+/// <remarks>This exception is intended primarily for internal use only and should not be thrown directly by user receiving/subscribing code.</remarks>
+public sealed class EventSubscriberUnhandledException(string? message = null, Exception? innerException = null)
+    : Exception(message ?? "An unhandled exception occurred during the event subscriber processing.", innerException), IEventSubscriberException
+{
+    /// <inheritdoc/>
+    public ErrorHandling ErrorHandling => ErrorHandling.None;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/IEventSubscriberException.cs b/src/CoreEx.Events/Subscribing/Exceptions/IEventSubscriberException.cs
new file mode 100644
index 00000000..b9ca77fe
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/IEventSubscriberException.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Events.Subscribing.Exceptions;
+
+/// <summary>
+/// Defines an <see cref="EventSubscriberBase"/>-specific <see cref="Exception"/>.
+/// </summary>
+public interface IEventSubscriberException
+{
+    /// <summary>
+    /// Gets the specific <see cref="Subscribing.ErrorHandling"/> option that resulted in the exception.
+    /// </summary>
+    ErrorHandling ErrorHandling { get; } 
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/Exceptions/README.md b/src/CoreEx.Events/Subscribing/Exceptions/README.md
new file mode 100644
index 00000000..013a007b
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/Exceptions/README.md
@@ -0,0 +1,25 @@
+# CoreEx.Events.Subscribing.Exceptions
+
+> Defines the subscriber-specific exception types raised by the `ErrorHandling` pipeline; each exception carries the `ErrorHandling` value that triggered it, allowing host infrastructure to inspect and act on the outcome.
+
+## Overview
+
+When the `ErrorHandler` resolves an error outcome of `None`, `DeadLetter`, `Catastrophic`, or `Retry`, the subscribing pipeline translates that outcome into a typed exception that propagates back to the transport host. The host can catch the specific exception type to determine the correct broker-level action — abandoning, dead-lettering, completing, or retrying the message — without inspecting raw exception messages.
+
+All exceptions in this namespace implement `IEventSubscriberException`, which exposes the `ErrorHandling` value that produced the exception, and most wrap the original inner exception for full stack-trace preservation.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| [`IEventSubscriberException`](./IEventSubscriberException.cs) | Marker interface carried by all subscriber exceptions; exposes the `ErrorHandling` value that triggered the exception. |
+| **[`EventSubscriberUnhandledException`](./EventSubscriberUnhandledException.cs)** | Raised when `ErrorHandling.None` is resolved; bubbles the unhandled error to the host process for broker-level handling. |
+| **[`EventSubscriberCatastrophicException`](./EventSubscriberCatastrophicException.cs)** | Raised when `ErrorHandling.Catastrophic` is resolved; signals a fatal, non-retryable condition that the host should escalate. |
+| **[`EventSubscriberDeadLetterException`](./EventSubscriberDeadLetterException.cs)** | Raised when `ErrorHandling.DeadLetter` is resolved; instructs the host to forward the message to the dead-letter destination. |
+| **[`EventSubscriberRetryException`](./EventSubscriberRetryException.cs)** | Raised when `ErrorHandling.Retry` is resolved; instructs the host to re-enqueue or abandon the message for retry. |
+| **[`EventSubscriberHandledException`](./EventSubscriberHandledException.cs)** | Raised for `CompleteAs*` outcomes where logging has occurred; signals the host to complete the message without further escalation. |
+| **[`EventSubscriberReceiveException`](./EventSubscriberReceiveException.cs)** | Wraps an error that occurred during the raw receive/deserialization phase before handler dispatch. |
+
+## Related namespaces
+
+- **[`CoreEx.Events.Subscribing`](../README.md)** - Parent namespace; `ErrorHandler` and `EventSubscriberBase` produce and consume these exception types.
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/IEventSubscriberInbox.cs b/src/CoreEx.Events/Subscribing/IEventSubscriberInbox.cs
new file mode 100644
index 00000000..72126315
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/IEventSubscriberInbox.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Enables an <see cref="EventSubscriberBase"/> inbox pattern to determine whether an event/message should be processed; for example, to track and detect duplicates to enable idempotent event/message handling.
+/// </summary>
+public interface IEventSubscriberInbox
+{
+    /// <summary>
+    /// Performs an inbox check on the <paramref name="event"/>/message.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> indicates that the event/message should be processed; otherwise, <see langword="false"/>.</returns>
+    Task<bool> InboxCheckAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/README.md b/src/CoreEx.Events/Subscribing/README.md
new file mode 100644
index 00000000..ca30f3d2
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/README.md
@@ -0,0 +1,50 @@
+# CoreEx.Events.Subscribing
+
+> Provides the CoreEx subscriber dispatch pipeline: `EventSubscriberBase` receives and converts incoming CloudEvents, `SubscribedManager` routes them to `[Subscribe]`-decorated handlers, and a structured `ErrorHandling` system replaces boilerplate try/catch logic.
+
+## Overview
+
+The subscribing namespace defines the inbound half of the CoreEx events pipeline. Transport-specific subscriber hosts (Azure Service Bus, RabbitMQ, etc.) inherit from `EventSubscriberBase`, which handles the CloudEvent → `EventData` conversion and all cross-cutting concerns before handing off to application-level `SubscribedBase` handlers.
+
+`SubscribedManager` acts as the dispatcher: it holds a registry of `SubscribedBase` types decorated with `[Subscribe]` attributes, resolves the single matching handler for each received event, and optionally invokes an `IEventSubscriberInbox` to enforce idempotent processing before the handler runs. Unmatched events and ambiguous matches are each governed by configurable `ErrorHandling` values.
+
+Every error outcome in the pipeline — transient retry, dead-letter, silent completion, catastrophic escalation — is expressed as an `ErrorHandling` enum value. The `ErrorHandler` class provides a fluent per-exception-type mapping, eliminating repetitive try/catch scaffolding from subscriber code. `EventSubscriberMetrics` exposes an OpenTelemetry `messages.received` counter for observability.
+
+## Key capabilities
+
+- 🔄 **CloudEvent → `EventData` conversion**: `EventSubscriberBase` uses `IEventFormatter.ConvertFromCloudEvent` and `Parse` to produce a fully populated `EventData` before any handler is invoked.
+- 📬 **`SubscribedManager` dispatch**: Registers `SubscribedBase` handlers by `[Subscribe]` attribute; routes each event to exactly one handler or applies `NotSubscribedHandling` / `AmbiguousSubscriberHandling` policies.
+- ✉️ **Typed `SubscribedBase<TValue>`**: Deserializes `EventData.Data` to a strongly-typed `TValue` before invoking `OnReceiveAsync`, with `InvalidDataHandling` governing deserialization failures.
+- 🛡️ **Structured error handling**: `ErrorHandling` enum values are mapped per exception type via `ErrorHandler`; `AutoTransientHandling` automatically promotes `IExtendedException.IsTransient` exceptions to `Retry`; `WhereIsExtendedErrorHandling` catches all remaining `IExtendedException.IsError` cases.
+- 📥 **Inbox idempotency**: `IEventSubscriberInbox.InboxCheckAsync` can be enabled globally via `SubscribedManager.RequiresInbox(...)` or per-handler via `SubscribedBase.RequiresInboxCheck`; `InboxFailureHandling` governs failed checks.
+- 📊 **OpenTelemetry metrics**: `EventSubscriberMetrics` records a `messages.received` counter (with outcome tags) via `System.Diagnostics.Metrics`; `SubscribedInvoker` wraps handler invocations in activity spans.
+- 🗂️ **`EventSubscriberArgs`**: Carries per-receive context including `MessageUniqueKey`, resiliency attempt count, and an open `Properties` dictionary for transport-specific metadata.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| _[`EventSubscriberBase`](./EventSubscriberBase.cs)_ | Abstract transport subscriber base; converts `CloudEvent` → `EventData`, delegates to `SubscribedManager`, enforces tenant-id and error-handling policies. |
+| **[`SubscribedManager`](./SubscribedManager.cs)** | Registers and dispatches to `SubscribedBase` handlers; controls `NotSubscribedHandling`, `AmbiguousSubscriberHandling`, and optional inbox idempotency. |
+| _[`SubscribedBase`](./SubscribedBase.cs)_ | Abstract per-event handler; exposes per-handler `ErrorHandler`, `InvalidDataHandling`, `RequiresInboxCheck`, and `JsonSerializerOptions` overrides. |
+| _[`SubscribedBase<TValue>`](./SubscribedBaseT.cs)_ | Typed variant of `SubscribedBase` that deserializes `EventData.Data` to `TValue` before calling `OnReceiveAsync`. |
+| **[`SubscribeAttribute`](./SubscribeAttribute.cs)** | Decorates `SubscribedBase` types to declare the events they handle; matched by `SubscribedManager` during routing. |
+| **[`ErrorHandler`](./ErrorHandler.cs)** | Fluent configurator mapping exception types (and `IExtendedException` signals) to `ErrorHandling` values; used on both `EventSubscriberBase` and individual `SubscribedBase` handlers. |
+| **[`ErrorHandling`](./ErrorHandling.cs)** | Enum: `None`, `CompleteAsSilent`, `CompleteAsInformation`, `CompleteAsWarning`, `CompleteAsError`, `Retry`, `DeadLetter`, `Catastrophic`. |
+| **[`ErrorHandlerArgs`](./ErrorHandlerArgs.cs)** | Carries exception, source, and context to `ErrorHandler` resolution; used internally during error processing. |
+| **[`EventSubscriberArgs`](./EventSubscriberArgs.cs)** | Per-receive arguments: `MessageUniqueKey`, `AttemptCount`, `Owner`, and open `Properties` dictionary for transport metadata. |
+| **[`EventSubscriberMetrics`](./EventSubscriberMetrics.cs)** | Exposes the `CoreEx.Events.Subscribing` `Meter` and `messages.received` counter for OpenTelemetry metric collection. |
+| **[`SubscribedInvoker`](./SubscribedInvoker.cs)** | `InvokerBase` subclass that wraps `SubscribedBase` handler invocations in OpenTelemetry activity spans. |
+| [`IEventSubscriberInbox`](./IEventSubscriberInbox.cs) | Enables inbox idempotency: `InboxCheckAsync` returns `true` when the event should be processed, `false` to skip (already seen). |
+
+## Namespaces
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.Events.Subscribing.Exceptions`** | Subscriber-specific exception types raised by the error handling pipeline. | [📖 README](./Exceptions/README.md) |
+
+## Related namespaces
+
+- **[`CoreEx.Events`](../README.md)** - Parent package; defines `EventData`, `IEventFormatter`, and `CloudEvent` interop consumed throughout.
+- **[`CoreEx.Events.Publishing`](../Publishing/README.md)** - Complementary publishing pipeline for outbound events.
+- **[`CoreEx.Invokers`](../../CoreEx/Invokers/README.md)** - `SubscribedInvoker` extends `InvokerBase` to wrap handler executions with OpenTelemetry activities.
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/SubscribeAttribute.cs b/src/CoreEx.Events/Subscribing/SubscribeAttribute.cs
new file mode 100644
index 00000000..25617083
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/SubscribeAttribute.cs
@@ -0,0 +1,65 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Defines the pattern matching used by the <see cref="SubscribedManager"/> to uniquely identify the <see cref="SubscribedBase"/> by matching against both the <see cref="EventData.Title"/> and <see cref="EventData.Source"/>.
+/// </summary>
+/// <param name="title">The <see cref="EventData.Title"/> glob-like matching pattern that will represent the underlying <see cref="Title"/> <see cref="Regex"/>.</param>
+/// <param name="source">The <see cref="EventData.Source"/> glob-like matching pattern that will represent the underlying <see cref="Source"/> <see cref="Regex"/>.</param>
+/// <remarks>This <see cref="SubscribeAttribute"/> allows multiple; in that at least one of the specified attributes needs to match to be considered a successful match.
+/// <para>The <see cref="EventData.Title"/> for example may be implemented using a dot-based segmented format; for example: '<c>segment1.segment2.segment3.segmentn</c>'.</para>
+/// <para>A glob-like matching pattern supports '<c>*</c>' (single segment), '<c>**</c>' (multiple segments) and '<c>?</c>' (a single character within a single segment).<para/>
+/// The following are matching pattern examples for '<c>coreex.system.product.updated.v1</c>':
+/// <code>
+/// **.product.** (match)
+/// core*.system.product.updated.v1 (match)
+/// coreex.**.updated.v1 (match)
+/// coreex.*.updated.v1 (no match)
+/// </code>
+/// </para>
+/// </remarks>
+[AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+public sealed class SubscribeAttribute(string? title = null, string? source = null) : Attribute
+{
+    private readonly string? _title = title;
+    private readonly string? _source = source;
+
+    /// <summary>
+    /// Gets or sets the default <see cref="TitleSeparator"/>.
+    /// </summary>
+    public static char DefaultTitleSeparator { get; set; } = '.';
+
+    /// <summary>
+    /// Gets or sets the default <see cref="SourceSeparator"/>.
+    /// </summary>
+    public static char DefaultSourceSeparator { get; set; } = '/';
+
+    /// <summary>
+    /// Gets or sets the <see cref="Regex"/> matching pattern for the <see cref="EventData.Title"/>.
+    /// </summary>
+    public Regex? Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the title separator character used to split the <see cref="EventData.Title"/> into segments (where auto-creating the underlying <see cref="Title"/> <see cref="Regex"/>).
+    /// </summary>
+    public char TitleSeparator { get; set; } = DefaultTitleSeparator;
+
+    /// <summary>
+    /// Gets or sets the <see cref="Regex"/> matching pattern for the <see cref="EventData.Source"/> (see <see cref="Uri.OriginalString"/>).
+    /// </summary>
+    public Regex? Source { get; set; }
+
+    /// <summary>
+    /// Gets or sets the source separator character used to split the <see cref="EventData.Source"/> into segments (where auto-creating the underlying <see cref="Source"/> <see cref="Regex"/>).
+    /// </summary>
+    public char SourceSeparator { get; set; } = DefaultSourceSeparator;
+
+    /// <summary>
+    /// Indicates whether the event matches the <see cref="Title"/> and <see cref="Source"/>.
+    /// </summary>
+    /// <param name="title">The event title (i.e. <see cref="EventData.Title"/>).</param>
+    /// <param name="source">The event source <see cref="Uri"/> (i.e. <see cref="EventData.Source"/>.</param>
+    /// <returns><see langword="true"/> indicates a successful match; otherwise, <see langword="false"/>.</returns>
+    public bool IsMatch(string? title, Uri? source)
+        => SubscribedBase.IsMatch(Title ?? SubscribedBase.CreateGlobRegex(_title.ThrowIfNullOrEmpty(nameof(Title)), TitleSeparator), title)
+        && ((_source is null && Source is null) || SubscribedBase.IsUriMatch(Source ?? SubscribedBase.CreateGlobRegex(_source!, SourceSeparator), source));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/SubscribedBase.Static.cs b/src/CoreEx.Events/Subscribing/SubscribedBase.Static.cs
new file mode 100644
index 00000000..3981f3d4
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/SubscribedBase.Static.cs
@@ -0,0 +1,80 @@
+namespace CoreEx.Events.Subscribing;
+
+public abstract partial class SubscribedBase
+{
+    private static readonly Regex _wildcardAllRegex = AllRegex();
+    private static readonly ConcurrentDictionary<(string, char, RegexOptions?), Regex> _regexCache = new();
+
+    /// <summary>
+    /// Indicates whether the <see cref="string"/>-based <paramref name="input"/> matches the regular expression.
+    /// </summary>
+    /// <param name="regex">The <see cref="Regex"/>.</param>
+    /// <param name="input">The <see cref="string"/> to search for a match.</param>
+    /// <returns><see langword="true"/> indicates a match; otherwise, <see langword="false"/>.</returns>
+    public static bool IsMatch(Regex regex, string? input) => regex.ThrowIfNull().IsMatch(input ?? string.Empty);
+
+    /// <summary>
+    /// Indicates whether the <see cref="Uri"/>-based <paramref name="input"/> matches the regular expression.
+    /// </summary>
+    /// <param name="regex">The <see cref="Regex"/>.</param>
+    /// <param name="input">The <see cref="Uri"/> to search for a match.</param>
+    /// <returns><see langword="true"/> indicates a match; otherwise, <see langword="false"/>.</returns>
+    public static bool IsUriMatch(Regex regex, Uri? input) => IsMatch(regex, input?.OriginalString);
+
+    /// <summary>
+    /// Indicates whether the <paramref name="input"/> matches the segmented (using the <paramref name="separator"/>) glob-like matching pattern.
+    /// </summary>
+    /// <param name="pattern">The dot-based glob-like matching pattern.</param>
+    /// <param name="input">The string to search for a match.</param>
+    /// <param name="separator">The segment separator.</param>
+    /// <returns><see langword="true"/> indicates a match; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>See <see cref="SubscribeAttribute"/> for further details on the dot-based glob-like matching pattern.</remarks>
+    public static bool IsMatch(string? pattern, string? input, char separator = '.') => string.IsNullOrEmpty(pattern) || IsMatch(CreateGlobRegex(pattern, separator), input);
+
+    /// <summary>
+    /// Indicates whether the <paramref name="input"/> matches the segmented (using the <paramref name="separator"/>) glob-like matching pattern.
+    /// </summary>
+    /// <param name="pattern">The dot-based glob-like matching pattern.</param>
+    /// <param name="input">The <see cref="Uri"/> to search for a match.</param>
+    /// <param name="separator">The segment separator.</param>
+    /// <returns><see langword="true"/> indicates a match; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>See <see cref="SubscribeAttribute"/> for further details on the dot-based glob-like matching pattern.</remarks>
+    public static bool IsUriMatch(string? pattern, Uri? input, char separator) => string.IsNullOrEmpty(pattern) || IsMatch(CreateGlobRegex(pattern, separator), input?.OriginalString);
+
+    /// <summary>
+    /// Creates a <see cref="Regex"/> from the dot-based glob-like matching pattern.
+    /// </summary>
+    /// <param name="pattern">The glob-like matching pattern.</param>
+    /// <param name="separator">The segment separator.</param>
+    /// <param name="options">The optional <see cref="RegexOptions"/>.</param>
+    /// <returns>The wildcard <see cref="Regex"/>.</returns>
+    /// <remarks>See <see cref="SubscribeAttribute"/> for further details on the dot-based glob-like matching pattern.</remarks>
+    public static Regex CreateGlobRegex(string pattern, char separator, RegexOptions? options = null)
+    {
+        options ??= RegexOptions.IgnoreCase | RegexOptions.Compiled;
+
+        if (string.IsNullOrEmpty(pattern))
+            return _wildcardAllRegex;
+
+        return _regexCache.GetOrAdd((pattern, separator, options), _ =>
+        {
+            var regex = Regex.Escape(pattern)
+                .Replace(@"\*\*", ".*")                 // Match any number of segments.
+                .Replace(@"\*", $@"[^{separator}]*")    // Match a single segment.
+                .Replace(@"\?", $@"[^{separator}]");    // Match a single char in a segment.
+
+            return new Regex($"^{regex}$", options.Value);
+        });
+    }
+
+    [GeneratedRegex(".*", RegexOptions.Compiled)]
+    private static partial Regex AllRegex();
+
+    /// <summary>
+    /// Indicates whether the expected <paramref name="majorVersion"/> matches the <paramref name="version"/>.
+    /// </summary>
+    /// <param name="majorVersion">The expected major version number.</param>
+    /// <param name="version">The <see cref="Version"/> to compare <see cref="Version.Major"/> with.</param>
+    /// <returns><see langword="true"/> indicates a match; otherwise, <see langword="false"/>.</returns>
+    public static bool IsVersionMatch(int? majorVersion, Version? version) => majorVersion is null || (version is not null && version.Major == majorVersion.Value);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/SubscribedBase.cs b/src/CoreEx.Events/Subscribing/SubscribedBase.cs
new file mode 100644
index 00000000..f92b6481
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/SubscribedBase.cs
@@ -0,0 +1,73 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides the base capabilities for a subscribed event receiver.
+/// </summary>
+/// <remarks>See <see cref="SubscribedManager"/> that manages the subscribed instance lifetime and execution management.</remarks>
+public abstract partial class SubscribedBase
+{
+    /// <summary>
+    /// Gets or sets the optional customizable <see cref="Subscribing.ErrorHandler"/> configuration that is specific to the subscribed event/message receiving.
+    /// </summary>
+    /// <remarks>Where not specified the owning <see cref="EventSubscriberBase"/> will handle as a fallback.</remarks>
+    public ErrorHandler? ErrorHandler { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> where the <see cref="EventData.Data"/> is not considered <i>valid</i>.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="null"/>.
+    /// <para>When specified overrides the parent <see cref="EventSubscriberBase.InvalidDataHandling"/>.</para></remarks>
+    public ErrorHandling? InvalidDataHandling { get; set; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="EventData"/> requires an <b>inbox</b> check before processing.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="null"/>.
+    /// <para>When specified overrides the parent <see cref="SubscribedManager.RequiresInboxCheck"/>.</para></remarks>
+    public bool? RequiresInboxCheck { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> for when the <see cref="EventData"/> fails the <see cref="IEventSubscriberInbox.InboxCheckAsync"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="null"/>.
+    /// <para>When specified overrides the parent <see cref="SubscribedManager.InboxFailureHandling"/>.</para></remarks>
+    public ErrorHandling? InboxFailureHandling { get; set; }
+
+    /// <summary>
+    /// Gets or sets the optional <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="null"/>.
+    /// <para>When specified overrides the <see cref="EventSubscriberBase.JsonSerializerOptions"/>.</para></remarks>
+    public JsonSerializerOptions? JsonSerializerOptions { get; set; }
+
+    /// <summary>
+    /// Receives and processes the <paramref name="event"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    public Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default) => OnReceiveAsync(@event, args, cancellationToken);
+
+    /// <summary>
+    /// Receives and processes the <paramref name="event"/>.
+    /// </summary>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Result"/>.</returns>
+    /// <remarks>Any exception thrown will be automatically converted to a <see cref="Result.Fail(Exception)"/>; however, it is considered more performant if an errant <see cref="Result"/> is returned natively.</remarks>
+    protected abstract Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Deserializes the <see cref="EventData.Data"/> value to the specified <typeparamref name="TValue"/> type.
+    /// </summary>
+    /// <typeparam name="TValue">The <see cref="EventData.Data"/> value <see cref="Type"/>.</typeparam>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="valueIsRequired">Indicates whether the <see cref="EventData.Data"/> value is required.</param>
+    /// <returns>The deserialized value within a <see cref="Result{T}.Value"/>.</returns>
+    /// <remarks>Where an invalid data error (see <see cref="InvalidDataHandling"/>) occurs a <see cref="EventSubscriberReceiveException"/> will be thrown.</remarks>
+    protected Result<TValue> DeserializeValue<TValue>(EventData @event, EventSubscriberArgs args, bool valueIsRequired)
+        => args.Owner!.DeserializeValue<TValue>(@event, valueIsRequired, InvalidDataHandling, JsonSerializerOptions);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/SubscribedBaseT.cs b/src/CoreEx.Events/Subscribing/SubscribedBaseT.cs
new file mode 100644
index 00000000..6cedd805
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/SubscribedBaseT.cs
@@ -0,0 +1,39 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides the base capabilities for a subscribed event receiver with a specified <typeparamref name="TValue"/> <see cref="Type"/> automatically handling deserialization.
+/// </summary>
+/// <typeparam name="TValue">The <see cref="EventData.Data"/> value <see cref="Type"/>.</typeparam>
+public abstract class SubscribedBase<TValue> : SubscribedBase
+{
+    /// <summary>
+    /// Indicates whether the <see cref="EventData.Data"/> value is required.
+    /// </summary>
+    public virtual bool ValueIsRequired { get; } = true;
+
+    /// <summary>
+    /// Gets or sets the optional <see cref="IValidator{T}"/> to use when validating the deserialized <see cref="EventData.Data"/> value.
+    /// </summary>
+    /// <remarks>This is invoked automatically prior to the <see cref="OnReceiveAsync(TValue, EventData, EventSubscriberArgs, CancellationToken)"/>.</remarks>
+    public virtual IValidator<TValue>? ValueValidator { get; }
+
+    /// <inheritdoc/>
+    protected override sealed Task<Result> OnReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+        => DeserializeValue<TValue>(@event, args, ValueIsRequired)
+            .WhenAsAsync(v => ValueValidator is not null, async v =>
+            {
+                var vr = await ValueValidator!.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
+                Result<TValue> r = vr.HasErrors ? vr.ToResult() : Result.Ok(v);
+                return r;
+            })
+            .ThenAsAsync(async v => await OnReceiveAsync(v, @event, args, cancellationToken).ConfigureAwait(false));
+
+    /// <summary>
+    /// Receives and processes the <paramref name="event"/>.
+    /// </summary>
+    /// <param name="value">The deserialized <paramref name="event"/> (<see cref="EventData.Data"/>) value.</param>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task<Result> OnReceiveAsync(TValue value, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/SubscribedInvoker.cs b/src/CoreEx.Events/Subscribing/SubscribedInvoker.cs
new file mode 100644
index 00000000..a6671f2b
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/SubscribedInvoker.cs
@@ -0,0 +1,8 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides the <see cref="SubscribedBase"/> invoker.
+/// </summary>
+/// <remarks>This invoker is <i>only</i> used where a <see cref="SubscribedBase"/> is involved; i.e has been subscribed to.</remarks>
+[InvokerName("CoreEx.Events.Subscribing.Subscribed")]
+public class SubscribedInvoker : InvokerBase<SubscribedBase> { }
\ No newline at end of file
diff --git a/src/CoreEx.Events/Subscribing/SubscribedManager.cs b/src/CoreEx.Events/Subscribing/SubscribedManager.cs
new file mode 100644
index 00000000..901f9210
--- /dev/null
+++ b/src/CoreEx.Events/Subscribing/SubscribedManager.cs
@@ -0,0 +1,220 @@
+namespace CoreEx.Events.Subscribing;
+
+/// <summary>
+/// Provides <see cref="EventSubscriberBase"/> subscription and execution management.
+/// </summary>
+/// <remarks>Note: <see cref="IEventSubscriberInbox.InboxCheckAsync"/> is enabled using one of the <see cref="RequiresInbox(bool)"/> methods to set up.</remarks>
+/// <param name="invoker">The optional <see cref="SubscribedInvoker"/>.</param>
+public sealed class SubscribedManager(SubscribedInvoker? invoker = null)
+{
+    private readonly SubscribedInvoker _invoker = invoker ?? new();
+    private readonly List<(Type Type, SubscribeAttribute[] Attributes)> _subscribers = [];
+    private IEventSubscriberInbox? _inbox;
+    private Type? _inboxType;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> for when an <see cref="EventData"/> has no configured subscriber.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.CompleteAsSilent"/>.</remarks>
+    public ErrorHandling NotSubscribedHandling { get; set; } = ErrorHandling.CompleteAsSilent;
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> for when an <see cref="EventData"/> has multiple subscribers.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.Catastrophic"/>.</remarks> 
+    public ErrorHandling AmbiguousSubscriberHandling { get; set; } = ErrorHandling.Catastrophic;
+
+    /// <summary>
+    /// Indicates whether all subscribers require an <b>inbox</b> check (unless explicitly overridden) before processing.
+    /// </summary>
+    /// <remarks>Defaults to <see langword="false"/>. This is set using <see cref="RequiresInbox(bool)"/>.
+    /// <para>An individual subscriber can override by setting its <see cref="SubscribedBase.RequiresInboxCheck"/> value.</para></remarks>
+    public bool RequiresInboxCheck { get; private set; } = false;
+
+    /// <summary>
+    /// Sets the <b>inbox</b> to the specified <paramref name="inbox"/> and <paramref name="requiresInboxCheck"/> to enable inbox checking.
+    /// </summary>
+    /// <param name="inbox">The <see cref="IEventSubscriberInbox"/>.</param>
+    /// <param name="requiresInboxCheck">Indicates whether all subscribers require an <paramref name="inbox"/> check (unless explicitly overridden) before processing.</param>
+    /// <returns>The <see cref="SubscribedManager"/> to support fluent-style method-chaining.</returns>
+    public SubscribedManager RequiresInbox(IEventSubscriberInbox inbox, bool requiresInboxCheck = true)
+    {
+        _inbox = inbox.ThrowIfNull();
+        _inboxType = null;
+        RequiresInboxCheck = requiresInboxCheck;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the <b>inbox</b> to the specified <typeparamref name="TInbox"/> and <paramref name="requiresInboxCheck"/> to enable inbox checking.
+    /// </summary>
+    /// <typeparam name="TInbox">The <see cref="IEventSubscriberInbox"/> <see cref="Type"/>.</typeparam>
+    /// <param name="requiresInboxCheck">Indicates whether all subscribers require an <b>inbox</b> check (unless explicitly overridden) before processing.</param>
+    /// <returns>The <see cref="SubscribedManager"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <typeparamref name="TInbox"/> will be instantiated using dependency injection per <see cref="ReceiveAsync(ExecutionContext, SubscribedBase, EventData, EventSubscriberArgs, CancellationToken)"/> execution (as needed).</remarks>
+    public SubscribedManager RequiresInbox<TInbox>(bool requiresInboxCheck = true) where TInbox : IEventSubscriberInbox
+    {
+        _inboxType = typeof(TInbox);
+        _inbox = null;
+        RequiresInboxCheck = requiresInboxCheck;
+        return this;
+    }
+
+    /// <summary>
+    /// Sets the <b>inbox</b> to the DI configured <see cref="IEventSubscriberInbox"/> and <paramref name="requiresInboxCheck"/> to enable inbox checking.
+    /// </summary>
+    /// <param name="requiresInboxCheck">Indicates whether all subscribers require an <b>inbox</b> check (unless explicitly overridden) before processing.</param>
+    /// <returns>The <see cref="SubscribedManager"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <see cref="IEventSubscriberInbox"/> will be instantiated using dependency injection per <see cref="ReceiveAsync(ExecutionContext, SubscribedBase, EventData, EventSubscriberArgs, CancellationToken)"/> execution (as needed).</remarks>
+    public SubscribedManager RequiresInbox(bool requiresInboxCheck = true) => RequiresInbox<IEventSubscriberInbox>(requiresInboxCheck);
+
+    /// <summary>
+    /// Gets or sets the <see cref="ErrorHandling"/> for when the <see cref="EventData"/> fails the <see cref="IEventSubscriberInbox.InboxCheckAsync"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="ErrorHandling.CompleteAsWarning"/> as this is an expected byproduct of achieving at least once only idempotent processing; i.e. event/message has previously been processed
+    /// (either successfully or unsuccessfully) and further attempts should be ignored.</remarks>
+    public ErrorHandling InboxFailureHandling { get; set; } = ErrorHandling.CompleteAsWarning;
+
+    /// <summary>
+    /// Adds a single subscriber type.
+    /// </summary>
+    /// <typeparam name="T">The subscriber type to add.</typeparam>
+    /// <returns>The <see cref="SubscribedManager"/> to support fluent-style method-chaining.</returns>
+    public SubscribedManager AddSubscriber<T>() where T : SubscribedBase => AddSubscribers(typeof(T));
+
+    /// <summary>
+    /// Adds multiple subscriber types.
+    /// </summary>
+    /// <param name="types">The subscriber types to add.</param>
+    /// <returns>The <see cref="SubscribedManager"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Each type must implement both <see cref="SubscribedBase"/> and at least be decorated with one <see cref="SubscribeAttribute"/> otherwise an <see cref="ArgumentException"/> will be thrown.</remarks>
+    public SubscribedManager AddSubscribers(params IEnumerable<Type> types)
+    {
+        foreach (var type in types.Distinct().Where(t => !_subscribers.Any(x => x.Type == t)))
+        {
+            if (!type.IsClass || type.IsAbstract || type.IsGenericType)
+                throw new ArgumentException($"Type {type.Name} is not a class, is abstract and/or generic and as such cannot be used as a subscriber.", nameof(types));
+
+            if (!typeof(SubscribedBase).IsAssignableFrom(type))
+                throw new ArgumentException($"Type {type.Name} does not inherit from {nameof(SubscribedBase)}.", nameof(types));
+
+            var atts = type.GetCustomAttributes<SubscribeAttribute>().ToArray();
+            if (atts.Length == 0)
+                throw new ArgumentException($"Type {type.Name} is not decorated with any {nameof(SubscribeAttribute)} attributes and as such cannot be used as a subscriber.", nameof(types));
+
+            _subscribers.Add((type, atts));
+        }
+
+        return this;
+    }
+
+    /// <summary>
+    /// Dynamically adds all subscribers within the specified assembly that implement <see cref="SubscribedBase"/> and are decorated with at least one <see cref="SubscribeAttribute"/>.
+    /// </summary>
+    /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <returns>The <see cref="SubscribedManager"/> to support fluent-style method-chaining.</returns>
+    public SubscribedManager AddSubscribersUsing<TAssembly1>()
+    {
+        var assembly = typeof(TAssembly1).Assembly;
+        var types = assembly.GetTypes().Where(t => typeof(SubscribedBase).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract && !t.IsGenericType && t.GetCustomAttributes<SubscribeAttribute>().Any());
+        return AddSubscribers([.. types]);
+    }
+
+    /// <summary>
+    /// Matches and creates an instance of the <see cref="SubscribedBase"/> where found; otherwise, an error will occur.
+    /// </summary>
+    /// <param name="executionContext">The current <see cref="ExecutionContext"/>.</param>
+    /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="title">The event title (i.e. <see cref="EventData.Title"/>) to match.</param>
+    /// <param name="source">The event source <see cref="Uri"/> (i.e. <see cref="EventData.Source"/> to match.</param>
+    /// <returns>The <see cref="Result{T}"/> with the instantiated <see cref="SubscribedBase"/>; otherwise, the corresponding <see cref="Result.Fail(Exception)"/>.
+    /// <remarks>The <see cref="EventSubscriberArgs.UsesSubscribedManager"/> property is set to <see langword="true"/> and the <see cref="EventSubscriberArgs.Subscriber"/> property is set to the matched
+    /// <see cref="SubscribedBase"/> instance (where matched).</remarks></returns>
+    public Result<SubscribedBase> Match(ExecutionContext executionContext, EventSubscriberArgs args, string? title, Uri? source = null)
+    {
+        executionContext.ThrowIfNull();
+        args.ThrowIfNull();
+        args.Owner.ThrowIfNull();
+        args.UsesSubscribedManager = true;
+
+        var subscribers = _subscribers
+            .Where(x => x.Attributes.Any(a => a.IsMatch(title, source)))
+            .Select(x => x.Type)
+            .ToArray();
+
+        // Handle where no subscriber is found.
+        if (subscribers.Length == 0)
+        {
+            var eha = new ErrorHandlerArgs { SubscriberArgs = args, SourceType = GetType(), ErrorHandlingOverride = NotSubscribedHandling, Exception = new InvalidOperationException("No subscriber matched the event.") };
+            return args.Owner.ErrorHandler.Handle(eha, defaultErrorHandling: null);
+        }
+
+        // Handle where more than one subscriber is found.
+        if (subscribers.Length > 1)
+        {
+            var eha = new ErrorHandlerArgs { SubscriberArgs = args, SourceType = GetType(), ErrorHandlingOverride = AmbiguousSubscriberHandling, Exception = new InvalidOperationException($"Multiple subscribers ({subscribers.Length}) matched the event.") };
+            return args.Owner.ErrorHandler.Handle(eha, defaultErrorHandling: null);
+        }
+
+        // Instantiate the matched subscriber; failure is always considered 'Catastrophic'.
+        try
+        {
+            return args.Subscriber = (SubscribedBase)executionContext.ServiceProvider.ThrowIfNull().GetRequiredService(subscribers[0]);
+        }
+        catch (Exception ex)
+        {
+            return args.Owner.ErrorHandler.Handle(new ErrorHandlerArgs { SubscriberArgs = args, SourceType = GetType(), Exception = new InvalidOperationException($"Unable to instantiate matched Subscribed type '{subscribers[0].Name}': {ex.Message}"), ErrorHandlingOverride = ErrorHandling.Catastrophic }, null);
+        }
+    }
+
+    /// <summary>
+    /// Receives and processes the <see cref="EventData"/> using the <paramref name="subscribed"/> instance.
+    /// </summary>
+    /// <param name="executionContext">The current <see cref="ExecutionContext"/>.</param>
+    /// <param name="subscribed">The previously matched <see cref="SubscribedBase"/>.</param>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>It is expected that a <see cref="Match(ExecutionContext, EventSubscriberArgs, string?, Uri?)"/> is performed prior to match and instantiate the required <paramref name="subscribed"/> instance.</remarks>
+    public async Task<Result> ReceiveAsync(ExecutionContext executionContext, SubscribedBase subscribed, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
+    {
+        executionContext.ThrowIfNull();
+        executionContext.ServiceProvider.ThrowIfNull();
+        subscribed.ThrowIfNull();
+        @event.ThrowIfNull();
+        args.Owner.ThrowIfNull();
+
+        // Where the subscriber requires an inbox check then action accordingly.
+        if (subscribed.RequiresInboxCheck ?? RequiresInboxCheck)
+        {
+            if (_inbox is null && _inboxType is null)
+                throw new InvalidOperationException($"The Inbox is not configured and the subscriber requires an inbox check; use {nameof(RequiresInbox)} to configure.");
+
+            var inbox = _inbox ?? (IEventSubscriberInbox)executionContext.ServiceProvider.GetRequiredService(_inboxType!);
+
+            if (!await inbox.InboxCheckAsync(@event, args, cancellationToken).ConfigureAwait(false))
+            {
+                var eha = new ErrorHandlerArgs { SubscriberArgs = args, SourceType = GetType(), ErrorHandlingOverride = InboxFailureHandling, Exception = new InvalidOperationException("The event failed the inbox check and will not be processed.") };
+                return args.Owner.ErrorHandler.Handle(eha, defaultErrorHandling: null);
+            }
+        }
+
+        // Execute the subscribed receive.
+        return await _invoker.InvokeAsync(subscribed, async (_, cancellationToken) =>
+        {
+            try
+            {
+                return Result.Go(await subscribed.ReceiveAsync(@event, args, cancellationToken).ConfigureAwait(false))
+                    .OnFailure(result => subscribed.ErrorHandler is not null ? subscribed.ErrorHandler.Handle(new ErrorHandlerArgs { SubscriberArgs = args, SourceType = subscribed.GetType(), Exception = result.Error }, null) : result);
+            }
+            catch (Exception ex) when (subscribed.ErrorHandler is not null && ex is not IEventSubscriberException && !ex.IsCanceled()) // Ignore IEventSubscriberException's and *CanceledException as they are intended to bubble up!
+            {
+                return subscribed.ErrorHandler.Handle(new ErrorHandlerArgs { SubscriberArgs = args, SourceType = subscribed.GetType(), Exception = ex }, null);
+            }
+            catch (Exception ex)
+            {
+                return Result.Fail(ex);
+            }
+        }, cancellationToken).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj b/src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj
deleted file mode 100644
index 800d49aa..00000000
--- a/src/CoreEx.FluentValidation/CoreEx.FluentValidation.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.FluentValidation</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET FluentValidation Extensions.</Title>
-    <Description>CoreEx .NET FluentValidation Extensions.</Description>
-    <PackageTags>coreex api function aspnet validation validator validate fluentvalidation</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="11.11.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-</Project>
diff --git a/src/CoreEx.FluentValidation/FluentValidationExtensions.cs b/src/CoreEx.FluentValidation/FluentValidationExtensions.cs
deleted file mode 100644
index fd3b23d1..00000000
--- a/src/CoreEx.FluentValidation/FluentValidationExtensions.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.FluentValidation;
-using CoreEx.RefData;
-using FluentValidation.Validators;
-using System;
-
-namespace FluentValidation
-{
-    /// <summary>
-    /// <c>FluentValidation</c> extension methods.
-    /// </summary>
-    public static class FluentValidationExtensions
-    {
-        /// <summary>
-        /// Defines an <see cref="IReferenceData"/> validator whereby the <see cref="ReferenceDataTypeOf{T}.As{TRef}"/> is required to specify corresponding <see cref="IReferenceData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-        /// <param name="ruleBuilder">The <paramref name="ruleBuilder"/> to enable the extension method.</param>
-        /// <returns>The <see cref="ReferenceDataTypeOf{T}"/>.</returns>
-        public static ReferenceDataTypeOf<T> RefDataCode<T>(this IRuleBuilder<T, string?> ruleBuilder) => new(ruleBuilder);
-
-        /// <summary>
-        /// Provides for the specification of the corresponding <see cref="ReferenceDataTypeOf{T}"/> <see cref="IReferenceData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-        public class ReferenceDataTypeOf<T>
-        {
-            private readonly IRuleBuilder<T, string?> _ruleBuilder;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="ReferenceDataTypeOf{T}"/> class.
-            /// </summary>
-            /// <param name="ruleBuilder">The <see cref="IRuleBuilder{T, TProperty}"/>.</param>
-            internal ReferenceDataTypeOf(IRuleBuilder<T, string?> ruleBuilder) => _ruleBuilder = ruleBuilder;
-
-            /// <summary>
-            /// Sets the <see cref="ReferenceDataCodeValidator{T, TRef}"/> for the specified <typeparamref name="TRef"/> <see cref="Type"/>.
-            /// </summary>
-            /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-            /// <returns>The <see cref="IRuleBuilderOptions{T, TProperty}"/> to support fluent-style method-chaining.</returns>
-            public IRuleBuilderOptions<T, string?> As<TRef>() where TRef : IReferenceData => _ruleBuilder.SetValidator(new ReferenceDataCodeValidator<T, TRef>()); 
-        }
-
-        /// <summary>
-        /// Defines an <see cref="IReferenceData"/> validator to ensure that the <see cref="IReferenceData.IsValid"/> is <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <param name="ruleBuilder">The <paramref name="ruleBuilder"/> to enable the extension method.</param>
-        /// <returns>The <see cref="IRuleBuilderOptions{T, TProperty}"/> to support fluent-style method-chaining.</returns>
-		public static IRuleBuilderOptions<T, TRef?> IsValid<T, TRef>(this IRuleBuilder<T, TRef?> ruleBuilder) where TRef : IReferenceData
-			=> ruleBuilder.SetValidator(new ReferenceDataValidator<T, TRef>());
-
-        /// <summary>
-        /// Defines a mandatory (see <see cref="NotEmptyValidator{T, TProperty}"/>) validator to ensure that the value is not equal to its default value.
-        /// </summary>
-        /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="ruleBuilder">The <paramref name="ruleBuilder"/> to enable the extension method.</param>
-        /// <returns>The <see cref="IRuleBuilderOptions{T, TProperty}"/> to support fluent-style method-chaining.</returns>
-        public static IRuleBuilderOptions<T, TProperty> Mandatory<T, TProperty>(this IRuleBuilder<T, TProperty> ruleBuilder)
-			=> ruleBuilder.SetValidator(new NotEmptyValidator<T,TProperty>());
-
-        /// <summary>
-        /// Associates a validator provider with the current property rule where the property is nullable (and therefore optional).
-        /// </summary>
-        /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">the property <see cref="Type"/>.</typeparam>
-        /// <param name="ruleBuilder">The <paramref name="ruleBuilder"/> to enable the extension method.</param>
-        /// <param name="validator">The property <see cref="IValidator{T}"/>.</param>
-        /// <param name="ruleSets">The list of rule sets.</param>
-        /// <returns>The <see cref="IRuleBuilderOptions{T, TProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Added as advised: <see href="https://github.com/FluentValidation/FluentValidation/issues/1320"/>.</remarks>
-        public static IRuleBuilderOptions<T, TProperty> SetOptionalValidator<T, TProperty>(this IRuleBuilder<T, TProperty?> ruleBuilder, IValidator<TProperty> validator, params string[] ruleSets) where TProperty : class
-            => ruleBuilder.SetValidator(validator!, ruleSets)!;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/FluentValidator.cs b/src/CoreEx.FluentValidation/FluentValidator.cs
deleted file mode 100644
index 8fba140f..00000000
--- a/src/CoreEx.FluentValidation/FluentValidator.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using FV = FluentValidation;
-
-namespace CoreEx.FluentValidation
-{
-    /// <summary>
-    /// Provides access to the fluent-validator capabilities.
-    /// </summary>
-    public static class FluentValidator
-    {
-        /// <summary>
-        /// Creates (or gets) an instance of the validator.
-        /// </summary>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>; defaults to <see cref="ExecutionContext.ServiceProvider"/> where not specified.</param>
-        /// <returns>The <typeparamref name="TValidator"/> instance.</returns>
-        public static TValidator Create<TValidator>(IServiceProvider? serviceProvider = null) where TValidator : FV.IValidator
-            => (serviceProvider == null ? ExecutionContext.GetService<TValidator>() : serviceProvider.GetService<TValidator>())
-                ?? throw new InvalidOperationException($"Attempted to get service '{typeof(TValidator).FullName}' but null was returned; this would indicate that the service has not been configured correctly.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/IFluentServiceCollectionExtensions.cs b/src/CoreEx.FluentValidation/IFluentServiceCollectionExtensions.cs
deleted file mode 100644
index 293b433d..00000000
--- a/src/CoreEx.FluentValidation/IFluentServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using System;
-using System.Linq;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extensions.
-    /// </summary>
-    public static class IFluentServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds the <see cref="FluentValidation.IValidator{T}"/>, the corresponding <see cref="CoreEx.FluentValidation.ValidatorWrapper{T}"/> and <typeparamref name="TValidator"/> as scoped services.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddFluentValidator<T, TValidator>(this IServiceCollection services) where TValidator : class, FluentValidation.IValidator<T>
-            => AddFluentValidatorWithInterfacesInternal<T, TValidator>(services);
-
-        /// <summary>
-        /// Adds the <see cref="FluentValidation.IValidator{T}"/>, the corresponding <see cref="CoreEx.FluentValidation.ValidatorWrapper{T}"/> and <typeparamref name="TValidator"/> as scoped services.
-        /// </summary>
-        private static IServiceCollection AddFluentValidatorWithInterfacesInternal<T, TValidator>(this IServiceCollection services) where TValidator : class, FluentValidation.IValidator<T>
-            => services.ThrowIfNull(nameof(services))
-                .AddScoped<FluentValidation.IValidator<T>, TValidator>()
-                .AddScoped<CoreEx.Validation.IValidator<T>>(sp => new CoreEx.FluentValidation.ValidatorWrapper<T>(sp.GetRequiredService<FluentValidation.IValidator<T>>()))
-                .AddScoped(sp => (TValidator)sp.GetRequiredService<FluentValidation.IValidator<T>>());
-
-        /// <summary>
-        /// Adds the <typeparamref name="TValidator"/> as a scoped service only.
-        /// </summary>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        /// <remarks>Note that this does <i>not</i> register the corresponding <see cref="FluentValidation.IValidator{T}"/> and <see cref="CoreEx.Validation.IValidator{T}"/>; use <see cref="AddFluentValidator{T, TValidator}(IServiceCollection)"/> to explicitly perform.</remarks>
-        public static IServiceCollection AddFluentValidator<TValidator>(this IServiceCollection services) where TValidator : class, FluentValidation.IValidator
-            => AddFluentValidatorInternal<TValidator>(services);
-
-        /// <summary>
-        /// Adds the <see cref="FluentValidation.IValidator"/> as a scoped service only.
-        /// </summary>
-        private static IServiceCollection AddFluentValidatorInternal<TValidator>(this IServiceCollection services) where TValidator : class, FluentValidation.IValidator
-            => services.ThrowIfNull(nameof(services)).AddScoped<TValidator>();
-
-        /// <summary>
-        /// Adds all the <see cref="FluentValidation.IValidator{T}"/>(s) and corresponding <see cref="CoreEx.FluentValidation.ValidatorWrapper{T}"/>(s) from the specified <typeparamref name="TAssembly"/> as scoped services.
-        /// </summary>
-        /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="includeInternalTypes">Indicates whether to include internally defined types.</param>
-        /// <param name="alsoRegisterInterfaces">Indicates whether to also register the interfaces with <see cref="AddFluentValidator{T, TValidator}(IServiceCollection)"/> (default); otherwise, with <see cref="AddFluentValidator{TValidator}(IServiceCollection)"/> (just the validator instance itself).</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddFluentValidators<TAssembly>(this IServiceCollection services, bool includeInternalTypes = false, bool alsoRegisterInterfaces = true)
-        {
-            var afv = alsoRegisterInterfaces
-                ? typeof(IFluentServiceCollectionExtensions).GetMethod(nameof(AddFluentValidatorWithInterfacesInternal), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic)!
-                : typeof(IFluentServiceCollectionExtensions).GetMethod(nameof(AddFluentValidatorInternal), System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic)!;
-
-            foreach (var match in from type in includeInternalTypes ? typeof(TAssembly).Assembly.GetTypes() : typeof(TAssembly).Assembly.GetExportedTypes()
-                                  where !type.IsAbstract && !type.IsGenericTypeDefinition
-                                  let interfaces = type.GetInterfaces()
-                                  let genericInterfaces = interfaces.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(FluentValidation.IValidator<>))
-                                  let @interface = genericInterfaces.FirstOrDefault()
-                                  let valueType = @interface?.GetGenericArguments().FirstOrDefault()
-                                  where @interface != null
-                                  select new { valueType, type })
-            {
-                if (alsoRegisterInterfaces)
-                    afv.MakeGenericMethod(match.valueType, match.type).Invoke(null, new object[] { services });
-                else
-                    afv.MakeGenericMethod(match.type).Invoke(null, new object[] { services });
-            }
-
-            return services;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/ReferenceDataCodeValidator.cs b/src/CoreEx.FluentValidation/ReferenceDataCodeValidator.cs
deleted file mode 100644
index b2adc313..00000000
--- a/src/CoreEx.FluentValidation/ReferenceDataCodeValidator.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using FluentValidation;
-using FluentValidation.Validators;
-using System;
-
-namespace CoreEx.FluentValidation
-{
-    /// <summary>
-    /// Represents a <see cref="IReferenceData.Code"/> validator.
-    /// </summary>
-    /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    public class ReferenceDataCodeValidator<T, TRef> : PropertyValidator<T, string?> where TRef : IReferenceData
-    {
-        /// <inheritdoc/>
-        public override string Name => nameof(ReferenceDataCodeValidator<T, TRef>);
-
-        /// <inheritdoc/>
-        public override bool IsValid(ValidationContext<T> context, string? value) => 
-            value == null || ReferenceDataOrchestrator.Current.GetByTypeRequired<TRef>().TryGetByCode(value, out var rd) && rd!.IsValid;
-
-        /// <inheritdoc/>
-        protected override string GetDefaultMessageTemplate(string errorCode) => "'{PropertyName}' is invalid.";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/ReferenceDataValidator.cs b/src/CoreEx.FluentValidation/ReferenceDataValidator.cs
deleted file mode 100644
index 8f771819..00000000
--- a/src/CoreEx.FluentValidation/ReferenceDataValidator.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using FluentValidation;
-using FluentValidation.Validators;
-using System;
-
-namespace CoreEx.FluentValidation
-{
-    /// <summary>
-    /// Represents a <see cref="IReferenceData"/> validator.
-    /// </summary>
-    /// <typeparam name="T">The owning object <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    public class ReferenceDataValidator<T, TRef> : PropertyValidator<T, TRef?> where TRef : IReferenceData
-    {
-        /// <inheritdoc/>
-        public override string Name => nameof(ReferenceDataValidator<T, TRef>);
-
-        /// <inheritdoc/>
-        public override bool IsValid(ValidationContext<T> context, TRef? value) => value == null || value.IsValid;
-
-        /// <inheritdoc/>
-        protected override string GetDefaultMessageTemplate(string errorCode) => "'{PropertyName}' is invalid.";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/ValidationExtensions.cs b/src/CoreEx.FluentValidation/ValidationExtensions.cs
deleted file mode 100644
index 57da729d..00000000
--- a/src/CoreEx.FluentValidation/ValidationExtensions.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using FluentValidation.Results;
-using System;
-using FV = FluentValidation;
-
-namespace CoreEx.FluentValidation
-{
-    /// <summary>
-    /// <c>FluentValidation</c> extension methods.
-    /// </summary>
-    public static class ValidationExtensions
-    {
-        /// <summary>
-        /// Throws a <see cref="ValidationException"/> where the <see cref="ValidationResult"/> has errors (is not <see cref="ValidationResult.IsValid"/>).
-        /// </summary>
-        /// <param name="validationResult">The <see cref="ValidationResult"/>.</param>
-        /// <exception cref="ValidationException">The resulting <see cref="ValidationException"/> where the <see cref="ValidationResult"/> has errors.</exception>
-        public static void ThrowValidationException(this ValidationResult validationResult)
-        {
-            var vex = ToValidationException(validationResult);
-            if (vex != null)
-                throw vex;
-        }
-
-        /// <summary>
-        /// Creates a <see cref="ValidationException"/> where the <see cref="ValidationResult"/> has errors (is not <see cref="ValidationResult.IsValid"/>).
-        /// </summary>
-        /// <param name="validationResult">The <see cref="ValidationResult"/>.</param>
-        /// <returns>The <see cref="ValidationException"/> where the <see cref="ValidationResult"/> has errors; otherwise, <c>null</c>.</returns>
-        public static ValidationException? ToValidationException(this ValidationResult validationResult)
-        {
-            if (validationResult.ThrowIfNull(nameof(validationResult)).IsValid)
-                return null;
-
-            var mic = new MessageItemCollection();
-            foreach (var error in validationResult.Errors)
-            {
-                mic.AddPropertyError(error.PropertyName, error.ErrorMessage);
-            }
-
-            return new ValidationException(mic);
-        }
-
-        /// <summary>
-        /// Wraps the <i>FluentValidation</i> <see cref="FV.IValidator{T}"/> to a <see cref="CoreEx.Validation.IValidator{T}"/> using a <see cref="ValidatorWrapper{T}"/> to enable interoperability.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="validator">The <i>FluentValidation</i> <see cref="FV.IValidator{T}"/>.</param>
-        /// <returns>The <see cref="CoreEx.Validation.IValidator{T}"/>.</returns>
-        public static CoreEx.Validation.IValidator<T> Wrap<T>(this FV.IValidator<T> validator) => new ValidatorWrapper<T>(validator);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/ValidationResultWrapper.cs b/src/CoreEx.FluentValidation/ValidationResultWrapper.cs
deleted file mode 100644
index 6e28dece..00000000
--- a/src/CoreEx.FluentValidation/ValidationResultWrapper.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Localization;
-using CoreEx.Results;
-using CoreEx.Validation;
-using FluentValidation.Results;
-using System;
-
-namespace CoreEx.FluentValidation
-{
-    /// <summary>
-    /// Represents a <see cref="ValidationResult"/> wrapper to enable <i>CoreEx</i> <see cref="IValidationResult"/> interoperability.
-    /// </summary>
-    public class ValidationResultWrapper<T> : IValidationResult<T>
-    {
-        private ValidationException? _vex;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationResultWrapper{T}"/> class with the specified <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="ValidationResult"/> to wrap.</param>
-        /// <param name="value">The originating value being validated.</param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public ValidationResultWrapper(ValidationResult result, T? value)
-        {
-            Result = result.ThrowIfNull(nameof(result));
-            Value = value;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationResultWrapper{T}"/> class where the value was <c>null</c> and therefore no corresponding <see cref="Result"/>.
-        /// </summary>
-        public ValidationResultWrapper() => _vex = new ValidationException(new LText("CoreEx.FluentValidation.NullValueException", "Value is required."));
-
-        /// <summary>
-        /// Gets the underlying <see cref="ValidationResult"/> that is being wrapped (where applicable).
-        /// </summary>
-        public ValidationResult? Result { get; }
-
-        /// <inheritdoc/>
-        public T? Value { get; }
-
-        /// <inheritdoc/>
-        public bool HasErrors => Result == null || !Result.IsValid;
-
-        /// <inheritdoc/>
-        public MessageItemCollection? Messages => HasErrors ? (ToException() is ValidationException vex ? vex.Messages : null) : null;
-
-        /// <inheritdoc/>
-        public Result? FailureResult => null;
-
-        /// <inheritdoc/>
-        IValidationResult IValidationResult.ThrowOnError() => ThrowOnError();
-
-        /// <summary>
-        /// Throws a <see cref="ValidationException"/> where <see cref="HasErrors"/>.
-        /// </summary>
-        /// <returns>The <see cref="ValidationResultWrapper{T}"/> to support fluent-style method-chaining.</returns>
-        public ValidationResultWrapper<T> ThrowOnError()
-        {
-            if (HasErrors)
-                throw ToException()!;
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public Exception? ToException() => HasErrors ? (_vex ??= Result!.ToValidationException()) : null;
-
-        /// <inheritdoc/>
-        public Result<R> ToResult<R>() => HasErrors ? Result<R>.ValidationError(Messages!) : Validation.Validation.ConvertValueToResult<T, R>(Value!);
-
-        /// <inheritdoc/>
-        public Result ToResult() => HasErrors ? Results.Result.ValidationError(Messages!) : Results.Result.Success;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/ValidatorWrapper.cs b/src/CoreEx.FluentValidation/ValidatorWrapper.cs
deleted file mode 100644
index ffdda4d3..00000000
--- a/src/CoreEx.FluentValidation/ValidatorWrapper.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Validation;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using FV = FluentValidation;
-
-namespace CoreEx.FluentValidation
-{
-    /// <summary>
-    /// Represents an <see cref="FV.IValidator{T}"/> wrapper to enable <i>CoreEx</i> <see cref="IValidator{T}"/> interoperability.
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    /// <param name="fluentValidator">The <see cref="FV.IValidator{T}"/> to wrap.</param>
-    public sealed class ValidatorWrapper<T>(FV.IValidator<T> fluentValidator) : IValidator<T>
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="FV.IValidator{T}"/> that is being wrapped.
-        /// </summary>
-        public FV.IValidator<T> Validator { get; } = fluentValidator.ThrowIfNull(nameof(fluentValidator));
-
-        /// <inheritdoc/>
-        public async Task<IValidationResult<T>> ValidateAsync(T value, CancellationToken cancellationToken = default)
-            => value == null ? new ValidationResultWrapper<T>() : new ValidationResultWrapper<T>(await Validator.ValidateAsync(value, cancellationToken).ConfigureAwait(false), value);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.FluentValidation/strong-name-key.snk b/src/CoreEx.FluentValidation/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.FluentValidation/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj b/src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj
deleted file mode 100644
index b5f0bc80..00000000
--- a/src/CoreEx.Newtonsoft/CoreEx.Newtonsoft.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Newtonsoft</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Newtonsoft Extensions.</Title>
-    <Description>CoreEx .NET Newtonsoft Extensions.</Description>
-    <PackageTags>coreex api function aspnet json newtonsoft jsonserializer</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CloudNative.CloudEvents.NewtonsoftJson" Version="2.8.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-</Project>
diff --git a/src/CoreEx.Newtonsoft/Json/CloudEventSerializer.cs b/src/CoreEx.Newtonsoft/Json/CloudEventSerializer.cs
deleted file mode 100644
index 08df6e45..00000000
--- a/src/CoreEx.Newtonsoft/Json/CloudEventSerializer.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CloudNative.CloudEvents;
-using CloudNative.CloudEvents.NewtonsoftJson;
-using CoreEx.Events;
-using Newtonsoft.Json;
-using System;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides the <see cref="Nsj.JsonSerializer"/>-based <see cref="IEventSerializer"/>.
-    /// </summary>
-    public class CloudEventSerializer : CloudEventSerializerBase
-    {
-        private Nsj.JsonSerializer? _jsonSerializer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CloudEventSerializer"/> class.
-        /// </summary>
-        /// <param name="eventDataFormatter">The <see cref="EventDataFormatter"/>; where <c>null</c> this will default.</param>
-        /// <param name="settings">The <see cref="Nsj.JsonSerializerSettings"/>; where <c>null</c> this will default.</param>
-        public CloudEventSerializer(EventDataFormatter? eventDataFormatter = null, JsonSerializerSettings? settings = null) : base(eventDataFormatter)
-        {
-            EventDataFormatter.JsonSerializer ??= new JsonSerializer(settings);
-            Settings = settings ?? (JsonSerializerSettings)EventDataFormatter.JsonSerializer.Options;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="JsonSerializerSettings"/>.
-        /// </summary>
-        public JsonSerializerSettings Settings { get; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="Nsj.JsonSerializer"/> instance.
-        /// </summary>
-        protected Nsj.JsonSerializer JsonSerializer => _jsonSerializer ??= Nsj.JsonSerializer.Create(Settings);
-
-        /// <inheritdoc/>
-        protected override Task<CloudEvent> DecodeAsync(BinaryData eventData, CancellationToken cancellationToken = default)
-            => Task.FromResult(new JsonEventFormatter(JsonSerializer).DecodeStructuredModeMessage(eventData, new ContentType(MediaTypeNames.Application.Json), null));
-
-        /// <inheritdoc/>
-        protected override Task<CloudEvent> DecodeAsync<T>(BinaryData eventData, CancellationToken cancellationToken = default)
-            => Task.FromResult(new JsonEventFormatter<T>(JsonSerializer).DecodeStructuredModeMessage(eventData, new ContentType(MediaTypeNames.Application.Json), null));
-
-        /// <inheritdoc/>
-        protected override Task<BinaryData> EncodeAsync(CloudEvent cloudEvent, CancellationToken cancellationToken = default)
-            => Task.FromResult(new BinaryData(new InternalFormatter(JsonSerializer).EncodeStructuredModeMessage(cloudEvent, out var _)));
-
-        private class InternalFormatter(Nsj.JsonSerializer jsonSerializer) : JsonEventFormatter(jsonSerializer)
-        {
-            /// <inheritdoc/>
-            protected override void EncodeStructuredModeData(CloudEvent cloudEvent, JsonWriter writer)
-            {
-                if (cloudEvent.Data is BinaryData bd && cloudEvent.DataContentType == MediaTypeNames.Application.Json)
-                {
-                    writer.WritePropertyName(DataPropertyName);
-                    writer.WriteRawValue(bd.ToString());
-                }
-                else
-                    base.EncodeStructuredModeData(cloudEvent, writer);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/CollectionResultJsonConverter.cs b/src/CoreEx.Newtonsoft/Json/CollectionResultJsonConverter.cs
deleted file mode 100644
index 6be1ece0..00000000
--- a/src/CoreEx.Newtonsoft/Json/CollectionResultJsonConverter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using Newtonsoft.Json;
-using System;
-using System.Collections;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="ICollectionResult"/> values.
-    /// </summary>
-    public class CollectionResultJsonConverter : JsonConverter
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType) => typeof(ICollectionResult).IsAssignableFrom(objectType);
-
-        /// <inheritdoc/>
-        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, global::Newtonsoft.Json.JsonSerializer serializer)
-        {
-            if (reader.TokenType == JsonToken.Null)
-                return default;
-
-            var cr = (ICollectionResult)Activator.CreateInstance(objectType)!;
-            var coll = (ICollection?)serializer.Deserialize(reader, cr.CollectionType);
-
-            if (coll != null)
-                cr.Items = coll;
-
-            return cr;
-        }
-
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object? value, global::Newtonsoft.Json.JsonSerializer serializer)
-        {
-            if (value == null || value is not ICollectionResult cr)
-                return;
-
-            writer.WriteStartArray();
-
-            if (cr.Items != null)
-            {
-                foreach (var item in cr.Items)
-                {
-                    serializer.Serialize(writer, item);
-                }
-            }
-
-            writer.WriteEndArray();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/CompositeKeyJsonConverter.cs b/src/CoreEx.Newtonsoft/Json/CompositeKeyJsonConverter.cs
deleted file mode 100644
index 0b42b9e9..00000000
--- a/src/CoreEx.Newtonsoft/Json/CompositeKeyJsonConverter.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="CompositeKey"/> values.
-    /// </summary>
-    public class CompositeKeyJsonConverter : JsonConverter
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType) => objectType == typeof(CompositeKey);
-
-        /// <inheritdoc/>
-        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, global::Newtonsoft.Json.JsonSerializer serializer)
-        {
-            if (reader.TokenType == JsonToken.Null)
-                return CompositeKey.Empty;
-
-            if (reader.TokenType != JsonToken.StartArray)
-            {
-                var jtr = (JsonTextReader)reader;
-                throw new JsonSerializationException($"Expected {nameof(JsonToken.StartArray)} for a {nameof(CompositeKey)}; found {reader.TokenType}.", jtr.Path, jtr.LineNumber, jtr.LinePosition, null);
-            }
-
-            var depth = reader.Depth;
-            var args = new List<object?>();
-
-            reader.Read();
-            while (reader.Depth > depth)
-            {
-                if (reader.TokenType == JsonToken.Null)
-                {
-                    args.Add(null);
-                    reader.Read();
-                    continue;
-                }
-
-                if (reader.TokenType != JsonToken.StartObject)
-                {
-                    var jtr = (JsonTextReader)reader;
-                    throw new JsonSerializationException($"Expected {nameof(JsonToken.StartObject)} for a {nameof(CompositeKey)}; found {reader.TokenType}.", jtr.Path, jtr.LineNumber, jtr.LinePosition, null);
-                }
-
-                var objDepth = reader.Depth;
-                reader.Read();
-                while (reader.Depth > objDepth)
-                {
-                    if (reader.TokenType != JsonToken.PropertyName)
-                    {
-                        var jtr = (JsonTextReader)reader;
-                        throw new JsonSerializationException($"Expected {nameof(JsonToken.PropertyName)} for a {nameof(CompositeKey)}; found {reader.TokenType}.", jtr.Path, jtr.LineNumber, jtr.LinePosition, null);
-                    }
-
-                    var name = reader.Value;
-
-                    switch (name)
-                    {
-                        case "string": args.Add(reader.ReadAsString()); break;
-                        case "char": args.Add(reader.ReadAsString()?.ToCharArray().FirstOrDefault()); break;
-                        case "short": args.Add((short?)reader.ReadAsInt32()); break;
-                        case "int": args.Add(reader.ReadAsInt32()); break;
-                        case "long": args.Add((long?)reader.ReadAsDecimal()); break;
-                        case "guid": args.Add(reader.ReadAsString() is string s && Guid.TryParse(s, out var g) ? g : null); break;
-                        case "datetime": args.Add(reader.ReadAsDateTime()); break;
-                        case "datetimeoffset": args.Add(reader.ReadAsDateTimeOffset()); break;
-                        case "ushort": args.Add((ushort?)reader.ReadAsInt32()); break;
-                        case "uint": args.Add((uint?)reader.ReadAsDecimal()); break;
-                        case "ulong": args.Add((ulong?)reader.ReadAsDecimal()); break;
-                        default:
-                            var jtr = (JsonTextReader)reader;
-                            throw new JsonSerializationException($"Unsupported {nameof(CompositeKey)} type '{name}'.", jtr.Path, jtr.LineNumber, jtr.LinePosition, null);
-                    }
-
-                    reader.Read();
-                    if (reader.TokenType != JsonToken.EndObject)
-                    {
-                        var jtr = (JsonTextReader)reader;
-                        throw new JsonSerializationException($"Expected {nameof(JsonToken.EndObject)} for a {nameof(CompositeKey)} argument; found {reader.TokenType}.", jtr.Path, jtr.LineNumber, jtr.LinePosition, null);
-                    }
-                }
-
-                reader.Read();
-            }
-
-            return new CompositeKey([.. args]);
-        }
-
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object? value, global::Newtonsoft.Json.JsonSerializer serializer)
-        {
-            if (value is not CompositeKey key || key.Args.Length == 0)
-            {
-                writer.WriteNull();
-                return;
-            }
-
-            writer.WriteStartArray();
-
-            foreach (var arg in key.Args)
-            {
-                if (arg is null)
-                {
-                    writer.WriteNull();
-                    continue;
-                }
-
-                writer.WriteStartObject();
-
-                _ = arg switch
-                {
-                    string str => JsonWrite(writer, "string", () => writer.WriteValue(str)),
-                    char c => JsonWrite(writer, "char", () => writer.WriteValue(c.ToString())),
-                    short s => JsonWrite(writer, "short", () => writer.WriteValue(s)),
-                    int i => JsonWrite(writer, "int", () => writer.WriteValue(i)),
-                    long l => JsonWrite(writer, "long", () => writer.WriteValue(l)),
-                    Guid g => JsonWrite(writer, "guid", () => writer.WriteValue(g)),
-                    DateTime d => JsonWrite(writer, "datetime", () => writer.WriteValue(d)),
-                    DateTimeOffset o => JsonWrite(writer, "datetimeoffset", () => writer.WriteValue(o)),
-                    ushort us => JsonWrite(writer, "ushort", () => writer.WriteValue(us)),
-                    uint ui => JsonWrite(writer, "uint", () => writer.WriteValue(ui)),
-                    ulong ul => JsonWrite(writer, "ulong", () => writer.WriteValue(ul)),
-                    _ => throw new JsonException($"Unsupported {nameof(CompositeKey)} type '{arg.GetType().Name}'.")
-                };
-
-                writer.WriteEndObject();
-            }
-
-            writer.WriteEndArray();
-        }
-
-        /// <summary>
-        /// Provides a simple means to write a JSON property name and value.
-        /// </summary>
-        private static bool JsonWrite(JsonWriter writer, string name, Action action)
-        {
-            writer.WritePropertyName(name);
-            action();
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/ContractResolver.cs b/src/CoreEx.Newtonsoft/Json/ContractResolver.cs
deleted file mode 100644
index 202dd1ca..00000000
--- a/src/CoreEx.Newtonsoft/Json/ContractResolver.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Entities.Extended;
-using CoreEx.Events;
-using CoreEx.RefData;
-using CoreEx.RefData.Extended;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Reflection;
-using Stj = System.Text.Json.Serialization;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Extends the <see cref="CamelCasePropertyNamesContractResolver"/> to enable runtime configurable of JSON serialization property rename and ignore.
-    /// </summary>
-    public class ContractResolver : CamelCasePropertyNamesContractResolver
-    {
-        private readonly static ContractResolver _default = new();
-
-        private HashSet<Type>? _typeDict;
-        private ConcurrentDictionary<Type, Dictionary<string, string>>? _renameDict;
-        private ConcurrentDictionary<Type, HashSet<string>>? _ignoreDict;
-
-        /// <summary>
-        /// Static constructor.
-        /// </summary>
-        static ContractResolver()
-        {
-            _default.AddType<EntityCore>()
-                    .AddType<EntityBase>()
-                    .AddType(typeof(ReferenceDataBaseEx<,>))
-                    .AddType(typeof(ReferenceDataBase<>))
-                    .AddType<MessageItem>()
-                    .AddType<PagingArgs>()
-                    .AddType<PagingResult>()
-                    .AddType<EventDataBase>();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContractResolver"/>.
-        /// </summary>
-        public ContractResolver() => NamingStrategy = SubstituteNamingStrategy.Substitute;
-
-        /// <summary>
-        /// Gets the default <see cref="ContractResolver"/>.
-        /// </summary>
-        /// <remarks>Automatically adds the serialization property renames and ignores for <see cref="EventDataBase"/>, <see cref="EventData"/>, <see cref="EventData{T}"/>, <see cref="ChangeLog"/> and <see cref="ReferenceDataBase{T}"/> types.</remarks>
-        public static ContractResolver Default => _default;
-
-        /// <summary>
-        /// Adds the <typeparamref name="T"/> <see cref="Type"/> by reflecting all <c>System.Text.Json.Serialization</c> property attributes to infer rename (<see cref="Stj.JsonPropertyNameAttribute"/>) or ignore (<see cref="Stj.JsonIgnoreAttribute"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
-        /// <returns>The <see cref="ContractResolver"/> instance to support fluent-style method-chaining.</returns>
-        public ContractResolver AddType<T>() => AddType(typeof(T));
-
-        /// <summary>
-        /// Adds the <paramref name="type"/> by reflecting all <c>System.Text.Json.Serialization</c> property attributes to infer rename (<see cref="Stj.JsonPropertyNameAttribute"/>) or ignore (<see cref="Stj.JsonIgnoreAttribute"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/>.</param>
-        /// <returns>The <see cref="ContractResolver"/> instance to support fluent-style method-chaining.</returns>
-        public ContractResolver AddType(Type type)
-        {
-            (_typeDict ??= []).Add(type);
-            return this;
-        }
-
-        /// <summary>
-        /// Renames one or more properties for a <see cref="Type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/>.</param>
-        /// <param name="pairs">One or more property and JSON name pairs.</param>
-        /// <returns>The <see cref="ContractResolver"/> instance to support fluent-style method-chaining.</returns>
-        public ContractResolver AddRename(Type type, IDictionary<string, string> pairs)
-        {
-            type.ThrowIfNull(nameof(type));
-
-            if (pairs != null)
-            {
-                foreach (var pair in pairs)
-                {
-                    AddRename(type, pair.Key, pair.Value);
-                }
-            }
-
-            return this;
-        }
-
-        /// <summary>
-        /// Renames the <paramref name="type"/> property to the <paramref name="jsonName"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/>.</param>
-        /// <param name="propertyName">The property name.</param>
-        /// <param name="jsonName">The JSON name.</param>
-        /// <returns>The <see cref="ContractResolver"/> instance to support fluent-style method-chaining.</returns>
-        public ContractResolver AddRename(Type type, string propertyName, string jsonName)
-        {
-            type.ThrowIfNull(nameof(type));
-            propertyName.ThrowIfNullOrEmpty(nameof(propertyName));
-            jsonName.ThrowIfNullOrEmpty(nameof(jsonName));
-
-            if (propertyName == jsonName)
-                return this;
-
-            (_renameDict ??= new ConcurrentDictionary<Type, Dictionary<string, string>>()).AddOrUpdate(type, t => new Dictionary<string, string> { { propertyName, jsonName } }, (t, d) => { d.TryAdd(propertyName, jsonName); return d; });
-
-            return this;
-        }
-
-        /// <summary>
-        /// Ignores one or more properties for a <see cref="Type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/>.</param>
-        /// <param name="propertyNames">One or more property names.</param>
-        /// <returns>The <see cref="ContractResolver"/> instance to support fluent-style method-chaining.</returns>
-        public ContractResolver AddIgnore(Type type, params string[] propertyNames)
-        {
-            type.ThrowIfNull(nameof(type));
-
-            if (propertyNames == null || propertyNames.Length == 0)
-                return this;
-
-            (_ignoreDict ??= new ConcurrentDictionary<Type, HashSet<string>>()).AddOrUpdate(type, t => new HashSet<string>(propertyNames), (t, hs) => { hs.UnionWith(propertyNames); return hs; });
-            return this;
-        }
-
-        /// <inheritdoc/>
-        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
-        {
-            var property = base.CreateProperty(member, memberSerialization);
-            var type = property.DeclaringType!.IsGenericType ? property.DeclaringType!.GetGenericTypeDefinition() : property.DeclaringType!;
-
-            if (_ignoreDict != null && _ignoreDict.TryGetValue(type, out var hs))
-            {
-                if (hs.Contains(property.PropertyName!))
-                {
-                    property.ShouldSerialize = x => false;
-                    property.Ignored = true;
-                    return property;
-                }
-            }
-
-            if (_renameDict != null && _renameDict.TryGetValue(type, out var d) && d.TryGetValue(property.PropertyName!, out var jn))
-            {
-                property.PropertyName = jn;
-                return property;
-            }
-            
-            if (_typeDict != null && _typeDict.TryGetValue(type, out _))
-            {
-                var jpna = member.GetCustomAttribute<Stj.JsonPropertyNameAttribute>(true);
-                if (jpna != null)
-                {
-                    property.PropertyName = jpna.Name;
-                    property.Order = member.GetCustomAttribute<Stj.JsonPropertyOrderAttribute>(true)?.Order;
-                    return property;
-                }
-
-                var jpia = member.GetCustomAttribute<Stj.JsonIgnoreAttribute>(true);
-                if (jpia != null)
-                {
-                    property.ShouldSerialize = x => false;
-                    property.Ignored = true;
-                }
-            }
-
-            return property;
-        }
-
-        /// <summary>
-        /// Gets (creates) the <see cref="JsonProperty"/> from the <paramref name="memberInfo"/>.
-        /// </summary>
-        /// <param name="memberInfo">The <see cref="MemberInfo"/>.</param>
-        /// <param name="memberSerialization">The <see cref="MemberSerialization"/> option.</param>
-        /// <returns>The <see cref="JsonProperty"/>.</returns>
-        public JsonProperty GetProperty(MemberInfo memberInfo, MemberSerialization memberSerialization) => CreateProperty(memberInfo, memberSerialization);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/EventDataSerializer.cs b/src/CoreEx.Newtonsoft/Json/EventDataSerializer.cs
deleted file mode 100644
index 10d1872d..00000000
--- a/src/CoreEx.Newtonsoft/Json/EventDataSerializer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Json;
-using System;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides the <see cref="JsonSerializer"/>-based <see cref="IEventSerializer"/>.
-    /// </summary>
-    public class EventDataSerializer : EventDataSerializerBase
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventDataSerializer"/> class.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="eventDataFormatter">The <see cref="Events.EventDataFormatter"/>.</param>
-        public EventDataSerializer(IJsonSerializer? jsonSerializer = null, EventDataFormatter? eventDataFormatter = null) : base(jsonSerializer ?? new JsonSerializer(), eventDataFormatter)
-        {
-            if (JsonSerializer is not CoreEx.Newtonsoft.Json.JsonSerializer)
-                throw new ArgumentException($"The {nameof(IJsonSerializer)} instance must be of Type '{typeof(CoreEx.Newtonsoft.Json.JsonSerializer).FullName}'.", nameof(jsonSerializer));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/JsonFilterer.cs b/src/CoreEx.Newtonsoft/Json/JsonFilterer.cs
deleted file mode 100644
index ba127621..00000000
--- a/src/CoreEx.Newtonsoft/Json/JsonFilterer.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides a means to apply a filter to include or exclude JSON properties (in effect removing the unwanted properties).
-    /// </summary>
-    public static class JsonFilterer
-    {
-        /// <summary>
-        /// Trys to apply the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
-        /// <param name="json">The corresponding JSON <paramref name="value"/> <see cref="string"/> with the filtering applied.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="settings">The optional <see cref="JsonSerializerSettings"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <param name="preFilterInspector">The <see cref="IJsonPreFilterInspector"/> action.</param>
-        /// <returns><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</returns>
-        public static bool TryApply<T>(T value, IEnumerable<string>? paths, out string json, JsonPropertyFilter filter = JsonPropertyFilter.Include, JsonSerializerSettings? settings = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-        {
-            var r = TryApply(value, paths, out JToken node, filter, settings, comparison, preFilterInspector);
-            json = node.ToString(Formatting.None);
-            return r;
-        }
-
-        /// <summary>
-        /// Trys to apply the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
-        /// <param name="json">The corresponding <paramref name="value"/> <see cref="JToken"/> with the filtering applied.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="settings">The optional <see cref="JsonSerializerSettings"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <param name="preFilterInspector">The <see cref="IJsonPreFilterInspector"/> action.</param>
-        /// <returns><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</returns>
-        public static bool TryApply<T>(T value, IEnumerable<string>? paths, out JToken json, JsonPropertyFilter filter = JsonPropertyFilter.Include, JsonSerializerSettings? settings = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-        {
-            value.ThrowIfNull(nameof(value));
-            json = JToken.FromObject(value, Nsj.JsonSerializer.Create(settings));
-            preFilterInspector?.Invoke(new JsonPreFilterInspector(json));
-            return Apply(json, paths, filter, comparison);
-        }
-
-        /// <summary>
-        /// Applies the inclusion and exclusion of the JSON paths to a specified <see cref="JToken"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JToken"/> value.</param>
-        /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <remarks><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</remarks>
-        public static bool Apply(JToken json, IEnumerable<string>? paths, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
-        {
-            var maxDepth = 0;
-            var dict = Text.Json.JsonFilterer.CreateDictionary(paths, filter, comparison, ref maxDepth, true);
-
-            var filtered = false;
-            if (maxDepth > 0)
-                JsonFilter(json, dict, filter, 0, maxDepth, ref filtered, comparison);
-
-            return filtered;
-        }
-
-        /// <summary>
-        /// Filter the JSON nodes based on the includes/excludes.
-        /// </summary>
-        private static bool JsonFilter(JToken json, Dictionary<string, bool> paths, JsonPropertyFilter filter, int depth, int maxDepth, ref bool filtered, StringComparison comparison)
-        {
-            // Do not check beyond maximum depth as there is no further filtering required.
-            if (depth > maxDepth)
-                return false;
-
-            // Iterate through the properties within the object and filter accordingly.
-            if (json is JObject jo)
-            {
-                foreach (var jn in jo.Properties().ToArray())
-                {
-                    string path = Text.Json.JsonFilterer.PrependRootPath(jn.Path);
-                    bool found = paths.TryGetValue(path, out var isSpecifiedPath);
-                    if (!found && Text.Json.JsonFilterer.TryRemovePathIndexes(path, out var pathWithoutIndexes))
-                        found = paths.TryGetValue(pathWithoutIndexes, out isSpecifiedPath);
-
-                    if ((filter == JsonPropertyFilter.Include && !found) || (filter == JsonPropertyFilter.Exclude && found))
-                    {
-                        jo.Remove(jn.Name);
-                        filtered = true;
-                        continue;
-                    }
-
-                    if (filter == JsonPropertyFilter.Include && found && isSpecifiedPath)
-                        continue;
-
-                    // Where there is a child value then continue navigation.
-                    if (jn.Value != null)
-                        JsonFilter(jn.Value, paths, filter, depth + 1, maxDepth, ref filtered, comparison);
-                }
-            }
-            else if (json is JArray ja)
-            {
-                // Iterate and filter each item in the array.
-                for (var i = ja.Count - 1; i >= 0; i--)
-                {
-                    var jn = ja[i];
-                    if (jn != null)
-                    {
-                        if (JsonFilter(jn, paths, filter, depth, maxDepth, ref filtered, comparison))
-                        {
-                            ja.RemoveAt(i);
-                            filtered = true;
-                        }
-                    }
-                }
-            }
-            else if (json is JValue)
-            {
-                var path = Text.Json.JsonFilterer.PrependRootPath(json.Path);
-                if (!paths.TryGetValue(path, out var isSpecifiedPath) && Text.Json.JsonFilterer.TryRemovePathIndexes(path, out var pathWithoutIndexes))
-                    paths.TryGetValue(pathWithoutIndexes, out isSpecifiedPath);
-
-                return filter == JsonPropertyFilter.Include ? !isSpecifiedPath : isSpecifiedPath;
-            }
-
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/JsonPreFilterInspector.cs b/src/CoreEx.Newtonsoft/Json/JsonPreFilterInspector.cs
deleted file mode 100644
index 9e6838b8..00000000
--- a/src/CoreEx.Newtonsoft/Json/JsonPreFilterInspector.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using Newtonsoft.Json.Linq;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides pre (prior) to filtering JSON inspection.
-    /// </summary>
-    /// <param name="json">The <see cref="JToken"/>.</param>
-    public readonly struct JsonPreFilterInspector(JToken json) : IJsonPreFilterInspector
-    {
-        /// <inheritdoc/>
-        object IJsonPreFilterInspector.Json => Json;
-
-        /// <summary>
-        /// Gets the <see cref="JToken"/> before any filtering has been applied.
-        /// </summary>
-        public JToken Json { get; } = json;
-
-        /// <inheritdoc/>
-        public string? ToJsonString() => Json.ToString(Nsj.Formatting.None);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/JsonSerializer.cs b/src/CoreEx.Newtonsoft/Json/JsonSerializer.cs
deleted file mode 100644
index 89649761..00000000
--- a/src/CoreEx.Newtonsoft/Json/JsonSerializer.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Reflection;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides the <see cref="Nsj.JsonSerializer"/> encapsulated implementation.
-    /// </summary>
-    /// <param name="settings">The <see cref="JsonSerializerSettings"/>. Defaults to <see cref="DefaultSettings"/>.</param>
-    public class JsonSerializer(JsonSerializerSettings? settings = null) : IJsonSerializer
-    {
-        /// <summary>
-        /// Gets or sets the default <see cref="JsonSerializerSettings"/>.
-        /// </summary>
-        /// <remarks>The following <see cref="JsonSerializerSettings"/> will default:
-        /// <list type="bullet">
-        ///  <item><description><see cref="JsonSerializerSettings.DefaultValueHandling"/> = <see cref="DefaultValueHandling.Ignore"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.NullValueHandling"/> = <see cref="NullValueHandling.Ignore"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.Formatting"/> = <see cref="Formatting.None"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.ContractResolver"/> = <see cref="ContractResolver.Default"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.Converters"/> = <see cref="Nsj.Converters.StringEnumConverter"/>, <see cref="ReferenceDataJsonConverter"/>, <see cref="CollectionResultJsonConverter"/>
-        ///  and <see cref="CompositeKeyJsonConverter"/>.</description></item>
-        /// </list>
-        /// </remarks>
-        public static JsonSerializerSettings DefaultSettings { get; set; } = new JsonSerializerSettings
-        {
-            DefaultValueHandling = DefaultValueHandling.Ignore,
-            NullValueHandling = NullValueHandling.Ignore,
-            Formatting = Formatting.None,
-            ContractResolver = ContractResolver.Default,
-            Converters = { new Nsj.Converters.StringEnumConverter(), new ReferenceDataJsonConverter(), new CollectionResultJsonConverter(), new CompositeKeyJsonConverter() }
-        };
-
-        /// <summary>
-        /// Gets the underlying serializer configuration settings/options.
-        /// </summary>
-        object IJsonSerializer.Options => Settings;
-
-        /// <summary>
-        /// Gets the <see cref="JsonSerializerSettings"/>.
-        /// </summary>
-        public JsonSerializerSettings Settings { get; } = settings ?? DefaultSettings;
-
-        /// <inheritdoc/>
-        public string Serialize<T>(T value, JsonWriteFormat? format = null) => SerializeToBinaryData(value, format).ToString();
-
-        /// <inheritdoc/>
-        public BinaryData SerializeToBinaryData<T>(T value, JsonWriteFormat? format = null)
-        {
-            var ms = new MemoryStream();
-            using var sw = new StreamWriter(ms);
-            using var jtw = new Nsj.JsonTextWriter(sw);
-            Nsj.JsonSerializer.Create(format == null ? Settings : CopySettings(format!.Value)).Serialize(jtw, value);
-            jtw.Flush();
-            ms.Position = 0;
-            return BinaryData.FromStream(ms);
-        }
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public object? Deserialize([StringSyntax(StringSyntaxAttribute.Json)] string json) 
-#else
-        public object? Deserialize(string json)
-#endif
-            => Deserialize(BinaryData.FromString(json));
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public object? Deserialize([StringSyntax(StringSyntaxAttribute.Json)] string json, Type type) 
-#else
-        public object? Deserialize(string json, Type type)
-#endif
-            => Deserialize(BinaryData.FromString(json), type);
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public T? Deserialize<T>([StringSyntax(StringSyntaxAttribute.Json)] string json) 
-#else
-        public T? Deserialize<T>(string json)
-#endif
-            => Deserialize<T>(BinaryData.FromString(json))!;
-
-        /// <inheritdoc/>
-        public object? Deserialize(BinaryData json) => Deserialize<dynamic>(json);
-
-        /// <inheritdoc/>
-        public T? Deserialize<T>(BinaryData json) => (T?)Deserialize(json, typeof(T));
-
-        /// <inheritdoc/>
-        public object? Deserialize(BinaryData json, Type type)
-        {
-            using var s = json.ToStream();
-            using var sr = new StreamReader(s);
-            using var jtr = new Nsj.JsonTextReader(sr);
-            return Nsj.JsonSerializer.Create(Settings).Deserialize(jtr, type);
-        }
-
-        /// <inheritdoc/>
-        public bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out string json, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-            => JsonFilterer.TryApply(value, names, out json, filter, Settings, comparison, preFilterInspector);
-
-        /// <inheritdoc/>
-        public bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out object json, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-        {
-            var r = JsonFilterer.TryApply(value, names, out JToken node, filter, Settings, comparison, preFilterInspector);
-            json = node;
-            return r;
-        }
-
-        /// <inheritdoc/>
-        bool IJsonSerializer.TryGetJsonName(MemberInfo memberInfo, [NotNullWhen(true)] out string? jsonName)
-        {
-            var sji = memberInfo.ThrowIfNull(nameof(memberInfo)).GetCustomAttribute<System.Text.Json.Serialization.JsonIgnoreAttribute>(true);
-            if (sji != null)
-            {
-                jsonName = null;
-                return false;
-            }
-
-            var ji = memberInfo.GetCustomAttribute<JsonIgnoreAttribute>(true);
-            if (ji != null)
-            {
-                jsonName = null;
-                return false;
-            }
-
-            var jpn = memberInfo.GetCustomAttribute<JsonPropertyAttribute>(true);
-            if (jpn?.PropertyName != null)
-            {
-                jsonName = jpn.PropertyName;
-                return true;
-            }
-
-            if (Settings.ContractResolver is ContractResolver cr)
-            {
-                var jo = memberInfo.DeclaringType?.GetCustomAttribute<JsonObjectAttribute>(true);
-                var jp = cr.GetProperty(memberInfo, jo == null ? MemberSerialization.OptOut : jo.MemberSerialization);
-                if (jp != null)
-                {
-                    jsonName = jp.Ignored ? null : jp.PropertyName;
-                    return !jp.Ignored;
-                }
-            }
-
-            if (Settings.ContractResolver is CamelCasePropertyNamesContractResolver ccr && ccr.NamingStrategy != null)
-                jsonName = ccr.NamingStrategy.GetPropertyName(memberInfo.Name, false);
-            else
-                jsonName = memberInfo.Name;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Copies the settings.
-        /// </summary>
-        private JsonSerializerSettings CopySettings(JsonWriteFormat format)
-        {
-            var s = new JsonSerializerSettings
-            {
-                ReferenceLoopHandling = Settings.ReferenceLoopHandling,
-                MissingMemberHandling = Settings.MissingMemberHandling,
-                ObjectCreationHandling = Settings.ObjectCreationHandling,
-                NullValueHandling = Settings.NullValueHandling,
-                DefaultValueHandling = Settings.DefaultValueHandling,
-                PreserveReferencesHandling = Settings.PreserveReferencesHandling,
-                TypeNameHandling = Settings.TypeNameHandling,
-                MetadataPropertyHandling = Settings.MetadataPropertyHandling,
-                TypeNameAssemblyFormatHandling = Settings.TypeNameAssemblyFormatHandling,
-                ConstructorHandling = Settings.ConstructorHandling,
-                ContractResolver = Settings.ContractResolver,
-                EqualityComparer = Settings.EqualityComparer,
-                ReferenceResolverProvider = Settings.ReferenceResolverProvider,
-                TraceWriter = Settings.TraceWriter,
-                SerializationBinder = Settings.SerializationBinder,
-                Error = Settings.Error,
-                Context = Settings.Context,
-                DateFormatString = Settings.DateFormatString,
-                MaxDepth = Settings.MaxDepth,
-                Formatting = format == JsonWriteFormat.None ? Formatting.None : Formatting.Indented,
-                DateFormatHandling = Settings.DateFormatHandling,
-                DateTimeZoneHandling = Settings.DateTimeZoneHandling,
-                DateParseHandling = Settings.DateParseHandling,
-                FloatFormatHandling = Settings.FloatFormatHandling,
-                FloatParseHandling = Settings.FloatParseHandling,
-                StringEscapeHandling = Settings.StringEscapeHandling,
-                Culture = Settings.Culture,
-                CheckAdditionalContent = Settings.CheckAdditionalContent,
-            };
-
-            if (Settings.Converters != null)
-                s.Converters = new List<JsonConverter>(Settings.Converters);
-
-            return s;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/NewtonsoftServiceCollectionExtensions.cs b/src/CoreEx.Newtonsoft/Json/NewtonsoftServiceCollectionExtensions.cs
deleted file mode 100644
index 01dbcf6e..00000000
--- a/src/CoreEx.Newtonsoft/Json/NewtonsoftServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Events;
-using CoreEx.Json;
-using System;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extensions.
-    /// </summary>
-    public static class NewtonsoftServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Checks that the <see cref="IServiceCollection"/> is not null.
-        /// </summary>
-        private static IServiceCollection CheckServices(IServiceCollection services) => services.ThrowIfNull(nameof(services));
-
-        /// <summary>
-        /// Adds the <see cref="CoreEx.Newtonsoft.Json.JsonSerializer"/> as the <see cref="IJsonSerializer"/> and <see cref="CoreEx.Newtonsoft.Json.ReferenceDataContentJsonSerializer"/> as the <see cref="IReferenceDataContentJsonSerializer"/> singleton services.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddNewtonsoftJsonSerializer(this IServiceCollection services) 
-            => CheckServices(services).AddSingleton<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                                      .AddSingleton<IReferenceDataContentJsonSerializer, CoreEx.Newtonsoft.Json.ReferenceDataContentJsonSerializer>();
-
-        /// <summary>
-        /// Adds the <see cref="CoreEx.Newtonsoft.Json.CloudEventSerializer"/> as the <see cref="IEventSerializer"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddNewtonsoftCloudEventSerializer(this IServiceCollection services) => CheckServices(services).AddSingleton<IEventSerializer, CoreEx.Newtonsoft.Json.CloudEventSerializer>();
-
-        /// <summary>
-        /// Adds the <see cref="CoreEx.Newtonsoft.Json.EventDataSerializer"/> as the <see cref="IEventSerializer"/> singleton service.
-        /// </summary>
-        /// <param name="configure">The action to enable the <see cref="CoreEx.Newtonsoft.Json.EventDataSerializer"/> to be further configured.</param>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddNewtonsoftEventDataSerializer(this IServiceCollection services, Action<CoreEx.Newtonsoft.Json.EventDataSerializer>? configure = null) => CheckServices(services).AddSingleton<IEventSerializer>(sp =>
-        {
-            var eds = new CoreEx.Newtonsoft.Json.EventDataSerializer(sp.GetService<IJsonSerializer>(), sp.GetService<EventDataFormatter>());
-            configure?.Invoke(eds);
-            return eds;
-        });
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/ReferenceDataContentJsonSerializer.cs b/src/CoreEx.Newtonsoft/Json/ReferenceDataContentJsonSerializer.cs
deleted file mode 100644
index 876e300e..00000000
--- a/src/CoreEx.Newtonsoft/Json/ReferenceDataContentJsonSerializer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.RefData;
-using Newtonsoft.Json;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides the JSON Serialize and Deserialize implementation to allow <see cref="IReferenceData"/> types to serialize contents.
-    /// </summary>
-    /// <remarks>Generally, <see cref="IReferenceData"/> types will serialize the <see cref="IReferenceData.Code"/> as the value; this allows for full <see cref="IReferenceData"/> contents to be serialized.</remarks>
-    /// <param name="settings">The <see cref="JsonSerializerSettings"/>. Defaults to <see cref="DefaultSettings"/>.</param>
-    public class ReferenceDataContentJsonSerializer(JsonSerializerSettings? settings = null) : JsonSerializer(settings ?? DefaultSettings), IReferenceDataContentJsonSerializer
-    {
-        /// <summary>
-        /// Gets or sets the default <see cref="JsonSerializerSettings"/> without <see cref="ReferenceDataJsonConverter"/> to allow <see cref="IReferenceData"/> types to serialize contents.
-        /// </summary>
-        /// <remarks>The following <see cref="JsonSerializerSettings"/> will default:
-        /// <list type="bullet">
-        ///  <item><description><see cref="JsonSerializerSettings.DefaultValueHandling"/> = <see cref="DefaultValueHandling.Ignore"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.NullValueHandling"/> = <see cref="NullValueHandling.Ignore"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.Formatting"/> = <see cref="Formatting.None"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.ContractResolver"/> = <see cref="ContractResolver.Default"/>.</description></item>
-        ///  <item><description><see cref="JsonSerializerSettings.Converters"/> = <see cref="Nsj.Converters.StringEnumConverter"/> and <see cref="CollectionResultJsonConverter"/>.</description></item>
-        /// </list>
-        /// </remarks>
-        public static new JsonSerializerSettings DefaultSettings { get; set; } = new JsonSerializerSettings
-        {
-            DefaultValueHandling = DefaultValueHandling.Ignore,
-            NullValueHandling = NullValueHandling.Ignore,
-            Formatting = Formatting.None,
-            ContractResolver = ContractResolver.Default,
-            Converters = { new Nsj.Converters.StringEnumConverter(), new CollectionResultJsonConverter() }
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/ReferenceDataJsonConverter.cs b/src/CoreEx.Newtonsoft/Json/ReferenceDataJsonConverter.cs
deleted file mode 100644
index 3ae8e6e8..00000000
--- a/src/CoreEx.Newtonsoft/Json/ReferenceDataJsonConverter.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using Newtonsoft.Json;
-using System;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="IReferenceData"/> values.
-    /// </summary>
-    public class ReferenceDataJsonConverter : JsonConverter
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type objectType) => typeof(IReferenceData).IsAssignableFrom(objectType);
-
-        /// <inheritdoc/>
-        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, global::Newtonsoft.Json.JsonSerializer serializer)
-        {
-            if (reader.TokenType == JsonToken.Null)
-                return default;
-
-            if (reader.TokenType != JsonToken.String)
-            {
-                var jtr = (JsonTextReader)reader;
-                throw new JsonSerializationException("Reference data value must be a string.", jtr.Path, jtr.LineNumber, jtr.LinePosition, null);
-            }
-
-            if (reader.Value is not string code)
-                return default;
-
-            if (ExecutionContext.HasCurrent)
-            {
-                var coll = ReferenceDataOrchestrator.Current.GetByType(objectType);
-                if (coll != null && coll.TryGetByCode(code, out var rd))
-                    return rd;
-            }
-
-            var rdx = (IReferenceData)Activator.CreateInstance(objectType)!;
-            rdx.Code = code;
-            rdx.SetInvalid();
-            return rdx;
-        }
-
-        /// <inheritdoc/>
-        public override void WriteJson(JsonWriter writer, object? value, global::Newtonsoft.Json.JsonSerializer serializer)
-        {
-            if (value is not IReferenceData rd || rd.Code == null)
-                return;
-
-            writer.WriteValue(rd.Code);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/Json/SubstituteNamingStrategy.cs b/src/CoreEx.Newtonsoft/Json/SubstituteNamingStrategy.cs
deleted file mode 100644
index 698b63a1..00000000
--- a/src/CoreEx.Newtonsoft/Json/SubstituteNamingStrategy.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Newtonsoft.Json.Serialization;
-
-namespace CoreEx.Newtonsoft.Json
-{
-    /// <summary>
-    /// Provides a substitution and camel case naming strategy.
-    /// </summary>
-    /// <remarks>Converts the name by checking <see cref="CoreEx.Json.JsonSerializer.NameSubstitutions"/>, then uses <see cref="CamelCaseNamingStrategy"/>.</remarks>
-    public class SubstituteNamingStrategy : CamelCaseNamingStrategy
-    {
-        /// <summary>
-        /// Gets the <see cref="SubstituteNamingStrategy"/> instance.
-        /// </summary>
-        public static SubstituteNamingStrategy Substitute { get; } = new SubstituteNamingStrategy();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SubstituteNamingStrategy"/> class.
-        /// </summary>
-        public SubstituteNamingStrategy()
-        {
-            ProcessDictionaryKeys = true;
-            OverrideSpecifiedNames = false;
-        }
-
-        /// <inheritdoc/>
-        public override string GetPropertyName(string name, bool hasSpecifiedName) 
-            => (!hasSpecifiedName && CoreEx.Json.JsonSerializer.NameSubstitutions.TryGetValue(name, out var jsonName)) ? jsonName : base.GetPropertyName(name, hasSpecifiedName);
-
-        /// <inheritdoc/>
-        public override string GetDictionaryKey(string key) => CoreEx.Json.JsonSerializer.NameSubstitutions.TryGetValue(key, out var jsonName) ? jsonName : base.GetDictionaryKey(key);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Newtonsoft/strong-name-key.snk b/src/CoreEx.Newtonsoft/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Newtonsoft/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.OData/CoreEx.OData.csproj b/src/CoreEx.OData/CoreEx.OData.csproj
deleted file mode 100644
index 88295fb8..00000000
--- a/src/CoreEx.OData/CoreEx.OData.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.OData</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET OData extras.</Title>
-    <Description>CoreEx .NET OData extras.</Description>
-    <PackageTags>coreex odata</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup>
-    <PackageReference Include="Simple.OData.V4.Client" Version="6.0.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/CoreEx.OData/IBoundClientExtensions.cs b/src/CoreEx.OData/IBoundClientExtensions.cs
deleted file mode 100644
index 76d751b1..00000000
--- a/src/CoreEx.OData/IBoundClientExtensions.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Wildcards;
-using Simple.OData.Client;
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Adds additional extension methods to the <see cref="IBoundClient{T}"/>.
-    /// </summary>
-    public static class IBoundClientExtensions
-    {
-        /// <summary>
-        /// Filters a sequence of values based on a <paramref name="predicate"/> only <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="when">Indicates to perform an underlying <see cref="IFluentClient{TElement, FT}.Filter(Expression{Func{TElement, bool}})"/> only when <c>true</c>;
-        /// otherwise, no <b>Where</b> is invoked.</param>
-        /// <param name="predicate">A function to test each element for a condition.</param>
-        /// <returns>The resulting query.</returns>
-        public static IBoundClient<TElement> FilterWhen<TElement>(this IBoundClient<TElement> query, bool when, Expression<Func<TElement, bool>> predicate) where TElement : class
-        {
-            var q = query.ThrowIfNull(nameof(query));
-            if (when)
-                return q.Filter(predicate.ThrowIfNull(nameof(predicate)));
-            else
-                return q;
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a <paramref name="predicate"/> only when the <paramref name="with"/> is not the default value for the <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The with value <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="with">Indicates to perform an underlying <see cref="IFluentClient{TElement, FT}.Filter(Expression{Func{TElement, bool}})"/> only when the with is not the default
-        /// value; otherwise, no <b>Where</b> is invoked.</param>
-        /// <param name="predicate">A function to test each element for a condition.</param>
-        /// <returns>The resulting query.</returns>
-        public static IBoundClient<TElement> FilterWith<TElement, T>(this IBoundClient<TElement> query, T with, Expression<Func<TElement, bool>> predicate) where TElement : class
-        {
-            var q = query.ThrowIfNull(nameof(query));
-            if (Comparer<T>.Default.Compare(with, default!) != 0 && Comparer<T>.Default.Compare(with, default!) != 0)
-            {
-                if (with is not string && with is System.Collections.IEnumerable ie && !ie.GetEnumerator().MoveNext())
-                    return q;
-
-                return q.Filter(predicate.ThrowIfNull(nameof(predicate)));
-            }
-            else
-                return q;
-        }
-
-        /// <summary>
-        /// Filters a sequence of values using the specified <paramref name="property"/> and <paramref name="text"/> containing <see cref="Wildcard.MultiBasic"/> supported wildcards.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="property">The <see cref="MemberExpression"/>.</param>
-        /// <param name="text">The text to query.</param>
-        /// <param name="ignoreCase">Indicates whether the comparison should ignore case (default) or not; will use <see cref="string.ToUpper()"/> when selected for comparisons.</param>
-        /// <param name="checkForNull">Indicates whether a null check should also be performed before the comparion occurs (defaults to <c>true</c>).</param>
-        /// <returns>The resulting (updated) query.</returns>
-        public static IBoundClient<TElement> FilterWildcard<TElement>(this IBoundClient<TElement> query, Expression<Func<TElement, string?>> property, string? text, bool ignoreCase = true, bool checkForNull = true) where TElement : class
-        {
-            var q = query.ThrowIfNull(nameof(query));
-            var p = property.ThrowIfNull(nameof(property));
-
-            // Check the expression.
-            if (p.Body is not MemberExpression me)
-                throw new ArgumentException("Property expression must be of Type MemberExpression.", nameof(property));
-
-            Expression exp = me;
-            var wc = Wildcard.MultiBasic;
-            var wr = wc.Parse(text).ThrowOnError();
-
-            // Exit stage left where nothing to do.
-            if (wr.Selection.HasFlag(WildcardSelection.None) || wr.Selection.HasFlag(WildcardSelection.Single))
-                return query;
-
-            var s = wr.GetTextWithoutWildcards();
-            if (ignoreCase)
-            {
-                s = s?.ToUpper(System.Globalization.CultureInfo.InvariantCulture);
-                exp = Expression.Call(me, typeof(string).GetMethod(nameof(string.ToUpper), Type.EmptyTypes)!);
-            }
-
-            if (wr.Selection.HasFlag(WildcardSelection.Equal))
-                exp = Expression.Equal(exp, Expression.Constant(s));
-            else if (wr.Selection.HasFlag(WildcardSelection.EndsWith))
-                exp = Expression.Call(exp, "EndsWith", null, Expression.Constant(s));
-            else if (wr.Selection.HasFlag(WildcardSelection.StartsWith))
-                exp = Expression.Call(exp, "StartsWith", null, Expression.Constant(s));
-            else if (wr.Selection.HasFlag(WildcardSelection.Contains))
-                exp = Expression.Call(exp, "Contains", null, Expression.Constant(s));
-            else
-                throw new ArgumentException("Wildcard selection text is not supported.", nameof(text));
-
-            // Add check for not null.
-            if (checkForNull)
-            {
-                var ee = Expression.NotEqual(me, Expression.Constant(null));
-                exp = Expression.AndAlso(ee, exp);
-            }
-
-            var le = Expression.Lambda<Func<TElement, bool>>(exp, p.Parameters);
-            return q.Filter(le);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/IOData.cs b/src/CoreEx.OData/IOData.cs
deleted file mode 100644
index 1113fced..00000000
--- a/src/CoreEx.OData/IOData.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.OData.Mapping;
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Enables the <b>OData</b> functionality.
-    /// </summary>
-    public interface IOData
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="Soc.ODataClient"/>.
-        /// </summary>
-        Soc.ODataClient Client { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ODataInvoker"/>.
-        /// </summary>
-        ODataInvoker Invoker { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        IMapper Mapper { get; }
-
-        /// <summary>
-        /// Gets the default <see cref="ODataClient.Args"/> used where not expliticly specified for an operation.
-        /// </summary>
-        ODataArgs Args { get; }
-
-        /// <summary>
-        /// Creates an <see cref="ODataQuery{T, TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="queryArgs">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="ODataQuery{T, TModel}"/>.</returns>
-        ODataQuery<T, TModel> Query<T, TModel>(ODataArgs queryArgs, string? collectionName, Func<Soc.IBoundClient<TModel>, Soc.IBoundClient<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        Task<Result<T?>> GetWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="value">The value to create.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        Task<Result<T>> CreateWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        Task<Result<T>> UpdateWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new();
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        Task<Result> DeleteWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new();
-
-        /// <summary>
-        /// Invoked where a <see cref="Soc.WebRequestException"/> has been thrown.
-        /// </summary>
-        /// <param name="odex">The <b>OData</b> <see cref="Soc.WebRequestException"/>.</param>
-        /// <returns>The <see cref="Result"/> containing the appropriate <see cref="IResult.Error"/> where handled; otherwise, <c>null</c> indicating that the exception is unexpected and will continue to be thrown as such.</returns>
-        /// <remarks>Provides an opportunity to inspect and handle the exception before it is returned. A resulting <see cref="Result"/> that is <see cref="Result.IsSuccess"/> is not considered sensical; therefore, will result in the originating
-        /// exception being thrown.</remarks>
-        Result? HandleODataException(Soc.WebRequestException odex);
-
-        /// <summary>
-        /// Creates an untyped <see cref="ODataItemCollection{T}"/> for the specified <paramref name="collectionName"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-        /// <returns>The <see cref="ODataItemCollection{T}"/>.</returns>
-        ODataItemCollection<T> CreateItemCollection<T>(ODataArgs args, string collectionName, IODataMapper<T> mapper) where T : class, new();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/Mapping/IODataMapper.cs b/src/CoreEx.OData/Mapping/IODataMapper.cs
deleted file mode 100644
index e74cb6ad..00000000
--- a/src/CoreEx.OData/Mapping/IODataMapper.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.OData.Mapping
-{
-    /// <summary>
-    /// Defines an <see cref="ODataItem"/> mapper.
-    /// </summary>
-    public interface IODataMapper
-    {
-        /// <summary>
-        /// Gets the source <see cref="Type"/> being mapped from/to the <see cref="ODataItem"/>.
-        /// </summary>
-        Type SourceType { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> mappings.
-        /// </summary>
-        IEnumerable<IPropertyColumnMapper> Mappings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> from the <see cref="Mappings"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        IPropertyColumnMapper this[string propertyName] { get; }
-
-        /// <summary>
-        /// Attempts to get the <see cref="IPropertyColumnMapper"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <param name="propertyColumnMapper">The corresponding <see cref="IPropertyColumnMapper"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyColumnMapper? propertyColumnMapper);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper.ColumnName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper.ColumnName"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        string GetColumnName(string propertyName);
-
-        /// <summary>
-        /// Maps from an <paramref name="entity"/> creating a corresponding instance of the <see cref="SourceType"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="ODataItem"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of the <see cref="SourceType"/>.</returns>
-        object? MapFromOData(ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="ODataItem"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToOData(object? value, ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/Mapping/IODataMapperT.cs b/src/CoreEx.OData/Mapping/IODataMapperT.cs
deleted file mode 100644
index 99584ce6..00000000
--- a/src/CoreEx.OData/Mapping/IODataMapperT.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.OData.Mapping
-{
-    /// <summary>
-    /// Defines an <see cref="ODataItem"/> mapper.
-    /// </summary>
-    /// <typeparam name="TSource">The <see cref="IODataMapper.SourceType"/>.</typeparam>
-    public interface IODataMapper<TSource> : IODataMapper
-    {
-        /// <inheritdoc/>
-        Type IODataMapper.SourceType => typeof(TSource);
-
-        /// <inheritdoc/>
-        object? IODataMapper.MapFromOData(ODataItem entity, OperationTypes operationType) => MapFromOData(entity, operationType)!;
-
-        /// <inheritdoc/>
-        void IODataMapper.MapToOData(object? value, ODataItem entity, OperationTypes operationType) => MapToOData((TSource?)value, entity, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="entity"/> creating a corresponding instance of <typeparamref name="TSource"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="ODataItem"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of <typeparamref name="TSource"/>.</returns>
-        new TSource? MapFromOData(ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="ODataItem"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToOData(TSource? value, ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Gets the OData primary key from the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The primary key.</returns>
-        object[] GetODataKey(TSource value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/Mapping/IPropertyColumnMapper.cs b/src/CoreEx.OData/Mapping/IPropertyColumnMapper.cs
deleted file mode 100644
index cefefef3..00000000
--- a/src/CoreEx.OData/Mapping/IPropertyColumnMapper.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping.Converters;
-using CoreEx.Mapping;
-using System;
-
-namespace CoreEx.OData.Mapping
-{
-    /// <summary>
-    /// Enables bi-directional property and <see cref="ODataItem"/> column mapping.
-    /// </summary>
-    public interface IPropertyColumnMapper
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyExpression"/>.
-        /// </summary>
-        IPropertyExpression PropertyExpression { get; }
-
-        /// <summary>
-        /// Gets the source property name.
-        /// </summary>
-        string PropertyName { get; }
-
-        /// <summary>
-        /// Gets the source property <see cref="Type"/>.
-        /// </summary>
-        Type PropertyType { get; }
-
-        /// <summary>
-        /// Indicates whether the underlying source property is a complex type.
-        /// </summary>
-        bool IsSrcePropertyComplex { get; }
-
-        /// <summary>
-        /// Gets the destination <i>Dataverse</i> column name.
-        /// </summary>
-        string ColumnName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property (default to <see cref="OperationTypes.Any"/>).
-        /// </summary>
-        OperationTypes OperationTypes { get; }
-
-        /// <summary>
-        /// Indicates whether the property forms part of the primary key. 
-        /// </summary>
-        bool IsPrimaryKey { get; }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/>).
-        /// </summary>
-        void SetPrimaryKey();
-
-        /// <summary>
-        /// Gets the <see cref="IConverter"/> (used where a specific source and destination type conversion is required).
-        /// </summary>
-        IConverter? Converter { get; }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        void SetConverter(IConverter converter);
-
-        /// <summary>
-        /// Gets the <see cref="IMapper"/> to map complex types.
-        /// </summary>
-        IODataMapper? Mapper { get; }
-
-        /// <summary>
-        /// Set the <see cref="IODataMapper"/> to map complex types.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IODataMapper"/>.</param>
-        /// <remarks>The <see cref="Mapper"/> and <see cref="Converter"/> are mutually exclusive.</remarks>
-        void SetMapper(IODataMapper mapper);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="ODataItem"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToOData(object value, ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="entity"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="ODataItem"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapFromOData(ODataItem entity, object value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/Mapping/ODataMapperT.cs b/src/CoreEx.OData/Mapping/ODataMapperT.cs
deleted file mode 100644
index 7338f29c..00000000
--- a/src/CoreEx.OData/Mapping/ODataMapperT.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.OData.Mapping
-{
-    /// <summary>
-    /// Provides bidirectional mapping from a <typeparamref name="TSource"/> <see cref="Type"/> to an <see cref="ODataItem"/>.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    public class ODataMapper<TSource> : IODataMapper<TSource>, IBidirectionalMapper<TSource, ODataItem> where TSource : class, new()
-    {
-        private readonly List<IPropertyColumnMapper> _mappings = [];
-        private readonly bool _implementsIIdentifier = typeof(IIdentifier).IsAssignableFrom(typeof(TSource));
-        private readonly Lazy<SourceToItemMapper> _mapperFromTo;
-        private readonly Lazy<ItemToSourceMapper> _mapperToFrom;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataMapper{TSource}"/> class.
-        /// </summary>
-        /// <param name="autoMap">Indicates whether the entity should automatically map all public get/set properties, where the property and column names are all assumed to share the same name.</param>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        public ODataMapper(bool autoMap = false, params string[] ignoreSrceProperties)
-        {
-            if (typeof(TSource) == typeof(string)) throw new InvalidOperationException("TSource must not be a String.");
-
-            if (autoMap)
-                AutomagicallyMap(ignoreSrceProperties);
-
-            _mapperFromTo = new Lazy<SourceToItemMapper>(() => new SourceToItemMapper(this));
-            _mapperToFrom = new Lazy<ItemToSourceMapper>(() => new ItemToSourceMapper(this));
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> mappings.
-        /// </summary>
-        public IEnumerable<IPropertyColumnMapper> Mappings => _mappings.AsEnumerable();
-
-        /// <inheritdoc/>
-        public IPropertyColumnMapper this[string propertyName] => TryGetProperty(propertyName, out var pcm) ? pcm : throw new ArgumentException($"Property '{propertyName}' does not exist.", nameof(propertyName));
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyColumnMapper"/> for the specified source <paramref name="propertyExpression"/>.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <returns>The <see cref="IPropertyColumnMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        public IPropertyColumnMapper this[Expression<Func<TSource, object?>> propertyExpression]
-        {
-            get
-            {
-                propertyExpression.ThrowIfNull(nameof(propertyExpression));
-
-                MemberExpression? me = null;
-                if (propertyExpression.Body.NodeType == ExpressionType.MemberAccess)
-                    me = propertyExpression.Body as MemberExpression;
-                else if (propertyExpression.Body.NodeType == ExpressionType.Convert)
-                {
-                    if (propertyExpression.Body is UnaryExpression ue)
-                        me = ue.Operand as MemberExpression;
-                }
-
-                if (me == null)
-                    throw new InvalidOperationException("Only Member access expressions are supported.");
-
-                return this[me.Member.Name];
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyColumnMapper? propertyColumnMapper)
-        {
-            propertyColumnMapper = _mappings.Where(x => x.PropertyName == propertyName).FirstOrDefault();
-            return propertyColumnMapper != null;
-        }
-
-        /// <inheritdoc/>
-        public string GetColumnName(string propertyName) => this[propertyName].ColumnName;
-
-        /// <summary>
-        /// Automatically add each public get/set property.
-        /// </summary>
-        private void AutomagicallyMap(string[] ignoreSrceProperties)
-        {
-            foreach (var sp in TypeReflector.GetProperties(typeof(TSource)))
-            {
-                // Do not auto-map where ignore has been specified.
-                if (ignoreSrceProperties.Contains(sp.Name))
-                    continue;
-
-                // Create the lambda expression for the property and add to the mapper.
-                var spe = Expression.Parameter(typeof(TSource), "x");
-                var sex = Expression.Lambda(Expression.Property(spe, sp), spe);
-                typeof(ODataMapper<TSource>)
-                    .GetMethod(nameof(AutoProperty), BindingFlags.NonPublic | BindingFlags.Instance)!
-                    .MakeGenericMethod([sp.PropertyType])
-                    .Invoke(this, [sex, null, OperationTypes.Any]);
-            }
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper with additiional auto-logic.
-        /// </summary>
-        private PropertyColumnMapper<TSource, TSourceProperty> AutoProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-            => Property(propertyExpression, columnName, operationTypes);
-
-        /// <summary>
-        /// Adds a <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper (same as <see cref="Map"/>).
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>OData</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> Property<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            var pcm = new PropertyColumnMapper<TSource, TSourceProperty>(propertyExpression, columnName, operationTypes);
-            AddMapping(pcm);
-            return pcm;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper (same as <see cref="Property"/>).
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>OData</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> Map<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-            => Property(propertyExpression, columnName, operationTypes);
-
-        /// <summary>
-        /// Validates and adds a new IPropertyColumnMapper.
-        /// </summary>
-        private void AddMapping<TSourceProperty>(PropertyColumnMapper<TSource, TSourceProperty> propertyColumnMapper)
-        {
-            if (_mappings.Any(x => x.PropertyName == propertyColumnMapper.PropertyName))
-                throw new ArgumentException($"Source property '{propertyColumnMapper.PropertyName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            if (_mappings.Any(x => x.ColumnName == propertyColumnMapper.ColumnName))
-                throw new ArgumentException($"Column '{propertyColumnMapper.ColumnName}' must not be specified more than once.", nameof(propertyColumnMapper));
-
-            _mappings.Add(propertyColumnMapper);
-        }
-
-        /// <summary>
-        /// Adds or updates <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper (same as <see cref="HasMap"/>)
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>OData</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <param name="property">An <see cref="Action"/> enabling access to the created <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</param>
-        /// <returns></returns>
-        /// <remarks>Where updating an existing the <paramref name="columnName"/> and <paramref name="operationTypes"/> where specified will override the previous values.</remarks>
-        public ODataMapper<TSource> HasProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes? operationTypes = null, Action<PropertyColumnMapper<TSource, TSourceProperty>>? property = null)
-        {
-            var tmp = new PropertyColumnMapper<TSource, TSourceProperty>(propertyExpression, columnName, operationTypes ?? OperationTypes.Any);
-            var pcm = _mappings.Where(x => x.PropertyName == tmp.PropertyName).OfType<PropertyColumnMapper<TSource, TSourceProperty>>().SingleOrDefault();
-            if (pcm == null)
-                AddMapping(pcm = tmp);
-            else
-            {
-                if (columnName != null && tmp.ColumnName != pcm.ColumnName)
-                {
-                    if (_mappings.Any(x => x.ColumnName == pcm.ColumnName))
-                        throw new ArgumentException($"Column '{pcm.ColumnName}' must not be specified more than once.", nameof(columnName));
-                    else
-                        pcm.ColumnName = tmp.ColumnName;
-                }
-
-                if (operationTypes != null)
-                    pcm.OperationTypes = operationTypes.Value;
-            }
-
-            property?.Invoke(pcm);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds or updates <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to the mapper (same as <see cref="HasProperty"/>).
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>OData</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <param name="property">An <see cref="Action"/> enabling access to the created <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/>.</param>
-        /// <returns></returns>
-        /// <remarks>Where updating an existing the <paramref name="columnName"/> and <paramref name="operationTypes"/> where specified will override the previous values.</remarks>
-        public ODataMapper<TSource> HasMap<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes? operationTypes = null, Action<PropertyColumnMapper<TSource, TSourceProperty>>? property = null)
-            => HasProperty(propertyExpression, columnName, operationTypes, property);
-
-        /// <summary>
-        /// Inherits the property mappings from the selected <paramref name="inheritMapper"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="inheritMapper"/> source <see cref="Type"/>. Must inherit from <typeparamref name="TSource"/>.</typeparam>
-        /// <param name="inheritMapper">The <see cref="IODataMapper{T}"/> to inherit from.</param>
-        public void InheritPropertiesFrom<T>(IODataMapper<T> inheritMapper) where T : class, new()
-        {
-            inheritMapper.ThrowIfNull(nameof(inheritMapper));
-            if (!typeof(TSource).IsSubclassOf(typeof(T))) throw new ArgumentException($"Type {typeof(TSource).Name} must inherit from {typeof(T).Name}.", nameof(inheritMapper));
-
-            var pe = Expression.Parameter(typeof(TSource), "x");
-            var type = typeof(ODataMapper<>).MakeGenericType(typeof(TSource));
-
-            foreach (var p in inheritMapper.Mappings)
-            {
-                var lex = Expression.Lambda(Expression.Property(pe, p.PropertyName), pe);
-                var pmap = (IPropertyColumnMapper)type
-                    .GetMethod("Property", BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)!
-                    .MakeGenericMethod(p.PropertyType)
-                    .Invoke(this, [lex, p.ColumnName, p.OperationTypes])!;
-
-                if (p.IsPrimaryKey)
-                    pmap.SetPrimaryKey();
-
-                if (p.Converter != null)
-                    pmap.SetConverter(p.Converter);
-
-                if (p.Mapper != null)
-                    pmap.SetMapper(p.Mapper);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void MapToOData(TSource? value, ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            entity.ThrowIfNull(nameof(entity));
-            if (value == null) return;
-
-            foreach (var p in _mappings)
-            {
-                p.MapToOData(value, entity, operationType);
-            }
-
-            OnMapToOData(value, entity, operationType);
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapToOData(TSource, ODataItem, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="ODataItem"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        protected virtual void OnMapToOData(TSource value, ODataItem entity, OperationTypes operationType) { }
-
-        /// <inheritdoc/>
-        public TSource? MapFromOData(ODataItem entity, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            entity.ThrowIfNull(nameof(entity));
-            var value = new TSource();
-
-            foreach (var p in _mappings)
-            {
-                p.MapFromOData(entity, value, operationType);
-            }
-
-            value = OnMapFromOData(value, entity, operationType);
-            return (value != null && value is IInitial ii && ii.IsInitial) ? null : value;
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapFromOData(ODataItem, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The source value.</param>
-        /// <param name="entity">The <see cref="ODataItem"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The source value.</returns>
-        protected virtual TSource? OnMapFromOData(TSource value, ODataItem entity, OperationTypes operationType) => value;
-
-        /// <summary>
-        /// <typeparamref name="TSource"/> to <see cref="ODataItem"/> mapper.
-        /// </summary>
-        private class SourceToItemMapper(ODataMapper<TSource> parent) : Mapper<TSource, ODataItem>
-        {
-            internal ODataMapper<TSource> Parent { get; } = parent;
-
-            protected override ODataItem? OnMap(TSource? source, ODataItem? destination, OperationTypes operationType)
-            {
-                if (source is null)
-                    return default;
-
-                destination ??= new ODataItem();
-                Parent.MapToOData(source, destination, operationType);
-                return destination;
-            }
-        }
-
-        /// <summary>
-        /// <see cref="ODataItem"/> to <typeparamref name="TSource"/> mapper.
-        /// </summary>
-        private class ItemToSourceMapper(ODataMapper<TSource> parent) : Mapper<ODataItem, TSource>
-        {
-            internal ODataMapper<TSource> Parent { get; } = parent;
-
-            protected override TSource? OnMap(ODataItem? source, TSource? destination, OperationTypes operationType)
-            {
-                if (source is null)
-                    return default;
-
-                return Parent.MapFromOData(source, operationType);
-            }
-        }
-
-        /// <inheritdoc/>
-        IMapper<TSource, ODataItem> IBidirectionalMapper<TSource, ODataItem>.MapperFromTo => _mapperFromTo.Value;
-
-        /// <inheritdoc/>
-        IMapper<ODataItem, TSource> IBidirectionalMapper<TSource, ODataItem>.MapperToFrom => _mapperToFrom.Value;
-
-        /// <inheritdoc/>
-        public object[] GetODataKey(TSource value, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            value.ThrowIfNull(nameof(value));
-
-            var km = _mappings.Where(x => x.IsPrimaryKey).ToArray();
-            if (km.Length == 0)
-                throw new InvalidOperationException("No primary key mappings have been defined.");
-
-            var oi = new ODataItem();
-            foreach (var p in km)
-            {
-                p.MapToOData(value, oi, operationType);
-            }
-
-            var key = new object[km.Length];
-            for (int i = 0; i < km.Length; i++)
-            {
-                key[i] = oi.Attributes[km[i].ColumnName];
-            }
-
-            return key;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/Mapping/ODataMapping.cs b/src/CoreEx.OData/Mapping/ODataMapping.cs
deleted file mode 100644
index b5679524..00000000
--- a/src/CoreEx.OData/Mapping/ODataMapping.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.OData.Mapping
-{
-    /// <summary>
-    /// Enables <see cref="Create{TSource}"/> or <see cref="CreateAuto{TSource}(string[])"/> of a <see cref="ODataMapper{TSource}"/>.
-    /// </summary>
-    public class ODataMapping
-    {
-        /// <summary>
-        /// Creates a <see cref="ODataMapper{TSource}"/> where properties are added manually.
-        /// </summary>
-        /// <returns>A <see cref="ODataMapper{TSource}"/>.</returns>
-        public static ODataMapper<TSource> Create<TSource>() where TSource : class, new() => new(false);
-
-        /// <summary>
-        /// Creates a <see cref="ODataMapper{TSource}"/> where properties are added automatically (assumes the property and column names share the same name).
-        /// </summary>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        /// <returns>A <see cref="ODataMapper{TSource}"/>.</returns>
-        public static ODataMapper<TSource> CreateAuto<TSource>(params string[] ignoreSrceProperties) where TSource : class, new() => new(true, ignoreSrceProperties);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/Mapping/PropertyColumnMapper.cs b/src/CoreEx.OData/Mapping/PropertyColumnMapper.cs
deleted file mode 100644
index 40bcd205..00000000
--- a/src/CoreEx.OData/Mapping/PropertyColumnMapper.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping;
-using CoreEx.Mapping.Converters;
-using System;
-using System.Linq.Expressions;
-
-namespace CoreEx.OData.Mapping
-{
-    /// <summary>
-    /// Provides bi-directional property and <see cref="ODataItem"/> column mapping.
-    /// </summary>
-    /// <typeparam name="TSource">The source entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSourceProperty">The corresponding source property <see cref="Type"/>.</typeparam>
-    public class PropertyColumnMapper<TSource, TSourceProperty> : IPropertyColumnMapper where TSource : class, new()
-    {
-        private readonly PropertyExpression<TSource, TSourceProperty> _propertyExpression;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> class.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>Dictionary</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        internal PropertyColumnMapper(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            _propertyExpression = Abstractions.Reflection.PropertyExpression.Create(propertyExpression);
-            ColumnName = columnName ?? PropertyName;
-            OperationTypes = operationTypes;
-        }
-
-        /// <inheritdoc/>
-        public IPropertyExpression PropertyExpression => _propertyExpression;
-
-        /// <inheritdoc/>
-        public string PropertyName => _propertyExpression.Name;
-
-        /// <inheritdoc/>
-        public Type PropertyType => typeof(TSourceProperty);
-
-        /// <inheritdoc/>
-        public bool IsSrcePropertyComplex => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public string ColumnName { get; internal set; }
-
-        /// <inheritdoc/>
-        public OperationTypes OperationTypes { get; internal set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKey { get; private set; }
-
-        /// <inheritdoc/>
-        public IConverter? Converter { get; private set; }
-
-        /// <inheritdoc/>
-        public IODataMapper? Mapper { get; private set; }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetPrimaryKey()
-        {
-            if (Mapper != null) throw new InvalidOperationException("A primary key must not contain a Mapper.");
-            IsPrimaryKey = true;
-        }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/>).
-        /// </summary>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetPrimaryKey()
-        {
-            ((IPropertyColumnMapper)this).SetPrimaryKey();
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetConverter(IConverter converter)
-        {
-            converter.ThrowIfNull(nameof(converter));
-
-            if (Mapper != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (converter.SourceType != typeof(TSourceProperty))
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' and IConverter.SourceType '{converter.SourceType.Name}' must match.");
-
-            Converter = converter;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetConverter<TDestinationProperty>(IConverter<TSourceProperty, TDestinationProperty> converter)
-        {
-            ((IPropertyColumnMapper)this).SetConverter(converter);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.SetMapper(IODataMapper mapper)
-        {
-            mapper.ThrowIfNull(nameof(mapper));
-
-            if (Converter != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (!_propertyExpression.IsClass)
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' must be a class to set a Mapper.");
-
-            if (mapper.SourceType != typeof(TSourceProperty))
-                throw new ArgumentException($"The PropertyType '{PropertyType.Name}' and IDictionaryMapper.SourceType '{mapper.SourceType.Name}' must match.", nameof(mapper));
-
-            Mapper = mapper;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Mapper"/>.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IODataMapper"/>.</param>
-        /// <returns>The <see cref="PropertyColumnMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyColumnMapper<TSource, TSourceProperty> SetMapper<TDestinationProperty>(IODataMapper<TDestinationProperty> mapper)
-        {
-            ((IPropertyColumnMapper)this).SetMapper(mapper);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.MapToOData(object? value, ODataItem entity, OperationTypes operationType) => MapToDictionary((TSource?)value, entity, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="entity"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="entity">The <see cref="ODataItem"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapToDictionary(TSource? value, ODataItem entity, OperationTypes operationType)
-        {
-            if (value == null || !OperationTypes.HasFlag(operationType))
-                return;
-
-            var val = _propertyExpression.GetValue(value);
-            if (Mapper != null)
-            {
-                if (val != null)
-                    Mapper.MapToOData(val, entity, operationType);
-            }
-            else
-            {
-                var aval = Converter == null ? val : Converter.ConvertToDestination(val);
-                entity[ColumnName] = aval!;
-            }
-        }
-
-        /// <inheritdoc/>
-        void IPropertyColumnMapper.MapFromOData(ODataItem entity, object value, OperationTypes operationType) => MapFromDictionary(entity, (TSource)value, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="entity"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="entity">The <see cref="ODataItem"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapFromDictionary(ODataItem entity, TSource value, OperationTypes operationType)
-        {
-            if (!OperationTypes.HasFlag(operationType))
-                return;
-
-            TSourceProperty? pval;
-            if (Mapper != null)
-                pval = (TSourceProperty?)Mapper.MapFromOData(entity, operationType);
-            else
-            {
-                if (!entity.Attributes.ContainsKey(ColumnName))
-                    pval = _propertyExpression.GetDefault();
-                else if (Converter is null)
-                    pval = (TSourceProperty)entity[ColumnName]!;
-                else
-                    pval = (TSourceProperty)Converter.ConvertToSource(entity[ColumnName])!;
-            }
-
-            _propertyExpression.SetValue(value, pval);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataArgs.cs b/src/CoreEx.OData/ODataArgs.cs
deleted file mode 100644
index 65fd1e7d..00000000
--- a/src/CoreEx.OData/ODataArgs.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Net;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Provides the <b>OData</b> arguments.
-    /// </summary>
-    public struct ODataArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataArgs"/> struct.
-        /// </summary>
-        public ODataArgs() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataArgs"/> struct from a <paramref name="template"/>.
-        /// </summary>
-        /// <param name="template">The template <see cref="ODataArgs"/> to copy from.</param>
-        public ODataArgs(ODataArgs template)
-        {
-            NullOnNotFound = template.NullOnNotFound;
-            CleanUpResult = template.CleanUpResult;
-            PreReadOnUpdate = template.PreReadOnUpdate;
-            PreReadOnDelete = template.PreReadOnDelete;
-            IsPagingGetCountSupported = template.IsPagingGetCountSupported;
-        }
-
-        /// <summary>
-        /// Indicates that a <c>null</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> on <b>Get</b>. Defaults to <c>true</c>.
-        /// </summary>
-        /// <remarks>Consider setting <see cref="Soc.ODataClientSettings.IgnoreResourceNotFoundException"/> to <c>true</c> which ensure a <c>null</c> is returned avoiding the cost of an unnecessary exception.</remarks>
-        public bool NullOnNotFound { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether the result should be <see cref="Entities.Cleaner.Clean{T}(T)">cleaned up</see>.
-        /// </summary>
-        public bool CleanUpResult { get; set; } = false;
-
-        /// <summary>
-        /// Indicates whether a pre-read (<b>Get</b>) should be performed prior to an <b>Update</b> operation to ensure that the entity exists before attempting. Defaults to <c>false</c>.
-        /// </summary>
-        /// <remarks>A pre-read will ensure that <b>only</b> an update can occur; otherwise, an <i>upsert</i> may occur (dependent on system capability).</remarks>
-        public bool PreReadOnUpdate { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether a pre-read (<b>Get</b>) should be performed prior to a <b>Delete</b> operation to ensure that the entity exists before attempting. Defaults to <c>false</c>.
-        /// </summary>
-        public bool PreReadOnDelete { get; set; } = false;
-
-        /// <summary>
-        /// Indicates whether <see cref="Entities.PagingArgs.IsGetCount"/> is supported; i.e. does the OData endpoint support <c>$count=true</c>. Defaults to <c>true</c>.
-        /// </summary>
-        public bool IsPagingGetCountSupported { get; set; } = true;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataClient.cs b/src/CoreEx.OData/ODataClient.cs
deleted file mode 100644
index 0b18233b..00000000
--- a/src/CoreEx.OData/ODataClient.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.OData.Mapping;
-using CoreEx.Results;
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Provides the <b>OData</b> client functionality.
-    /// </summary>
-    /// <param name="client">The <see cref="Soc.ODataClient"/>.</param>
-    /// <param name="mapper">The <see cref="IMapper"/>; defaults to <see cref="Mapper.Empty"/>.</param>
-    /// <param name="invoker">Enables the <see cref="Invoker"/> to be overridden; defaults to <see cref="ODataInvoker"/>.</param>
-    /// <remarks>Where <paramref name="mapper"/> is not specified then <see cref="Mapper.Empty"/> will be used. Note that an <see cref="IMapper"/> will be required where performing any operations outside of any <see cref="ODataItemCollection{T}"/> (being untyped).</remarks>
-    public class ODataClient(Soc.ODataClient client, IMapper? mapper = null, ODataInvoker? invoker = null) : IOData
-    {
-        /// <inheritdoc/>
-        public Soc.ODataClient Client { get; } = client.ThrowIfNull(nameof(client));
-
-        /// <inheritdoc/>
-        public ODataInvoker Invoker { get; } = invoker ?? new ODataInvoker();
-
-        /// <inheritdoc/>
-        public IMapper Mapper { get; } = mapper ?? CoreEx.Mapping.Mapper.Empty;
-
-        /// <inheritdoc/>
-        public ODataArgs Args { get; set; } = new ODataArgs();
-
-        /// <inheritdoc/>
-        public ODataQuery<T, TModel> Query<T, TModel>(ODataArgs queryArgs, string? collectionName, Func<Soc.IBoundClient<TModel>, Soc.IBoundClient<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, new()
-            => new(this, queryArgs, collectionName, query);
-
-        /// <inheritdoc/>
-        public async Task<Result<T?>> GetWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() => await Invoker.InvokeAsync(this, async(_, ct) =>
-        {
-            return (await GetModelAsync<TModel>(args, collectionName, key, ct).ConfigureAwait(false))
-                .WhenAs(model => model is null, _ => default!, model => MapToValue<T, TModel>(args, model!));
-        }, this, cancellationToken);
-
-        /// <inheritdoc/>
-        public async Task<Result<T>> CreateWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() => await Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            var model = Mapper.Map<T, TModel>(Cleaner.PrepareCreate(value.ThrowIfNull(nameof(value))), OperationTypes.Create)!;
-            var created = await Client.For<TModel>(collectionName).Set(Cleaner.PrepareCreate(model)).InsertEntryAsync(true, ct).ConfigureAwait(false);
-            return MapToValue<T, TModel>(args, created);
-        }, this, cancellationToken);
-
-        /// <inheritdoc/>
-        public async Task<Result<T>> UpdateWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new() => await Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            Cleaner.PrepareUpdate(value.ThrowIfNull(nameof(value)));
-            TModel model;
-
-            if (args.PreReadOnUpdate)
-            {
-                var get = (await GetModelAsync<TModel>(args, collectionName, value.EntityKey, ct).ConfigureAwait(false))
-                    .When(v => v is null, _ => Result.NotFoundError());
-
-                if (get.IsFailure)
-                    return get.AsResult();
-
-                model = Mapper.Map(value, get.Value, OperationTypes.Update)!;
-            }
-            else
-                model = Mapper.Map<T, TModel>(value, OperationTypes.Update)!;
-
-            var updated = await Client.For<TModel>(collectionName).Key(value.EntityKey.Args).Set(Cleaner.PrepareUpdate(model)).UpdateEntryAsync(true, ct).ConfigureAwait(false);
-            return updated is null ? Result<T>.NotFoundError() : Result<T>.Ok(MapToValue<T, TModel>(args, updated));
-        }, this, cancellationToken);
-
-        /// <inheritdoc/>
-        public async Task<Result> DeleteWithResultAsync<T, TModel>(ODataArgs args, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new() => await Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            if (args.PreReadOnDelete)
-            {
-                var get = await Result.GoAsync(GetModelAsync<TModel>(args, collectionName, key, ct))
-                    .When(model => model is null, _ => Result.NotFoundError()).ConfigureAwait(false);
-
-                if (get.IsFailure)
-                    return get.AsResult();
-            }
-
-            await Client.For<TModel>(collectionName).Key(key.Args).DeleteEntryAsync(ct).ConfigureAwait(false);
-            return Result.Success;
-        }, this, cancellationToken);
-
-        /// <summary>
-        /// Gets (reads) the model.
-        /// </summary>
-        private async Task<Result<TModel?>> GetModelAsync<TModel>(ODataArgs args, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where TModel : class, new()
-        {
-            try
-            {
-                return Result.Go(await Client.For<TModel>(collectionName).Key(key.Args).FindEntryAsync(cancellationToken).ConfigureAwait(false))
-                    .WhenAs<TModel, TModel?>(model => model is null || (model is ILogicallyDeleted ld && ld.IsDeleted.HasValue && ld.IsDeleted.Value), _ => args.NullOnNotFound ? default! : Result.NotFoundError(), model => model);
-            }
-            catch (Soc.WebRequestException odex) when (odex.Code == HttpStatusCode.NotFound && args.NullOnNotFound) { return default!; }
-        }
-
-        /// <summary>
-        /// Maps from the model to the value.
-        /// </summary>
-        private T MapToValue<T, TModel>(ODataArgs args, TModel model) where T : class, IEntityKey, new() where TModel : class, new()
-        {
-            var result = Mapper.Map<T>(model, OperationTypes.Get);
-            return (result is not null) ? CleanUpResult(args, result) : throw new InvalidOperationException("Mapping from the OData model must not result in a null value.");
-        }
-
-        /// <summary>
-        /// Cleans up the result where specified within the args.
-        /// </summary>
-        internal static T CleanUpResult<T>(ODataArgs args, T value) => args.CleanUpResult ? Cleaner.Clean(value) : value;
-
-        /// <inheritdoc/>
-        public Result? HandleODataException(Soc.WebRequestException odex) => OnCosmosException(odex);
-
-        /// <summary>
-        /// Provides the <see cref="Soc.WebRequestException"/> handling as a result of <see cref="HandleODataException(Soc.WebRequestException)"/>.
-        /// </summary>
-        /// <param name="odex">The <see cref="Soc.WebRequestException"/>.</param>
-        /// <returns>The <see cref="Result"/> containing the appropriate <see cref="IResult.Error"/>.</returns>
-        /// <remarks>Where overridding and the <see cref="Soc.WebRequestException"/> is not specifically handled then invoke the base to ensure any standard handling is executed.</remarks>
-        protected virtual Result? OnCosmosException(Soc.WebRequestException odex) => odex.ThrowIfNull(nameof(odex)).Code switch
-        {
-            HttpStatusCode.NotFound => Result.Fail(new NotFoundException(null, odex)),
-            HttpStatusCode.Conflict => Result.Fail(new DuplicateException(null, odex)),
-            HttpStatusCode.PreconditionFailed => Result.Fail(new ConcurrencyException(null, odex)),
-            _ => Result.Fail(odex)
-        };
-
-        /// <inheritdoc/>
-        public ODataItemCollection<T> CreateItemCollection<T>(ODataArgs args, string collectionName, IODataMapper<T> mapper) where T : class, new() => new(this, args, collectionName, mapper);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataExtensions.cs b/src/CoreEx.OData/ODataExtensions.cs
deleted file mode 100644
index 96f2351d..00000000
--- a/src/CoreEx.OData/ODataExtensions.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.OData.Mapping;
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Provides the <b>OData</b> extension methods.
-    /// </summary>
-    public static class ODataExtensions
-    {
-        /// <summary>
-        /// Creates an <see cref="ODataQuery{T, TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="ODataQuery{T, TModel}"/>.</returns>
-        public static ODataQuery<T, TModel> Query<T, TModel>(this IOData odata, Func<Soc.IBoundClient<TModel>, Soc.IBoundClient<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.Query<T, TModel>(new ODataArgs(odata.Args), null, query);
-
-        /// <summary>
-        /// Creates an <see cref="ODataQuery{T, TModel}"/> to enable select-like capabilities.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="query">The function to further define the query.</param>
-        /// <returns>A <see cref="ODataQuery{T, TModel}"/>.</returns>
-        public static ODataQuery<T, TModel> Query<T, TModel>(this IOData odata, string? collectionName, Func<Soc.IBoundClient<TModel>, Soc.IBoundClient<TModel>>? query = null) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.Query<T, TModel>(new ODataArgs(odata.Args), collectionName, query);
-
-        #region Standard
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T, TModel>(this IOData odata, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.GetAsync<T, TModel>(CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T, TModel>(this IOData odata, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.GetAsync<T, TModel>(null, key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<T?> GetAsync<T, TModel>(this IOData odata, string? collectionName, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.GetAsync<T, TModel>(collectionName, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static async Task<T?> GetAsync<T, TModel>(this IOData odata, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await odata.GetWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<T> CreateAsync<T, TModel>(this IOData odata, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.CreateAsync<T, TModel>(null, value, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static async Task<T> CreateAsync<T, TModel>(this IOData odata, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await odata.CreateWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<T> UpdateAsync<T, TModel>(this IOData odata, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.UpdateAsync<T, TModel>(null, value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes).
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static async Task<T> UpdateAsync<T, TModel>(this IOData odata, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await odata.UpdateWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task DeleteAsync<T, TModel>(this IOData odata, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteAsync<T, TModel>(CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task DeleteAsync<T, TModel>(this IOData odata, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteAsync<T, TModel>(null, key, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task DeleteAsync<T, TModel>(this IOData odata, string? collectionName, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteAsync<T, TModel>(collectionName, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static async Task DeleteAsync<T, TModel>(this IOData odata, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => (await odata.DeleteWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        #endregion
-
-        #region WithResult
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T, TModel>(this IOData odata, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.GetWithResultAsync<T, TModel>(CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T, TModel>(this IOData odata, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.GetWithResultAsync<T, TModel>(null, key, cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static Task<Result<T?>> GetWithResultAsync<T, TModel>(this IOData odata, string? collectionName, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.GetWithResultAsync<T, TModel>(collectionName, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from <typeparamref name="TModel"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public static async Task<Result<T?>> GetWithResultAsync<T, TModel>(this IOData odata, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => (await odata.GetWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<Result<T>> CreateWithResultAsync<T, TModel>(this IOData odata, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.CreateWithResultAsync<T, TModel>(null, value, cancellationToken);
-
-        /// <summary>
-        /// Performs a create for the value (reselects and/or automatically saves changes) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<Result<T>> CreateWithResultAsync<T, TModel>(this IOData odata, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.CreateWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<Result<T>> UpdateWithResultAsync<T, TModel>(this IOData odata, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.UpdateWithResultAsync<T, TModel>(null, value, cancellationToken);
-
-        /// <summary>
-        /// Performs an update for the value (reselects and/or automatically saves changes) with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="value">The value to insert.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public static Task<Result<T>> UpdateWithResultAsync<T, TModel>(this IOData odata, string? collectionName, T value, CancellationToken cancellationToken = default) where T : class, IEntityKey, new() where TModel : class, new()
-            => odata.UpdateWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, value, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IOData odata, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteWithResultAsync<T, TModel>(CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IOData odata, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteWithResultAsync<T, TModel>(null, key, cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The key value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IOData odata, string? collectionName, object? key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteWithResultAsync<T, TModel>(collectionName, CompositeKey.Create(key), cancellationToken);
-
-        /// <summary>
-        /// Performs a delete for the specified <paramref name="key"/> with a <see cref="Result"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TModel">The entity framework model <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the model implements <see cref="ILogicallyDeleted"/> then this will update the <see cref="ILogicallyDeleted.IsDeleted"/> with <c>true</c> versus perform a physical deletion.</remarks>
-        public static Task<Result> DeleteWithResultAsync<T, TModel>(this IOData odata, string? collectionName, CompositeKey key, CancellationToken cancellationToken = default) where T : class, IEntityKey where TModel : class, new()
-            => odata.DeleteWithResultAsync<T, TModel>(new ODataArgs(odata.Args), collectionName, key, cancellationToken);
-
-        #endregion
-
-        #region CreateItemCollection
-
-        /// <summary>
-        /// Creates an untyped <see cref="ODataItemCollection{T}"/> for the specified <paramref name="collectionName"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TMapper">The <see cref="IODataMapper{TSource}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <returns>The <see cref="ODataItemCollection{T}"/>.</returns>
-        public static ODataItemCollection<T> CreateItemCollection<T, TMapper>(this IOData odata, string collectionName) where T : class, new() where TMapper : IODataMapper<T>, new()
-            => odata.CreateItemCollection(collectionName, new TMapper());
-
-        /// <summary>
-        /// Creates an untyped <see cref="ODataItemCollection{T}"/> for the specified <paramref name="collectionName"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TMapper">The <see cref="IODataMapper{TSource}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <returns>The <see cref="ODataItemCollection{T}"/>.</returns>
-        public static ODataItemCollection<T> CreateItemCollection<T, TMapper>(this IOData odata, ODataArgs args, string collectionName) where T : class, new() where TMapper : IODataMapper<T>, new()
-            => odata.CreateItemCollection(args, collectionName, new TMapper());
-
-        /// <summary>
-        /// Creates an untyped <see cref="ODataItemCollection{T}"/> for the specified <paramref name="collectionName"/>.
-        /// </summary>
-        /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-        /// <returns>The <see cref="ODataItemCollection{T}"/>.</returns>
-        public static ODataItemCollection<T> CreateItemCollection<T>(this IOData odata, string collectionName, IODataMapper<T> mapper) where T : class, new()
-            => odata.CreateItemCollection(new ODataArgs(odata.Args), collectionName, mapper);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataInvoker.cs b/src/CoreEx.OData/ODataInvoker.cs
deleted file mode 100644
index 1457a4c8..00000000
--- a/src/CoreEx.OData/ODataInvoker.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Provides the standard <see cref="IOData"/> invoker functionality.
-    /// </summary>
-    public class ODataInvoker : InvokerBase<object, IOData> 
-    {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, object invoker, Func<InvokeArgs, TResult> func, IOData? args)
-        {
-            try
-            {
-                return base.OnInvoke(invokeArgs, invoker, func, args);
-            }
-            catch (Soc.WebRequestException odex)
-            {
-                var eresult = args!.HandleODataException(odex);
-                if (eresult.HasValue && eresult.Value.IsFailure && eresult.Value.Error is CoreEx.Abstractions.IExtendedException)
-                {
-                    var dresult = default(TResult);
-                    if (dresult is IResult dir)
-                        return (TResult)dir.ToFailure(eresult.Value.Error);
-                    else
-                        eresult.Value.ThrowOnError();
-                }
-
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, object invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, IOData? args, CancellationToken cancellationToken)
-        {
-            try
-            {
-                return await base.OnInvokeAsync(invokeArgs, invoker, func, args, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Soc.WebRequestException odex)
-            {
-                var eresult = args!.HandleODataException(odex);
-                if (eresult.HasValue && eresult.Value.IsFailure && eresult.Value.Error is CoreEx.Abstractions.IExtendedException)
-                {
-                    var dresult = default(TResult);
-                    if (dresult is IResult dir)
-                        return (TResult)dir.ToFailure(eresult.Value.Error);
-                    else
-                        eresult.Value.ThrowOnError();
-                }
-
-                throw;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataItem.cs b/src/CoreEx.OData/ODataItem.cs
deleted file mode 100644
index 9cbf11aa..00000000
--- a/src/CoreEx.OData/ODataItem.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using CoreEx.OData.Mapping;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Provides a untyped <see cref="Attributes"/>-based (<see cref="IDictionary{TKey, TValue}"/>) <b>OData</b> item/entry.
-    /// </summary>
-    public class ODataItem
-    {
-        /// <summary>
-        /// Maps none or more <paramref name="items"/> into a corresponding <see cref="ODataItem"/> <see cref="IEnumerable{T}"/>.
-        /// </summary>
-        /// <param name="items">The OData items.</param>
-        /// <returns>The <see cref="ODataItem"/> <see cref="IEnumerable{T}"/>.</returns>
-        public static IEnumerable<ODataItem> MapODataItems(IEnumerable<IDictionary<string, object>> items)
-        {
-            foreach (var item in items)
-            {
-                yield return new ODataItem(item);
-            }
-        }
-
-        /// <summary>
-        /// Maps none or more <paramref name="items"/> into a corresponding <typeparamref name="T"/> <see cref="IEnumerable{T}"/> using the specified <paramref name="mapper"/>.
-        /// </summary>
-        /// <typeparam name="T">The resulting item <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-        /// <param name="items">The OData items.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The <typeparamref name="T"/> <see cref="IEnumerable{T}"/>.</returns>
-        public static IEnumerable<T> MapODataItems<T>(IODataMapper<T> mapper, IEnumerable<IDictionary<string, object>> items, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            foreach (var item in MapODataItems(items))
-            {
-                yield return mapper.MapFromOData(item, operationType)!;
-            }
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ODataItem"/> from the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public static ODataItem MapFrom<T>(IODataMapper<T> mapper, T value, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            var result = new ODataItem();
-            mapper.MapToOData(value, result, operationType);
-            return result;
-        }
-
-        /// <summary>
-        /// Creates an <see cref="ODataItem"/> from the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The specific <see cref="IMapper{TSource, TDestination}"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public static ODataItem? MapFrom<T>(IMapper<T, ODataItem> mapper, T? value, OperationTypes operationType = OperationTypes.Unspecified) => mapper.Map(value, operationType);
-
-        /// <summary>
-        /// Creates an <see cref="ODataItem"/> from the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IMapper{TSource, TDestination}"/> mapper.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public static ODataItem? MapFrom<T>(IMapper mapper, T? value, OperationTypes operationType = OperationTypes.Unspecified) => mapper.Map<T, ODataItem>(value, operationType);
-
-        /// <summary>
-        /// Creates an <see cref="ODataItem"/> from the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="client">The <see cref="ODataClient"/> mapper.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public static ODataItem? MapFrom<T>(ODataClient client, T? value, OperationTypes operationType = OperationTypes.Unspecified) => MapFrom(client.Mapper, value, operationType);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataItem"/> class.
-        /// </summary>
-        public ODataItem() => Attributes = new Dictionary<string, object>();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataItem"/> class with the specified <paramref name="attributes"/>.
-        /// </summary>
-        /// <param name="attributes">The <see cref="IDictionary{TKey, TValue}"/>.</param>
-        public ODataItem(IDictionary<string, object> attributes) => Attributes = attributes;
-
-        /// <summary>
-        /// Gets the attributes/columns.
-        /// </summary>
-        public IDictionary<string, object> Attributes { get; private set; } = new Dictionary<string, object>();
-
-        /// <summary>
-        /// Gets or sets the value of the specified attribute.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns>The value.</returns>
-        public object? this[string name]
-        {
-            get => Attributes[name];
-
-            set
-            {
-                if (Attributes.ContainsKey(name))
-                    Attributes[name] = value!;
-                else
-                    Attributes.Add(name, value!);
-            }
-        }
-
-        /// <summary>
-        /// Maps the <see cref="ODataItem"/> to a <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public T MapTo<T>(IODataMapper<T> mapper, OperationTypes operationType = OperationTypes.Unspecified) where T : class, new() => mapper.MapFromOData(this, operationType)!;
-
-        /// <summary>
-        /// Maps the <see cref="ODataItem"/> to a <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The specific <see cref="IMapper{TSource, TDestination}"/>.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public T MapTo<T>(IMapper<ODataItem, T> mapper, OperationTypes operationType = OperationTypes.Unspecified) => mapper.Map(this, operationType)!;
-
-        /// <summary>
-        /// Maps the <see cref="ODataItem"/> to a <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IMapper"/>.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public T MapTo<T>(IMapper mapper, OperationTypes operationType = OperationTypes.Unspecified) => mapper.Map<ODataItem, T>(this, operationType)!;
-
-        /// <summary>
-        /// Maps the <see cref="ODataItem"/> to a <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The resulting value <see cref="Type"/>.</typeparam>
-        /// <param name="client">The <see cref="ODataClient"/>.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The resultant value.</returns>
-        public T MapTo<T>(ODataClient client, OperationTypes operationType = OperationTypes.Unspecified) => MapTo<T>(client.Mapper, operationType);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataItemCollection.cs b/src/CoreEx.OData/ODataItemCollection.cs
deleted file mode 100644
index c0ef5206..00000000
--- a/src/CoreEx.OData/ODataItemCollection.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.OData.Mapping;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Enables the common <see cref="ODataItem"/>-collection CRUD functionality.
-    /// </summary>
-    /// <typeparam name="T">The resultant <see cref="Type"/>.</typeparam>
-    /// <param name="client">The owning <see cref="Owner"/>.</param>
-    /// <param name="args">The <see cref="ODataArgs"/>.</param>
-    /// <param name="collectionName">The collection name.</param>
-    /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-    public class ODataItemCollection<T>(ODataClient client, ODataArgs args, string collectionName, IODataMapper<T> mapper) where T : class, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataItemCollection{T}"/> class.
-        /// </summary>
-        /// <param name="client">The owning <see cref="Owner"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="mapper">The specific <see cref="IODataMapper{TSource}"/>.</param>
-        public ODataItemCollection(ODataClient client, string collectionName, IODataMapper<T> mapper) : this(client, new ODataArgs(client.ThrowIfNull().Args), collectionName, mapper) { }
-
-        /// <summary>
-        /// Gets the owning <see cref="ODataClient"/>.
-        /// </summary>
-        public ODataClient Owner { get; } = client.ThrowIfNull(nameof(client));
-
-        /// <summary>
-        /// Gets the <see cref="ODataArgs"/>.
-        /// </summary>
-        public ODataArgs Args { get; } = args;
-
-        /// <summary>
-        /// Gets the collection name.
-        /// </summary>
-        public string CollectionName { get; } = collectionName.ThrowIfNull(nameof(collectionName));
-
-        /// <summary>
-        /// Gets the <see cref="IODataMapper{TSource}"/>.
-        /// </summary>
-        public IODataMapper<T> Mapper { get; } = mapper.ThrowIfNull(nameof(mapper));
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from the <see cref="ODataItem"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<T?> GetAsync(params object[] key) => GetAsync(key, default);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from the <see cref="ODataItem"/> to <typeparamref name="T"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public async Task<T?> GetAsync(object[] key, CancellationToken cancellationToken = default) => (await GetWithResultAsync(key, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from the <see cref="ODataItem"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public Task<Result<T?>> GetWithResultAsync(params object[] key) => GetWithResultAsync(key, default);
-
-        /// <summary>
-        /// Gets the entity for the specified <paramref name="key"/> mapping from the <see cref="ODataItem"/> to <typeparamref name="T"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The entity value where found; otherwise, <c>null</c>.</returns>
-        public async Task<Result<T?>> GetWithResultAsync(object[] key, CancellationToken cancellationToken = default) => await Owner.Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            return (await GetItemAsync(key, ct).ConfigureAwait(false))
-                .WhenAs<ODataItem?, T?>(entity => entity is null, _ => default!, entity => MapFromOData(entity!, OperationTypes.Get));
-        }, Owner, cancellationToken);
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/> mapping from/to an intermediary untyped <see cref="ODataItem"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public async Task<T> CreateAsync(T value, CancellationToken cancellationToken = default) => (await CreateWithResultAsync(value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Creates the entity with a <see cref="Result{T}"/> mapping from/to an intermediary untyped <see cref="ODataItem"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public async Task<Result<T>> CreateWithResultAsync(T value, CancellationToken cancellationToken = default) => await Owner.Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            var item = ODataItem.MapFrom(Mapper, Cleaner.PrepareCreate(value.ThrowIfNull()), OperationTypes.Create);
-            Mapper.MapToOData(value, item, OperationTypes.Create);
-            var created = await Owner.Client.For(CollectionName).Set(item.Attributes).InsertEntryAsync(true, ct).ConfigureAwait(false);
-            return created is null ? Result<T>.NotFoundError() : Result<T>.Ok(MapFromOData(new ODataItem(created), OperationTypes.Get));
-        }, Owner, cancellationToken);
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/> mapping from/to an intermediary untyped <see cref="ODataItem"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public async Task<T> UpdateAsync(T value, CancellationToken cancellationToken = default) => (await UpdateWithResultAsync(value, cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Updates the entity with a <see cref="Result{T}"/> mapping from/to an intermediary untyped <see cref="ODataItem"/>.
-        /// </summary>
-        /// <param name="value">The value to update.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value (refreshed where specified).</returns>
-        public async Task<Result<T>> UpdateWithResultAsync(T value, CancellationToken cancellationToken = default) => await Owner.Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            ODataItem item;
-            var key = Mapper.GetODataKey(Cleaner.PrepareUpdate(value.ThrowIfNull()), OperationTypes.Update);
-
-            if (Args.PreReadOnUpdate)
-            {
-                var get = (await GetItemAsync(key, ct).ConfigureAwait(false))
-                    .When(v => v is null, _ => Result.NotFoundError());
-
-                if (get.IsFailure)
-                    return get.AsResult();
-
-                item = get.Value;
-                Mapper.MapToOData(value, get.Value, OperationTypes.Update);
-            }
-            else
-                item = ODataItem.MapFrom(Mapper, value, OperationTypes.Update);
-
-            var updated = await Owner.Client.For(CollectionName).Key(key).Set(item.Attributes).UpdateEntryAsync(true, ct).ConfigureAwait(false);
-            return updated is null ? Result<T>.NotFoundError() : Result<T>.Ok(MapFromOData(new ODataItem(updated), OperationTypes.Get));
-        }, Owner, cancellationToken);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        public Task DeleteAsync(params object[] key) => DeleteAsync(key, default);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task DeleteAsync(object[] key, CancellationToken cancellationToken = default) => (await DeleteWithResultAsync(key, cancellationToken).ConfigureAwait(false)).ThrowOnError();
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        public Task<Result> DeleteWithResultAsync(params object[] key) => DeleteWithResultAsync(key, default);
-
-        /// <summary>
-        /// Deletes the entity for the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task<Result> DeleteWithResultAsync(object[] key, CancellationToken cancellationToken = default) => await Owner.Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            await Owner.Client.For(CollectionName).Key(key).DeleteEntryAsync(ct).ConfigureAwait(false);
-            return Result.Success;
-        }, Owner, cancellationToken);
-
-        /// <summary>
-        /// Gets (reads) the entity.
-        /// </summary>
-        private async Task<Result<ODataItem?>> GetItemAsync(object[] key, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                return Result.Go(await Owner.Client.For(CollectionName).Key(key).FindEntryAsync(cancellationToken).ConfigureAwait(false))
-                    .WhenAs<IDictionary<string, object>, ODataItem?>(d => d is null, _ => Args.NullOnNotFound ? default! : Result.NotFoundError(), d => new ODataItem(d));
-            }
-            catch (Soc.WebRequestException odex) when (odex.Code == HttpStatusCode.NotFound && Args.NullOnNotFound) { return default!; }
-        }
-
-        /// <summary>
-        /// Maps from the <paramref name="item"/> to the value.
-        /// </summary>
-        /// <param name="item">The <see cref="ODataItem"/>.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The value.</returns>
-        public T MapFromOData(ODataItem item, OperationTypes operationType = OperationTypes.Unspecified) => item.MapTo(Mapper, operationType);
-
-        /// <summary>
-        /// Maps from the <paramref name="value"/> to the <see cref="ODataItem"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The <see cref="ODataItem"/>.</returns>
-        public ODataItem MapToOData(T value, OperationTypes operationType = OperationTypes.Unspecified) => ODataItem.MapFrom(Mapper, value.ThrowIfNull(), operationType);
-
-        /// <summary>
-        /// Invokes a <paramref name="clientFunc"/> function (wrapping with the underlying <see cref="ODataClient.Invoker"/>).
-        /// </summary>
-        /// <param name="clientFunc">The customized untyped <see cref="Soc.IBoundClient{T}"/> function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task InvokeAsync(Func<Soc.IBoundClient<IDictionary<string, object>>, Task> clientFunc, CancellationToken cancellationToken = default)
-            => InvokeWithResultAsync(async client => { await clientFunc(client).ConfigureAwait(false); return Result.Success; }, cancellationToken);
-
-        /// <summary>
-        /// Invokes a <paramref name="clientFunc"/> function (wrapping with the underlying <see cref="ODataClient.Invoker"/>) returning a value with a <see cref="Type"/> of <typeparamref name="TValue"/>
-        /// </summary>
-        /// <typeparam name="TValue">The returning value <see cref="Type"/>.</typeparam>
-        /// <param name="clientFunc">The customized untyped <see cref="Soc.IBoundClient{T}"/> function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value.</returns>
-        public async Task<TValue> InvokeAsync<TValue>(Func<Soc.IBoundClient<IDictionary<string, object>>, Task<TValue>> clientFunc, CancellationToken cancellationToken = default)
-            => (await InvokeWithResultAsync<TValue>(async client => { var v = await clientFunc(client).ConfigureAwait(false); return Result.Ok<TValue>(v); }, cancellationToken)).Value;
-
-        /// <summary>
-        /// Invokes a <paramref name="clientFunc"/> function (wrapping with the underlying <see cref="ODataClient.Invoker"/>).
-        /// </summary>
-        /// <param name="clientFunc">The customized untyped <see cref="Soc.IBoundClient{T}"/> function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task<Result> InvokeWithResultAsync(Func<Soc.IBoundClient<IDictionary<string, object>>, Task<Result>> clientFunc, CancellationToken cancellationToken = default) => await Owner.Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            var client = Owner.Client.For(CollectionName);
-            return await clientFunc(client).ConfigureAwait(false);
-        }, Owner, cancellationToken);
-
-        /// <summary>
-        /// Invokes a <paramref name="clientFunc"/> function (wrapping with the underlying <see cref="ODataClient.Invoker"/>) returning a value with a <see cref="Type"/> of <typeparamref name="TValue"/>
-        /// </summary>
-        /// <typeparam name="TValue">The returning value <see cref="Type"/>.</typeparam>
-        /// <param name="clientFunc">The customized untyped <see cref="Soc.IBoundClient{T}"/> function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The value.</returns>
-        public async Task<Result<TValue>> InvokeWithResultAsync<TValue>(Func<Soc.IBoundClient<IDictionary<string, object>>, Task<Result<TValue>>> clientFunc, CancellationToken cancellationToken = default) => await Owner.Invoker.InvokeAsync(this, async (_, ct) =>
-        {
-            var client = Owner.Client.For(CollectionName);
-            return await clientFunc(client).ConfigureAwait(false);
-        }, Owner, cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/ODataQuery.cs b/src/CoreEx.OData/ODataQuery.cs
deleted file mode 100644
index 43669b85..00000000
--- a/src/CoreEx.OData/ODataQuery.cs
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.OData
-{
-    /// <summary>
-    /// Encapsulates an <b>OData</b> query enabling select-like capabilities.
-    /// </summary>
-    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TModel">The OData model <see cref="Type"/>.</typeparam>
-    public struct ODataQuery<T, TModel> where T : class, new() where TModel : class, new()
-    {
-        private readonly Func<Soc.IBoundClient<TModel>, Soc.IBoundClient<TModel>>? _query;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ODataQuery{T, TModel}"/> struct.
-        /// </summary>
-        /// <param name="odata">The <see cref="IOData"/>.</param>
-        /// <param name="args">The <see cref="ODataArgs"/>.</param>
-        /// <param name="collectionName">The collection name.</param>
-        /// <param name="query">A function to modify the underlying <see cref="Soc.IBoundClient{TModel}"/> query.</param>
-        /// <exception cref="ArgumentNullException"></exception>
-        internal ODataQuery(IOData odata, ODataArgs args, string? collectionName, Func<Soc.IBoundClient<TModel>, Soc.IBoundClient<TModel>>? query)
-        {
-            ODataClient = odata.ThrowIfNull(nameof(odata));
-            Args = args;
-            CollectionName = collectionName;
-            _query = query;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IOData"/>.
-        /// </summary>
-        public IOData ODataClient { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ODataArgs"/>.
-        /// </summary>
-        public ODataArgs Args { get; }
-
-        /// <summary>
-        /// Gets the optional collection name override.
-        /// </summary>
-        public string? CollectionName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        public readonly IMapper Mapper => ODataClient.Mapper;
-
-        /// <summary>
-        /// Gets the <see cref="PagingResult"/>.
-        /// </summary>
-        public PagingResult? Paging { get; private set; }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <see cref="ODataQuery{T, TModel}"/> to suport fluent-style method-chaining.</returns>
-        public ODataQuery<T, TModel> WithPaging(PagingArgs? paging)
-        {
-            Paging = paging == null ? null : (paging is PagingResult pr ? pr : new PagingResult(paging));
-            return this;
-        }
-
-        /// <summary>
-        /// Adds <see cref="PagingArgs"/> to the query.
-        /// </summary>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The <see cref="ODataQuery{T, TModel}"/> to suport fluent-style method-chaining.</returns>
-        public ODataQuery<T, TModel> WithPaging(long skip, long? take = null) => WithPaging(PagingArgs.CreateSkipAndTake(skip, take));
-
-        /// <summary>
-        /// Manages the underlying query construction and lifetime.
-        /// </summary>
-        private async readonly Task<Result<TResult?>> ExecuteQueryAsync<TResult>(Func<Soc.IBoundClient<TModel>, CancellationToken, Task<TResult?>> executeAsync, string memeberName, CancellationToken cancellationToken)
-            => await ODataClient.Invoker.InvokeAsync(ODataClient, ODataClient, CollectionName, _query, async (args, odata, name, query, ct) =>
-            {
-                var q = odata.Client.For<TModel>(name);
-                return await executeAsync((query == null) ? q : query(q), ct).ConfigureAwait(false);
-            }, ODataClient, cancellationToken, memeberName);
-
-        /// <summary>
-        /// Executes the query and maps.
-        /// </summary>
-        private async readonly Task<Result<T?>> ExecuteQueryAndMapAsync<TResult>(Func<Soc.IBoundClient<TModel>, CancellationToken, Task<TResult?>> executeAsync, string memeberName, CancellationToken cancellationToken)
-        {
-            var result = await ExecuteQueryAsync(executeAsync, memeberName, cancellationToken).ConfigureAwait(false);
-            if (result.IsFailure)
-                return result.AsResult();
-
-            var val = result.Value == null ? default! : Mapper.Map<T>(result.Value, OperationTypes.Get);
-            return Args.CleanUpResult ? Cleaner.Clean(val) : val;
-        }
-
-        /// <summary>
-        /// Cleans up the result where specified within the args.
-        /// </summary>
-        private readonly T CleanUpResult(T value) => Args.CleanUpResult ? Cleaner.Clean(value) : value;
-
-        /// <summary>
-        /// Selects a single item.
-        /// </summary>
-        /// <returns>The single item.</returns>
-        public async readonly Task<T> SelectSingleAsync(CancellationToken cancellationToken = default)
-             => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).Single(), nameof(SelectSingleAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects a single item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <returns>The single item.</returns>
-        public async readonly Task<Result<T>> SelectSingleWithResultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).Single(), nameof(SelectSingleWithResultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects a single item or default.
-        /// </summary>
-        /// <returns>The single item or default.</returns>
-        public async readonly Task<T?> SelectSingleOrDefaultAsync(CancellationToken cancellationToken = default)
-             => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).SingleOrDefault()!, nameof(SelectSingleOrDefaultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects a single item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <returns>The single item or default.</returns>
-        public async readonly Task<Result<T?>> SelectSingleOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).SingleOrDefault()!, nameof(SelectSingleOrDefaultWithResultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects first item.
-        /// </summary>
-        /// <returns>The first item.</returns>
-        public async readonly Task<T> SelectFirstAsync(CancellationToken cancellationToken = default)
-             => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).First(), nameof(SelectFirstAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects first item with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <returns>The first item.</returns>
-        public async readonly Task<Result<T>> SelectFirstWithResultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).First(), nameof(SelectFirstWithResultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects first item or default.
-        /// </summary>
-        /// <returns>The first item or default.</returns>
-        public async readonly Task<T?> SelectFirstOrDefaultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).FirstOrDefault()!, nameof(SelectFirstOrDefaultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Selects first item or default with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <returns>The first item or default.</returns>
-        public async readonly Task<Result<T?>> SelectFirstOrDefaultWithResultAsync(CancellationToken cancellationToken = default)
-            => (await ExecuteQueryAndMapAsync(async (q, ct) => (await q.Skip(0).Top(2).FindEntriesAsync(ct).ConfigureAwait(false)).FirstOrDefault()!, nameof(SelectFirstOrDefaultWithResultAsync), cancellationToken).ConfigureAwait(false))!;
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async readonly Task<TCollResult> SelectResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new() => new TCollResult
-        {
-            Paging = Paging,
-            Items = (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectResultAsync), cancellationToken).ConfigureAwait(false)).Value
-        };
-
-        /// <summary>
-        /// Executes the query command creating a <typeparamref name="TCollResult"/> with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TCollResult">The <see cref="ICollectionResult{TColl, TItem}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TColl">The <see cref="ICollection{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <typeparamref name="TCollResult"/>.</returns>
-        public async readonly Task<Result<TCollResult>> SelectResultWithResultAsync<TCollResult, TColl>(CancellationToken cancellationToken = default) where TCollResult : ICollectionResult<TColl, T>, new() where TColl : ICollection<T>, new() => new TCollResult
-        {
-            Paging = Paging,
-            Items = (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectResultWithResultAsync), cancellationToken).ConfigureAwait(false)).Value
-        };
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <returns>A resultant collection.</returns>
-        public async readonly Task<TColl> SelectQueryAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-            => (await SelectQueryWithResultInternalAsync<TColl>(nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <returns>A resultant collection.</returns>
-        public readonly Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(CancellationToken cancellationToken = default) where TColl : ICollection<T>, new()
-            => SelectQueryWithResultInternalAsync<TColl>(nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes a query adding to the passed collection.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="collection">The collection to add items to.</param>
-        /// <returns>The <paramref name="collection"/>.</returns>
-        public async readonly Task<TColl> SelectQueryAsync<TColl>(TColl collection, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => (await SelectQueryWithResultInternalAsync(collection, nameof(SelectQueryAsync), cancellationToken).ConfigureAwait(false)).Value;
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="collection">The collection to add items to.</param>
-        /// <returns>The <paramref name="collection"/>.</returns>
-        public readonly Task<Result<TColl>> SelectQueryWithResultAsync<TColl>(TColl collection, CancellationToken cancellationToken = default) where TColl : ICollection<T>
-            => SelectQueryWithResultInternalAsync(collection, nameof(SelectQueryWithResultAsync), cancellationToken);
-
-        /// <summary>
-        /// Executes the query command creating a resultant collection with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async readonly Task<Result<TColl>> SelectQueryWithResultInternalAsync<TColl>(string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>, new()
-        {
-            var coll = new TColl();
-            return await SelectQueryWithResultInternalAsync(coll, memberName, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes a query adding to the passed collection with a <see cref="Result{T}"/> internal.
-        /// </summary>
-        private async readonly Task<Result<TColl>> SelectQueryWithResultInternalAsync<TColl>(TColl collection, string memberName, CancellationToken cancellationToken) where TColl : ICollection<T>
-        {
-            collection.ThrowIfNull(nameof(collection));
-
-            var paging = Paging;
-            var mapper = Mapper;
-            var args = Args;
-
-            return await ExecuteQueryAsync(async (q, ct) =>
-            {
-                Soc.ODataFeedAnnotations ann = null!;
-
-                if (paging is not null)
-                {
-                    if (paging.Option == PagingOption.TokenAndTake)
-                        throw new InvalidOperationException("PagingOption.TokenAndTake is not supported for OData.");
-
-                    q = q.Skip(paging.Skip!.Value).Top(paging.Take);
-                    if (paging.IsGetCount && args.IsPagingGetCountSupported)
-                        ann = new Soc.ODataFeedAnnotations();
-                }
-
-                foreach (var item in await (ann is null ? q.FindEntriesAsync(ct) : q.FindEntriesAsync(ann, ct)).ConfigureAwait(false))
-                {
-                    var val = mapper.Map<TModel, T>(item, OperationTypes.Get) ?? throw new InvalidOperationException("Mapping from the ODATA model must not result in a null value.");
-                    collection.Add(args.CleanUpResult ? Cleaner.Clean(val) : val);
-                }
-
-                if (ann != null)
-                    paging!.TotalCount = ann.Count;
-
-                return Result<TColl>.Ok(collection);
-            }, memberName, cancellationToken).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.OData/README.md b/src/CoreEx.OData/README.md
deleted file mode 100644
index d9c3013a..00000000
--- a/src/CoreEx.OData/README.md
+++ /dev/null
@@ -1,324 +0,0 @@
-# CoreEx
-
-The `CoreEx.OData` namespace provides extended [_OData v4_](https://en.wikipedia.org/wiki/Open_Data_Protocol) support leveraging the [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client/wiki) open-source capabilities. 
-
-<br/>
-
-## Motivation
-
-The motivation is to simplify and unify the approach to _OData_ access. The [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client/wiki) provides, as the name implies, a simple and easy to use _OData_ client.
-
-<br/>
-
-## ODataClient
-
-The [`ODataClient`](./ODataClient.cs) class is a wrapper around the [`Simple.OData.Client.ODataClient`](https://github.com/simple-odata-client/Simple.OData.Client/wiki/Getting-started-with-Simple.OData.Client). Yes, they have the same name; sadly, naming stuff is [hard](https://martinfowler.com/bliki/TwoHardThings.html).
-
-The [`ODataClient`](./ODataClient.cs) is the base (common) implementation for the [`IOData`](./IOData.cs) interface that provides the standardized access to the underlying endpoint. For typed access an [IMapper](../CoreEx/Mapping/IMapper.cs) that contains the mapping logic to map to and from the **entity** and underlying **model** ia required.
-
-<br/>
-
-## Requirements
-
-The requirements for usage are as follows.
-- An **entity** (DTO) that represents the data that must as a minimum implement [`IEntityKey`](../CoreEx/Entities/IEntityKey.cs); generally via either the implementation of [`IIdentifier`](../CoreEx/Entities/IIdentifierT.cs) or [`IPrimaryKey`](../CoreEx/Entities/IPrimaryKey.cs).
-- A **model** being the underlying configured JSON-serializable representation of the data source model.
-- An [`IMapper`](../CoreEx/Mapping/IMapper.cs) that contains the mapping logic to map to and from the **entity** and **model**.
-
-The **entity** and **model** are different types to encourage separation between the externalized **entity** representation and the underlying **model**; which may be shaped differently, and have different property to column naming conventions, etc.
-
-Additionally, untyped **model** access is also supported via an [`ODataItem`](./ODataItem.cs) (dictionary-based representation) and the [`ODataItemCollection`](./ODataItemCollection.cs), a CRUD-enabler for untyped.
-
-<br/>
-
-## CRUD capabilities
-
-The [`IOData`](./IOData.cs) and corresponding [`ODataClient`](./ODataClient.cs) provide the base CRUD capabilities as follows:
-
-<br/>
-
-### Query (read)
-
-A query is actioned using the [`ODataQuery`](./ODataQuery.cs) which is ostensibly a lighweight wrapper over an `IBoundClient<TModel>`(https://github.com/simple-odata-client/Simple.OData.Client/blob/master/src/Simple.OData.Client.Core/Fluent/IBoundClient.cs) that automatically maps from the **model** to the **entity**.
-
-The following methods provide additional capabilities:
-
-Method | Description
--|-
-`WithPaging` | Adds `Skip` and `Take` paging to the query.
-`SelectSingleAsync`, `SelectSingleWithResult` | Selects a single item.
-`SelectSingleOrDefaultAsync`, `SelectSingleOrDefaultWithResultAsync` | Selects a single item or default.
-`SelectFirstAsync`, `SelectFirstWithResultAsync` | Selects first item.
-`SelectFirstOrDefaultAsync`, `SelectFirstOrDefaultWithResultAsync` | Selects first item or default.
-`SelectQueryAsync`, `SelectQueryWithResultAsync` | Select items into or creating a resultant collection.
-`SelectResultAsync`, `SelectResultWithResultAsync` | Select items creating a [`ICollectionResult`](../CoreEx/Entities/ICollectionResultT2.cs) which also contains corresponding [`PagingResult`](../CoreEx/Entities/PagingResult.cs).
-
-<br/>
-
-### Get (read)
-
-Gets (`GetAsync` or `GetWithResultAsync`) the **entity** for the specified key mapping from the **model**. Uses [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client/wiki/Retrieving-a-single-row-by-key) internally to get the **model** using the specified key.
-
-<br/>
-
-### Create 
-
-Creates (`CreateAsync` or `CreateWithResultAsync`) the **entity** by firstly mapping to the **model**. Uses [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client/wiki/Adding-entries) to insert.
-
-Where the **entity** implements [`IChangeLogAuditLog`](../CoreEx/Entities/IChangeLogAuditLog.cs) generally via [`ChangeLog`](../CoreEx/Entities/IChangeLog.cs) or [`ChangeLogEx`](../CoreEx/Entities/Extended/IChangeLogEx.cs), then the `CreatedBy` and `CreatedDate` properties will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Where the **entity** and/or **model** implements [`ITenantId`](../CoreEx/Entities/ITenantId.cs) then the `TenantId` property will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-<br/>
-
-### Update
-
-Updates (`UpdateAsync` or `UpdateWithResultAsync`) the **entity** by firstly mapping to the **model**. Uses [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client/wiki/Updating-entries) to update.
-
-Where the **entity** implements [`IChangeLogAuditLog`](../CoreEx/Entities/IChangeLogAuditLog.cs) generally via [`ChangeLog`](../CoreEx/Entities/IChangeLog.cs) or [`ChangeLogEx`](../CoreEx/Entities/Extended/IChangeLogEx.cs), then the `UpdatedBy` and `UpdatedDate` properties will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-Where the **entity** and/or **model** implements [`ITenantId`](../CoreEx/Entities/ITenantId.cs) then the `TenantId` property will be automatically set from the [`ExecutionContext`](../CoreEx/ExecutionContext.cs).
-
-<br/>
-
-### Delete
-
-Deletes (`DeleteAsync` or `DeleteWithResultAsync`) the **entity**. Uses [`Simple.OData.Client`](https://github.com/simple-odata-client/Simple.OData.Client/wiki/Deleting-entries) to delete.
-
-<br/>
-
-## Untyped
-
-Untyped refers to the support of a **model** that is not defined as a type at compile time; is from a `Simple.OData.Client.ODataClient` perspective a `IDictionary<string, object>`. The [`ODataItem`](./ODataItem.cs) encapsulates the dictionary-based representation with the corresponding [`ODataItemCollection`](./ODataItemCollection.cs) enabling CRUD operations.
-
-The [`ODataMapper`](./Mapping/ODataMapperT.cs) provides the mapping logic to map to and from the **entity** and untyped **model** dictionary. The following demonstrates:
-
-``` csharp
-public class CustomerToDataverseAccountMapper : ODataMapper<Customer>
-{
-    public CustomerToDataverseAccountMapper()
-    {
-        Property(c => c.AccountId, "accountid", OperationTypes.AnyExceptCreate).SetPrimaryKey();
-        Property(x => x.FirstName, "firstname");
-        Property(x => x.LastName, "lastname");
-    }
-}
-```
-
-<br/>
-
-## Usage
-
-To use the [`Simple.OData.Client.ODataClient`](https://github.com/simple-odata-client/Simple.OData.Client/wiki/Getting-started-with-Simple.OData.Client) must first be instantiated, then passed to the [`ODataClient`](./ODataClient.cs) constructor including a reference to the [`IMapper`](../CoreEx/Mapping/IMapper.cs).
-
-The following will demonstrate the usage connecting to [_Microsoft Dataverse Web API_](https://learn.microsoft.com/en-us/power-apps/developer/data-platform/webapi/overview) within the context of solution leveraging the _CoreEx_ library and dependency injection (DI).
-
-<br/>
-
-### Settings
-
-The _Dataverse_ connection string settings are required:
-
-``` csharp
-public class DemoSettings : SettingsBase
-{
-    private readonly string UrlKey = "Url";
-    private readonly string ClientIdKey = "ClientId";
-    private readonly string CiientSecretKey = "ClientSecret";
-    private readonly string TenantIdKey = "TenantId";
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DemoSettings"/> class.
-    /// </summary>
-    /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-    public DemoSettings(IConfiguration configuration) : base(configuration, "Demo") { }
-
-    /// <summary>
-    /// Gets the Dataverse connection string.
-    /// </summary>
-    public string DataverseConnectionString => GetRequiredValue<string>("ConnectionStrings:Dataverse");
-
-    /// <summary>
-    /// Gets the <see cref="DataverseSettings"/> from the <see cref="DataverseConnectionString"/>.
-    /// </summary>
-    public DataverseSettings DataverseConnectionSettings
-    {
-        get
-        {
-            var cs = DataverseConnectionString.Split(';').Select(s => s.Split('=')).ToDictionary(s => s[0].Trim(), s => s[1].Trim(), StringComparer.OrdinalIgnoreCase);
-            if (!cs.TryGetValue(UrlKey, out var url)) throw new InvalidOperationException($"The connection string is missing the '{UrlKey}' key.");
-            if (!cs.TryGetValue(ClientIdKey, out var clientId)) throw new InvalidOperationException($"The connection string is missing the '{ClientIdKey}' key.");
-            if (!cs.TryGetValue(CiientSecretKey, out var clientSecret)) throw new InvalidOperationException($"The connection string is missing the '{CiientSecretKey}' key.");
-            if (!cs.TryGetValue(TenantIdKey, out var tenantId)) throw new InvalidOperationException($"The connection string is missing the '{TenantIdKey}' key.");
-            return new DataverseSettings(url, clientId, clientSecret, tenantId);
-        }
-    }
-
-    /// <summary>
-    /// Gets the Dataverse OData endpoint from the <see cref="DataverseConnectionString"/>.
-    /// </summary>
-    public Uri DataverseODataEndpoint => new(DataverseConnectionSettings.Address, "/api/data/v9.2/");
-
-    /// <summary>
-    /// Represents the resuluting <see cref="DataverseConnectionSettings"/>.
-    /// </summary>
-    public class DataverseSettings
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataverseSettings"/> class.
-        /// </summary>
-        internal DataverseSettings(string url, string clientId, string clientSecret, string tenantId)
-        {
-            Address = new Uri(url);
-            ClientId = clientId;
-            ClientSecret = clientSecret;
-            TenantId = tenantId;
-        }
-
-        /// <summary>
-        /// Gets the address <see cref="Uri"/>.
-        /// </summary>
-        public Uri Address { get; }
-
-        /// <summary>
-        /// Gets the client identifier.
-        /// </summary>
-        public string ClientId { get; }
-
-        /// <summary>
-        /// Gets the client secret.
-        /// </summary>
-        public string ClientSecret { get; } 
-
-        /// <summary>
-        /// Gets the tenant identifier.
-        /// </summary>
-        public string TenantId { get; }
-    }
-}
-```
-
-The _Dataverse_ connection string is stored in the `appsettings.json` file:
-
-``` json
-{
-  "ConnectionStrings": {
-	"Dataverse": "Url=https://<your-tenant>.crm.dynamics.com;ClientId=<your-client-id>;ClientSecret=<your-client-secret>;TenantId=<your-tenant-id>"
-  }
-}
-```
-
-<br/>
-
-### Authentication
-
-The _Dataverse_ authentication is handled by leveraging a [`DelegatingHandler`](https://learn.microsoft.com/en-us/aspnet/web-api/overview/advanced/http-message-handlers) to perform the authentication (uses [MSAL.NET](https://learn.microsoft.com/en-us/entra/msal/dotnet/getting-started/instantiate-confidential-client-config-options)), cache the token, and add the `Authorization` header to each request.
-
-``` csharp
-public class DataverseAuthenticationHandler : DelegatingHandler
-{
-    private readonly SemaphoreSlim _semaphore = new(1, 1);
-    private readonly SyncSettings _settings;
-    private AuthenticationResult? _authResult;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DataverseAuthenticationHandler"/> class.
-    /// </summary>
-    /// <param name="settings">The <see cref="SyncSettings"/>.</param>
-    public DataverseAuthenticationHandler(SyncSettings settings) => _settings = settings.ThrowIfNull();
-
-    /// <inheritdoc/>
-    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-    {
-        // Verify and renew token if needed.
-        await VerifyAndRenewTokenAsync(cancellationToken).ConfigureAwait(false);
-
-        // Set the authorization bearer token.
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", _authResult!.AccessToken);
-
-        // Honor the commitment to keep calling down the chain.
-        return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
-    }
-
-    /// <summary>
-    /// Verifies and renews the token if needed: first time, has expired, or will expire in less than 5 minutes - then get token and cache for improved performance.
-    /// </summary>
-    private async Task VerifyAndRenewTokenAsync(CancellationToken cancellationToken)
-    {
-        // First time, has expired, or will expire in less than 5 minutes, then get token - token cached for performance.
-        var expiryLimit = DateTimeOffset.UtcNow.AddMinutes(5);
-        if (_authResult == null || _authResult.ExpiresOn <= expiryLimit)
-        {
-            await _semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
-            {
-                // Recheck in case another thread has already renewed the token.
-                if (_authResult == null || _authResult.ExpiresOn <= expiryLimit)
-                {
-                    var dcs = _settings.DataverseConnectionSettings;
-                    var authority = new Uri($"https://login.microsoftonline.com/{dcs.TenantId}");
-
-                    var app = ConfidentialClientApplicationBuilder
-                        .Create(dcs.ClientId)
-                        .WithClientSecret(dcs.ClientSecret)
-                        .WithAuthority(authority)
-                        .Build();
-
-                    var scopes = new List<string> { new Uri(dcs.Address, "/.default").AbsoluteUri };
-                    _authResult = await app.AcquireTokenForClient(scopes).ExecuteAsync(cancellationToken).ConfigureAwait(false);
-                }
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
-    }
-}
-```
-
-<br/>
-
-### Dataverse Client
-
-Extend to the [`ODataClient`](./ODataClient.cs) to provide the specific _Dataverse_ implementation. The [`ODataArgs`](./ODataArgs.cs) can be used to configure the `ODataClient` to derive specific behavior where applicable.
-
-``` csharp
-using Soc = Simple.OData.Client;
-
-public class DataverseClient : ODataClient
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DataverseClient"/> class.
-    /// </summary>
-    /// <param name="client">The <see cref="Soc.ODataClient"/>.</param>
-    /// <param name="mapper">The <see cref="IMapper"/>.</param>
-    public DataverseClient(Soc.ODataClient client, IMapper mapper) : base(client, mapper)
-    {
-        Args = new ODataArgs { PreReadOnUpdate = false };
-    }
-}
-```
-
-### Registration
-
-At application start up the dependency injection (DI) needs to be configured; comprised of the following:
-- Register the `DataverseClient` as scoped; assumes that the `IMapper` has also been configured.
-- Register the `Soc.ODataClient` as scoped; instantiates a new `Soc.ODataClientSettings` with the _named_ `HttpClient`.
-- Register the `DataverseAuthenticationHandler` as a singleton; to ensure the underlying token is used for all requests.
-- Register the `HttpClient` with a name of `"dataverse"`; also configured with the `DataverseAuthenticationHandler`.
-
-``` csharp
-// Configure the Dataverse required services.
-Services
-    .AddScoped<DataverseClient>()
-    .AddScoped(sp =>
-    {
-        var hc = sp.GetRequiredService<IHttpClientFactory>().CreateClient("dataverse");
-        var socs = new Soc.ODataClientSettings(hc);
-        return new Soc.ODataClient(socs);
-    })
-    .AddSingleton<DataverseAuthenticationHandler>() // Singleton to ensure the underlying token is reused.
-    .AddHttpClient("dataverse", (sp, client) => client.BaseAddress = sp.GetRequiredService<SyncSettings>().DataverseODataEndpoint)
-        .AddHttpMessageHandler<DataverseAuthenticationHandler>();
-```
\ No newline at end of file
diff --git a/src/CoreEx.OData/strong-name-key.snk b/src/CoreEx.OData/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.OData/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.RefData/AGENTS.md b/src/CoreEx.RefData/AGENTS.md
new file mode 100644
index 00000000..d061093c
--- /dev/null
+++ b/src/CoreEx.RefData/AGENTS.md
@@ -0,0 +1,118 @@
+# CoreEx.RefData — AI Usage Guide
+
+Provides the reference data (lookup table) framework: typed base classes, thread-safe collections, a hybrid-cache-backed orchestrator, and code-serialization support.
+
+## Preferred Approach — Code Generation
+
+The canonical way to introduce reference data is through the **`*.CodeGen` project** (`ref-data.yaml` + `CoreEx.CodeGen`). This is the deterministic, preferred pattern used across all sample domains. Code generation produces:
+
+| Generated output | Description |
+|---|---|
+| `*.g.cs` — `ReferenceData<TSelf>` partial class | The typed reference data contract |
+| `*.g.cs` — `ReferenceDataCollection<TSelf>` class | Thread-safe, cache-friendly collection |
+| `*.g.cs` — `IReferenceDataRepository` | Repository interface for loading from the database |
+| `*.g.cs` — `ReferenceDataRepository` | EF Core implementation of the repository |
+| `*.g.cs` — `IReferenceDataProvider` / `ReferenceDataService` | Orchestrator provider wiring all types together |
+| `*.g.cs` — `ReferenceDataController` | API controller exposing all reference data types |
+
+### `ref-data.yaml` — the single source of truth
+
+Declare every reference data type in `ref-data.yaml` inside the `*.CodeGen` project:
+
+```yaml
+collectionSortOrder: Code
+repository: EntityFramework
+entities:
+- name: MovementStatus
+- name: UnitOfMeasure
+  plural: UnitsOfMeasure
+  properties:
+  - name: Scale
+    type: int
+```
+
+Run the `*.CodeGen` project to regenerate all `*.g.cs` outputs. Never edit generated files directly.
+
+### Hand-authored partial — `const string` code values
+
+After generation, add a hand-authored `partial class` alongside the generated one to declare the known code values as `const string` fields:
+
+```csharp
+// MovementStatus.cs — hand-authored alongside MovementStatus.g.cs
+public partial class MovementStatus
+{
+    public const string Pending   = "P";
+    public const string Confirmed = "C";
+    public const string Canceled  = "X";
+}
+```
+
+Use these constants directly in business logic and validators — no runtime lookup required:
+
+```csharp
+if (movement.Status == MovementStatus.Pending) { ... }
+```
+
+### Registration
+
+Register the generated `IReferenceDataProvider` with the orchestrator, then dynamically register all generated services and repositories:
+
+```csharp
+// Program.cs
+builder.Services
+    .AddReferenceDataOrchestrator<ReferenceDataService>()   // generated IReferenceDataProvider
+    ...
+
+// Dynamic registration discovers ReferenceDataService and ReferenceDataRepository via [ScopedService]
+builder.Services.AddDynamicServicesUsing<ReferenceDataService, ReferenceDataRepository>();
+```
+
+The orchestrator resolves `IHybridCache` from DI to cache loaded collections. Register FusionCache separately — see [CoreEx.Caching.FusionCache](../CoreEx.Caching.FusionCache/README.md).
+
+---
+
+## ReferenceDataCodeCollection — Wire Serialization
+
+For properties that serialise as a list of string codes on the wire but expose typed reference data objects in code:
+
+```csharp
+public class Order : IIdentifier<Guid>
+{
+    // Serialized as ["E","A"] on the wire; exposes ICollection<BasketStatus> in code
+    public ReferenceDataCodeCollection<BasketStatus> AllowedStatuses { get; set; } = [];
+}
+```
+
+## Date Validity
+
+Reference data items with `StartsOn`/`EndsOn` control `IsValid` at runtime. The validation date defaults to `Runtime.UtcNow` but can be overridden per-request by injecting `IReferenceDataContext` (registered as a scoped service) and setting its `Date` property.
+
+```csharp
+// Override the validation date for the current request scope
+public class MyService(IReferenceDataContext refDataContext)
+{
+    public void SetValidationDate(DateTimeOffset date)
+        => refDataContext.Date = date;
+
+    // Override for a specific type only
+    public void SetValidationDateForType(DateTimeOffset date)
+        => refDataContext[typeof(DiscountCoupon)] = date;
+}
+```
+
+## Do Not
+
+- Do not hand-write the `ReferenceData<TSelf>` class, collection, repository, service, or controller — use `ref-data.yaml` and the `*.CodeGen` project to generate them.
+- Do not edit `*.g.cs` files — they are overwritten on every generation run.
+- Do not load reference data collections on every request — the orchestrator caches via `IHybridCache`; load functions are called only on a cache miss.
+- Do not access reference data in `static` constructors — the orchestrator must be resolved from DI at runtime.
+- Do not use `ReferenceDataCodeCollection<T>` for single-value fields — use a plain `Code` string property on the contract instead.
+
+## Further Reading
+
+- [README](./README.md) — full `ReferenceData`, `ReferenceDataCollection`, `ReferenceDataHybridCache`, and `ReferenceDataOrchestrator` API reference.
+- [CoreEx.Caching.FusionCache](../CoreEx.Caching.FusionCache/README.md) — recommended `IHybridCache` implementation for `ReferenceDataHybridCache`.
+- [CoreEx](../CoreEx/README.md) — defines `IReferenceData`, `IReferenceDataCollection`, and `ReferenceDataOrchestrator`.
+- [Contracts layer](../../samples/docs/contracts-layer.md) — how reference-data contracts are declared with `[ReferenceData]` and consumed via code properties in entity contracts.
+- [Infrastructure layer](../../samples/docs/infrastructure-layer.md) — reference-data repository implementation and cache registration in real sample code.
+- [Tooling](../../samples/docs/tooling.md) — how `ref-data.yaml` and `*.CodeGen` drive generation of the full reference-data controller/service/repository layer.
diff --git a/src/CoreEx.RefData/Abstractions/README.md b/src/CoreEx.RefData/Abstractions/README.md
new file mode 100644
index 00000000..6374d591
--- /dev/null
+++ b/src/CoreEx.RefData/Abstractions/README.md
@@ -0,0 +1,30 @@
+# CoreEx.RefData.Abstractions
+
+> Provides the core abstract implementations for reference data items and collections: the identity, validity, mapping, and thread-safe indexing infrastructure from which all concrete reference data types derive.
+
+## Overview
+
+`CoreEx.RefData.Abstractions` contains `ReferenceDataCore<TId>` and `ReferenceDataCollectionCore<TId, TRef>` — the two foundational abstract classes that all reference data types and their collections build on top of. These types are intentionally separated from the concrete specializations (`ReferenceData<TSelf>`, `ReferenceDataCollection<TRef>`, etc.) to allow advanced scenarios such as custom Id types or alternative collection strategies without coupling to the framework defaults.
+
+`ReferenceDataCore<TId>` defines the canonical property contract: `Id`, `Code`, `Text`, `Description`, `SortOrder`, `IsActive`, `StartsOn`, `EndsOn`, `IsValid`, and `IsInactive`. Text and Description are resolved through `LText` on each get so they honour the ambient locale. Equality and hashing use only `Id` and `Code` to remain key-stable across context switches. Invalid state can be forced via `SetInvalid` to represent items that failed mapping or were rejected by the orchestrator.
+
+`ReferenceDataCollectionCore<TId, TRef>` manages items in concurrent dictionaries keyed by both `Id` and `Code`, enforces uniqueness at add time (throwing `InvalidOperationException` on duplicate Id or Code), and exposes `GetItems(sortOrder, activeOnly, isValid)` returning a stable, sorted `IEnumerable<TRef>`. An internal `StringComparer` for Code comparisons is injected at construction, defaulting to `OrdinalIgnoreCase`.
+
+## Key capabilities
+
+- 🧱 **Canonical reference data contract**: `ReferenceDataCore<TId>` exposes the full set of reference data properties, value-semantic equality keyed on `Id`/`Code`, JSON property-order attributes for consistent serialization, and read/write access compatible with EF Core and other ORMs.
+- 🔍 **Orchestrator lookup hooks**: static `TryGetById` and `TryGetByCode` members are wired to the ambient `ReferenceDataOrchestrator`, allowing any reference data type to resolve itself without an injected dependency.
+- 📋 **Thread-safe dual-key indexing**: `ReferenceDataCollectionCore<TId, TRef>` maintains separate `ConcurrentDictionary` caches for Id and Code lookups, with a reader— writer — locked `List<TRef>` backing store for `GetItems` ordering.
+- **Validity and active filtering**: `GetItems` accepts optional `activeOnly` and `isValid` flags; item validity is evaluated against the ambient `ReferenceDataContext` date, so temporal reference data is correctly filtered at read time.
+- **Extensible initialization**: `OnInitialization()` is called at the end of the collection constructor, providing a clean hook for subclass-specific setup without overriding the constructor.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| _[`ReferenceDataCore<TId>`](./ReferenceDataCore.cs)_ | Abstract base for all reference data; defines `Id`, `Code`, `Text`, `Description`, `SortOrder`, `IsActive`, `StartsOn`/`EndsOn`, `IsValid`, `IsInactive`, and mapping support. Equality and hash code use `Id` and `Code`. |
+| _[`ReferenceDataCollectionCore<TId, TRef>`](./ReferenceDataCollectionCore.cs)_ | Abstract base for reference data collections; maintains concurrent Id-keyed and Code-keyed dictionaries, enforces duplicate-key constraints at add time, and exposes sorted/filtered `GetItems`. |
+
+## Related namespaces
+
+- **[`CoreEx.RefData`](../README.md)** - Contains the concrete `ReferenceData<TSelf>`, `ReferenceData<TId, TSelf>`, `ReferenceDataCollection<TRef>`, and `ReferenceDataCollection<TId, TRef>` specializations built on top of these abstractions.
\ No newline at end of file
diff --git a/src/CoreEx.RefData/Abstractions/ReferenceDataCollectionCore.cs b/src/CoreEx.RefData/Abstractions/ReferenceDataCollectionCore.cs
new file mode 100644
index 00000000..10a27954
--- /dev/null
+++ b/src/CoreEx.RefData/Abstractions/ReferenceDataCollectionCore.cs
@@ -0,0 +1,325 @@
+namespace CoreEx.RefData.Abstractions;
+
+/// <summary>
+/// Represents the core <see cref="IReferenceDataCollection{TId, TRef}"/> implementation.
+/// </summary>
+/// <typeparam name="TId">The <see cref="IReferenceData.Id"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TRef">The <see cref="IReferenceData{TId}"/> <see cref="Type"/>.</typeparam>
+/// <remarks>This class leverages dictionaries internally to manage the items and as such there is no implied order when using the likes of the <see cref="GetEnumerator"/>; use 
+/// <see cref="GetItems(CoreEx.RefData.ReferenceDataSortOrder?, bool?, bool?)"/> to achieve desired ordering where applicable. 
+/// <para>The <see cref="IReferenceData"/> <see cref="IReferenceData.Id"/> and <see cref="IReferenceData.Code"/> must be both unique.</para></remarks>
+public abstract class ReferenceDataCollectionCore<TId, TRef> : IReferenceDataCollection<TId, TRef>, ICollection<TRef> where TRef : class, IReferenceData<TId>
+{
+#if NET9_0_OR_GREATER
+    private readonly Lock _lock = new();
+#else
+    private readonly object _lock = new();
+#endif
+    private readonly ConcurrentDictionary<object, TRef> _rdcId = new();
+    private readonly ConcurrentDictionary<string, TRef> _rdcCode;
+    private Dictionary<(string, object?), TRef>? _mappingsDict;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCollection{TItem, TId}"/> class.
+    /// </summary>
+    /// <param name="sortOrder">The default <see cref="ReferenceDataSortOrder"/> for the collection. Defaults to <see cref="ReferenceDataSortOrder.SortOrder"/>.</param>
+    /// <param name="codeComparer">The <see cref="StringComparer"/> for <see cref="IReferenceData.Code"/> comparisons. Defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>.</param>
+    internal ReferenceDataCollectionCore(ReferenceDataSortOrder sortOrder = ReferenceDataSortOrder.SortOrder, StringComparer? codeComparer = null)
+    {
+        SortOrder = sortOrder;
+        _rdcCode = new ConcurrentDictionary<string, TRef>(codeComparer ?? StringComparer.OrdinalIgnoreCase);
+    }
+
+    /// <summary>
+    /// Gets the default <see cref="ReferenceDataSortOrder"/> used by <see cref="GetItems"/>.
+    /// </summary>
+    [JsonIgnore]
+    public ReferenceDataSortOrder SortOrder { get; }
+
+    /// <summary>
+    /// Gets the item for the specified <see cref="IReferenceData.Code"/>.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <returns>The item where found; otherwise, <see langword="null"/>.</returns>
+    public TRef? this[string code] => _rdcCode[code];
+
+    /// <inheritdoc/>
+    public void Clear()
+    {
+        lock (_lock)
+        {
+            _rdcId.Clear();
+            _rdcCode.Clear();
+            _mappingsDict?.Clear();
+        }
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>The underlying <see cref="IReferenceData.Mappings"/> are included during add; if they are maintained (see <see cref="IReferenceData.SetMapping{T}(string, T)"/>) after these will not be included.</remarks>
+    public void Add(TRef item)
+    {
+        item.ThrowIfNull();
+        item.Id.ThrowIfNull();
+        item.Code.ThrowIfNullOrEmpty();
+
+        lock (_lock)
+        {
+            if (_rdcId.Values.Contains(item))
+                throw new ArgumentException($"Item already exists within the collection.", nameof(item));
+
+            if (_rdcId.ContainsKey(item.Id))
+                throw new ArgumentException($"Item with Id '{item.Id}' already exists within the collection.", nameof(item));
+
+            if (_rdcCode.ContainsKey(item.Code))
+                throw new ArgumentException($"Item with Code '{item.Code!}' already exists within the collection.", nameof(item));
+
+            if (item.HasMappings)
+            {
+                _mappingsDict ??= [];
+
+                // Make sure there are no duplicates.
+                foreach (var map in item.Mappings!)
+                {
+                    if (_mappingsDict.ContainsKey((map.Key, map.Value)))
+                        throw new ArgumentException($"Item with Mapping Key '{map.Key}' and Value '{map.Value}' already exists within the collection.");
+                }
+
+                // Now add 'em in.
+                foreach (var map in item.Mappings)
+                {
+                    _mappingsDict.Add((map.Key, map.Value), item);
+                }
+            }
+
+            // Add to the underlying dictionaries.
+            _rdcId.TryAdd(item.Id, item);
+            _rdcCode.TryAdd(item.Code, item);
+        }
+    }
+
+    /// <summary>
+    /// Adds items from the <paramref name="source"/>.
+    /// </summary>
+    /// <param name="source">The source <see cref="IEnumerable{T}"/>.</param>
+    public void AddRange(IEnumerable<TRef> source)
+    {
+        if (source is null)
+            return;
+
+        foreach (var item in source)
+        {
+            Add(item);
+        }
+    }
+
+    /// <summary>
+    /// Adds items from the <paramref name="source"/> asynchronously.
+    /// </summary>
+    /// <param name="source">The source <see cref="IQueryable{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns></returns>
+    public async Task AddRangeAsync(IQueryable<TRef> source, CancellationToken cancellationToken = default)
+    {
+        if (source is IAsyncEnumerable<TRef> ae)
+            await AddRangeAsync(ae, cancellationToken).ConfigureAwait(false);
+
+        AddRange(source);
+    }
+
+    /// <summary>
+    /// Adds items from the <paramref name="source"/> asynchronously.
+    /// </summary>
+    /// <param name="source">The source <see cref="IAsyncEnumerable{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task AddRangeAsync(IAsyncEnumerable<TRef>? source, CancellationToken cancellationToken = default)
+    {
+        if (source is not null)
+        {
+            await foreach (TRef item in source.WithCancellation(cancellationToken).ConfigureAwait(false))
+            {
+                Add(item);
+            }
+        }
+    }
+
+    /// <inheritdoc/>
+    public bool ContainsId(TId id) => _rdcId.ContainsKey(id.ThrowIfNull());
+
+    /// <inheritdoc/>
+    public bool TryGetById(TId id, [NotNullWhen(true)] out TRef? item)
+    {
+        if (id is not null)
+            return _rdcId.TryGetValue(id, out item);
+
+        item = default;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public TRef? GetById(TId id) => id is null ? default : _rdcId[id];
+
+    /// <inheritdoc/>
+    public bool ContainsCode(string code) => _rdcCode.ContainsKey(code);
+
+    /// <inheritdoc/>
+    public bool TryGetByCode(string code, [NotNullWhen(true)] out TRef? item)
+    {
+        if (code is not null)
+            return _rdcCode.TryGetValue(code, out item);
+
+        item = default;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public TRef? GetByCode(string code) => code is null ? default : _rdcCode[code];
+
+    /// <inheritdoc/>
+    public bool ContainsMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T> => _mappingsDict is not null && _mappingsDict.ContainsKey((name, value));
+
+    /// <inheritdoc/>
+    bool IReferenceDataCollection.TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out IReferenceData? item)
+    {
+        var r = TryGetByMapping<T>(name, value, out TRef? itemx);
+        item = itemx;
+        return r;
+    }
+
+    /// <inheritdoc/>
+    public bool TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out TRef? item) where T : IComparable<T>, IEquatable<T>
+    {
+        if (_mappingsDict is not null)
+            return _mappingsDict.TryGetValue((name, value), out item);
+
+        item = default;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    public TRef? GetByMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T> => TryGetByMapping(name, value, out var item) ? item : default;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    IEnumerable<IReferenceData> IReferenceDataCollection.AllItems => AllList;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    IEnumerable<IReferenceData> IReferenceDataCollection.ActiveItems => ActiveList;
+
+    /// <summary>
+    /// Gets a list of all items (excluding where <i>not</i> <see cref="IsItemValid(TRef)"/>) sorted by the <see cref="SortOrder"/> value.
+    /// </summary>
+    /// <value>An <see cref="IList{T}"/> containing the selected items.</value>
+    /// <remarks>This is provided as a property to more easily support binding; it encapsulates the following method invocation: <c><see cref="GetItems"/>(SortOrder, null, true);</c></remarks>
+    [JsonIgnore]
+    public IList<TRef> AllList => GetItems(SortOrder, null, true);
+
+    /// <summary>
+    /// Gets a list of all active (<see cref="IsItemActive(TRef)"/> and <see cref="IsItemValid(TRef)"/>) items sorted by the <see cref="SortOrder"/> value.
+    /// </summary>
+    /// <value>An <see cref="IList{TItem}"/> containing the selected items.</value>
+    /// <remarks>This is provided as a property to more easily support binding; it encapsulates the following method invocation: <c><see cref="GetItems"/>(SortOrder, true, null);</c></remarks>
+    [JsonIgnore]
+    public IList<TRef> ActiveList => GetItems(SortOrder, true, null);
+
+    /// <summary>
+    /// Gets a list of <typeparamref name="TRef"/> items from the collection using the specified criteria.
+    /// </summary>
+    /// <param name="sortOrder">Defines the <see cref="ReferenceDataSortOrder"/>; <see langword="null"/> indicates to use the defined <see cref="SortOrder"/>.</param>
+    /// <param name="isActive">Indicates whether the list should include values with the same <see cref="IReferenceData.IsInactive"/> value; otherwise, <see langword="null"/> indicates all.</param>
+    /// <param name="isValid">Indicates whether the list should include values with the same <see cref="IsItemValid"/> value; otherwise, <see langword="null"/> indicates all.</param>
+    /// <remarks>This is leveraged by <see cref="AllList"/> and <see cref="ActiveList"/>. Where both the <paramref name="isActive"/> and <paramref name="isValid"/> are provided they are treated like a logical <i>AND</i>.</remarks>
+    public List<TRef> GetItems(ReferenceDataSortOrder? sortOrder = null, bool? isActive = null, bool? isValid = true)
+    {
+        if (_rdcId.IsEmpty)
+            return [];
+
+        var list = from rd in _rdcId.Values select rd;
+        if (isActive is not null)
+            list = list.Where(item => isActive.Value ? IsItemActive(item) : !IsItemActive(item));
+
+        if (isValid is not null)
+            list = list.Where(item => isValid.Value ? IsItemValid(item) : !IsItemValid(item));
+
+        list = (sortOrder ?? SortOrder) switch
+        {
+            ReferenceDataSortOrder.Id => list.OrderBy(x => x.Id),
+            ReferenceDataSortOrder.Code => list.OrderBy(x => x.Code),
+            ReferenceDataSortOrder.Text => list.OrderBy(x => x.Text).ThenBy(x => x.Code),
+            _ => list.OrderBy(x => x.SortOrder).ThenBy(x => x.Text).ThenBy(x => x.Code)
+        };
+
+        return [.. list];
+    }
+
+    /// <summary>
+    /// Determines whether the <paramref name="item"/> is considered active and therefore accessible from within the collection.
+    /// </summary>
+    /// <param name="item">The item to validate.</param>
+    /// <returns><see langword="true"/> indicates active; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>By default checks <see cref="IReferenceData.IsInactive"/>.</remarks>
+    protected virtual bool IsItemActive(TRef item) => !item.IsInactive;
+
+    /// <summary>
+    /// Determines whether the <paramref name="item"/> is considered valid and therefore accessible from within the collection.
+    /// </summary>
+    /// <param name="item">The item to validate.</param>
+    /// <returns><see langword="true"/> indicates valid; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>By default checks <see cref="IReferenceData.IsValid"/>.</remarks>
+    protected virtual bool IsItemValid(TRef item) => item.IsValid;
+
+    #region ICollection
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public ICollection<TId> Keys => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public ICollection<TRef> Values => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public int Count => _rdcId.Count;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    bool ICollection<TRef>.IsReadOnly => false;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public bool IsSynchronized => false;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public object SyncRoot => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    public bool Contains(TRef item) => _rdcId.Values.Contains(item);
+
+    /// <inheritdoc/>
+    void ICollection<TRef>.CopyTo(TRef[] array, int arrayIndex) => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    bool ICollection<TRef>.Remove(TRef item) => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    /// <remarks>Only items that are <see cref="IsItemValid(TRef)"/> are enumerated. There is no implied sort order; use <see cref="GetItems(ReferenceDataSortOrder?, bool?, bool?)"/> for sorted lists.</remarks>
+    public IEnumerator<TRef> GetEnumerator()
+    {
+        foreach (TRef item in _rdcId.Values)
+        {
+            if (IsItemValid(item))
+                yield return item;
+        }
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Only items that are <see cref="IsItemValid(TRef)"/> are enumerated. There is no implied sort order; use <see cref="GetItems(ReferenceDataSortOrder?, bool?, bool?)"/> for sorted lists.</remarks>
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    /// <inheritdoc/>
+    public void CopyTo(Array array, int index) => throw new NotSupportedException();
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/Abstractions/ReferenceDataCore.cs b/src/CoreEx.RefData/Abstractions/ReferenceDataCore.cs
new file mode 100644
index 00000000..40e503be
--- /dev/null
+++ b/src/CoreEx.RefData/Abstractions/ReferenceDataCore.cs
@@ -0,0 +1,145 @@
+namespace CoreEx.RefData.Abstractions;
+
+/// <summary>
+/// Represents the core <see cref="IReferenceData{TId}"/> implementation.
+/// </summary>
+/// <typeparam name="TId">The <see cref="IIdentifier{TId}"/> <see cref="Type"/>.</typeparam>
+/// <remarks>The <see cref="object.Equals(object?)"/> and <see cref="object.GetHashCode"/> overrides only use the <see cref="Id"/> and <see cref="Code"/> properties. The other properties are considered
+/// superfluous from an equality perspective. The <see cref="Id"/> and <see cref="Code"/> properties should be both unique within their owning collection; the <see cref="ReferenceDataCollectionCore{TId, TRef}"/>
+/// ensures this.</remarks>
+[DebuggerDisplay("Id = {Id}, Code = {Code}, IsActive = {IsActive}, IsValid = {IsValid}")]
+public abstract class ReferenceDataCore<TId> : IReferenceData<TId>
+{
+    private string? _text;
+    private string? _description;
+    private bool _isActive = true;
+    private bool _isValid = true;
+    private ConcurrentDictionary<string, object?>? _mappings;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCore{TId}"/> class.
+    /// </summary>
+    internal ReferenceDataCore() => Id = default!;
+
+    /// <inheritdoc/>
+    object? IReferenceData.Id { get => Id; init => Id = (TId)value!; }
+
+    /// <inheritdoc/>
+    [JsonPropertyOrder(-999)]
+    public TId Id { get; init; }
+
+    /// <inheritdoc/>
+    [JsonPropertyOrder(-998)]
+    public string? Code { get; init; }
+
+    /// <inheritdoc/>
+    /// <remarks>The text is localized on get using an <see cref="LText"/>. The <see cref="LText.KeyAndOrText"/> is automatically set to the <see cref="Type.FullName"/> + '.' + <see cref="Code"/>; eg. '<c>Contoso.Products.Contracts.Brand.YETI</c>'.
+    /// <para>Use <see cref="GetText"/> to get the original (non-localized) text.</para></remarks>
+    [JsonPropertyOrder(-997)]
+    public string? Text { get => new LText($"{GetType().FullName}:{Code ?? "?"}", _text).ToString(); init => _text = value; }
+
+    /// <inheritdoc/>
+    /// <remarks>The description is localized on get using an <see cref="LText"/>. The <see cref="LText.KeyAndOrText"/> is automatically set to the <see cref="Type.FullName"/> + '.' + <see cref="Code"/> + 'Description'; eg. '<c>Contoso.Products.Contracts.Brand.YETI.Description</c>'.
+    /// <para>Use <see cref="GetDescription"/> to get the original (non-localized) description.</para></remarks>
+    [JsonPropertyOrder(-996)]
+    public string? Description { get => new LText($"{GetType().FullName}:{Code ?? "?"}.{nameof(Description)}", _description).ToString(); init => _description = value; }
+
+    /// <inheritdoc/>
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
+    [JsonPropertyOrder(-995)]
+    public int SortOrder { get; init; }
+
+    /// <inheritdoc/>
+    [JsonPropertyOrder(-994)]
+    public virtual bool IsInactive
+    {
+        get
+        {
+            if (!_isValid || !_isActive)
+                return true;
+
+            if (StartsOn is not null || EndsOn is not null)
+            {
+                var ctx = ExecutionContext.GetService<IReferenceDataContext>();
+                var date = ctx is null ? Runtime.UtcNow : ctx[GetType()];
+
+                if (StartsOn is not null && date < StartsOn)
+                    return true;
+
+                if (EndsOn is not null && date > EndsOn)
+                    return true;
+            }
+
+            return !_isActive;
+        }
+
+        init => _isActive = !value;
+    }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public bool IsActive => !IsInactive;
+
+    /// <inheritdoc/>
+    [JsonPropertyOrder(-993)]
+    public DateTimeOffset? StartsOn { get; init; }
+
+    /// <inheritdoc/>
+    [JsonPropertyOrder(-992)]
+    public DateTimeOffset? EndsOn { get; init; }
+
+    /// <inheritdoc/>
+    public string? ETag { get; init; }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public bool IsValid => _isValid;
+
+    /// <inheritdoc/>
+    void IReferenceData.SetInvalid() => _isValid = false;
+
+    /// <inheritdoc/>
+    public override string ToString() => Text ?? Code ?? Id?.ToString() ?? base.ToString()!;
+
+    /// <inheritdoc/>
+    public string? GetText() => _text;
+
+    /// <inheritdoc/>
+    public string? GetDescription() => _description;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public bool HasMappings => _mappings is not null && !_mappings.IsEmpty;
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public IReadOnlyDictionary<string, object?>? Mappings => _mappings is null ? null : new ReadOnlyDictionary<string, object?>(_mappings);
+
+    /// <inheritdoc/>
+    public void SetMapping<T>(string name, T? value) where T : IComparable<T?>, IEquatable<T?>
+        => (_mappings ??= new()).AddOrUpdate(name, _ => value, (_, _) => value);
+
+    /// <inheritdoc/>
+    public bool TryGetMapping<T>(string name, [NotNullWhen(true)] out T? value) where T : IComparable<T?>, IEquatable<T?>
+    {
+        value = default!;
+        if (!HasMappings || !_mappings!.TryGetValue(name, out var val))
+            return false;
+
+        value = (T?)val!;
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode() => HashCode.Combine(Id, Code);
+
+    /// <inheritdoc/>
+    public override bool Equals(object? obj)
+    {
+        if (obj is null) return false;
+        if (ReferenceEquals(this, obj)) return true;
+        if (obj is not IReferenceData rd) return false;
+
+        return Equals(Id, rd.Id) && Equals(Code, rd.Code);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/CoreEx.RefData.csproj b/src/CoreEx.RefData/CoreEx.RefData.csproj
new file mode 100644
index 00000000..2a17d8a4
--- /dev/null
+++ b/src/CoreEx.RefData/CoreEx.RefData.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>CoreEx .NET Reference Data extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data caching hybrid-cache</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.RefData/CoreExReferenceDataExtensions.DependencyInjection.cs b/src/CoreEx.RefData/CoreExReferenceDataExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..783b004e
--- /dev/null
+++ b/src/CoreEx.RefData/CoreExReferenceDataExtensions.DependencyInjection.cs
@@ -0,0 +1,51 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class CoreExReferenceDataExtensions
+{
+    /// <summary>
+    /// Adds the <see cref="ReferenceDataOrchestrator"/> created by the <paramref name="orchestratorFactory"/> as a singleton service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="orchestratorFactory">The function to create the <see cref="ReferenceDataOrchestrator"/>.</param>
+    /// <param name="healthCheck">Indicates whether a corresponding <see cref="ReferenceDataOrchestratorHealthCheck"/> should be configured.</param>
+    /// <param name="healthCheckName">The health check name; defaults to '<c>reference-data-orchestrator</c>'.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    /// <remarks>Also, registers the <see cref="ReferenceDataHybridCache"/> as the required <see cref="IReferenceDataCache"/> scoped service.</remarks>
+    public static IServiceCollection AddReferenceDataOrchestrator(this IServiceCollection services, Func<IServiceProvider, ReferenceDataOrchestrator> orchestratorFactory, bool healthCheck = true, string? healthCheckName = "reference-data-orchestrator")
+    {
+        services.ThrowIfNull().AddSingleton(sp => orchestratorFactory(sp));
+        if (healthCheck)
+            services.AddHealthChecks().AddTypeActivatedCheck<ReferenceDataOrchestratorHealthCheck>(healthCheckName ?? "reference-data-orchestrator", null, tags: HealthCheckTags.StartUpAndReadyOnly);
+
+        services.TryAddScoped<IReferenceDataCache>(sp => new ReferenceDataHybridCache(sp.GetService<IHybridCache>() ?? ActivatorUtilities.GetServiceOrCreateInstance<MemoryOnlyHybridCache>(sp)));
+        return services;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="ReferenceDataOrchestrator"/> using an <see cref="IReferenceDataCache"/> as a singleton service automatically registering the <see cref="IReferenceDataProvider"/> (see <see cref="ReferenceDataOrchestrator.Register"/>).
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="healthCheck">Indicates whether a corresponding <see cref="ReferenceDataOrchestratorHealthCheck"/> should be configured.</param>
+    /// <param name="healthCheckName">The health check name; defaults to '<c>reference-data-orchestrator</c>'.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    /// <remarks>Where an <see cref="IReferenceDataCache"/> has not been registered then the <see cref="ReferenceDataHybridCache"/> will be used by default.</remarks>
+    public static IServiceCollection AddReferenceDataOrchestrator(this IServiceCollection services, bool healthCheck = true, string? healthCheckName = "reference-data-orchestrator")
+        => AddReferenceDataOrchestrator(services, sp => new ReferenceDataOrchestrator(sp, sp.GetRequiredService<ILogger<ReferenceDataOrchestrator>>()).Register(), healthCheck, healthCheckName);
+
+    /// <summary>
+    /// Adds the <see cref="ReferenceDataOrchestrator"/> using an <see cref="IReferenceDataCache"/> as a singleton service automatically registering the specified <typeparamref name="TProvider"/> (see <see cref="ReferenceDataOrchestrator.Register"/>).
+    /// </summary>
+    /// <typeparam name="TProvider">The <see cref="IReferenceDataProvider"/> to register.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="healthCheck">Indicates whether a corresponding <see cref="ReferenceDataOrchestratorHealthCheck"/> should be configured.</param>
+    /// <param name="healthCheckName">The health check name; defaults to '<c>reference-data-orchestrator</c>'.</param>
+    /// <returns>The <see cref="IServiceCollection"/>.</returns>
+    /// <remarks>Where an <see cref="IReferenceDataCache"/> has not been registered then the <see cref="ReferenceDataHybridCache"/> will be used by default.</remarks>
+    public static IServiceCollection AddReferenceDataOrchestrator<TProvider>(this IServiceCollection services, bool healthCheck = true, string? healthCheckName = "reference-data-orchestrator") where TProvider : IReferenceDataProvider
+        => AddReferenceDataOrchestrator(services, sp => new ReferenceDataOrchestrator(sp, sp.GetRequiredService<ILogger<ReferenceDataOrchestrator>>()).Register<TProvider>(), healthCheck, healthCheckName);
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/GlobalUsing.cs b/src/CoreEx.RefData/GlobalUsing.cs
new file mode 100644
index 00000000..5252a61d
--- /dev/null
+++ b/src/CoreEx.RefData/GlobalUsing.cs
@@ -0,0 +1,19 @@
+global using CoreEx;
+global using CoreEx.Abstractions;
+global using CoreEx.Caching;
+global using CoreEx.Entities;
+global using CoreEx.HealthChecks;
+global using CoreEx.Localization;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.RefData.HealthChecks;
+global using CoreEx.Results;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Logging;
+global using System.Collections;
+global using System.Collections.Concurrent;
+global using System.Collections.ObjectModel;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/src/CoreEx.RefData/HealthChecks/README.md b/src/CoreEx.RefData/HealthChecks/README.md
new file mode 100644
index 00000000..fca40a38
--- /dev/null
+++ b/src/CoreEx.RefData/HealthChecks/README.md
@@ -0,0 +1,24 @@
+# CoreEx.RefData.HealthChecks
+
+> Provides ASP.NET Core health-check integration for the `ReferenceDataOrchestrator`, reporting the full list of registered reference data types as health-check data.
+
+## Overview
+
+`CoreEx.RefData.HealthChecks` exposes `ReferenceDataOrchestratorHealthCheck`, a single `IHealthCheck` implementation that returns a healthy result and attaches the names of every type registered with the ambient `ReferenceDataOrchestrator` as diagnostic data. This lets operations teams confirm which reference data types are available in a deployed service without requiring access to the application internals.
+
+The check always returns `Healthy` — it is a diagnostic aid rather than a fault detector. When reference data types fail to load at runtime, the failure is surfaced through the orchestrator's own exception propagation, not through this health check.
+
+## Key capabilities
+
+- ✅ **Always-healthy orchestrator probe**: `ReferenceDataOrchestratorHealthCheck` reports `Healthy` and attaches all registered type names, giving a quick confirmation that the orchestrator is configured and populated.
+- 📋 **Type enumeration data**: the health-check data dictionary contains one entry per registered reference data type; the keys and values are both the fully qualified type name, making the result easy to inspect in health-check dashboards.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ReferenceDataOrchestratorHealthCheck`](./ReferenceDataOrchestratorHealthCheck.cs)** | `IHealthCheck` implementation; calls `ReferenceDataOrchestrator.GetAllTypes()` and emits the result as health-check data with a `Healthy` status. |
+
+## Related namespaces
+
+- **[`CoreEx.RefData`](../README.md)** - Root namespace containing the orchestrator and cache that this health check monitors.
\ No newline at end of file
diff --git a/src/CoreEx.RefData/HealthChecks/ReferenceDataOrchestratorHealthCheck.cs b/src/CoreEx.RefData/HealthChecks/ReferenceDataOrchestratorHealthCheck.cs
new file mode 100644
index 00000000..6565c87c
--- /dev/null
+++ b/src/CoreEx.RefData/HealthChecks/ReferenceDataOrchestratorHealthCheck.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.RefData.HealthChecks;
+
+/// <summary>
+/// Provides a <see cref="ReferenceDataOrchestrator"/> <see cref="IHealthCheck"/>.
+/// </summary>
+/// <param name="orchestrator">The <see cref="ReferenceDataOrchestrator"/>.</param>
+public class ReferenceDataOrchestratorHealthCheck(ReferenceDataOrchestrator orchestrator) : IHealthCheck
+{
+    private readonly ReferenceDataOrchestrator _orchestrator = orchestrator.ThrowIfNull();
+
+    /// <inheritdoc/>
+    /// <remarks>Will always return <see cref="HealthCheckResult.Healthy"/>.</remarks>
+    public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        var data = new Dictionary<string, object>
+        {
+            { "types", _orchestrator.GetAllTypes().Select(x => x.Name).ToArray() }
+        };
+
+        return Task.FromResult(HealthCheckResult.Healthy(null, data));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/README.md b/src/CoreEx.RefData/README.md
new file mode 100644
index 00000000..b89ddaa5
--- /dev/null
+++ b/src/CoreEx.RefData/README.md
@@ -0,0 +1,50 @@
+# CoreEx.RefData
+
+> Provides the CoreEx reference data framework: typed base classes for reference data items and collections, a hybrid-cache-backed orchestrator, contextual date-validity checking, and a code-serialization collection.
+
+## Overview
+
+`CoreEx.RefData` implements the domain concept of reference data — lookup tables (e.g. Status, Country, Currency) that are read frequently and change rarely. Items carry an `Id`, a `Code`, `Text`, `Description`, `SortOrder`, `IsActive`, and optional `StartsOn`/`EndsOn` date range, all of which participate in validity checking via `ReferenceDataContext`.
+
+Two concrete base classes cover the most common identity types: `ReferenceData<TSelf>` (string `Id`) and `ReferenceData<TId, TSelf>` (arbitrary `TId`). Each exposes static `TryGetById` and `TryGetByCode` helpers that delegate to the ambient `ReferenceDataOrchestrator` registered in the DI container. Collections are thread-safe dictionaries keyed by both `Id` and `Code`; `GetItems` returns a stable, sorted `IEnumerable` by `ReferenceDataSortOrder`.
+
+`ReferenceDataHybridCache` implements `IReferenceDataCache` on top of `IHybridCache`, using per-type semaphores to ensure that only one thread performs the expensive load while others wait, then everyone benefits from the cached result. `ReferenceDataCodeCollection<TRef>` solves the serialization problem: a property declared as a list of codes is stored as `List<string?>` on the wire but exposes `ICollection<TRef>` at the domain level.
+
+## Key capabilities
+
+- 📚 **Typed reference data base classes**: `ReferenceData<TSelf>` (string Id) and `ReferenceData<TId, TSelf>` (typed Id) provide `Id`, `Code`, `Text`, `Description`, `SortOrder`, `IsActive`, `StartsOn`/`EndsOn`, mapping support, and `ThrowIfInactive`/`ThrowIfInvalid` guards.
+- 📋 **Thread-safe collections**: `ReferenceDataCollection<TRef>` and `ReferenceDataCollection<TId, TRef>` index items by both `Id` and `Code` (case-insensitive by default) and expose `GetItems(sortOrder, activeOnly, isValid)` for filtered, ordered enumeration.
+- 🔄 **Hybrid-cache backing**: `ReferenceDataHybridCache` implements `IReferenceDataCache` via `IHybridCache`; per-type semaphores prevent thundering-herd on cold start and support configurable entry options per item type via `OnCreateCacheEntry`.
+- 📅 **Contextual date validity**: `ReferenceDataContext` supplies the reference date used to evaluate `StartsOn`/`EndsOn` on every item; the date can be set globally or overridden per type, defaulting to `Runtime.UtcNow`.
+- 🌐 **Localised text and description**: `Text` and `Description` are resolved through `LText` on every get, enabling locale-specific display strings without changing the domain model.
+- 🏷 **Code-serialization collection**: `ReferenceDataCodeCollection<TRef>` stores codes as `List<string?>` for wire serialization while presenting an `ICollection<TRef>` interface backed by the live orchestrator lookups.
+- 🔧 **DI and health-check helpers**: `AddReferenceDataOrchestrator` and related `IServiceCollection` extensions register the orchestrator and cache; `ReferenceDataOrchestratorHealthCheck` exposes a health-check endpoint reporting all registered reference data types.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| _[`ReferenceData<TSelf>`](./ReferenceDataT.cs)_ | Abstract reference data base with `string` Id; provides static `TryGetById`/`TryGetByCode`, implicit/explicit `string` cast operators, and `IComparable<TSelf>` by code. |
+| _[`ReferenceData<TId, TSelf>`](./ReferenceDataT2.cs)_ | Abstract reference data base with arbitrary typed `TId`; same feature set as `ReferenceData<TSelf>` but with both Id and Code lookups. |
+| **[`ReferenceDataCollection<TRef>`](./ReferenceDataCollectionT.cs)** | Thread-safe `IReferenceDataCollection` with string `Id`; indexes by Id and Code, default sort by `ReferenceDataSortOrder.SortOrder`. |
+| **[`ReferenceDataCollection<TId, TRef>`](./ReferenceDataCollectionT2.cs)** | Thread-safe `IReferenceDataCollection` with typed `TId`; otherwise identical to the string variant. |
+| **[`ReferenceDataCodeCollection<TRef>`](./ReferenceDataCodeCollection.cs)** | Serializes a reference data relationship as a `List<string?>` of codes on the wire while presenting `ICollection<TRef>` at the domain level. |
+| **[`ReferenceDataHybridCache`](./ReferenceDataHybridCache.cs)** | `IReferenceDataCache` implementation backed by `IHybridCache`; per-type semaphores enforce single-loader semantics on cache miss; supports per-type entry-option customisation via `OnCreateCacheEntry`. |
+| **[`ReferenceDataContext`](./ReferenceDataContext.cs)** | Supplies the contextual date used to evaluate `StartsOn`/`EndsOn` validity; settable globally or per reference data type. |
+| **[`ReferenceDataSortOrder`](./ReferenceDataSortOrder.cs)** | Enum: `SortOrder`, `Id`, `Code`, `Text`; controls the ordering returned by `GetItems`. |
+
+## Namespaces
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.RefData.Abstractions`** | Core abstract implementations: `ReferenceDataCore<TId>` and `ReferenceDataCollectionCore<TId, TRef>` providing the full identity, validity, mapping, and collection infrastructure. | [📖 README](./Abstractions/README.md) |
+| **`CoreEx.RefData.HealthChecks`** | `ReferenceDataOrchestratorHealthCheck` — reports all registered reference data types to the ASP.NET Core health-check endpoint. | [📖 README](./HealthChecks/README.md) |
+
+## Related namespaces
+
+- **[`CoreEx`](../CoreEx/README.md)** - Defines `IReferenceData`, `IReferenceDataCollection`, `IReferenceDataCache`, `ReferenceDataOrchestrator`, and `IHybridCache` consumed throughout.
+- **[`CoreEx.Caching.FusionCache`](../CoreEx.Caching.FusionCache/README.md)** - `FusionHybridCache` is the recommended `IHybridCache` implementation for backing `ReferenceDataHybridCache` in production.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataCodeCollection.cs b/src/CoreEx.RefData/ReferenceDataCodeCollection.cs
new file mode 100644
index 00000000..f4076abb
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataCodeCollection.cs
@@ -0,0 +1,80 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Provides a special purpose <see cref="IReferenceData"/> collection specifically for managing a referenced list of <i>serialization identifiers</i>, being the underlying <see cref="IReferenceData.Code"/>.
+/// </summary>
+public class ReferenceDataCodeCollection<TRef> : IReferenceDataCodeCollection, ICollection<TRef> where TRef : IReferenceData, new()
+{
+    private readonly List<string?> _codes;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCodeCollection{TRef}"/> class.
+    /// </summary>
+    public ReferenceDataCodeCollection() => _codes = [];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCodeCollection{TRef}"/> class with a reference to an external <see cref="IReferenceData.Code"/> list.
+    /// </summary>
+    /// <param name="codes">A reference to the external <see cref="IReferenceData.Code"/> list; it is this list that will be maintained by this collection.</param>
+    public ReferenceDataCodeCollection(ref List<string?>? codes) => _codes = codes ?? [];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCodeCollection{TRef}"/> class with a list of items.
+    /// </summary>
+    /// <param name="items">The list of <see cref="IReferenceData"/> items.</param>
+    public ReferenceDataCodeCollection(IEnumerable<TRef> items) => _codes = [.. (items ?? []).Select(x => x.Code)];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCodeCollection{TRef}"/> class with a <see cref="IReferenceData.Code"/> array.
+    /// </summary>
+    /// <param name="codes">The <see cref="IReferenceData.Code"/> array.</param>
+    public ReferenceDataCodeCollection(params IEnumerable<string?> codes) => _codes = [.. codes];
+
+    /// <inheritdoc/>
+    public bool HasInvalidItems => this.Any(x => x is null || !x.IsValid);
+
+    /// <inheritdoc/>
+    public bool HasInactiveItems => this.Any(x => x is not null && x.IsValid && !x.IsActive);
+
+    /// <inheritdoc/>
+    public int Count => _codes.Count;
+
+    /// <inheritdoc/>
+    public List<string?> ToCodeList() => [.. _codes];
+
+    /// <inheritdoc/>
+    public IEnumerable<IReferenceData> ToRefDataList() => [.. this];
+
+    /// <inheritdoc/>
+    public bool IsReadOnly => ((IList)_codes).IsReadOnly;
+
+    /// <inheritdoc/>
+    public void Add(TRef item) => _codes.Add(item?.Code);
+
+    /// <inheritdoc/>
+    public void Clear() => _codes.Clear();
+
+    /// <inheritdoc/>
+    public bool Contains(TRef item) => ((IList)_codes).Contains(item);
+
+    /// <inheritdoc/>
+    public void CopyTo(TRef[] array, int arrayIndex) => ((IList)_codes).CopyTo(array, arrayIndex);
+
+    /// <inheritdoc/>
+    public IEnumerator<TRef> GetEnumerator()
+    {
+        foreach (string? code in _codes)
+        {
+            yield return ReferenceDataOrchestrator.TryGetByCode<TRef>(code, out var item) ? item : item;
+        }
+    }
+
+    /// <inheritdoc/>
+    public int IndexOf(TRef item) => _codes.IndexOf(item?.Code);
+
+    /// <inheritdoc/>
+    public bool Remove(TRef item) => _codes.Remove(item?.Code);
+
+    /// <inheritdoc/>
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataCollectionT.cs b/src/CoreEx.RefData/ReferenceDataCollectionT.cs
new file mode 100644
index 00000000..dad219e7
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataCollectionT.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Represents a generic <see cref="IReferenceDataCollection{TId, TRef}"/> implementation where the <see cref="IReferenceData.Id"/> <see cref="Type"/> is a <see cref="string"/>.
+/// </summary>
+/// <typeparam name="TRef">The <see cref="IReferenceData{TId}"/> <see cref="Type"/>.</typeparam>
+/// <remarks>This class leverages dictionaries internally to manage the items and as such there is no implied order when using the likes of the <see cref="IEnumerator"/>; use 
+/// <see cref="ReferenceDataCollectionCore{TId, TRef}.GetItems(CoreEx.RefData.ReferenceDataSortOrder?, bool?, bool?)"/> to achieve desired ordering where applicable.</remarks>
+public class ReferenceDataCollection<TRef> : ReferenceDataCollectionCore<string, TRef>, ICollection<TRef> where TRef : class, IReferenceData<string>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCollection{TItem, TId}"/> class.
+    /// </summary>
+    /// <param name="sortOrder">The <see cref="ReferenceDataSortOrder"/>. Defaults to <see cref="ReferenceDataSortOrder.SortOrder"/>.</param>
+    /// <param name="codeComparer">The <see cref="StringComparer"/> for <see cref="IReferenceData.Code"/> comparisons. Defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>.</param>
+    public ReferenceDataCollection(ReferenceDataSortOrder sortOrder = ReferenceDataSortOrder.SortOrder, StringComparer? codeComparer = null) : base(sortOrder, codeComparer) => OnInitialization();
+
+    /// <summary>
+    /// Provides an opportunity to extend initialization when the object is constructed.
+    /// </summary>
+    protected virtual void OnInitialization() { }
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataCollectionT2.cs b/src/CoreEx.RefData/ReferenceDataCollectionT2.cs
new file mode 100644
index 00000000..b3a2b810
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataCollectionT2.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Represents a generic <see cref="IReferenceDataCollection{TId, TRef}"/> implementation where the <see cref="IReferenceData.Id"/> <see cref="Type"/> is specified with the <typeparamref name="TId"/>.
+/// </summary>
+/// <typeparam name="TId">The <see cref="IReferenceData.Id"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TRef">The <see cref="IReferenceData{TId}"/> <see cref="Type"/>.</typeparam>
+/// <remarks>This class leverages dictionaries internally to manage the items and as such there is no implied order when using the likes of the <see cref="IEnumerator"/>; use 
+/// <see cref="ReferenceDataCollectionCore{TId, TRef}.GetItems(CoreEx.RefData.ReferenceDataSortOrder?, bool?, bool?)"/> to achieve desired ordering where applicable.</remarks>
+public class ReferenceDataCollection<TId, TRef> : ReferenceDataCollectionCore<TId, TRef>, ICollection<TRef> where TRef : class, IReferenceData<TId>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ReferenceDataCollection{TItem, TId}"/> class.
+    /// </summary>
+    /// <param name="sortOrder">The <see cref="ReferenceDataSortOrder"/>. Defaults to <see cref="ReferenceDataSortOrder.SortOrder"/>.</param>
+    /// <param name="codeComparer">The <see cref="StringComparer"/> for <see cref="IReferenceData.Code"/> comparisons. Defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>.</param>
+    public ReferenceDataCollection(ReferenceDataSortOrder sortOrder = ReferenceDataSortOrder.SortOrder, StringComparer? codeComparer = null) : base(sortOrder, codeComparer) => OnInitialization();
+
+    /// <summary>
+    /// Provides an opportunity to extend initialization when the object is constructed.
+    /// </summary>
+    protected virtual void OnInitialization() { }
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataContext.cs b/src/CoreEx.RefData/ReferenceDataContext.cs
new file mode 100644
index 00000000..7961b44c
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataContext.cs
@@ -0,0 +1,40 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Provides the contextual validation <see cref="Date"/> for a <see cref="IReferenceData.StartsOn"/> and <see cref="IReferenceData.EndsOn"/> <see cref="IReferenceData.IsValid"/> verification.
+/// </summary>
+public class ReferenceDataContext : IReferenceDataContext
+{
+    private DateTimeOffset? _date;
+    private readonly ConcurrentDictionary<Type, DateTimeOffset?> _coll = new();
+
+    /// <summary>
+    /// Gets or sets the <see cref="IReferenceData"/> <see cref="IReferenceData.StartsOn"/> and <see cref="IReferenceData.EndsOn"/> contextual validation date.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="Runtime.UtcNow"/>.</remarks>
+    public DateTimeOffset? Date
+    {
+        get => _date ??= Runtime.UtcNow;
+        set => _date = value;
+    }
+
+    /// <summary>
+    /// Gets or sets a contextual validation date for a specific <see cref="IReferenceData"/> <paramref name="type"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <returns>The contextual validation date.</returns>
+    public DateTimeOffset? this[Type type]
+    {
+        get => (_coll.TryGetValue(type.ThrowIfNull(), out var date) ? date : Date) ?? Date;
+        set => _coll.AddOrUpdate(type, _ => value, (_, _) => value);
+    }
+
+    /// <summary>
+    /// Resets all dates.
+    /// </summary>
+    public void Reset()
+    {
+        _date = null;
+        _coll.Clear();
+    }
+}
diff --git a/src/CoreEx.RefData/ReferenceDataHybridCache.TypedInvoker.cs b/src/CoreEx.RefData/ReferenceDataHybridCache.TypedInvoker.cs
new file mode 100644
index 00000000..349374e2
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataHybridCache.TypedInvoker.cs
@@ -0,0 +1,45 @@
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace CoreEx.RefData;
+
+public partial class ReferenceDataHybridCache
+{
+    /*
+     * This functionality is required as the underlying cache *may* leverage serialization, and as such, we have to get it in a typed manner as IReferenceDataCollection (interface) is not valid.
+     */
+
+    private static readonly MethodInfo TryGetByKeyAsync_OpenGeneric = typeof(IHybridCache).GetMethod(nameof(IHybridCache.TryGetByKeyAsync)) ?? throw new InvalidOperationException($"{nameof(IHybridCache)}.{nameof(IHybridCache.TryGetByKeyAsync)} public instance method not found.");
+    private static readonly ConcurrentDictionary<Type, TryGetByKeyInvoker> _invokers = new();
+
+    private delegate Task<(bool Exists, object? Value)> TryGetByKeyInvoker(IHybridCache cache, string key, HybridCacheEntryOptions options, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets (or adds) the <see cref="TryGetByKeyInvoker"/> for the specified type.
+    /// </summary>
+    private static TryGetByKeyInvoker GetInvokerForType(Type type) => _invokers.GetOrAdd(type, type =>
+    {
+        // Close the generic: TryGetByKeyAsync<T>
+        var closed = TryGetByKeyAsync_OpenGeneric.MakeGenericMethod(type);
+
+        // Parameters: (cache, key, options, cancellationToken) =>
+        var cacheParam = Expression.Parameter(typeof(IHybridCache), "cache");
+        var keyParam = Expression.Parameter(typeof(string), "key");
+        var optParam = Expression.Parameter(typeof(HybridCacheEntryOptions), "options");
+        var ctParam = Expression.Parameter(typeof(CancellationToken), "cancellationToken");
+
+        // Expression: cache.TryGetByKeyAsync<TVal>(key, options, ct)
+        var call = Expression.Call(cacheParam, closed, keyParam, optParam, ctParam);
+
+        // Build method body: ToTupleTask<T>(call).
+        var method = typeof(ReferenceDataHybridCache).GetMethod(nameof(ToTupleTask), BindingFlags.NonPublic | BindingFlags.Static)!.MakeGenericMethod(type);
+        var body = Expression.Call(method, call);
+        var lambda = Expression.Lambda<TryGetByKeyInvoker>(body, cacheParam, keyParam, optParam, ctParam);
+        return lambda.Compile();
+    });
+
+    /// <summary>
+    /// Underlying method to invoke the typed <see cref="IHybridCache.TryGetByKeyAsync{T}"/>.
+    /// </summary>
+    private static async Task<(bool Exists, object? Value)> ToTupleTask<T>(Task<(bool Exists, T? Value)> task) => await task.ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataHybridCache.cs b/src/CoreEx.RefData/ReferenceDataHybridCache.cs
new file mode 100644
index 00000000..5c5e2dcd
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataHybridCache.cs
@@ -0,0 +1,100 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Provides <see cref="IReferenceDataCache"/> implementation using an <see cref="IHybridCache"/>.
+/// </summary>
+/// <param name="cache">The underlying <see cref="IHybridCache"/>.</param>
+public partial class ReferenceDataHybridCache(IHybridCache cache) : IReferenceDataCache
+{
+    private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphores = new();
+    private readonly ConcurrentDictionary<Type, HybridCacheEntryOptions> _entryOptions = new();
+#if NET8_0
+    private readonly object _lock = new();
+#else
+    private readonly Lock _lock = new();
+#endif
+
+    /// <summary>
+    /// Gets the underlying <see cref="IHybridCache"/>.
+    /// </summary>
+    public IHybridCache Cache { get; set; } = cache.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or creates the <see cref="HybridCacheEntryOptions"/> for the specified <paramref name="type"/>. 
+    /// </summary>
+    private HybridCacheEntryOptions GetOrCreateEntryOptions(Type type) => _entryOptions.GetOrAdd(type, _ =>
+    {
+        var options = HybridCacheEntryOptions.CreateForName(type.Name);
+        OnCreateCacheEntry(type, options);
+        return options;
+    });
+
+    /// <inheritdoc/>
+    public async Task<IReferenceDataCollection> GetOrCreateAsync(Type type, Func<Type, CancellationToken, Task<IReferenceDataCollection>> factory, CancellationToken cancellationToken = default)
+    {
+        var key = $"RefData:{(Internal.GetNamespaceFormattedName(type))}";
+        var options = GetOrCreateEntryOptions(type);
+
+        // Use invoker to ensure properly typed (needed for the likes of deserialization, where/if used).
+        var invoker = GetInvokerForType(type);
+
+        // Try and get as most likely already in the cache; where exists then exit fast.
+        var (Exists, Value) = await invoker(Cache, key, options, cancellationToken).ConfigureAwait(false);
+        if (Exists)
+            return (IReferenceDataCollection)Value!;
+
+        // A lock is also needed to absolutely ensure only a single semaphore is _ever_ created per type/key.
+        SemaphoreSlim semaphore;
+        lock (_lock)
+        {
+            // Get or add a new semaphore for the cache key so we can manage single concurrency for *this* key only.
+            semaphore = _semaphores.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
+        }
+
+        // Use the semaphore to manage a single thread to perform the "expensive" get operation.
+        await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
+        try
+        {
+            // Does a get or create as it may have been added as we went to lock.
+            return (await Cache.GetOrCreateByKeyAsync(key, async cancellationToken =>
+            {
+                return await factory(type, cancellationToken).ConfigureAwait(false) ?? throw new InvalidOperationException($"The '{type.Name}' (reference data) collection returned from the factory must not be null.");
+            }, options, cancellationToken).ConfigureAwait(false))!;
+        }
+        finally
+        {
+            semaphore.Release();
+        }
+    }
+
+    /// <summary>
+    /// Provides an opportunity to further configure the <see cref="HybridCacheEntryOptions"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <param name="entry">The <see cref="HybridCacheEntryOptions"/>.</param>
+    protected virtual void OnCreateCacheEntry(Type type, HybridCacheEntryOptions entry) { }
+
+    /// <summary>
+    /// Registers the <see cref="HybridCacheEntryOptions"/> for the specified <typeparamref name="TRefColl"/>.
+    /// </summary>
+    /// <typeparam name="TRefColl">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <param name="options">The <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <returns>The <see cref="ReferenceDataHybridCache"/> to support fluent-style method-chaining.</returns>
+    public ReferenceDataHybridCache RegisterCacheEntryOptions<TRefColl>(HybridCacheEntryOptions options) where TRefColl : IReferenceDataCollection => RegisterCacheEntryOptions(typeof(TRefColl), options);
+
+    /// <summary>
+    /// Registers the <see cref="HybridCacheEntryOptions"/> for the specified <paramref name="type"/> (should be a <see cref="IReferenceDataCollection"/> <see cref="Type"/>).
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/>.</param>
+    /// <param name="options">The <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <returns>The <see cref="ReferenceDataHybridCache"/> to support fluent-style method-chaining.</returns>
+    public ReferenceDataHybridCache RegisterCacheEntryOptions(Type type, HybridCacheEntryOptions options)
+    {
+        if (type.ThrowIfNull().GetInterface(nameof(IReferenceDataCollection)) == null)
+            throw new ArgumentException($"The specified '{type.Name}' is not a valid {nameof(IReferenceDataCollection)} type.", nameof(type));
+
+        options.ThrowIfNull();
+        _entryOptions[type] = options;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataSortOrder.cs b/src/CoreEx.RefData/ReferenceDataSortOrder.cs
new file mode 100644
index 00000000..5e74c881
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataSortOrder.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Provides the sort order for the reference data.
+/// </summary>
+public enum ReferenceDataSortOrder
+{
+    /// <summary>
+    /// Ordered by <see cref="IReferenceData.SortOrder"/>, then <see cref="IReferenceData.Text"/>, and finally <see cref="IReferenceData.Code"/> (default).
+    /// </summary>
+    SortOrder,
+
+    /// <summary>
+    /// Ordered by <see cref="IReferenceData"/> <see cref="IReferenceData.Id"/>.
+    /// </summary>
+    Id,
+
+    /// <summary>
+    /// Ordered by <see cref="IReferenceData.Code"/>.
+    /// </summary>
+    Code,
+
+    /// <summary>
+    /// Ordered by <see cref="IReferenceData.Text"/> and then <see cref="IReferenceData.Code"/>.
+    /// </summary>
+    Text
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataT.cs b/src/CoreEx.RefData/ReferenceDataT.cs
new file mode 100644
index 00000000..965701c3
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataT.cs
@@ -0,0 +1,75 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Represents a <see cref="IReferenceData{TId}"/> implementation where the <see cref="IReferenceData.Id"/> <see cref="Type"/> is a <see cref="string"/>.
+/// </summary>
+/// <typeparam name="TSelf">The reference data <see cref="Type"/> itself.</typeparam>
+/// <remarks>The underlying implicit/explicit <see cref="string"/> casting only supports <see cref="IReferenceData.Code"/> as there is no means to distinguish between it and the <see cref="IIdentifier{TId}.Id"/> where they are of type <see cref="string"/>.</remarks>
+[DebuggerDisplay("Id = {Id}, Code = {Code}, Text = {_text}, IsActive = {IsActive}")]
+public abstract partial class ReferenceData<TSelf> : ReferenceDataCore<string>, IComparable<TSelf>
+    where TSelf : ReferenceData<TSelf>, IReferenceData<string>, new()
+{
+    /// <summary>
+    /// Throws an <see cref="InvalidOperationException"/> where <see cref="ReferenceDataCore{TId}.IsInactive"/>; otherwise, continues.
+    /// </summary>
+    /// <returns>The instance itself to support fluent-style method-chaining.</returns>
+    /// <remarks>This does verify whether the reference data is invalid also.</remarks>
+    public TSelf ThrowIfInactive()
+    {
+        ThrowIfInvalid();
+        if (IsInactive)
+            throw new InvalidOperationException("The reference data must not be in an inactive state.");
+
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="InvalidOperationException"/> where not <see cref="IReferenceData.IsValid"/>; otherwise, continues.
+    /// </summary>
+    /// <returns>The instance itself to support fluent-style method-chaining.</returns>
+    /// <remarks>This does not verify whether the reference data is inactive.</remarks>
+    public TSelf ThrowIfInvalid()
+    {
+        if (!IsValid)
+            throw new InvalidOperationException("The reference data must not be in an invalid state.");
+
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Tries to get the <typeparamref name="TSelf"/> <see cref="IReferenceData"/> item for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData{TId}"/> <see cref="IReferenceData.Id"/>.</param>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.
+    /// <para>This leverages the <see cref="ReferenceDataOrchestrator.TryGetById{TRef, TId}(TId, out TRef)"/> internally to perform.</para></remarks>
+    public static bool TryGetById(string id, out TSelf item) => ReferenceDataOrchestrator.TryGetById(id, out item);
+
+    /// <summary>
+    /// Tries to get the <typeparamref name="TSelf"/> <see cref="IReferenceData"/> item for the specified <paramref name="code"/>.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.
+    /// <para>This leverages the <see cref="ReferenceDataOrchestrator.TryGetByCode{TRef}(string?, out TRef)"/> internally to perform.</para></remarks>
+    public static bool TryGetByCode(string? code, out TSelf item) => ReferenceDataOrchestrator.TryGetByCode(code, out item);
+
+    /// <inheritdoc/>
+    /// <remarks>Comparison is based on the <see cref="IReferenceData.Code"/>.</remarks>
+    public int CompareTo(TSelf? other) => other is null ? 1 : Code?.CompareTo(other.Code) ?? 0;
+
+    /// <summary>
+    /// An explicit cast operator that converts a <paramref name="code"/> to a <typeparamref name="TSelf"/> <see cref="ReferenceData{TSelf}"/> instance.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    [return: NotNullIfNotNull(nameof(code))]
+    public static explicit operator ReferenceData<TSelf>?(string? code) => code is null ? null : TryGetByCode(code, out var item) ? item : item;
+
+    /// <summary>
+    /// An implicit cast operator that converts a <see cref="ReferenceData{TSelf}"/> to its <see cref="IReferenceData.Code"/> as a <see cref="string"/>.
+    /// </summary>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    public static implicit operator string(ReferenceData<TSelf>? item) => item?.Code!;
+}
\ No newline at end of file
diff --git a/src/CoreEx.RefData/ReferenceDataT2.cs b/src/CoreEx.RefData/ReferenceDataT2.cs
new file mode 100644
index 00000000..2a75c6a4
--- /dev/null
+++ b/src/CoreEx.RefData/ReferenceDataT2.cs
@@ -0,0 +1,88 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Represents a <see cref="IReferenceData{TId}"/> implementation where the <see cref="IReferenceData.Id"/> <see cref="Type"/> is specified with the <typeparamref name="TId"/>.
+/// </summary>
+/// <typeparam name="TId">The <see cref="IIdentifier{TId}"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The reference data <see cref="Type"/> itself.</typeparam>
+/// <remarks>The <see cref="ReferenceData{TSelf}"/> should be used where the <see cref="IReferenceData.Id"/> <see cref="Type"/> is to be a <see cref="string"/> as this is already optimized for this.</remarks>
+[DebuggerDisplay("Id = {Id}, Code = {Code}, Text = {_text}, IsActive = {IsActive}")]
+public abstract partial class ReferenceData<TId, TSelf> : ReferenceDataCore<TId>, IComparable<TSelf>
+    where TSelf : ReferenceData<TId, TSelf>, IReferenceData<TId>, new()
+{
+    /// <summary>
+    /// Throws an <see cref="InvalidOperationException"/> where <see cref="ReferenceDataCore{TId}.IsInactive"/>; otherwise, continues.
+    /// </summary>
+    /// <returns>The instance itself to support fluent-style method-chaining.</returns>
+    /// <remarks>This does verify whether the reference data is invalid also.</remarks>
+    public TSelf ThrowIfInactive()
+    {
+        ThrowIfInvalid();
+        if (IsInactive)
+            throw new InvalidOperationException("The reference data must not be in an inactive state.");
+
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="InvalidOperationException"/> where not <see cref="IReferenceData.IsValid"/>; otherwise, continues.
+    /// </summary>
+    /// <returns>The instance itself to support fluent-style method-chaining.</returns>
+    /// <remarks>This does not verify whether the reference data is inactive.</remarks>
+    public TSelf ThrowIfInvalid()
+    {
+        if (!IsValid)
+            throw new InvalidOperationException("The reference data must not be in an invalid state.");
+
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Tries to get the <typeparamref name="TSelf"/> <see cref="IReferenceData"/> item for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData{TId}"/> <see cref="IReferenceData.Id"/>.</param>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.
+    /// <para>This leverages the <see cref="ReferenceDataOrchestrator.TryGetById{TRef, TId}(TId, out TRef)"/> internally to perform.</para></remarks>
+    public static bool TryGetById(TId id, out TSelf item) => ReferenceDataOrchestrator.TryGetById(id.ThrowIfNull(), out item);
+
+    /// <summary>
+    /// Tries to get the <typeparamref name="TSelf"/> <see cref="IReferenceData"/> item for the specified <paramref name="code"/>.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.
+    /// <para>This leverages the <see cref="ReferenceDataOrchestrator.TryGetByCode{TRef}(string?, out TRef)"/> internally to perform.</para></remarks>
+    public static bool TryGetByCode(string? code, out TSelf item) => ReferenceDataOrchestrator.TryGetByCode(code, out item);
+
+    /// <inheritdoc/>
+    /// <remarks>Comparison is based on the <see cref="IReferenceData.Code"/>.</remarks>
+    public int CompareTo(TSelf? other) => other is null ? 1 : Code?.CompareTo(other.Code) ?? 0;
+
+    /// <summary>
+    /// An explicit cast operator that converts an <paramref name="id"/> to a <typeparamref name="TSelf"/> <see cref="ReferenceData{TId, TSelf}"/> instance.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData{TId}"/> <see cref="IReferenceData.Id"/>.</param>
+    public static explicit operator ReferenceData<TId, TSelf>(TId id) => TryGetById(id, out var item) ? item : item;
+
+    /// <summary>
+    /// An explicit cast operator that converts a <paramref name="code"/> to a <typeparamref name="TSelf"/> <see cref="ReferenceData{TId, TSelf}"/> instance.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    [return: NotNullIfNotNull(nameof(code))]
+    public static explicit operator ReferenceData<TId, TSelf>?(string? code) => code is null ? null : TryGetByCode(code, out var item) ? item : item;
+
+    /// <summary>
+    /// An implicit cast operator that converts a <see cref="ReferenceData{TId, TSelf}"/> to its identifier type <typeparamref name="TId"/>.
+    /// </summary>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    public static implicit operator TId(ReferenceData<TId, TSelf>? item) => item is null ? default! : item.Id!;
+
+    /// <summary>
+    /// An implicit cast operator that converts a <see cref="ReferenceData{TId, TSelf}"/> to its <see cref="IReferenceData.Code"/> as a <see cref="string"/>.
+    /// </summary>
+    /// <param name="item">The <typeparamref name="TSelf"/> instance.</param>
+    public static implicit operator string(ReferenceData<TId, TSelf>? item) => item?.Code!;
+}
\ No newline at end of file
diff --git a/src/CoreEx.Solace/CoreEx.Solace.csproj b/src/CoreEx.Solace/CoreEx.Solace.csproj
deleted file mode 100644
index c9c7539b..00000000
--- a/src/CoreEx.Solace/CoreEx.Solace.csproj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-	  <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-	  <RootNamespace>CoreEx.Solace</RootNamespace>
-	  <Product>CoreEx</Product>
-	  <Title>CoreEx .NET Standard Solace PubSub+ Extensions.</Title>
-	  <Description>CoreEx Solace PubSub+ Extensions.</Description>
-	  <PackageTags>coreex api function aspnet solace pubsubplus</PackageTags>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SolaceSystems.Solclient.Messaging" Version="10.27.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-	<Import Project="..\..\Common.targets" />
-
-</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Solace/PubSub/EventDataToPubSubMessageConverter.cs b/src/CoreEx.Solace/PubSub/EventDataToPubSubMessageConverter.cs
deleted file mode 100644
index 09d5a7ff..00000000
--- a/src/CoreEx.Solace/PubSub/EventDataToPubSubMessageConverter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using CoreEx.Text.Json;
-using System;
-using SolaceSystems.Solclient.Messaging;
-
-namespace CoreEx.Solace.PubSub
-{
-    /// <summary>
-    /// Converts an <see cref="EventData"/> to a <see cref="IMessage"/>.
-    /// </summary>
-    /// <remarks>Internally converts an <see cref="EventData"/> to a corresponding <see cref="EventSendData"/> using the <see cref="EventSerializer"/>, then converts to the <see cref="IMessage"/> using the <see cref="EventSendDataConverter"/>.</remarks>
-    /// <param name="eventSerializer">The <see cref="IEventSerializer"/> to serialize the <see cref="EventData"/> into a corresponding <see cref="EventSendData.Data"/>.</param>
-    /// <param name="valueConverter">The <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="IMessage"/>.</param>
-    public class EventDataToPubSubMessageConverter(IEventSerializer? eventSerializer = null, IValueConverter<EventSendData, IMessage>? valueConverter = null) : IValueConverter<EventData, IMessage>
-    {
-        /// <summary>
-        /// Gets the <see cref="IEventSerializer"/> to serialize the <see cref="EventData"/> into <see cref="BinaryData"/> for the <see cref="EventSendData.Data"/>.
-        /// </summary>
-        protected IEventSerializer EventSerializer { get; } = eventSerializer ?? ExecutionContext.GetService<IEventSerializer>() ?? new EventDataSerializer();
-
-        /// <summary>
-        /// Gets the <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="IMessage"/>.
-        /// </summary>
-        protected IValueConverter<EventSendData, IMessage> EventSendDataConverter { get; } = valueConverter ?? ExecutionContext.GetService<IValueConverter<EventSendData, IMessage>>() ?? new EventSendDataToPubSubConverter();
-
-        /// <inheritdoc/>
-        public IMessage Convert(EventData @event)
-        {
-            EventSerializer.EventDataFormatter.Format(@event);
-            var esd = new EventSendData(@event) { Data = Invoker.RunSync(() => EventSerializer.SerializeAsync(@event)) };
-            return EventSendDataConverter.Convert(esd);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Solace/PubSub/EventSendDataToPubSubConverter.cs b/src/CoreEx.Solace/PubSub/EventSendDataToPubSubConverter.cs
deleted file mode 100644
index d94abbca..00000000
--- a/src/CoreEx.Solace/PubSub/EventSendDataToPubSubConverter.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using SolaceSystems.Solclient.Messaging;
-using System;
-using System.Linq;
-using System.Net.Mime;
-
-namespace CoreEx.Solace.PubSub
-{
-    /// <summary>
-    /// Converts an <see cref="EventSendData"/> to a <see cref="IMessage"/>.
-    /// </summary>
-    public class EventSendDataToPubSubConverter : IValueConverter<EventSendData, IMessage>
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="EventSendData"/> property selection; where a property is selected it will be set as one of the <see cref="IMessage"/> properties.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="EventDataProperty.All"/>.</remarks>
-        public EventDataProperty PropertySelection { get; set; } = EventDataProperty.All;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Attributes"/> name for the <see cref="IMessage.UserPropertyMap"/>.
-        /// </summary>
-        /// <remarks>Defaults to '<c>_SessionId</c>'.</remarks>
-        public string SessionIdAttributeName { get; set; } = $"_{nameof(IMessage.ApplicationMessageId)}";
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Attributes"/> name for the <see cref="IMessage.TimeToLive"/>.
-        /// </summary>
-        /// <remarks>Defaults to '<c>_TimeToLive</c>'.</remarks>
-        public string TimeToLiveAttributeName { get; set; } = $"_{nameof(IMessage.TimeToLive)}";
-
-        /// <summary>
-        /// Indicates whether to use the <see cref="EventDataBase.PartitionKey"/> as the <see cref="IMessage.UserPropertyMap"/>.
-        /// </summary>
-        public bool UsePartitionKeyAsSessionId { get; set; } = true;
-
-        /// <inheritdoc/>
-        /// <remarks>By default the <see cref="SessionIdAttributeName"/> will be used to update the <see cref="IMessage.UserPropertyMap"/> from the <see cref="EventDataBase.Attributes"/>, followed by the
-        /// <see cref="UsePartitionKeyAsSessionId"/> option, until not <c>null</c>; otherwise, will be left as <c>null</c>.
-        /// <para>Similarily, the <see cref="TimeToLiveAttributeName"/> will be used to update the <see cref="IMessage.TimeToLive"/> from the <see cref="EventDataBase.Attributes"/>.</para></remarks>
-        public IMessage Convert(EventSendData @event)
-        {
-            var message = ContextFactory.Instance.CreateMessage();
-
-            message.BinaryAttachment = @event.Data?.ToArray() ?? [];
-            message.ApplicationMessageId = @event.Id;
-            message.HttpContentType = MediaTypeNames.Application.Json;
-            message.CorrelationId = @event.CorrelationId ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current.CorrelationId : null);
-
-            message.CreateUserPropertyMap();
-            message.UserPropertyMap.AddString("Subject", @event.Subject);
-
-            if (@event.Action != null && PropertySelection.HasFlag(EventDataProperty.Action))
-                message.UserPropertyMap.AddString(nameof(EventData.Action), @event.Action);
-
-            if (@event.Source != null && PropertySelection.HasFlag(EventDataProperty.Source))
-                message.UserPropertyMap.AddString(nameof(EventData.Source), @event.Source.ToString());
-
-            if (@event.Type != null && PropertySelection.HasFlag(EventDataProperty.Type))
-                message.UserPropertyMap.AddString(nameof(EventData.Type), @event.Type);
-
-            if (@event.TenantId != null && PropertySelection.HasFlag(EventDataProperty.TenantId))
-                message.UserPropertyMap.AddString(nameof(EventData.TenantId), @event.TenantId);
-
-            if (@event.PartitionKey != null && PropertySelection.HasFlag(EventDataProperty.PartitionKey))
-                message.UserPropertyMap.AddString(nameof(EventData.PartitionKey), @event.PartitionKey);
-
-            if (@event.ETag != null && PropertySelection.HasFlag(EventDataProperty.ETag))
-                message.UserPropertyMap.AddString(nameof(EventData.ETag), @event.ETag);
-
-            if (@event.Key != null && PropertySelection.HasFlag(EventDataProperty.Key))
-                message.UserPropertyMap.AddString(nameof(EventData.Key), @event.Key);
-
-            if (@event.Attributes != null && @event.Attributes.Count > 0 && PropertySelection.HasFlag(EventDataProperty.Attributes))
-            {
-                // Attrtibutes that start with an underscore are considered internal and will not be sent automatically; i.e. _SessionId and _TimeToLive.
-                foreach (var attribute in @event.Attributes.Where(x => !string.IsNullOrEmpty(x.Key) && !x.Key.StartsWith('_')))
-                {
-                    message.UserPropertyMap.AddString(attribute.Key, attribute.Value);
-                }
-            }
-
-            if (@event.Attributes != null && @event.Attributes.TryGetValue(SessionIdAttributeName, out var sessionId))
-                message.UserPropertyMap.AddString("SessionId", sessionId);
-            else if (@event.PartitionKey != null)
-                message.UserPropertyMap.AddString("SessionId", UsePartitionKeyAsSessionId ? @event.PartitionKey : string.Empty);
-
-            if (@event.Attributes != null && @event.Attributes.TryGetValue(TimeToLiveAttributeName, out var ttl) && TimeSpan.TryParse(ttl, out var timeToLive))
-                message.TimeToLive = (long)timeToLive.TotalMilliseconds;
-
-            return message;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Solace/PubSub/IPubSubSender.cs b/src/CoreEx.Solace/PubSub/IPubSubSender.cs
deleted file mode 100644
index 10a58486..00000000
--- a/src/CoreEx.Solace/PubSub/IPubSubSender.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-
-namespace CoreEx.Solace.PubSub
-{
-    /// <summary>
-    /// Defines the standardized <b>Event</b> sending via Solace PubSub+.
-    /// </summary>
-    public interface IPubSubSender : IEventSender { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Solace/PubSub/PubSubSender.cs b/src/CoreEx.Solace/PubSub/PubSubSender.cs
deleted file mode 100644
index a9d78ddf..00000000
--- a/src/CoreEx.Solace/PubSub/PubSubSender.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using Microsoft.Extensions.Logging;
-using SolaceSystems.Solclient.Messaging;
-
-namespace CoreEx.Solace.PubSub
-{
-    /// <summary>
-    /// Represents a PubSub <see cref="ISession"/> <see cref="IPubSubSender"/> (see also <seealso cref="IEventSender"/>).
-    /// </summary>
-    /// <remarks>See <see cref="EventSendDataToPubSubConverter"/> for details</remarks>
-    public class PubSubSender : IPubSubSender
-    {
-        private const string _unspecifiedQueueOrTopicName = "$default";
-        private static PubSubSenderInvoker? _invoker;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PubSubSender"/> class.
-        /// </summary>
-        /// <param name="solaceContext">The Solace <see cref="IContext"/>.</param>
-        /// <param name="sessionProperties">The Solace <see cref="SessionProperties"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="invoker">The optional <see cref="PubSubSenderInvoker"/>.</param>
-        /// <param name="converter">The optional <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="IMessage"/>.</param>
-        public PubSubSender(IContext solaceContext, SessionProperties sessionProperties, SettingsBase settings, ILogger<PubSubSender> logger, PubSubSenderInvoker? invoker = null, IValueConverter<EventSendData, IMessage>? converter = null)
-        {
-            SolaceContext = solaceContext.ThrowIfNull(nameof(solaceContext));
-            SessionProperties = sessionProperties.ThrowIfNull(nameof(sessionProperties));
-            Settings = settings.ThrowIfNull(nameof(settings));
-            Logger = logger.ThrowIfNull(nameof(logger));
-            Invoker = invoker ?? (_invoker ??= new PubSubSenderInvoker());
-            Converter = converter ?? new EventSendDataToPubSubConverter();
-            DefaultQueueOrTopicName = Settings.GetCoreExValue($"{GetType().Name}:QueueOrTopicName", defaultValue: _unspecifiedQueueOrTopicName);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IContext"/>.
-        /// </summary>
-        protected IContext SolaceContext { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="SessionProperties"/>.
-        /// </summary>
-        protected SessionProperties SessionProperties { get; }
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        protected SettingsBase Settings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        protected ILogger Logger { get; }
-
-        /// <summary>
-        /// Gets the <see cref="PubSubSenderInvoker"/>.
-        /// </summary>
-        protected PubSubSenderInvoker Invoker { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IValueConverter{TSource, TDestination}"/> to convert an <see cref="EventSendData"/> to a corresponding <see cref="IMessage"/>.
-        /// </summary>
-        protected IValueConverter<EventSendData, IMessage> Converter { get; }
-
-        /// <summary>
-        /// Gets or sets the default queue or topic name used by <see cref="SendAsync(IEnumerable{EventSendData}, CancellationToken)"/> where <see cref="EventSendData.Destination"/> is <c>null</c>.
-        /// </summary>
-        public string? DefaultQueueOrTopicName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum batch size for sending.
-        /// </summary>
-        /// <remarks>Defaults to <c>50</c>.</remarks>
-        public int MaxBatchSize { get; set; } = 50;
-
-        /// <inheritdoc/>
-        public Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellationToken = default)
-        {
-            if (events == null || !events.Any())
-                return Task.CompletedTask;
-
-            Invoker.Invoke(this, events, (_, events) =>
-            {
-                var totalCount = events.Count();
-                Logger.LogDebug("{TotalCount} events in total are to be sent.", totalCount);
-
-                if (totalCount == 0)
-                    return;
-
-                if (totalCount != events.Select(x => x.Id).Distinct().Count())
-                    throw new EventSendException(PrependStats($"All events must have a unique identifier ({nameof(EventSendData)}.{nameof(EventSendData.Id)}).", totalCount, totalCount), events);
-
-                // Sets up the list of unsent events.
-                var unsentEvents = new List<EventSendData>(events);
-
-                var queueDict = new Dictionary<string, Queue<(IMessage Message, int Index)>>();
-                var index = 0;
-                foreach (var @event in events)
-                {
-                    //Convert message
-                    var message = Converter.Convert(@event) ?? throw new EventSendException($"The {nameof(Converter)} must return a {nameof(IMessage)} instance.");
-
-                    var name = @event.Destination ?? DefaultQueueOrTopicName ?? throw new InvalidOperationException($"The {nameof(DefaultQueueOrTopicName)} must be specified where the {nameof(EventSendData)}.{nameof(EventSendData.Destination)} is null.");
-                    message.Destination = ContextFactory.Instance.CreateTopic(name);
-
-                    //Enqueue event message
-                    if (queueDict.TryGetValue(name, out var queue))
-                        queue.Enqueue((message, index++));
-                    else
-                    {
-                        queue = new Queue<(IMessage, int)>();
-                        queue.Enqueue((message, index++));
-                        queueDict.Add(name, queue);
-                    }
-                }
-
-                Logger.LogDebug("There are {QueueTopicCount} queues/topics specified; as such there will be that many batches sent as a minimum.", queueDict.Keys.Count);
-
-                // Establish session and dispose when done.
-                using var session = EstablishSessionToPubSubBroker();
-
-                // Get queue name by checking configuration override.
-                foreach (var qitem in queueDict)
-                {
-                    var n = qitem.Key == _unspecifiedQueueOrTopicName ? null : qitem.Key;
-                    var key = $"{GetType().Name}_QueueOrTopicName{(n is null ? "" : $"_{n}")}";
-                    var queue = qitem.Value;
-                    var sentIds = new List<string>();
-
-                    // Send in batches.
-                    while (queue.Count > 0)
-                    {
-                        sentIds.Clear();
-                        var messageBatch = new List<IMessage>();
-
-                        // Add the first message to the batch.
-                        var firstMsg = queue.Peek();
-                        messageBatch.Add(firstMsg.Message);
-                        sentIds.Add(firstMsg.Message.ApplicationMessageId);
-                        queue.Dequeue();
-
-                        // Keep adding until done or max size reached for batch.
-                        while (queue.Count > 0 && messageBatch.Count < MaxBatchSize)
-                        {
-                            messageBatch.Add(queue.Peek().Message);
-                            sentIds.Add(queue.Peek().Message.ApplicationMessageId);
-                            queue.Dequeue();
-                        }
-
-                        try
-                        {
-                            Logger.LogDebug("Sending {Count} message(s) to PubSub Broker.", messageBatch.Count);
-                            var returnCode = session.Send([.. messageBatch], 0, messageBatch.Count, out int sentCount);
-
-                            if (returnCode != ReturnCode.SOLCLIENT_OK)
-                            {
-                                Logger.LogDebug("{UnsentCount} of the total {TotalCount} events were not successfully sent.", unsentEvents.Count, totalCount);
-                                throw new EventSendException(PrependStats($"PubSubMessage send failed with return code {Enum.GetName(typeof(ReturnCode), returnCode)}.", totalCount, unsentEvents.Count), unsentEvents);
-                            }
-
-                            if (messageBatch.Count != sentCount)
-                            {
-                                Logger.LogDebug("{UnsentCount} of the total {TotalCount} events were not successfully sent.", unsentEvents.Count, totalCount);
-                                throw new InvalidOperationException("Not all messages in batch were sent; only {sentCount} of {messageBatch.Count} were sent.");
-                            }
-
-                            Logger.LogDebug("Successful send of {Count} message(s).", messageBatch.Count);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogDebug("{UnsentCount} of the total {TotalCount} events were not successfully sent.", unsentEvents.Count, totalCount);
-                            throw new EventSendException(PrependStats($"PubSubMessage cannot be sent: {ex.Message}", totalCount, unsentEvents.Count), ex, unsentEvents);
-                        }
-
-                        // Begin next batch after confirming sent events; continue ^ where any left.
-                        unsentEvents.RemoveAll(esd => sentIds.Contains(esd.Id ?? string.Empty));
-                    }
-                }
-
-                // Raise the event.
-                AfterSend?.Invoke(this, EventArgs.Empty);
-            }, nameof(SendAsync));
-
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Establishes the session to the PubSub broker.
-        /// </summary>
-        private ISession EstablishSessionToPubSubBroker()
-        {
-            Logger.LogDebug("Establishing Solace Session as {UserName}@{VPNName} on {Host} with SSL Trust Store directory {SSLTrustStoreDir}.", SessionProperties.UserName, SessionProperties.VPNName, SessionProperties.Host, SessionProperties.SSLTrustStoreDir);
-
-            var session = SolaceContext.CreateSession(SessionProperties, null, null);
-            var returnCode = session.Connect();
-            if (returnCode == ReturnCode.SOLCLIENT_OK)
-                return session;
-
-            session.Dispose();
-            throw new InvalidOperationException($"Cannot establish Solace PubSub broker session. Return code is {Enum.GetName(typeof(ReturnCode), returnCode)}.");
-        }
-
-        /// <summary>
-        /// Prepend the sent stats to the message.
-        /// </summary>
-        private static string PrependStats(string message, int totalCount, int unsentCount) => $"{unsentCount} of the total {totalCount} events were not successfully sent. {message}";
-
-        /// <inheritdoc/>
-        public event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Solace/PubSub/PubSubSenderInvoker.cs b/src/CoreEx.Solace/PubSub/PubSubSenderInvoker.cs
deleted file mode 100644
index 376cda15..00000000
--- a/src/CoreEx.Solace/PubSub/PubSubSenderInvoker.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Transactions;
-
-namespace CoreEx.Solace.PubSub
-{
-    /// <summary>
-    /// Provides the standard <see cref="PubSubSender"/> invoker functionality.
-    /// </summary>
-    /// <remarks>Suppresses the <see cref="TransactionScope"/> as Azure Service Bus does not support distributed transactions and this may be invoked in the context of an already enlisted transaction.</remarks>
-    public class PubSubSenderInvoker : InvokerBase<PubSubSender>
-    {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, PubSubSender invoker, Func<InvokeArgs, TResult> func)
-        {
-            TransactionScope? txn = null;
-            try
-            {
-                txn = new TransactionScope(TransactionScopeOption.Suppress, TransactionScopeAsyncFlowOption.Enabled);
-                return base.OnInvoke(invokeArgs, invoker, func);
-            }
-            finally
-            {
-                txn?.Dispose();
-            }
-        }
-
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, PubSubSender invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
-        {
-            TransactionScope? txn = null;
-            try
-            {
-                txn = new TransactionScope(TransactionScopeOption.Suppress, TransactionScopeAsyncFlowOption.Enabled);
-                return await base.OnInvokeAsync(invokeArgs, invoker, func, cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                txn?.Dispose();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Solace/README.md b/src/CoreEx.Solace/README.md
deleted file mode 100644
index 9d2aa843..00000000
--- a/src/CoreEx.Solace/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# CoreEx.Solace.PubSub
-
-Provides the key [Solace PubSub+ Event Broker](https://solace.com/products/event-broker/) capabilities, leveraging the [`SolaceSystems.Solclient.Messaging`](https://docs.solace.com/API/Messaging-APIs/dotNet-API/net-api-home.htm) library.
-
-<br/>
-
-## Publishing
-
-A _CoreEx_ [`PubSubSender`](./PubSub/PubSubSender.cs) provides the [`IEventSender.SendAsync`](../CoreEx/Events/IEventSender.cs) capabilities to batch send one or more events/mesages to PubSub+.
-
-<br/>
\ No newline at end of file
diff --git a/src/CoreEx.Solace/strong-name-key.snk b/src/CoreEx.Solace/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Solace/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Template/CoreEx.Template.csproj b/src/CoreEx.Template/CoreEx.Template.csproj
new file mode 100644
index 00000000..8f4e2085
--- /dev/null
+++ b/src/CoreEx.Template/CoreEx.Template.csproj
@@ -0,0 +1,212 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <Title>CoreEx 'dotnet new' template.</Title>
+    <Description>Core 'dotnet new' template for scaffolding CoreEx-based projects.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data</PackageTags>
+    <PackageType>Template</PackageType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Include all content files so VS can navigate them. -->
+    <Content Include="content\**" PackagePath="content" />
+    <!-- Un-pack the raw template.json files; version-stamped copies are packed by GenerateVersionedTemplateJson. -->
+    <Content Update="content\**\.template.config\template.json" Pack="false" />
+    <Content Update="content\CoreEx.Bootstrap\.template.config\template.json" Pack="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Exclude all content files from compilation; they are included as content only. -->
+    <Compile Remove="content\**" />
+  </ItemGroup>
+
+  <!-- Inline task: replace a literal string in a file and write the result to a new path. -->
+  <UsingTask TaskName="ReplaceTextInFile" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <SourceFile ParameterType="System.String" Required="true" />
+      <DestinationFile ParameterType="System.String" Required="true" />
+      <FindText ParameterType="System.String" Required="true" />
+      <ReplaceText ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+          string content = System.IO.File.ReadAllText(SourceFile);
+          content = content.Replace(FindText, ReplaceText);
+          System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(DestinationFile) ?? string.Empty);
+          System.IO.File.WriteAllText(DestinationFile, content);
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
+     <!-- Copy packaged AI context files from the CoreEx repo into the CoreEx.Core and CoreEx.Bootstrap templates at pack time.
+       This ensures every generated solution is immediately AI-ready without a separate sync step.
+       Files sourced:
+         - consumer-instructions/.github/copilot-instructions.md → .github/copilot-instructions.md
+        - .github/prompts/coreex-scaffold.prompt.md            → .github/prompts/coreex-scaffold.prompt.md
+        - .github/skills/solution-scaffolder/*                 → .github/skills/solution-scaffolder/
+         - .github/agents/coreex-expert.agent.md               → .github/agents/coreex-expert.agent.md
+         - .claude/commands/coreex-expert.md                    → .claude/commands/coreex-expert.md
+         - .claude/commands/coreex-docs-sync.md                 → .claude/commands/coreex-docs-sync.md
+         - .github/instructions/*.instructions.md               → .github/instructions/
+        - docs/application-scaffolding-guide.md                → .github/docs/coreex/application-scaffolding-guide.md
+         - samples/docs/*.md                                     → .github/docs/coreex/
+         - src/CoreEx.*/AGENTS.md                               → .github/docs/coreex/agents/
+  -->
+    <Target Name="CopyTemplateAiContext" BeforeTargets="_GetPackageFiles">
+    <PropertyGroup>
+      <_RepoRoot>$(MSBuildThisFileDirectory)..\..\</_RepoRoot>
+      <_AiGenRoot>$(BaseIntermediateOutputPath)generated\CoreEx.Core\</_AiGenRoot>
+    </PropertyGroup>
+
+      <!-- Clear previously generated AI assets so wildcard Bootstrap packing cannot pick up stale files. -->
+      <RemoveDir Directories="$(_AiGenRoot)" />
+
+    <!-- Single files and package AGENTS.md files (need explicit source→dest mapping) -->
+    <ItemGroup>
+      <_AiFile Include="$(_RepoRoot)consumer-instructions\.github\copilot-instructions.md" DestSubPath=".github\copilot-instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\prompts\coreex-scaffold.prompt.md" DestSubPath=".github\prompts\coreex-scaffold.prompt.md" />
+      <_AiFile Include="$(_RepoRoot).github\skills\solution-scaffolder\SKILL.md" DestSubPath=".github\skills\solution-scaffolder\SKILL.md" />
+      <_AiFile Include="$(_RepoRoot).github\skills\solution-scaffolder\README.md" DestSubPath=".github\skills\solution-scaffolder\README.md" />
+      <_AiFile Include="$(_RepoRoot).github\skills\solution-scaffolder\assets\servicebus-config.template.json" DestSubPath=".github\skills\solution-scaffolder\assets\servicebus-config.template.json" />
+      <_AiFile Include="$(_RepoRoot).github\skills\solution-scaffolder\assets\docker-compose.local.yml" DestSubPath=".github\skills\solution-scaffolder\assets\docker-compose.local.yml" />
+      <_AiFile Include="$(_RepoRoot).github\skills\solution-scaffolder\references\workflow.md" DestSubPath=".github\skills\solution-scaffolder\references\workflow.md" />
+      <_AiFile Include="$(_RepoRoot).github\agents\coreex-expert.agent.md" DestSubPath=".github\agents\coreex-expert.agent.md" />
+      <_AiFile Include="$(_RepoRoot).claude\commands\coreex-expert.md" DestSubPath=".claude\commands\coreex-expert.md" />
+      <_AiFile Include="$(_RepoRoot).claude\commands\coreex-docs-sync.md" DestSubPath=".claude\commands\coreex-docs-sync.md" />
+      <!-- Per-package AI usage guides: AGENTS.md renamed to <PackageName>.md -->
+      <_AiFile Include="$(_RepoRoot)src\CoreEx\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.AspNetCore\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.AspNetCore.md" />
+      <_AiFile Condition="Exists('$(_RepoRoot)src\CoreEx.AspNetCore.NSwag\AGENTS.md')" Include="$(_RepoRoot)src\CoreEx.AspNetCore.NSwag\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.AspNetCore.NSwag.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Azure.Messaging.ServiceBus\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Azure.Messaging.ServiceBus.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Caching.FusionCache\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Caching.FusionCache.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.CodeGen\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.CodeGen.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Data\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Data.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Database\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Database.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Database.Postgres\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Database.Postgres.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Database.SqlServer\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Database.SqlServer.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.DomainDriven\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.DomainDriven.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.EntityFrameworkCore\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.EntityFrameworkCore.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Events\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Events.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.RefData\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.RefData.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.UnitTesting\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.UnitTesting.md" />
+      <_AiFile Include="$(_RepoRoot)src\CoreEx.Validation\AGENTS.md" DestSubPath=".github\docs\coreex\agents\CoreEx.Validation.md" />
+    </ItemGroup>
+
+    <!-- Capability instruction files -->
+    <ItemGroup>
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-api-controllers.instructions.md" DestSubPath=".github\instructions\coreex-api-controllers.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-application-services.instructions.md" DestSubPath=".github\instructions\coreex-application-services.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-contracts.instructions.md" DestSubPath=".github\instructions\coreex-contracts.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-conventions.instructions.md" DestSubPath=".github\instructions\coreex-conventions.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-domain.instructions.md" DestSubPath=".github\instructions\coreex-domain.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-event-subscribers.instructions.md" DestSubPath=".github\instructions\coreex-event-subscribers.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-host-setup.instructions.md" DestSubPath=".github\instructions\coreex-host-setup.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-repositories.instructions.md" DestSubPath=".github\instructions\coreex-repositories.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-tests.instructions.md" DestSubPath=".github\instructions\coreex-tests.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-tooling.instructions.md" DestSubPath=".github\instructions\coreex-tooling.instructions.md" />
+      <_AiFile Include="$(_RepoRoot).github\instructions\coreex-validators.instructions.md" DestSubPath=".github\instructions\coreex-validators.instructions.md" />
+    </ItemGroup>
+
+    <!-- Architecture / sample docs -->
+    <ItemGroup>
+      <_AiFile Include="$(_RepoRoot)docs\application-scaffolding-guide.md" DestSubPath=".github\docs\coreex\application-scaffolding-guide.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\application-layer.md" DestSubPath=".github\docs\coreex\application-layer.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\aspire.md" DestSubPath=".github\docs\coreex\aspire.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\contracts-layer.md" DestSubPath=".github\docs\coreex\contracts-layer.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\domain-layer.md" DestSubPath=".github\docs\coreex\domain-layer.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\hosts-layer.md" DestSubPath=".github\docs\coreex\hosts-layer.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\infrastructure-layer.md" DestSubPath=".github\docs\coreex\infrastructure-layer.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\layers.md" DestSubPath=".github\docs\coreex\layers.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\local-dev.md" DestSubPath=".github\docs\coreex\local-dev.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\patterns.md" DestSubPath=".github\docs\coreex\patterns.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\testing.md" DestSubPath=".github\docs\coreex\testing.md" />
+      <_AiFile Include="$(_RepoRoot)samples\docs\tooling.md" DestSubPath=".github\docs\coreex\tooling.md" />
+    </ItemGroup>
+
+    <!-- Copy all files in one batch (DestSubPath drives both the copy destination and the pack path) -->
+    <Copy SourceFiles="@(_AiFile)" DestinationFiles="@(_AiFile->'$(_AiGenRoot)%(DestSubPath)')" SkipUnchangedFiles="true" />
+
+    <!-- Add all generated AI files to the nupkg under content\CoreEx.Core\
+         Explicit items are required for renamed files (PackagePath transform in a non-Include
+         attribute produces a single joined string, not per-item values). -->
+    <ItemGroup>
+      <!-- Single files -->
+      <None Include="$(_AiGenRoot).github\copilot-instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\copilot-instructions.md" />
+      <None Include="$(_AiGenRoot).github\prompts\coreex-scaffold.prompt.md" Pack="true" PackagePath="content\CoreEx.Core\.github\prompts\coreex-scaffold.prompt.md" />
+      <None Include="$(_AiGenRoot).github\skills\solution-scaffolder\SKILL.md" Pack="true" PackagePath="content\CoreEx.Core\.github\skills\solution-scaffolder\SKILL.md" />
+      <None Include="$(_AiGenRoot).github\skills\solution-scaffolder\README.md" Pack="true" PackagePath="content\CoreEx.Core\.github\skills\solution-scaffolder\README.md" />
+      <None Include="$(_AiGenRoot).github\skills\solution-scaffolder\assets\servicebus-config.template.json" Pack="true" PackagePath="content\CoreEx.Core\.github\skills\solution-scaffolder\assets\servicebus-config.template.json" />
+      <None Include="$(_AiGenRoot).github\skills\solution-scaffolder\assets\docker-compose.local.yml" Pack="true" PackagePath="content\CoreEx.Core\.github\skills\solution-scaffolder\assets\docker-compose.local.yml" />
+      <None Include="$(_AiGenRoot).github\skills\solution-scaffolder\references\workflow.md" Pack="true" PackagePath="content\CoreEx.Core\.github\skills\solution-scaffolder\references\workflow.md" />
+      <None Include="$(_AiGenRoot).github\agents\coreex-expert.agent.md" Pack="true" PackagePath="content\CoreEx.Core\.github\agents\coreex-expert.agent.md" />
+      <None Include="$(_AiGenRoot).claude\commands\coreex-expert.md" Pack="true" PackagePath="content\CoreEx.Core\.claude\commands\coreex-expert.md" />
+      <None Include="$(_AiGenRoot).claude\commands\coreex-docs-sync.md" Pack="true" PackagePath="content\CoreEx.Core\.claude\commands\coreex-docs-sync.md" />
+      <!-- Per-package AI usage guides -->
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.AspNetCore.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.AspNetCore.md" />
+      <None Condition="Exists('$(_AiGenRoot).github\docs\coreex\agents\CoreEx.AspNetCore.NSwag.md')" Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.AspNetCore.NSwag.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.AspNetCore.NSwag.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Azure.Messaging.ServiceBus.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Azure.Messaging.ServiceBus.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Caching.FusionCache.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Caching.FusionCache.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.CodeGen.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.CodeGen.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Data.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Data.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Database.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Database.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Database.Postgres.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Database.Postgres.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Database.SqlServer.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Database.SqlServer.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.DomainDriven.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.DomainDriven.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.EntityFrameworkCore.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.EntityFrameworkCore.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Events.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Events.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.RefData.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.RefData.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.UnitTesting.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.UnitTesting.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\agents\CoreEx.Validation.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\agents\CoreEx.Validation.md" />
+      <!-- Capability instruction files (explicit — wildcards with %(Filename)%(Extension) in PackagePath
+           inside a Target use implicit None item context and map all files to the same path) -->
+      <None Include="$(_AiGenRoot).github\instructions\coreex-api-controllers.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-api-controllers.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-application-services.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-application-services.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-contracts.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-contracts.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-conventions.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-conventions.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-domain.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-domain.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-event-subscribers.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-event-subscribers.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-host-setup.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-host-setup.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-repositories.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-repositories.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-tests.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-tests.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-tooling.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-tooling.instructions.md" />
+      <None Include="$(_AiGenRoot).github\instructions\coreex-validators.instructions.md" Pack="true" PackagePath="content\CoreEx.Core\.github\instructions\coreex-validators.instructions.md" />
+      <!-- Architecture / sample docs (explicit) -->
+      <None Include="$(_AiGenRoot).github\docs\coreex\application-scaffolding-guide.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\application-scaffolding-guide.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\application-layer.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\application-layer.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\aspire.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\aspire.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\contracts-layer.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\contracts-layer.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\domain-layer.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\domain-layer.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\hosts-layer.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\hosts-layer.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\infrastructure-layer.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\infrastructure-layer.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\layers.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\layers.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\local-dev.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\local-dev.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\patterns.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\patterns.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\testing.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\testing.md" />
+      <None Include="$(_AiGenRoot).github\docs\coreex\tooling.md" Pack="true" PackagePath="content\CoreEx.Core\.github\docs\coreex\tooling.md" />
+      <_BootstrapAiGenerated Include="$(_AiGenRoot)**\*" Exclude="$(_AiGenRoot).template.config\template.json" />
+      <None Include="@(_BootstrapAiGenerated)" Pack="true" PackagePath="content\CoreEx.Bootstrap\%(RecursiveDir)%(Filename)%(Extension)" />
+    </ItemGroup>
+  </Target>
+
+  <!-- Stamp the CoreEx version into each template.json before the nupkg is assembled.
+       BeforeTargets="_GetPackageFiles" ensures the items are visible when NuGet collects pack content. -->
+  <Target Name="GenerateVersionedTemplateJson" BeforeTargets="_GetPackageFiles">
+    <PropertyGroup>
+      <_GenRoot>$(BaseIntermediateOutputPath)generated\</_GenRoot>
+    </PropertyGroup>
+    <ReplaceTextInFile SourceFile="$(MSBuildThisFileDirectory)content\CoreEx.Core\.template.config\template.json" DestinationFile="$(_GenRoot)CoreEx.Core\.template.config\template.json" FindText="COREEX_VERSION" ReplaceText="$(Version)" />
+    <ReplaceTextInFile SourceFile="$(MSBuildThisFileDirectory)content\CoreEx.Api\.template.config\template.json" DestinationFile="$(_GenRoot)CoreEx.Api\.template.config\template.json" FindText="COREEX_VERSION" ReplaceText="$(Version)" />
+    <ReplaceTextInFile SourceFile="$(MSBuildThisFileDirectory)content\CoreEx.Relay\.template.config\template.json" DestinationFile="$(_GenRoot)CoreEx.Relay\.template.config\template.json" FindText="COREEX_VERSION" ReplaceText="$(Version)" />
+    <ReplaceTextInFile SourceFile="$(MSBuildThisFileDirectory)content\CoreEx.Subscribe\.template.config\template.json" DestinationFile="$(_GenRoot)CoreEx.Subscribe\.template.config\template.json" FindText="COREEX_VERSION" ReplaceText="$(Version)" />
+    <ItemGroup>
+      <None Include="$(_GenRoot)CoreEx.Core\.template.config\template.json" Pack="true" PackagePath="content\CoreEx.Core\.template.config\template.json" />
+      <None Include="$(_GenRoot)CoreEx.Api\.template.config\template.json" Pack="true" PackagePath="content\CoreEx.Api\.template.config\template.json" />
+      <None Include="$(_GenRoot)CoreEx.Relay\.template.config\template.json" Pack="true" PackagePath="content\CoreEx.Relay\.template.config\template.json" />
+      <None Include="$(_GenRoot)CoreEx.Subscribe\.template.config\template.json" Pack="true" PackagePath="content\CoreEx.Subscribe\.template.config\template.json" />
+    </ItemGroup>
+  </Target>
+
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Template/README.md b/src/CoreEx.Template/README.md
new file mode 100644
index 00000000..c91806b8
--- /dev/null
+++ b/src/CoreEx.Template/README.md
@@ -0,0 +1,582 @@
+# CoreEx.Template
+
+> Provides the `dotnet new` template pack for scaffolding CoreEx-based domain microservice solutions -- five composable templates, one `dotnet new install`.
+
+## Overview
+
+`CoreEx.Template` is a `PackageType=Template` NuGet package that installs five `dotnet new` templates as a single unit. Together they cover both the AI-ready bootstrap entry point and the full project topology for a CoreEx domain-based microservice: the shared solution core (contracts, application, infrastructure, database tooling) and the independently deployable host processes (API, Outbox Relay, Subscriber).
+
+| Short name | Template | Emits |
+|---|---|---|
+| `coreex-bootstrap` | CoreEx AI-ready bootstrap repository | Minimal repository shell + packaged AI workflow assets for `/coreex-scaffold` |
+| `coreex` | CoreEx domain-based microservice application | Solution scaffold: `src/` libraries + `tools/` projects + `tests/` (Test.Common + Test.Unit) |
+| `coreex-api` | CoreEx API host | `src/[name].Api/` host project + `tests/[solution].Test.Api/` integration test project |
+| `coreex-relay` | CoreEx Outbox Relay host | `src/[name].Relay/` host project + `tests/[solution].Test.Relay/` integration test project |
+| `coreex-subscribe` | CoreEx Subscriber host | `src/[name].Subscribe/` host project + `tests/[solution].Test.Subscribe/` integration test project |
+
+Parameters are consistent across templates -- the same `--data-provider`, `--messaging-provider`, and feature flags appear in every template that needs them, ensuring the generated code is coherent regardless of which templates you use.
+
+## Installation
+
+```sh
+dotnet new install CoreEx.Template
+```
+
+To verify:
+
+```sh
+dotnet new list --tag CoreEx
+```
+
+To update after a new release:
+
+```sh
+dotnet new update
+```
+
+To uninstall:
+
+```sh
+dotnet new uninstall CoreEx.Template
+```
+
+## AI-Guided Scaffolding
+
+Every generated solution includes a small bootstrap AI workflow set under `.github/`, and the dedicated `coreex-bootstrap` template emits only that shell:
+
+- `/coreex-scaffold` -- interviews for project needs, recommends the smallest safe `dotnet new coreex*` command set, and can run the commands.
+- `.github/skills/solution-scaffolder/` -- the packaged workflow guidance for greenfield scaffolding.
+- `.github/docs/coreex/application-scaffolding-guide.md` -- the decision-oriented guide behind the workflow.
+
+The packaged workflow assets are sourced from the repository's canonical `.github/` set, while the generated solution still receives the consumer-specific `copilot-instructions.md` variant from `consumer-instructions/`.
+
+Typical bootstrap flow:
+
+```sh
+dotnet new coreex-bootstrap -n Avanade.Erp.Sales
+```
+
+Then run `/coreex-scaffold` and answer the business-shape questions. The workflow derives the required `coreex`, `coreex-api`, `coreex-relay`, and `coreex-subscribe` commands, using `--force` only when replacing the bootstrap placeholders.
+
+---
+
+## Naming Convention
+
+The templates use dot-delimited names that encode the solution hierarchy. Understanding this is essential -- the name you supply drives all file names, namespace declarations, project cross-references, and configuration values automatically.
+
+**Recommended format:** `[Company].[Product].[Domain]`
+
+| Segment | Example | Role |
+|---|---|---|
+| Company | `Avanade` | Organisation |
+| Product | `Erp` | Product or system |
+| Domain | `Sales` | The bounded context being scaffolded |
+
+For the **solution template** (`coreex`) the name is the three-part solution root, e.g. `Avanade.Erp.Sales`. For each **host template** (`coreex-api`, `coreex-relay`, `coreex-subscribe`) the name appends the host suffix, e.g. `Avanade.Erp.Sales.Api`.
+
+### Derived values (example: `Avanade.Erp.Sales.Api`)
+
+| Derived symbol | Value | Used for |
+|---|---|---|
+| `domain-name` | `Sales` | Class names, namespaces, DB identifiers (mixed case) |
+| `domain-name-lower` | `sales` | Service Bus topic/subscription names, Postgres database name |
+| `solution-name` | `Avanade.Erp.Sales` | Cross-project references in host `.csproj` files |
+| `solution-parent-name` | `Avanade.Erp` | `CoreEx:Host:SolutionName` in `appsettings.json` |
+
+---
+
+## Template 1 -- `coreex-bootstrap` (AI-ready bootstrap)
+
+Creates an intentionally minimal repository shell for teams that want to start with the agent workflow before committing to a CoreEx project shape. It emits root guidance and the packaged `.github/` and `.claude/` AI assets needed for `/coreex-scaffold`.
+
+Run this when you want the repository to stay effectively empty until the scaffold interview derives the right host and capability mix.
+
+### Parameters
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `-n` / `--name` | string | _(required)_ | Solution base name, e.g. `Avanade.Erp.Sales`. Drives the root guidance text. |
+
+### Output
+
+```
+AGENTS.md
+README.md
+.github/
+.claude/
+```
+
+### Example
+
+```sh
+dotnet new coreex-bootstrap -n Avanade.Erp.Sales
+```
+
+---
+
+## Template 2 -- `coreex` (Solution scaffold)
+
+Scaffolds the shared solution core: the `.slnx` solution file, solution-wide configuration files (`.editorconfig`, `Directory.Build.props`, `Directory.Packages.props`), the `Contracts`, `Application`, `Infrastructure` (and optionally `Domain`) class-library projects, and the `Database` and `CodeGen` tooling projects.
+
+Run this **once per domain** from the solution root directory.
+
+### Parameters
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `-n` / `--name` | string | _(required)_ | Solution base name, e.g. `Avanade.Erp.Sales`. Drives all file names and namespaces. Format: `[Company].[Product].[Domain]`. |
+| `--refdata-enabled` | bool | `true` | Includes the reference-data pattern: `IReferenceDataRepository` (Application), `ReferenceDataService` (Application), `ReferenceDataRepository` (Infrastructure), and the `CodeGen` tool project. |
+| `--rop-enabled` | bool | `false` | Enables Railway-Oriented Programming -- `Result`/`Result<T>` return types throughout the solution. |
+| `--domain-driven-enabled` | bool | `false` | Adds the `[Domain].Domain` project for DDD aggregates, domain events, and value objects. |
+| `--data-provider` | `SqlServer` \| `Postgres` \| `None` | `SqlServer` | The data persistence technology. `None` is for facade scenarios (e.g. over Dynamics 365) where there is no local database -- the `Database` tool project, EF Core packages, DbContext, and EfDb are all omitted. |
+| `--outbox-enabled` | bool | `true` | Includes transactional-outbox wiring in the Infrastructure project. Has no effect when `--data-provider None`. |
+| `--messaging-provider` | `ServiceBus` \| `None` | `ServiceBus` | The messaging technology. `None` omits all messaging configuration. |
+
+### Output
+
+```
+[name].slnx
+.editorconfig
+.gitignore
+.filenesting.json
+Directory.Build.props
+Directory.Packages.props
+src/
+  [name].Contracts/
+    [name].Contracts.csproj
+    GlobalUsing.cs
+  [name].Application/
+    [name].Application.csproj
+    GlobalUsing.cs
+    ReferenceDataService.cs              (refdata-enabled only)
+    Repositories/
+      IReferenceDataRepository.cs        (refdata-enabled only)
+  [name].Domain/                         (domain-driven-enabled only)
+    [name].Domain.csproj
+    GlobalUsing.cs
+  [name].Infrastructure/
+    [name].Infrastructure.csproj
+    GlobalUsing.cs
+    Repositories/
+      [Domain]DbContext.cs               (data-provider != None)
+      [Domain]EfDb.cs                    (data-provider != None)
+      ReferenceDataRepository.cs         (refdata-enabled && data-provider != None)
+tools/
+  [name].Database/                       (data-provider != None)
+    [name].Database.csproj
+    Program.cs
+  [name].CodeGen/                        (refdata-enabled && data-provider != None)
+    [name].CodeGen.csproj
+    Program.cs
+    ref-data.yaml
+tests/
+  [name].Test.Common/
+    [name].Test.Common.csproj
+    TestData.cs
+    Data/                                (data-provider != None -- embedded seed data for DbEx)
+  [name].Test.Unit/
+    [name].Test.Unit.csproj
+```
+
+### Examples
+
+Default (PostgreSQL, refdata, Service Bus outbox):
+```sh
+dotnet new coreex -n Avanade.Erp.Sales
+```
+
+PostgreSQL with no refdata:
+```sh
+dotnet new coreex -n Avanade.Erp.Sales --data-provider Postgres --refdata-enabled false
+```
+
+Facade over an external system (no local database or messaging):
+```sh
+dotnet new coreex -n Avanade.Erp.Sales --data-provider None --messaging-provider None
+```
+
+Domain-driven design with ROP, Postgres, no outbox:
+```sh
+dotnet new coreex -n Avanade.Erp.Sales --domain-driven-enabled true --rop-enabled true --data-provider Postgres --outbox-enabled false
+```
+
+---
+
+## Template 3 -- `coreex-api` (API host)
+
+Scaffolds an ASP.NET Core Web API host project. Wires up CoreEx execution context, optional reference-data orchestration, FusionCache L1/L2 caching with Redis backplane, the selected database provider and EF Core, outbox publishing, NSwag OpenAPI, and OpenTelemetry.
+
+Run this from the **solution root** (the directory created by `coreex`). The template emits into both `src/` and `tests/` so it must be run at the root level.
+
+### Parameters
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `-n` / `--name` | string | _(required)_ | Full project name, e.g. `Avanade.Erp.Sales.Api`. Must match the solution name with `.Api` appended. |
+| `--refdata-enabled` | bool | `true` | Wires up `ReferenceDataOrchestrator` and dynamic service registration for reference-data caching. Match the value used with `coreex`. |
+| `--data-provider` | `SqlServer` \| `Postgres` \| `None` | `SqlServer` | Database technology. Selects the Aspire connection, CoreEx database, unit-of-work, and outbox publisher registration. |
+| `--outbox-enabled` | bool | `true` | Registers the outbox publisher (`SqlServerOutboxPublisher` or `PostgresOutboxPublisher`) as the `IEventPublisher`. Has no effect when `--data-provider None`. |
+
+### Output
+
+```
+src/
+  [name].Api/
+    [name].Api.csproj
+    Program.cs
+    GlobalUsing.cs
+    appsettings.json
+    appsettings.Development.json
+    AGENTS.md
+tests/
+  [solution-name].Test.Api/
+    [solution-name].Test.Api.csproj
+```
+
+**`appsettings.json`** (illustrative -- values are replaced at generation time):
+
+```jsonc
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Avanade.Erp",    // Company.Product (solution-parent-name)
+      "DomainName": "Sales"              // Domain (domain-name)
+    },
+    "Events": {
+      "Destination": "sales"             // Topic/queue name (domain-name-lower)
+    }
+  },
+  "Logging": { ... }
+}
+```
+
+**`appsettings.Development.json`** (connection strings vary by `--data-provider`):
+
+```jsonc
+{
+  "Aspire": {
+    // SQL Server (implement-sqlserver):
+    "Microsoft": { "Data": { "SqlClient": { "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=Sales;..." } } },
+    // OR PostgreSQL (implement-postgres):
+    "Npgsql": { "ConnectionString": "Server=127.0.0.1;Database=sales;..." },
+    "StackExchange": { "Redis": { "ConnectionString": "localhost:6379" } }
+  }
+}
+```
+
+### Examples
+
+Default (PostgreSQL, refdata, outbox):
+```sh
+dotnet new coreex-api -n Avanade.Erp.Sales.Api
+```
+
+PostgreSQL, no refdata:
+```sh
+dotnet new coreex-api -n Avanade.Erp.Sales.Api --data-provider Postgres --refdata-enabled false
+```
+
+Facade (no database):
+```sh
+dotnet new coreex-api -n Avanade.Erp.Sales.Api --data-provider None
+```
+
+---
+
+## Template 4 -- `coreex-relay` (Outbox Relay host)
+
+Scaffolds an ASP.NET Core background-service host that reads committed events from the transactional outbox table and forwards them to the messaging provider. Does not reference the solution's shared projects -- it is a standalone host that requires only a database connection and a messaging connection.
+
+Run this from the **solution root** (the directory created by `coreex`). The template emits into both `src/` and `tests/` so it must be run at the root level.
+
+> **Note:** When `--data-provider None` is selected the outbox relay has nothing to relay. Scaffold this host only when your solution uses the outbox pattern (i.e. `--data-provider` is `SqlServer` or `Postgres` and `--outbox-enabled true`).
+
+### Parameters
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `-n` / `--name` | string | _(required)_ | Full project name, e.g. `Avanade.Erp.Sales.Relay`. |
+| `--data-provider` | `SqlServer` \| `Postgres` \| `None` | `SqlServer` | Database technology used for reading the outbox. |
+| `--messaging-provider` | `ServiceBus` \| `None` | `ServiceBus` | Messaging provider to publish forwarded events to. |
+
+### Output
+
+```
+src/
+  [name].Relay/
+    [name].Relay.csproj
+    Program.cs
+    appsettings.json
+    appsettings.Development.json
+    AGENTS.md
+tests/
+  [solution-name].Test.Relay/
+    [solution-name].Test.Relay.csproj
+```
+
+**`appsettings.json`** (illustrative):
+
+```jsonc
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Avanade.Erp",
+      "DomainName": "Sales",
+      "Services": {
+        "Interval": "00:00:00.500",
+        "OutboxRelay": {
+          "BatchSize": 10,
+          "PerWorkerPartitionCount": 2,
+          "LeaseDuration": "00:00:05",
+          "BackoffDuration": "00:00:05",
+          "ServicesCount": 4
+        }
+      }
+    }
+  }
+}
+```
+
+**`appsettings.Development.json`** (connection strings vary by provider):
+
+```jsonc
+{
+  "Aspire": {
+    // SQL Server or PostgreSQL connection (same pattern as coreex-api)
+    "Azure": {
+      // implement-servicebus only:
+      "Messaging": { "ServiceBus": { "ConnectionString": "Endpoint=sb://localhost;..." } }
+    }
+  }
+}
+```
+
+### Examples
+
+SQL Server outbox -> Azure Service Bus:
+```sh
+dotnet new coreex-relay -n Avanade.Erp.Sales.Relay
+```
+
+PostgreSQL outbox -> Azure Service Bus:
+```sh
+dotnet new coreex-relay -n Avanade.Erp.Sales.Relay --data-provider Postgres
+```
+
+---
+
+## Template 4 -- `coreex-subscribe` (Subscriber host)
+
+Scaffolds an ASP.NET Core background-service host that receives events from a messaging provider, dispatches them through the CoreEx `SubscribedManager`, and processes them via subscriber implementations. Optionally includes reference-data caching and a database connection for subscriber logic that needs persistence.
+
+Run this from the **solution root** (the directory created by `coreex`). The template emits into both `src/` and `tests/` so it must be run at the root level.
+
+### Parameters
+
+| Parameter | Type | Default | Description |
+|---|---|---|---|
+| `-n` / `--name` | string | _(required)_ | Full project name, e.g. `Avanade.Erp.Sales.Subscribe`. |
+| `--refdata-enabled` | bool | `true` | Wires up `ReferenceDataOrchestrator` and dynamic service registration for reference-data caching. Match the value used with `coreex`. |
+| `--data-provider` | `SqlServer` \| `Postgres` \| `None` | `SqlServer` | Database technology. When not `None`, EF Core and outbox publisher are wired so subscriber logic can persist state and emit its own events. |
+| `--messaging-provider` | `ServiceBus` \| `None` | `ServiceBus` | Messaging provider to receive events from. When `None`, no receiver is configured. |
+
+### Output
+
+```
+src/
+  [name].Subscribe/
+    [name].Subscribe.csproj
+    Program.cs
+    GlobalUsing.cs
+    appsettings.json
+    appsettings.Development.json
+    AGENTS.md
+tests/
+  [solution-name].Test.Subscribe/
+    [solution-name].Test.Subscribe.csproj
+```
+
+**`appsettings.json`** (illustrative):
+
+```jsonc
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "Avanade.Erp",
+      "DomainName": "Sales",
+      "Services": { "Interval": "00:00:00.500" }
+    },
+    "Events": {
+      "Destination": "sales"             // Outbound event topic/queue (domain-name-lower)
+    }
+  }
+}
+```
+
+**`appsettings.Development.json`** (connection strings vary by provider):
+
+```jsonc
+{
+  "Aspire": {
+    // SQL Server or PostgreSQL connection (same pattern as coreex-api)
+    "Azure": {
+      // implement-servicebus only:
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;...",
+          "QueueOrTopicName": "avanade.erp",   // solution-name-lower
+          "SubscriptionName": "sales"           // domain-name-lower
+        }
+      }
+    },
+    "StackExchange": { "Redis": { "ConnectionString": "localhost:6379" } }
+  }
+}
+```
+
+### Examples
+
+Default (PostgreSQL, refdata, Service Bus):
+```sh
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe
+```
+
+PostgreSQL, no refdata:
+```sh
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe --data-provider Postgres --refdata-enabled false
+```
+
+Messaging only (no local database):
+```sh
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe --data-provider None
+```
+
+---
+
+## Typical Workflow
+
+All four templates are independent. Use only the ones your solution needs. The following shows a full event-driven microservice topology:
+
+### Step 1 -- Create the solution root
+
+```sh
+mkdir Avanade.Erp.Sales
+cd Avanade.Erp.Sales
+dotnet new coreex -n Avanade.Erp.Sales
+```
+
+Produces the `.slnx`, solution configuration files, `src/` class libraries, `tools/` projects, and `tests/` (Test.Common + Test.Unit). The current directory becomes the solution root.
+
+### Step 2 -- Scaffold host projects
+
+Run from the **solution root**. Each template emits into both `src/` and `tests/`:
+
+```sh
+dotnet new coreex-api        -n Avanade.Erp.Sales.Api
+dotnet new coreex-relay      -n Avanade.Erp.Sales.Relay
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe
+```
+
+### Step 3 -- Add hosts and their test projects to the solution
+
+```sh
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Api
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Api
+
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Relay
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Relay
+
+dotnet sln Avanade.Erp.Sales.slnx add src/Avanade.Erp.Sales.Subscribe
+dotnet sln Avanade.Erp.Sales.slnx add tests/Avanade.Erp.Sales.Test.Subscribe
+```
+
+### Resulting directory structure
+
+```
+Avanade.Erp.Sales/
+  Avanade.Erp.Sales.slnx
+  .editorconfig  |  .gitignore  |  Directory.Build.props  |  Directory.Packages.props
+  src/
+    Avanade.Erp.Sales.Contracts/
+    Avanade.Erp.Sales.Application/
+    Avanade.Erp.Sales.Infrastructure/
+    Avanade.Erp.Sales.Api/
+    Avanade.Erp.Sales.Relay/
+    Avanade.Erp.Sales.Subscribe/
+  tools/
+    Avanade.Erp.Sales.Database/
+    Avanade.Erp.Sales.CodeGen/
+  tests/
+    Avanade.Erp.Sales.Test.Common/
+    Avanade.Erp.Sales.Test.Unit/
+    Avanade.Erp.Sales.Test.Api/
+    Avanade.Erp.Sales.Test.Relay/
+    Avanade.Erp.Sales.Test.Subscribe/
+```
+
+---
+
+## Scenario Examples
+
+### Full event-driven (SQL Server, Service Bus, refdata)
+
+All defaults -- no flags required:
+
+```sh
+dotnet new coreex            -n Avanade.Erp.Sales
+dotnet new coreex-api        -n Avanade.Erp.Sales.Api
+dotnet new coreex-relay      -n Avanade.Erp.Sales.Relay
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe
+```
+
+### PostgreSQL variant
+
+```sh
+dotnet new coreex            -n Avanade.Erp.Sales --data-provider Postgres
+dotnet new coreex-api        -n Avanade.Erp.Sales.Api        --data-provider Postgres
+dotnet new coreex-relay      -n Avanade.Erp.Sales.Relay      --data-provider Postgres
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe --data-provider Postgres
+```
+
+### Facade over an external system (e.g. Dynamics 365)
+
+No local database, no outbox, no messaging infrastructure -- the API is a pure HTTP facade:
+
+```sh
+dotnet new coreex     -n Avanade.Erp.Sales --data-provider None --messaging-provider None
+dotnet new coreex-api -n Avanade.Erp.Sales.Api --data-provider None
+```
+
+No relay or subscriber needed -- omit those templates entirely.
+
+### API + Subscriber only (no outbox relay)
+
+When using an at-least-once messaging pattern without transactional outbox:
+
+```sh
+dotnet new coreex            -n Avanade.Erp.Sales --outbox-enabled false
+dotnet new coreex-api        -n Avanade.Erp.Sales.Api        --outbox-enabled false
+dotnet new coreex-subscribe -n Avanade.Erp.Sales.Subscribe
+```
+
+---
+
+## Package Design Notes
+
+**Single install, four templates.** All four templates ship inside one NuGet package (`PackageType=Template`). A single `dotnet new install CoreEx.Template` makes all four short names available: `coreex`, `coreex-api`, `coreex-relay`, and `coreex-subscribe`.
+
+**Version stamping.** Each `template.json` carries `COREEX_VERSION` as a placeholder. During `dotnet pack`, an inline MSBuild `ReplaceTextInFile` task stamps the actual `$(Version)` into generated copies of the four `template.json` files before they are packed. The source copies in `content/` retain the placeholder and remain editable.
+
+**Central Package Management.** All `PackageReference` entries in generated projects carry no `Version` attribute -- versions are resolved from the `Directory.Packages.props` emitted by the `coreex` solution template. The host templates therefore require that the `coreex` solution template has been applied first (since `Directory.Packages.props` lives at the solution root).
+
+**Conditional file exclusion.** The template engine's `sources.modifiers` with glob patterns handle all conditional file output -- no empty placeholder files are emitted. The `.slnx` solution file uses `specialCustomOperations` to enable `<!--#if-->` XML-style conditionals (the template engine does not recognise `.slnx` as XML by default).
+
+**`preferNameDirectory`.** All four templates set `preferNameDirectory: false` so they generate into the current directory rather than creating an extra named subdirectory. The solution template generates its content directly into the current directory. Host templates generate their content into `src/[ProjectName]/` and `tests/[solution-name].Test.X/` subdirectories, which are created by the template itself as part of the source layout -- not by the `preferNameDirectory` mechanism.
+
+**`solution-name` file renaming.** The `solution-name` derived symbol (everything before the last dot-segment of the `-n` value) carries `fileRename: "solution-name"` in all host templates. This causes directory names like `solution-name.Test.Api` to be substituted at generation time, producing correctly-named test project folders (e.g. `Avanade.Erp.Sales.Test.Api`) that match the CoreEx sample naming convention.
+
+## Additional Resources
+
+- [CoreEx](https://github.com/Avanade/CoreEx) -- The framework these templates scaffold for.
+- [CoreEx.CodeGen](../CoreEx.CodeGen/README.md) -- The reference-data code-generation tool project scaffolded by the `coreex` template when `--refdata-enabled true`.
+- [dotnet templating wiki](https://github.com/dotnet/templating/wiki) -- Full reference for `template.json` configuration.
diff --git a/src/CoreEx.Template/content/CoreEx.Api/.template.config/template.json b/src/CoreEx.Template/content/CoreEx.Api/.template.config/template.json
new file mode 100644
index 00000000..0cdda328
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/.template.config/template.json
@@ -0,0 +1,196 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "https://github.com/avanade/coreex",
+  "classifications": [ "CoreEx", "Microservice", "API" ],
+  "identity": "CoreEx.Api",
+  "name": "CoreEx API host",
+  "description": "An ASP.NET Core Web API host, and test, projects for a CoreEx domain-based microservice.",
+  "shortName": "coreex-api",
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "sourceName": "app-name.Api",
+  "preferNameDirectory": false,
+  "symbols": {
+    "coreex-version": {
+      "type": "generated",
+      "generator": "constant",
+      "parameters": {
+        "value": "COREEX_VERSION"
+      },
+      "replaces": "coreex-version"
+    },
+    "domain-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimited",
+      "fileRename": "domain-name",
+      "replaces": "domain-name"
+    },
+    "solution-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastDotDelimited",
+      "fileRename": "solution-name",
+      "replaces": "solution-name"
+    },
+    "solution-parent-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastTwoDotDelimited",
+      "replaces": "solution-parent-name"
+    },
+    "domain-name-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimitedLower",
+      "replaces": "domain-name-lower"
+    },
+    "domain-parent-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "DomainParentLower",
+      "replaces": "domain-parent-lower"
+    },
+    "refdata-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Reference data enabled",
+      "description": "Indicates whether reference data pattern/capabilities is enabled.",
+      "defaultValue": "true"
+    },
+    "data-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "SqlServer",
+          "displayName": "SQL Server",
+          "description": "Indicates to use SQL Server as the data provider."
+        },
+        {
+          "choice": "Postgres",
+          "displayName": "PostgreSQL",
+          "description": "Indicates to use PostgreSQL as the data provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no data provider is used (e.g. a facade over an external system such as Dynamics 365)."
+        }
+      ],
+      "defaultValue": "Postgres",
+      "displayName": "Data provider",
+      "description": "Determines the data provider technology to use."
+    },
+    "implement-sqlserver": {
+      "type": "computed",
+      "value": "data-provider == 'SqlServer'"
+    },
+    "implement-postgres": {
+      "type": "computed",
+      "value": "data-provider == 'Postgres'"
+    },
+    "implement-none-data": {
+      "type": "computed",
+      "value": "data-provider == 'None'"
+    },
+    "outbox-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Outbox enabled",
+      "description": "Indicates whether a transactional-outbox is enabled.",
+      "defaultValue": "true"
+    }
+  },
+  "specialCustomOperations": {
+    "*.md": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!-- #if" ],
+            "actionableElse": [ "<!-- #else" ],
+            "actionableElseif": [ "<!-- #elseif", "<!-- #elif" ],
+            "endif": [ "<!-- #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.csproj": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.props": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.cs": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "// #if" ],
+            "actionableElse": [ "// #else" ],
+            "actionableElseif": [ "// #elseif", "// #elif" ],
+            "endif": [ "// #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    }
+  },
+  "forms": {
+    "ValueSecondToLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(?:.*\\.)?([^.]+)\\.[^.]+$",
+      "replacement": "$1"
+    },
+    "ValueWithoutLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(.*)\\.([^\\.]+)$",
+      "replacement": "$1"
+    },
+    "LowerCase": {
+      "identifier": "lowerCase"
+    },
+    "ValueSecondToLastDotDelimitedLower": {
+      "identifier": "chain",
+      "steps": [ "ValueSecondToLastDotDelimited", "LowerCase" ]
+    },
+    "ValueWithoutLastTwoDotDelimited": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "ValueWithoutLastDotDelimited" ]
+    },
+    "DomainParentLower": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "ValueSecondToLastDotDelimited", "LowerCase" ]
+    }
+  }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/AGENTS.md b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/AGENTS.md
new file mode 100644
index 00000000..974d3e83
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/AGENTS.md
@@ -0,0 +1,109 @@
+# domain-name API Host -- AI Agent Guide
+
+This is the **ASP.NET Core API host** for the `domain-name` domain, part of the `solution-name` microservice. It exposes REST endpoints backed by the CoreEx layered application core.
+
+> **Before answering any CoreEx question:** check whether `.github/docs/coreex/` is populated at the solution root. If empty, run `/coreex-docs-sync` first. The package guide at `.github/docs/coreex/agents/CoreEx.AspNetCore.md` is especially relevant to this project.
+
+---
+
+## Host Responsibilities
+
+This project is a **thin host** -- it wires up DI, configures the pipeline, and delegates all business logic to the `solution-name.Application` layer. It should contain:
+
+- `Program.cs` -- startup, DI registration, middleware pipeline
+- Controllers -- route handlers that call Application services; no business logic here
+- No direct database access; no direct Service Bus calls
+
+Read `.github/docs/coreex/hosts-layer.md` for the full host-layer guide.
+
+---
+
+## Adding a Controller
+
+1. Create a new file in the project, e.g. `Controllers/ProductController.cs`
+2. Inherit from `ControllerBase` and apply `[Route("api/[controller]")]`
+3. Inject the Application service interface (from `solution-name.Application`)
+4. Map HTTP verbs to service methods -- return `IActionResult` using `solution-name.Application` result types
+5. CoreEx provides `WebApiPublisher` / `HttpWebApi` helpers for standardised response handling
+
+Consult `.github/docs/coreex/agents/CoreEx.AspNetCore.md` for controller patterns and `WebApiPublisher` usage.
+
+---
+
+## OpenAPI / NSwag
+
+The host registers NSwag via `services.AddOpenApiDocument(...)` with CoreEx defaults applied (`s.AddCoreExConfiguration()`). The Swagger UI is available at `/swagger` in development.
+
+Consult `.github/docs/coreex/agents/CoreEx.AspNetCore.NSwag.md` for NSwag customisation patterns.
+
+---
+
+## Caching
+
+The host wires FusionCache with both in-memory (L1) and Redis distributed (L2) backing. The CoreEx `IHybridCache` abstraction is registered as `AddFusionHybridCache()`.
+
+- Use `IHybridCache` in Application services -- never take direct `IMemoryCache` or `IDistributedCache` dependencies
+- Idempotency support is provided via `AddHybridCacheIdempotencyProvider()`
+
+Consult `.github/docs/coreex/agents/CoreEx.Caching.FusionCache.md` for caching patterns.
+
+---
+
+## This Host's Feature Configuration
+
+<!-- #if implement-sqlserver -->
+- **Data provider:** SQL Server -- `builder.AddSqlClientConnection("SqlServer")` (Aspire connection name)
+<!-- #elif implement-postgres -->
+- **Data provider:** PostgreSQL -- `builder.AddNpgsqlDataSource("Postgres")` (Aspire connection name)
+<!-- #else -->
+- **Data provider:** None -- this host uses no database; services call external systems directly
+<!-- #endif -->
+<!-- #if (outbox-enabled && !implement-none-data) -->
+- **Transactional outbox:** Enabled -- events are written to the DB outbox by `domain-nameOutboxPublisher`; the Relay host reads and forwards them
+<!-- #else -->
+- **Transactional outbox:** Disabled -- events are published directly to the message broker
+<!-- #endif -->
+<!-- #if refdata-enabled -->
+- **Reference data:** Enabled -- `ReferenceDataOrchestrator<ReferenceDataService>` is registered; reference data is hydrated via `ReferenceDataRepository`
+<!-- #else -->
+- **Reference data:** Disabled
+<!-- #endif -->
+
+---
+
+## Key Packages
+
+| Package | Purpose |
+|---|---|
+| `CoreEx.AspNetCore` | Web API base types, middleware, `WebApiPublisher` |
+| `CoreEx.AspNetCore.NSwag` | NSwag OpenAPI integration |
+| `CoreEx.Caching.FusionCache` | FusionCache `IHybridCache` integration |
+<!-- #if implement-sqlserver -->
+| `CoreEx.Database.SqlServer` | SQL Server database access |
+<!-- #endif -->
+<!-- #if implement-postgres -->
+| `CoreEx.Database.Postgres` | PostgreSQL database access |
+<!-- #endif -->
+<!-- #if !implement-none-data -->
+| `CoreEx.EntityFrameworkCore` | EF Core integration (`EfDb`, `IEfDbContext`) |
+<!-- #endif -->
+<!-- #if refdata-enabled -->
+| `CoreEx.RefData` | Reference data orchestration |
+<!-- #endif -->
+
+---
+
+## Relevant Docs
+
+- `.github/docs/coreex/hosts-layer.md` -- host startup patterns
+- `.github/docs/coreex/patterns.md` -- CoreEx request/response patterns
+- `.github/docs/coreex/testing.md` -- integration test setup for the API host
+- `.github/docs/coreex/local-dev.md` -- running locally with .NET Aspire
+- `.github/docs/coreex/agents/CoreEx.AspNetCore.md` -- Web API patterns
+- `.github/docs/coreex/agents/CoreEx.Caching.FusionCache.md` -- caching
+<!-- #if !implement-none-data -->
+- `.github/docs/coreex/agents/CoreEx.EntityFrameworkCore.md` -- EF Core patterns
+<!-- #endif -->
+<!-- #if refdata-enabled -->
+- `.github/docs/coreex/agents/CoreEx.RefData.md` -- reference data patterns
+<!-- #endif -->
diff --git a/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/GlobalUsing.cs
new file mode 100644
index 00000000..e8b503e4
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/GlobalUsing.cs
@@ -0,0 +1,20 @@
+global using CoreEx;
+global using CoreEx.AspNetCore.Mvc;
+global using CoreEx.Caching;
+global using CoreEx.Database;
+// #if implement-sqlserver
+global using CoreEx.Database.SqlServer;
+// #elif implement-postgres
+global using CoreEx.Database.Postgres;
+// #endif
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+// #if refdata-enabled
+global using CoreEx.RefData;
+// #endif
+global using CoreEx.Validation;
+global using Microsoft.AspNetCore.Mvc;
+global using NSwag.Annotations;
+global using System.Net;
+global using System.Text.Json;
diff --git a/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/Program.cs b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/Program.cs
new file mode 100644
index 00000000..6ec69cde
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/Program.cs
@@ -0,0 +1,115 @@
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+using solution-name.Infrastructure.Repositories;
+
+namespace app-name.Api;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+           .AddExecutionContext()
+// #if refdata-enabled
+           .AddReferenceDataOrchestrator()              // Resolves the (CodeGen-generated) IReferenceDataProvider from DI at runtime — no compile-time dependency on the generated type.
+// #endif
+           .AddMvcWebApi()
+           .AddHttpWebApi();
+
+        // Dynamically register all [ScopedService] application services and infrastructure repositories (including those generated by CodeGen) by scanning each assembly. The AssemblyMarker types are stable anchors that always exist.
+        builder.Services.AddDynamicServicesUsing(typeof(solution-name.Application.AssemblyMarker).Assembly, typeof(solution-name.Infrastructure.AssemblyMarker).Assembly);
+
+        // Add L1/L2 caching services.
+        builder.Services.AddMemoryCache();              // Adds the in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Adds Redis as the distributed cache - L2.
+
+        // Add and wire-up FusionCache including backplane.
+        builder.Services.AddFusionCache()
+           .WithRegisteredMemoryCache()
+           .WithRegisteredDistributedCache()
+           .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+           .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        // Add CoreEx caching services.
+        builder.Services
+           .AddFusionHybridCache()                     // Adds the CoreEx.Caching.IHybridCache for FusionCache.
+           .AddDefaultCacheKeyProvider()               // Adds the default CoreEx.Caching.ICacheKeyProvider.
+           .AddHybridCacheIdempotencyProvider();       // Adds the CoreEx.Caching.Idempotency.IIdempotencyProvider.
+
+        // Add the repository and related database services.
+// #if implement-sqlserver
+        builder.AddSqlServerClient("SqlServer");        // Adds the SqlServerClient (using Aspire library).
+        builder.Services
+           .AddSqlServerDatabase()                     // Adds the SqlServerDatabase.
+           .AddSqlServerUnitOfWork()                   // Adds the SqlServerUnitOfWork for the SqlServerDatabase.
+           .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+// #if outbox-enabled
+           .AddSqlServerOutboxPublisher()              // Adds the SqlServerOutboxPublisher as the IEventPublisher.
+// #endif
+           .AddDbContext<domain-nameDbContext>()       // Adds the standard EF DbContext.
+           .AddEfDb<domain-nameEfDb>();                // Adds the CoreEx extended EF service.
+// #elif implement-postgres
+        builder.AddNpgsqlDataSource("Postgres");        // Adds the NpgsqlDataSource (using Aspire library).
+        builder.Services
+            .AddPostgresDatabase()                      // Adds the PostgresDatabase.
+            .AddPostgresUnitOfWork()                    // Adds the PostgresUnitOfWork for the PostgresDatabase.
+            .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+// #if outbox-enabled
+            .AddPostgresOutboxPublisher()               // Adds the PostgresOutboxPublisher as the IEventPublisher.
+// #endif
+            .AddDbContext<domain-nameDbContext>()       // Adds the standard EF DbContext.
+            .AddEfDb<domain-nameEfDb>();                // Adds the CoreEx extended EF service.
+// #endif
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+// #if implement-sqlserver
+            .WithCoreExSqlServerTelemetry()
+// #elif implement-postgres
+            .WithCoreExPostgresTelemetry()
+// #endif
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.UseIdempotencyKey();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+
+        // Run the application.
+        app.Run();
+    }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/app-name.Api.csproj b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/app-name.Api.csproj
new file mode 100644
index 00000000..61a61690
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/app-name.Api.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <ItemGroup>
+    <!--#if refdata-enabled-->
+    <ProjectReference Include="..\solution-name.Application\solution-name.Application.csproj" />
+    <!--#endif-->
+    <ProjectReference Include="..\solution-name.Infrastructure\solution-name.Infrastructure.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreEx.AspNetCore" />
+    <PackageReference Include="CoreEx.AspNetCore.NSwag" />
+    <PackageReference Include="CoreEx.Caching.FusionCache" />
+    <!--#if implement-sqlserver-->
+    <PackageReference Include="CoreEx.Database.SqlServer" />
+    <PackageReference Include="Aspire.Microsoft.Data.SqlClient" />
+    <!--#endif-->
+    <!--#if implement-postgres-->
+    <PackageReference Include="CoreEx.Database.Postgres" />
+    <PackageReference Include="Aspire.Azure.Npgsql" />
+    <!--#endif-->
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" />
+    <PackageReference Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Update="appsettings.Development.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/appsettings.Development.json b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/appsettings.Development.json
new file mode 100644
index 00000000..bcb45b27
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/appsettings.Development.json
@@ -0,0 +1,42 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+//#if implement-sqlserver
+      "Npgsql": "Warning",
+//#endif
+//#if implement-servicebus
+      "Azure.Messaging.ServiceBus": "Critical",
+      "CoreEx.Azure.Messaging.ServiceBus": "Warning",
+//#endif
+      "ZiggyCreatures": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+//#if implement-sqlserver
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=domain-name;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+//#elif implement-postgres
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=domain-name-lower;Username=postgres;Password=yourStrong#!Password"
+    },
+//#endif
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/appsettings.json b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/appsettings.json
new file mode 100644
index 00000000..c68c250b
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/src/app-name.Api/appsettings.json
@@ -0,0 +1,20 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "solution-parent-name",
+      "DomainName": "domain-name"
+    },
+    "Events": {
+      "Destination": "domain-parent-lower" // Topic/queue name.
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Update": "None"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/GlobalUsing.cs
new file mode 100644
index 00000000..48940cdf
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/GlobalUsing.cs
@@ -0,0 +1,18 @@
+global using CoreEx;
+// #if (implement-postgres && outbox-enabled)
+global using CoreEx.Database.Postgres.Outbox;
+// #endif
+// #if (implement-sqlserver && outbox-enabled)
+global using CoreEx.Database.SqlServer.Outbox;
+// #endif
+global using AwesomeAssertions;
+global using NUnit.Framework;
+global using System.Net;
+global using UnitTestEx;
+global using UnitTestEx.NUnit;
+global using UnitTestEx.Expectations;
+global using solution-name.Contracts;
+// #if (implement-sqlserver || implement-postgres)
+global using DbMigration = solution-name.Database.Program;
+global using TestData = solution-name.Test.Common.TestData;
+// #endif
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/HostTests.cs b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/HostTests.cs
new file mode 100644
index 00000000..8b1e7f23
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/HostTests.cs
@@ -0,0 +1,84 @@
+namespace solution-name.Test.Api;
+
+public partial class HostTests : WithApiTester<solution-name.Api.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+// #if implement-sqlserver
+        await Test.MigrateSqlServerDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #elif implement-postgres
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #endif
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+    }
+
+    [Test]
+    public void Swagger_UI()
+    {
+        // Hit swagger and assert redirect.
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger")
+            .Assert(HttpStatusCode.Found)
+            .AssertLocationHeader(new Uri("/swagger/index.html", UriKind.Relative));
+
+        // Go to redirected URL and assert basic content.
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger/index.html")
+            .Assert(HttpStatusCode.OK)
+            .GetContent().Should().Contain("<title>Swagger UI</title>");
+    }
+
+    [Test]
+    public void Swagger_Json()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger/v1/swagger.json")
+            .Assert(HttpStatusCode.OK)
+            .AssertContentTypeJson()
+            .GetContent().Should().BeJson()
+                .ContainAll(["$.openapi", "$.info", "$.paths"])
+                .HavePath("$.info.title").GetValue<string>().Should().Be("solution-name.Api");
+    }
+
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health_Basic(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+    }
+
+    [TestCase("/health/live/detailed", true)]
+    [TestCase("/health/startup/detailed", false)]
+    [TestCase("/health/ready/detailed", false)]
+    public void Health_Detailed(string path, bool minimal)
+    {
+        string[] _paths =
+        [
+// #if refdata-enabled
+            "$.entries.reference-data-orchestrator",
+// #endif
+            "$.entries['stackExchange.Redis']",
+// #if implement-sqlserver
+            "$.entries.sqlServer"
+// #elif implement-postgres
+            "$.entries.postgreSql"
+// #endif
+        ];
+
+        var r = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .AssertContentTypeJson();
+
+        r.Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+
+        var json = r.GetContent().Should().BeJson();
+        if (minimal)
+            json.NotContainAny(_paths);
+        else
+            json.ContainAll(_paths);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/appsettings.unittest.json b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/appsettings.unittest.json
new file mode 100644
index 00000000..9a9e0740
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/appsettings.unittest.json
@@ -0,0 +1,13 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "System.Net.Http.HttpClient": "Information",
+      "Polly": "Information"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/solution-name.Test.Api.csproj b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/solution-name.Test.Api.csproj
new file mode 100644
index 00000000..619335bc
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Api/tests/solution-name.Test.Api/solution-name.Test.Api.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="CoreEx.UnitTesting" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\app-name.Api\app-name.Api.csproj" />
+    <ProjectReference Include="..\solution-name.Test.Common\solution-name.Test.Common.csproj" />
+    <!--#if (implement-sqlserver || implement-postgres)-->
+    <ProjectReference Include="..\..\tools\solution-name.Database\solution-name.Database.csproj" />
+    <!--#endif-->
+  </ItemGroup>
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Bootstrap/.template.config/template.json b/src/CoreEx.Template/content/CoreEx.Bootstrap/.template.config/template.json
new file mode 100644
index 00000000..2439e647
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Bootstrap/.template.config/template.json
@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "https://github.com/avanade/coreex",
+  "classifications": [ "CoreEx", "Bootstrap", "AI" ],
+  "identity": "CoreEx.Bootstrap",
+  "name": "CoreEx AI-ready bootstrap repository",
+  "description": "An intentionally minimal CoreEx bootstrap repository that includes only the AI workflow assets needed to drive /coreex-scaffold.",
+  "shortName": "coreex-bootstrap",
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "sourceName": "app-name",
+  "preferNameDirectory": false,
+  "symbols": {
+    "coreex-version": {
+      "type": "generated",
+      "generator": "constant",
+      "parameters": {
+        "value": "COREEX_VERSION"
+      },
+      "replaces": "coreex-version"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Bootstrap/AGENTS.md b/src/CoreEx.Template/content/CoreEx.Bootstrap/AGENTS.md
new file mode 100644
index 00000000..783d58ab
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Bootstrap/AGENTS.md
@@ -0,0 +1,15 @@
+# app-name -- CoreEx Bootstrap
+
+This repository is intentionally bootstrapped with only the **CoreEx AI workflow assets**.
+
+Run `/coreex-scaffold` to interview the business/domain shape and scaffold the smallest safe `dotnet new coreex*` command set for this solution.
+
+Until that workflow runs, the repository is expected to stay mostly empty apart from:
+
+- `.github/` instructions, prompts, skills, and the cached CoreEx docs.
+- `.claude/commands/` prompt shims.
+- this bootstrap guidance file.
+
+If the repository still only contains this bootstrap shell, it is safe for `/coreex-scaffold` to use `dotnet new ... --force` when replacing placeholder files with the full solution scaffold.
+
+Use `/coreex-expert` when you need CoreEx architecture guidance before choosing the final shape.
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Bootstrap/CLAUDE.md b/src/CoreEx.Template/content/CoreEx.Bootstrap/CLAUDE.md
new file mode 100644
index 00000000..f356820b
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Bootstrap/CLAUDE.md
@@ -0,0 +1,20 @@
+@.github/copilot-instructions.md
+@.github/instructions/coreex-conventions.instructions.md
+@.github/instructions/coreex-contracts.instructions.md
+@.github/instructions/coreex-application-services.instructions.md
+@.github/instructions/coreex-validators.instructions.md
+@.github/instructions/coreex-repositories.instructions.md
+@.github/instructions/coreex-api-controllers.instructions.md
+@.github/instructions/coreex-event-subscribers.instructions.md
+@.github/instructions/coreex-host-setup.instructions.md
+@.github/instructions/coreex-domain.instructions.md
+@.github/instructions/coreex-tests.instructions.md
+@.github/instructions/coreex-tooling.instructions.md
+
+## Slash commands
+
+| Command | What it does |
+|---|---|
+| `/coreex-scaffold` | Guided interview → derives and runs the right `dotnet new coreex*` commands for this solution shape |
+| `/coreex-expert` | Architecture guidance, pattern decisions, and sample-aligned implementation advice |
+| `/coreex-docs-sync` | Fetches and caches CoreEx architecture docs and per-package AI guides under `.github/docs/coreex/` |
diff --git a/src/CoreEx.Template/content/CoreEx.Bootstrap/README.md b/src/CoreEx.Template/content/CoreEx.Bootstrap/README.md
new file mode 100644
index 00000000..5fefbaa7
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Bootstrap/README.md
@@ -0,0 +1,16 @@
+# app-name
+
+This template creates an intentionally empty, AI-ready CoreEx bootstrap repository.
+
+## Next Step
+
+Run `/coreex-scaffold` in Copilot Chat or Claude Code. The workflow will ask about:
+
+- the bounded context and solution name;
+- whether the domain owns data or is a facade;
+- whether it needs an API host;
+- whether it needs reliable event publishing and an outbox relay;
+- whether it needs to consume events with a subscriber host;
+- whether reference data, domain-driven design, and ROP should be enabled.
+
+From that interview, the workflow will derive and run the right `dotnet new coreex*` commands for the solution.
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/.template.config/ide.host.json b/src/CoreEx.Template/content/CoreEx.Core/.template.config/ide.host.json
new file mode 100644
index 00000000..6b1c549f
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/.template.config/ide.host.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "http://json.schemastore.org/vs-2017.3.host",
+  "primaryOutputs": [
+    {
+      "path": "app-name.slnx"
+    }
+  ]
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Core/.template.config/template.json b/src/CoreEx.Template/content/CoreEx.Core/.template.config/template.json
new file mode 100644
index 00000000..7b4ac89f
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/.template.config/template.json
@@ -0,0 +1,338 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "https://github.com/avanade/coreex",
+  "classifications": [ "CoreEx", "Microservice", "Application" ],
+  "identity": "CoreEx.Solution",
+  "name": "CoreEx Application services",
+  "description": "A solution template for the core application services, tooling, and test projects using CoreEx.",
+  "shortName": "coreex",
+  "tags": {
+    "language": "C#",
+    "type": "solution"
+  },
+  "sourceName": "app-name",
+  "preferNameDirectory": false,
+  "symbols": {
+    "coreex-version": {
+      "type": "generated",
+      "generator": "constant",
+      "parameters": {
+        "value": "COREEX_VERSION"
+      },
+      "replaces": "coreex-version"
+    },
+    "domain-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueAfterLastDotDelimited",
+      "fileRename": "domain-name",
+      "replaces": "domain-name"
+    },
+    "domain-name-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueAfterLastDotDelimitedLower",
+      "replaces": "domain-name-lower"
+    },
+    "domain-parent-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimitedLower",
+      "replaces": "domain-parent-lower"
+    },
+    "db-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueAfterLastDotDelimitedLower",
+      "fileRename": "db-name",
+      "replaces": "db-name"
+    },
+    "solution-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastDotDelimited",
+      "fileRename": "solution-name",
+      "replaces": "solution-name"
+    },
+    "app-name-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "LowerCase",
+      "replaces": "app-name-lower"
+    },
+    "date-now": {
+      "type": "generated",
+      "generator": "now",
+      "parameters": {
+        "format": "yyyyMMdd"
+      },
+      "fileRename": "date-now",
+      "replaces": "date-now"
+    },
+    "refdata-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Reference data enabled",
+      "description": "Indicates whether reference data pattern/capabilities is enabled.",
+      "defaultValue": "true"
+    },
+    "rop-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "ROP enabled",
+      "description": "Indicates whether Railway-oriented Programming (ROP), being Result/Result<T>, is enabled.",
+      "defaultValue": "false"
+    },
+    "domain-driven-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Domain-driven project enabled",
+      "description": "Indicates whether a Domain-driven project is enabled.",
+      "defaultValue": "false"
+    },
+    "data-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "SqlServer",
+          "displayName": "SQL Server",
+          "description": "Indicates to use SQL Server as the data provider."
+        },
+        {
+          "choice": "Postgres",
+          "displayName": "PostgreSQL",
+          "description": "Indicates to use PostgreSQL as the data provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no data provider is used (e.g. a facade over an external system such as Dynamics 365)."
+        }
+      ],
+      "defaultValue": "Postgres",
+      "displayName": "Data provider",
+      "description": "Determines the data provider technology to use."
+    },
+    "implement-sqlserver": {
+      "type": "computed",
+      "value": "data-provider == 'SqlServer'"
+    },
+    "implement-postgres": {
+      "type": "computed",
+      "value": "data-provider == 'Postgres'"
+    },
+    "implement-none-data": {
+      "type": "computed",
+      "value": "data-provider == 'None'"
+    },
+    "outbox-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Outbox enabled",
+      "description": "Indicates whether a transactional-outbox is enabled.",
+      "defaultValue": "true"
+    },
+    "messaging-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "ServiceBus",
+          "displayName": "Azure Service Bus",
+          "description": "Indicates to use Azure Service Bus as the messaging provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no messaging provider is used."
+        }
+      ],
+      "defaultValue": "ServiceBus",
+      "displayName": "Messaging provider",
+      "description": "Determines the messaging provider technology to use."
+    },
+    "implement-servicebus": {
+      "type": "computed",
+      "value": "messaging-provider == 'ServiceBus'"
+    },
+    "implement-none-messaging": {
+      "type": "computed",
+      "value": "messaging-provider == 'None'"
+    }
+  },
+  "sources": [
+    {
+      "rename": {
+        "_Directory.Build.props": "Directory.Build.props",
+        "_Directory.Packages.props": "Directory.Packages.props",
+        "_editorconfig": ".editorconfig",
+        "_gitattributes": ".gitattributes",
+        "_gitignore": ".gitignore",
+        "_.filenesting.json": ".filenesting.json"
+      },
+      "modifiers": [
+        {
+          "condition": "(!refdata-enabled)",
+          "exclude": [
+            "src/app-name.Application/ReferenceDataService.g.cs",
+            "src/app-name.Application/Repositories/IReferenceDataRepository.g.cs",
+            "src/app-name.Infrastructure/Repositories/ReferenceDataRepository.cs",
+            "tools/app-name.CodeGen/**",
+            "tools/app-name.Database/Data/ref-data.seed.yaml"
+          ]
+        },
+        {
+          "condition": "(!domain-driven-enabled)",
+          "exclude": [ "src/app-name.Domain/**" ]
+        },
+        {
+          "condition": "(implement-none-data)",
+          "exclude": [
+            "tools/app-name.Database/**",
+            "tools/app-name.CodeGen/**",
+            "src/app-name.Infrastructure/Repositories/domain-nameDbContext.cs",
+            "src/app-name.Infrastructure/Repositories/domain-nameEfDb.cs",
+            "tests/app-name.Test.Common/Data/**"
+          ]
+        },
+        {
+          "condition": "(implement-sqlserver)",
+          "exclude": [ "tools/app-name.Database/Migrations/*.pgsql" ]
+        },
+        {
+          "condition": "(implement-postgres)",
+          "exclude": [ "tools/app-name.Database/Migrations/*.sql" ]
+        },
+        {
+          "condition": "(!outbox-enabled)",
+          "exclude": [ "tools/app-name.Database/Migrations/*outbox-tables.*" ]
+        },
+        {
+          "condition": "(!implement-servicebus)",
+          "exclude": [ "servicebus/**" ]
+        }
+      ]
+    }
+  ],
+  "specialCustomOperations": {
+    "*.md": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!-- #if" ],
+            "actionableElse": [ "<!-- #else" ],
+            "actionableElseif": [ "<!-- #elseif", "<!-- #elif" ],
+            "endif": [ "<!-- #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.slnx": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.csproj": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.props": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.cs": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "// #if" ],
+            "actionableElse": [ "// #else" ],
+            "actionableElseif": [ "// #elseif", "// #elif" ],
+            "endif": [ "// #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.yaml": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "# #if" ],
+            "actionableElse": [ "# #else" ],
+            "actionableElseif": [ "# #elseif", "# #elif" ],
+            "endif": [ "# #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    }
+  },
+  "forms": {
+    "ValueAfterLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^.*\\.([^\\.]+)$", // regex to capture the last segment in a dot-delimited string (e.g. "Foo.Bar.App.Blah" → "Blah", "App.Blah" → "Blah", "Blah" → "Blah").
+      "replacement": "$1" // replace with the captured last segment.
+    },
+    "ValueSecondToLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(?:.*\\.)?([^.]+)\\.[^.]+$", // regex to capture the second-to-last segment in a dot-delimited string (e.g. "Foo.Bar.App.Blah" → "App", "App.Blah" → "App", "Blah" → "Blah").
+      "replacement": "$1" // replace it with the captured second-to-last or last (depending) segment.
+    },
+    "ValueWithoutLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(.*)\\.([^.]+)$", // regex to capture everything before the last dot-delimiter (e.g. "Foo.Bar.App.Blah" → "Foo.Bar.App", "App.Blah" → "App", "Blah" → "Blah").
+      "replacement": "$1" // replace it with everything before the last dot-delimited segment.
+    },
+    "LowerCase": {
+      "identifier": "lowerCase"
+    },
+    "ValueAfterLastDotDelimitedLower": {
+      "identifier": "chain",
+      "steps": [ "ValueAfterLastDotDelimited", "LowerCase" ]
+    },
+    "ValueSecondToLastDotDelimitedLower": {
+      "identifier": "chain",
+      "steps": [ "ValueSecondToLastDotDelimited", "LowerCase" ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/AGENTS.md b/src/CoreEx.Template/content/CoreEx.Core/AGENTS.md
new file mode 100644
index 00000000..1f0b3b1f
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/AGENTS.md
@@ -0,0 +1,81 @@
+# app-name -- CoreEx Application Services
+
+This represents the **CoreEx domain-based application services** for the `domain-name` domain.
+
+**AI assistance:** run `/coreex-scaffold` to choose and scaffold the right greenfield solution shape, or run `/coreex-expert` for CoreEx architecture guidance, pattern decisions, and sample-aligned implementation advice. The full CoreEx doc cache is pre-loaded in `.github/docs/coreex/` -- the expert reads it automatically.
+
+> Re-run `/coreex-docs-sync` after bumping the CoreEx NuGet version in `Directory.Packages.props`.
+
+---
+
+## Project Structure
+
+```
+app-name/
++-- src/
+|   +-- app-name.Contracts/        # Public contracts: entities, DTOs, event schemas
+|   +-- app-name.Application/      # Business logic: services, validators, repository interfaces
+|   +-- app-name.Domain/           # (domain-driven-enabled) Aggregates, value objects, domain events
+|   +-- app-name.Infrastructure/   # EF Core repositories, outbox, external integrations
++-- tools/
+|   +-- app-name.Database/         # (data-provider != None) Database migrations (DbEx)
+|   +-- app-name.CodeGen/          # (refdata-enabled && data-provider != None) Ref-data code gen
++-- tests/
+|   +-- app-name.Test.Common/      # Shared test infrastructure: TestData marker, embedded seed data
+|   +-- app-name.Test.Unit/        # Fast isolated unit tests (validators, services, no I/O)
++-- Directory.Packages.props       # Central NuGet version management (no versions in .csproj)
+```
+
+See `.github/docs/coreex/layers.md` for the full layered architecture and dependency rules.
+
+---
+
+## Feature Configuration
+
+<!-- #if implement-sqlserver -->
+- **Data provider:** SQL Server (`CoreEx.Database.SqlServer`, `CoreEx.EntityFrameworkCore`)
+<!-- #elif implement-postgres -->
+- **Data provider:** PostgreSQL (`CoreEx.Database.Postgres`, `CoreEx.EntityFrameworkCore`)
+<!-- #else -->
+- **Data provider:** None -- facade solution (e.g. over Dynamics 365 via HttpClient)
+<!-- #endif -->
+<!-- #if (refdata-enabled && !implement-none-data) -->
+- **Reference data:** Enabled -- `src/app-name.Application/ReferenceDataService.cs` and `tools/app-name.CodeGen/`
+<!-- #else -->
+- **Reference data:** Disabled
+<!-- #endif -->
+<!-- #if domain-driven-enabled -->
+- **Domain project:** Enabled -- `src/app-name.Domain/` (aggregates, value objects)
+<!-- #else -->
+- **Domain project:** Disabled -- domain logic lives in Application
+<!-- #endif -->
+<!-- #if rop-enabled -->
+- **Railway-Oriented Programming:** Enabled -- service methods return `Result`/`Result<T>`
+<!-- #else -->
+- **Railway-Oriented Programming:** Disabled -- standard exception-based error handling
+<!-- #endif -->
+<!-- #if (outbox-enabled && !implement-none-data) -->
+- **Transactional outbox:** Enabled -- events committed atomically with data via the outbox table
+<!-- #else -->
+- **Transactional outbox:** Disabled
+<!-- #endif -->
+<!-- #if implement-servicebus -->
+- **Messaging:** Azure Service Bus (`CoreEx.Azure.Messaging.ServiceBus`)
+<!-- #else -->
+- **Messaging:** None configured
+<!-- #endif -->
+
+---
+
+## Relevant Docs
+
+- `.github/docs/coreex/layers.md` -- full layered architecture and dependency rules
+- `.github/docs/coreex/patterns.md` -- CoreEx request/response and event patterns
+- `.github/docs/coreex/application-scaffolding-guide.md` -- choosing the smallest safe CoreEx solution shape before adding code
+- `.github/docs/coreex/contracts-layer.md` -- entities, DTOs, event schemas
+- `.github/docs/coreex/application-layer.md` -- services, validators, repository interfaces
+- `.github/docs/coreex/infrastructure-layer.md` -- EF Core, outbox, external integrations
+- `.github/docs/coreex/testing.md` -- test project setup, `WithGenericTester`, `WithApiTester`
+- `.github/docs/coreex/local-dev.md` -- running locally with .NET Aspire
+- `.github/docs/coreex/tooling.md` -- Database and CodeGen tool projects
+
diff --git a/src/CoreEx.Template/content/CoreEx.Core/CLAUDE.md b/src/CoreEx.Template/content/CoreEx.Core/CLAUDE.md
new file mode 100644
index 00000000..f356820b
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/CLAUDE.md
@@ -0,0 +1,20 @@
+@.github/copilot-instructions.md
+@.github/instructions/coreex-conventions.instructions.md
+@.github/instructions/coreex-contracts.instructions.md
+@.github/instructions/coreex-application-services.instructions.md
+@.github/instructions/coreex-validators.instructions.md
+@.github/instructions/coreex-repositories.instructions.md
+@.github/instructions/coreex-api-controllers.instructions.md
+@.github/instructions/coreex-event-subscribers.instructions.md
+@.github/instructions/coreex-host-setup.instructions.md
+@.github/instructions/coreex-domain.instructions.md
+@.github/instructions/coreex-tests.instructions.md
+@.github/instructions/coreex-tooling.instructions.md
+
+## Slash commands
+
+| Command | What it does |
+|---|---|
+| `/coreex-scaffold` | Guided interview → derives and runs the right `dotnet new coreex*` commands for this solution shape |
+| `/coreex-expert` | Architecture guidance, pattern decisions, and sample-aligned implementation advice |
+| `/coreex-docs-sync` | Fetches and caches CoreEx architecture docs and per-package AI guides under `.github/docs/coreex/` |
diff --git a/src/CoreEx.Template/content/CoreEx.Core/README.md b/src/CoreEx.Template/content/CoreEx.Core/README.md
new file mode 100644
index 00000000..8b986163
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/README.md
@@ -0,0 +1,228 @@
+# app-name
+
+A CoreEx microservice for the `domain-name` domain.
+
+## This solution
+
+<!-- #if implement-sqlserver -->
+- **Data provider:** SQL Server (`CoreEx.Database.SqlServer`, `CoreEx.EntityFrameworkCore`)
+<!-- #endif -->
+<!-- #if implement-postgres -->
+- **Data provider:** PostgreSQL (`CoreEx.Database.Postgres`, `CoreEx.EntityFrameworkCore`)
+<!-- #endif -->
+<!-- #if implement-none-data -->
+- **Data provider:** None — facade over an external system (no local database)
+<!-- #endif -->
+<!-- #if (refdata-enabled && !implement-none-data) -->
+- **Reference data:** Enabled — `tools/app-name.CodeGen/` + `src/app-name.Application/ReferenceDataService.cs`
+<!-- #endif -->
+<!-- #if domain-driven-enabled -->
+- **Domain layer:** Enabled — `src/app-name.Domain/` (aggregates, value objects)
+<!-- #endif -->
+<!-- #if rop-enabled -->
+- **Railway-oriented programming:** Enabled — services return `Result`/`Result<T>`
+<!-- #endif -->
+<!-- #if (outbox-enabled && !implement-none-data) -->
+- **Transactional outbox:** Enabled — events committed atomically with data
+<!-- #endif -->
+<!-- #if implement-servicebus -->
+- **Messaging:** Azure Service Bus (`CoreEx.Azure.Messaging.ServiceBus`)
+<!-- #endif -->
+
+---
+
+## Prerequisites
+
+| Requirement | Notes |
+|---|---|
+| **.NET SDK** | `net10.0` — see `Directory.Build.props` |
+| **Podman** (preferred) or **Docker** | Required to run the infrastructure containers |
+
+### Git configuration (Windows)
+
+```bash
+git config --global core.autocrlf input
+```
+
+Run this once. Git for Windows defaults to `core.autocrlf=true`, which overrides the `.gitattributes` LF enforcement and causes noisy diffs. `input` mode stores LF on commit without expanding to CRLF on checkout.
+
+---
+
+## Solution structure
+
+```
+app-name/
+├── src/
+│   ├── app-name.Contracts/        # Public contracts, DTOs, event schemas
+│   ├── app-name.Application/      # Services, validators, repository interfaces
+<!-- #if domain-driven-enabled -->
+│   ├── app-name.Domain/           # Aggregates, value objects, domain events
+<!-- #endif -->
+│   └── app-name.Infrastructure/   # EF Core repositories, outbox, external adapters
+<!-- #if !implement-none-data -->
+├── tools/
+<!-- #if (refdata-enabled && !implement-none-data) -->
+│   ├── app-name.CodeGen/          # Reference data C# generation (reads ref-data.yaml)
+<!-- #endif -->
+│   └── app-name.Database/         # Database migrations and seeding (DbEx)
+<!-- #endif -->
+└── tests/
+    ├── app-name.Test.Common/      # Shared test infrastructure and seed data
+    └── app-name.Test.Unit/        # Fast isolated unit tests (no I/O)
+```
+
+Host projects (`app-name.Api`, `app-name.Relay`, `app-name.Subscribe`) are added separately with `dotnet new coreex-api`, `coreex-relay`, and `coreex-subscribe`. See [Adding hosts](#adding-hosts) below.
+
+---
+
+## Infrastructure
+
+<!-- #if !implement-none-data -->
+Start the containers before running the solution or any integration tests:
+
+```bash
+podman compose up -d   # Podman (preferred)
+docker compose up -d   # Docker
+```
+
+| Container | Port(s) | Purpose |
+|---|---|---|
+<!-- #if implement-sqlserver -->
+| `db-sql-server` | 1433 | SQL Server — domain schema and data |
+<!-- #endif -->
+<!-- #if implement-postgres -->
+| `db-postgres` | 5432 | PostgreSQL — domain schema and data |
+<!-- #endif -->
+| `redis-cache` | 6379 | Redis — FusionCache distributed backplane |
+<!-- #if implement-servicebus -->
+| `servicebus-emulator` | 5672 (AMQP), 5300 (mgmt) | Azure Service Bus emulator |
+<!-- #endif -->
+| `aspire-dashboard` | 18888 (UI), 4317 (OTLP) | OpenTelemetry traces and logs |
+
+Stop and remove containers:
+
+```bash
+podman compose down
+```
+
+<!-- #else -->
+This solution is a facade (no local database). Start Redis for caching and the dashboard for telemetry:
+
+```bash
+podman compose up -d
+```
+
+<!-- #endif -->
+<!-- #if implement-sqlserver -->
+### Connection strings
+
+Connection strings are in each host's `appsettings.Development.json` under the `Aspire:` key hierarchy. The `Database` default:
+
+```json
+"Aspire": {
+  "Microsoft": {
+    "Data": {
+      "SqlClient": {
+        "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=domain-name;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+      }
+    }
+  }
+}
+```
+
+<!-- #endif -->
+<!-- #if implement-postgres -->
+### Connection strings
+
+Connection strings are in each host's `appsettings.Development.json` under the `Aspire:` key hierarchy. The `Database` default:
+
+```json
+"Aspire": {
+  "Npgsql": {
+    "ConnectionString": "Server=127.0.0.1;Database=domain-name-lower;Username=postgres;Password=yourStrong#!Password"
+  }
+}
+```
+
+<!-- #endif -->
+---
+
+<!-- #if !implement-none-data -->
+## Database
+
+Migrate and seed — required once on first run and after any schema change:
+
+```bash
+dotnet run --project tools/app-name.Database -- all
+```
+
+| Command | Effect |
+|---|---|
+| `-- all` | Create schema, run migrations, seed reference data |
+| `-- drop` | Drop and recreate the database |
+| `-- reset` | Reset seed data only (schema stays) |
+| `-- migrate` | Apply migrations without seeding |
+
+See `tools/app-name.Database/Migrations/` for migration scripts and `tools/app-name.Database/Data/` for seed data.
+
+<!-- #endif -->
+<!-- #if (refdata-enabled && !implement-none-data) -->
+---
+
+## Reference data code generation
+
+After editing `tools/app-name.CodeGen/ref-data.yaml`, regenerate the C# reference data layer:
+
+```bash
+dotnet run --project tools/app-name.CodeGen
+```
+
+Commit the generated `*.g.cs` files alongside the `ref-data.yaml` changes. **Never edit generated files by hand** — they are overwritten on the next run.
+
+<!-- #endif -->
+---
+
+## Build and test
+
+```bash
+dotnet build
+dotnet test
+```
+
+<!-- #if !implement-none-data -->
+Unit tests in `tests/app-name.Test.Unit` are fast and isolated — no infrastructure required. Integration tests (in host test projects) require the containers to be running and the database migrated.
+
+<!-- #else -->
+Unit tests in `tests/app-name.Test.Unit` are fast and isolated — no infrastructure required.
+
+<!-- #endif -->
+---
+
+## Adding hosts
+
+Use the CoreEx templates to add host projects into this solution:
+
+```bash
+dotnet new coreex-api       -n app-name.Api              -o .   # HTTP API + test project
+dotnet new coreex-relay     -n app-name.Relay     -o .   # Outbox relay + test project
+dotnet new coreex-subscribe -n app-name.Subscribe        -o .   # Event subscriber + test project
+```
+
+Each template adds the host project, its test project, and wires both into the solution file.
+
+---
+
+## Coding conventions
+
+| Rule | Detail |
+|---|---|
+| **Line endings** | LF everywhere (enforced by `.gitattributes` + `.editorconfig`) |
+| **Indentation** | 4 spaces (C#) · 2 spaces (JSON, YAML, XML, `*.csproj`) |
+| **Nullable** | Enabled — nullable warnings are treated as errors; never suppress with `!` without justification |
+| **`using` statements** | One `GlobalUsing.cs` per project — never in individual source files |
+| **Namespaces** | File-scoped only: `namespace Foo.Bar;` |
+| **Private fields** | Prefixed `_camelCase` |
+| **Generated files** | Never edit `*.g.cs`, `*.g.sql`, `*.g.pgsql` — re-run the owning generator |
+| **ConfigureAwait** | Always `.ConfigureAwait(false)` in service and repository code |
+
+Full rules are in `.editorconfig`. AI-oriented guidance is in `AGENTS.md`.
diff --git a/src/CoreEx.Template/content/CoreEx.Core/_.filenesting.json b/src/CoreEx.Template/content/CoreEx.Core/_.filenesting.json
new file mode 100644
index 00000000..e21bbefa
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/_.filenesting.json
@@ -0,0 +1,14 @@
+{
+  "help": "https://go.microsoft.com/fwlink/?linkid=866610",
+  "dependentFileProviders": {
+    "add": {
+      "pathSegment": {
+        "add": {
+          ".g.cs": [
+            ".cs"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/_Directory.Build.props b/src/CoreEx.Template/content/CoreEx.Core/_Directory.Build.props
new file mode 100644
index 00000000..1faab5f1
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/_Directory.Build.props
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/_Directory.Packages.props b/src/CoreEx.Template/content/CoreEx.Core/_Directory.Packages.props
new file mode 100644
index 00000000..7e94f5ea
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/_Directory.Packages.props
@@ -0,0 +1,91 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!--Disable warning about multiple package sources-->
+    <NoWarn>$(NoWarn);NU1507</NoWarn>
+  </PropertyGroup>
+
+  <!-- CoreEx packages. -->
+  <ItemGroup>
+    <PackageVersion Include="CoreEx" Version="coreex-version" />
+    <PackageVersion Include="CoreEx.AspNetCore" Version="coreex-version" />
+    <PackageVersion Include="CoreEx.AspNetCore.NSwag" Version="coreex-version" />
+    <!--#if implement-servicebus-->
+    <PackageVersion Include="CoreEx.Azure.Messaging.ServiceBus" Version="coreex-version" />
+    <!--#endif-->
+    <PackageVersion Include="CoreEx.Caching.FusionCache" Version="coreex-version" />
+    <PackageVersion Include="CoreEx.Data" Version="coreex-version" />
+    <!--#if implement-postgres-->
+    <PackageVersion Include="CoreEx.Database" Version="coreex-version" />
+    <PackageVersion Include="CoreEx.Database.Postgres" Version="coreex-version" />
+    <!--#endif-->
+    <!--#if implement-sqlserver-->
+    <PackageVersion Include="CoreEx.Database" Version="coreex-version" />
+    <PackageVersion Include="CoreEx.Database.SqlServer" Version="coreex-version" />
+    <!--#endif-->
+    <!--#if domain-driven-enabled-->
+    <PackageVersion Include="CoreEx.DomainDriven" Version="coreex-version" />
+    <!--#endif-->
+    <!--#if (implement-sqlserver || implement-postgres)-->
+    <PackageVersion Include="CoreEx.EntityFrameworkCore" Version="coreex-version" />
+    <!--#endif-->
+    <PackageVersion Include="CoreEx.Events" Version="coreex-version" />
+    <!--#if refdata-enabled-->
+    <PackageVersion Include="CoreEx.RefData" Version="coreex-version" />
+    <!--#endif-->
+    <PackageVersion Include="CoreEx.Validation" Version="coreex-version" />
+  </ItemGroup>
+
+  <!-- Aspire client integration packages. -->
+  <ItemGroup>
+    <!--#if implement-servicebus-->
+    <PackageVersion Include="Aspire.Azure.Messaging.ServiceBus" Version="13.1.1" />
+    <!--#endif-->
+    <!--#if implement-postgres-->
+    <PackageVersion Include="Aspire.Azure.Npgsql" Version="13.1.1" />
+    <!--#endif-->
+    <!--#if implement-sqlserver-->
+    <PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="13.1.1" />
+    <!--#endif-->
+    <PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="13.1.1" />
+  </ItemGroup>
+
+  <!-- OpenTelemetry packages. -->
+  <ItemGroup>
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+  </ItemGroup>
+
+  <!-- FusionCache support packages. -->
+  <ItemGroup>
+    <PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" Version="2.5.0" />
+    <PackageVersion Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson" Version="2.5.0" />
+  </ItemGroup>
+
+  <!-- Tool/Test packages. -->
+  <ItemGroup>
+    <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
+    <!--#if refdata-enabled-->
+    <PackageVersion Include="CoreEx.CodeGen" Version="coreex-version" />
+    <!--#endif-->
+    <PackageVersion Include="CoreEx.UnitTesting" Version="coreex-version" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <!--#if implement-postgres-->
+    <PackageVersion Include="DbEx.Postgres" Version="3.1.2" />
+    <!--#endif-->
+    <!--#if implement-sqlserver-->
+    <PackageVersion Include="DbEx.SqlServer" Version="3.1.2" />
+    <!--#endif-->
+    <!--#if implement-sqlserver-->
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
+    <!--#endif-->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="NUnit" Version="4.3.2" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.9.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
+    <!--#if implement-postgres-->
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
+    <!--#endif-->
+    <PackageVersion Include="UnitTestEx.NUnit" Version="5.11.0" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/_editorconfig b/src/CoreEx.Template/content/CoreEx.Core/_editorconfig
new file mode 100644
index 00000000..643a1302
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/_editorconfig
@@ -0,0 +1,197 @@
+root = true
+
+# ── Universal ────────────────────────────────────────────────────────────────
+
+[*]
+charset                  = utf-8
+indent_style             = space
+indent_size              = 4
+trim_trailing_whitespace = true
+insert_final_newline     = true
+end_of_line              = lf
+
+# ── C# source files ──────────────────────────────────────────────────────────
+
+[*.cs]
+indent_style = space
+indent_size  = 4
+
+# ── Formatting ───────────────────────────────────────────────────────────────
+
+# Allman-style braces — opening brace always on its own line.
+csharp_new_line_before_open_brace                                   = all
+csharp_new_line_before_else                                         = true
+csharp_new_line_before_catch                                        = true
+csharp_new_line_before_finally                                      = true
+csharp_new_line_before_members_in_object_initializers              = true
+csharp_new_line_before_members_in_anonymous_types                  = true
+csharp_new_line_between_query_expression_clauses                   = true
+
+# Indentation
+csharp_indent_case_contents                                         = true
+csharp_indent_switch_labels                                         = true
+csharp_indent_labels                                                = flush_left
+
+# Spacing
+csharp_space_after_cast                                             = false
+csharp_space_after_keywords_in_control_flow_statements             = true
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_call_parameter_list_parentheses        = false
+csharp_space_before_colon_in_inheritance_clause                    = true
+csharp_space_after_colon_in_inheritance_clause                     = true
+csharp_space_around_binary_operators                               = before_and_after
+
+# Wrapping
+csharp_preserve_single_line_statements                             = false
+csharp_preserve_single_line_blocks                                 = true
+
+# Using directives — System.* first; no blank lines between groups.
+dotnet_sort_system_directives_first                                 = false
+dotnet_separate_import_directive_groups                            = false
+
+# ── Language rules — standards (IDE warning; not a build error without EnforceCodeStyleInBuild) ──
+
+# File-scoped namespaces required.
+csharp_style_namespace_declarations                                = file_scoped:warning
+
+# Null-forgiving operator: prefer is-null checks over reference equality.
+dotnet_style_prefer_is_null_check_over_reference_equality_method  = true:warning
+
+# ── Language rules — modernisation (IDE suggestion) ──────────────────────────
+
+# Braces: omit on single-line if/else/for/while bodies; require when multi-line.
+csharp_prefer_braces                                               = when_multiline:none
+
+# Expression-bodied members: prefer => when the entire body is a single expression.
+csharp_style_expression_bodied_methods                             = when_on_single_line:none
+csharp_style_expression_bodied_properties                          = true:none
+csharp_style_expression_bodied_accessors                           = when_on_single_line:none
+csharp_style_expression_bodied_indexers                            = when_on_single_line:none
+csharp_style_expression_bodied_operators                           = when_on_single_line:none
+csharp_style_expression_bodied_lambdas                             = when_on_single_line:none
+csharp_style_expression_bodied_local_functions                     = when_on_single_line:none
+csharp_style_expression_bodied_constructors                        = when_on_single_line:none
+
+# var: prefer explicit type for built-ins; prefer var when type is obvious from RHS.
+csharp_style_var_for_built_in_types                                = false:none
+csharp_style_var_when_type_is_apparent                             = true:none
+csharp_style_var_elsewhere                                         = true:none
+
+# Null handling and pattern matching.
+dotnet_style_null_propagation                                      = true:none
+dotnet_style_coalesce_expression                                   = true:none
+csharp_style_prefer_null_check_over_type_check                     = true:none
+csharp_style_prefer_is_not_expression                              = true:none
+csharp_style_prefer_pattern_matching                               = true:none
+csharp_style_prefer_switch_expression                              = true:none
+
+# Object and collection initialisers.
+dotnet_style_object_initializer                                    = true:none
+dotnet_style_collection_initializer                                = true:none
+
+# Modern using declarations (using var x = ... instead of using (var x = ...)).
+csharp_prefer_simple_using_statement                               = true:none
+
+# Auto-properties over explicit backing fields where no extra logic exists.
+dotnet_style_prefer_auto_properties                                = true:none
+
+# Throw expressions (x ?? throw ...).
+csharp_style_throw_expression                                      = true:none
+
+# Conditional delegate invocation (handler?.Invoke() vs if (handler != null) handler()).
+csharp_style_conditional_delegate_call                             = true:none
+
+# Tuple/anonymous type member names.
+dotnet_style_prefer_inferred_tuple_names                           = true:none
+dotnet_style_prefer_inferred_anonymous_type_member_names           = true:none
+
+# Accessibility modifiers — always explicit, even when the default would apply.
+dotnet_style_require_accessibility_modifiers                       = for_non_interface_members:none
+
+# Preferred modifier order.
+csharp_preferred_modifier_order                                    = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:none
+
+# ── Naming conventions ───────────────────────────────────────────────────────
+# Rules are evaluated top-to-bottom; the first match wins.
+
+## Symbol groups
+
+dotnet_naming_symbols.private_fields.applicable_kinds             = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities   = private,private_protected
+
+dotnet_naming_symbols.non_private_fields.applicable_kinds         = field
+dotnet_naming_symbols.non_private_fields.applicable_accessibilities = public,internal,protected,protected_internal
+
+dotnet_naming_symbols.constants.applicable_kinds                  = field,local
+dotnet_naming_symbols.constants.required_modifiers                = const
+
+dotnet_naming_symbols.interfaces.applicable_kinds                 = interface
+
+dotnet_naming_symbols.type_parameters.applicable_kinds            = type_parameter
+
+dotnet_naming_symbols.async_methods.applicable_kinds              = method
+dotnet_naming_symbols.async_methods.required_modifiers            = async
+
+## Naming styles
+
+# _camelCase
+dotnet_naming_style.prefix_underscore.capitalization              = camel_case
+dotnet_naming_style.prefix_underscore.required_prefix             = _
+
+# PascalCase
+dotnet_naming_style.pascal_case.capitalization                    = pascal_case
+
+# IPascalCase
+dotnet_naming_style.i_prefix_pascal_case.capitalization           = pascal_case
+dotnet_naming_style.i_prefix_pascal_case.required_prefix          = I
+
+# TPascalCase
+dotnet_naming_style.t_prefix_pascal_case.capitalization           = pascal_case
+dotnet_naming_style.t_prefix_pascal_case.required_prefix          = T
+
+# PascalCaseAsync
+dotnet_naming_style.pascal_case_async.capitalization              = pascal_case
+dotnet_naming_style.pascal_case_async.required_suffix             = Async
+
+## Rules
+
+# Private fields → _camelCase  (warning — agreed standard)
+dotnet_naming_rule.private_fields_underscore.symbols              = private_fields
+dotnet_naming_rule.private_fields_underscore.style                = prefix_underscore
+dotnet_naming_rule.private_fields_underscore.severity             = warning
+
+# Non-private fields → PascalCase  (suggestion — rare in this codebase)
+dotnet_naming_rule.non_private_fields_pascal.symbols              = non_private_fields
+dotnet_naming_rule.non_private_fields_pascal.style                = pascal_case
+dotnet_naming_rule.non_private_fields_pascal.severity             = suggestion
+
+# Constants → PascalCase  (suggestion)
+dotnet_naming_rule.constants_pascal.symbols                       = constants
+dotnet_naming_rule.constants_pascal.style                         = pascal_case
+dotnet_naming_rule.constants_pascal.severity                      = suggestion
+
+# Interfaces → IPascalCase  (warning — agreed standard)
+dotnet_naming_rule.interfaces_i_prefix.symbols                    = interfaces
+dotnet_naming_rule.interfaces_i_prefix.style                      = i_prefix_pascal_case
+dotnet_naming_rule.interfaces_i_prefix.severity                   = warning
+
+# Type parameters → TPascalCase  (suggestion)
+dotnet_naming_rule.type_parameters_t_prefix.symbols               = type_parameters
+dotnet_naming_rule.type_parameters_t_prefix.style                 = t_prefix_pascal_case
+dotnet_naming_rule.type_parameters_t_prefix.severity              = suggestion
+
+# Async methods → PascalCaseAsync  (warning — agreed standard)
+dotnet_naming_rule.async_methods_async_suffix.symbols             = async_methods
+dotnet_naming_rule.async_methods_async_suffix.style               = pascal_case_async
+dotnet_naming_rule.async_methods_async_suffix.severity            = warning
+
+# ── Structured data files ─────────────────────────────────────────────────────
+
+[*.{json,jsn,xml,yaml,yml,props,csproj,sln,sql,pgsql}]
+indent_style = space
+indent_size  = 2
+
+# ── Markdown ──────────────────────────────────────────────────────────────────
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/src/CoreEx.Template/content/CoreEx.Core/_gitattributes b/src/CoreEx.Template/content/CoreEx.Core/_gitattributes
new file mode 100644
index 00000000..b0c3c5cb
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/_gitattributes
@@ -0,0 +1,6 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+*.sh text eol=lf
diff --git a/src/CoreEx.Template/content/CoreEx.Core/_gitignore b/src/CoreEx.Template/content/CoreEx.Core/_gitignore
new file mode 100644
index 00000000..75042d9c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/_gitignore
@@ -0,0 +1,433 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+*.env
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+[Aa][Rr][Mm]64[Ee][Cc]/
+bld/
+[Bb]in/
+[Oo]bj/
+[Oo]ut/
+[Ll]og/
+[Ll]ogs/
+
+# Build results on 'Bin' directories
+**/[Bb]in/*
+# Uncomment if you have tasks that rely on *.refresh files to move binaries
+# (https://github.com/github/gitignore/pull/3736)
+#!**/[Bb]in/*.refresh
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+*.trx
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Approval Tests result files
+*.received.*
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.idb
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+**/.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+**/.fake/
+
+# CodeRush personal settings
+**/.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+**/__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+#tools/**
+#!tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+MSBuild_Logs/
+
+# AWS SAM Build and Temporary Artifacts folder
+.aws-sam
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+**/.mfractor/
+
+# Local History for Visual Studio
+**/.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+**/.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# NTFS to Ext4 file system migration files
+*.Identifier
+
+# Azd and Azure CLI for .NET project files
+*.azdproj
+.azd/
+.azure/
+
+# Terraform files
+*.tfstate
+*.tfstate.backup
+.terraform/
+.terraform.lock.hcl
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/app-name.slnx b/src/CoreEx.Template/content/CoreEx.Core/app-name.slnx
new file mode 100644
index 00000000..c6686553
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/app-name.slnx
@@ -0,0 +1,28 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="docker-compose.yml" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src\app-name.Contracts\app-name.Contracts.csproj" />
+    <Project Path="src\app-name.Application\app-name.Application.csproj" />
+    <!--#if domain-driven-enabled-->
+    <Project Path="src\app-name.Domain\app-name.Domain.csproj" />
+    <!--#endif-->
+    <Project Path="src\app-name.Infrastructure\app-name.Infrastructure.csproj" />
+  </Folder>
+  <Folder Name="/tools/">
+    <!--#if !implement-none-data-->
+    <Project Path="tools\app-name.Database\app-name.Database.csproj" />
+    <!--#endif-->
+    <!--#if (refdata-enabled && !implement-none-data)-->
+    <Project Path="tools\app-name.CodeGen\app-name.CodeGen.csproj" />
+    <!--#endif-->
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests\app-name.Test.Common\app-name.Test.Common.csproj" />
+    <Project Path="tests\app-name.Test.Unit\app-name.Test.Unit.csproj" />
+  </Folder>
+</Solution>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/docker-compose.yml b/src/CoreEx.Template/content/CoreEx.Core/docker-compose.yml
new file mode 100644
index 00000000..842a790c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/docker-compose.yml
@@ -0,0 +1,47 @@
+name: app-name-lower
+
+services:
+#if (implement-sqlserver || implement-servicebus)
+  db-sql-server:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    environment:
+      SA_PASSWORD: "yourStrong(!)Password"
+      ACCEPT_EULA: "Y"
+    ports:
+      - "1433:1433"
+#endif
+#if implement-postgres
+  db-postgres:
+    image: postgres
+    environment:
+      POSTGRES_PASSWORD: "yourStrong#!Password"
+    ports:
+      - "5432:5432"
+#endif
+  redis-cache:
+    image: docker.io/redis:latest
+    ports:
+      - "6379:6379"
+
+  aspire-dashboard:
+    image: mcr.microsoft.com/dotnet/nightly/aspire-dashboard:latest
+    environment:
+      - DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true
+    ports:
+      - "18888:18888"
+      - "4317:18889"
+#if implement-servicebus
+  servicebus-emulator:
+    image: mcr.microsoft.com/azure-messaging/servicebus-emulator:latest
+    depends_on:
+      - db-sql-server
+    volumes:
+      - ./servicebus/Config.json:/ServiceBus_Emulator/ConfigFiles/Config.json
+    environment:
+      SQL_SERVER: db-sql-server
+      MSSQL_SA_PASSWORD: "yourStrong(!)Password"
+      ACCEPT_EULA: "Y"
+    ports:
+      - "5672:5672"   # AMQP
+      - "5300:5300"   # Management / HTTP
+#endif
diff --git a/src/CoreEx.Template/content/CoreEx.Core/servicebus/Config.json b/src/CoreEx.Template/content/CoreEx.Core/servicebus/Config.json
new file mode 100644
index 00000000..7599a6af
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/servicebus/Config.json
@@ -0,0 +1,33 @@
+{
+  "UserConfig": {
+    "Namespaces": [
+      {
+        "Name": "sbemulatorns",
+        "Topics": [
+          {
+            "Name": "domain-parent-lower",
+            "Properties": {
+              "DefaultMessageTimeToLive": "PT1H",
+              "RequiresDuplicateDetection": false
+            },
+            "Subscriptions": [
+              {
+                "Name": "domain-name-lower",
+                "Properties": {
+                  "DefaultMessageTimeToLive": "PT1H",
+                  "LockDuration": "PT1M",
+                  "MaxDeliveryCount": 10,
+                  "DeadLetteringOnMessageExpiration": false,
+                  "RequiresSession": true
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ],
+    "Logging": {
+      "Type": "Console"
+    }
+  }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/AssemblyMarker.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/AssemblyMarker.cs
new file mode 100644
index 00000000..fc7d7a77
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/AssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace app-name.Application;
+
+/// <summary>Stable assembly marker for this project.</summary>
+/// <remarks>Resolves this project's <see cref="System.Reflection.Assembly"/> for dynamic <c>[ScopedService]</c> registration via <c>AddDynamicServicesUsing(typeof(AssemblyMarker).Assembly)</c> in the host. A neutral marker is used deliberately — anchoring on a real type (e.g. a service) would read as if the registration were scoped to that one type and would break if it were renamed/removed. Do not remove and do not replace with a domain type.</remarks>
+public abstract class AssemblyMarker;
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/GlobalUsing.cs
new file mode 100644
index 00000000..8a49c36c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/GlobalUsing.cs
@@ -0,0 +1,17 @@
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Localization;
+// #if refdata-enabled
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+// #endif
+// #if rop-enabled
+global using CoreEx.Results;
+// #endif
+global using CoreEx.Validation;
+// #if refdata-enabled
+global using app-name.Application.Repositories;
+// #endif
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/ReferenceDataService.g.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/ReferenceDataService.g.cs
new file mode 100644
index 00000000..9ffbae8c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/ReferenceDataService.g.cs
@@ -0,0 +1,18 @@
+/*
+ * WARNING: This file is currently in an initial scaffolding state and will be (replaced) generated by 'app-name.CodeGen' in the future; any changes will be lost.
+ */
+
+namespace app-name.Application;
+
+/// <summary>Provides the <see cref="IReferenceDataProvider"/> implementation.</summary>
+[ScopedService<IReferenceDataProvider>]
+public partial class ReferenceDataService(IReferenceDataRepository repository) : IReferenceDataProvider
+{
+    private readonly IReferenceDataRepository _repository = repository.ThrowIfNull();
+
+    /// <inheritdoc/>
+    public IEnumerable<(Type, Type)> Types => [];
+
+    /// <inheritdoc/>
+    public virtual Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => throw new NotImplementedException();
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/Repositories/IReferenceDataRepository.g.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/Repositories/IReferenceDataRepository.g.cs
new file mode 100644
index 00000000..f51df834
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/Repositories/IReferenceDataRepository.g.cs
@@ -0,0 +1,8 @@
+/*
+ * WARNING: This file is currently in an initial scaffolding state and will be (replaced) generated by 'app-name.CodeGen' in the future; any changes will be lost.
+ */
+
+namespace app-name.Application.Repositories;
+
+/// <summary>Enables the underlying reference-data repository.</summary>
+public partial interface IReferenceDataRepository;
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/app-name.Application.csproj b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/app-name.Application.csproj
new file mode 100644
index 00000000..01ea89ab
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Application/app-name.Application.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\app-name.Contracts\app-name.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreEx.Data" />
+    <!--#if domain-driven-enabled-->
+    <PackageReference Include="CoreEx.DomainDriven" />
+    <!--#endif-->
+    <!--#if refdata-enabled-->
+    <PackageReference Include="CoreEx.RefData" />
+    <!--#endif-->
+    <PackageReference Include="CoreEx.Validation" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Contracts/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Contracts/GlobalUsing.cs
new file mode 100644
index 00000000..bc9cca97
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Contracts/GlobalUsing.cs
@@ -0,0 +1,7 @@
+global using CoreEx.Entities;
+global using CoreEx.Localization;
+// #if refdata-enabled
+global using CoreEx.RefData;
+// #endif
+global using System.ComponentModel;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Contracts/app-name.Contracts.csproj b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Contracts/app-name.Contracts.csproj
new file mode 100644
index 00000000..bb510727
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Contracts/app-name.Contracts.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="CoreEx" />
+    <!--#if refdata-enabled-->
+    <PackageReference Include="CoreEx.RefData" />
+    <!--#endif-->
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Domain/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Domain/GlobalUsing.cs
new file mode 100644
index 00000000..8f037b5f
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Domain/GlobalUsing.cs
@@ -0,0 +1,6 @@
+global using app-name.Contracts;
+global using CoreEx;
+global using CoreEx.DomainDriven;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Results;
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Domain/app-name.Domain.csproj b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Domain/app-name.Domain.csproj
new file mode 100644
index 00000000..ce0dea66
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Domain/app-name.Domain.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\app-name.Contracts\app-name.Contracts.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreEx.DomainDriven" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/AssemblyMarker.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/AssemblyMarker.cs
new file mode 100644
index 00000000..e6048321
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/AssemblyMarker.cs
@@ -0,0 +1,5 @@
+namespace app-name.Infrastructure;
+
+/// <summary>Stable assembly marker for this project.</summary>
+/// <remarks>Resolves this project's <see cref="System.Reflection.Assembly"/> for dynamic <c>[ScopedService]</c> registration via <c>AddDynamicServicesUsing(typeof(AssemblyMarker).Assembly)</c> in the host. A neutral marker is used deliberately — anchoring on a real type (e.g. a repository) would read as if the registration were scoped to that one type and would break if it were renamed/removed. Do not remove and do not replace with a domain type.</remarks>
+public abstract class AssemblyMarker;
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/GlobalUsing.cs
new file mode 100644
index 00000000..7d546314
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/GlobalUsing.cs
@@ -0,0 +1,36 @@
+global using CoreEx;
+global using CoreEx.Data;
+global using CoreEx.Data.Models;
+// #if (implement-sqlserver || implement-postgres)
+global using CoreEx.Database;
+// #if implement-sqlserver
+global using CoreEx.Database.SqlServer;
+// #if outbox-enabled
+global using CoreEx.Database.SqlServer.Outbox;
+// #endif
+// #elif implement-postgres
+global using CoreEx.Database.Postgres;
+// #if outbox-enabled
+global using CoreEx.Database.Postgres.Outbox;
+// #endif
+// #endif
+// #endif
+global using CoreEx.DependencyInjection;
+// #if domain-driven-enabled
+global using CoreEx.DomainDriven;
+// #endif
+global using CoreEx.Entities;
+// #if (implement-sqlserver || implement-postgres)
+global using CoreEx.EntityFrameworkCore;
+global using CoreEx.EntityFrameworkCore.Converters;
+// #endif
+global using CoreEx.Json;
+global using CoreEx.Mapping;
+// #if refdata-enabled
+global using CoreEx.RefData;
+// #endif
+// #if (implement-sqlserver || implement-postgres)
+global using Microsoft.EntityFrameworkCore;
+// #endif
+global using Microsoft.Extensions.DependencyInjection;
+global using System.Text.Json.Serialization;
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/ReferenceDataRepository.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/ReferenceDataRepository.cs
new file mode 100644
index 00000000..8b8cef96
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/ReferenceDataRepository.cs
@@ -0,0 +1,7 @@
+namespace app-name.Infrastructure.Repositories;
+
+/// <summary>Provides the <see cref="ReferenceDataRepository"/> implementation (see generated <c>ReferenceDataRepository.g.cs</c> for entity-specific providers).</summary>
+public partial class ReferenceDataRepository(domain-nameEfDb ef)
+{
+    private readonly domain-nameEfDb _ef = ef.ThrowIfNull();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/domain-nameDbContext.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/domain-nameDbContext.cs
new file mode 100644
index 00000000..113032d2
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/domain-nameDbContext.cs
@@ -0,0 +1,59 @@
+namespace app-name.Infrastructure.Repositories;
+
+// #if implement-sqlserver
+/// <summary>Provides the <b>domain-name</b> <see cref="DbContext"/> with <see cref="IEfDbContext"/> support.</summary>
+public partial class domain-nameDbContext(DbContextOptions<domain-nameDbContext> options, SqlServerDatabase database) : DbContext(options), IEfDbContext
+{
+    /// <inheritdoc/>
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseSqlServer(BaseDatabase.Connection, contextOwnsConnection: false).EnableDetailedErrors(true);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        // Add the generated models to the model builder. AddGeneratedModels is implemented in the generated *DbContext.g.cs partial; until CodeGen has run the partial method has no implementation and this call is elided by the compiler (so the scaffold compiles as-is).
+        AddGeneratedModels(modelBuilder);
+    }
+
+    /// <summary>Adds the CodeGen-generated entity models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="ModelBuilder"/>.</param>
+    /// <remarks>Implemented in the generated <c>*DbContext.g.cs</c> partial; do not implement by hand.</remarks>
+    partial void AddGeneratedModels(ModelBuilder modelBuilder);
+}
+// #elif implement-postgres
+/// <summary>Provides the <b>domain-name</b> <see cref="DbContext"/> with <see cref="IEfDbContext"/> support.</summary>
+public partial class domain-nameDbContext(DbContextOptions<domain-nameDbContext> options, PostgresDatabase database) : DbContext(options), IEfDbContext
+{
+    /// <inheritdoc/>
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseNpgsql(BaseDatabase.Connection, contextOwnsConnection: false).EnableDetailedErrors(true);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        // Add the generated models to the model builder. AddGeneratedModels is implemented in the generated *DbContext.g.cs partial; until CodeGen has run the partial method has no implementation and this call is elided by the compiler (so the scaffold compiles as-is).
+        AddGeneratedModels(modelBuilder);
+    }
+
+    /// <summary>Adds the CodeGen-generated entity models to the <paramref name="modelBuilder"/>.</summary>
+    /// <param name="modelBuilder">The <see cref="ModelBuilder"/>.</param>
+    /// <remarks>Implemented in the generated <c>*DbContext.g.cs</c> partial; do not implement by hand.</remarks>
+    partial void AddGeneratedModels(ModelBuilder modelBuilder);
+}
+// #endif
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/domain-nameEfDb.cs b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/domain-nameEfDb.cs
new file mode 100644
index 00000000..3c3084c0
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/Repositories/domain-nameEfDb.cs
@@ -0,0 +1,7 @@
+namespace app-name.Infrastructure.Repositories;
+
+/// <summary>Provides the <see cref="domain-nameDbContext"/> <see cref="EfDb{TDbContext}"/> wrapper.</summary>
+public sealed class domain-nameEfDb(domain-nameDbContext dbContext) : EfDb<domain-nameDbContext>(dbContext, _options)
+{
+    private static readonly EfDbOptions _options = new();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/app-name.Infrastructure.csproj b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/app-name.Infrastructure.csproj
new file mode 100644
index 00000000..ac90b112
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/src/app-name.Infrastructure/app-name.Infrastructure.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\app-name.Application\app-name.Application.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreEx.Data" />
+    <!--#if implement-sqlserver-->
+    <PackageReference Include="CoreEx.Database.SqlServer" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <!--#endif-->
+    <!--#if implement-postgres-->
+    <PackageReference Include="CoreEx.Database.Postgres" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <!--#endif-->
+    <!--#if (implement-sqlserver || implement-postgres)-->
+    <PackageReference Include="CoreEx.EntityFrameworkCore" />
+    <!--#endif-->
+    <!--#if refdata-enabled-->
+    <PackageReference Include="CoreEx.RefData" />
+    <!--#endif-->
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/mutate-data.seed.yaml b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/mutate-data.seed.yaml
new file mode 100644
index 00000000..1e3f2347
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/mutate-data.seed.yaml
@@ -0,0 +1,23 @@
+# Mutate test dataset for the 'domain-name' domain — loaded by the XxxMutateTests classes via:
+#   MigrateXxxDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs)
+#
+# Contains the BASELINE rows that POST/PUT/PATCH/DELETE tests act on — e.g. a row to update, a row
+# to delete, an existing SKU/key for a duplicate-conflict test. Kept separate from
+# 'read-data.seed.yaml' so mutations never disturb read expectations.
+#
+# DbEx YAML format: schema (top-level) -> '- <table>:' (array item, note the leading '-') -> rows.
+#   * Identifiers and GUID foreign-keys use '^N' (deterministic: ^1 == 1.ToGuid()).
+#   * Reference data is linked by CODE (e.g. gender_code: M), never by id/FK.
+#   * Set scenario flags explicitly where a test needs them (e.g. is_deleted: true).
+#   * Schema, table, AND column names must match the database's ACTUAL casing (what the migration created):
+#       - PostgreSQL (default): lowercase snake_case  (schema 'bar', table 'employee', column 'employee_id')
+#       - SQL Server:           PascalCase            (schema 'Bar', table 'Employee', column 'EmployeeId')
+#     A wrong-cased schema/table fails the seed with "Table '...' does not exist".
+#   * Give each DESTRUCTIVE test its own '^N' row (Update/Delete/Patch target different ids; NUnit randomises order).
+#
+# Example (PostgreSQL — replace with your domain's schema/tables/rows):
+#
+# bar:
+#   - employee:
+#     - { employee_id: ^1, first_name: Bob, last_name: Smith, gender_code: M, salary: 50000, date_of_birth: 1990-01-01 }
+#     - { employee_id: ^2, first_name: Jane, last_name: Doe, gender_code: F, salary: 60000, date_of_birth: 1985-06-15 }
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/no-data.seed.yaml b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/no-data.seed.yaml
new file mode 100644
index 00000000..3657fb01
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/no-data.seed.yaml
@@ -0,0 +1 @@
+# This file intentionally left blank; to be used in tests where no data is required.
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/read-data.seed.yaml b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/read-data.seed.yaml
new file mode 100644
index 00000000..345f5a78
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/Data/read-data.seed.yaml
@@ -0,0 +1,20 @@
+# Read test dataset for the 'domain-name' domain — loaded by the XxxReadTests classes via:
+#   MigrateXxxDataAsync<TestData>(["read-data.seed.yaml"], DbMigration.ConfigureMigrationArgs)
+#
+# Contains the STABLE rows that GET/query tests assert against. Mutate tests load the separate
+# 'mutate-data.seed.yaml' so mutations never disturb these read expectations.
+#
+# DbEx YAML format: schema (top-level) -> '- <table>:' (array item, note the leading '-') -> rows.
+#   * Identifiers and GUID foreign-keys use '^N' (deterministic: ^1 == 1.ToGuid()).
+#   * Reference data is linked by CODE (e.g. gender_code: M), never by id/FK.
+#   * Schema, table, AND column names must match the database's ACTUAL casing (what the migration created):
+#       - PostgreSQL (default): lowercase snake_case  (schema 'bar', table 'employee', column 'employee_id')
+#       - SQL Server:           PascalCase            (schema 'Bar', table 'Employee', column 'EmployeeId')
+#     A wrong-cased schema/table fails the seed with "Table '...' does not exist".
+#
+# Example (PostgreSQL — replace with your domain's schema/tables/rows):
+#
+# bar:
+#   - employee:
+#     - { employee_id: ^1, first_name: Bob, last_name: Smith, gender_code: M, salary: 50000, date_of_birth: 1990-01-01 }
+#     - { employee_id: ^2, first_name: Jane, last_name: Doe, gender_code: F, salary: 60000, date_of_birth: 1985-06-15 }
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/TestData.cs b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/TestData.cs
new file mode 100644
index 00000000..3b1e6086
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/TestData.cs
@@ -0,0 +1,4 @@
+namespace app-name.Test.Common;
+
+/// <summary>Marker class for locating test data embedded resources across all test projects in the 'domain-name' domain.</summary>
+public sealed class TestData;
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/app-name.Test.Common.csproj b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/app-name.Test.Common.csproj
new file mode 100644
index 00000000..1b2f2704
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Common/app-name.Test.Common.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+  <!--#if !implement-none-data-->
+  <ItemGroup>
+    <ProjectReference Include="..\..\tools\app-name.Database\app-name.Database.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+  <!--#endif-->
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/EntryPoint.cs b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..f9f3d778
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/EntryPoint.cs
@@ -0,0 +1,34 @@
+namespace app-name.Test.Unit;
+
+/// <summary>Provides the host entry point for the unit test configuration.</summary>
+public class EntryPoint
+{
+    /// <summary>Configure the minimum services required for the unit tests.</summary>
+    public static void ConfigureApplication(IHostApplicationBuilder builder)
+    {
+        // Configure the minimum services required for the unit tests.
+        builder.Services.AddExecutionContext();
+        builder.Services.AddMemoryCache();
+// #if refdata-enabled
+        builder.Services.AddReferenceDataOrchestrator<ReferenceDataServiceDecorator>();
+
+        // Reuse the "real" database configured reference data.
+        var jdr = JsonDataReader.ParseYaml<app-name.Database.Program>("ref-data.seed.yaml", JsonDataReaderOptions.CreateForReferenceData(JsonPropertyNamingConvention.SnakeCase));
+        builder.Services.AddSingleton(new ReferenceDataServiceDecorator(jdr));
+// #endif
+    }
+// #if refdata-enabled
+
+    /// <summary>Provides a decorator for the <see cref="ReferenceDataService"/> to use JSON data for unit tests.</summary>
+    public class ReferenceDataServiceDecorator(JsonDataReader jdr) : ReferenceDataService(Mock.Of<IReferenceDataRepository>())
+    {
+        public override Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+        {
+            // Add a case per reference data type a validator under test needs. '{RefData}' is the contract type and
+            // '{RefData}Collection' its collection; 'schema.$^table' is the appropriately-cased key into the seed data.
+            //_ when type == typeof(ref-data-name) => Task.FromResult((IReferenceDataCollection)jdr.Deserialize<ref-data-nameCollection>("schema.$^table")!),
+            _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+        };
+    }
+// #endif
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/GlobalUsing.cs
new file mode 100644
index 00000000..873e60fe
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/GlobalUsing.cs
@@ -0,0 +1,23 @@
+global using AwesomeAssertions;
+global using CoreEx;
+// #if refdata-enabled
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+// #endif
+// #if rop-enabled
+global using CoreEx.Results;
+// #endif
+global using CoreEx.UnitTesting;
+global using CoreEx.UnitTesting.Data;
+global using CoreEx.Validation;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Hosting;
+global using Moq;
+global using NUnit.Framework;
+global using UnitTestEx;
+global using UnitTestEx.NUnit;
+// #if refdata-enabled
+global using app-name.Application;
+global using app-name.Application.Repositories;
+// #endif
+global using ExecutionContext = CoreEx.ExecutionContext;
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/app-name.Test.Unit.csproj b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/app-name.Test.Unit.csproj
new file mode 100644
index 00000000..fc1154d5
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tests/app-name.Test.Unit/app-name.Test.Unit.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="CoreEx.UnitTesting" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\app-name.Application\app-name.Application.csproj" />
+    <ProjectReference Include="..\..\src\app-name.Contracts\app-name.Contracts.csproj" />
+    <ProjectReference Include="..\app-name.Test.Common\app-name.Test.Common.csproj" />
+    <!--#if (refdata-enabled && (implement-sqlserver || implement-postgres))-->
+    <!-- Required by EntryPoint.cs: JsonDataReader.ParseYaml<app-name.Database.Program> reads the embedded ref-data seed. -->
+    <ProjectReference Include="..\..\tools\app-name.Database\app-name.Database.csproj" />
+    <!--#endif-->
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/Program.cs b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/Program.cs
new file mode 100644
index 00000000..50a35003
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/Program.cs
@@ -0,0 +1 @@
+await CoreEx.CodeGen.CodeGenConsole.Create().RunAsync(args);
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/app-name.CodeGen.csproj b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/app-name.CodeGen.csproj
new file mode 100644
index 00000000..b71929eb
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/app-name.CodeGen.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreEx.CodeGen" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/ref-data.yaml b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/ref-data.yaml
new file mode 100644
index 00000000..45bc2fc8
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.CodeGen/ref-data.yaml
@@ -0,0 +1,9 @@
+# Reference data entity definitions.
+# See https://github.com/Avanade/CoreEx/blob/main/src/CoreEx.CodeGen for more information.
+apiProjectPath: ../../src/app-name.Api
+applicationProjectPath: ../../src/app-name.Application
+contractsProjectPath: ../../src/app-name.Contracts
+dataProjectPath: ../../src/app-name.Infrastructure
+collectionSortOrder: Code
+repository: EntityFramework
+entities:
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Data/ref-data.seed.yaml b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Data/ref-data.seed.yaml
new file mode 100644
index 00000000..5ead3f40
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Data/ref-data.seed.yaml
@@ -0,0 +1,5 @@
+# #if implement-sqlserver
+domain-name: []
+# #elif implement-postgres
+db-name: []
+# #endif
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000001-create-db-name-schema.pgsql b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000001-create-db-name-schema.pgsql
new file mode 100644
index 00000000..5c332891
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000001-create-db-name-schema.pgsql
@@ -0,0 +1 @@
+CREATE SCHEMA IF NOT EXISTS "db-name";
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000001-create-db-name-schema.sql b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000001-create-db-name-schema.sql
new file mode 100644
index 00000000..c7cba417
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000001-create-db-name-schema.sql
@@ -0,0 +1 @@
+IF SCHEMA_ID('domain-name') IS NULL EXEC('CREATE SCHEMA [domain-name]')
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000002-create-db-name-outbox-tables.pgsql b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000002-create-db-name-outbox-tables.pgsql
new file mode 100644
index 00000000..5993a0c2
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000002-create-db-name-outbox-tables.pgsql
@@ -0,0 +1,37 @@
+-- Create table: "db-name"."outbox" and "db-name"."outbox_lease"
+
+BEGIN;
+
+CREATE TABLE "db-name"."outbox" (
+  "outbox_id" BIGSERIAL NOT NULL PRIMARY KEY,
+  "tenant_id" VARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  "partition_id" INTEGER NOT NULL,        -- Partition number; computed in application from partition-key.
+  "status" SMALLINT NOT NULL DEFAULT 0,   -- 0=Pending, 1=Processing, 2=Done.
+  "enqueued_utc" TIMESTAMPTZ NOT NULL,    -- When the event was enqueued within application.
+  "available_utc" TIMESTAMPTZ NOT NULL,   -- When the event is eligible for processing (retry delay).
+  "dequeued_utc" TIMESTAMPTZ NULL,        -- When the event was successfully dequeued/relayed.
+  "attempts" INTEGER NOT NULL DEFAULT 0,  -- Retry attempt count.
+
+  -- Message:
+  "destination" VARCHAR(255) NULL,        -- Message destination; i.e. queue/topic/etc.
+  "event" TEXT NOT NULL,                  -- CloudEvent as JSON.
+
+  -- Claim/leasing:
+  "lease_id" UUID NULL,                   -- Unique identifier of the lease.
+  "lease_until_utc" TIMESTAMPTZ NULL      -- Leased until UTC; after which assume released due to possible application crash.
+);
+
+CREATE INDEX "ix_db-name_outbox_partition_order" ON "db-name"."outbox" ("tenant_id", "partition_id", "outbox_id", "status", "available_utc", "lease_until_utc", "destination", "attempts");
+CREATE INDEX "ix_db-name_outbox_worker_pull" ON "db-name"."outbox" ("tenant_id", "partition_id", "status", "outbox_id", "available_utc");
+CREATE INDEX "ix_db-name_outbox_clean_up" ON "db-name"."outbox" ("outbox_id", "dequeued_utc") WHERE "status" = 2;
+
+CREATE TABLE "db-name"."outbox_lease" (
+  "tenant_id" VARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  "partition_id" INTEGER NOT NULL,        -- Partition number; computed in application from partition-key.
+  "lease_id" UUID NULL,                   -- Unique identifier of the lessee.
+  "lease_until_utc" TIMESTAMPTZ NULL,     -- Leased until UTC; after which assume released due to possible application crash.
+
+  CONSTRAINT "pk_db-name_outbox_lease" PRIMARY KEY ("tenant_id", "partition_id")
+);
+
+COMMIT;
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000002-create-db-name-outbox-tables.sql b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000002-create-db-name-outbox-tables.sql
new file mode 100644
index 00000000..130e8b4c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Migrations/date-now-000002-create-db-name-outbox-tables.sql
@@ -0,0 +1,37 @@
+-- Create table: [domain-name].[Outbox] and [domain-name].[OutboxLease]
+
+BEGIN TRANSACTION
+
+CREATE TABLE [domain-name].[Outbox] (
+  [OutboxId] BIGINT IDENTITY (1, 1) NOT NULL PRIMARY KEY,
+  [TenantId] NVARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  [PartitionId] INT NOT NULL,             -- Partition number; computed in application from partition-key.
+  [Status] TINYINT NOT NULL DEFAULT 0,    -- 0=Pending, 1=Processing, 2=Done.
+  [EnqueuedUtc] DATETIME2 NOT NULL,       -- When the event was enqueued within application.
+  [AvailableUtc] DATETIME2 NOT NULL,      -- When the event is eligible for processing (retry delay).
+  [DequeuedUtc] DATETIME2 NULL,           -- When the event was successfully dequeued/relayed.
+  [Attempts] INT NOT NULL DEFAULT 0,      -- Retry attempt count.
+
+  -- Message:
+  [Destination] NVARCHAR(255) NULL,       -- Message destination; i.e. queue/topic/etc.
+  [Event] NVARCHAR(MAX) NOT NULL,         -- CloudEvent as JSON.
+
+  -- Claim/leasing:
+  [LeaseId] UNIQUEIDENTIFIER NULL,        -- Unique identifier of the lease.
+  [LeaseUntilUtc] DATETIME2 NULL,         -- Leased until UTC; after which assume released due to possible application crash.
+
+  INDEX [IX_domain-name_Outbox_PartitionOrder] ([TenantId], [PartitionId], [OutboxId]) INCLUDE ([Status], [AvailableUtc], [LeaseUntilUtc], [Destination], [Attempts]),
+  INDEX [IX_domain-name_Outbox_WorkerPull] ([TenantId], [PartitionId], [Status]) INCLUDE ([OutboxId], [AvailableUtc]),
+  INDEX [IX_domain-name_Outbox_CleanUp] ([OutboxId]) INCLUDE ([DequeuedUtc]) WHERE [Status] = 2
+);
+
+CREATE TABLE [domain-name].[OutboxLease] (
+  [TenantId] NVARCHAR(255) NOT NULL,      -- '(none)' indicates no tenancy.
+  [PartitionId] INT NOT NULL,             -- Partition number; computed in application from partition-key.
+  [LeaseId] UNIQUEIDENTIFIER NULL,        -- Unique identifier of the lessee.
+  [LeaseUntilUtc] DATETIME2 NULL          -- Leased until UTC; after which assume released due to possible application crash.
+
+  CONSTRAINT PK_domain-name_OutboxLease PRIMARY KEY (TenantId, PartitionId)
+);
+
+COMMIT TRANSACTION
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Program.cs b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Program.cs
new file mode 100644
index 00000000..be704f38
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/Program.cs
@@ -0,0 +1,48 @@
+using CoreEx.Database;
+// #if implement-sqlserver
+using DbEx.Migration;
+using DbEx.SqlServer.Console;
+
+namespace app-name.Database;
+
+/// <summary>Represents the <b>database utilities</b> program.</summary>
+public class Program
+{
+    /// <summary>Main startup.</summary>
+    public static Task<int> Main(string[] args) => SqlServerMigrationConsole
+        .Create<Program>("Data Source=127.0.0.1,1433;Initial Catalog=domain-name;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true")
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>Configure the <see cref="MigrationArgs"/>.</summary>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
+    {
+        args.AddAssembly<SqlStatement>().AddAssembly<Program>();   // SqlStatement = CoreEx EF code-gen templates; Program = this project's embedded migrations/data. Both REQUIRED — the API tests call ConfigureMigrationArgs directly (not via Main), so the Database assembly must be added here. Do not remove.
+        args.DataResetFilterPredicate = ts => ts.Schema == "domain-name";   // Only reset data for the specified schema.
+        return args;
+    }
+}
+// #elif implement-postgres
+using DbEx.Migration;
+using DbEx.Postgres.Console;
+
+namespace app-name.Database;
+
+/// <summary>Represents the <b>database utilities</b> program.</summary>
+public class Program
+{
+    /// <summary>Main startup.</summary>
+    public static Task<int> Main(string[] args) => PostgresMigrationConsole
+        .Create<Program>("Server=127.0.0.1;Database=domain-name-lower;Username=postgres;Password=yourStrong#!Password")
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>Configure the <see cref="MigrationArgs"/>.</summary>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args)
+    {
+        args.AddAssembly<SqlStatement>().AddAssembly<Program>();   // SqlStatement = CoreEx EF code-gen templates; Program = this project's embedded migrations/data. Both REQUIRED — the API tests call ConfigureMigrationArgs directly (not via Main), so the Database assembly must be added here. Do not remove.
+        args.DataResetFilterPredicate = ts => ts.Schema == "db-name";   // Only reset data for the specified schema.
+        return args;
+    }
+}
+// #endif
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/app-name.Database.csproj b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/app-name.Database.csproj
new file mode 100644
index 00000000..58e719ee
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/app-name.Database.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreEx.Database" />
+    <!--#if implement-sqlserver-->
+    <PackageReference Include="DbEx.SqlServer" />
+    <!--#endif-->
+    <!--#if implement-postgres-->
+    <PackageReference Include="DbEx.Postgres" />
+    <!--#endif-->
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/dbex.yaml b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/dbex.yaml
new file mode 100644
index 00000000..a1534c0b
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Core/tools/app-name.Database/dbex.yaml
@@ -0,0 +1,21 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/Avanade/DbEx/refs/heads/main/schema/dbex.json
+dotNetDataProjectPath: ../../src/app-name.Infrastructure
+# #if implement-postgres
+schema: db-name
+# #elseif (implement-sqlserver)
+schema: domain-name
+# #endif
+# #if outbox-enabled
+outbox: true
+# #if implement-postgres
+outboxName: outbox
+# #elseif (implement-sqlserver)
+outboxName: Outbox
+# #endif
+# #else
+outbox: false
+# #endif
+tables:
+# Reference-data
+
+# Transactional-data
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/.template.config/template.json b/src/CoreEx.Template/content/CoreEx.Relay/.template.config/template.json
new file mode 100644
index 00000000..bdcbc42c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/.template.config/template.json
@@ -0,0 +1,209 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "https://github.com/avanade/coreex",
+  "classifications": [ "CoreEx", "Microservice", "Relay" ],
+  "identity": "CoreEx.Relay",
+  "name": "CoreEx Outbox Relay host",
+  "description": "An ASP.NET Core Outbox Relay host, and test, projects for a CoreEx domain-based microservice.",
+  "shortName": "coreex-relay",
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "sourceName": "app-name.Relay",
+  "preferNameDirectory": false,
+  "symbols": {
+    "coreex-version": {
+      "type": "generated",
+      "generator": "constant",
+      "parameters": {
+        "value": "COREEX_VERSION"
+      },
+      "replaces": "coreex-version"
+    },
+    "domain-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimited",
+      "fileRename": "domain-name",
+      "replaces": "domain-name"
+    },
+    "solution-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastDotDelimited",
+      "fileRename": "solution-name",
+      "replaces": "solution-name"
+    },
+    "solution-parent-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastTwoDotDelimited",
+      "replaces": "solution-parent-name"
+    },
+    "domain-name-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimitedLower",
+      "replaces": "domain-name-lower"
+    },
+    "domain-parent-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "DomainParentLower",
+      "replaces": "domain-parent-lower"
+    },
+    "data-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "SqlServer",
+          "displayName": "SQL Server",
+          "description": "Indicates to use SQL Server as the data provider."
+        },
+        {
+          "choice": "Postgres",
+          "displayName": "PostgreSQL",
+          "description": "Indicates to use PostgreSQL as the data provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no data provider is used (e.g. a facade over an external system such as Dynamics 365)."
+        }
+      ],
+      "defaultValue": "Postgres",
+      "displayName": "Data provider",
+      "description": "Determines the data provider technology to use."
+    },
+    "implement-sqlserver": {
+      "type": "computed",
+      "value": "data-provider == 'SqlServer'"
+    },
+    "implement-postgres": {
+      "type": "computed",
+      "value": "data-provider == 'Postgres'"
+    },
+    "implement-none-data": {
+      "type": "computed",
+      "value": "data-provider == 'None'"
+    },
+    "messaging-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "ServiceBus",
+          "displayName": "Azure Service Bus",
+          "description": "Indicates to use Azure Service Bus as the messaging provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no messaging provider is used."
+        }
+      ],
+      "defaultValue": "ServiceBus",
+      "displayName": "Messaging provider",
+      "description": "Determines the messaging provider technology to use."
+    },
+    "implement-servicebus": {
+      "type": "computed",
+      "value": "messaging-provider == 'ServiceBus'"
+    },
+    "implement-none-messaging": {
+      "type": "computed",
+      "value": "messaging-provider == 'None'"
+    }
+  },
+  "specialCustomOperations": {
+    "*.md": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!-- #if" ],
+            "actionableElse": [ "<!-- #else" ],
+            "actionableElseif": [ "<!-- #elseif", "<!-- #elif" ],
+            "endif": [ "<!-- #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.csproj": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.props": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.cs": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "// #if" ],
+            "actionableElse": [ "// #else" ],
+            "actionableElseif": [ "// #elseif", "// #elif" ],
+            "endif": [ "// #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    }
+  },
+  "forms": {
+    "ValueSecondToLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(?:.*\\.)?([^.]+)\\.[^.]+$",
+      "replacement": "$1"
+    },
+    "ValueWithoutLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(.*)\\.([^\\.]+)$",
+      "replacement": "$1"
+    },
+    "LowerCase": {
+      "identifier": "lowerCase"
+    },
+    "ValueSecondToLastDotDelimitedLower": {
+      "identifier": "chain",
+      "steps": [ "ValueSecondToLastDotDelimited", "LowerCase" ]
+    },
+    "ValueWithoutLastTwoDotDelimited": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "ValueWithoutLastDotDelimited" ]
+    },
+    "DomainParentLower": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "ValueSecondToLastDotDelimited", "LowerCase" ]
+    }
+  }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/AGENTS.md b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/AGENTS.md
new file mode 100644
index 00000000..479835f7
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/AGENTS.md
@@ -0,0 +1,98 @@
+# domain-name Outbox Relay Host -- AI Agent Guide
+
+This is the **Outbox Relay host** for the `domain-name` domain, part of the `solution-name` microservice. It reads events from the transactional outbox in the database and forwards them to the configured message broker.
+
+> **Before answering any CoreEx question:** check whether `.github/docs/coreex/` is populated at the solution root. If empty, run `/coreex-docs-sync` first. The package guides at `.github/docs/coreex/agents/` are especially relevant -- check `CoreEx.Events.md` and the database-specific guide.
+
+---
+
+## Host Responsibilities
+
+The relay is a **background worker host** -- it runs one or more `IHostedService` instances that continuously poll the database outbox and publish outstanding events. It should contain:
+
+- `Program.cs` -- startup, DI registration, no controllers needed
+- No business logic; no domain types; no Application layer references
+
+Read `.github/docs/coreex/hosts-layer.md` for the full host-layer guide and the outbox relay pattern.
+
+---
+
+## How the Outbox Relay Works
+
+1. The API (or Subscriber) host writes events to the **database outbox table** instead of publishing them directly -- this ensures events are committed atomically with business data.
+2. The relay polls the outbox on a configurable interval.
+3. It publishes each event to the message broker (e.g. Azure Service Bus).
+4. On successful publish, the event row is marked as sent (or deleted).
+
+This guarantees at-least-once delivery without distributed transactions.
+
+---
+
+## Configuration
+
+The relay connects to the same database as the API host -- use the **same Aspire resource name** so Aspire wires up the connection string automatically:
+
+<!-- #if implement-sqlserver -->
+- `builder.AddSqlServerClient("SqlServer")` -- matches the Aspire SQL Server resource
+<!-- #elif implement-postgres -->
+- `builder.AddAzureNpgsqlDataSource("Postgres")` -- matches the Aspire PostgreSQL resource
+<!-- #else -->
+- No database configured -- this relay has no data provider
+<!-- #endif -->
+<!-- #if implement-servicebus -->
+- `builder.AddAzureServiceBusClient("ServiceBus")` -- matches the Aspire Service Bus resource
+<!-- #endif -->
+
+Relay timing and retry settings are configured via `appsettings.json` -- read `.github/docs/coreex/hosts-layer.md` for the outbox relay configuration schema.
+
+---
+
+## This Host's Feature Configuration
+
+<!-- #if implement-sqlserver -->
+- **Database:** SQL Server outbox (`AddSqlServerOutboxRelay()` + `AddSqlServerOutboxRelayHostedService()`)
+<!-- #elif implement-postgres -->
+- **Database:** PostgreSQL outbox (`AddPostgresOutboxRelay()` + `AddPostgresOutboxRelayHostedService()`)
+<!-- #else -->
+- **Database:** None -- this relay has no database outbox configured
+<!-- #endif -->
+<!-- #if implement-servicebus -->
+- **Message broker:** Azure Service Bus (`AddAzureServiceBusPublisher()`)
+<!-- #else -->
+- **Message broker:** None configured
+<!-- #endif -->
+
+---
+
+## Key Packages
+
+| Package | Purpose |
+|---|---|
+<!-- #if implement-sqlserver -->
+| `CoreEx.Database.SqlServer` | SQL Server outbox relay implementation |
+<!-- #endif -->
+<!-- #if implement-postgres -->
+| `CoreEx.Database.Postgres` | PostgreSQL outbox relay implementation |
+<!-- #endif -->
+<!-- #if implement-servicebus -->
+| `CoreEx.Azure.Messaging.ServiceBus` | Azure Service Bus publisher |
+<!-- #endif -->
+| `CoreEx.Events` | Event publishing abstractions |
+
+---
+
+## Relevant Docs
+
+- `.github/docs/coreex/hosts-layer.md` -- relay startup patterns and outbox configuration
+- `.github/docs/coreex/infrastructure-layer.md` -- outbox schema and EF Core setup
+- `.github/docs/coreex/local-dev.md` -- running locally with .NET Aspire
+<!-- #if implement-sqlserver -->
+- `.github/docs/coreex/agents/CoreEx.Database.SqlServer.md` -- SQL Server outbox details
+<!-- #endif -->
+<!-- #if implement-postgres -->
+- `.github/docs/coreex/agents/CoreEx.Database.Postgres.md` -- PostgreSQL outbox details
+<!-- #endif -->
+<!-- #if implement-servicebus -->
+- `.github/docs/coreex/agents/CoreEx.Azure.Messaging.ServiceBus.md` -- Service Bus publisher
+<!-- #endif -->
+- `.github/docs/coreex/agents/CoreEx.Events.md` -- event publishing abstractions
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/Program.cs b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/Program.cs
new file mode 100644
index 00000000..a4c82641
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/Program.cs
@@ -0,0 +1,85 @@
+// #if implement-servicebus
+global using CoreEx.Azure.Messaging.ServiceBus;
+// #endif
+global using OpenTelemetry;
+global using OpenTelemetry.Trace;
+
+
+namespace app-name.Relay;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+            .AddMvcWebApi()
+            .AddHttpWebApi()
+            .AddHostedServiceManager();
+
+        // Add the repository and related outbox relay services.
+// #if implement-sqlserver
+        builder.AddSqlServerClient("SqlServer");        // Adds the SqlServerClient (using Aspire library).
+        builder.Services
+            .AddSqlServerDatabase()                     // Adds the SqlServerDatabase.
+            .AddSqlServerUnitOfWork()                   // Adds the SqlServerUnitOfWork for the SqlServerDatabase.
+            .AddSqlServerOutboxRelay();                 // Adds the SqlServerOutboxRelay.
+
+        builder.AddSqlServerOutboxRelayHostedService(); // Adds the SqlServerOutboxRelayHostedService.
+// #elif implement-postgres
+        builder.AddAzureNpgsqlDataSource("Postgres");   // Adds the NpgsqlDataSource (using Aspire library).
+        builder.Services
+            .AddPostgresDatabase()                      // Adds the PostgresDatabase.
+            .AddPostgresUnitOfWork()                    // Adds the PostgresUnitOfWork for the PostgresDatabase.
+            .AddPostgresOutboxRelay();                  // Adds the PostgresOutboxRelay.
+
+        builder.AddPostgresOutboxRelayHostedService();  // Adds the PostgresOutboxRelayHostedService.
+// #endif
+
+// #if implement-servicebus
+        // Add the Azure Service Bus publisher.
+        builder.AddAzureServiceBusClient("ServiceBus");        // Adds the Azure Service Bus client (using Aspire library).
+        builder.Services.AddAzureServiceBusPublisher((_, c) => // Adds the Azure Service Bus as the IEventPublisher.
+        {
+            c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;  // Use a partition-id as the session-id.
+        });
+// #endif
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+// #if implement-sqlserver
+            .WithCoreExSqlServerTelemetry()
+// #elif implement-postgres
+            .WithCoreExPostgresTelemetry()
+// #endif
+// #if implement-servicebus
+            .WithCoreExServiceBusTelemetry()
+// #endif
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseExecutionContext();
+
+        app.MapHealthChecks();
+        app.MapHostedServices();
+
+        // Run the application.
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/app-name.Relay.csproj b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/app-name.Relay.csproj
new file mode 100644
index 00000000..83c5a7d0
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/app-name.Relay.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <ItemGroup>
+    <PackageReference Include="CoreEx.AspNetCore" />
+    <!--#if implement-sqlserver-->
+    <PackageReference Include="CoreEx.Database.SqlServer" />
+    <PackageReference Include="Aspire.Microsoft.Data.SqlClient" />
+    <!--#endif-->
+    <!--#if implement-postgres-->
+    <PackageReference Include="CoreEx.Database.Postgres" />
+    <PackageReference Include="Aspire.Azure.Npgsql" />
+    <!--#endif-->
+    <!--#if implement-servicebus-->
+    <PackageReference Include="CoreEx.Azure.Messaging.ServiceBus" />
+    <PackageReference Include="Aspire.Azure.Messaging.ServiceBus" />
+    <!--#endif-->
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Update="appsettings.Development.json">
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/appsettings.Development.json b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/appsettings.Development.json
new file mode 100644
index 00000000..c76a3d58
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/appsettings.Development.json
@@ -0,0 +1,38 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+//#if implement-postgres
+      "Npgsql": "Warning",
+//#endif
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+//#if implement-sqlserver
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=domain-name;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+//#elif implement-postgres
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=domain-name-lower;Username=postgres;Password=yourStrong#!Password"
+    },
+//#endif
+//#if implement-servicebus
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
+        }
+      }
+    }
+//#endif
+  }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/appsettings.json b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/appsettings.json
new file mode 100644
index 00000000..90ff665c
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/src/app-name.Relay/appsettings.json
@@ -0,0 +1,25 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "solution-parent-name",
+      "DomainName": "domain-name",
+      "Services": {
+        "Interval": "00:00:00.500",
+        "OutboxRelay": {
+          "BatchSize": 10,
+          "PerWorkerPartitionCount": 2,
+          "LeaseDuration": "00:00:05",
+          "BackoffDuration": "00:00:05",
+          "ServicesCount": 4
+        }
+      }
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/GlobalUsing.cs
new file mode 100644
index 00000000..7f085618
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/GlobalUsing.cs
@@ -0,0 +1,14 @@
+// #if implement-servicebus
+global using CoreEx.Azure.Messaging.ServiceBus;
+// #endif
+global using CoreEx.Events;
+global using CoreEx.UnitTesting;
+global using AwesomeAssertions;
+global using Microsoft.Extensions.DependencyInjection;
+global using NUnit.Framework;
+global using System.Net;
+global using UnitTestEx;
+global using UnitTestEx.Expectations;
+global using DbMigration = solution-name.Database.Program;
+global using ExecutionContext = CoreEx.ExecutionContext;
+global using TestData = solution-name.Test.Common.TestData;
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/HostTests.cs b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/HostTests.cs
new file mode 100644
index 00000000..c9b99222
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/HostTests.cs
@@ -0,0 +1,91 @@
+namespace solution-name.Test.Relay;
+
+public partial class HostTests : WithApiTester<solution-name.Relay.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+// #if implement-sqlserver
+        await Test.MigrateSqlServerDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #elif implement-postgres
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #endif
+    }
+
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health_Basic(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+    }
+
+    [TestCase("/health/live/detailed", true)]
+    [TestCase("/health/startup/detailed", false)]
+    [TestCase("/health/ready/detailed", false)]
+    public void Health_Detailed(string path, bool minimal)
+    {
+        string[] _paths =
+        [
+// #if implement-sqlserver
+            "$.entries.sqlServer",
+            "$.entries.sqlserver-outbox-relay-00",
+            "$.entries.sqlserver-outbox-relay-01",
+            "$.entries.sqlserver-outbox-relay-02",
+            "$.entries.sqlserver-outbox-relay-03"
+// #elif implement-postgres
+            "$.entries.postgreSql",
+            "$.entries.postgres-outbox-relay-00",
+            "$.entries.postgres-outbox-relay-01",
+            "$.entries.postgres-outbox-relay-02",
+            "$.entries.postgres-outbox-relay-03"
+// #endif
+        ];
+
+        var r = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .AssertContentTypeJson();
+
+        r.Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+
+        var json = r.GetContent().Should().BeJson();
+        if (minimal)
+            json.NotContainAny(_paths);
+        else
+            json.ContainAll(_paths);
+    }
+
+    [Test]
+    public void HostedService_Pause_And_Resume()
+    {
+// #if implement-sqlserver
+        const string Service = "sqlserver-outbox-relay-03";
+// #elif implement-postgres
+        const string Service = "postgres-outbox-relay-03";
+// #endif
+
+        Test.Http<string>()
+            .Run(HttpMethod.Get, $"/hosted-services/{Service}/status")
+            .Value.Should().BeOneOf("Running", "Sleeping");
+
+        Test.Http()
+            .Run(HttpMethod.Post, $"/hosted-services/{Service}/pause")
+            .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+
+        Test.Delay(TimeSpan.FromSeconds(1))
+            .Http<string>()
+            .Run(HttpMethod.Get, $"/hosted-services/{Service}/status")
+            .Value.Should().Be("Paused");
+
+        Test.Http()
+            .Run(HttpMethod.Post, $"/hosted-services/{Service}/resume")
+            .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+
+        Test.Delay(TimeSpan.FromSeconds(1))
+            .Http<string>()
+            .Run(HttpMethod.Get, $"/hosted-services/{Service}/status")
+            .Value.Should().BeOneOf("Running", "Sleeping");
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/RelayTests.cs b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/RelayTests.cs
new file mode 100644
index 00000000..54ac1b69
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/RelayTests.cs
@@ -0,0 +1,64 @@
+// #if (implement-servicebus && implement-sqlserver)
+using CoreEx.Database.SqlServer.Outbox;
+
+// #elif (implement-servicebus && implement-postgres)
+using CoreEx.Database.Postgres.Outbox;
+
+// #endif
+namespace solution-name.Test.Relay;
+
+public class RelayTests : WithApiTester<solution-name.Relay.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+// #if implement-sqlserver
+        await Test.MigrateSqlServerDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #elif implement-postgres
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #endif
+// #if implement-servicebus
+        await Test.GetAndClearAzureServiceBusAsync(ServiceBusSessionReceiverOptions.CreateForTopicSubscription("domain-parent-lower", "domain-name-lower"));
+// #endif
+    }
+
+// #if implement-servicebus
+    [Test]
+    public void Outbox_Relay()
+    {
+        // Arrange the two events to publish and relay.
+        var ce1 = Test.CreateCloudEventFromJsonResource("Test-CloudEvent-00.json");
+        var ce2 = Test.CreateCloudEventFromJsonResource("Test-CloudEvent-01.json");
+
+        // Publish two events to the outbox.
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.Run(async _ =>
+            {
+                // Publish two events to the outbox.
+// #if implement-sqlserver
+                var pub = ActivatorUtilities.GetServiceOrCreateInstance<SqlServerOutboxPublisher>(test.Services);
+// #elif implement-postgres
+                var pub = ActivatorUtilities.GetServiceOrCreateInstance<PostgresOutboxPublisher>(test.Services);
+// #endif
+                pub.Add("domain-parent-lower", [ce1, ce2]);
+                await pub.PublishAsync();
+
+                // Hosted-service(s) are currently running and should relay to Azure Service Bus; we just need to give it a few seconds to do so.
+                for (int i = 0; i < 5; i++)
+                    await Task.Delay(TimeSpan.FromSeconds(1));
+
+                // Receive the events from Azure Service Bus and assert (order is not guaranteed as different sessions).
+                var list = await Test.GetAndClearAzureServiceBusAsync(ServiceBusSessionReceiverOptions.CreateForTopicSubscription("domain-parent-lower", "domain-name-lower"));
+
+                list.Should().NotBeNull().And.HaveCount(2);
+                list.Should().NotBeNull().And.HaveCount(2);
+                var ce1Msg = list.Should().ContainSingle(x => x.MessageId == ce1.Id).Subject;
+                var ce2Msg = list.Should().ContainSingle(x => x.MessageId == ce2.Id).Subject;
+                ObjectComparer.AssertJson(ce1.EncodeToJsonElement().ToString(), ce1Msg.Body.ToString());
+                ObjectComparer.AssertJson(ce2.EncodeToJsonElement().ToString(), ce2Msg.Body.ToString());
+            }).AssertSuccess();
+        });
+    }
+// #endif
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/Resources/Test-CloudEvent-00.json b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/Resources/Test-CloudEvent-00.json
new file mode 100644
index 00000000..4eed4996
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/Resources/Test-CloudEvent-00.json
@@ -0,0 +1,22 @@
+{
+  "specversion": "1.0",
+  "id": "019c72b9-e8e4-73aa-83fc-c5847cd4c217",
+  "type": "contoso.products.test.created.v1",
+  "source": "urn:contoso:products",
+  "subject": "00000000-0000-0000-0000-000000000000",
+  "time": "2026-02-18T21:48:32.3532188Z",
+  "partitionkey": "00000000-0000-0000-0000-000000000000",
+  "authtype": "user",
+  "authid": "METACORTEX\\thomas.anderson",
+  "dataschemaversion": "1.0",
+  "datacontenttype": "application/json",
+  "traceparent": "00-7de3f6abfabf606dd289d93e6d118456-cc3d1971a8b15a04-01",
+  "data": {
+    "changeLog": {
+      "createdBy": "METACORTEX\\thomas.anderson",
+      "createdOn": "2026-02-18T21:48:32.3532188\u002B00:00"
+    },
+    "id": "00000000-0000-0000-0000-000000000000",
+    "text": "Test entity"
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/Resources/Test-CloudEvent-01.json b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/Resources/Test-CloudEvent-01.json
new file mode 100644
index 00000000..359b2001
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/Resources/Test-CloudEvent-01.json
@@ -0,0 +1,12 @@
+{
+  "specversion": "1.0",
+  "id": "019c72b9-e9ab-7a00-97e9-cdf97f2f6024",
+  "type": "contoso.products.test.deleted",
+  "source": "urn:contoso:products",
+  "subject": "00000001-0000-0000-0000-000000000000",
+  "time": "2026-02-18T21:48:32.5446661Z",
+  "partitionkey": "00000001-0000-0000-0000-000000000000",
+  "authtype": "user",
+  "authid": "METACORTEX\\thomas.anderson",
+  "traceparent": "00-1bd9e9901c03640e349802f6ce9df85f-e49a3299dd102aaa-01"
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/appsettings.unittest.json b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/appsettings.unittest.json
new file mode 100644
index 00000000..2e5fb12e
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/appsettings.unittest.json
@@ -0,0 +1,41 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      //#if implement-postgres
+      "Npgsql": "Warning",
+      //#endif
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "CoreEx": {
+    "Host": {
+      "Services": {
+        "Interval": "00:00:01"
+      }
+    }
+  },
+  //#if implement-servicebus
+  "Aspire": {
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://127.0.0.1;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;",
+          "ClientOptions": {
+            "RetryOptions": {
+              "MaxRetries": 0,
+              "Delay": "00:00:01",
+              "MaxDelay": "00:00:01",
+              "Mode": "Fixed",
+              "TryTimeout": "00:00:01"
+            }
+          }
+        }
+      }
+    }
+  }
+  //#endif
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/solution-name.Test.Relay.csproj b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/solution-name.Test.Relay.csproj
new file mode 100644
index 00000000..b84062e0
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Relay/tests/solution-name.Test.Relay/solution-name.Test.Relay.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="CoreEx.UnitTesting" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\app-name.Relay\app-name.Relay.csproj" />
+    <ProjectReference Include="..\solution-name.Test.Common\solution-name.Test.Common.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/.template.config/template.json b/src/CoreEx.Template/content/CoreEx.Subscribe/.template.config/template.json
new file mode 100644
index 00000000..5c41c763
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/.template.config/template.json
@@ -0,0 +1,220 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "https://github.com/avanade/coreex",
+  "classifications": [ "CoreEx", "Microservice", "Subscribe" ],
+  "identity": "CoreEx.Subscribe",
+  "name": "CoreEx Subscribe host",
+  "description": "An ASP.NET Core Subscribe host, and test, projects for a CoreEx domain-based microservice.",
+  "shortName": "coreex-subscribe",
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  },
+  "sourceName": "app-name.Subscribe",
+  "preferNameDirectory": false,
+  "symbols": {
+    "coreex-version": {
+      "type": "generated",
+      "generator": "constant",
+      "parameters": {
+        "value": "COREEX_VERSION"
+      },
+      "replaces": "coreex-version"
+    },
+    "domain-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimited",
+      "fileRename": "domain-name",
+      "replaces": "domain-name"
+    },
+    "solution-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastDotDelimited",
+      "fileRename": "solution-name",
+      "replaces": "solution-name"
+    },
+    "solution-parent-name": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueWithoutLastTwoDotDelimited",
+      "replaces": "solution-parent-name"
+    },
+    "domain-name-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "ValueSecondToLastDotDelimitedLower",
+      "replaces": "domain-name-lower"
+    },
+    "domain-parent-lower": {
+      "type": "derived",
+      "valueSource": "name",
+      "valueTransform": "DomainParentLower",
+      "replaces": "domain-parent-lower"
+    },
+    "refdata-enabled": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Reference data enabled",
+      "description": "Indicates whether reference data pattern/capabilities is enabled.",
+      "defaultValue": "true"
+    },
+    "data-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "SqlServer",
+          "displayName": "SQL Server",
+          "description": "Indicates to use SQL Server as the data provider."
+        },
+        {
+          "choice": "Postgres",
+          "displayName": "PostgreSQL",
+          "description": "Indicates to use PostgreSQL as the data provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no data provider is used (e.g. a facade over an external system such as Dynamics 365)."
+        }
+      ],
+      "defaultValue": "Postgres",
+      "displayName": "Data provider",
+      "description": "Determines the data provider technology to use."
+    },
+    "implement-sqlserver": {
+      "type": "computed",
+      "value": "data-provider == 'SqlServer'"
+    },
+    "implement-postgres": {
+      "type": "computed",
+      "value": "data-provider == 'Postgres'"
+    },
+    "implement-none-data": {
+      "type": "computed",
+      "value": "data-provider == 'None'"
+    },
+    "messaging-provider": {
+      "type": "parameter",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "ServiceBus",
+          "displayName": "Azure Service Bus",
+          "description": "Indicates to use Azure Service Bus as the messaging provider."
+        },
+        {
+          "choice": "None",
+          "displayName": "None",
+          "description": "Indicates no messaging provider is used."
+        }
+      ],
+      "defaultValue": "ServiceBus",
+      "displayName": "Messaging provider",
+      "description": "Determines the messaging provider technology to use."
+    },
+    "implement-servicebus": {
+      "type": "computed",
+      "value": "messaging-provider == 'ServiceBus'"
+    },
+    "implement-none-messaging": {
+      "type": "computed",
+      "value": "messaging-provider == 'None'"
+    }
+  },
+  "specialCustomOperations": {
+    "*.md": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!-- #if" ],
+            "actionableElse": [ "<!-- #else" ],
+            "actionableElseif": [ "<!-- #elseif", "<!-- #elif" ],
+            "endif": [ "<!-- #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.csproj": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.props": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "<!--#if" ],
+            "actionableElse": [ "<!--#else" ],
+            "actionableElseif": [ "<!--#elseif", "<!--#elif" ],
+            "endif": [ "<!--#endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    },
+    "*.cs": {
+      "operations": [
+        {
+          "type": "conditional",
+          "configuration": {
+            "actionableIf": [ "// #if" ],
+            "actionableElse": [ "// #else" ],
+            "actionableElseif": [ "// #elseif", "// #elif" ],
+            "endif": [ "// #endif" ],
+            "trim": true,
+            "wholeLine": true
+          }
+        }
+      ]
+    }
+  },
+  "forms": {
+    "ValueSecondToLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(?:.*\\.)?([^.]+)\\.[^.]+$",
+      "replacement": "$1"
+    },
+    "ValueWithoutLastDotDelimited": {
+      "identifier": "replace",
+      "pattern": "^(.*)\\.([^\\.]+)$",
+      "replacement": "$1"
+    },
+    "LowerCase": {
+      "identifier": "lowerCase"
+    },
+    "ValueSecondToLastDotDelimitedLower": {
+      "identifier": "chain",
+      "steps": [ "ValueSecondToLastDotDelimited", "LowerCase" ]
+    },
+    "ValueWithoutLastDotDelimitedLower": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "LowerCase" ]
+    },
+    "ValueWithoutLastTwoDotDelimited": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "ValueWithoutLastDotDelimited" ]
+    },
+    "DomainParentLower": {
+      "identifier": "chain",
+      "steps": [ "ValueWithoutLastDotDelimited", "ValueSecondToLastDotDelimited", "LowerCase" ]
+    }
+  }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/AGENTS.md b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/AGENTS.md
new file mode 100644
index 00000000..dfc2a3e2
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/AGENTS.md
@@ -0,0 +1,130 @@
+# domain-name Subscriber Host -- AI Agent Guide
+
+This is the **Message Subscriber host** for the `domain-name` domain, part of the `solution-name` microservice. It receives messages from the configured message broker and dispatches them to subscriber implementations.
+
+> **Before answering any CoreEx question:** check whether `.github/docs/coreex/` is populated at the solution root. If empty, run `/coreex-docs-sync` first. The package guide at `.github/docs/coreex/agents/CoreEx.Azure.Messaging.ServiceBus.md` is especially relevant to this project.
+
+---
+
+## Host Responsibilities
+
+<!-- #if implement-servicebus -->
+This is a **background worker host** -- it runs a Service Bus session receiver as a hosted service and delegates message handling to typed subscriber classes. It should contain:
+
+- `Program.cs` -- startup, DI registration, subscriber wiring
+- `Subscribers/` -- `ISubscriber<TEvent>` implementations (one per message type)
+- No business logic; business processing belongs in `solution-name.Application`
+<!-- #else -->
+This is a **background worker host** with no messaging provider configured. It should contain:
+
+- `Program.cs` -- startup and DI registration
+- No business logic; business processing belongs in `solution-name.Application`
+- Add a messaging provider (`CoreEx.Azure.Messaging.ServiceBus`) to enable message receiving
+<!-- #endif -->
+
+Read `.github/docs/coreex/hosts-layer.md` for the full host-layer guide.
+
+---
+
+<!-- #if implement-servicebus -->
+## Adding a New Subscriber
+
+1. Create a class in `Subscribers/`, e.g. `ProductCreatedSubscriber.cs`
+2. Implement `SubscriberBase<TEvent>` or `ISubscriber<TEvent>` from `CoreEx.Events`
+3. Register it via `AddSubscribedManager()` in `Program.cs` (the template wires this up via `AddSubscribersUsing<T>()`)
+4. Decorate with `[EventSubscriber("EventType", "EventSource")]` to declare which messages it handles
+5. Call the Application service from inside `ReceiveAsync()` -- keep subscriber classes thin
+
+Consult `.github/docs/coreex/agents/CoreEx.Azure.Messaging.ServiceBus.md` for subscriber patterns and session receiver configuration.
+
+---
+
+## Session Receiver Configuration
+
+The subscriber uses Azure Service Bus **session-enabled topics** for ordered, partitioned message delivery:
+
+```json
+// appsettings.Development.json
+"Aspire": {
+  "Azure": {
+    "Messaging": {
+      "ServiceBus": {
+        "QueueOrTopicName": "domain-parent-lower",
+        "SubscriptionName": "domain-name-lower"
+      }
+    }
+  }
+}
+```
+
+`MaxConcurrentSessions` (default: 4) controls parallelism -- each session processes messages sequentially, preventing ordering violations.
+
+<!-- #endif -->
+
+---
+
+## Caching
+
+The subscriber wires FusionCache with both in-memory (L1) and Redis distributed (L2) backing -- consistent with the API host -- so reference data and idempotency checks are shared across instances.
+
+---
+
+## This Host's Feature Configuration
+
+<!-- #if implement-servicebus -->
+- **Messaging:** Azure Service Bus -- session receiver with `SubscribedManager` dispatch
+<!-- #else -->
+- **Messaging:** None configured -- add a messaging provider to enable message receiving
+<!-- #endif -->
+<!-- #if implement-sqlserver -->
+- **Database:** SQL Server -- used for outbox publishing when subscribers need to emit their own events
+<!-- #elif implement-postgres -->
+- **Database:** PostgreSQL -- used for outbox publishing when subscribers need to emit their own events
+<!-- #else -->
+- **Database:** None -- no database configured; subscribers do not persist data directly
+<!-- #endif -->
+<!-- #if refdata-enabled -->
+- **Reference data:** Enabled -- `ReferenceDataOrchestrator<ReferenceDataService>` is registered; reference data is available in subscriber logic
+<!-- #else -->
+- **Reference data:** Disabled
+<!-- #endif -->
+
+---
+
+## Key Packages
+
+| Package | Purpose |
+|---|---|
+<!-- #if implement-servicebus -->
+| `CoreEx.Azure.Messaging.ServiceBus` | Service Bus session receiver, `SubscribedManager` |
+<!-- #endif -->
+| `CoreEx.Events` | `ISubscriber<T>`, `SubscriberBase<T>`, `EventSubscriberAttribute` |
+| `CoreEx.Caching.FusionCache` | FusionCache `IHybridCache` integration |
+<!-- #if implement-sqlserver -->
+| `CoreEx.Database.SqlServer` | SQL Server outbox for outbound events |
+<!-- #endif -->
+<!-- #if implement-postgres -->
+| `CoreEx.Database.Postgres` | PostgreSQL outbox for outbound events |
+<!-- #endif -->
+<!-- #if !implement-none-data -->
+| `CoreEx.EntityFrameworkCore` | EF Core integration (`EfDb`, `IEfDbContext`) |
+<!-- #endif -->
+<!-- #if refdata-enabled -->
+| `CoreEx.RefData` | Reference data orchestration |
+<!-- #endif -->
+
+---
+
+## Relevant Docs
+
+- `.github/docs/coreex/hosts-layer.md` -- subscriber host startup patterns
+- `.github/docs/coreex/patterns.md` -- event and messaging patterns
+- `.github/docs/coreex/local-dev.md` -- running locally with .NET Aspire
+<!-- #if implement-servicebus -->
+- `.github/docs/coreex/agents/CoreEx.Azure.Messaging.ServiceBus.md` -- Service Bus receiver, session config, subscriber patterns
+<!-- #endif -->
+- `.github/docs/coreex/agents/CoreEx.Events.md` -- event type system and subscriber contracts
+- `.github/docs/coreex/agents/CoreEx.Caching.FusionCache.md` -- caching
+<!-- #if refdata-enabled -->
+- `.github/docs/coreex/agents/CoreEx.RefData.md` -- reference data patterns
+<!-- #endif -->
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/GlobalUsing.cs
new file mode 100644
index 00000000..1296e9e6
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/GlobalUsing.cs
@@ -0,0 +1,30 @@
+global using CoreEx;
+global using CoreEx.AspNetCore.Mvc;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Caching;
+global using CoreEx.Database;
+// #if implement-sqlserver
+global using CoreEx.Database.SqlServer;
+// #elif implement-postgres
+global using CoreEx.Database.Postgres;
+// #endif
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.Events;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.Results;
+// #if refdata-enabled
+global using CoreEx.RefData;
+// #endif
+global using CoreEx.Validation;
+global using Microsoft.AspNetCore.Mvc;
+global using Microsoft.Extensions.Options;
+global using OpenTelemetry;
+global using OpenTelemetry.Trace;
+global using StackExchange.Redis;
+global using System.Net;
+global using System.Text.Json;
+global using ZiggyCreatures.Caching.Fusion;
+global using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/Program.cs b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/Program.cs
new file mode 100644
index 00000000..5b9fbe9b
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/Program.cs
@@ -0,0 +1,140 @@
+using solution-name.Infrastructure.Repositories;
+// #if implement-servicebus
+using CoreEx.Azure.Messaging.ServiceBus;
+// #endif
+using Microsoft.Extensions.Options;
+using OpenTelemetry;
+using OpenTelemetry.Trace;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace app-name.Subscribe;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddPrecisionTimeProvider()
+            .AddExecutionContext()
+// #if refdata-enabled
+            .AddReferenceDataOrchestrator()             // Resolves the (CodeGen-generated) IReferenceDataProvider from DI at runtime — no compile-time dependency on the generated type.
+// #endif
+            .AddMvcWebApi()
+            .AddHttpWebApi()
+            .AddHostedServiceManager();
+
+        // Dynamically register all [ScopedService] types — subscribers (this host), application services, and infrastructure repositories (including those generated by CodeGen). The AssemblyMarker types are stable anchors that always exist.
+        builder.Services.AddDynamicServicesUsing(typeof(Program).Assembly, typeof(solution-name.Application.AssemblyMarker).Assembly, typeof(solution-name.Infrastructure.AssemblyMarker).Assembly);
+
+        // Add L1/L2 caching services.
+        builder.Services.AddMemoryCache();              // Adds the in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Adds Redis as the distributed cache - L2.
+
+        // Add and wire-up FusionCache including backplane.
+        builder.Services.AddFusionCache()
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions);
+
+        // Add CoreEx caching services.
+        builder.Services
+            .AddFusionHybridCache()                     // Adds the CoreEx.Caching.IHybridCache for FusionCache.
+            .AddDefaultCacheKeyProvider()               // Adds the default CoreEx.Caching.ICacheKeyProvider.
+            .AddHybridCacheIdempotencyProvider();       // Adds the CoreEx.Caching.Idempotency.IIdempotencyProvider.
+
+        // Add the repository and related database services.
+// #if implement-sqlserver
+        builder.AddSqlServerClient("SqlServer");        // Adds the SqlServerClient (using Aspire library).
+        builder.Services
+            .AddSqlServerDatabase()                     // Adds the SqlServerDatabase.
+            .AddSqlServerUnitOfWork()                   // Adds the SqlServerUnitOfWork for the SqlServerDatabase.
+            .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+            .AddSqlServerOutboxPublisher()              // Adds the SqlServerOutboxPublisher as the IEventPublisher.
+            .AddDbContext<domain-nameDbContext>()       // Adds the standard EF DbContext.
+            .AddEfDb<domain-nameEfDb>();                // Adds the CoreEx extended EF service.
+// #elif implement-postgres
+        builder.AddAzureNpgsqlDataSource("Postgres");   // Adds the NpgsqlDataSource (using Aspire library).
+        builder.Services
+            .AddPostgresDatabase()                      // Adds the PostgresDatabase.
+            .AddPostgresUnitOfWork()                    // Adds the PostgresUnitOfWork for the PostgresDatabase.
+            .AddEventFormatter()                        // Adds the EventFormatter to enable message formatting for publishing.
+            .AddPostgresOutboxPublisher()               // Adds the PostgresOutboxPublisher as the IEventPublisher.
+            .AddDbContext<domain-nameDbContext>()       // Adds the standard EF DbContext.
+            .AddEfDb<domain-nameEfDb>();                // Adds the CoreEx extended EF service.
+// #endif
+
+// #if implement-servicebus
+        // Add the Azure Service Bus client and subscribe wiring.
+        builder.AddAzureServiceBusClient("ServiceBus");         // Adds the Azure Service Bus client (using Aspire library).
+        builder.Services.AddAzureServiceBusPublisher((_, c) =>  // Adds the service bus as the IEventPublisher.
+        {
+            c.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyConvertedToAnId;  // Use a partition-id as the session-id.
+        }, addAsDefaultIEventPublisher: false);                                              // Add as a named IEventPublisher, not the default (as the default is the OutboxPublisher).
+
+        // Add event formatter and subscribed-manager.
+        builder.Services
+            .AddEventFormatter()                                                // Adds the EventFormatter to enable message parsing/formatting.
+            .AddSubscribedManager((_, c) => c.AddSubscribersUsing<Program>());  // Add all subscribers from this assembly.
+
+        // Build and create the Azure Service Bus receiving services.
+        builder.Services.AzureServiceBusReceiving()
+            .WithSessionReceiver(_ => ServiceBusSessionReceiverOptions.CreateForTopicSubscription())    // Set the topic and subscription, etc. from configuration.
+            .WithSubscribedSubscriber()                 // Adds the service bus subscriber using the SubscribedManager.
+            .WithHostedService()                        // Adds the service bus receiver as a hosted service.
+            .Build();                                   // Builds all the services and adds to the service collection.
+// #endif
+
+        // Post-configure all health-checks; adds the standard tags.
+        builder.Services.PostConfigureAllHealthChecks();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+// #if implement-sqlserver
+            .WithCoreExSqlServerTelemetry()
+// #elif implement-postgres
+            .WithCoreExPostgresTelemetry()
+// #endif
+// #if implement-servicebus
+            .WithCoreExServiceBusTelemetry()
+// #endif
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+        app.MapHealthChecks();
+        app.MapHostedServices();
+
+        // Run the application.
+        app.Run();
+    }
+}
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/app-name.Subscribe.csproj b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/app-name.Subscribe.csproj
new file mode 100644
index 00000000..391479a6
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/app-name.Subscribe.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <ItemGroup>
+    <ProjectReference Include="..\solution-name.Application\solution-name.Application.csproj" />
+    <ProjectReference Include="..\solution-name.Infrastructure\solution-name.Infrastructure.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="CoreEx.AspNetCore" />
+    <PackageReference Include="CoreEx.AspNetCore.NSwag" />
+    <PackageReference Include="CoreEx.Caching.FusionCache" />
+    <!--#if implement-servicebus-->
+    <PackageReference Include="CoreEx.Azure.Messaging.ServiceBus" />
+    <PackageReference Include="Aspire.Azure.Messaging.ServiceBus" />
+    <!--#endif-->
+    <!--#if implement-sqlserver-->
+    <PackageReference Include="CoreEx.Database.SqlServer" />
+    <PackageReference Include="Aspire.Microsoft.Data.SqlClient" />
+    <!--#endif-->
+    <!--#if implement-postgres-->
+    <PackageReference Include="CoreEx.Database.Postgres" />
+    <PackageReference Include="Aspire.Azure.Npgsql" />
+    <!--#endif-->
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" />
+    <PackageReference Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="Azure.Experimental.EnableActivitySource" Value="true" />
+  </ItemGroup>
+</Project>
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/appsettings.Development.json b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/appsettings.Development.json
new file mode 100644
index 00000000..8856ede8
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/appsettings.Development.json
@@ -0,0 +1,53 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Azure": "Warning",
+      "Microsoft": "Warning",
+//#if implement-sqlserver
+      "Npgsql": "Warning",
+//#endif
+//#if implement-servicebus
+      "Azure.Messaging.ServiceBus": "Critical",
+      "CoreEx.Azure.Messaging.ServiceBus": "Warning",
+//#endif
+      "ZiggyCreatures": "Warning",
+      "StackExchange": "Warning"
+    }
+  },
+  "Aspire": {
+//#if implement-sqlserver
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=domain-name;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    },
+//#elif implement-postgres
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=domain-name-lower;Username=postgres;Password=yourStrong#!Password"
+    },
+//#endif
+//#if implement-servicebus
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;",
+          "QueueOrTopicName": "domain-parent-lower",
+          "SubscriptionName": "domain-name-lower"
+        }
+      }
+    },
+//#endif
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/appsettings.json b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/appsettings.json
new file mode 100644
index 00000000..f98ff39d
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/src/app-name.Subscribe/appsettings.json
@@ -0,0 +1,23 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "solution-parent-name",
+      "DomainName": "domain-name",
+      "Services": {
+        "Interval": "00:00:00.500"
+      }
+    },
+    "Events": {
+      "Destination": "domain-parent-lower" // Topic/queue name.
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.EntityFrameworkCore": "Warning",
+      "Microsoft.EntityFrameworkCore.Update": "None"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/GlobalUsing.cs b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/GlobalUsing.cs
new file mode 100644
index 00000000..b31c09cc
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/GlobalUsing.cs
@@ -0,0 +1,18 @@
+global using CoreEx;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Events;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Events.Subscribing.Exceptions;
+global using CoreEx.Results;
+global using AwesomeAssertions;
+global using Microsoft.Extensions.DependencyInjection;
+global using NUnit.Framework;
+global using System.Net;
+global using UnitTestEx;
+global using UnitTestEx.NUnit;
+global using UnitTestEx.Expectations;
+global using solution-name.Contracts;
+// #if (implement-sqlserver || implement-postgres)
+global using DbMigration = solution-name.Database.Program;
+global using TestData = solution-name.Test.Common.TestData;
+// #endif
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/HostTests.cs b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/HostTests.cs
new file mode 100644
index 00000000..2e717548
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/HostTests.cs
@@ -0,0 +1,89 @@
+namespace solution-name.Test.Subscribe;
+
+public partial class HostTests : WithApiTester<solution-name.Subscribe.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+// #if implement-sqlserver
+        await Test.MigrateSqlServerDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #elif implement-postgres
+        await Test.MigratePostgresDataAsync<TestData>(["no-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+// #endif
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+    }
+
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health_Basic(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+    }
+
+    [TestCase("/health/live/detailed", true)]
+    [TestCase("/health/startup/detailed", false)]
+    [TestCase("/health/ready/detailed", false)]
+    public void Health_Detailed(string path, bool minimal)
+    {
+        string[] _paths =
+        [
+// #if refdata-enabled
+            "$.entries.reference-data-orchestrator",
+// #endif
+            "$.entries['stackExchange.Redis']",
+// #if implement-sqlserver
+            "$.entries.sqlServer",
+// #elif implement-postgres
+            "$.entries.postgreSql",
+// #endif
+// #if implement-servicebus
+            "$.entries.azure-service-bus-session-receiver"
+// #endif
+        ];
+
+        var r = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .AssertContentTypeJson();
+
+        r.Response.StatusCode.Should().BeOneOf(HttpStatusCode.OK, HttpStatusCode.ServiceUnavailable);
+
+        var json = r.GetContent().Should().BeJson();
+        if (minimal)
+            json.NotContainAny(_paths);
+        else
+            json.ContainAll(_paths);
+    }
+
+    [Test]
+    public void HostedService_Pause_And_Resume()
+    {
+// #if implement-servicebus
+        const string Service = "azure-service-bus-session-receiver";
+// #endif
+
+        Test.Http<string>()
+            .Run(HttpMethod.Get, $"/hosted-services/{Service}/status")
+            .Value.Should().BeOneOf("Running", "Sleeping");
+
+        Test.Http()
+            .Run(HttpMethod.Post, $"/hosted-services/{Service}/pause")
+            .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+
+        Test.Delay(TimeSpan.FromSeconds(1))
+            .Http<string>()
+            .Run(HttpMethod.Get, $"/hosted-services/{Service}/status")
+            .Value.Should().Be("Paused");
+
+        Test.Http()
+            .Run(HttpMethod.Post, $"/hosted-services/{Service}/resume")
+            .Response.StatusCode.Should().Be(HttpStatusCode.Accepted);
+
+        Test.Delay(TimeSpan.FromSeconds(1))
+            .Http<string>()
+            .Run(HttpMethod.Get, $"/hosted-services/{Service}/status")
+            .Value.Should().BeOneOf("Running", "Sleeping");
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/SubscriberTests.cs b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/SubscriberTests.cs
new file mode 100644
index 00000000..902f04e5
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/SubscriberTests.cs
@@ -0,0 +1,41 @@
+namespace solution-name.Test.Subscribe;
+
+public partial class SubscriberTests : WithApiTester<solution-name.Subscribe.Program>
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUpAsync()
+    {
+        // #if implement-sqlserver
+        await Test.MigrateSqlServerDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        // #elif implement-postgres
+        await Test.MigratePostgresDataAsync<TestData>(["mutate-data.seed.yaml"], DbMigration.ConfigureMigrationArgs).ConfigureAwait(false);
+        // #endif
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+
+        // #if implement-sqlserver
+        Test.UseExpectedSqlServerOutboxPublisher();
+        // #elif implement-postgres
+        Test.UseExpectedPostgresOutboxPublisher();
+        // #endif
+    }
+
+    [Test]
+    public void NotSubscribed_CompleteAsSilent() => Test.Scoped(test =>
+    {
+        var ed = EventData.CreateEvent("test", "not-subscribed").WithKey("abc");
+        var ce = Test.CreateCloudEventFrom(ed);
+        var sbm = ce.ToServiceBusReceivedMessage();
+
+        test.Run(async _ =>
+        {
+            var sbs = test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+            var r = await sbs.ReceiveAsync(sbm);
+
+            r.IsFailure.Should().BeTrue();
+            var e = r.Error.Should().BeOfType<EventSubscriberHandledException>().Subject;
+            e.ErrorHandling.Should().Be(ErrorHandling.CompleteAsSilent);
+            e.InnerException.Should().NotBeNull();
+            e.InnerException.Message.Should().Be("No subscriber matched the event.");
+        }).AssertSuccess();
+    });
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/appsettings.unittest.json b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/appsettings.unittest.json
new file mode 100644
index 00000000..c0f6d3d4
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/appsettings.unittest.json
@@ -0,0 +1,16 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "System": "Information",
+      "Microsoft": "Information",
+      //#if implement-postgres
+      "Npgsql": "Warning",
+      //#endif
+      "ZiggyCreature": "Warning",
+      "StackExchange": "Warning",
+      "System.Net.Http.HttpClient": "Information",
+      "Polly": "Information"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/solution-name.Test.Subscribe.csproj b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/solution-name.Test.Subscribe.csproj
new file mode 100644
index 00000000..11e21bfe
--- /dev/null
+++ b/src/CoreEx.Template/content/CoreEx.Subscribe/tests/solution-name.Test.Subscribe/solution-name.Test.Subscribe.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="CoreEx.UnitTesting" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\app-name.Subscribe\app-name.Subscribe.csproj" />
+    <ProjectReference Include="..\solution-name.Test.Common\solution-name.Test.Common.csproj" />
+    <!--#if (implement-sqlserver || implement-postgres)-->
+    <ProjectReference Include="..\..\tools\solution-name.Database\solution-name.Database.csproj" />
+    <!--#endif-->
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\**\*" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting.Azure.Functions/Abstractions/AzureFunctionsCoreExOneOffTestSetUp.cs b/src/CoreEx.UnitTesting.Azure.Functions/Abstractions/AzureFunctionsCoreExOneOffTestSetUp.cs
deleted file mode 100644
index 742baab3..00000000
--- a/src/CoreEx.UnitTesting.Azure.Functions/Abstractions/AzureFunctionsCoreExOneOffTestSetUp.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Reflection;
-using UnitTestEx.Abstractions;
-
-[assembly: OneOffTestSetUp(typeof(AzureFunctionsCoreExOneOffTestSetUp))]
-
-namespace UnitTestEx.Abstractions
-{
-    /// <summary>
-    /// Provides the one-off test set-up for the <see cref="CoreEx"/>-related testing.
-    /// </summary>
-    /// <remarks>Adds the <see cref="CoreExExtension"/> to support the runtime extension inclusion. Also, changes the <see cref="TestSetUp.Default"/> <see cref="TestSetUp.JsonSerializer"/> to the <see cref="CoreEx.Text.Json.JsonSerializer"/>.
-    /// <para>This inherits the <see cref="CoreExOneOffTestSetUp"/> achieving the same functionality, but is delared within this <see cref="Assembly"/> to ensure executed.</para></remarks>
-    public class AzureFunctionsCoreExOneOffTestSetUp : CoreExOneOffTestSetUp { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting.Azure.Functions/CoreEx.UnitTesting.Azure.Functions.csproj b/src/CoreEx.UnitTesting.Azure.Functions/CoreEx.UnitTesting.Azure.Functions.csproj
deleted file mode 100644
index 21f9de8e..00000000
--- a/src/CoreEx.UnitTesting.Azure.Functions/CoreEx.UnitTesting.Azure.Functions.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>UnitTestEx</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx Azure Functions UnitTesting extras.</Title>
-    <Description>CoreEx UnitTesting (UnitTestEx) extras.</Description>
-    <PackageTags>coreex unittest unit-test test unittestex</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\CoreEx.Azure\CoreEx.Azure.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="UnitTestEx.Azure.Functions" Version="5.3.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/CoreEx.UnitTesting.Azure.Functions/UnitTestExExtensions.cs b/src/CoreEx.UnitTesting.Azure.Functions/UnitTestExExtensions.cs
deleted file mode 100644
index 870ac240..00000000
--- a/src/CoreEx.UnitTesting.Azure.Functions/UnitTestExExtensions.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.AspNetCore.Http;
-using CoreEx.Http;
-using Microsoft.AspNetCore.Http;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Net.Http;
-using System.Net.Mime;
-using UnitTestEx.Azure.Functions;
-using Ceh = CoreEx.Http;
-
-namespace UnitTestEx
-{
-    /// <summary>
-    /// Provides extension methods to the core <see href="https://github.com/Avanade/unittestex"/>.
-    /// </summary>
-    public static class UnitTestExExtensions
-    {
-        #region FunctionTesterBase
-
-        /// <summary>
-        /// Creates a new <see cref="HttpRequest"/> with no body.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="httpMethod">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The requuest uri.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <returns>The <see cref="HttpRequest"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, [StringSyntax(StringSyntaxAttribute.Uri)] string? requestUri, Ceh.HttpRequestOptions? requestOptions = null)
-#else
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, string? requestUri, Ceh.HttpRequestOptions? requestOptions = null)
-#endif
-            where TEntryPoint : class, new() where TSelf : FunctionTesterBase<TEntryPoint, TSelf>
-            => tester.CreateHttpRequest(httpMethod, requestUri).ApplyRequestOptions(requestOptions);
-
-        /// <summary>
-        /// Creates a new <see cref="HttpRequest"/> with no body.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="httpMethod">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The requuest uri.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <param name="requestModifier">The optional <see cref="HttpRequest"/> modifier.</param>
-        /// <returns>The <see cref="HttpRequest"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, [StringSyntax(StringSyntaxAttribute.Uri)] string? requestUri, Ceh.HttpRequestOptions? requestOptions = null, Action<HttpRequest>? requestModifier = null)
-#else
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, string? requestUri, Ceh.HttpRequestOptions? requestOptions = null, Action<HttpRequest>? requestModifier = null)
-#endif
-            where TEntryPoint : class, new() where TSelf : FunctionTesterBase<TEntryPoint, TSelf>
-            => tester.CreateHttpRequest(httpMethod, requestUri, requestModifier).ApplyRequestOptions(requestOptions);
-
-        /// <summary>
-        /// Creates a new <see cref="HttpRequest"/> with <paramref name="body"/> (defaults <see cref="HttpRequest.ContentType"/> to <see cref="MediaTypeNames.Text.Plain"/>).
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="httpMethod">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The requuest uri.</param>
-        /// <param name="body">The optional body content.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <returns>The <see cref="HttpRequest"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, [StringSyntax(StringSyntaxAttribute.Uri)] string? requestUri, string? body, Ceh.HttpRequestOptions? requestOptions = null)
-#else
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, string? requestUri, string? body, Ceh.HttpRequestOptions? requestOptions = null)
-#endif
-            where TEntryPoint : class, new() where TSelf : FunctionTesterBase<TEntryPoint, TSelf>
-            => tester.CreateHttpRequest(httpMethod, requestUri, body, null, null).ApplyRequestOptions(requestOptions);
-
-        /// <summary>
-        /// Creates a new <see cref="HttpRequest"/> with <paramref name="body"/> and <paramref name="contentType"/>.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="httpMethod">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The requuest uri.</param>
-        /// <param name="body">The optional body content.</param>
-        /// <param name="contentType">The content type. Defaults to <see cref="MediaTypeNames.Text.Plain"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <returns>The <see cref="HttpRequest"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, [StringSyntax(StringSyntaxAttribute.Uri)] string? requestUri, string? body, string? contentType, Ceh.HttpRequestOptions? requestOptions = null)
-#else
-        public static HttpRequest CreateHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, string? requestUri, string? body, string? contentType, Ceh.HttpRequestOptions? requestOptions = null)
-#endif
-            where TEntryPoint : class, new() where TSelf : FunctionTesterBase<TEntryPoint, TSelf>
-            => tester.CreateHttpRequest(httpMethod, requestUri, body, contentType, null).ApplyRequestOptions(requestOptions);
-
-        /// <summary>
-        /// Creates a new <see cref="HttpRequest"/> with the <paramref name="value"/> JSON serialized as <see cref="HttpRequest.ContentType"/> of <see cref="MediaTypeNames.Application.Json"/>.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="httpMethod">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The requuest uri.</param>
-        /// <param name="value">The value to JSON serialize.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/> modifier.</param>
-        /// <returns>The <see cref="HttpRequest"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static HttpRequest CreateJsonHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, [StringSyntax(StringSyntaxAttribute.Uri)] string? requestUri, object? value, Ceh.HttpRequestOptions? requestOptions)
-#else
-        public static HttpRequest CreateJsonHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, string? requestUri, object? value, Ceh.HttpRequestOptions? requestOptions)
-#endif
-            where TEntryPoint : class, new() where TSelf : FunctionTesterBase<TEntryPoint, TSelf>
-            => tester.CreateJsonHttpRequest(httpMethod, requestUri, value).ApplyRequestOptions(requestOptions);
-
-        /// <summary>
-        /// Creates a new <see cref="HttpRequest"/> with the <paramref name="value"/> JSON serialized as <see cref="HttpRequest.ContentType"/> of <see cref="MediaTypeNames.Application.Json"/>.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="httpMethod">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The requuest uri.</param>
-        /// <param name="value">The value to JSON serialize.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/> modifier.</param>
-        /// <param name="requestModifier">The optional <see cref="HttpRequest"/> modifier.</param>
-        /// <returns>The <see cref="HttpRequest"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static HttpRequest CreateJsonHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, [StringSyntax(StringSyntaxAttribute.Uri)] string? requestUri, object? value, Ceh.HttpRequestOptions? requestOptions, Action<HttpRequest>? requestModifier = null)
-#else
-        public static HttpRequest CreateJsonHttpRequest<TEntryPoint, TSelf>(this FunctionTesterBase<TEntryPoint, TSelf> tester, HttpMethod httpMethod, string? requestUri, object? value, Ceh.HttpRequestOptions? requestOptions, Action<HttpRequest>? requestModifier = null)
-#endif
-            where TEntryPoint : class, new() where TSelf : FunctionTesterBase<TEntryPoint, TSelf>
-            => tester.CreateJsonHttpRequest(httpMethod, requestUri, value, requestModifier).ApplyRequestOptions(requestOptions);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting.Azure.Functions/strong-name-key.snk b/src/CoreEx.UnitTesting.Azure.Functions/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.UnitTesting.Azure.Functions/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.UnitTesting.Azure.ServiceBus/Abstractions/AzureServiceBusCoreExOneOffTestSetUp.cs b/src/CoreEx.UnitTesting.Azure.ServiceBus/Abstractions/AzureServiceBusCoreExOneOffTestSetUp.cs
deleted file mode 100644
index 4be6c738..00000000
--- a/src/CoreEx.UnitTesting.Azure.ServiceBus/Abstractions/AzureServiceBusCoreExOneOffTestSetUp.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Reflection;
-using UnitTestEx.Abstractions;
-
-[assembly: OneOffTestSetUp(typeof(AzureServiceBusCoreExOneOffTestSetUp))]
-
-namespace UnitTestEx.Abstractions
-{
-    /// <summary>
-    /// Provides the one-off test set-up for the <see cref="CoreEx"/>-related testing.
-    /// </summary>
-    /// <remarks>Adds the <see cref="CoreExExtension"/> to support the runtime extension inclusion. Also, changes the <see cref="TestSetUp.Default"/> <see cref="TestSetUp.JsonSerializer"/> to the <see cref="CoreEx.Text.Json.JsonSerializer"/>.
-    /// <para>This inheits the <see cref="CoreExOneOffTestSetUp"/> achieving the same functionality, but is delared within this <see cref="Assembly"/> to ensure executed.</para></remarks>
-    public class AzureServiceBusCoreExOneOffTestSetUp : CoreExOneOffTestSetUp { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting.Azure.ServiceBus/CoreEx.UnitTesting.Azure.ServiceBus.csproj b/src/CoreEx.UnitTesting.Azure.ServiceBus/CoreEx.UnitTesting.Azure.ServiceBus.csproj
deleted file mode 100644
index 0686c1f3..00000000
--- a/src/CoreEx.UnitTesting.Azure.ServiceBus/CoreEx.UnitTesting.Azure.ServiceBus.csproj
+++ /dev/null
@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>UnitTestEx</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx Azure ServiceBus UnitTesting extras.</Title>
-    <Description>CoreEx UnitTesting (UnitTestEx) extras.</Description>
-    <PackageTags>coreex unittest unit-test test unittestex</PackageTags>
-  </PropertyGroup>
-
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="UnitTestEx.Azure.ServiceBus" Version="5.3.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/CoreEx.UnitTesting.Azure.ServiceBus/UnitTestExExtensions.cs b/src/CoreEx.UnitTesting.Azure.ServiceBus/UnitTestExExtensions.cs
deleted file mode 100644
index b09fbb70..00000000
--- a/src/CoreEx.UnitTesting.Azure.ServiceBus/UnitTestExExtensions.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Core.Amqp;
-using Azure.Messaging.ServiceBus;
-using CoreEx;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Events;
-using CoreEx.Mapping.Converters;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using UnitTestEx.Abstractions;
-
-namespace UnitTestEx
-{
-    /// <summary>
-    /// Provides extension methods to the core <see href="https://github.com/Avanade/unittestex"/>.
-    /// </summary>
-    public static class UnitTestExExtensions
-    {
-        /// <summary>
-        /// Creates a <see cref="ServiceBusReceivedMessage"/> from the <paramref name="event"/> leveraging the registered <see cref="EventDataToServiceBusConverter"/> to perform the underlying conversion.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="event">The <see cref="EventData"/> or <see cref="EventData{T}"/> value.</param>
-        /// <returns>The <see cref="ServiceBusReceivedMessage"/>.</returns>
-        /// <remarks>This will result in the <see cref="TesterBase.Services"/> from the underlying host being instantiated. If a <b>Services</b>-related error occurs then consider performing a <see cref="TesterBase.ResetHost()"/> after creation to reset.</remarks>
-        public static ServiceBusReceivedMessage CreateServiceBusMessage(this TesterBase tester, EventData @event)
-        {
-            @event.ThrowIfNull(nameof(@event));
-            var message = (tester.Services.GetService<EventDataToServiceBusConverter>() ?? new EventDataToServiceBusConverter(tester.Services.GetService<IEventSerializer>(), tester.Services.GetService<IValueConverter<EventSendData, ServiceBusMessage>>())).Convert(@event).GetRawAmqpMessage();
-            return tester.CreateServiceBusMessage(message);
-        }
-
-        /// <summary>
-        /// Creates a <see cref="ServiceBusReceivedMessage"/> from the <paramref name="event"/> leveraging the registered <see cref="EventDataToServiceBusConverter"/> to perform the underlying conversion.
-        /// </summary>
-        /// <param name="tester">The tester.</param>
-        /// <param name="event">The <see cref="EventData"/> or <see cref="EventData{T}"/> value.</param>
-        /// <param name="messageModify">Optional <see cref="AmqpAnnotatedMessage"/> modifier than enables the message to be further configured.</param>
-        /// <returns>The <see cref="ServiceBusReceivedMessage"/>.</returns>
-        /// <remarks>This will result in the <see cref="TesterBase.Services"/> from the underlying host being instantiated. If a <b>Services</b>-related error occurs then consider performing a <see cref="TesterBase.ResetHost()"/> after creation to reset.</remarks>
-        public static ServiceBusReceivedMessage CreateServiceBusMessage(this TesterBase tester, EventData @event, Action<AmqpAnnotatedMessage>? messageModify)
-        {
-            @event.ThrowIfNull(nameof(@event));
-            var message = (tester.Services.GetService<EventDataToServiceBusConverter>() ?? new EventDataToServiceBusConverter(tester.Services.GetService<IEventSerializer>(), tester.Services.GetService<IValueConverter<EventSendData, ServiceBusMessage>>())).Convert(@event).GetRawAmqpMessage();
-            return tester.CreateServiceBusMessage(message, messageModify);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting.Azure.ServiceBus/strong-name-key.snk b/src/CoreEx.UnitTesting.Azure.ServiceBus/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.UnitTesting.Azure.ServiceBus/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.UnitTesting/AGENTS.md b/src/CoreEx.UnitTesting/AGENTS.md
new file mode 100644
index 00000000..157e8e4e
--- /dev/null
+++ b/src/CoreEx.UnitTesting/AGENTS.md
@@ -0,0 +1,111 @@
+# CoreEx.UnitTesting — AI Usage Guide
+
+The single test-support package for the entire CoreEx ecosystem. One `<PackageReference>` covers events, outbox, Service Bus, caching, validation, HTTP, and all assertion helpers.
+
+## Project Reference
+
+```xml
+<PackageReference Include="CoreEx.UnitTesting" Version="..." />
+```
+
+No additional CoreEx test packages are needed — this package covers everything.
+
+## Test Class Shape (NUnit)
+
+```csharp
+[TestFixture]
+public class OrderServiceTest : UnitTestBase
+{
+    [OneTimeSetUp]
+    public async Task OneTimeSetUp()
+    {
+        await Test.ClearFusionCacheAsync().ConfigureAwait(false);
+        // seed your test database here
+    }
+
+    [Test]
+    public void Create_Order_Published_To_Outbox()
+        => Test.ScopedType<OrderService>()
+               .ExpectChangeLogCreated()
+               .ExpectIdentifier()
+               .ExpectSqlServerOutboxEvents(new CloudEvent { ... })
+               .Run(s => s.CreateAsync(new Order { ... }));
+}
+```
+
+## Event / Outbox Expectations
+
+Use the database-specific expectation method that matches your domain's persistence provider. Do not mix SQL Server and PostgreSQL helpers.
+
+```csharp
+// SQL Server outbox
+.ExpectSqlServerOutboxEvents(new CloudEvent { Subject = "contoso.orders.order.created.v1", ... })
+.ExpectNoSqlServerOutboxEvents()
+
+// PostgreSQL outbox
+.ExpectPostgresOutboxEvents(new CloudEvent { Subject = "contoso.orders.order.created.v1", ... })
+.ExpectNoPostgresOutboxEvents()
+
+// Azure Service Bus direct publisher (no outbox)
+.ExpectAzureServiceBusEvents(new CloudEvent { ... })
+.ExpectNoAzureServiceBusEvents()
+```
+
+## Validation Assertions
+
+```csharp
+// Assert validator passes
+await ProductValidator.Default.AssertSuccess(new Product { Sku = "SKU001" });
+
+// Assert validator fails with specific field errors
+await ProductValidator.Default.AssertErrors(
+    new Product { Sku = "" },
+    ("Sku", "Sku is required."));
+```
+
+## Subscribe / Relay Host Tests
+
+```csharp
+// Subscribe host
+[TestFixture]
+public class OrderSubscriberTest : UnitTestBase
+{
+    [Test]
+    public void Receive_OrderCreated()
+        => Test.Type<OrderCreatedSubscriber>()
+               .ExpectNoSqlServerOutboxEvents()
+               .Run(s => s.ReceiveAsync(CreateCloudEvent("contoso.orders.order.created.v1", order)));
+}
+```
+
+## JSON Seed Data
+
+```csharp
+// Load seed data from embedded YAML with token substitution
+var data = await JsonDataReader.ParseYamlAsync("Resources/data.yaml");
+await db.SeedAsync(data);
+```
+
+## ExecutionContext Scoping
+
+```csharp
+Test.ScopedType<OrderService>()
+    .WithUser("test@contoso.com")
+    .Run(s => s.GetAsync(id));
+```
+
+## Do Not
+
+- Do not add separate per-feature test packages (e.g. `CoreEx.UnitTesting.Events`) — they do not exist; all test helpers are in this package.
+- Do not use `ExpectSqlServerOutboxEvents` for a PostgreSQL domain or vice versa.
+- Do not call `PublishAsync()` in tests — the `EventPublisherDecorator` (registered by `UseExpectedEventPublisher`) captures events automatically.
+- Do not forget `await Test.ClearFusionCacheAsync()` in `[OneTimeSetUp]` for tests involving cached reference data.
+- Do not use FluentAssertions — the CoreEx test framework uses AwesomeAssertions (`AwesomeAssertions` NuGet package).
+
+## Further Reading
+
+- [README](./README.md) — full expectations, outbox helpers, `JsonDataReader`, and `UnitTestExExtensions` API reference.
+- [UnitTestEx](https://github.com/Avanade/UnitTestEx) — the underlying test-host framework.
+- [AwesomeAssertions](https://github.com/AwesomeAssertions/AwesomeAssertions) — fluent assertion library used internally.
+- [Testing](../../samples/docs/testing.md) — comprehensive real-world guide covering unit, integration, API, Subscribe, and Relay test patterns with concrete examples from the sample solution.
+- [Patterns](../../samples/docs/patterns.md) — test-specific patterns including outbox assertion, mock HTTP client, inter-domain mock strategy, and `FusionCache` reset.
diff --git a/src/CoreEx.UnitTesting/Abstractions/CoreExExtension.cs b/src/CoreEx.UnitTesting/Abstractions/CoreExExtension.cs
deleted file mode 100644
index 6dd0e97a..00000000
--- a/src/CoreEx.UnitTesting/Abstractions/CoreExExtension.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Entities;
-using CoreEx.Http;
-using Microsoft.AspNetCore.Mvc;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx.Assertors;
-using UnitTestEx.Expectations;
-
-namespace UnitTestEx.Abstractions
-{
-    /// <summary>
-    /// Provides the <see cref="CoreEx"/> extension capabilities.
-    /// </summary>
-    public class CoreExExtension : TesterExtensionsConfig
-    {
-        /// <inheritdoc/>
-        public override void OnUseSetUp(TesterBase owner)
-        {
-            // Where the TestSetUp has been configured to use ExpectedEvents then automatically use it.
-            if (owner.SetUp.IsExpectedEventsEnabled())
-                owner.UseExpectedEvents();
-
-            // Override username from ExecutionContext.
-            if (ExecutionContext.HasCurrent)
-                owner.SetUp.DefaultUserName = ExecutionContext.Current.UserName;
-        }
-
-        /// <inheritdoc/>
-        /// <remarks>This is a duplication of the underlying <see cref="HttpResult.CreateAsync{T}(HttpResponseMessage, CoreEx.Json.IJsonSerializer?, System.Threading.CancellationToken)"/> logic.</remarks>
-        public override void UpdateValueFromHttpResponseMessage<TValue>(TesterBase owner, HttpResponseMessage response, ref TValue? value) where TValue : default
-        {
-            // This is a duplication of the HttpResult logic.
-            if (value != null && value is IETag etag && etag.ETag == null && response.Headers.ETag != null)
-                etag.ETag = response.Headers.ETag.Tag;
-
-            // Where the value is an ICollectionResult then update the Paging property from the corresponding response headers.
-            if (value is ICollectionResult cr && cr != null && cr.Paging is null)
-            {
-                if (response.TryGetPagingResult(out var paging))
-                    cr.Paging = paging;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override void UpdateValueFromActionResult<TValue>(TesterBase owner, IActionResult actionResult, ref TValue? value) where TValue : default
-        {
-            if (actionResult is ValueContentResult vcr)
-            {
-                if (value != null && value is IETag etag && etag.ETag == null && vcr.ETag != null)
-                    etag.ETag = vcr.ETag;
-
-                if (value is ICollectionResult cr && cr != null && cr.Paging is null)
-                    cr.Paging = vcr.PagingResult;
-            }
-        }
-
-        /// <inheritdoc/>
-        public override Task ExpectationAssertAsync<TTester>(ExpectationsBase<TTester> expectation, AssertArgs args)
-        {
-            // Where an ErrorExpectations and ValidationException then assert/match the errors/messages.
-            if (expectation is ErrorExpectations<TTester> ee)
-            {
-                if (!ee.ErrorsMatched && ee.Errors.Count > 0 && args.Exception is not null && args.Exception is ValidationException vex)
-                {
-                    var actual = vex.Messages?.Where(x => x.Type == MessageType.Error).Select(x => new ApiError(x.Property, x.Text ?? string.Empty)).ToArray() ?? [];
-                    if (!Assertor.TryAreErrorsMatched(ee.Errors, actual, out var errorMessage))
-                        args.Tester.Implementor.AssertFail(errorMessage);
-
-                    ee.ErrorsMatched = true;
-                }
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Abstractions/CoreExOneOffTestSetUp.cs b/src/CoreEx.UnitTesting/Abstractions/CoreExOneOffTestSetUp.cs
deleted file mode 100644
index 7549b349..00000000
--- a/src/CoreEx.UnitTesting/Abstractions/CoreExOneOffTestSetUp.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Entities;
-using System.Linq;
-using UnitTestEx.Assertors;
-
-[assembly: UnitTestEx.Abstractions.OneOffTestSetUp(typeof(UnitTestEx.Abstractions.CoreExOneOffTestSetUp))]
-
-namespace UnitTestEx.Abstractions
-{
-    /// <summary>
-    /// Provides the one-off test set-up for the <see cref="CoreEx"/>-related testing.
-    /// </summary>
-    /// <remarks>Adds the <see cref="CoreExExtension"/> to support the runtime extension inclusion. Also, changes the <see cref="TestSetUp.Default"/> <see cref="TestSetUp.JsonSerializer"/> to the <see cref="CoreEx.Text.Json.JsonSerializer"/>.</remarks>
-    public class CoreExOneOffTestSetUp : OneOffTestSetUpBase
-    {
-        private static bool _loaded;
-
-        /// <inheritdoc/>
-        public override void SetUp()
-        {
-            if (_loaded)
-                return;
-
-            _loaded = true;
-            TestSetUp.Extensions.Add(new CoreExExtension());
-            TestSetUp.Default.JsonSerializer = new CoreEx.Text.Json.JsonSerializer().ToUnitTestEx();
-
-            // Extend the AssertErrors functionality to support ValidationException.
-            AssertorBase.AddAssertErrorsExtension((assertor, errors) =>
-            {
-                if (assertor.Exception is ValidationException vex)
-                {
-                    var actual = vex.Messages?.Where(x => x.Type == MessageType.Error).Select(x => new ApiError(x.Property, x.Text ?? string.Empty)).ToArray() ?? [];
-                    if (!Assertor.TryAreErrorsMatched(errors, actual, out var errorMessage))
-                        assertor.Owner.Implementor.AssertFail(errorMessage);
-
-                    return true;
-                }
-
-                return false;
-            });
-        }
-
-        /// <summary>
-        /// Forces the one-off test set-up to occur.
-        /// </summary>
-        public static void ForceSetUp() => new CoreExOneOffTestSetUp().SetUp();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/AspNetCore/AgentTester.cs b/src/CoreEx.UnitTesting/AspNetCore/AgentTester.cs
deleted file mode 100644
index ed3b1027..00000000
--- a/src/CoreEx.UnitTesting/AspNetCore/AgentTester.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx.Abstractions;
-using UnitTestEx.Assertors;
-using Ceh = CoreEx.Http;
-
-namespace UnitTestEx.AspNetCore
-{
-    /// <summary>
-    /// Provides <b>HTTP Agent</b> <see cref="Ceh.TypedHttpClientBase"/> testing.
-    /// </summary>
-    /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
-    /// <param name="testServer">The <see cref="TestServer"/>.</param>
-    public class AgentTester<TAgent>(TesterBase owner, TestServer testServer) : HttpTesterBase<AgentTester<TAgent>>(owner, testServer) where TAgent : Ceh.TypedHttpClientBase
-    {
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResultAssertor"/>.</returns>
-        public HttpResultAssertor Run(Func<TAgent, Task<Ceh.HttpResult>> func) => RunAsync(func).GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResultAssertor"/>.</returns>
-        public HttpResultAssertor<TValue> Run<TValue>(Func<TAgent, Task<Ceh.HttpResult<TValue>>> func) => RunAsync(func).GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResponseMessageAssertor"/>.</returns>
-        public HttpResponseMessageAssertor Run(Func<TAgent, Task<HttpResponseMessage>> func) => RunAsync(func).GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResultAssertor"/>.</returns>
-        public async Task<HttpResultAssertor> RunAsync(Func<TAgent, Task<Ceh.HttpResult>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-
-            using var scope = this.CreateClientScope<TAgent>();
-            var agent = scope.ServiceProvider.GetRequiredService<TAgent>();
-            var res = await func(agent).ConfigureAwait(false);
-
-            await Task.Delay(TestSetUp.TaskDelayMilliseconds).ConfigureAwait(false);
-
-            var result = res.ToResult();
-            await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateArgs(LastLogs, result.IsFailure ? result.Error : null).AddExtra(res.Response)).ConfigureAwait(false);
-
-            return new HttpResultAssertor(Owner, res);
-        }
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResultAssertor"/>.</returns>
-        public async Task<HttpResultAssertor<TValue>> RunAsync<TValue>(Func<TAgent, Task<Ceh.HttpResult<TValue>>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-
-            using var scope = this.CreateClientScope<TAgent>();
-            var agent = scope.ServiceProvider.GetRequiredService<TAgent>();
-            var res = await func(agent).ConfigureAwait(false);
-
-            await Task.Delay(TestSetUp.TaskDelayMilliseconds).ConfigureAwait(false);
-
-            var result = res.ToResult();
-            if (res.IsSuccess)
-                await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateValueArgs(LastLogs, result.Value).AddExtra(res.Response)).ConfigureAwait(false);
-            else
-                await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateArgs(LastLogs, result.Error).AddExtra(res.Response)).ConfigureAwait(false);
-
-            return res.IsSuccess ? new HttpResultAssertor<TValue>(Owner, res.Value, res) : new HttpResultAssertor<TValue>(Owner, res);
-        }
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResponseMessageAssertor"/>.</returns>
-        public async Task<HttpResponseMessageAssertor> RunAsync(Func<TAgent, Task<HttpResponseMessage>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-
-            using var scope = this.CreateClientScope<TAgent>();
-            var agent = scope.ServiceProvider.GetRequiredService<TAgent>();
-            var res = await func(agent).ConfigureAwait(false);
-
-            await Task.Delay(TestSetUp.TaskDelayMilliseconds).ConfigureAwait(false);
-            await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateArgs(LastLogs).AddExtra(res)).ConfigureAwait(false);
-
-            return new HttpResponseMessageAssertor(Owner, res);
-        }
-        /// <summary>
-        /// Perform the assertion of any expectations.
-        /// </summary>
-        /// <param name="res">The <see cref="HttpResponseMessage"/>/</param>
-        protected override Task AssertExpectationsAsync(HttpResponseMessage res) => throw new NotImplementedException("This is performed internally; and therefore should not be invoked.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/AspNetCore/AgentTesterT.cs b/src/CoreEx.UnitTesting/AspNetCore/AgentTesterT.cs
deleted file mode 100644
index 09507cb0..00000000
--- a/src/CoreEx.UnitTesting/AspNetCore/AgentTesterT.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Http;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx.Abstractions;
-using UnitTestEx.Assertors;
-
-namespace UnitTestEx.AspNetCore
-{
-    /// <summary>
-    /// Provides <b>HTTP Agent</b> <see cref="TypedHttpClientBase"/> testing.
-    /// </summary>
-    /// <typeparam name="TAgent">The Agent (inherits from <see cref="TypedHttpClientBase"/>) <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TValue">The response value <see cref="Type"/>.</typeparam>
-    /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
-    /// <param name="testServer">The <see cref="TestServer"/>.</param>
-    public class AgentTester<TAgent, TValue>(TesterBase owner, TestServer testServer) : HttpTesterBase<TValue, AgentTester<TAgent, TValue>>(owner, testServer) where TAgent : TypedHttpClientBase
-    {
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResultAssertor{TValue}"/>.</returns>
-        public HttpResultAssertor<TValue> Run(Func<TAgent, Task<HttpResult<TValue>>> func) => RunAsync(func).GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResponseMessageAssertor{TValue}"/>.</returns>
-        public HttpResponseMessageAssertor<TValue> Run(Func<TAgent, Task<HttpResponseMessage>> func) => RunAsync(func).GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResultAssertor{TValue}"/>.</returns>
-        public async Task<HttpResultAssertor<TValue>> RunAsync(Func<TAgent, Task<HttpResult<TValue>>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-
-            using var scope = this.CreateClientScope<TAgent>();
-            var agent = scope.ServiceProvider.GetRequiredService<TAgent>();
-            var res = await func(agent).ConfigureAwait(false);
-
-            await Task.Delay(TestSetUp.TaskDelayMilliseconds).ConfigureAwait(false);
-
-            var result = res.ToResult();
-            if (res.IsSuccess)
-                await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateValueArgs(LastLogs, result.Value).AddExtra(res.Response)).ConfigureAwait(false);
-            else
-                await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateArgs(LastLogs, result.Error).AddExtra(res.Response)).ConfigureAwait(false);
-
-            return res.IsSuccess ? new HttpResultAssertor<TValue>(Owner, res.Value, res) : new HttpResultAssertor<TValue>(Owner, res);
-        }
-
-        /// <summary>
-        /// Runs the test by executing a <typeparamref name="TAgent"/> method.
-        /// </summary>
-        /// <param name="func">The function to execution.</param>
-        /// <returns>An <see cref="HttpResponseMessageAssertor{TValue}"/>.</returns>
-        public async Task<HttpResponseMessageAssertor<TValue>> RunAsync(Func<TAgent, Task<HttpResponseMessage>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-
-            using var scope = this.CreateClientScope<TAgent>();
-            var agent = scope.ServiceProvider.GetRequiredService<TAgent>();
-            var res = await func(agent).ConfigureAwait(false);
-
-            await Task.Delay(TestSetUp.TaskDelayMilliseconds).ConfigureAwait(false);
-            await ExpectationsArranger.AssertAsync(ExpectationsArranger.CreateArgs(LastLogs).AddExtra(res)).ConfigureAwait(false);
-
-            return new HttpResponseMessageAssertor<TValue>(Owner, res);
-        }
-
-        /// <summary>
-        /// Perform the assertion of any expectations.
-        /// </summary>
-        /// <param name="res">The <see cref="HttpResponseMessage"/>/</param>
-        protected override Task AssertExpectationsAsync(HttpResponseMessage res) => throw new NotImplementedException("This is performed internally; and therefore should not be invoked.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Assertors/HttpResultAssertor.cs b/src/CoreEx.UnitTesting/Assertors/HttpResultAssertor.cs
deleted file mode 100644
index 1db30345..00000000
--- a/src/CoreEx.UnitTesting/Assertors/HttpResultAssertor.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Http;
-using UnitTestEx.Abstractions;
-
-namespace UnitTestEx.Assertors
-{
-    /// <summary>
-    /// Represents the <see cref="HttpResult"/> test assert helper.
-    /// </summary>
-    /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
-    /// <param name="result">The <see cref="HttpResult"/>.</param>
-    public class HttpResultAssertor(TesterBase owner, HttpResult result) : HttpResponseMessageAssertor(owner, result.ThrowIfNull(nameof(result)).Response)
-    {
-        /// <summary>
-        /// Gets the <see cref="HttpResult"/>.
-        /// </summary>
-        public HttpResult Result { get; private set; } = result;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Assertors/HttpResultAssertorT.cs b/src/CoreEx.UnitTesting/Assertors/HttpResultAssertorT.cs
deleted file mode 100644
index 330f073d..00000000
--- a/src/CoreEx.UnitTesting/Assertors/HttpResultAssertorT.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Http;
-using System;
-using UnitTestEx.Abstractions;
-
-namespace UnitTestEx.Assertors
-{
-    /// <summary>
-    /// Represents the <see cref="HttpResult{TValue}"/> test assert helper with a specified result <typeparamref name="TValue"/> <see cref="Type"/>.
-    /// </summary>
-    /// 
-    public class HttpResultAssertor<TValue> : HttpResponseMessageAssertor<TValue>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResultAssertor"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
-        /// <param name="result">The <see cref="HttpResult"/>.</param>
-        public HttpResultAssertor(TesterBase owner, HttpResult<TValue> result) : base(owner, result.ThrowIfNull(nameof(result)).Response) => Result = result;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResultAssertor"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
-        /// <param name="value">The value already deserialized.</param>
-        /// <param name="result"></param>
-        public HttpResultAssertor(TesterBase owner, TValue value, HttpResult<TValue> result) : base(owner, value, result.ThrowIfNull(nameof(result)).Response) => Result = result;
-
-        /// <summary>
-        /// Gets the <see cref="HttpResult{TValue}"/>.
-        /// </summary>
-        public HttpResult<TValue> Result { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/CoreEx.UnitTesting.csproj b/src/CoreEx.UnitTesting/CoreEx.UnitTesting.csproj
index c4578e96..df931210 100644
--- a/src/CoreEx.UnitTesting/CoreEx.UnitTesting.csproj
+++ b/src/CoreEx.UnitTesting/CoreEx.UnitTesting.csproj
@@ -1,24 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
-    <RootNamespace>UnitTestEx</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx UnitTesting extras.</Title>
-    <Description>CoreEx UnitTesting (UnitTestEx) extras.</Description>
-    <PackageTags>coreex unittest unit-test test unittestex</PackageTags>
+    <Title>CoreEx .NET Unit Testing extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the testing of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data unit-testing integration-testing intra-domain inter-domain mocking mstest xunit nunit unittestex json-data</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
   <ItemGroup>
-    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\CoreEx.Azure\CoreEx.Azure.csproj" />
+    <PackageReference Include="DbEx.Postgres" />
+    <PackageReference Include="DbEx.SqlServer" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="UnitTestEx" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="UnitTestEx" Version="5.3.0" />
+    <ProjectReference Include="..\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+    <ProjectReference Include="..\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+    <ProjectReference Include="..\CoreEx.Database.Postgres\CoreEx.Database.Postgres.csproj" />
+    <ProjectReference Include="..\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
+    <ProjectReference Include="..\CoreEx.Events\CoreEx.Events.csproj" />
+    <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Data/JsonDataReader.cs b/src/CoreEx.UnitTesting/Data/JsonDataReader.cs
new file mode 100644
index 00000000..d74a20a8
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Data/JsonDataReader.cs
@@ -0,0 +1,434 @@
+namespace CoreEx.UnitTesting.Data;
+
+/// <summary>
+/// Provides a hierarchical mutating reader for JSON or YAML data with dynamic property substitution support using the venerable <see cref="JsonNode"/>.
+/// </summary>
+/// <remarks>This is <i>not</i> intended for high-volume or high-performance use; more for the likes of basic dynamic data seeding scenarios in unit tests.</remarks>
+public sealed partial class JsonDataReader
+{
+    private static readonly Regex _regex = EmbeddedDynamicParametersRegex();
+
+    private readonly JsonNode _rootNode;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonDataReader"/> class.
+    /// </summary>
+    private JsonDataReader(JsonNode root, JsonDataReaderOptions? options)
+    {
+        _rootNode = root.ThrowIfNull().ThrowWhen(root => root is not JsonObject, "JSON root node must be a JsonObject.");
+        Options = options ?? new JsonDataReaderOptions();
+    }
+
+    /// <summary>
+    /// Gets the <see cref="JsonDataReaderOptions"/>.
+    /// </summary>
+    public JsonDataReaderOptions Options { get; }
+
+    /// <summary>
+    /// Gets the root <see cref="JsonNode"/>.
+    /// </summary>
+    public JsonNode RootNode => _rootNode;
+
+    /// <summary>
+    /// Tries to get the <see cref="JsonNode"/> for the specified <paramref name="path"/>.
+    /// </summary>
+    /// <param name="path">The qualified path to support child navigation.</param>
+    /// <param name="jsonNode">The <see cref="JsonNode"/> found.</param>
+    /// <returns><see langword="true"/> indicates found; otherwise, false.</returns>
+    public bool TryGetPath(string path, out JsonNode? jsonNode)
+    {
+        jsonNode = JsonFilter.GetMatched(_rootNode.DeepClone(), path);
+        return jsonNode is not null;
+    }
+
+    /// <summary>
+    /// Tries to create the <see cref="JsonNode"/> replacing any dynamic parameters for the specified <paramref name="path"/>.
+    /// </summary>
+    /// <param name="path">The qualified path to support child navigation.</param>
+    /// <param name="jsonNode">The resulting <see cref="JsonNode"/> with all dynamic parameters replaced where possible.</param>
+    /// <returns><see langword="true"/> indicates created; otherwise, false.</returns>
+    public bool TryCreateData(string path, [NotNullWhen(true)] out JsonNode? jsonNode)
+    {
+        jsonNode = null;
+
+        if (!TryGetPath(path, out var jn))
+            return false;
+
+        jsonNode = CopyAndReplace(jn, new JsonDataReaderArgs(Options.Parameters) { Root = jn, CurrentPropertyName = null, CurrentNode = null, Properties = Options.Properties, ApplyProperties = true });
+        return jsonNode is not null;
+    }
+
+    /// <summary>
+    /// Copies the JSON and replaces any dynamic parameters.
+    /// </summary>
+    private JsonNode? CopyAndReplace(JsonNode? jn, JsonDataReaderArgs args)
+    {
+        if (jn is null)
+            return null;
+
+        switch (jn)
+        {
+            case JsonArray ja:
+                var newArray = new JsonArray();
+                for (int i = 0; i < ja.Count; i++)
+                {
+                    var item = ja[i];
+                    var newItem = CopyAndReplace(item, new JsonDataReaderArgs(args.Parameters) { Root = args.Root, CurrentPropertyName = null, CurrentNode = null, Index = i, Properties = args.Properties, ApplyProperties = args.ApplyProperties });
+                    newArray.Add(newItem);
+                }
+
+                return newArray;
+
+            case JsonObject jo:
+                if (args.ApplyProperties)
+                    Options.RootNodePreProcessor?.Invoke(new JsonDataReaderArgs(args.Parameters) { Root = args.Root, CurrentPropertyName = args.CurrentPropertyName, CurrentNode = jo, Properties = args.Properties, Index = args.Index });
+
+                var newObject = new JsonObject();
+                foreach (var kvp in jo)
+                {
+                    var newValue = CopyAndReplace(kvp.Value, new JsonDataReaderArgs(args.Parameters) { Root = args.Root, CurrentPropertyName = kvp.Key, CurrentNode = kvp.Value, Properties = args.Properties, Index = args.Index });
+                    newObject[kvp.Key] = newValue;
+                }
+
+                if (args.ApplyProperties && Options.Properties.Count > 0)
+                    ApplyPropertiesWhereNotFound(jo, newObject, new JsonDataReaderArgs(args.Parameters) { Root = args.Root, CurrentPropertyName = null, CurrentNode = null, Properties = args.Properties, Index = args.Index });
+
+                args.ApplyProperties = false;
+                return newObject;
+
+            case JsonValue jv:
+                return ReplaceDynamicParameter(jv, args);
+
+            default:
+                return jn.DeepClone();
+        }
+    }
+
+    /// <summary>
+    /// Apply properties where not found in the source JSON.
+    /// </summary>
+    private void ApplyPropertiesWhereNotFound(JsonObject sourceObject, JsonObject targetObject, JsonDataReaderArgs args)
+    {
+        // Apply the args properties first.
+        if (args.Properties is not null)
+        {
+            foreach (var ap in args.Properties)
+            {
+                if (sourceObject.ContainsKey(ap.Key))
+                    continue;
+
+                object? val = ap.Value;
+                if (ap.Value is string str && !string.IsNullOrEmpty(str) && str.Length > 1 && str[0] == '^')
+                {
+                    if (TryGetDynamicValue(str[1..], args, out var v))
+                        val = v;
+                }
+
+                if (val is not null)
+                    targetObject[ap.Key] = CreateJsonValue(val);
+            }
+        }
+
+        // Apply the options properties second.
+        foreach (var p in Options.Properties)
+        {
+            if (sourceObject.ContainsKey(p.Key) || (args.Properties is not null && args.Properties.ContainsKey(p.Key)))
+                continue;
+
+            object? val = p.Value;
+            if (p.Value is string str && !string.IsNullOrEmpty(str) && str.Length > 1 && str[0] == '^')
+            {
+                if (TryGetDynamicValue(str[1..], args, out var v))
+                    val = v;
+            }
+
+            if (val is not null)
+                targetObject[p.Key] = CreateJsonValue(val);
+        }
+    }
+
+    /// <summary>
+    /// Replace any '^xxx' dynamic placeholders.
+    /// </summary>
+    private static JsonNode? ReplaceDynamicParameter(JsonValue jv, JsonDataReaderArgs args)
+    {
+        if (jv.GetValueKind() != JsonValueKind.String)
+            return jv.DeepClone();
+
+        var str = jv.GetValue<string>();
+        if (!string.IsNullOrEmpty(str) && str.Length > 1 && str[0] == '^')
+        {
+            if (TryGetDynamicValue(str[1..], args, out var val))
+            {
+                if (val is string str2 && str2 is not null && ReplaceEmbeddedDynamicParameters(ref str2!, args))
+                    val = str2;
+
+                return CreateJsonValue(val);
+            }
+        }
+
+        if (ReplaceEmbeddedDynamicParameters(jv, args, out var replacedNode))
+            return replacedNode;
+
+        return jv.DeepClone();
+    }
+
+    /// <summary>
+    /// Replace any embedded '(^xxx)' dynamic placeholders.
+    /// </summary>
+    private static bool ReplaceEmbeddedDynamicParameters(JsonValue jv, JsonDataReaderArgs args, out JsonNode? result)
+    {
+        result = null;
+
+        if (jv.TryGetValue<string>(out var str))
+        {
+            if (ReplaceEmbeddedDynamicParameters(ref str, args))
+            {
+                result = CreateJsonValue(str);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Replace any embedded '(^xxx)' dynamic placeholders.
+    /// </summary>
+    private static bool ReplaceEmbeddedDynamicParameters(ref string? str, JsonDataReaderArgs args)
+    {
+        if (string.IsNullOrEmpty(str))
+            return false;
+
+        var sb = new StringBuilder();
+        int i = 0;
+        foreach (var match in _regex.EnumerateMatches(str))
+        {
+            sb.Append(str.AsSpan(i, match.Index - i));
+            var key = str.Substring(match.Index, match.Length);
+            if (TryGetDynamicValue(key[2..^1], args, out var val))
+            {
+                var str2 = val?.ToString();
+                ReplaceEmbeddedDynamicParameters(ref str2, args);
+                sb.Append(str2);
+            }
+            else
+                sb.Append(key);
+
+            i = match.Index + match.Length;
+        }
+
+        if (sb.Length == 0)
+            return false;
+
+        sb.Append(str.AsSpan(i, str.Length - i));
+        str = sb.ToString();
+        return true;
+    }
+
+    /// <summary>
+    /// Tries to get the dynamic value.
+    /// </summary>
+    private static bool TryGetDynamicValue(string key, JsonDataReaderArgs args, out object? value)
+    {
+        if (args.Parameters.TryGetValue(key, out var func))
+        {
+            value = func(args);
+            if (value is string str && str is not null && ReplaceEmbeddedDynamicParameters(ref str!, args))
+                value = str;
+
+            return true;
+        }
+        else if (int.TryParse(key, out var i))
+        {
+            value = new Guid(i, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+            return true;
+        }
+
+        value = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Creates a <see cref="JsonValue"/> from a .NET value.
+    /// </summary>
+    private static JsonValue? CreateJsonValue(object? val)
+    {
+        if (val is null)
+            return null;
+
+        return val switch
+        {
+            string sv => JsonValue.Create(sv),
+            Guid gv => JsonValue.Create(gv),
+            DateTime dv => JsonValue.Create(dv),
+            DateTimeOffset ov => JsonValue.Create(ov),
+            DateOnly dv => JsonValue.Create(dv.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)),
+            TimeOnly tv => JsonValue.Create(tv.ToString("HH:mm:ss.FFFFFFF", System.Globalization.CultureInfo.InvariantCulture)),
+            bool bv => JsonValue.Create(bv),
+            short nsv => JsonValue.Create(nsv),
+            int niv => JsonValue.Create(niv),
+            long nlv => JsonValue.Create(nlv),
+            ushort nusv => JsonValue.Create(nusv),
+            uint nuiv => JsonValue.Create(nuiv),
+            ulong nulv => JsonValue.Create(nulv),
+            decimal ndv => JsonValue.Create(ndv),
+            double n2v => JsonValue.Create(n2v),
+            float nfv => JsonValue.Create(nfv),
+            _ => JsonValue.Create(val.ToString())
+        };
+    }
+
+    /// <summary>
+    /// Tries to create a new <see cref="JsonNode"/> replacing any dynamic parameters for the specified <paramref name="path"/> and deserializes to the specified <typeparamref name="T"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to deserialize to.</typeparam>
+    /// <param name="path">The qualified path to support child navigation.</param>
+    /// <param name="options">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The deserialized value where found; otherwise, <see langword="default"/>.</returns>
+    /// <remarks>Where specifying the <paramref name="options"/> then the <see cref="JsonSerializerOptions.PropertyNamingPolicy"/> should be aligned with the <see cref="JsonDataReaderOptions.NamingConvention"/>.
+    /// Where not specified (i.e. <see langword="null"/>), then the <see cref="JsonDataReaderOptions.NamingConvention"/> will automatically be used.</remarks>
+    public T? Deserialize<T>(string path, JsonSerializerOptions? options = null)
+    {
+        if (!TryCreateData(path, out var jsonNode))
+            return default;
+
+        if (options is null)
+        {
+            if (Options.SerializerOptions is not null)
+                options = Options.SerializerOptions;
+            else
+                options = new JsonSerializerOptions(JsonDefaults.SerializerOptions)
+                {
+                    PropertyNamingPolicy = Options.NamingConvention switch
+                    {
+                        JsonPropertyNamingConvention.CamelCase => JsonNamingPolicy.CamelCase,
+                        JsonPropertyNamingConvention.SnakeCase => JsonNamingPolicy.SnakeCaseLower,
+                        JsonPropertyNamingConvention.KebabCase => JsonNamingPolicy.KebabCaseLower,
+                        _ => null
+                    }
+                };
+        }
+
+        return JsonSerializer.Deserialize<T>(jsonNode, options);
+    }
+
+    #region ParseYaml+Json
+
+    /// <summary>
+    /// Reads and parses the YAML from the named embedded resource <see cref="Stream"/> within the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="System.Reflection.Assembly"/> to find manifest resources (see <see cref="System.Reflection.Assembly.GetManifestResourceStream(string)"/>).</typeparam>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseYaml<TResource>(string resourceName, JsonDataReaderOptions? options = null) => ParseYaml(CoreEx.Abstractions.Resource.GetStream<TResource>(resourceName), options);
+
+    /// <summary>
+    /// Reads and parses the YAML <see cref="string"/>.
+    /// </summary>
+    /// <param name="yaml">The YAML <see cref="string"/>.</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseYaml(string yaml, JsonDataReaderOptions? options = null)
+    {
+        using var sr = new StringReader(yaml);
+        return ParseYaml(sr, options);
+    }
+
+    /// <summary>
+    /// Reads and parses the YAML <see cref="Stream"/>.
+    /// </summary>
+    /// <param name="s">The YAML <see cref="Stream"/>.</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseYaml(Stream s, JsonDataReaderOptions? options = null) => ParseYaml(new StreamReader(s), options);
+
+    /// <summary>
+    /// Reads and parses the YAML <see cref="TextReader"/>.
+    /// </summary>
+    /// <param name="tr">The YAML <see cref="TextReader"/>.</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseYaml(TextReader tr, JsonDataReaderOptions? options = null)
+    {
+        var yaml = new DeserializerBuilder().WithNodeTypeResolver(new YamlNodeTypeResolver()).Build().Deserialize(tr);
+        var json = new SerializerBuilder().JsonCompatible().Build().Serialize(yaml!);
+        return new(JsonNode.Parse(json) ?? throw new InvalidOperationException("JsonNode.Parse resulted in a null."), options);
+    }
+
+    /// <summary>
+    /// Reads and parses the JSON from the named embedded resource <see cref="Stream"/> within the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="System.Reflection.Assembly"/> to find manifest resources (see <see cref="System.Reflection.Assembly.GetManifestResourceStream(string)"/>).</typeparam>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseJson<TResource>(string resourceName, JsonDataReaderOptions? options = null) => ParseJson(CoreEx.Abstractions.Resource.GetStream<TResource>(resourceName), options);
+
+    /// <summary>
+    /// Reads and parses the JSON <see cref="string"/>.
+    /// </summary>
+    /// <param name="json">The JSON <see cref="string"/>.</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseJson([StringSyntax(StringSyntaxAttribute.Json)] string json, JsonDataReaderOptions? options = null)
+        => new(JsonNode.Parse(json) ?? throw new InvalidOperationException("JsonNode.Parse resulted in a null."), options);
+
+    /// <summary>
+    /// Reads and parses the JSON <see cref="Stream"/>.
+    /// </summary>
+    /// <param name="s">The JSON <see cref="Stream"/>.</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseJson(Stream s, JsonDataReaderOptions? options = null) => new(JsonNode.Parse(s) ?? throw new InvalidOperationException("JsonNode.Parse resulted in a null."), options);
+
+    /// <summary>
+    /// Reads and parses the <see cref="JsonNode"/>.
+    /// </summary>
+    /// <param name="jsonNode">The <see cref="JsonNode"/>.</param>
+    /// <param name="options">The optional <see cref="JsonDataReaderOptions"/>.</param>
+    /// <returns>The <see cref="JsonDataReader"/>.</returns>
+    public static JsonDataReader ParseJson(JsonNode jsonNode, JsonDataReaderOptions? options = null) => new(jsonNode, options);
+
+    #endregion
+
+    /// <summary>
+    /// A custom <see cref="INodeTypeResolver"/> to support the YAML to JSON conversion of boolean and number types.
+    /// </summary>
+    private sealed class YamlNodeTypeResolver : INodeTypeResolver
+    {
+        private static readonly string[] boolValues = ["true", "false"];
+
+        /// <inheritdoc/>
+        bool INodeTypeResolver.Resolve(NodeEvent? nodeEvent, ref Type currentType)
+        {
+            if (nodeEvent is Scalar scalar && scalar.Style == YamlDotNet.Core.ScalarStyle.Plain)
+            {
+                if (decimal.TryParse(scalar.Value, out _))
+                {
+                    if (scalar.Value.Length > 1 && scalar.Value.StartsWith('0')) // Valid JSON does not support a number that starts with a zero.
+                        currentType = typeof(string);
+                    else
+                        currentType = typeof(decimal);
+
+                    return true;
+                }
+
+                if (boolValues.Contains(scalar.Value))
+                {
+                    currentType = typeof(bool);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Provides the generated <see cref="Regex"/> for <see cref="ReplaceEmbeddedDynamicParameters(ref string?, JsonDataReaderArgs)"/>.
+    /// </summary>
+    [GeneratedRegex(@"\(\^(.*?)\)", RegexOptions.Compiled)]
+    private static partial Regex EmbeddedDynamicParametersRegex();
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Data/JsonDataReaderArgs.cs b/src/CoreEx.UnitTesting/Data/JsonDataReaderArgs.cs
new file mode 100644
index 00000000..fde4675c
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Data/JsonDataReaderArgs.cs
@@ -0,0 +1,44 @@
+namespace CoreEx.UnitTesting.Data;
+
+/// <summary>
+/// Provides the runtime arguments for the <see cref="JsonDataReader"/>.
+/// </summary>
+/// <remarks>The dynamic runtime parameters and their corresponding functions.</remarks>
+public sealed class JsonDataReaderArgs(IDictionary<string, Func<JsonDataReaderArgs, object?>> parameters)
+{
+    /// <summary>
+    /// Gets the originating <see cref="JsonNode"/> that represents the root for the data.
+    /// </summary>
+    public JsonNode? Root { get; init; }
+
+    /// <summary>
+    /// Gets the current source property name.
+    /// </summary>
+    /// <remarks>Where the <see cref="CurrentPropertyName"/> is <see langword="null"/> this indicates that no source property is available; i.e. adding new <see cref="Properties"/>.</remarks>
+    public string? CurrentPropertyName { get; internal set; }
+
+    /// <summary>
+    /// Gets the current source <see cref="JsonNode"/> value.
+    /// </summary>
+    public JsonNode? CurrentNode { get; internal set; }
+
+    /// <summary>
+    /// Gets the current array index where the <see cref="CurrentNode"/> is an element within a <see cref="JsonArray"/>; otherwise, <see langword="null"/>.
+    /// </summary>
+    public int? Index { get; internal set; }
+
+    /// <summary>
+    /// Gets the standard properties that are required for each resulting <see cref="JsonObject"/>.
+    /// </summary>
+    public IDictionary<string, object?>? Properties { get; internal set; }
+
+    /// <summary>
+    /// Gets the dynamic runtime parameters and their corresponding functions.
+    /// </summary>
+    public IDictionary<string, Func<JsonDataReaderArgs, object?>> Parameters { get; } = parameters;
+
+    /// <summary>
+    /// Indicates whether the <see cref="Properties"/> and <see cref="JsonDataReaderOptions.Properties"/> must be applied.
+    /// </summary>
+    internal bool ApplyProperties { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Data/JsonDataReaderOptions.cs b/src/CoreEx.UnitTesting/Data/JsonDataReaderOptions.cs
new file mode 100644
index 00000000..3d736193
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Data/JsonDataReaderOptions.cs
@@ -0,0 +1,157 @@
+namespace CoreEx.UnitTesting.Data;
+
+/// <summary>
+/// Provides options for the <see cref="JsonDataReader"/>.
+/// </summary>
+/// <remarks>The following <see cref="Parameters"/> (note the snake_case convention) are configured out-of-the-box:
+/// <list type="bullet">
+/// <item><description>'<c>id</c>' - Generates a new identifier using <see cref="Runtime.NewId"/>.</description></item>
+/// <item><description>'<c>guid</c>' - Generates a new GUID using <see cref="Runtime.NewGuid"/>.</description></item>
+/// <item><description>'<c>now</c>' - Gets the current UTC <see cref="DateTimeOffset"/> using <see cref="Runtime.UtcNow"/>.</description></item>
+/// <item><description>'<c>tomorrow</c>' - Gets the UTC <see cref="DateTimeOffset"/> for tomorrow using <see cref="Runtime.UtcNow"/> plus 1 day.</description></item>
+/// <item><description>'<c>yesterday</c>' - Gets the UTC <see cref="DateTimeOffset"/> for yesterday using <see cref="Runtime.UtcNow"/> minus 1 day.</description></item>
+/// <item><description>'<c>tenant_id</c>' - Gets the current <see cref="ExecutionContext.TenantId"/>.</description></item>
+/// <item><description>'<c>user_id</c>' - Gets the current <see cref="ExecutionContext.User"/> <see cref="Security.AuthenticationUser.Id"/>.</description></item>
+/// <item><description>'<c>user_name</c>' - Gets the current <see cref="ExecutionContext.User"/> <see cref="Security.AuthenticationUser.UserName"/>.</description></item>
+/// <item><description>'<c>index</c>' - Gets the current array index where the <see cref="JsonDataReaderArgs.CurrentNode"/> is an element within a <see cref="JsonArray"/>; otherwise, zero.</description></item>
+/// </list>
+/// </remarks>
+public class JsonDataReaderOptions
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonDataReaderOptions"/> class.
+    /// </summary>
+    /// <param name="namingConvention">The JSON property naming convention used by the <see cref="JsonDataReader"/>; defaults to <see cref="JsonPropertyNamingConvention.PascalCase"/>.</param>
+    public JsonDataReaderOptions(JsonPropertyNamingConvention namingConvention = JsonPropertyNamingConvention.PascalCase)
+    {
+        NamingConvention = namingConvention;
+        Parameters = new(StringComparer.OrdinalIgnoreCase)
+        {
+            { "id", _ => Runtime.NewId() },
+            { "guid", _ => Runtime.NewGuid() },
+            { "now", _ => Runtime.UtcNow },
+            { "tomorrow", _ => Runtime.UtcNow.AddDays(1) },
+            { "yesterday", _ => Runtime.UtcNow.AddDays(-1) },
+            { "tenant_id", _ => ExecutionContext.TryGetCurrent(out var ec) ? ec.TenantId : TenantId },
+            { "user_id", _ => ExecutionContext.TryGetCurrent(out var ec) && ec.User is not null ? ec.User.Id : AuthenticationUser.EnvironmentUser.Id },
+            { "user_name", _ => ExecutionContext.TryGetCurrent(out var ec) && ec.User is not null ? ec.User.UserName : AuthenticationUser.EnvironmentUser.UserName },
+            { "index", args => args?.Index ?? 0 }
+        };
+    }
+
+    /// <summary>
+    /// Gets the JSON property naming convention.
+    /// </summary>
+    public JsonPropertyNamingConvention NamingConvention { get; }
+
+    /// <summary>
+    /// Gets or sets the optional <see cref="JsonSerializerOptions"/> to be used by the <see cref="JsonDataReader"/>.
+    /// </summary>
+    /// <remarks>Where specifying then the <see cref="JsonSerializerOptions.PropertyNamingPolicy"/> should be aligned with the <see cref="NamingConvention"/></remarks>
+    public JsonSerializerOptions? SerializerOptions { get; set; }
+
+    /// <summary>
+    /// Gets the dynamic runtime parameters and their corresponding functions.
+    /// </summary>
+    public Dictionary<string, Func<JsonDataReaderArgs, object?>> Parameters { get; }
+
+    /// <summary>
+    /// Gets the properties that will be applied to the root-most <see cref="JsonObject"/> where not already present.
+    /// </summary>
+    /// <remarks>Root-most means the top-level JSON object in the hierarchy; i.e. if the root is a JSON array, then the direct child objects would be considered root-most.</remarks>
+    public Dictionary<string, object?> Properties { get; } = [];
+
+    /// <summary>
+    /// Gets or sets the default <see cref="IReadOnlyTenantId.TenantId"/> where it can not be obtained from the current <see cref="ExecutionContext"/>.
+    /// </summary>
+    public string? TenantId { get; set; }
+
+    /// <summary>
+    /// Gets or sets a delegate that is invoked for each root-most <see cref="JsonObject"/> to allow pre-processing.
+    /// </summary>
+    /// <remarks>This can be used to customize processing of the root-most node (see <see cref="JsonDataReaderArgs.CurrentNode"/>) prior to further processing, such as adding or modifying properties, etc. Once complete, then the standard substitution and property application occurs.
+    /// <para>Root-most means the top-level JSON object in the hierarchy; i.e. if the root is a JSON array, then the direct child objects would be considered root-most.</para></remarks>
+    public Action<JsonDataReaderArgs>? RootNodePreProcessor { get; set; }
+
+    /// <summary>
+    /// Adds standard properties to the root <see cref="JsonObject"/> where not already present.
+    /// </summary>
+    /// <returns>The <see cref="JsonDataReaderOptions"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The following standard properties (converted based on the <see cref="NamingConvention"/>) are included:
+    /// <list type="bullet">
+    /// <item><description>'<c>CreatedOn</c>' - Set to '<c>^now</c>'.</description></item>
+    /// <item><description>'<c>CreatedBy</c>' - Set to '<c>^user_name</c>'.</description></item>
+    /// <item><description>'<c>TenantId</c>' - Set to '<c>^tenant_id</c>'.</description></item>
+    /// </list>
+    /// </remarks>
+    public JsonDataReaderOptions AddStandardProperties()
+    {
+        Properties.TryAdd(ConvertPropertyName(nameof(ChangeLog.CreatedOn)), "^now");
+        Properties.TryAdd(ConvertPropertyName(nameof(ChangeLog.CreatedBy)), "^user_name");
+        Properties.TryAdd(ConvertPropertyName(nameof(TenantId)), "^tenant_id");
+        return this;
+    }
+
+    /// <summary>
+    /// Creates a <see cref="JsonDataReaderOptions"/> instance configured for reference data.
+    /// </summary>
+    /// <param name="namingConvention">The JSON property naming convention used by the <see cref="JsonDataReader"/>; defaults to <see cref="JsonPropertyNamingConvention.PascalCase"/>.</param>
+    /// <param name="idGenerator">An optional function to generate the <see cref="RefData.Abstractions.IReferenceData"/> <see cref="IIdentifier.Id"/>.</param>
+    /// <returns>The <see cref="JsonDataReaderOptions"/>.</returns>
+    /// <remarks>This method will configure the <see cref="RootNodePreProcessor"/> to convert a single key/value pair into '<c>code</c>' and '<c>text</c>' properties by convention.
+    /// <para>The following additional <see cref="Properties"/> are included in addition to the <see cref="AddStandardProperties"/>:
+    /// <list type="bullet">
+    /// <item><description>'<c>id</c>' - Uses the <paramref name="idGenerator"/> where provided; otherwise, '<c>^id</c>'.</description></item>
+    /// <item><description>'<c>isActive</c>' - Set to <see langword="true"/>.</description></item>
+    /// <item><description>'<c>sortOrder</c>' - Uses the current array index where the <see cref="JsonDataReaderArgs.CurrentNode"/> is an element within a <see cref="JsonArray"/>; otherwise, zero.</description></item>
+    /// </list>
+    /// </para></remarks>
+    public static JsonDataReaderOptions CreateForReferenceData(JsonPropertyNamingConvention namingConvention = JsonPropertyNamingConvention.PascalCase, Func<object?>? idGenerator = null)
+    {
+        var o = new JsonDataReaderOptions(namingConvention).AddStandardProperties();
+        o.Properties.TryAdd(o.ConvertPropertyName(nameof(RefData.Abstractions.IReferenceData.Id)), idGenerator is null ? "^id" : "^__idGenerator");
+        o.Properties.TryAdd(o.ConvertPropertyName(nameof(RefData.Abstractions.IReferenceData.IsActive)), true);
+        o.Properties.TryAdd(o.ConvertPropertyName(nameof(RefData.Abstractions.IReferenceData.SortOrder)), "^index");
+
+        if (idGenerator is not null)
+            o.Parameters.TryAdd("__idGenerator", _ => idGenerator());
+
+        o.RootNodePreProcessor = args =>
+        {
+            // Where only a single property exists, then assume it is the code & text pair by convention.
+            if (args.CurrentNode is JsonObject jsonObject && jsonObject.TryGetNonEnumeratedCount(out var count) && count == 1)
+            {
+                var kvp = jsonObject.First();
+                if (kvp.Value is not null && kvp.Value.GetValueKind() == JsonValueKind.String)
+                {
+                    jsonObject.Remove(kvp.Key);
+                    jsonObject.Add(o.ConvertPropertyName(nameof(RefData.Abstractions.IReferenceData.Code)), kvp.Key);
+                    jsonObject.Add(o.ConvertPropertyName(nameof(RefData.Abstractions.IReferenceData.Text)), kvp.Value);
+                }
+            }
+        };
+
+        return o;
+    }
+
+    /// <summary>
+    /// Converts the <paramref name="propertyName"/> based on the configured <see cref="NamingConvention"/>.
+    /// </summary>
+    /// <param name="propertyName">The property name to convert.</param>
+    /// <returns>The converted property name.</returns>
+    [return: NotNullIfNotNull(nameof(propertyName))]
+    public string? ConvertPropertyName(string? propertyName)
+    {
+        if (propertyName is null)
+            return null;
+
+        return NamingConvention switch
+        {
+            JsonPropertyNamingConvention.PascalCase => SentenceCase.ToPascalCase(propertyName),
+            JsonPropertyNamingConvention.CamelCase => SentenceCase.ToCamelCase(propertyName),
+            JsonPropertyNamingConvention.SnakeCase => SentenceCase.ToSnakeCase(propertyName),
+            JsonPropertyNamingConvention.KebabCase => SentenceCase.ToKebabCase(propertyName),
+            _ => propertyName
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Data/JsonPropertyNamingConvention.cs b/src/CoreEx.UnitTesting/Data/JsonPropertyNamingConvention.cs
new file mode 100644
index 00000000..1e843e7c
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Data/JsonPropertyNamingConvention.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.UnitTesting.Data;
+
+/// <summary>
+/// Defines the JSON property naming convention used by the <see cref="JsonDataReader"/> when reading/deserializing JSON data.
+/// </summary>
+public enum JsonPropertyNamingConvention
+{
+    /// <summary>
+    /// Represents the PascalCase naming convention where the first letter of each word is capitalized.
+    /// </summary>
+    PascalCase,
+
+    /// <summary>
+    /// Represents the camelCase naming convention where the first letter of the first word is lowercase and the first letter of each subsequent word is capitalized.
+    /// </summary>
+    CamelCase,
+
+    /// <summary>
+    /// Represents the snake_case naming convention where words are separated by underscores and all letters are lowercase.
+    /// </summary>
+    SnakeCase,
+
+    /// <summary>
+    /// Represents the kebab-case naming convention where words are separated by hyphens and all letters are lowercase.
+    /// </summary>
+    KebabCase,
+
+    /// <summary>
+    /// Represents no known naming convention; i.e. property names will be used as-is without any transformation.
+    /// </summary>
+    None
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Data/README.md b/src/CoreEx.UnitTesting/Data/README.md
new file mode 100644
index 00000000..b548f00f
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Data/README.md
@@ -0,0 +1,33 @@
+# CoreEx.UnitTesting.Data
+
+> Provides `JsonDataReader` — a hierarchical mutating reader for JSON or YAML data with dynamic property substitution — and supporting option and argument types that configure its behaviour.
+
+## Overview
+
+`CoreEx.UnitTesting.Data` centres on `JsonDataReader`, which parses a JSON or YAML document into a `JsonNode` tree and then deep-copies it while resolving `^token` placeholders and `(^token)` embedded substitutions at every node. The result is a fully substituted `JsonNode` that the caller can navigate or deserialise as needed — typically to seed a test database, drive an API request body, or assert expected response content.
+
+Substitution values come from the `JsonDataReaderOptions.Parameters` dictionary, which maps token names (case-insensitive) to factory functions that receive a `JsonDataReaderArgs` instance. Nine tokens are registered by default: `^id`, `^guid`, `^now`, `^tomorrow`, `^yesterday`, `^tenant_id`, `^user_id`, `^user_name`, and `^index`. The caller can add further tokens or override existing ones at any time. In addition, `JsonDataReaderOptions.Properties` holds key-value pairs that are injected into every root-most `JsonObject` in the output where the property is not already present; the `AddStandardProperties()` helper pre-registers `CreatedOn`, `CreatedBy`, and `TenantId` for change-log seeding scenarios.
+
+The `TryGetPath` method retrieves a deep clone of a subtree by dot-notation path without performing substitution; `TryCreateData` combines path resolution with full substitution and returns the mutated node; `Deserialize<T>` is a convenience wrapper that calls `TryCreateData` and then deserialises the substituted node to the requested type, automatically aligning `JsonSerializerOptions.PropertyNamingPolicy` with the configured `JsonPropertyNamingConvention`.
+
+## Key capabilities
+
+- 🧬 **Hierarchical mutating reader**: `JsonDataReader` deep-copies the parsed `JsonNode` tree during substitution so the original document is never modified; objects, arrays, and scalar values are all visited recursively.
+- 🔧 **`^token` and `(^token)` substitution**: scalar string values prefixed with `^` are replaced wholesale; `(^token)` patterns embedded within a longer string are substituted in-place; both forms resolve against the same `Parameters` dictionary and support chained substitution.
+- **Property injection**: `JsonDataReaderOptions.Properties` are merged into every root-most `JsonObject` in the output when the key is absent; a `RootNodePreProcessor` delegate allows arbitrary node manipulation before standard substitution runs.
+- 📝 **Configurable naming conventions**: `JsonPropertyNamingConvention` (`PascalCase`, `CamelCase`, `SnakeCase`, `KebabCase`, `None`) controls the name transformation applied when `Deserialize<T>` constructs its `JsonSerializerOptions`.
+- 📦 **Direct deserialisation**: `Deserialize<T>(path)` resolves the substituted subtree and deserialises it to any type in one call, using the naming convention to align property mapping automatically.
+- **YAML and JSON input**: static factory methods `ParseYaml` and `ParseJson` accept strings, streams, `TextReader`, embedded resources (via a `TResource` type parameter), or raw `JsonNode` instances, making it straightforward to load fixtures from any source.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`JsonDataReader`](./JsonDataReader.cs)** | Hierarchical mutating reader; parses JSON or YAML into a `JsonNode` root, resolves `^token`/`(^token)` placeholders via `TryCreateData`, and exposes `Deserialize<T>` for direct typed deserialisation. Factory methods: `ParseJson`, `ParseYaml`. |
+| **[`JsonDataReaderArgs`](./JsonDataReaderArgs.cs)** | Per-node runtime context passed to every `Parameters` factory function; exposes `Root`, `CurrentPropertyName`, `CurrentNode`, `Index`, and the live `Parameters` dictionary. |
+| **[`JsonDataReaderOptions`](./JsonDataReaderOptions.cs)** | Configuration for a `JsonDataReader` instance: `NamingConvention`, `Parameters` token dictionary, `Properties` injection map, `SerializerOptions`, `TenantId` fallback, `RootNodePreProcessor` hook, and the `AddStandardProperties()` / `ForReferenceData()` convenience builders. |
+| **[`JsonPropertyNamingConvention`](./JsonPropertyNamingConvention.cs)** | Enum: `PascalCase`, `CamelCase`, `SnakeCase`, `KebabCase`, `None`; controls the property-name transformation applied during deserialisation. |
+
+## Related namespaces
+
+- **[`CoreEx.UnitTesting`](../README.md)** - Root namespace; `JsonDataReader` is consumed by the DbEx-based SQL Server and PostgreSQL database-seeding helpers to populate test databases from JSON/YAML fixture files.
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Events/EventExpecationsConfig.cs b/src/CoreEx.UnitTesting/Events/EventExpecationsConfig.cs
new file mode 100644
index 00000000..cd10437e
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Events/EventExpecationsConfig.cs
@@ -0,0 +1,430 @@
+namespace CoreEx.UnitTesting.Events;
+
+/// <summary>
+/// Provides the <see cref="EventExpectations{TTester}"/> configuration for a specific <see cref="IEventPublisher"/> service key, enabling the configuration of expected events and their assertion during testing.
+/// </summary>
+/// <remarks>Where expected events have been specified they will be matched, in the sequence specified, against the actual events published during the test execution.</remarks>
+public sealed class EventExpectationsConfig
+{
+    private bool _expectNoEvents;
+    private readonly List<EventExpectationAssertor> _assertors = [];
+    private readonly List<string> _pathsToIgnore = [.. DefaultPathsToIgnore];
+    private Action<AssertArgs, DestinationEvent[]>? _assertAllEvents;
+
+    /// <summary>
+    /// Gets or sets the default <see cref="CloudEvent"/> metadata paths to ignore for comparisons.
+    /// </summary>
+    public static List<string> DefaultMetadataPathsToIgnore { get; set => field = value.ThrowIfNull(); } = ["id", "time", "subject", "partitionkey", "authtype", "authid", "traceparent", "tracestate", "baggage"];
+
+    /// <summary>
+    /// Gets or sets the default <see cref="CloudEvent"/> data paths to ignore for comparisons.
+    /// </summary>
+    public static List<string> DefaultDataPathsToIgnore { get; set => field = value.ThrowIfNull(); } = ["data.id", "data.changelog", "data.etag"];
+
+    /// <summary>
+    /// Gets the default JSON <see cref="CloudEvent"/> paths to ignore for comparisons, which is a combination of the <see cref="DefaultMetadataPathsToIgnore"/> and <see cref="DefaultDataPathsToIgnore"/>.
+    /// </summary>
+    public static List<string> DefaultPathsToIgnore => [.. DefaultMetadataPathsToIgnore, .. DefaultDataPathsToIgnore];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventExpectationsConfig"/> class.
+    /// </summary>
+    /// <param name="tester">The owning <see cref="TesterBase"/>.</param>
+    /// <param name="serviceKey">The registered service key.</param>
+    /// <param name="requestId">The request identifier.</param>
+    /// <param name="assembly">The assembly to use for resource resolution.</param>
+    internal EventExpectationsConfig(TesterBase tester, string serviceKey, string? requestId, Assembly assembly)
+    {
+        Tester = tester;
+        ServiceKey = serviceKey;
+        RequestId = requestId;
+        ResourceAssembly = assembly;
+    }
+
+    /// <summary>
+    /// Gets the owning <see cref="TesterBase"/>.
+    /// </summary>
+    internal TesterBase Tester { get; }
+
+    /// <summary>
+    /// Gets the registered service key for the underlying <see cref="IEventPublisher"/>.
+    /// </summary>
+    internal string ServiceKey { get; }
+
+    /// <summary>
+    /// Gets the request identifier.
+    /// </summary>
+    internal string? RequestId { get; }
+
+    /// <summary>
+    /// Gets the assembly to use for resource resolution.
+    /// </summary>
+    internal Assembly ResourceAssembly { get; }
+
+    /// <summary>
+    /// Gets the current list of JSON paths to ignore for all event comparisons.
+    /// </summary>
+    /// <remarks><para>Defaults to <see cref="DefaultPathsToIgnore"/>.</para>
+    /// Note: this list is copied and concatenated with the path(s) specified for the individual event expectations. Therefore, any changes after an event expectation is made, will not be included; i.e. only
+    /// applies to subsequent event expectations. This is to ensure consistency for the individual event expectation configurations, and to avoid any unintended consequences of changes to the default paths
+    /// after preceding event expectations have been configured.</remarks>
+    public List<string> PathsToIgnore => _pathsToIgnore;
+
+    /// <summary>
+    /// Indicates that no events should have been published.
+    /// </summary>
+    internal void ExpectNoEvents()
+    {
+        if (_assertors.Count != 0)
+            throw new InvalidOperationException("Cannot set to expect no events when event expectations have already been configured.");
+
+        _expectNoEvents = true;
+    }
+
+    /// <summary>
+    /// Indicates that events should have been published.
+    /// </summary>
+    /// <exception cref="InvalidOperationException"></exception>
+    internal void ExpectEvents()
+    {
+        if (_expectNoEvents)
+            throw new InvalidOperationException("Cannot set to expect events when already configured to expect no events.");
+
+        if (_assertAllEvents is not null)
+            throw new InvalidOperationException($"Cannot set to expect events when already configured using {nameof(AssertAllFromJsonResource)}, {nameof(AssertCount)}, or {nameof(Assert)}.");
+    }
+
+    /// <summary>
+    /// Gets or sets the factory function used to create new <see cref="ExecutionContext"/> instance.
+    /// </summary>
+    public Func<IServiceProvider, ExecutionContext> ExecutionContextFactory { get; set; } = sp => new ExecutionContext();
+
+    /// <summary>
+    /// Gets or sets the <see cref="JsonSerializerOptions"/>; where <see langword="null"/> then the registered version from the <see cref="TesterBase.Services"/> will be used.
+    /// </summary>
+    public JsonSerializerOptions? JsonSerializerOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="IHostSettings"/>; where <see langword="null"/> then the registered host version from the <see cref="TesterBase.Services"/> will be used.
+    /// </summary>
+    public IHostSettings? HostSettings { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <see cref="IEventFormatter"/>; where <see langword="null"/> then the registered version from the <see cref="TesterBase.Services"/> will be used.
+    /// </summary>
+    public IEventFormatter? EventFormatter { get; set; }
+
+    /// <summary>
+    /// Adds an expectation assertion that the consumer of the <paramref name="events"/> action is responsible for asserting as required.
+    /// </summary>
+    /// <param name="events">The actual <see cref="DestinationEvent"/> array.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig Assert(Action<DestinationEvent[]> events)
+    {
+        ExpectEvents();
+        events.ThrowIfNull();
+
+        _assertAllEvents = (_, actual) =>
+        {
+            events(actual);
+            Tester.Implementor.WriteLine($"    > Expected zero or more event(s) with a custom Assert; and that assertion was met.");
+        };
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds am expectation assertion that asserts that the number of published events matches the specified <paramref name="count"/>..
+    /// </summary>
+    /// <param name="count">The expected number of events to be published.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertCount(int count)
+    {
+        ExpectEvents();
+        count.ThrowIfLessThanOrEqualToZero();
+
+        _assertAllEvents = (_, actual) =>
+        {
+            if (count == actual.Length)
+                Tester.Implementor.WriteLine($"    > Expected {count} event(s); and that number was found to be published.");
+            else
+                Tester.Implementor.AssertFail($"Expected {_assertors.Count} '{ServiceKey}' events; however, {actual.Length} were found to be published.");
+        };
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that one or more events were published matching the <see cref="DestinationEvent"/> array from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the <see cref="Assembly"/> for the embedded resource.</typeparam>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="pathsToIgnore"/> should be from an individual <see cref="CloudEvent"/> perspective from a consistency perspective.</remarks>
+    public EventExpectationsConfig AssertAllFromJsonResource<TAssembly>(string resourceName, params IEnumerable<string> pathsToIgnore)
+        => AssertAllFromJsonResource(resourceName, typeof(TAssembly).Assembly, pathsToIgnore);
+
+    /// <summary>
+    /// Adds an expectation assertion that one or more events were published matching the <see cref="DestinationEvent"/> array from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="pathsToIgnore"/> should be from an individual <see cref="CloudEvent"/> perspective from a consistency perspective.</remarks>
+    public EventExpectationsConfig AssertAllFromJsonResource(string resourceName, params IEnumerable<string> pathsToIgnore)
+        => AssertAllFromJsonResource(resourceName, null, pathsToIgnore);
+
+    /// <summary>
+    /// Adds an expectation assertion that one or more events were published matching the <see cref="DestinationEvent"/> array from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="assembly">The <see cref="ResourceAssembly"/> that contains the resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="pathsToIgnore"/> should be from an individual <see cref="CloudEvent"/> perspective from a consistency perspective.</remarks>
+    public EventExpectationsConfig AssertAllFromJsonResource(string resourceName, Assembly? assembly = null, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+
+        assembly ??= ResourceAssembly;
+        var capturedPaths = CombinePaths(pathsToIgnore).Select(x => $"event.{(x.StartsWith("$.") ? x[2..] : x)}").ToArray();
+        _assertAllEvents = (args, events) =>
+        {
+            var ej = Resource.GetJson(resourceName, assembly);
+            var aj = JsonSerializer.Serialize(events.Select(kvp => new { destination = kvp.Destination, @event = kvp.Event.EncodeToJsonElement() }));
+
+            ObjectComparer.AssertJson(new UnitTestEx.Json.JsonElementComparerOptions { PreambleText = $"'{ServiceKey}' event(s) comparison." }, ej, aj, capturedPaths);
+            Tester.Implementor.WriteLine("    > All event expectations met successfully.");
+        };
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published where the returned value will be used as the source of the <see cref="EventData.Data"/>.
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="title">The expected <see cref="EventData.Title"/> (.</param>
+    /// <param name="messageType">The expected <see cref="EventData.MessageType"/>.</param>
+    /// <param name="updater">An optional action to further update the expected <see cref="EventData"/> prior to assertion.</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Internally this constructs the <see cref="EventData"/> and converts it to a <see cref="CloudEvent"/> for comparison.</remarks>
+    public EventExpectationsConfig AssertWithValue(string destination, string title, CoreEx.Events.MessageType messageType = CoreEx.Events.MessageType.Event, Action<EventData>? updater = null, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+
+        _assertors.Add(new EventExpectationAssertor(this, destination, (assertor, args, _) =>
+        {
+            var ed = new EventData() { Title = title, MessageType = messageType }.WithValue(args.Value, null, assertor.JsonSerializerOptions);
+            updater?.Invoke(ed);
+            return assertor.EventFormatter.ConvertToCloudEvent(assertor.EventFormatter.Format(ed));
+        }, CombinePaths(pathsToIgnore)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the specified <see cref="EventData"/> converted as a <see cref="CloudEvent"/> (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="eventData">The <see cref="EventData"/>.</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertEventData(string destination, EventData eventData, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+        eventData.ThrowIfNull();
+
+        _assertors.Add(new EventExpectationAssertor(this, destination, (assertor, args, _) =>
+        {
+            return assertor.EventFormatter.ConvertToCloudEvent(assertor.EventFormatter.Format(eventData));
+        }, CombinePaths(pathsToIgnore)));
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the primary metadata (where specified) only.
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="title">The expected <see cref="EventData.Title"/> (<see cref="CloudEvent.Type"/>) glob-like matching pattern that will represent the underlying title <see cref="Regex"/>.</param>
+    /// <param name="key">The expected <see cref="EventData.Key"/> (<see cref="CloudEvent.Subject"/>) value.</param>
+    /// <param name="source">The expected <see cref="EventData.Source"/> (<see cref="CloudEvent.Source"/>) glob-like matching pattern that will represent the underlying source <see cref="Regex"/>.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="title"/> and <paramref name="source"/> both support glob-like matching patterns.</remarks>
+    public EventExpectationsConfig AssertMetadata(string destination, string? title = null, string? key = null, string? source = null)
+    {
+        ExpectEvents();
+
+        _assertors.Add(new EventExpectationAssertor(this, destination, (assertor, args, actual) =>
+        {
+            assertor.AssertDestination(actual.Destination);
+
+            var sa = new SubscribeAttribute(title, source);
+            if (sa.IsMatch(actual.Event?.Type, actual.Event?.Source))
+            {
+                if (key != null)
+                    assertor.Tester.Implementor.AssertAreEqual(key, actual.Event?.Subject, $"Expected key '{key}'; but found '{actual.Event?.Subject}'.");
+            }
+            else
+                assertor.Tester.Implementor.AssertFail($"Expected event metadata did not match; Title expected '{title}' vs actual '{actual.Event?.Type}', Source expected '{source}' vs actual '{actual.Event?.Source}'");
+        }, []));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the specified <see cref="CloudEvent"/> (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="cloudEvent">The expected <see cref="CloudEvent"/>. </param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertCloudEvent(string destination, CloudEvent cloudEvent, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+        _assertors.Add(new EventExpectationAssertor(this, destination, (_, _, _) => cloudEvent, pathsToIgnore));
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the <see cref="CloudEvent"/> from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the <see cref="Assembly"/> for the embedded resource.</typeparam>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertCloudEventFromJsonResource<TAssembly>(string destination, string resourceName, params IEnumerable<string> pathsToIgnore)
+        => AssertCloudEventFromJsonResource<TAssembly>(destination, resourceName, null, pathsToIgnore);
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the <see cref="CloudEvent"/> from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the <see cref="Assembly"/> for the embedded resource.</typeparam>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="updater">An optional action to update the <see cref="CloudEvent"/> before use.</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertCloudEventFromJsonResource<TAssembly>(string destination, string resourceName, Action<CloudEvent>? updater = null, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+
+        _assertors.Add(new EventExpectationAssertor(this, destination, (assertor, args, _) =>
+        {
+            return assertor.Tester.CreateCloudEventFromJsonResource<TAssembly>(resourceName, updater);
+        }, CombinePaths(pathsToIgnore)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the <see cref="CloudEvent"/> from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertCloudEventFromJsonResource(string destination, string resourceName, params IEnumerable<string> pathsToIgnore)
+        => AssertCloudEventFromJsonResource(destination, resourceName, null, null, pathsToIgnore);
+
+    /// <summary>
+    /// Adds an expectation assertion that an event was published matching the <see cref="CloudEvent"/> from the specified JSON resource (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="updater">An optional action to update the <see cref="CloudEvent"/> before use.</param>
+    /// <param name="assembly">The <see cref="ResourceAssembly"/> that contains the resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    public EventExpectationsConfig AssertCloudEventFromJsonResource(string destination, string resourceName, Action<CloudEvent>? updater = null, Assembly? assembly = null, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+
+        _assertors.Add(new EventExpectationAssertor(this, destination, (assertor, args, _) =>
+        {
+            return assertor.Tester.CreateCloudEventFromJsonResource(resourceName, updater, assembly ?? ResourceAssembly);
+        }, CombinePaths(pathsToIgnore)));
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a custom expectation assertion that an event was published where the provided <paramref name="customAssert"/> will be invoked to perform the assertion against the actual <see cref="DestinationEvent"/> (with any specified JSON paths to ignore).
+    /// </summary>
+    /// <param name="destination">The expected destination (i.e. topic) name.</param>
+    /// <param name="customAssert">The custom assert action.</param>
+    /// <param name="pathsToIgnore">Any additional JSON paths to ignore from the underlying <see cref="CloudEvent"/> comparison.</param>
+    /// <returns>The <see cref="EventExpectationsConfig"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <see cref="EventExpectationAssertor.AssertDestination(string)"/> and <see cref="EventExpectationAssertor.AssertCloudEvent(CloudEvent, CloudEvent)"/> methods can be used within the custom assert action for consistency.</remarks>
+    public EventExpectationsConfig AssertCustom(string destination, Action<EventExpectationAssertor, AssertArgs, DestinationEvent> customAssert, params IEnumerable<string> pathsToIgnore)
+    {
+        ExpectEvents();
+        _assertors.Add(new EventExpectationAssertor(this, destination, customAssert, pathsToIgnore));
+        return this;
+    }
+
+    /// <summary>
+    /// Combines the specified array of paths to ignore with the existing set of ignored paths.
+    /// </summary>
+    private string[] CombinePaths(IEnumerable<string> pathsToIgnore) => _pathsToIgnore.Count == 0 ? [.. pathsToIgnore] : [.. _pathsToIgnore, .. pathsToIgnore];
+
+    /// <summary>
+    /// Performs the assertion of the expected events against those that were published, throwing an exception if any expectations were not met.
+    /// </summary>
+    /// <param name="args">The <see cref="AssertArgs"/>.</param>
+    internal void Assert(AssertArgs args)
+    {
+        Tester.Implementor.WriteLine($"  > '{ServiceKey}' events.");
+
+        // High-level checks.
+        if (!Tester.SharedState.RequestStateData(RequestId).TryGetValue(ServiceKey, out var obj) || obj is not DestinationEvent[] events || events.Length == 0)
+        {
+            if (_expectNoEvents)
+            {
+                Tester.Implementor.WriteLine("    > Expected no events and there were none.");
+                return;
+            }
+
+            args.Tester.Implementor.AssertFail($"Expected '{ServiceKey}' events; however, no events were found to be published.");
+            return;
+        }
+
+        if (_expectNoEvents)
+        {
+            Tester.Implementor.AssertFail($"Expected no '{ServiceKey}'events; however, {events.Length} found to be published.");
+            return;
+        }
+
+        if (_assertAllEvents is not null)
+        {
+            _assertAllEvents(args, events);
+            return;
+        }
+
+        if (_assertors.Count == 0)
+        {
+            Tester.Implementor.WriteLine($"    > Expected events; and {events.Length} found to be published.");
+            return;
+        }
+
+        if (_assertors.Count != events.Length)
+        {
+            Tester.Implementor.AssertFail($"Expected {_assertors.Count} '{ServiceKey}' events; however, {events.Length} were found to be published.");
+            return;
+        }
+
+        // Iterate and check each.
+        var index = 0;
+        foreach (var assertor in _assertors)
+        {
+            Tester.Implementor.WriteLine($"    > Event {index + 1} of {_assertors.Count}.");
+            assertor.Assert(args, events[index]);
+            index++;
+        }
+
+        Tester.Implementor.WriteLine("    > Event expectations met successfully.");
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Events/EventExpectationAssertor.cs b/src/CoreEx.UnitTesting/Events/EventExpectationAssertor.cs
new file mode 100644
index 00000000..d13f1364
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Events/EventExpectationAssertor.cs
@@ -0,0 +1,110 @@
+namespace CoreEx.UnitTesting.Events;
+
+/// <summary>
+/// Provides assertion capabilities for an expected event.
+/// </summary>
+public sealed class EventExpectationAssertor
+{
+    private readonly EventExpectationsConfig _config;
+    private readonly string? _expectedDestination;
+    private readonly string[] _pathsToIgnore;
+    private readonly Func<EventExpectationAssertor, AssertArgs, DestinationEvent, CloudEvent>? _expectedEventFactory;
+    private readonly Action<EventExpectationAssertor, AssertArgs, DestinationEvent>? _customAssert;
+
+    private JsonSerializerOptions? _jsonSerializerOptions;
+    private IHostSettings? _hostSettings;
+    private IEventFormatter? _eventFormatter;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventExpectationAssertor"/> class with an <paramref name="expectedEventFactory"/>.
+    /// </summary>
+    /// <param name="config">The owning <see cref="EventExpectationsConfig"/>.</param>
+    /// <param name="expectedDestination">The expected destination.</param>
+    /// <param name="expectedEventFactory">The function to create the expected <see cref="CloudEvent"/>.</param>
+    /// <param name="pathsToIgnore">The JSON paths to ignore.</param>
+    internal EventExpectationAssertor(EventExpectationsConfig config, string? expectedDestination, Func<EventExpectationAssertor, AssertArgs, DestinationEvent, CloudEvent> expectedEventFactory, IEnumerable<string> pathsToIgnore)
+    {
+        _config = config;
+        _expectedDestination = expectedDestination;
+        _expectedEventFactory = expectedEventFactory;
+        _pathsToIgnore = [.. pathsToIgnore];
+
+        // Copy out key attributes from the config for use in the assertion - need the now version.
+        _jsonSerializerOptions = _config.JsonSerializerOptions;
+        _hostSettings = _config.HostSettings;
+        _eventFormatter = _config.EventFormatter;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventExpectationAssertor"/> class with a <paramref name="customAssert"/>.
+    /// </summary>
+    /// <param name="config">The owning <see cref="EventExpectationsConfig"/>.</param>
+    /// <param name="expectedDestination">The expected destination.</param>
+    /// <param name="customAssert">The custom assert action.</param>
+    /// <param name="pathsToIgnore">The JSON paths to ignore.</param>
+    internal EventExpectationAssertor(EventExpectationsConfig config, string? expectedDestination, Action<EventExpectationAssertor, AssertArgs, DestinationEvent> customAssert, IEnumerable<string> pathsToIgnore)
+    {
+        _config = config;
+        _expectedDestination = expectedDestination;
+        _customAssert = customAssert;
+        _pathsToIgnore = [.. pathsToIgnore];
+
+        // Copy out key attributes from the config for use in the assertion - need the now version.
+        _jsonSerializerOptions = _config.JsonSerializerOptions;
+        _hostSettings = _config.HostSettings;
+        _eventFormatter = _config.EventFormatter;
+    }
+
+    /// <summary>
+    /// Gets the owning <see cref="TesterBase"/>.
+    /// </summary>
+    public TesterBase Tester => _config.Tester;
+
+    /// <summary>
+    /// Gets or sets the <see cref="JsonSerializerOptions"/>; where <see langword="null"/> then the registered version from the <see cref="TesterBase.Services"/> will be used.
+    /// </summary>
+    public JsonSerializerOptions JsonSerializerOptions => _jsonSerializerOptions ??= _config.Tester.Services.GetService<JsonSerializerOptions>() ?? CoreEx.Json.JsonDefaults.SerializerOptions;
+
+    /// <summary>
+    /// Gets the <see cref="IHostSettings"/>; where <see langword="null"/> then the registered host version from the <see cref="TesterBase.Services"/> will be used.
+    /// </summary>
+    public IHostSettings HostSettings => _hostSettings ??= _config.Tester.Services.GetService<IHostSettings>() ?? throw new InvalidOperationException($"A {nameof(IHostSettings)} instance is required to perform the event assertion; either set on the config or ensure it is registered in the services.");
+
+    /// <summary>
+    /// Gets the <see cref="IEventFormatter"/>; where <see langword="null"/> then the registered version from the <see cref="TesterBase.Services"/> will be used.
+    /// </summary>
+    public IEventFormatter EventFormatter => _eventFormatter ??= _config.Tester.Services.GetService<IEventFormatter>() ?? new EventFormatter(HostSettings);
+
+    /// <summary>
+    /// Asserts that the expected and actual <see cref="DestinationEvent"/> are equal, ignoring any specified paths.
+    /// </summary>
+    /// <param name="args">The <see cref="AssertArgs"/>.</param>
+    /// <param name="actual">The actual <see cref="DestinationEvent"/>.</param>
+    internal void Assert(AssertArgs args, DestinationEvent actual)
+    {
+        AssertDestination(actual.Destination);
+
+        if (_expectedEventFactory is not null)
+            AssertCloudEvent(_expectedEventFactory(this, args, actual), actual.Event);
+        else
+            _customAssert?.Invoke(this, args, actual);
+    }
+
+    /// <summary>
+    /// Asserts that the previously configured expected destination and <paramref name="actual"/> destination are equal.
+    /// </summary>
+    /// <param name="actual">The actual destination.</param>
+    public void AssertDestination(string actual) => Tester.Implementor.AssertAreEqual(_expectedDestination, actual, $"Expected '{_config.ServiceKey}' event destination '{_expectedDestination}'; but found '{actual}'.");
+
+    /// <summary>
+    /// Asserts that the expected and actual <see cref="CloudEvent"/> are equal, ignoring any previously configured JSON paths.
+    /// </summary>
+    /// <param name="expected">The expected <see cref="CloudEvent"/>.</param>
+    /// <param name="actual">The actual <see cref="CloudEvent"/>.</param>
+    public void AssertCloudEvent(CloudEvent expected, CloudEvent actual)
+    {
+        var ej = expected?.EncodeToJsonElement(JsonSerializerOptions) ?? null;
+        var aj = actual?.EncodeToJsonElement(JsonSerializerOptions) ?? null;
+        ObjectComparer.Assert(new UnitTestEx.Json.JsonElementComparerOptions { PreambleText = $"'{_config.ServiceKey}' event comparison." }, ej, aj, _pathsToIgnore);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Events/EventExpectations.cs b/src/CoreEx.UnitTesting/Events/EventExpectations.cs
new file mode 100644
index 00000000..90976cf1
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Events/EventExpectations.cs
@@ -0,0 +1,88 @@
+namespace CoreEx.UnitTesting.Events;
+
+/// <summary>
+/// Provides <see cref="IEventPublisher"/>-specific expectations for unit testing.
+/// </summary>
+/// <typeparam name="TTester">The tester <see cref="Type"/>.</typeparam>
+public class EventExpectations<TTester> : ExpectationsBase<TTester>
+{
+    private readonly Dictionary<string, EventExpectationsConfig> _expectations = [];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EventExpectations{TTester}"/> class.
+    /// </summary>
+    /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
+    /// <param name="tester">The initiating tester.</param>
+    /// <param name="requestId">The request identifier.</param>
+    /// <param name="assembly">The assembly to use for resource resolution.</param>
+    internal EventExpectations(TesterBase owner, TTester tester, string? requestId, Assembly assembly) : base(owner, tester)
+    {
+        RequestId = requestId;
+        ResourceAssembly = assembly;
+    }
+
+    /// <inheritdoc/>
+    public override string Title => "Event expectations";
+
+    /// <inheritdoc/>
+    /// <remarks>Overrides to ensure it occurs after majority.</remarks>
+    public override int Order => 5000;
+
+    /// <summary>
+    /// Gets the request identifier.
+    /// </summary>
+    internal string? RequestId { get; }
+
+    /// <summary>
+    /// Gets the assembly to use for resource resolution.
+    /// </summary>
+    internal Assembly ResourceAssembly { get; }
+
+    /// <summary>
+    /// Expects that no events will have been published for the keyed <see cref="IEventPublisher"/>.
+    /// </summary>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public void ExpectNoEvents(string serviceKey)
+    {
+        GetOrAddConfig(serviceKey).ExpectNoEvents();
+    }
+
+    /// <summary>
+    /// Expects that events will have been published for the keyed <see cref="IEventPublisher"/>.
+    /// </summary>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <param name="configure">The action to enable events expectations configuration.</param>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public void ExpectEvents(string serviceKey, Action<EventExpectationsConfig>? configure = null)
+    {
+        var config = GetOrAddConfig(serviceKey);
+        config.ExpectEvents();
+        configure?.Invoke(config);
+    }
+
+    /// <summary>
+    /// Gets or adds the expectation configuration for the specified service key.
+    /// </summary>
+    private EventExpectationsConfig GetOrAddConfig(string serviceKey)
+    {
+        if (!_expectations.TryGetValue(serviceKey.ThrowIfNullOrEmpty(), out var config))
+        {
+            config = new EventExpectationsConfig(Owner, serviceKey, RequestId, ResourceAssembly);
+            _expectations[serviceKey] = config;
+        }
+
+        return config;
+    }
+
+    /// <inheritdoc/>
+    protected override Task OnAssertAsync(AssertArgs args)
+    {
+        foreach (var kvp in _expectations)
+        {
+            kvp.Value.Assert(args);
+        }
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Events/EventPublisherDecorator.cs b/src/CoreEx.UnitTesting/Events/EventPublisherDecorator.cs
new file mode 100644
index 00000000..a64788ee
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Events/EventPublisherDecorator.cs
@@ -0,0 +1,80 @@
+namespace CoreEx.UnitTesting.Events;
+
+/// <summary>
+/// Provides a decorator for an event publisher that integrates with <see cref="TestSharedState"/> enabling additional test-related behaviors while delegating event publishing operations to the actual underlying publisher.
+/// </summary>
+/// <param name="key">The key used to reference the published events in the shared state.</param>
+/// <param name="testSharedState">The shared test state used to coordinate or track event publishing during tests.</param>
+/// <param name="innerEventPublisher">The underlying event publisher to which all event publishing operations are delegated.</param>
+/// <remarks>This decorator is typically used in testing scenarios to augment and observe event publishing without modifying the core event publisher implementation. All publishing operations are forwarded
+/// to the specified inner event publisher.</remarks>
+public class EventPublisherDecorator(string key, TestSharedState testSharedState, IEventPublisher innerEventPublisher) : IEventPublisher
+{
+    private readonly TestSharedState _sharedState = testSharedState.ThrowIfNull();
+    private readonly IEventPublisher _innerEventPublisher = innerEventPublisher.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the key used to reference the published events in the shared state.
+    /// </summary>
+    /// <remarks>This key is typically the same as used to register the underlying service itself.</remarks>
+    public string Key { get; } = key.ThrowIfNullOrEmpty();
+
+    /// <inheritdoc/>
+    public bool HasBeenPublished => _innerEventPublisher.HasBeenPublished;
+
+    /// <inheritdoc/>
+    public bool IsEmpty => _innerEventPublisher.IsEmpty;
+
+    /// <inheritdoc/>
+    public int Count => _innerEventPublisher.Count;
+
+    /// <inheritdoc/>
+    public void Add(IEnumerable<EventData> events) => _innerEventPublisher.Add(events);
+
+    /// <inheritdoc/>
+    public void Add(string destination, IEnumerable<EventData> events) => _innerEventPublisher.Add(destination, events);
+
+    /// <inheritdoc/>
+    public void Add(string destination, IEnumerable<CloudEvent> events) => _innerEventPublisher.Add(destination, events);
+
+    /// <inheritdoc/>
+    public void Add(params EventData[] events) => _innerEventPublisher.Add(events);
+
+    /// <inheritdoc/>
+    public void Add(string destination, params EventData[] events) => _innerEventPublisher.Add(destination, events);
+
+    /// <inheritdoc/>
+    public void Add(string destination, params CloudEvent[] events) => _innerEventPublisher.Add(destination, events);
+
+    /// <inheritdoc/>
+    public void Add(IEnumerable<DestinationEvent> events) => _innerEventPublisher.Add(events);
+
+    /// <inheritdoc/>
+    public void Clear() => _innerEventPublisher.Clear();
+
+    /// <inheritdoc/>
+    public void Reset() => _innerEventPublisher.Reset();
+
+    /// <inheritdoc/>
+    public void Rollback(int count) => _innerEventPublisher.Rollback(count);
+
+    /// <inheritdoc/>
+    public DestinationEvent[] GetEvents() => _innerEventPublisher.GetEvents();
+
+    /// <inheritdoc/>
+    public async Task PublishAsync(CancellationToken cancellationToken = default)
+    {
+        var events = GetEvents();
+        var requestId = _sharedState.GetHttpRequestId();
+
+        // Where an action is registered in the shared state for the current request, invoke it; this allows for test-specific behaviors to be executed just prior to the actual publishing of events.
+        if (_sharedState.RequestStateData(requestId).TryGetValue($"_{nameof(EventPublisherDecorator)}_{key}", out var val) && val is Action publishAction)
+            publishAction();
+
+        // Publish the events using the underlying publisher.
+        await _innerEventPublisher.PublishAsync(cancellationToken).ConfigureAwait(false);
+
+        // Forward the published events appending to the shared state.
+        _sharedState.RequestStateData(requestId).AddOrUpdate(Key, events, (_, __) => events);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Events/README.md b/src/CoreEx.UnitTesting/Events/README.md
new file mode 100644
index 00000000..b0bdfcd9
--- /dev/null
+++ b/src/CoreEx.UnitTesting/Events/README.md
@@ -0,0 +1,30 @@
+# CoreEx.UnitTesting.Events
+
+> Provides the event-capture and assertion infrastructure for CoreEx unit tests: the `EventPublisherDecorator` that intercepts published events during a test run, and the `EventExpectations`/`EventExpectationsConfig`/`EventExpectationAssertor` types that declare and verify them.
+
+## Overview
+
+`CoreEx.UnitTesting.Events` implements the two-phase event-testing pattern used across all CoreEx publisher integrations. In the first phase (test setup), `EventPublisherDecorator` is substituted for the real `IEventPublisher` in the DI container via `UseExpectedEventPublisher`; it delegates all `Add`/`SendAsync` calls to the original publisher while also recording each `DestinationEvent` in `TestSharedState`. In the second phase (post-run assertion), `EventExpectations<TSelf>` retrieves the captured events and hands them to each registered `EventExpectationAssertor`, which compares the actual `CloudEvent` JSON against the expected event (from a resource file or a factory delegate), ignoring configurable paths such as `id`, `time`, `subject`, `data.id`, `data.changelog`, and `data.etag` by default.
+
+`EventExpectationsConfig` is the fluent configuration surface exposed to test authors; it controls which paths to ignore, whether to assert that no events were published, whether to assert all events in sequence or as an unordered set, and how to supply expected event content (embedded resource names, `EventData` factories, or fully custom `CloudEvent` comparators). The config is populated by the `ExpectEvents`/`ExpectNoEvents` extension method family defined in `UnitTestExExpectations`.
+
+## Key capabilities
+
+- 🔧 **Non-invasive event capture**: `EventPublisherDecorator` wraps the real publisher transparently — all actual publish operations proceed to the underlying outbox or Service Bus publisher while a copy is stored in `TestSharedState` for later assertion.
+- 💬 **Sequenced or unordered event assertions**: `EventExpectationsConfig` supports asserting events in the declared order or as an unordered set; each assertion compares the full `CloudEvent` JSON representation.
+- 📝 **Flexible expected-event sources**: `EventExpectationAssertor` accepts an expected `CloudEvent` from an embedded JSON resource, from an `EventData` factory delegate, or from a fully custom `Action<AssertArgs, DestinationEvent>` comparator.
+- ✅ **Configurable path ignoring**: `EventExpectationsConfig.DefaultMetadataPathsToIgnore` and `DefaultDataPathsToIgnore` pre-configure the noisiest volatile paths (`id`, `time`, `data.etag`, etc.); individual tests can extend or replace this list.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`EventPublisherDecorator`](./EventPublisherDecorator.cs)** | `IEventPublisher` decorator that forwards all calls to the wrapped inner publisher while recording each published `DestinationEvent` in `TestSharedState` under a configurable service key. |
+| **[`EventExpectationsConfig`](./EventExpecationsConfig.cs)** | Fluent configuration for a single publisher's event expectations: paths to ignore, expected-no-events flag, sequenced assertors list, and an optional catch-all `AssertAllEvents` action. Exposes `DefaultMetadataPathsToIgnore` and `DefaultDataPathsToIgnore` as mutable static lists. |
+| **[`EventExpectationAssertor`](./EventExpectationAssertor.cs)** | Performs the actual JSON comparison of one expected event against the captured `DestinationEvent`; resolves expected content from a resource file, an `EventData` factory, or a custom delegate; respects the configured ignore paths. |
+| **[`EventExpectations`](./EventExpectations.cs)** | `IExpectationExtension` implementation that manages the list of `EventExpectationsConfig` instances per service key and drives post-run assertion for all registered publishers. |
+
+## Related namespaces
+
+- **[`CoreEx.UnitTesting`](../README.md)** - Root namespace; `UnitTestExExpectations` and `UnitTestExExtensions` are the primary consumer-facing entry points that create and wire up the types defined here.
+- **[`CoreEx.Events`](../../CoreEx.Events/README.md)** - Defines `IEventPublisher`, `EventData`, and `IEventFormatter` that `EventPublisherDecorator` wraps and `EventExpectationAssertor` uses to convert events to `CloudEvent` for comparison.
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Expectations/EventExpectations.cs b/src/CoreEx.UnitTesting/Expectations/EventExpectations.cs
deleted file mode 100644
index 83571e23..00000000
--- a/src/CoreEx.UnitTesting/Expectations/EventExpectations.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Events;
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using UnitTestEx.Abstractions;
-using UnitTestEx.Json;
-
-namespace UnitTestEx.Expectations
-{
-    /// <summary>
-    /// Provides <see cref="CoreEx.Events"/> expectations.
-    /// </summary>
-    /// <param name="owner">The owning <see cref="TesterBase"/>.</param>
-    /// <param name="tester">The initiating tester.</param>
-    public class EventExpectations<TTester>(TesterBase owner, TTester tester) : ExpectationsBase<TTester>(owner, tester)
-    {
-        private readonly Dictionary<string, List<(string? Source, string? Subject, string? Action, EventData? Event, string[] PathsToIgnore)>> _expectedEvents = [];
-        private bool _expectNoEvents = true;
-        private bool _expectEvents;
-
-        /// <inheritdoc/>
-        /// <remarks>Overrides to ensure it occurs after majority.</remarks>
-        public override int Order => 1000;
-
-        /// <summary>
-        /// Expects that no events have been published.
-        /// </summary>
-        /// <remarks>Any previously explicitly specified expected events will be removed.</remarks>
-        public void ExpectNoEvents()
-        {
-            _expectedEvents.Clear();
-            _expectNoEvents = true;
-            _expectEvents = false;
-        }
-
-        /// <summary>
-        /// Expects that at least one event has been published.
-        /// </summary>
-        /// <remarks>Any previously explicitly specified expected events will be removed.</remarks>
-        public void ExpectEvents()
-        {
-            if (!Owner.IsExpectedEventPublisherConfigured())
-                throw new NotSupportedException($"The {nameof(TestSetUp)}.{nameof(UnitTestExExtensions.EnableExpectedEvents)} or {nameof(TesterBase)}.{nameof(UnitTestExExtensions.UseExpectedEvents)} must be used before this functionality can be executed; note that enabling will automatically replace the {nameof(IEventPublisher)} to use the {nameof(ExpectedEventPublisher)}.");
-
-            _expectedEvents.Clear();
-            _expectNoEvents = false;
-            _expectEvents = true;
-        }
-
-        /// <summary>
-        /// Adds the event into the dictionary.
-        /// </summary>
-        private void Add(string? destination, (string? Source, string? Subject, string? Action, EventData? Event, string[] PathsToIgnore) @event)
-        {
-            if (!Owner.IsExpectedEventPublisherConfigured())
-                throw new NotSupportedException($"The {nameof(TestSetUp)}.{nameof(UnitTestExExtensions.EnableExpectedEvents)} or {nameof(TesterBase)}.{nameof(UnitTestExExtensions.UseExpectedEvents)} must be used before this functionality can be executed; note that enabling will automatically replace the {nameof(IEventPublisher)} to use the {nameof(ExpectedEventPublisher)}.");
-
-            var key = destination ?? ExpectedEventPublisher.NullKeyName;
-            if (_expectedEvents.TryGetValue(key, out var events))
-                events.Add(@event);
-            else
-                _expectedEvents.Add(key, [@event]);
-
-            _expectNoEvents = false;
-            _expectEvents = false;
-        }
-
-        /// <summary>
-        /// Expects that the corresponding event has been published (in order specified). The expected event <paramref name="subject"/> and <paramref name="action"/> can use wildcards. All other <see cref="EventData"/> properties are not matched/verified.
-        /// </summary>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        public void Expect(string? destination, string subject, string? action = "*") => Add(destination, ("*", subject.ThrowIfNull(nameof(subject)), action, null, []));
-
-        /// <summary>
-        /// Expects that the corresponding event has been published (in order specified). The expected event <paramref name="source"/>, <paramref name="subject"/> and <paramref name="action"/> can use wildcards. All other <see cref="EventData"/> 
-        /// properties are not matched/verified.
-        /// </summary>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="source">The expected source formatted as a <see cref="Uri"/> (may contain wildcards).</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        public void Expect(string? destination, string source, string subject, string? action = "*") => Add(destination, (source.ThrowIfNull(nameof(source)), subject.ThrowIfNull(nameof(subject)), action, null, []));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="event"/> has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="event">The expected <paramref name="event"/>. Wildcards are supported for <see cref="EventDataBase.Subject"/> and <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="pathsToIgnore">The JSON paths to ignore from the comparison. Defaults to <see cref="UnitTestExExtensions.GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <remarks>Wildcards are supported for <see cref="EventDataBase.Subject"/>, <see cref="EventDataBase.Action"/> and <see cref="EventDataBase.Type"/>.</remarks>
-        public void Expect(string? destination, EventData @event, params string[] pathsToIgnore) => Add(destination, (null, @event?.Subject, @event?.Action, @event.ThrowIfNull(nameof(@event)), pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="event"/> has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="source">The expected source formatted as a <see cref="Uri"/> (may contain wildcards).</param>
-        /// <param name="event">The expected <paramref name="event"/>. Wildcards are supported for <see cref="EventDataBase.Subject"/> and <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="pathsToIgnore">The JSON paths to ignore from the comparison. Defaults to <see cref="UnitTestExExtensions.GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <remarks>Wildcards are supported for <see cref="EventDataBase.Subject"/>, <see cref="EventDataBase.Action"/> and <see cref="EventDataBase.Type"/>.</remarks>
-        public void Expect(string? destination, string source, EventData @event, params string[] pathsToIgnore) => Add(destination, (source, @event?.Subject, @event?.Action, @event.ThrowIfNull(nameof(@event)), pathsToIgnore));
-
-        /// <inheritdoc/>
-        protected override Task OnAssertAsync(AssertArgs args)
-        {
-            var expectedEventPublisher = ExpectedEventPublisher.GetFromSharedState(args.Tester.SharedState);
-            if (expectedEventPublisher is null)
-            {
-                if (_expectNoEvents)
-                    return Task.CompletedTask;
-                else
-                    throw new InvalidOperationException($"The {nameof(ExpectedEventPublisher)}.{nameof(ExpectedEventPublisher.GetFromSharedState)} must not return null; there is an internal issue.");
-            }
-
-            if (!expectedEventPublisher.IsEmpty)
-                args.Tester.Implementor.AssertFail("Expected Event Publish/Send mismatch; there are one or more published events that have not been sent.");
-
-            var names = expectedEventPublisher.PublishedEvents.Keys.ToArray();
-            if (_expectNoEvents && !_expectEvents && _expectedEvents.Count == 0 && names.Length > 0)
-                args.Tester.Implementor.AssertFail($"Expected no Event(s); one or more were published.");
-
-            if (names.Length == 0 && (_expectEvents || _expectedEvents.Count != 0))
-                args.Tester.Implementor.AssertFail($"Expected Event(s); none were published.");
-
-            if (_expectEvents)
-                return Task.CompletedTask;
-
-            if (names.Length != _expectedEvents.Count)
-                args.Tester.Implementor.AssertFail($"Expected {_expectedEvents.Count} event destination(s); there were {names.Length}.");
-
-            if (names.Length == 1 && _expectedEvents.Count == 1 && _expectedEvents.ContainsKey(ExpectedEventPublisher.NullKeyName))
-            {
-                var key = _expectedEvents.Keys.First();
-                AssertDestination(args, key, _expectedEvents[key], [.. EventExpectations<TTester>.GetEvents(expectedEventPublisher, names[0])]);
-                return Task.CompletedTask;
-            }
-
-            foreach (var name in names)
-            {
-                if (_expectedEvents.TryGetValue(name, out var exp))
-                    AssertDestination(args, name, exp, [.. EventExpectations<TTester>.GetEvents(expectedEventPublisher, name)]);
-                else
-                    args.Tester.Implementor.AssertFail($"Published event(s) to destination '{name}'; these were not expected.");
-            }
-
-            var missing = string.Join(", ", _expectedEvents.Keys.Where(key => !names.Contains(key)).Select(x => $"'{x}'"));
-            if (!string.IsNullOrEmpty(missing))
-                args.Tester.Implementor.AssertFail($"Expected event(s) to be published to destination(s): {missing}; none were found.");
-
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Gets the event JSON from the event storage.
-        /// </summary>
-        private static List<string> GetEvents(ExpectedEventPublisher expectedEventPublisher, string? name) 
-            => expectedEventPublisher!.PublishedEvents.TryGetValue(name ?? ExpectedEventPublisher.NullKeyName, out var queue) ? [.. queue.Select(x => x.Json)] : new();
-
-        /// <summary>
-        /// Asserts the events for the destination.
-        /// </summary>
-        private void AssertDestination(AssertArgs args, string? destination, List<(string? Source, string? Subject, string? Action, EventData? Event, string[] PathsToIgnore)> expectedEvents, List<string?> actualEvents)
-        {
-            if (actualEvents.ThrowIfNull(nameof(actualEvents)).Count != expectedEvents.Count)
-                args.Tester.Implementor.AssertFail($"Destination {destination}: Expected {_expectedEvents.Count} event(s); there were {actualEvents.Count} actual.");
-
-            for (int i = 0; i < actualEvents.Count; i++)
-            {
-                var exp = expectedEvents[i].Event;
-                var wcexp = exp ?? new EventData { Subject = expectedEvents[i].Subject, Action = expectedEvents[i].Action };
-                var act = (EventData)args.Tester.JsonSerializer.Deserialize(actualEvents[i]!, wcexp.GetType())!;
-
-                // Assert source, subject, action and type using wildcards where specified.
-                if (expectedEvents[i].Source != null && !WildcardMatch(args, expectedEvents[i].Source!, act.Source?.ToString(), '/'))
-                    args.Tester.Implementor.AssertFail($"Destination {destination}: Expected Event[{i}].{nameof(EventDataBase.Source)} '{expectedEvents[i].Source}' does not match actual '{act.Source}'.");
-
-                if (wcexp.Subject != null && !WildcardMatch(args, wcexp.Subject!, act.Subject?.ToString(), args.Tester.SetUp.GetExpectedEventsFormatter().SubjectSeparatorCharacter))
-                    args.Tester.Implementor.AssertFail($"Destination {destination}: Expected Event[{i}].{nameof(EventDataBase.Subject)} '{wcexp.Subject}' does not match actual '{act.Subject}'.");
-
-                if (wcexp.Action != null && !WildcardMatch(args, wcexp.Action!, act.Action?.ToString(), char.MinValue))
-                    args.Tester.Implementor.AssertFail($"Destination {destination}: Expected Event[{i}].{nameof(EventDataBase.Action)} '{wcexp.Action}' does not match actual '{act.Action}'.");
-
-                if (wcexp.Type != null && !WildcardMatch(args, wcexp.Type!, act.Type?.ToString(), args.Tester.SetUp.GetExpectedEventsFormatter().TypeSeparatorCharacter))
-                    args.Tester.Implementor.AssertFail($"Destination {destination}: Expected Event[{i}].{nameof(EventDataBase.Type)} '{wcexp.Type}' does not match actual '{act.Type}'.");
-
-                // Where there is *no* expected eventdata then skip comparison.
-                if (exp == null)
-                    continue;
-
-                // Compare the events.
-                var list = new List<string>(args.Tester.SetUp.GetExpectedEventsPathsToIgnore());
-                list.AddRange(new string[] { nameof(EventDataBase.Source), nameof(EventDataBase.Subject), nameof(EventDataBase.Action), nameof(EventDataBase.Type) });
-                list.AddRange(expectedEvents[i].PathsToIgnore);
-
-                var res = JsonElementComparer.Default.Compare(args.Tester.JsonSerializer.Serialize(exp), actualEvents[i]!, [.. list]);
-                if (res.HasDifferences)
-                    args.Tester.Implementor.AssertFail($"Destination {destination}; Expected event is not equal to actual:{Environment.NewLine}{res}");
-            }
-        }
-
-        /// <summary>
-        /// Performs a wildcard match on each part of the strings using the <paramref name="separatorCharacter"/> to split.
-        /// </summary>
-        /// <param name="args">The <see cref="AssertArgs"/>.</param>
-        /// <param name="expected">The expected including wildcards.</param>
-        /// <param name="actual">The actual to compare against the expected.</param>
-        /// <param name="separatorCharacter">The seperator character.</param>
-        /// <returns><c>true</c> where there is a wildcard match; otherwise, <c>false</c>.</returns>
-        public bool WildcardMatch(AssertArgs args, string expected, string? actual, char separatorCharacter)
-        {
-            if (expected.ThrowIfNull(nameof(expected)) == "*")
-                return true;
-
-            var eparts = expected.Split(separatorCharacter);
-            if (actual == null)
-                return false;
-
-            var aparts = actual.Split(separatorCharacter);
-
-            // Compare each part for an exact match or wildcard.
-            for (int i = 0; i < eparts.Length; i++)
-            {
-                if (i >= aparts.Length)
-                    return false;
-
-                if (new string[] { aparts[i] }.WhereWildcard(x => x, eparts[i], ignoreCase: false, wildcard: args.Tester.SetUp.GetExpectedEventsWildcard()).FirstOrDefault() == null)
-                    return false;
-            }
-
-            if (aparts.Length == eparts.Length)
-                return true;
-
-            // Where longer make sure last part is a multi wildcard.
-            return aparts.Length > eparts.Length && eparts[^1] == new string(new char[] { args.Tester.SetUp.GetExpectedEventsWildcard().MultiWildcard });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Expectations/ExpectedEventPublisher.cs b/src/CoreEx.UnitTesting/Expectations/ExpectedEventPublisher.cs
deleted file mode 100644
index 6c98b835..00000000
--- a/src/CoreEx.UnitTesting/Expectations/ExpectedEventPublisher.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Events;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using System.Collections.Concurrent;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using UnitTestEx.Abstractions;
-
-namespace UnitTestEx.Expectations
-{
-    /// <summary>
-    /// Provides an expected event publisher to support <see cref="EventExpectations{TTester}"/>.
-    /// </summary>
-    /// <remarks>Where an <see cref="ILogger"/> is provided then each <see cref="EventData"/> will also be logged during <i>Send</i>.
-    /// <para></para></remarks>
-    public sealed class ExpectedEventPublisher : EventPublisher
-    {
-        private readonly TestSharedState _sharedState;
-        private readonly ILogger? _logger;
-        private readonly IJsonSerializer _jsonSerializer;
-
-        /// <summary>
-        /// Get the <c>null</c> key name.
-        /// </summary>
-        public const string NullKeyName = "<default>";
-
-        /// <summary>
-        /// Gets the <see cref="ExpectedEventPublisher"/> from the <see cref="TestSharedState"/>.
-        /// </summary>
-        /// <param name="sharedState">The <see cref="TestSharedState"/>.</param>
-        /// <returns>The <see cref="ExpectedEventPublisher"/> where found; otherwise, <c>null</c>.</returns>
-        internal static ExpectedEventPublisher? GetFromSharedState(TestSharedState sharedState)
-            => sharedState.ThrowIfNull(nameof(sharedState)).StateData.TryGetValue(nameof(ExpectedEventPublisher), out var eep) ? eep as ExpectedEventPublisher : null;
-
-        /// <summary>
-        /// Sets the <see cref="ExpectedEventPublisher"/> into the <see cref="TestSharedState"/>.
-        /// </summary>
-        /// <param name="sharedState">The <see cref="TestSharedState"/>.</param>
-        /// <param name="expectedEventPublisher">The <see cref="ExpectedEventPublisher"/>.</param>
-        internal static void SetToSharedState(TestSharedState sharedState, ExpectedEventPublisher? expectedEventPublisher)
-            => sharedState.ThrowIfNull(nameof(sharedState)).StateData[nameof(ExpectedEventPublisher)] = expectedEventPublisher.ThrowIfNull(nameof(expectedEventPublisher));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExpectedEventPublisher"/> class.
-        /// </summary>
-        /// <param name="sharedState">The <see cref="TestSharedState"/>.</param>
-        /// <param name="logger">The optional <see cref="ILogger"/> for logging the events (each <see cref="EventData"/>).</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/> for the logging. Defaults to <see cref="JsonSerializer.Default"/></param>
-        /// <param name="eventDataFormatter">The <see cref="EventDataFormatter"/>; defaults where not specified.</param>
-        /// <param name="eventSerializer">The <see cref="IEventSerializer"/>; defaults where not specified.</param>
-        public ExpectedEventPublisher(TestSharedState sharedState, ILogger<ExpectedEventPublisher>? logger = null, IJsonSerializer? jsonSerializer = null, EventDataFormatter? eventDataFormatter = null, IEventSerializer? eventSerializer = null)
-            : base(eventDataFormatter, eventSerializer ?? new CoreEx.Text.Json.EventDataSerializer(), new NullEventSender())
-        {
-            _sharedState = sharedState.ThrowIfNull(nameof(sharedState));
-            SetToSharedState(_sharedState, this);
-            _logger = logger;
-            _jsonSerializer = jsonSerializer ?? JsonSerializer.Default;
-        }
-
-        /// <summary>
-        /// Gets the dictionary that contains the actual published and sent events by destination.
-        /// </summary>
-        /// <remarks>The actual published events are queued as the JSON-serialized (indented) representation of the <see cref="EventData"/>, the <see cref="EventData"/> itself, and the corresponding <see cref="EventSendData"/>.</remarks>
-        public ConcurrentDictionary<string, ConcurrentQueue<(string Json, EventData Event, EventSendData SentEvent)>> PublishedEvents { get; } = new();
-
-        /// <summary>
-        /// Indicates whether any events have been published.
-        /// </summary>
-        public bool HasPublishedEvents => !PublishedEvents.IsEmpty;
-
-        /// <summary>
-        /// Gets the total count of published events (across all destinations).
-        /// </summary>
-        public int PublishedEventCount => PublishedEvents.Select(x => x.Value.Count).Sum();
-
-        /// <inheritdoc/>
-        protected override Task OnEventSendAsync(string? name, EventData eventData, EventSendData eventSendData, CancellationToken cancellationToken)
-        {
-            var queue = PublishedEvents.GetOrAdd(name ?? NullKeyName, _ => new ConcurrentQueue<(string Json, EventData Event, EventSendData SentEvent)>());
-            var json = _jsonSerializer.Serialize(eventData, JsonWriteFormat.Indented);
-            queue.Enqueue((json, eventData, eventSendData));
-
-            if (_logger != null)
-            {
-                var sb = new StringBuilder("UnitTestEx > Event send");
-                if (!string.IsNullOrEmpty(name))
-                    sb.Append($" (destination: '{name}')");
-
-                sb.AppendLine(" ->");
-                sb.Append(json);
-                _logger.LogInformation("{Event}", sb.ToString());
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Expectations/UnitTestExExtensions.cs b/src/CoreEx.UnitTesting/Expectations/UnitTestExExtensions.cs
deleted file mode 100644
index f1fc75b8..00000000
--- a/src/CoreEx.UnitTesting/Expectations/UnitTestExExtensions.cs
+++ /dev/null
@@ -1,721 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Events;
-using CoreEx.Http;
-using CoreEx.Wildcards;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Reflection;
-using System.Threading.Tasks;
-using UnitTestEx.Abstractions;
-using UnitTestEx.AspNetCore;
-
-namespace UnitTestEx.Expectations
-{
-    /// <summary>
-    /// Provides extension methods to the core <see href="https://github.com/Avanade/unittestex"/>.
-    /// </summary>
-    public static class UnitTestExExtensions
-    {
-        #region Tester
-
-        private const string TesterBaseIsExpectedEventPublisherConfiguredKey = nameof(TesterBase) + "_" + nameof(IsExpectedEventPublisherConfigured);
-
-        /// <summary>
-        /// Replaces the <see cref="IEventPublisher"/> with the <see cref="ExpectedEventPublisher"/> to enable the <see cref="EventExpectations{TTester}"/>.
-        /// </summary>
-        /// <param name="tester">The <see cref="TesterBase"/>.</param>
-        /// <returns>This will automatically be invoked where the <see cref="TestSetUp"/> <see cref="EnableExpectedEvents(TestSetUp, bool)"/> has been executed.</returns>
-        internal static void UseExpectedEvents(this TesterBase tester)
-        {
-            var usingExpectedEvents = tester.SetUp.Properties.TryGetValue(TesterBaseIsExpectedEventPublisherConfiguredKey, out var val) && (bool)val!;
-
-            if (!usingExpectedEvents)
-            {
-                tester.ConfigureServices(sc => sc.ReplaceScoped<IEventPublisher, ExpectedEventPublisher>());
-                tester.SetUp.Properties[TesterBaseIsExpectedEventPublisherConfiguredKey] = true;
-            }
-        }
-
-        /// <summary>
-        /// Replaces the <see cref="IEventPublisher"/> with the <see cref="ExpectedEventPublisher"/> to enable the <see cref="EventExpectations{TTester}"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</typeparam>
-        /// <param name="tester">The <see cref="TesterBase"/>.</param>
-        /// <returns>This will automatically be invoked where the <see cref="TestSetUp"/> <see cref="EnableExpectedEvents(TestSetUp, bool)"/> has been executed.</returns>
-        public static TSelf UseExpectedEvents<TSelf>(this TesterBase<TSelf> tester) where TSelf : TesterBase<TSelf>
-        {
-            ((TesterBase)tester).UseExpectedEvents();
-            return (TSelf)tester;
-        }
-
-        /// <summary>
-        /// Gets whether the <see cref="UseExpectedEvents{TSelf}(TesterBase{TSelf})"/> has been invoked
-        /// </summary>
-        /// <param name="tester">The <see cref="TesterBase"/>.</param>
-        /// <returns>Indicates whether the <see cref="ExpectedEventPublisher"/> is configured.</returns>
-        public static bool IsExpectedEventPublisherConfigured(this TesterBase tester) => tester.SetUp.Properties.TryGetValue(TesterBaseIsExpectedEventPublisherConfiguredKey, out var val) && (bool)val!;
-
-        /// <summary>
-        /// Gets the <see cref="ExpectedEventPublisher"/> from the <see cref="TesterBase.Services"/>.
-        /// </summary>
-        /// <param name="tester">The <see cref="TesterBase"/>.</param>
-        /// <returns>The <see cref="ExpectedEventPublisher"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown where the <see cref="ExpectedEventPublisher"/> has not been configured (<see cref="IsExpectedEventPublisherConfigured"/>).</exception>
-        public static ExpectedEventPublisher GetExpectedEventPublisher(this TesterBase tester)
-        {
-            if (!IsExpectedEventPublisherConfigured(tester))
-                throw new InvalidOperationException($"The {nameof(ExpectedEventPublisher)} has not been configured. Please ensure that the {nameof(UseExpectedEvents)} method has been invoked.");
-
-            return (ExpectedEventPublisher)tester.Services.GetRequiredService<IEventPublisher>();
-        }
-
-        #endregion
-
-        #region TestSetUp
-
-        private const string ExpectedEventsPathsToIgnoreKey = nameof(ExpectedEventPublisher) + "_" + "PathsToIgnore";
-        private const string ExpectedEventsWildcardKey = nameof(ExpectedEventPublisher) + "_" + nameof(Wildcard);
-        private const string ExpectedEventsFormatterKey = nameof(ExpectedEventPublisher) + "_" + nameof(EventDataFormatter);
-        private const string ExpectedEventsEnabledKey = nameof(ExpectedEventPublisher) + "_" + nameof(EnableExpectedEvents);
-        private const string ExpectedNoEventsKey = nameof(ExpectedEventPublisher) + "_" + nameof(ExpectNoEvents);
-
-        /// <summary>
-        /// Gets the <see cref="ExpectedEventPublisher"/> JSON paths to ignore from the <see cref="TestSetUp.Properties"/>.
-        /// </summary>
-        /// <param name="setUp">The <see cref="TestSetUp"/>.</param>
-        /// <returns>The <see cref="ExpectedEventPublisher"/> JSON paths to ignore.</returns>
-        /// <remarks>By default <see cref="EventDataBase.Id"/>, <see cref="EventDataBase.CorrelationId"/>, <see cref="EventDataBase.Timestamp"/>, <see cref="EventDataBase.ETag"/> and <see cref="EventDataBase.Key"/> are ignored.</remarks>
-        public static List<string> GetExpectedEventsPathsToIgnore(this TestSetUp setUp)
-        {
-            if (setUp.Properties.TryGetValue(ExpectedEventsPathsToIgnoreKey, out var pathsToIgnore))
-                return (List<string>)pathsToIgnore!;
-
-            var pti = new List<string>() { nameof(EventDataBase.Id), nameof(EventDataBase.CorrelationId), nameof(EventDataBase.Timestamp), nameof(EventDataBase.ETag), nameof(EventDataBase.Key) };
-            setUp.Properties.TryAdd(ExpectedEventsPathsToIgnoreKey, pti);
-            return pti;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="ExpectedEventPublisher"/> <see cref="Wildcard"/> parser from the <see cref="TestSetUp.Properties"/>.
-        /// </summary>
-        /// <param name="setUp">The <see cref="TestSetUp"/>.</param>
-        /// <returns>The <see cref="Wildcard"/> parser.</returns>
-        public static Wildcard GetExpectedEventsWildcard(this TestSetUp setUp)
-            => setUp.Properties.TryGetValue(ExpectedEventsWildcardKey, out var wildcard) ? (Wildcard)wildcard! : SetExpectedEventsWildcard(setUp, Wildcard.MultiAll);
-
-        /// <summary>
-        /// Sets the <see cref="ExpectedEventPublisher"/> <see cref="Wildcard"/> parser into the <see cref="TestSetUp.Properties"/>.
-        /// </summary>
-        /// <param name="setUp">The <see cref="TestSetUp"/>.</param>
-        /// <param name="wildcard">The <see cref="Wildcard"/> parser.</param>
-        public static Wildcard SetExpectedEventsWildcard(this TestSetUp setUp, Wildcard wildcard)
-        {
-            setUp.Properties[ExpectedEventsWildcardKey] = wildcard;
-            return wildcard;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="ExpectedEventPublisher"/> <see cref="EventDataFormatter"/> from the <see cref="TestSetUp.Properties"/>.
-        /// </summary>
-        /// <param name="setUp">The <see cref="TestSetUp"/>.</param>
-        /// <returns>The <see cref="Wildcard"/> parser.</returns>
-        public static EventDataFormatter GetExpectedEventsFormatter(this TestSetUp setUp)
-            => setUp.Properties.TryGetValue(ExpectedEventsFormatterKey, out var formatter) ? (EventDataFormatter)formatter! : SetExpectedEventsFormatter(setUp, new EventDataFormatter());
-
-        /// <summary>
-        /// Sets the <see cref="ExpectedEventPublisher"/> <see cref="EventDataFormatter"/> into the <see cref="TestSetUp.Properties"/>.
-        /// </summary>
-        /// <param name="setUp">The <see cref="TestSetUp"/>.</param>
-        /// <param name="formatter">The <see cref="Wildcard"/> parser.</param>
-        public static EventDataFormatter SetExpectedEventsFormatter(this TestSetUp setUp, EventDataFormatter formatter)
-        {
-            setUp.Properties[ExpectedEventsFormatterKey] = formatter;
-            return formatter;
-        }
-
-        /// <summary>
-        /// Sets whether the <see cref="EventExpectations{TTester}"/> functionality is enabled.
-        /// </summary>
-        /// <param name="setup">The <see cref="TestSetUp"/>.</param>
-        /// <param name="enabled">The enabled option.</param>
-        /// <remarks>Where enabled the <see cref="IEventSender"/> will be automatically replaced by the <see cref="Expectations.ExpectedEventPublisher"/> that is used by the <see cref="EventExpectations{TTester}"/> to verify that the
-        /// expected events were sent. Therefore, the events will <b>not</b> be sent to any external eventing/messaging system as a result.</remarks>
-        public static void EnableExpectedEvents(this TestSetUp setup, bool enabled = true) => setup.Properties[ExpectedEventsEnabledKey] = enabled;
-
-        /// <summary>
-        /// Indicates whether the <b>ExpectedEvents</b> functionality is enabled (see <see cref="EnableExpectedEvents"/>). Defaults to <c>false</c>.
-        /// </summary>
-        /// <param name="setup">The <see cref="TestSetUp"/>.</param>
-        public static bool IsExpectedEventsEnabled(this TestSetUp setup) => setup.Properties.TryGetValue(ExpectedEventsEnabledKey, out var enabled) && (bool)enabled!;
-
-        /// <summary>
-        /// Sets whether to verify that <b>no</b> events are published as the default behaviour. Defaults to <c>true</c>.
-        /// </summary>
-        /// <param name="setup">The <see cref="TestSetUp"/>.</param>
-        /// <param name="expectNoEvents">The expectation option.</param>
-        public static void ExpectNoEvents(this TestSetUp setup, bool expectNoEvents = true) => setup.Properties[ExpectedNoEventsKey] = expectNoEvents;
-
-        /// <summary>
-        /// Indicates whether to verify that <b>no</b> events are published as the default behaviour. Defaults to <c>true</c>.
-        /// </summary>
-        /// <param name="setup">The <see cref="TestSetUp"/>.</param>
-        public static bool IsExpectingNoEvents(this TestSetUp setup) => setup.Properties.TryGetValue(ExpectedNoEventsKey, out var expectNoEvents) && (bool)expectNoEvents!;
-
-        #endregion   
-
-        #region EventExpectations
-
-        /// <summary>
-        /// Invokes the set expectation logic.
-        /// </summary>
-        private static TSelf SetEventExpectation<TSelf>(this IExpectations<TSelf> tester, Action<EventExpectations<TSelf>> action) where TSelf : IExpectations<TSelf>
-        {
-            var ee = tester.ExpectationsArranger.GetOrAdd(() => new EventExpectations<TSelf>(tester.ExpectationsArranger.Owner, (TSelf)tester));
-            action(ee);
-            return (TSelf)tester;
-        }
-
-        /// <summary>
-        /// Expects that no events have been published. 
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>On first invocation will automatically replace <see cref="IEventPublisher"/> with a new <see cref="InMemoryPublisher"/> scoped service (DI) to capture events for this expectation. The other services are therefore required
-        /// for this to function. As this is a scoped service no parallel execution of services against the same test host is supported as this capability is not considered thread-safe.</remarks>
-        public static TSelf ExpectNoEvents<TSelf>(this IExpectations<TSelf> tester) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.ExpectNoEvents());
-
-        /// <summary>
-        /// Expects that at least one event has been published. 
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>On first invocation will automatically replace <see cref="IEventPublisher"/> with a new <see cref="InMemoryPublisher"/> scoped service (DI) to capture events for this expectation. The other services are therefore required
-        /// for this to function. As this is a scoped service no parallel execution of services against the same test host is supported as this capability is not considered thread-safe.</remarks>
-        public static TSelf ExpectEvents<TSelf>(this IExpectations<TSelf> tester) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.ExpectEvents());
-
-        /// <summary>
-        /// Expects that the corresponding event has been published (in order specified). The expected event <paramref name="subject"/> and <paramref name="action"/> can use wildcards. All other <see cref="EventData"/> properties are not matched/verified.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>On first invocation will automatically replace <see cref="IEventPublisher"/> with a new <see cref="InMemoryPublisher"/> scoped service (DI) to capture events for this expectation. The other services are therefore required
-        /// for this to function. As this is a scoped service no parallel execution of services against the same test host is supported as this capability is not considered thread-safe.</remarks>
-        public static TSelf ExpectEvent<TSelf>(this IExpectations<TSelf> tester, string subject, string? action = "*") where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(null, subject, action));
-
-        /// <summary>
-        /// Expects that the corresponding event <paramref name="value"/> has been published (in order specified). The expected event <paramref name="subject"/> and <paramref name="action"/> can use wildcards.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="value">The expected <see cref="EventData.Value"/>.</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison. Defaults to <see cref="UnitTestExExtensions.GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectEventValue<TSelf>(this IExpectations<TSelf> tester, object? value, string subject, string? action, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(null, new EventData { Subject = subject, Action = action, Value = value }, pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the corresponding event has been published (in order specified). The expected event <paramref name="source"/>, <paramref name="subject"/> and <paramref name="action"/> can use wildcards. All other <see cref="EventData"/> 
-        /// properties are not matched/verified.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="source">The expected source formatted as a <see cref="Uri"/> (may contain wildcards).</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>On first invocation will automatically replace <see cref="IEventPublisher"/> with a new <see cref="InMemoryPublisher"/> scoped service (DI) to capture events for this expectation. The other services are therefore required
-        /// for this to function. As this is a scoped service no parallel execution of services against the same test host is supported as this capability is not considered thread-safe.</remarks>
-        public static TSelf ExpectEvent<TSelf>(this IExpectations<TSelf> tester, string source, string subject, string? action = "*") where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(null, source, subject, action));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="event"/> has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="event">The expected <paramref name="event"/>. Wildcards are supported for <see cref="EventDataBase.Subject"/> and <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison. Defaults to <see cref="GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>Wildcards are supported for <see cref="EventDataBase.Subject"/>, <see cref="EventDataBase.Action"/> and <see cref="EventDataBase.Type"/>.</remarks>
-        public static TSelf ExpectEvent<TSelf>(this IExpectations<TSelf> tester, EventData @event, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(null, @event, pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="event"/> has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="source">The expected source formatted as a <see cref="Uri"/> (may contain wildcards).</param>
-        /// <param name="event">The expected <paramref name="event"/>. Wildcards are supported for <see cref="EventDataBase.Subject"/> and <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison. Defaults to <see cref="GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>Wildcards are supported for <see cref="EventDataBase.Subject"/>, <see cref="EventDataBase.Action"/> and <see cref="EventDataBase.Type"/>.</remarks>
-        public static TSelf ExpectEvent<TSelf>(this IExpectations<TSelf> tester, string source, EventData @event, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(null, source, @event, pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the JSON serialized <see cref="EventData"/> from the named embedded resource has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name) that contains the expected value as serialized JSON.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectEventFromJsonResource<TSelf>(this IExpectations<TSelf> tester, string resourceName, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => ExpectEventFromJsonResource(tester, resourceName, Assembly.GetCallingAssembly(), pathsToIgnore);
-
-        /// <summary>
-        /// Expects that the JSON serialized <see cref="EventData"/> from the named embedded resource has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name) that contains the expected value as serialized JSON.</param>
-        /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectEventFromJsonResource<TSelf>(this IExpectations<TSelf> tester, string resourceName, Assembly assembly, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(null, Resource.GetJsonValue<EventData>(resourceName, assembly ?? Assembly.GetCallingAssembly(), e.Owner.JsonSerializer), pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="destination"/> event has been published (in order specified). The expected event <paramref name="subject"/> and <paramref name="action"/> can use wildcards. All other <see cref="EventData"/> properties are not matched/verified.
-        /// </summary>
-        /// <param name="tester">The <see cref="HttpTesterBase{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>On first invocation will automatically replace <see cref="IEventPublisher"/> with a new <see cref="InMemoryPublisher"/> scoped service (DI) to capture events for this expectation. The other services are therefore required
-        /// for this to function. As this is a scoped service no parallel execution of services against the same test host is supported as this capability is not considered thread-safe.</remarks>
-        public static TSelf ExpectDestinationEvent<TSelf>(this IExpectations<TSelf> tester, string destination, string subject, string? action = "*") where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(destination, subject, action));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="destination"/> event <paramref name="value"/> has been published (in order specified). The expected event <paramref name="subject"/> and <paramref name="action"/> can use wildcards.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="value">The expected <see cref="EventData.Value"/>.</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison. Defaults to <see cref="GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectDestinationEventValue<TSelf>(this IExpectations<TSelf> tester, object? value, string destination, string subject, string? action, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(destination, new EventData { Subject = subject, Action = action, Value = value }, pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="destination"/> event has been published (in order specified). The expected event <paramref name="source"/>, <paramref name="subject"/> and <paramref name="action"/> can use wildcards. All other <see cref="EventData"/> 
-        /// properties are not matched/verified.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="source">The expected source formatted as a <see cref="Uri"/> (may contain wildcards).</param>
-        /// <param name="subject">The expected subject (may contain wildcards).</param>
-        /// <param name="action">The expected action (may contain wildcards).</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>On first invocation will automatically replace <see cref="IEventPublisher"/> with a new <see cref="InMemoryPublisher"/> scoped service (DI) to capture events for this expectation. The other services are therefore required
-        /// for this to function. As this is a scoped service no parallel execution of services against the same test host is supported as this capability is not considered thread-safe.</remarks>
-        public static TSelf ExpectDestinationEvent<TSelf>(this IExpectations<TSelf> tester, string destination, string source, string subject, string? action = "*") where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(destination, source, subject, action));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="destination"/> <paramref name="event"/> has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="event">The expected <paramref name="event"/>. Wildcards are supported for <see cref="EventDataBase.Subject"/> and <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison. Defaults to <see cref="GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>Wildcards are supported for <see cref="EventDataBase.Subject"/>, <see cref="EventDataBase.Action"/> and <see cref="EventDataBase.Type"/>.</remarks>
-        public static TSelf ExpectDestinationEvent<TSelf>(this IExpectations<TSelf> tester, string destination, EventData @event, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(destination, @event, pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the corresponding <paramref name="destination"/> <paramref name="event"/> has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="source">The expected source formatted as a <see cref="Uri"/> (may contain wildcards).</param>
-        /// <param name="event">The expected <paramref name="event"/>. Wildcards are supported for <see cref="EventDataBase.Subject"/> and <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison. Defaults to <see cref="GetExpectedEventsPathsToIgnore"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>Wildcards are supported for <see cref="EventDataBase.Subject"/>, <see cref="EventDataBase.Action"/> and <see cref="EventDataBase.Type"/>.</remarks>
-        public static TSelf ExpectDestinationEvent<TSelf>(this IExpectations<TSelf> tester, string destination, string source, EventData @event, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(destination, source, @event, pathsToIgnore));
-
-        /// <summary>
-        /// Expects that the JSON serialized <see cref="EventData"/> from the named embedded resource has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name) that contains the expected value as serialized JSON.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectDestinationEventFromJsonResource<TSelf>(this IExpectations<TSelf> tester, string destination, string resourceName, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => ExpectDestinationEventFromJsonResource(tester, destination, resourceName, Assembly.GetCallingAssembly(), pathsToIgnore);
-
-        /// <summary>
-        /// Expects that the JSON serialized <see cref="EventData"/> from the named embedded resource has been published (in order specified). All properties for expected event will be compared again the actual.
-        /// </summary>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="destination">The named destination (e.g. queue or topic).</param>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name) that contains the expected value as serialized JSON.</param>
-        /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource.</param>
-        /// <param name="pathsToIgnore">The paths to ignore from the comparison.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectDestinationEventFromJsonResource<TSelf>(this IExpectations<TSelf> tester, string destination, string resourceName, Assembly assembly, params string[] pathsToIgnore) where TSelf : IExpectations<TSelf>
-            => tester.SetEventExpectation(e => e.Expect(destination, Resource.GetJsonValue<EventData>(resourceName, assembly ?? Assembly.GetCallingAssembly(), e.Owner.JsonSerializer), pathsToIgnore));
-
-        #endregion
-
-        #region ValueExpectations
-
-        /// <summary>
-        /// Invokes the set expectation logic.
-        /// </summary>
-        private static TSelf SetValueExpectationExtension<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, Func<AssertArgs, Task<bool>> extension) where TSelf : IValueExpectations<TValue, TSelf>
-        {
-            tester.ExpectationsArranger.GetOrAdd(() => new ValueExpectations<TSelf>(tester.ExpectationsArranger.Owner, (TSelf)tester)).AddExtension(extension);
-            return (TSelf)tester;
-        }
-
-        /// <summary>
-        /// Verifies implements <see cref="Type"/>.
-        /// </summary>
-        private static void VerifyImplements<TValue, TInterface>()
-        {
-            if (typeof(TValue).GetInterface(typeof(TInterface).FullName ?? typeof(TInterface).Name) == null)
-                throw new InvalidOperationException($"{typeof(TValue).Name} must implement the interface {typeof(TInterface).Name}.");
-        }
-
-        /// <summary>
-        /// Expects the <see cref="IIdentifier"/> to be implemented and have non-default <see cref="IIdentifier.Id"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <param name="identifier">The optional expected identifier to compare to.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectIdentifier<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, object? identifier = null) where TSelf : IValueExpectations<TValue, TSelf>
-        {
-            VerifyImplements<TValue, IIdentifier>();
-            IgnoreIdentifier(tester);
-            var pn = $"{nameof(IIdentifier)}.{nameof(IIdentifier.Id)}";
-
-            Task<bool> extension(AssertArgs args)
-            {
-                var id = args.Value as IIdentifier;
-                if (id is null || id.Id is null)
-                    args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
-
-                if (identifier is null)
-                {
-                    if (System.Collections.Comparer.Default.Compare(id!.Id, id!.GetType().IsClass ? null! : Activator.CreateInstance(id!.GetType())) == 0)
-                        args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-default value.");
-                }
-                else
-                    args.Tester.Implementor.AssertAreEqual(identifier, id!.Id, $"Expected {pn} value of '{identifier}'; actual '{id.Id}'.");
-
-                return Task.FromResult(false);
-            }
-
-            return SetValueExpectationExtension(tester, extension);
-        }
-
-        /// <summary>
-        /// Expects the <see cref="IPrimaryKey"/> to be implemented and have non-default <see cref="IPrimaryKey.PrimaryKey"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <param name="primaryKey">The optional expected primary key to compare to.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectPrimaryKey<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, object? primaryKey) where TSelf : IValueExpectations<TValue, TSelf>
-            => ExpectPrimaryKey(tester, new CompositeKey(primaryKey));
-
-        /// <summary>
-        /// Expects the <see cref="IPrimaryKey"/> to be implemented and have non-default <see cref="IPrimaryKey.PrimaryKey"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <param name="primaryKey">The optional expected primary key to compare to.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectPrimaryKey<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, CompositeKey? primaryKey = null) where TSelf : IValueExpectations<TValue, TSelf>
-        {
-            VerifyImplements<TValue, IPrimaryKey>();
-            IgnorePrimaryKey(tester);
-            var pn = $"{nameof(IPrimaryKey)}.{nameof(IPrimaryKey.PrimaryKey)}";
-
-            Task<bool> extension(AssertArgs args)
-            {
-                var pk = args.Value as IPrimaryKey;
-                if (pk is null)
-                    args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
-
-                if (pk!.PrimaryKey.IsInitial)
-                    args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(CompositeKey.Args)} to have one or more non-default values.");
-
-                if (primaryKey.HasValue)
-                     args.Tester.Implementor.AssertAreEqual(primaryKey.Value, pk.PrimaryKey, $"Expected {pn} value of '{primaryKey.Value}'; actual '{pk.PrimaryKey}'.");
-
-                return Task.FromResult(false);
-            }
-
-            return SetValueExpectationExtension(tester, extension);
-        }
-
-        /// <summary>
-        /// Expects the <see cref="IETag"/> to be implemented and have non-default <see cref="IETag.ETag"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <param name="previousETag">The optional previous ETag to compare not equal to; i.e. it must be different.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectETag<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, string? previousETag = null) where TSelf : IValueExpectations<TValue, TSelf>
-        {
-            VerifyImplements<TValue, IETag>();
-            IgnoreETag(tester);
-            var pn = $"{nameof(IETag)}.{nameof(IETag.ETag)}";
-
-            Task<bool> extension(AssertArgs args)
-            {
-                var etag = args.Value as IETag;
-                if (etag is null || etag.ETag is null)
-                    args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
-
-                if (previousETag is not null && previousETag == etag!.ETag)
-                    args.Tester.Implementor.AssertFail($"Expected {pn} value of '{previousETag}' to be different to actual.");
-
-                return Task.FromResult(false);
-            }
-
-            return SetValueExpectationExtension(tester, extension);
-        }
-
-        /// <summary>
-        /// Expects the <see cref="IChangeLog"/> to be implemented and have non-default <see cref="IChangeLog.ChangeLog"/> <see cref="ChangeLog.CreatedBy"/> and <see cref="ChangeLog.CreatedDate"/> values.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <param name="createdBy">The specific <see cref="ChangeLog.CreatedBy"/> value where specified (can include wildcards); otherwise, indicates to check for user running the test (see <see cref="Abstractions.TesterBase.UserName"/>).</param>
-        /// <param name="createdDateGreaterThan">The <see cref="DateTime"/> in which the <see cref="ChangeLog.CreatedDate"/> should be greater than or equal to; where <c>null</c> it will default to <see cref="DateTime.UtcNow"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectChangeLogCreated<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, string? createdBy = null, DateTime? createdDateGreaterThan = null) where TSelf : IValueExpectations<TValue, TSelf>
-        {
-            VerifyImplements<TValue, IChangeLog>();
-            IgnoreChangeLog(tester);
-            var pn = $"{nameof(IChangeLog)}.{nameof(IChangeLog.ChangeLog)}";
-
-            createdBy ??= tester.ExpectationsArranger.Owner.UserName;
-            createdDateGreaterThan = Cleaner.Clean(createdDateGreaterThan ?? DateTime.UtcNow.Subtract(new TimeSpan(0, 0, 1)));
-
-            Task<bool> extension(AssertArgs args)
-            {
-                var cl = args.Value as IChangeLogAuditLog;
-                if (cl is null || cl.ChangeLogAudit == null)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}) to have a non-null value.");
-
-                if (cl!.ChangeLogAudit!.CreatedBy == null)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.CreatedBy)} value of '{createdBy}'; actual was null.");
-                else
-                {
-                    var wcr = Wildcard.BothAll.Parse(createdBy).ThrowOnError();
-                    if (cl?.ChangeLogAudit?.CreatedBy == null || !wcr.CreateRegex().IsMatch(cl!.ChangeLogAudit!.CreatedBy))
-                        args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.CreatedBy)} value of '{createdBy}'; actual '{cl?.ChangeLogAudit?.CreatedBy}'.");
-                }
-
-                if (!cl!.ChangeLogAudit!.CreatedDate.HasValue)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.CreatedDate)} to have a non-null value.");
-                else if (Cleaner.Clean(cl!.ChangeLogAudit!.CreatedDate.Value) < createdDateGreaterThan.Value)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.CreatedDate)} value of '{createdDateGreaterThan.Value}'; actual '{cl.ChangeLogAudit.CreatedDate.Value}' must be greater than or equal to expected.");
-
-                return Task.FromResult(false);
-            }
-
-            return SetValueExpectationExtension(tester, extension);
-        }
-
-        /// <summary>
-        /// Expects the <see cref="IChangeLog"/> to be implemented and have non-default <see cref="IChangeLog.ChangeLog"/> <see cref="ChangeLog.UpdatedBy"/> and <see cref="ChangeLog.UpdatedDate"/> values.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <param name="updatedBy">The specific <see cref="ChangeLog.UpdatedBy"/> value where specified (can include wildcards); otherwise, indicates to check for user running the test (see <see cref="Abstractions.TesterBase.UserName"/>).</param>
-        /// <param name="updatedDateGreaterThan">The <see cref="DateTime"/> in which the <see cref="ChangeLog.UpdatedDate"/> should be greater than or equal to; where <c>null</c> it will default to <see cref="DateTime.UtcNow"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectChangeLogUpdated<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, string? updatedBy = null, DateTime? updatedDateGreaterThan = null) where TSelf : IValueExpectations<TValue, TSelf>
-        {
-            VerifyImplements<TValue, IChangeLog>();
-            IgnoreChangeLog(tester);
-            var pn = $"{nameof(IChangeLog)}.{nameof(IChangeLog.ChangeLog)}";
-
-            updatedBy ??= tester.ExpectationsArranger.Owner.UserName;
-            updatedDateGreaterThan = Cleaner.Clean(updatedDateGreaterThan ?? DateTime.UtcNow.Subtract(new TimeSpan(0, 0, 1)));
-
-            Task<bool> extension(AssertArgs args)
-            {
-                var cl = args.Value as IChangeLogAuditLog;
-                if (cl is null || cl.ChangeLogAudit == null)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}) to have a non-null value.");
-
-                if (cl!.ChangeLogAudit!.UpdatedBy == null)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.UpdatedBy)} value of '{updatedBy}'; actual was null.");
-                else
-                {
-                    var wcr = Wildcard.BothAll.Parse(updatedBy).ThrowOnError();
-                    if (cl?.ChangeLogAudit?.UpdatedBy == null || !wcr.CreateRegex().IsMatch(cl!.ChangeLogAudit!.UpdatedBy))
-                        args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.UpdatedBy)} value of '{updatedBy}'; actual '{cl?.ChangeLogAudit?.UpdatedBy}'.");
-                }
-
-                if (!cl!.ChangeLogAudit!.UpdatedDate.HasValue)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.UpdatedDate)} to have a non-null value.");
-                else if (Cleaner.Clean(cl!.ChangeLogAudit!.UpdatedDate.Value) < updatedDateGreaterThan.Value)
-                    args.Tester.Implementor.AssertFail($"Expected Change Log ({nameof(IChangeLogAuditLog)}.{nameof(IChangeLogAuditLog.ChangeLogAudit)}).{nameof(ChangeLog.UpdatedDate)} value of '{updatedDateGreaterThan.Value}'; actual '{cl.ChangeLogAudit.UpdatedDate.Value}' must be greater than or equal to expected.");
-
-                return Task.FromResult(false);
-            }
-
-            return SetValueExpectationExtension(tester, extension);
-        }
-
-        #endregion
-
-        #region IgnorePathsExpectations
-
-        /// <summary>
-        /// Ignores the <see cref="IIdentifier.Id"/> JSON path.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf IgnoreIdentifier<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf> => IgnorePaths(tester, nameof(IIdentifier.Id));
-
-        /// <summary>
-        /// Ignores the <see cref="IPrimaryKey.PrimaryKey"/> JSON path.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf IgnorePrimaryKey<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf> => IgnorePaths(tester, nameof(IPrimaryKey.PrimaryKey));
-
-        /// <summary>
-        /// Ignores the <see cref="IETag.ETag"/> JSON path.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf IgnoreETag<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf> => IgnorePaths(tester, nameof(IETag.ETag));
-
-        /// <summary>
-        /// Ignores the <see cref="IChangeLog.ChangeLog"/> JSON path.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf IgnoreChangeLog<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf> => IgnorePaths(tester, nameof(IChangeLog.ChangeLog));
-
-        /// <summary>
-        /// Adds <paramref name="paths"/> to ignore from the JSON value comparison.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
-        /// <param name="paths">The JSON paths to ignore.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf IgnorePaths<TSelf>(IExpectations<TSelf> tester, params string[] paths) where TSelf : IExpectations<TSelf>
-        {
-            tester.ExpectationsArranger.PathsToIgnore.AddRange(paths);
-            return (TSelf)tester;
-        }
-
-        #endregion
-
-        #region ErrorExpectations
-
-        /// <summary>
-        /// Expects the specified <paramref name="errorType"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <param name="expectations">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="errorType">The expected <see cref="ErrorType"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
-        public static TSelf ExpectErrorType<TSelf>(this IExpectations<TSelf> expectations, ErrorType errorType) where TSelf : IExpectations<TSelf>
-        {
-            var ee = expectations.ExpectationsArranger.GetOrAdd(() => new ErrorExpectations<TSelf>(expectations.ExpectationsArranger.Owner, (TSelf)expectations));
-
-            ee.AddExtension(args =>
-            {
-                if (args.Exception is not null)
-                {
-                    if (args.Exception is IExtendedException eex)
-                    {
-                        if (eex.ErrorType != errorType.ToString())
-                            args.Tester.Implementor.AssertFail($"Expected error type of '{errorType}' but actual was '{eex.ErrorType}'.");
-                        else
-                            return Task.FromResult(false);
-                    }
-                }
-
-                if (args.TryGetExtra<HttpResponseMessage>(out var result) && result is not null)
-                {
-                    if (result.Headers.TryGetValues(HttpConsts.ErrorTypeHeaderName, out var vals))
-                    {
-                        if (vals.Contains(errorType.ToString()))
-                            return Task.FromResult(false);
-                        else
-                            args.Tester.Implementor.AssertFail($"Expected error type of '{errorType}' but actual was {string.Join(", ", vals.Select(x => $"'{x}'"))}.");
-                    }
-                }
-
-                args.Tester.Implementor.AssertFail($"Expected error type of '{errorType}' but none was returned.");
-                return Task.FromResult(false);
-            });
-
-            return (TSelf)expectations;
-        }
-
-        /// <summary>
-        /// Expects that one or more errors will be returned matching the specified <paramref name="messages"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <param name="expectations">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="messages">The error messages.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns> 
-        public static TSelf ExpectErrors<TSelf>(this IExpectations<TSelf> expectations, MessageItemCollection messages) where TSelf : IExpectations<TSelf>
-            => ExpectErrors(expectations, messages is null ? [] : messages.ToArray());
-
-        /// <summary>
-        /// Expects that one or more errors will be returned matching the specified <paramref name="messages"/>.
-        /// </summary>
-        /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
-        /// <param name="expectations">The <see cref="IExpectations{TSelf}"/>.</param>
-        /// <param name="messages">The error messages.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns> 
-        public static TSelf ExpectErrors<TSelf>(this IExpectations<TSelf> expectations, params MessageItem[] messages) where TSelf : IExpectations<TSelf>
-        {
-            if (messages.Length == 0)
-                return (TSelf)expectations;
-
-            var errors = new List<ApiError>();
-            foreach (var msg in messages.Where(x => x.Type == MessageType.Error))
-                errors.Add(new ApiError(msg.Property, msg.Text ?? string.Empty));
-
-            return expectations.ExpectErrors(errors.ToArray());
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/GlobalUsing.cs b/src/CoreEx.UnitTesting/GlobalUsing.cs
new file mode 100644
index 00000000..278e0068
--- /dev/null
+++ b/src/CoreEx.UnitTesting/GlobalUsing.cs
@@ -0,0 +1,45 @@
+global using AwesomeAssertions.Execution;
+global using AwesomeAssertions.Primitives;
+global using CloudNative.CloudEvents;
+global using CoreEx;
+global using CoreEx.Azure.Messaging.ServiceBus;
+global using CoreEx.Data;
+global using CoreEx.Database.Postgres.Outbox;
+global using CoreEx.Database.SqlServer.Outbox;
+global using CoreEx.Entities;
+global using CoreEx.Entities.Abstractions;
+global using CoreEx.Events;
+global using CoreEx.Events.Publishing;
+global using CoreEx.Events.Subscribing;
+global using CoreEx.Hosting;
+global using CoreEx.Http.Abstractions;
+global using CoreEx.Json;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Security;
+global using CoreEx.Text;
+global using CoreEx.UnitTesting.Events;
+global using CoreEx.Validation;
+global using DbEx;
+global using DbEx.Migration;
+global using DbEx.Migration.Data;
+global using DbEx.Postgres.Migration;
+global using DbEx.SqlServer.Migration;
+global using AwesomeAssertions;
+global using Microsoft.Extensions.DependencyInjection;
+global using System.Collections.Concurrent;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Reflection;
+global using System.Text;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.RegularExpressions;
+global using UnitTestEx;
+global using UnitTestEx.Abstractions;
+global using UnitTestEx.AspNetCore;
+global using UnitTestEx.Assertors;
+global using UnitTestEx.Expectations;
+global using UnitTestEx.Hosting;
+global using YamlDotNet.Core.Events;
+global using YamlDotNet.Serialization;
+global using Asb = Azure.Messaging.ServiceBus;
+global using ExecutionContext = CoreEx.ExecutionContext;
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/GlobalUsings.cs b/src/CoreEx.UnitTesting/GlobalUsings.cs
new file mode 100644
index 00000000..2a3df51d
--- /dev/null
+++ b/src/CoreEx.UnitTesting/GlobalUsings.cs
@@ -0,0 +1,4 @@
+global using AwesomeAssertions.Execution;
+global using AwesomeAssertions.Primitives;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
diff --git a/src/CoreEx.UnitTesting/Json/ToCoreExJsonSerializerMapper.cs b/src/CoreEx.UnitTesting/Json/ToCoreExJsonSerializerMapper.cs
deleted file mode 100644
index a6b77a7b..00000000
--- a/src/CoreEx.UnitTesting/Json/ToCoreExJsonSerializerMapper.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace UnitTestEx.Json
-{
-    /// <summary>
-    /// Provides a wrapper for <see cref="IJsonSerializer"/> to <see cref="CoreEx.Json.IJsonSerializer"/>.
-    /// </summary>
-    /// <remarks>Only the compatible capabilities have been implemented.</remarks>
-    /// <param name="testJsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    public class ToCoreExJsonSerializerMapper(IJsonSerializer testJsonSerializer) : CoreEx.Json.IJsonSerializer
-    {
-        private readonly IJsonSerializer _testJsonSerializer = testJsonSerializer.ThrowIfNull(nameof(testJsonSerializer));
-
-        /// <inheritdoc/>
-        public object Options => _testJsonSerializer.Options;
-
-        /// <inheritdoc/>
-        public object? Deserialize(string json) => _testJsonSerializer.Deserialize(json);
-
-        /// <inheritdoc/>
-        public object? Deserialize(string json, Type type) => _testJsonSerializer.Deserialize(json, type);
-
-        /// <inheritdoc/>
-        public T? Deserialize<T>(string json) => _testJsonSerializer.Deserialize<T>(json);
-
-        /// <inheritdoc/>
-        public object? Deserialize(BinaryData json) => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public object? Deserialize(BinaryData json, Type type) => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public T? Deserialize<T>(BinaryData json) => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public string Serialize<T>(T value, CoreEx.Json.JsonWriteFormat? format = null) => _testJsonSerializer.Serialize(value, format == CoreEx.Json.JsonWriteFormat.Indented ? JsonWriteFormat.Indented : JsonWriteFormat.None);
-
-        /// <inheritdoc/>
-        public BinaryData SerializeToBinaryData<T>(T value, CoreEx.Json.JsonWriteFormat? format = null) => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out string json, CoreEx.Json.JsonPropertyFilter filter = CoreEx.Json.JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<CoreEx.Json.IJsonPreFilterInspector>? preFilterInspector = null)
-            => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out object json, CoreEx.Json.JsonPropertyFilter filter = CoreEx.Json.JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<CoreEx.Json.IJsonPreFilterInspector>? preFilterInspector = null)
-            => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public bool TryGetJsonName(MemberInfo memberInfo, [NotNullWhen(true)] out string? jsonName)
-            => throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/Json/ToUnitTestExJsonSerializerMapper.cs b/src/CoreEx.UnitTesting/Json/ToUnitTestExJsonSerializerMapper.cs
deleted file mode 100644
index 75bac02f..00000000
--- a/src/CoreEx.UnitTesting/Json/ToUnitTestExJsonSerializerMapper.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace UnitTestEx.Json
-{
-    /// <summary>
-    /// Provides a wrapper for <see cref="CoreEx.Json.IJsonSerializer"/> to <see cref="IJsonSerializer"/>.
-    /// </summary>
-    /// <remarks>Only the compatible capabilities have been implemented.</remarks>
-    /// <param name="coreJsonSerializer">The <see cref="CoreEx.Json.IJsonSerializer"/>.</param>
-    public class ToUnitTestExJsonSerializerMapper(CoreEx.Json.IJsonSerializer coreJsonSerializer) : IJsonSerializer, CoreEx.Json.IJsonSerializer
-    {
-        private readonly CoreEx.Json.IJsonSerializer _coreJsonSerializer = coreJsonSerializer.ThrowIfNull(nameof(coreJsonSerializer));
-
-        /// <inheritdoc/>
-        public object Options => _coreJsonSerializer.Options;
-
-        /// <inheritdoc/>
-        public object? Deserialize(string json) => _coreJsonSerializer.Deserialize(json);
-
-        /// <inheritdoc/>
-        public object? Deserialize(string json, Type type) => _coreJsonSerializer.Deserialize(json, type);
-
-        /// <inheritdoc/>
-        public T? Deserialize<T>(string json) => _coreJsonSerializer.Deserialize<T>(json);
-
-        /// <inheritdoc/>
-        public string Serialize<T>(T value, JsonWriteFormat? format = null) => _coreJsonSerializer.Serialize(value, format == JsonWriteFormat.Indented ? CoreEx.Json.JsonWriteFormat.Indented : CoreEx.Json.JsonWriteFormat.None);
-
-        #region CoreEx.Json.IJsonSerializer
-
-        /// <inheritdoc/>
-        object? CoreEx.Json.IJsonSerializer.Deserialize(BinaryData json) => _coreJsonSerializer.Deserialize(json);
-
-        /// <inheritdoc/>
-        object? CoreEx.Json.IJsonSerializer.Deserialize(BinaryData json, Type type) => _coreJsonSerializer.Deserialize(json, type);
-
-        /// <inheritdoc/>
-        T? CoreEx.Json.IJsonSerializer.Deserialize<T>(BinaryData json) where T : default => _coreJsonSerializer.Deserialize<T>(json);
-
-        /// <inheritdoc/>
-        string CoreEx.Json.IJsonSerializer.Serialize<T>(T value, CoreEx.Json.JsonWriteFormat? format)
-            => _coreJsonSerializer.Serialize(value, format);
-
-        /// <inheritdoc/>
-        BinaryData CoreEx.Json.IJsonSerializer.SerializeToBinaryData<T>(T value, CoreEx.Json.JsonWriteFormat? format) 
-            => _coreJsonSerializer.SerializeToBinaryData(value, format);
-
-        /// <inheritdoc/>
-        bool CoreEx.Json.IJsonSerializer.TryApplyFilter<T>(T value, IEnumerable<string>? names, out string json, CoreEx.Json.JsonPropertyFilter filter, StringComparison comparison, Action<CoreEx.Json.IJsonPreFilterInspector>? preFilterInspector)
-            => _coreJsonSerializer.TryApplyFilter(value, names, out json, filter, comparison, preFilterInspector);
-
-        /// <inheritdoc/>
-        bool CoreEx.Json.IJsonSerializer.TryApplyFilter<T>(T value, IEnumerable<string>? names, out object json, CoreEx.Json.JsonPropertyFilter filter, StringComparison comparison, Action<CoreEx.Json.IJsonPreFilterInspector>? preFilterInspector)
-            => _coreJsonSerializer.TryApplyFilter(value, names, out json, filter, comparison, preFilterInspector);
-
-        /// <inheritdoc/>
-        bool CoreEx.Json.IJsonSerializer.TryGetJsonName(MemberInfo memberInfo, [NotNullWhen(true)] out string? jsonName)
-            => _coreJsonSerializer.TryGetJsonName(memberInfo, out jsonName);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/README.md b/src/CoreEx.UnitTesting/README.md
index aff4d024..1246d534 100644
--- a/src/CoreEx.UnitTesting/README.md
+++ b/src/CoreEx.UnitTesting/README.md
@@ -1,31 +1,66 @@
 # CoreEx.UnitTesting
 
-The `CoreEx.UnitTesting` namespace extends [_UnitTestEx_](https://github.com/Avanade/UnitTestEx) to enable _CoreEx_ related unit testing capabilities. 
+> Provides the complete CoreEx unit- and integration-testing toolkit: fluent expectations, event-capture assertions, JSON seed-data loading, and convenience extensions that bridge UnitTestEx with every major CoreEx subsystem.
 
-<br/>
+## Overview
+
+`CoreEx.UnitTesting` is the single testing package that covers the entire CoreEx ecosystem. Rather than shipping a separate `CoreEx.UnitTesting.Events`, `CoreEx.UnitTesting.SqlServer`, or similar per-feature test packages, all capabilities are consolidated here deliberately. Unit- and integration-testing packages are never deployed to production, so the additional transitive references carry no runtime cost; consolidating into one package eliminates version-alignment friction, reduces `<PackageReference>` noise in test projects, and makes the full test surface immediately discoverable.
+
+The package extends [UnitTestEx](https://github.com/Avanade/UnitTestEx) — the CoreEx-recommended test host — with CoreEx-specific registration helpers, expectations, and assertion extensions. These operate by injecting an `EventPublisherDecorator` into the DI container so published events are captured during a test run and then asserted after the fact, without touching the real publisher. The one-off setup hook (`UnitTestExOneOffTestSetUp`) wires CoreEx defaults (`JsonDefaults`, `AuthenticationUser`, `ValidationException` error matching) into the UnitTestEx infrastructure automatically when the assembly is loaded.
+
+A companion `Data` child namespace provides `JsonDataReader` — a JSON-to-`JsonNode` bridge that supports parameterised `{{token}}`-style substitutions for generated values (ids, timestamps, tenant/user context) and multiple naming conventions. This makes it straightforward to seed SQL Server or PostgreSQL test databases directly from `data.yaml` or JSON resource files.
 
 ## Motivation
 
-To improve and simplify the unit testing of _CoreEx_ related code.
+- A single package covers all CoreEx test concerns; test projects need only one `<PackageReference>` to access every helper regardless of which CoreEx features the service under test uses.
+- Keeping test support consolidated maximises discoverability: developers find assertions for events, reference data, outbox patterns, caching, validation, and HTTP all in one place rather than hunting across multiple packages.
+- Automatic one-off set-up ensures CoreEx defaults (serialization, user context, `ValidationException` error mapping) are applied consistently across all test frameworks (NUnit, xUnit, MSTest) without manual wiring.
+- `EventPublisherDecorator` allows event expectations to be declared and asserted against the real outbox/publisher pipeline without requiring live infrastructure.
+- `JsonDataReader` enables repeatable, parameterised seed data from JSON/YAML resources rather than hard-coded insert statements.
+
+## Key capabilities
+
+- 🧪 **Unified test package**: one `<PackageReference>` covers testing support for all CoreEx subsystems — events, outbox (SQL Server and PostgreSQL), Azure Service Bus, caching (FusionCache), validation, HTTP, ETag, identifier, and change-log assertions.
+- 📦 **Automatic CoreEx wiring**: `UnitTestExOneOffTestSetUp` registers CoreEx JSON defaults, the environment user, and `ValidationException` error assertion handling with UnitTestEx on first assembly load.
+- ✅ **Fluent value expectations**: `UnitTestExExpectations` static class extends `IValueExpectations<TValue, TSelf>` and `IExpectations<TSelf>` with `ExpectIdentifier`, `ExpectETag`, `ExpectChangeLogCreated`, `ExpectChangeLogUpdated`, and `IgnorePaths` to assert domain-entity lifecycle concerns.
+- 💬 **Event-capture and assertion**: `UseExpectedEventPublisher` replaces the real publisher with `EventPublisherDecorator` at test-host setup time; `ExpectEvents`/`ExpectNoEvents` plus publisher-specific overloads (`ExpectSqlServerOutboxEvents`, `ExpectPostgresOutboxEvents`, `ExpectAzureServiceBusEvents`) declare and then verify published events as `CloudEvent` JSON comparisons.
+- ⚡ **Publisher-specific outbox helpers**: dedicated `ExpectSqlServerOutboxEvents`, `ExpectNoSqlServerOutboxEvents`, `ExpectPostgresOutboxEvents`, `ExpectNoPostgresOutboxEvents`, `ExpectAzureServiceBusEvents`, and `ExpectNoAzureServiceBusEvents` extension methods target each outbox/publisher by its registered service key.
+- 🔧 **Broad extension surface**: `UnitTestExExtensions` adds `Scoped`/`ExecutionContext` scoping helpers, `CreateCloudEventFrom` event builders, `AssertProblemDetailsTitle` HTTP response assertions, `ClearFusionCacheAsync` cache reset, and validator-level `AssertSuccess`/`AssertErrors` shortcuts directly on `TesterBase` and `IValidator<T>`.
+- 📝 **Validation shortcuts**: `AssertSuccess` and `AssertErrors` extension methods execute a `CoreEx.Validation.IValidator<T>` and assert the outcome inline, using AwesomeAssertions for readable failure messages.
+- 🔄 **FusionCache test reset**: `ClearFusionCacheAsync` clears the registered `IFusionCache` between test runs to prevent state bleed in cached reference-data or other cache-backed scenarios.
+- 📊 **JSON/YAML seed-data loading**: `JsonDataReader` parses JSON or YAML into a `JsonNode` tree and deep-copies it with `^token` and `(^token)` placeholder substitution, returning a fully resolved `JsonNode` (or directly deserialised value) ready to seed a test database or drive request bodies. Built-in tokens cover `^id`, `^now`, `^tenant_id`, `^user_name`, and more; custom tokens are registered on `JsonDataReaderOptions.Parameters`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`UnitTestExOneOffTestSetUp`](./UnitTestExOneOffTestSetUp.cs)** | Internal one-off UnitTestEx initializer; configures CoreEx JSON serialization defaults, the environment user name, and `ValidationException` error-assertion integration automatically on assembly load. |
+| **[`UnitTestExExpectations`](./UnitTestExExpectations.cs)** | Static partial class; aggregates all CoreEx-specific value and tester expectation extension methods: `ExpectIdentifier`, `ExpectETag`, `ExpectChangeLogCreated`, `ExpectChangeLogUpdated`, `IgnorePaths`, and the full event and outbox expectation surface. |
+| **[`UnitTestExExtensions`](./UnitTestExExtensions.cs)** | Static partial class; aggregates all CoreEx-specific `TesterBase` and `IValidator<T>` extension methods: `Scoped`, `CreateCloudEventFrom`, `AssertProblemDetailsTitle`, `ClearFusionCacheAsync`, `UseExpectedEventPublisher`, `AssertSuccess`, and `AssertErrors`. |
+
+## Namespaces
 
-<br/>
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.UnitTesting.Data`** | `JsonDataReader` — a hierarchical mutating reader that parses JSON or YAML and deep-copies the `JsonNode` tree with `^token` placeholder substitution; consumers use the resolved node (or `Deserialize<T>`) to seed databases or build request payloads. | [📖 README](./Data/README.md) |
+| **`CoreEx.UnitTesting.Events`** | `EventExpectationsConfig`, `EventExpectationAssertor`, `EventExpectations`, and `EventPublisherDecorator`; the infrastructure for capturing and asserting published events in tests. | [📖 README](./Events/README.md) |
 
-## Agent-initiated ASP.NET testing
+## Related namespaces
 
-To test ASP.NET Core Controllers using the _Agent_ pattern, being the usage of a [`TypedHttpClientBase`](../../CoreEx/Http/TypedHttpClientBase.cs) to invoke via an `HttpRequestMessage`, the following enable:
-- [`AgentTester<TAgent>`](./AspNetCore/AgentTester.cs) - an _Agent_-based tester that expects no response value.
-- [`AgentTester<TAgent, TValue>`](./AspNetCore/AgentTesterT.cs) - an _Agent_-based tester that expects the specified responce value.
+- **[`CoreEx`](../CoreEx/README.md)** - Provides `ExecutionContext`, `ValidationException`, `EventData`, and `JsonDefaults` wired in by `UnitTestExOneOffTestSetUp`.
+- **[`CoreEx.Events`](../CoreEx.Events/README.md)** - Defines `IEventPublisher` and `EventData` that `EventPublisherDecorator` wraps for event capture.
+- **[`CoreEx.Azure.Messaging.ServiceBus`](../CoreEx.Azure.Messaging.ServiceBus/README.md)** - `ServiceBusPublisher` whose service key is targeted by `ExpectAzureServiceBusEvents`.
+- **[`CoreEx.Database.SqlServer`](../CoreEx.Database.SqlServer/README.md)** - `SqlServerOutboxPublisher` whose service key is targeted by `ExpectSqlServerOutboxEvents`; `JsonDataReader` seeds SQL Server test databases.
+- **[`CoreEx.Database.Postgres`](../CoreEx.Database.Postgres/README.md)** - `PostgresOutboxPublisher` whose service key is targeted by `ExpectPostgresOutboxEvents`; `JsonDataReader` seeds PostgreSQL test databases.
+- **[`CoreEx.Caching.FusionCache`](../CoreEx.Caching.FusionCache/README.md)** - `IFusionCache` implementation cleared by `ClearFusionCacheAsync`.
+- **[`CoreEx.Validation`](../CoreEx.Validation/README.md)** - `IValidator<T>` and `ValidationException` targeted by the `AssertSuccess`/`AssertErrors` and one-off setup extensions.
 
-<br/>
+## Additional Resources
 
-## Validation testing
+- [UnitTestEx](https://github.com/Avanade/UnitTestEx) - The underlying test-host framework that `CoreEx.UnitTesting` extends; provides `TesterBase`, `ApiTester`, `GenericTester`, `IExpectations`, and the framework-agnostic assertion infrastructure.
+- [AwesomeAssertions](https://github.com/AwesomeAssertions/AwesomeAssertions) - Fluent assertion library used by the validation shortcuts and internal assertion helpers.
+- [YamlDotNet](https://github.com/aaubry/YamlDotNet) - Used internally to parse `data.yaml` seed files before they are handed to `JsonDataReader`.
 
-To test an [`IValidator`](../CoreEx/Validation/IValidator.cs) `Validation().With()` extension methods are provided, extending the [`GenericTesterBase`](https://github.com/Avanade/UnitTestEx/blob/main/src/UnitTestEx/Generic/GenericTesterBase.cs). The following is an example:
+## AI Usage Guide
 
-``` csharp
-GenericTester.Create<Startup>()
-    .ExpectErrors(
-        "Name is required.",
-        "Price must be between 0 and 100.")
-    .Validation().With<ProductValidator, Product>(new Product { Price = 450.95m })
-```
\ No newline at end of file
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestAssertions.cs b/src/CoreEx.UnitTesting/UnitTestAssertions.cs
new file mode 100644
index 00000000..2f38c025
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestAssertions.cs
@@ -0,0 +1,136 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace AwesomeAssertions;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides custom <see cref="AwesomeAssertions"/> assertion classes for use in unit testing.
+/// </summary>
+public static class UnitTestAssertions
+{
+    /// <summary>
+    /// Returns a <see cref="JsonNodeAssertions"/> for asserting on the <see cref="JsonNode"/> directly.
+    /// </summary>
+    /// <param name="node">The <see cref="JsonNode"/> subject.</param>
+    /// <returns>A <see cref="JsonNodeAssertions"/> for fluent JSON-specific chaining.</returns>
+    public static JsonNodeAssertions Should(this JsonNode node) => new(node, AssertionChain.GetOrCreate());
+
+    /// <summary>
+    /// Asserts that the string is valid JSON, enabling further JSON-specific assertions.
+    /// </summary>
+    /// <param name="assertions">The <see cref="StringAssertions"/>.</param>
+    /// <param name="because">The reason the assertion should be satisfied.</param>
+    /// <param name="becauseArgs">The <paramref name="because"/> format arguments.</param>
+    /// <returns>A <see cref="JsonNodeAssertions"/> for fluent JSON-specific chaining.</returns>
+    public static JsonNodeAssertions BeJson(this StringAssertions assertions, string because = "", params object[] becauseArgs)
+    {
+        var chain = assertions.CurrentAssertionChain;
+
+        chain.ForCondition(assertions.Subject is not null)
+            .BecauseOf(because, becauseArgs)
+            .WithDefaultIdentifier("JSON string")
+            .FailWith("Expected {context} to be valid JSON{reason}, but it was <null>.");
+
+        JsonNode? node = null;
+        string? parseError = null;
+        var isValid = true;
+
+        try
+        {
+            node = JsonNode.Parse(assertions.Subject!);
+        }
+        catch (JsonException ex)
+        {
+            isValid = false;
+            parseError = ex.Message;
+        }
+
+        chain.ForCondition(isValid)
+            .BecauseOf(because, becauseArgs)
+            .WithDefaultIdentifier("string")
+            .FailWith("Expected {context} to be valid JSON{reason}, but parsing failed: {0}.", parseError);
+
+        return new JsonNodeAssertions(node!, chain);
+    }
+
+    /// <summary>
+    /// Provides JSON-specific assertions for a <see cref="JsonNode"/> subject.
+    /// </summary>
+    public sealed class JsonNodeAssertions : ReferenceTypeAssertions<JsonNode, JsonNodeAssertions>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonNodeAssertions"/> class.
+        /// </summary>
+        /// <param name="subject">The <see cref="JsonNode"/> subject.</param>
+        /// <param name="assertionChain">The <see cref="AssertionChain"/>.</param>
+        internal JsonNodeAssertions(JsonNode subject, AssertionChain assertionChain) : base(subject, assertionChain) { }
+
+        /// <inheritdoc/>
+        protected override string Identifier => "JSON";
+
+        /// <summary>
+        /// Asserts that the JSON contains all the specified JSON paths.
+        /// </summary>
+        /// <param name="paths">The JSON paths to match.</param>
+        /// <param name="because">The reason the assertion should be satisfied.</param>
+        /// <param name="becauseArgs">The <paramref name="because"/> format arguments.</param>
+        /// <returns>The current <see cref="JsonNodeAssertions"/> to support fluent-style chaining.</returns>
+        /// <remarks>The original <see cref="JsonNode"/> is cloned before matching to ensure the assertion does not modify the original JSON.</remarks>
+        public JsonNodeAssertions ContainAll(IEnumerable<string> paths, string because = "", params object[] becauseArgs)
+        {
+            foreach (var path in paths)
+            {
+                var jn = JsonFilter.GetMatched(Subject.DeepClone(), path);
+
+                CurrentAssertionChain.ForCondition(jn is not null)
+                    .BecauseOf(because, becauseArgs)
+                    .WithDefaultIdentifier("string")
+                    .FailWith("Expected {context} path to exist{reason}: {0}", path);
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Asserts that the JSON does not contain any of the specified JSON paths.
+        /// </summary>
+        /// <param name="paths">The JSON paths to match.</param>
+        /// <param name="because">The reason the assertion should be satisfied.</param>
+        /// <param name="becauseArgs">The <paramref name="because"/> format arguments.</param>
+        /// <returns>The current <see cref="JsonNodeAssertions"/> to support fluent-style chaining.</returns>
+        /// <remarks>The original <see cref="JsonNode"/> is cloned before matching to ensure the assertion does not modify the original JSON.</remarks>
+        public JsonNodeAssertions NotContainAny(IEnumerable<string> paths, string because = "", params object[] becauseArgs)
+        {
+            foreach (var path in paths)
+            {
+                var jn = JsonFilter.GetMatched(Subject.DeepClone(), path);
+
+                CurrentAssertionChain.ForCondition(jn is null)
+                    .BecauseOf(because, becauseArgs)
+                    .WithDefaultIdentifier("string")
+                    .FailWith("Expected {context} path to not exist{reason}: {0}", path);
+            }
+
+            return this;
+        }
+
+        /// <summary>
+        /// Asserts that the JSON contains the specified JSON path, returning the matching <see cref="JsonNode"/> for further chaining if desired.
+        /// </summary>
+        /// <param name="path">The JSON path to match.</param>
+        /// <param name="because">The reason the assertion should be satisfied.</param>
+        /// <param name="becauseArgs">The <paramref name="because"/> format arguments.</param>
+        /// <returns>The <see cref="JsonNode"/> that matches the specified JSON path.</returns>
+        /// <remarks>The original <see cref="JsonNode"/> is cloned before matching to ensure the assertion does not modify the original JSON.</remarks>
+        public JsonNode HavePath(string path, string because = "", params object[] becauseArgs)
+        {
+            var jn = JsonFilter.GetMatched(Subject.DeepClone(), path);
+
+            CurrentAssertionChain.ForCondition(jn is not null)
+                .BecauseOf(because, becauseArgs)
+                .WithDefaultIdentifier("string")
+                .FailWith("Expected {context} path to exist{reason}");
+
+            return jn!;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.ChangeLog.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.ChangeLog.cs
new file mode 100644
index 00000000..10fc0209
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.ChangeLog.cs
@@ -0,0 +1,122 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Expects the <see cref="IReadOnlyChangeLog"/> to be implemented and have non-default <see cref="IReadOnlyChangeLog.ChangeLog"/> <see cref="IChangeLogEx.CreatedBy"/> and <see cref="IChangeLogEx.CreatedOn"/> values.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <param name="createdBy">The specific <see cref="IChangeLogEx.CreatedBy"/> value where specified (can include wildcards); otherwise, indicates to check for user running the test (see <see cref="Abstractions.TesterBase.UserName"/>).</param>
+    /// <param name="createdOn">The <see cref="DateTimeOffset"/> in which the <see cref="IChangeLogEx.CreatedOn"/> should be greater than or equal to; where <c>null</c> it will default to <see cref="DateTimeOffset.UtcNow"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf ExpectChangeLogCreated<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, string? createdBy = null, DateTimeOffset? createdOn = null) where TSelf : IValueExpectations<TValue, TSelf>
+    {
+        string pn;
+        if (typeof(TValue).GetInterface(typeof(IReadOnlyChangeLogEx).FullName ?? typeof(IReadOnlyChangeLogEx).Name) is null)
+        {
+            VerifyImplements<TValue, IReadOnlyChangeLog>();
+            pn = $"{nameof(IReadOnlyChangeLog)}.{nameof(IReadOnlyChangeLog.ChangeLog)}";
+        }
+        else
+            pn = $"{nameof(IReadOnlyChangeLogEx)}";
+
+        IgnoreChangeLog(tester);
+
+        createdBy ??= tester.ExpectationsArranger.Owner.UserName;
+        createdOn ??= DateTimeOffset.UtcNow.Subtract(new TimeSpan(0, 0, 1));
+
+        Task<bool> extension(AssertArgs args)
+        {
+            var cl = args.Value is IReadOnlyChangeLog icl ? icl.ChangeLog : args.Value as IReadOnlyChangeLogEx;
+            if (cl is null)
+            {
+                args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
+                return Task.FromResult(true);
+            }
+
+            if (cl.CreatedOn == null)
+                args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(IReadOnlyChangeLogEx.CreatedBy)} value of '{createdBy}'; actual was null.");
+            else
+            {
+                if (!SubscribedBase.IsMatch(createdBy, cl.CreatedBy))
+                    args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(ChangeLog.CreatedBy)} value of '{createdBy}'; actual '{cl.CreatedBy}'.");
+            }
+
+            if (!cl.CreatedOn.HasValue)
+                args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(IReadOnlyChangeLogEx.CreatedOn)} to have a non-null value.");
+            else if (cl.CreatedOn.Value < createdOn.Value)
+                args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(IReadOnlyChangeLogEx.CreatedOn)} value of '{createdOn.Value}'; actual '{cl.CreatedOn.Value}' must be greater than or equal to expected.");
+
+            return Task.FromResult(true);
+        }
+
+        return SetValueExpectationExtension(tester, extension);
+    }
+
+    /// <summary>
+    /// Expects the <see cref="IReadOnlyChangeLog"/> to be implemented and have non-default <see cref="IReadOnlyChangeLog.ChangeLog"/> <see cref="IChangeLogEx.UpdatedBy"/> and <see cref="IChangeLogEx.UpdatedOn"/> values.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <param name="updatedBy">The specific <see cref="IChangeLogEx.UpdatedBy"/> value where specified (can include wildcards); otherwise, indicates to check for user running the test (see <see cref="Abstractions.TesterBase.UserName"/>).</param>
+    /// <param name="updatedOn">The <see cref="DateTimeOffset"/> in which the <see cref="IChangeLogEx.UpdatedOn"/> should be greater than or equal to; where <c>null</c> it will default to <see cref="DateTimeOffset.UtcNow"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf ExpectChangeLogUpdated<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, string? updatedBy = null, DateTimeOffset? updatedOn = null) where TSelf : IValueExpectations<TValue, TSelf>
+    {
+        string pn;
+        if (typeof(TValue).GetInterface(typeof(IReadOnlyChangeLogEx).FullName ?? typeof(IReadOnlyChangeLogEx).Name) is null)
+        {
+            VerifyImplements<TValue, IReadOnlyChangeLog>();
+            pn = $"{nameof(IReadOnlyChangeLog)}.{nameof(IReadOnlyChangeLog.ChangeLog)}";
+        }
+        else
+            pn = $"{nameof(IReadOnlyChangeLogEx)}";
+
+        IgnoreChangeLog(tester);
+
+        updatedBy ??= tester.ExpectationsArranger.Owner.UserName;
+        updatedOn ??= DateTimeOffset.UtcNow.Subtract(new TimeSpan(0, 0, 1));
+
+        Task<bool> extension(AssertArgs args)
+        {
+            var cl = args.Value is IReadOnlyChangeLog icl ? icl.ChangeLog : args.Value as IReadOnlyChangeLogEx;
+            if (cl is null)
+            {
+                args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
+                return Task.FromResult(true);
+            }
+
+            if (cl.UpdatedOn == null)
+                args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(IReadOnlyChangeLogEx.UpdatedBy)} value of '{updatedBy}'; actual was null.");
+            else
+            {
+                if (!SubscribedBase.IsMatch(updatedBy, cl.UpdatedBy))
+                    args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(ChangeLog.UpdatedBy)} value of '{updatedBy}'; actual '{cl.UpdatedBy}'.");
+            }
+
+            if (!cl.UpdatedOn.HasValue)
+                args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(IReadOnlyChangeLogEx.UpdatedOn)} to have a non-null value.");
+            else if (cl.UpdatedOn.Value < updatedOn.Value)
+                args.Tester.Implementor.AssertFail($"Expected {pn}.{nameof(IReadOnlyChangeLogEx.UpdatedOn)} value of '{updatedOn.Value}'; actual '{cl.UpdatedOn.Value}' must be greater than or equal to expected.");
+
+            return Task.FromResult(true);
+        }
+
+        return SetValueExpectationExtension(tester, extension);
+    }
+
+    /// <summary>
+    /// Ignores the <see cref="IChangeLog.ChangeLog"/> JSON path (and <see cref="IChangeLogEx.CreatedBy"/>, <see cref="IChangeLogEx.CreatedOn"/>, <see cref="IChangeLogEx.UpdatedBy"/> and <see cref="IChangeLogEx.UpdatedOn"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf IgnoreChangeLog<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf>
+        => IgnorePaths(tester, nameof(IChangeLog.ChangeLog), nameof(IChangeLogEx.CreatedBy), nameof(IChangeLogEx.CreatedOn), nameof(IChangeLogEx.UpdatedBy), nameof(IChangeLogEx.UpdatedOn));
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.ETag.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.ETag.cs
new file mode 100644
index 00000000..3284bfc4
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.ETag.cs
@@ -0,0 +1,44 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Expects the <see cref="IReadOnlyETag"/> to be implemented and have non-default <see cref="IReadOnlyETag.ETag"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <param name="previousETag">The optional previous ETag to compare <b>not</b> equal to; i.e. it must be different.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf ExpectETag<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, string? previousETag = null) where TSelf : IValueExpectations<TValue, TSelf>
+    {
+        VerifyImplements<TValue, IReadOnlyETag>();
+        IgnoreETag(tester);
+        var pn = $"{nameof(IReadOnlyETag)}.{nameof(IReadOnlyETag.ETag)}";
+
+        Task<bool> extension(AssertArgs args)
+        {
+            var etag = args.Value as IETag;
+            if (etag is null || etag.ETag is null)
+                args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
+
+            if (previousETag is not null && previousETag == etag!.ETag)
+                args.Tester.Implementor.AssertFail($"Expected {pn} value of '{previousETag}' to be different to actual.");
+
+            return Task.FromResult(true);
+        }
+
+        return SetValueExpectationExtension(tester, extension);
+    }
+
+    /// <summary>
+    /// Ignores the <see cref="IReadOnlyETag.ETag"/> JSON path.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf IgnoreETag<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf> => IgnorePaths(tester, nameof(IReadOnlyETag.ETag));
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.Events.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.Events.cs
new file mode 100644
index 00000000..8ced25a2
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.Events.cs
@@ -0,0 +1,100 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="CoreEx"/>-specific extension methods to <see cref="UnitTestEx"/>.
+/// </summary>
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Gets the <see cref="TestSharedState.RequestStateData(string?)"/> key suffix.
+    /// </summary>
+    internal const string RequestStateDataKeySuffix = "_Expectations";   
+
+    /// <summary>
+    /// Expects that no events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> or default where not specified).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectNoEvents<TSelf>(this IExpectations<TSelf> tester, string serviceKey) where TSelf : IExpectations<TSelf>
+    {
+        var requestId = tester.ExpectationsArranger.Tester is HttpTesterBase httpTester ? httpTester.RequestId : null;
+        tester.ExpectationsArranger.GetOrAdd(() => new EventExpectations<TSelf>(tester.ExpectationsArranger.Owner, (TSelf)tester, requestId, Assembly.GetCallingAssembly())).ExpectNoEvents(serviceKey);
+
+        // Tag that an expectation has been added for the current request (if applicable) so that the expectations will be evaluated at the end of the request.
+        tester.ExpectationsArranger.Owner.SharedState.RequestStateData(requestId)[$"{serviceKey}_Expectations"] = null;
+        return (TSelf)tester;
+    }
+
+    /// <summary>
+    /// Expects that events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> or default where not specified).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <param name="configure">The action to enable events expectations configuration.</param>
+    /// <param name="resourceAssembly">The optional <see cref="Assembly"/> to use for default resource resolution.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectEvents<TSelf>(this IExpectations<TSelf> tester, string serviceKey, Action<EventExpectationsConfig>? configure = null, Assembly? resourceAssembly = null) where TSelf : IExpectations<TSelf>
+    {
+        var requestId = tester.ExpectationsArranger.Tester is HttpTesterBase httpTester ? httpTester.RequestId : null;
+        tester.ExpectationsArranger.GetOrAdd(() => new EventExpectations<TSelf>(tester.ExpectationsArranger.Owner, (TSelf)tester, requestId, resourceAssembly ?? Assembly.GetCallingAssembly())).ExpectEvents(serviceKey, configure);
+
+        // Tag that an expectation has been added for the current request (if applicable) so that the expectations will be evaluated at the end of the request.
+        tester.ExpectationsArranger.Owner.SharedState.RequestStateData(requestId)[$"{serviceKey}{RequestStateDataKeySuffix}"] = null;
+        return (TSelf)tester;
+    }
+
+    /// <summary>
+    /// Adds a post-run action to evaluate and clean up the captured events for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/>).
+    /// </summary>
+    /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="AspNetCore.ApiTester{TEntryPoint}"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="expectNoEvents">Indicates whether to expect no events to be published.</param>
+    /// <returns>The <see cref="AspNetCore.ApiTester{TEntryPoint}"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="expectNoEvents"/> parameter is only actioned when no explicit event expectations are defined for the underlying test; acts as a catch all.
+    /// <para>Note: this should not generally be invoked directly, but rather through a parent extension method, or equivalent, where applicable.</para></remarks>
+    public static AspNetCore.ApiTester<TEntryPoint> AddEventExpectationsPostRun<TEntryPoint>(this AspNetCore.ApiTester<TEntryPoint> tester, string serviceKey, bool expectNoEvents = true) where TEntryPoint : class => tester
+        .AddPostRunAfterExpectationsAction(instance =>
+        {
+            // Determine whether the test run itself had any expectations defined for the captured events; if not, then perform an expectation to ensure that no events were published (as the captured events would be unexpected).
+            var requestId = instance is HttpTesterBase httpTester ? httpTester.RequestId : null;
+            var data = tester.SharedState.RequestStateData(requestId);
+
+            // If no explicit event expectations were defined for the test, then assert that no events were published (as any captured events would be unexpected).
+            var eventKey = $"{serviceKey}{UnitTestExExpectations.RequestStateDataKeySuffix}";
+            if (expectNoEvents && !data.ContainsKey(eventKey))
+            {
+                tester.Implementor.WriteLine("");
+                tester.Implementor.WriteLine($"** '{serviceKey}' has no explicit event expectations defined; asserting that no events were published.");
+                if (data.TryGetValue(serviceKey, out var obj) && obj is DestinationEvent[] events && events.Length > 0)
+                    tester.Implementor.AssertFail($"Expected no {serviceKey} events; however, {events.Length} found to be published.");
+                else
+                    tester.Implementor.WriteLine("> Expected no events and there were none.");
+            }
+        })
+        .AddPostRunAction(_ =>
+        {
+            // Pre-delete any existing captured events to ensure a clean slate for this test run.
+            var eventKey = $"{serviceKey}{UnitTestExExpectations.RequestStateDataKeySuffix}";
+            tester.SharedState.StateData.Remove(eventKey, out var __);
+        });
+
+    /// <summary>
+    /// Configures an <paramref name="action"/> that will be executed (during the underlying <see cref="EventPublisherDecorator.PublishAsync"/>) for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="HttpTesterBase{TSelf}"/> tester.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="action">The action to execute.</param>
+    /// <returns>The <see cref="HttpTesterBase{TSelf}"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>This allows for test-specific behaviors to be executed just prior to the actual publishing of events; i.e. simulating the throwing on an unexpected exception.</remarks>
+    public static TSelf OnEventPublish<TSelf>(this TSelf tester, string serviceKey, Action action) where TSelf : HttpTesterBase<TSelf>
+    {
+        tester.Owner.SharedState.RequestStateData(tester.RequestId)[$"_{nameof(EventPublisherDecorator)}_{serviceKey}"] = action;
+        return (TSelf)tester;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.Identifier.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.Identifier.cs
new file mode 100644
index 00000000..76dd9c89
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.Identifier.cs
@@ -0,0 +1,49 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Expects the <see cref="IReadOnlyIdentifier"/> to be implemented and have non-default <see cref="IIdentifierCore.Id"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <param name="identifier">The optional expected identifier to compare to.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf ExpectIdentifier<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, object? identifier = null) where TSelf : IValueExpectations<TValue, TSelf>
+    {
+        VerifyImplements<TValue, IIdentifierCore>();
+        IgnoreIdentifier(tester);
+        var pn = $"{nameof(IReadOnlyIdentifier)}.{nameof(IIdentifier.Id)}";
+
+        Task<bool> extension(AssertArgs args)
+        {
+            var id = args.Value as IIdentifier;
+            if (id is null || id.Id is null)
+                args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-null value.");
+
+            if (identifier is null)
+            {
+                if (System.Collections.Comparer.Default.Compare(id!.Id, id!.GetType().IsClass ? null! : Activator.CreateInstance(id!.GetType())) == 0)
+                    args.Tester.Implementor.AssertFail($"Expected {pn} to have a non-default value.");
+            }
+            else
+                args.Tester.Implementor.AssertAreEqual(identifier, id!.Id, $"Expected {pn} value of '{identifier}'; actual '{id.Id}'.");
+
+            return Task.FromResult(true);
+        }
+
+        return SetValueExpectationExtension(tester, extension);
+    }
+
+    /// <summary>
+    /// Ignores the <see cref="IReadOnlyIdentifier"/> <see cref="IIdentifierCore.Id"/> JSON path.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IValueExpectations{TValue, TSelf}"/> tester.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf IgnoreIdentifier<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester) where TSelf : IValueExpectations<TValue, TSelf> => IgnorePaths(tester, nameof(IIdentifierCore.Id));
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.Postgres.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.Postgres.cs
new file mode 100644
index 00000000..3f74bfe8
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.Postgres.cs
@@ -0,0 +1,30 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="CoreEx"/>-specific extension methods to <see cref="UnitTestEx"/>.
+/// </summary>
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Expects that no events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> defaults to <see cref="PostgresOutboxPublisher.DefaultServiceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectNoPostgresOutboxEvents<TSelf>(this IExpectations<TSelf> tester, string serviceKey = PostgresOutboxPublisher.DefaultServiceKey) where TSelf : IExpectations<TSelf>
+        => ExpectNoEvents(tester, serviceKey);
+
+    /// <summary>
+    /// Expects that events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> defaults to <see cref="PostgresOutboxPublisher.DefaultServiceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="configure">The action to enable events expectations configuration.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectPostgresOutboxEvents<TSelf>(this IExpectations<TSelf> tester, Action<EventExpectationsConfig>? configure = null, string serviceKey = PostgresOutboxPublisher.DefaultServiceKey) where TSelf : IExpectations<TSelf>
+        => ExpectEvents(tester, serviceKey, configure, Assembly.GetCallingAssembly());
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.ServiceBus.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.ServiceBus.cs
new file mode 100644
index 00000000..47a7dff8
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.ServiceBus.cs
@@ -0,0 +1,30 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="CoreEx"/>-specific extension methods to <see cref="UnitTestEx"/>.
+/// </summary>
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Expects that no events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> defaults to <see cref="ServiceBusPublisher.DefaultServiceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectNoAzureServiceBusEvents<TSelf>(this IExpectations<TSelf> tester, string serviceKey = ServiceBusPublisher.DefaultServiceKey) where TSelf : IExpectations<TSelf>
+        => ExpectNoEvents(tester, serviceKey);
+
+    /// <summary>
+    /// Expects that events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> defaults to <see cref="ServiceBusPublisher.DefaultServiceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="configure">The action to enable events expectations configuration.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectAzureServiceBusEvents<TSelf>(this IExpectations<TSelf> tester, Action<EventExpectationsConfig>? configure = null, string serviceKey = ServiceBusPublisher.DefaultServiceKey) where TSelf : IExpectations<TSelf>
+        => ExpectEvents(tester, serviceKey, configure, Assembly.GetCallingAssembly());
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.SqlServer.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.SqlServer.cs
new file mode 100644
index 00000000..9310b728
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.SqlServer.cs
@@ -0,0 +1,30 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="CoreEx"/>-specific extension methods to <see cref="UnitTestEx"/>.
+/// </summary>
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Expects that no events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> defaults to <see cref="SqlServerOutboxPublisher.DefaultServiceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectNoSqlServerOutboxEvents<TSelf>(this IExpectations<TSelf> tester, string serviceKey = SqlServerOutboxPublisher.DefaultServiceKey) where TSelf : IExpectations<TSelf>
+        => ExpectNoEvents(tester, serviceKey);
+
+    /// <summary>
+    /// Expects that events will have been published for the keyed <see cref="IEventPublisher"/> (<paramref name="serviceKey"/> defaults to <see cref="SqlServerOutboxPublisher.DefaultServiceKey"/>).
+    /// </summary>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="configure">The action to enable events expectations configuration.</param>
+    /// <param name="serviceKey">The service key used for the keyed registration.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="serviceKey"/> must be the same as used when registering the underlying <see cref="IEventPublisher"/>.</remarks>
+    public static TSelf ExpectSqlServerOutboxEvents<TSelf>(this IExpectations<TSelf> tester, Action<EventExpectationsConfig>? configure = null, string serviceKey = SqlServerOutboxPublisher.DefaultServiceKey) where TSelf : IExpectations<TSelf>
+        => ExpectEvents(tester, serviceKey, configure, Assembly.GetCallingAssembly());
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExpectations.cs b/src/CoreEx.UnitTesting/UnitTestExExpectations.cs
new file mode 100644
index 00000000..2ada520a
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExpectations.cs
@@ -0,0 +1,40 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx.Expectations;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides <see cref="CoreEx"/>-specific extension methods to <see cref="UnitTestEx"/>.
+/// </summary>
+public static partial class UnitTestExExpectations
+{
+    /// <summary>
+    /// Sets the configured expectation logic.
+    /// </summary>
+    private static TSelf SetValueExpectationExtension<TValue, TSelf>(this IValueExpectations<TValue, TSelf> tester, Func<AssertArgs, Task<bool>> extension) where TSelf : IValueExpectations<TValue, TSelf>
+    {
+        tester.ExpectationsArranger.GetOrAdd(() => new ValueExpectations<TSelf>(tester.ExpectationsArranger.Owner, (TSelf)tester)).AddExtension(extension);
+        return (TSelf)tester;
+    }
+
+    /// <summary>
+    /// Verifies that the <typeparamref name="TValue"/> implements <typeparamref name="TInterface"/>.
+    /// </summary>
+    private static void VerifyImplements<TValue, TInterface>()
+    {
+        if (typeof(TValue).GetInterface(typeof(TInterface).FullName ?? typeof(TInterface).Name) == null)
+            throw new InvalidOperationException($"{typeof(TValue).Name} must implement the interface {typeof(TInterface).Name}.");
+    }
+
+    /// <summary>
+    /// Adds <paramref name="paths"/> to ignore from the JSON value comparison.
+    /// </summary>
+    /// <typeparam name="TSelf">The expectations <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="IExpectations{TSelf}"/> tester.</param>
+    /// <param name="paths">The JSON paths to ignore.</param>
+    /// <returns>The <typeparamref name="TSelf"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf IgnorePaths<TSelf>(IExpectations<TSelf> tester, params string[] paths) where TSelf : IExpectations<TSelf>
+    {
+        tester.ExpectationsArranger.PathsToIgnore.AddRange(paths);
+        return (TSelf)tester;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.Assert.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.Assert.cs
new file mode 100644
index 00000000..ae9c6f3c
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.Assert.cs
@@ -0,0 +1,23 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Asserts that the response is a <see cref="ProblemDetails"/> and that the <see cref="ProblemDetails.Title"/> matches the expected <paramref name="title"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The <see cref="HttpResponseMessageAssertorBase{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="assertor">The <see cref="HttpResponseMessageAssertorBase{TSelf}"/>.</param>
+    /// <param name="title">The expected <see cref="ProblemDetails.Title"/>.</param>
+    /// <returns>The <see cref="HttpResponseMessageAssertorBase{TSelf}"/> instance to support fluent-style method-chaining.</returns>
+    public static TSelf AssertProblemDetailsTitle<TSelf>(this TSelf assertor, string title) where TSelf : HttpResponseMessageAssertorBase<TSelf>
+    {
+        var problemDetails = assertor.GetValue<ProblemDetails>(null);
+        if (problemDetails is null)
+            assertor.Owner.Implementor.AssertFail("Expected ProblemDetails response to be present but nothing was returned.");
+
+        assertor.Owner.Implementor.AssertAreEqual(title, problemDetails!.Title, "ProblemDetails Title does not match expected value.");
+        return assertor;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.Caching.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.Caching.cs
new file mode 100644
index 00000000..eb3616aa
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.Caching.cs
@@ -0,0 +1,13 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Clears the underlying L1/L2 cache by executing the <see cref="ZiggyCreatures.Caching.Fusion.IFusionCache.ClearAsync(bool, ZiggyCreatures.Caching.Fusion.FusionCacheEntryOptions?, CancellationToken)"/>.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <remarks>The <see cref="ZiggyCreatures.Caching.Fusion.IFusionCache"/> service must be registered within the underlying test host.</remarks>
+    public static async Task ClearFusionCacheAsync(this TesterBase tester) => await tester.ThrowIfNull().Services.GetRequiredService<ZiggyCreatures.Caching.Fusion.IFusionCache>().ClearAsync(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.CloudEvent.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.CloudEvent.cs
new file mode 100644
index 00000000..a79a1e3a
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.CloudEvent.cs
@@ -0,0 +1,52 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides extensions for <see cref="TesterBase"/> to support common testing scenarios.
+/// </summary>
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Create a <see cref="CloudEvent"/> from the specified <see cref="EventData"/>.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="event">The <see cref="EventData"/>.</param>
+    /// <returns>The <see cref="CloudEvent"/>.</returns>
+    /// <remarks>This will use the configured <see cref="IEventFormatter"/> service to format and convert.</remarks>
+    public static CloudEvent CreateCloudEventFrom(this TesterBase tester, EventData @event)
+    {
+        tester.ThrowIfNull();
+        var formatter = tester.Services.GetService<IEventFormatter>() ?? ActivatorUtilities.CreateInstance<EventFormatter>(tester.Services);
+        return formatter.ConvertToCloudEvent(formatter.Format(@event));
+    }
+
+    /// <summary>
+    /// Create a <see cref="CloudEvent"/> from the specified JSON resource.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="updater">An optional action to update the <see cref="CloudEvent"/> before use.</param>
+    /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
+    /// <returns>The <see cref="CloudEvent"/>.</returns>
+    public static CloudEvent CreateCloudEventFromJsonResource(this TesterBase tester, string resourceName, Action<CloudEvent>? updater = null, Assembly? assembly = null)
+    {
+        tester.ThrowIfNull();
+
+        var json = Resource.GetJson(resourceName, assembly ?? Assembly.GetCallingAssembly());
+        var jr = new Utf8JsonReader(Encoding.UTF8.GetBytes(json));
+        var je = JsonElement.ParseValue(ref jr);
+        return je.DecodeToCloudEvent().Adjust(ce => updater?.Invoke(ce));
+    }
+
+    /// <summary>
+    /// Create a <see cref="CloudEvent"/> from the specified JSON resource.
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the <see cref="Assembly"/> for the embedded resource.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualified resource name).</param>
+    /// <param name="updater">An optional action to update the <see cref="CloudEvent"/> before use.</param>
+    /// <returns>The <see cref="CloudEvent"/>.</returns>
+    public static CloudEvent CreateCloudEventFromJsonResource<TAssembly>(this TesterBase tester, string resourceName, Action<CloudEvent>? updater = null)
+        => tester.ThrowIfNull().CreateCloudEventFromJsonResource(resourceName, updater, typeof(TAssembly).Assembly);
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.Events.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.Events.cs
new file mode 100644
index 00000000..c1504978
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.Events.cs
@@ -0,0 +1,28 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The originating <see cref="IEventPublisher"/> should have been registered with the <see cref="Microsoft.Extensions.DependencyInjection.CoreExEventsExtensions.AddEventPublisher(IServiceCollection, string, Func{IServiceProvider, IEventPublisher}, bool)"/>
+    /// to ensure the service was registered correctly to enable this functionality.
+    /// <para>The <paramref name="bypassPassThrough"/> when set to <see langword="true"/> will bypass the pass-through to the original event publisher and leverage the <see cref="NoOpEventPublisher"/> instead.</para></remarks>
+    public static IServiceCollection UseExpectedEventPublisher(this IServiceCollection services, string serviceKey = "EventPublisher", bool bypassPassThrough = false)
+        => services.ThrowIfNull().ReplaceKeyedScoped<IEventPublisher>(serviceKey.ThrowIfNullOrEmpty(), (sp, _) =>
+        {
+            var rootServiceKey = $"{serviceKey}_Root";
+            var root = bypassPassThrough
+                ? ActivatorUtilities.CreateInstance<NoOpEventPublisher>(sp)
+                : sp.GetKeyedService<IEventPublisher>(rootServiceKey) ?? throw new InvalidOperationException($"The root '{rootServiceKey}' publisher must be registered before the expected publisher can be used.");
+
+            var sharedState = sp.GetService<TestSharedState>() ?? throw new InvalidOperationException($"The UnitTestEx test shared state must be registered as required by the underlying {nameof(EventPublisherDecorator)}.");
+            return new EventPublisherDecorator(serviceKey, sharedState, root);
+        });
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.Postgres.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.Postgres.cs
new file mode 100644
index 00000000..89daab46
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.Postgres.cs
@@ -0,0 +1,104 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method that defaults the <paramref name="serviceKey"/> to <see cref="PostgresOutboxPublisher.DefaultServiceKey"/> where invoking the underlying <see cref="UseExpectedEventPublisher(IServiceCollection, string, bool)"/>.
+    /// <para>The <paramref name="bypassPassThrough"/> when set to <see langword="true"/> will bypass the pass-through to the original event publisher and leverage the <see cref="NoOpEventPublisher"/> instead.</para></remarks>
+    public static IServiceCollection UseExpectedPostgresOutboxPublisher(this IServiceCollection services, string serviceKey = PostgresOutboxPublisher.DefaultServiceKey, bool bypassPassThrough = false)
+        => UseExpectedEventPublisher(services, serviceKey, bypassPassThrough);
+
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions; whilst also adding post-run expectations for the captured events.
+    /// </summary>
+    /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="AspNetCore.ApiTester{TEntryPoint}"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <param name="expectNoEvents">Indicates whether to expect no events to be published.</param>
+    /// <returns>The <see cref="AspNetCore.ApiTester{TEntryPoint}"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="expectNoEvents"/> parameter is only actioned when no explicit event expectations are defined for the underlying test; acts as a catch all.</remarks>
+    public static AspNetCore.ApiTester<TEntryPoint> UseExpectedPostgresOutboxPublisher<TEntryPoint>(this AspNetCore.ApiTester<TEntryPoint> tester, string serviceKey = PostgresOutboxPublisher.DefaultServiceKey, bool bypassPassThrough = false, bool expectNoEvents = true) where TEntryPoint : class
+        => tester.ConfigureServices(services => services.UseExpectedPostgresOutboxPublisher(serviceKey, bypassPassThrough))
+                 .AddEventExpectationsPostRun(serviceKey, expectNoEvents);
+
+    /// <summary>
+    /// Execute the <see cref="PostgresMigration"/> using the <typeparamref name="TAssembly"/> to include additional resource.
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Assembly"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="configureMigrationArgs">The function to further configure the <see cref="MigrationArgs"/>.</param>
+    /// <param name="connectionString">The database connection string configuration key.</param>
+    /// <remarks>Where the migration is unsuccessful then an <see cref="TestFrameworkImplementor.AssertFail(string?)"/> will be automatically issued.
+    /// <para>The <paramref name="connectionString"/> supports the retrieval of the value from <see cref="TesterBase.Configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</para></remarks>
+    public static Task MigratePostgresDataAsync<TAssembly>(this TesterBase tester, Func<MigrationArgs, MigrationArgs>? configureMigrationArgs = null, string connectionString = "^Aspire:Npgsql:ConnectionString")
+        => MigratePostgresDataAsync(tester, configureMigrationArgs, connectionString, typeof(TAssembly).Assembly);
+
+    /// <summary>
+    /// Execute the <see cref="PostgresMigration"/> using the <typeparamref name="TAssembly"/> to include additional resource.
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Assembly"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="resourceFileNames">The resource file names to include in the data loading; see <see cref="DataParserArgs.AddNamed{TAssembly}(string[])"/>.</param>
+    /// <param name="configureMigrationArgs">The function to further configure the <see cref="MigrationArgs"/>.</param>
+    /// <param name="connectionString">The database connection string configuration key.</param>
+    /// <remarks>Where the migration is unsuccessful then an <see cref="TestFrameworkImplementor.AssertFail(string?)"/> will be automatically issued.
+    /// <para>The <paramref name="connectionString"/> supports the retrieval of the value from <see cref="TesterBase.Configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</para></remarks>
+    public static Task MigratePostgresDataAsync<TAssembly>(this TesterBase tester, string[] resourceFileNames, Func<MigrationArgs, MigrationArgs>? configureMigrationArgs = null, string connectionString = "^Aspire:Npgsql:ConnectionString")
+    {
+        if (configureMigrationArgs is null)
+        {
+            return MigratePostgresDataAsync<TAssembly>(tester, ma =>
+            {
+                ma.DataParserArgs.AddNamed<TAssembly>(resourceFileNames);
+                return ma;
+            }, connectionString);
+        }
+        else
+        {
+            return MigratePostgresDataAsync<TAssembly>(tester, ma =>
+            {
+                var cma = configureMigrationArgs(ma);
+                cma.DataParserArgs.AddNamed<TAssembly>(resourceFileNames);
+                return cma;
+            }, connectionString);
+        }
+    }
+
+    /// <summary>
+    /// Execute the <see cref="PostgresMigration"/>.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="configureMigrationArgs">The function to further configure the <see cref="MigrationArgs"/>.</param>
+    /// <param name="connectionString">The database connection string configuration key.</param>
+    /// <param name="assemblies">Zero or more assemblies to add to the migration args (see <see cref="MigrationArgsBase{TSelf}.AddAssembly(Assembly[])"/>).</param>
+    /// <remarks>Where the migration is unsuccessful then an <see cref="TestFrameworkImplementor.AssertFail(string?)"/> will be automatically issued.
+    /// <para>The <paramref name="connectionString"/> supports the retrieval of the value from <see cref="TesterBase.Configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</para></remarks>
+    public static async Task MigratePostgresDataAsync(this TesterBase tester, Func<MigrationArgs, MigrationArgs>? configureMigrationArgs = null, string connectionString = "^Aspire:Npgsql:ConnectionString", params Assembly[] assemblies)
+    {
+        // Determine the connection string and configure the migration args.
+        var cs = CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(connectionString.ThrowIfNullOrEmpty(), tester.ThrowIfNull().Configuration);
+        var ma = new MigrationArgs(_connectionStrings.TryAdd(cs, 0) ? MigrationCommand.All | MigrationCommand.ResetAndData : MigrationCommand.ResetAndData, cs);
+
+        if (configureMigrationArgs is not null)
+            ma = configureMigrationArgs(ma);
+
+        if (assemblies.Length > 0)
+            ma.AddAssembly(assemblies);
+
+        // Execute the PostgreSQL migration.
+        using var m = new PostgresMigration(ma);
+        var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+
+        if (!Success)
+            tester.Implementor.AssertFail("PostgresMigration failed:" + Environment.NewLine + Output);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.RefData.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.RefData.cs
new file mode 100644
index 00000000..aeb91427
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.RefData.cs
@@ -0,0 +1,19 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Extends the reference data collection with additional items for testing purposes.
+    /// </summary>
+    /// <typeparam name="TRefColl">The <see cref="IReferenceDataCollection"/> <see cref="Type"/>.</typeparam>
+    /// <param name="referenceDataCollection">The reference data collection to extend.</param>
+    /// <param name="additionalItems">The additional items to add to the collection.</param>
+    /// <returns>The extended reference data collection.</returns>
+    public static TRefColl ExtendForTesting<TRefColl>(this TRefColl referenceDataCollection, IEnumerable<IReferenceData> additionalItems) where TRefColl : IReferenceDataCollection
+    {
+        referenceDataCollection.AddRange(additionalItems);
+        return referenceDataCollection;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.ServiceBus.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.ServiceBus.cs
new file mode 100644
index 00000000..5cf5ef5b
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.ServiceBus.cs
@@ -0,0 +1,160 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Gets all messages for the Azure Service Bus queue or topic subscription completing each resulting in all messages also being cleared.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="sbo">The <see cref="ServiceBusReceiverOptions"/>.</param>
+    /// <returns>A list of <see cref="Asb.ServiceBusReceivedMessage"/> that were cleared.</returns>
+    public static async Task<List<Asb.ServiceBusReceivedMessage>> GetAndClearAzureServiceBusAsync(this TesterBase tester, ServiceBusReceiverOptions sbo)
+    {
+        var sbc = tester.ThrowIfNull().Services.GetRequiredService<Asb.ServiceBusClient>();
+        var qtn = CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(sbo.QueueOrTopicName, tester.Configuration);
+        var list = new List<Asb.ServiceBusReceivedMessage>();
+
+        await using var receiver = sbo.IsSubscription
+            ? sbc.CreateReceiver(qtn, CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(sbo.SubscriptionName!, tester.Configuration))
+            : sbc.CreateReceiver(qtn);
+
+        while (true)
+        {
+            var messages = await receiver.ReceiveMessagesAsync(maxMessages: 50, maxWaitTime: TimeSpan.FromMilliseconds(1));
+            if (messages.Count == 0)
+                break;
+
+            foreach (var m in messages)
+                await receiver.CompleteMessageAsync(m);
+
+            list.AddRange(messages);
+        }
+
+        return list;
+    }
+
+    /// <summary>
+    /// Gets all messages for the Azure Service Bus queue or topic subscription completing each resulting in all messages also being cleaed.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="sbo">The <see cref="ServiceBusSessionReceiverOptions"/>.</param>
+    /// <returns>A list of <see cref="Asb.ServiceBusReceivedMessage"/> that were cleared.</returns>
+    /// <remarks>This method is used for session-enabled queues or topic subscriptions.</remarks>
+    public static async Task<List<Asb.ServiceBusReceivedMessage>> GetAndClearAzureServiceBusAsync(this TesterBase tester, ServiceBusSessionReceiverOptions sbo)
+    {
+        var sbc = tester.ThrowIfNull().Services.GetRequiredService<Asb.ServiceBusClient>();
+        var qtn = CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(sbo.QueueOrTopicName, tester.Configuration);
+        var list = new List<Asb.ServiceBusReceivedMessage>();
+
+        while (true)
+        {
+            Asb.ServiceBusSessionReceiver? session;
+
+            try
+            {
+                session = sbo.IsSubscription
+                    ? await sbc.AcceptNextSessionAsync(qtn, CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(sbo.SubscriptionName!, tester.Configuration))
+                    : await sbc.AcceptNextSessionAsync(qtn);
+            }
+            catch (Asb.ServiceBusException ex)
+            {
+                if (ex.Reason == Asb.ServiceBusFailureReason.ServiceTimeout || (ex.InnerException is System.Net.Sockets.SocketException innerEx && innerEx.SocketErrorCode == System.Net.Sockets.SocketError.TimedOut))
+                    break; // No more sessions available
+
+                throw;
+            }
+
+            if (session is null)
+                break;
+
+            await using (session)
+            {
+                while (true)
+                {
+                    var messages = await session.ReceiveMessagesAsync(maxMessages: 50, maxWaitTime: TimeSpan.FromMilliseconds(1));
+                    if (messages.Count == 0)
+                        break;
+
+                    foreach (var msg in messages)
+                        await session.CompleteMessageAsync(msg);
+
+                    list.AddRange(messages);
+                }
+            }
+        }
+
+        return list;
+    }
+
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method that defaults the <paramref name="serviceKey"/> to <see cref="ServiceBusPublisher.DefaultServiceKey"/> where invoking the underlying <see cref="UseExpectedEventPublisher(IServiceCollection, string, bool)"/>.
+    /// <para>The <paramref name="bypassPassThrough"/> when set to <see langword="true"/> will bypass the pass-through to the original event publisher and leverage the <see cref="NoOpEventPublisher"/> instead.</para></remarks>
+    public static IServiceCollection UseExpectedAzureServiceBusPublisher(this IServiceCollection services, string serviceKey = ServiceBusPublisher.DefaultServiceKey, bool bypassPassThrough = false)
+        => UseExpectedEventPublisher(services, serviceKey, bypassPassThrough);
+
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions; whilst also adding post-run expectations for the captured events.
+    /// </summary>
+    /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="AspNetCore.ApiTester{TEntryPoint}"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <param name="expectNoEvents">Indicates whether to expect no events to be published.</param>
+    /// <returns>The <see cref="AspNetCore.ApiTester{TEntryPoint}"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="expectNoEvents"/> parameter is only actioned when no explicit event expectations are defined for the underlying test; acts as a catch all.</remarks>
+    public static AspNetCore.ApiTester<TEntryPoint> UseExpectedAzureServiceBusPublisher<TEntryPoint>(this AspNetCore.ApiTester<TEntryPoint> tester, string serviceKey = ServiceBusPublisher.DefaultServiceKey, bool bypassPassThrough = false, bool expectNoEvents = true) where TEntryPoint : class
+        => tester.ConfigureServices(services => services.UseExpectedAzureServiceBusPublisher(serviceKey, bypassPassThrough))
+                 .AddEventExpectationsPostRun(serviceKey, expectNoEvents);
+
+    /// <summary>
+    /// Converts a <see cref="CloudEvent"/> to a <see cref="Asb.ServiceBusReceivedMessage"/>.
+    /// </summary>
+    /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
+    /// <param name="contentMode">The <see cref="ContentMode"/> to use; defaults to <see cref="ContentMode.Structured"/>.</param>
+    /// <param name="includeAttributes">Indicates whether to include all <see cref="CloudEvent.GetPopulatedAttributes"/> as <see cref="Asb.ServiceBusMessage.ApplicationProperties"/>; defaults to <see langword="true"/>.</param>
+    /// <returns>The <see cref="Asb.ServiceBusReceivedMessage"/>.</returns>
+    /// <remarks>The <see cref="Asb.ServiceBusReceivedMessage.Subject"/> is set to the <see cref="CloudEvent.Type"/>. This converts the <see cref="CloudEvent"/> to an interim <see cref="Asb.ServiceBusMessage"/> before creating the <see cref="Asb.ServiceBusReceivedMessage"/>.</remarks>
+    public static Asb.ServiceBusReceivedMessage ToServiceBusReceivedMessage(this CloudEvent cloudEvent, ContentMode contentMode = ContentMode.Structured, bool includeAttributes = true)
+        => cloudEvent.ToServiceBusMessage(contentMode, includeAttributes).ToServiceBusReceivedMessage();
+
+    /// <summary>
+    /// Converts a <see cref="Asb.ServiceBusMessage"/> to a <see cref="Asb.ServiceBusReceivedMessage"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="Asb.ServiceBusMessage"/>.</param>
+    /// <returns>The <see cref="Asb.ServiceBusReceivedMessage"/>.</returns>
+    public static Asb.ServiceBusReceivedMessage ToServiceBusReceivedMessage(this Asb.ServiceBusMessage message)
+    {
+        // Copy application properties
+        var props = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        foreach (var kvp in message.ApplicationProperties)
+            props[kvp.Key] = kvp.Value;
+
+        // Create a ServiceBusReceivedMessage using the ServiceBusModelFactory with the same properties as the original message.
+        return Asb.ServiceBusModelFactory.ServiceBusReceivedMessage(
+            body: message.Body,
+            messageId: message.MessageId,
+            partitionKey: message.PartitionKey,
+            sessionId: message.SessionId,
+            replyToSessionId: message.ReplyToSessionId,
+            timeToLive: message.TimeToLive,
+            correlationId: message.CorrelationId,
+            subject: message.Subject,
+            to: message.To,
+            contentType: message.ContentType,
+            replyTo: message.ReplyTo,
+            scheduledEnqueueTime: message.ScheduledEnqueueTime,
+            properties: props,
+            deliveryCount: 1,
+            sequenceNumber: DateTimeOffset.UtcNow.Ticks,
+            enqueuedTime: DateTimeOffset.UtcNow
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.SqlServer.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.SqlServer.cs
new file mode 100644
index 00000000..6eb417e4
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.SqlServer.cs
@@ -0,0 +1,104 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <returns>The <see cref="IServiceCollection"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method that defaults the <paramref name="serviceKey"/> to <see cref="SqlServerOutboxPublisher.DefaultServiceKey"/> where invoking the underlying <see cref="UseExpectedEventPublisher(IServiceCollection, string, bool)"/>.
+    /// <para>The <paramref name="bypassPassThrough"/> when set to <see langword="true"/> will bypass the pass-through to the original event publisher and leverage the <see cref="NoOpEventPublisher"/> instead.</para></remarks>
+    public static IServiceCollection UseExpectedSqlServerOutboxPublisher(this IServiceCollection services, string serviceKey = SqlServerOutboxPublisher.DefaultServiceKey, bool bypassPassThrough = false)
+        => UseExpectedEventPublisher(services, serviceKey, bypassPassThrough);
+
+    /// <summary>
+    /// Replaces the registered <see cref="IEventPublisher"/> with a decorator (<see cref="EventPublisherDecorator"/>) that also captures the published events for expectation assertions; whilst also adding post-run expectations for the captured events.
+    /// </summary>
+    /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="AspNetCore.ApiTester{TEntryPoint}"/>.</param>
+    /// <param name="serviceKey">The service key for the previously registered <see cref="IEventPublisher"/>.</param>
+    /// <param name="bypassPassThrough">Indicates whether to bypass the pass-through to the original event publisher.</param>
+    /// <param name="expectNoEvents">Indicates whether to expect no events to be published.</param>
+    /// <returns>The <see cref="AspNetCore.ApiTester{TEntryPoint}"/> instance to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="expectNoEvents"/> parameter is only actioned when no explicit event expectations are defined for the underlying test; acts as a catch all.</remarks>
+    public static AspNetCore.ApiTester<TEntryPoint> UseExpectedSqlServerOutboxPublisher<TEntryPoint>(this AspNetCore.ApiTester<TEntryPoint> tester, string serviceKey = SqlServerOutboxPublisher.DefaultServiceKey, bool bypassPassThrough = false, bool expectNoEvents = true) where TEntryPoint : class
+        => tester.ConfigureServices(services => services.UseExpectedSqlServerOutboxPublisher(serviceKey, bypassPassThrough))
+                 .AddEventExpectationsPostRun(serviceKey, expectNoEvents);
+
+    /// <summary>
+    /// Execute the <see cref="SqlServerMigration"/> using the <typeparamref name="TAssembly"/> to include additional resource.
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Assembly"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="configureMigrationArgs">The function to further configure the <see cref="MigrationArgs"/>.</param>
+    /// <param name="connectionString">The database connection string configuration key.</param>
+    /// <remarks>Where the migration is unsuccessful then an <see cref="TestFrameworkImplementor.AssertFail(string?)"/> will be automatically issued.
+    /// <para>The <paramref name="connectionString"/> supports the retrieval of the value from <see cref="TesterBase.Configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</para></remarks>
+    public static Task MigrateSqlServerDataAsync<TAssembly>(this TesterBase tester, Func<MigrationArgs, MigrationArgs>? configureMigrationArgs = null, string connectionString = "^Aspire:Microsoft:Data:SqlClient:ConnectionString")
+        => MigrateSqlServerDataAsync(tester, configureMigrationArgs, connectionString, typeof(TAssembly).Assembly);
+
+    /// <summary>
+    /// Execute the <see cref="SqlServerMigration"/> using the <typeparamref name="TAssembly"/> to include additional resource.
+    /// </summary>
+    /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Assembly"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="resourceFileNames">The resource file names to include in the data loading; see <see cref="DataParserArgs.AddNamed{TAssembly}(string[])"/>.</param>
+    /// <param name="configureMigrationArgs">The function to further configure the <see cref="MigrationArgs"/>.</param>
+    /// <param name="connectionString">The database connection string configuration key.</param>
+    /// <remarks>Where the migration is unsuccessful then an <see cref="TestFrameworkImplementor.AssertFail(string?)"/> will be automatically issued.
+    /// <para>The <paramref name="connectionString"/> supports the retrieval of the value from <see cref="TesterBase.Configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</para></remarks>
+    public static Task MigrateSqlServerDataAsync<TAssembly>(this TesterBase tester, string[] resourceFileNames, Func<MigrationArgs, MigrationArgs>? configureMigrationArgs = null, string connectionString = "^Aspire:Microsoft:Data:SqlClient:ConnectionString")
+    {
+        if (configureMigrationArgs is null)
+        {
+            return MigrateSqlServerDataAsync<TAssembly>(tester, ma =>
+            {
+                ma.DataParserArgs.AddNamed<TAssembly>(resourceFileNames);
+                return ma;
+            }, connectionString);
+        }
+        else
+        {
+            return MigrateSqlServerDataAsync<TAssembly>(tester, ma =>
+            {
+                var cma = configureMigrationArgs(ma);
+                cma.DataParserArgs.AddNamed<TAssembly>(resourceFileNames);
+                return cma;
+            }, connectionString);
+        }
+    }
+
+    /// <summary>
+    /// Execute the <see cref="SqlServerMigration"/>.
+    /// </summary>
+    /// <param name="tester">The <see cref="TesterBase"/>.</param>
+    /// <param name="configureMigrationArgs">The function to further configure the <see cref="MigrationArgs"/>.</param>
+    /// <param name="connectionString">The database connection string configuration key.</param>
+    /// <param name="assemblies">Zero or more assemblies to add to the migration args (see <see cref="MigrationArgsBase{TSelf}.AddAssembly(Assembly[])"/>).</param>
+    /// <remarks>Where the migration is unsuccessful then an <see cref="TestFrameworkImplementor.AssertFail(string?)"/> will be automatically issued.
+    /// <para>The <paramref name="connectionString"/> supports the retrieval of the value from <see cref="TesterBase.Configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</para></remarks>
+    public static async Task MigrateSqlServerDataAsync(this TesterBase tester, Func<MigrationArgs, MigrationArgs>? configureMigrationArgs = null, string connectionString = "^Aspire:Microsoft:Data:SqlClient:ConnectionString", params Assembly[] assemblies)
+    {
+        // Determine the connection string and configure the migration args.
+        var cs = CoreEx.Abstractions.Internal.GetValueFromConfigurationWhereApplicable(connectionString.ThrowIfNullOrEmpty(), tester.ThrowIfNull().Configuration);
+        var ma = new MigrationArgs(_connectionStrings.TryAdd(cs, 0) ? MigrationCommand.All | MigrationCommand.ResetAndData : MigrationCommand.ResetAndData, cs);
+
+        if (configureMigrationArgs is not null)
+            ma = configureMigrationArgs(ma);
+
+        if (assemblies.Length > 0)
+            ma.AddAssembly(assemblies);
+
+        // Execute the sql-server migration.
+        using var m = new SqlServerMigration(ma);
+        var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+
+        if (!Success)
+            tester.Implementor.AssertFail("SqlServerMigration failed:" + Environment.NewLine + Output);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.Validation.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.Validation.cs
new file mode 100644
index 00000000..257ee846
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.Validation.cs
@@ -0,0 +1,71 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+public static partial class UnitTestExExtensions
+{
+    /// <summary>
+    /// Executes the validation and asserts that it is successful (i.e. no errors).
+    /// </summary>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="value">The value to validate.</param>
+    /// <returns>The <see cref="IValidationResult{T}"/>.</returns>
+    /// <remarks>This is using <see cref="AwesomeAssertions"/> to assert that the validation is successful (i.e. <see cref="IValidationResult.HasErrors"/> is <see langword="false"/>).</remarks>
+    public static void AssertSuccess<TValue>(this IValidator<TValue> validator, TValue value)
+        => AssertSuccessAsync(validator, value).GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Executes the validation and asserts that it is successful (i.e. no errors).
+    /// </summary>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="value">The value to validate.</param>
+    /// <returns>The <see cref="IValidationResult{T}"/>.</returns>
+    /// <remarks>This is using <see cref="AwesomeAssertions"/> to assert that the validation is successful (i.e. <see cref="IValidationResult.HasErrors"/> is <see langword="false"/>).</remarks>
+    public static async Task<IValidationResult<TValue>> AssertSuccessAsync<TValue>(this IValidator<TValue> validator, TValue value)
+    {
+        var vr = await validator.ValidateAsync(value).ConfigureAwait(false);
+        vr.HasErrors.Should().BeFalse();
+        return vr;
+    }
+
+    /// <summary>
+    /// Executes the validation and asserts that it has errors and that the expected errors are present.
+    /// </summary>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="expectedErrors">The expected errors.</param>
+    /// <returns>The <see cref="IValidationResult{T}"/>.</returns>
+    /// <remarks>This is using <see cref="AwesomeAssertions"/> to assert that the validation was unsuccessful (i.e. <see cref="IValidationResult.HasErrors"/> is <see langword="true"/>), then comparing the
+    /// <paramref name="expectedErrors"/> with the <see cref="IValidationResult.Messages"/> using <see cref="Assertor.TryAreErrorsMatched(IEnumerable{ApiError}?, IEnumerable{ApiError}?, out string?)"/>.</remarks>
+    public static IValidationResult<TValue> AssertErrors<TValue>(this IValidator<TValue> validator, TValue value, params IEnumerable<ApiError> expectedErrors)
+        => AssertErrorsAsync(validator, value, expectedErrors).GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Executes the validation and asserts that it has errors and that the expected errors are present.
+    /// </summary>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="expectedErrors">The expected errors.</param>
+    /// <returns>The <see cref="IValidationResult{T}"/>.</returns>
+    /// <remarks>This is using <see cref="AwesomeAssertions"/> to assert that the validation was unsuccessful (i.e. <see cref="IValidationResult.HasErrors"/> is <see langword="true"/>), then comparing the
+    /// <paramref name="expectedErrors"/> with the <see cref="IValidationResult.Messages"/> using <see cref="Assertor.TryAreErrorsMatched(IEnumerable{ApiError}?, IEnumerable{ApiError}?, out string?)"/>.</remarks>
+    public static async Task<IValidationResult<TValue>> AssertErrorsAsync<TValue>(this IValidator<TValue> validator, TValue value, params IEnumerable<ApiError> expectedErrors)
+    {
+        if (expectedErrors == null || !expectedErrors.Any())
+            throw new ArgumentException($"At least one expected error must be provided; alternatively, use {nameof(AssertSuccess)}/{nameof(AssertSuccessAsync)} where asserting a successful validation).", nameof(expectedErrors));
+
+        var vr = await validator.ValidateAsync(value).ConfigureAwait(false);
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().NotBeNull().And.HaveCountGreaterThan(0);
+
+        var actualErrors = vr.Messages.Where(x => x.Type == CoreEx.Entities.MessageType.Error).Select(x => new ApiError(x.Property, x.Text?.ToString() ?? "none")).ToArray();
+        if (!Assertor.TryAreErrorsMatched(expectedErrors, actualErrors, out var errorMessage))
+            false.Should().BeTrue(because: errorMessage);
+
+        return vr;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExExtensions.cs b/src/CoreEx.UnitTesting/UnitTestExExtensions.cs
index 6fc2567b..819fc47f 100644
--- a/src/CoreEx.UnitTesting/UnitTestExExtensions.cs
+++ b/src/CoreEx.UnitTesting/UnitTestExExtensions.cs
@@ -1,440 +1,90 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Azure.Core.Amqp;
-using Azure.Messaging.ServiceBus;
-using CoreEx;
-using CoreEx.AspNetCore.Http;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Events;
-using CoreEx.Http;
-using CoreEx.Mapping.Converters;
-using CoreEx.Validation;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.TestHost;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq.Expressions;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Threading.Tasks;
-using UnitTestEx.Abstractions;
-using UnitTestEx.AspNetCore;
-using UnitTestEx.Assertors;
-using UnitTestEx.Generic;
-using UnitTestEx.Json;
-using Ceh = CoreEx.Http;
-
-namespace UnitTestEx
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace UnitTestEx;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides extensions for <see cref="TesterBase"/> to support common testing scenarios.
+/// </summary>
+public static partial class UnitTestExExtensions
 {
+    private static readonly ConcurrentDictionary<string, byte> _connectionStrings = [];
+
     /// <summary>
-    /// Provides extension methods to the core <see href="https://github.com/Avanade/unittestex"/>.
+    /// Enables an <see cref="ExecutionContext"/> instance to be tested managed within a <see cref="TesterBase.Services"/> <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/>.
     /// </summary>
-    public static class UnitTestExExtensions
+    /// <typeparam name="TSelf">The <see cref="TesterBase{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase{TSelf}"/>.</param>
+    /// <param name="scopedTester">The <see cref="ScopedTypeTester{TService}"/> testing action.</param>
+    /// <param name="configure">The optional pre-test <see cref="ExecutionContext"/> configuration action.</param>
+    /// <returns>The <see cref="TesterBase{TSelf}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method for common testing with an <see cref="ExecutionContext"/> instance within a scoped service lifetime.</remarks>
+    public static TSelf Scoped<TSelf>(this TesterBase<TSelf> tester, Action<ScopedTypeTester<ExecutionContext>> scopedTester, Action<ExecutionContext>? configure = null) where TSelf : TesterBase<TSelf>
     {
-        #region IJsonSerializer
-
-        /// <summary>
-        /// Map (convert) the <see cref="CoreEx.Json.IJsonSerializer"/> to a <see cref="UnitTestEx.Json.IJsonSerializer"/>.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="CoreEx.Json.IJsonSerializer"/>.</param>
-        /// <returns>The <see cref="UnitTestEx.Json.IJsonSerializer"/> (see <see cref="ToUnitTestExJsonSerializerMapper"/>).</returns>
-        public static IJsonSerializer ToUnitTestEx(this CoreEx.Json.IJsonSerializer jsonSerializer) => new ToUnitTestExJsonSerializerMapper(jsonSerializer);
-
-        /// <summary>
-        /// Map (convert) the <see cref="UnitTestEx.Json.IJsonSerializer"/> to a <see cref="CoreEx.Json.IJsonSerializer"/>.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="UnitTestEx.Json.IJsonSerializer"/>.</param>
-        /// <returns>The <see cref="CoreEx.Json.IJsonSerializer"/> (see <see cref="ToCoreExJsonSerializerMapper"/>).</returns>
-        public static CoreEx.Json.IJsonSerializer ToCoreEx(this IJsonSerializer jsonSerializer) => new ToCoreExJsonSerializerMapper(jsonSerializer);
-
-        /// <summary>
-        /// Updates the <see cref="TesterBase.JsonSerializer"/> used by the <see cref="TesterBase{TSelf}"/> itself, not the underlying executing host which should be configured separately.
-        /// </summary>
-        /// <typeparam name="TSelf">The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</typeparam>
-        /// <param name="tester">The <see cref="TesterBase{TSelf}"/>.</param>
-        /// <param name="jsonSerializer">The <see cref="JsonSerializer"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
-        public static TSelf UseJsonSerializer<TSelf>(this TesterBase<TSelf> tester, CoreEx.Json.IJsonSerializer jsonSerializer) where TSelf : TesterBase<TSelf>
-            => tester.UseJsonSerializer((jsonSerializer.ThrowIfNull(nameof(jsonSerializer))).ToUnitTestEx());
-
-        #endregion
-
-        #region CreateClientScope
-
-        /// <summary>
-        /// Creates a client-side <see cref="IServiceScope"/> from the <see cref="HttpTesterBase"/> enabling the <typeparamref name="TAgent"/>.
-        /// </summary>
-        /// <typeparam name="TAgent">The Agent (inherits from <see cref="TypedHttpClientBase"/>) <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The <see cref="HttpTesterBase"/>.</param>
-        /// <returns>The <see cref="IServiceScope"/>.</returns>
-        public static IServiceScope CreateClientScope<TAgent>(this HttpTesterBase tester) where TAgent : TypedHttpClientBase
+        tester.ThrowIfNull();
+        scopedTester.ThrowIfNull();
+        return tester.ScopedType<ExecutionContext>(test =>
         {
-            var sc = new ServiceCollection();
-            sc.AddExecutionContext(sp => new CoreEx.ExecutionContext { UserName = tester.UserName ?? tester.Owner.SetUp.DefaultUserName });
-
-            if (tester.JsonSerializer is CoreEx.Json.IJsonSerializer cjs)
-                sc.AddSingleton(cjs);
-            else
-                throw new InvalidOperationException($"The {nameof(HttpTesterBase)} must use a {nameof(IJsonSerializer)} that implements CoreEx.Json.IJsonSerializer to leverage Agent {typeof(TAgent).Name}.");
-
-            sc.AddLogging(lb => { lb.SetMinimumLevel(tester.Owner.SetUp.MinimumLogLevel); lb.ClearProviders(); lb.AddProvider(tester.Owner.LoggerProvider); });
-            sc.AddSingleton(new HttpClient(new HttpTesterBase.HttpDelegatingHandler(tester, tester.TestServer.CreateHandler())) { BaseAddress = tester.TestServer.BaseAddress });
-            sc.AddSingleton(tester.Owner.SharedState);
-            sc.AddSingleton(tester.Owner.Configuration);
-            sc.AddDefaultSettings();
-            sc.AddScoped<TAgent>();
-            return sc.BuildServiceProvider().CreateScope();
-        }
-
-        #endregion
-
-        #region ActionResultAssertor
-
-        /// <summary>
-        /// Asserts that the <see cref="ValueContentResult.ETag"/> matches the <paramref name="expectedETag"/>.
-        /// </summary>
-        /// <param name="assertor">The assertor.</param>
-        /// <param name="expectedETag">The expected ETag value.</param>
-        /// <returns>The <see cref="ActionResultAssertor"/> to support fluent-style method-chaining.</returns>
-        public static ActionResultAssertor AssertETagHeader(this ActionResultAssertor assertor, string expectedETag)
-        {
-            if (assertor.Result != null && assertor.Result is ValueContentResult vcr)
-                assertor.Owner.Implementor.AssertAreEqual(expectedETag, vcr.ETag, $"Expected and Actual {nameof(ValueContentResult.ETag)} values are not equal.");
-            else
-                assertor.Owner.Implementor.AssertFail($"The Result must be of Type {typeof(ValueContentResult).FullName} to use {nameof(AssertETagHeader)}.");
-
-            return assertor;
-        }
-
-        /// <summary>
-        /// Asserts that the <see cref="ValueContentResult.Location"/> matches the <paramref name="expectedUri"/>.
-        /// </summary>
-        /// <param name="assertor">The assertor.</param>
-        /// <param name="expectedUri">The expected <see cref="Uri"/>.</param>
-        /// <returns>The <see cref="ActionResultAssertor"/> to support fluent-style method-chaining.</returns>
-#if NET7_0_OR_GREATER
-        public static ActionResultAssertor AssertLocationHeader(this ActionResultAssertor assertor, [StringSyntax(StringSyntaxAttribute.Uri)] Uri expectedUri)
-#else
-        public static ActionResultAssertor AssertLocationHeader(this ActionResultAssertor assertor, Uri expectedUri)
-#endif
-        {
-            if (assertor.Result != null && assertor.Result is ValueContentResult vcr)
-                assertor.Owner.Implementor.AssertAreEqual(expectedUri, vcr.Location, $"Expected and Actual {nameof(ValueContentResult.Location)} values are not equal.");
-            else if (assertor.Result != null && assertor.Result is ExtendedStatusCodeResult escr)
-                assertor.Owner.Implementor.AssertAreEqual(expectedUri, escr.Location, $"Expected and Actual {nameof(ExtendedStatusCodeResult.Location)} values are not equal.");
-            else
-                assertor.Owner.Implementor.AssertFail($"The Result must be of Type {typeof(ValueContentResult).FullName} or {typeof(ExtendedStatusCodeResult).FullName} to use {nameof(AssertLocationHeader)}.");
-
-            return assertor;
-        }
-
-        /// <summary>
-        /// Asserts that the <see cref="ValueContentResult.Location"/> matches the <paramref name="expectedUri"/> function.
-        /// </summary>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="assertor">The assertor.</param>
-        /// <param name="expectedUri">The expected <see cref="Uri"/> function.</param>
-        /// <returns>The <see cref="ActionResultAssertor"/> to support fluent-style method-chaining.</returns>
-        public static ActionResultAssertor AssertLocationHeader<TValue>(this ActionResultAssertor assertor, Func<TValue, Uri> expectedUri)
-            => assertor.AssertLocationHeader(expectedUri.Invoke(assertor.GetValue<TValue>()!));
-
-        /// <summary>
-        /// Asserts that the <see cref="ValueContentResult.Location"/> contains the <paramref name="expected"/> string.
-        /// </summary>
-        /// <param name="assertor">The assertor.</param>
-        /// <param name="expected">The expected string.</param>
-        /// <returns>The <see cref="ActionResultAssertor"/> to support fluent-style method-chaining.</returns>
-        public static ActionResultAssertor AssertLocationHeaderContains(this ActionResultAssertor assertor, string expected)
-        {
-            Uri? actual = null;
-            if (assertor.Result != null && assertor.Result is ValueContentResult vcr)
-                actual = vcr.Location;
-            else if (assertor.Result != null && assertor.Result is ExtendedStatusCodeResult escr)
-                actual = escr.Location;
-            else
-                assertor.Owner.Implementor.AssertFail($"The Result must be of Type {typeof(ValueContentResult).FullName} or {typeof(ExtendedStatusCodeResult).FullName} to use {nameof(AssertLocationHeader)}.");
-
-            if (actual == null)
-                assertor.Owner.Implementor.AssertFail($"The actual {nameof(ValueContentResult.Location)} must not be null.");
-
-            if (!actual!.ToString().Contains(expected))
-                assertor.Owner.Implementor.AssertFail($"The {nameof(ValueContentResult.Location)} '{actual}' must contain {expected}.");
-
-            return assertor;
-        }
-
-        /// <summary>
-        /// Asserts that the <see cref="ValueContentResult.Location"/> contains the <paramref name="expected"/> string function.
-        /// </summary>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="assertor">The assertor.</param>
-        /// <param name="expected">The expected string function.</param>
-        /// <returns>The <see cref="ActionResultAssertor"/> to support fluent-style method-chaining.</returns>
-        public static ActionResultAssertor AssertLocationHeader<TValue>(this ActionResultAssertor assertor, Func<TValue, string> expected)
-            => assertor.AssertLocationHeaderContains(expected.Invoke(assertor.GetValue<TValue>()!));
-
-#endregion
-
-        #region GenericTesterBase
-
-        /// <summary>
-        /// Enables the validation <see cref="GenericTesterBaseWith{TEntryPoint, TSelf}">with</see> a specified validation.
-        /// </summary>
-        /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TSelf">The <see cref="ApiTesterBase{TEntryPoint, TSelf}"/>.</typeparam>
-        /// <param name="tester">The tester.</param>
-        /// <param name="operationType">The optional <see cref="OperationType"/> for the test (updates the <see cref="ExecutionContext.Current"/>).</param>
-        public static GenericTesterBaseWith<TEntryPoint, TSelf> Validation<TEntryPoint, TSelf>(this GenericTesterBase<TEntryPoint, TSelf> tester, OperationType operationType = OperationType.Unspecified) where TEntryPoint : class, new() where TSelf : GenericTesterBase<TEntryPoint, TSelf>
-            => new(tester, operationType);
-
-        /// <summary>
-        /// Enables the validation.
-        /// </summary>
-        /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TSelf">The <see cref="ApiTesterBase{TEntryPoint, TSelf}"/>.</typeparam>
-        public class GenericTesterBaseWith<TEntryPoint, TSelf> where TEntryPoint : class, new() where TSelf : GenericTesterBase<TEntryPoint, TSelf>
-        {
-            private readonly GenericTesterBase<TEntryPoint, TSelf> _tester;
-            private readonly OperationType _operationType;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="AgentTesterWith{TEntryPoint, TSelf}"/>.
-            /// </summary>
-            internal GenericTesterBaseWith(GenericTesterBase<TEntryPoint, TSelf> tester, OperationType operationType)
-            {
-                _tester = tester.ThrowIfNull(nameof(tester));
-                _operationType = operationType;
-            }
-
-            /// <summary>
-            /// Creates (instantiates) the <typeparamref name="TValidator"/> using Dependency Injection (DI) and validates the <typeparamref name="TValue"/> <paramref name="value"/>.
-            /// </summary>
-            /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-            /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-            /// <param name="value">The value to validate.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public ValueAssertor<IValidationResult> With<TValidator, TValue>(TValue value) where TValue : class where TValidator : class, IValidator<TValue>
-                => WithAsync<TValidator, TValue>(value).GetAwaiter().GetResult();
-
-            /// <summary>
-            /// Validates the <typeparamref name="TValue"/> <paramref name="value"/> using the <paramref name="validator"/>.
-            /// </summary>
-            /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-            /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-            /// <param name="validator">The validator.</param>
-            /// <param name="value">The value to validate.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public ValueAssertor<IValidationResult> With<TValidator, TValue>(TValidator validator, TValue value) where TValue : class where TValidator : class, IValidator<TValue>
-                => WithAsync(validator, value).GetAwaiter().GetResult();
-
-            /// <summary>
-            /// Executes the <paramref name="validation"/> function.
-            /// </summary>
-            /// <param name="validation">The validation function.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public ValueAssertor<IValidationResult> With(Func<IValidationResult> validation) => WithAsync(() => Task.FromResult(validation())).GetAwaiter().GetResult();
-
-            /// <summary>
-            /// Executes the <paramref name="validation"/> function.
-            /// </summary>
-            /// <param name="validation">The validation function.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public ValueAssertor<IValidationResult> With(Func<Task<IValidationResult>> validation) => WithAsync(validation).GetAwaiter().GetResult();
-
-            /// <summary>
-            /// Creates (instantiates) the <typeparamref name="TValidator"/> using Dependency Injection (DI) and validates the <typeparamref name="TValue"/> <paramref name="value"/>.
-            /// </summary>
-            /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-            /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-            /// <param name="value">The value to validate.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public Task<ValueAssertor<IValidationResult>> WithAsync<TValidator, TValue>(TValue value) where TValue : class where TValidator : class, IValidator<TValue>
-                => WithAsync(_tester.Services.GetService<TValidator>() ?? throw new InvalidOperationException($"Validator '{typeof(TValidator).FullName}' not configured using Dependency Injection (DI) and therefore unable to be instantiated for testing."), value);
-
-            /// <summary>
-            /// Validates the <typeparamref name="TValue"/> <paramref name="value"/> using the <paramref name="validator"/>.
-            /// </summary>
-            /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-            /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-            /// <param name="validator">The validator.</param>
-            /// <param name="value">The value to validate.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public Task<ValueAssertor<IValidationResult>> WithAsync<TValidator, TValue>(TValidator validator, TValue value) where TValue : class where TValidator : class, IValidator<TValue>
-                => WithAsync(async () => await validator.ThrowIfNull(nameof(validator)).ValidateAsync(value).ConfigureAwait(false));
-
-            /// <summary>
-            /// Executes the <paramref name="validation"/> function.
-            /// </summary>
-            /// <param name="validation">The validation function.</param>
-            /// <returns>The <see cref="ValueAssertor{TValue}"/> with the resulting <see cref="IValidationResult"/>.</returns>
-            public Task<ValueAssertor<IValidationResult>> WithAsync(Func<Task<IValidationResult>> validation)
-                => _tester.RunAsync(async () =>
-                {
-                    // Build out an execution context.
-                    OperationType? existingOperationType = null;
-                    if (ExecutionContext.HasCurrent)
-                        existingOperationType = ExecutionContext.Current.OperationType;
-                    else
-                    {
-                        var ec = _tester.Services.GetService<ExecutionContext>();
-                        if (ec is null)
-                            _ = ExecutionContext.Current;
-                        else if (!ExecutionContext.HasCurrent)
-                            ExecutionContext.SetCurrent(ec);
-
-                        // Update service provider where null.
-                        ExecutionContext.Current.ServiceProvider ??= _tester.Services;
-                    }
-
-                    // Set/override the operation type.
-                    ExecutionContext.Current.OperationType = _operationType;
-
-                    // Perform the validation.
-                    try
-                    {
-                        var vr = await validation().ConfigureAwait(false);
-                        vr.ThrowOnError();
-                        return vr;
-                    }
-                    finally
-                    {
-                        // Reset where finished.
-                        if (existingOperationType.HasValue)
-                            ExecutionContext.Current.OperationType = existingOperationType.Value;
-                        else
-                            ExecutionContext.Reset();
-                    }
-                });
-        }
-
-        #endregion
-
-        #region ApiTesterBase
-
-        /// <summary>
-        /// Enables a test <see cref="HttpRequestMessage"/> to be sent to the underlying <see cref="TestServer"/> <see cref="AgentTesterWith{TEntryPoint, TSelf}">with</see> a specified <see cref="TypedHttpClientBase">agent</see>.
-        /// </summary>
-        /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TSelf">The <see cref="ApiTesterBase{TEntryPoint, TSelf}"/>.</typeparam>
-        /// <param name="tester">The tester.</param>
-        /// <returns>The <see cref="AgentTesterWith{TEntryPoint, TSelf}"/> to allow <b>Agent</b> type specification.</returns>
-        public static AgentTesterWith<TEntryPoint, TSelf> Agent<TEntryPoint, TSelf>(this ApiTesterBase<TEntryPoint, TSelf> tester)
-            where TEntryPoint : class where TSelf : ApiTesterBase<TEntryPoint, TSelf>
-            => new(tester);
+            configure?.Invoke(test.Service);
+            scopedTester(test);
+        });
+    }
 
-        /// <summary>
-        /// Enables the <see cref="TypedHttpClientBase">agent</see> <see cref="Type"/> specification.
-        /// </summary>
-        /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TSelf">The <see cref="ApiTesterBase{TEntryPoint, TSelf}"/>.</typeparam>
-        public class AgentTesterWith<TEntryPoint, TSelf> where TEntryPoint : class where TSelf : ApiTesterBase<TEntryPoint, TSelf>
+    /// <summary>
+    /// Enables an <see cref="ExecutionContext"/> instance to be tested managed within a <see cref="TesterBase.Services"/> <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The <see cref="TesterBase{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase{TSelf}"/>.</param>
+    /// <param name="scopedTester">The <see cref="ScopedTypeTester{TService}"/> testing action.</param>
+    /// <param name="configure">The optional pre-test <see cref="ExecutionContext"/> configuration action.</param>
+    /// <returns>The <see cref="TesterBase{TSelf}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method for common testing with an <see cref="ExecutionContext"/> instance within a scoped service lifetime.</remarks>
+    public static TSelf Scoped<TSelf>(this TesterBase<TSelf> tester, Func<ScopedTypeTester<ExecutionContext>, Task> scopedTester, Action<ExecutionContext>? configure = null) where TSelf : TesterBase<TSelf>
+    {
+        tester.ThrowIfNull();
+        scopedTester.ThrowIfNull();
+        return tester.ScopedType<ExecutionContext>(async test =>
         {
-            private readonly ApiTesterBase<TEntryPoint, TSelf> _tester;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="AgentTesterWith{TEntryPoint, TSelf}"/>.
-            /// </summary>
-            internal AgentTesterWith(ApiTesterBase<TEntryPoint, TSelf> tester) => _tester = tester.ThrowIfNull(nameof(tester));
-
-            /// <summary>
-            /// Enables a test <see cref="HttpRequestMessage"/> to be sent to the underlying <see cref="TestServer"/> leveraging the specified <see cref="TypedHttpClientBase">agent</see>.
-            /// </summary>
-            /// <typeparam name="TAgent">The <see cref="AgentTester{TAgent}"/>.</typeparam>
-            /// <returns>The <see cref="AgentTester{TAgent}"/>.</returns>
-            public AgentTester<TAgent> With<TAgent>() where TAgent : TypedHttpClientBase => new(_tester, _tester.GetTestServer());
-
-            /// <summary>
-            /// Enables a test <see cref="HttpRequestMessage"/> to be sent to the underlying <see cref="TestServer"/> leveraging the specified <see cref="TypedHttpClientBase">agent</see>.
-            /// </summary>
-            /// <typeparam name="TAgent">The <see cref="AgentTester{TAgent}"/>.</typeparam>
-            /// <typeparam name="TValue">The response value <see cref="Type"/>.</typeparam>
-            /// <returns>The <see cref="AgentTester{TAgent, TValue}"/>.</returns>
-            public AgentTester<TAgent, TValue> With<TAgent, TValue>() where TAgent : TypedHttpClientBase => new(_tester, _tester.GetTestServer());
-        }
-
-        #endregion
-
-        #region ControllerTester
-
-        /// <summary>
-        /// Runs the controller using an <see cref="HttpRequestMessage"/> inferring the <see cref="HttpMethod"/>, operation name and request from the <paramref name="expression"/>.
-        /// </summary>
-        /// <typeparam name="TController">The <see cref="ControllerBase"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The result value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The tester.</param>
-        /// <param name="expression">The controller operation invocation expression.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <param name="requestModifier">The optional <see cref="HttpRequestMessage"/> modifier.</param>
-        /// <returns>A <see cref="HttpResponseMessageAssertor"/>.</returns>
-        public static HttpResponseMessageAssertor Run<TController, TResult>(this ControllerTester<TController> tester, Expression<Func<TController, TResult>> expression, Ceh.HttpRequestOptions? requestOptions = null, Action<HttpRequestMessage>? requestModifier = null)
-            where TController : ControllerBase
-            => RunAsync(tester, expression, requestOptions, requestModifier).GetAwaiter().GetResult();
+            configure?.Invoke(test.Service);
+            await scopedTester(test).ConfigureAwait(false);
+        });
+    }
 
-        /// <summary>
-        /// Runs the controller using an <see cref="HttpRequestMessage"/> inferring the <see cref="HttpMethod"/>, operation name and request from the <paramref name="expression"/>.
-        /// </summary>
-        /// <typeparam name="TController">The <see cref="ControllerBase"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The result value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The tester.</param>
-        /// <param name="expression">The controller operation invocation expression.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <param name="requestModifier">The optional <see cref="HttpRequestMessage"/> modifier.</param>
-        /// <returns>A <see cref="HttpResponseMessageAssertor"/>.</returns>
-        public static Task<HttpResponseMessageAssertor> RunAsync<TController, TResult>(this ControllerTester<TController> tester, Expression<Func<TController, TResult>> expression, Ceh.HttpRequestOptions? requestOptions = null, Action<HttpRequestMessage>? requestModifier = null)
-            where TController : ControllerBase
+    /// <summary>
+    /// Enables an <see cref="ExecutionContext"/> instance to be tested managed within a <see cref="TesterBase.Services"/> <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The <see cref="TesterBase{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase{TSelf}"/>.</param>
+    /// <param name="tenantId">The tenant identifier to set on the <see cref="ExecutionContext"/>.</param>
+    /// <param name="scopedTester">The <see cref="ScopedTypeTester{TService}"/> testing action.</param>
+    /// <param name="configure">The optional pre-test <see cref="ExecutionContext"/> configuration action.</param>
+    /// <returns>The <see cref="TesterBase{TSelf}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method for common testing with an <see cref="ExecutionContext"/> instance within a scoped service lifetime.</remarks>
+    public static TSelf Scoped<TSelf>(this TesterBase<TSelf> tester, string? tenantId, Action<ScopedTypeTester<ExecutionContext>> scopedTester, Action<ExecutionContext>? configure = null) where TSelf : TesterBase<TSelf>
+        => Scoped(tester, scopedTester, ec =>
         {
-            void rm(HttpRequestMessage hr)
-            {
-                requestModifier?.Invoke(hr);
-                hr.ApplyRequestOptions(requestOptions);
-            }
-
-            return tester.RunAsync(expression, rm);
-        }
+            ec.TenantId = tenantId;
+            configure?.Invoke(ec);
+        });
 
-        /// <summary>
-        /// Runs the controller using an <see cref="HttpRequestMessage"/> inferring the <see cref="HttpMethod"/>, operation name and request from the <paramref name="expression"/>.
-        /// </summary>
-        /// <typeparam name="TController">The <see cref="ControllerBase"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The result value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The tester.</param>
-        /// <param name="expression">The controller operation invocation expression.</param>
-        /// <param name="content">The body content.</param>
-        /// <param name="contentType">The body content type. Defaults to <see cref="MediaTypeNames.Text.Plain"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <param name="requestModifier">The optional <see cref="HttpRequestMessage"/> modifier.</param>
-        /// <returns>A <see cref="HttpResponseMessageAssertor"/>.</returns>
-        public static HttpResponseMessageAssertor RunContent<TController, TResult>(this ControllerTester<TController> tester, Expression<Func<TController, TResult>> expression, string? content, string? contentType = MediaTypeNames.Text.Plain, Ceh.HttpRequestOptions? requestOptions = null, Action<HttpRequestMessage>? requestModifier = null)
-            where TController : ControllerBase
-            => RunContentAsync(tester, expression, content, contentType, requestOptions, requestModifier).GetAwaiter().GetResult();
-
-        /// <summary>
-        /// Runs the controller using an <see cref="HttpRequestMessage"/> inferring the <see cref="HttpMethod"/>, operation name and request from the <paramref name="expression"/>.
-        /// </summary>
-        /// <typeparam name="TController">The <see cref="ControllerBase"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResult">The result value <see cref="Type"/>.</typeparam>
-        /// <param name="tester">The tester.</param>
-        /// <param name="expression">The controller operation invocation expression.</param>
-        /// <param name="content">The body content.</param>
-        /// <param name="contentType">The body content type. Defaults to <see cref="MediaTypeNames.Text.Plain"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="Ceh.HttpRequestOptions"/>.</param>
-        /// <param name="requestModifier">The optional <see cref="HttpRequestMessage"/> modifier.</param>
-        /// <returns>A <see cref="HttpResponseMessageAssertor"/>.</returns>
-        public static Task<HttpResponseMessageAssertor> RunContentAsync<TController, TResult>(this ControllerTester<TController> tester, Expression<Func<TController, TResult>> expression, string? content, string? contentType = MediaTypeNames.Text.Plain, Ceh.HttpRequestOptions? requestOptions = null, Action<HttpRequestMessage>? requestModifier = null)
-            where TController : ControllerBase
+    /// <summary>
+    /// Enables an <see cref="ExecutionContext"/> instance to be tested managed within a <see cref="TesterBase.Services"/> <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/>.
+    /// </summary>
+    /// <typeparam name="TSelf">The <see cref="TesterBase{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="tester">The <see cref="TesterBase{TSelf}"/>.</param>
+    /// <param name="tenantId">The tenant identifier to set on the <see cref="ExecutionContext"/>.</param>
+    /// <param name="scopedTester">The <see cref="ScopedTypeTester{TService}"/> testing action.</param>
+    /// <param name="configure">The optional pre-test <see cref="ExecutionContext"/> configuration action.</param>
+    /// <returns>The <see cref="TesterBase{TSelf}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method for common testing with an <see cref="ExecutionContext"/> instance within a scoped service lifetime.</remarks>
+    public static TSelf Scoped<TSelf>(this TesterBase<TSelf> tester, string? tenantId, Func<ScopedTypeTester<ExecutionContext>, Task> scopedTester, Action<ExecutionContext>? configure = null) where TSelf : TesterBase<TSelf>
+    {
+        tester.ThrowIfNull();
+        scopedTester.ThrowIfNull();
+        return tester.ScopedType<ExecutionContext>(async test =>
         {
-            void rm(HttpRequestMessage hr)
-            {
-                requestModifier?.Invoke(hr);
-                hr.ApplyRequestOptions(requestOptions);
-            }
-
-            return tester.RunContentAsync(expression, content, contentType, rm);
-        }
-
-        #endregion
+            test.Service.TenantId = tenantId;
+            configure?.Invoke(test.Service);
+            await scopedTester(test).ConfigureAwait(false);
+        });
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UnitTestExOneOffTestSetUp.cs b/src/CoreEx.UnitTesting/UnitTestExOneOffTestSetUp.cs
new file mode 100644
index 00000000..648981c2
--- /dev/null
+++ b/src/CoreEx.UnitTesting/UnitTestExOneOffTestSetUp.cs
@@ -0,0 +1,31 @@
+[assembly: UnitTestEx.Abstractions.OneOffTestSetUp(typeof(CoreEx.UnitTesting.UnitTestExOneOffTestSetUp))]
+
+namespace CoreEx.UnitTesting;
+
+/// <summary>
+/// One-off test set-up for <b>UnitTestEx</b> to initialize <b>CoreEx</b>-specific capabilities.
+/// </summary>
+internal class UnitTestExOneOffTestSetUp : UnitTestEx.Abstractions.OneOffTestSetUpBase
+{
+    /// <inheritdoc/>
+    public override void SetUp()
+    {
+        TestSetUp.Default.DefaultUserName = CoreEx.Security.AuthenticationUser.EnvironmentUser.UserName;
+        TestSetUp.Default.JsonSerializer = new UnitTestEx.Json.JsonSerializer(CoreEx.Json.JsonDefaults.SerializerOptions);
+
+        // Extend the AssertErrors functionality to support the ValidationException.
+        AssertorBase.AddAssertErrorsExtension((assertor, errors) =>
+        {
+            if (assertor.Exception is ValidationException vex)
+            {
+                var actual = vex.Messages?.Where(x => x.Type == Entities.MessageType.Error).Select(x => new ApiError(x.Property, x.Text.ToString() ?? string.Empty)).ToArray() ?? [];
+                if (!Assertor.TryAreErrorsMatched(errors, actual, out var errorMessage))
+                    assertor.Owner.Implementor.AssertFail(errorMessage);
+
+                return true;
+            }
+
+            return false;
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/UsingApiTester.cs b/src/CoreEx.UnitTesting/UsingApiTester.cs
deleted file mode 100644
index 24191932..00000000
--- a/src/CoreEx.UnitTesting/UsingApiTester.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Http;
-using Microsoft.AspNetCore.TestHost;
-using System;
-using System.Net.Http;
-using UnitTestEx.AspNetCore;
-
-namespace UnitTestEx
-{
-    /// <summary>
-    /// Provides a shared <see cref="ApiTester"/> class to enable usage of the same underlying <see cref="TestServer"/> instance across multiple tests.
-    /// </summary>
-    /// <typeparam name="TEntryPoint">The API startup <see cref="Type"/>.</typeparam>
-    /// <remarks>Implements <see cref="IDisposable"/> so should be automatically disposed off by the test framework host.</remarks>
-    public abstract class UsingApiTester<TEntryPoint> : ApiTester<TEntryPoint> where TEntryPoint : class
-    {
-        /// <summary>
-        /// Gets the <see cref="ApiTester"/>; i.e. itself.
-        /// </summary>
-        /// <remarks>This is provided for backwards compatibility.</remarks>
-        public UsingApiTester<TEntryPoint> ApiTester => this;
-
-        /// <summary>
-        /// Enables a test <see cref="HttpRequestMessage"/> to be sent to the underlying <see cref="TestServer"/> with a specified <see cref="TypedHttpClientBase">agent</see>.
-        /// </summary>
-        /// <typeparam name="TAgent">The <see cref="AgentTester{TAgent}"/>.</typeparam>
-        /// <returns>The <see cref="AgentTester{TAgent}"/>.</returns>
-        public AgentTester<TAgent> Agent<TAgent>() where TAgent : CoreEx.Http.TypedHttpClientBase => new(this, GetTestServer());
-
-        /// <summary>
-        /// Enables a test <see cref="HttpRequestMessage"/> to be sent to the underlying <see cref="TestServer"/> with a specified <see cref="TypedHttpClientBase">agent</see>.
-        /// </summary>
-        /// <typeparam name="TAgent">The <see cref="AgentTester{TAgent}"/>.</typeparam>
-        /// <typeparam name="TValue">The response value <see cref="Type"/>.</typeparam>
-        /// <returns>The <see cref="AgentTester{TAgent, TValue}"/>.</returns>
-        public AgentTester<TAgent, TValue> Agent<TAgent, TValue>() where TAgent : CoreEx.Http.TypedHttpClientBase => new(this, GetTestServer());
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.UnitTesting/strong-name-key.snk b/src/CoreEx.UnitTesting/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.UnitTesting/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx.Validation/AGENTS.md b/src/CoreEx.Validation/AGENTS.md
new file mode 100644
index 00000000..d97faf35
--- /dev/null
+++ b/src/CoreEx.Validation/AGENTS.md
@@ -0,0 +1,98 @@
+# CoreEx.Validation — AI Usage Guide
+
+Fluent, property-centric validation framework tightly integrated with `ExecutionContext`, `LText` localisation, and the CoreEx exception model.
+
+## Define a Validator
+
+Extend `Validator<TEntity>` and declare property chains in the constructor. Assign a `Default` singleton to avoid repeated instantiation.
+
+```csharp
+public class ProductValidator : Validator<Product>
+{
+    public static readonly ProductValidator Default = new();
+
+    public ProductValidator()
+    {
+        Property(p => p.Sku)
+            .Mandatory()
+            .String(maxLength: 20);
+
+        Property(p => p.Name)
+            .Mandatory()
+            .String(maxLength: 100);
+
+        Property(p => p.Price)
+            .Mandatory()
+            .CompareValue(CompareOperator.GreaterThan, 0m);
+    }
+}
+```
+
+## Call from a Service
+
+Always call `ValidateAndThrowAsync` before mutating state. This produces a `ValidationException` with all field-level errors at once.
+
+```csharp
+public async Task<Product> CreateAsync(Product product, CancellationToken ct = default)
+{
+    await ProductValidator.Default.ValidateAndThrowAsync(product, ct).ConfigureAwait(false);
+
+    return await _uow.TransactionAsync(async () =>
+    {
+        // ... persist and publish
+    }).ConfigureAwait(false);
+}
+```
+
+## Common Rules Reference
+
+```csharp
+Property(p => p.Email).Mandatory().Email();
+Property(p => p.Status).Mandatory().Enum();            // validates enum is defined
+Property(p => p.Quantity).Mandatory().Numeric(allowNegatives: false);
+Property(p => p.Description).String(maxLength: 500);
+Property(p => p.Tags).Collection(maxCount: 10);
+Property(p => p.Address).Entity(AddressValidator.Default);  // child entity
+```
+
+## Conditional Rules
+
+Use `When`/`WhenHasValue`/`DependsOn` to guard the declarative rules.
+
+```csharp
+Property(p => p.DiscountCode)
+    .Mandatory()
+    .WhenEntity(product => product.HasDiscount);
+
+Property(p => p.ExpiresOn)
+    .CompareValue(CompareOperator.GreaterThan, () => Runtime.UtcNow)
+    .WhenHasValue();
+```
+
+## Reusable Validators
+
+Use `CommonValidator<TValue>` for logic reused across multiple entity validators.
+
+```csharp
+public static readonly CommonValidator<string> SkuValidator = Validator.CreateCommon<string>(v =>
+    v.String(minLength: 3, maxLength: 20));
+
+// Usage
+HasRuleFor(p => p.Sku).Common(SkuValidator);
+```
+
+## Do Not
+
+- Do not call `ValidateAsync` and ignore errors — always call `ValidateAndThrowAsync` or check `HasErrors` and throw `ValidationException` explicitly.
+- Do not add try/catch around `ValidateAndThrowAsync` to rethrow as a different exception type — `ValidationException` maps to HTTP 400 automatically.
+- Do not validate inside `TransactionAsync` — validate first (before the transaction) so failed validation never opens a database transaction.
+- Do not use `DataAnnotations` attributes alongside CoreEx validators — pick one approach per entity and stay consistent.
+- Do not use FluentValidation alongside CoreEx validators unless bridging with `InteropRule` is explicitly needed.
+
+## Further Reading
+
+- [README](./README.md) — full rule catalogue, clause types, `CommonValidator`, `RuleSet`, and `ValidationExtensions` API reference.
+- [CoreEx](../CoreEx/README.md) — `ValidationException`, `MessageItemCollection`, and `LText` localisation.
+- [CoreEx.AspNetCore](../CoreEx.AspNetCore/README.md) — `ValidationException` is translated to `400 application/problem+json` with field-level errors by `WebApi`.
+- [Application layer](../../samples/docs/application-layer.md) — where and how validators are called in application services, including the validate-before-transaction pattern.
+- [Patterns](../../samples/docs/patterns.md) — validation patterns, conditional rules, reusable `CommonValidator` usage, and the relationship between validators and policies.
diff --git a/src/CoreEx.Validation/AbstractValidator.cs b/src/CoreEx.Validation/AbstractValidator.cs
index 86cc0b94..4005f328 100644
--- a/src/CoreEx.Validation/AbstractValidator.cs
+++ b/src/CoreEx.Validation/AbstractValidator.cs
@@ -1,13 +1,8 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents the base entity validator using <see href="https://docs.fluentvalidation.net/en/latest/">FluentValidation</see> syntax.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <remarks>This is a synonym for the <see cref="Validator{TEntity}"/>.</remarks>
-    public abstract class AbstractValidator<TEntity> : Validator<TEntity> where TEntity : class { }
-}
\ No newline at end of file
+/// <summary>
+/// Provides entity validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <remarks>This is a synonym for the <see cref="Validator{TEntity}"/> (and inherits from) to enable <see href="https://docs.fluentvalidation.net/en/latest/">FluentValidation</see>-like syntax.</remarks>
+public abstract class AbstractValidator<TEntity> : Validator<TEntity> where TEntity : class { }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/AbstractValidatorT2.cs b/src/CoreEx.Validation/AbstractValidatorT2.cs
new file mode 100644
index 00000000..be97f797
--- /dev/null
+++ b/src/CoreEx.Validation/AbstractValidatorT2.cs
@@ -0,0 +1,9 @@
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides entity validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The self <see cref="Type"/>.</typeparam>
+/// <remarks>This is a synonym for the <see cref="Validator{TEntity, TSelf}"/> (and inherits from) to enable <see href="https://docs.fluentvalidation.net/en/latest/">FluentValidation</see>-like syntax.</remarks>
+public abstract class AbstractValidator<TEntity, TSelf> : Validator<TEntity, TSelf> where TEntity : class where TSelf : AbstractValidator<TEntity, TSelf>, new() { }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IPropertyContext.cs b/src/CoreEx.Validation/Abstractions/IPropertyContext.cs
new file mode 100644
index 00000000..a233e5bd
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IPropertyContext.cs
@@ -0,0 +1,94 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables a validation context for a property.
+/// </summary>
+public interface IPropertyContext
+{
+    /// <summary>
+    /// Gets the owning entity <see cref="IValidationContext"/>.
+    /// </summary>
+    IValidationContext Owner { get; }
+
+    /// <summary>
+    /// Gets the property <see cref="IPropertyRuntimeMetadata"/>.
+    /// </summary>
+    IPropertyRuntimeMetadata Metadata { get; }
+
+    /// <summary>
+    /// Gets the additional parameters (see <see cref="ValidationArgs.Parameters"/>).
+    /// </summary>
+    IDictionary<string, object?> Parameters { get; }
+
+    /// <summary>
+    /// Gets the property name.
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// Gets the JSON property name.
+    /// </summary>
+    string JsonName { get; }
+
+    /// <summary>
+    /// Gets the fully qualified property name.
+    /// </summary>
+    string FullyQualifiedPropertyName { get; }
+
+    /// <summary>
+    /// Gets the fully qualified JSON property name.
+    /// </summary>
+    string FullyQualifiedJsonPropertyName { get; }
+
+    /// <summary>
+    /// Gets the friendly text.
+    /// </summary>
+    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+    LText Text { get; }
+
+    /// <summary>
+    /// Gets the property value.
+    /// </summary>
+    object? Value { get; }
+
+    /// <summary>
+    /// Indicates whether the originating property <see cref="Value"/> was <see langword="null"/>.
+    /// </summary>
+    bool IsValueNull { get; }
+
+    /// <summary>
+    /// Indicates whether the originating property type is <see cref="Nullable{T}"/>.
+    /// </summary>
+    bool IsValueNullable { get; }
+
+    /// <summary>
+    /// Indicates whether the property is in error as a result of a previous validation.
+    /// </summary>
+    bool IsInError { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Abstractions.ValueFormatter"/> to use when localizing the property value within an error message.
+    /// </summary>
+    ValueFormatter ValueFormatter { get; }
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified format and additional values to be included in the text and <b>adds</b> to the underlying <see cref="IValidationContext"/>.
+    /// </summary>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text (<see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter).</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    /// <remarks>The friendly <see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter.</remarks>
+    MessageItem AddError(LText format, params object?[] values);
+
+    /// <summary>
+    /// Creates a fully qualified property name appending the <paramref name="name"/>.
+    /// </summary>
+    /// <param name="name">The property name.</param>
+    string CreateFullyQualifiedPropertyName(string name);
+
+    /// <summary>
+    /// Creates a fully qualified JSON property name appending the <paramref name="jsonName"/>.
+    /// </summary>
+    /// <param name="jsonName">The JSON property name.</param>
+    string CreateFullyQualifiedJsonPropertyName(string jsonName);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IPropertyContextT.cs b/src/CoreEx.Validation/Abstractions/IPropertyContextT.cs
new file mode 100644
index 00000000..dcd9337d
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IPropertyContextT.cs
@@ -0,0 +1,26 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables a validation context for a property.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+public interface IPropertyContext<TEntity> : IPropertyContext where TEntity : class 
+{
+    /// <summary>
+    /// Gets the <see cref="RootPropertyRule"/>.
+    /// </summary>
+    IRootPropertyRule<TEntity> RootPropertyRule { get; }
+
+    /// <inheritdoc/>
+    IValidationContext IPropertyContext.Owner => Owner;
+
+    /// <summary>
+    /// Gets the owning entity <see cref="IValidationContext{TEntity}"/>.
+    /// </summary>
+    new IValidationContext<TEntity> Owner { get; }
+
+    /// <summary>
+    /// Gets the owning entity value.
+    /// </summary>
+    TEntity? Entity { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IPropertyContextT2.cs b/src/CoreEx.Validation/Abstractions/IPropertyContextT2.cs
new file mode 100644
index 00000000..fb136d37
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IPropertyContextT2.cs
@@ -0,0 +1,24 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables a validation context for a property.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public interface IPropertyContext<TEntity, TProperty> : IPropertyContext<TEntity> where TEntity : class 
+{
+    /// <inheritdoc/>
+    object? IPropertyContext.Value => Value;
+
+    /// <summary>
+    /// Gets the property value.
+    /// </summary>
+    /// <returns>The property value.</returns>
+    new TProperty Value { get; }
+
+    /// <summary>
+    /// Overrides (sets) the property value (where not read-only).
+    /// </summary>
+    /// <param name="value">The override value.</param>
+    void Override(TProperty value);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ISelfRuntimeMetadata.cs b/src/CoreEx.Validation/Abstractions/ISelfRuntimeMetadata.cs
new file mode 100644
index 00000000..22899a0e
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ISelfRuntimeMetadata.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables the runtime metadata definition for an entity where the property is acting as itself.
+/// </summary>
+internal interface ISelfRuntimeMetadata { }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IValidationContext.cs b/src/CoreEx.Validation/Abstractions/IValidationContext.cs
new file mode 100644
index 00000000..17cbeb03
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IValidationContext.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables validation context for an entity.
+/// </summary>
+public interface IValidationContext : IValidationResult
+{
+    /// <summary>
+    /// Gets the entity <see cref="Type"/>.
+    /// </summary>
+    Type EntityType { get; }
+
+    /// <summary>
+    /// Gets the entity prefix used for fully qualified <i>entity.property</i> naming (<see langword="null"/> represents the root).
+    /// </summary>
+    string? FullyQualifiedEntityName { get; }
+
+    /// <summary>
+    /// Gets the entity prefix used for fully qualified JSON <i>entity.property</i> naming (<see langword="null"/> represents the root).
+    /// </summary>
+    string? FullyQualifiedJsonEntityName { get; }
+
+    /// <summary>
+    /// Indicates whether JSON names were used for the <see cref="MessageItem.Property"/>.
+    /// </summary>
+    /// <remarks>See <see cref="ValidationArgs.DefaultUseJsonNames"/> and <see cref="ValidationArgs.UseJsonNames"/>.</remarks>
+    bool UseJsonNames { get; }
+
+    /// <summary>
+    /// Gets the <see cref="JsonSerializerOptions"/> used for JSON property naming.
+    /// </summary>
+    JsonSerializerOptions? JsonSerializerOptions { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IServiceProvider"/> to use when resolving services.
+    /// </summary>
+    /// <remarks>The <see cref="ExecutionContext.ServiceProvider"/> will be used as the default where not specified.</remarks>
+    IServiceProvider? ServiceProvider { get; }
+
+    /// <summary>
+    /// Gets the additional parameters (see <see cref="ValidationArgs.Parameters"/>).
+    /// </summary>
+    IDictionary<string, object?> Parameters { get; }
+
+    /// <summary>
+    /// Determines whether the specified fully qualified property has an error.
+    /// </summary>
+    /// <param name="fullyQualifiedPropertyName">The fully qualified property name.</param>
+    /// <returns><see langword="true"/> where an error exists for the specified property; otherwise, <see langword="false"/>.</returns>
+    bool HasError(string fullyQualifiedPropertyName);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IValidationContextT.cs b/src/CoreEx.Validation/Abstractions/IValidationContextT.cs
new file mode 100644
index 00000000..7a6a7642
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IValidationContextT.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables validation context.
+/// </summary>
+/// <typeparam name="T">The <see cref="Type"/>.</typeparam>
+public interface IValidationContext<T> : IValidationContext, IValidationResult<T> { }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IValidatorEx.cs b/src/CoreEx.Validation/Abstractions/IValidatorEx.cs
new file mode 100644
index 00000000..515679ae
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IValidatorEx.cs
@@ -0,0 +1,17 @@
+
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Extends the <see cref="IValidator"/>.
+/// </summary>
+public interface IValidatorEx : IValidator
+{
+    /// <summary>
+    /// Validate the <paramref name="value"/> with optional <paramref name="args"/>.
+    /// </summary>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="args">The optional <see cref="ValidationArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationContext"/>.</returns>
+    Task<IValidationContext> ValidateAsync(object? value, ValidationArgs? args, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IValidatorExT.cs b/src/CoreEx.Validation/Abstractions/IValidatorExT.cs
new file mode 100644
index 00000000..f177072d
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IValidatorExT.cs
@@ -0,0 +1,38 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Extends the <see cref="IValidator{T}"/>
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+public interface IValidatorEx<T> : IValidatorEx, IValidator<T>
+{
+    /// <inheritdoc/>
+    async Task<IValidationContext> IValidatorEx.ValidateAsync(object? value, ValidationArgs? args, CancellationToken cancellationToken)
+        => await ValidateAsync((T)value!, args, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Validate the value with optional <see cref="ValidationArgs"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="args">An optional <see cref="ValidationArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationContext{T}"/>.</returns>
+    Task<IValidationContext<T>> ValidateAsync(T value, ValidationArgs? args, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Validate the value with optional <see cref="ValidationArgs"/> and automatically throw a <see cref="ValidationException"/> where <see cref="IValidationResult.HasErrors"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="args">An optional <see cref="ValidationArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task ValidateAndThrowAsync(T value, ValidationArgs? args, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Validate using the <paramref name="context"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="IValidationContext{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationContext{T}"/>.</returns>
+    /// <remarks>This is generally intended for internal use only.</remarks>
+    Task ValidateAsync(IValidationContext<T> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/IValueValidator.cs b/src/CoreEx.Validation/Abstractions/IValueValidator.cs
new file mode 100644
index 00000000..a98d2cde
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/IValueValidator.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables the <see cref="ValueValidator{T}"/> validation.
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+public interface IValueValidator<T>
+{
+    /// <summary>
+    /// Validate the value.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationResult{T}"/>.</returns>
+    Task<IValidationResult<ValidationValue<T>>> ValidateAsync(CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Validate the value with optional <see cref="ValidationArgs"/>.
+    /// </summary>
+    /// <param name="args">An optional <see cref="ValidationArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationResult{T}"/>.</returns>
+    Task<IValidationResult<ValidationValue<T>>> ValidateAsync(ValidationArgs? args, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/InlineValidator.cs b/src/CoreEx.Validation/Abstractions/InlineValidator.cs
new file mode 100644
index 00000000..a605e035
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/InlineValidator.cs
@@ -0,0 +1,82 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Provides the base inline validator functionality.
+/// </summary>
+/// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+/// <remarks>See also <see cref="CommonValidator{TValue}"/>.</remarks>
+public abstract class InlineValidator<TValue>
+{
+    private readonly Validator _validator;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CommonValidator{T}"/> class.
+    /// </summary>
+    /// <param name="configure">The action to configure the <see cref="CommonValidator{T}"/>.</param>
+    internal InlineValidator(Action<Validator>? configure)
+    {
+        _validator = new();
+        configure?.Invoke(_validator);
+    }
+
+    /// <summary>
+    /// Gets or sets the property and JSON name override (where not <see langword="null"/>).
+    /// </summary>
+    /// <remarks>This will apply to all instances in which the <see cref="CommonValidator{TValue}"/> is used; therefore, caution is required when using. This is intended for advanced usage only.</remarks>
+    protected string? OverrideName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the property text override (where not <see langword="null"/>).
+    /// </summary>
+    /// <remarks>This will apply to all instances in which the <see cref="CommonValidator{TValue}"/> is used; therefore, caution is required when using. This is intended for advanced usage only.</remarks>
+    protected LText? OverrideText { get; set; }
+
+    /// <summary>
+    /// Validates the value.
+    /// </summary>
+    /// <typeparam name="TEntity">The related entity <see cref="Type"/>.</typeparam>
+    /// <param name="context">The related <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    internal async Task ValidateAsync<TEntity>(PropertyContext<TEntity, TValue> context, CancellationToken cancellationToken) where TEntity : class
+    {
+        var root = new RootPropertyRule<ValidationValue<TValue>, TValue>(
+            new PropertyRuntimeMetadata<ValidationValue<TValue>, TValue>(OverrideName ?? context.Name, _ => context.Metadata.GetValue<TValue>(context.Entity), text: () => OverrideText ?? context.Metadata.Text, jsonName: OverrideName ?? context.Metadata.JsonName),
+                context.IsValueNullable ? _ => context.GetNullableValueOrDefault<TValue>() : null, context.IsValueNullable ? _ => context.IsNullableValueDefault() : null);
+
+        ValidationExtensions.Chain(root, _validator);
+
+        var vv = new ValidationValue<TValue>(context.Value);
+        var vc = new ValidationContext<ValidationValue<TValue>>(vv, context.CreateValidationArgs(true));
+        var pc = new PropertyContext<ValidationValue<TValue>, TValue>(root, vc);
+
+        // Execute the primary validation.
+        await root.ValidateAsync(pc, cancellationToken).ConfigureAwait(false);
+
+        // Execute the secondary validation.
+        await OnValidateAsync(pc, cancellationToken).ConfigureAwait(false);
+
+        // Merge results.
+        context.MergeResult(vc);
+    }
+
+    /// <summary>
+    /// Validate the common property value.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected virtual Task OnValidateAsync(PropertyContext<ValidationValue<TValue>, TValue> context, CancellationToken cancellationToken) => Task.CompletedTask;
+
+    /// <summary>
+    /// Provides the underlying <see cref="PropertyRuleBase{TEntity, TProperty}"/> enabling standardized configuration and validation behavior to be added/chained.
+    /// </summary>
+    public sealed class Validator : PropertyRuleBase<ValidationValue<TValue>, TValue>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Validator"/> class.
+        /// </summary>
+        internal Validator() { }
+
+        /// <inheritdoc/>
+        protected override Task OnValidateAsync(PropertyContext<ValidationValue<TValue>, TValue> context, CancellationToken cancellationToken) => Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/README.md b/src/CoreEx.Validation/Abstractions/README.md
new file mode 100644
index 00000000..8ef57c13
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/README.md
@@ -0,0 +1,45 @@
+# CoreEx.Validation.Abstractions
+
+> Provides the core interfaces, abstract base classes, and infrastructure types that underpin the CoreEx validation framework.
+
+## Overview
+
+`CoreEx.Validation.Abstractions` defines the foundational contracts and base implementations that all validators, property rules, and validation contexts build upon. Consumer code rarely references these types directly — they are surfaced through the fluent API on `Validator<TEntity>` and `ValidationExtensions` — but they are the authoritative extension points for anyone building custom rules, custom validators, or integrating the framework into a new host.
+
+`ValidatorBase<TEntity, TSelf>` is the shared abstract root for both `Validator<TEntity>` and `Validator<TEntity, TParent>`. It owns the `Rules` list, the `HasProperty`/`HasRuleFor` fluent entry points, the `RuleSet` and `Include` configuration helpers, and the internal `ValidateInternalAsync` orchestration loop. `InlineValidator<TValue>` is a lower-level building block that underpins `CommonValidator<TValue>`; it stores a single `Validator` (an inner `Validator<ValidationValue<TValue>>`) that validates the wrapped value as though it were an entity property.
+
+`IValidatorEx` and `IValidatorEx<T>` are the public validator interfaces consumed by `EntityRule`, `InteropRule`, and DI registration helpers. `IValidationContext<T>` is returned from every `ValidateAsync` call and carries the entity value, the accumulated error list, and the `ThrowOnError()` helper. `IPropertyContext<TEntity>` and `IPropertyContext<TEntity, TProperty>` are the interfaces through which clause and rule implementations access the property value, entity, and owning context without depending on the concrete `PropertyContext` struct.
+
+## Key capabilities
+
+- 🧱 **Validator lifecycle base**: `ValidatorBase<TEntity, TSelf>` wires up `HasProperty`/`HasRuleFor`, `RuleSet`, `Include`, and the ordered async execution loop for all property rule chains.
+- 📋 **Inline and common validator base**: `InlineValidator<TValue>` enables a `Validator<ValidationValue<TValue>>` to validate a raw value (not an entity), which is the foundation for `CommonValidator<TValue>` and `CommonRule`.
+- 🔧 **Extensible rule and clause interfaces**: `IPropertyRule<TEntity>`, `IPropertyRule<TEntity, TProperty>`, `IRootPropertyRule<TEntity>`, `IPropertyClause<TEntity>`, and `IPropertyClause<TEntity, TProperty>` provide the contracts for custom rules and clauses.
+- 💬 **Structured validation messages**: `ValidationMessageItem` extends `MessageItem` with an internal `FullyQualifiedPropertyName` that maps validation errors to precise .NET and JSON property paths.
+- ⚡ **Async-first contract**: `IValidatorEx<T>.ValidateAsync` and `IPropertyClause.CheckAsync` are async throughout; synchronous surfaces are explicit opt-ins layered on top.
+- **Value-level validation**: `ValueValidator<T>` and `IValueValidator<T>` allow a raw value to be validated outside of an entity context — used by `Validator.CreateFor<T>(value, ...)` entry points.
+- **Runtime metadata**: `ISelfRuntimeMetadata` and `SelfRuntimeMetadata` provide the property name, JSON name, and value accessor abstraction used by rule and clause implementations without reflection at validation time.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| _[`ValidatorBase<TEntity, TSelf>`](./ValidatorBase.cs)_ | Abstract root for all entity validators; owns the `Rules` list and the `HasProperty`/`HasRuleFor`/`RuleSet`/`Include` fluent builder surface; drives the `ValidateInternalAsync` execution loop. |
+| _[`InlineValidator<TValue>`](./InlineValidator.cs)_ | Abstract base for `CommonValidator<TValue>`; wraps a single inner `Validator<ValidationValue<TValue>>` so a plain value can be validated using the full rule chain machinery. |
+| **[`ValueValidator<T>`](./ValueValidator.cs)** | Concrete `IValueValidator<T>` that validates a raw value (not an entity property) by wrapping it in a `ValidationValue<T>` and executing the configured rule chain. |
+| **[`ValidationMessageItem`](./ValidationMessageItem.cs)** | Extends `MessageItem` with an internal fully-qualified property-name field used to correlate validation errors with their source properties during context accumulation. |
+| **[`ValidationValue<T>`](./ValidationValue.cs)** | Lightweight wrapper that presents a raw value as a single-property `class` entity so it can be validated by the entity-centric rule machinery. |
+| **[`ValueFormatter`](./ValueFormatter.cs)** | Static helper that formats a property value into a human-readable `LText` for use in comparison-rule error messages. |
+| [IValidatorEx](./IValidatorEx.cs) | Non-generic marker interface for all CoreEx validators; used for DI registration and type-safe discovery. |
+| [IValidatorEx<T>](./IValidatorExT.cs) | Generic validator interface; defines `ValidateAsync(T, ValidationArgs?, CancellationToken)` and `ValidateAndThrowAsync`; implemented by all concrete validators. |
+| [IValidationContext](./IValidationContext.cs) | Non-generic validation-result contract; exposes the error list, `HasErrors`, and `ThrowOnError()`. |
+| [IValidationContext<T>](./IValidationContextT.cs) | Generic validation result returned from `ValidateAsync`; extends `IValidationContext` with the typed entity value. |
+| [IPropertyContext](./IPropertyContext.cs) | Non-generic property-context contract exposing the owning `IValidationContext`, property name, JSON name, and `AddError`. |
+| [IPropertyContext<TEntity>](./IPropertyContextT.cs) | Entity-typed property-context interface; gives clause and rule implementations access to the owning `IValidationContext<TEntity>` and the entity reference. |
+| [IPropertyContext<TEntity, TProperty>](./IPropertyContextT2.cs) | Fully typed property-context interface; adds the resolved `TProperty` value. |
+
+## Related namespaces
+
+- **[`CoreEx.Validation`](../README.md)** - Root namespace containing `Validator<TEntity>`, `CommonValidator<TValue>`, `ValidationContext`, `ValidationArgs`, `PropertyContext`, and all `ValidationExtensions` that build on top of these abstractions.
+- **[`CoreEx.Validation.Rules`](../Rules/README.md)** - All built-in rule implementations; each rule receives an `IPropertyContext<TEntity, TProperty>` defined here.
+- **[`CoreEx.Validation.Clauses`](../Clauses/README.md)** - `WhenClause` and `DependsOnClause` implement `IPropertyClause<TEntity, TProperty>` defined here.
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/SelfRuntimeMetadata.cs b/src/CoreEx.Validation/Abstractions/SelfRuntimeMetadata.cs
new file mode 100644
index 00000000..e4b6c62b
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/SelfRuntimeMetadata.cs
@@ -0,0 +1,59 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Provides the runtime metadata definition for an entity where the property is acting as itself.
+/// </summary>
+internal readonly struct SelfRuntimeMetadata<TSelf>() : IPropertyRuntimeMetadata, ISelfRuntimeMetadata
+{
+    private const string _name = "$self";
+    private readonly Lazy<LText> _text = new(() => new LText($"{Internal.GetNamespaceFormattedName(typeof(TSelf))}:{_name}", Validation.ValueName.ToSentenceCase()));
+
+    /// <inheritdoc/>
+    public Type Owner => typeof(TSelf);
+
+    /// <inheritdoc/>
+    public Type Type => typeof(TSelf);
+
+    /// <inheritdoc/>
+    public string Name => _name;
+
+    /// <inheritdoc/>
+    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+    public LText Text => _text.Value;
+
+    /// <inheritdoc/>
+    public string? JsonName => null;
+
+    /// <inheritdoc/>
+    public object? DefaultValue => null;
+
+    /// <inheritdoc/>
+    public CleanOption CleanOption => CleanOption.None;
+
+    /// <inheritdoc/>
+    public bool IsReadOnly => true;
+
+    /// <inheritdoc/>
+    public string? Format => null;
+
+    /// <inheritdoc/>
+    public void Clean(object entity) { }
+
+    /// <inheritdoc/>
+    public string GetJsonName(JsonSerializerOptions? options = null) => string.Empty;
+
+    /// <inheritdoc/>
+    public object? GetValue(object entity) => entity;
+
+    /// <inheritdoc/>
+    public T GetValue<T>(object entity) => (T)entity;
+
+    /// <inheritdoc/>
+    public bool IsDefault(object entity) => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    public void SetValue(object entity, object? value) => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    public void SetValue<T>(object entity, T value) => throw new NotSupportedException();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ValidationMessageItem.cs b/src/CoreEx.Validation/Abstractions/ValidationMessageItem.cs
new file mode 100644
index 00000000..26c3c6f6
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ValidationMessageItem.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Represents a validation-extended <see cref="MessageItem"/>.
+/// </summary>
+public record class ValidationMessageItem : MessageItem
+{
+    /// <summary>
+    /// Gets the fully qualified property name that the message relates to.
+    /// </summary>
+    /// <remarks>Required for internal validation purposes; specifically for tracking which property a validation message is associated with as the <see cref="MessageItem.Property"/> may contain the
+    /// fully qualified JSON name.</remarks>
+    [JsonIgnore]
+    internal string? FullyQualifiedPropertyName { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ValidationValue.cs b/src/CoreEx.Validation/Abstractions/ValidationValue.cs
new file mode 100644
index 00000000..6629120a
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ValidationValue.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Provides a validation value entity wrapper.
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+public sealed class ValidationValue<T>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ValidationValue{T}"/> class.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    internal ValidationValue(T value) => Value = value;
+
+    /// <summary>
+    /// Gets the value.
+    /// </summary>
+    public T? Value { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ValidatorBase.Fluent.cs b/src/CoreEx.Validation/Abstractions/ValidatorBase.Fluent.cs
new file mode 100644
index 00000000..8b297d95
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ValidatorBase.Fluent.cs
@@ -0,0 +1,30 @@
+namespace CoreEx.Validation.Abstractions;
+
+public abstract partial class ValidatorBase<TEntity, TSelf>
+{
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyExpression"/>.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
+    /// <remarks>This is a synonym for the <see cref="Property{TProperty}(Expression{Func{TEntity, TProperty?}})"/> to enable <see href="https://docs.fluentvalidation.net/en/latest/">FluentValidation</see>-like syntax.</remarks>
+    protected IRootPropertyRule<TEntity, TProperty> RuleFor<TProperty>(Expression<Func<TEntity, TProperty?>> propertyExpression)
+        => PropertyInternal<TProperty>(RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull()), null, null);
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyExpression"/>.
+    /// </summary>
+    /// <param name="propertyExpression">The property <see cref="Expression{TDelegate}"/>.</param>
+    /// <remarks>This is a synonym for the <see cref="Property{TProperty}(Expression{Func{TEntity, TProperty?}})"/> to enable <see href="https://docs.fluentvalidation.net/en/latest/">FluentValidation</see>-like syntax.</remarks>
+    protected IRootPropertyRule<TEntity, TProperty?> RuleFor<TProperty>(Expression<Func<TEntity, TProperty?>> propertyExpression) where TProperty : struct
+    {
+        var metadata = RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull());
+        var rule = new RootPropertyRule<TEntity, TProperty?>(metadata,
+            e => metadata.GetValue<TProperty?>(e).GetValueOrDefault(),
+            e => Comparer<TProperty>.Default.Compare(metadata.GetValue<TProperty?>(e).GetValueOrDefault(), default) == 0);
+
+        Rules.Add(rule);
+        return rule;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ValidatorBase.cs b/src/CoreEx.Validation/Abstractions/ValidatorBase.cs
new file mode 100644
index 00000000..00addc91
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ValidatorBase.cs
@@ -0,0 +1,177 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Represents the base entity validator.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="ValidatorBase{TEntity, TSelf}"/> <see cref="Type"/>.</typeparam>
+/// <remarks>This is intended for advanced scenarios where <see cref="ValidateAsync(TEntity, CoreEx.Validation.ValidationArgs?, CancellationToken)"/> must be explicitly overridden to implement the desired behavior; otherwise, it throws a <see cref="NotSupportedException"/>.
+/// <para>Generally, use <see cref="Validator{TEntity}"/> (inherit from) or <see cref="Validator.Create{TEntity}"/> (in-line) to leverage.</para></remarks>
+public abstract partial class ValidatorBase<TEntity, TSelf> : IValidatorEx<TEntity> where TEntity : class where TSelf : ValidatorBase<TEntity, TSelf>
+{
+    /// <summary>
+    /// Gets the underlying <see cref="IRootPropertyRule{TEntity}"/> collection.
+    /// </summary>
+    protected List<IRootPropertyRule<TEntity>> Rules { get; } = [];
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyExpression"/>.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
+    protected IRootPropertyRule<TEntity, TProperty> Property<TProperty>(Expression<Func<TEntity, TProperty?>> propertyExpression)
+        => PropertyInternal<TProperty>(RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull()), null, null);
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyExpression"/>.
+    /// </summary>
+    /// <param name="propertyExpression">The property <see cref="Expression{TDelegate}"/>.</param>
+    protected IRootPropertyRule<TEntity, TProperty?> Property<TProperty>(Expression<Func<TEntity, TProperty?>> propertyExpression) where TProperty : struct
+    {
+        var metadata = RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull());
+        var rule = new RootPropertyRule<TEntity, TProperty?>(metadata,
+            e => metadata.GetValue<TProperty?>(e).GetValueOrDefault(),
+            e => Comparer<TProperty>.Default.Compare(metadata.GetValue<TProperty?>(e).GetValueOrDefault(), default) == 0);
+
+        Rules.Add(rule);
+        return rule;
+    }
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyMetadata"/>.
+    /// </summary>
+    private RootPropertyRule<TEntity, TProperty> PropertyInternal<TProperty>(IPropertyRuntimeMetadata propertyMetadata, Func<TEntity, TProperty>? getNullableValue, Func<TEntity, bool>? isNullableValueDefault)
+    {
+        var rule = new RootPropertyRule<TEntity, TProperty>(propertyMetadata.ThrowIfNull(), getNullableValue, isNullableValueDefault);
+        Rules.Add(rule);
+        return rule;
+    }
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyExpression"/> enabling an inline <paramref name="configure"/> opportunity.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf HasProperty<TProperty>(Expression<Func<TEntity, TProperty?>> propertyExpression, Action<IRootPropertyRule<TEntity, TProperty>>? configure = null)
+        => HasPropertyInternal(RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull()), configure, null, null);
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyExpression"/> enabling an inline <paramref name="configure"/> opportunity.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf HasProperty<TProperty>(Expression<Func<TEntity, TProperty?>> propertyExpression, Action<IRootPropertyRule<TEntity, TProperty?>>? configure = null) where TProperty : struct
+    {
+        var metadata = RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull());
+        return HasPropertyInternal(metadata, configure,
+            e => metadata.GetValue<TProperty?>(e).GetValueOrDefault(),
+            e => Comparer<TProperty>.Default.Compare(metadata.GetValue<TProperty?>(e).GetValueOrDefault(), default) == 0);
+    }
+
+    /// <summary>
+    /// Adds a <see cref="IPropertyRule{TEntity, TProperty}"/> to the validator <see cref="Rules"/> for the specified <paramref name="propertyMetadata"/> enabling an inline <paramref name="configure"/> opportunity.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyMetadata">The <see cref="IPropertyRuntimeMetadata"/>.</param>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <param name="getNullableValue">A function to get the underlying nullable value.</param>
+    /// <param name="isNullableValueDefault">A function to determine whether the underlying nullable value is its default.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    internal TSelf HasPropertyInternal<TProperty>(IPropertyRuntimeMetadata propertyMetadata, Action<IRootPropertyRule<TEntity, TProperty>>? configure, Func<TEntity, TProperty>? getNullableValue, Func<TEntity, bool>? isNullableValueDefault)
+    {
+        var rule = PropertyInternal(propertyMetadata, getNullableValue, isNullableValueDefault);
+        configure?.Invoke(rule);
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Adds a self-validation <see cref="IPropertyRule{TEntity, TProperty}"/> for the <typeparamref name="TEntity"/> to the validator <see cref="Rules"/>.
+    /// </summary>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This may only be invoked once; otherwise, an <see cref="InvalidOperationException"/> will be thrown.</remarks>
+    public TSelf Self(Action<IRootPropertyRule<TEntity, TEntity>>? configure = null)
+    {
+        if (Rules.Any(r => r is RootPropertyRule<TEntity, TEntity> rr && rr.Metadata is ISelfRuntimeMetadata))
+            throw new InvalidOperationException("The 'Self' rule has already been defined for this validator; it may only be configured once.");
+
+        // Uses a special SelfRuntimeMetadata/ISelfRuntimeMetadata to enable functionality internally.
+        var srm = new SelfRuntimeMetadata<TEntity>();
+        var rule = new RootPropertyRule<TEntity, TEntity>(srm, null, null);
+        Rules.Add(rule);
+        configure?.Invoke(rule);
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Adds a <see cref="IncludeBaseRule{TEntity}"/> to the validator <see cref="Rules"/> for the specified <paramref name="baseValidator"/>.
+    /// </summary>
+    /// <param name="baseValidator">The base <see cref="IValidatorEx"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    /// <remarks><typeparamref name="TInclude"/> must be the same or a base type of <typeparamref name="TEntity"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.
+    /// <para><i>Note:</i> the <paramref name="baseValidator"/> is added internally as an <see cref="IncludeBaseRule{TEntity}"/> rule; therefore, it will be executed in the order added in relation to other property-base rules.</para></remarks>
+    protected TSelf Include<TInclude>(IValidatorEx<TInclude> baseValidator) where TInclude : class
+    {
+        baseValidator.ThrowIfNull();
+        if (typeof(TInclude) == typeof(TEntity) || typeof(TInclude).IsAssignableFrom(typeof(TEntity)))
+            return IncludeBase(baseValidator);
+
+        throw new ArgumentException($"The specified base validator type '{typeof(TInclude).FullName}' must be the same or a base type of the entity type '{typeof(TEntity).FullName}'.", nameof(baseValidator));
+    }
+
+    /// <summary>
+    /// Adds a <see cref="IncludeBaseRule{TEntity}"/> to the validator <see cref="Rules"/> for the specified <paramref name="baseValidator"/>.
+    /// </summary>
+    /// <param name="baseValidator">The base <see cref="IValidatorEx"/>.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    internal TSelf IncludeBase<TInclude>(IValidatorEx<TInclude> baseValidator) where TInclude : class
+    {
+        Rules.Add(new IncludeBaseRule<TEntity>(baseValidator));
+        return (TSelf)this;
+    }
+
+    /// <summary>
+    /// Adds a <see cref="RuleSet{TEntity}"/> to the validator <see cref="Rules"/> enabling a conditional (<paramref name="predicate"/>) set of rules to be configured.
+    /// </summary>
+    /// <param name="predicate">The predicate to determine whether the <see cref="RuleSet{TEntity}"/> is to be validated.</param>
+    /// <param name="configure">The action to configure the underlying set of rules.</param>
+    /// <returns>The <typeparamref name="TSelf"/> to support fluent-style method-chaining.</returns>
+    public TSelf HasRuleSet(Predicate<ValidationContext<TEntity>> predicate, Action<RuleSet<TEntity>> configure)
+    {
+        var ruleSet = new RuleSet<TEntity>(predicate);
+        configure?.Invoke(ruleSet);
+
+        if (ruleSet.Rules.Count > 0)
+            Rules.Add(ruleSet);
+
+        return (TSelf)this;
+    }
+
+    /// <inheritdoc/>
+    async Task<IValidationResult<TEntity>> IValidator<TEntity>.ValidateAsync(TEntity value, CancellationToken cancellationToken) => await ValidateAsync(value, null, cancellationToken).ConfigureAwait(false);
+
+    /// <inheritdoc/>
+    public virtual Task<IValidationContext<TEntity>> ValidateAsync(TEntity value, ValidationArgs? args, CancellationToken cancellationToken)
+        => throw new NotSupportedException($"{nameof(ValidateAsync)} is not supported by the {nameof(ValidatorBase<,>)} class.");
+
+    /// <inheritdoc/>
+    public virtual Task ValidateAndThrowAsync(TEntity value, ValidationArgs? args, CancellationToken cancellationToken)
+        => throw new NotSupportedException($"{nameof(ValidateAndThrowAsync)} is not supported by the {nameof(ValidatorBase<,>)} class.");
+
+    /// <inheritdoc/>
+    Task IValidatorEx<TEntity>.ValidateAsync(IValidationContext<TEntity> context, CancellationToken cancellationToken)
+        => ValidateAsync(context, cancellationToken);
+
+    /// <summary>
+    /// Validate using the <paramref name="context"/>.
+    /// </summary>
+    /// <param name="context">The <see cref="IValidationContext{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationContext{T}"/>.</returns>
+    internal abstract Task ValidateAsync(IValidationContext<TEntity> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ValueFormatter.cs b/src/CoreEx.Validation/Abstractions/ValueFormatter.cs
new file mode 100644
index 00000000..3d37dfc7
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ValueFormatter.cs
@@ -0,0 +1,62 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Provides value formatter configuration and corresponding <see cref="ToLText{T}(T)"/>.
+/// </summary>
+/// <param name="format">The <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> format to use when localizing the property value within an error message.</param>
+/// <param name="formatProvider">The optional <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> <see cref="IFormatProvider"/> to use when localizing the property value within an error message.</param>
+/// <param name="quotingCharacter">The optional quoting character so it appears as a literal string.</param>
+public readonly struct ValueFormatter(string? format, IFormatProvider? formatProvider = null, char? quotingCharacter = '\'')
+{
+    private readonly bool _useStringFormat = !string.IsNullOrEmpty(format) && format.Contains("{0");
+
+    /// <summary>
+    /// Gets the default <see cref="ValueFormatter"/>.
+    /// </summary>
+    public static ValueFormatter Default { get; } = new ValueFormatter(null, null, '\'');
+
+    /// <summary>
+    /// Gets the <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> format to use when localizing the property value within an error message.
+    /// </summary>
+    /// <remarks>Also supports <see href="https://learn.microsoft.com/en-us/dotnet/standard/base-types/composite-formatting">composite formatting</see>.</remarks>
+    public string? Format { get; } = format;
+
+    /// <summary>
+    /// Gets the optional <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> <see cref="IFormatProvider"/> to use when localizing the property value within an error message.
+    /// </summary>
+    public IFormatProvider? FormatProvider { get; } = formatProvider;
+
+    /// <summary>
+    /// Gets the optional quoting character so it appears as a literal string.
+    /// </summary>
+    public char? QuotingCharacter { get; } = quotingCharacter;
+
+    /// <summary>
+    /// Formats the specified <paramref name="value"/> as a <see cref="LText"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <returns>The formatted <see cref="LText"/>.</returns>
+    public LText ToLText<T>(T? value)
+    {
+        var text = _useStringFormat 
+            ? string.Format(Format!, value) 
+            : value is IFormattable f
+                ? f.ToString(Format, FormatProvider)
+                : value?.ToString();
+
+        if (text is null)
+            return ValidatorStrings.NullText;
+
+        if (QuotingCharacter is null)
+            return new LText(text);
+
+        return new LText(string.Create(text.Length + 2, (text, QuotingCharacter.Value),
+            (span, state) => 
+            {
+                span[0] = state.Value;
+                state.text.AsSpan().CopyTo(span[1..^1]);
+                span[^1] = state.Value;
+            }));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Abstractions/ValueValidator.cs b/src/CoreEx.Validation/Abstractions/ValueValidator.cs
new file mode 100644
index 00000000..5636947a
--- /dev/null
+++ b/src/CoreEx.Validation/Abstractions/ValueValidator.cs
@@ -0,0 +1,35 @@
+namespace CoreEx.Validation.Abstractions;
+
+/// <summary>
+/// Enables validation for a value.
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+public sealed class ValueValidator<T> : Validator<ValidationValue<T>>, IValueValidator<T>
+{
+    private readonly ValidationValue<T> _validationValue;
+    private readonly IPropertyRuntimeMetadata _metadata;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ValueValidator{T}"/> class.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="name">The value name.</param>
+    /// <param name="jsonName">The value JSON name.</param>
+    /// <param name="text">The friendly text name.</param>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <param name="getNullableValue">A function to get the underlying nullable value.</param>
+    /// <param name="isNullableValueDefault">A function to determine whether the underlying nullable value is its default.</param>
+    internal ValueValidator(T value, string name, string? jsonName, LText? text, Action<IPropertyRule<ValidationValue<T>, T>>? configure, Func<ValidationValue<T>, T>? getNullableValue, Func<ValidationValue<T>, bool>? isNullableValueDefault)
+    {
+        _validationValue = new(value);
+        _metadata = new PropertyRuntimeMetadata<ValidationValue<T>, T?>(name, static e => e.Value, text: text is null ? null : () => text.Value, jsonName: jsonName);
+        HasPropertyInternal(_metadata, configure, getNullableValue, isNullableValueDefault);
+    }
+
+    /// <inheritdoc/>
+    public Task<IValidationResult<ValidationValue<T>>> ValidateAsync(CancellationToken cancellationToken = default) => ValidateAsync(null, cancellationToken);
+
+    /// <inheritdoc/>
+    public async Task<IValidationResult<ValidationValue<T>>> ValidateAsync(ValidationArgs? args, CancellationToken cancellationToken = default)
+        => await ValidateAsync(_validationValue, args ?? new ValidationArgs { FullyQualifiedEntityName = _metadata.Name, FullyQualifiedJsonEntityName = _metadata.JsonName }, cancellationToken).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Clauses/DependsOnClause.cs b/src/CoreEx.Validation/Clauses/DependsOnClause.cs
index e40a8c1f..faa79ee9 100644
--- a/src/CoreEx.Validation/Clauses/DependsOnClause.cs
+++ b/src/CoreEx.Validation/Clauses/DependsOnClause.cs
@@ -1,35 +1,28 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Clauses;
 
-using CoreEx.Abstractions.Reflection;
-using System;
-using System.Linq.Expressions;
-
-namespace CoreEx.Validation.Clauses
+/// <summary>
+/// Represents a depends on clause; in that specified property (<paramref name="dependsOnExpression"/>) of the entity must have a non-default value, and not have a validation error, to continue.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDependsOnProperty">The depends on property <see cref="Type"/>.</typeparam>
+/// <param name="dependsOnExpression">The <see cref="Expression"/> to reference the depends on entity property.</param>
+public sealed class DependsOnClause<TEntity, TProperty, TDependsOnProperty>(Expression<Func<TEntity, TDependsOnProperty>> dependsOnExpression) : IPropertyClause<TEntity, TProperty> where TEntity : class
 {
-    /// <summary>
-    /// Represents a depends on test clause; in that another specified property of the entity must have a non-default value (and not have a validation error) to continue.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <param name="dependsOnExpression">The <see cref="Expression"/> to reference the depends on entity property.</param>
-    public class DependsOnClause<TEntity, TProperty>(Expression<Func<TEntity, TProperty>> dependsOnExpression) : IPropertyRuleClause<TEntity, TProperty> where TEntity : class
+    private readonly IPropertyRuntimeMetadata _dependsOn = RuntimeMetadata.GetForExpression(dependsOnExpression.ThrowIfNull());
+
+    /// <inheritdoc/>
+    public Task<bool> CheckAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
     {
-        private readonly PropertyExpression<TEntity, TProperty> _dependsOn = PropertyExpression.Create(dependsOnExpression.ThrowIfNull(nameof(dependsOnExpression)));
+        // Make sure not the same property.
+        if (_dependsOn.Name == context.Name)
+            throw new InvalidOperationException($"The depends on property '{_dependsOn.Name}' cannot be the same as the property being validated.");
 
-        /// <summary>
-        /// Checks the clause.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        public bool Check(IPropertyContext context)
-        {
-            // Do not continue where the depends on property is in error.
-            if (context.ThrowIfNull(nameof(context)).Parent.HasError(context.CreateFullyQualifiedPropertyName(_dependsOn.Name)))
-                return false;
+        // Do not continue where the depends on property is in error.
+        if (context.HasError(context.CreateFullyQualifiedPropertyName(_dependsOn.Name)))
+            return Task.FromResult(false);
 
-            // Check depends on value to continue.
-            object? value = _dependsOn.GetValue((TEntity)context.Parent.Value!);
-            return !(System.Collections.Comparer.Default.Compare(value, default(TProperty)!) == 0);
-        }
+        // Check depends on value to continue.
+        return Task.FromResult(!_dependsOn.IsDefault(context.Entity));
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Clauses/IPropertyClauseT.cs b/src/CoreEx.Validation/Clauses/IPropertyClauseT.cs
new file mode 100644
index 00000000..192230b9
--- /dev/null
+++ b/src/CoreEx.Validation/Clauses/IPropertyClauseT.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Validation.Clauses;
+
+/// <summary>
+/// Enables a property clause for an entity.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+public interface IPropertyClause<TEntity> where TEntity : class 
+{
+    /// <summary>
+    /// Checks the clause.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> where validation is to continue; otherwise, <see langword="false"/> to stop.</returns>
+    Task<bool> CheckAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Clauses/IPropertyClauseT2.cs b/src/CoreEx.Validation/Clauses/IPropertyClauseT2.cs
new file mode 100644
index 00000000..31645ecb
--- /dev/null
+++ b/src/CoreEx.Validation/Clauses/IPropertyClauseT2.cs
@@ -0,0 +1,20 @@
+namespace CoreEx.Validation.Clauses;
+
+/// <summary>
+/// Enables a typed property clause for an entity.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
+public interface IPropertyClause<TEntity, TProperty> : IPropertyClause<TEntity> where TEntity : class
+{
+    Task<bool> IPropertyClause<TEntity>.CheckAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken)
+        => CheckAsync((PropertyContext<TEntity, TProperty>)context, cancellationToken);
+
+    /// <summary>
+    /// Checks the clause.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> where validation is to continue; otherwise, <see langword="false"/> to stop.</returns>
+    Task<bool> CheckAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Clauses/IPropertyRuleClause.cs b/src/CoreEx.Validation/Clauses/IPropertyRuleClause.cs
deleted file mode 100644
index 0c7603f1..00000000
--- a/src/CoreEx.Validation/Clauses/IPropertyRuleClause.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Validation.Clauses
-{
-    /// <summary>
-    /// Enables a <see cref="PropertyRule{TEntity, TProperty}"/> clause.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    public interface IPropertyRuleClause<TEntity> where TEntity : class
-    {
-        /// <summary>
-        /// Checks the clause.
-        /// </summary>
-        /// <param name="context">The <see cref="IPropertyContext"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        bool Check(IPropertyContext context);
-    }
-
-    /// <summary>
-    /// Enables a typed <see cref="PropertyRule{TEntity, TProperty}"/> clause.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
-    public interface IPropertyRuleClause<TEntity, TProperty> : IPropertyRuleClause<TEntity> where TEntity : class { }
-}
diff --git a/src/CoreEx.Validation/Clauses/README.md b/src/CoreEx.Validation/Clauses/README.md
new file mode 100644
index 00000000..08ce8b6a
--- /dev/null
+++ b/src/CoreEx.Validation/Clauses/README.md
@@ -0,0 +1,29 @@
+# CoreEx.Validation.Clauses
+
+> Provides the conditional clause implementations that guard whether a property rule executes — allowing rules to be skipped based on boolean conditions, async predicates, or sibling-property state.
+
+## Overview
+
+`CoreEx.Validation.Clauses` contains the two built-in `IPropertyClause<TEntity, TProperty>` implementations used by the CoreEx validation framework. A clause is evaluated _before_ the rule body; when its `CheckAsync` returns `false` the rule is skipped and no error is added, enabling context-sensitive validation without branching logic inside rule implementations.
+
+Clauses are never instantiated directly by consumers. They are created and attached to a rule chain via the extension methods in `ValidationExtensions` (`When*` and `DependsOn` families). Multiple clauses can be chained on a single rule and are evaluated left-to-right; the first clause that returns `false` stops evaluation.
+
+## Key capabilities
+
+- ⏸ **Boolean/predicate guard (`WhenClause`)**: skips the rule when a static `bool`, a `Func<bool>`, a context-aware predicate, or a fully async `PredicateAsync` evaluates to `false`; covers entity-level, property-value-level, and presence-check variants.
+- 🔗 **Sibling-property guard (`DependsOnClause`)**: skips the rule when a specified sibling property has its default value _or_ has already produced a validation error, preventing cascading errors when an upstream field is missing.
+- ⚡ **Async-native**: both clause types are fully async; `WhenClause` accepts a `PredicateAsync<TEntity, TProperty>` delegate so external lookups can be awaited inside a clause without blocking.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| [IPropertyClause<TEntity>](./IPropertyClauseT.cs) | Non-generic-property clause contract; defines `CheckAsync(IPropertyContext<TEntity>, CancellationToken)`; used when clause implementation does not need the resolved property type. |
+| [IPropertyClause<TEntity, TProperty>](./IPropertyClauseT2.cs) | Fully typed clause contract; defines `CheckAsync(PropertyContext<TEntity, TProperty>, CancellationToken)`; the standard implementation target for built-in clauses. |
+| **[`WhenClause<TEntity, TProperty>`](./WhenClause.cs)** | Evaluates a `PredicateAsync<TEntity, TProperty>` delegate; returns `false` (skip rule) when the delegate returns `false`. Wired via `When()`, `WhenValue()`, `WhenHasValue()`, `WhenEntity()`. |
+| **[`DependsOnClause<TEntity, TProperty, TDependsOnProperty>`](./DependsOnClause.cs)** | Returns `false` (skip rule) when the depends-on sibling property is at its default value or already carries a validation error. Wired via `DependsOn(expression)`. |
+
+## Related namespaces
+
+- **[`CoreEx.Validation`](../README.md)** - Root namespace; `ValidationExtensions.WhenClause` and `ValidationExtensions.DependsOnClause` are the public entry points that create and attach these clause instances.
+- **[`CoreEx.Validation.Abstractions`](../Abstractions/README.md)** - Defines `IPropertyClause<TEntity>` and `IPropertyClause<TEntity, TProperty>` that both clause types implement.
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Clauses/WhenClause.cs b/src/CoreEx.Validation/Clauses/WhenClause.cs
index 5f8ebc03..6eefbc3d 100644
--- a/src/CoreEx.Validation/Clauses/WhenClause.cs
+++ b/src/CoreEx.Validation/Clauses/WhenClause.cs
@@ -1,50 +1,15 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation.Clauses
+namespace CoreEx.Validation.Clauses;
+
+/// <summary>
+/// Represents a <i>when</i> test clause; in that the condition must be <see langword="true"/> to continue.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="whenAsync">The when-based <see cref="PredicateAsync{TEntity, TProperty}"/>.</param>
+public sealed class WhenClause<TEntity, TProperty>(PredicateAsync<TEntity, TProperty> whenAsync) : IPropertyClause<TEntity, TProperty> where TEntity : class
 {
-    /// <summary>
-    /// Represents a when test clause; in that the condition must be <c>true</c> to continue.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class WhenClause<TEntity, TProperty> : IPropertyRuleClause<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Predicate<TEntity>? _entityPredicate;
-        private readonly Predicate<TProperty>? _propertyPredicate;
-        private readonly Func<bool>? _when;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WhenClause{TEntity, TProperty}"/> class with a <paramref name="predicate"/> being passed the <typeparamref name="TEntity"/>.
-        /// </summary>
-        /// <param name="predicate">The when predicate.</param>
-        public WhenClause(Predicate<TEntity> predicate) => _entityPredicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WhenClause{TEntity, TProperty}"/> class with a <paramref name="when"/> function.
-        /// </summary>
-        /// <param name="when">The when function.</param>
-        public WhenClause(Func<bool> when) => _when = when.ThrowIfNull(nameof(when));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WhenClause{TEntity, TProperty}"/> class with a <paramref name="predicate"/> being passed the <typeparamref name="TProperty"/>.
-        /// </summary>
-        /// <param name="predicate">The when predicate.</param>
-        public WhenClause(Predicate<TProperty> predicate) => _propertyPredicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Checks the clause.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        public bool Check(IPropertyContext context)
-        {
-            context.ThrowIfNull(nameof(context));
+    private readonly PredicateAsync<TEntity, TProperty> _whenAsync = whenAsync.ThrowIfNull();
 
-            return _when != null ? _when.Invoke()
-                : _entityPredicate != null ? _entityPredicate.Invoke((TEntity)context.Parent.Value!)
-                : _propertyPredicate!.Invoke((TProperty)context.Value!);
-        }
-    }
+    /// <inheritdoc/>
+    public Task<bool> CheckAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken) => _whenAsync(context, cancellationToken);
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/CommonValidator.cs b/src/CoreEx.Validation/CommonValidator.cs
deleted file mode 100644
index 8e35c30e..00000000
--- a/src/CoreEx.Validation/CommonValidator.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Provides access to the common value validator capabilities.
-    /// </summary>
-    public static class CommonValidator
-    {
-        /// <summary>
-        /// Create a new instance of the <see cref="CommonValidator{T}"/>.
-        /// </summary>
-        /// <param name="configure">An action with the <see cref="CommonValidator{T}"/> to enable further configuration.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/>.</returns>
-        /// <remarks>This is a synonym for the <see cref="Validator.CreateFor{T}(Action{CommonValidator{T}})"/>.</remarks>
-        public static CommonValidator<T> Create<T>(Action<CommonValidator<T>>? configure = null) => new CommonValidator<T>().Configure(configure);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/CommonValidatorT.cs b/src/CoreEx.Validation/CommonValidatorT.cs
index 53ded451..cb7ed9e3 100644
--- a/src/CoreEx.Validation/CommonValidatorT.cs
+++ b/src/CoreEx.Validation/CommonValidatorT.cs
@@ -1,145 +1,39 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides a common validator enabling standardized configuration and validation behavior to be shared/reused.
+/// </summary>
+/// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+/// <remarks>General guidance is to <b>not</b> use <see cref="Nullable{T}"/> (struct) or nullable class (i.e. <c>string?</c>) <typeparamref name="TValue"/>  as this will limit reusability with <i>no</i> functional benefits.</remarks>
+/// <param name="configure">The action to configure the <see cref="CommonValidator{T}"/>.</param>
+public class CommonValidator<TValue>(Action<InlineValidator<TValue>.Validator>? configure) : InlineValidator<TValue>(configure)
 {
+    private List<Func<PropertyContext<ValidationValue<TValue>, TValue>, CancellationToken, Task>>? _additionalAsync;
+
     /// <summary>
-    /// Provides a common value rule that can be used by other validators that share the same <see cref="Type"/> of <typeparamref name="T"/>.
+    /// Validate the common value (post all configured <see cref="PropertyRuleBase{TEntity, TProperty}"/> chained rules) enabling multiple additional validation functions to be added.
     /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    /// <remarks>Note: the <see cref="PropertyRuleBase{TEntity, TProperty}.Name"/>, <see cref="PropertyRuleBase{TEntity, TProperty}.JsonName"/> and <see cref="PropertyRuleBase{TEntity, TProperty}.Text"/> initially default to <see cref="Validation.ValueNameDefault"/>.</remarks>
-    public class CommonValidator<T> : PropertyRuleBase<ValidationValue<T>, T>, IValidatorEx<T>
+    /// <param name="additionalAsync">The additional validation function.</param>
+    /// <returns>The <see cref="CommonValidator{T}"/>.</returns>
+    public CommonValidator<TValue> AdditionalAsync(Func<PropertyContext<ValidationValue<TValue>, TValue>, CancellationToken, Task> additionalAsync)
     {
-        private Func<PropertyContext<ValidationValue<T>, T>, CancellationToken, Task<Result>>? _additionalAsync;
-        private bool _textOverridden;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CommonValidator{T}"/>.
-        /// </summary>
-        public CommonValidator() : base(Validation.ValueNameDefault) => _textOverridden = false;
-
-        /// <inheritdoc/>
-        public override LText Text 
-        { 
-            get => base.Text;
-            set
-            {
-                base.Text = value;
-                _textOverridden = true;
-            }
-        }
-
-        /// <summary>
-        /// Enables the validator to be further configured.
-        /// </summary>
-        /// <param name="validator">An action with the <see cref="CommonValidator{T}"/> to enable further configuration.</param>
-        /// <returns>The validator to support fluent-style method-chaining.</returns>
-        public CommonValidator<T> Configure(Action<CommonValidator<T>>? validator)
-        {
-            validator?.Invoke(this);
-            return this;
-        }
-
-        /// <summary>
-        /// Validates the value.
-        /// </summary>
-        /// <typeparam name="TEntity">The related entity <see cref="Type"/>.</typeparam>
-        /// <param name="context">The related <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        internal async Task ValidateAsync<TEntity>(PropertyContext<TEntity, T> context, CancellationToken cancellationToken) where TEntity : class
-        {
-            var vv = new ValidationValue<T>(context.ThrowIfNull(nameof(context)).Parent.Value, context.Value);
-            var vc = new ValidationContext<ValidationValue<T>>(vv, new ValidationArgs
-            {
-                Config = context.Parent.Config,
-                SelectedPropertyName = context.Parent.SelectedPropertyName,
-                FullyQualifiedEntityName = context.Parent.FullyQualifiedEntityName,
-                FullyQualifiedJsonEntityName = context.Parent.FullyQualifiedJsonEntityName,
-                UseJsonNames = context.UseJsonName
-            });
-
-            var ctx = new PropertyContext<ValidationValue<T>, T>(vc, context.Value, context.Name, context.JsonName, _textOverridden ? Text : context.Text);
-            await InvokeAsync(ctx, cancellationToken).ConfigureAwait(false);
-
-            await (ctx.Parent.FailureResult ?? Result.Success)
-                .ThenAsync(() => OnValidateAsync(ctx, cancellationToken))
-                .WhenAsync(() => _additionalAsync != null, () => _additionalAsync!(ctx, cancellationToken))
-                .Match(ok: () =>
-                {
-                    context.HasError = ctx.HasError;
-                    context.Parent.MergeResult(ctx.Parent);
-                }, fail: ex => context.Parent.SetFailureResult(Result.Fail(ex)))
-                .ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Validate the entity value (post all configured property rules) enabling additional validation logic to be added by the inheriting classes.
-        /// </summary>
-        /// <param name="context">The <see cref="ValidationContext{TEntity}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        protected virtual Task<Result> OnValidateAsync(PropertyContext<ValidationValue<T>, T> context, CancellationToken cancellationToken) => Task.FromResult(Result.Success);
-
-        /// <summary>
-        /// Validate the entity value (post all configured property rules) enabling additional validation logic to be added.
-        /// </summary>
-        /// <param name="additionalAsync">The asynchronous function to invoke.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/>.</returns>
-        public CommonValidator<T> AdditionalAsync(Func<PropertyContext<ValidationValue<T>, T>, CancellationToken, Task<Result>> additionalAsync)
-        {
-            if (_additionalAsync != null)
-                throw new InvalidOperationException("Additional can only be defined once for a Validator.");
-
-            _additionalAsync = additionalAsync.ThrowIfNull(nameof(additionalAsync));
-            return this;
-        }
-
-        /// <inheritdoc/>
-        async Task<ValidationContext<T>> IValidatorEx<T>.ValidateAsync(T value, ValidationArgs? args, CancellationToken cancellationToken)
-        {
-            var context = new ValidationContext<T>(value, args ?? new ValidationArgs());
-            var ir = await ValidateAsync(value, context.FullyQualifiedEntityName, context.FullyQualifiedEntityName, Text, cancellationToken: cancellationToken).ConfigureAwait(false);
-            context.MergeResult(ir.Messages);
-            return context;
-        }
+        (_additionalAsync ??= []).Add(additionalAsync.ThrowIfNull());
+        return this;
+    }
 
-        /// <summary>
-        /// Validates the value.
-        /// </summary>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="name">The value name.</param>
-        /// <param name="jsonName">The value JSON name.</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <param name="throwOnError">Indicates to throw a <see cref="ValidationException"/> where an error was found.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="ValueValidatorResult{TEntity, TProperty}"/>.</returns>
-        private async Task<ValueValidatorResult<ValidationValue<T>, T>> ValidateAsync(T? value, string? name, string? jsonName, LText? text = null, bool throwOnError = false, CancellationToken cancellationToken = default)
+    /// <summary>
+    /// Validate the common property value.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected async override Task OnValidateAsync(PropertyContext<ValidationValue<TValue>, TValue> context, CancellationToken cancellationToken)
+    {
+        if (_additionalAsync is not null)
         {
-            var vv = new ValidationValue<T>(null, value);
-            var ctx = new PropertyContext<ValidationValue<T>, T>(new ValidationContext<ValidationValue<T>>(vv,
-                new ValidationArgs()), value, name ?? Name, jsonName ?? JsonName, text ?? name.ToSentenceCase() ?? Text);
-
-            await InvokeAsync(ctx, cancellationToken).ConfigureAwait(false);
-            var res = new ValueValidatorResult<ValidationValue<T>, T>(ctx);
-
-            if (ctx.Parent.FailureResult is null)
+            foreach (var validator in _additionalAsync)
             {
-                var result = await OnValidateAsync(ctx, cancellationToken).ConfigureAwait(false);
-                if (result.IsSuccess && _additionalAsync != null)
-                    result = await _additionalAsync(ctx, cancellationToken).ConfigureAwait(false);
-
-                ctx.Parent.SetFailureResult(result);
+                await validator(context, cancellationToken).ConfigureAwait(false);
             }
-
-            if (throwOnError)
-                res.ThrowOnError();
-
-            return res;
         }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/CompareOperator.cs b/src/CoreEx.Validation/CompareOperator.cs
index b93aa998..20d35e2d 100644
--- a/src/CoreEx.Validation/CompareOperator.cs
+++ b/src/CoreEx.Validation/CompareOperator.cs
@@ -1,23 +1,25 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-namespace CoreEx.Validation
+/// <summary>
+/// Represents a comparison operator.
+/// </summary>
+public enum CompareOperator
 {
-    /// <summary>
-    /// Represents a comparison operator.
-    /// </summary>
-    public enum CompareOperator
-    {
-        /// <summary>A comparison for equality.</summary>
-        Equal,
-        /// <summary>A comparison for inequality.</summary>
-        NotEqual,
-        /// <summary>A comparison for less than.</summary>
-        LessThan,
-        /// <summary>A comparison for less than or equal to.</summary>
-        LessThanEqual,
-        /// <summary>A comparison for greater than.</summary>
-        GreaterThan,
-        /// <summary>A comparison for greater than or equal to.</summary>
-        GreaterThanEqual,
-    }
-}
+    /// <summary>A comparison for equality.</summary>
+    Equal,
+
+    /// <summary>A comparison for inequality.</summary>
+    NotEqual,
+
+    /// <summary>A comparison for less than.</summary>
+    LessThan,
+
+    /// <summary>A comparison for less than or equal to.</summary>
+    LessThanOrEqualTo,
+
+    /// <summary>A comparison for greater than.</summary>
+    GreaterThan,
+
+    /// <summary>A comparison for greater than or equal to.</summary>
+    GreaterThanOrEqualTo
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/CoreEx.Validation.csproj b/src/CoreEx.Validation/CoreEx.Validation.csproj
index 58a627bb..67506b09 100644
--- a/src/CoreEx.Validation/CoreEx.Validation.csproj
+++ b/src/CoreEx.Validation/CoreEx.Validation.csproj
@@ -1,18 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx.Validation</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET Validation (Alternative).</Title>
-    <Description>CoreEx .NET Validation (Alternative).</Description>
-    <PackageTags>coreex api function aspnet entity microservices referencedata validation validator validate</PackageTags>
+    <Title>CoreEx .NET Validation extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data validation rules clauses fluent</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
   <ItemGroup>
     <ProjectReference Include="..\CoreEx\CoreEx.csproj" />
   </ItemGroup>
-  
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.Validation/GlobalUsing.cs b/src/CoreEx.Validation/GlobalUsing.cs
new file mode 100644
index 00000000..9826293a
--- /dev/null
+++ b/src/CoreEx.Validation/GlobalUsing.cs
@@ -0,0 +1,23 @@
+global using CoreEx.Abstractions;
+global using CoreEx.Data;
+global using CoreEx.Entities;
+global using CoreEx.Entities.Abstractions;
+global using CoreEx.Localization;
+global using CoreEx.Metadata;
+global using CoreEx.RefData;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Validation.Abstractions;
+global using CoreEx.Validation.Clauses;
+global using CoreEx.Validation.Rules;
+global using CoreEx.Wildcards;
+global using Microsoft.Extensions.DependencyInjection;
+global using System.Collections;
+global using System.Collections.Immutable;
+global using System.Diagnostics;
+global using System.Linq.Expressions;
+global using System.Numerics;
+global using System.Runtime.CompilerServices;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IEntityRule.cs b/src/CoreEx.Validation/IEntityRule.cs
deleted file mode 100644
index da107a70..00000000
--- a/src/CoreEx.Validation/IEntityRule.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Provides a validation rule for an entity.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    public interface IEntityRule<TEntity> where TEntity : class
-    {
-        /// <summary>
-        /// Validates an entity given a <see cref="ValidationContext{TEntity}"/>.
-        /// </summary>
-        /// <param name="context">The <see cref="ValidationContext{TEntity}"/></param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IPropertyContext.cs b/src/CoreEx.Validation/IPropertyContext.cs
deleted file mode 100644
index 158badb4..00000000
--- a/src/CoreEx.Validation/IPropertyContext.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Localization;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables a validation context for a property.
-    /// </summary>
-    public interface IPropertyContext
-    {
-        /// <summary>
-        /// Gets the <see cref="IValidationContext"/> for the parent entity.
-        /// </summary>
-        IValidationContext Parent { get; }
-
-        /// <summary>
-        /// Gets the property name.
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// Gets the JSON property name.
-        /// </summary>
-        string JsonName { get; }
-
-        /// <summary>
-        /// Gets the property text.
-        /// </summary>
-        string Text { get; }
-
-        /// <summary>
-        /// Gets the property value.
-        /// </summary>
-        object? Value { get; }
-
-        /// <summary>
-        /// Gets the fully qualified property name.
-        /// </summary>
-        string FullyQualifiedPropertyName { get; }
-
-        /// <summary>
-        /// Gets the fully qualified Json property name.
-        /// </summary>
-        string FullyQualifiedJsonPropertyName { get; }
-
-        /// <summary>
-        /// Indicates whether there has been a validation error.
-        /// </summary>
-        bool HasError { get; }
-
-        /// <summary>
-        /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified format and <b>adds</b> to the underlying <see cref="IValidationContext"/>.
-        /// The friendly <see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        MessageItem CreateErrorMessage(LText format);
-
-        /// <summary>
-        /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified format and additional values to be included in the text and <b>adds</b> to the underlying <see cref="IValidationContext"/>.
-        /// The friendly <see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text (<see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter).</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        MessageItem CreateErrorMessage(LText format, params object?[] values);
-
-        /// <summary>
-        /// Creates a fully qualified property name for the name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        string CreateFullyQualifiedPropertyName(string name);
-
-        /// <summary>
-        /// Creates a fully qualified JSON property name for the name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        string CreateFullyQualifiedJsonPropertyName(string name);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IPropertyContextT.cs b/src/CoreEx.Validation/IPropertyContextT.cs
deleted file mode 100644
index 134d6d05..00000000
--- a/src/CoreEx.Validation/IPropertyContextT.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables a validation context for a property.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public interface IPropertyContext<TEntity, in TProperty> : IPropertyContext where TEntity : class { }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IPropertyRule.cs b/src/CoreEx.Validation/IPropertyRule.cs
deleted file mode 100644
index f89458a5..00000000
--- a/src/CoreEx.Validation/IPropertyRule.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables a validation rule for an entity property. 
-    /// </summary>
-    public interface IPropertyRule
-    {
-        /// <summary>
-        /// Gets the property name.
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// Gets the JSON property name.
-        /// </summary>
-        public string JsonName { get; }
-
-        /// <summary>
-        /// Gets or sets the friendly text name used in validation messages.
-        /// </summary>
-        public LText Text { get; set; }
-
-        /// <summary>
-        /// Gets or sets the error message format text (overrides the default) used for all validation errors.
-        /// </summary>
-        public LText? ErrorText { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IPropertyRuleT2.cs b/src/CoreEx.Validation/IPropertyRuleT2.cs
deleted file mode 100644
index 9da72cb1..00000000
--- a/src/CoreEx.Validation/IPropertyRuleT2.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using CoreEx.Validation.Clauses;
-using CoreEx.Validation.Rules;
-using System;
-using System.Linq.Expressions;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables a validation rule for an entity property. 
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public interface IPropertyRule<TEntity, in TProperty> : IPropertyRule where TEntity : class
-    {
-        /// <summary>
-        /// Adds a clause (<see cref="IPropertyRuleClause{TEntity, TProperty}"/>) to the rule.
-        /// </summary>
-        /// <param name="clause">The <see cref="IPropertyRuleClause{TEntity, TProperty}"/>.</param>
-        void AddClause(IPropertyRuleClause<TEntity> clause);
-
-        /// <summary>
-        /// Adds a rule (<see cref="IValueRule{TEntity, TProperty}"/>) to the property.
-        /// </summary>
-        /// <param name="rule">The <see cref="IValueRule{TEntity, TProperty}"/>.</param>
-        /// <returns>The <see cref="PropertyRuleBase{TEntity, TProperty}"/>.</returns>
-        IPropertyRule<TEntity, TProperty> AddRule(IValueRule<TEntity, TProperty> rule);
-
-        /// <summary>
-        /// Adds a <see cref="DependsOnClause{TEntity, TProperty}"/> to this <see cref="PropertyRule{TEntity, TProperty}"/> in that another specified property of the entity must have a non-default value (and not have a validation error) to continue.
-        /// </summary>
-        /// <param name="expression">A depends on expression.</param>
-        /// <returns>The <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        public IPropertyRule<TEntity, TProperty> DependsOn<TDependsProperty>(Expression<Func<TEntity, TDependsProperty>> expression)
-        {
-            if (expression == null)
-                return this;
-
-            AddClause(new DependsOnClause<TEntity, TDependsProperty>(expression));
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="ValueRuleBase{TEntity, TProperty}.ErrorText"/> for the last <see cref="AddRule(IValueRule{TEntity, TProperty})">rule</see> added.
-        /// </summary>
-        /// <param name="errorText">The error message format text.</param>
-        /// <returns>The <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        IPropertyRule<TEntity, TProperty> WithMessage(LText errorText);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IValidationContext.cs b/src/CoreEx.Validation/IValidationContext.cs
deleted file mode 100644
index 46381331..00000000
--- a/src/CoreEx.Validation/IValidationContext.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Provides the validation context properties for an entity.
-    /// </summary>
-    public interface IValidationContext : IValidationResult
-    {
-        /// <summary>
-        /// Gets the entity <see cref="Type"/>.
-        /// </summary>
-        Type EntityType { get; }
-
-        /// <summary>
-        /// Gets the entity prefix used for fully qualified <i>entity.property</i> naming (<c>null</c> represents the root).
-        /// </summary>
-        string? FullyQualifiedEntityName { get; }
-
-        /// <summary>
-        /// Gets the entity prefix used for fully qualified JSON <i>entity.property</i> naming (<c>null</c> represents the root).
-        /// </summary>
-        string? FullyQualifiedJsonEntityName { get; }
-
-        /// <summary>
-        /// Indicates whether JSON names were used for the <see cref="MessageItem"/> <see cref="MessageItem.Property"/>; by default (<c>false</c>) uses the .NET property names.
-        /// </summary>
-        bool UsedJsonNames { get; }
-
-        /// <summary>
-        /// Gets the configuration parameters.
-        /// </summary>
-        /// <remarks>Configuration parameters provide a means to pass values down through the validation stack. The consuming developer must instantiate the property on first use.</remarks>
-        IDictionary<string, object?>? Config { get; }
-
-        /// <summary>
-        /// Determines whether one of the specified fully qualified property names has an error.
-        /// </summary>
-        /// <param name="fullyQualifiedPropertyName">The fully qualified property name.</param>
-        /// <returns><c>true</c> where an error exists for at least one of the specified properties; otherwise, <c>false</c>.</returns>
-        bool HasError(string fullyQualifiedPropertyName);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IValidatorEx.cs b/src/CoreEx.Validation/IValidatorEx.cs
deleted file mode 100644
index 46c51930..00000000
--- a/src/CoreEx.Validation/IValidatorEx.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Extends the <see cref="IValidator"/>.
-    /// </summary>
-    public interface IValidatorEx : IValidator
-    {
-        /// <summary>
-        /// Validate the entity value with specified <see cref="ValidationArgs"/>.
-        /// </summary>
-        /// <param name="value">The entity value.</param>
-        /// <param name="args">An optional <see cref="ValidationArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="IValidationContext"/>.</returns>
-        Task<IValidationContext> ValidateAsync(object value, ValidationArgs? args, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IValidatorExT.cs b/src/CoreEx.Validation/IValidatorExT.cs
deleted file mode 100644
index 67df339d..00000000
--- a/src/CoreEx.Validation/IValidatorExT.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Extends the <see cref="IValidator{T}"/>
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    public interface IValidatorEx<T> : IValidatorEx, IValidator<T>
-    {
-        /// <inheritdoc/>
-        async Task<IValidationContext> IValidatorEx.ValidateAsync(object value, ValidationArgs? args, CancellationToken cancellationToken)
-            => await ValidateAsync((T)value!, args, cancellationToken).ConfigureAwait(false);
-
-        /// <inheritdoc/>
-        async Task<IValidationResult<T>> IValidator<T>.ValidateAsync(T value, CancellationToken cancellationToken)
-            => await ValidateAsync(value, null, cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Validate the entity value with specified <see cref="ValidationArgs"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="args">An optional <see cref="ValidationArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="ValidationContext{TEntity}"/>.</returns>
-        Task<ValidationContext<T>> ValidateAsync(T value, ValidationArgs? args, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/IncludeBaseRule.cs b/src/CoreEx.Validation/IncludeBaseRule.cs
deleted file mode 100644
index d8d632b5..00000000
--- a/src/CoreEx.Validation/IncludeBaseRule.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents a rule that enables a base validator to be included.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TInclude">The entity base <see cref="Type"/>.</typeparam>
-    public class IncludeBaseRule<TEntity, TInclude> : ValidatorBase<TEntity>, IEntityRule<TEntity> where TEntity : class where TInclude : class
-    {
-        private readonly IValidatorEx<TInclude> _include;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="IncludeBaseRule{TEntity, TInclude}"/> class.
-        /// </summary>
-        /// <param name="include">The base <see cref="IValidatorEx{TInclude}"/>.</param>
-        internal IncludeBaseRule(IValidatorEx<TInclude> include) => _include = include.ThrowIfNull(nameof(include));
-
-        /// <inheritdoc/>
-        public async Task ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken = default)
-        {
-            if (context.ThrowIfNull(nameof(context)).Value is not TInclude val)
-                throw new InvalidOperationException($"Type {typeof(TEntity).Name} must inherit from {typeof(TInclude).Name}.");
-
-            var ctx = new ValidationContext<TInclude>(val, new ValidationArgs
-            {
-                Config = context.Config,
-                SelectedPropertyName = context.SelectedPropertyName,
-                ShallowValidation = context.ShallowValidation,
-                FullyQualifiedEntityName = context.FullyQualifiedEntityName,
-                UseJsonNames = context.UsedJsonNames
-            });
-
-            if (_include is ValidatorBase<TInclude> vb) // Victoria Bitter, for a hard-earned thirst: https://www.youtube.com/watch?v=WA1h9h7-_Z4
-            {
-                foreach (var r in vb.Rules)
-                {
-                    await r.ValidateAsync(ctx, cancellationToken).ConfigureAwait(false);
-                    if (ctx.FailureResult is not null)
-                        break;
-                }
-            }
-
-            context.MergeResult(ctx);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/PredicateAsync.cs b/src/CoreEx.Validation/PredicateAsync.cs
new file mode 100644
index 00000000..69013873
--- /dev/null
+++ b/src/CoreEx.Validation/PredicateAsync.cs
@@ -0,0 +1,11 @@
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Represents the method signature for an <see cref="IPropertyRule{TEntity, TProperty}"/> context-based asynchronous predicate.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+/// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+/// <returns><see langword="true"/> where meets the criteria defined within the method represented by this delegate; otherwise, <see langword="false"/>.</returns>
+public delegate Task<bool> PredicateAsync<TEntity, TProperty>(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken) where TEntity : class;
\ No newline at end of file
diff --git a/src/CoreEx.Validation/PropertyContext.cs b/src/CoreEx.Validation/PropertyContext.cs
index 4443f3aa..8de42084 100644
--- a/src/CoreEx.Validation/PropertyContext.cs
+++ b/src/CoreEx.Validation/PropertyContext.cs
@@ -1,244 +1,268 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides a validation context for a property.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public struct PropertyContext<TEntity, TProperty> : IPropertyContext<TEntity, TProperty> where TEntity : class
+{
+    private const string _dictionaryKeyParameterName = "__dictionaryKey";
+    private const string _collectionIndexParameterName = "__collectionIndex";
 
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Localization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+    private readonly IRootPropertyRule<TEntity> _root;
+    private readonly IPropertyRuntimeMetadata _metadata;
+    private readonly ValidationContext<TEntity> _owner;
 
-namespace CoreEx.Validation
-{
     /// <summary>
-    /// Provides a validation context for a property.
+    /// Initializes a new instance of the <see cref="PropertyContext{TEntity, TProperty}"/> class.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class PropertyContext<TEntity, TProperty> : IPropertyContext<TEntity, TProperty> where TEntity : class
+    /// <param name="root">The <see cref="RootPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <param name="context">The validation context for the parent entity.</param>
+    internal PropertyContext(RootPropertyRule<TEntity, TProperty> root, ValidationContext<TEntity> context)
     {
-        private readonly bool _doNotAppendName = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyContext{TEntity, TProperty}"/> class.
-        /// </summary>
-        /// <param name="context">The validation context for the parent entity.</param>
-        /// <param name="value">The property value.</param>
-        /// <param name="name">The property name.</param>
-        /// <param name="jsonName">The JSON property name.</param>
-        /// <param name="text">The property text.</param>
-        public PropertyContext(ValidationContext<TEntity> context, TProperty? value, string name, string? jsonName = null, LText? text = null)
+        _root = root.ThrowIfNull();
+        _metadata = root.Metadata.ThrowIfNull();
+        _owner = context.ThrowIfNull();
+
+        JsonName = _metadata.GetJsonName(context.JsonSerializerOptions);
+        Value = _metadata.GetValue<TProperty>(context.Value);
+        IsValueNull = Value is null;
+        ValueFormatter = root.ValueFormatter;
+        Text = root.Text ?? _metadata.Text;
+
+        if (_metadata is ISelfRuntimeMetadata)
+        {
+            // Self-referencing entity; so, use the owner qualified names where not null; otherwise, default.
+            FullyQualifiedPropertyName = _owner.FullyQualifiedEntityName ?? Name;
+            FullyQualifiedJsonPropertyName = _owner.FullyQualifiedJsonEntityName ?? JsonName;
+        }
+        else
         {
-            Parent = context.ThrowIfNull(nameof(context));
-            Name = name.ThrowIfNullOrEmpty(nameof(name));
-            JsonName = jsonName ?? Name;
-            UseJsonName = context.UsedJsonNames;
-            Text = text ?? Name.ToSentenceCase()!;
-            Value = value;
+            // Standard property; so, append to the owner qualified names.
             FullyQualifiedPropertyName = CreateFullyQualifiedPropertyName(Name);
             FullyQualifiedJsonPropertyName = CreateFullyQualifiedJsonPropertyName(JsonName);
         }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyContext{TEntity, TProperty}"/> class where the property is considered the value (impacts the fully-qualified names, etc.).
-        /// </summary>
-        /// <param name="text">The property text.</param>
-        /// <param name="context">The validation context for the parent entity.</param>
-        /// <param name="value">The property value.</param>
-        public PropertyContext(LText? text, ValidationContext<TEntity> context, TProperty? value)
-        {
-            Parent = context.ThrowIfNull(nameof(context));
-            FullyQualifiedPropertyName = Parent.FullyQualifiedEntityName ?? Validation.ValueNameDefault;
-            FullyQualifiedJsonPropertyName = Parent.FullyQualifiedJsonEntityName ?? Validation.ValueNameDefault;
-            Name = FullyQualifiedPropertyName.Split('.', StringSplitOptions.RemoveEmptyEntries).Last();
-            JsonName = FullyQualifiedJsonPropertyName.Split('.', StringSplitOptions.RemoveEmptyEntries).Last();
-            Text = text ?? Name.ToSentenceCase()!;
-            Value = value;
-            _doNotAppendName = true;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PropertyContext{TEntity, TProperty}"/> class.
+    /// </summary>
+    /// <param name="context">The <see cref="IPropertyContext{TEntity}"/>.</param>
+    /// <param name="value">The property value.</param>
+    internal PropertyContext(IPropertyContext<TEntity> context, TProperty value)
+    {
+        _root = context.RootPropertyRule;
+        _metadata = context.Metadata;
+        _owner = (ValidationContext<TEntity>)context.Owner;
+
+        JsonName = context.JsonName;
+        Value = value;
+        IsValueNull = context.IsValueNull;
+        ValueFormatter = context.ValueFormatter;
+        Text = context.Text;
+        FullyQualifiedPropertyName = context.FullyQualifiedPropertyName;
+        FullyQualifiedJsonPropertyName = context.FullyQualifiedJsonPropertyName;
+    }
 
-        /// <summary>
-        /// Gets the <see cref="ExecutionContext.Current"/> instance.
-        /// </summary>
-        public CoreEx.ExecutionContext ExecutionContext => ExecutionContext.Current;
-
-        /// <summary>
-        /// Gets the <see cref="ValidationContext{TEntity}"/> for the parent entity.
-        /// </summary>
-        public ValidationContext<TEntity> Parent { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IValidationContext"/> for the parent entity.
-        /// </summary>
-        IValidationContext IPropertyContext.Parent => Parent;
-
-        /// <summary>
-        /// Gets the property name.
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// Gets the JSON property name.
-        /// </summary>
-        public string JsonName { get; }
-
-        /// <summary>
-        /// Gets the fully qualified property name.
-        /// </summary>
-        public string FullyQualifiedPropertyName { get; }
-
-        /// <summary>
-        /// Gets the fully qualified Json property name.
-        /// </summary>
-        public string FullyQualifiedJsonPropertyName { get; }
-
-        /// <summary>
-        /// Indicates whether to use the JSON property name for the <see cref="MessageItem"/> <see cref="MessageItem.Property"/>; by default (<c>false</c>) uses the .NET property name.
-        /// </summary>
-        public bool UseJsonName { get; }
-
-        /// <summary>
-        /// Gets the property text.
-        /// </summary>
-        public string Text { get; }
-
-        /// <summary>
-        /// Gets the property value.
-        /// </summary>
-        object? IPropertyContext.Value => Value;
-
-        /// <summary>
-        /// Gets the property value.
-        /// </summary>
-        public TProperty? Value { get; private set; }
-
-        /// <summary>
-        /// Indicates whether there has been a validation error.
-        /// </summary>
-        public bool HasError { get; internal set; }
-
-        /// <summary>
-        /// Enables the underlying value to be overridden (updated).
-        /// </summary>
-        /// <param name="value">The override value.</param>
-        public void OverrideValue(TProperty? value)
-        {
-            if (Comparer<TProperty?>.Default.Compare(Value, value) == 0)
-                return;
-
-            // Get the property info.
-            if (Parent.Value is ValidationValue<TProperty> vv)
-            {
-                if (vv.Entity != null)
-                {
-                    var pr = TypeReflector.GetReflector(TypeReflectorArgs.Default, vv.Entity.GetType()).GetProperty(Name) ?? throw new InvalidOperationException($"Property '{Name}' does not exist for Type {Parent.EntityType.Name}.");
-
-                    try
-                    {
-                        pr.PropertyExpression.SetValue(vv.Entity, value);
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new InvalidOperationException($"Type '{Parent.EntityType.Name}' Property '{Name}' value cannot be overridden: {ex.Message}", ex);
-                    }
-                }
-                else
-                    throw new InvalidOperationException("A value without a parent object owning the property value cannot be overridden.");
-            }
-            else
-            {
-                var pr = TypeReflector.GetReflector<TEntity>(TypeReflectorArgs.Default).GetProperty(Name) ?? throw new InvalidOperationException($"Property '{Name}' does not exist for Type {typeof(TEntity).Name}.");
-
-                try
-                {
-                    pr.PropertyExpression.SetValue(Parent.Value, value);
-                }
-                catch (Exception ex)
-                {
-                    throw new InvalidOperationException($"Type '{typeof(TEntity).Name}' Property '{Name}' value cannot be overridden: {ex.Message}", ex);
-                }
-            }
-
-            Value = value;
-        }
+    /// <inheritdoc/>
+    readonly IRootPropertyRule<TEntity> IPropertyContext<TEntity>.RootPropertyRule => _root;
 
-        /// <summary>
-        /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified format and <b>adds</b> to the underlying <see cref="IValidationContext"/>.
-        /// The friendly <see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem CreateErrorMessage(LText format) => CreateErrorMessage(format, []);
-
-        /// <summary>
-        /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified format and additional values to be included in the text and <b>adds</b> to the underlying <see cref="IValidationContext"/>.
-        /// The friendly <see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text (<see cref="Text"/> and <see cref="Value"/> are automatically passed as the first two arguments to the string formatter).</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem CreateErrorMessage(LText format, params object?[] values)
-        {
-            HasError = true;
-            var fVals = (new string[] { Text, Value?.ToString()! }).Concat(values).ToArray();
+    /// <inheritdoc/>
+    readonly IValidationContext<TEntity> IPropertyContext<TEntity>.Owner => _owner;
 
-            if (_doNotAppendName)
-                return Parent.AddMessage(MessageType.Error, format, fVals);
-            else
-                return Parent.AddMessage(Name, JsonName, MessageType.Error, format, fVals);
-        }
+    /// <inheritdoc/>
+    readonly IPropertyRuntimeMetadata IPropertyContext.Metadata => _metadata;
 
-        /// <summary>
-        /// Creates a fully qualified property name for the name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        public string CreateFullyQualifiedPropertyName(string name) => (Parent.FullyQualifiedEntityName == null) ? name : (Parent.FullyQualifiedEntityName + (name.StartsWith('[') ? "" : ".") + name);
-
-        /// <summary>
-        /// Creates a fully qualified JSON property name for the name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        public string CreateFullyQualifiedJsonPropertyName(string name) => (Parent.FullyQualifiedJsonEntityName == null) ? name : (Parent.FullyQualifiedJsonEntityName + (name.StartsWith('[') ? "" : ".") + name);
-
-        /// <summary>
-        /// Creates a new <see cref="ValidationArgs"/> from the <see cref="PropertyContext{TEntity, TProperty}"/>.
-        /// </summary>
-        /// <returns>A <see cref="ValidationArgs"/>.</returns>
-        public ValidationArgs CreateValidationArgs()
-        {
-            var args = new ValidationArgs
-            {
-                FullyQualifiedEntityName = FullyQualifiedPropertyName,
-                FullyQualifiedJsonEntityName = FullyQualifiedJsonPropertyName,
-                SelectedPropertyName = Parent?.SelectedPropertyName,
-                UseJsonNames = Parent?.UsedJsonNames
-            };
-
-            // Copy the configuration values; do not allow the higher-level dictionaries (stack) to be extended by lower-level validators.
-            if (Parent?.Config != null)
-            {
-                args.Config ??= new Dictionary<string, object?>();
-                foreach (var cfg in Parent.Config)
-                {
-                    args.Config.Add(cfg.Key, cfg.Value);
-                }
-            }
-
-            return args;
-        }
+    /// <summary>
+    /// Gets the property <see cref="IPropertyRuntimeMetadata"/>.
+    /// </summary>
+    internal readonly IPropertyRuntimeMetadata Metadata => _metadata;
 
-        /// <summary>
-        /// Merges a validation result into this.
-        /// </summary>
-        /// <param name="context">The <see cref="IValidationContext"/> to merge.</param>
-        public void MergeResult(IValidationContext context)
-        {
-            if (context == null)
-                return;
+    /// <inheritdoc/>
+    public readonly IDictionary<string, object?> Parameters => _owner.Parameters;
 
-            if (context.HasErrors)
-                HasError = true;
+    /// <inheritdoc/>
+    public readonly string Name => _metadata.Name;
 
-            Parent.MergeResult(context);
-        }
+    /// <inheritdoc/>
+    public string JsonName { get; }
+
+    /// <inheritdoc/>
+    public string FullyQualifiedPropertyName { get; }
+
+    /// <inheritdoc/>
+    public string FullyQualifiedJsonPropertyName { get; }
+
+    /// <inheritdoc/>
+    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+    public LText Text { get; }
+
+    /// <inheritdoc/>
+    public readonly TEntity Entity => _owner.Value;
+
+    /// <inheritdoc/>
+    public TProperty Value { get; private set; }
+
+    /// <inheritdoc/>
+    public bool IsValueNull { get; private set; }
+
+    /// <inheritdoc/>
+    public ValueFormatter ValueFormatter { get; }
+
+    /// <inheritdoc/>
+    public readonly bool IsInError => HasError(FullyQualifiedPropertyName);
+
+    /// <summary>
+    /// Determines whether the specified fully qualified property name has an error.
+    /// </summary>
+    /// <param name="fullyQualifiedPropertyName">The fully qualified property name.</param>
+    /// <returns><see langword="true"/> where an error exists for the specified property; otherwise, <see langword="false"/>.</returns>
+    public readonly bool HasError(string fullyQualifiedPropertyName) => _owner.HasError(fullyQualifiedPropertyName);
+
+    /// <summary>
+    /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified <paramref name="format"/> and additional <paramref name="values"/> to be included in the text.
+    /// </summary>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>The <see cref="MessageItem"/>.</returns>
+    /// <remarks>The property friendly text and value are automatically prepended to the <paramref name="values"/> as the first two arguments where the <paramref name="format"/> does not have already have <see cref="LText.HasArgs"/>.</remarks>
+    public readonly MessageItem AddError(LText format, params object?[] values) => _owner.AddError<TProperty>(_metadata, Text, ValueFormatter, JsonName, format, values);
+
+    /// <inheritdoc/>
+    public readonly string CreateFullyQualifiedPropertyName(string name) => _owner.CreateFullyQualifiedPropertyName(name);
+
+    /// <inheritdoc/>
+    public readonly string CreateFullyQualifiedJsonPropertyName(string jsonName) => _owner.CreateFullyQualifiedJsonPropertyName(jsonName);
+
+    /// <summary>
+    /// Creates a new <see cref="ValidationArgs"/> from the <see cref="PropertyContext{TEntity, TProperty}"/>.
+    /// </summary>
+    /// <param name="useParentQualifiedNames">Indicates whether to alternatively use the qualified names from the parent <see cref="ValidationContext{TEntity}"/>.</param>
+    /// <returns>The <see cref="ValidationArgs"/>.</returns>
+    public readonly ValidationArgs CreateValidationArgs(bool useParentQualifiedNames = false) => new()
+    {
+        FullyQualifiedEntityName = useParentQualifiedNames ? _owner.FullyQualifiedEntityName : FullyQualifiedPropertyName,
+        FullyQualifiedJsonEntityName = useParentQualifiedNames ? _owner.FullyQualifiedJsonEntityName : FullyQualifiedJsonPropertyName,
+        UseJsonNames = _owner.UseJsonNames,
+        JsonSerializerOptions = _owner.JsonSerializerOptions,
+        ServiceProvider = _owner.ServiceProvider,
+        Parameters = _owner.Parameters
+    };
+
+    /// <summary>
+    /// Merges a validation result into this.
+    /// </summary>
+    /// <param name="validationResult">The <see cref="IValidationResult"/> to merge.</param>
+    internal readonly void MergeResult(IValidationResult validationResult) => _owner.MergeResult(validationResult);
+
+    /// <summary>
+    /// Formats the property value as a <see cref="LText"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <returns>The <see cref="LText"/> representation.</returns>
+    /// <remarks>Leverages the <see cref="IRootPropertyRule{TEntity}.SetFormat(string?, IFormatProvider?, char?)"/> configuration.</remarks>
+    public readonly LText FormatValue(TProperty? value) => ValueFormatter.ToLText(value);
+
+    /// <summary>
+    /// Indicates whether the originating property type is <see cref="Nullable{T}"/>.
+    /// </summary>
+    public readonly bool IsValueNullable => _root.IsValueNullable;
+
+    /// <summary>
+    /// Gets the originating property <see cref="Nullable{T}.Value"/> or <see langword="default"/> (where <see cref="IsValueNullable"/>).
+    /// </summary>
+    /// <typeparam name="T">The property <see cref="Nullable{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The originating property <see cref="Nullable{T}.Value"/> or <see langword="default"/>.</returns>
+    public readonly T GetNullableValueOrDefault<T>() => _root.GetNullableValueOrDefault<T>(Entity);
+
+    /// <summary>
+    /// Indicates whether the originating property <see cref="Nullable{T}.Value"/> is <see langword="default"/> (where <see cref="IsValueNullable"/>).
+    /// </summary>
+    /// <returns><see langword="true"/> where <see langword="default"/>; otherwise, <see langword="false"/>.</returns>
+    public readonly bool IsNullableValueDefault() => _root.IsNullableValueDefault(Entity);
+
+    /// <inheritdoc/>
+    /// <remarks>An <see cref="InvalidOperationException"/> will be thrown where the underlying property is read-only.</remarks>
+    public void Override(TProperty value)
+    {
+        if (_metadata.IsReadOnly)
+            throw new InvalidOperationException($"The property '{Name}' is read-only and cannot be overridden.");
+
+        // Override the value on the actual entity.
+        _metadata.SetValue(Entity, value);
+
+        // Update the context to reflect the new value.
+        Value = value;
+        IsValueNull = value is null;
+    }
+
+    /// <summary>
+    /// Gets the <i>last</i> dictionary key from the validation stack.
+    /// </summary>
+    /// <typeparam name="TKey">The dictionary key <see cref="Type"/>.</typeparam>
+    /// <returns>The dictionary key.</returns>
+    /// <remarks>This is typically used where the property being validated is within a dictionary and the key is required as part of the validation. The dictionary key is added to the context parameters
+    /// by the <see cref="CoreEx.Validation.Rules.DictionaryRule{TEntity, TProperty, TKey, TValue}"/>.
+    /// <para>A <see cref="KeyNotFoundException"/> will be thrown where the context does not contain a dictionary key or it is not of type <typeparamref name="TKey"/>.</para></remarks>
+    /// <exception cref="KeyNotFoundException"/>
+    public readonly TKey GetDictionaryKey<TKey>() where TKey : notnull
+    {
+        if (Parameters?.TryGetValue("__dictionaryKey", out var obj) == true && obj is TKey typedKey)
+            return typedKey;
+
+        throw new KeyNotFoundException("The property context does not contain a dictionary key or was not the specified type.");
+    }
+
+    /// <summary>
+    /// Gets the <i>last</i> dictionary key from the validation stack where available (without exception where not found or of incorrect type).
+    /// </summary>
+    /// <returns>The dictionary key where available; otherwise, <see langword="null"/>.</returns>
+    internal readonly object? GetDictionaryKeySafe() => Parameters.TryGetValue(_dictionaryKeyParameterName, out var obj) ? obj : null;
+
+    /// <summary>
+    /// Sets the <i>last</i> dictionary key within the validation stack.
+    /// </summary>
+    /// <param name="key">The dictionary key.</param>
+    internal readonly void SetDictionaryKey(object? key)
+    {
+        if (key is null)
+            _owner.Parameters.Remove(_dictionaryKeyParameterName);
+        else
+            _owner.Parameters[_dictionaryKeyParameterName] = key;
+    }
+
+    /// <summary>
+    /// Gets the <i>last</i> collection index from the validation stack.
+    /// </summary>
+    /// <returns>The collection index.</returns>
+    /// <remarks>This is typically used where the property being validated is within a collection and the index is required as part of the validation. The collection index is added to the context parameters
+    /// by the <see cref="CoreEx.Validation.Rules.CollectionRule{TEntity, TProperty, TItem}"/>.
+    /// <para>An <see cref="IndexOutOfRangeException"/> will be thrown where the context does not contain a collection index or it is not of type <see cref="int"/>.</para></remarks>
+    /// <exception cref="IndexOutOfRangeException"/>
+    public readonly int GetCollectionIndex()
+    {
+        if (Parameters?.TryGetValue(_collectionIndexParameterName, out var obj) == true && obj is int typedIndex)
+            return typedIndex;
+
+        throw new IndexOutOfRangeException("The property context does not contain a collection index or was not the specified type.");
+    }
+
+    /// <summary>
+    /// Gets the <i>last</i> collection index from the validation stack where available (without exception where not found or of incorrect type).
+    /// </summary>
+    /// <returns>The collection index.</returns>
+    internal readonly int? GetCollectionIndexSafe() => Parameters.TryGetValue(_collectionIndexParameterName, out var obj) && obj is int typedIndex ? typedIndex : null;
+
+    /// <summary>
+    /// Sets the <i>last</i> collection index within the validation stack.
+    /// </summary>
+    /// <param name="index">The collection index.</param>
+    internal readonly void SetCollectionIndex(int? index)
+    {
+        if (index is null)
+            _owner.Parameters.Remove(_collectionIndexParameterName);
+        else
+            _owner.Parameters[_collectionIndexParameterName] = index;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/PropertyRule.cs b/src/CoreEx.Validation/PropertyRule.cs
deleted file mode 100644
index 25e3f191..00000000
--- a/src/CoreEx.Validation/PropertyRule.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Localization;
-using CoreEx.Validation.Clauses;
-using CoreEx.Validation.Rules;
-using System;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents a validation rule for an entity property.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class PropertyRule<TEntity, TProperty> : PropertyRuleBase<TEntity, TProperty>, IEntityRule<TEntity>, IValueRule<TEntity, TProperty> where TEntity : class
-    {
-        private readonly PropertyExpression<TEntity, TProperty> _property;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="LambdaExpression"/> to reference the entity property.</param>
-        public PropertyRule(Expression<Func<TEntity, TProperty>> propertyExpression) : this(PropertyExpression.Create(propertyExpression)) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        private PropertyRule(PropertyExpression<TEntity, TProperty> propertyExpression) : base(propertyExpression.Name, propertyExpression.Text, propertyExpression.JsonName) => _property = propertyExpression;
-
-        /// <inheritdoc/>
-        public async Task ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken = default)
-        {
-            if (context.ThrowIfNull(nameof(context)).Value == null)
-                return;
-
-            // Where validating a specific property then make sure the names match.
-            if (context.SelectedPropertyName != null && context.SelectedPropertyName != Name)
-                return;
-
-            // Ensure that the property does not already have an error.
-            if (context.HasError(_property))
-                return;
-
-            // Get the property value and create the property context.
-            var value = _property.GetValue(context.Value);
-            var ctx = new PropertyContext<TEntity, TProperty>(context, value, this.Name, this.JsonName, this.Text);
-
-            // Run the rules.
-            await InvokeAsync(ctx, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Adds a rule (<see cref="IValueRule{TEntity, TProperty}"/>) to the property.
-        /// </summary>
-        /// <param name="rule">The <see cref="IValueRule{TEntity, TProperty}"/>.</param>
-        /// <returns>The <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        public new PropertyRule<TEntity, TProperty> AddRule(IValueRule<TEntity, TProperty> rule)
-        {
-            base.AddRule(rule);
-            return this;
-        }
-
-        /// <summary>
-        /// Gets or sets the error message format text (overrides the default).
-        /// </summary>
-        LText? IValueRule<TEntity, TProperty>.ErrorText { get => throw new NotSupportedException("ErrorText should not bet set directly on a PropertyRule."); set => throw new NotSupportedException("ErrorText should not bet set directly on a PropertyRule."); }
-
-        /// <inheritdoc/>
-        void IValueRule<TEntity, TProperty>.AddClause(IPropertyRuleClause<TEntity> clause) => AddClause(clause);
-
-        /// <inheritdoc/>
-        bool IValueRule<TEntity, TProperty>.Check(IPropertyContext context) => throw new NotSupportedException("A property value clauses check should not occur directly on a PropertyRule.");
-
-        /// <inheritdoc/>
-        Task IValueRule<TEntity, TProperty>.ValidateAsync(IPropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken) => throw new NotSupportedException("A property value validation should not occur directly on a PropertyRule.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/PropertyRuleBase.cs b/src/CoreEx.Validation/PropertyRuleBase.cs
deleted file mode 100644
index cc267f71..00000000
--- a/src/CoreEx.Validation/PropertyRuleBase.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using CoreEx.Validation.Clauses;
-using CoreEx.Validation.Rules;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents a base validation rule for an entity property.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public abstract class PropertyRuleBase<TEntity, TProperty> : IPropertyRule<TEntity, TProperty> where TEntity : class
-    {
-        private readonly List<IValueRule<TEntity, TProperty>> _rules = [];
-        private readonly List<IPropertyRuleClause<TEntity>> _clauses = [];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyRuleBase{TEntity, TProperty}"/> class.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as <see cref="Text.SentenceCase.ToSentenceCase(string)"/>).</param>
-        /// <param name="jsonName">The JSON property name (defaults to <paramref name="name"/>).</param>
-        protected PropertyRuleBase(string name, LText? text = null, string? jsonName = null)
-        {
-            Name = name.ThrowIfNullOrEmpty(nameof(name));
-            Text = text ?? Name.ToSentenceCase()!;
-            JsonName = string.IsNullOrEmpty(jsonName) ? Name : jsonName;
-        }
-
-        /// <inheritdoc/>
-        public string Name { get; internal set; }
-
-        /// <inheritdoc/>
-        public string JsonName { get; internal set; }
-
-        /// <inheritdoc/>
-        public virtual LText Text { get; set; }
-
-        /// <inheritdoc/>
-        public virtual LText? ErrorText { get; set; }
-
-        /// <inheritdoc/>
-        IPropertyRule<TEntity, TProperty> IPropertyRule<TEntity, TProperty>.WithMessage(LText errorText)
-        {
-            if (_rules.Count == 0)
-                ErrorText = errorText;
-            else
-                _rules.Last().ErrorText = errorText;
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        IPropertyRule<TEntity, TProperty> IPropertyRule<TEntity, TProperty>.AddRule(IValueRule<TEntity, TProperty> rule) => AddRule(rule);
-
-        /// <summary>
-        /// Adds a rule (<see cref="IValueRule{TEntity, TProperty}"/>) to the property.
-        /// </summary>
-        /// <param name="rule">The <see cref="IValueRule{TEntity, TProperty}"/>.</param>
-        /// <returns>The <see cref="PropertyRuleBase{TEntity, TProperty}"/>.</returns>
-        public PropertyRuleBase<TEntity, TProperty> AddRule(IValueRule<TEntity, TProperty> rule)
-        {
-            rule.ThrowIfNull(nameof(rule)).ErrorText ??= ErrorText;  // Override the rule's error text where not already overridden.
-
-            _rules.Add(rule);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a clause (<see cref="IPropertyRuleClause{TEntity, TProperty}"/>) to the last rule added.
-        /// </summary>
-        /// <param name="clause">The <see cref="IPropertyRuleClause{TEntity, TProperty}"/>.</param>
-        public void AddClause(IPropertyRuleClause<TEntity> clause)
-        {
-            if (clause == null)
-                return;
-
-            if (_rules.Count == 0)
-                _clauses.Add(clause);
-            else
-                _rules.Last().AddClause(clause);
-        }
-
-        /// <summary>
-        /// Runs the configured clauses and rules.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected async Task InvokeAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
-        {
-            context.ThrowIfNull(nameof(context));
-
-            // Check all "this" clauses.
-            foreach (var clause in _clauses)
-            {
-                if (!clause.Check(context))
-                    return;
-            }
-
-            // Check and execute all rules/clauses within the rules stack.
-            foreach (var rule in _rules)
-            {
-                if (rule.Check(context))
-                    await rule.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
-
-                // Stop validating after an error.
-                if (context.HasError || context.Parent.FailureResult.HasValue)
-                    break;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/README.md b/src/CoreEx.Validation/README.md
index 5e1a1cdb..9f6858f1 100644
--- a/src/CoreEx.Validation/README.md
+++ b/src/CoreEx.Validation/README.md
@@ -1,445 +1,104 @@
-# CoreEx
-
-The `CoreEx.Validation` namespace provides an alternative data validation capability. It provides a familiar fluent-style method-chaining experience to other frameworks, taking a slightly different approach to validation configuration, and arguably supports more complex validations.  
-
-<br/>
-
-## Composition
-
-At its core a [`Validator`](./Validator.cs) can contain one or more **Rules** (provides a specific value validation), which can be further conditionally controlled by zero or more **Clauses** (provides a means to check whether a validation should occur).
-
-<br/>
-
-### Rules
-
-All rules must inherit from	[`PropertyRuleBase`](./PropertyRuleBase.cs) which enables the following key capabilities:
-
-Capability | Description
--|-
-`Name` | Gets the underlying property/value name.
-`Text` | Gets/sets the friendly text name used in validation messages.
-`WithMessage` | Sets (overrides) the error message for the rule.
-
-The following represent access to clauses/conditions (support zero or more) to determine whether the `Rule` should be invoked:
-
-Method | Description
--|-
-`DependsOn` | Adds a [`DependsOnClause`](./Clauses/DependsOnClause.cs) that ensures that another specified property of the entity must have a non-default value and not have a corresponding validation error. 
-`When` | Adds a [`WhenClause`](./Clauses/WhenClause.cs) where the condition must be `true`.
-`WhenOperation` | Adds a `WhenClause` that ensures that the `ExecutionContext.Current.OperationType` is equal to the specified value.
-`WhenNotOperation` | Adds a `WhenClause` that ensures that the `ExecutionContext.Current.OperationType` is _not_ equal to the specified value.
-`WhenValue` | Adds a `WhenClause` where the condition for the corresponding value must be `true`.
-`WhenHasValue` | Adds a `WhenClause` where the corresponding value must not be `default`.
-
-The following represent the available rules:
-
-Rule | Description 
--|-
-`BetweenRule` | Provides a comparision validation between a specified from and to value.
-`CollectionRule` | Provides collection (`IEnumerable`) validation including `MinCount`, `MaxCount`, per item validation `CollectionRuleItem` and duplicate checking. 
-`CommonRule` | Provides for integrating a common validation against a specified property.
-`ComparePropertyRule` | Provides a comparision validation against another property within the same entity; also confirms other property has no errors prior to comparison.
-`CompareValueRule` | Provides a comparision validation against a specified value. 
-`CompareValuesRule` | Provides a comparision validation against one or more specified values. 
-`CustomRule` | Provides a custom validation against a specified property.
-`DecimalRule` | Represents a numeric rule that validates `DecimalPlaces` (fractional-part length) and `MaxDigits` (being the sum of the integer-part and fractional-part lengths). 
-`DictionaryRule` | Provides dictionary (`IDictionary`) validation including `MinCount`, `MaxCount` and per item validation `DictionaryRuleItem`. 
-`DuplicateRule` | Provides validation where the rule predicate must return `false` to not be considered a duplicate. 
-`EmailRule` | Provides e-mail validation.
-`EntityRule` | Provides entity validation.
-`EnumRule` | Provides [`Enum`](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/builtin-types/enum) validation to ensure that the value has been defined.
-`EnumValueRule` | Provides `string` validation against an [`Enum`](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/builtin-types/enum) value.
-`ExistsRule` | Provides validation where the rule predicate must return `true` or a value to verify it exists.
-`ImmutableRule` | Provides validation where the rule predicate must return `true` to be considered valid (has not been modified).
-`InteropRule` | Provides interoperability integration with other validation frameworks.
-`MandatoryRule` | Provides mandatory validation; determined as mandatory when it contains its default value.
-`MustRule` | Provides validation where the rule predicate must return `true` to be considered valid.
-`NoneRule` | Provides a rule to ensure value is its default value (opposite of `MandatoryRule`).
-`NotNullRule` | Provides validation where the value must not be `null`.
-`NumericRule` | Represents a numeric rule to validate precision, scale and whether negatives are allowed.
-`NullRule` | Provides validation where the value must be `null`.
-`OverrideRule` | Provides the ability to override the property value.
-`ReferenceDataCodeRule` | Provides validation for a `ReferenceDataBase.Code`; validates that it exists and that the corresponding `ReferenceDataBase.IsValid`.
-`ReferenceDataRule` | Provides validation for a `ReferenceDataBase`; validates that the `ReferenceDataBase.IsValid`.
-`ReferenceDataSidListRule` | Provides validation for a `ReferenceDataSidListBase` including `MinCount`, `MaxCount`, per item `ReferenceDataBase.IsValid` and whether to `AllowDuplicates`.
-`StringRule` | Provides `string` validation including `MinLength`, `MaxLength` and `Regex`.
-`WildcardRule` | Provides `string` `Wildcard` validation.
-
-<br/>
-
-### Clauses
-
-The following represent the available clauses:
-
-Clause | Description 
--|-
-`DependsOnClause` | Represents a depends on test clause; in that another specified property of the entity must have a non-default value to continue.
-`WhenClause` | Represents a when test clause; in that the condition must be `true` to continue.
-
-<br/>
-
-### Extension Methods
-
-The **rules** are generally not instantiated directly, but accessed via pre-defined extension methods to provide a more simplified, natural, experience using fluent-style (method-chaining) approach to development.
-
-The following represent the available extension methods:
-
-Extension method | Description | Underlying rule
--|-|-
-`AreValid()` | Adds a *reference data list* validation. | `ReferenceDataSidListRule`
-`Between()` | Adds a *between comparision* validation. | `BetweenRule`
-`Collection()` | Adds a *collection* validation. | `CollectionRule`
-`CompareProperty()` | Adds a *property comparison* validation. | `ComparePropertyRule`
-`CompareValue()` | Adds a *value comparison* validation. | `CompareValueRule`
-`CompareValues()` | Adds a *values comparison* validation. | `CompareValuesRule`
-`Currency()` | Adds a *currency* validation for a `decimal` using a `NumberFormatInfo`. | `DecimalRule`
-`Custom()` | Adds a *custom* validation. | `CustomRule`
-`Default()` | Adds a property value override where the current value is the default for the `Type`. | `OverrideRule`
-`Dictionary()` | Adds a *dictionary* validation. | `DictionaryRule`
-`Duplicate()` | Adds a *duplicate* validation. | `DuplicateRule`
-`Empty()` | Adds a *none* validation. | `NoneRule`
-`Email()` | Adds an *e-mail* validation. | `EmailRule`
-`EmailAddress()` | Adds an *e-mail* validation. | `EmailRule`
-`Entity()` | Adds an *entity* validation. | `EntityValidationRule`
-`Entity().With<TValidator>()` | Adds an *entity* validation. | `EntityValidationRule`
-`EntityCollection()` | Adds an *entity collection* validation. | `EntityCollectionValidationRule`
-`Enum()` | Adds an *enum* validation for an `Enum` `Type`. | `EnumRule`
-`Enum().As<TEnum>()` | Adds an *enum* validation for a `string` `Type`. | `EnumValueRule`
-`Equal()` | Adds an *equal value comparison* validation. | `CompareValueRule`
-`ExclusiveBetween()` | Adds an exclusive *between comparision* validation. | `BetweenRule`
-`Exists()` | Adds an *exists* validation. | `ExistsRule`
-`GreaterThan()` | Adds a *greater than value comparison* validation. | `CompareValueRule`
-`GreaterThanOrEqualTo()` | Adds a *greater than or equal to value comparison* validation. | `CompareValueRule`
-`Immutable()` | Adds an *immutable* validation. | `ImmutableRule`
-`InclusiveBetween()` | Adds an inclusive *between comparision* validation. | `BetweenRule`
-`IsInEnum()` | Adds an *enum* validation for an `Enum` `Type`. | `EnumRule`
-`IsValid()` | Adds a *reference data* validation. | `ReferenceDataRule`
-`LessThan()` | Adds a *less than value comparison* validation. | `CompareValueRule`
-`LessThanOrEqualTo()` | Adds a *less than or equal to value comparison* validation. | `CompareValueRule`
-`Length()` | Adds a `string` exact length validation. | `StringRule`
-`Mandatory()` | Adds a *mandatory* validation. | `MandatoryRule`
-`Matches()` | Adds a `Regex` validation. | `StringRule`
-`MaximumLength()` | Adds a `string` maximum length validation. | `StringRule`
-`MaximumCount()` | Adds an `ICollection` maximum count validation. | `CollectionRule`
-`MinimumLength()` | Adds a `string` minimum length validation. | `StringRule`
-`MinimumCount()` | Adds an `ICollection` minimum count validation. | `CollectionRule`
-`Must()` | Adds a *must* validation. | `MustRule`
-`NotEmpty()` | Adds a *mandatory* validation. | `MandatoryRule`
-`NotEqual()` | Adds a *not equal value comparison* validation. | `CompareValueRule`
-`NotNull()` | Adds a not *null* validation. | `NotNullRule`
-`None()` | Adds a *none* validation. | `NoneRule`
-`Numeric()` | Adds a *numeric* validation. | `NumericRule` or `DecimalRule`
-`Null()` | Adds a *null* validation. | `NullRule`
-`Override` | Adds a property value override. | `OverrideRule`
-`RefData().As<TRef>()` | Adds a *reference data* validation for a `string` `Type`. | `ReferenceDataCodeRule`
-`RefDataCode` | Adds a *reference data code* validation. | `ReferenceDataCodeRule`
-`String()` | Adds a `string` validation. | `StringRule`
-`Wildcard()` | Adds a `string` *wildcard* validation. | `WildcardRule`
-
-Additional extension methods included are as follows:
-
-Extension method | Description
--|-
-`Text()` | Updates the rule friendly name text used in validation messages.
-`Common()` | Provides for integrating a common validation against a specified property.
-`Validate()` | Enables (sets up) validation for a value.
-
-<br/>
-
-### Error messages
-
-All error messages are managed as an embedded resources accessible via the `ValidatorStrings` class; as follows:
-
-Property | Format string
--|-
-`AllowNegativesFormat` | {0} must not be negative.
-`BetweenInclusiveFormat` | {0} must be between {2} and {3}.
-`BetweenExclusiveFormat` | {0} must be between {2} and {3} (exclusive).
-`CollectionNullItemFormat` | {0} contains one or more items that are not specified.
-`CompareEqualFormat` | {0} must be equal to {2}.
-`CompareGreaterThanEqualFormat` | {0} must be greater than or equal to {2}.
-`CompareGreaterThanFormat` | {0} must be greater than {2}.
-`CompareLessThanEqualFormat` | {0} must be less than or equal to {2}.
-`CompareLessThanFormat` | {0} must be less than {2}.
-`CompareNotEqualFormat` | {0} must not be equal to {2}.
-`DecimalPlacesFormat` | {0} exceeds the maximum specified number of decimal places ({2}).
-`DependsOnFormat` | {0} is required where {2} has a value.
-`DictionaryNullKeyFormat` | {0} contains one or more keys that are not specified.
-`DictionaryNullValueFormat` | {0} contains one or more values that are not specified.
-`DuplicateFormat` | {0} already exists and would result in a duplicate.
-`DuplicateValue2Format` | {0} contains duplicates; {2} value specified more than once.
-`DuplicateValueFormat` | {0} contains duplicates; {2} value '{3}' specified more than once.
-`ExactLengthFormat` | {0} must be exactly {2} characters in length.
-`ExistsFormat` | {0} is not found; a valid value is required.
-`ImmutableFormat` | {0} is not allowed to change; please reset value.
-`InvalidFormat` | {0} is invalid.
-`MandatoryFormat` | {0} is required.
-`MaxCountFormat` | {0} must not exceed {2} item(s).
-`MaxDigitsFormat` | {0} must not exceed {2} digits in total.
-`MaxLengthFormat` | {0} must not exceed {2} characters in length.
-`MaxValueFormat` | {0} is greater than the maximum allowed value of {2}.
-`MinCountFormat` | {0} must have at least {2} item(s).
-`MinLengthFormat` | {0} must be at least {2} characters in length.
-`MinValueFormat` | {0} is less than the minimum allowed value of {2}.
-`MustFormat` | {0} is invalid.
-`RegexFormat` | {0} is invalid.
-`WildcardFormat` | {0} contains invalid or non-supported wildcard selection.
-
-The validation framework passes the friendly text name as `{0}`, and the validating value as `{1}` for inclusion in the final message output. Higher numbered format strings are applicable to the specific validator rule consuming.
-
-<br/>
-
-## Usage
-
-There are multiple means to leverage the validation framework.
-
-<br/>
-
-### Entity-based validator class
-
-The primary means for an entity-based validator is to inherit from the `Validator` class (or `AbstractValidator`). The instance should be instantiated once (and cached) where possible as the underlying property expressions can be a relatively expensive (performance) operation.
-
-Additionally, the `OnValidate` method can be overridden to add more complex and/or cross-property validations as required.
-
-Each property for the entity is configured using the `Property` method (or `RuleFor`) and a corresponding property expression. The property expression is advantageous as the friendly text name can be inferred (in order specified):
-- Use the `DisplayAttribute(Name="Product Code")` value; will be: "Product Code";
-- Use the property name `string CustomerNumber { get; set; }` formatted as Sentence Case; will be "Customer Number".
-- The resulting text from above is then passed through the text localization (`LText`) resource string replacement.
-
-An example is as follows:
-
-``` csharp
-public class PersonValidator : Validator<Person>
-{
-    public PersonValidator()
-    {
-        Property(x => x.Name).Mandatory().String(maxLength: 50);
-        Property(x => x.Birthday).CompareValue(CompareOperator.LessThanEqual, DateTime.Now, "today");
-    }
-
-    protected override Task<Result> OnValidateAsync(ValidationContext<Test> context)
-    {
-        // Check that Amount property has not had an error already; then validate and error.
-        context.Check(x = x.Amount, (val) => val <= 100, "{0} must be greater than 100.");
-
-        return Result.SuccessTask;
-    }
-}
-
-var person = new Person { Name = "Freddie", Birthday = new DateTime(1946, 09, 05), Amount = 150 };
-
-// Validate the value.
-var result = await new PersonValidator().ValidateAsync(person);
-```
-
-<br/>
-
-### Entity-based inline validator
-
-The secondary means for an entity-based validator is to define and execute inline. The `HasProperty()` is used to create a property (or `HasRuleFor`), with a corresponding action to enable validation configuration.
-
-An example is as follows:
-
-``` csharp
-var person = new Person { Name = "Freddie", Birthday = new DateTime(1946, 09, 05);
-
-// Create an entity-based validator on the fly.
-var result = await Validator.Create<Test>()
-    .HasProperty(x => x.Name, p => p.Mandatory().String(maxLength: 50))
-    .HasProperty(x => x.Birthdar, p => p.CompareValue(CompareOperator.LessThanEqual, DateTime.Now, "today"))
-    .ValidateAsync(person);
-```
-
-<br/>
-
-
-### Value-based validator
-
-Values, both entity and non-entity, can be validated directly. Examples are as follows:
-
-``` csharp
-var person = new Person { Name = "Freddie", Birthday = new DateTime(1946, 09, 05);
-
-// Validate an entity value; being the Person class.
-var pv = new PersonValidator();
-await person.Validate().Entity(pv).RunAsync();
-
-// Validate a value (e.g. a string, int, DateTime, etc.) without an entity-based validator.
-await person.Name.Validate().Mandatory().String(maxLength: 10).RunAsync(throwOnError: true);
-```
-
-<br/>
-
-### Validation chaining
-
-As demonstrated in the prior examples the validation supports fluent-style (method-chaining) for the underlying **rules** and **clauses**.
-
-When the validation is executed the **rules** will be invoked in the order in which they are specified, and conditionally invoked where succeeding **clauses** (optional) are specified for a rule (to the right of). A validation may have zero or more clauses before the first rule, then a rule with zero or more succeeding clauses, followed by zero or more rules, etc.
-
-The following is a property that will only perform any succeeding rules once the `DependsOn` clause results in `true`; otherwise, no rules will be executed. Where `true` then the `CompareProperty` will be executed:
-
-``` csharp
-Property(x => x.DateTo).DependsOn(x => x.DateFrom).CompareProperty(CompareOperator.GreaterThanEqual, x => x.DateFrom);
-```
-
-The following is a property that will always execute the `Mandatory` rule, and only the `CompareProperty` rule where the `DependsOn` clause results in `true`:
-
-``` csharp
-Property(x => x.DateTo).Mandatory.CompareProperty(CompareOperator.GreaterThanEqual, x => x.DateFrom).DependsOn(x => x.DateFrom);
-```
-
-<br/>
-
-### Common validations
-
-To support reusablility of property validations a `CommonValidator` is used to enable. This allows for the validation logic to be defined once, and reused (shared) across multiple validations. This validator also enables validation to be configured for non-entities (e.g. intrinisic types).
-
-An example is as follows:
-
-``` csharp
-var cv = CommonValidator<string> _cv = Validator.CreateCommon<string>(v => v.String(5).Must(x => x.Value != "XXXXX"));
-
-var v = Validator.Create<TestData>()
-    .HasProperty(x => x.Text, p => p.Mandatory().Common(cv));
-```
-
-<br/>
-
-### Examples
-
-The following represents a number of additional examples demonstrating property validation scenarios:
-
-``` csharp
-// The integer is mandatory, must be positive, and has a max value of 999, and must have a value greater of 10.
-Property(x => x.Integer).Mandatory().Numeric(allowNegatives: false, maxDigits: 3).CompareValue(CompareOperator.GreaterThan, 10);
-
-// The decimal should be treated as a positive currency with default decimal places (NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits).
-Property(x => x.Amount).Currency(allowNegatives: true);
-
-// The decimal must be positive, with a max value of 999.999, and max three decimal places (max digits includes decimal places).
-Property(x => x.Amount2).Numeric(allowNegatives: false, maxDigits: 6, decimalPlaces: 3);
-
-// The Date From must be greater than Now; with specified text "today" to include in error message.
-Property(x => x.DateFrom).CompareValue(CompareOperator.GreaterThan, DateTime.Now, "today");
-
-// The Date To must be greater than the Date From where the Date From (DependsOn) has a value 
-// (also DependsOn will not validate where the dependent field has previously failed).
-Property(x => x.DateTo).DependsOn(x => x.DateFrom).CompareProperty(CompareOperator.GreaterThanEqual, x => x.DateFrom);
-
-// When can be used to conditionalise a previous rule; so Name is mandatory only when the Integer value is 50; also, max length is 50.
-Property(x => x.Name).Mandatory().When(x => x.Integer == 50).String(maxLength: 50);
-
-// Must can used for more complex logic, as in the condition 'must' be true otherwise the value is considered invalid.
-Property(x => x.Amount).Must(x => x.Integer > 10);
-
-// The phone number will be validated against the defined regex. 
-Property(x => x.PhoneNo).String(new Regex(@"\+0\d{9}|\+0[1-9]\d{12}|0[1-9]\d{8}|00[1-9]\d{9}|00[1-9]\d{13}"));
-
-// The Gender (which is a Reference Data entity) is mandatory and must be considered valid.
-Property(x => x.Gender).Mandatory().IsValid();
-
-// Check the sub entity exists (mandatory) and is valid (using defined validator).
-Property(x => x.SubTest).Mandatory().Entity().With(test2Validator);
-
-// Check the sub entity collection (exists), has 1-4 items in the collection, and each is valid (using defined validator).
-Property(x => x.SubTesters).Mandatory().Collection(minCount: 1, maxCount: 4, item: CollectionRuleItem.Create<Test2>(test2Validator));
-```
-
-The following demonstrates the mixing of both entity-based options:
-
-``` csharp
-public class PersonValidator : Validator<Person>
-{
-    private static readonly Validator<Address> _addressValidator = Validator.Create<Address>()
-        .HasProperty(x => x.Street, p => p.Mandatory().String(50))
-        .HasProperty(x => x.City, p => p.Mandatory().String(50));
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PersonValidator"/>.
-    /// </summary>
-    public PersonValidator()
-    {
-        Property(x => x.FirstName).Mandatory().String(50);
-        Property(x => x.LastName).Mandatory().String(50);
-        Property(x => x.Gender).Mandatory().IsValid();
-        Property(x => x.Birthday).Mandatory().CompareValue(CompareOperator.LessThanEqual, () => DateTime.Now, "Today");
-        Property(x => x.Address).Entity().With(_addressValidator);
-    }
-}
-```
-
-<br/>
-
-## Advanced
-
-There are additional features that enable more advanced / complex validation scenarios.
-
-<br/>
-
-### Conditional rule set
-
-The `RuleSet` represents a conditional validation rule for an entity, in that it groups one or more **rules** together that only get invoked where a specified condition results in **true**.
-
-The following demonstrates `RuleSet` usage for an *Entity-based validator class*:
-
-``` csharp
-public class TestItemValidator : Validator<TestItem>
-{
-    public TestItemValidator()
-    {
-        RuleSet(x => x.Value.Code == "A", () => 
-        {
-            Property(x => x.Text).Mandatory().Must(x => x.Text == "A");
-        });
-
-        RuleSet(x => x.Value.Code == "B", () =>
-        {
-            Property(x => x.Text).Mandatory().Must(x => x.Text == "B");
-        });
-    }
-}
-```
-
-The following demonstrates `HasRuleSet` usage for an `Entity-based inline validator`:
-
-``` csharp
-var v = Validator.Create<TestItem>()
-    .HasRuleSet(x => x.Value.Code == "A", y =>
-    {
-        y.Property(x => x.Text).Mandatory().Must(x => x.Text == "A");
-    })
-    .HasRuleSet(x => x.Value.Code == "B", (y) =>
-    {
-        y.Property(x => x.Text).Mandatory().Must(x => x.Text == "B");
-    });
-```
-
-<br/>
-
-### Include/inherit validators
-
-Where entities leverage inheritence, having the corresponding validators include the base (parent) classes validations rules can be advantageous (versus codifying the rules multiple times). The `IncludeBase` method enables a base validator to be included within another validator's rule set.
-
-The following is an example of using the `IncludeBase` method:
-
-``` csharp
-var r = Validator.Create<TestData>()
-    .IncludeBase(testDataBaseValidator)
-    .HasProperty(x => x.CountB, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10))
-    .Validate(new TestData { CountB = 0 });
-```
-
-<br/>
-
-### Consolidating multiple validators
-
-The `MultiValidator` enables the validation of multiple values there is a need to consolidate the results into a single set of `Messages` (and/or `ValidationException`).
-
-An example is as follows:
-
-``` csharp
-var result = await MultiValidator.Create()
-    .Add(person.Validate(nameof(value)).Mandatory().Entity(personValidator))
-    .Add(other.Validate(nameof(other)).Mandatory().Entity(otherValidator))
-    .RunAsync();
-```
\ No newline at end of file
+# CoreEx.Validation
+
+> Provides a fluent, property-centric validation framework for .NET classes: composable rules, conditional clauses, strongly-typed error messages, and deep integration with the CoreEx execution and exception model.
+
+## Overview
+
+`CoreEx.Validation` fills the gap between primitive data-annotation validation and a fully featured domain validation library. The framework is built around the concept of a `Validator<TEntity>` that owns a set of `PropertyRule` chains — one chain per property. Each chain is declared fluently using `HasProperty`/`HasRuleFor`, and individual rules are appended to the chain with extension methods defined in `ValidationExtensions`.
+
+Every rule invoked on a property chain runs asynchronously and receives a `PropertyContext<TEntity, TProperty>` that carries the current entity, the resolved property value, the accumulated error list, and a reference to the owning `ValidationContext<TEntity>`. When a rule adds an error it does so through the context, which means all rules in the chain continue executing and all errors for all properties are collected before the framework decides to throw or return.
+
+Validation is initiated by calling `ValidateAsync` on a validator instance and inspecting the returned `IValidationContext<TEntity>`, or by calling `ValidateAndThrowAsync` which converts errors to a CoreEx `ValidationException` automatically.
+
+## Motivation
+
+- The standard .NET `DataAnnotations` model is attribute-only, non-composable, and cannot express cross-property rules or async checks cleanly.
+- FluentValidation is a popular alternative but requires a separate NuGet dependency and has a different abstraction model; CoreEx.Validation integrates tightly with `ExecutionContext`, `LText` localisation, `IValidatorEx`, and the CoreEx exception hierarchy.
+- Property rules and clauses are plain sealed classes; extension methods in `ValidationExtensions` are the only public API surface, making it trivial to discover and extend the rule set.
+- Common validators (`CommonValidator<TValue>`) allow validation logic to be extracted from a specific entity and reused across validators without duplication.
+- `RuleSet<TEntity>` groups multiple rules under a shared predicate, enabling scenario-specific validation blocks that only activate under defined conditions.
+
+## Key capabilities
+
+- ✅ **Fluent property-rule chains**: properties are declared with `HasProperty`/`HasRuleFor` and rules are appended via extension methods; the chain executes every rule in order, collecting all errors before reporting.
+- 📋 **Rich built-in rule set**: mandatory, string (length, regex), numeric, decimal/floating-point precision, between/range, comparison (value, property, values), enum, email, wildcard, null/none/empty, error, collection, dictionary, entity, common, reference data, and interop rules cover the vast majority of domain validation needs.
+- 🧩 **Conditional clauses**: `When`/`WhenValue`/`WhenHasValue` and `DependsOn` clauses short-circuit a rule when a condition is not met, enabling context-sensitive rules without branching in the rule body.
+- ⚡ **Fully async**: every rule and clause is `async`-capable; `PredicateAsync<TEntity, TProperty>` delegates allow awaiting external services within a clause.
+- 🔧 **Common and inline validators**: `CommonValidator<TValue>` encapsulates reusable validation logic; `InlineValidator<TValue>` is the compositional base used by both `CommonValidator` and `CommonRule`.
+- 📝 **Localised error messages**: every rule accepts an optional `LText` override; default messages are defined in `ValidatorStrings` and resolved through CoreEx localisation.
+- 🔍 **Context-aware property paths**: `PropertyContext` tracks fully qualified property names (both .NET and JSON) so error messages map precisely to the correct field in API responses.
+- 💬 **RuleSet grouping**: `RuleSet<TEntity>` collects a block of rules that only execute when a `Predicate<ValidationContext<TEntity>>` returns `true`.
+- 🧩 **Base-validator include**: `Validator<TEntity>`/`AbstractValidator<TEntity>` and the fluent `Include` method allow a base validator to be composed into a derived validator.
+- **Interop bridge**: `InteropRule` and the `.Interop()` extension forward validation to any `IValidator`/`IValidator<T>` (e.g. a FluentValidation validator) and merge errors into the CoreEx context.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`Validator`](./Validator.cs)** | Static factory and service-locator entry point: `Create<TEntity>()`, `Get<TValidator>()`, and `CreateCommon<TValue>()`. |
+| **[`Validator<TEntity>`](./ValidatorT.cs)** | Concrete entity validator; owns rule chains declared fluently via `HasProperty`/`HasRuleFor`; exposes `ValidateAsync` and `ValidateAndThrowAsync`. |
+| _[`AbstractValidator<TEntity>`](./AbstractValidator.cs)_ | Convenience base class for defining reusable named validators without generic constraints; derives from `Validator<TEntity>`. |
+| _[`AbstractValidator<TEntity, TParent>`](./AbstractValidatorT2.cs)_ | Convenience base class for validators with a parent-entity context; enables cross-entity validation. |
+| **[`CommonValidator<TValue>`](./CommonValidatorT.cs)** | Reusable value-level validator; wraps an `InlineValidator<TValue>`; used with the `Common`/`.Common()` rule extension to apply shared logic across properties. |
+| **[`ValidationContext<TEntity>`](./ValidationContext.cs)** | The live context for a single validation execution; accumulates `ValidationMessageItem` errors across all property chains; implements `IValidationContext<TEntity>`. |
+| **[`ValidationArgs`](./ValidationArgs.cs)** | Immutable options for a validation run: `UseJsonNames`, `FullyQualifiedEntityName`, `FullyQualifiedJsonEntityName`, `ServiceProvider` and `Parameters`. |
+| **[`PropertyContext<TEntity, TProperty>`](./PropertyContext.cs)** | Per-rule execution context; carries entity, value, property metadata, and the owning `ValidationContext`; passed to every rule and clause. |
+| **[`CompareOperator`](./CompareOperator.cs)** | Enum: `Equal`, `NotEqual`, `LessThan`, `LessThanOrEqualTo`, `GreaterThan`, `GreaterThanOrEqualTo`; used by the compare rules. |
+| **[`ValidationExtensions`](./ValidationExtensions.cs)** | Static partial class aggregating all rule and clause extension methods into a single discoverable surface. |
+
+## Clauses
+
+Clauses are conditional guards that run _before_ the rule body. When a clause returns `false` the rule is skipped and no error is added. Clauses are appended to any `IPropertyRule` using the extension methods listed below.
+
+| Clause Class | Description | Extensions |
+|---|---|---|
+| **[`DependsOnClause<TEntity, TProperty, TDependsOnProperty>`](./Clauses/DependsOnClause.cs)** | Skips the rule when a specified sibling property has its default value or has already reported a validation error. | `DependsOn(Expression<Func<TEntity, TDependsOnProperty>>)` |
+| **[`WhenClause<TEntity, TProperty>`](./Clauses/WhenClause.cs)** | Skips the rule when a boolean condition or async predicate evaluates to `false`. | `When(bool)`, `When(Func<bool>)`, `When(Func<PropertyContext,bool>)`, `When(PredicateAsync)`, `WhenValue(Predicate<TProperty>)`, `WhenHasValue()`, `WhenEntity(Predicate<TEntity>)` |
+
+## Rules
+
+Rules apply the actual validation logic to a property value. Each rule class is typically instantiated via the corresponding `ValidationExtensions` method(s). Rules inherit from `PropertyRuleBase<TEntity, TProperty>` and implement `OnValidateAsync`.
+
+| Rule Class | Description | Extensions |
+|---|---|---|
+| **[`BetweenRule<TEntity, TProperty>`](./Rules/BetweenRule.cs)** | Validates that a comparable value lies between two bounds (inclusive or exclusive). | `Between(min, max)`, `InclusiveBetween(min, max)`, `ExclusiveBetween(min, max)` |
+| **[`CollectionRule<TEntity, TProperty, TItem>`](./Rules/CollectionRule.cs)** | Validates an `IEnumerable<T>` collection: min/max count, duplicate detection (by Id, key, property, or equality), and optional per-item entity validation. | `Collection(with)`, `Collection(maxCount)`, `Collection(minCount, maxCount)`; `With` helpers: `WithDuplicateIdCheck()`, `WithDuplicateKeyCheck()`, `WithDuplicatePropertyCheck()`, `WithDuplicateCheck()` |
+| **[`CommonRule<TEntity, TProperty>`](./Rules/CommonRule.cs)** | Applies a `CommonValidator<TProperty>` (or `InlineValidator<TProperty>`) to a property, enabling shared rule logic to be reused across multiple properties or validators. | `Common(commonValidator)` |
+| **[`ComparePropertyRule<TEntity, TProperty, TCompareProperty>`](./Rules/ComparePropertyRule.cs)** | Compares the property value against another property on the same entity using a `CompareOperator`; skips if the target property already has an error. | `CompareProperty(op, expression)` |
+| **[`CompareValueRule<TEntity, TProperty>`](./Rules/CompareValueRule.cs)** | Compares the property value against a supplied constant or function value using a `CompareOperator`. | `CompareValue(op, value)`, `Equal(value)`, `NotEqual(value)`, `LessThan(value)`, `LessThanOrEqualTo(value)`, `GreaterThan(value)`, `GreaterThanOrEqualTo(value)` |
+| **[`CompareValuesRule<TEntity, TProperty>`](./Rules/CompareValuesRule.cs)** | Validates that the property value is equal to one of a supplied set of values; optionally replaces the value with the matched entry. | `CompareValues(values)`, `CompareValues(Func<context, values>)` |
+| **[`DecimalRule<TEntity>`](./Rules/DecimalRule.cs)** | Validates `decimal` precision and scale, and optional sign constraint. Also covers `IFloatingPoint<T>` via `PrecisionScale`. | `Decimal(precision, scale)`, `PrecisionScale(precision, scale)` |
+| **[`DictionaryRule<TEntity, TProperty, TKey, TValue>`](./Rules/DictionaryRule.cs)** | Validates an `IDictionary<TKey,TValue>`: min/max count and optional per-entry value validation. | `Dictionary(with)`, `Dictionary(maxCount)`, `Dictionary(minCount, maxCount)` |
+| **[`EmailRule<TEntity>`](./Rules/EmailRule.cs)** | Validates that a `string` is a valid e-mail address (via `MailAddress.TryCreate`) and optionally within a maximum length. | `Email()`, `Email(maxLength)` |
+| **[`EntityRule<TEntity, TProperty>`](./Rules/EntityRule.cs)** | Delegates validation of a complex child-entity property to a separate `IValidatorEx<TProperty>`; merges child errors into the parent context with prefixed property names. | `Entity(with)`, `Entity(validator)` |
+| **[`EnumRule<TEntity, TProperty>`](./Rules/EnumRule.cs)** | Validates that a `struct Enum` value is defined (or within an optional allowed set). | `Enum()`, `Enum(allowed[])` |
+| **[`EnumStringRule<TEntity>`](./Rules/EnumStringRule.cs)** | Validates that a `string` property can be parsed to a specified `Enum` type; configured via `EnumWith` fluent builder. | `Enum(Func<EnumWith, EnumWith>)` (string overload) |
+| **[`ErrorRule<TEntity, TProperty>`](./Rules/ErrorRule.cs)** | Always emits the supplied error text; intended for use with a `When`/`DependsOn` clause to guard its execution. | `Error(text)`, `Duplicate()`, `NotFound()`, `Invalid()`, `Immutable()` |
+| **[`InteropRule<TEntity, TProperty>`](./Rules/InteropRule.cs)** | Delegates validation to an external `IValidator`/`IValidator<T>` (e.g. a FluentValidation validator) and merges results into the CoreEx `ValidationContext`. | `Interop(getValidator)`, `Interop(validator)` |
+| **[`MandatoryRule<TEntity, TProperty>`](./Rules/MandatoryRule.cs)** | Validates that the value is not `null`, not the default value, and/or not empty (string/collection). | `Mandatory()`, `NotNull()`, `NotEmpty()` |
+| **[`NullNoneEmptyRule<TEntity, TProperty>`](./Rules/NullNoneEmptyRule.cs)** | Validates that the value _is_ `null`, default, or empty — the inverse of mandatory; configurable per mode. | `Null()`, `None()`, `Empty()` |
+| **[`NumericRule<TEntity, TProperty>`](./Rules/NumericRule.cs)** | Validates that a numeric value satisfies sign constraints (allows/disallows negatives). | `Numeric(allowNegatives)`, `Positive()` |
+| **[`ReferenceDataCodeCollectionRule<TEntity, TProperty>`](./Rules/ReferenceDataCodeCollectionRule.cs)** | Validates that an `IReferenceDataCodeCollection` contains no invalid or inactive items. | `ReferenceDataCodes(allowInactive)`, `AreValid(allowInactive)` |
+| **[`ReferenceDataCodeRule<TEntity>`](./Rules/ReferenceDataCodeRule.cs)** | Validates that a `string` property represents a valid reference data code, resolving through the orchestrator; configured via `ReferenceDataWith` fluent builder. | `ReferenceData(Func<ReferenceDataWith, ReferenceDataWith>)` (string overload) |
+| **[`ReferenceDataRule<TEntity, TProperty>`](./Rules/ReferenceDataRule.cs)** | Validates that an `IReferenceData` property is valid (and optionally active). | `ReferenceData(allowInactive)`, `IsValid(allowInactive)` |
+| **[`RuleSet<TEntity>`](./Rules/RuleSet.cs)** | Groups a block of `IRootPropertyRule` chains that only execute when a `Predicate<ValidationContext<TEntity>>` is `true`; wired into a validator via `RuleSet(predicate, configure)` on the fluent builder. | (used via `ValidatorBase<TEntity, TSelf>.RuleSet(predicate, configure)`) |
+| **[`StringRule<TEntity>`](./Rules/StringRule.cs)** | Validates string length (min/max), regex pattern matching, or an exact length. | `String(maxLength)`, `String(min, max, regex)`, `Matches(regex)`, `Length(exact)`, `MinimumLength()`, `MaximumLength()` |
+| **[`WildcardRule<TEntity>`](./Rules/WildcardRule.cs)** | Validates that a `string` conforms to a CoreEx `Wildcard` pattern. | `Wildcard()`, `Wildcard(wildcard)` |
+
+## Namespaces
+
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.Validation.Abstractions`** | Core interfaces, abstract base classes, and infrastructure types that underpin the validation framework: `IValidatorEx`, `ValidatorBase`, `InlineValidator`, `ValueValidator`, `IPropertyContext`, `IValidationContext`, and `ValidationMessageItem`. | [📖 README](./Abstractions/README.md) |
+| **`CoreEx.Validation.Clauses`** | Conditional clause implementations (`WhenClause`, `DependsOnClause`) and the `IPropertyClause` interface. | [📖 README](./Clauses/README.md) |
+| **`CoreEx.Validation.Rules`** | All built-in rule implementations (`MandatoryRule`, `StringRule`, `CollectionRule`, etc.) and the `IPropertyRule` / `PropertyRuleBase` infrastructure. | [📖 README](./Rules/README.md) |
+
+## Related namespaces
+
+- **[`CoreEx`](../CoreEx/README.md)** - Defines `ValidationException`, `MessageItem`, `IValidationResult`, `LText`, `ExecutionContext`, and `Wildcard` consumed throughout.
+- **[`CoreEx.RefData`](../CoreEx.RefData/README.md)** - Provides `IReferenceData` and `IReferenceDataCodeCollection` validated by `ReferenceDataRule`, `ReferenceDataCodeRule`, and `ReferenceDataCodeCollectionRule`.
+- **[`CoreEx.AspNetCore`](../CoreEx.AspNetCore/README.md)** - Converts `ValidationException` raised by `ValidateAndThrowAsync` into HTTP 400 responses with a structured error body.
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ReferenceDataValidation.cs b/src/CoreEx.Validation/ReferenceDataValidation.cs
deleted file mode 100644
index 164d5387..00000000
--- a/src/CoreEx.Validation/ReferenceDataValidation.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents the standard <see cref="IReferenceData"/> validation configuration settings.
-    /// </summary>
-    public static class ReferenceDataValidation
-    {
-        /// <summary>
-        /// Gets or sets the maximum length for the <see cref="IReferenceData.Code"/>.
-        /// </summary>
-        public static int MaxCodeLength { get; set; } = 30;
-
-        /// <summary>
-        /// Gets or sets the maximum length for the <see cref="IReferenceData.Text"/>.
-        /// </summary>
-        public static int MaxTextLength { get; set; } = 256;
-
-        /// <summary>
-        /// Gets or sets the maximum length for the <see cref="IReferenceData.Description"/>.
-        /// </summary>
-        public static int MaxDescriptionLength { get; set; } = 1000;
-
-        /// <summary>
-        /// Indicates whether the <see cref="IReferenceData.Description"/> is supported.
-        /// </summary>
-        public static bool SupportsDescription { get; set; } = false;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ReferenceDataValidator.cs b/src/CoreEx.Validation/ReferenceDataValidator.cs
deleted file mode 100644
index c6dec006..00000000
--- a/src/CoreEx.Validation/ReferenceDataValidator.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using CoreEx.Results;
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents the base <see cref="IReferenceData"/> validator.
-    /// </summary>
-    /// <typeparam name="TEntity">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    public class ReferenceDataValidator<TEntity> : Validator<TEntity> where TEntity : class, IReferenceData
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataValidator{TEntity}"/> class.
-        /// </summary>
-        public ReferenceDataValidator()
-        {
-            Property(x => x.Id).Mandatory().Custom(ValidateId);
-            Property(x => x.Code).Mandatory().String(ReferenceDataValidation.MaxCodeLength);
-            Property(x => x.Text).Mandatory().String(ReferenceDataValidation.MaxTextLength);
-            Property(x => x.Description).String(ReferenceDataValidation.MaxDescriptionLength).When(() => ReferenceDataValidation.SupportsDescription);
-            Property(x => x.Description).Empty().When(() => !ReferenceDataValidation.SupportsDescription);
-            Property(x => x.EndDate).When(x => x.StartDate.HasValue && x.EndDate.HasValue).CompareProperty(CompareOperator.GreaterThanEqual, x => x.StartDate);
-        }
-
-        /// <summary>
-        /// Perform more complex mandatory check based on the ReferenceData base ID type.
-        /// </summary>
-        private Result ValidateId(PropertyContext<TEntity, object?> context)
-        {
-            if (context.Value != null)
-            {
-                if (context.Value is int iid && iid != 0)
-                    return Result.Success;
-
-                if (context.Value is long lid && lid != 0)
-                    return Result.Success;
-
-                if (context.Value is Guid gid && gid != Guid.Empty)
-                    return Result.Success;
-            }
-
-            context.CreateErrorMessage(ValidatorStrings.MandatoryFormat);
-            return Result.Success;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ReferenceDataValidatorBase.cs b/src/CoreEx.Validation/ReferenceDataValidatorBase.cs
deleted file mode 100644
index 18a3ccb5..00000000
--- a/src/CoreEx.Validation/ReferenceDataValidatorBase.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents the base <see cref="IReferenceData"/> validator with a <see cref="Default"/> instance.
-    /// </summary>
-    /// <typeparam name="TEntity">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="ReferenceDataValidatorBase{TEntity, TValidator}"/> <see cref="Type"/>.</typeparam>
-    public abstract class ReferenceDataValidatorBase<TEntity, TSelf> : ReferenceDataValidator<TEntity>
-        where TEntity : class, IReferenceData
-        where TSelf : ReferenceDataValidatorBase<TEntity, TSelf>, new()
-    {
-        private static readonly TSelf _default = new();
-
-#pragma warning disable CA1000 // Do not declare static members on generic types; by-design, results in a consistent static defined default instance without the need to specify generic type to consume.
-        /// <summary>
-        /// Gets the current instance of the validator.
-        /// </summary>
-        public static TSelf Default
-#pragma warning restore CA1000 
-        {
-            get
-            {
-                if (_default == null)
-                    throw new InvalidOperationException("An instance of this Validator cannot be referenced as it is still being constructed; beware that you may have a circular reference within the constructor.");
-
-                return _default;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Resources.resx b/src/CoreEx.Validation/Resources.resx
deleted file mode 100644
index 838f1ba1..00000000
--- a/src/CoreEx.Validation/Resources.resx
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="CoreEx.Validation.AllowNegativesFormat" xml:space="preserve">
-    <value>{0} must not be negative.</value>
-  </data>
-  <data name="CoreEx.Validation.ArgumentFormat" xml:space="preserve">
-    <value>{0} is required.</value>
-  </data>
-  <data name="CoreEx.Validation.AuthenticationException" xml:space="preserve">
-    <value>An authentication error occured; the credentials you provided are not valid.</value>
-  </data>
-  <data name="CoreEx.Validation.AuthorizationException" xml:space="preserve">
-    <value>An authorization error occurred; you are not permitted to perform this action.</value>
-  </data>
-  <data name="CoreEx.Validation.BetweenExclusiveFormat" xml:space="preserve">
-    <value>{0} must be between {2} and {3} (exclusive).</value>
-  </data>
-  <data name="CoreEx.Validation.BetweenInclusiveFormat" xml:space="preserve">
-    <value>{0} must be between {2} and {3}.</value>
-  </data>
-  <data name="CoreEx.Validation.BusinessException" xml:space="preserve">
-    <value>A business error occurred.</value>
-  </data>
-  <data name="CoreEx.Validation.CollectionNullItemFormat" xml:space="preserve">
-    <value>{0} contains one or more items that are not specified.</value>
-  </data>
-  <data name="CoreEx.Validation.CompareEqualFormat" xml:space="preserve">
-    <value>{0} must be equal to {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.CompareGreaterThanEqualFormat" xml:space="preserve">
-    <value>{0} must be greater than or equal to {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.CompareGreaterThanFormat" xml:space="preserve">
-    <value>{0} must be greater than {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.CompareLessThanEqualFormat" xml:space="preserve">
-    <value>{0} must be less than or equal to {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.CompareLessThanFormat" xml:space="preserve">
-    <value>{0} must be less than {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.CompareNotEqualFormat" xml:space="preserve">
-    <value>{0} must not be equal to {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.ConcurrencyException" xml:space="preserve">
-    <value>A concurrency error occurred; please refresh the data and try again.</value>
-  </data>
-  <data name="CoreEx.Validation.ConflictException" xml:space="preserve">
-    <value>A data conflict occurred.</value>
-  </data>
-  <data name="CoreEx.Validation.DecimalPlacesFormat" xml:space="preserve">
-    <value>{0} exceeds the maximum specified number of decimal places ({2}).</value>
-  </data>
-  <data name="CoreEx.Validation.DependsOnFormat" xml:space="preserve">
-    <value>{0} is required where {2} has a value.</value>
-  </data>
-  <data name="CoreEx.Validation.DictionaryNullKeyFormat" xml:space="preserve">
-    <value>{0} contains one or more keys that are not specified.</value>
-  </data>
-  <data name="CoreEx.Validation.DictionaryNullValueFormat" xml:space="preserve">
-    <value>{0} contains one or more values that are not specified.</value>
-  </data>
-  <data name="CoreEx.Validation.DuplicateException" xml:space="preserve">
-    <value>A duplicate error occurred.</value>
-  </data>
-  <data name="CoreEx.Validation.DuplicateFormat" xml:space="preserve">
-    <value>{0} already exists and would result in a duplicate.</value>
-  </data>
-  <data name="CoreEx.Validation.DuplicateValue2Format" xml:space="preserve">
-    <value>{0} contains duplicates; {2} specified more than once.</value>
-  </data>
-  <data name="CoreEx.Validation.DuplicateValueFormat" xml:space="preserve">
-    <value>{0} contains duplicates; {2} '{3}' specified more than once.</value>
-  </data>
-  <data name="CoreEx.Validation.EmailFormat" xml:space="preserve">
-    <value>{0} is not a valid e-mail address.</value>
-  </data>
-  <data name="CoreEx.Validation.ExactLengthFormat" xml:space="preserve">
-    <value>{0} must be exactly {2} characters in length.</value>
-  </data>
-  <data name="CoreEx.Validation.ExistsFormat" xml:space="preserve">
-    <value>{0} is not found; a valid value is required.</value>
-  </data>
-  <data name="CoreEx.Validation.Identifier" xml:space="preserve">
-    <value>Identifier</value>
-  </data>
-  <data name="CoreEx.Validation.ImmutableFormat" xml:space="preserve">
-    <value>{0} is not allowed to change; please reset value.</value>
-  </data>
-  <data name="CoreEx.Validation.InvalidFormat" xml:space="preserve">
-    <value>{0} is invalid.</value>
-  </data>
-  <data name="CoreEx.Validation.InvalidItemsFormat" xml:space="preserve">
-    <value>{0} contains one or more invalid items.</value>
-  </data>
-  <data name="CoreEx.Validation.MandatoryFormat" xml:space="preserve">
-    <value>{0} is required.</value>
-  </data>
-  <data name="CoreEx.Validation.MaxCountFormat" xml:space="preserve">
-    <value>{0} must not exceed {2} item(s).</value>
-  </data>
-  <data name="CoreEx.Validation.MaxDigitsFormat" xml:space="preserve">
-    <value>{0} must not exceed {2} digits in total.</value>
-  </data>
-  <data name="CoreEx.Validation.MaxLengthFormat" xml:space="preserve">
-    <value>{0} must not exceed {2} characters in length.</value>
-  </data>
-  <data name="CoreEx.Validation.MaxValueFormat" xml:space="preserve">
-    <value>{0} is greater than the maximum allowed value of {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.MinCountFormat" xml:space="preserve">
-    <value>{0} must have at least {2} item(s).</value>
-  </data>
-  <data name="CoreEx.Validation.MinLengthFormat" xml:space="preserve">
-    <value>{0} must be at least {2} characters in length.</value>
-  </data>
-  <data name="CoreEx.Validation.MinValueFormat" xml:space="preserve">
-    <value>{0} is less than the minimum allowed value of {2}.</value>
-  </data>
-  <data name="CoreEx.Validation.MustFormat" xml:space="preserve">
-    <value>{0} is invalid.</value>
-  </data>
-  <data name="CoreEx.Validation.NoneFormat" xml:space="preserve">
-    <value>{0} must not be specified.</value>
-  </data>
-  <data name="CoreEx.Validation.NotFoundException" xml:space="preserve">
-    <value>Requested data was not found.</value>
-  </data>
-  <data name="CoreEx.Validation.PrimaryKey" xml:space="preserve">
-    <value>Primary Key</value>
-  </data>
-  <data name="CoreEx.Validation.RegexFormat" xml:space="preserve">
-    <value>{0} is invalid.</value>
-  </data>
-  <data name="CoreEx.Validation.ValidationException" xml:space="preserve">
-    <value>A data validation error occurred.</value>
-  </data>
-  <data name="CoreEx.Validation.WildcardFormat" xml:space="preserve">
-    <value>{0} contains invalid or non-supported wildcard selection.</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/CoreEx.Validation/RuleSet.cs b/src/CoreEx.Validation/RuleSet.cs
deleted file mode 100644
index 8a160dc7..00000000
--- a/src/CoreEx.Validation/RuleSet.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents a validation rule set for an entity, in that it groups one or more <see cref="Rules"/> together for a specified condition.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    public class RuleSet<TEntity> : ValidatorBase<TEntity>, IEntityRule<TEntity> where TEntity : class
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RuleSet{TEntity}"/> class to be invoked where the predicate is true.
-        /// </summary>
-        /// <param name="predicate">A function to determine whether the <see cref="RuleSet{TEntity}"/> is to be validated.</param>
-        internal RuleSet(Predicate<ValidationContext<TEntity>> predicate) => Predicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Gets the function to determine whether the <see cref="RuleSet{TEntity}"/> is to be validated.
-        /// </summary>
-        public Predicate<ValidationContext<TEntity>> Predicate { get; private set; }
-
-        /// <inheritdoc/>
-        public async Task ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken = default)
-        {
-            // Check the condition before continuing to validate the underlying rules.
-            if (!Predicate(context))
-                return;
-
-            // Validate each of the property rules.
-            foreach (var rule in Rules)
-            {
-                await rule.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/BetweenRule.cs b/src/CoreEx.Validation/Rules/BetweenRule.cs
index eed7fbee..0c359fb5 100644
--- a/src/CoreEx.Validation/Rules/BetweenRule.cs
+++ b/src/CoreEx.Validation/Rules/BetweenRule.cs
@@ -1,116 +1,46 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a comparison validation between two values.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="min">The function to get the minimum value.</param>
+/// <param name="max">The function to get the maximum value.</param>
+/// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+/// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+/// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
+/// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+public sealed class BetweenRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, bool exclusiveBetween = false, IComparer<TProperty>? comparer = null) 
+    : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IComparable<TProperty>
 {
+    private readonly Func<PropertyContext<TEntity, TProperty>, TProperty> _min = min.ThrowIfNull();
+    private readonly Func<PropertyContext<TEntity, TProperty>, TProperty> _max = max.ThrowIfNull();
+    private readonly Func<TProperty, LText?>? _minText = minText;
+    private readonly Func<TProperty, LText?>? _maxText= maxText;
+    private readonly bool _exclusiveBetween = exclusiveBetween;
+
     /// <summary>
-    /// Provides a comparision validation between two specified values.
+    /// Gets the <see cref="IComparer{T}"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class BetweenRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly TProperty _compareFromValue;
-        private readonly Func<TEntity, TProperty>? _compareFromValueFunction;
-        private readonly Func<TEntity, CancellationToken, Task<TProperty>>? _compareFromValueFunctionAsync;
-        private readonly LText? _compareFromText;
-        private readonly Func<TEntity, LText>? _compareFromTextFunction;
-        private readonly TProperty _compareToValue;
-        private readonly Func<TEntity, TProperty>? _compareToValueFunction;
-        private readonly Func<TEntity, CancellationToken, Task<TProperty>>? _compareToValueFunctionAsync;
-        private readonly LText? _compareToText;
-        private readonly Func<TEntity, LText>? _compareToTextFunction;
-        private readonly bool _exclusiveBetween;
+    public IComparer<TProperty> Comparer { get; } = comparer ?? Comparer<TProperty>.Default;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BetweenRule{TEntity, TProperty}"/> class specifying the between from and to values.
-        /// </summary>
-        /// <param name="compareFromValue">The compare from value.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareFromText">The compare from text to be passed for the error message (default is to use <paramref name="compareFromValue"/>).</param>
-        /// <param name="compareToText">The compare to text to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
-        public BetweenRule(TProperty compareFromValue, TProperty compareToValue, LText? compareFromText = null, LText? compareToText = null, bool exclusiveBetween = false)
-        {
-            _compareFromValue = compareFromValue;
-            _compareFromText = compareFromText;
-            _compareToValue = compareToValue;
-            _compareToText = compareToText;
-            _exclusiveBetween = exclusiveBetween;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BetweenRule{TEntity, TProperty}"/> class specifying the between from and to value functions.
-        /// </summary>
-        /// <param name="compareFromValueFunction">The compare from value function.</param>
-        /// <param name="compareToValueFunction">The compare to value function.</param>
-        /// <param name="compareFromTextFunction">The compare from text function (default is to use the result of the <paramref name="compareFromValueFunction"/>).</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
-        public BetweenRule(Func<TEntity, TProperty> compareFromValueFunction, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareFromTextFunction = null, Func<TEntity, LText>? compareToTextFunction = null, bool exclusiveBetween = false)
-        {
-            _compareFromValueFunction = compareFromValueFunction.ThrowIfNull(nameof(compareFromValueFunction));
-            _compareFromTextFunction = compareFromTextFunction;
-            _compareFromValue = default!;
-            _compareToValueFunction = compareToValueFunction.ThrowIfNull(nameof(compareToValueFunction));
-            _compareToTextFunction = compareToTextFunction;
-            _compareToValue = default!;
-            _exclusiveBetween = exclusiveBetween;
-        }
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        // Get the min and max values.
+        var min = _min(context);
+        var max = _max(context);
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BetweenRule{TEntity, TProperty}"/> class specifying the between from and to value async functions.
-        /// </summary>
-        /// <param name="compareFromValueFunctionAsync">The compare from value function.</param>
-        /// <param name="compareToValueFunctionAsync">The compare to value function.</param>
-        /// <param name="compareFromTextFunction">The compare from text function (default is to use the result of the <paramref name="compareFromValueFunctionAsync"/>).</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunctionAsync"/>).</param>
-        /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
-        public BetweenRule(Func<TEntity, CancellationToken, Task<TProperty>> compareFromValueFunctionAsync, Func<TEntity, CancellationToken, Task<TProperty>> compareToValueFunctionAsync, Func<TEntity, LText>? compareFromTextFunction = null, Func<TEntity, LText>? compareToTextFunction = null, bool exclusiveBetween = false)
+        // Compare the values.
+        if ((_exclusiveBetween && (Comparer.Compare(context.Value, min) <= 0 || Comparer.Compare(context.Value, max) >= 0))
+            || (!_exclusiveBetween && (Comparer.Compare(context.Value, min) < 0 || Comparer.Compare(context.Value, max) > 0)))
         {
-            _compareFromValueFunctionAsync = compareFromValueFunctionAsync.ThrowIfNull(nameof(compareFromValueFunctionAsync));
-            _compareFromTextFunction = compareFromTextFunction;
-            _compareFromValue = default!;
-            _compareToValueFunctionAsync = compareToValueFunctionAsync.ThrowIfNull(nameof(compareToValueFunctionAsync));
-            _compareToTextFunction = compareToTextFunction;
-            _compareToValue = default!;
-            _exclusiveBetween = exclusiveBetween;
+            context.AddError(ErrorText ?? (_exclusiveBetween ? ValidatorStrings.BetweenExclusiveFormat : ValidatorStrings.BetweenInclusiveFormat),
+                _minText?.Invoke(min) ?? context.FormatValue(min),
+                _maxText?.Invoke(max) ?? context.FormatValue(max));
         }
 
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            var compareFromValue = _compareFromValueFunction != null
-                ? _compareFromValueFunction(context.Parent.Value!)
-                : (_compareFromValueFunctionAsync != null
-                    ? await _compareFromValueFunctionAsync(context.Parent.Value!, cancellationToken).ConfigureAwait(false)
-                    : _compareFromValue);
-
-            var compareToValue = _compareToValueFunction != null
-                ? _compareToValueFunction(context.Parent.Value!)
-                : (_compareToValueFunctionAsync != null
-                    ? await _compareToValueFunctionAsync(context.Parent.Value!, cancellationToken).ConfigureAwait(false)
-                    : _compareToValue);
-
-            var comparer = Comparer<TProperty?>.Default;
-            if ((_exclusiveBetween && (comparer.Compare(context.Value, compareFromValue) <= 0 || comparer.Compare(context.Value, compareToValue) >= 0))
-                || (!_exclusiveBetween && (comparer.Compare(context.Value, compareFromValue) < 0 || comparer.Compare(context.Value, compareToValue) > 0)))
-            {
-                string? compareFromText = _compareFromText ?? compareFromValue?.ToString() ?? new LText("null");
-                if (_compareFromTextFunction != null)
-                    compareFromText = _compareFromTextFunction(context.Parent.Value!);
-
-                string? compareToText = _compareToText ?? compareToValue?.ToString() ?? new LText("null");
-                if (_compareToTextFunction != null)
-                    compareToText = _compareToTextFunction(context.Parent.Value!); 
-
-                context.CreateErrorMessage(ErrorText ?? (_exclusiveBetween ? ValidatorStrings.BetweenExclusiveFormat : ValidatorStrings.BetweenInclusiveFormat), compareFromText, compareToText);
-            }
-        }
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CollectionRule.cs b/src/CoreEx.Validation/Rules/CollectionRule.cs
index 1695bb5a..e82955c5 100644
--- a/src/CoreEx.Validation/Rules/CollectionRule.cs
+++ b/src/CoreEx.Validation/Rules/CollectionRule.cs
@@ -1,126 +1,317 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using CoreEx.Abstractions.Reflection;
-using System;
-using System.Collections;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides a collection (<see cref="IEnumerable{T}"/>) validation including item-based validation and duplicate checking.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/> (<see cref="IEnumerable{T}"/>).</typeparam>
+/// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+public sealed class CollectionRule<TEntity, TProperty, TItem> : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IEnumerable<TItem?>
 {
+    private readonly Func<PropertyContext<TEntity, TProperty>, int>? _minCount;
+    private readonly Func<PropertyContext<TEntity, TProperty>, int?>? _maxCount;
+    private readonly With _with;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CollectionRule{TEntity, TProperty, TItem}"/> class.
+    /// </summary>
+    /// <param name="minCount">The minimum count.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="With"/>.</param>
+    public CollectionRule(Func<PropertyContext<TEntity, TProperty>, int>? minCount, Func<PropertyContext<TEntity, TProperty>, int?>? maxCount, Func<With, With>? with)
+    {
+        _minCount = minCount;
+        _maxCount = maxCount;
+
+        var w = new With(this);
+        _with = with?.Invoke(w) ?? w;
+    }
+
+    /// <inheritdoc/>
+    protected async override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    { 
+        var minCount = _minCount?.Invoke(context) ?? 0;
+        var maxCount = _maxCount?.Invoke(context);
+
+        if (minCount < 0)
+            throw new InvalidOperationException("Minimum count must not be negative.");
+
+        if (maxCount.HasValue)
+        {
+            if (maxCount.Value < 0)
+                throw new InvalidOperationException("Maximum count must not be negative.");
+
+            if (maxCount.Value < minCount)
+                throw new InvalidOperationException("Maximum count must not be less than minimum count.");
+        }
+
+        await _with.ValidateAsync(context, minCount, maxCount, cancellationToken).ConfigureAwait(false);
+    }
+
     /// <summary>
-    /// Provides collection validation including <see cref="MinCount"/> and <see cref="MaxCount"/>.
+    /// Provides additional configuration options for the <see cref="CollectionRule{TEntity, TProperty, TItem}"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The collection property <see cref="Type"/>.</typeparam>
-    public class CollectionRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IEnumerable?
+    public sealed class With
     {
-        private readonly Type _itemType;
-        private ICollectionRuleItem? _item;
+        private readonly CollectionRule<TEntity, TProperty, TItem> _rule;
+        private Func<ValidationArgs, IValidatorEx<TItem>>? _getValidator;
+        private bool _hasAllowNullItems;
+#pragma warning disable CA1859 // Use concrete types when possible for improved performance; not applicable here as interface is needed.
+        private IItemDuplicateCheck? _itemDuplicateCheck;
+#pragma warning restore CA1859 // Use concrete types when possible for improved performance
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CollectionRule{TEntity, TProperty}"/> class.
+        /// Initializes a new instance of the <see cref="With"/> class.
         /// </summary>
-        public CollectionRule() => _itemType = TypeReflector.GetCollectionItemType(typeof(TProperty)).ItemType!;
+        internal With(CollectionRule<TEntity, TProperty, TItem> rule) => _rule = rule;
 
         /// <summary>
-        /// Gets or sets the minimum count.
+        /// Indicates that one or more items can be <see langword="null"/>.
         /// </summary>
-        public int MinCount { get; set; }
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With AllowNullItems()
+        {
+            _hasAllowNullItems = true;
+            return this;
+        }
 
         /// <summary>
-        /// Gets or sets the maximum count.
+        /// Sets the specified <b>Item</b> <paramref name="configure"/>.
         /// </summary>
-        public int? MaxCount { get; set; }
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithItemValidator(Action<InlineValidator<TItem>.Validator>? configure) => WithItemValidator(new ValidatingInlineValidator<TItem>(configure));
 
         /// <summary>
-        /// Indicates whether the underlying collection items can be <c>null</c>.
+        /// Sets the specified <b>Item</b> <paramref name="validator"/>.
         /// </summary>
-        public bool AllowNullItems { get; set; }
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithItemValidator(IValidatorEx<TItem> validator)
+        {
+            _getValidator = _getValidator is not null ? throw new InvalidOperationException("The collection rule can only have one validator.") : _ => validator.ThrowIfNull();
+            return this;
+        }
 
         /// <summary>
-        /// Gets or sets the collection item validation configuration.
+        /// Sets the specified <b>Item</b> <typeparamref name="TValidator"/> service (resolved at validation runtime).
         /// </summary>
-        public ICollectionRuleItem? Item
+        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithItemValidator<TValidator>() where TValidator : IValidatorEx<TItem>
         {
-            get => _item;
-
-            set
-            {
-                if (value == null)
-                {
-                    _item = value;
-                    return;
-                }
-
-                if (_itemType != value.ItemType)
-                    throw new ArgumentException($"A CollectionRule TProperty ItemType '{_itemType.Name}' must be the same as the Item {value.ItemType.Name}");
-
-                _item = value;
-            }
+            _getValidator = _getValidator is not null ? throw new InvalidOperationException("The collection rule can only have one validator.") : args => CoreEx.Validation.Validator.Get<TValidator>(args.ServiceProvider);
+            return this;
         }
 
         /// <summary>
-        /// Overrides the <b>Check</b> method and will not validate where performing a shallow validation.
+        /// Sets the specified keyed <b>Item</b> <typeparamref name="TValidator"/> service (resolved at validation runtime).
         /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        protected override bool Check(PropertyContext<TEntity, TProperty> context) => !context.ThrowIfNull(nameof(context)).Parent.ShallowValidation && base.Check(context);
+        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
+        /// <param name="serviceKey">The service key.</param>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithItemKeyedValidator<TValidator>(object? serviceKey) where TValidator : IValidatorEx<TItem>
+        {
+            _getValidator = _getValidator is not null ? throw new InvalidOperationException("The collection rule can only have one validator.") : args => CoreEx.Validation.Validator.GetKeyed<TValidator>(serviceKey, args.ServiceProvider);
+            return this;
+        }
 
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        /// <summary>
+        /// Sets the generic duplicate checking logic.
+        /// </summary>
+        /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+        /// <param name="keySelector">The key selector.</param>
+        /// <param name="comparer">The equality comparer.</param>
+        /// <param name="duplicateText">The duplicate <see cref="LText"/> to be used in the error message.</param>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        internal With WithDuplicateCheckingInternal<TKey>(Func<TItem, TKey> keySelector, IEqualityComparer<TKey>? comparer, Func<LText> duplicateText)
         {
-            if (context.Value == null)
-                return;
+            _itemDuplicateCheck = _itemDuplicateCheck is not null ? throw new InvalidOperationException("The collection rule can only have one duplicate checker.") : new ItemDuplicateCheck<TKey>(keySelector, comparer, duplicateText);
+            return this;
+        }
 
-            // Where only validating count on an icollection do it quickly and exit.
-            if (AllowNullItems && Item is null && context.Value is ICollection coll)
+        /// <summary>
+        /// Validates each item within the collection.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="minCount">The minimum count.</param>
+        /// <param name="maxCount">The maximum count.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+        internal async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, int minCount, int? maxCount, CancellationToken cancellationToken)
+        {
+            // Fast path where only checking for count.
+            if (_hasAllowNullItems && _getValidator is null && _itemDuplicateCheck is null && context.Value is ICollection coll)
             {
-                if (coll.Count < MinCount)
-                    context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MinCountFormat, MinCount);
-                else if (MaxCount.HasValue && coll.Count > MaxCount.Value)
-                    context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxCountFormat, MaxCount);
-
+                PostEnumerationValidation(context, false, minCount, maxCount, coll.Count);
                 return;
             }
 
-            // Iterate through the collection validating each of the items.
-            var i = 0;
+            // Enumerate and validate each item.
+            var index = 0;
             var hasNullItem = false;
-            var hasItemErrors = false;
-            foreach (var item in context.Value)
+            var hasItemError = false;
+            var hasDuplicate = false;
+
+            var duplicateChecker = _itemDuplicateCheck?.CreateDuplicateChecker();
+
+            foreach (var item in context.Value!)
             {
-                // Create the context args.
-                var args = context.CreateValidationArgs();
-                var indexer = $"[{i++}]";
-                args.FullyQualifiedEntityName += indexer;
-                args.FullyQualifiedJsonEntityName += indexer;
+                // Handle null item(s).
+                if (item is null)
+                {
+                    if (!_hasAllowNullItems)
+                        hasNullItem = true;
 
-                if (!AllowNullItems && item == null)
-                    hasNullItem = true;
+                    index++;
+                    continue;
+                }
 
-                // Validate and merge.
-                if (item != null && Item?.ItemValidator != null)
+                // Validate the item.
+                var hasError = false;
+                if (_getValidator is not null)
                 {
-                    var r = await Item.ItemValidator.ValidateAsync(item, args, cancellationToken).ConfigureAwait(false);
-                    context.MergeResult(r);
-                    if (r.HasErrors)
-                        hasItemErrors = true;
+                    // Create the context args.
+                    var args = CreateValidationArgs(context, index);
+
+                    var last = context.GetCollectionIndexSafe();
+                    context.SetCollectionIndex(index);
+
+                    // Validate the item and merge the result.
+                    try
+                    {
+                        var vi = _getValidator.Invoke(args);
+                        var r = vi is ValidatingInlineValidator<TItem> vilv
+                            ? await vilv.ValidateEntityAsync(item, args, cancellationToken).ConfigureAwait(false)
+                            : await vi.ValidateAsync(item, args, cancellationToken).ConfigureAwait(false);
+
+                        context.MergeResult(r);
+                        if (r.HasErrors)
+                            hasItemError = hasError = true;
+                    }
+                    finally
+                    {
+                        context.SetCollectionIndex(last);
+                    }
                 }
+
+                // Check for duplicates where applicable.
+                if (!hasError && !hasDuplicate && duplicateChecker?.IsDuplicate(item) is true)
+                    hasDuplicate = true;
+
+                index++;
             }
 
+            // Check for duplicates and error accordingly.
+            if (!hasItemError && hasDuplicate)
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.DuplicateValueFormat, _itemDuplicateCheck!.DuplicateText());
+
+            // Perform the standard post enumeration validation.
+            PostEnumerationValidation(context, hasNullItem, minCount, maxCount, index);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="ValidationArgs"/> for the specified <paramref name="index"/>.
+        /// </summary>
+        private static ValidationArgs CreateValidationArgs(PropertyContext<TEntity, TProperty> context, int index)
+        {
+            var args = context.CreateValidationArgs();
+            var indexer = $"[{index}]";
+            args.FullyQualifiedEntityName += indexer;
+            args.FullyQualifiedJsonEntityName += indexer;
+            return args;
+        }
+
+        /// <summary>
+        /// Performs the standatd post enumeration validation.
+        /// </summary>
+        private void PostEnumerationValidation(PropertyContext<TEntity, TProperty> context, bool hasNullItem, int minCount, int? maxCount, int count)
+        {
+            // Emit the null item error.
             if (hasNullItem)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CollectionNullItemFormat);
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.CollectionNullItemFormat);
 
             // Check the length/count.
-            if (i < MinCount)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MinCountFormat, MinCount);
-            else if (MaxCount.HasValue && i > MaxCount.Value)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxCountFormat, MaxCount);
-
-            // Check for duplicates.
-            if (!hasItemErrors)
-                Item?.DuplicateValidation(context, context.Value);
+            if (count < minCount)
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.MinCountFormat, minCount);
+            else if (maxCount.HasValue && count > maxCount.Value)
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.MaxCountFormat, maxCount);
+        }
+    }
+
+    /// <summary>
+    /// Enables the duplicate checking configuration for items within a collection.
+    /// </summary>
+    internal interface IItemDuplicateCheck
+    {
+        /// <summary>
+        /// Gets the duplicate <see cref="LText"/> to be used in the error message.
+        /// </summary>
+        Func<LText> DuplicateText { get; }
+
+        /// <summary>
+        /// Create the runtime <see cref="IItemDuplicateChecker"/>.
+        /// </summary>
+        /// <returns>The <see cref="IItemDuplicateChecker"/>.</returns>
+        IItemDuplicateChecker CreateDuplicateChecker();
+    }
+
+    /// <summary>
+    /// Enables the runtime duplicate checking for items within a collection.
+    /// </summary>
+    internal interface IItemDuplicateChecker
+    {
+        /// <summary>
+        /// Indicates whether the specified <paramref name="item"/> is a duplicate.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns><see langword="true"/> indicates a duplicate; otherwise, <see langword="false"/>.</returns>
+        bool IsDuplicate(TItem item);
+    }
+
+    /// <summary>
+    /// Provides duplicate checking configuration for items within a collection.
+    /// </summary>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <param name="keySelector">The key selector.</param>
+    /// <param name="comparer">The equality comparer.</param>
+    /// <param name="duplicateText">The duplicate <see cref="LText"/> function.</param>
+    internal sealed class ItemDuplicateCheck<TKey>(Func<TItem, TKey> keySelector, IEqualityComparer<TKey>? comparer, Func<LText> duplicateText) : IItemDuplicateCheck
+    {
+        /// <summary>
+        /// Gets the key selector.
+        /// </summary>
+        public Func<TItem, TKey> KeySelector { get; } = keySelector.ThrowIfNull();
+
+        /// <summary>
+        /// Gets the equality comparer.
+        /// </summary>
+        public IEqualityComparer<TKey>? Comparer { get; } = comparer;
+
+        /// <inheritdoc/>
+        public Func<LText> DuplicateText { get; } = duplicateText.ThrowIfNull();
+
+        /// <inheritdoc/>
+        public IItemDuplicateChecker CreateDuplicateChecker() => new ItemDuplicateChecker<TKey>(this);
+    }
+
+    /// <summary>
+    /// Provides runtime duplicate checking for items within a collection.
+    /// </summary>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    internal sealed class ItemDuplicateChecker<TKey> : IItemDuplicateChecker
+    {
+        private readonly ItemDuplicateCheck<TKey> _config;
+        private readonly HashSet<TKey> _keys;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemDuplicateChecker{TKey}"/> class.
+        /// </summary>
+        /// <param name="config">The <see cref="ItemDuplicateCheck{TKey}"/>.</param>
+        public ItemDuplicateChecker(ItemDuplicateCheck<TKey> config)
+        {
+            _config = config.ThrowIfNull();
+            _keys = new HashSet<TKey>(_config.Comparer);
         }
+
+        /// <inheritdoc/>
+        public bool IsDuplicate(TItem item) => !_keys.Add(_config.KeySelector(item));
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CollectionRuleItem.cs b/src/CoreEx.Validation/Rules/CollectionRuleItem.cs
deleted file mode 100644
index 32703533..00000000
--- a/src/CoreEx.Validation/Rules/CollectionRuleItem.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides the means to create a <see cref="CollectionRuleItem{TItemEntity}"/> instance.
-    /// </summary>
-    public static class CollectionRuleItem
-    {
-        /// <summary>
-        /// Create an instance of the <see cref="CollectionRuleItem{TItem}"/> class with no <see cref="Validator"/>.
-        /// </summary>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <returns>The <see cref="CollectionRuleItem{TItem}"/>.</returns>
-        public static CollectionRuleItem<TItem> Create<TItem>() => new(null);
-
-        /// <summary>
-        /// Create an instance of the <see cref="CollectionRuleItem{TItem}"/> class with a corresponding <paramref name="validator"/>.
-        /// </summary>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="validator">The corresponding item <see cref="IValidatorEx{TItem}"/>.</param>
-        /// <returns>The <see cref="CollectionRuleItem{TItem}"/>.</returns>
-        public static CollectionRuleItem<TItem> Create<TItem>(IValidatorEx<TItem> validator) => new(validator.ThrowIfNull(nameof(validator)));
-
-        /// <summary>
-        /// Create an instance of the <see cref="CollectionRuleItem{TItem}"/> class leveraging the <paramref name="serviceProvider"/> to get the instance.
-        /// </summary>
-        /// <typeparam name="TItem">The item entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The item validator <see cref="Type"/>.</typeparam>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>; defaults to <see cref="ExecutionContext.ServiceProvider"/> where not specified.</param>
-        /// <returns>The <see cref="CollectionRuleItem{TItem}"/>.</returns>
-        public static CollectionRuleItem<TItem> Create<TItem, TValidator>(IServiceProvider? serviceProvider = null) where TValidator : IValidatorEx<TItem> => new(Validator.Create<TValidator>(serviceProvider));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CollectionRuleItemT.cs b/src/CoreEx.Validation/Rules/CollectionRuleItemT.cs
deleted file mode 100644
index 22778f55..00000000
--- a/src/CoreEx.Validation/Rules/CollectionRuleItemT.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Abstractions.Reflection;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using CoreEx.Localization;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation configuration for an item within a <see cref="CollectionRule{TEntity, TProperty}"/>.
-    /// </summary>
-    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-    public sealed class CollectionRuleItem<TItem> : ICollectionRuleItem
-    {
-        private bool _duplicateCheck = false;
-        private IPropertyExpression? _propertyExpression;
-        private LText? _duplicateText = null;
-        private bool _ignoreWhereKeyIsInitial = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollectionRuleItem{TItem}"/> class with a corresponding <paramref name="validator"/>.
-        /// </summary>
-        /// <param name="validator">The corresponding item <see cref="IValidatorEx{TItem}"/>.</param>
-        internal CollectionRuleItem(IValidatorEx<TItem>? validator) => ItemValidator = validator;
-
-        /// <summary>
-        /// Gets the corresponding item <see cref="IValidatorEx"/>.
-        /// </summary>
-        IValidatorEx? ICollectionRuleItem.ItemValidator => ItemValidator;
-
-        /// <summary>
-        /// Gets the corresponding item <see cref="IValidatorEx{TItemEntity}"/>.
-        /// </summary>
-        public IValidatorEx<TItem>? ItemValidator { get; private set; }
-
-        /// <summary>
-        /// Gets the item <see cref="Type"/>.
-        /// </summary>
-        public Type ItemType => typeof(TItem);
-
-        /// <summary>
-        /// Specifies that the collection is to be checked for duplicates using the item's <see cref="IEntityKey.EntityKey"/> value.
-        /// </summary>
-        /// <param name="duplicateText">The duplicate text <see cref="LText"/> to be passed for the error message; defaults to <see cref="ValidatorStrings.Identifier"/> or <see cref="ValidatorStrings.PrimaryKey"/> depending on whether <see cref="IIdentifier"/> is implemented.</param>
-        /// <returns>The <see cref="CollectionRuleItem{TItemEntity}"/> instance to support chaining/fluent.</returns>
-        public CollectionRuleItem<TItem> DuplicateCheck(LText? duplicateText = null)
-        {
-            if (_duplicateCheck)
-                throw new InvalidOperationException($"A {nameof(DuplicateCheck)} can only be specified once.");
-
-            if (ItemType.GetInterface(typeof(IEntityKey).Name) == null)
-                throw new InvalidOperationException($"A CollectionRuleItem ItemType '{ItemType.Name}' must implement '{nameof(IEntityKey)}' to support default expression-less {nameof(DuplicateCheck)}.");
-
-            _duplicateText = string.IsNullOrEmpty(duplicateText) ? (ItemType.GetInterface(typeof(IIdentifier).Name) is not null ? ValidatorStrings.Identifier : ValidatorStrings.PrimaryKey) : duplicateText;
-            _duplicateCheck = true;
-
-            return this;
-        }
-
-        /// <summary>
-        /// Specifies that the collection is to be checked for duplicates using the item's <see cref="IEntityKey.EntityKey"/> value with an option to <paramref name="ignoreWhereKeyIsInitial"/>.
-        /// </summary>
-        /// <param name="ignoreWhereKeyIsInitial">Indicates whether to ignore the <see cref="IEntityKey.EntityKey"/> when the underlying <see cref="CompositeKey.IsInitial"/>; useful where the identifier will be generated by the underlying data source on create for example.</param>
-        /// <param name="duplicateText">The duplicate text <see cref="LText"/> to be passed for the error message; defaults to <see cref="ValidatorStrings.Identifier"/>.</param>
-        /// <returns>The <see cref="CollectionRuleItem{TItemEntity}"/> instance to support chaining/fluent.</returns>
-        public CollectionRuleItem<TItem> DuplicateCheck(bool ignoreWhereKeyIsInitial, LText? duplicateText = null)
-        {
-            DuplicateCheck(duplicateText);
-            _ignoreWhereKeyIsInitial = ignoreWhereKeyIsInitial;
-            return this;
-        }
-
-        /// <summary>
-        /// Specifies that the collection is to be checked for duplicates using the specified item <paramref name="propertyExpression"/>.
-        /// </summary>
-        /// <typeparam name="TItemProperty">The item property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the item property that is being duplicate checked.</param>
-        /// <param name="duplicateText">The duplicate text <see cref="LText"/> to be passed for the error message (default is to derive the text from the property itself where possible).</param>
-        /// <returns>The <see cref="CollectionRuleItem{TItemEntity}"/> instance to support chaining/fluent.</returns>
-        public CollectionRuleItem<TItem> DuplicateCheck<TItemProperty>(Expression<Func<TItem, TItemProperty>> propertyExpression, LText? duplicateText = null)
-        {
-            if (_duplicateCheck)
-                throw new InvalidOperationException($"A {nameof(DuplicateCheck)} can only be specified once.");
-
-            _propertyExpression = PropertyExpression.Create(propertyExpression);
-            _duplicateText = duplicateText ?? _propertyExpression.Text;
-            _duplicateCheck = true;
-
-            return this;
-        }
-
-        /// <summary>
-        /// Performs the duplicate validation check.
-        /// </summary>
-        /// <param name="context">The <see cref="IPropertyContext"/>.</param>
-        /// <param name="items">The items to duplicate check.</param>
-        void ICollectionRuleItem.DuplicateValidation(IPropertyContext context, IEnumerable? items) => DuplicateValidation(context, (IEnumerable<TItem>?)items);
-
-        /// <summary>
-        /// Performs the duplicate validation check.
-        /// </summary>
-        /// <param name="context">The <see cref="IPropertyContext"/>.</param>
-        /// <param name="items">The items to duplicate check.</param>
-        private void DuplicateValidation(IPropertyContext context, IEnumerable<TItem>? items)
-        {
-            if (!_duplicateCheck || items == null)
-                return;
-
-            if (_propertyExpression != null)
-            {
-                var dict = new Dictionary<object, object?>();
-                foreach (var item in items.Where(x => x != null))
-                {
-                    var val = _propertyExpression.GetValue(item!);
-                    if (val is not null && !dict.TryAdd(val, item))
-                        context.CreateErrorMessage(ValidatorStrings.DuplicateValueFormat, _duplicateText!, val!);
-                }
-            }
-            else
-            {
-                var dict = new Dictionary<object, object?>();
-                foreach (var item in items.Where(x => x != null).Cast<IEntityKey>())
-                {
-                    if (_ignoreWhereKeyIsInitial && item.EntityKey.IsInitial)
-                        continue;
-
-                    if (!dict.TryAdd(item.EntityKey, item))
-                        context.CreateErrorMessage(item.EntityKey.Args.Length == 1 ? ValidatorStrings.DuplicateValueFormat : ValidatorStrings.DuplicateValue2Format, _duplicateText!, item.EntityKey.ToString());
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CommonRule.cs b/src/CoreEx.Validation/Rules/CommonRule.cs
index 9009b5f2..c32fde3f 100644
--- a/src/CoreEx.Validation/Rules/CommonRule.cs
+++ b/src/CoreEx.Validation/Rules/CommonRule.cs
@@ -1,22 +1,19 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides <paramref name="common"/> validation integration.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="common">The <see cref="InlineValidator{T}"/>.</param>
+/// <remarks>Although named <paramref name="common"/> (primary use), the underlying base <see cref="InlineValidator{TValue}"/> is supported to enable additional types where applicable.</remarks>
+public sealed class CommonRule<TEntity, TProperty>(InlineValidator<TProperty> common) : PropertyRuleBase<TEntity, TProperty> where TEntity : class
 {
-    /// <summary>
-    /// Provides for integrating a common validation against a specified property.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
-    /// <param name="commonValidator">The <see cref="CommonValidator{T}"/>.</param>
-    internal class CommonRule<TEntity, TProperty>(CommonValidator<TProperty> commonValidator) : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly CommonValidator<TProperty> _commonValidator = commonValidator.ThrowIfNull(nameof(commonValidator));
+    private readonly InlineValidator<TProperty> _commonValidator = common.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override bool ValidateWhenNull => true;
 
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-            => await _commonValidator.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
-    }
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken) => _commonValidator.ValidateAsync(context, cancellationToken);
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ComparePropertyRule.cs b/src/CoreEx.Validation/Rules/ComparePropertyRule.cs
index 109eeed4..5c5f72af 100644
--- a/src/CoreEx.Validation/Rules/ComparePropertyRule.cs
+++ b/src/CoreEx.Validation/Rules/ComparePropertyRule.cs
@@ -1,48 +1,57 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Localization;
-using System;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides a comparison validation against another property within the same entity; also confirms other property has no errors prior to comparison.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <typeparam name="TCompareProperty">The comparison property <see cref="Type"/>.</typeparam>
+/// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+/// <param name="compareToPropertyExpression">>The <see cref="Expression"/> to reference the compare-to entity property.</param>
+/// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting compare-to value.</param>
+/// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+public sealed class ComparePropertyRule<TEntity, TProperty, TCompareProperty>(CompareOperator compareOperator, Expression<Func<TEntity, TCompareProperty>> compareToPropertyExpression, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null)
+    : CompareRuleBase<TEntity, TProperty>(compareOperator, compareToText, comparer) where TEntity : class where TProperty : IComparable<TProperty>
 {
-    /// <summary>
-    /// Provides a comparision validation against another property within the same entity; also confirms other property has no errors prior to comparison.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TCompareProperty">The compare to property <see cref="Type"/>.</typeparam>
-    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-    /// <param name="compareToPropertyExpression">The <see cref="Expression"/> to reference the compare to entity property.</param>
-    /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to derive the text from the property itself).</param>
-    public class ComparePropertyRule<TEntity, TProperty, TCompareProperty>(CompareOperator compareOperator, Expression<Func<TEntity, TCompareProperty>> compareToPropertyExpression, LText? compareToText = null) : CompareRuleBase<TEntity, TProperty>(compareOperator) where TEntity : class
+    private readonly IPropertyRuntimeMetadata _compareToProperty = RuntimeMetadata.GetForExpression(compareToPropertyExpression.ThrowIfNull());
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
     {
-        private readonly PropertyExpression<TEntity, TCompareProperty> _compareTo = PropertyExpression.Create(compareToPropertyExpression);
-        private readonly LText? _compareToText = compareToText;
+        // Make sure not the same property.
+        if (_compareToProperty.Name == context.Name)
+            throw new InvalidOperationException($"The compare-to property '{_compareToProperty.Name}' cannot be the same as the property being validated.");
+
+        // Do not continue where the compare-to property is in error.
+        if (context.HasError(context.CreateFullyQualifiedPropertyName(_compareToProperty.Name)))
+            return Task.CompletedTask;
 
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        // Get the compare to value; where is null then simply skip the comparison.
+        var compareTo = _compareToProperty.GetValue<TCompareProperty>(context.Entity);
+        if (compareTo is null)
+            return Task.CompletedTask;
+
+        // Where compare to is the same type then _fast-path_ the comparison.
+        if (compareTo is TProperty casted)
         {
-            // Do not validate where the compare to property has an error.
-            if (context.Parent.HasError(_compareTo))
-                return Task.CompletedTask;
-
-            // Convert type and compare values.
-            try
-            {
-                var compareToValue = (TProperty)(object)_compareTo.GetValue(context.Parent.Value)!;
-                if (!Compare(context.Value!, compareToValue))
-                    CreateErrorMessage(context, _compareToText ?? _compareTo.Text);
-
-                return Task.CompletedTask;
-            }
-            catch (InvalidCastException icex)
-            {
-                throw new InvalidCastException($"Property '{_compareTo.Name}' and '{context.Name}' are incompatible: {icex.Message}", icex);
-            }
+            if (!Compare(context.Value, casted))
+                CreateErrorMessage(context, casted);
+
+            return Task.CompletedTask;
         }
+
+        // Convert (slow-path) the compare-to to the property type and perform the (apples-to-apples) compare.
+        try
+        {
+            var changed = (TProperty)Convert.ChangeType(compareTo, typeof(TProperty));
+            if (!Compare(context.Value, changed))
+                CreateErrorMessage(context, changed);
+        }
+        catch (Exception ex) when (ex is InvalidCastException || ex is FormatException)
+        {
+            throw new InvalidCastException($"Property '{_compareToProperty.Name}' and '{context.Name}' are incompatible for a comparison: {ex.Message}", ex);
+        }
+
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CompareRuleBase.cs b/src/CoreEx.Validation/Rules/CompareRuleBase.cs
index 36ffb522..0e5046a3 100644
--- a/src/CoreEx.Validation/Rules/CompareRuleBase.cs
+++ b/src/CoreEx.Validation/Rules/CompareRuleBase.cs
@@ -1,64 +1,65 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using CoreEx.Localization;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides base comparison validation capability.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+/// <param name="compareToText">The compare-to value text formatter (used in error message); otherwise, uses the resulting compare to value.</param>
+/// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+public abstract class CompareRuleBase<TEntity, TProperty>(CompareOperator compareOperator, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IComparable<TProperty>
 {
     /// <summary>
-    /// Provides base comparision validation capability.
+    /// Gets the <see cref="CompareOperator"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-    public abstract class CompareRuleBase<TEntity, TProperty>(CompareOperator compareOperator) : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        /// <summary>
-        /// Gets the <see cref="CompareOperator"/>.
-        /// </summary>
-        public CompareOperator Operator { get; private set; } = compareOperator;
+    protected CompareOperator Operator { get; } = compareOperator;
 
-        /// <summary>
-        /// Gets or sets the comparer.
-        /// </summary>
-        public Comparer<TProperty?> Comparer { get; set; } = Comparer<TProperty?>.Default;
+    /// <summary>
+    /// Gets or sets the comparer.
+    /// </summary>
+    protected IComparer<TProperty> Comparer { get; } = comparer ?? Comparer<TProperty>.Default;
 
-        /// <summary>
-        /// Compare two values using the default comparer for the type.
-        /// </summary>
-        /// <param name="lValue">The left value.</param>
-        /// <param name="rValue">The right value.</param>
-        /// <returns><c>true</c> where valid; otherwise, <c>false</c>.</returns>
-        protected bool Compare(TProperty? lValue, TProperty? rValue) => Operator switch
-        {
-            CompareOperator.Equal => Comparer.Compare(lValue, rValue) == 0,
-            CompareOperator.NotEqual => Comparer.Compare(lValue, rValue) != 0,
-            CompareOperator.LessThan => Comparer.Compare(lValue, rValue) < 0,
-            CompareOperator.LessThanEqual => Comparer.Compare(lValue, rValue) <= 0,
-            CompareOperator.GreaterThan => Comparer.Compare(lValue, rValue) > 0,
-            CompareOperator.GreaterThanEqual => Comparer.Compare(lValue, rValue) >= 0,
-            _ => throw new InvalidOperationException("An invalid Operator value was encountered.")
-        };
+    /// <summary>
+    /// Gets the comparison text formatter (used in error message); otherwise, uses the resulting compare to value.
+    /// </summary>
+    protected Func<TProperty, LText?>? CompareToText { get; } = compareToText;
 
-        /// <summary>
-        /// Creates the error message passing the <paramref name="compareToText"/> text as the third format parameter (i.e. String.Format("{2}")).
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <param name="compareToText">The compare text <see cref="LText"/> to be passed for the error message.</param>
-        protected void CreateErrorMessage(PropertyContext<TEntity, TProperty> context, LText compareToText)
-        {
-            context.ThrowIfNull(nameof(context));
+    /// <summary>
+    /// Compare two values using the <see cref="Comparer"/>.
+    /// </summary>
+    /// <param name="lValue">The left value.</param>
+    /// <param name="rValue">The right value.</param>
+    /// <returns><see langword="true"/> where valid; otherwise, <see langword="false"/>.</returns>
+    protected bool Compare(TProperty lValue, TProperty rValue) => Operator switch
+    {
+        CompareOperator.Equal => Comparer.Compare(lValue, rValue) == 0,
+        CompareOperator.NotEqual => Comparer.Compare(lValue, rValue) != 0,
+        CompareOperator.LessThan => Comparer.Compare(lValue, rValue) < 0,
+        CompareOperator.LessThanOrEqualTo => Comparer.Compare(lValue, rValue) <= 0,
+        CompareOperator.GreaterThan => Comparer.Compare(lValue, rValue) > 0,
+        CompareOperator.GreaterThanOrEqualTo => Comparer.Compare(lValue, rValue) >= 0,
+        _ => throw new InvalidOperationException("An invalid Operator value was encountered.")
+    };
+
+    /// <summary>
+    /// Creates the error message passing the <see cref="CompareToText"/> or <paramref name="compareToValue"/> as the third format parameter (i.e. String.Format("{2}")).
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="compareToValue">The compare-to value.</param>
+    protected void CreateErrorMessage(PropertyContext<TEntity, TProperty> context, TProperty compareToValue)
+    {
+        context.ThrowIfNull();
+        var compareToText = CompareToText?.Invoke(compareToValue) ?? context.FormatValue(compareToValue);
 
-            switch (Operator)
-            {
-                case CompareOperator.Equal: context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CompareEqualFormat, (string)compareToText); break;
-                case CompareOperator.NotEqual: context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CompareNotEqualFormat, (string)compareToText); break;
-                case CompareOperator.LessThan: context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CompareLessThanFormat, (string)compareToText); break;
-                case CompareOperator.LessThanEqual: context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CompareLessThanEqualFormat, (string)compareToText); break;
-                case CompareOperator.GreaterThan: context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CompareGreaterThanFormat, (string)compareToText); break;
-                case CompareOperator.GreaterThanEqual: context.CreateErrorMessage(ErrorText ?? ValidatorStrings.CompareGreaterThanEqualFormat, (string)compareToText); break;
-            }
+        switch (Operator)
+        {
+            case CompareOperator.Equal: context.AddError(ErrorText ?? ValidatorStrings.CompareEqualFormat, compareToText); break;
+            case CompareOperator.NotEqual: context.AddError(ErrorText ?? ValidatorStrings.CompareNotEqualFormat, compareToText); break;
+            case CompareOperator.LessThan: context.AddError(ErrorText ?? ValidatorStrings.CompareLessThanFormat, compareToText); break;
+            case CompareOperator.LessThanOrEqualTo: context.AddError(ErrorText ?? ValidatorStrings.CompareLessThanEqualFormat, compareToText); break;
+            case CompareOperator.GreaterThan: context.AddError(ErrorText ?? ValidatorStrings.CompareGreaterThanFormat, compareToText); break;
+            case CompareOperator.GreaterThanOrEqualTo: context.AddError(ErrorText ?? ValidatorStrings.CompareGreaterThanEqualFormat, compareToText); break;
         }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CompareValueRule.cs b/src/CoreEx.Validation/Rules/CompareValueRule.cs
index 63e43fa5..b5a6c367 100644
--- a/src/CoreEx.Validation/Rules/CompareValueRule.cs
+++ b/src/CoreEx.Validation/Rules/CompareValueRule.cs
@@ -1,82 +1,33 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+using CoreEx.Validation.Abstractions;
+
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a comparison validation using the specified <paramref name="compareOperator"/> and <paramref name="compareToValue"/>.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+/// <param name="compareToValue">The function to get the compare-to value.</param>
+/// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareToValue"/> value.</param>
+/// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+public sealed class CompareValueRule<TEntity, TProperty>(CompareOperator compareOperator, Func<PropertyContext<TEntity, TProperty>, TProperty> compareToValue, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) 
+    : CompareRuleBase<TEntity, TProperty>(compareOperator, compareToText, comparer) where TEntity : class where TProperty : IComparable<TProperty>
 {
-    /// <summary>
-    /// Provides a comparision validation against a specified value.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class CompareValueRule<TEntity, TProperty> : CompareRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly TProperty _compareToValue;
-        private readonly Func<TEntity, TProperty>? _compareToValueFunction;
-        private readonly Func<TEntity, CancellationToken, Task<TProperty>>? _compareToValueFunctionAsync;
-        private readonly LText? _compareToText;
-        private readonly Func<TEntity, LText>? _compareToTextFunction;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompareValueRule{TEntity, TProperty}"/> class specifying the compare to value.
-        /// </summary>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        public CompareValueRule(CompareOperator compareOperator, TProperty compareToValue, LText? compareToText = null) : base(compareOperator)
-        {
-            _compareToValue = compareToValue;
-            _compareToText = compareToText;
-        }
+    private readonly Func<PropertyContext<TEntity, TProperty>, TProperty> _compareToValue = compareToValue.ThrowIfNull();
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompareValueRule{TEntity, TProperty}"/> class specifying the compare to value function.
-        /// </summary>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToValueFunction">The compare to value function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        public CompareValueRule(CompareOperator compareOperator, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null) : base(compareOperator)
-        {
-            _compareToValueFunction = compareToValueFunction.ThrowIfNull(nameof(compareToValueFunction));
-            _compareToTextFunction = compareToTextFunction;
-            _compareToValue = default!;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompareValueRule{TEntity, TProperty}"/> class specifying the compare to value async function.
-        /// </summary>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToValueFunctionAsync">The compare to value function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunctionAsync"/>).</param>
-        public CompareValueRule(CompareOperator compareOperator, Func<TEntity, CancellationToken, Task<TProperty>> compareToValueFunctionAsync, Func<TEntity, LText>? compareToTextFunction = null) : base(compareOperator)
-        {
-            _compareToValueFunctionAsync = compareToValueFunctionAsync.ThrowIfNull(nameof(compareToValueFunctionAsync));
-            _compareToTextFunction = compareToTextFunction;
-            _compareToValue = default!;
-        }
-
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            context.ThrowIfNull(nameof(context));
-
-            var compareToValue = _compareToValueFunction != null
-                ? _compareToValueFunction(context.Parent.Value!) 
-                : (_compareToValueFunctionAsync != null
-                    ? await _compareToValueFunctionAsync(context.Parent.Value!, cancellationToken).ConfigureAwait(false)
-                    : _compareToValue);
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        // Get the compare to value; where is null then simply skip the comparison.
+        var compareTo = _compareToValue(context);
+        if (compareTo is null)
+            return Task.CompletedTask;
 
-            if (!Compare(context.Value, compareToValue))
-            {
-                string? compareToText = _compareToText ?? compareToValue?.ToString() ?? new LText("null");
-                if (_compareToTextFunction != null)
-                    compareToText = _compareToTextFunction(context.Parent.Value!);
+        // Perform the comparison.
+        if (!Compare(context.Value, compareTo))
+            CreateErrorMessage(context, compareTo);
 
-                CreateErrorMessage(context, compareToText);
-            }
-        }
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CompareValuesRule.cs b/src/CoreEx.Validation/Rules/CompareValuesRule.cs
index e6fea326..f5ca83c9 100644
--- a/src/CoreEx.Validation/Rules/CompareValuesRule.cs
+++ b/src/CoreEx.Validation/Rules/CompareValuesRule.cs
@@ -1,63 +1,40 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a comparison validation against one or more values.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="compareToValues">The compare-to value(s).</param>
+/// <param name="comparer">The optional <see cref="IEqualityComparer{T}"/>.</param>
+/// <param name="overrideValueWhereMatched">Indicates whether to override the underlying property value with the corresponding matched value.</param>
+public sealed class CompareValuesRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>, IEnumerable<TProperty>> compareToValues, IEqualityComparer<TProperty>? comparer = null, bool overrideValueWhereMatched = false)
+    : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IEquatable<TProperty>
 {
-    /// <summary>
-    /// Provides a comparision validation against one or more values.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class CompareValuesRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly IEnumerable<TProperty>? _compareToValues;
-        private readonly Func<TEntity, CancellationToken, Task<IEnumerable<TProperty>>>? _compareToValuesFunctionAsync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompareValuesRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        private CompareValuesRule() => ValidateWhenDefault = false;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompareValuesRule{TEntity, TProperty}"/> class specifying the compare to values (as an <see cref="CompareOperator.Equal"/>).
-        /// </summary>
-        /// <param name="compareToValues">The compare to values.</param>
-        public CompareValuesRule(IEnumerable<TProperty> compareToValues) : this() 
-            => _compareToValues = compareToValues.ThrowIfNull(nameof(compareToValues));
+    private readonly Func<PropertyContext<TEntity, TProperty>, IEnumerable<TProperty>> _compareToValues = compareToValues.ThrowIfNull();
+    private readonly IEqualityComparer<TProperty> _comparer = comparer ?? EqualityComparer<TProperty>.Default;
+    private readonly bool _overrideValueWhereMatched = overrideValueWhereMatched;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CompareValuesRule{TEntity, TProperty}"/> class specifying the compare to values async function (as an <see cref="CompareOperator.Equal"/>).
-        /// </summary>
-        /// <param name="compareToValuesFunctionAsync">The compare to values function.</param>
-        public CompareValuesRule(Func<TEntity, CancellationToken, Task<IEnumerable<TProperty>>> compareToValuesFunctionAsync) : this()
-            =>  _compareToValuesFunctionAsync = compareToValuesFunctionAsync.ThrowIfNull(nameof(compareToValuesFunctionAsync));
-
-        /// <summary>
-        /// Gets or sets the <see cref="IEqualityComparer{T}"/>.
-        /// </summary>
-        public IEqualityComparer<TProperty?> EqualityComparer { get; set; } = EqualityComparer<TProperty?>.Default;
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        // Get the compare to value(s).
+        var compareToValues = _compareToValues(context);
+        if (compareToValues is null)
+            return Task.CompletedTask;
 
-        /// <summary>
-        /// Indicates whether to override the underlying property value with the corresponding matched value.
-        /// </summary>
-        public bool OverrideValue { get; set; }
+        // Perform the comparison.
+        if (!compareToValues.Any(v => _comparer.Equals(context.Value, v)))
+            context.AddError(ErrorText ?? ValidatorStrings.InvalidFormat);
 
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        // Override the value where matched, is requested, and is different.
+        if (_overrideValueWhereMatched)
         {
-            context.ThrowIfNull(nameof(context));
-
-            // Perform the comparison, and override where selected.
-            var values = _compareToValues != null ? _compareToValues! : await _compareToValuesFunctionAsync!(context.Parent.Value!, cancellationToken).ConfigureAwait(false);
-            if (!values.Where(x => EqualityComparer.Equals(x, context.Value)).Any())
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidFormat);
-            else if (OverrideValue)
-                context.OverrideValue(values.Where(x => EqualityComparer.Equals(x, context.Value)).First());
+            var @override = compareToValues.First(v => _comparer.Equals(context.Value, v));
+            if (!EqualityComparer<TProperty>.Default.Equals(@override, context.Value))
+                context.Override(@override);
         }
+
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/CustomRule.cs b/src/CoreEx.Validation/Rules/CustomRule.cs
deleted file mode 100644
index bf1ebeee..00000000
--- a/src/CoreEx.Validation/Rules/CustomRule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a custom validation against a specified property.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
-    public class CustomRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Func<PropertyContext<TEntity, TProperty>, Result>? _custom;
-        private readonly Func<PropertyContext<TEntity, TProperty>, CancellationToken, Task<Result>>? _customAsync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CustomRule{TEntity, TProperty}"/> class specifying the corresponding <paramref name="custom"/>.
-        /// </summary>
-        /// <param name="custom">The function to invoke to perform the custom validation.</param>
-        public CustomRule(Func<PropertyContext<TEntity, TProperty>, Result> custom) => _custom = custom.ThrowIfNull(nameof(custom));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CustomRule{TEntity, TProperty}"/> class specifying the corresponding <paramref name="customAsync"/>.
-        /// </summary>
-        /// <param name="customAsync">The function to invoke to perform the custom validation.</param>
-        public CustomRule(Func<PropertyContext<TEntity, TProperty>, CancellationToken, Task<Result>> customAsync) => _customAsync = customAsync.ThrowIfNull(nameof(customAsync));
-
-        /// <summary>
-        /// Validate the property value.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            Result result;
-            if (_customAsync == null)
-                result = _custom!(context);
-            else
-                result = await _customAsync(context, cancellationToken).ConfigureAwait(false);
-
-            context.Parent.SetFailureResult(result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/DecimalRule.cs b/src/CoreEx.Validation/Rules/DecimalRule.cs
index 0bb4d1cc..582a6d0f 100644
--- a/src/CoreEx.Validation/Rules/DecimalRule.cs
+++ b/src/CoreEx.Validation/Rules/DecimalRule.cs
@@ -1,90 +1,61 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a decimal validation to check <paramref name="precision"/>, <paramref name="scale"/> and whether negatives are allowed (defaults to <see langword="true"/>, i.e. allowed).
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+/// <param name="scale">The maximum number of decimal places.</param>
+/// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+/// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.
+/// <para>Internally converts to the property value to a <see cref="decimal"/>. Other floating-point types (<see cref="float"/> and <see cref="double"/>) are generally not supported as precision might be lost during conversion.</para></remarks>
+public sealed class DecimalRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>,int?>? precision, Func<PropertyContext<TEntity, TProperty>, int?>? scale = null, Func<PropertyContext<TEntity, TProperty>, bool>? allowNegatives = null) : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IFloatingPoint<TProperty>
 {
-    /// <summary>
-    /// Represents a numeric rule that validates the maximum <see cref="DecimalPlaces"/> (fractional-part length aka scale) and <see cref="MaxDigits"/> (being the sum of the integer-part and fractional-part lengths aka precision).
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <remarks>Internally converts to the property value to a <see cref="decimal"/>. Floating-point types (<see cref="float"/> and <see cref="double"/>) are generally not supported
-    /// as precision might be lost during conversion. For more information on integer- and fractional-part see <see href="https://en.wikipedia.org/wiki/Fractional_part"/>.</remarks>
-    public class DecimalRule<TEntity, TProperty> : NumericRule<TEntity, TProperty> where TEntity : class
-    {
-        private int? _maxDigits;
-        private int? _decimalPlaces;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DecimalRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        public DecimalRule() => ValidateWhenDefault = false;
-
-        /// <summary>
-        /// Gets or sets the maximum digits being the sum of the integer-part and fractional-part (<see cref="DecimalPlaces"/>) lengths; also known as precision.
-        /// </summary>
-        /// <remarks>For example, to validate a number with the pattern '999.99', then <see cref="MaxDigits"/> would be 5 and <see cref="DecimalPlaces"/> would be 2. Minimum specified value is 1.</remarks>
-        public int? MaxDigits
-        {
-            get { return _maxDigits; }
-
-            set
-            {
-                if (value.HasValue && value.Value < 1)
-                    throw new ArgumentException("Minimum value (where specified) for MaxDigits is 1.");
+    private readonly Func<PropertyContext<TEntity, TProperty>, int?>? _precision = precision;
+    private readonly Func<PropertyContext<TEntity, TProperty>, int?>? _scale = scale;
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool> _allowNegativesFunc = allowNegatives ?? (_ => true);
 
-                _maxDigits = value;
-            }
-        }
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        var precision = _precision?.Invoke(context);
+        var scale = _scale?.Invoke(context);
+        var allowNegatives = _allowNegativesFunc(context);
 
-        /// <summary>
-        /// Gets or sets the maximum supported number of decimal places (fractional-part length); also known as scale.
-        /// </summary>
-        /// <remarks>Minimum specified value is 0.</remarks>
-        public int? DecimalPlaces
-        {
-            get { return _decimalPlaces; }
+        if (precision.HasValue && precision.Value < 1)
+            throw new InvalidOperationException("Precision minimum value (where specified) is 1.");
 
-            set
-            {
-                if (value.HasValue && value.Value < 0)
-                    throw new ArgumentException("Minimum value (where specified) for DecimalPlaces is 0.");
+        if (scale.HasValue && scale.Value < 0)
+            throw new InvalidOperationException("Scale minimum value (where specified) is 0.");
 
-                _decimalPlaces = value;
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        // Validate the scale and/or precision where specified.
+        if (precision is not null || scale is not null)
         {
             // Convert numeric to a decimal value.
-            decimal value = Convert.ToDecimal(context.Value, System.Globalization.CultureInfo.CurrentCulture);
+            var value = decimal.CreateChecked(context.Value);
+            var integralLength = precision.HasValue ? DecimalRuleHelper.CalcIntegralPartLength(value) : 0;
+            var fractionalLength = precision.HasValue || scale.HasValue ? DecimalRuleHelper.CalcFractionalPartLength(value) : 0;
 
-            // Check if negative.
-            if (!AllowNegatives && value < 0)
+            // Check the precision.
+            if (precision.HasValue && !DecimalRuleHelper.CheckPrecision(precision.Value, scale, integralLength, fractionalLength))
             {
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.AllowNegativesFormat);
+                context.AddError(ErrorText ?? ValidatorStrings.MaxDigitsFormat, precision);
                 return Task.CompletedTask;
             }
 
-            int il = MaxDigits.HasValue ? DecimalRuleHelper.CalcIntegerPartLength(value) : 0;
-            int dp = MaxDigits.HasValue || DecimalPlaces.HasValue ? DecimalRuleHelper.CalcFractionalPartLength(value) : 0;
-
-            // Check max digits.
-            if (MaxDigits.HasValue && !DecimalRuleHelper.CheckMaxDigits(MaxDigits.Value, DecimalPlaces, il, dp))
+            // Check the scale.
+            if (scale.HasValue && !DecimalRuleHelper.CheckScale(scale.Value, fractionalLength))
             {
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxDigitsFormat, MaxDigits);
+                context.AddError(ErrorText ?? ValidatorStrings.DecimalPlacesFormat, scale);
                 return Task.CompletedTask;
             }
+        }
 
-            // Check decimal places.
-            if (DecimalPlaces.HasValue && !DecimalRuleHelper.CheckDecimalPlaces(DecimalPlaces.Value, dp))
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.DecimalPlacesFormat, DecimalPlaces);
+        // Finally, check for negatives.
+        if (!allowNegatives && TProperty.IsNegative(context.Value))
+            context.AddError(ErrorText ?? ValidatorStrings.AllowNegativesFormat);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/DecimalRuleHelper.cs b/src/CoreEx.Validation/Rules/DecimalRuleHelper.cs
deleted file mode 100644
index 657b2f2d..00000000
--- a/src/CoreEx.Validation/Rules/DecimalRuleHelper.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Represents a helper for the <see cref="DecimalRule{TEntity, TProperty}"/>.
-    /// </summary>
-    public static class DecimalRuleHelper
-    {
-        /// <summary>
-        /// Checks the <paramref name="value"/> for the max digits.
-        /// </summary>
-        /// <param name="value">The value to check.</param>
-        /// <param name="maxDigits">The maximum digits (including <paramref name="decimalPlaces"/>).</param>
-        /// <param name="decimalPlaces">The maximum number of decimal places.</param>
-        /// <returns><c>true</c> where valid; otherwise, <c>false</c>.</returns>
-        public static bool CheckMaxDigits(decimal value, int maxDigits, int? decimalPlaces = null)
-        {
-            if (maxDigits < 1)
-                throw new ArgumentException("MaxDigits must be 1 or greater.", nameof(maxDigits));
-
-            if (decimalPlaces.HasValue && decimalPlaces.Value < 0)
-                throw new ArgumentException("DecimalPlaces cannot be negative.", nameof(decimalPlaces));
-
-            if (value == 0)
-                return true;
-
-            return CheckMaxDigits(maxDigits, decimalPlaces, CalcIntegerPartLength(value), CalcFractionalPartLength(value));
-        }
-
-        /// <summary>
-        /// Checks the max digits.
-        /// </summary>
-        internal static bool CheckMaxDigits(int maxDigits, int? decimalPlaces, int il, int dp) => (il + (decimalPlaces ?? dp)) <= maxDigits;
-
-        /// <summary>
-        /// Checks the <paramref name="value"/> to determine whether the fractional-part length is greater than the specified maximum number of decimal places.
-        /// </summary>
-        /// <param name="value">The value to check.</param>
-        /// <param name="decimalPlaces">The maximum number of decimal places.</param>
-        /// <returns><c>true</c> where valid; otherwise, <c>false</c>.</returns>
-        public static bool CheckDecimalPlaces(decimal value, int decimalPlaces)
-        {
-            if (decimalPlaces < 0)
-                throw new ArgumentException("DecimalPlaces cannot be negative.", nameof(decimalPlaces));
-
-            if (value == 0)
-                return true;
-
-            return CheckDecimalPlaces(decimalPlaces, CalcFractionalPartLength(value));
-        }
-
-        /// <summary>
-        /// Checks the decimal places.
-        /// </summary>
-        internal static bool CheckDecimalPlaces(int decimalPlaces, int dp) => dp <= decimalPlaces;
-
-        /// <summary>
-        /// Calculates the integer-part length for a <see cref="decimal"/> value.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The integer-part length.</returns>
-        public static int CalcIntegerPartLength(decimal value)
-        {
-            if (value == 0)
-                return 0;
-
-            var floor = (double)Math.Floor(Math.Abs(value));
-            if (floor == 0)
-                return 0;
-
-            return (int)Math.Floor(Math.Log10(floor)) + 1;
-        }
-
-        /// <summary>
-        /// Calculates the fractional-part length for a <see cref="decimal"/> value.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The fractional-part length.</returns>
-        public static int CalcFractionalPartLength(decimal value)
-        {
-            if (value == 0)
-                return 0;
-
-            value %= 1;
-            if (value == 0)
-                return 0;
-
-            int count = -1;
-            while (value % 10m != 0m)
-            {
-                value *= 10m;
-                count++;
-            }
-
-            return count < 0 ? 0 : count;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/DictionaryRule.cs b/src/CoreEx.Validation/Rules/DictionaryRule.cs
index 0012a65a..4a0b813d 100644
--- a/src/CoreEx.Validation/Rules/DictionaryRule.cs
+++ b/src/CoreEx.Validation/Rules/DictionaryRule.cs
@@ -1,138 +1,236 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a dictionary (<see cref="IDictionary"/>) validation including item-based validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/> (<see cref="IDictionary{TKey, TValue}"/>).</typeparam>
+/// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+/// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+/// <remarks>The dictionary validation constrains the key and value to being defined using a <see langword="notnull"/> to limit usage challenges with this library (lack of generic covariance) limits native
+/// support. However, having said that, a <see cref="Dictionary{TKey, TValue}"/> does not support null keys anyway.</remarks>
+public sealed class DictionaryRule<TEntity, TProperty, TKey, TValue> : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IDictionary<TKey, TValue> where TKey : notnull where TValue : notnull
+{
+    private readonly Func<PropertyContext<TEntity, TProperty>, int>? _minCount;
+    private readonly Func<PropertyContext<TEntity, TProperty>, int?>? _maxCount;
+    private readonly With _with;
 
-using CoreEx.Abstractions.Reflection;
-using System;
-using System.Collections;
-using System.Threading;
-using System.Threading.Tasks;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}"/> class.
+    /// </summary>
+    /// <param name="minCount">The minimum count.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="With"/>.</param>
+    public DictionaryRule(Func<PropertyContext<TEntity, TProperty>, int>? minCount, Func<PropertyContext<TEntity, TProperty>, int?>? maxCount, Func<With, With>? with)
+    {
+        _minCount = minCount;
+        _maxCount = maxCount;
+
+        var w = new With(this);
+        _with = with?.Invoke(w) ?? w;
+    }
+
+    /// <inheritdoc/>
+    protected async override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        var minCount = _minCount?.Invoke(context) ?? 0;
+        var maxCount = _maxCount?.Invoke(context);
+
+        if (minCount < 0)
+            throw new InvalidOperationException("Minimum count must not be negative.");
+
+        if (maxCount.HasValue)
+        {
+            if (maxCount.Value < 0)
+                throw new InvalidOperationException("Maximum count must not be negative.");
+
+            if (maxCount.Value < minCount)
+                throw new InvalidOperationException("Maximum count must not be less than minimum count.");
+        }
+
+        await _with.ValidateAsync(context, minCount, maxCount, cancellationToken).ConfigureAwait(false);
+    }
 
-namespace CoreEx.Validation.Rules
-{
     /// <summary>
-    /// Provides dictionary validation including <see cref="MinCount"/> and <see cref="MaxCount"/>.
+    /// Provides additional configuration options for the <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The dictionary property <see cref="Type"/>.</typeparam>
-    public class DictionaryRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IDictionary?
+    public sealed class With
     {
-        private readonly Type _keyType;
-        private readonly Type _valueType;
-        private IDictionaryRuleItem? _item;
+        private readonly DictionaryRule<TEntity, TProperty, TKey, TValue> _rule;
+        private Func<ValidationArgs, IValidatorEx<TKey>>? _getKeyValidator;
+        private Func<ValidationArgs, IValidatorEx<TValue>>? _getValueValidator;
+        private bool _hasAllowNullValues;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="With"/> class.
+        /// </summary>
+        internal With(DictionaryRule<TEntity, TProperty, TKey, TValue> rule) => _rule = rule;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DictionaryRule{TEntity, TProperty}"/> class.
+        /// Indicates that entries can have a <see langword="null"/> <see cref="DictionaryEntry.Value"/>.
         /// </summary>
-        public DictionaryRule()
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With AllowNullValues()
         {
-            var (kt, vt) = TypeReflector.GetDictionaryType(typeof(TProperty));
-            _keyType = kt!;
-            _valueType = vt!;
+            _hasAllowNullValues = true;
+            return this;
         }
 
         /// <summary>
-        /// Indicates whether the underlying dictionary key can be null.
+        /// Sets the specified <b>Key</b> <paramref name="configure"/>.
         /// </summary>
-        public bool AllowNullKeys { get; set; }
+        /// <param name="configure">The action to configure the <see cref="InlineValidator{TKey}.Validator"/>.</param>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithKeyValidator(Action<InlineValidator<TKey>.Validator>? configure) => WithKeyValidator(ValidatorStrings.KeyText, configure);
 
         /// <summary>
-        /// Indicates whether the underlying dictionary value can be null.
+        /// Sets the specified <b>Key</b> <paramref name="configure"/>.
         /// </summary>
-        public bool AllowNullValues { get; set; }
+        /// <param name="text">The property text.</param>
+        /// <param name="configure">The action to configure the <see cref="InlineValidator{TKey}.Validator"/>.</param>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithKeyValidator(LText text, Action<InlineValidator<TKey>.Validator>? configure)
+        {
+            _getKeyValidator = _getKeyValidator is null
+                ? _ => new ValidatingInlineValidator<TKey>(configure).WithName(Validation.KeyName).WithText(text)
+                : throw new InvalidOperationException("The dictionary rule can only have one Key validator.");
+
+            return this;
+        }
 
         /// <summary>
-        /// Gets or sets the minimum count;
+        /// Sets the specified <b>Value</b> <paramref name="configure"/>.
         /// </summary>
-        public int MinCount { get; set; }
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithValueValidator(Action<InlineValidator<TValue>.Validator>? configure) => WithValueValidator(new ValidatingInlineValidator<TValue>(configure));
 
         /// <summary>
-        /// Gets or sets the maximum count.
+        /// Sets the specified <b>Value</b> <paramref name="validator"/>.
         /// </summary>
-        public int? MaxCount { get; set; }
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithValueValidator(IValidatorEx<TValue> validator)
+        {
+            _getValueValidator = _getValueValidator is not null ? throw new InvalidOperationException("The dictionary rule can only have one Value validator.") : _ => validator.ThrowIfNull();
+            return this;
+        }
 
         /// <summary>
-        /// Gets or sets the dictionary item validation configuration.
+        /// Sets the specified <b>Value</b> <typeparamref name="TValidator"/> service (resolved at validation runtime).
         /// </summary>
-        public IDictionaryRuleItem? Item
+        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithValueValidator<TValidator>() where TValidator : IValidatorEx<TValue>
         {
-            get => _item;
-
-            set
-            {
-                if (value == null)
-                {
-                    _item = value;
-                    return;
-                }
-
-                if (_keyType != value.KeyType)
-                    throw new ArgumentException($"A DictionaryRule TProperty KeyType '{_keyType.Name}' must be the same as the Key {value.KeyType.Name}.");
-
-                if (_valueType != value.ValueType)
-                    throw new ArgumentException($"A DictionaryRule TProperty ValueType '{_valueType.Name}' must be the same as the Value {value.ValueType.Name}.");
-
-                _item = value;
-            }
+            _getValueValidator = _getValueValidator is not null ? throw new InvalidOperationException("The dictionary rule can only have one Value validator.") : args => CoreEx.Validation.Validator.Get<TValidator>(args.ServiceProvider);
+            return this;
         }
 
         /// <summary>
-        /// Overrides the <b>Check</b> method and will not validate where performing a shallow validation.
+        /// Sets the specified keyed <b>Value</b> <typeparamref name="TValidator"/> service (resolved at validation runtime).
         /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        protected override bool Check(PropertyContext<TEntity, TProperty> context) => !context.ThrowIfNull(nameof(context)).Parent.ShallowValidation && base.Check(context);
-
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
+        /// <param name="serviceKey">The service key.</param>
+        /// <returns>The <see cref="With"/> to support fluent-style method-chaining.</returns>
+        public With WithValueKeyedValidator<TValidator>(object? serviceKey) where TValidator : IValidatorEx<TValue>
         {
-            if (context.Value == null)
-                return;
+            _getValueValidator = _getValueValidator is not null ? throw new InvalidOperationException("The dictionary rule can only have one Value validator.") : args => CoreEx.Validation.Validator.GetKeyed<TValidator>(serviceKey, args.ServiceProvider);
+            return this;
+        }
 
-            // Iterate through the dictionary validating each of the items.
-            var i = 0;
+        /// <summary>
+        /// Validates each item within the dictionary.
+        /// </summary>
+        /// <param name="context"></param>
+        /// <param name="minCount">The minimum count.</param>
+        /// <param name="maxCount">The maximum count.</param>
+        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+        internal async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, int minCount, int? maxCount, CancellationToken cancellationToken)
+        {
             var hasNullKey = false;
             var hasNullValue = false;
-            foreach (var item in context.Value)
-            {
-                var de = (DictionaryEntry)item;
 
-                // Create the context args.
-                var args = context.CreateValidationArgs();
-                var indexer = $"[{de.Key}]";
-                args.FullyQualifiedEntityName += indexer;
-                args.FullyQualifiedJsonEntityName += indexer;
-                i++;
+            // Validate each item in the dictionary.
+            foreach (var kvp in context.Value)
+            {
+                bool hasKeyError = false;
 
-                if (!AllowNullKeys && de.Key == null)
+                // Validate the key.
+                if (kvp.Key is null)
                     hasNullKey = true;
+                else if (_getKeyValidator is not null)
+                {
+                    var args = context.CreateValidationArgs();
 
-                if (!AllowNullValues && de.Value == null)
-                    hasNullValue = true;
+                    // Where the key is a string, then set the name on the validator to support better error messages.
+                    var kv = _getKeyValidator.Invoke(args);
+                    if (kvp.Key is string s && !string.IsNullOrEmpty(s) && kv is ValidatingInlineValidator<TKey> vilv)
+                        vilv.WithName(s);
 
-                // Validate and merge.
-                if (de.Key != null && Item?.KeyValidator != null)
-                {
-                    var r = await Item.KeyValidator.ValidateAsync(de.Key, args, cancellationToken).ConfigureAwait(false);
+                    // Validate the key and merge the result.
+                    var r = await kv.ValidateAsync(kvp.Key, args, cancellationToken).ConfigureAwait(false);
+                    hasKeyError = r.HasErrors;
                     context.MergeResult(r);
                 }
 
-                if (de.Value != null && Item?.ValueValidator != null)
+                // Validate the value (only where key is considered valid; i.e. not null and passes validation where a validator is specified).
+                if (!hasKeyError)
                 {
-                    var r = await Item.ValueValidator.ValidateAsync(de.Value, args, cancellationToken).ConfigureAwait(false);
-                    context.MergeResult(r);
+                    if (kvp.Value is null)
+                        hasNullValue = true;
+                    else if (_getValueValidator is not null)
+                    {
+                        var args = CreateValidationArgs(context, kvp.Key?.ToString());
+
+                        var last = context.GetDictionaryKeySafe();
+                        context.SetDictionaryKey(kvp.Key);
+
+                        // Validate the value and merge the result.
+                        try
+                        {
+                            var vv = _getValueValidator.Invoke(args);
+                            var r = vv is ValidatingInlineValidator<TValue> vilv
+                                ? await vilv.ValidateEntityAsync(kvp.Value, args, cancellationToken).ConfigureAwait(false)
+                                : await vv.ValidateAsync(kvp.Value, args, cancellationToken).ConfigureAwait(false);
+
+                            context.MergeResult(r);
+                        }
+                        finally
+                        {
+                            context.SetDictionaryKey(last);
+                        }
+                    }
                 }
             }
 
+            // Emit the key and/or value error(s).
             if (hasNullKey)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.DictionaryNullKeyFormat);
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.DictionaryNullKeyFormat);
 
-            if (hasNullValue)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.DictionaryNullValueFormat);
+            if (hasNullValue && !_hasAllowNullValues)
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.DictionaryNullValueFormat);
 
             // Check the length/count.
-            if (i < MinCount)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MinCountFormat, MinCount);
-            else if (MaxCount.HasValue && i > MaxCount.Value)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxCountFormat, MaxCount);
+            var count = context.Value.Count;
+            if (count < minCount)
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.MinCountFormat, minCount);
+            else if (maxCount.HasValue && count > maxCount.Value)
+                context.AddError(_rule.ErrorText ?? ValidatorStrings.MaxCountFormat, maxCount);
+        }
+
+        /// <summary>
+        /// Creates the <see cref="ValidationArgs"/> for the specified <paramref name="key"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+        /// <param name="key">The dictionary key.</param>
+        /// <returns>The <see cref="ValidationArgs"/>.</returns>
+        private static ValidationArgs CreateValidationArgs(PropertyContext<TEntity, TProperty> context, string? key)
+        {
+            var args = context.CreateValidationArgs();
+            args.FullyQualifiedEntityName += $"[{(key ?? "null")}]";
+
+            // Note: an indexer for a dictionary from a JSON perspective is simply a property name; i.e. no square brackets.
+            args.FullyQualifiedJsonEntityName += $".{key ?? "null"}";
+            return args;
         }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/DictionaryRuleItem.cs b/src/CoreEx.Validation/Rules/DictionaryRuleItem.cs
deleted file mode 100644
index 0dfa6987..00000000
--- a/src/CoreEx.Validation/Rules/DictionaryRuleItem.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides the means to create a <see cref="DictionaryRuleItem{TKey, TValue}"/> instance.
-    /// </summary>
-    public static class DictionaryRuleItem
-    {
-        /// <summary>
-        /// Create an instance of the <see cref="DictionaryRuleItem{TKey, TValue}"/> class.
-        /// </summary>
-        /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The corresponding value <see cref="IValidatorEx{TValue}"/>.</param>
-        /// <param name="value">The corresponding value <see cref="IValidatorEx{TValue}"/>.</param>
-        /// <returns>The <see cref="DictionaryRuleItem{TKey, TValue}"/>.</returns>
-        public static DictionaryRuleItem<TKey, TValue> Create<TKey, TValue>(IValidatorEx<TKey>? key = null, IValidatorEx<TValue>? value = null) => new(key, value);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/DictionaryRuleItemT.cs b/src/CoreEx.Validation/Rules/DictionaryRuleItemT.cs
deleted file mode 100644
index 5a3de44b..00000000
--- a/src/CoreEx.Validation/Rules/DictionaryRuleItemT.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation configuration for an item (<see cref="KeyValuePair"/>) within a <see cref="DictionaryRule{TEntity, TProperty}"/>.
-    /// </summary>
-    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-    public sealed class DictionaryRuleItem<TKey, TValue> : IDictionaryRuleItem
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DictionaryRuleItem{TKey, TValue}"/> class with a corresponding <paramref name="valueValidator"/>.
-        /// </summary>
-        /// <param name="keyValidator">The corresponding key <see cref="IValidatorEx{TKey}"/>.</param>
-        /// <param name="valueValidator">The corresponding value <see cref="IValidatorEx{TValue}"/>.</param>
-        internal DictionaryRuleItem(IValidatorEx<TKey>? keyValidator, IValidatorEx<TValue>? valueValidator)
-        {
-            KeyValidator = keyValidator;
-            ValueValidator = valueValidator;
-        }
-
-        /// <inheritdoc/>
-        IValidatorEx? IDictionaryRuleItem.KeyValidator => KeyValidator;
-
-        /// <summary>
-        /// Gets the corresponding value <see cref="IValidatorEx{TValue}"/>.
-        /// </summary>
-        public IValidatorEx<TKey>? KeyValidator { get; private set; }
-
-        /// <inheritdoc/>
-        IValidatorEx? IDictionaryRuleItem.ValueValidator => ValueValidator;
-
-        /// <summary>
-        /// Gets the corresponding value <see cref="IValidatorEx{TValue}"/>.
-        /// </summary>
-        public IValidatorEx<TValue>? ValueValidator { get; private set; }
-
-        /// <inheritdoc/>
-        public Type ItemType => typeof(KeyValuePair<TKey, TValue>);
-
-        /// <inheritdoc/>
-        public Type KeyType => typeof(TKey);
-
-        /// <inheritdoc/>
-        public Type ValueType => typeof(TValue);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/DuplicateRule.cs b/src/CoreEx.Validation/Rules/DuplicateRule.cs
deleted file mode 100644
index ca787b63..00000000
--- a/src/CoreEx.Validation/Rules/DuplicateRule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation where the rule predicate <b>must</b> return <c>false</c> to not be considered a duplicate.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class DuplicateRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Predicate<TEntity>? _predicate;
-        private readonly Func<bool>? _duplicate;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DuplicateRule{TEntity, TProperty}"/> class with a <paramref name="predicate"/>.
-        /// </summary>
-        /// <param name="predicate">The must predicate.</param>
-        public DuplicateRule(Predicate<TEntity> predicate) => _predicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DuplicateRule{TEntity, TProperty}"/> class with a <paramref name="duplicate"/> function.
-        /// </summary>
-        /// <param name="duplicate">The duplicate function.</param>
-        public DuplicateRule(Func<bool> duplicate) => _duplicate = duplicate.ThrowIfNull(nameof(duplicate));
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (_predicate != null)
-            {
-                if (_predicate(context.Parent.Value!))
-                    context.CreateErrorMessage(ErrorText ?? ValidatorStrings.DuplicateFormat);
-            }
-            else
-            {
-                if (_duplicate!())
-                    context.CreateErrorMessage(ErrorText ?? ValidatorStrings.DuplicateFormat);
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EmailRule.cs b/src/CoreEx.Validation/Rules/EmailRule.cs
index 817d7c87..d58414bb 100644
--- a/src/CoreEx.Validation/Rules/EmailRule.cs
+++ b/src/CoreEx.Validation/Rules/EmailRule.cs
@@ -1,42 +1,26 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using System.ComponentModel.DataAnnotations;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides an e-mail <see langword="string"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <param name="maxLength">The optional maximum string length.</param>
+public sealed class EmailRule<TEntity>(Func<PropertyContext<TEntity, string>, int?>? maxLength) : PropertyRuleBase<TEntity, string> where TEntity : class
 {
-    /// <summary>
-    /// Provides <see cref="string"/> validation for an <b>e-mail</b> using the <see cref="EmailAddressAttribute"/> to perform the underlying validation.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    public class EmailRule<TEntity> : ValueRuleBase<TEntity, string> where TEntity : class
-    {
-        private static readonly EmailAddressAttribute _emailChecker = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmailRule{TEntity}"/> class.
-        /// </summary>
-        public EmailRule() => ValidateWhenDefault = false;
-
-        /// <summary>
-        /// Gets or sets the maximum length.
-        /// </summary>
-        public int? MaxLength { get; set; }
+    private readonly Func<PropertyContext<TEntity, string>, int?>? _maxLength = maxLength;
 
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellation)
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken)
+    {
+        if (!System.Net.Mail.MailAddress.TryCreate(context.Value, out _))
+            context.AddError(ErrorText ?? ValidatorStrings.EmailFormat);
+        else if (_maxLength is not null)
         {
-            if (!_emailChecker.IsValid(context.Value))
-            { 
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.EmailFormat);
-                return Task.CompletedTask;
-            }
-
-            if (MaxLength.HasValue && context.Value!.Length > MaxLength.Value)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxLengthFormat, MaxLength);
-
-            return Task.CompletedTask;
+            var maxLength = _maxLength(context);
+            if (maxLength.HasValue && context.Value!.Length > maxLength.Value)
+                context.AddError(ErrorText ?? ValidatorStrings.MaxLengthFormat, maxLength.Value);
         }
+
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EntityRule.cs b/src/CoreEx.Validation/Rules/EntityRule.cs
index 37863181..9bba0ea0 100644
--- a/src/CoreEx.Validation/Rules/EntityRule.cs
+++ b/src/CoreEx.Validation/Rules/EntityRule.cs
@@ -1,50 +1,86 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides entity validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public sealed class EntityRule<TEntity, TProperty> : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : class?
 {
+    internal Func<PropertyContext<TEntity, TProperty>, ValidationArgs, CancellationToken, Task<IValidationContext>>? _validationAsync;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EntityRule{TEntity, TProperty}"/> class.
+    /// </summary>
+    /// <param name="with">Extends configuration <see cref="With"/>.</param>
+    public EntityRule(Action<With> with)
+    {
+        var erw = new With(this);
+        with?.Invoke(erw);
+    }
+
+    /// <inheritdoc/>
+    protected override async Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        var vr = await _validationAsync.ThrowIfNull().Invoke(context, context.CreateValidationArgs(), cancellationToken).ConfigureAwait(false);
+        context.MergeResult(vr);
+    }
+
     /// <summary>
-    /// Provides entity validation.
+    /// Provides additional configuration options for the <see cref="EntityRule{TEntity, TProperty}"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
-    /// <param name="validator">The <see cref="IValidatorEx"/>.</param>
-    public class EntityRule<TEntity, TProperty, TValidator>(TValidator validator) : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : class? where TValidator : IValidatorEx
+    public class With
     {
+        private readonly EntityRule<TEntity, TProperty> _rule;
+
         /// <summary>
-        /// Gets the <see cref="IValidatorEx"/>.
+        /// Initializes a new instance of the <see cref="With"/> class.
         /// </summary>
-        public TValidator Validator { get; private set; } = validator.ThrowIfNull(nameof(validator));
+        /// <param name="rule">The owning <see cref="EntityRule{TEntity, TProperty}"/>.</param>
+        internal With(EntityRule<TEntity, TProperty> rule) => _rule = rule;
 
         /// <summary>
-        /// Overrides the <b>Check</b> method and will not validate where performing a shallow validation.
+        /// Sets the specified <paramref name="configure"/>.
         /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        protected override bool Check(PropertyContext<TEntity, TProperty> context) => !context.ThrowIfNull(nameof(context)).Parent.ShallowValidation && base.Check(context);
+        public void WithValidator(Action<InlineValidator<TProperty>.Validator>? configure) => WithValidator(new ValidatingInlineValidator<TProperty>(configure));
 
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        /// <summary>
+        /// Sets the specified <paramref name="validator"/>.
+        /// </summary>
+        public void WithValidator(IValidatorEx<TProperty> validator)
         {
-            // Exit where nothing to validate.
-            if (context.Value == null)
-                return;
-
-            if (Validator is CommonValidator<TProperty> vp) // Common validators need the originating context for best results.
+            validator.ThrowIfNull();
+            _rule._validationAsync = async (context, args, cancellationToken) =>
             {
-                await vp.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
-                return;
-            }
-
-            // Create the context args.
-            var args = context.CreateValidationArgs();
+                var value = context.Metadata.GetValue<TProperty>(context.Entity);
+                if (validator is ValidatingInlineValidator<TProperty> vilv)
+                    return await vilv.ValidateEntityAsync(value, args, cancellationToken).ConfigureAwait(false);
 
-            // Validate and merge.
-            context.MergeResult(await Validator.ValidateAsync(context.Value, args, cancellationToken).ConfigureAwait(false));
+                return await validator.ValidateAsync(value, args, cancellationToken).ConfigureAwait(false);
+            };
         }
+
+        /// <summary>
+        /// Sets the specified <typeparamref name="TValidator"/>.
+        /// </summary>
+        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
+        public void WithValidator<TValidator>() where TValidator : IValidatorEx<TProperty> => _rule._validationAsync = async (context, args, cancellationToken) =>
+        {
+            var validator = Validator.Get<TValidator>(args.ServiceProvider);
+            var value = context.Metadata.GetValue<TProperty>(context.Entity);
+            return await validator.ValidateAsync(value, args, cancellationToken).ConfigureAwait(false);
+        };
+
+        /// <summary>
+        /// Sets the specified keyed <typeparamref name="TValidator"/>.
+        /// </summary>
+        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
+        /// <param name="serviceKey">The service key.</param>
+        public void WithKeyedValidator<TValidator>(object? serviceKey) where TValidator : IValidatorEx<TProperty> => _rule._validationAsync = async (context, args, cancellationToken) =>
+        {
+            var validator = Validator.GetKeyed<TValidator>(serviceKey, args.ServiceProvider);
+            var value = context.Metadata.GetValue<TProperty>(context.Entity);
+            return await validator.ValidateAsync(value, args, cancellationToken).ConfigureAwait(false);
+        };
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EntityRuleWith.cs b/src/CoreEx.Validation/Rules/EntityRuleWith.cs
deleted file mode 100644
index 02f1e36d..00000000
--- a/src/CoreEx.Validation/Rules/EntityRuleWith.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a means to add an <see cref="EntityRule{TEntity, TProperty, TValidator}"/> using a validator <see cref="With"/> a specified validator <see cref="Type"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <param name="parent">The parent <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
-    public class EntityRuleWith<TEntity, TProperty>(IPropertyRule<TEntity, TProperty> parent) where TEntity : class where TProperty : class?
-    {
-        private readonly IPropertyRule<TEntity, TProperty> _parent = parent.ThrowIfNull(nameof(parent));
-
-        /// <summary>
-        /// Adds an <see cref="EntityRule{TEntity, TProperty, TValidator}"/> using a validator <see cref="With"/> a specified <typeparamref name="TValidator"/>.
-        /// </summary>
-        /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>; defaults to <see cref="ExecutionContext.ServiceProvider"/> where not specified.</param>
-        /// <returns>A <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        public IPropertyRule<TEntity, TProperty> With<TValidator>(IServiceProvider? serviceProvider = null) where TValidator : IValidatorEx
-        {
-            _parent.AddRule(new EntityRule<TEntity, TProperty, TValidator>(Validator.Create<TValidator>(serviceProvider)));
-            return _parent;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EnumRule.cs b/src/CoreEx.Validation/Rules/EnumRule.cs
index 44de7a81..92283eb2 100644
--- a/src/CoreEx.Validation/Rules/EnumRule.cs
+++ b/src/CoreEx.Validation/Rules/EnumRule.cs
@@ -1,35 +1,34 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides an <see cref="Enum"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
+/// <param name="allowed">An optional list of allowed values.</param>
+public class EnumRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>, TProperty[]?>? allowed) : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : struct, Enum
 {
-    /// <summary>
-    /// Provides <see cref="Enum"/> validation to ensure that the value has been defined.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class EnumRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : struct, Enum
+    private readonly Func<PropertyContext<TEntity, TProperty>, TProperty[]?>? _allowed = allowed;
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnumRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        public EnumRule() => ValidateWhenDefault = false;
+        if (!Enum.IsDefined(context.Value))
+            context.AddError(ErrorText ?? ValidatorStrings.InvalidFormat);
 
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+        if (_allowed is not null)
         {
-            // Make sure the enum is defined.
-#if NET6_0_OR_GREATER
-            if (!Enum.IsDefined(context.Value))
-#else
-            if (!Enum.IsDefined(typeof(TProperty), context.Value))
-#endif
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidFormat);
-
-            return Task.CompletedTask;
+            var allowed = _allowed(context);
+            if (allowed is not null && allowed.Length > 0 && !allowed.Contains(context.Value))
+                context.AddError(ErrorText ?? ValidatorStrings.InvalidFormat);
         }
+
+        return Task.CompletedTask;
     }
+
+    /// <summary>
+    /// Provides a corresponding <see cref="Nullable{T}"/> <see cref="Enum"/> validation..
+    /// </summary>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public sealed class NullableRule(Func<PropertyContext<TEntity, TProperty>, TProperty[]?>? allowed) : EnumRule<TEntity, TProperty>(allowed) { }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EnumStringRule.cs b/src/CoreEx.Validation/Rules/EnumStringRule.cs
new file mode 100644
index 00000000..693c9d62
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/EnumStringRule.cs
@@ -0,0 +1,99 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides an <see cref="Enum"/> <see langword="string"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+public class EnumStringRule<TEntity> : PropertyRuleBase<TEntity, string> where TEntity : class
+{
+    private readonly EnumWith _with;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EnumStringRule{TEntity}"/> class.
+    /// </summary>
+    /// <param name="with">Extended <see cref="EnumWith"/> configuration.</param>
+    public EnumStringRule(Func<EnumWith, EnumWith> with)
+    {
+        _with = new EnumWith(this);
+        with.ThrowIfNull().Invoke(_with);
+    }
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken)
+    {
+        if (_with.Validator is not null && !_with.Validator(context))
+            context.AddError(ErrorText ?? ValidatorStrings.InvalidFormat);
+
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Provides additional configuration options for the <see cref="EnumStringRule{TEntity}"/>.
+    /// </summary>
+    public class EnumWith
+    {
+        private readonly EnumStringRule<TEntity> _rule;
+        private bool _ignoreCasing;
+        private bool _overrideValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnumWith"/> class.
+        /// </summary>
+        internal EnumWith(EnumStringRule<TEntity> rule) => _rule = rule;
+
+        /// <summary>
+        /// Gets the configured validator.
+        /// </summary>
+        internal Func<PropertyContext<TEntity, string>, bool>? Validator { get; set; }
+
+        /// <summary>
+        /// Indicates whether to ignore casing when parsing the <see cref="Enum"/> value.
+        /// </summary>
+        public EnumWith IgnoreCase()
+        {
+            _ignoreCasing = true;
+            return this;
+        }
+
+        /// <summary>
+        /// Indicates whether the value should be overridden with the parsed value.
+        /// </summary>
+        /// <remarks>The value must be mutable otherwise an <see cref="InvalidOperationException"/> will be thrown at runtime.</remarks>
+        public EnumWith Override()
+        {
+            _overrideValue = true;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the <see cref="Enum"/> <see cref="Type"/> used to validate the value.
+        /// </summary>
+        /// <typeparam name="TEnum">The <see cref="Enum"/> <see cref="Type"/>.</typeparam>
+        /// <param name="allowed">An optional list of allowed values.</param>
+        public EnumWith With<TEnum>(params TEnum[] allowed) where TEnum : struct, Enum 
+        {
+            Validator = Validator is not null ? throw new InvalidOperationException("The Enum rule can only have one validator.") : (context) =>
+            {
+                if (!Enum.TryParse<TEnum>(context.Value, _ignoreCasing, out var @enum))
+                    return false;
+
+                if (allowed is not null && allowed.Length > 0 && !allowed.Contains(@enum))
+                    return false;
+
+                if (_overrideValue)
+                    context.Override(@enum.ToString());
+
+                return true;
+            };
+
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the <see cref="Enum"/> <see cref="Type"/> used to validate the value.
+        /// </summary>
+        /// <typeparam name="TEnum">The <see cref="Enum"/> <see cref="Type"/>.</typeparam>
+        /// <param name="allowed">An optional list of allowed values.</param>
+        public EnumWith With<TEnum>(IEnumerable<TEnum> allowed) where TEnum : struct, Enum => With(allowed?.ToArray() ?? []);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EnumValueRule.cs b/src/CoreEx.Validation/Rules/EnumValueRule.cs
deleted file mode 100644
index 19781a79..00000000
--- a/src/CoreEx.Validation/Rules/EnumValueRule.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides <see cref="string"/> validation against an <see cref="Enum"/> value.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TEnum">The corresponding <see cref="Enum"/> <see cref="Type"/>.</typeparam>
-    public class EnumValueRule<TEntity, TEnum> : ValueRuleBase<TEntity, string> where TEntity : class where TEnum : struct, Enum
-    {
-        /// <summary>
-        /// Initializes a new <see cref="EnumValueRule{TEntity, TEnum}"/> class.
-        /// </summary>
-        public EnumValueRule() => ValidateWhenDefault = false;
-
-        /// <summary>
-        /// Indicates whether to ignore the casing of the value when parsing the <typeparamref name="TEnum"/>.
-        /// </summary>
-        public bool IgnoreCase { get; set; }
-
-        /// <summary>
-        /// Indicates whether to override the underlying property value with the corresponding <see cref="Enum"/> name.
-        /// </summary>
-        /// <remarks>This is only applicable where <see cref="IgnoreCase"/> is true.</remarks>
-        public bool OverrideValue { get; set; }
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellation)
-        {
-            if (!Enum.TryParse<TEnum>(context.Value!, IgnoreCase, out var val))
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidFormat);
-            else if (IgnoreCase && OverrideValue)
-                context.OverrideValue(val.ToString());
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/EnumValueRuleAs.cs b/src/CoreEx.Validation/Rules/EnumValueRuleAs.cs
deleted file mode 100644
index c85052d6..00000000
--- a/src/CoreEx.Validation/Rules/EnumValueRuleAs.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a means to add an <see cref="EnumValueRule{TEntity, TEnum}"/> <see cref="As"/> a specified <see cref="Enum"/> <see cref="Type"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <param name="parent">The parent <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
-    public class EnumValueRuleAs<TEntity>(IPropertyRule<TEntity, string> parent) where TEntity : class
-    {
-        private readonly IPropertyRule<TEntity, string> _parent = parent.ThrowIfNull(nameof(parent));
-
-        /// <summary>
-        /// Adds an <see cref="EntityRule{TEntity, TProperty, TValidator}"/> using a validator <see cref="As"/> a specified <typeparamref name="TEnum"/>.
-        /// </summary>
-        /// <typeparam name="TEnum">The property <see cref="Enum"/> <see cref="Type"/>.</typeparam>
-        /// <param name="ignoreCase">Indicates whether to ignore the casing of the value when parsing the <typeparamref name="TEnum"/>.</param>
-        /// <param name="overrideValue">Indicates whether to override the underlying property value with the corresponding <see cref="Enum"/> name.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        public IPropertyRule<TEntity, string> As<TEnum>(bool ignoreCase = false, bool overrideValue = false, LText? errorText = null) where TEnum : struct, Enum
-        {
-            _parent.AddRule(new EnumValueRule<TEntity, TEnum> { IgnoreCase = ignoreCase, OverrideValue = overrideValue, ErrorText = errorText });
-            return _parent;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ErrorRule.cs b/src/CoreEx.Validation/Rules/ErrorRule.cs
new file mode 100644
index 00000000..05bc9307
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/ErrorRule.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a validation rule that will always emit an error; unless, a succeeding conditional clause prevents it.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
+/// <param name="errorText">The resulting default error <see cref="LText"/>.</param>
+public class ErrorRule<TEntity, TProperty>(LText errorText) : PropertyRuleBase<TEntity, TProperty> where TEntity : class
+{
+    private readonly LText _errorText = errorText;
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        context.AddError(ErrorText ?? _errorText);
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ExistsRule.cs b/src/CoreEx.Validation/Rules/ExistsRule.cs
deleted file mode 100644
index 06643fbe..00000000
--- a/src/CoreEx.Validation/Rules/ExistsRule.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Http;
-using CoreEx.Results;
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation where the rule predicate <b>must</b> return <c>true</c> or a value to verify it exists.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class ExistsRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Predicate<TEntity>? _predicate;
-        private readonly Func<TEntity, CancellationToken, Task<bool>>? _exists;
-        private readonly Func<TEntity, CancellationToken, Task<object?>>? _existsNotNull;
-        private readonly Func<TEntity, CancellationToken, Task<HttpResultBase>>? _httpResult;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExistsRule{TEntity, TProperty}"/> class with a <paramref name="predicate"/>.
-        /// </summary>
-        /// <param name="predicate">The must predicate.</param>
-        public ExistsRule(Predicate<TEntity> predicate) => _predicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExistsRule{TEntity, TProperty}"/> class with an <paramref name="exists"/> function that must return true.
-        /// </summary>
-        /// <param name="exists">The exists function.</param>
-        public ExistsRule(Func<TEntity, CancellationToken, Task<bool>> exists) => _exists = exists.ThrowIfNull(nameof(exists));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExistsRule{TEntity, TProperty}"/> class with an <paramref name="exists"/> function that must return a value.
-        /// </summary>
-        /// <param name="exists">The exists function.</param>
-        /// <remarks>Where the resultant value is an <see cref="IResult"/> then existence is confirmed when <see cref="IResult.IsSuccess"/> and the the underlying <see cref="IResult.Value"/> is not null.</remarks>
-        public ExistsRule(Func<TEntity, CancellationToken, Task<object?>> exists) => _existsNotNull = exists.ThrowIfNull(nameof(exists));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ExistsRule{TEntity, TProperty}"/> class with an <paramref name="httpResult"/> function that must return a successful <see cref="HttpResultBase"/>.
-        /// </summary>
-        /// <param name="httpResult">The <see cref="HttpResult"/> function.</param>
-        /// <remarks>A result of <see cref="HttpResultBase.IsSuccess"/> implies exists, whilst a <see cref="HttpResultBase.StatusCode"/> of <see cref="HttpStatusCode.NotFound"/> does not.
-        /// Any other status code will result in the underlying <see cref="HttpResultBase.Response"/> <see cref="HttpResponseMessage.EnsureSuccessStatusCode"/> being invoked resulting in an
-        /// appropriate exception being thrown.</remarks>
-        public ExistsRule(Func<TEntity, CancellationToken, Task<HttpResultBase>> httpResult) => _httpResult = httpResult.ThrowIfNull(nameof(httpResult));
-
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (_predicate != null)
-            {
-                if (!_predicate(context.Parent.Value!))
-                    CreateErrorMessage(context);
-            }
-            else if (_exists != null)
-            {
-                if (!await _exists(context.Parent.Value!, cancellationToken).ConfigureAwait(false))
-                    CreateErrorMessage(context);
-            }
-            else if (_httpResult != null)
-            {
-                var r = await _httpResult(context.Parent.Value!, cancellationToken).ConfigureAwait(false);
-                if (r == null || r.Response == null)
-                    throw new InvalidOperationException("The HttpResult value is in an invalid state; the underlying Response property must not be null.");
-
-                if (!r.IsSuccess)
-                {
-                    if (r.StatusCode == HttpStatusCode.NotFound)
-                        CreateErrorMessage(context);
-                    else
-                        r.Response.EnsureSuccessStatusCode();
-                }
-            }
-            else
-            {
-                var value = await _existsNotNull!(context.Parent.Value!, cancellationToken).ConfigureAwait(false);
-                if (value == null)
-                    CreateErrorMessage(context);
-
-                if (value is IResult ir)
-                {
-                    if (ir.IsFailure)
-                        context.Parent.SetFailureResult(new Result(ir.Error));
-
-                    if (ir.Value is null)
-                        CreateErrorMessage(context);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Create the error message.
-        /// </summary>
-        private void CreateErrorMessage(PropertyContext<TEntity, TProperty> context) => context.CreateErrorMessage(ErrorText ?? ValidatorStrings.ExistsFormat);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ICollectionRuleItem.cs b/src/CoreEx.Validation/Rules/ICollectionRuleItem.cs
deleted file mode 100644
index 76964243..00000000
--- a/src/CoreEx.Validation/Rules/ICollectionRuleItem.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Enables the validation configuration for an item within a <see cref="CollectionRule{TEntity, TProperty}"/>.
-    /// </summary>
-    public interface ICollectionRuleItem
-    {
-        /// <summary>
-        /// Gets the corresponding item <see cref="IValidatorEx"/>.
-        /// </summary>
-        IValidatorEx? ItemValidator { get; }
-
-        /// <summary>
-        /// Gets the item <see cref="Type"/>.
-        /// </summary>
-        Type ItemType { get; }
-
-        /// <summary>
-        /// Performs the duplicate validation check.
-        /// </summary>
-        /// <param name="context">The <see cref="IPropertyContext"/>.</param>
-        /// <param name="items">The items to duplicate check.</param>
-        void DuplicateValidation(IPropertyContext context, IEnumerable? items);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IDictionaryRuleItem.cs b/src/CoreEx.Validation/Rules/IDictionaryRuleItem.cs
deleted file mode 100644
index 42e25b2c..00000000
--- a/src/CoreEx.Validation/Rules/IDictionaryRuleItem.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Enables the validation configuration for an item (<see cref="KeyValuePair"/>) within a <see cref="DictionaryRule{TEntity, TProperty}"/>.
-    /// </summary>
-    public interface IDictionaryRuleItem
-    {
-        /// <summary>
-        /// Gets the corresponding key <see cref="IValidatorEx"/>.
-        /// </summary>
-        IValidatorEx? KeyValidator { get; }
-
-        /// <summary>
-        /// Gets the corresponding value <see cref="IValidatorEx"/>.
-        /// </summary>
-        IValidatorEx? ValueValidator { get; }
-
-        /// <summary>
-        /// Gets the item <see cref="Type"/>.
-        /// </summary>
-        Type ItemType { get; }
-
-        /// <summary>
-        /// Gets the key <see cref="Type"/>.
-        /// </summary>
-        Type KeyType { get; }
-
-        /// <summary>
-        /// Gets the value <see cref="Type"/>.
-        /// </summary>
-        Type ValueType { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IPropertyRuleEx.cs b/src/CoreEx.Validation/Rules/IPropertyRuleEx.cs
new file mode 100644
index 00000000..48765494
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/IPropertyRuleEx.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Enables an extended property rule for an entity and property.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public interface IPropertyRuleEx<TEntity, TProperty> : IPropertyRule<TEntity, TProperty> where TEntity : class
+{
+    /// <summary>
+    /// Validates the value.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IPropertyRuleT.cs b/src/CoreEx.Validation/Rules/IPropertyRuleT.cs
new file mode 100644
index 00000000..1a2b6267
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/IPropertyRuleT.cs
@@ -0,0 +1,34 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Enables a property rule for an entity and property.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+public interface IPropertyRule<TEntity> where TEntity : class
+{
+    /// <summary>
+    /// Gets the error message format text (overrides the default) used for all property validation errors.
+    /// </summary>
+    LText? ErrorText { get; }
+
+    /// <summary>
+    /// Adds an <see cref="IPropertyClause{TEntity}"/>.
+    /// </summary>
+    /// <param name="clause">The <see cref="IPropertyClause{TEntity}"/>.</param>
+    void AddClause(IPropertyClause<TEntity> clause);
+
+    /// <summary>
+    /// Chains an <see cref="IPropertyRuleEx{TEntity, TProperty}"/> extending the current configuration.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity}"/>.</param>
+    /// <returns>The chained <paramref name="rule"/>.</returns>
+    /// <remarks>Chains an additional rule that is executed where the <see cref="ValidateAsync(IPropertyContext{TEntity}, CancellationToken)"/> is successful.</remarks>
+    void Chain(IPropertyRule<TEntity> rule);
+
+    /// <summary>
+    /// Validates the value.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task ValidateAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IPropertyRuleT2.cs b/src/CoreEx.Validation/Rules/IPropertyRuleT2.cs
new file mode 100644
index 00000000..6139acce
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/IPropertyRuleT2.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Enables a property rule for an entity and property.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public interface IPropertyRule<TEntity, out TProperty> : IPropertyRule<TEntity> where TEntity : class
+{
+    /// <summary>
+    /// Overrides the error message for the rule.
+    /// </summary>
+    /// <param name="errorText">The error <see cref="LText"/>.</param>
+    /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/> to support fluent-style method-chaining.</returns>
+    IPropertyRule<TEntity, TProperty> WithMessage(LText errorText);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IRootPropertyRuleT.cs b/src/CoreEx.Validation/Rules/IRootPropertyRuleT.cs
new file mode 100644
index 00000000..fb8ec8ee
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/IRootPropertyRuleT.cs
@@ -0,0 +1,50 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Enables root property rule capabilities.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+public interface IRootPropertyRule<TEntity> : IPropertyRule<TEntity> where TEntity : class
+{
+    /// <summary>
+    /// Indicates whether the originating property type is <see cref="Nullable{T}"/>.
+    /// </summary>
+    bool IsValueNullable { get; }
+
+    /// <summary>
+    /// Gets the originating property <see cref="Nullable{T}.Value"/> or <see langword="default"/> (where <see cref="IsValueNullable"/>).
+    /// </summary>
+    /// <typeparam name="T">The property <see cref="Nullable{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="entity">The entity value.</param>
+    /// <returns>The originating property <see cref="Nullable{T}.Value"/> or <see langword="default"/>.</returns>
+    T GetNullableValueOrDefault<T>(TEntity entity);
+
+    /// <summary>
+    /// Indicates whether the originating property <see cref="Nullable{T}.Value"/> is <see langword="default"/> (where <see cref="IsValueNullable"/>).
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    /// <returns><see langword="true"/> where <see langword="default"/>; otherwise, <see langword="false"/>.</returns>
+    bool IsNullableValueDefault(TEntity entity);
+
+    /// <summary>
+    /// Sets (overrides) the property text to be used within any error message.
+    /// </summary>
+    /// <param name="text">The property <see cref="LText"/>.</param>
+    void SetText(LText? text);
+
+    /// <summary>
+    /// Sets (overrides) the format to use when localizing the property value within any error message.
+    /// </summary>
+    /// <param name="format">The format.</param>
+    /// <param name="formatProvider">The optional <see cref="IFormatProvider"/>.</param>
+    /// <param name="quotingCharacter">The quoting character so it appears as a literal string.</param>
+    /// <remarks>The underlying property type must implement <see cref="IFormattable"/> as this results in <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> being used.</remarks>
+    void SetFormat(string? format, IFormatProvider? formatProvider, char? quotingCharacter);
+
+    /// <summary>
+    /// Validates the property value.
+    /// </summary>
+    /// <param name="context">The <see cref="ValidationContext{TEntity}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IRootPropertyRuleT2.cs b/src/CoreEx.Validation/Rules/IRootPropertyRuleT2.cs
new file mode 100644
index 00000000..9f03c51c
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/IRootPropertyRuleT2.cs
@@ -0,0 +1,8 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Enables root property rule capabilities.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public interface IRootPropertyRule<TEntity, TProperty> : IRootPropertyRule<TEntity>, IPropertyRule<TEntity, TProperty> where TEntity : class { }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IValueRule.cs b/src/CoreEx.Validation/Rules/IValueRule.cs
deleted file mode 100644
index a3d06b9d..00000000
--- a/src/CoreEx.Validation/Rules/IValueRule.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using CoreEx.Validation.Clauses;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides the rule to <see cref="ValidateAsync">validate</see> a value.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The value <see cref="System.Type"/>.</typeparam>
-    public interface IValueRule<TEntity, out TProperty> where TEntity : class
-    {
-        /// <summary>
-        /// Gets or sets the error message format text (overrides the default).
-        /// </summary>
-        LText? ErrorText { get; set; }
-
-        /// <summary>
-        /// Adds a <see cref="IPropertyRuleClause{TEntity}"/>.
-        /// </summary>
-        /// <param name="clause">The <see cref="IPropertyRuleClause{TEntity}"/>.</param>
-        void AddClause(IPropertyRuleClause<TEntity> clause);
-
-        /// <summary>
-        /// Checks the clauses.
-        /// </summary>
-        /// <param name="context">The <see cref="IPropertyContext"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        bool Check(IPropertyContext context);
-
-        /// <summary>
-        /// Validate the value.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task ValidateAsync(IPropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ImmutableRule.cs b/src/CoreEx.Validation/Rules/ImmutableRule.cs
deleted file mode 100644
index 66656e13..00000000
--- a/src/CoreEx.Validation/Rules/ImmutableRule.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation where the immutable rule predicate <b>must</b> return <c>true</c> to be considered valid.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class ImmutableRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Predicate<TEntity>? _predicate;
-        private readonly Func<bool>? _immutable;
-        private readonly Func<CancellationToken, Task<bool>>? _immutableAsync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRule{TEntity, TProperty}"/> class with a <paramref name="predicate"/>.
-        /// </summary>
-        /// <param name="predicate">The must predicate.</param>
-        public ImmutableRule(Predicate<TEntity> predicate) => _predicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRule{TEntity, TProperty}"/> class with an <paramref name="immutable"/> function.
-        /// </summary>
-        /// <param name="immutable">The immutable function.</param>
-        public ImmutableRule(Func<bool> immutable) => _immutable = immutable.ThrowIfNull(nameof(immutable));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImmutableRule{TEntity, TProperty}"/> class with an <paramref name="immutableAsync"/> function.
-        /// </summary>
-        /// <param name="immutableAsync">The immutable function.</param>
-        public ImmutableRule(Func<CancellationToken, Task<bool>> immutableAsync) => _immutableAsync = immutableAsync.ThrowIfNull(nameof(immutableAsync));
-
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (_predicate != null)
-            {
-                if (!_predicate.Invoke(context.Parent.Value!))
-                    CreateErrorMessage(context);
-            }
-            else if (_immutable != null)
-            {
-                if (!_immutable.Invoke())
-                    CreateErrorMessage(context);
-            }
-            else 
-            {
-                if (!await _immutableAsync!.Invoke(cancellationToken).ConfigureAwait(false))
-                    CreateErrorMessage(context);
-            }
-        }
-
-        /// <summary>
-        /// Create the error message.
-        /// </summary>
-        private void CreateErrorMessage(PropertyContext<TEntity, TProperty> context) => context.CreateErrorMessage(ErrorText ?? ValidatorStrings.ImmutableFormat);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/IncludeBaseRule.cs b/src/CoreEx.Validation/Rules/IncludeBaseRule.cs
new file mode 100644
index 00000000..c4181adb
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/IncludeBaseRule.cs
@@ -0,0 +1,60 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Represents a rule that enables a base validator to be included.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <param name="validator">The base validator.</param>
+/// <remarks>Implements <see cref="IRootPropertyRule{TEntity}"/> to enable usage for the likes of <see cref="ValidatorBase{TEntity, TSelf}.Rules"/>; however, acts as a pass-through proxy therefore will largely throw <see cref="NotImplementedException"/>.</remarks>
+internal class IncludeBaseRule<TEntity>(IValidatorEx validator) : IRootPropertyRule<TEntity> where TEntity : class
+{
+    private readonly IValidatorEx _validator = validator.ThrowIfNull();
+
+    /// <inheritdoc/>
+    bool IRootPropertyRule<TEntity>.IsValueNullable => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    LText? IPropertyRule<TEntity>.ErrorText { get => throw new NotImplementedException(); }
+
+    /// <inheritdoc/>
+    public void SetText(LText? text) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.AddClause(IPropertyClause<TEntity> clause) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.Chain(IPropertyRule<TEntity> rule) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    T IRootPropertyRule<TEntity>.GetNullableValueOrDefault<T>(TEntity entity) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    bool IRootPropertyRule<TEntity>.IsNullableValueDefault(TEntity entity) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    void IRootPropertyRule<TEntity>.SetFormat(string? format, IFormatProvider? formatProvider, char? quotingCharacter) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    async Task IRootPropertyRule<TEntity>.ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken)
+    {
+        // Create the args to pass through.
+        var args = new ValidationArgs
+        {
+            FullyQualifiedEntityName = context.FullyQualifiedEntityName,
+            FullyQualifiedJsonEntityName = context.FullyQualifiedJsonEntityName,
+            UseJsonNames = context.UseJsonNames,
+            Parameters = context.Parameters,
+            JsonSerializerOptions = context.JsonSerializerOptions,
+            ServiceProvider = context.ServiceProvider
+        };
+
+        // Validate.
+        var vr = await _validator.ValidateAsync(context.Value, args, cancellationToken).ConfigureAwait(false);
+
+        // Merge results.
+        context.MergeResult(vr);
+    }
+
+    /// <inheritdoc/>
+    Task IPropertyRule<TEntity>.ValidateAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken) => throw new NotImplementedException();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/InteropRule.cs b/src/CoreEx.Validation/Rules/InteropRule.cs
index 0059deee..2d3c096f 100644
--- a/src/CoreEx.Validation/Rules/InteropRule.cs
+++ b/src/CoreEx.Validation/Rules/InteropRule.cs
@@ -1,73 +1,32 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides an <i>interop</i> validation rule; intended for non-<c>CoreEx.Validation</c>.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="getValidator">The function to get the <see cref="IValidator{T}"/>.</param>
+/// <param name="validateWhenNull">Indicates whether the validation will be performed where the property value is <see langword="null"/>.</param>
+public class InteropRule<TEntity, TProperty>(Func<IValidator> getValidator, bool validateWhenNull) : PropertyRuleBase<TEntity, TProperty> where TEntity : class
 {
-    /// <summary>
-    /// Provides interop validation to a base <see cref="IValidator"/> (intended for non-<c>CoreEx.Validation</c>).
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TValidator">The property validator <see cref="Type"/>.</typeparam>
-    public class InteropRule<TEntity, TProperty, TValidator> : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : class? where TValidator : IValidator
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InteropRule{TEntity, TProperty, TValidator}"/> class.
-        /// </summary>
-        /// <param name="validatorFunc">The function to return the <see cref="IValidator"/>.</param>
-        public InteropRule(Func<TValidator> validatorFunc)
-        {
-            ValidatorFunc = validatorFunc.ThrowIfNull(nameof(validatorFunc));
-            if (validatorFunc is IValidatorEx)
-                throw new ArgumentException($"{ValidatorFunc.GetType().Name} implements {typeof(IValidatorEx).Name} and as such must use {typeof(EntityRule<,,>).Name}.", nameof(validatorFunc));
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IValidatorEx"/> function.
-        /// </summary>
-        public Func<TValidator> ValidatorFunc { get; private set; }
-
-        /// <summary>
-        /// Overrides the <b>Check</b> method and will not validate where performing a shallow validation.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        protected override bool Check(PropertyContext<TEntity, TProperty> context) => !context.ThrowIfNull(nameof(context)).Parent.ShallowValidation && base.Check(context);
+    private readonly Func<IValidator> _getValidator = getValidator.ThrowIfNull();
 
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            // Exit where nothing to validate.
-            if (context.Value == null)
-                return;
+    /// <inheritdoc/>
+    protected override bool ValidateWhenNull => validateWhenNull;
 
-            var v = ValidatorFunc() ?? throw new InvalidOperationException($"The {nameof(ValidatorFunc)} must return a non-null value.");
-            if (v is CommonValidator<TProperty> cv) // Common validators need the originating context for best results.
-            {
-                await cv.ValidateAsync(context, cancellationToken).ConfigureAwait(false); 
-                return;
-            }
-
-            if (v is IValidatorEx vex) // Use the "better" validator to enable.
-            {
-                // Create the context args.
-                var args = context.CreateValidationArgs();
-
-                // Validate and merge.
-                context.MergeResult(await vex.ValidateAsync(context.Value, args, cancellationToken).ConfigureAwait(false));
-                return;
-            }
-
-            // Validate and merge using basic "interop".
-            var ir = await v.ValidateAsync(context.Value, cancellationToken).ConfigureAwait(false);
+    /// <inheritdoc/>
+    protected async override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        var validator = _getValidator() ?? throw new InvalidOperationException("The get validator function must not return null.");
+        IValidationResult vr;
 
-            if (ir.HasErrors)
-                context.HasError = true;
+        if (validator is IValidatorEx<TProperty> vex)
+            vr = await vex.ValidateAsync(context.Value, context.CreateValidationArgs(), cancellationToken).ConfigureAwait(false);
+        else if (validator is IValidator<TProperty> vtx)
+            vr = await vtx.ValidateAsync(context.Value, cancellationToken).ConfigureAwait(false);
+        else
+            vr = await validator.ValidateAsync(context.Value, cancellationToken).ConfigureAwait(false);
 
-            context.Parent.MergeResult(ir.Messages);
-        }
+        context.MergeResult(vr);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/MandatoryRule.cs b/src/CoreEx.Validation/Rules/MandatoryRule.cs
index 31158247..4ec4fdf4 100644
--- a/src/CoreEx.Validation/Rules/MandatoryRule.cs
+++ b/src/CoreEx.Validation/Rules/MandatoryRule.cs
@@ -1,56 +1,69 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides a mandatory validation rule; determined as mandatory when is <see langword="null"/> or it equals its default/empty state.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="mustNotBeDefault">Indicates that a validation error should occur when the value is <see langword="default"/>.</param>
+/// <param name="mustNotBeEmpty">Indicates that a validation error should occur when the value is considered empty.</param>
+/// <remarks>A value will be determined as mandatory when it equals its <see langword="default"/>. For example an <see cref="int"/> will error when the value is zero; however, a
+/// <see cref="Nullable{Int32}"/> will error only when <see langword="null"/>. A zero is considered non-<see langword="default"/> and will succeed, unless <paramref name="mustNotBeDefault"/> is used.
+/// <para>For a <see cref="string"/> mandatory is determined by <see cref="string.Length"/> being zero or <see cref="string.IsNullOrWhiteSpace(string?)"/> resulting in <see langword="true"/>.</para>
+/// <para>Finally, a <see cref="ICollection"/> and <see cref="IEnumerable"/> mandatory is determined by whether they contain any items.</para></remarks>
+public sealed class MandatoryRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>, bool> mustNotBeDefault, Func<PropertyContext<TEntity, TProperty>, bool> mustNotBeEmpty) : PropertyRuleBase<TEntity, TProperty> where TEntity : class
 {
-    /// <summary>
-    /// Provides mandatory validation; determined as mandatory when it equals its default value.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <remarks>A value will be determined as mandatory when it equals its default value. For example an <see cref="int"/> will trigger when the value is zero; however, a
-    /// <see cref="Nullable{Int32}"/> will trigger when null only (a zero is considered a value in this instance).
-    /// <para>For a <see cref="string"/> mandatory is determined by <see cref="string.Length"/> being zero or <see cref="string.IsNullOrWhiteSpace(string?)"/> resulting in <c>true</c>.</para></remarks>
-    public class MandatoryRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool> _mustNotBeDefault = mustNotBeDefault.ThrowIfNull();
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool> _mustNotBeEmpty = mustNotBeEmpty.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override bool ValidateWhenNull => true;
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
     {
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            // Compare the value against its default.
-            if (Comparer<TProperty?>.Default.Compare(context.Value, default!) == 0)
-                return CreateErrorMessageAsync(context);
-
-            // Also check for empty strings.
-            if (context.Value is string val && (val.Length == 0 || string.IsNullOrWhiteSpace(val)))
-                return CreateErrorMessageAsync(context);
-
-            // Also check for empty collections.
-            if (context.Value is ICollection coll && coll.Count == 0)
-                return CreateErrorMessageAsync(context);
-
-            // Also check for empty enumerables.
-            if (context.Value is IEnumerable enumerable)
-            {
-                var enumerator = enumerable.GetEnumerator();
-                if (!enumerator.MoveNext())
-                    return CreateErrorMessageAsync(context);
-            }
+        // Check for null.
+        if (context.IsValueNull)
+            return AddError(context);
+
+        var mustNotBeDefault = _mustNotBeDefault(context);
+        var mustNotBeEmpty = _mustNotBeEmpty(context);
+
+        // Compare the value against its default.
+        if (mustNotBeDefault && context.IsValueNullable && context.IsNullableValueDefault())
+            return AddError(context);
 
+        if (mustNotBeDefault && !context.IsValueNullable && Comparer<TProperty>.Default.Compare(context.Value, default) == 0) 
+            return AddError(context);
+
+        if (!mustNotBeEmpty)
             return Task.CompletedTask;
-        }
 
-        /// <summary>
-        /// Create the error message.
-        /// </summary>
-        private Task CreateErrorMessageAsync(PropertyContext<TEntity, TProperty> context)
+        // Also check for empty strings.
+        if (context.Value is string val)
+            return val is null || val.Length == 0 || string.IsNullOrWhiteSpace(val) ? AddError(context) : Task.CompletedTask;
+
+        // Also check for empty collections.
+        if (context.Value is ICollection coll && coll.Count == 0)
+            return coll.Count == 0 ? AddError(context) : Task.CompletedTask;
+
+        // Also check for empty enumerables.
+        if (context.Value is IEnumerable enumerable)
         {
-            context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MandatoryFormat);
-            return Task.CompletedTask;
+            var enumerator = enumerable.GetEnumerator();
+            if (!enumerator.MoveNext())
+                return AddError(context);
         }
+
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Create the error message.
+    /// </summary>
+    private Task AddError(PropertyContext<TEntity, TProperty> context)
+    {
+        context.AddError(ErrorText ?? ValidatorStrings.MandatoryFormat);
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/MustRule.cs b/src/CoreEx.Validation/Rules/MustRule.cs
deleted file mode 100644
index 7ef54559..00000000
--- a/src/CoreEx.Validation/Rules/MustRule.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation where the rule predicate <b>must</b> return <c>true</c> to be considered valid.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class MustRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Predicate<TEntity>? _predicate;
-        private readonly Func<bool>? _must;
-        private readonly Func<CancellationToken, Task<bool>>? _mustAsync;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MustRule{TEntity, TProperty}"/> class with a <paramref name="predicate"/>.
-        /// </summary>
-        /// <param name="predicate">The must predicate.</param>
-        public MustRule(Predicate<TEntity> predicate) => _predicate = predicate.ThrowIfNull(nameof(predicate));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MustRule{TEntity, TProperty}"/> class with a <paramref name="must"/> function.
-        /// </summary>
-        /// <param name="must">The must function.</param>
-        public MustRule(Func<bool> must) => _must = must.ThrowIfNull(nameof(must));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MustRule{TEntity, TProperty}"/> class with a <paramref name="mustAsync"/> function.
-        /// </summary>
-        /// <param name="mustAsync">The must function.</param>
-        public MustRule(Func<CancellationToken, Task<bool>> mustAsync) => _mustAsync = mustAsync.ThrowIfNull(nameof(mustAsync));
-
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (_predicate != null)
-            {
-                if (!_predicate.Invoke(context.Parent.Value!))
-                    CreateErrorMessage(context);
-            }
-            else if (_must != null)
-            {
-                if (!_must.Invoke())
-                    CreateErrorMessage(context);
-            }
-            else
-            {
-                if (!await _mustAsync!.Invoke(cancellationToken).ConfigureAwait(false))
-                    CreateErrorMessage(context);
-            }
-        }
-
-        /// <summary>
-        /// Create the error message.
-        /// </summary>
-        private void CreateErrorMessage(PropertyContext<TEntity, TProperty> context) => context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MustFormat);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/NoneRule.cs b/src/CoreEx.Validation/Rules/NoneRule.cs
deleted file mode 100644
index 02eb02c5..00000000
--- a/src/CoreEx.Validation/Rules/NoneRule.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation to ensure the value is not specified (is none); determined as when it does equal its default value.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <remarks>A value will be determined as none when it equals its default value. For example an <see cref="int"/> will trigger when the value is zero; however, a
-    /// <see cref="Nullable{Int32}"/> will trigger when null only (a zero is considered a value in this instance).</remarks>
-    public class NoneRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            // Compare the value against its default.
-            if (Comparer<TProperty?>.Default.Compare(context.Value, default!) == 0)
-                return Task.CompletedTask;
-
-            if (context.Value is string val && (val.Length == 0 || string.IsNullOrWhiteSpace(val)))
-                return Task.CompletedTask;
-
-            // Also check for empty collections.
-            if (context.Value is ICollection coll && coll.Count == 0)
-                return Task.CompletedTask;
-
-            // Also check for empty enumerables.
-            if (context.Value is IEnumerable enumerable)
-            {
-                var enumerator = enumerable.GetEnumerator();
-                if (!enumerator.MoveNext())
-                    return Task.CompletedTask;
-            }
-
-            context.CreateErrorMessage(ErrorText ?? ValidatorStrings.NoneFormat);
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/NotNullRule.cs b/src/CoreEx.Validation/Rules/NotNullRule.cs
deleted file mode 100644
index 29e719a6..00000000
--- a/src/CoreEx.Validation/Rules/NotNullRule.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a not <c>null</c> validation.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class NotNullRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (context.Value is null)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MandatoryFormat);
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/NullNoneEmptyRule.cs b/src/CoreEx.Validation/Rules/NullNoneEmptyRule.cs
new file mode 100644
index 00000000..f7e9ec93
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/NullNoneEmptyRule.cs
@@ -0,0 +1,70 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a <paramref name="mustBeNull"/>, <paramref name="mustBeDefault"/> and <paramref name="mustBeEmpty"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="mustBeNull">Indicates that a validation error should occur when the value is <i>not</i> <see langword="null"/>.</param>
+/// <param name="mustBeDefault">Indicates that a validation error should occur when the value is <i>not</i> <see langword="default"/>.</param>
+/// <param name="mustBeEmpty">Indicates that a validation error should occur when the value is considered <i>not</i> empty.</param>
+public sealed class NullNoneEmptyRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>, bool> mustBeNull, Func<PropertyContext<TEntity, TProperty>, bool> mustBeDefault, Func<PropertyContext<TEntity, TProperty>, bool> mustBeEmpty) : PropertyRuleBase<TEntity, TProperty> where TEntity : class
+{
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool> _mustBeNull = mustBeNull.ThrowIfNull();
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool> _mustBeDefault = mustBeDefault.ThrowIfNull();
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool> _mustBeEmpty = mustBeEmpty.ThrowIfNull();
+
+    /// <inheritdoc/>
+    protected override bool ValidateWhenNull => true;
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        var mustBeNull = _mustBeNull(context);
+        var mustBeDefault = _mustBeDefault(context);
+        var mustBeEmpty = _mustBeEmpty(context);
+
+        // Check if must be null.
+        if (mustBeNull && !context.IsValueNull)
+            return AddError(context);
+
+        // Compare the value against its default.
+        if (mustBeDefault && context.IsValueNullable && !context.IsNullableValueDefault())
+            return AddError(context);
+
+        if (mustBeDefault && !context.IsValueNullable && Comparer<TProperty>.Default.Compare(context.Value, default) != 0)
+            return AddError(context);
+
+        if (!mustBeEmpty)
+            return Task.CompletedTask;
+
+        // Also check for empty strings.
+        if (context.Value is string val)
+            return val is null || val.Length == 0 || string.IsNullOrWhiteSpace(val) ? Task.CompletedTask : AddError(context);
+
+        if (context.Metadata.Type == typeof(string) && context.IsValueNull)
+            return Task.CompletedTask;
+
+        // Also check for empty collections.
+        if (context.Value is ICollection coll)
+            return coll.Count == 0 ? Task.CompletedTask : AddError(context);
+
+        // Also check for empty enumerables.
+        if (context.Value is IEnumerable enumerable)
+        {
+            var enumerator = enumerable.GetEnumerator();
+            return !enumerator.MoveNext() ? Task.CompletedTask : AddError(context);
+        }
+
+        return context.IsValueNull ? Task.CompletedTask : AddError(context);
+    }
+
+    /// <summary>
+    /// Create the error message.
+    /// </summary>
+    private Task AddError(PropertyContext<TEntity, TProperty> context)
+    {
+        context.AddError(ErrorText ?? ValidatorStrings.NoneFormat);
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/NullRule.cs b/src/CoreEx.Validation/Rules/NullRule.cs
deleted file mode 100644
index d83b8702..00000000
--- a/src/CoreEx.Validation/Rules/NullRule.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a <c>null</c> validation.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class NullRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (context.Value is not null)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.NoneFormat);
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/NullableEnumRule.cs b/src/CoreEx.Validation/Rules/NullableEnumRule.cs
deleted file mode 100644
index 5e29eceb..00000000
--- a/src/CoreEx.Validation/Rules/NullableEnumRule.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides <see cref="Nullable{T}"/> <see cref="Enum"/> validation to ensure that the value has been defined.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class NullableEnumRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty?> where TEntity : class where TProperty : struct, Enum
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EnumRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        public NullableEnumRule() => ValidateWhenDefault = false;
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty?> context, CancellationToken cancellationToken = default)
-        {
-            // Make sure the enum is defined.
-            if (context.Value is null || !Enum.IsDefined(typeof(TProperty), context.Value))
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidFormat);
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/NumericRule.cs b/src/CoreEx.Validation/Rules/NumericRule.cs
index dd4db351..648a7dc5 100644
--- a/src/CoreEx.Validation/Rules/NumericRule.cs
+++ b/src/CoreEx.Validation/Rules/NumericRule.cs
@@ -1,43 +1,25 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides a numeric validation to check whether negatives are allowed (defaults to <see langword="true"/>, i.e. allowed).
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+public sealed class NumericRule<TEntity, TProperty>(Func<PropertyContext<TEntity, TProperty>, bool>? allowNegatives = null) : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : INumber<TProperty>
 {
-    /// <summary>
-    /// Represents a numeric rule to validate whether negatives are allowed.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class NumericRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NumericRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        public NumericRule() => ValidateWhenDefault = false;
+    private readonly Func<PropertyContext<TEntity, TProperty>, bool>? _allowNegatives = allowNegatives;
 
-        /// <summary>
-        /// Indicates whether to allow negative values.
-        /// </summary>
-        public bool AllowNegatives { get; set; }
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        if (_allowNegatives is not null)
         {
-            // Where allowing negatives do nothing.
-            if (AllowNegatives)
-                return Task.CompletedTask;
-
-            // Convert numeric to a double value.
-            double value = Convert.ToDouble(context.Value, System.Globalization.CultureInfo.InvariantCulture);
-
-            // Determine if the value is negative and is/isn't allowed.
-            if (!AllowNegatives && value < 0)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.AllowNegativesFormat);
-
-            return Task.CompletedTask;
+            var allowNegatives = _allowNegatives(context);
+            if (!allowNegatives && TProperty.IsNegative(context.Value))
+                context.AddError(ErrorText ?? ValidatorStrings.AllowNegativesFormat);
         }
+
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/OverrideRule.cs b/src/CoreEx.Validation/Rules/OverrideRule.cs
deleted file mode 100644
index 0b2b9ebe..00000000
--- a/src/CoreEx.Validation/Rules/OverrideRule.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a means to override a value within a validation context.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public class OverrideRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class
-    {
-        private readonly Func<TEntity, TProperty>? _func;
-        private readonly Func<TEntity, CancellationToken, Task<TProperty>>? _funcAsync;
-        private readonly TProperty _value = default!;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OverrideRule{TEntity, TProperty}"/> class with a <paramref name="func"/>.
-        /// </summary>
-        /// <param name="func">The override function.</param>
-        public OverrideRule(Func<TEntity, TProperty> func) => _func = func.ThrowIfNull(nameof(func));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OverrideRule{TEntity, TProperty}"/> class with a <paramref name="funcAsync"/>.
-        /// </summary>
-        /// <param name="funcAsync">The override function.</param>
-        public OverrideRule(Func<TEntity, CancellationToken, Task<TProperty>> funcAsync) => _funcAsync = funcAsync.ThrowIfNull(nameof(funcAsync));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OverrideRule{TEntity, TProperty}"/> class with a <paramref name="value"/>.
-        /// </summary>
-        /// <param name="value">The override value.</param>
-        public OverrideRule(TProperty value) => _value = value;
-
-        /// <summary>
-        /// Indicates whether the value is only overridden where the current value is the default value for the type.
-        /// </summary>
-        public bool OnlyOverrideDefault { get; set; } = false;
-
-        /// <inheritdoc/>
-        protected override async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            // Compare the value against override to see if there is a difference.
-            if (OnlyOverrideDefault && Comparer<TProperty?>.Default.Compare(context.Value, default!) != 0)
-                return;
-
-            // Get the override value.
-            var overrideVal = _func != null 
-                ? _func(context.Parent.Value!) 
-                : (_funcAsync != null
-                    ? await _funcAsync(context.Parent.Value!, cancellationToken).ConfigureAwait(false)
-                    : _value);
-
-            context.OverrideValue(overrideVal);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/PropertyRuleBase.cs b/src/CoreEx.Validation/Rules/PropertyRuleBase.cs
new file mode 100644
index 00000000..f51da943
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/PropertyRuleBase.cs
@@ -0,0 +1,88 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides the base <see cref="IPropertyRule{TEntity, TProperty}"/> capabilities.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+public abstract class PropertyRuleBase<TEntity, TProperty> : IPropertyRuleEx<TEntity, TProperty> where TEntity : class
+{
+    private List<IPropertyClause<TEntity>>? _clauses;
+    private IPropertyRule<TEntity>? _chainedRule;
+
+    /// <inheritdoc/>
+    public LText? ErrorText { get; private set; }
+
+    /// <summary>
+    /// Indicates whether the validation will be performed where the property value is <see langword="null"/>.
+    /// </summary>
+    /// <remarks>When this is set to <see langword="false"/> and the property value is <see langword="null"/> then the underyling clauses (if any) and validation will be bypassed and the next chained rule in 
+    /// sequence will be executed.</remarks>
+    protected virtual bool ValidateWhenNull => false;
+
+    /// <inheritdoc/>
+    IPropertyRule<TEntity, TProperty> IPropertyRule<TEntity, TProperty>.WithMessage(LText errorText)
+    {
+        ErrorText = errorText;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.AddClause(IPropertyClause<TEntity> clause) => (_clauses ??= []).Add(clause.ThrowIfNull());
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.Chain(IPropertyRule<TEntity> rule)
+    {
+        if (_chainedRule is not null)
+            throw new InvalidOperationException("Each rule can only support a single chained rule.");
+
+        _chainedRule = rule.ThrowIfNull();
+    }
+
+    /// <inheritdoc/>
+    async Task IPropertyRule<TEntity>.ValidateAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken)
+    {
+        if (context is PropertyContext<TEntity, TProperty> ctx)
+        {
+            await ValidateInternalAsync(ctx, cancellationToken).ConfigureAwait(false);
+            return;
+        }
+
+        // Value is Nullable<T> and we need to convert it to T to continue.
+        ctx = new PropertyContext<TEntity, TProperty>(context, context.Value is null ? default! : (TProperty)context.Value);
+        await ValidateInternalAsync(ctx, cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    Task IPropertyRuleEx<TEntity, TProperty>.ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken) => ValidateInternalAsync(context, cancellationToken);
+
+    /// <summary>
+    /// Validate the property value.
+    /// </summary>
+    private async Task ValidateInternalAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        // First, check whether rule is bypassed when null.
+        if (!ValidateWhenNull && context.IsValueNull)
+        {
+            if (_chainedRule is not null)
+                await _chainedRule!.ValidateAsync(context, cancellationToken).ConfigureAwait(false); 
+
+            return;
+        }
+
+        // Next, check the clauses; if they are not satisfied then we don't execute the validation but we do execute the next chained rule (if any).
+        var cr = await RootPropertyRule<TEntity, TProperty>.CheckClausesAsync(context, _clauses, cancellationToken).ConfigureAwait(false);
+        if (cr)
+            await OnValidateAsync(context, cancellationToken).ConfigureAwait(false);
+
+        if (_chainedRule is not null && !context.IsInError)
+            await _chainedRule!.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Validate the property value.
+    /// </summary>
+    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected abstract Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/README.md b/src/CoreEx.Validation/Rules/README.md
new file mode 100644
index 00000000..c87d409a
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/README.md
@@ -0,0 +1,61 @@
+# CoreEx.Validation.Rules
+
+> Provides all built-in property rule implementations for the CoreEx validation framework, together with the `IPropertyRule` interfaces and `PropertyRuleBase` abstract base class that underpin them.
+
+## Overview
+
+`CoreEx.Validation.Rules` contains every built-in rule that can be applied to a property chain in a `Validator<TEntity>`. Rules are the units of validation logic — each one receives a `PropertyContext<TEntity, TProperty>`, inspects the value, and optionally calls `context.AddError(...)` to register a failure. Rules are never instantiated directly; they are created through the fluent extension methods in `ValidationExtensions` and returned as `IPropertyRule<TEntity, TProperty>` so further clauses or chained rules can be appended.
+
+`PropertyRuleBase<TEntity, TProperty>` provides the shared scaffolding: it holds the optional `ErrorText` override, the list of attached `IPropertyClause` guards, the chain pointer to the next rule, and the `ValidateAsync` orchestration that runs clauses first and then delegates to `OnValidateAsync`. The `IPropertyRule<TEntity>`, `IPropertyRule<TEntity, TProperty>`, `IRootPropertyRule<TEntity>`, and `IRootPropertyRule<TEntity, TProperty>` interfaces define the contracts at each layer of the rule infrastructure.
+
+`RuleSet<TEntity>` is a special rule-like container that groups a set of `IRootPropertyRule` chains under a predicate; it is wired into a validator via the `ValidatorBase.RuleSet(predicate, configure)` fluent builder and is stored in the same `Rules` list as ordinary property rules, but its execution delegates to all contained chains when the predicate is satisfied.
+
+## Key capabilities
+
+- 📋 **Comprehensive built-in rule set**: covers mandatory presence, string constraints, numeric/decimal precision, range/between, ordered and equality comparisons against values and sibling properties, enum membership, e-mail format, wildcard patterns, null/none/empty inverse checks, unconditional errors, collection and dictionary cardinality with duplicate detection, child-entity delegation, common/inline validator composition, reference data validity, and external validator interop.
+- 🧱 **Consistent base scaffolding**: `PropertyRuleBase<TEntity, TProperty>` enforces a uniform clause-then-rule execution contract; the `ValidateWhenNull` override lets rules like `CommonRule` opt in to executing even when the value is `null`.
+- 🔧 **Extensible via `With` inner builders**: `CollectionRule`, `DictionaryRule`, and `EntityRule` each expose a nested `With` fluent builder that configures optional per-rule sub-validators, duplicate-check strategies, and cardinality constraints, keeping the primary extension-method signature clean.
+- 💬 **Override-able error text**: every rule inherits `ErrorText` from `PropertyRuleBase` and will use it in place of the default `ValidatorStrings` message when set, enabling per-call customization without subclassing.
+- 🧩 **Conditional rule grouping**: `RuleSet<TEntity>` batches multiple root-property rules under a `Predicate<ValidationContext<TEntity>>`, enabling scenario or mode-specific validation blocks that activate only when the predicate passes.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| [IPropertyRule<TEntity>](./IPropertyRuleT.cs) | Root property-rule contract; exposes `AddClause`, `Chain`, `SetText`, and `ErrorText`. |
+| [IPropertyRule<TEntity, TProperty>](./IPropertyRuleT2.cs) | Typed property-rule contract; extends `IPropertyRule<TEntity>` with the typed `ValidateAsync` method. |
+| [IRootPropertyRule<TEntity>](./IRootPropertyRuleT.cs) | Marker interface for rules stored directly in a validator's `Rules` list; implemented by `RootPropertyRule<TEntity, TProperty>` and `RuleSet<TEntity>`. |
+| _[`PropertyRuleBase<TEntity, TProperty>`](./PropertyRuleBase.cs)_ | Abstract base for all rule implementations; holds `ErrorText`, clause list, chain pointer; drives the clause-check-then-`OnValidateAsync` execution contract. |
+| **[`RootPropertyRule<TEntity, TProperty>`](./RootPropertyRule.cs)** | Concrete `IRootPropertyRule` entry point created by `HasProperty`/`HasRuleFor`; owns the property metadata and dispatches to the chained rule sequence. |
+| **[`RuleSet<TEntity>`](./RuleSet.cs)** | Groups a set of `IRootPropertyRule` chains under a `Predicate<ValidationContext<TEntity>>`; chains execute only when the predicate returns `true`. |
+| **[`MandatoryRule<TEntity, TProperty>`](./MandatoryRule.cs)** | Validates that a value is not `null`, not default, and/or not empty; wired via `Mandatory()`, `NotNull()`, `NotEmpty()`. |
+| **[`NullNoneEmptyRule<TEntity, TProperty>`](./NullNoneEmptyRule.cs)** | Inverse of mandatory — validates that a value _is_ `null`, default, or empty; wired via `Null()`, `None()`, `Empty()`. |
+| **[`StringRule<TEntity>`](./StringRule.cs)** | Validates string length (min/max/exact) and optional regex; wired via `String()`, `Matches()`, `Length()`, `MinimumLength()`, `MaximumLength()`. |
+| **[`NumericRule<TEntity, TProperty>`](./NumericRule.cs)** | Validates sign constraint on any `INumber<T>`; wired via `Numeric()`, `Positive()`. |
+| **[`DecimalRule<TEntity>`](./DecimalRule.cs)** | Validates `decimal` precision and scale; `PrecisionScale` covers generic `IFloatingPoint<T>`; wired via `Decimal()`, `PrecisionScale()`. |
+| **[`BetweenRule<TEntity, TProperty>`](./BetweenRule.cs)** | Validates a comparable value lies between two bounds; wired via `Between()`, `InclusiveBetween()`, `ExclusiveBetween()`. |
+| _[`CompareRuleBase<TEntity, TProperty>`](./CompareRuleBase.cs)_ | Abstract base for `CompareValueRule` and `ComparePropertyRule`; holds the `CompareOperator` and optional `IComparer<T>`. |
+| **[`CompareValueRule<TEntity, TProperty>`](./CompareValueRule.cs)** | Compares property value against a constant or function value using a `CompareOperator`; wired via `CompareValue()`, `Equal()`, `NotEqual()`, `LessThan()`, `LessThanOrEqualTo()`, `GreaterThan()`, `GreaterThanOrEqualTo()`. |
+| **[`ComparePropertyRule<TEntity, TProperty, TCompareProperty>`](./ComparePropertyRule.cs)** | Compares property value against another property on the same entity; skips if the target property has an error; wired via `CompareProperty(op, expression)`. |
+| **[`CompareValuesRule<TEntity, TProperty>`](./CompareValuesRule.cs)** | Validates equality against a set of allowed values, optionally replacing the property value with the matched entry; wired via `CompareValues(values)`. |
+| **[`EnumRule<TEntity, TProperty>`](./EnumRule.cs)** | Validates a `struct Enum` is defined or within an allowed subset; wired via `Enum()`, `Enum(allowed[])`. |
+| **[`EnumStringRule<TEntity>`](./EnumStringRule.cs)** | Validates a `string` can be parsed to an `Enum` type, configured via the `EnumWith` nested builder; wired via `Enum(Func<EnumWith, EnumWith>)`. |
+| **[`EmailRule<TEntity>`](./EmailRule.cs)** | Validates a `string` is a valid e-mail address (`MailAddress.TryCreate`) and optionally within a max length; wired via `Email()`. |
+| **[`WildcardRule<TEntity>`](./WildcardRule.cs)** | Validates a `string` conforms to a CoreEx `Wildcard` pattern; wired via `Wildcard()`. |
+| **[`ErrorRule<TEntity, TProperty>`](./ErrorRule.cs)** | Always emits the supplied error; intended for use with a `When` clause; wired via `Error()`, `Duplicate()`, `NotFound()`, `Invalid()`, `Immutable()`. |
+| **[`CollectionRule<TEntity, TProperty, TItem>`](./CollectionRule.cs)** | Validates an `IEnumerable<T>` for min/max count and duplicate detection; wired via `Collection()`; `With` helpers: `WithDuplicateIdCheck()`, `WithDuplicateKeyCheck()`, `WithDuplicatePropertyCheck()`, `WithDuplicateCheck()`. |
+| **[`DictionaryRule<TEntity, TProperty, TKey, TValue>`](./DictionaryRule.cs)** | Validates an `IDictionary<TKey,TValue>` for min/max count with optional per-entry validation; wired via `Dictionary()`. |
+| **[`EntityRule<TEntity, TProperty>`](./EntityRule.cs)** | Delegates validation of a child entity to an `IValidatorEx<TProperty>`; merges child errors into the parent context with prefixed names; wired via `Entity()`. |
+| **[`CommonRule<TEntity, TProperty>`](./CommonRule.cs)** | Applies a `CommonValidator<TProperty>` to a property, enabling reuse of shared rule logic; wired via `Common(commonValidator)`. |
+| **[`ReferenceDataRule<TEntity, TProperty>`](./ReferenceDataRule.cs)** | Validates an `IReferenceData` property is valid (and optionally active); wired via `ReferenceData()`, `IsValid()`. |
+| **[`ReferenceDataCodeRule<TEntity>`](./ReferenceDataCodeRule.cs)** | Validates a `string` as a reference data code via the orchestrator, configured with `ReferenceDataWith`; wired via `ReferenceData(Func<ReferenceDataWith, ReferenceDataWith>)`. |
+| **[`ReferenceDataCodeCollectionRule<TEntity, TProperty>`](./ReferenceDataCodeCollectionRule.cs)** | Validates an `IReferenceDataCodeCollection` contains no invalid or inactive items; wired via `ReferenceDataCodes()`, `AreValid()`. |
+| **[`InteropRule<TEntity, TProperty>`](./InteropRule.cs)** | Delegates validation to any external `IValidator`/`IValidator<T>` and merges results into the CoreEx context; wired via `Interop()`. |
+| **[`IncludeBaseRule<TEntity>`](./IncludeBaseRule.cs)** | Internal pass-through that injects a base `IValidatorEx` into a derived validator's `Rules` list; used by the `Include` fluent method on `ValidatorBase`. |
+
+## Related namespaces
+
+- **[`CoreEx.Validation`](../README.md)** - Root namespace; `ValidationExtensions` partial classes are the sole public entry point for creating and attaching all rule types defined here.
+- **[`CoreEx.Validation.Abstractions`](../Abstractions/README.md)** - Defines `IPropertyRule`, `PropertyRuleBase`, `IPropertyContext`, and `IValidatorEx` consumed by every rule implementation.
+- **[`CoreEx.Validation.Clauses`](../Clauses/README.md)** - Clause implementations that guard rule execution; clauses are attached to `IPropertyRule` instances defined here.
+- **[`CoreEx.RefData`](../../CoreEx.RefData/README.md)** - Provides `IReferenceData` and `IReferenceDataCodeCollection` validated by `ReferenceDataRule`, `ReferenceDataCodeRule`, and `ReferenceDataCodeCollectionRule`.
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ReferenceDataCodeCollectionRule.cs b/src/CoreEx.Validation/Rules/ReferenceDataCodeCollectionRule.cs
new file mode 100644
index 00000000..8b1fd613
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/ReferenceDataCodeCollectionRule.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides an <see cref="IReferenceDataCodeCollection"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
+/// <param name="allowInactive">Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.</param>
+public class ReferenceDataCodeCollectionRule<TEntity, TProperty>(bool allowInactive) : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IReferenceDataCodeCollection
+{
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        if (context.Value.HasInvalidItems || (!allowInactive && context.Value.HasInactiveItems))
+            context.AddError(ErrorText ?? ValidatorStrings.InvalidItemsFormat);
+
+        return Task.CompletedTask;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ReferenceDataCodeRule.cs b/src/CoreEx.Validation/Rules/ReferenceDataCodeRule.cs
index 25d47ffb..623aa5de 100644
--- a/src/CoreEx.Validation/Rules/ReferenceDataCodeRule.cs
+++ b/src/CoreEx.Validation/Rules/ReferenceDataCodeRule.cs
@@ -1,28 +1,94 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using CoreEx.RefData;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides an <see cref="Enum"/> <see langword="string"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+public class ReferenceDataCodeRule<TEntity> : PropertyRuleBase<TEntity, string> where TEntity : class
 {
+    private readonly ReferenceDataWith _with;
+
     /// <summary>
-    /// Provides validation for a <see cref="IReferenceData.Code"/>; validates that the <see cref="IReferenceData.IsValid"/>.
+    /// Initializes a new instance of the <see cref="EnumStringRule{TEntity}"/> class.
     /// </summary>
-    public class ReferenceDataCodeRule<TEntity, TRef> : ValueRuleBase<TEntity, string> where TEntity : class where TRef : IReferenceData?
+    /// <param name="with">Extended <see cref="ReferenceDataWith"/> configuration.</param>
+    public ReferenceDataCodeRule(Func<ReferenceDataWith, ReferenceDataWith> with)
+    {
+        _with = new ReferenceDataWith(this);
+        with.ThrowIfNull().Invoke(_with);
+    }
+
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken)
     {
+        if (_with.Validator is not null && !_with.Validator(context))
+            context.AddError(ErrorText ?? ValidatorStrings.InvalidFormat);
+
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// Provides additional configuration options for the <see cref="ReferenceDataCodeRule{TEntity}"/>.
+    /// </summary>
+    public class ReferenceDataWith
+    {
+        private readonly ReferenceDataCodeRule<TEntity> _rule;
+        private bool _allowInactive;
+        private bool _overrideValue;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReferenceDataWith"/> class.
+        /// </summary>
+        internal ReferenceDataWith(ReferenceDataCodeRule<TEntity> rule) => _rule = rule;
+
         /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeRule{TEntity, TRef}"/> class.
+        /// Gets the configured validator.
         /// </summary>
-        public ReferenceDataCodeRule() => ValidateWhenDefault = false;
+        internal Func<PropertyContext<TEntity, string>, bool>? Validator { get; set; }
 
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken = default)
+        /// <summary>
+        /// Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.
+        /// </summary>
+        /// <returns></returns>
+        public ReferenceDataWith AllowInactive()
+        {
+            _allowInactive = true;
+            return this;
+        }
+
+        /// <summary>
+        /// Indicates whether the value should be overridden with the parsed value.
+        /// </summary>
+        /// <remarks>The value must be mutable otherwise an <see cref="InvalidOperationException"/> will be thrown at runtime.</remarks>
+        public ReferenceDataWith Override()
         {
-            if (!ReferenceDataOrchestrator.Current.GetByTypeRequired<TRef>().TryGetByCode(context.Value!, out var rd) || !rd!.IsValid)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidFormat);
+            _overrideValue = true;
+            return this;
+        }
+
+        /// <summary>
+        /// Sets the <see cref="IReferenceData"/> <see cref="Type"/> used to validate the value.
+        /// </summary>
+        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+        public ReferenceDataWith With<TRef>() where TRef : IReferenceData
+        {
+            Validator = Validator is not null ? throw new InvalidOperationException("The ReferenceDataCode rule can only have one validator.") : context =>
+            {
+                if (ReferenceDataOrchestrator.Current.GetByTypeRequired<TRef>().TryGetByCode(context.Value!, out var rd) && rd.IsValid)
+                {
+                    if (_allowInactive || rd.IsActive)
+                    {
+                        if (_overrideValue)
+                            context.Override(rd.Code!);
+
+                        return true;
+                    }
+                }
+
+                return false;
+            };
 
-            return Task.CompletedTask;
+            return this;
         }
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ReferenceDataCodeRuleAs.cs b/src/CoreEx.Validation/Rules/ReferenceDataCodeRuleAs.cs
deleted file mode 100644
index 1ee5abc6..00000000
--- a/src/CoreEx.Validation/Rules/ReferenceDataCodeRuleAs.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using CoreEx.RefData;
-using System;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides a means to add an <see cref="ReferenceDataCodeRule{TEntity, TRefData}"/> using a validator <see cref="As"/> a specified <see cref="IReferenceData"/> <see cref="Type"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <param name="parent">The parent <see cref="PropertyRuleBase{TEntity, TProperty}"/>.</param>
-    /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-    public class ReferenceDataCodeRuleAs<TEntity>(IPropertyRule<TEntity, string> parent, LText? errorText = null) where TEntity : class
-    {
-        private readonly IPropertyRule<TEntity, string> _parent = parent.ThrowIfNull(nameof(parent));
-        private readonly LText? _errorText = errorText;
-
-        /// <summary>
-        /// Adds an <see cref="ReferenceDataCodeRule{TEntity, TRefData}"/> using a validator <see cref="As"/> a specified <see cref="IReferenceData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <returns>A <see cref="ReferenceDataCodeRule{TEntity, TRefData}"/>.</returns>
-        public IPropertyRule<TEntity, string> As<TRef>() where TRef : IReferenceData
-        {
-            _parent.AddRule(new ReferenceDataCodeRule<TEntity, TRef>() { ErrorText = _errorText });
-            return _parent;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ReferenceDataRule.cs b/src/CoreEx.Validation/Rules/ReferenceDataRule.cs
index 3e9c55d0..bb90cf1e 100644
--- a/src/CoreEx.Validation/Rules/ReferenceDataRule.cs
+++ b/src/CoreEx.Validation/Rules/ReferenceDataRule.cs
@@ -1,28 +1,19 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using CoreEx.RefData;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides an <see cref="IReferenceData"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
+/// <param name="allowInactive">Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.</param>
+public class ReferenceDataRule<TEntity, TProperty>(bool allowInactive) : PropertyRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IReferenceData
 {
-    /// <summary>
-    /// Provides validation for a <see cref="IReferenceData"/>; validates that the <see cref="IReferenceData.IsValid"/>.
-    /// </summary>
-    public class ReferenceDataRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IReferenceData?
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        public ReferenceDataRule() => ValidateWhenDefault = false;
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (!context.Value!.IsValid)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidFormat);
+        if (!context.Value.IsValid || (!allowInactive && !context.Value.IsActive))
+            context.AddError(ErrorText ?? ValidatorStrings.InvalidFormat);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ReferenceDataSidListRule.cs b/src/CoreEx.Validation/Rules/ReferenceDataSidListRule.cs
deleted file mode 100644
index fd2bd5b4..00000000
--- a/src/CoreEx.Validation/Rules/ReferenceDataSidListRule.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides validation for a <see cref="IReferenceDataCodeList"/> including <see cref="MinCount"/>, <see cref="MaxCount"/>, per item <see cref="IReferenceData.IsValid"/>, and whether to <see cref="AllowDuplicates"/>.
-    /// </summary>
-    public class ReferenceDataSidListRule<TEntity, TProperty> : ValueRuleBase<TEntity, TProperty> where TEntity : class where TProperty : IReferenceDataCodeList?
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataSidListRule{TEntity, TProperty}"/> class.
-        /// </summary>
-        public ReferenceDataSidListRule() => ValidateWhenDefault = false;
-
-        /// <summary>
-        /// Gets or sets the minimum count;
-        /// </summary>
-        public int MinCount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum count.
-        /// </summary>
-        public int? MaxCount { get; set; }
-
-        /// <summary>
-        /// Indicates whether duplicate values are allowed.
-        /// </summary>
-        public bool AllowDuplicates { get; set; } = false;
-
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default)
-        {
-            if (context.Value!.HasInvalidItems)
-            {
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.InvalidItemsFormat);
-                return Task.CompletedTask;
-            }
-
-            // Check Min and Max counts.
-            if (context.Value.Count < MinCount)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MinCountFormat, MinCount);
-            else if (MaxCount.HasValue && context.Value.Count > MaxCount.Value)
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxCountFormat, MaxCount);
-
-            // Check duplicates.
-            if (!AllowDuplicates)
-            {
-                var dict = new HashSet<string?>();
-                foreach (var item in context.Value.ToRefDataList().Where(x => x.IsValid))
-                {
-                    if (dict.TryGetValue(item.Code, out _))
-                    {
-                        context.CreateErrorMessage(ErrorText ?? ValidatorStrings.DuplicateValueFormat, "Code", item.ToString());
-                        return Task.CompletedTask;
-                    }
-
-                    dict.Add(item.Code);
-                }
-            }
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/RootPropertyRule.cs b/src/CoreEx.Validation/Rules/RootPropertyRule.cs
new file mode 100644
index 00000000..2fcc5ec6
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/RootPropertyRule.cs
@@ -0,0 +1,142 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides the root <see cref="IPropertyRuleEx{TEntity, TProperty}"/> capabilities.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
+public sealed class RootPropertyRule<TEntity, TProperty> : IPropertyRuleEx<TEntity, TProperty>, IRootPropertyRule<TEntity, TProperty> where TEntity : class
+{
+    private readonly Func<TEntity, TProperty>? _getNullableValue;
+    private readonly Func<TEntity, bool>? _isNullableValueDefault;
+    private List<IPropertyClause<TEntity>>? _clauses;
+    private IPropertyRule<TEntity>? _chainedRule;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RootPropertyRule{TEntity, TProperty}"/> class.
+    /// </summary>
+    /// <param name="metadata">The <see cref="IPropertyRuntimeMetadata"/>.</param>
+    /// <param name="getNullableValue">A function to get the underlying nullable value.</param>
+    /// <param name="isNullableValueDefault">A function to determine whether the underlying nullable value is its default.</param>
+    internal RootPropertyRule(IPropertyRuntimeMetadata metadata, Func<TEntity, TProperty>? getNullableValue, Func<TEntity, bool>? isNullableValueDefault)
+    {
+        Metadata = metadata.ThrowIfNull();
+        _getNullableValue = getNullableValue;
+        _isNullableValueDefault = isNullableValueDefault;
+
+        if (metadata.Format is not null)
+            ValueFormatter = new(metadata.Format);
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/>.
+    /// </summary>
+    public IPropertyRuntimeMetadata Metadata { get; }
+
+    /// <inheritdoc/>
+    public bool IsValueNullable => _getNullableValue is not null;
+
+    /// <summary>
+    /// Gets the property text override (where set); otherwise, <see langword="null"/>.
+    /// </summary>
+    public LText? Text { get; private set; }
+
+    /// <inheritdoc/>
+    public void SetText(LText? text) => Text = text;
+
+    /// <summary>
+    /// Gets the <see cref="Abstractions.ValueFormatter"/> to use when localizing the property value within an error message.
+    /// </summary>
+    public ValueFormatter ValueFormatter { get; private set; } = ValueFormatter.Default;
+
+    /// <inheritdoc/>
+    void IRootPropertyRule<TEntity>.SetFormat(string? format, IFormatProvider? formatProvider, char? quotingCharacter) => ValueFormatter = new(format, formatProvider, quotingCharacter);
+
+    /// <inheritdoc/>
+    /// <remarks>Not supported for a <see cref="RootPropertyRule{TEntity, TProperty}"/>; will throw a <see cref="NotSupportedException"/>.</remarks>
+    public LText? ErrorText 
+    { 
+        get => throw new NotSupportedException($"A {GetType().Name} does not support {nameof(ErrorText)}."); 
+        set => throw new NotSupportedException($"A {GetType().Name} does not support {nameof(ErrorText)}.");
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Not supported for a <see cref="RootPropertyRule{TEntity, TProperty}"/>; will throw a <see cref="NotSupportedException"/>.</remarks>
+    IPropertyRule<TEntity, TProperty> IPropertyRule<TEntity, TProperty>.WithMessage(LText errorText) => throw new NotSupportedException($"A {GetType().Name} does not support {nameof(IPropertyRule<,>.WithMessage)}.");
+
+    /// <summary>
+    /// Gets the originating property <see cref="Nullable{T}.Value"/> or <see langword="default"/> (where <see cref="IsValueNullable"/>).
+    /// </summary>
+    /// <typeparam name="T">The property <see cref="Nullable{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The originating property <see cref="Nullable{T}.Value"/> or <see langword="default"/>.</returns>
+    public T GetNullableValueOrDefault<T>(TEntity entity) => IsValueNullable ? Internal.Cast<TProperty?, T>(_getNullableValue!(entity)) : throw new InvalidOperationException("The property must be Nullable<T>.");
+
+    /// <summary>
+    /// Indicates whether the originating property <see cref="Nullable{T}.Value"/> is <see langword="default"/> (where <see cref="IsValueNullable"/>).
+    /// </summary>
+    public bool IsNullableValueDefault(TEntity entity) => IsValueNullable ? _isNullableValueDefault!(entity) : throw new InvalidOperationException("The property must be Nullable<T>.");
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.AddClause(IPropertyClause<TEntity> clause) => (_clauses ??= []).Add(clause.ThrowIfNull());
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.Chain(IPropertyRule<TEntity> rule)
+    {
+        if (_chainedRule is not null)
+            throw new InvalidOperationException("A rule can only support a single chained rule.");
+
+        _chainedRule = rule.ThrowIfNull();
+    }
+
+    /// <summary>
+    /// Checks the clauses.
+    /// </summary>
+    /// <param name="context">The <see cref="IPropertyContext"/>.</param>
+    /// <param name="clauses">The <see cref="IPropertyClause{TEntity}"/> <see cref="List{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> where validation is to continue; otherwise, <see langword="false"/> to stop.</returns>
+    internal static async Task<bool> CheckClausesAsync(PropertyContext<TEntity, TProperty> context, List<IPropertyClause<TEntity>>? clauses, CancellationToken cancellationToken)
+    {
+        if (clauses is not null)
+        {
+            foreach (var clause in clauses)
+            {
+                var cr = await clause.CheckAsync(context, cancellationToken).ConfigureAwait(false);
+                if (!cr)
+                    return cr;
+            }
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc/>
+    async Task IPropertyRule<TEntity>.ValidateAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken)
+        => await ValidateAsync((PropertyContext<TEntity, TProperty>)context, cancellationToken);
+
+    /// <inheritdoc/>
+    public async Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
+    {
+        if (_chainedRule is not null)
+            await _chainedRule.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    public async Task ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken)
+    {
+        // Check that there are no pre-existing errors for the property.
+        if (context.HasError<TProperty>(Metadata))
+            return;
+
+        // Create the property context.
+        var pc = new PropertyContext<TEntity, TProperty>(this, context);
+
+        // Check the clauses.
+        var cr = await CheckClausesAsync(pc, _clauses, cancellationToken).ConfigureAwait(false);
+        if (!cr)
+            return;
+
+        // Perform the validation.
+        await ValidateAsync(pc, cancellationToken).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/RuleSet.cs b/src/CoreEx.Validation/Rules/RuleSet.cs
new file mode 100644
index 00000000..d82bea15
--- /dev/null
+++ b/src/CoreEx.Validation/Rules/RuleSet.cs
@@ -0,0 +1,55 @@
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides a validation rule set for an entity, in that it groups <see cref="Rules"/> together that are only validated when the specified condition (predicate) is <see langword="true"/>.
+/// </summary>
+/// <typeparam name="TEntity">the entity <see cref="Type"/>.</typeparam>
+/// <param name="predicate">The predicate to determine whether the <see cref="RuleSet{TEntity}"/> is to be validated.</param>
+public sealed class RuleSet<TEntity>(Predicate<ValidationContext<TEntity>> predicate) : ValidatorBase<TEntity, RuleSet<TEntity>>, IRootPropertyRule<TEntity> where TEntity : class
+{
+    private readonly Predicate<ValidationContext<TEntity>> _predicate = predicate.ThrowIfNull();
+
+    /// <inheritdoc/>
+    bool IRootPropertyRule<TEntity>.IsValueNullable => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    LText? IPropertyRule<TEntity>.ErrorText { get => throw new NotImplementedException(); }
+
+    /// <inheritdoc/>
+    public void SetText(LText? text) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.AddClause(IPropertyClause<TEntity> clause) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    void IPropertyRule<TEntity>.Chain(IPropertyRule<TEntity> rule) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    T IRootPropertyRule<TEntity>.GetNullableValueOrDefault<T>(TEntity entity) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    bool IRootPropertyRule<TEntity>.IsNullableValueDefault(TEntity entity) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    void IRootPropertyRule<TEntity>.SetFormat(string? format, IFormatProvider? formatProvider, char? quotingCharacter) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    async Task IRootPropertyRule<TEntity>.ValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken)
+    {
+        // Check the predicate.
+        if (!_predicate(context))
+            return;
+
+        // Execute the rules in the set.
+        foreach (var rule in Rules)
+        {
+            await rule.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    /// <inheritdoc/>
+    Task IPropertyRule<TEntity>.ValidateAsync(IPropertyContext<TEntity> context, CancellationToken cancellationToken) => throw new NotImplementedException();
+
+    /// <inheritdoc/>
+    internal override Task ValidateAsync(IValidationContext<TEntity> context, CancellationToken cancellationToken) => throw new NotImplementedException();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/StringRule.cs b/src/CoreEx.Validation/Rules/StringRule.cs
index 676ea171..d51713cd 100644
--- a/src/CoreEx.Validation/Rules/StringRule.cs
+++ b/src/CoreEx.Validation/Rules/StringRule.cs
@@ -1,64 +1,52 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+namespace CoreEx.Validation.Rules;
+
+/// <summary>
+/// Provides <see langword="string"/> validation including minimum and maximum length, and regular expression.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <param name="minLength">The minimum length.</param>
+/// <param name="maxLength">The maximum length.</param>
+/// <param name="regex">The regular expression.</param>
+public sealed class StringRule<TEntity>(Func<PropertyContext<TEntity, string>, int>? minLength = null, Func<PropertyContext<TEntity, string>, int?>? maxLength = null, Func<PropertyContext<TEntity, string>, Regex?>? regex = null) : PropertyRuleBase<TEntity, string> where TEntity : class
 {
-    /// <summary>
-    /// Provides <see cref="string"/> validation including <see cref="MinLength"/>, <see cref="MaxLength"/>, and <see cref="Regex"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    public class StringRule<TEntity> : ValueRuleBase<TEntity, string> where TEntity : class
-    {
-        private int _minLength = 0;
-        private int? _maxLength = null;
+    private readonly Func<PropertyContext<TEntity, string>, int>? _minLength = minLength;
+    private readonly Func<PropertyContext<TEntity, string>, int?>? _maxLength = maxLength;
+    private readonly Func<PropertyContext<TEntity, string>, Regex?>? _regex = regex;
 
-        /// <summary>
-        /// Gets or sets the minimum length;
-        /// </summary>
-        public int MinLength { get => _minLength; set => _minLength = value >= 0 ? value : throw new ArgumentException($"{nameof(MinLength)} must be zero or greater.", nameof(MinLength)); }
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken)
+    {
+        var minLength = _minLength?.Invoke(context) ?? 0;
+        var maxLength = _maxLength?.Invoke(context);
+        var regex = _regex?.Invoke(context);
 
-        /// <summary>
-        /// Gets or sets the maximum length.
-        /// </summary>
-        public int? MaxLength { get => _maxLength; set => _maxLength = value is null || value.Value > 0 ? value : throw new ArgumentException($"{nameof(MaxLength)} must be greater that zero.", nameof(MaxLength)); }
+        if (minLength < 0)
+            throw new InvalidOperationException($"Minimum length must be zero or greater.");
 
-        /// <summary>
-        /// Gets or sets the regex.
-        /// </summary>
-        public Regex? Regex { get; set; }
+        if (maxLength is not null && maxLength.Value <= 0)
+            throw new InvalidOperationException($"Maximum length must be greater than zero.");
 
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken = default)
+        if (minLength > 0 && maxLength.HasValue && minLength == maxLength!.Value && context.Value.Length != minLength)
         {
-            if (string.IsNullOrEmpty(context.Value))
-                return Task.CompletedTask;
-
-            if (MinLength > 0 && MaxLength.HasValue && MinLength == MaxLength!.Value && context.Value.Length != MinLength)
-            {
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.ExactLengthFormat, MinLength);
-                return Task.CompletedTask;
-            }
-
-            if (context.Value.Length < MinLength)
-            {
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MinLengthFormat, MinLength);
-                return Task.CompletedTask;
-            }
-
-            if (MaxLength.HasValue && context.Value.Length > MaxLength.Value)
-            {
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.MaxLengthFormat, MaxLength);
-                return Task.CompletedTask;
-            }
+            context.AddError(ErrorText ?? ValidatorStrings.ExactLengthFormat, minLength);
+            return Task.CompletedTask;
+        }
 
-            if (Regex != null && !Regex.IsMatch(context.Value))
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.RegexFormat);
+        if (context.Value.Length < minLength)
+        {
+            context.AddError(ErrorText ?? ValidatorStrings.MinLengthFormat, minLength);
+            return Task.CompletedTask;
+        }
 
+        if (maxLength.HasValue && context.Value.Length > maxLength.Value)
+        {
+            context.AddError(ErrorText ?? ValidatorStrings.MaxLengthFormat, maxLength);
             return Task.CompletedTask;
         }
+
+        if (regex is not null && !regex.IsMatch(context.Value))
+            context.AddError(ErrorText ?? ValidatorStrings.RegexFormat);
+
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/ValueRuleBase.cs b/src/CoreEx.Validation/Rules/ValueRuleBase.cs
deleted file mode 100644
index e2ae6bf5..00000000
--- a/src/CoreEx.Validation/Rules/ValueRuleBase.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using CoreEx.Validation.Clauses;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
-{
-    /// <summary>
-    /// Provides the base functionality for a property value rule.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
-    public abstract class ValueRuleBase<TEntity, TProperty> : IValueRule<TEntity, TProperty> where TEntity : class
-    {
-        private readonly List<IPropertyRuleClause<TEntity>> _clauses = [];
-
-        /// <inheritdoc/>
-        public LText? ErrorText { get; set; }
-
-        /// <summary>
-        /// Indicates that the <see cref="ValidateAsync(PropertyContext{TEntity, TProperty}, CancellationToken)"/> is also invoked when the property value <i>equals</i> the default value for the <typeparamref name="TProperty"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>; this indicates that the property <i>is</i> validated where default.</remarks>
-        protected bool ValidateWhenDefault { get; set; } = true;
-
-        /// <summary>
-        /// Adds a clause (<see cref="IPropertyRuleClause{TEntity, TProperty}"/>) to the rule.
-        /// </summary>
-        /// <param name="clause">The <see cref="IPropertyRuleClause{TEntity, TProperty}"/>.</param>
-        public void AddClause(IPropertyRuleClause<TEntity> clause)
-        {
-            if (clause == null)
-                return;
-
-            _clauses.Add(clause);
-        }
-
-        /// <summary>
-        /// Checks the clause.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        protected virtual bool Check(PropertyContext<TEntity, TProperty> context)
-        {
-            foreach (var clause in _clauses)
-            {
-                if (!clause.Check(context))
-                    return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Checks the clause.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <returns><c>true</c> where validation is to continue; otherwise, <c>false</c> to stop.</returns>
-        bool IValueRule<TEntity, TProperty>.Check(IPropertyContext context) => Check((PropertyContext<TEntity, TProperty>)context);
-
-        /// <summary>
-        /// Validate the property value.
-        /// </summary>
-        /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="Task"/>.</returns>
-        protected abstract Task ValidateAsync(PropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken = default);
-
-        /// <inheritdoc/>
-        Task IValueRule<TEntity, TProperty>.ValidateAsync(IPropertyContext<TEntity, TProperty> context, CancellationToken cancellationToken)
-        {
-            var pc = (PropertyContext<TEntity, TProperty>)context;
-            if (ValidateWhenDefault || Comparer<TProperty?>.Default.Compare(pc.Value, default!) != 0)
-                return ValidateAsync(pc, cancellationToken);
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Rules/WildcardRule.cs b/src/CoreEx.Validation/Rules/WildcardRule.cs
index 2198c7a0..f00e8f71 100644
--- a/src/CoreEx.Validation/Rules/WildcardRule.cs
+++ b/src/CoreEx.Validation/Rules/WildcardRule.cs
@@ -1,35 +1,22 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation.Rules;
 
-using CoreEx.Wildcards;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation.Rules
+/// <summary>
+/// Provides a <see cref="Wildcard"/> <see langword="string"/> validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <param name="wildcard">The <see cref="Wildcard"/>.</param>
+public class WildcardRule<TEntity>(Func<PropertyContext<TEntity, string>, Wildcard?> wildcard) : PropertyRuleBase<TEntity, string> where TEntity : class
 {
-    /// <summary>
-    /// Provides <see cref="string"/> <see cref="Wildcard"/> validation.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    public class WildcardRule<TEntity> : ValueRuleBase<TEntity, string> where TEntity : class
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WildcardRule{TEntity}"/> class.
-        /// </summary>
-        public WildcardRule() => ValidateWhenDefault = false;
+    private readonly Func<PropertyContext<TEntity, string>, Wildcard?> _wildcard = wildcard.ThrowIfNull();
 
-        /// <summary>
-        /// Gets or sets the <see cref="Wildcard"/> configuration (uses <see cref="Wildcard.Default"/> where <c>null</c>).
-        /// </summary>
-        public Wildcard? Wildcard { get; set; }
+    /// <inheritdoc/>
+    protected override Task OnValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken)
+    {
+        var wildcard = _wildcard(context) ?? Wildcard.Default ?? Wildcard.MultiBasic;
 
-        /// <inheritdoc/>
-        protected override Task ValidateAsync(PropertyContext<TEntity, string> context, CancellationToken cancellationToken = default)
-        {
-            var wildcard = Wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
-            if (wildcard != null && !wildcard.Validate(context.Value))
-                context.CreateErrorMessage(ErrorText ?? ValidatorStrings.WildcardFormat);
+        if (wildcard.Parse(context.Value).HasError)
+            context.AddError(ErrorText ?? ValidatorStrings.WildcardFormat);
 
-            return Task.CompletedTask;
-        }
+        return Task.CompletedTask;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidatingInlineValidator.cs b/src/CoreEx.Validation/ValidatingInlineValidator.cs
new file mode 100644
index 00000000..348dc7be
--- /dev/null
+++ b/src/CoreEx.Validation/ValidatingInlineValidator.cs
@@ -0,0 +1,129 @@
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides an implementation of the <see cref="InlineValidator{TValue}"/> that can be used directly for inline-style validation that also supports <see cref="IValidatorEx{TValue}"/>.
+/// </summary>
+/// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+/// <param name="configure">The action to configure the <see cref="ValidatingInlineValidator{T}"/>.</param>
+internal sealed class ValidatingInlineValidator<TValue>(Action<ValidatingInlineValidator<TValue>.Validator>? configure) : InlineValidator<TValue>(configure), IValidatorEx<TValue>
+{
+    /// <summary>
+    /// Overrides the property and JSON names.
+    /// </summary>
+    /// <param name="name">The property name.</param>
+    /// <returns>The <see cref="ValidatingInlineValidator{TValue}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This will apply to all instances in which the <see cref="ValidatingInlineValidator{TValue}"/> is used; therefore, caution is required when using. This is intended for advanced usage only.</remarks>
+    public ValidatingInlineValidator<TValue> WithName(string name)
+    {
+        OverrideName = name.ThrowIfNullOrEmpty();
+        return this;
+    }
+
+    /// <summary>
+    /// Overrides the property text.
+    /// </summary>
+    /// <param name="text">The property text.</param>
+    /// <returns>The <see cref="ValidatingInlineValidator{TValue}"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This will apply to all instances in which the <see cref="ValidatingInlineValidator{TValue}"/> is used; therefore, caution is required when using. This is intended for advanced usage only.</remarks>
+    public ValidatingInlineValidator<TValue> WithText(LText text)
+    {
+        OverrideText = text;
+        return this;
+    }
+
+    /// <inheritdoc/>
+    Task<IValidationContext<TValue>> IValidatorEx<TValue>.ValidateAsync(TValue value, ValidationArgs? args, CancellationToken cancellationToken) => ValidateInternalAsync(value, args, cancellationToken);
+
+    /// <inheritdoc/>
+    async Task IValidatorEx<TValue>.ValidateAndThrowAsync(TValue value, ValidationArgs? args, CancellationToken cancellationToken)
+        => (await ValidateInternalAsync(value, args, cancellationToken).ConfigureAwait(false)).ThrowOnError();
+
+    /// <inheritdoc/>
+    async Task<IValidationResult<TValue>> IValidator<TValue>.ValidateAsync(TValue value, CancellationToken cancellationToken)
+        => await ValidateInternalAsync(value, null, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Performs the <see cref="IValidator{T}"/> validation from above methods.
+    /// </summary>
+    private async Task<IValidationContext<TValue>> ValidateInternalAsync(TValue value, ValidationArgs? args, CancellationToken cancellationToken)
+    {
+        // Validate the value.
+        args ??= new ValidationArgs();
+        var r = await new ValueValidator<TValue>(value, Validation.ValueName, null, Validation.ValueText, c => c.Common(this), null, null).ValidateAsync(new ValidationValue<TValue>(value), args, cancellationToken);
+
+        // Transform the context to expose TValue.
+        var vc = new ValueValidationContext(r);
+        return vc;
+    }
+
+    /// <summary>
+    /// Validates the <paramref name="value"/> treating <typeparamref name="TValue"/> as the root entity at the path already established in <paramref name="args"/>, without adding a '<c>.value</c>' property path segment.
+    /// </summary>
+    /// <remarks>Used by <see cref="Rules.DictionaryRule{TEntity, TProperty, TKey, TValue}"/> and <see cref="Rules.CollectionRule{TEntity, TProperty, TItem}"/>
+    /// when the validator was configured via an inline <see cref="Action{T}"/> to avoid an errant '<c>.value</c>' segment in error property paths.</remarks>
+    internal async Task<IValidationContext<TValue>> ValidateEntityAsync(TValue value, ValidationArgs args, CancellationToken cancellationToken)
+    {
+        // Run the inline rules treating TValue as the root entity at the path already in args (no ".value" wrapper).
+        // Nulling the entity names and using the full args path as the property name means CreateFullyQualifiedPropertyName
+        // returns the name directly (null entity prefix), so FullyQualifiedPropertyName == args entity path.
+        var entityArgs = args with { FullyQualifiedEntityName = null, FullyQualifiedJsonEntityName = null };
+        var r = await new ValueValidator<TValue>(value, args.FullyQualifiedEntityName ?? Validation.ValueName, args.FullyQualifiedJsonEntityName, Validation.ValueText, c => c.Common(this), null, null)
+            .ValidateAsync(new ValidationValue<TValue>(value), entityArgs, cancellationToken).ConfigureAwait(false);
+
+        return new ValueValidationContext(r);
+    }
+
+    /// <inheritdoc/>
+    Task IValidatorEx<TValue>.ValidateAsync(IValidationContext<TValue> context, CancellationToken cancellationToken)
+        => throw new NotSupportedException($"{nameof(ValidateAsync)} is not supported by the {nameof(ValidatingInlineValidator<>)} class.");
+
+    /// <summary>
+    /// Custom <see cref="IValidationContext{TEntity}"/> that transforms the underlying <see cref="ValidationValue{TValue}.Value"/> and related-context.
+    /// </summary>
+    internal readonly struct ValueValidationContext(IValidationContext<ValidationValue<TValue>> parent) : IValidationContext<TValue>
+    {
+        private readonly IValidationContext<ValidationValue<TValue>> _parent = parent;
+
+        /// <inheritdoc/>
+        public Type EntityType => _parent.EntityType;
+
+        /// <inheritdoc/>
+        public string? FullyQualifiedEntityName => _parent.FullyQualifiedEntityName;
+
+        /// <inheritdoc/>
+        public string? FullyQualifiedJsonEntityName => _parent.FullyQualifiedJsonEntityName;
+
+        /// <inheritdoc/>
+        public bool UseJsonNames => _parent.UseJsonNames;
+
+        /// <inheritdoc/>
+        public JsonSerializerOptions? JsonSerializerOptions => _parent.JsonSerializerOptions;
+
+        /// <inheritdoc/>
+        public IServiceProvider? ServiceProvider => _parent.ServiceProvider;
+
+        /// <inheritdoc/>
+        public IDictionary<string, object?> Parameters => _parent.Parameters;
+
+        /// <inheritdoc/>
+        public TValue? Value => _parent.Value is null ? default : _parent.Value.Value;
+
+        /// <inheritdoc/>
+        public bool HasErrors => _parent.HasErrors;
+
+        /// <inheritdoc/>
+        public MessageItemCollection? Messages => _parent.Messages;
+
+        /// <inheritdoc/>
+        public bool HasError(string fullyQualifiedPropertyName) => _parent.HasError(fullyQualifiedPropertyName);
+
+        /// <inheritdoc/>
+        public IValidationResult ThrowOnError() => _parent.ThrowOnError();
+
+        /// <inheritdoc/>
+        public Exception? ToException() => _parent.ToException();
+
+        /// <inheritdoc/>
+        public Result ToResult() => HasErrors ? Result.ValidationError(Messages!) : Result.Success;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationArgs.cs b/src/CoreEx.Validation/ValidationArgs.cs
index e92ceabb..9689bdf2 100644
--- a/src/CoreEx.Validation/ValidationArgs.cs
+++ b/src/CoreEx.Validation/ValidationArgs.cs
@@ -1,71 +1,58 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using System.Collections.Generic;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Represents optional arguments for a validation.
+/// </summary>
+public sealed record class ValidationArgs
 {
+    private static bool? _defaultUseJsonNames;
+    private bool? _useJsonNames;
+
     /// <summary>
-    /// Represents the optional extended arguments for an entity validation.
+    /// Gets or sets the default <see cref="UseJsonNames"/> for all validations unless explicitly overridden. Defaults to <see langword="true"/>.
     /// </summary>
-    public class ValidationArgs
+    public static bool DefaultUseJsonNames
     {
-        private static bool? _defaultUseJsonNames;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationArgs"/> class.
-        /// </summary>
-        public ValidationArgs() { }
-
-        /// <summary>
-        /// Indicates whether to use the JSON name for the <see cref="MessageItem"/> <see cref="MessageItem.Property"/>; by default (<c>false</c>) uses the .NET name.
-        /// </summary>
-        /// <remarks>Will attempt to use <see cref="SettingsBase.ValidationUseJsonNames"/> as a default where possible.</remarks>
-        public static bool DefaultUseJsonNames 
-        { 
-            get => _defaultUseJsonNames ?? ExecutionContext.GetService<SettingsBase>()?.ValidationUseJsonNames ?? false;
-            set => _defaultUseJsonNames = value;
-        } 
-
-        /// <summary>
-        /// Gets or sets the optional name of a selected (specific) property to validate for the entity (<c>null</c> indicates to validate all).
-        /// </summary>
-        /// <remarks>Nested or fully quailified entity names are not supported for this type of validation; only a property of the primary entity can be selected.</remarks>
-        public string? SelectedPropertyName { get; set; }
+        get => _defaultUseJsonNames ??= Internal.GetConfigurationValue("CoreEx:Validation:DefaultUseJsonNames", true);
+        set => _defaultUseJsonNames = value;
+    }
 
-        /// <summary>
-        /// Gets or sets the entity prefix used for fully qualified <i>entity.property</i> naming (<c>null</c> represents the root).
-        /// </summary>
-        public string? FullyQualifiedEntityName { get; set; }
+    /// <summary>
+    /// Indicates whether to use the JSON name for the <see cref="MessageItem"/> <see cref="MessageItem.Property"/> for all validation messages.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="DefaultUseJsonNames"/>.</remarks>
+    public bool UseJsonNames
+    { 
+        get => _useJsonNames ??= DefaultUseJsonNames;
+        set => _useJsonNames = value;
+    }
 
-        /// <summary>
-        /// Gets or sets the entity prefix used for fully qualified <i>entity.property</i> naming (<c>null</c> represents the root).
-        /// </summary>
-        public string? FullyQualifiedJsonEntityName { get; set; }
+    /// <summary>
+    /// Gets or sets the entity prefix used for fully qualified <i>entity.property</i> naming.
+    /// </summary>
+    /// <remarks>This is only used for root-level validations.</remarks>
+    public string? FullyQualifiedEntityName { get; set; }
 
-        /// <summary>
-        /// Indicates (overrides <see cref="DefaultUseJsonNames"/>) whether to use the JSON name for the <see cref="MessageItem"/> <see cref="MessageItem.Property"/>;
-        /// defaults to <c>null</c> (uses the <see cref="DefaultUseJsonNames"/> value).
-        /// </summary>
-        public bool? UseJsonNames { get; set; }
+    /// <summary>
+    /// Gets or sets the entity prefix used for fully qualified <i>entity.property</i> JSON naming.
+    /// </summary>
+    /// <remarks>This is only used for root-level validations.</remarks>
+    public string? FullyQualifiedJsonEntityName { get; set; }
 
-        /// <summary>
-        /// Gets <see cref="UseJsonNames"/> selection.
-        /// </summary>
-        internal bool UseJsonNamesSelection => UseJsonNames ?? DefaultUseJsonNames;
+    /// <summary>
+    /// Gets or sets the <see cref="JsonSerializerOptions"/> used for JSON property naming.
+    /// </summary>
+    public JsonSerializerOptions? JsonSerializerOptions { get; set; }
 
-        /// <summary>
-        /// Indicates that a shallow validation is required; i.e. will only validate the top level properties.
-        /// </summary>
-        /// <remarks>The default deep validation will not only validate the top level properties, but also those children down the object graph;
-        /// i.e. sub-objects and collections.</remarks>
-        public bool ShallowValidation { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="IServiceProvider"/> to use when resolving services.
+    /// </summary>
+    /// <remarks>The <see cref="ExecutionContext.ServiceProvider"/> will be used as the default where not specified.</remarks>
+    public IServiceProvider? ServiceProvider { get; set; }
 
-        /// <summary>
-        /// Gets the configuration parameters.
-        /// </summary>
-        /// <remarks>Configuration parameters provide a means to pass values down through the validation stack. The consuming developer must instantiate the property on first use.</remarks>
-        public IDictionary<string, object?>? Config { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the additional parameters.
+    /// </summary>
+    /// <remarks>Additional parameters provide a means to pass values down through the validation stack.</remarks>
+    public IDictionary<string, object?> Parameters { get; set => field = value.ThrowIfNull(); } = new Dictionary<string, object?>();
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationContext.Utility.cs b/src/CoreEx.Validation/ValidationContext.Utility.cs
new file mode 100644
index 00000000..a81d3e18
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationContext.Utility.cs
@@ -0,0 +1,163 @@
+namespace CoreEx.Validation;
+
+public sealed partial class ValidationContext<TEntity>
+{
+    /// <summary>
+    /// Determines whether the specified property has an error.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <returns><see langword="true"/> where an error exists for the specified property; otherwise, <see langword="false"/>.</returns>
+    public bool HasError<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) => HasError<TProperty>(RuntimeMetadata.GetForExpression(propertyExpression));
+
+    /// <summary>
+    /// Determines whether the specified property has an error.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyMetadata">The property metadata.</param>
+    /// <returns><see langword="true"/> where an error exists for the specified property; otherwise, <see langword="false"/>.</returns>
+    internal bool HasError<TProperty>(IPropertyRuntimeMetadata propertyMetadata) => HasError(CreateFullyQualifiedPropertyName(propertyMetadata.Name));
+
+    /// <summary>
+    /// Checks whether a specified property has not had an error, then executes a predicate to determine whether an error has occurred and where <see langword="true"/> adds an error <see cref="MessageItem"/>.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <param name="predicate">The error checking predicate; a <see langword="true"/> result indicates an error.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns><see langword="true"/> indicates that the specified property has had an error, or is now considered in error; otherwise, <see langword="false"/> for no error.</returns>
+    /// <remarks>The property friendly text and value are automatically passed as the first two arguments to the underlying string formatter.</remarks>
+    public bool Check<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, Predicate<TProperty> predicate, LText format, params object?[] values)
+    {
+        var pm = RuntimeMetadata.GetForExpression(propertyExpression);
+        predicate.ThrowIfNull();
+
+        if (HasError<TProperty>(pm))
+            return true;
+
+        if (!predicate(pm.GetValue<TProperty>(Value)))
+            return false;
+
+        AddError<TProperty>(pm, null, null, null, format, values);
+        return true;
+    }
+
+    /// <summary>
+    /// Checks whether a specified property has not had an error, then <paramref name="when"/> <see langword="true"/> adds an error <see cref="MessageItem"/>.
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <param name="when"><see langword="true"/> indicates an error; otherwise, <see langword="false"/>.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns><see langword="true"/> indicates that the specified property has had an error, or is now considered in error; otherwise, <see langword="false"/> for no error.</returns>
+    /// <remarks>The property friendly text and value are automatically passed as the first two arguments to the underlying string formatter.</remarks>
+    public bool Check<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, bool when, LText format, params object?[] values)
+    {
+        var pm = RuntimeMetadata.GetForExpression(propertyExpression);
+
+        if (HasError<TProperty>(pm))
+            return true;
+
+        if (!when)
+            return false;
+
+        AddError<TProperty>(pm, null, null, null, format, values);
+        return true;
+    }
+
+    /// <summary>
+    /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and and additional values included in the text. 
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>The <see cref="MessageItem"/>.</returns>
+    /// <remarks>The property friendly text and value are automatically prepended to the <paramref name="values"/> as the first two arguments where the <paramref name="format"/> does not have already have <see cref="LText.HasArgs"/>.</remarks>
+    public MessageItem AddError<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText format, params object?[] values)
+        => AddError<TProperty>(RuntimeMetadata.GetForExpression(propertyExpression), null, null, null, format, values);
+
+    /// <summary>
+    /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and and additional values included in the text. 
+    /// </summary>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyMetadata">The <see cref="IPropertyRuntimeMetadata"/>.</param>
+    /// <param name="text">The property <see cref="LText"/> override.</param>
+    /// <param name="valueFormatter">The <see cref="ValueFormatter"/>.</param>
+    /// <param name="jsonNameOverride">The JSON property name override.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>The <see cref="MessageItem"/>.</returns>
+    /// <remarks>The property friendly text and value are automatically prepended to the <paramref name="values"/> as the first two arguments where the <paramref name="format"/> does not have already have <see cref="LText.HasArgs"/>.</remarks>
+    internal MessageItem AddError<TProperty>(IPropertyRuntimeMetadata propertyMetadata, LText? text, ValueFormatter? valueFormatter, string? jsonNameOverride, LText format, params object?[] values)
+    {
+        format = format.EnsureNoArgsWhen(values);
+
+        text ??= propertyMetadata.Text;
+        jsonNameOverride ??= propertyMetadata.GetJsonName(JsonSerializerOptions);
+        object?[] std = [text, valueFormatter is null ? propertyMetadata.GetValue(Value) : valueFormatter.Value.ToLText(propertyMetadata.GetValue(Value))];
+
+        if (propertyMetadata is ISelfRuntimeMetadata)
+            return AddError(format, [.. std, .. values]);
+        else
+            return AddError(propertyMetadata.Name, jsonNameOverride ?? propertyMetadata.GetJsonName(JsonSerializerOptions), format, [.. std, .. values]);
+    }
+
+    /// <summary>
+    /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and and additional values included in the text. 
+    /// </summary>
+    /// <param name="propertyName">The property name.</param>
+    /// <param name="jsonPropertyName">The JSON property name.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>The <see cref="MessageItem"/>.</returns>
+    internal MessageItem AddError(string propertyName, string jsonPropertyName, LText format, params object?[] values)
+    {
+        propertyName.ThrowIfNullOrEmpty();
+        var fqpn = CreateFullyQualifiedPropertyName(propertyName);
+        var mi = new ValidationMessageItem()
+        {
+            Property = UseJsonNames ? CreateFullyQualifiedJsonPropertyName(jsonPropertyName) : fqpn,
+            Type = MessageType.Error,
+            Text = format.EnsureNoArgs().WithArgs(values),
+            FullyQualifiedPropertyName = fqpn
+        };
+
+        GetMessages().Add(mi);
+        return mi;
+    }
+
+    /// <summary>
+    /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the explicit text format and and additional values included in the text. 
+    /// </summary>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>The <see cref="MessageItem"/>.</returns>
+    internal MessageItem AddError(LText format, params object?[] values)
+    {
+        var mi = new ValidationMessageItem()
+        {
+            Property = UseJsonNames ? (FullyQualifiedJsonEntityName ?? string.Empty) : FullyQualifiedEntityName,
+            Type = MessageType.Error,
+            Text = format.EnsureNoArgs().WithArgs(values),
+            FullyQualifiedPropertyName = FullyQualifiedEntityName
+        };
+
+        GetMessages().Add(mi);
+        return mi;
+    }
+
+    /// <summary>
+    /// Creates a fully qualified property name appending the <paramref name="name"/>.
+    /// </summary>
+    /// <param name="name">The property name.</param>
+    public string CreateFullyQualifiedPropertyName(string name) => FullyQualifiedEntityName is null ? name : name.StartsWith('[') ? FullyQualifiedEntityName + name : FullyQualifiedEntityName + "." + name;
+
+    /// <summary>
+    /// Creates a fully qualified JSON property name appending the <paramref name="jsonName"/>.
+    /// </summary>
+    /// <param name="jsonName">The JSON property name.</param>
+    public string CreateFullyQualifiedJsonPropertyName(string jsonName) => FullyQualifiedJsonEntityName is null ? jsonName : (jsonName.StartsWith('[') ? FullyQualifiedJsonEntityName + jsonName : FullyQualifiedJsonEntityName + "." + jsonName);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationContext.cs b/src/CoreEx.Validation/ValidationContext.cs
index 319374e8..42bce619 100644
--- a/src/CoreEx.Validation/ValidationContext.cs
+++ b/src/CoreEx.Validation/ValidationContext.cs
@@ -1,552 +1,161 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Abstractions.Reflection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using CoreEx.Localization;
-using CoreEx.Results;
-
-namespace CoreEx.Validation
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides the <typeparamref name="TEntity"/> <see cref="IValidationContext{TEntity}"/>.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <param name="value">The entity value.</param>
+/// <param name="args">The <see cref="ValidationArgs"/>.</param>
+/// <param name="fullyQualifiedEntityNameOverride">Optional <see cref="ValidationArgs.FullyQualifiedEntityName"/> override.</param>
+/// <param name="fullyQualifiedJsonEntityNameOverride">Optional <see cref="ValidationArgs.FullyQualifiedJsonEntityName"/> override.</param>
+public sealed partial class ValidationContext<TEntity>(TEntity value, ValidationArgs args, string? fullyQualifiedEntityNameOverride = null, string? fullyQualifiedJsonEntityNameOverride = null) : IValidationContext<TEntity> where TEntity : class
 {
+    private HashSet<string>? _errorProperties;
+
     /// <summary>
-    /// Provides a validation context for an entity.
+    /// Gets the <see cref="ValidationArgs"/>.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    public class ValidationContext<TEntity> : IValidationContext, IValidationResult<TEntity>
-    {
-        private readonly Dictionary<string, MessageItem> _propertyMessages = [];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationContext{TEntity}"/> class.
-        /// </summary>
-        /// <param name="value">The entity value.</param>
-        /// <param name="args">The <see cref="ValidationArgs"/>.</param>
-        /// <param name="fullyQualifiedEntityNameOverride">Optional <see cref="ValidationArgs.FullyQualifiedEntityName"/> override.</param>
-        /// <param name="fullyQualifiedJsonEntityNameOverride">Optional <see cref="ValidationArgs.FullyQualifiedJsonEntityName"/> override.</param>
-        public ValidationContext(TEntity value, ValidationArgs args, string? fullyQualifiedEntityNameOverride = null, string? fullyQualifiedJsonEntityNameOverride = null)
-        {
-            args.ThrowIfNull(nameof(args));
-
-            Value = value;
-            FullyQualifiedEntityName = fullyQualifiedEntityNameOverride ?? args.FullyQualifiedEntityName;
-            FullyQualifiedJsonEntityName = fullyQualifiedJsonEntityNameOverride ?? args.FullyQualifiedJsonEntityName ?? FullyQualifiedEntityName;
-            UsedJsonNames = args.UseJsonNamesSelection;
-            Config = args.Config;
-            SelectedPropertyName = args.SelectedPropertyName;
-            ShallowValidation = args.ShallowValidation;
-        }
+    public ValidationArgs Args { get; } = args.ThrowIfNull();
 
-        /// <summary>
-        /// Gets the <see cref="ExecutionContext.Current"/> instance.
-        /// </summary>
-        public CoreEx.ExecutionContext ExecutionContext => ExecutionContext.Current;
+    /// <inheritdoc/>
+    public Type EntityType => typeof(TEntity);
 
-        /// <inheritdoc/>
-        public Type EntityType => typeof(TEntity);
+    /// <inheritdoc/>
+    object? IValidationResult.Value => Value;
 
-        /// <inheritdoc/>
-        object? IValidationResult.Value => Value;
+    /// <inheritdoc/>
+    public TEntity Value { get; } = value;
 
-        /// <summary>
-        /// Gets the entity value.
-        /// </summary>
-        public TEntity Value { get; }
+    /// <inheritdoc/>
+    public string? FullyQualifiedEntityName { get; } = fullyQualifiedEntityNameOverride ?? args.FullyQualifiedEntityName;
 
-        /// <summary>
-        /// Gets the entity prefix used for fully qualified <i>entity.property</i> naming (<c>null</c> represents the root).
-        /// </summary>
-        public string? FullyQualifiedEntityName { get; }
+    /// <inheritdoc/>
+    public string? FullyQualifiedJsonEntityName { get; } = fullyQualifiedJsonEntityNameOverride ?? args.FullyQualifiedJsonEntityName;
 
-        /// <summary>
-        /// Gets the entity prefix used for fully qualified JSON <i>entity.property</i> naming (<c>null</c> represents the root).
-        /// </summary>
-        public string? FullyQualifiedJsonEntityName { get; }
+    /// <inheritdoc/>
+    public bool UseJsonNames { get; } = args.UseJsonNames;
 
-        /// <summary>
-        /// Gets the optional name of a selected (specific) property to validate for the entity (<c>null</c> indicates to validate all).
-        /// </summary>
-        public string? SelectedPropertyName { get; }
+    /// <inheritdoc/>
+    public JsonSerializerOptions? JsonSerializerOptions { get; } = args.JsonSerializerOptions;
 
-        /// <summary>
-        /// Indicates whether to use the JSON name for the <see cref="MessageItem"/> <see cref="MessageItem.Property"/>; by default (<c>false</c>) uses the .NET name.
-        /// </summary>
-        public bool UsedJsonNames { get; }
-
-        /// <summary>
-        /// Gets the <see cref="MessageItemCollection"/>.
-        /// </summary>
-        public MessageItemCollection? Messages { get; private set; }
-
-        /// <summary>
-        /// Indicates whether there has been a validation error.
-        /// </summary>
-        public bool HasErrors { get; private set; }
-
-        /// <summary>
-        /// Indicates that a shallow validation is required; i.e. will only validate the top level properties.
-        /// </summary>
-        public bool ShallowValidation { get; }
-
-        /// <inheritdoc/>
-        public IDictionary<string, object?>? Config { get; set; }
-
-        /// <summary>
-        /// Gets (creates) the messages collection.
-        /// </summary>
-        /// <returns></returns>
-        private MessageItemCollection GetMessages()
-        {
-            if (Messages == null)
-            {
-                Messages = [];
-                Messages.CollectionChanged += Messages_CollectionChanged;
-            }
-
-            return Messages;
-        }
+    /// <inheritdoc/>
+    public IServiceProvider? ServiceProvider { get; } = args.ServiceProvider;
 
-        /// <summary>
-        /// Handle the add of a message.
-        /// </summary>
-        private void Messages_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
-                    foreach (var m in e.NewItems!)
-                    {
-                        MessageItem mi = (MessageItem)m;
-                        if (mi.Type == MessageType.Error)
-                            HasErrors = true;
-                    }
-
-                    break;
-
-                default:
-                    throw new InvalidOperationException("Operation invalid for Messages; only add supported.");
-            }
-        }
-
-        /// <inheritdoc/>
-        public Result? FailureResult { get; private set; }
-
-        /// <summary>
-        /// Sets the <see cref="FailureResult"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        internal void SetFailureResult(Result? result)
-        {
-            if (result is null)
-                return;
+    /// <summary>
+    /// Gets the <see cref="MessageItemCollection"/>.
+    /// </summary>
+    public MessageItemCollection? Messages { get; private set; }
 
-            if (FailureResult.HasValue)
-                throw new InvalidOperationException("The ValidationContext is already in a Failure state.");
+    /// <inheritdoc/>
+    public IDictionary<string, object?> Parameters { get; } = args.Parameters;
 
-            if (result.Value.IsFailure)
-            {
-                FailureResult = result;
-                HasErrors = true;
-            }
-        }
-
-        /// <inheritdoc/>
-        public Exception? ToException() => FailureResult.HasValue ? FailureResult.Value.Error : (HasErrors ? new ValidationException(Messages!) : null);
+    /// <summary>
+    /// Indicates whether there has been a validation error.
+    /// </summary>
+    public bool HasErrors { get; private set; }
 
-        /// <inheritdoc/>
-        IValidationResult IValidationResult.ThrowOnError() => ThrowOnError(false);
+    /// <summary>
+    /// Determines whether the specified fully qualified property name has an error.
+    /// </summary>
+    /// <param name="fullyQualifiedPropertyName">The fully qualified property name.</param>
+    /// <returns><see langword="true"/> where an error exists for the specified property; otherwise, <see langword="false"/>.</returns>
+    public bool HasError(string fullyQualifiedPropertyName) => _errorProperties is not null && _errorProperties.Contains(fullyQualifiedPropertyName);
 
-        /// <summary>
-        /// Throws a <see cref="Exception"/> (typically a <see cref="ValidationException"/>) where an error was found (and optionally if warnings).
-        /// </summary>
-        /// <param name="includeWarnings">Indicates whether to throw where only warnings exist.</param>
-        /// <returns>The <see cref="ValidationContext{TEntity}"/> to support fluent-style method-chaining.</returns>
-        public ValidationContext<TEntity> ThrowOnError(bool includeWarnings = false)
+    /// <summary>
+    /// Gets (creates) the messages collection.
+    /// </summary>
+    private MessageItemCollection GetMessages()
+    {
+        if (Messages is null)
         {
-            var ex = ToException();
-            if (ex is not null)
-                throw ex;
-
-            if (includeWarnings && Messages != null && Messages.Any(x => x.Type == MessageType.Warning))
-                throw new ValidationException(Messages);
-
-            return this;
+            Messages = [];
+            Messages.CollectionChanged += Messages_CollectionChanged;
         }
 
-        /// <inheritdoc/>
-        public Result<R> ToResult<R>() => FailureResult.HasValue ? FailureResult.Value.Bind<R>() : (HasErrors ? Result<R>.ValidationError(Messages!) : Validation.ConvertValueToResult<TEntity, R>(Value!));
-
-        /// <inheritdoc/>
-        public Result ToResult() => FailureResult ?? (HasErrors ? Result.ValidationError(Messages!) : Result.Success);
-
-        /// <summary>
-        /// Merges a validation result into this.
-        /// </summary>
-        /// <param name="context">The <see cref="IValidationContext"/> to merge.</param>
-        public void MergeResult(IValidationContext context)
-        {
-            if (context.FailureResult.HasValue)
-                SetFailureResult(context.FailureResult.Value);
-            else
-                MergeResult(context?.Messages);
-        }
+        return Messages;
+    }
 
-        /// <summary>
-        /// Merges a <see cref="MessageItemCollection"/> into this.
-        /// </summary>
-        /// <param name="messages">The <see cref="MessageItemCollection"/> to merge.</param>
-        public void MergeResult(MessageItemCollection? messages)
+    /// <summary>
+    /// Handle the add of a message.
+    /// </summary>
+    private void Messages_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    {
+        switch (e.Action)
         {
-            if (messages == null || messages.Count == 0)
-                return;
-
-            MessageItemCollection? errs = null;
-            foreach (var mi in messages)
-            {
-                if (!string.IsNullOrEmpty(mi.Property) && mi.Type == MessageType.Error)
+            case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
+                foreach (var m in e.NewItems!)
                 {
-                    if (!HasError(mi.Property))
-                        _propertyMessages.Add(mi.Property, mi);
+                    MessageItem mi = (MessageItem)m;
+                    if (mi.Type == MessageType.Error)
+                    {
+                        HasErrors = true;
+                        if (mi is ValidationMessageItem vmi && vmi.FullyQualifiedPropertyName is not null)
+                            (_errorProperties ??= []).Add(vmi.FullyQualifiedPropertyName);
+                    }
                 }
 
-                (errs ??= GetMessages()).Add(mi);
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified property has an error.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <returns><c>true</c> where an error exists for the specified property; otherwise, <c>false</c>.</returns>
-        public bool HasError<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) => HasError(CreateFullyQualifiedName(propertyExpression));
+                break;
 
-        /// <summary>
-        /// Determines whether the specified property has an error.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <returns><c>true</c> where an error exists for the specified property; otherwise, <c>false</c>.</returns>
-        internal bool HasError<TProperty>(PropertyExpression<TEntity, TProperty> propertyExpression) => HasError(CreateFullyQualifiedName(propertyExpression));
-
-        /// <summary>
-        /// Determines whether one of the specified fully qualified property name has an error.
-        /// </summary>
-        /// <param name="fullyQualifiedPropertyName">The fully qualified property name.</param>
-        /// <returns><c>true</c> where an error exists for at least one of the specified properties; otherwise, <c>false</c>.</returns>
-        public bool HasError(string fullyQualifiedPropertyName) => _propertyMessages.ContainsKey(fullyQualifiedPropertyName);
-
-        /// <summary>
-        /// Gets the error <see cref="MessageItem"/> for the specified property.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <returns>The corresponding <see cref="MessageItem"/>; otherwise, <c>null</c>.</returns>
-        public MessageItem? GetError<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) => _propertyMessages.TryGetValue(CreateFullyQualifiedName(propertyExpression), out MessageItem? mi) ? null : mi;
-
-        /// <summary>
-        /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property and explicit text. 
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="text">The text <see cref="LText"/>.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddError<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText text)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            return AddMessage(pe.Name, pe.JsonName, MessageType.Error, text, GetTextAndValue(pe));
+            default:
+                throw new InvalidOperationException("Operation invalid for Messages; only add supported.");
         }
+    }
 
-        /// <summary>
-        /// Adds an <see cref="MessageType.Error"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and and additional values included in the text. The property
-        /// friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddError<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText format, params object[] values)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            return AddMessage(pe.Name, pe.JsonName, MessageType.Error, format, [.. GetTextAndValue(pe), .. values]);
-        }
-
-        /// <summary>
-        /// Adds an <see cref="MessageType.Warning"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property and explicit text. The property friendly text and value are automatically passed as the
-        /// first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="text">The text <see cref="LText"/>.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddWarning<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText text)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            return AddMessage(pe.Name, pe.JsonName, MessageType.Warning, text, GetTextAndValue(pe));
-        }
-
-        /// <summary>
-        /// Adds an <see cref="MessageType.Warning"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and and additional values included in the text. The property
-        /// friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddWarning<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText format, params object[] values)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            return AddMessage(pe.Name, pe.JsonName, MessageType.Warning, format, [.. GetTextAndValue(pe), .. values]);
-        }
-
-        /// <summary>
-        /// Adds an <see cref="MessageType.Info"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property and explicit text. The property friendly text and value are automatically passed as the
-        /// first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="text">The text <see cref="LText"/>.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddInfo<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText text)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            return AddMessage(pe.Name, pe.JsonName, MessageType.Info, text, GetTextAndValue(pe));
-        }
-
-        /// <summary>
-        /// Adds an <see cref="MessageType.Info"/> <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and and additional values included in the text. The property
-        /// friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddInfo<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText format, params object[] values)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            return AddMessage(pe.Name, pe.JsonName, MessageType.Info, format, [.. GetTextAndValue(pe), .. values]);
-        }
-
-        /// <summary>
-        /// Adds a <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property and explicit text.
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        /// <param name="jsonPropertyName">The JSON property name.</param>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="text">The text <see cref="LText"/>.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        internal MessageItem AddMessage(string propertyName, string? jsonPropertyName, MessageType type, LText text)
-        {
-            var mi = GetMessages().Add(CreateFullyQualifiedName(propertyName, jsonPropertyName), type, text);
-            if (type == MessageType.Error && !HasError(mi.Property!))
-                _propertyMessages.Add(mi.Property!, mi);
-
-            return mi;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified property, explicit text format and additional values included in the text.
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        /// <param name="jsonPropertyName">The JSON property name.</param>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        internal MessageItem AddMessage(string propertyName, string? jsonPropertyName, MessageType type, LText format, params object?[] values)
-        {
-            var mi = GetMessages().Add(CreateFullyQualifiedName(propertyName, jsonPropertyName), type, format, values);
-            if (type == MessageType.Error && !HasError(mi.Property!))
-                _propertyMessages.Add(mi.Property!, mi);
-
-            return mi;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified text.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="text">The text <see cref="LText"/>.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddMessage(MessageType type, LText text)
-        {
-            var mi = GetMessages().Add(UsedJsonNames ? FullyQualifiedJsonEntityName : FullyQualifiedEntityName, type, text);
-            if (type == MessageType.Error && !HasError(mi.Property!))
-                _propertyMessages.Add(mi.Property!, mi);
-
-            return mi;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="MessageItem"/> to the <see cref="Messages"/> for the specified text format and additional values included in the text.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>The <see cref="MessageItem"/>.</returns>
-        public MessageItem AddMessage(MessageType type, LText format, params object?[] values)
-        {
-            var mi = GetMessages().Add(UsedJsonNames ? FullyQualifiedJsonEntityName : FullyQualifiedEntityName, type, format, values);
-            if (type == MessageType.Error && !HasError(mi.Property!))
-                _propertyMessages.Add(mi.Property!, mi);
-
-            return mi;
-        }
-
-        /// <summary>
-        /// Checks whether a specified property has not had an error, then executes a predicate to determine whether an error has occurred (returns <c>true</c>) adding an error <see cref="MessageItem"/> for the
-        /// specified property and text. The property friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="predicate">The error checking predicate; a <c>true</c> result indicates an error.</param>
-        /// <param name="text">The error text <see cref="LText"/>.</param>
-        /// <returns><c>true</c> indicates that the specified property has had an error, or is now considered in error; otherwise, <c>false</c> for no error.</returns>
-        public bool Check<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, Func<TProperty, bool> predicate, LText text)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            predicate.ThrowIfNull(nameof(predicate));
-
-            if (HasError(pe))
-                return true;
-
-            var tv = GetTextAndValue(pe);
-            if (!predicate((TProperty)tv[1]))
-                return false;
-
-            AddMessage(pe.Name, pe.JsonName, MessageType.Error, text, tv);
-            return true;
-        }
-
-        /// <summary>
-        /// Checks whether a specified property has not had an error, then where <paramref name="when"/> is <c>true</c> adds an error <see cref="MessageItem"/> for the
-        /// specified property and text. The property friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="when"><c>true</c> indicates an error; otherwise, <c>false</c>.</param>
-        /// <param name="text">The error text <see cref="LText"/>.</param>
-        /// <returns><c>true</c> indicates that the specified property has had an error, or is now considered in error; otherwise, <c>false</c> for no error.</returns>
-        public bool Check<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, bool when, LText text)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            if (HasError(pe))
-                return true;
-
-            var tv = GetTextAndValue(pe);
-            if (!when)
-                return false;
-
-            AddMessage(pe.Name, pe.JsonName, MessageType.Error, text, tv);
-            return true;
-        }
-
-        /// <summary>
-        /// Checks whether a specified property has not had an error, then executes a predicate to determine whether an error has occurred (returns <c>true</c>) adding an error <see cref="MessageItem"/> for the
-        /// specified property, text format and and additional values included in the text. The property friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="predicate">The error checking predicate; a <c>false</c> result indicates an error.</param>
-        /// <param name="format">The error composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns><c>true</c> indicates that the specified property has had an error, or is now considered in error; otherwise, <c>false</c> for no error.</returns>
-        public bool Check<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, Func<TProperty, bool> predicate, LText format, params object[] values)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            predicate.ThrowIfNull(nameof(predicate));
-
-            if (HasError(pe))
-                return true;
-
-            var tv = GetTextAndValue(pe);
-            if (!predicate((TProperty)tv[1]))
-                return false;
-
-            AddMessage(pe.Name, pe.JsonName, MessageType.Error, format, [.. tv, .. values]);
-            return true;
-        }
-
-        /// <summary>
-        /// Checks whether a specified property has not had an error, then where <paramref name="when"/> is <c>true</c> adds an error <see cref="MessageItem"/> for the specified property, 
-        /// text format and and additional values included in the text. The property friendly text and value are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <param name="when"><c>true</c> indicates an error; otherwise, <c>false</c>.</param>
-        /// <param name="format">The error composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns><c>true</c> indicates that the specified property has had an error, or is now considered in error; otherwise, <c>false</c> for no error.</returns>
-        public bool Check<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, bool when, LText format, params object[] values)
-        {
-            var pe = CreatePropertyExpression(propertyExpression);
-            if (HasError(pe))
-                return true;
-
-            var tv = GetTextAndValue(pe);
-            if (!when)
-                return false;
-
-            AddMessage(pe.Name, pe.JsonName, MessageType.Error, format, [.. tv, .. values]);
-            return true;
-        }
+    /// <inheritdoc/>
+    public Exception? ToException() => HasErrors ? new ValidationException(Messages!) : null;
 
-        /// <summary>
-        /// Gets the friendly text and value for a property expression.
-        /// </summary>
-        private object[] GetTextAndValue<TProperty>(PropertyExpression<TEntity, TProperty> propertyExpression) => [propertyExpression.Text, propertyExpression.GetValue(Value)!];
+    /// <inheritdoc/>
+    IValidationResult IValidationResult.ThrowOnError() => ThrowOnError();
 
-        /// <summary>
-        /// Creates the property expression from the expression.
-        /// </summary>
-        private static PropertyExpression<TEntity, TProperty> CreatePropertyExpression<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) => PropertyExpression.Create(propertyExpression);
+    /// <summary>
+    /// Throws a <see cref="ValidationException"/> where an error was found (and optionally any warnings).
+    /// </summary>
+    /// <returns>The <see cref="ValidationContext{TEntity}"/> to support fluent-style method-chaining.</returns>
+    public ValidationContext<TEntity> ThrowOnError()
+    {
+        var ex = ToException();
+        if (ex is not null)
+            throw ex;
 
-        /// <summary>
-        /// Gets the text for the specified property.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The property expression.</param>
-        /// <returns>The property text.</returns>
-        public LText GetText<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) => CreatePropertyExpression(propertyExpression).Text;
+        return this;
+    }
 
-        /// <summary>
-        /// Creates the fully qualified name from an expression.
-        /// </summary>
-        private string CreateFullyQualifiedName<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression)
-            => CreateFullyQualifiedName(CreatePropertyExpression(propertyExpression));
+    /// <summary>
+    /// Merges a <paramref name="validationResult"/> into this.
+    /// </summary>
+    /// <param name="validationResult">The <see cref="IValidationResult"/> to merge.</param>
+    internal void MergeResult(IValidationResult? validationResult)
+    {
+        if (validationResult?.Messages is not null && validationResult.Messages.Count > 0)
+            GetMessages().AddRange(validationResult.Messages);
+    }
 
-        /// <summary>
-        /// Creates the fully qualified name from a property expression.
-        /// </summary>
-        private string CreateFullyQualifiedName<TProperty>(PropertyExpression<TEntity, TProperty> propertyExpression)
-            => CreateFullyQualifiedName(propertyExpression.ThrowIfNull(nameof(propertyExpression)).Name, propertyExpression.JsonName);
+    /// <inheritdoc/>
+    public Result ToResult() => HasErrors ? Result.ValidationError(Messages!) : Result.Success;
 
-        /// <summary>
-        /// Creates the fully qualified name using the property and json property names.
-        /// </summary>
-        private string CreateFullyQualifiedName(string propertyName, string? jsonPropertyName)
-        {
-            propertyName.ThrowIfNullOrEmpty(nameof(propertyName));
-            return UsedJsonNames ? CreateFullyQualifiedJsonPropertyName(jsonPropertyName ?? propertyName) : CreateFullyQualifiedPropertyName(propertyName);
-        }
+    /// <summary>
+    /// Executes a <i>further</i> <paramref name="validator"/> for the <see cref="Value"/>.
+    /// </summary>
+    /// <param name="validator">The <see cref="IValidatorEx{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is useful in scenarios where <i>further</i> validation needs to occur for the <see cref="Value"/>, that needs an <see cref="IValidatorEx{T}"/> to be constructed dynamically at runtime with the same
+    /// <see cref="ValidationContext{TEntity}"/>, that is ostensibly a continuation/extension of any existing validation for that value.</remarks>
+    public Task ValidateFurtherAsync(IValidatorEx<TEntity> validator, CancellationToken cancellationToken = default) => validator.ThrowIfNull().ValidateAsync(this, cancellationToken);
 
-        /// <summary>
-        /// Creates a fully qualified property name for the specified name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        /// <returns>The fully qualified property name.</returns>
-        internal string CreateFullyQualifiedPropertyName(string name) => FullyQualifiedEntityName == null ? name : name.StartsWith('[') ? FullyQualifiedEntityName + name : FullyQualifiedEntityName + "." + name;
+    /// <summary>
+    /// Executes a <i>further</i> dynamically created <see cref="Validator{TEntity}"/> for the <see cref="Value"/> that enables further configuration.
+    /// </summary>
+    /// <param name="configure">An action to configure the <see cref="Validator{TEntity}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is useful in scenarios where <i>further</i> validation needs to occur for the <see cref="Value"/>, that needs an <see cref="IValidatorEx{T}"/> to be constructed dynamically at runtime with the same
+    /// <see cref="ValidationContext{TEntity}"/>, that is ostensibly a continuation/extension of any existing validation for that value.</remarks>
+    public Task ValidateFurtherAsync(Action<Validator<TEntity>> configure, CancellationToken cancellationToken = default)
+    {
+        if (configure is null)
+            return Task.CompletedTask;
 
-        /// <summary>
-        /// Creates a fully qualified JSON property name for the specified name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        /// <returns>The fully qualified property name.</returns>
-        internal string CreateFullyQualifiedJsonPropertyName(string name) => FullyQualifiedJsonEntityName == null ? name : name.StartsWith('[') ? FullyQualifiedJsonEntityName + name : FullyQualifiedJsonEntityName + "." + name;
+        var v = Validator.Create<TEntity>();
+        configure(v);
+        return ValidateFurtherAsync(v, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.BetweenRule.cs b/src/CoreEx.Validation/ValidationExtensions.BetweenRule.cs
new file mode 100644
index 00000000..b38e4c11
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.BetweenRule.cs
@@ -0,0 +1,178 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The minimum value.</param>
+    /// <param name="max">The maximum value.</param>
+    /// <param name="minText">The minimum text (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Between<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty min, TProperty max, LText? minText = null, LText? maxText = null, bool exclusiveBetween = false, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(_ => min, _ => max, _ => minText, _ => maxText, exclusiveBetween, comparer));
+
+    /// <summary>
+    /// Chains a between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The function to get the minimum value.</param>
+    /// <param name="max">The function to get the maximum value.</param>
+    /// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Between<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, bool exclusiveBetween = false, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(c => min.ThrowIfNull()(c), c => max.ThrowIfNull()(c), minText, maxText, exclusiveBetween, comparer));
+
+    /// <summary>
+    /// Chains an inclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The minimum value.</param>
+    /// <param name="max">The maximum value.</param>
+    /// <param name="minText">The minimum text (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> InclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty min, TProperty max, LText? minText = null, LText? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+    => Chain(rule, new BetweenRule<TEntity, TProperty>(_ => min, _ => max, _ => minText, _ => maxText, false, comparer));
+
+    /// <summary>
+    /// Chains an inclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The function to get the minimum value.</param>
+    /// <param name="max">The function to get the maximum value.</param>
+    /// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> InclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(c => min.ThrowIfNull()(c), c => max.ThrowIfNull()(c), minText, maxText, false, comparer));
+
+    /// <summary>
+    /// Chains an exclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The minimum value.</param>
+    /// <param name="max">The maximum value.</param>
+    /// <param name="minText">The minimum text (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> ExclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty min, TProperty max, LText? minText = null, LText? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(_ => min, _ => max, _ => minText, _ => maxText, true, comparer));
+
+    /// <summary>
+    /// Chains an exclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The function to get the minimum value.</param>
+    /// <param name="max">The function to get the maximum value.</param>
+    /// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> ExclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(c => min.ThrowIfNull()(c), c => max.ThrowIfNull()(c), minText, maxText, true, comparer));
+
+    /* Nullable/Struct */
+
+    /// <summary>
+    /// Chains a between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The minimum value.</param>
+    /// <param name="max">The maximum value.</param>
+    /// <param name="minText">The minimum text (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Between<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty min, TProperty max, LText? minText = null, LText? maxText = null, bool exclusiveBetween = false, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(_ => min, _ => max, _ => minText, _ => maxText, exclusiveBetween, comparer));
+
+    /// <summary>
+    /// Chains a between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The function to get the minimum value.</param>
+    /// <param name="max">The function to get the maximum value.</param>
+    /// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Between<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, bool exclusiveBetween = false, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(c => min.ThrowIfNull()(c), c => max.ThrowIfNull()(c), minText, maxText, exclusiveBetween, comparer));
+
+    /// <summary>
+    /// Chains an inclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The minimum value.</param>
+    /// <param name="max">The maximum value.</param>
+    /// <param name="minText">The minimum text (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> InclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty min, TProperty max, LText? minText = null, LText? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+    => Chain(rule, new BetweenRule<TEntity, TProperty>(_ => min, _ => max, _ => minText, _ => maxText, false, comparer));
+
+    /// <summary>
+    /// Chains an inclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The function to get the minimum value.</param>
+    /// <param name="max">The function to get the maximum value.</param>
+    /// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> InclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(c => min.ThrowIfNull()(c), c => max.ThrowIfNull()(c), minText, maxText, false, comparer));
+
+    /// <summary>
+    /// Chains an exclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The minimum value.</param>
+    /// <param name="max">The maximum value.</param>
+    /// <param name="minText">The minimum text (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> ExclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty min, TProperty max, LText? minText = null, LText? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(_ => min, _ => max, _ => minText, _ => maxText, true, comparer));
+
+    /// <summary>
+    /// Chains an exclusive between comparison (<see cref="BetweenRule{TEntity, TProperty}"/>) validation of a <paramref name="min"/> and <paramref name="max"/> value.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="min">The function to get the minimum value.</param>
+    /// <param name="max">The function to get the maximum value.</param>
+    /// <param name="minText">The minimum text formatter (used in the error message); otherwise, uses the resulting <paramref name="min"/> value.</param>
+    /// <param name="maxText">The maximum text formatter (used in the error message); otherwise, uses the resulting <paramref name="max"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> ExclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> min, Func<PropertyContext<TEntity, TProperty>, TProperty> max, Func<TProperty, LText?>? minText = null, Func<TProperty, LText?>? maxText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new BetweenRule<TEntity, TProperty>(c => min.ThrowIfNull()(c), c => max.ThrowIfNull()(c), minText, maxText, true, comparer));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.CollectionRule.cs b/src/CoreEx.Validation/ValidationExtensions.CollectionRule.cs
new file mode 100644
index 00000000..986fef9b
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.CollectionRule.cs
@@ -0,0 +1,136 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a collection (<see cref="CollectionRule{TEntity, TProperty, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The <see cref="IEnumerable{T}"/> item <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> to chain to.</param>
+    /// <param name="with">Extends configuration <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    public static CollectionRule<TEntity, IEnumerable<TItem>, TItem> Collection<TEntity, TItem>(this IPropertyRule<TEntity, IEnumerable<TItem?>> rule, Func<CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With, CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With> with) where TEntity : class
+        => (CollectionRule<TEntity, IEnumerable<TItem>, TItem>)Chain(rule, new CollectionRule<TEntity, IEnumerable<TItem>, TItem>(null, null, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="CollectionRule{TEntity, TProperty, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The <see cref="IEnumerable{T}"/> item <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> to chain to.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    public static CollectionRule<TEntity, IEnumerable<TItem>, TItem> Collection<TEntity, TItem>(this IPropertyRule<TEntity, IEnumerable<TItem?>> rule, int maxCount, Func<CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With, CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With>? with = null) where TEntity : class
+        => (CollectionRule<TEntity, IEnumerable<TItem>, TItem>)Chain(rule, new CollectionRule<TEntity, IEnumerable<TItem>, TItem>(null, _ => maxCount, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="CollectionRule{TEntity, TProperty, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The <see cref="IEnumerable{T}"/> item <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> to chain to.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    public static CollectionRule<TEntity, IEnumerable<TItem>, TItem> Collection<TEntity, TItem>(this IPropertyRule<TEntity, IEnumerable<TItem?>> rule, Func<PropertyContext<TEntity, IEnumerable<TItem>>, int?>? maxCount, Func<CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With, CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With>? with = null) where TEntity : class
+        => (CollectionRule<TEntity, IEnumerable<TItem>, TItem>)Chain(rule, new CollectionRule<TEntity, IEnumerable<TItem>, TItem>(null, maxCount, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="CollectionRule{TEntity, TProperty, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The <see cref="IEnumerable{T}"/> item <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> to chain to.</param>
+    /// <param name="minCount">The minimum count.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    public static CollectionRule<TEntity, IEnumerable<TItem>, TItem> Collection<TEntity, TItem>(this IPropertyRule<TEntity, IEnumerable<TItem?>> rule, int minCount, int? maxCount, Func<CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With, CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With>? with = null) where TEntity : class
+        => (CollectionRule<TEntity, IEnumerable<TItem>, TItem>)Chain(rule, new CollectionRule<TEntity, IEnumerable<TItem>, TItem>(_ => minCount, _ => maxCount, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="CollectionRule{TEntity, TProperty, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The <see cref="IEnumerable{T}"/> item <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> to chain to.</param>
+    /// <param name="minCount">The minimum count.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    public static CollectionRule<TEntity, IEnumerable<TItem>, TItem> Collection<TEntity, TItem>(this IPropertyRule<TEntity, IEnumerable<TItem?>> rule, Func<PropertyContext<TEntity, IEnumerable<TItem>>, int>? minCount, Func<PropertyContext<TEntity, IEnumerable<TItem>>, int?>? maxCount, Func<CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With, CollectionRule<TEntity, IEnumerable<TItem>, TItem>.With>? with = null) where TEntity : class
+        => (CollectionRule<TEntity, IEnumerable<TItem>, TItem>)Chain(rule, new CollectionRule<TEntity, IEnumerable<TItem>, TItem>(minCount, maxCount, with));
+
+    /* WithDuplicateCheck-extensions */
+
+    /// <summary>
+    /// Sets the duplicate check based on the <see cref="IIdentifierCore.Id"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="with">The <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    /// <param name="duplicateText">The duplicate <see cref="LText"/> to be used in the error message.</param>
+    /// <returns>The <paramref name="with"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="duplicateText"/> defaults to <see cref="ValidatorStrings.IdentifierText"/>.</remarks>
+    public static CollectionRule<TEntity, TProperty, TItem>.With WithDuplicateIdCheck<TEntity, TProperty, TItem>(this CollectionRule<TEntity, TProperty, TItem>.With with, LText? duplicateText = null) where TEntity : class where TProperty : IEnumerable<TItem> where TItem : IIdentifierCore
+        => with.ThrowIfNull().WithDuplicateCheckingInternal(item => item.EntityKey, CompositeKeyComparer.Default, () => duplicateText ?? ValidatorStrings.IdentifierText);
+
+    /// <summary>
+    /// Sets the duplicate check based on the <see cref="IEntityKey.EntityKey"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="with">The <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    /// <param name="duplicateText">The duplicate <see cref="LText"/> to be used in the error message.</param>
+    /// <returns>The <paramref name="with"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="duplicateText"/> defaults to <see cref="ValidatorStrings.KeyText"/>.</remarks>
+    public static CollectionRule<TEntity, TProperty, TItem>.With WithDuplicateKeyCheck<TEntity, TProperty, TItem>(this CollectionRule<TEntity, TProperty, TItem>.With with, LText? duplicateText = null) where TEntity : class where TProperty : IEnumerable<TItem> where TItem : IEntityKey
+        => with.ThrowIfNull().WithDuplicateCheckingInternal(item => item.EntityKey, CompositeKeyComparer.Default, () => duplicateText ?? ValidatorStrings.KeyText);
+
+    /// <summary>
+    /// Sets the duplicate check based on the <paramref name="propertyExpression"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItemProperty">The item property <see cref="Type"/>.</typeparam>
+    /// <param name="with">The <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
+    /// <param name="comparer">The <see cref="IEqualityComparer{T}"/>.</param>
+    /// <param name="duplicateText">The duplicate <see cref="LText"/> to be used in the error message.</param>
+    /// <returns>The <paramref name="with"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="duplicateText"/> defaults to the resulting <paramref name="propertyExpression"/> <see cref="IPropertyRuntimeMetadata.Text"/>.</remarks>
+    public static CollectionRule<TEntity, TProperty, TItem>.With WithDuplicatePropertyCheck<TEntity, TProperty, TItem, TItemProperty>(this CollectionRule<TEntity, TProperty, TItem>.With with, Expression<Func<TItem, TItemProperty>> propertyExpression, IEqualityComparer<TItemProperty>? comparer = null, LText? duplicateText = null) where TEntity : class where TProperty : IEnumerable<TItem> where TItem : class
+    {
+        var dcp = RuntimeMetadata.GetForExpression(propertyExpression.ThrowIfNull());
+        return with.ThrowIfNull().WithDuplicateCheckingInternal(dcp.GetValue<TItemProperty>, comparer, () => duplicateText ??= dcp.Text);
+    }
+
+    /// <summary>
+    /// Sets the duplicate check based on the item value (<see cref="IEquatable{T}"/>).
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <param name="with">The <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    /// <param name="duplicateText">The duplicate <see cref="LText"/> to be used in the error message.</param>
+    /// <param name="comparer">The equality comparer.</param>
+    /// <returns>The <paramref name="with"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="duplicateText"/> defaults to <see cref="ValidatorStrings.KeyText"/>.</remarks>
+    public static CollectionRule<TEntity, TProperty, TItem>.With WithDuplicateCheck<TEntity, TProperty, TItem>(this CollectionRule<TEntity, TProperty, TItem>.With with, IEqualityComparer<TItem>? comparer = null, LText? duplicateText = null) where TEntity : class where TProperty : IEnumerable<TItem> where TItem : IEquatable<TItem>
+        => with.ThrowIfNull().WithDuplicateCheckingInternal(item => item, comparer, () => duplicateText ?? ValidatorStrings.ItemText);
+
+    /// <summary>
+    /// Sets the duplicate check based on the <paramref name="keySelector"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <param name="with">The <see cref="CollectionRule{TEntity, TProperty, TItem}.With"/>.</param>
+    /// <param name="keySelector">The key selector.</param>
+    /// <param name="comparer">The equality comparer.</param>
+    /// <param name="duplicateText">The duplicate <see cref="LText"/> to be used in the error message.</param>
+    /// <returns>The <paramref name="with"/> to support fluent-style method-chaining.</returns>
+    public static CollectionRule<TEntity, TProperty, TItem>.With WithDuplicateCheck<TEntity, TProperty, TItem, TKey>(this CollectionRule<TEntity, TProperty, TItem>.With with, Func<TItem, TKey> keySelector, IEqualityComparer<TKey>? comparer = null, LText? duplicateText = null) where TEntity : class where TProperty : IEnumerable<TItem>
+        => with.ThrowIfNull().WithDuplicateCheckingInternal(keySelector, comparer, () => duplicateText ?? ValidatorStrings.ItemText);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.CommonRule.cs b/src/CoreEx.Validation/ValidationExtensions.CommonRule.cs
new file mode 100644
index 00000000..c0087fad
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.CommonRule.cs
@@ -0,0 +1,24 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a common (<see cref="CommonRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="commonValidator">The <see cref="CommonValidator{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Common<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, InlineValidator<TProperty> commonValidator) where TEntity : class
+        => Chain(rule, new CommonRule<TEntity, TProperty>(commonValidator.ThrowIfNull()));
+
+    /// <summary>
+    /// Chains a common (<see cref="CommonRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="commonValidator">The <see cref="CommonValidator{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Common<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, InlineValidator<TProperty> commonValidator) where TEntity : class where TProperty : struct
+        => Chain(rule, new CommonRule<TEntity, TProperty>(commonValidator.ThrowIfNull()));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.ComparePropertyRule.cs b/src/CoreEx.Validation/ValidationExtensions.ComparePropertyRule.cs
new file mode 100644
index 00000000..7ca90398
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.ComparePropertyRule.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a property comparison (<see cref="ComparePropertyRule{TEntity, TProperty, TCompareProperty}"/>) validation against another property (<paramref name="compareToPropertyExpression"/>) within the same entity; also confirms other property has no errors prior to comparison.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TCompareProperty"></typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+    /// <param name="compareToPropertyExpression">>The <see cref="Expression"/> to reference the compare-to entity property.</param>
+    /// <param name="compareToText">The compare-to value text formatter (used in the error message); otherwise, uses the resulting compare-to value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> CompareProperty<TEntity, TProperty, TCompareProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, Expression<Func<TEntity, TCompareProperty>> compareToPropertyExpression, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new ComparePropertyRule<TEntity, TProperty, TCompareProperty>(compareOperator, compareToPropertyExpression, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a property comparison (<see cref="ComparePropertyRule{TEntity, TProperty, TCompareProperty}"/>) validation against another property (<paramref name="compareToPropertyExpression"/>) within the same entity; also confirms other property has no errors prior to comparison.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TCompareProperty"></typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+    /// <param name="compareToPropertyExpression">>The <see cref="Expression"/> to reference the compare-to entity property.</param>
+    /// <param name="compareToText">The compare-to value text formatter (used in the error message); otherwise, uses the resulting compare-to value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> CompareProperty<TEntity, TProperty, TCompareProperty>(this IPropertyRule<TEntity, TProperty?> rule, CompareOperator compareOperator, Expression<Func<TEntity, TCompareProperty>> compareToPropertyExpression, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new ComparePropertyRule<TEntity, TProperty, TCompareProperty>(compareOperator, compareToPropertyExpression, compareToText, comparer));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.CompareValueRule.cs b/src/CoreEx.Validation/ValidationExtensions.CompareValueRule.cs
new file mode 100644
index 00000000..0b931823
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.CompareValueRule.cs
@@ -0,0 +1,346 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a <paramref name="compareTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Compare<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(compareOperator, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <paramref name="compareTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Compare<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(compareOperator, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.Equal"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Equal<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.Equal, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.Equal"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Equal<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.Equal, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.NotEqual"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> NotEqual<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.NotEqual, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.NotEqual"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> NotEqual<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.NotEqual, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThan, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThan, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThanOrEqualTo, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThanOrEqualTo, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThanOrEqualTo, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThanOrEqualTo, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThan, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThan, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /* Nullable/Struct */
+
+    /// <summary>
+    /// Chains a <paramref name="compareTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Compare<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, CompareOperator compareOperator, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(compareOperator, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <paramref name="compareTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Compare<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, CompareOperator compareOperator, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(compareOperator, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.Equal"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Equal<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.Equal, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.Equal"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Equal<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.Equal, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.NotEqual"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> NotEqual<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.NotEqual, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.NotEqual"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> NotEqual<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.NotEqual, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThan, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThan, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThanOrEqualTo, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.LessThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> LessThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThanOrEqualTo, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThanOrEqualTo, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThanOrEqualTo"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThanOrEqualTo, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, TProperty compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThan, _ => compareTo, compareToText, comparer));
+
+    /// <summary>
+    /// Chains a <see cref="CompareOperator.GreaterThan"/> comparison (<see cref="CompareValueRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="compareTo">The function to get the compare-to value.</param>
+    /// <param name="compareToText">The value text formatter (used in the error message); otherwise, uses the resulting <paramref name="compareTo"/> value.</param>
+    /// <param name="comparer">The optional <see cref="IComparer{T}"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> GreaterThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty> compareTo, Func<TProperty, LText?>? compareToText = null, IComparer<TProperty>? comparer = null) where TEntity : class where TProperty : struct, IComparable<TProperty>
+        => Chain(rule, new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThan, c => compareTo.ThrowIfNull()(c), compareToText, comparer));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.CompareValuesRule.cs b/src/CoreEx.Validation/ValidationExtensions.CompareValuesRule.cs
new file mode 100644
index 00000000..26950c44
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.CompareValuesRule.cs
@@ -0,0 +1,54 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a <paramref name="values"/> comparison (<see cref="CompareValuesRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="values">The compare-to value(s).</param>
+    /// <param name="comparer">The optional <see cref="IEqualityComparer{T}"/>.</param>
+    /// <param name="overrideValueWhereMatched">Indicates whether to override the underlying property value with the corresponding matched value.</param>
+    public static IPropertyRule<TEntity, TProperty> CompareValues<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, IEnumerable<TProperty> values, IEqualityComparer<TProperty>? comparer = null, bool overrideValueWhereMatched = false) where TEntity : class where TProperty : IEquatable<TProperty>
+        => Chain(rule, new CompareValuesRule<TEntity, TProperty>(_ => values, comparer, overrideValueWhereMatched));
+
+    /// <summary>
+    /// Chains a <paramref name="values"/> comparison (<see cref="CompareValuesRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="values">The function to get the compare-to value(s).</param>
+    /// <param name="comparer">The optional <see cref="IEqualityComparer{T}"/>.</param>
+    /// <param name="overrideValueWhereMatched">Indicates whether to override the underlying property value with the corresponding matched value.</param>
+    public static IPropertyRule<TEntity, TProperty> CompareValues<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, IEnumerable<TProperty>> values, IEqualityComparer<TProperty>? comparer = null, bool overrideValueWhereMatched = false) where TEntity : class where TProperty : IEquatable<TProperty>
+        => Chain(rule, new CompareValuesRule<TEntity, TProperty>(c => values.ThrowIfNull()(c), comparer, overrideValueWhereMatched));
+
+    /* Nullable/Struct */
+
+    /// <summary>
+    /// Chains a <paramref name="values"/> comparison (<see cref="CompareValuesRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="values">The compare-to value(s).</param>
+    /// <param name="comparer">The optional <see cref="IEqualityComparer{T}"/>.</param>
+    /// <param name="overrideValueWhereMatched">Indicates whether to override the underlying property value with the corresponding matched value.</param>
+    public static IPropertyRule<TEntity, TProperty> CompareValues<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, IEnumerable<TProperty> values, IEqualityComparer<TProperty>? comparer = null, bool overrideValueWhereMatched = false) where TEntity : class where TProperty : struct, IEquatable<TProperty>
+        => Chain(rule, new CompareValuesRule<TEntity, TProperty>(_ => values, comparer, overrideValueWhereMatched));
+
+    /// <summary>
+    /// Chains a <paramref name="values"/> comparison (<see cref="CompareValuesRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="values">The function to get the compare-to value(s).</param>
+    /// <param name="comparer">The optional <see cref="IEqualityComparer{T}"/>.</param>
+    /// <param name="overrideValueWhereMatched">Indicates whether to override the underlying property value with the corresponding matched value.</param>
+    public static IPropertyRule<TEntity, TProperty> CompareValues<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, IEnumerable<TProperty>> values, IEqualityComparer<TProperty>? comparer = null, bool overrideValueWhereMatched = false) where TEntity : class where TProperty : struct, IEquatable<TProperty>
+        => Chain(rule, new CompareValuesRule<TEntity, TProperty>(c => values.ThrowIfNull()(c), comparer, overrideValueWhereMatched));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.DecimalRule.cs b/src/CoreEx.Validation/ValidationExtensions.DecimalRule.cs
new file mode 100644
index 00000000..1158f410
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.DecimalRule.cs
@@ -0,0 +1,94 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, decimal> Decimal<TEntity>(this IPropertyRule<TEntity, decimal> rule, int? precision, int? scale = null, bool allowNegatives = true) where TEntity : class
+        => Chain(rule, new DecimalRule<TEntity, decimal>(_ => precision, _ => scale, _ => allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, decimal> Decimal<TEntity>(this IPropertyRule<TEntity, decimal> rule, Func<PropertyContext<TEntity, decimal>, int?>? precision, Func<PropertyContext<TEntity, decimal>, int?>? scale = null, Func<PropertyContext<TEntity, decimal>, bool>? allowNegatives = null) where TEntity : class
+        => Chain(rule, new DecimalRule<TEntity, decimal>(precision, scale, allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, TProperty> PrecisionScale<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, int? precision, int? scale = null, bool allowNegatives = true) where TEntity : class where TProperty : IFloatingPoint<TProperty>
+        => Chain(rule, new DecimalRule<TEntity, TProperty>(_ => precision, _ => scale, _ => allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, TProperty> PrecisionScale<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, int?>? precision, Func<PropertyContext<TEntity, TProperty>, int?>? scale = null, Func<PropertyContext<TEntity, TProperty>, bool>? allowNegatives = null) where TEntity : class where TProperty : IFloatingPoint<TProperty>
+        => Chain(rule, new DecimalRule<TEntity, TProperty>(precision, scale, allowNegatives));
+
+    /* Nullable/Struct */
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, decimal> Decimal<TEntity>(this IPropertyRule<TEntity, decimal?> rule, int? precision, int? scale = null, bool allowNegatives = true) where TEntity : class
+        => Chain(rule, new DecimalRule<TEntity, decimal>(_ => precision, _ => scale, _ => allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, decimal> Decimal<TEntity>(this IPropertyRule<TEntity, decimal?> rule, Func<PropertyContext<TEntity, decimal>, int?>? precision, Func<PropertyContext<TEntity, decimal>, int?>? scale = null, Func<PropertyContext<TEntity, decimal>, bool>? allowNegatives = null) where TEntity : class
+        => Chain(rule, new DecimalRule<TEntity, decimal>(precision, scale, allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, TProperty> PrecisionScale<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, int? precision, int? scale = null, bool allowNegatives = true) where TEntity : class where TProperty : struct, IFloatingPoint<TProperty>
+        => Chain(rule, new DecimalRule<TEntity, TProperty>(_ => precision, _ => scale, _ => allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="precision"/>, <paramref name="scale"/> and <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of decimal places.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    /// <remarks>For example, to validate a number with the pattern '999.99', then <paramref name="precision"/> would be 5 and <paramref name="scale"/> would be 2.</remarks>
+    public static IPropertyRule<TEntity, TProperty> PrecisionScale<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, int?>? precision, Func<PropertyContext<TEntity, TProperty>, int?>? scale = null, Func<PropertyContext<TEntity, TProperty>, bool>? allowNegatives = null) where TEntity : class where TProperty : struct, IFloatingPoint<TProperty>
+        => Chain(rule, new DecimalRule<TEntity, TProperty>(precision, scale, allowNegatives));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.DependsOnClause.cs b/src/CoreEx.Validation/ValidationExtensions.DependsOnClause.cs
new file mode 100644
index 00000000..994e6ae8
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.DependsOnClause.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Adds a depends on expression (<see cref="DependsOnClause{TEntity, TProperty, TDependsOnProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDependsOnProperty">The depends on property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="dependsOnPropertyExpression">The depends on property expression.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Represents a depends on clause; in that specified property (<paramref name="dependsOnPropertyExpression"/>) of the entity must have a non-default value, and not have a validation error, to continue.</remarks>
+    public static IPropertyRule<TEntity, TProperty> DependsOn<TEntity, TProperty, TDependsOnProperty>(this IPropertyRule<TEntity, TProperty> rule, Expression<Func<TEntity, TDependsOnProperty>> dependsOnPropertyExpression) where TEntity : class
+        => AddClause(rule, new DependsOnClause<TEntity, TProperty, TDependsOnProperty>(dependsOnPropertyExpression.ThrowIfNull()));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.DictionaryRule.cs b/src/CoreEx.Validation/ValidationExtensions.DictionaryRule.cs
new file mode 100644
index 00000000..9c1b2acf
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.DictionaryRule.cs
@@ -0,0 +1,65 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a dictionary (<see cref="DictionaryRule{TEntity, TProperty, TKey, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="with">Extends configuration <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}.With"/>.</param>
+    public static DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue> Dictionary<TEntity, TKey, TValue>(this IPropertyRule<TEntity, IDictionary<TKey, TValue>> rule, Func<DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With, DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With> with) where TEntity : class where TKey : notnull where TValue : notnull
+        => (DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>)Chain(rule, new DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>(null, null, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="DictionaryRule{TEntity, TProperty, TKey, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}.With"/>.</param>
+    public static DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue> Dictionary<TEntity, TKey, TValue>(this IPropertyRule<TEntity, IDictionary<TKey, TValue>> rule, int maxCount, Func<DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With, DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With>? with = null) where TEntity : class where TKey : notnull where TValue : notnull
+        => (DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>)Chain(rule, new DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>(null, _ => maxCount, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="DictionaryRule{TEntity, TProperty, TKey, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}.With"/>.</param>
+    public static DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue> Dictionary<TEntity, TKey, TValue>(this IPropertyRule<TEntity, IDictionary<TKey, TValue>> rule, Func<PropertyContext<TEntity, IDictionary<TKey, TValue>>, int?>? maxCount, Func<DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With, DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With>? with = null) where TEntity : class where TKey : notnull where TValue : notnull
+        => (DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>)Chain(rule, new DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>(null, maxCount, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="DictionaryRule{TEntity, TProperty, TKey, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="minCount">The minimum count.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}.With"/>.</param>
+    public static DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue> Dictionary<TEntity, TKey, TValue>(this IPropertyRule<TEntity, IDictionary<TKey, TValue>> rule, int minCount, int? maxCount, Func<DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With, DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With>? with = null) where TEntity : class where TKey : notnull where TValue : notnull
+        => (DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>)Chain(rule, new DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>(_ => minCount, _ => maxCount, with));
+
+    /// <summary>
+    /// Chains a collection (<see cref="DictionaryRule{TEntity, TProperty, TKey, TItem}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="minCount">The minimum count.</param>
+    /// <param name="maxCount">The maximum count.</param>
+    /// <param name="with">Extends configuration <see cref="DictionaryRule{TEntity, TProperty, TKey, TValue}.With"/>.</param>
+    public static DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue> Dictionary<TEntity, TKey, TValue>(this IPropertyRule<TEntity, IDictionary<TKey, TValue>> rule, Func<PropertyContext<TEntity, IDictionary<TKey, TValue>>, int>? minCount, Func<PropertyContext<TEntity, IDictionary<TKey, TValue>>, int?>? maxCount, Func<DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With, DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>.With>? with = null) where TEntity : class where TKey : notnull where TValue : notnull
+        => (DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>)Chain(rule, new DictionaryRule<TEntity, IDictionary<TKey, TValue>, TKey, TValue>(minCount, maxCount, with));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.EmailRule.cs b/src/CoreEx.Validation/ValidationExtensions.EmailRule.cs
new file mode 100644
index 00000000..23cc8e90
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.EmailRule.cs
@@ -0,0 +1,24 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains an e-mail <see langword="string"/> (<see cref="EmailRule{TEntity}"/>) with optional <paramref name="maxLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="maxLength">The maximum string length.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> Email<TEntity>(this IPropertyRule<TEntity, string> rule, int maxLength) where TEntity : class
+        => Chain(rule, new EmailRule<TEntity>(_ => maxLength));
+
+    /// <summary>
+    /// Chains an e-mail <see langword="string"/> (<see cref="EmailRule{TEntity}"/>) with optional <paramref name="maxLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="maxLength">The optional maximum string length.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> Email<TEntity>(this IPropertyRule<TEntity, string> rule, Func<PropertyContext<TEntity, string>, int?>? maxLength = null) where TEntity : class
+        => Chain(rule, new EmailRule<TEntity>(maxLength));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.EntityRule.cs b/src/CoreEx.Validation/ValidationExtensions.EntityRule.cs
new file mode 100644
index 00000000..2ec5b04c
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.EntityRule.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains an entity (<see cref="EntityRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="with">Extends configuration <see cref="EntityRule{TEntity, TProperty}.With"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Entity<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Action<EntityRule<TEntity, TProperty>.With> with) where TEntity : class where TProperty : class?
+        => Chain(rule, new EntityRule<TEntity, TProperty>(with));
+
+    /// <summary>
+    /// Chains an entity (<see cref="EntityRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="validator">The <see cref="IValidatorEx{T}"/>.</param>
+    /// <remarks>Consider using the <see cref="Entity{TEntity, TProperty}(IPropertyRule{TEntity, TProperty}, Action{EntityRule{TEntity, TProperty}.With})"/> as this provides additional validator options (where applicable).</remarks>
+    public static IPropertyRule<TEntity, TProperty> Entity<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, IValidatorEx<TProperty> validator) where TEntity : class where TProperty : class?
+        => Entity(rule, w => w.WithValidator(validator));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.EnumRule.cs b/src/CoreEx.Validation/ValidationExtensions.EnumRule.cs
new file mode 100644
index 00000000..11884e15
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.EnumRule.cs
@@ -0,0 +1,77 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains an <see cref="System.Enum"/> (<see cref="EnumRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, params TProperty[] allowed) where TEntity : class where TProperty : struct, Enum
+        => Chain(rule, new EnumRule<TEntity, TProperty>(_ => allowed));
+
+    /// <summary>
+    /// Chains an <see cref="System.Enum"/> (<see cref="EnumRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, IEnumerable<TProperty> allowed) where TEntity : class where TProperty : struct, Enum
+        => Chain(rule, new EnumRule<TEntity, TProperty>(_ => allowed?.ToArray()));
+
+    /// <summary>
+    /// Chains an <see cref="System.Enum"/> (<see cref="EnumRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, TProperty[]?>? allowed) where TEntity : class where TProperty : struct, Enum
+        => Chain(rule, new EnumRule<TEntity, TProperty>(allowed));
+
+    /* Nullable-enum */
+
+    /// <summary>
+    /// Chains an <see cref="System.Enum"/> (<see cref="EnumRule{TEntity, TProperty}.NullableRule"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, params TProperty[] allowed) where TEntity : class where TProperty : struct, Enum
+        => Chain(rule, new EnumRule<TEntity, TProperty>.NullableRule(_ => allowed));
+
+    /// <summary>
+    /// Chains an <see cref="System.Enum"/> (<see cref="EnumRule{TEntity, TProperty}.NullableRule"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, IEnumerable<TProperty> allowed) where TEntity : class where TProperty : struct, Enum
+        => Chain(rule, new EnumRule<TEntity, TProperty>.NullableRule(_ => allowed?.ToArray()));
+
+    /// <summary>
+    /// Chains an <see cref="System.Enum"/> (<see cref="EnumRule{TEntity, TProperty}.NullableRule"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowed">An optional list of allowed values.</param>
+    public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, TProperty[]?>? allowed) where TEntity : class where TProperty : struct, Enum
+        => Chain(rule, new EnumRule<TEntity, TProperty>.NullableRule(allowed));
+
+    /* Enum-string */
+
+    /// <summary>
+    /// Chains a <see langword="string"/>-based <see cref="System.Enum"/> (<see cref="EnumStringRule{TEntity}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="with">The <see cref="EnumStringRule{TEntity}.EnumWith"/> configuration function.</param>
+    public static IPropertyRule<TEntity, string> Enum<TEntity>(this IPropertyRule<TEntity, string> rule, Func<EnumStringRule<TEntity>.EnumWith, EnumStringRule<TEntity>.EnumWith> with) where TEntity : class
+        => Chain(rule, new EnumStringRule<TEntity>(with));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.ErrorRule.cs b/src/CoreEx.Validation/ValidationExtensions.ErrorRule.cs
new file mode 100644
index 00000000..a3d0d875
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.ErrorRule.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a specified <paramref name="error"/> (<see cref="ErrorRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="error">The error text.</param>
+    /// <remarks>Use a succeeding conditional clause to control whether the <paramref name="error"/> is emitted.</remarks>
+    public static IPropertyRule<TEntity, TProperty> Error<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText error) where TEntity : class
+        => Chain(rule, new ErrorRule<TEntity, TProperty>(error));
+
+    /// <summary>
+    /// Chains a duplicate (<see cref="ErrorRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <remarks>Use a succeeding conditional clause to control whether the error (<see cref="ValidatorStrings.DuplicateFormat"/>) is emitted.</remarks>
+    public static IPropertyRule<TEntity, TProperty> Duplicate<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class => Error(rule, ValidatorStrings.DuplicateFormat);
+
+    /// <summary>
+    /// Chains a not-found (<see cref="ErrorRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <remarks>Use a succeeding conditional clause to control whether the error (<see cref="ValidatorStrings.NotFoundFormat"/>) is emitted.</remarks>
+    public static IPropertyRule<TEntity, TProperty> NotFound<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class => Error(rule, ValidatorStrings.NotFoundFormat);
+
+    /// <summary>
+    /// Chains an invalid (<see cref="ErrorRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <remarks>Use a succeeding conditional clause to control whether the error (<see cref="ValidatorStrings.InvalidFormat"/>) is emitted.</remarks>
+    public static IPropertyRule<TEntity, TProperty> Invalid<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class => Error(rule, ValidatorStrings.InvalidFormat);
+
+    /// <summary>
+    /// Chains an invalid (<see cref="ErrorRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <remarks>Use a succeeding conditional clause to control whether the error (<see cref="ValidatorStrings.ImmutableFormat"/>) is emitted.</remarks>
+    public static IPropertyRule<TEntity, TProperty> Immutable<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class => Error(rule, ValidatorStrings.ImmutableFormat);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.InteropRule.cs b/src/CoreEx.Validation/ValidationExtensions.InteropRule.cs
new file mode 100644
index 00000000..9c5ae8b6
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.InteropRule.cs
@@ -0,0 +1,26 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains an interop (<see cref="InteropRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="getValidator">The function to get the <see cref="IValidator"/>.</param>
+    /// <param name="validateWhenNull">Indicates whether the validation will be performed where the property value is <see langword="null"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Interop<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<IValidator> getValidator, bool validateWhenNull = false) where TEntity : class
+        => Chain(rule, new InteropRule<TEntity, TProperty>(getValidator, validateWhenNull));
+
+    /// <summary>
+    /// Chains an interop (<see cref="InteropRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="validator">The <see cref="IValidator"/>.</param>
+    /// <param name="validateWhenNull">Indicates whether the validation will be performed where the property value is <see langword="null"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> Interop<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, IValidator validator, bool validateWhenNull = false) where TEntity : class
+        => Interop(rule, () => validator, validateWhenNull);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.MandatoryRule.cs b/src/CoreEx.Validation/ValidationExtensions.MandatoryRule.cs
new file mode 100644
index 00000000..c1b5f9b8
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.MandatoryRule.cs
@@ -0,0 +1,44 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a mandatory (<see cref="MandatoryRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="mustNotBeDefault">Indicates that a validation error should occur when the value is <see langword="default"/>.</param>
+    /// <param name="mustNotBeEmpty">Indicates that a validation error should occur when the value is considered empty.</param>
+    public static IPropertyRule<TEntity, TProperty> Mandatory<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool mustNotBeDefault = true, bool mustNotBeEmpty = true) where TEntity : class
+        => Chain(rule, new MandatoryRule<TEntity, TProperty>(mustNotBeDefault: _ => mustNotBeDefault, mustNotBeEmpty: _ => mustNotBeEmpty));
+
+    /// <summary>
+    /// Chains a mandatory (<see cref="MandatoryRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="mustNotBeDefault">Indicates that a validation error should occur when the value is <see langword="default"/>.</param>
+    /// <param name="mustNotBeEmpty">Indicates that a validation error should occur when the value is considered empty.</param>
+    public static IPropertyRule<TEntity, TProperty> Mandatory<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, bool>? mustNotBeDefault, Func<PropertyContext<TEntity, TProperty>, bool>? mustNotBeEmpty) where TEntity : class
+        => Chain(rule, new MandatoryRule<TEntity, TProperty>(mustNotBeDefault ?? (_ => true), mustNotBeEmpty ?? (_ => true)));
+
+    /// <summary>
+    /// Chains a null and not empty (<see cref="MandatoryRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    public static IPropertyRule<TEntity, TProperty> NotEmpty<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class
+        => Chain(rule, new MandatoryRule<TEntity, TProperty>(mustNotBeDefault: _ => true, mustNotBeEmpty: _ => true));
+
+    /// <summary>
+    /// Chains a not null only (<see cref="MandatoryRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    public static IPropertyRule<TEntity, TProperty> NotNull<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class
+        => Chain(rule, new MandatoryRule<TEntity, TProperty>(mustNotBeDefault: _ => false, mustNotBeEmpty: _ => false));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.NullNoneEmptyRule.cs b/src/CoreEx.Validation/ValidationExtensions.NullNoneEmptyRule.cs
new file mode 100644
index 00000000..b18948b9
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.NullNoneEmptyRule.cs
@@ -0,0 +1,52 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a must be <see langword="null"/> (<see cref="NullNoneEmptyRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    public static IPropertyRule<TEntity, TProperty> Null<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class where TProperty : class?
+        => Chain(rule, new NullNoneEmptyRule<TEntity, TProperty>(mustBeNull: _ => true, mustBeDefault: _ => false, mustBeEmpty: _ => false));
+
+    /// <summary>
+    /// Chains a must be <see langword="default"/> (<see cref="NullNoneEmptyRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    public static IPropertyRule<TEntity, TProperty> None<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class
+        => Chain(rule, new NullNoneEmptyRule<TEntity, TProperty>(mustBeNull: _ => false, mustBeDefault: _ => true, mustBeEmpty: _ => false));
+
+    /// <summary>
+    /// Chains a must be empty (<see cref="NullNoneEmptyRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    public static IPropertyRule<TEntity, TProperty> Empty<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class where TProperty : class?
+        => Chain(rule, new NullNoneEmptyRule<TEntity, TProperty>(mustBeNull: _ => false, mustBeDefault: _ => false, mustBeEmpty: _ => true));
+
+    /// <summary>
+    /// Chains a must be null (<see cref="NullNoneEmptyRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    public static IPropertyRule<TEntity, TProperty?> Null<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule) where TEntity : class where TProperty : struct
+        => Chain(rule, new NullNoneEmptyRule<TEntity, TProperty?>(mustBeNull: _ => true, mustBeDefault: _ => false, mustBeEmpty: _ => false));
+
+    /// <summary>
+    /// Chains a must be <see langword="default"/> (<see cref="NullNoneEmptyRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    public static IPropertyRule<TEntity, TProperty> None<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule) where TEntity : class where TProperty : struct
+        => Chain(rule, new NullNoneEmptyRule<TEntity, TProperty>(mustBeNull: _ => false, mustBeDefault: _ => true, mustBeEmpty: _ => false));
+
+    /// <summary>
+    /// Chains a must be empty (<see cref="NullNoneEmptyRule{TEntity, TProperty}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    public static IPropertyRule<TEntity, TProperty> Empty<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule) where TEntity : class where TProperty : struct
+        => Chain(rule, new NullNoneEmptyRule<TEntity, TProperty>(mustBeNull: _ => false, mustBeDefault: _ => false, mustBeEmpty: _ => true));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.NumericRule.cs b/src/CoreEx.Validation/ValidationExtensions.NumericRule.cs
new file mode 100644
index 00000000..f89165d2
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.NumericRule.cs
@@ -0,0 +1,64 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    public static IPropertyRule<TEntity, TProperty> Numeric<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool allowNegatives = true) where TEntity : class where TProperty : INumber<TProperty>
+        => Chain(rule, new NumericRule<TEntity, TProperty>(_ => allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    public static IPropertyRule<TEntity, TProperty> Numeric<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, bool> allowNegatives) where TEntity : class where TProperty : INumber<TProperty>
+        => Chain(rule, new NumericRule<TEntity, TProperty>(allowNegatives));
+
+    /// <summary>
+    /// Chains a positive-only numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    public static IPropertyRule<TEntity, TProperty> Positive<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class where TProperty : INumber<TProperty>
+        => Chain(rule, new NumericRule<TEntity, TProperty>(allowNegatives: _ => false));
+
+    /* Nullable/Struct */
+
+    /// <summary>
+    /// Chains a <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    public static IPropertyRule<TEntity, TProperty> Numeric<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, bool allowNegatives = true) where TEntity : class where TProperty : struct, INumber<TProperty>
+        => Chain(rule, new NumericRule<TEntity, TProperty>(_ => allowNegatives));
+
+    /// <summary>
+    /// Chains a <paramref name="allowNegatives"/> numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
+    public static IPropertyRule<TEntity, TProperty> Numeric<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, Func<PropertyContext<TEntity, TProperty>, bool> allowNegatives) where TEntity : class where TProperty : struct, INumber<TProperty>
+        => Chain(rule, new NumericRule<TEntity, TProperty>(allowNegatives));
+
+    /// <summary>
+    /// Chains a positive-only numeric value (<see cref="NumericRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    public static IPropertyRule<TEntity, TProperty> Positive<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule) where TEntity : class where TProperty : struct, INumber<TProperty>
+        => Chain(rule, new NumericRule<TEntity, TProperty>(allowNegatives: _ => false));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.ReferenceDataRule.cs b/src/CoreEx.Validation/ValidationExtensions.ReferenceDataRule.cs
new file mode 100644
index 00000000..9a70e607
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.ReferenceDataRule.cs
@@ -0,0 +1,57 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains an <see cref="IReferenceData"/> (<see cref="ReferenceDataRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowInactive">Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> ReferenceData<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool allowInactive = false) where TEntity : class where TProperty : IReferenceData
+        => Chain(rule, new ReferenceDataRule<TEntity, TProperty>(allowInactive));
+
+    /// <summary>
+    /// Chains an <see cref="IReferenceData"/> (<see cref="ReferenceDataRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowInactive">Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> IsValid<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool allowInactive = false) where TEntity : class where TProperty : IReferenceData
+        => ReferenceData(rule, allowInactive);
+
+    /* ReferenceData-string */
+
+    /// <summary>
+    /// Chains a <see langword="string"/>-based <see cref="IReferenceData.Code"/> (<see cref="ReferenceDataCodeRule{TEntity}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="with">The <see cref="ReferenceDataCodeRule{TEntity}.ReferenceDataWith"/> function.</param>
+    public static IPropertyRule<TEntity, string> ReferenceData<TEntity>(this IPropertyRule<TEntity, string> rule, Func<ReferenceDataCodeRule<TEntity>.ReferenceDataWith, ReferenceDataCodeRule<TEntity>.ReferenceDataWith> with) where TEntity : class
+        => Chain(rule, new ReferenceDataCodeRule<TEntity>(with));
+
+    /* IReferenceDataCodeCollection */
+
+    /// <summary>
+    /// Chains an <see cref="IReferenceDataCodeCollection"/> (<see cref="ReferenceDataRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowInactive">Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> ReferenceDataCodes<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool allowInactive = false) where TEntity : class where TProperty : IReferenceDataCodeCollection
+        => Chain(rule, new ReferenceDataCodeCollectionRule<TEntity, TProperty>(allowInactive));
+
+    /// <summary>
+    /// Chains an <see cref="IReferenceDataCodeCollection"/> (<see cref="ReferenceDataRule{TEntity, TProperty}"/>) validation.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="allowInactive">Indicates whether to allow an <see cref="IReferenceData"/> value where <see cref="IReferenceData.IsActive"/> is set to <see langword="false"/>.</param>
+    public static IPropertyRule<TEntity, TProperty> AreValid<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool allowInactive = false) where TEntity : class where TProperty : IReferenceDataCodeCollection
+        => ReferenceDataCodes(rule, allowInactive);
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.StringRule.cs b/src/CoreEx.Validation/ValidationExtensions.StringRule.cs
new file mode 100644
index 00000000..60558bc5
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.StringRule.cs
@@ -0,0 +1,89 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="maxLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="maxLength">The maximum string length.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, int maxLength) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(maxLength: _ => maxLength));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="minLength"/> and <paramref name="maxLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="minLength">The minimum string length.</param>
+    /// <param name="maxLength">The maximum string length.</param>
+    /// <param name="regex">The <see cref="Regex"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, int minLength, int? maxLength, Regex? regex = null) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(minLength: _ => minLength, maxLength: _ => maxLength, regex: _ => regex));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="minLength"/> and <paramref name="maxLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="minLength">The minimum string length.</param>
+    /// <param name="maxLength">The maximum string length.</param>
+    /// <param name="regex">The <see cref="Regex"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, Func<PropertyContext<TEntity, string>, int>? minLength, Func<PropertyContext<TEntity, string>, int?>? maxLength, Func<PropertyContext<TEntity, string>, Regex?>? regex = null) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(minLength: minLength, maxLength: maxLength, regex: regex));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="regex"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="regex">The <see cref="Regex"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, Regex regex) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(regex: _ => regex));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="regex"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="regex">The <see cref="Regex"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> Matches<TEntity>(this IPropertyRule<TEntity, string> rule, Regex regex) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(regex: _ => regex));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="exactLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="exactLength">The exact string length.</param>
+    /// <param name="regex">The optional <see cref="Regex"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> Length<TEntity>(this IPropertyRule<TEntity, string> rule, int exactLength, Regex? regex = null) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(minLength: _ => exactLength, maxLength: _ => exactLength, regex: _ => regex));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="minLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="minLength">The minimum string length.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> MinimumLength<TEntity>(this IPropertyRule<TEntity, string> rule, int minLength) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(minLength: _ => minLength));
+
+    /// <summary>
+    /// Chains a <see langword="string"/> (<see cref="StringRule{TEntity}"/>) <paramref name="maxLength"/> validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="maxLength">The maximum string length.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> MaximumLength<TEntity>(this IPropertyRule<TEntity, string> rule, int maxLength) where TEntity : class
+        => Chain(rule, new StringRule<TEntity>(maxLength: _ => maxLength));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.WhenClause.cs b/src/CoreEx.Validation/ValidationExtensions.WhenClause.cs
new file mode 100644
index 00000000..7cdd0970
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.WhenClause.cs
@@ -0,0 +1,80 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Adds a entity predicate (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="predicate">A predicate to determine whether the current rule is to executed.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> WhenEntity<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TEntity> predicate) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>((c, _) => Task.FromResult(predicate.ThrowIfNull().Invoke(c.Entity))));
+
+    /// <summary>
+    /// Adds a property predicate (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="predicate">A predicate to determine whether the current rule is to executed.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> WhenValue<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TProperty> predicate) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>((c, _) => Task.FromResult(predicate.ThrowIfNull().Invoke(c.Value))));
+
+    /// <summary>
+    /// Adds a when <see cref="bool"/> (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="when">A <see cref="bool"/> to determine whether the current rule is to executed.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool when) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>((_, _) => Task.FromResult(when)));
+
+    /// <summary>
+    /// Adds a <see cref="bool"/> function (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="when">A <see cref="bool"/> function to determine whether the current rule is to executed.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<bool> when) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>((c, _) => Task.FromResult(when.ThrowIfNull().Invoke())));
+
+    /// <summary>
+    /// Adds a <see cref="PropertyContext{TEntity, TProperty}"/> <see cref="bool"/> function (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="when">A <see cref="PropertyContext{TEntity, TProperty}"/> <see cref="bool"/> function to determine whether the current rule is to executed.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, bool> when) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>((c, _) => Task.FromResult(when.ThrowIfNull().Invoke(c))));
+
+    /// <summary>
+    /// Adds an <see langword="async"/> function (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="whenAsync">A <see cref="PredicateAsync{TEntity, TProperty}"/> to determine whether the current rule is to executed.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, PredicateAsync<TEntity, TProperty> whenAsync) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>(whenAsync));
+
+    /// <summary>
+    /// Adds a must have non-<see langword="default"/> value (<see cref="WhenClause{TEntity, TProperty}"/>) clause to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> WhenHasValue<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class
+        => AddClause(rule, new WhenClause<TEntity, TProperty>((c, _) => Task.FromResult(Comparer<TProperty>.Default.Compare(c.Value, default!) != 0)));
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.WildcardRule.cs b/src/CoreEx.Validation/ValidationExtensions.WildcardRule.cs
new file mode 100644
index 00000000..5697facf
--- /dev/null
+++ b/src/CoreEx.Validation/ValidationExtensions.WildcardRule.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidationExtensions
+{
+    /// <summary>
+    /// Chains a <see cref="Wildcards.Wildcard"/> <see langword="string"/> (<see cref="WildcardRule{TEntity}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="wildcard">The optional <see cref="Wildcards.Wildcard"/>; defaults to <see cref="Wildcard.Default"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> Wildcard<TEntity>(this IPropertyRule<TEntity, string> rule, Wildcard? wildcard = null) where TEntity : class
+        => Chain(rule, new WildcardRule<TEntity>(_ => wildcard));
+
+    /// <summary>
+    /// Chains a <see cref="Wildcards.Wildcard"/> <see langword="string"/> (<see cref="WildcardRule{TEntity}"/>) validation to the existing <paramref name="rule"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="wildcard">The optional <see cref="Wildcards.Wildcard"/>; defaults to <see cref="Wildcard.Default"/>.</param>
+    /// <returns>The <see cref="StringRule{TEntity}"/>.</returns>
+    public static IPropertyRule<TEntity, string> Wildcard<TEntity>(this IPropertyRule<TEntity, string> rule, Func<PropertyContext<TEntity, string>, Wildcard?> wildcard) where TEntity : class
+        => Chain(rule, new WildcardRule<TEntity>(wildcard));
+
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationExtensions.cs b/src/CoreEx.Validation/ValidationExtensions.cs
index bf036046..f2ce67a9 100644
--- a/src/CoreEx.Validation/ValidationExtensions.cs
+++ b/src/CoreEx.Validation/ValidationExtensions.cs
@@ -1,1796 +1,154 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using CoreEx.Http;
-using CoreEx.Localization;
-using CoreEx.RefData;
-using CoreEx.Results;
-using CoreEx.Validation.Clauses;
-using CoreEx.Validation.Rules;
-using CoreEx.Wildcards;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq.Expressions;
-using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class ValidationExtensions
 {
     /// <summary>
-    /// Provides extension methods required by the validation framework (including support for fluent-style method chaining).
+    /// Adds a <paramref name="clause"/> to the preceding <paramref name="rule"/>.
     /// </summary>
-    public static class ValidationExtensions
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="clause">The <see cref="IPropertyClause{TEntity, TProperty}"/> to add.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> AddClause<TEntity, TProperty>(IPropertyRule<TEntity, TProperty> rule, IPropertyClause<TEntity, TProperty> clause) where TEntity : class
     {
-        #region Text
-
-        /// <summary>
-        /// Updates the rule friendly name text used in validation messages (see <see cref="IPropertyRule.Text"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="text">The text for the rule.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Text<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText text) where TEntity : class
-        {
-            rule.ThrowIfNull(nameof(rule)).Text = text;
-            return rule;
-        }
-
-        #endregion
-
-        #region When
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> where the <typeparamref name="TEntity"/> <paramref name="predicate"/> must be <c>true</c> for the rule to be validated.
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="predicate">A function to determine whether the preceeding rule is to be validated.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TEntity> predicate) where TEntity : class
-        {
-            if (predicate == null)
-                return rule;
-
-            rule.ThrowIfNull(nameof(rule)).AddClause(new WhenClause<TEntity, TProperty>(predicate));
-            return rule;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> where the <typeparamref name="TProperty"/> <paramref name="predicate"/> must be <c>true</c> for the rule to be validated.
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="predicate">A function to determine whether the preceeding rule is to be validated.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> WhenValue<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TProperty> predicate) where TEntity : class
-        {
-            if (predicate == null)
-                return rule;
-
-            rule.ThrowIfNull(nameof(rule)).AddClause(new WhenClause<TEntity, TProperty>(predicate));
-            return rule;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> where the <typeparamref name="TProperty"/> must have a value (i.e. not the default value for the Type) for the rule to be validated.
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> WhenHasValue<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class
-            => WhenValue(rule, (TProperty pv) => Comparer<TProperty>.Default.Compare(pv, default!) != 0);
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> which must be <c>true</c> for the rule to be validated.
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="when">A function to determine whether the preceeding rule is to be validated.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<bool> when) where TEntity : class
-        {
-            if (when == null)
-                return rule;
-
-            rule.ThrowIfNull(nameof(rule)).AddClause(new WhenClause<TEntity, TProperty>(when));
-            return rule;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> which must be <c>true</c> for the rule to be validated.
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="when">A <see cref="bool"/> to determine whether the preceeding rule is to be validated.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> When<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool when) where TEntity : class
-            => When(rule, () => when);
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> that states that the
-        /// <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext"/> <see cref="ExecutionContext.OperationType"/> is equal to the specified
-        /// (<paramref name="operationType"/>).
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> WhenOperation<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, OperationType operationType) where TEntity : class
-            => When(rule, x => ExecutionContext.Current.OperationType == operationType);
-
-        /// <summary>
-        /// Adds a <see cref="WhenClause{TEntity, TProperty}"/> to this <see cref="IPropertyRule{TEntity, TProperty}"/> that states that the
-        /// <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext"/> <see cref="ExecutionContext.OperationType"/> is not equal to the specified
-        /// (<paramref name="operationType"/>).
-        /// </summary>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="operationType">The <see cref="OperationType"/>.</param>
-        /// <returns>The <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> WhenNotOperation<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, OperationType operationType) where TEntity : class
-            => When(rule, x => ExecutionContext.Current.OperationType != operationType);
-
-        #endregion
-
-        #region Mandatory
-
-        /// <summary>
-        /// Adds a mandatory validation (<see cref="MandatoryRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Mandatory<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new MandatoryRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a not empty validation (<see cref="MandatoryRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        /// <remarks>This is a synonym for <see cref="Mandatory{TEntity, TProperty}(IPropertyRule{TEntity, TProperty}, Localization.LText?)"/>.</remarks>
-        public static IPropertyRule<TEntity, TProperty> NotEmpty<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new MandatoryRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a not <c>null</c> validation (<see cref="NotNullRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> NotNull<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NotNullRule<TEntity, TProperty> { ErrorText = errorText });
-
-        #endregion
-
-        #region None
-
-        /// <summary>
-        /// Adds a none validation (<see cref="NoneRule{TEntity, TProperty}"/>) where it is expected that the value equals its default.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> None<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NoneRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an empty validation (<see cref="NoneRule{TEntity, TProperty}"/>) where it is expected that the value equals its default.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        /// <remarks>This is a synonym for <see cref="None{TEntity, TProperty}(IPropertyRule{TEntity, TProperty}, Localization.LText?)"/>.</remarks>
-        public static IPropertyRule<TEntity, TProperty> Empty<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NoneRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <c>null</c> validation (<see cref="NoneRule{TEntity, TProperty}"/>) where it is expected that the value is <c>null</c>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Null<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NullRule<TEntity, TProperty> { ErrorText = errorText });
-
-        #endregion
-
-        #region Must
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="predicate"/> <b>must</b> return <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="predicate">The must predicate.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Must<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TEntity> predicate, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new MustRule<TEntity, TProperty>(predicate) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="must"/> function <b>must</b> return <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="must">The must function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Must<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<bool> must, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new MustRule<TEntity, TProperty>(must) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="must"/> value be <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="must">The must value.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Must<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool must, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new MustRule<TEntity, TProperty>(() => must) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="mustAsync"/> function <b>must</b> return <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="mustAsync">The must function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> MustAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<CancellationToken, Task<bool>> mustAsync, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new MustRule<TEntity, TProperty>(mustAsync) { ErrorText = errorText });
-
-        #endregion
-
-        #region Exists
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="predicate"/> <b>exists</b> return <c>true</c> to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="predicate">The exists predicate.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Exists<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TEntity> predicate, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>(predicate) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="exists"/> function <b>exists</b> return <c>true</c> to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="exists">The exists function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> ExistsAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<bool>> exists, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>(exists) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="exists"/> resultant value is <c>true</c> to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="exists">The exists value.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Exists<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool exists, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>((_, __) => Task.FromResult(exists)) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="exists"/> function must return <b>not null</b> to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="exists">The exists function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <remarks>Where the resultant value is an <see cref="IResult"/> then existence is confirmed when <see cref="IResult.IsSuccess"/> and the the underlying <see cref="IResult.Value"/> is not null.</remarks>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> ValueExistsAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<object?>> exists, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>(exists) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="exists"/> resultant value is <b>not null</b> to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="exists">The exists function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <remarks>Where the resultant value is an <see cref="IResult"/> then existence is confirmed when <see cref="IResult.IsSuccess"/> and the the underlying <see cref="IResult.Value"/> is not null.</remarks>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> ValueExists<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, object? exists, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>((_, __) => Task.FromResult(exists != null)) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="agentResult"/> function must return a successful response to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="agentResult">The <see cref="HttpResult"/> function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> AgentExistsAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<HttpResult>> agentResult, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>(async (v, ct) => await agentResult(v, ct).ConfigureAwait(false)) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="agentResult"/> function must return a successful response to verify it exists (see <see cref="ExistsRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TAgentValue">The corresponding <see cref="HttpResult{T}"/> <see cref="HttpResult{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="agentResult">The <see cref="HttpResult"/> function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> AgentExistsAsync<TEntity, TProperty, TAgentValue>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<HttpResult<TAgentValue>>> agentResult, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ExistsRule<TEntity, TProperty>(async (v, ct) => await agentResult(v, ct).ConfigureAwait(false)) { ErrorText = errorText });
-
-        #endregion
-
-        #region Duplicate
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="predicate"/> <b>must</b> return <c>false</c> to not be considered a duplicate (see <see cref="DuplicateRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="predicate">The must predicate.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Duplicate<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TEntity> predicate, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DuplicateRule<TEntity, TProperty>(predicate) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="duplicate"/> function <b>must</b> return <c>false</c> to not be considered a duplicate (see <see cref="DuplicateRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="duplicate">The duplicate function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Duplicate<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<bool> duplicate, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DuplicateRule<TEntity, TProperty>(duplicate) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="duplicate"/> value must be <c>false</c> to not be considered a duplicate (see <see cref="DuplicateRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="duplicate">The duplicate value.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Duplicate<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool duplicate, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DuplicateRule<TEntity, TProperty>(() => duplicate) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where considered a duplicate (see <see cref="DuplicateRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Duplicate<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DuplicateRule<TEntity, TProperty>(() => true) { ErrorText = errorText });
-
-        #endregion
-
-        #region Immutable
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="predicate"/> <b>must</b> return <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="predicate">The must predicate.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Immutable<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Predicate<TEntity> predicate, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ImmutableRule<TEntity, TProperty>(predicate) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="immutable"/> function <b>must</b> return <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="immutable">The must function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Immutable<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<bool> immutable, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ImmutableRule<TEntity, TProperty>(immutable) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="immutableAsync"/> function <b>must</b> return <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="immutableAsync">The must function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> ImmutableAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<CancellationToken, Task<bool>> immutableAsync, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ImmutableRule<TEntity, TProperty>(immutableAsync) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where the rule <paramref name="immutable"/> value be <c>true</c> to be considered valid (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="immutable">The must value.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Immutable<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool immutable, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ImmutableRule<TEntity, TProperty>(() => immutable) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a validation where considered immutable (see <see cref="MustRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Immutable<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ImmutableRule<TEntity, TProperty>(() => false) { ErrorText = errorText });
-
-        #endregion
-
-        #region Between
-
-        /// <summary>
-        /// Adds a between comparision validation against a specified from and to value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValue">The compare from value.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareFromText">The compare from text to be passed for the error message (default is to use <paramref name="compareFromValue"/>).</param>
-        /// <param name="compareToText">The compare to text to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Between<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareFromValue, TProperty compareToValue, LText? compareFromText = null, LText? compareToText = null, bool exclusiveBetween = false, LText ? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValue, compareToValue, compareFromText, compareToText, exclusiveBetween) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a between comparision validation against from and to values returned by functions (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValueFunction">The compare from value function.</param>
-        /// <param name="compareToValueFunction">The compare to value function.</param>
-        /// <param name="compareFromTextFunction">The compare from text function (default is to use the result of the <paramref name="compareFromValueFunction"/>).</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Between<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareFromValueFunction, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareFromTextFunction = null, Func<TEntity, LText>? compareToTextFunction = null, bool exclusiveBetween = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValueFunction, compareToValueFunction, compareFromTextFunction, compareToTextFunction, exclusiveBetween) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a between comparision validation against from and to values returned by async functions (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValueFunctionAsync">The compare from value function.</param>
-        /// <param name="compareToValueFunctionAsync">The compare to value function.</param>
-        /// <param name="compareFromTextFunction">The compare from text function (default is to use the result of the <paramref name="compareFromValueFunctionAsync"/>).</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunctionAsync"/>).</param>
-        /// <param name="exclusiveBetween">Indicates whether the between comparison is exclusive or inclusive (default).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> BetweenAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<TProperty>> compareFromValueFunctionAsync, Func<TEntity, CancellationToken, Task<TProperty>> compareToValueFunctionAsync, Func<TEntity, LText>? compareFromTextFunction = null, Func<TEntity, LText>? compareToTextFunction = null, bool exclusiveBetween = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValueFunctionAsync, compareToValueFunctionAsync, compareFromTextFunction, compareToTextFunction, exclusiveBetween) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an inclusive between comparision validation against a specified from and to value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValue">The compare from value.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareFromText">The compare from text to be passed for the error message (default is to use <paramref name="compareFromValue"/>).</param>
-        /// <param name="compareToText">The compare to text to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> InclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareFromValue, TProperty compareToValue, LText? compareFromText = null, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValue, compareToValue, compareFromText, compareToText, false) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a inclusive between comparision validation against from and to values returned by functions (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValueFunction">The compare from value function.</param>
-        /// <param name="compareToValueFunction">The compare to value function.</param>
-        /// <param name="compareFromTextFunction">The compare from text function (default is to use the result of the <paramref name="compareFromValueFunction"/>).</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> InclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareFromValueFunction, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareFromTextFunction = null, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValueFunction, compareToValueFunction, compareFromTextFunction, compareToTextFunction, false) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an exclusive between comparision validation against a specified from and to value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValue">The compare from value.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareFromText">The compare from text to be passed for the error message (default is to use <paramref name="compareFromValue"/>).</param>
-        /// <param name="compareToText">The compare to text to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> ExclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareFromValue, TProperty compareToValue, LText? compareFromText = null, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValue, compareToValue, compareFromText, compareToText, true) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a exclusive between comparision validation against from and to values returned by functions (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareFromValueFunction">The compare from value function.</param>
-        /// <param name="compareToValueFunction">The compare to value function.</param>
-        /// <param name="compareFromTextFunction">The compare from text function (default is to use the result of the <paramref name="compareFromValueFunction"/>).</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> ExclusiveBetween<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareFromValueFunction, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareFromTextFunction = null, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new BetweenRule<TEntity, TProperty>(compareFromValueFunction, compareToValueFunction, compareFromTextFunction, compareToTextFunction, true) { ErrorText = errorText });
-
-        #endregion
-
-        #region CompareValue
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.Equal"/> validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Equal<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.Equal, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.Equal"/> validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Equal<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.Equal, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.NotEqual"/> validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> NotEqual<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.NotEqual, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.NotEqual"/> validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> NotEqual<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.NotEqual, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.LessThan"/> validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> LessThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThan, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.LessThan"/> validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> LessThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThan, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.LessThanEqual"/> validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> LessThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThanEqual, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.LessThanEqual"/> validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> LessThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.LessThanEqual, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.GreaterThan"/> validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> GreaterThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThan, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.GreaterThan"/> validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> GreaterThan<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThan, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.GreaterThanEqual"/> validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> GreaterThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThanEqual, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision <see cref="CompareOperator.GreaterThanEqual"/> validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> GreaterThanOrEqualTo<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(CompareOperator.GreaterThanEqual, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision validation against a specified value (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToValue">The compare to value.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToValue"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CompareValue<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, TProperty compareToValue, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(compareOperator, compareToValue, compareToText) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision validation against a value returned by a function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToValueFunction">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunction"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CompareValue<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, Func<TEntity, TProperty> compareToValueFunction, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(compareOperator, compareToValueFunction, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision validation against a value returned by an async function (<see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToValueFunctionAsync">The compare to function.</param>
-        /// <param name="compareToTextFunction">The compare to text function (default is to use the result of the <paramref name="compareToValueFunctionAsync"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CompareValueAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, Func<TEntity, CancellationToken, Task<TProperty>> compareToValueFunctionAsync, Func<TEntity, LText>? compareToTextFunction = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValueRule<TEntity, TProperty>(compareOperator, compareToValueFunctionAsync, compareToTextFunction) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision validation against one or more specified values (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValues">The compare to values.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CompareValues<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, IEnumerable<TProperty> compareToValues, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValuesRule<TEntity, TProperty>(compareToValues) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision validation against one or more specified values (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValuesFunctionAsync">The compare to values function.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CompareValues<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<IEnumerable<TProperty>>> compareToValuesFunctionAsync, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValuesRule<TEntity, TProperty>(compareToValuesFunctionAsync) { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a comparision validation against one or more specified values (see <see cref="CompareValueRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareToValues">The compare to values.</param>
-        /// <param name="ignoreCase">Indicates whether to ignore the casing of the value when comparing.</param>
-        /// <param name="overrideValue">Indicates whether to override the underlying property value with the corresponding matched value.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, string> CompareValues<TEntity>(this IPropertyRule<TEntity, string> rule, IEnumerable<string> compareToValues, bool ignoreCase, bool overrideValue = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CompareValuesRule<TEntity, string>(compareToValues) { EqualityComparer = ignoreCase ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal, OverrideValue = overrideValue, ErrorText = errorText });
-
-        #endregion
-
-        #region CompareProperty
-
-        /// <summary>
-        /// Adds a comparision validation against a specified property (see <see cref="ComparePropertyRule{TEntity, TProperty, TProperty2}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TCompareProperty">The compare to property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="compareOperator">The <see cref="CompareOperator"/>.</param>
-        /// <param name="compareToPropertyExpression">The <see cref="Expression"/> to reference the compare to entity property.</param>
-        /// <param name="compareToText">The compare to text <see cref="LText"/> to be passed for the error message (default is to use <paramref name="compareToPropertyExpression"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CompareProperty<TEntity, TProperty, TCompareProperty>(this IPropertyRule<TEntity, TProperty> rule, CompareOperator compareOperator, Expression<Func<TEntity, TCompareProperty>> compareToPropertyExpression, LText? compareToText = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ComparePropertyRule<TEntity, TProperty, TCompareProperty>(compareOperator, compareToPropertyExpression, compareToText) { ErrorText = errorText });
-
-        #endregion
-
-        #region String
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with a maximum length (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="maxLength">The maximum string length.</param>
-        /// <param name="regex">The <see cref="Regex"/>.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, int maxLength, Regex? regex = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { MaxLength = maxLength, Regex = regex, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with a minimum and maximum length (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="minLength">The minimum string length.</param>
-        /// <param name="maxLength">The maximum string length.</param>
-        /// <param name="regex">The <see cref="Regex"/>.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, int minLength, int? maxLength, Regex? regex = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { MinLength = minLength, MaxLength = maxLength, Regex = regex, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with a <paramref name="regex"/> (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="regex">The <see cref="Regex"/>.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> String<TEntity>(this IPropertyRule<TEntity, string> rule, Regex? regex = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { Regex = regex, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with a <paramref name="regex"/> (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="regex">The <see cref="Regex"/>.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> Matches<TEntity>(this IPropertyRule<TEntity, string> rule, Regex? regex = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { Regex = regex, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with an exact length (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="exactLength">The exact string length.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> Length<TEntity>(this IPropertyRule<TEntity, string> rule, int exactLength, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { MinLength = exactLength, MaxLength = exactLength, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with a minimum length (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="minimumLength">The minimum string length.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> MinimumLength<TEntity>(this IPropertyRule<TEntity, string> rule, int minimumLength, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { MinLength = minimumLength, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="string"/> validation with a maximum length (see <see cref="StringRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="maximumLength">The maximum string length.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> MaximumLength<TEntity>(this IPropertyRule<TEntity, string> rule, int maximumLength, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new StringRule<TEntity> { MaxLength = maximumLength, ErrorText = errorText });
-
-        #endregion
-
-        #region Email
-
-        /// <summary>
-        /// Adds an e-mail validation (see <see cref="EmailRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="maxLength">The maximum string length for the e-mail address; defaults to 254.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        /// <remarks>The maximum length for an email address is '<c>254</c>' or '<c>256</c>' or '<c>320</c>' as per this <see href="https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address#:~:text=%20The%20length%20limits%20are%20as%20follows%3A%20,i.e.%2C%20example.com%20--%20254%20characters%20maximum.%20More%20">article</see>,
-        /// in the absense of a definitive answer '<c>254</c>' has been chosen as the default. As it appears there is no real correct answer, simply adjust accordingly.</remarks>
-        public static IPropertyRule<TEntity, string> Email<TEntity>(this IPropertyRule<TEntity, string> rule, int? maxLength = 254, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new EmailRule<TEntity> { MaxLength = maxLength, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an e-mail validation (see <see cref="EmailRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="maxLength">The maximum string length for the e-mail address; defaults to 254.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        /// <remarks>The maximum length for an email address is '<c>254</c>' or '<c>256</c>' or '<c>320</c>' as per this <see href="https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address#:~:text=%20The%20length%20limits%20are%20as%20follows%3A%20,i.e.%2C%20example.com%20--%20254%20characters%20maximum.%20More%20">article</see>,
-        /// in the absense of a definitive answer '<c>254</c>' has been chosen as the default. As it appears there is no real correct answer, simply adjust accordingly.</remarks>
-        public static IPropertyRule<TEntity, string> EmailAddress<TEntity>(this IPropertyRule<TEntity, string> rule, int? maxLength = 254, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new EmailRule<TEntity> { MaxLength = maxLength, ErrorText = errorText });
-
-        #endregion
-
-        #region Enum
-
-        /// <summary>
-        /// Adds an <see cref="System.Enum"/> validation to ensure that the value has been defined (see <see cref="EnumRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class where TProperty : struct, Enum
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new EnumRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an <see cref="System.Enum"/> validation to ensure that the value has been defined (see <see cref="NullableEnumRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty?> Enum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, LText? errorText = null) where TEntity : class where TProperty : struct, Enum
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NullableEnumRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an <see cref="System.Enum"/> validation to ensure that the value has been defined (see <see cref="EnumRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> IsInEnum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class where TProperty : struct, Enum
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new EnumRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds an <see cref="System.Enum"/> validation to ensure that the value has been defined (see <see cref="NullableEnumRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty?> IsIsEnum<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty?> rule, LText? errorText = null) where TEntity : class where TProperty : struct, Enum
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NullableEnumRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Enables the addition of an <see cref="EnumValueRule{TEntity, TEnum}"/> using an <see cref="EnumValueRuleAs{TEntity}.As{TEnum}"/> to validate against a specified <see cref="System.Enum"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static EnumValueRuleAs<TEntity> Enum<TEntity>(this IPropertyRule<TEntity, string> rule) where TEntity : class
-            => new(rule.ThrowIfNull(nameof(rule))) { };
-
-        #endregion
-
-        #region Wildcard
-
-        /// <summary>
-        /// Adds a <see cref="string"/> <see cref="Wildcard"/> validation (see <see cref="WildcardRule{TEntity}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, String}"/> being extended.</param>
-        /// <param name="wildcard">The <see cref="Wildcard"/> configuration (defaults to <see cref="Wildcard.Default"/>).</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, String}"/>.</returns>
-        public static IPropertyRule<TEntity, string> Wildcard<TEntity>(this IPropertyRule<TEntity, string> rule, Wildcard? wildcard = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new WildcardRule<TEntity> { Wildcard = wildcard, ErrorText = errorText });
-
-        #endregion
-
-        #region Numeric
-
-        /// <summary>
-        /// Adds a <see cref="Int32"/> validation (see <see cref="DecimalRule{TEntity, Int32}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Int32}"/> being extended.</param> 
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Int32}"/>.</returns>
-        public static IPropertyRule<TEntity, int> Numeric<TEntity>(this IPropertyRule<TEntity, int> rule, bool allowNegatives = false, int? maxDigits = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, int> { AllowNegatives = allowNegatives, MaxDigits = maxDigits, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Int32}"/> validation (see <see cref="DecimalRule{TEntity, Int32}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Int32}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Int32}"/>.</returns>
-        public static IPropertyRule<TEntity, int?> Numeric<TEntity>(this IPropertyRule<TEntity, int?> rule, bool allowNegatives = false, int? maxDigits = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, int?> { AllowNegatives = allowNegatives, MaxDigits = maxDigits, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Int64"/> validation (see <see cref="DecimalRule{TEntity, Int64}"/>);
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Long}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Int64}"/>.</returns>
-        public static IPropertyRule<TEntity, long> Numeric<TEntity>(this IPropertyRule<TEntity, long> rule, bool allowNegatives = false, int? maxDigits = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, long> { AllowNegatives = allowNegatives, MaxDigits = maxDigits, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Int64}"/> validation (see <see cref="DecimalRule{TEntity, Int64}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Int64}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Int64}"/>.</returns>
-        public static IPropertyRule<TEntity, long?> Numeric<TEntity>(this IPropertyRule<TEntity, long?> rule, bool allowNegatives = false, int? maxDigits = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, long?> { AllowNegatives = allowNegatives, MaxDigits = maxDigits, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Decimal"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits (including decimal places).</param>
-        /// <param name="decimalPlaces">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, decimal> Numeric<TEntity>(this IPropertyRule<TEntity, decimal> rule, bool allowNegatives = false, int? maxDigits = null, int? decimalPlaces = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, decimal> { AllowNegatives = allowNegatives, MaxDigits = maxDigits, DecimalPlaces = decimalPlaces, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Decimal}"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits (including decimal places).</param>
-        /// <param name="decimalPlaces">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, decimal?> Numeric<TEntity>(this IPropertyRule<TEntity, decimal?> rule, bool allowNegatives = false, int? maxDigits = null, int? decimalPlaces = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, decimal?> { AllowNegatives = allowNegatives, MaxDigits = maxDigits, DecimalPlaces = decimalPlaces, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Decimal"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="precision">The maximum digits (including decimal places).</param>
-        /// <param name="scale">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, decimal> PrecisionScale<TEntity>(this IPropertyRule<TEntity, decimal> rule, int? precision = null, int? scale = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, decimal> { MaxDigits = precision, DecimalPlaces = scale, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Decimal}"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="precision">The maximum digits (including decimal places).</param>
-        /// <param name="scale">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, decimal?> PrecisionScale<TEntity>(this IPropertyRule<TEntity, decimal?> rule, int? precision = null, int? scale = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, decimal?> { MaxDigits = precision, DecimalPlaces = scale, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Single"/> validation (see <see cref="NumericRule{TEntity, Single}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Single}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Single}"/>.</returns>
-        public static IPropertyRule<TEntity, float> Numeric<TEntity>(this IPropertyRule<TEntity, float> rule, bool allowNegatives = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NumericRule<TEntity, float> { AllowNegatives = allowNegatives, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Single}"/> validation (see <see cref="NumericRule{TEntity, Single}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Single}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Single}"/>.</returns>
-        public static IPropertyRule<TEntity, float?> Numeric<TEntity>(this IPropertyRule<TEntity, float?> rule, bool allowNegatives = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NumericRule<TEntity, float?> { AllowNegatives = allowNegatives, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Single"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="precision">The maximum digits (including decimal places).</param>
-        /// <param name="scale">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, float> PrecisionScale<TEntity>(this IPropertyRule<TEntity, float> rule, int? precision = null, int? scale = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, float> { MaxDigits = precision, DecimalPlaces = scale, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Single}"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="precision">The maximum digits (including decimal places).</param>
-        /// <param name="scale">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, float?> PrecisionScale<TEntity>(this IPropertyRule<TEntity, float?> rule, int? precision = null, int? scale = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, float?> { MaxDigits = precision, DecimalPlaces = scale, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Double"/> validation (see <see cref="NumericRule{TEntity, Double}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Double}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Double}"/>.</returns>
-        public static IPropertyRule<TEntity, double> Numeric<TEntity>(this IPropertyRule<TEntity, double> rule, bool allowNegatives = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NumericRule<TEntity, double> { AllowNegatives = allowNegatives, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Double}"/> validation (see <see cref="NumericRule{TEntity, Double}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Double}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Double}"/>.</returns>
-        public static IPropertyRule<TEntity, double?> Numeric<TEntity>(this IPropertyRule<TEntity, double?> rule, bool allowNegatives = false, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new NumericRule<TEntity, double?> { AllowNegatives = allowNegatives, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Double"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="precision">The maximum digits (including decimal places).</param>
-        /// <param name="scale">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, double> PrecisionScale<TEntity>(this IPropertyRule<TEntity, double> rule, int? precision = null, int? scale = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, double> { MaxDigits = precision, DecimalPlaces = scale, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="Nullable{Double}"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="precision">The maximum digits (including decimal places).</param>
-        /// <param name="scale">The maximum number of decimal places.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, double?> PrecisionScale<TEntity>(this IPropertyRule<TEntity, double?> rule, int? precision = null, int? scale = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, double?> { MaxDigits = precision, DecimalPlaces = scale, ErrorText = errorText });
-
-        #endregion
-
-        #region Currency
-
-        /// <summary>
-        /// Adds a currency (<see cref="Decimal"/>) validation (see <see cref="DecimalRule{TEntity, Decimal}"/> for an <see cref="Decimal"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits (including decimal places).</param>
-        /// <param name="currencyFormatInfo">The <see cref="NumberFormatInfo"/> that the <see cref="NumberFormatInfo.CurrencyDecimalDigits">decimal places</see> will be derived from;
-        /// where <c>null</c> <see cref="NumberFormatInfo.CurrentInfo"/> will be used as a default.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, decimal> Currency<TEntity>(this IPropertyRule<TEntity, decimal> rule, bool allowNegatives = false, int? maxDigits = null, NumberFormatInfo? currencyFormatInfo = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, decimal>
-            {
-                AllowNegatives = allowNegatives,
-                MaxDigits = maxDigits,
-                DecimalPlaces = currencyFormatInfo == null ? NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits : currencyFormatInfo.CurrencyDecimalDigits,
-                ErrorText = errorText
-            });
-
-        /// <summary>
-        /// Adds a currency <see cref="Nullable{Decimal}"/> validation (see <see cref="DecimalRule{TEntity, Decimal}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, Decimal}"/> being extended.</param>
-        /// <param name="allowNegatives">Indicates whether to allow negative values.</param>
-        /// <param name="maxDigits">The maximum digits (including decimal places).</param>
-        /// <param name="currencyFormatInfo">The <see cref="NumberFormatInfo"/> that the <see cref="NumberFormatInfo.CurrencyDecimalDigits">decimal places</see> will be derived from;
-        /// where <c>null</c> <see cref="NumberFormatInfo.CurrentInfo"/> will be used as a default.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, Decimal}"/>.</returns>
-        public static IPropertyRule<TEntity, decimal?> Currency<TEntity>(this IPropertyRule<TEntity, decimal?> rule, bool allowNegatives = false, int? maxDigits = null, NumberFormatInfo? currencyFormatInfo = null, LText? errorText = null) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new DecimalRule<TEntity, decimal?>
-            {
-                AllowNegatives = allowNegatives,
-                MaxDigits = maxDigits,
-                DecimalPlaces = currencyFormatInfo == null ? NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits : currencyFormatInfo.CurrencyDecimalDigits,
-                ErrorText = errorText
-            });
-
-        #endregion
-
-        #region ReferenceData
-
-        /// <summary>
-        /// Adds a <see cref="IReferenceData"/> validation (see <see cref="ReferenceDataRule{TEntity, TProperty}"/>) to ensure the value is valid.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/> (must inherit from <see cref="IReferenceData"/>).</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> IsValid<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, LText? errorText = null) where TEntity : class where TProperty : IReferenceData?
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ReferenceDataRule<TEntity, TProperty> { ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="IReferenceDataCodeList"/> validation (see <see cref="ReferenceDataRule{TEntity, TProperty}"/>) to ensure the list of SIDs are valid.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/> (must inherit from <see cref="IReferenceDataCodeList"/>).</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="allowDuplicates">Indicates whether duplicate values are allowed.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> AreValid<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, bool allowDuplicates = false, int minCount = 0, int? maxCount = null, LText? errorText = null) where TEntity : class where TProperty : IReferenceDataCodeList?
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new ReferenceDataSidListRule<TEntity, TProperty> { AllowDuplicates = allowDuplicates, MinCount = minCount, MaxCount = maxCount, ErrorText = errorText });
-
-        /// <summary>
-        /// Adds a <see cref="IReferenceData.Code"/> validation (see <see cref="ReferenceDataCodeRule{TEntity, TRefData}"/> to ensure the <c>Code</c> is valid.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="errorText">The error message format text <see cref="LText"/> (overrides the default).</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static ReferenceDataCodeRuleAs<TEntity> RefDataCode<TEntity>(this IPropertyRule<TEntity, string> rule, LText? errorText = null) where TEntity : class
-            => new(rule.ThrowIfNull(nameof(rule)), errorText);
-
-        #endregion
-
-        #region Collection
-
-        /// <summary>
-        /// Adds a collection (<see cref="System.Collections.IEnumerable"/>) validation (see <see cref="CollectionRule{TEntity, TProperty}"/>) where the <see cref="ICollectionRuleItem"/> can be specified.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="item">The item <see cref="ICollectionRuleItem"/> configuration.</param>
-        /// <param name="allowNullItems">Indicates whether the underlying collection item must not be null.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Collection<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, int minCount = 0, int? maxCount = null, ICollectionRuleItem? item = null, bool allowNullItems = false) where TEntity : class where TProperty : System.Collections.IEnumerable?
-        {
-            var cr = new CollectionRule<TEntity, TProperty> { MinCount = minCount, MaxCount = maxCount, Item = item, AllowNullItems = allowNullItems };
-            return rule.ThrowIfNull(nameof(rule)).AddRule(cr);
-        }
-
-        /// <summary>
-        /// Adds a collection (<see cref="System.Collections.IEnumerable"/>) validation (see <see cref="CollectionRule{TEntity, TProperty}"/>) for the specified <paramref name="itemValidator"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The property item <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="itemValidator">The property item <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="allowNullItems">Indicates whether the underlying collection item must not be null.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Collection<TEntity, TProperty, TItem>(this IPropertyRule<TEntity, TProperty> rule, IValidatorEx<TItem> itemValidator, int minCount = 0, int? maxCount = null, bool allowNullItems = false) where TEntity : class where TProperty : IEnumerable<TItem>?
-        {
-            var cr = new CollectionRule<TEntity, TProperty> { MinCount = minCount, MaxCount = maxCount, Item = CollectionRuleItem.Create(itemValidator), AllowNullItems = allowNullItems };
-            return rule.ThrowIfNull(nameof(rule)).AddRule(cr);
-        }
-
-        /// <summary>
-        /// Adds a collection (<see cref="System.Collections.ICollection"/>) minimum count validation (see <see cref="CollectionRule{TEntity, TProperty}.MinCount"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> MinimumCount<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, int minCount) where TEntity : class where TProperty : System.Collections.ICollection?
-            => Collection(rule, minCount, null, null, true);
-
-        /// <summary>
-        /// Adds a collection (<see cref="System.Collections.ICollection"/>) maximum count validation (see <see cref="CollectionRule{TEntity, TProperty}.MaxCount"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> MaximumCount<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, int maxCount) where TEntity : class where TProperty : System.Collections.ICollection?
-            => Collection(rule, 0, maxCount, null, true);
-
-        #endregion
-
-        #region Dictionary
-
-        /// <summary>
-        /// Adds a dictionary (<see cref="System.Collections.IDictionary"/>) validation (see <see cref="DictionaryRule{TEntity, TProperty}"/>) where the <see cref="IDictionaryRuleItem"/> can be specified.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="item">The item <see cref="IDictionaryRuleItem"/> configuration.</param>
-        /// <param name="allowNullKeys">Indicates whether the underlying dictionary keys must not be null.</param>
-        /// <param name="allowNullValues">Indicates whether the underlying dictionary values must not be null.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Dictionary<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, int minCount = 0, int? maxCount = null, IDictionaryRuleItem? item = null, bool allowNullKeys = false, bool allowNullValues = false) where TEntity : class where TProperty : System.Collections.IDictionary?
-        {
-            var cr = new DictionaryRule<TEntity, TProperty> { MinCount = minCount, MaxCount = maxCount, Item = item, AllowNullKeys = allowNullKeys, AllowNullValues = allowNullValues };
-            return rule.ThrowIfNull(nameof(rule)).AddRule(cr);
-        }
-
-        /// <summary>
-        /// Adds a dictionary (<see cref="System.Collections.Generic.Dictionary{TKey, TValue}"/>) validation (see <see cref="DictionaryRule{TEntity, TProperty}"/>) for the specified <paramref name="keyValidator"/> and <paramref name="valueValidator"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="keyValidator">The key <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="valueValidator">The value <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="allowNullKeys">Indicates whether the underlying dictionary keys must not be null.</param>
-        /// <param name="allowNullValues">Indicates whether the underlying dictionary values must not be null.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Dictionary<TEntity, TProperty, TKey, TValue>(this IPropertyRule<TEntity, TProperty> rule, IValidatorEx<TKey>? keyValidator, IValidatorEx<TValue>? valueValidator, int minCount = 0, int? maxCount = null, bool allowNullKeys = false, bool allowNullValues = false) where TEntity : class where TProperty : Dictionary<TKey, TValue>? where TKey : notnull
-        {
-            var cr = new DictionaryRule<TEntity, TProperty> { MinCount = minCount, MaxCount = maxCount, Item = DictionaryRuleItem.Create(keyValidator, valueValidator), AllowNullKeys = allowNullKeys, AllowNullValues = allowNullValues };
-            return rule.ThrowIfNull(nameof(rule)).AddRule(cr);
-        }
-
-        #endregion
-
-        #region Entity
-
-        /// <summary>
-        /// Adds an entity validation (see <see cref="EntityRule{TEntity, TProperty, TValidator}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="validator">The validator.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Entity<TEntity, TProperty, TValidator>(this IPropertyRule<TEntity, TProperty> rule, TValidator validator) where TEntity : class where TProperty : class? where TValidator : IValidatorEx
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new EntityRule<TEntity, TProperty, TValidator>(validator));
-
-        /// <summary>
-        /// Enables the addition of an <see cref="EntityRule{TEntity, TProperty, TValidator}"/> using a validator <see cref="EntityRuleWith{TEntity, TProperty}.With{TValidator}"/> a specified validator <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <returns>An <see cref="EntityRuleWith{TEntity, TProperty}"/>.</returns>
-        public static EntityRuleWith<TEntity, TProperty> Entity<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule) where TEntity : class where TProperty : class?
-            => new(rule.ThrowIfNull(nameof(rule)));
-
-        #endregion
-
-        #region Interop
-
-        /// <summary>
-        /// Adds an interop validation (see <see cref="InteropRule{TEntity, TProperty, TValidator}"/>) (intended for non-<c>CoreEx.Validation</c>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="validator">The validator.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        /// <remarks>This is only intended to be leveraged for the root entity value being validated as no <see cref="ValidationArgs"/> are passed meaning advanced capabilities will be ignored.</remarks>
-        public static IPropertyRule<TEntity, TProperty> Interop<TEntity, TProperty, TValidator>(this IPropertyRule<TEntity, TProperty> rule, TValidator validator) where TEntity : class where TProperty : class? where TValidator : IValidator
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new InteropRule<TEntity, TProperty, TValidator>(() => validator.ThrowIfNull(nameof(validator))));
-
-        /// <summary>
-        /// Adds an interop validation (see <see cref="InteropRule{TEntity, TProperty, TValidator}"/>) (intended for non-<c>CoreEx.Validation</c>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="validatorFunc">The function to return the <see cref="IValidator"/>.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        /// <remarks>This is only intended to be leveraged for the root entity value being validated as no <see cref="ValidationArgs"/> are passed meaning advanced capabilities will be ignored.</remarks>
-        public static IPropertyRule<TEntity, TProperty> Interop<TEntity, TProperty, TValidator>(this IPropertyRule<TEntity, TProperty> rule, Func<TValidator> validatorFunc) where TEntity : class where TProperty : class? where TValidator : IValidator
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new InteropRule<TEntity, TProperty, TValidator>(validatorFunc));
-
-        #endregion
-
-        #region Custom
-
-        /// <summary>
-        /// Adds a <paramref name="custom"/> validation (see <see cref="CustomRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="custom">The custom function.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Custom<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, Result> custom) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CustomRule<TEntity, TProperty>(custom));
-
-        /// <summary>
-        /// Adds a <paramref name="customAsync"/> validation (see <see cref="CustomRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="customAsync">The custom function.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> CustomAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<PropertyContext<TEntity, TProperty>, CancellationToken, Task<Result>> customAsync) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CustomRule<TEntity, TProperty>(customAsync));
-
-        #endregion
-
-        #region Common
-
-        /// <summary>
-        /// Adds a common validation (see <see cref="CommonRule{TEntity, TProperty}"/>).
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
-        /// <param name="validator">The <see cref="CommonValidator{T}"/>.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Common<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, CommonValidator<TProperty> validator) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new CommonRule<TEntity, TProperty>(validator));
-
-        #endregion
-
-        #region Override/Default
-
-        /// <summary>
-        /// Adds a value override (see <see cref="OverrideRule{TEntity, TProperty}"/>) using the specified <paramref name="overrideFunc"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param> 
-        /// <param name="overrideFunc">The override function.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Override<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> overrideFunc) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new OverrideRule<TEntity, TProperty>(overrideFunc));
-
-        /// <summary>
-        /// Adds a value override (see <see cref="OverrideRule{TEntity, TProperty}"/>) using the specified <paramref name="overrideFuncAsync"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param> 
-        /// <param name="overrideFuncAsync">The override function.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> OverrideAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<TProperty>> overrideFuncAsync) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new OverrideRule<TEntity, TProperty>(overrideFuncAsync));
-
-        /// <summary>
-        /// Adds a value override (see <see cref="OverrideRule{TEntity, TProperty}"/>) using the specified <paramref name="overrideValue"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param> 
-        /// <param name="overrideValue">The override value.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Override<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty overrideValue) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new OverrideRule<TEntity, TProperty>(overrideValue));
-
-        /// <summary>
-        /// Adds a default (see <see cref="OverrideRule{TEntity, TProperty}"/>) using the specified <paramref name="defaultFunc"/> (overrides only where current value is the default for <see cref="Type"/>) .
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param> 
-        /// <param name="defaultFunc">The override function.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Default<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, TProperty> defaultFunc) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new OverrideRule<TEntity, TProperty>(defaultFunc) { OnlyOverrideDefault = true });
-
-        /// <summary>
-        /// Adds a default (see <see cref="OverrideRule{TEntity, TProperty}"/>) using the specified <paramref name="defaultFuncAsync"/> (overrides only where current value is the default for <see cref="Type"/>) .
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param> 
-        /// <param name="defaultFuncAsync">The override function.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> DefaultAsync<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, Func<TEntity, CancellationToken, Task<TProperty>> defaultFuncAsync) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new OverrideRule<TEntity, TProperty>(defaultFuncAsync) { OnlyOverrideDefault = true });
-
-        /// <summary>
-        /// Adds a default override (see <see cref="OverrideRule{TEntity, TProperty}"/>) using the specified <paramref name="defaultValue"/> (overrides only where current value is the default for <see cref="Type"/>) .
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param> 
-        /// <param name="defaultValue">The override value.</param>
-        /// <returns>A <see cref="IPropertyRule{TEntity, TProperty}"/>.</returns>
-        public static IPropertyRule<TEntity, TProperty> Default<TEntity, TProperty>(this IPropertyRule<TEntity, TProperty> rule, TProperty defaultValue) where TEntity : class
-            => rule.ThrowIfNull(nameof(rule)).AddRule(new OverrideRule<TEntity, TProperty>(defaultValue) { OnlyOverrideDefault = true });
-
-        #endregion
-
-        #region ValueValidator
-
-#if NETSTANDARD2_1
-        /// <summary>
-        /// Enables (sets up) validation for a value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>A <see cref="ValueValidator{T}"/>.</returns>
-        public static ValueValidator<T> Validate<T>(this T? value, string? name = null, LText? text = null) => new(value, name, text);
-
-        /// <summary>
-        /// Enables (sets up) validation for a value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="configure">The value validation configuration logic.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>A <see cref="ValueValidator{T}"/>.</returns>
-        public static ValueValidator<T> Validate<T>(this T? value, Action<ValueValidatorConfiguration<T>> configure, string? name = null, LText? text = null) 
-            => new ValueValidator<T>(value, name, text).Configure(configure);
-
-        /// <summary>
-        /// Enables (sets up) validation for a value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validator">The <see cref="CommonValidator{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>A <see cref="ValueValidator{T}"/>.</returns>
-        public static ValueValidator<T> Validate<T>(this T? value, CommonValidator<T> validator, string? name = null, LText? text = null)
-            => new ValueValidator<T>(value, name, text).Configure(c => c.Common(validator));
-#else
-        /// <summary>
-        /// Enables (sets up) validation for a value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="name">The value name (defaults to <paramref name="value"/> name using the <see cref="CallerArgumentExpressionAttribute"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>A <see cref="ValueValidator{T}"/>.</returns>
-        public static ValueValidator<T> Validate<T>(this T? value, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null) => new(value, name, text);
-
-        /// <summary>
-        /// Enables (sets up) validation for a value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="configure">The value validation configuration logic.</param>
-        /// <param name="name">The value name (defaults to <paramref name="value"/> name using the <see cref="CallerArgumentExpressionAttribute"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>A <see cref="ValueValidator{T}"/>.</returns>
-        public static ValueValidator<T> Validate<T>(this T? value, Action<ValueValidatorConfiguration<T>> configure, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null) 
-            => new ValueValidator<T>(value, name, text).Configure(configure);
-
-        /// <summary>
-        /// Enables (sets up) validation for a value.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validator">The <see cref="CommonValidator{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <paramref name="value"/> name using the <see cref="CallerArgumentExpressionAttribute"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>A <see cref="ValueValidator{T}"/>.</returns>
-        public static ValueValidator<T> Validate<T>(this T? value, CommonValidator<T> validator, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null)
-            => new ValueValidator<T>(value, name, text).Configure(c => c.Common(validator));
-#endif
-
-        #endregion
-
-        #region MultiValidator
-
-        /// <summary>
-        /// Adds a <see cref="ValueValidator{T}"/> to the <see cref="MultiValidator"/>. 
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="multiValidator">The <see cref="MultiValidator"/>.</param>
-        /// <param name="validator">The <see cref="ValueValidator{T}"/>.</param>
-        /// <returns>The (this) <see cref="MultiValidator"/>.</returns>
-        public static MultiValidator Add<T>(this MultiValidator multiValidator, ValueValidator<T> validator)
-        {
-            validator.ThrowIfNull(nameof(validator));
-            multiValidator.ThrowIfNull(nameof(multiValidator)).Validators.Add(async ct => await validator.ValidateAsync(ct).ConfigureAwait(false));
-            return multiValidator;
-        }
-
-        #endregion
-
-        #region Result
+        rule.AddClause(clause.ThrowIfNull());
+        return rule;
+    }
 
-        /// <summary>
-        /// Executes the <paramref name="validator"/> for the <see cref="Result{T}.Value"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The <see cref="LText"/> to use for the <see cref="IValidationResult"/>.</param>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/> function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
-        public static async Task<Result<TEntity>> ValidateAsync<TEntity>(this Result<TEntity> result, Action<ValueValidatorConfiguration<TEntity>>? validator, string? name = default, LText? text = default, CancellationToken cancellationToken = default)
-        {
-            validator.ThrowIfNull(nameof(validator));
+    /// <summary>
+    /// Chains the current <paramref name="rule"/> with the <paramref name="nextRule"/>, creating a chained sequence of rules.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="nextRule">The next <see cref="IPropertyRule{TEntity, TProperty}"/> in the chain.</param>
+    /// <returns>The <paramref name="nextRule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> Chain<TEntity, TProperty>(IPropertyRule<TEntity, TProperty> rule, IPropertyRule<TEntity, TProperty> nextRule) where TEntity : class
+    {
+        rule.ThrowIfNull().Chain(nextRule.ThrowIfNull());
+        return nextRule;
+    }
 
-            return await result.ThenAsync(async v =>
-            {
-                var vv = v.Validate(name, text);
-                vv.Configure(c => validator(c));
-                var vr = await vv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-                return vr.ToResult<TEntity>();
-            });
-        }
+    /// <summary>
+    /// Chains the current <paramref name="rule"/> with the <paramref name="nextRule"/>, creating a chained sequence of rules.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="nextRule">The next <see cref="IPropertyRule{TEntity, TProperty}"/> in the chain.</param>
+    /// <returns>The <paramref name="nextRule"/> to support fluent-style method-chaining.</returns>
+    public static IPropertyRule<TEntity, TProperty> Chain<TEntity, TProperty>(IPropertyRule<TEntity, TProperty?> rule, IPropertyRule<TEntity, TProperty> nextRule) where TEntity : class where TProperty : struct
+    {
+        rule.ThrowIfNull().Chain(nextRule.ThrowIfNull());
+        return nextRule;
+    }
 
-        /// <summary>
-        /// Executes the <paramref name="validator"/> for the <see cref="Result{T}.Value"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The <see cref="LText"/> to use for the <see cref="IValidationResult"/>.</param>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/> function.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
-        public static async Task<Result<TEntity>> ValidateAsync<TEntity>(this Task<Result<TEntity>> result, Action<ValueValidatorConfiguration<TEntity>>? validator, string? name = default, LText? text = default, CancellationToken cancellationToken = default)
-        {
-            validator.ThrowIfNull(nameof(validator));
+    /// <summary>
+    /// Sets (overrides) the property <paramref name="text"/> to be used within validation messages.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IRootPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="text">The property <see cref="LText"/>.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IRootPropertyRule<TEntity, TProperty> WithText<TEntity, TProperty>(this IRootPropertyRule<TEntity, TProperty> rule, LText? text) where TEntity : class
+    {
+        rule.ThrowIfNull().SetText(text);
+        return rule;
+    }
 
-            return await result.ThenAsync(async v =>
-            {
-                var vv = v.Validate(name, text);
-                vv.Configure(c => validator(c));
-                var vr = await vv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-                return vr.ToResult<TEntity>();
-            });
-        }
+    /// <summary>
+    /// Sets (overrides) the property <paramref name="text"/> to be used within validation messages.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IRootPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="text">The property <see cref="LText"/>.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    public static IRootPropertyRule<TEntity, TProperty?> WithText<TEntity, TProperty>(this IRootPropertyRule<TEntity, TProperty?> rule, LText? text) where TEntity : class where TProperty : struct
+    {
+        rule.ThrowIfNull().SetText(text);
+        return rule;
+    }
 
-#if NETSTANDARD2_1
-        /// <summary>
-        /// Executes the <paramref name="validator"/> for the specified <paramref name="value"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The <see cref="LText"/> to use for the <see cref="IValidationResult"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        /// <remarks>Validation only occurs where the <paramref name="validator"/> is not <c>null</c>; otherwise, continues as expected.</remarks>
-        public static async Task<TResult> ValidatesAsync<TResult, T>(this TResult result, T value, Action<ValueValidatorConfiguration<T>>? validator, string? name = default, LText? text = default, CancellationToken cancellationToken = default) where TResult : IResult
-#else
-        /// <summary>
-        /// Executes the <paramref name="validator"/> for the specified <paramref name="value"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <paramref name="value"/> name using the <see cref="CallerArgumentExpressionAttribute"/>).</param>
-        /// <param name="text">The <see cref="LText"/> to use for the <see cref="IValidationResult"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        /// <remarks>Validation only occurs where the <paramref name="validator"/> is not <c>null</c>; otherwise, continues as expected.</remarks>
-        public static async Task<TResult> ValidatesAsync<TResult, T>(this TResult result, T value, Action<ValueValidatorConfiguration<T>>? validator, [CallerArgumentExpression(nameof(value))] string? name = default, LText? text = default, CancellationToken cancellationToken = default) where TResult : IResult
-#endif
-        {
-            if (validator is null || result.IsFailure)
-                return result;
+    /// <summary>
+    /// Sets (overrides) the format and optional format provider to be used when formatting the property value within validation messages.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IRootPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="format">The format.</param>
+    /// <param name="formatProvider">The optional <see cref="IFormatProvider"/></param>
+    /// <param name="quotingCharacter">The quoting character so it appears as a literal string.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The underlying <typeparamref name="TProperty"/> type must implement <see cref="IFormattable"/> as this results in <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> being used.</remarks>
+    public static IRootPropertyRule<TEntity, TProperty> WithFormat<TEntity, TProperty>(this IRootPropertyRule<TEntity, TProperty> rule, string? format, IFormatProvider? formatProvider = null, char? quotingCharacter = '\'') where TEntity : class where TProperty : IFormattable
+    {
+        rule.ThrowIfNull().SetFormat(format, formatProvider, quotingCharacter);
+        return rule;
+    }
 
-            var vv = value.Validate(name, text);
-            vv.Configure(c => validator(c));
-            var vr = await vv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-            return vr.HasErrors ? (TResult)result.ToFailure(vr.ToException()!) : result;           
-        }
+    /// <summary>
+    /// Sets (overrides) the format and optional format provider to be used when formatting the property value within validation messages.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="rule">The <see cref="IRootPropertyRule{TEntity, TProperty}"/> being extended.</param>
+    /// <param name="format">The format.</param>
+    /// <param name="formatProvider">The optional <see cref="IFormatProvider"/></param>
+    /// <param name="quotingCharacter">The quoting character so it appears as a literal string.</param>
+    /// <returns>The <paramref name="rule"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The underlying <typeparamref name="TProperty"/> type must implement <see cref="IFormattable"/> as this results in <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> being used.</remarks>
+    public static IRootPropertyRule<TEntity, TProperty?> WithFormat<TEntity, TProperty>(this IRootPropertyRule<TEntity, TProperty?> rule, string? format, IFormatProvider? formatProvider = null, char? quotingCharacter = '\'') where TEntity : class where TProperty : struct, IFormattable
+    {
+        rule.ThrowIfNull().SetFormat(format, formatProvider, quotingCharacter);
+        return rule;
+    }
 
-#if NETSTANDARD2_1
-        /// <summary>
-        /// Executes the <paramref name="validator"/> for the specified <paramref name="value"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The <see cref="LText"/> to use for the <see cref="IValidationResult"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        /// <remarks>Validation only occurs where the <paramref name="validator"/> is not <c>null</c>; otherwise, continues as expected.</remarks>
-        public static async Task<TResult> ValidatesAsync<TResult, T>(this Task<TResult> result, T value, Action<ValueValidatorConfiguration<T>>? validator, string? name = default, LText? text = default, CancellationToken cancellationToken = default) where TResult : IResult
-#else
-        /// <summary>
-        /// Executes the <paramref name="validator"/> for the specified <paramref name="value"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <paramref name="value"/> name using the <see cref="CallerArgumentExpressionAttribute"/>).</param>
-        /// <param name="text">The <see cref="LText"/> to use for the <see cref="IValidationResult"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        /// <remarks>Validation only occurs where the <paramref name="validator"/> is not <c>null</c>; otherwise, continues as expected.</remarks>
-        public static async Task<TResult> ValidatesAsync<TResult, T>(this Task<TResult> result, T value, Action<ValueValidatorConfiguration<T>>? validator, [CallerArgumentExpression(nameof(value))] string? name = default, LText? text = default, CancellationToken cancellationToken = default) where TResult : IResult
-#endif
-        {
-            var r = await result.ConfigureAwait(false);
-            if (validator is null || r.IsFailure)
-                return r;
+    /// <summary>
+    /// Includes the specified <paramref name="baseValidator"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TSelf">The <see cref="ValidatorBase{TEntity, TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TInclude">The included base entity <see cref="Type"/>.</typeparam>
+    /// <param name="validator">The <see cref="ValidatorBase{TEntity, TSelf}"/>.</param>
+    /// <param name="baseValidator">The base <see cref="IValidatorEx{T}"/>.</param>
+    /// <returns>The <paramref name="validator"/> to support fluent-style method-chaining.</returns>
+    /// <remarks><i>Note:</i> the <paramref name="baseValidator"/> is added internally as an <see cref="IncludeBaseRule{TEntity}"/> rule; therefore, it will be executed in the order added in relation to other property-base rules.</remarks>
+    public static TSelf Include<TEntity, TSelf, TInclude>(this ValidatorBase<TEntity, TSelf> validator, IValidatorEx<TInclude> baseValidator) where TEntity : class, TInclude where TInclude : class where TSelf : ValidatorBase<TEntity, TSelf>
+        => validator.ThrowIfNull().IncludeBase(baseValidator.ThrowIfNull());
 
-            var vv = value.Validate(name, text);
-            vv.Configure(c => validator(c));
-            var vr = await vv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-            return vr.HasErrors ? (TResult)r.ToFailure(vr.ToException()!) : r;
-        }
+    /// <summary>
+    /// Creates an <see cref="IValueValidator{T}"/> to enable validation of the specified <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <param name="name">The value name (defaults to <paramref name="value"/> name using the caller argument expression).</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <param name="jsonName">The JSON name where different to the name and using <see cref="ValidationArgs.UseJsonNames"/>.</param>
+    /// <returns>The <see cref="IValueValidator{T}"/>.</returns>
+    /// <remarks>The <paramref name="configure"/> should be used to further configure the validation rules, clauses, etc. 
+    /// <para>Finally, the <see cref="IValueValidator{T}.ValidateAsync(CancellationToken)"/> or <see cref="IValueValidator{T}.ValidateAsync(ValidationArgs?, CancellationToken)"/>, should be invoked to execute the underlying validation.</para></remarks>
+    public static IValueValidator<T> Validator<T>(this T? value, Action<IPropertyRule<ValidationValue<T>, T>>? configure, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null, string? jsonName = null) where T : notnull
+        => new ValueValidator<T>(value!, name ?? Validation.ValueName, jsonName, text, configure, null, null);
 
-        #endregion
-    }
+    /// <summary>
+    /// Creates an <see cref="IValueValidator{T}"/> to enable validation of the specified <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="configure">The action to configure the resulting <see cref="IPropertyRule{TEntity, TProperty}"/>.</param>
+    /// <param name="name">The value name (defaults to <paramref name="value"/> name using the caller argument expression).</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <param name="jsonName">The JSON name where different to the name and using <see cref="ValidationArgs.UseJsonNames"/>.</param>
+    /// <returns>The <see cref="IValueValidator{T}"/>.</returns>
+    /// <remarks>The <paramref name="configure"/> should be used to further configure the validation rules, clauses, etc. 
+    /// <para>Finally, the <see cref="IValueValidator{T}.ValidateAsync(CancellationToken)"/> or <see cref="IValueValidator{T}.ValidateAsync(ValidationArgs?, CancellationToken)"/>, should be invoked to execute the underlying validation.</para></remarks>
+    public static IValueValidator<T?> Validator<T>(this T? value, Action<IPropertyRule<ValidationValue<T?>, T?>>? configure, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null, string? jsonName = null) where T : struct
+        => new ValueValidator<T?>(value, name ?? Validation.ValueName, jsonName, text, configure, e => e.Value.GetValueOrDefault(), e => Comparer<T>.Default.Compare(e.Value.GetValueOrDefault(), default) == 0);
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationServiceCollectionExtensions.cs b/src/CoreEx.Validation/ValidationServiceCollectionExtensions.cs
deleted file mode 100644
index 4a0a8375..00000000
--- a/src/CoreEx.Validation/ValidationServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Localization;
-using CoreEx.Validation;
-using System;
-using System.Linq;
-using System.Reflection;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extensions.
-    /// </summary>
-    public static class ValidationServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Adds the <see cref="IValidatorEx{T}"/>, the <see cref="IValidator{T}"/>, and <typeparamref name="TValidator"/> as scoped services.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddValidator<T, TValidator>(this IServiceCollection services) where TValidator : class, IValidatorEx<T>
-            => AddValidatorWithInterfacesInternal<T, TValidator>(services);
-
-        /// <summary>
-        /// Adds the <see cref="IValidatorEx{T}"/>, the <see cref="IValidator{T}"/>, and <typeparamref name="TValidator"/> as scoped services.
-        /// </summary>
-        private static IServiceCollection AddValidatorWithInterfacesInternal<T, TValidator>(this IServiceCollection services) where TValidator : class, IValidatorEx<T>
-            => services.ThrowIfNull(nameof(services))
-                .AddScoped<IValidatorEx<T>, TValidator>()
-                .AddScoped<IValidator<T>>(sp => sp.GetRequiredService<IValidatorEx<T>>())
-                .AddScoped(sp => (TValidator)sp.GetRequiredService<IValidatorEx<T>>());
-
-        /// <summary>
-        /// Adds the <typeparamref name="TValidator"/> as a scoped service only.
-        /// </summary>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        /// <remarks>Note that this does <i>not</i> register the corresponding <see cref="IValidatorEx{T}"/> and <see cref="IValidator{T}"/>; use <see cref="AddValidator{T, TValidator}(IServiceCollection)"/> to explicitly perform.</remarks>
-        public static IServiceCollection AddValidator<TValidator>(this IServiceCollection services) where TValidator : class, IValidatorEx
-            => AddValidatorInternal<TValidator>(services);
-
-        /// <summary>
-        /// Adds the <typeparamref name="TValidator"/> as a scoped service only.
-        /// </summary>
-        private static IServiceCollection AddValidatorInternal<TValidator>(this IServiceCollection services) where TValidator : class, IValidatorEx
-            => services.ThrowIfNull(nameof(services)).AddScoped<TValidator>();
-
-        /// <summary>
-        /// Adds all the <see cref="IValidatorEx{T}"/> validators from the specified <typeparamref name="TAssembly"/> as scoped services.
-        /// </summary>
-        /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddValidators<TAssembly>(this IServiceCollection services)
-            => AddValidators(services, [typeof(TAssembly).Assembly]);
-
-        /// <summary>
-        /// Adds all the <see cref="IValidatorEx{T}"/> validators from the specified <typeparamref name="TAssembly1"/> and <typeparamref name="TAssembly2"/> as scoped services.
-        /// </summary>
-        /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddValidators<TAssembly1, TAssembly2>(this IServiceCollection services)
-            => AddValidators(services, [typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly]);
-
-        /// <summary>
-        /// Adds all the <see cref="IValidatorEx{T}"/> validators from the specified <typeparamref name="TAssembly1"/>, <typeparamref name="TAssembly2"/> and <typeparamref name="TAssembly3"/> as scoped services.
-        /// </summary>
-        /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <typeparam name="TAssembly3">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddValidators<TAssembly1, TAssembly2, TAssembly3>(this IServiceCollection services)
-            => AddValidators(services, [typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly, typeof(TAssembly3).Assembly]);
-
-        /// <summary>
-        /// Adds all the <see cref="IValidatorEx{T}"/> validators from the specified <paramref name="assemblies"/> as scoped services.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="assemblies">The assemblies.</param>
-        /// <param name="includeInternalTypes">Indicates whether to include internally defined types.</param>
-        /// <param name="alsoRegisterInterfaces">Indicates whether to also register the interfaces with <see cref="AddValidator{T, TValidator}(IServiceCollection)"/> (default); otherwise, with <see cref="AddValidator{TValidator}(IServiceCollection)"/> (just the validator instance itself).</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddValidators(this IServiceCollection services, Assembly[] assemblies, bool includeInternalTypes = false, bool alsoRegisterInterfaces = true)
-        {
-            services.ThrowIfNull(nameof(services));
-
-            foreach (var assembly in assemblies.Distinct())
-            {
-                var av = alsoRegisterInterfaces
-                    ? typeof(ValidationServiceCollectionExtensions).GetMethod(nameof(AddValidatorWithInterfacesInternal), BindingFlags.Static | BindingFlags.NonPublic)!
-                    : typeof(ValidationServiceCollectionExtensions).GetMethod(nameof(AddValidatorInternal), BindingFlags.Static | BindingFlags.NonPublic)!;
-
-                foreach (var match in from type in includeInternalTypes ? assembly.GetTypes() : assembly.GetExportedTypes()
-                                      where !type.IsAbstract && !type.IsGenericTypeDefinition
-                                      let interfaces = type.GetInterfaces()
-                                      let genericInterfaces = interfaces.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IValidatorEx<>))
-                                      let @interface = genericInterfaces.FirstOrDefault()
-                                      let valueType = @interface?.GetGenericArguments().FirstOrDefault()
-                                      where @interface != null
-                                      select new { valueType, type })
-                {
-                    if (alsoRegisterInterfaces)
-                        av.MakeGenericMethod(match.valueType, match.type).Invoke(null, [services]);
-                    else
-                        av.MakeGenericMethod(match.type).Invoke(null, [services]);
-                }
-            }
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="ValidationTextProvider"/> as the <see cref="ITextProvider"/> as a singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddValidationTextProvider(this IServiceCollection services)
-            => services.ThrowIfNull(nameof(services)).AddSingleton<ITextProvider, ValidationTextProvider>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationTextProvider.cs b/src/CoreEx.Validation/ValidationTextProvider.cs
deleted file mode 100644
index 52ab56d5..00000000
--- a/src/CoreEx.Validation/ValidationTextProvider.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System.Resources;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Provides the <see cref="ITextProvider"/> for validation <see cref="LText"/> localization.
-    /// </summary>
-    public class ValidationTextProvider : TextProviderBase
-    {
-        /// <summary>
-        /// Gets the <see cref="System.Resources.ResourceManager"/> that contains the texts for the validation.
-        /// </summary>
-        public static ResourceManager ResourceManager { get; } = new("CoreEx.Validation.Resources", typeof(ValidationTextProvider).Assembly);
-
-        /// <inheritdoc/>
-        protected override string? GetTextForKey(LText key) => key.KeyAndOrText is null ? null : ResourceManager.GetString(key.KeyAndOrText, System.Globalization.CultureInfo.CurrentCulture);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidationValue.cs b/src/CoreEx.Validation/ValidationValue.cs
deleted file mode 100644
index d0835e23..00000000
--- a/src/CoreEx.Validation/ValidationValue.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents a validation value.
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    public class ValidationValue<T>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationValue{T}"/> class.
-        /// </summary>
-        /// <param name="entity">The parent entity value.</param>
-        /// <param name="value">The value.</param>
-        internal ValidationValue(object? entity, T? value)
-        {
-            Entity = entity;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the entity value.
-        /// </summary>
-        public object? Entity { get; }
-
-        /// <summary>
-        /// Gets the entity property value.
-        /// </summary>
-        public T? Value { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/Validator.cs b/src/CoreEx.Validation/Validator.cs
index 2875ea14..652fb397 100644
--- a/src/CoreEx.Validation/Validator.cs
+++ b/src/CoreEx.Validation/Validator.cs
@@ -1,118 +1,42 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using CoreEx.Validation.Rules;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Provides access to the validator capabilities.
+/// </summary>
+public static class Validator
 {
     /// <summary>
-    /// Provides access to the validator capabilities.
+    /// Create a new <see cref="Validator{TEntity}"/>.
     /// </summary>
-    public static class Validator
-    {
-        /// <summary>
-        /// Create a <see cref="Validator{TEntity}"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <returns>A <see cref="Validator{TEntity}"/>.</returns>
-        public static Validator<TEntity> Create<TEntity>() where TEntity : class => new();
-
-        /// <summary>
-        /// Create (or get) an instance of the pre-registered validator.
-        /// </summary>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>; defaults to <see cref="ExecutionContext.ServiceProvider"/> where not specified.</param>
-        /// <returns>The <typeparamref name="TValidator"/> instance.</returns>
-        public static TValidator Create<TValidator>(IServiceProvider? serviceProvider = null) where TValidator : IValidatorEx
-            => (serviceProvider == null ? ExecutionContext.GetService<TValidator>() : serviceProvider.GetService<TValidator>())
-                ?? throw new InvalidOperationException($"Attempted to get service '{typeof(TValidator).FullName}' but null was returned; this would indicate that the service has not been configured correctly.");
-
-        /// <summary>
-        /// Create <typeparamref name="T"/> value validator (see <see cref="CommonValidator{T}"/>).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="validator">An action with the <see cref="CommonValidator{T}"/> to enable further configuration.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/>.</returns>
-        /// <remarks>This is a synonym for the <see cref="CommonValidator.Create{T}(Action{CommonValidator{T}})"/>.</remarks>
-        public static CommonValidator<T> CreateFor<T>(Action<CommonValidator<T>>? validator = null) => CommonValidator.Create(validator);
-
-        /// <summary>
-        /// Create a collection-based <see cref="CommonValidator{T}"/> where the <see cref="ICollectionRuleItem"/> can be specified.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="item">The item <see cref="ICollectionRuleItem"/> configuration.</param>
-        /// <param name="allowNullItems">Indicates whether the underlying collection item must not be null.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/> for the collection.</returns>
-        public static CommonValidator<TColl> CreateForCollection<TColl>(int minCount = 0, int? maxCount = null, ICollectionRuleItem? item = null, bool allowNullItems = false) where TColl : class, IEnumerable?
-            => CreateFor<TColl>(v => v.Collection(minCount, maxCount, item, allowNullItems));
-
-        /// <summary>
-        /// Create a collection-based <see cref="CommonValidator{T}"/> for the specified <paramref name="itemValidator"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="itemValidator">The item <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="allowNullItems">Indicates whether the underlying collection item must not be null.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/> for the collection.</returns>
-        public static CommonValidator<TColl> CreateForCollection<TColl, TItem>(IValidatorEx<TItem> itemValidator, int minCount = 0, int? maxCount = null, bool allowNullItems = false) where TColl : class, IEnumerable<TItem>?
-            => CreateFor<TColl>(v => v.Collection(itemValidator, minCount, maxCount, allowNullItems));
-
-        /// <summary>
-        /// Create a dictionary-based <see cref="CommonValidator{T}"/> where the <see cref="IDictionaryRuleItem"/> can be specified.
-        /// </summary>
-        /// <typeparam name="TDict">The dictionary <see cref="Type"/>.</typeparam>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="item">The item <see cref="IDictionaryRuleItem"/> configuration.</param>
-        /// <param name="allowNullKeys">Indicates whether the underlying dictionary key can be null.</param>
-        /// <param name="allowNullValues">Indicates whether the underlying dictionary value can be null.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/> for the dictionary.</returns>
-        public static CommonValidator<TDict> CreateForDictionary<TDict>(int minCount = 0, int? maxCount = null, IDictionaryRuleItem? item = null, bool allowNullKeys = false, bool allowNullValues = false) where TDict : class, IDictionary
-            => CreateFor<TDict>(v => v.Dictionary(minCount, maxCount, item, allowNullKeys, allowNullValues));
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
+    public static Validator<TEntity> Create<TEntity>() where TEntity : class => new();
 
-        /// <summary>
-        /// Create a dictionary-based <see cref="CommonValidator{T}"/> for the specified <paramref name="keyValidator"/> and <paramref name="valueValidator"/>.
-        /// </summary>
-        /// <typeparam name="TDict">The dictionary <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="keyValidator">The key <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="valueValidator">The value <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="allowNullKeys">Indicates whether the underlying dictionary key can be null.</param>
-        /// <param name="allowNullValues">Indicates whether the underlying dictionary value can be null.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/> for the dictionary.</returns>
-        public static CommonValidator<TDict> CreateForDictionary<TDict, TKey, TValue>(IValidatorEx<TKey>? keyValidator, IValidatorEx<TValue>? valueValidator, int minCount = 0, int? maxCount = null, bool allowNullKeys = false, bool allowNullValues = false) where TDict : Dictionary<TKey, TValue>? where TKey : notnull
-            => CreateFor<TDict>(v => v.Dictionary(keyValidator, valueValidator, minCount, maxCount, allowNullKeys, allowNullValues));
+    /// <summary>
+    /// Gets an instance of the pre-registered <typeparamref name="TValidator"/> service.
+    /// </summary>
+    /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
+    /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/>; defaults to <see cref="ExecutionContext.ServiceProvider"/>.</param>
+    /// <returns>The <typeparamref name="TValidator"/> instance.</returns>
+    public static TValidator Get<TValidator>(IServiceProvider? serviceProvider = null) where TValidator : IValidatorEx
+        => serviceProvider is null ? ExecutionContext.GetRequiredService<TValidator>() : serviceProvider.GetRequiredService<TValidator>();
 
-        /// <summary>
-        /// Create a dictionary-based <see cref="CommonValidator{T}"/> for the specified <paramref name="valueValidator"/>.
-        /// </summary>
-        /// <typeparam name="TDict">The dictionary <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="valueValidator">The value <see cref="IValidatorEx{T}"/>.</param>
-        /// <param name="minCount">The minimum count.</param>
-        /// <param name="maxCount">The maximum count.</param>
-        /// <param name="allowNullKeys">Indicates whether the underlying dictionary key can be null.</param>
-        /// <param name="allowNullValues">Indicates whether the underlying dictionary value can be null.</param>
-        /// <returns>The <see cref="CommonValidator{T}"/> for the dictionary.</returns>
-        public static CommonValidator<TDict> CreateForDictionary<TDict, TKey, TValue>(IValidatorEx<TValue>? valueValidator, int minCount = 0, int? maxCount = null, bool allowNullKeys = false, bool allowNullValues = false) where TDict : Dictionary<TKey, TValue>? where TKey : notnull
-            => CreateFor<TDict>(v => v.Dictionary((IValidatorEx<TKey>?)null, valueValidator, minCount, maxCount, allowNullKeys, allowNullValues));
+    /// <summary>
+    /// Gets an instance of the pre-registered keyed <typeparamref name="TValidator"/> service.
+    /// </summary>
+    /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
+    /// <param name="serviceKey">The service key.</param>
+    /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/>; defaults to <see cref="ExecutionContext.ServiceProvider"/>.</param>
+    /// <returns>The <typeparamref name="TValidator"/> instance.</returns>
+    public static TValidator GetKeyed<TValidator>(object? serviceKey, IServiceProvider? serviceProvider = null) where TValidator : IValidatorEx
+        => serviceProvider is null ? ExecutionContext.GetRequiredKeyedService<TValidator>(serviceKey) : serviceProvider.GetRequiredKeyedService<TValidator>(serviceKey);
 
-        /// <summary>
-        /// Creates a <c>null</c> <see cref="IValidatorEx{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
-        /// <returns>A <c>null</c> <see cref="IValidatorEx{T}"/>; i.e. simply <c>null</c>.</returns>
-        public static IValidatorEx<T>? Null<T>() => null;
-    }
+    /// <summary>
+    /// Creates a new <see cref="CommonValidator{T}"/> inline.
+    /// </summary>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="configure">The action to configure the resulting <see cref="CommonValidator{T}"/>.</param>
+    /// <returns>The <see cref="CommonValidator{T}"/>.</returns>
+    /// <remarks>A common validator must be defined using a <see langword="notnull"/> <typeparamref name="TValue"/> type to ensure broadest commonality and usage throughout.</remarks>
+    public static CommonValidator<TValue> CreateCommon<TValue>(Action<CommonValidator<TValue>.Validator>? configure) where TValue : notnull => new(configure);
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidatorBase.cs b/src/CoreEx.Validation/ValidatorBase.cs
deleted file mode 100644
index 2c70bbb4..00000000
--- a/src/CoreEx.Validation/ValidatorBase.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Represents the base entity validator.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    public abstract class ValidatorBase<TEntity> : IValidatorEx<TEntity> where TEntity : class
-    {
-        /// <summary>
-        /// Gets the underlying rules collection.
-        /// </summary>
-        internal protected List<IEntityRule<TEntity>> Rules { get; } = [];
-
-        /// <summary>
-        /// Gets the <see cref="ExecutionContext.Current"/> instance.
-        /// </summary>
-        public CoreEx.ExecutionContext ExecutionContext => ExecutionContext.Current;
-
-        /// <summary>
-        /// Adds a <see cref="PropertyRule{TEntity, TProperty}"/> to the validator.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <returns>The <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        public virtual IPropertyRule<TEntity, TProperty> Property<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression)
-        {
-            PropertyRule<TEntity, TProperty> rule = new(propertyExpression);
-            Rules.Add(rule);
-            return rule;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyRule{TEntity, TProperty}"/> to the validator.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <returns>The <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        /// <remarks>This is a synonym for <see cref="Property{TProperty}(Expression{Func{TEntity, TProperty}})"/> to enable <see href="https://docs.fluentvalidation.net/en/latest/">FluentValidation</see> syntax.</remarks>
-        public virtual IPropertyRule<TEntity, TProperty> RuleFor<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) => Property(propertyExpression);
-
-        /// <inheritdoc/>
-        public virtual Task<ValidationContext<TEntity>> ValidateAsync(TEntity value, ValidationArgs? args, CancellationToken cancellationToken = default) => throw new NotSupportedException("Validate is not supported by this class.");
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidatorStrings.cs b/src/CoreEx.Validation/ValidatorStrings.cs
index 03fc3d32..b01a0521 100644
--- a/src/CoreEx.Validation/ValidatorStrings.cs
+++ b/src/CoreEx.Validation/ValidatorStrings.cs
@@ -1,217 +1,224 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using CoreEx.Localization;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Provides the standard text format strings.
+/// </summary>
+/// <remarks>For the format defaults within, the '<c>{0}</c>' and '<c>{1}</c>' placeholders represent a property's friendly text and value. Any placeholders '<c>{2}</c>', or above, are specific to the underlying validator/rule.</remarks>
+public static class ValidatorStrings
 {
     /// <summary>
-    /// Provides the standard text format strings.
-    /// </summary>
-    /// <remarks>For the format defaults within, the '<c>{0}</c>' and '<c>{1}</c>' placeholders represent a property's friendly text and value itself. Any placeholders '<c>{2}</c>', or above, are specific to the underlying valitator.</remarks>
-    public static class ValidatorStrings
-    {
-        /// <summary>
-        /// Gets or sets the format string for the compare equal error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be between {2} and {3}</c>'.</remarks>
-        public static LText BetweenInclusiveFormat { get; set; } = new("CoreEx.Validation.BetweenInclusiveFormat", "{0} must be between {2} and {3}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare equal error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be between {2} and {3} (exclusive)</c>'.</remarks>
-        public static LText BetweenExclusiveFormat { get; set; } = new("CoreEx.Validation.BetweenExclusiveFormat", "{0} must be between {2} and {3} (exclusive).");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare equal error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be equal to {2}</c>'.</remarks>
-        public static LText CompareEqualFormat { get; set; } = new("CoreEx.Validation.CompareEqualFormat", "{0} must be equal to {2}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare not equal error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must not be equal to {2}</c>'.</remarks>
-        public static LText CompareNotEqualFormat { get; set; } = new("CoreEx.Validation.CompareNotEqualFormat", "{0} must not be equal to {2}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare less than error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be less than {2}</c>'.</remarks>
-        public static LText CompareLessThanFormat { get; set; } = new("CoreEx.Validation.CompareLessThanFormat", "{0} must be less than {2}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare less than or equal error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be less than or equal to {2}</c>'.</remarks>
-        public static LText CompareLessThanEqualFormat { get; set; } = new("CoreEx.Validation.CompareLessThanEqualFormat", "{0} must be less than or equal to {2}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare greater than error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be greater than {2}</c>'.</remarks>
-        public static LText CompareGreaterThanFormat { get; set; } = new("CoreEx.Validation.CompareGreaterThanFormat", "{0} must be greater than {2}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the compare greater than or equal error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be greater than or equal to {2}</c>'.</remarks>
-        public static LText CompareGreaterThanEqualFormat { get; set; } = new("CoreEx.Validation.CompareGreaterThanEqualFormat", "{0} must be greater than or equal to {2}.");
-
-        /// <summary>
-        /// Gets or sets the format string for the Maximum digits error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must not exceed {2} digits in total</c>'.</remarks>
-        public static LText MaxDigitsFormat { get; set; } = new("CoreEx.Validation.MaxDigitsFormat", "{0} must not exceed {2} digits in total.");
-
-        /// <summary>
-        /// Gets or sets the format string for the Decimal places error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} exceeds the maximum specified number of decimal places ({2})</c>'.</remarks>
-        public static LText DecimalPlacesFormat { get; set; } = new("CoreEx.Validation.DecimalPlacesFormat", "{0} exceeds the maximum specified number of decimal places ({2}).");
-
-        /// <summary>
-        /// Gets or sets the format string for the duplicate error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} already exists and would result in a duplicate.</c>'</remarks>
-        public static LText DuplicateFormat { get; set; } = new("CoreEx.Validation.DuplicateFormat", "{0} already exists and would result in a duplicate.");
-
-        /// <summary>
-        /// Gets or sets the format string for a duplicate value error message; includes ability to specify values.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains duplicates; {2} value '{3}' specified more than once</c>'.</remarks>
-        public static LText DuplicateValueFormat { get; set; } = new("CoreEx.Validation.DuplicateValueFormat", "{0} contains duplicates; {2} value '{3}' specified more than once.");
-
-        /// <summary>
-        /// Gets or sets the format string for a duplicate value error message; no values specified.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains duplicates; {2} value specified more than once</c>'.</remarks>
-        public static LText DuplicateValue2Format { get; set; } = new("CoreEx.Validation.DuplicateValue2Format", "{0} contains duplicates; {2} value specified more than once.");
-
-        /// <summary>
-        /// Gets or sets the format string for the minimum count error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must have at least {2} item(s)</c>'.</remarks>
-        public static LText MinCountFormat { get; set; } = new("CoreEx.Validation.MinCountFormat", "{0} must have at least {2} item(s).");
-
-        /// <summary>
-        /// Gets or sets the format string for the maximum count error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must not exceed {2} item(s)</c>'.</remarks>
-        public static LText MaxCountFormat { get; set; } = new("CoreEx.Validation.MaxCountFormat", "{0} must not exceed {2} item(s).");
-
-        /// <summary>
-        /// Gets or sets the format string for the exists error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is not found; a valid value is required</c>'.</remarks>
-        public static LText ExistsFormat { get; set; } = new("CoreEx.Validation.ExistsFormat", "{0} is not found; a valid value is required.");
-
-        /// <summary>
-        /// Gets or sets the format string for the immutable error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is not allowed to change; please reset value</c>'.</remarks>
-        public static LText ImmutableFormat { get; set; } = new("CoreEx.Validation.ImmutableFormat", "{0} is not allowed to change; please reset value.");
-
-        /// <summary>
-        /// Gets the format string for the Mandatory error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is required</c>'. This references <see cref="Validation.MandatoryFormat"/>.</remarks>
-        public static LText MandatoryFormat => Validation.MandatoryFormat;
-
-        /// <summary>
-        /// Gets or sets the format string for the must error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is invalid</c>'.</remarks>
-        public static LText MustFormat { get; set; } = new("CoreEx.Validation.MustFormat", "{0} is invalid.");
-
-        /// <summary>
-        /// Gets or sets the format string for the allow negatives error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must not be negative</c>'.</remarks>
-        public static LText AllowNegativesFormat { get; set; } = new("CoreEx.Validation.AllowNegativesFormat", "{0} must not be negative.");
-
-        /// <summary>
-        /// Gets or sets the format string for the invalid error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is invalid</c>'.</remarks>
-        public static LText InvalidFormat { get; set; } = new("CoreEx.Validation.InvalidFormat", "{0} is invalid.");
-
-        /// <summary>
-        /// Gets or sets the format string for the invalid items error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains one or more invalid items</c>'.</remarks>
-        public static LText InvalidItemsFormat { get; set; } = new("CoreEx.Validation.InvalidItemsFormat", "{0} contains one or more invalid items.");
-
-        /// <summary>
-        /// Gets or sets the format string for the minimum length error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be at least {2} characters in length</c>'.</remarks>
-        public static LText MinLengthFormat { get; set; } = new("CoreEx.Validation.MinLengthFormat", "{0} must be at least {2} characters in length.");
-
-        /// <summary>
-        /// Gets or sets the format string for the maximum length error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must not exceed {2} characters in length</c>'.</remarks>
-        public static LText MaxLengthFormat { get; set; } = new("CoreEx.Validation.MaxLengthFormat", "{0} must not exceed {2} characters in length.");
-
-        /// <summary>
-        /// Gets or sets the format string for the exact length error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must be exactly {2} characters in length</c>'.</remarks>
-        public static LText ExactLengthFormat { get; set; } = new("CoreEx.Validation.ExactLengthFormat", "{0} must be exactly {2} characters in length.");
-
-        /// <summary>
-        /// Gets or sets the format string for the regex error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is invalid</c>'.</remarks>
-        public static LText RegexFormat { get; set; } = new("CoreEx.Validation.RegexFormat", "{0} is invalid.");
-
-        /// <summary>
-        /// Gets or sets the format string for the wildcard error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains invalid or non-supported wildcard selection</c>'.</remarks>
-        public static LText WildcardFormat { get; set; } = new("CoreEx.Validation.WildcardFormat", "{0} contains invalid or non-supported wildcard selection.");
-
-        /// <summary>
-        /// Gets or sets the format string for the collection null item error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains one or more items that are not specified</c>'.</remarks>
-        public static LText CollectionNullItemFormat { get; set; } = new("CoreEx.Validation.CollectionNullItemFormat", "{0} contains one or more items that are not specified.");
-
-        /// <summary>
-        /// Gets or sets the format string for the dictionary null key error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains one or more keys that are not specified</c>'.</remarks>
-        public static LText DictionaryNullKeyFormat { get; set; } = new("CoreEx.Validation.DictionaryNullKeyFormat", "{0} contains one or more keys that are not specified.");
-
-        /// <summary>
-        /// Gets or sets the format string for the dictionary null value error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} contains one or more values that are not specified</c>'.</remarks>
-        public static LText DictionaryNullValueFormat { get; set; } = new("CoreEx.Validation.DictionaryNullValueFormat", "{0} contains one or more values that are not specified.");
-
-        /// <summary>
-        /// Gets or sets the format string for the invalid email message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is an invalid e-mail address</c>'.</remarks>
-        public static LText EmailFormat { get; set; } = new("CoreEx.Validation.EmailFormat", "{0} is an invalid e-mail address.");
-
-        /// <summary>
-        /// Gets or sets the format string for when no (none) value is to be specified.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} must not be specified.</c>'.</remarks>
-        public static LText NoneFormat { get; set; } = new("CoreEx.Validation.NoneFormat", "{0} must not be specified.");
-
-        /// <summary>
-        /// Gets or sets the string for the <see cref="Entities.IPrimaryKey.PrimaryKey"/> literal.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>Primary Key</c>'</remarks>
-        public static LText PrimaryKey { get; set; } = new("CoreEx.Validation.PrimaryKey", "Primary Key");
-
-        /// <summary>
-        /// Gets or sets the string for the <see cref="Entities.IIdentifier.Id"/> literal.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>Identifier</c>'</remarks>
-        public static LText Identifier { get; set; } = new("CoreEx.Validation.Identifier", "Identifier");
-    }
+    /// Gets or sets the format string for the compare equal error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be between {2} and {3}</c>'.</remarks>
+    public static LText BetweenInclusiveFormat { get; set; } = new("CoreEx.Validation.BetweenInclusiveFormat", "{0} must be between {2} and {3}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare equal error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be between {2} and {3} (exclusive)</c>'.</remarks>
+    public static LText BetweenExclusiveFormat { get; set; } = new("CoreEx.Validation.BetweenExclusiveFormat", "{0} must be between {2} and {3} (exclusive).");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare equal error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be equal to {2}</c>'.</remarks>
+    public static LText CompareEqualFormat { get; set; } = new("CoreEx.Validation.CompareEqualFormat", "{0} must be equal to {2}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare not equal error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must not be equal to {2}</c>'.</remarks>
+    public static LText CompareNotEqualFormat { get; set; } = new("CoreEx.Validation.CompareNotEqualFormat", "{0} must not be equal to {2}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare less than error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be less than {2}</c>'.</remarks>
+    public static LText CompareLessThanFormat { get; set; } = new("CoreEx.Validation.CompareLessThanFormat", "{0} must be less than {2}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare less than or equal error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be less than or equal to {2}</c>'.</remarks>
+    public static LText CompareLessThanEqualFormat { get; set; } = new("CoreEx.Validation.CompareLessThanEqualFormat", "{0} must be less than or equal to {2}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare greater than error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be greater than {2}</c>'.</remarks>
+    public static LText CompareGreaterThanFormat { get; set; } = new("CoreEx.Validation.CompareGreaterThanFormat", "{0} must be greater than {2}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the compare greater than or equal error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be greater than or equal to {2}</c>'.</remarks>
+    public static LText CompareGreaterThanEqualFormat { get; set; } = new("CoreEx.Validation.CompareGreaterThanEqualFormat", "{0} must be greater than or equal to {2}.");
+
+    /// <summary>
+    /// Gets or sets the format string for the Maximum digits error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} exceeds the maximum digits ({2}).</c>'.</remarks>
+    public static LText MaxDigitsFormat { get; set; } = new("CoreEx.Validation.MaxDigitsFormat", "{0} exceeds the maximum digits ({2}).");
+
+    /// <summary>
+    /// Gets or sets the format string for the Decimal places error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} exceeds the maximum decimal places ({2})</c>'.</remarks>
+    public static LText DecimalPlacesFormat { get; set; } = new("CoreEx.Validation.DecimalPlacesFormat", "{0} exceeds the maximum decimal places ({2}).");
+
+    /// <summary>
+    /// Gets or sets the format string for the duplicate error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} already exists and would result in a duplicate.</c>'</remarks>
+    public static LText DuplicateFormat { get; set; } = new("CoreEx.Validation.DuplicateFormat", "{0} already exists and would result in a duplicate.");
+
+    /// <summary>
+    /// Gets or sets the format string for a duplicate value error message; includes ability to specify values.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} contains duplicates; {2} value specified more than once</c>'.</remarks>
+    public static LText DuplicateValueFormat { get; set; } = new("CoreEx.Validation.DuplicateValue2Format", "{0} contains duplicates; {2} specified more than once.");
+
+    /// <summary>
+    /// Gets or sets the format string for the minimum count error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must have at least {2} item(s)</c>'.</remarks>
+    public static LText MinCountFormat { get; set; } = new("CoreEx.Validation.MinCountFormat", "{0} must have at least {2} item(s).");
+
+    /// <summary>
+    /// Gets or sets the format string for the maximum count error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must not exceed {2} item(s)</c>'.</remarks>
+    public static LText MaxCountFormat { get; set; } = new("CoreEx.Validation.MaxCountFormat", "{0} must not exceed {2} item(s).");
+
+    /// <summary>
+    /// Gets or sets the format string for the not found error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} was not found</c>'.</remarks>
+    public static LText NotFoundFormat { get; set; } = new("CoreEx.Validation.NotFoundFormat", "{0} was not found.");
+
+    /// <summary>
+    /// Gets or sets the format string for the immutable error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} is not allowed to change; please reset value</c>'.</remarks>
+    public static LText ImmutableFormat { get; set; } = new("CoreEx.Validation.ImmutableFormat", "{0} is not allowed to change; please reset value.");
+
+    /// <summary>
+    /// Gets the format string for the Mandatory error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} is required</c>'. This references <see cref="Validation.MandatoryFormat"/>.</remarks>
+    public static LText MandatoryFormat => Validation.MandatoryFormat;
+
+    /// <summary>
+    /// Gets or sets the format string for the allow negatives error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must not be negative</c>'.</remarks>
+    public static LText AllowNegativesFormat { get; set; } = new("CoreEx.Validation.AllowNegativesFormat", "{0} must not be negative.");
+
+    /// <summary>
+    /// Gets or sets the format string for the invalid error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} is invalid</c>'.</remarks>
+    public static LText InvalidFormat { get; set; } = new("CoreEx.Validation.InvalidFormat", "{0} is invalid.");
+
+    /// <summary>
+    /// Gets or sets the format string for the invalid items error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} contains one or more invalid items</c>'.</remarks>
+    public static LText InvalidItemsFormat { get; set; } = new("CoreEx.Validation.InvalidItemsFormat", "{0} contains one or more invalid items.");
+
+    /// <summary>
+    /// Gets or sets the format string for the minimum length error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be at least {2} characters in length</c>'.</remarks>
+    public static LText MinLengthFormat { get; set; } = new("CoreEx.Validation.MinLengthFormat", "{0} must be at least {2} character(s) in length.");
+
+    /// <summary>
+    /// Gets or sets the format string for the maximum length error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must not exceed {2} characters in length</c>'.</remarks>
+    public static LText MaxLengthFormat { get; set; } = new("CoreEx.Validation.MaxLengthFormat", "{0} must not exceed {2} character(s) in length.");
+
+    /// <summary>
+    /// Gets or sets the format string for the exact length error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must be exactly {2} characters in length</c>'.</remarks>
+    public static LText ExactLengthFormat { get; set; } = new("CoreEx.Validation.ExactLengthFormat", "{0} must be exactly {2} character(s) in length.");
+
+    /// <summary>
+    /// Gets or sets the format string for the regex error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} is invalid</c>'.</remarks>
+    public static LText RegexFormat { get; set; } = new("CoreEx.Validation.RegexFormat", "{0} is invalid.");
+
+    /// <summary>
+    /// Gets or sets the format string for the wildcard error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} contains invalid or non-supported wildcard selection</c>'.</remarks>
+    public static LText WildcardFormat { get; set; } = new("CoreEx.Validation.WildcardFormat", "{0} contains invalid or non-supported wildcard selection.");
+
+    /// <summary>
+    /// Gets or sets the format string for the collection null item error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} contains one or more items that are not specified</c>'.</remarks>
+    public static LText CollectionNullItemFormat { get; set; } = new("CoreEx.Validation.CollectionNullItemFormat", "{0} contains one or more items that are not specified.");
+
+    /// <summary>
+    /// Gets or sets the format string for the dictionary null key error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} contains one or more keys that are not specified</c>'.</remarks>
+    public static LText DictionaryNullKeyFormat { get; set; } = new("CoreEx.Validation.DictionaryNullKeyFormat", "{0} contains one or more keys that are not specified.");
+
+    /// <summary>
+    /// Gets or sets the format string for the dictionary null value error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} contains one or more values that are not specified</c>'.</remarks>
+    public static LText DictionaryNullValueFormat { get; set; } = new("CoreEx.Validation.DictionaryNullValueFormat", "{0} contains one or more values that are not specified.");
+
+    /// <summary>
+    /// Gets or sets the format string for the invalid email message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} is an invalid e-mail address</c>'.</remarks>
+    public static LText EmailFormat { get; set; } = new("CoreEx.Validation.EmailFormat", "{0} is an invalid e-mail address.");
+
+    /// <summary>
+    /// Gets or sets the format string for when no (none) value is to be specified.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} must not be specified.</c>'.</remarks>
+    public static LText NoneFormat { get; set; } = new("CoreEx.Validation.NoneFormat", "{0} must not be specified.");
+
+    /// <summary>
+    /// Gets or sets the string for the <see cref="IPrimaryKey.PrimaryKey"/> literal.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>Primary Key</c>'</remarks>
+    public static LText PrimaryKeyText { get; set; } = new("CoreEx.Validation.PrimaryKey", "Primary Key");
+
+    /// <summary>
+    /// Gets or sets the string for the <see cref="IIdentifierCore.Id"/> literal.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>Identifier</c>'</remarks>
+    public static LText IdentifierText { get; set; } = new("CoreEx.Validation.Identifier", "Identifier");
+
+    /// <summary>
+    /// Gets or sets the string for the <see cref="IEntityKey"/> literal.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>Key</c>'</remarks>
+    public static LText KeyText { get; set; } = new("CoreEx.Validation.Key", "Key");
+
+    /// <summary>
+    /// Gets or sets the string for the item literal.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>Item</c>'</remarks>
+    public static LText ItemText { get; set; } = new("CoreEx.Validation.Item", "Item");
+
+    /// <summary>
+    /// Gets or sets the default value <see cref="LText"/>.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>Value</c>'. This references <see cref="Validation.ValueText"/>.</remarks>
+    public static LText ValueText => Validation.ValueText;
+
+    /// <summary>
+    /// Gets or sets the <see cref="LText"/> representation of <see langword="null"/>.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>&lt;null&gt;</c>'. This references <see cref="Validation.NullText"/>.</remarks>
+    public static LText NullText => Validation.NullText;
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidatorT.cs b/src/CoreEx.Validation/ValidatorT.cs
index 1332a7ad..8ac8187b 100644
--- a/src/CoreEx.Validation/ValidatorT.cs
+++ b/src/CoreEx.Validation/ValidatorT.cs
@@ -1,234 +1,102 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides entity validation.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <remarks>See also <see cref="Validator.Create{TEntity}"/>.</remarks>
+public class Validator<TEntity> : ValidatorBase<TEntity, Validator<TEntity>> where TEntity : class
+{
+    private List<Func<ValidationContext<TEntity>, CancellationToken, Task>>? _additionalAsync;
 
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Localization;
-using CoreEx.Results;
-using System;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
+    /// <inheritdoc/>
+    public async sealed override Task<IValidationContext<TEntity>> ValidateAsync(TEntity value, ValidationArgs? args = null, CancellationToken cancellationToken = default)
+    {
+        var context = new ValidationContext<TEntity>(value, args ?? new ValidationArgs { FullyQualifiedEntityName = Validation.ValueName, FullyQualifiedJsonEntityName = null });
+        await ValidateInternalAsync(context, cancellationToken).ConfigureAwait(false);
+        return context;
+    }
 
-namespace CoreEx.Validation
-{
     /// <summary>
-    /// Provides entity validation.
+    /// Validate the value.
     /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    public class Validator<TEntity> : ValidatorBase<TEntity> where TEntity : class
-    {
-        private RuleSet<TEntity>? _currentRuleSet;
-        private Func<ValidationContext<TEntity>, CancellationToken, Task<Result>>? _additionalAsync;
-
-        /// <inheritdoc/>
-        public override Task<ValidationContext<TEntity>> ValidateAsync(TEntity value, ValidationArgs? args = null, CancellationToken cancellationToken = default)
-        {
-            return ValidationInvoker.Current.InvokeAsync(this, async (_, cancellationToken) =>
-            {
-                var context = new ValidationContext<TEntity>(value, args ?? new ValidationArgs());
-                if (value is null)
-                {
-                    context.AddMessage(nameof(value), nameof(value), MessageType.Error, ValidatorStrings.MandatoryFormat, Validation.ValueTextDefault);
-                    return context;
-                }
-
-                // Validate each of the property rules.
-                foreach (var rule in Rules)
-                {
-                    await rule.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
-
-                    // Where in a failure state no further validation should be performed.
-                    if (context.FailureResult.HasValue)
-                        return context;
-                }
-
-                var result = await OnValidateAsync(context, cancellationToken).ConfigureAwait(false);
-                if (result.IsSuccess && _additionalAsync != null)
-                    result = await _additionalAsync(context, cancellationToken).ConfigureAwait(false);
-
-                context.SetFailureResult(result);
-                return context;
-            }, cancellationToken);
-        }
-
-        /// <summary>
-        /// Validate the entity value (post all configured property rules) enabling additional validation logic to be added by the inheriting classes.
-        /// </summary>
-        /// <param name="context">The <see cref="ValidationContext{TEntity}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        /// <remarks>The <paramref name="context"/> (see <see cref="ValidationContext{TEntity}"/> 'AddError' and related methods should be used for specific validation messages. Any <see cref="Result.IsFailure"/> <see cref="Result"/> will
-        /// override any existing validations and no further validations will occur.</remarks>
-        protected virtual Task<Result> OnValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken) => Task.FromResult(Result.Success);
-
-        /// <summary>
-        /// Adds a <see cref="PropertyRule{TEntity, TProperty}"/> to the validator.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <returns>The <see cref="PropertyRule{TEntity, TProperty}"/>.</returns>
-        public override IPropertyRule<TEntity, TProperty> Property<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression)
-        {
-            // Depending on the the state update either the ruleset rules or the underlying rules.
-            if (_currentRuleSet == null)
-                return base.Property(propertyExpression);
-
-            return _currentRuleSet.Property(propertyExpression);
-        }
-
-        /// <summary>
-        /// Adds the <see cref="PropertyRule{TEntity, TProperty}"/> to the validator enabling additional configuration via the specified <paramref name="property"/> action.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <param name="property">The action to act on the created <see cref="PropertyRule{TEntity, TProperty}"/>.</param>
-        /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
-        public Validator<TEntity> HasProperty<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, Action<IPropertyRule<TEntity, TProperty>>? property = null)
-        {
-            var p = Property(propertyExpression);
-            property?.Invoke(p);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="PropertyRule{TEntity, TProperty}"/> to the validator enabling additional configuration via the specified <paramref name="property"/> action.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <param name="property">The action to act on the created <see cref="PropertyRule{TEntity, TProperty}"/>.</param>
-        /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
-        /// <remarks>This is a synonym for <see cref="HasProperty{TProperty}(Expression{Func{TEntity, TProperty}}, Action{IPropertyRule{TEntity, TProperty}}?)"/>.</remarks>
-        public Validator<TEntity> HasRuleFor<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, Action<IPropertyRule<TEntity, TProperty>>? property = null) => HasProperty(propertyExpression, property);
-
-        /// <summary>
-        /// Adds a <see cref="IncludeBaseRule{TEntity, TInclude}"/> to the validator to enable a same typed validator to be included within the validator rule set.
-        /// </summary>
-        /// <param name="include">The <see cref="IValidatorEx{TInclude}"/> to include (add).</param>
-        /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
-        public Validator<TEntity> Include(IValidatorEx<TEntity> include)
-        {
-            include.ThrowIfNull(nameof(include));
-
-            if (_currentRuleSet == null)
-                Rules.Add(new IncludeBaseRule<TEntity, TEntity>(include));
-            else
-                _currentRuleSet.Rules.Add(new IncludeBaseRule<TEntity, TEntity>(include));
-
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="IncludeBaseRule{TEntity, TInclude}"/> to the validator to enable a base validator to be included within the validator rule set.
-        /// </summary>
-        /// <typeparam name="TInclude">The include <see cref="Type"/> in which <typeparamref name="TEntity"/> inherits from.</typeparam>
-        /// <param name="include">The <see cref="IValidatorEx{TInclude}"/> to include (add).</param>
-        /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
-        public Validator<TEntity> IncludeBase<TInclude>(IValidatorEx<TInclude> include) where TInclude : class
-        {
-            include.ThrowIfNull(nameof(include));
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationContext{T}"/>.</returns>
+    public Task<IValidationContext<TEntity>> ValidateAsync(TEntity value, CancellationToken cancellationToken)
+        => ValidateAsync(value, null, cancellationToken);
 
-            if (!typeof(TEntity).GetTypeInfo().IsSubclassOf(typeof(TInclude)))
-                throw new ArgumentException($"Type {typeof(TEntity).Name} must inherit from {typeof(TInclude).Name}.", nameof(include));
+    /// <inheritdoc/>
+    public async sealed override Task ValidateAndThrowAsync(TEntity value, ValidationArgs? args = null, CancellationToken cancellationToken = default)
+        => (await ValidateAsync(value, args, cancellationToken).ConfigureAwait(false)).ThrowOnError();
 
-            if (_currentRuleSet == null)
-                Rules.Add(new IncludeBaseRule<TEntity, TInclude>(include));
-            else
-                _currentRuleSet.Rules.Add(new IncludeBaseRule<TEntity, TInclude>(include));
+    /// <summary>
+    /// Validate the value and automatically throw a <see cref="ValidationException"/> where <see cref="IValidationResult.HasErrors"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public Task ValidateAndThrowAsync(TEntity value,  CancellationToken cancellationToken)
+        => ValidateAndThrowAsync(value, null, cancellationToken);
 
-            return this;
-        }
+    /// <inheritdoc/>
+    internal override Task ValidateAsync(IValidationContext<TEntity> context, CancellationToken cancellationToken)
+        => ValidateInternalAsync((ValidationContext<TEntity>)context, cancellationToken);
 
-        /// <summary>
-        /// Validate the entity value (post all configured property rules) enabling additional validation logic to be added.
-        /// </summary>
-        /// <param name="additionalAsync">The asynchronous function to invoke.</param>
-        /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
-        public Validator<TEntity> AdditionalAsync(Func<ValidationContext<TEntity>, CancellationToken, Task<Result>> additionalAsync)
+    /// <summary>
+    /// Orchestrates the validation of the entity value
+    /// </summary>
+    private async Task ValidateInternalAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken)
+    {
+        if (context.Value is null)
         {
-            if (_additionalAsync != null)
-                throw new InvalidOperationException("Additional can only be defined once for a Validator.");
-
-            _additionalAsync = additionalAsync.ThrowIfNull(nameof(additionalAsync));
-            return this;
+            context.AddError(Validation.MandatoryFormat, Validation.ValueText);
+            return;
         }
 
-        /// <summary>
-        /// Adds a <see cref="RuleSet(Predicate{ValidationContext{TEntity}}, Action)"/> that is conditionally invoked where the <paramref name="predicate"/> is true.
-        /// </summary>
-        /// <param name="predicate">The predicate.</param>
-        /// <param name="action">The action to invoke where the <see cref="Property"/> method will update the corresponding <see cref="RuleSet(Predicate{ValidationContext{TEntity}}, Action)"/> <see cref="ValidatorBase{TEntity}.Rules">rules</see>.</param>
-        /// <returns>The <see cref="RuleSet{TEntity}"/>.</returns>
-        public RuleSet<TEntity> RuleSet(Predicate<ValidationContext<TEntity>> predicate, Action action)
+        foreach (var rule in Rules)
         {
-            predicate.ThrowIfNull(nameof(predicate));
-            action.ThrowIfNull(nameof(action));
-
-            return SetRuleSet(new RuleSet<TEntity>(predicate), (v) => action());
+            await rule.ValidateAsync(context, cancellationToken).ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Adds a <see cref="RuleSet(Predicate{ValidationContext{TEntity}}, Action)"/> that is conditionally invoked where the <paramref name="predicate"/> is true.
-        /// </summary>
-        /// <param name="predicate">The predicate.</param>
-        /// <param name="action">The action to invoke where the passed <see cref="Validator{TEntity}"/> enables the <see cref="RuleSet(Predicate{ValidationContext{TEntity}}, Action)"/> <see cref="ValidatorBase{TEntity}.Rules">rules</see> to be updated.</param>
-        /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
-        public Validator<TEntity> HasRuleSet(Predicate<ValidationContext<TEntity>> predicate, Action<Validator<TEntity>> action)
-        {
-            predicate.ThrowIfNull(nameof(predicate));
-            action.ThrowIfNull(nameof(action));
-
-            SetRuleSet(new RuleSet<TEntity>(predicate), action);
-            return this;
-        }
+        await OnValidateAsync(context, cancellationToken).ConfigureAwait(false);
 
-        /// <summary>
-        /// Sets the rule set and invokes the action.
-        /// </summary>
-        private RuleSet<TEntity> SetRuleSet(RuleSet<TEntity> ruleSet, Action<Validator<TEntity>> action)
+        if (_additionalAsync is not null)
         {
-            if (_currentRuleSet != null)
-                throw new InvalidOperationException("RuleSets only support a single level of nesting.");
-
-            // Invoke the action that will add the entries to the ruleset not the underlying rules.
-            if (action != null)
+            foreach (var item in _additionalAsync)
             {
-                _currentRuleSet = ruleSet;
-                action(this);
-                _currentRuleSet = null;
+                await item(context, cancellationToken).ConfigureAwait(false);
             }
-
-            // Add the ruleset to the rules.
-            Rules.Add(ruleSet);
-            return ruleSet;
         }
+    }
 
-        /// <summary>
-        /// Throws a <see cref="ValidationException"/> where the <see cref="MessageItem"/> <see cref="MessageItem.Property"/> is set based on the <paramref name="propertyExpression"/>.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <param name="text">The message text.</param>
-        public void ThrowValidationException<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText text)
-        {
-            var p = PropertyExpression.Create(propertyExpression);
-            throw new ValidationException(MessageItem.CreateErrorMessage(ValidationArgs.DefaultUseJsonNames ? p.JsonName : p.Name, text));
-        }
+    /// <summary>
+    /// Validate the entity value (post all configured <see cref="ValidatorBase{TEntity, TSelf}"/> chained rules) enabling multiple additional validation functions to be added.
+    /// </summary>
+    /// <param name="additionalAsync">The additional validation function.</param>
+    /// <returns>The <see cref="Validator{TEntity}"/>.</returns>
+    public Validator<TEntity> AdditionalAsync(Func<ValidationContext<TEntity>, CancellationToken, Task> additionalAsync)
+    {
+        (_additionalAsync ??= []).Add(additionalAsync.ThrowIfNull());
+        return this;
+    }
 
-        /// <summary>
-        /// Throws a <see cref="ValidationException"/> where the <see cref="MessageItem"/> <see cref="MessageItem.Property"/> is set based on the <paramref name="propertyExpression"/>. The property
-        /// friendly text and <paramref name="propertyValue"/> are automatically passed as the first two arguments to the string formatter.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="propertyValue">The property values (to be used as part of the format).</param>
-        /// <param name="values"></param>
-        public void ThrowValidationException<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, LText format, TProperty propertyValue, params object[] values)
-        {
-            var p = PropertyExpression.Create(propertyExpression);
-            throw new ValidationException(MessageItem.CreateErrorMessage(ValidationArgs.DefaultUseJsonNames ? p.JsonName : p.Name,
-                string.Format(System.Globalization.CultureInfo.CurrentCulture, format, [p.Text, propertyValue!, .. values])));
-        }
+    /// <summary>
+    /// Validates the entity (post all configured <see cref="ValidatorBase{TEntity, TSelf}"/> chained rules) enabling additional validation logic to be added by the inheriting class.
+    /// </summary>
+    /// <param name="context">The <see cref="ValidationContext{TEntity}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected virtual Task OnValidateAsync(ValidationContext<TEntity> context, CancellationToken cancellationToken) => Task.CompletedTask;
+
+    /// <summary>
+    /// Validate the value with optional <see cref="ValidationArgs"/> with a corresponding <see cref="Result{T}"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="args">An optional <see cref="ValidationArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The <see cref="Result{T}"/>.</remarks>
+    public async Task<Result<TEntity>> ValidateWithResultAsync(TEntity value, ValidationArgs? args = null, CancellationToken cancellationToken = default)
+    {
+        var vc = await ValidateAsync(value, args, cancellationToken).ConfigureAwait(false);
+        return vc.HasErrors ? vc.ToResult() : value;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValidatorT2.cs b/src/CoreEx.Validation/ValidatorT2.cs
new file mode 100644
index 00000000..d3d6c271
--- /dev/null
+++ b/src/CoreEx.Validation/ValidatorT2.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides entity validation with a <see cref="Default"/> singleton instance.
+/// </summary>
+/// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The self <see cref="Type"/>.</typeparam>
+public abstract class Validator<TEntity, TSelf> : Validator<TEntity> where TEntity : class where TSelf : Validator<TEntity, TSelf>, new()
+{
+    /// <summary>
+    /// Gets the default singleton instance.
+    /// </summary>
+    public static TSelf Default { get; } = new TSelf();
+}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValueValidationConfiguration.cs b/src/CoreEx.Validation/ValueValidationConfiguration.cs
deleted file mode 100644
index 6bbb7f3c..00000000
--- a/src/CoreEx.Validation/ValueValidationConfiguration.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables the ability to configure the <see cref="ValueValidator{T}"/>.
-    /// </summary>
-    public class ValueValidatorConfiguration<T> : PropertyRuleBase<ValidationValue<T>, T>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValueValidatorConfiguration{T}"/> class.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as <see cref="Text.SentenceCase.ToSentenceCase(string)"/>).</param>
-        /// <param name="jsonName">The JSON property name (defaults to <paramref name="name"/>).</param>
-        internal ValueValidatorConfiguration(string name, LText? text = null, string? jsonName = null) : base(name, text, jsonName) { }
-
-        /// <summary>
-        /// Performs the underlying validation.
-        /// </summary>
-        /// <param name="validationValue">The <see cref="ValidationValue{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ValueValidatorResult{TEntity, TProperty}"/>.</returns>
-        internal async Task<ValueValidatorResult<ValidationValue<T>, T>> ValidateAsync(ValidationValue<T> validationValue, CancellationToken cancellationToken)
-        {
-            var ctx = new PropertyContext<ValidationValue<T>, T>(new ValidationContext<ValidationValue<T>>(validationValue, new ValidationArgs()), validationValue.Value, Name, JsonName, Text);
-            await InvokeAsync(ctx, cancellationToken).ConfigureAwait(false);
-            return new ValueValidatorResult<ValidationValue<T>, T>(ctx);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValueValidator.cs b/src/CoreEx.Validation/ValueValidator.cs
deleted file mode 100644
index 1176b1ee..00000000
--- a/src/CoreEx.Validation/ValueValidator.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables validation for a value.
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    public class ValueValidator<T>
-    {
-        private readonly ValueValidatorConfiguration<T> _configuration;
-        private readonly ValidationValue<T> _validationValue;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValueValidator{T}"/> class.
-        /// </summary>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        internal ValueValidator(T? value, string? name = null, LText? text = null)
-        {
-            _configuration = new ValueValidatorConfiguration<T>(string.IsNullOrEmpty(name) ? Validation.ValueNameDefault : name, text);
-            _validationValue = new ValidationValue<T>(null, value);
-        }
-
-        /// <summary>
-        /// Gets the initiating value being validated.
-        /// </summary>
-        public T? Value { get => _validationValue.Value; }
-
-        /// <summary>
-        /// Enables the validator underlying to be further configured.
-        /// </summary>
-        /// <param name="validator">The <see cref="ValueValidatorConfiguration{T}"/>.</param>
-        /// <returns>The <see cref="ValueValidator{T}"/> instance to support fluent-style method-chaining.</returns>
-        public ValueValidator<T> Configure(Action<ValueValidatorConfiguration<T>>? validator)
-        {
-            validator?.Invoke(_configuration);
-            return this;
-        }
-
-        /// <summary>
-        /// Validates the <see cref="Value"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ValueValidatorResult{TEntity, TProperty}"/>.</returns>
-        public Task<ValueValidatorResult<ValidationValue<T>, T>> ValidateAsync(CancellationToken cancellationToken = default)
-            => ValidationInvoker.Current.InvokeAsync(this, (_, cancellationToken) => _configuration.ValidateAsync(_validationValue, cancellationToken), cancellationToken);
-
-        /// <summary>
-        /// Validates the <see cref="Value"/>.
-        /// </summary>
-        /// <param name="throwOnError">Indicates whether to automatically throw a <see cref="ValidationException"/> where <see cref="IValidationResult.HasErrors"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ValueValidatorResult{TEntity, TProperty}"/>.</returns>
-        public async Task<ValueValidatorResult<ValidationValue<T>, T>> ValidateAsync(bool throwOnError, CancellationToken cancellationToken = default)
-        {
-            var vr = await ValidateAsync(cancellationToken).ConfigureAwait(false);
-            return throwOnError ? vr.ThrowOnError() : vr;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/ValueValidatorResult.cs b/src/CoreEx.Validation/ValueValidatorResult.cs
deleted file mode 100644
index 750ae869..00000000
--- a/src/CoreEx.Validation/ValueValidatorResult.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Enables the result of a <see cref="ValueValidator{T}"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    public interface IValueValidatorResult<TEntity, out TProperty> : IValidationResult<TProperty> where TEntity : class { }
-
-    /// <summary>
-    /// Represents the result of a <see cref="ValueValidator{T}"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <param name="context">The <see cref="PropertyContext{TEntity, TProperty}"/>.</param>
-    public sealed class ValueValidatorResult<TEntity, TProperty>(PropertyContext<TEntity, TProperty> context) : IValueValidatorResult<TEntity, TProperty> where TEntity : class
-    {
-        private readonly PropertyContext<TEntity, TProperty> _context = context.ThrowIfNull(nameof(context));
-
-        /// <inheritdoc/>
-        public TProperty? Value => _context.Value;
-
-        /// <inheritdoc/>
-        public bool HasErrors => _context.Parent.FailureResult is not null || _context.HasError; 
-
-        /// <inheritdoc/>
-        public MessageItemCollection? Messages => _context.Parent.Messages;
-
-        /// <inheritdoc/>
-        public Exception? ToException() => _context.Parent.ToException();
-
-        /// <inheritdoc/>
-        IValidationResult IValidationResult.ThrowOnError() => ThrowOnError();
-
-        /// <inheritdoc/>
-        public Result? FailureResult => _context.Parent.FailureResult;
-
-        /// <inheritdoc/>
-        public Result<R> ToResult<R>() => FailureResult.HasValue ? FailureResult.Value.Bind<R>() : (HasErrors ? Result<R>.ValidationError(Messages!) : Validation.ConvertValueToResult<TProperty, R>(Value!));
-
-        /// <inheritdoc/>
-        public Result ToResult() => FailureResult ?? (HasErrors ? Result.ValidationError(Messages!) : Result.Success);
-
-        /// <summary>
-        /// Throws a <see cref="ValidationException"/> where an error was found (and optionally if warnings).
-        /// </summary>
-        /// <param name="includeWarnings">Indicates whether to throw where only warnings exist.</param>
-        /// <returns>The <see cref="ValidationContext{TEntity}"/> to support fluent-style method-chaining.</returns>
-        public ValueValidatorResult<TEntity, TProperty> ThrowOnError(bool includeWarnings = false)
-        {
-            _context.Parent.ThrowOnError(includeWarnings);
-            return this;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx.Validation/strong-name-key.snk b/src/CoreEx.Validation/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx.Validation/strong-name-key.snk and /dev/null differ
diff --git a/src/CoreEx/AGENTS.md b/src/CoreEx/AGENTS.md
new file mode 100644
index 00000000..9728fca7
--- /dev/null
+++ b/src/CoreEx/AGENTS.md
@@ -0,0 +1,125 @@
+# CoreEx — AI Usage Guide
+
+`CoreEx` is the shared kernel of the CoreEx framework. All other CoreEx packages depend on it.
+
+## Semantic Exceptions
+
+Throw the most specific exception; the framework maps each to its HTTP status automatically.
+
+```csharp
+// 400 — field-level validation errors
+throw new ValidationException(new MessageItemCollection { new("sku", "Sku is required.") });
+
+// 404 — resource not found
+throw new NotFoundException();
+
+// 400 — business rule violation safe to surface to the caller
+throw new BusinessException("Basket is already checked out.");
+
+// 412 — optimistic concurrency conflict
+throw new ConcurrencyException();
+
+// 409 — duplicate record
+throw new DuplicateException();
+```
+
+## ExecutionContext
+
+`ExecutionContext` is `AsyncLocal`-scoped and carries user identity, tenant ID, timestamp, and operation type for the lifetime of a request. Access it via DI injection, or use the static accessors when outside the DI graph.
+
+```csharp
+// Preferred — inject via DI (scoped per request)
+public class MyService(ExecutionContext context) { }
+
+// Static access — returns the ambient instance for the current async context
+var ctx = ExecutionContext.Current;          // throws if none set
+var ctx = ExecutionContext.TryGetCurrent();  // returns null if none set
+```
+
+## Result / Result\<T\>
+
+Use `Result<T>` for expected business-error paths instead of throwing exceptions. Compose pipelines with `Then`, `ThenAs`, `GoAsync`, `ThenAsAsync`.
+
+```csharp
+public async Task<Result<Order>> GetOrderAsync(Guid id)
+{
+    var order = await _repo.GetAsync(id).ConfigureAwait(false);
+    return order is null ? Result.NotFoundError() : Result.Ok(order);
+}
+
+// Pipeline composition
+return await GetOrderAsync(id)
+    .ThenAsAsync(order => _validator.ValidateAndThrowAsync(order))
+    .ConfigureAwait(false);
+```
+
+## Entity Contracts
+
+Use the standard interfaces on your contracts so the framework's ETag, paging, and change-log handling works automatically.
+
+For entities authored in a project that references `CoreEx.CodeGen`, prefer the Roslyn source generator — declare a `partial` class with `[Contract]` and the generator emits the boilerplate (constructors, `CopyFrom`, `Clone`, equality, `CleanUp`, etc.).
+
+```csharp
+// Source-generated contract — preferred when CoreEx.CodeGen is referenced
+[Contract]
+public partial class Product : IIdentifier<Guid>, IETag, IChangeLog
+{
+    public Guid Id { get; set; }
+    public string? ETag { get; set; }
+    public ChangeLog? ChangeLog { get; set; }
+    public string? Name { get; set; }
+}
+
+// Reference-data contract — generator emits the full ReferenceData shape
+[ReferenceData]
+public partial class Status { }
+```
+
+When `CoreEx.CodeGen` is not available, implement the interfaces directly:
+
+```csharp
+public class Product : IIdentifier<Guid>, IETag, IChangeLog
+{
+    public Guid Id { get; set; }
+    public string? ETag { get; set; }
+    public ChangeLog? ChangeLog { get; set; }
+}
+```
+
+Server-managed fields (e.g. `ETag`, `ChangeLog`) should be marked `[ReadOnly(true)]` on generated contracts so they are excluded from inbound deserialization.
+
+## Dependency Injection Attributes
+
+Mark implementation classes with `[ScopedService]`, `[SingletonService]`, or `[TransientService]` and register them all at once via `AddDynamicServicesUsing<T>()`.
+
+```csharp
+[ScopedService<IProductService>]
+public class ProductService : IProductService { }
+
+// Program.cs
+builder.Services.AddDynamicServicesUsing<ProductService>();
+```
+
+## PrecisionTimeProvider
+
+Register in `Program.cs` to ensure timestamps are truncated to database-compatible precision.
+
+```csharp
+builder.Services.AddPrecisionTimeProvider();
+```
+
+## Do Not
+
+- Do not catch `IExtendedException` types to re-wrap them — let the framework middleware translate them.
+- Do not use `AutoMapper` — use explicit `Mapper<TSource, TDest>` or `BiDirectionMapper<TFrom, TTo>`.
+- Do not use `DateTime.UtcNow` directly — use `Runtime.UtcNow`, which returns `ExecutionContext.Timestamp` when a context is active and falls back to `TimeProvider.System.GetUtcNow()` otherwise.
+
+## Further Reading
+
+- [README](./README.md) — full API surface and namespace index.
+- [CoreEx.AspNetCore](../CoreEx.AspNetCore/README.md) — HTTP translation of these exceptions and Result types.
+- [CoreEx.Validation](../CoreEx.Validation/README.md) — ValidationException production.
+- [Contracts layer](../../samples/docs/contracts-layer.md) — how entity contracts, `[Contract]`, `[ReferenceData]`, and standard interfaces are used in practice.
+- [Application layer](../../samples/docs/application-layer.md) — real-world usage of `Result<T>`, semantic exceptions, and `ExecutionContext` in application services.
+- [Patterns](../../samples/docs/patterns.md) — pattern catalogue covering error handling, railway-oriented flows, and cross-cutting concerns.
+- [Layers overview](../../samples/docs/layers.md) — full layer dependency diagram and design-time tooling overview.
diff --git a/src/CoreEx/Abstractions/ETagGenerator.cs b/src/CoreEx/Abstractions/ETagGenerator.cs
deleted file mode 100644
index a112bf63..00000000
--- a/src/CoreEx/Abstractions/ETagGenerator.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Json;
-using System;
-using System.Security.Cryptography;
-
-namespace CoreEx.Abstractions
-{
-    /// <summary>
-    /// Provides <see cref="IETag.ETag"/> generator capabilities.
-    /// </summary>
-    public static class ETagGenerator
-    {
-        /// <summary>
-        /// Generates an ETag for a value by serializing to JSON and performing an <see cref="SHA256"/> hash.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <returns>The generated ETag.</returns>
-        public static string? Generate<T>(IJsonSerializer jsonSerializer, T? value)
-        {
-            jsonSerializer.ThrowIfNull(nameof(jsonSerializer));
-            if (value == null)
-                return null;
-
-            // Serialize to JSON and then hash.
-            byte[] hash;
-            var bd = jsonSerializer.SerializeToBinaryData(value);
-#if NETSTANDARD2_1
-            using var sha256 = SHA256.Create();
-            hash = sha256.ComputeHash(bd.ToArray());
-#else
-            hash = SHA256.HashData(bd);
-#endif
-            return Convert.ToBase64String(hash);
-        }
-
-        /// <summary>
-        /// Generates a hash of the parts using <see cref="SHA256"/>.
-        /// </summary>
-        /// <param name="parts">The parts to hash.</param>
-        /// <returns>The hashed value.</returns>
-        public static string? GenerateHash(params string[] parts)
-        {
-            if (parts == null || parts.Length == 0)
-                return null;
-
-            byte[] hash;
-#if NETSTANDARD2_1
-            var input = parts.Length == 1 ? parts[0] : string.Concat(parts);
-            using var sha256 = SHA256.Create();
-            hash = sha256.ComputeHash(new BinaryData(input).ToArray());
-#else
-            if (parts.Length == 1)
-                hash = SHA256.HashData(new BinaryData(parts[0]));
-            else
-            {
-                using var ih = IncrementalHash.CreateHash(HashAlgorithmName.SHA256);
-                foreach (var part in parts)
-                {
-                    ih.AppendData(new BinaryData(part));
-                }
-
-                hash = ih.GetCurrentHash();
-            }
-
-#endif
-            return Convert.ToBase64String(hash);
-        }
-
-        /// <summary>
-        /// Formats a <paramref name="value"/> as an <see cref="IETag.ETag"/> by bookending with the requisite double quotes character; for example '<c>abc</c>' would be formatted as '<c>"abc"</c>'.
-        /// </summary>
-        /// <param name="value">The value to format.</param>
-        /// <returns>The formatted <see cref="IETag.ETag"/>.</returns>
-        public static string? FormatETag(string? value)
-        { 
-            if (value is null)
-                return null;
-
-            if (value.StartsWith('\"') && value.EndsWith('\"'))
-                return value;
-
-            if (value.StartsWith("W/\"") && value.EndsWith('\"'))
-                return value[2..];
-            
-            return $"\"{value}\"";
-        }
-
-        /// <summary>
-        /// Parses an <see cref="IETag.ETag"/> by removing any weak prefix ('<c>W/</c>') double quotes character bookends; for example '<c>"abc"</c>' would be formatted as '<c>abc</c>'.
-        /// </summary>
-        /// <param name="etag">The <see cref="IETag.ETag"/> to unformat.</param>
-        /// <returns>The unformatted value.</returns>
-        public static string? ParseETag(string? etag)
-        {
-            if (string.IsNullOrEmpty(etag))
-                return null;
-
-            if (etag.StartsWith('\"') && etag.EndsWith('\"'))
-                return etag[1..^1];
-
-            if (etag.StartsWith("W/\"") && etag.EndsWith('\"'))
-                return etag[2..^1];
-
-            return etag;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/ErrorType.cs b/src/CoreEx/Abstractions/ErrorType.cs
deleted file mode 100644
index ab45f392..00000000
--- a/src/CoreEx/Abstractions/ErrorType.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Abstractions
-{
-    /// <summary>
-    /// Represents an error type.
-    /// </summary>
-    public enum ErrorType
-    {
-        /// <summary>
-        /// Indicates a Validation error.
-        /// </summary>
-        ValidationError = 1,
-
-        /// <summary>
-        /// Indicates a Business error.
-        /// </summary>
-        BusinessError = 2,
-
-        /// <summary>
-        /// Indicates an Authorization error.
-        /// </summary>
-        AuthorizationError = 3,
-
-        /// <summary>
-        /// Indicates a Concurrency error.
-        /// </summary>
-        ConcurrencyError = 4,
-
-        /// <summary>
-        /// Indicates a Not Found error.
-        /// </summary>
-        NotFoundError = 5,
-
-        /// <summary>
-        /// Indicates a Conflict error.
-        /// </summary>
-        ConflictError = 6,
-
-        /// <summary>
-        /// Indicates a Duplicate error.
-        /// </summary>
-        DuplicateError = 7,
-
-        /// <summary>
-        /// Indicates an Authentication error.
-        /// </summary>
-        AuthenticationError = 8,
-
-        /// <summary>
-        /// Indicates a Transient error.
-        /// </summary>
-        TransientError = 9,
-
-        /// <summary>
-        /// Indicates a Data Consistency error.
-        /// </summary>
-        DataConsistencyError = 10,
-
-        /// <summary>
-        /// Indicates an unknown/unhandled error.
-        /// </summary>
-        UnhandledError = 88
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/ExtendedException.cs b/src/CoreEx/Abstractions/ExtendedException.cs
new file mode 100644
index 00000000..17903dfa
--- /dev/null
+++ b/src/CoreEx/Abstractions/ExtendedException.cs
@@ -0,0 +1,109 @@
+namespace CoreEx.Abstractions;
+
+/// <summary>
+/// Provides the base <see cref="IExtendedException"/> implementation.
+/// </summary>
+public abstract class ExtendedException: Exception, IExtendedException
+{
+    private readonly Lazy<Dictionary<string, object?>> _extensions = new(() => []);
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExtendedException{TSelf}"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="innerException">The inner <see cref="Exception"/>.</param>
+    /// <param name="exceptionType">The <see cref="Exception"/> <see cref="Type"/>.</param>
+    /// <param name="defaultLoggingEnablement">The default logging enablement where no corresponding configuration setting is found.</param>
+    public ExtendedException(LText? message, Exception? innerException, Type? exceptionType = null, bool defaultLoggingEnablement = false) : base(message, innerException)
+    {
+        ShouldBeLogged = Internal.GetConfigurationValueWithFallback<bool>($"CoreEx:Exceptions:{(exceptionType ?? GetType()).Name}:LoggingEnabled", "CoreEx:Exceptions:LoggingEnabled", defaultLoggingEnablement);
+        OnInitialize();
+    }
+
+    /// <summary>
+    /// Provides the opportunity to perform specific initialization.
+    /// </summary>
+    protected abstract void OnInitialize();
+
+    /// <inheritdoc/>
+    public string? Detail { get; set; }
+
+    /// <inheritdoc/>
+    public string? ErrorType { get; set; }
+
+    /// <inheritdoc/>
+    public string? ErrorCode { get; set; }
+
+    /// <inheritdoc/>
+    public HttpStatusCode StatusCode { get; set; } = HttpStatusCode.InternalServerError;
+
+    /// <inheritdoc/>
+    public bool IsError { get; set; } = true;
+
+    /// <inheritdoc/>
+    public bool IsTransient { get; set; }
+
+    /// <inheritdoc/>
+    public TimeSpan? RetryAfter { get; set; }
+
+    /// <inheritdoc/>
+    public bool ShouldBeLogged { get; set; }
+
+    /// <inheritdoc/>
+    public IDictionary<string, object?> Extensions => _extensions.Value;
+
+    /// <inheritdoc/>
+    public bool HasExtensions => _extensions.IsValueCreated && _extensions.Value.Count > 0;
+
+    /// <inheritdoc/>
+    public Result ToResult() => new(this);
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        var sb = new StringBuilder(base.ToString());
+        sb.AppendLine();
+        sb.Append($"-> ErrorType: {ErrorType}");
+        if (ErrorCode is not null)
+            sb.Append($", ErrorCode: {ErrorCode}");
+
+        if (Detail is not null)
+            sb.Append($", Detail: {Detail}");
+
+        if (HasExtensions)
+        {
+            foreach (var kvp in Extensions)
+                sb.Append($", {kvp.Key}: {kvp.Value}");
+        }
+
+        return sb.ToString();
+    }
+
+    /// <summary>
+    /// Converts an <paramref name="exception"/> into an <see cref="IResult"/> where <typeparamref name="TResult"/> is an <see cref="IResult"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="Exception"/>.</param>
+    /// <param name="result">The resulting <typeparamref name="TResult"/> <see cref="IResult.IsFailure"/> value.</param>
+    /// <param name="forceAnyException">Indicates whether to force conversion for any exception, not just those implementing <see cref="IExtendedException"/> and considered <see cref="IExtendedException.IsError"/>.</param>
+    /// <returns><see langword="true"/> where the conversion was successful; otherwise, <see langword="false"/>.</returns>
+    public static bool TryConvertExceptionToResult<TResult>(Exception exception, [NotNullWhen(true)] out TResult? result, bool forceAnyException = false)
+    {
+        exception.ThrowIfNull();
+
+        // Where the result is an IResult (ROP) and the exception is considered an error then return as an IResult _failure_; unless being forced for any exception.
+        if (forceAnyException || (exception is IExtendedException eex && eex.IsError))
+        {
+            var dresult = default(TResult);
+            if (dresult is IResult dir)
+            {
+                result = (TResult)dir.ToFailure(exception);
+                return true;
+            }
+        }
+
+        // No conversion possible.
+        result = default;
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/ExtendedExceptionT.cs b/src/CoreEx/Abstractions/ExtendedExceptionT.cs
new file mode 100644
index 00000000..ff04ece5
--- /dev/null
+++ b/src/CoreEx/Abstractions/ExtendedExceptionT.cs
@@ -0,0 +1,21 @@
+namespace CoreEx.Abstractions;
+
+/// <summary>
+/// Provides the base <see cref="IExtendedException"/> implementation.
+/// </summary>
+/// <typeparam name="TSelf">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/> itself.</typeparam>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+/// <param name="defaultLoggingEnablement">The default logging enablement where no corresponding configuration setting is found.</param>
+public abstract class ExtendedException<TSelf>(LText? message, Exception? innerException, bool defaultLoggingEnablement = false)
+    : ExtendedException(message, innerException, typeof(TSelf), defaultLoggingEnablement) where TSelf : ExtendedException<TSelf>
+{
+    /// <summary>
+    /// Gets the configured <see cref="HttpStatusCode"/> for the exception type.
+    /// </summary>
+    /// <param name="default">The default where not configured.</param>
+    /// <param name="configuration">The optional <see cref="IConfiguration"/>; otherwise, defaults from <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <see cref="HttpStatusCode"/>.</returns>
+    protected HttpStatusCode GetConfiguredStatusCode(HttpStatusCode @default, IConfiguration? configuration = null)
+        => Internal.GetConfigurationValue<HttpStatusCode>($"CoreEx:Exception:{typeof(TSelf).Name}:StatusCode", @default, configuration);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/IEnumerableExtensions.cs b/src/CoreEx/Abstractions/IEnumerableExtensions.cs
deleted file mode 100644
index 4cfd1897..00000000
--- a/src/CoreEx/Abstractions/IEnumerableExtensions.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Wildcards;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq.Expressions;
-using System.Threading.Tasks;
-
-namespace System.Linq
-{
-    /// <summary>
-    /// Provides additional <see cref="IEnumerable{T}"/> extension methods.
-    /// </summary>
-    [DebuggerStepThrough]
-    public static class IEnumerableExtensions
-    {
-        /// <summary>
-        /// Performs the specified <paramref name="action"/> on each element in the sequence.
-        /// </summary>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="sequence">The sequence to iterate.</param>
-        /// <param name="action">The action to perform on each element.</param>
-        /// <returns>The sequence.</returns>
-        public static IEnumerable<TItem> ForEach<TItem>(this IEnumerable<TItem> sequence, Action<TItem> action)
-        {
-            if (sequence == null)
-                return sequence!;
-
-            action.ThrowIfNull(nameof(action));
-
-            foreach (TItem element in sequence.ThrowIfNull(nameof(sequence)))
-            {
-                action(element);
-            }
-
-            return sequence;
-        }
-
-        /// <summary>
-        /// Performs the specified <paramref name="action"/> on each element in the sequence asynchronously.
-        /// </summary>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="sequence">The sequence to iterate.</param>
-        /// <param name="action">The action to perform on each element.</param>
-        /// <returns>The sequence.</returns>
-        public static async Task<IEnumerable<TItem>> ForEachAsync<TItem>(this IEnumerable<TItem> sequence, Func<TItem, Task> action)
-        {
-            if (sequence == null)
-                return sequence!;
-
-            action.ThrowIfNull(nameof(action));
-
-            foreach (TItem element in sequence.ThrowIfNull(nameof(sequence)))
-            {
-                await action(element).ConfigureAwait(false);
-            }
-
-            return sequence;
-        }
-
-        /// <summary>
-        /// Creates a collection from a <see cref="IEnumerable{TItem}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="sequence">The sequence to iterate.</param>
-        /// <returns>A new collection that contains the elements from the input sequence.</returns>
-        public static TColl ToCollection<TColl, TItem>(this IEnumerable<TItem> sequence)
-            where TColl : ICollection<TItem>, new()
-        {
-            var coll = new TColl();
-            ToCollection(sequence, coll);
-            return coll;
-        }
-
-        /// <summary>
-        /// Add to a collection from a <see cref="IEnumerable{TItem}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="sequence">The sequence to iterate.</param>
-        /// <param name="coll">The collection to add the elements from the input sequence.</param>
-        public static void ToCollection<TColl, TItem>(this IEnumerable<TItem> sequence, TColl coll)
-            where TColl : ICollection<TItem>
-        {
-            coll.ThrowIfNull(nameof(coll));
-            sequence.ForEach(coll.Add);
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a <paramref name="predicate"/> only <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="predicate">A function to test each element for a condition.</param>
-        /// <param name="when">Indicates to perform an underlying <see cref="System.Linq.Enumerable.Where{TSource}(IEnumerable{TSource}, Func{TSource, bool})"/> only when <c>true</c>; otherwise, no <i>Where</i> is invoked.</param>
-        /// <returns>An <see cref="IEnumerable{T}"/> that contains elements from the input sequence that satisfy the condition.</returns>
-        public static IEnumerable<TElement> WhereWhen<TElement>(this IEnumerable<TElement> query, Func<TElement, bool> predicate, bool when) => when ? query.Where(predicate): query;
-
-        /// <summary>
-        /// Filters a sequence of values using the specified <paramref name="property"/> and <paramref name="text"/> containing supported wildcards (intended for LINQ to Objects).
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="property">The <see cref="MemberExpression"/>.</param>
-        /// <param name="text">The text to query.</param>
-        /// <param name="ignoreCase">Indicates whether the comparison should ignore case (default) or not.</param>
-        /// <param name="checkForNull">Indicates whether a null check should also be performed before the comparion occurs (defaults to <c>true</c>).</param>
-        /// <param name="wildcard">The <see cref="Wildcard"/> configuration to use; where <c>null</c> it will use <see cref="Wildcard.Default"/>.</param>
-        /// <returns>The resulting (updated) query.</returns>
-        public static IEnumerable<TElement> WhereWildcard<TElement>(this IEnumerable<TElement> query, Func<TElement, string?> property, string? text, bool ignoreCase = true, bool checkForNull = true, Wildcard? wildcard = null)
-            where TElement : class
-        {
-            query.ThrowIfNull(nameof(query));
-            property.ThrowIfNull(nameof(property));
-
-            var wc = wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
-            var wr = wc.Parse(text).ThrowOnError();
-
-            // Exit stage left where nothing to do.
-            if (wr.Selection.HasFlag(WildcardSelection.None))
-                return query;
-
-            // Handle the Equal.
-            var sc = ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
-            if (wr.Selection.HasFlag(WildcardSelection.Equal))
-                return query.Where(x =>
-                {
-                    var v = property.Invoke(x);
-                    return checkForNull ? v != null && v.Equals(text, sc) : v!.Equals(text, sc);
-                });
-
-            // Handle the easy Contains/StartsWith/Endswith.
-            if (!wr.Selection.HasFlag(WildcardSelection.SingleWildcard) && !wr.Selection.HasFlag(WildcardSelection.Embedded))
-            {
-                if (wr.Selection.HasFlag(WildcardSelection.Single))
-                    return query;
-
-                if (wr.Selection.HasFlag(WildcardSelection.Contains))
-                    return query.Where(x =>
-                    {
-                        var v = property.Invoke(x);
-                        return checkForNull ? v != null && v.Contains(wr.GetTextWithoutWildcards()!, sc) : v!.Contains(wr.GetTextWithoutWildcards()!, sc);
-                    });
-                else if (wr.Selection.HasFlag(WildcardSelection.StartsWith))
-                    return query.Where(x =>
-                    {
-                        var v = property.Invoke(x);
-                        return checkForNull ? v != null && v.StartsWith(wr.GetTextWithoutWildcards()!, sc) : v!.StartsWith(wr.GetTextWithoutWildcards()!, sc);
-                    });
-                else if (wr.Selection.HasFlag(WildcardSelection.EndsWith))
-                    return query.Where(x =>
-                    {
-                        var v = property.Invoke(x);
-                        return checkForNull ? v != null && v.EndsWith(wr.GetTextWithoutWildcards()!, sc) : v!.EndsWith(wr.GetTextWithoutWildcards()!, sc);
-                    });
-            }
-
-            // Handle the remainder using a regex.
-            var regex = wr.CreateRegex(ignoreCase);
-            return query.Where(x =>
-            {
-                var v = property.Invoke(x);
-                return v != null && regex.IsMatch(v);
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/IExtendedException.cs b/src/CoreEx/Abstractions/IExtendedException.cs
index 0e79291c..69b0ad30 100644
--- a/src/CoreEx/Abstractions/IExtendedException.cs
+++ b/src/CoreEx/Abstractions/IExtendedException.cs
@@ -1,44 +1,69 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Abstractions;
 
-using System.Net;
-
-namespace CoreEx.Abstractions
+/// <summary>
+/// Enables the extended <see cref="Exception"/> capabilities.
+/// </summary>
+public interface IExtendedException
 {
     /// <summary>
-    /// Enables the extended exception capabilities.
-    /// </summary>
-    public interface IExtendedException
-    {
-        /// <summary>
-        /// Gets the exception message.
-        /// </summary>
-        string Message { get; }
-
-        /// <summary>
-        /// Gets the error type/reason.
-        /// </summary>
-        /// <remarks>See <see cref="Abstractions.ErrorType"/> for standard values.</remarks>
-        string ErrorType { get; }
-
-        /// <summary>
-        /// Gets the error code.
-        /// </summary>
-        /// <remarks>See <see cref="Abstractions.ErrorType"/> for standard values.</remarks>
-        int ErrorCode { get; }
-
-        /// <summary>
-        /// Gets the corresponding <see cref="HttpStatusCode"/>.
-        /// </summary>
-        HttpStatusCode StatusCode { get; }
-
-        /// <summary>
-        /// Indicates whether exception is transient; i.e. is a candidate for a retry.
-        /// </summary>
-        bool IsTransient { get; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="IExtendedException"/> should be logged.
-        /// </summary>
-        bool ShouldBeLogged { get; }
-    }
+    /// Gets the exception message.
+    /// </summary>
+    string Message { get; }
+
+    /// <summary>
+    /// Gets the exception detail.
+    /// </summary>
+    string? Detail { get; }
+
+    /// <summary>
+    /// Gets the error type/category.
+    /// </summary>
+    string? ErrorType { get; }
+
+    /// <summary>
+    /// Gets the error code.
+    /// </summary>
+    string? ErrorCode { get; }
+
+    /// <summary>
+    /// Gets the corresponding <see cref="HttpStatusCode"/>.
+    /// </summary>
+    HttpStatusCode StatusCode { get; }
+
+    /// <summary>
+    /// Indicates whether this exception exception should be treated as a known/supported error; versus, being an unexpected outcome and handled accordingly. 
+    /// </summary>
+    bool IsError { get; }
+
+    /// <summary>
+    /// Indicates whether exception is transient; i.e. is a candidate for a retry.
+    /// </summary>
+    bool IsTransient { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IsTransient"/> retry after interval.
+    /// </summary>
+    TimeSpan? RetryAfter { get; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="IExtendedException"/> should be logged.
+    /// </summary>
+    bool ShouldBeLogged { get; }
+
+    /// <summary>
+    /// Gets an <see cref="IDictionary{TKey, TValue}"/> of extension values.
+    /// </summary>
+    /// <remarks>This enables additional values to be captured against the exception for later use/inspection.</remarks>
+    IDictionary<string, object?> Extensions { get; }
+
+    /// <summary>
+    /// Indicates whether there are any <see cref="Extensions"/>.
+    /// </summary>
+    bool HasExtensions { get; }
+
+    /// <summary>
+    /// Converts the <see cref="IExtendedException"/> to a <see cref="Result"/>.
+    /// </summary>
+    /// <returns>The <see cref="Result"/>.</returns>
+    Result ToResult();
 }
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/IQueryableExtensions.cs b/src/CoreEx/Abstractions/IQueryableExtensions.cs
deleted file mode 100644
index 35b117e8..00000000
--- a/src/CoreEx/Abstractions/IQueryableExtensions.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Entities;
-using CoreEx.Wildcards;
-using System.Collections.Generic;
-using System.Linq.Expressions;
-
-namespace System.Linq
-{
-    /// <summary>
-    /// Adds additional extension methods to the <see cref="IQueryable{T}"/>.
-    /// </summary>
-    public static class IQueryableExtensions
-    {
-        /// <summary>
-        /// Adds paging to the query.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> WithPaging<T>(this IQueryable<T> query, PagingArgs? paging)
-        {
-            if (paging is null)
-                return query.WithPaging(0, null);
-
-            if (paging.Option == PagingOption.TokenAndTake)
-                throw new ArgumentException("PagingArgs.Option must not be PagingOption.TokenAndTake.", nameof(paging));
-
-            return query.WithPaging(paging.Skip!.Value, paging.Take);
-        }
-
-        /// <summary>
-        /// Adds paging to the query using the specified <paramref name="skip"/> and <paramref name="take"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> being queried.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
-        /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
-        /// <returns>The query.</returns>
-        public static IQueryable<T> WithPaging<T>(this IQueryable<T> query, long skip, long? take = null)
-        {
-            var q = query.Skip(skip <= 0 ? 0 : (int)skip);
-            q = q.Take(take == null || take.Value < 1 ? (int)PagingArgs.DefaultTake : (int)take.Value);
-            return q;
-        }
-
-        /// <summary>
-        /// Creates a collection from a <see cref="IQueryable{TItem}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="query">The <see cref="IEnumerable{TItem}"/>.</param>
-        /// <returns>A new collection that contains the elements from the input sequence.</returns>
-        public static TColl ToCollection<TColl, TItem>(this IQueryable<TItem> query)
-            where TColl : ICollection<TItem>, new()
-        {
-            var coll = new TColl();
-            ToCollection(query, coll);
-            return coll;
-        }
-
-        /// <summary>
-        /// Creates a collection from a <see cref="IQueryable{TElement}"/> mapping each element to a corresponding item.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">>The <see cref="IQueryable{TElement}"/>.</param>
-        /// <param name="mapToItem">The mapping function invoked for each element.</param>
-        /// <returns>A new collection that contains the elements from the input sequence.</returns>
-        public static TColl ToCollection<TColl, TItem, TElement>(this IQueryable<TElement> query, Func<TElement, TItem> mapToItem)
-            where TColl : ICollection<TItem>, new()
-        {
-            var coll = new TColl();
-            ToCollection(query, mapToItem, coll);
-            return coll;
-        }
-
-        /// <summary>
-        /// Add to a collection from a <see cref="IQueryable{TItem}"/>.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <param name="query">The <see cref="IQueryable{TItem}"/>.</param>
-        /// <param name="coll">The collection to add the elements from the input sequence.</param>
-        public static void ToCollection<TColl, TItem>(this IQueryable<TItem> query, TColl coll)
-            where TColl : ICollection<TItem>
-        {
-            coll.ThrowIfNull(nameof(coll));
-
-            foreach (var item in query.ThrowIfNull(nameof(query)))
-            {
-                coll.Add(item);
-            }
-        }
-
-        /// <summary>
-        /// Add to a collection from a <see cref="IQueryable{TElement}"/> mapping each element to a corresponding item.
-        /// </summary>
-        /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TItem">The item <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">>The <see cref="IQueryable{TElement}"/>.</param>
-        /// <param name="mapToItem">The mapping function invoked for each element.</param>
-        /// <param name="coll">The collection to add the elements from the input sequence.</param>
-        public static void ToCollection<TColl, TItem, TElement>(this IQueryable<TElement> query, Func<TElement, TItem> mapToItem, TColl coll)
-            where TColl : ICollection<TItem>
-        {
-            mapToItem.ThrowIfNull(nameof(mapToItem));
-            coll.ThrowIfNull(nameof(coll));
-
-            foreach (var element in query.ThrowIfNull(nameof(query)))
-            {
-                coll.Add(mapToItem(element));
-            }
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a <paramref name="predicate"/> only <paramref name="when"/> <c>true</c>.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="when">Indicates to perform an underlying <see cref="Queryable.Where{TElement}(IQueryable{TElement}, Expression{Func{TElement, bool}})"/> only when <c>true</c>;
-        /// otherwise, no <b>Where</b> is invoked.</param>
-        /// <param name="predicate">A function to test each element for a condition.</param>
-        /// <returns>The resulting query.</returns>
-        public static IQueryable<TElement> WhereWhen<TElement>(this IQueryable<TElement> query, bool when, Expression<Func<TElement, bool>> predicate)
-        {
-            query.ThrowIfNull(nameof(query));
-
-            if (when)
-                return query.Where(predicate);
-            else
-                return query;
-        }
-
-        /// <summary>
-        /// Filters a sequence of values based on a <paramref name="predicate"/> only when the <paramref name="with"/> is not the default value for the <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The with value <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="with">Indicates to perform an underlying <see cref="Queryable.Where{TElement}(IQueryable{TElement}, Expression{Func{TElement, bool}})"/> only when the with is not the default
-        /// value; otherwise, no <b>Where</b> is invoked.</param>
-        /// <param name="predicate">A function to test each element for a condition.</param>
-        /// <returns>The resulting query.</returns>
-        public static IQueryable<TElement> WhereWith<TElement, T>(this IQueryable<TElement> query, T with, Expression<Func<TElement, bool>> predicate)
-        {
-            query.ThrowIfNull(nameof(query));
-
-            if (Comparer<T>.Default.Compare(with, default!) != 0 && Comparer<T>.Default.Compare(with, default!) != 0)
-            {
-                if (with is not string && with is System.Collections.IEnumerable ie && !ie.GetEnumerator().MoveNext())
-                    return query;
-
-                return query.Where(predicate);
-            }
-            else
-                return query;
-        }
-
-        /// <summary>
-        /// Filters a sequence of values using the specified <paramref name="property"/> and <paramref name="text"/> containing <see cref="Wildcard.MultiBasic"/> supported wildcards.
-        /// </summary>
-        /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
-        /// <param name="query">The query.</param>
-        /// <param name="property">The <see cref="MemberExpression"/>.</param>
-        /// <param name="text">The text to query.</param>
-        /// <param name="ignoreCase">Indicates whether the comparison should ignore case (default) or not; will use <see cref="string.ToUpper()"/> when selected for comparisons.</param>
-        /// <param name="checkForNull">Indicates whether a null check should also be performed before the comparion occurs (defaults to <c>true</c>).</param>
-        /// <returns>The resulting (updated) query.</returns>
-        public static IQueryable<TElement> WhereWildcard<TElement>(this IQueryable<TElement> query, Expression<Func<TElement, string?>> property, string? text, bool ignoreCase = true, bool checkForNull = true)
-        {
-            query.ThrowIfNull(nameof(query));
-            property.ThrowIfNull(nameof(property));
-
-            var wc = Wildcard.MultiBasic;
-            var wr = wc.Parse(text).ThrowOnError();
-
-            // Exit stage left where nothing to do.
-            if (wr.Selection.HasFlag(WildcardSelection.None) || wr.Selection.HasFlag(WildcardSelection.Single))
-                return query;
-
-            // Check the expression.
-            if (property.Body is not MemberExpression me)
-                throw new ArgumentException("Property expression must be of Type MemberExpression.", nameof(property));
-
-            Expression exp = me;
-            var s = wr.GetTextWithoutWildcards();
-            if (ignoreCase)
-            {
-                s = s?.ToUpper(System.Globalization.CultureInfo.CurrentCulture);
-                exp = Expression.Call(me, typeof(string).GetMethod("ToUpper", System.Type.EmptyTypes)!)!;
-            }
-
-            if (wr.Selection.HasFlag(WildcardSelection.Equal))
-                exp = Expression.Equal(exp, Expression.Constant(s));
-            else if (wr.Selection.HasFlag(WildcardSelection.EndsWith))
-                exp = Expression.Call(exp, "EndsWith", null, Expression.Constant(s));
-            else if (wr.Selection.HasFlag(WildcardSelection.StartsWith))
-                exp = Expression.Call(exp, "StartsWith", null, Expression.Constant(s));
-            else if (wr.Selection.HasFlag(WildcardSelection.Contains))
-                exp = Expression.Call(exp, "Contains", null, Expression.Constant(s));
-            else
-                throw new ArgumentException("Wildcard selection text is not supported.", nameof(text));
-
-            // Add check for not null.
-            if (checkForNull)
-            {
-                var ee = Expression.NotEqual(me, Expression.Constant(null));
-                exp = Expression.AndAlso(ee, exp);
-            }
-
-            // Create the final lambda expression.
-            return query.Where(Expression.Lambda<Func<TElement, bool>>(exp, property.Parameters));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/IServiceCollectionExtensions.cs b/src/CoreEx/Abstractions/IServiceCollectionExtensions.cs
deleted file mode 100644
index d680bebe..00000000
--- a/src/CoreEx/Abstractions/IServiceCollectionExtensions.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx;
-using CoreEx.Caching;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Events;
-using CoreEx.Events.HealthChecks;
-using CoreEx.Events.Subscribing;
-using CoreEx.Hosting;
-using CoreEx.Hosting.Work;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.Json.Merge;
-using CoreEx.Json.Merge.Extended;
-using CoreEx.Mapping;
-using CoreEx.RefData;
-using CoreEx.RefData.Caching;
-using CoreEx.RefData.HealthChecks;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Reflection;
-
-namespace Microsoft.Extensions.DependencyInjection
-{
-    /// <summary>
-    /// Provides <see cref="IServiceCollection"/> extensions.
-    /// </summary>
-    public static class IServiceCollectionExtensions
-    {
-        /// <summary>
-        /// Checks that the <see cref="IServiceCollection"/> is not null.
-        /// </summary>
-        private static IServiceCollection CheckServices(IServiceCollection services) => services.ThrowIfNull(nameof(services));
-
-        /// <summary>
-        /// Removes all items from the <see cref="IServiceCollection"/> for the specified <typeparamref name="TService"/>.
-        /// </summary>
-        /// <typeparam name="TService">The service <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns><c>true</c> if item was successfully removed; otherwise, <c>false</c>. Also returns <c>false</c> where item was not found.</returns>
-        public static bool Remove<TService>(this IServiceCollection services) where TService : class
-        {
-            var descriptor = CheckServices(services).FirstOrDefault(d => d.ServiceType == typeof(TService));
-            return descriptor != null && services.Remove(descriptor);
-        }
-
-        /// <summary>
-        /// Adds the <see cref="SystemTime.Default"/> as the <see cref="ISystemTime"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddSystemTime(this IServiceCollection services) => CheckServices(services).AddSingleton<ISystemTime>(sp => SystemTime.Default);
-
-        /// <summary>
-        /// Adds a scoped service to instantiate a new <see cref="ExecutionContext"/> instance.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="executionContextFactory">The function to override the creation of the <see cref="ExecutionContext"/> instance.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        /// <remarks>Where the <paramref name="executionContextFactory"/> is <c>null</c>, then the <see cref="ExecutionContext.Create"/> is used to create.</remarks>
-        public static IServiceCollection AddExecutionContext(this IServiceCollection services, Func<IServiceProvider, ExecutionContext>? executionContextFactory = null)
-        {
-            return CheckServices(services).AddScoped(sp =>
-            {
-                var ec = executionContextFactory?.Invoke(sp) ?? ExecutionContext.Create?.Invoke() ??
-                    throw new InvalidOperationException("Unable to create 'ExecutionContext' instance; either (in order) 'executionContextFactory' resulted in null, or 'ExecutionContext.Create' resulted in null.");
-
-                ec.ServiceProvider = sp;
-
-                ExecutionContext.Reset();
-                ExecutionContext.SetCurrent(ec);
-
-                return ec;
-            });
-        }
-
-        /// <summary>
-        /// Adds a <see cref="TypedHttpClientBase"/> using the underlying <see cref="HttpClientFactoryServiceCollectionExtensions.AddHttpClient{TClient}(IServiceCollection, string, Action{IServiceProvider, HttpClient})"/>.
-        /// </summary>
-        /// <typeparam name="TClient">The client <see cref="TypedHttpClientBase"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="name">The logical name of the <see cref="HttpClient"/> to configure.</param>
-        /// <param name="configure">The delegate to configure the underlying <see cref="HttpClient"/>.</param>
-        /// <returns>An <see cref="IHttpClientBuilder"/> that can be used to configure the client.</returns>
-        public static IHttpClientBuilder AddTypedHttpClient<TClient>(this IServiceCollection services, string name, Action<IServiceProvider, HttpClient>? configure = null) where TClient : TypedHttpClientBase
-            => configure == null ? services.AddHttpClient<TClient>(name) : services.AddHttpClient<TClient>(name, configure);
-
-        /// <summary>
-        /// Adds a <see cref="TypedHttpClientBase"/> using the underlying <see cref="HttpClientFactoryServiceCollectionExtensions.AddHttpClient{TClient}(IServiceCollection, string, Action{IServiceProvider, HttpClient})"/>.
-        /// </summary>
-        /// <typeparam name="TClient">The client <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TImplementation">The client <see cref="TypedHttpClientBase"/> implementation <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="name">The logical name of the <see cref="HttpClient"/> to configure.</param>
-        /// <param name="configure">The delegate to configure the underlying <see cref="HttpClient"/>.</param>
-        /// <returns>An <see cref="IHttpClientBuilder"/> that can be used to configure the client.</returns>
-        public static IHttpClientBuilder AddTypedHttpClient<TClient, TImplementation>(this IServiceCollection services, string name, Action<IServiceProvider, HttpClient>? configure = null) where TClient : class where TImplementation : TypedHttpClientBase, TClient
-            => configure == null ? services.AddHttpClient<TClient, TImplementation>(name) : services.AddHttpClient<TClient, TImplementation>(name, configure);
-
-        /// <summary>
-        /// Adds the <see cref="DefaultSettings"/> as the <see cref="SettingsBase"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddDefaultSettings(this IServiceCollection services) => CheckServices(services).AddSettings<DefaultSettings>();
-
-        /// <summary>
-        /// Adds the <typeparamref name="TSettings"/> <see cref="Type"/> as the singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        /// <remarks>Where the <see cref="SettingsBase"/> has not been registered then this will be registered automatically also.</remarks>
-        public static IServiceCollection AddSettings<TSettings>(this IServiceCollection services) where TSettings : SettingsBase
-        {
-            CheckServices(services).AddSingleton<TSettings>();
-
-            if (services.FirstOrDefault(d => d.ServiceType == typeof(SettingsBase)) == null)
-                CheckServices(services).AddSingleton<SettingsBase, TSettings>();
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="IdentifierGenerator"/> as the <see cref="string"/> <see cref="IIdentifierGenerator{T}"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddStringIdentifierGenerator(this IServiceCollection services) => CheckServices(services).AddSingleton<IIdentifierGenerator<string>, IdentifierGenerator>();
-
-        /// <summary>
-        /// Adds the <see cref="IdentifierGenerator"/> as the <see cref="Guid"/> <see cref="IIdentifierGenerator{T}"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddGuidIdentifierGenerator(this IServiceCollection services) => CheckServices(services).AddSingleton<IIdentifierGenerator<Guid>, IdentifierGenerator>();
-
-        /// <summary>
-        /// Adds the <see cref="LoggerEventPublisher"/> as the <see cref="IEventPublisher"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddLoggerEventPublisher(this IServiceCollection services) => CheckServices(services).AddEventPublisher<LoggerEventPublisher>();
-
-        /// <summary>
-        /// Adds the <see cref="NullEventPublisher"/> as the <see cref="IEventPublisher"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddNullEventPublisher(this IServiceCollection services) => CheckServices(services).AddEventPublisher<NullEventPublisher>();
-
-        /// <summary>
-        /// Adds the <see cref="EventPublisher"/> as the <see cref="IEventPublisher"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventPublisher(this IServiceCollection services) => CheckServices(services).AddEventPublisher<EventPublisher>();
-
-        /// <summary>
-        /// Adds the <typeparamref name="TEventPublisher"/> as the <see cref="IEventPublisher"/> scoped service.
-        /// </summary>
-        /// <typeparam name="TEventPublisher">The <see cref="IEventPublisher"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventPublisher<TEventPublisher>(this IServiceCollection services) where TEventPublisher : class, IEventPublisher => CheckServices(services).AddScoped<IEventPublisher, TEventPublisher>();
-
-        /// <summary>
-        /// Adds the <see cref="LoggerEventSender"/> as the <see cref="IEventSender"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddLoggerEventSender(this IServiceCollection services) => CheckServices(services).AddEventSender<LoggerEventSender>();
-
-        /// <summary>
-        /// Adds the <see cref="NullEventSender"/> as the <see cref="IEventSender"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddNullEventSender(this IServiceCollection services) => CheckServices(services).AddEventSender<NullEventSender>();
-
-        /// <summary>
-        /// Adds the <typeparamref name="TEventSender"/> as the <see cref="IEventSender"/> scoped service.
-        /// </summary>
-        /// <typeparam name="TEventSender">The <see cref="IEventSender"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventSender<TEventSender>(this IServiceCollection services) where TEventSender : class, IEventSender => CheckServices(services).AddScoped<IEventSender, TEventSender>();
-
-        /// <summary>
-        /// Adds the <typeparamref name="TEventSender"/> as the <see cref="IEventSender"/> scoped service.
-        /// </summary>
-        /// <typeparam name="TEventSender">The <see cref="IEventSender"/> <see cref="Type"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="IEventSender"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventSender<TEventSender>(this IServiceCollection services, Action<IServiceProvider, TEventSender> configure) where TEventSender : class, IEventSender => CheckServices(services).AddScoped<IEventSender>(sp =>
-        {
-            var sender = ActivatorUtilities.CreateInstance<TEventSender>(sp);
-            configure(sp, sender);
-            return sender;
-        });
-
-        /// <summary>
-        /// Adds the <see cref="EventSubscriberOrchestrator"/> as a singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="EventSubscriberOrchestrator"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventSubscriberOrchestrator(this IServiceCollection services, Action<IServiceProvider, EventSubscriberOrchestrator>? configure = null) => CheckServices(services).AddSingleton(sp =>
-        {
-            var eso = new EventSubscriberOrchestrator(sp);
-            configure?.Invoke(sp, eso);
-            return eso;
-        });
-
-        /// <summary>
-        /// Adds all the <see cref="SubscriberBase"/> types for a given <typeparamref name="TAssembly"/> that have at least one <see cref="EventSubscriberAttribute"/> (see also <seealso cref="EventSubscriberOrchestrator.GetSubscribers{TAssembly}(bool)"/>) as scoped services.
-        /// </summary>
-        /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="includeInternalTypes">Indicates whether to include internally defined types.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventSubscribers<TAssembly>(this IServiceCollection services, bool includeInternalTypes = false)
-        {
-            foreach (var type in EventSubscriberOrchestrator.GetSubscribers<TAssembly>(includeInternalTypes))
-            {
-                CheckServices(services).TryAddScoped(type);
-            }
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="CoreEx.Text.Json.JsonSerializer"/> as the <see cref="IJsonSerializer"/> and <see cref="CoreEx.Text.Json.ReferenceDataContentJsonSerializer"/> as the <see cref="IReferenceDataContentJsonSerializer"/> singleton services.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddJsonSerializer(this IServiceCollection services)
-            => CheckServices(services).AddSingleton<IJsonSerializer, CoreEx.Text.Json.JsonSerializer>()
-                                      .AddSingleton<IReferenceDataContentJsonSerializer, CoreEx.Text.Json.ReferenceDataContentJsonSerializer>();
-
-        /// <summary>
-        /// Adds the <see cref="JsonMergePatchEx"/> as the <see cref="IJsonMergePatch"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="JsonMergePatchOptions"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddJsonMergePatch(this IServiceCollection services, Action<JsonMergePatchExOptions>? configure = null) => AddJsonMergePatch(services, sp =>
-        {
-            var jmpo = new JsonMergePatchExOptions(sp.GetService<IJsonSerializer>());
-            configure?.Invoke(jmpo);
-            return new JsonMergePatchEx(jmpo);
-        });
-
-        /// <summary>
-        /// Adds the <see cref="IJsonMergePatch"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="createFactory">The function to create the <see cref="IJsonMergePatch"/> instance..</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddJsonMergePatch(this IServiceCollection services, Func<IServiceProvider, IJsonMergePatch>? createFactory) => CheckServices(services).AddSingleton(sp =>
-        {
-            return createFactory?.Invoke(sp) ?? throw new InvalidOperationException($"Unable to create '{nameof(IJsonMergePatch)}' instance; '{nameof(createFactory)}' resulted in null.");
-        });
-
-        /// <summary>
-        /// Adds the <see cref="CoreEx.Text.Json.CloudEventSerializer"/> as the <see cref="IEventSerializer"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="CoreEx.Text.Json.CloudEventSerializer"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddCloudEventSerializer(this IServiceCollection services, Action<IServiceProvider, CoreEx.Text.Json.CloudEventSerializer>? configure = null) => CheckServices(services).AddSingleton<IEventSerializer>(sp =>
-        {
-            var ces = new CoreEx.Text.Json.CloudEventSerializer(sp.GetService<EventDataFormatter>());
-            configure?.Invoke(sp, ces);
-            return ces;
-        });
-
-        /// <summary>
-        /// Adds the <see cref="CoreEx.Text.Json.EventDataSerializer"/> as the <see cref="IEventSerializer"/> singleton service.
-        /// </summary>
-        /// <param name="configure">The action to enable the <see cref="CoreEx.Text.Json.EventDataSerializer"/> to be further configured.</param>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventDataSerializer(this IServiceCollection services, Action<IServiceProvider, CoreEx.Text.Json.EventDataSerializer>? configure = null) => CheckServices(services).AddSingleton<IEventSerializer>(sp =>
-        {
-            var eds = new CoreEx.Text.Json.EventDataSerializer(sp.GetService<IJsonSerializer>(), sp.GetService<EventDataFormatter>());
-            configure?.Invoke(sp, eds);
-            return eds;
-        });
-
-        /// <summary>
-        /// Adds the <see cref="EventDataFormatter"/> as the singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="formatter">The optional <see cref="EventDataFormatter"/>; will default where not specified.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddEventDataFormatter(this IServiceCollection services, EventDataFormatter? formatter = null) => CheckServices(services).AddSingleton(_ => formatter ?? new EventDataFormatter());
-
-        /// <summary>
-        /// Adds the <see cref="FileLockSynchronizer"/> as the <see cref="IServiceSynchronizer"/> singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddFileLockSynchronizer(this IServiceCollection services) => CheckServices(services).AddSingleton<IServiceSynchronizer, FileLockSynchronizer>();
-
-        /// <summary>
-        /// Adds the <see cref="ReferenceDataOrchestrator"/> created by <paramref name="createOrchestrator"/> as a singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="createOrchestrator">The function to create the <see cref="ReferenceDataOrchestrator"/>.</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="ReferenceDataOrchestratorHealthCheck"/> should be configured.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>reference-data-orchestrator</c>'.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddReferenceDataOrchestrator(this IServiceCollection services, Func<IServiceProvider, ReferenceDataOrchestrator> createOrchestrator, bool healthCheck = true, string? healthCheckName = "reference-data-orchestrator")
-        {
-            CheckServices(services).AddSingleton(sp => createOrchestrator(sp));
-            if (healthCheck)
-                services.AddHealthChecks().AddTypeActivatedCheck<ReferenceDataOrchestratorHealthCheck>(healthCheckName ?? "reference-data-orchestrator");
-
-            return services;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="ReferenceDataOrchestrator"/> using a <see cref="MemoryCache"/> as a singleton service automatically registering the <see cref="IReferenceDataProvider"/> (see <see cref="ReferenceDataOrchestrator.Register"/>).
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="ReferenceDataOrchestratorHealthCheck"/> should be configured.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>reference-data-orchestrator</c>'.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddReferenceDataOrchestrator(this IServiceCollection services, bool healthCheck = true, string? healthCheckName = "reference-data-orchestrator")
-            => AddReferenceDataOrchestrator(services, sp => new ReferenceDataOrchestrator(sp, sp.GetService<IMemoryCache>(), sp.GetService<ICacheEntryConfig>()).Register(), healthCheck, healthCheckName);
-
-        /// <summary>
-        /// Adds the <see cref="ReferenceDataOrchestrator"/> using a <see cref="MemoryCache"/> as a singleton service automatically registering the specified <typeparamref name="TProvider"/> (see <see cref="ReferenceDataOrchestrator.Register"/>).
-        /// </summary>
-        /// <typeparam name="TProvider">The <see cref="IReferenceDataProvider"/> to register.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="healthCheck">Indicates whether a corresponding <see cref="ReferenceDataOrchestratorHealthCheck"/> should be configured.</param>
-        /// <param name="healthCheckName">The health check name; defaults to '<c>reference-data-orchestrator</c>'.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddReferenceDataOrchestrator<TProvider>(this IServiceCollection services, bool healthCheck = true, string? healthCheckName = "reference-data-orchestrator") where TProvider : IReferenceDataProvider
-            => AddReferenceDataOrchestrator(services, sp => new ReferenceDataOrchestrator(sp, sp.GetService<IMemoryCache>(), sp.GetService<ICacheEntryConfig>()).Register<TProvider>(), healthCheck, healthCheckName);
-
-        /// <summary>
-        /// Adds the <see cref="RequestCache"/> as the <see cref="IRequestCache"/> scoped service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/>.</returns>
-        public static IServiceCollection AddRequestCache(this IServiceCollection services) => CheckServices(services).AddScoped<IRequestCache>(_ => new RequestCache());
-
-        /// <summary>
-        /// Registers all the <see cref="IMapper{TSource, TDestination}"/>(s) from the specified <typeparamref name="TAssembly"/> into a new <see cref="Mapper"/> that is then registered as a singleton service.
-        /// </summary>
-        /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddMappers<TAssembly>(this IServiceCollection services)
-            => AddMappers(services, [typeof(TAssembly).Assembly]);
-
-        /// <summary>
-        /// Registers all the <see cref="IMapper{TSource, TDestination}"/>(s) from the specified <typeparamref name="TAssembly1"/> and <typeparamref name="TAssembly2"/> into a new <see cref="Mapper"/> that is then registered as a singleton service.
-        /// </summary>
-        /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddMappers<TAssembly1, TAssembly2>(this IServiceCollection services)
-            => AddMappers(services, [typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly]);
-
-        /// <summary>
-        /// Registers all the <see cref="IMapper{TSource, TDestination}"/>(s) from the specified <typeparamref name="TAssembly1"/>, <typeparamref name="TAssembly2"/> and <typeparamref name="TAssembly3"/> into a new <see cref="Mapper"/> that is then registered as a singleton service.
-        /// </summary>
-        /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <typeparam name="TAssembly3">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddMappers<TAssembly1, TAssembly2, TAssembly3>(this IServiceCollection services)
-            => AddMappers(services, [typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly, typeof(TAssembly3).Assembly]);
-
-        /// <summary>
-        /// Registers all the <see cref="IMapper{TSource, TDestination}"/>(s) from the specified <paramref name="assemblies"/> into a new <see cref="Mapper"/> that is then registered as a singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="assemblies">The assemblies to probe for mappers.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddMappers(this IServiceCollection services, params Assembly[] assemblies)
-        {
-            var mapper = new Mapper();
-            mapper.Register(assemblies);
-            return services.AddSingleton<IMapper>(mapper);
-        }
-
-        /// <summary>
-        /// Adds the <see cref="WorkStateOrchestrator"/> as a singleton service.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <param name="configure">The action to enable the <see cref="WorkStateOrchestrator"/> to be further configured.</param>
-        /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
-        public static IServiceCollection AddWorkStateOrchestrator(this IServiceCollection services, Action<IServiceProvider, WorkStateOrchestrator>? configure = null) => CheckServices(services).AddSingleton(sp =>
-        {
-            var wso = new WorkStateOrchestrator(sp.GetRequiredService<IWorkStatePersistence>(), sp.GetService<SettingsBase>(), sp.GetService<IJsonSerializer>(), sp.GetService<IIdentifierGenerator>());
-            configure?.Invoke(sp, wso);
-            return wso;
-        });
-
-        /// <summary>
-        /// Adds an <see cref="EventPublisherHealthCheck"/> that will publish and send a health-check <see cref="EventData"/> (message).
-        /// </summary>
-        /// <param name="builder">The <see cref="IHealthChecksBuilder"/>.</param>
-        /// <param name="name">The health check name. Defaults to '<c>event-publisher</c>'.</param>
-        /// <param name="eventPublisherFactory">The <see cref="IEventPublisher"/> factory.</param>
-        /// <param name="configure">The optional action to configure the <see cref="EventPublisherHealthCheckOptions"/>.</param>
-        /// <param name="failureStatus">The <see cref="HealthStatus"/> that should be reported when the health check reports a failure. If the provided value is <c>null</c>, then <see cref="HealthStatus.Unhealthy"/> will be reported.</param>
-        /// <param name="tags">A list of tags that can be used for filtering health checks.</param>
-        /// <param name="timeout">An optional <see cref="TimeSpan"/> representing the timeout of the check.</param>
-        /// <remarks>Where the <paramref name="eventPublisherFactory"/> is not specified then the registered <see cref="IEventPublisher"/> will be used.
-        /// <para><i>Note:</i> Only use where the corresponding subscriber(s)/consumer(s) are aware and can ignore/filter to avoid potential downstream challenges.</para></remarks>
-        public static IHealthChecksBuilder AddEventPublisherHealthCheck(this IHealthChecksBuilder builder, string? name = null, Func<IServiceProvider, IEventPublisher>? eventPublisherFactory = null, Action<IServiceProvider, EventPublisherHealthCheckOptions>? configure = null, HealthStatus? failureStatus = default, IEnumerable<string>? tags = default, TimeSpan? timeout = default)
-        {
-            eventPublisherFactory.ThrowIfNull(nameof(eventPublisherFactory));
-
-            return builder.Add(new HealthCheckRegistration(name ?? "event-publisher", sp =>
-            {
-                var ep = (eventPublisherFactory is null ? sp.GetService<IEventPublisher>() : eventPublisherFactory(sp)) ?? throw new InvalidOperationException("An IEventPublisher was either not registered or the factory returned null.");
-                var hc = new EventPublisherHealthCheck(ep);
-                configure?.Invoke(sp, hc.Options);
-                return hc;
-            }, failureStatus, tags, timeout));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/IUniqueKey.cs b/src/CoreEx/Abstractions/IUniqueKey.cs
deleted file mode 100644
index 4b022fd2..00000000
--- a/src/CoreEx/Abstractions/IUniqueKey.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Caching;
-
-namespace CoreEx.Abstractions
-{
-    /// <summary>
-    /// Identifies a type as containing a unique key of some sort without enabling the what or how.
-    /// </summary>
-    /// <remarks>Should then implement <see cref="IPrimaryKey"/> and/or <see cref="ICacheKey"/>.</remarks>
-    public interface IUniqueKey { }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Internal.cs b/src/CoreEx/Abstractions/Internal.cs
index 3401be6e..1fab7040 100644
--- a/src/CoreEx/Abstractions/Internal.cs
+++ b/src/CoreEx/Abstractions/Internal.cs
@@ -1,45 +1,187 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+[assembly: InternalsVisibleTo("CoreEx.AspNetCore, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5")]
+[assembly: InternalsVisibleTo("CoreEx.Azure.Messaging.ServiceBus, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5")]
+[assembly: InternalsVisibleTo("CoreEx.Database, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5")]
+[assembly: InternalsVisibleTo("CoreEx.RefData, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5")]
+[assembly: InternalsVisibleTo("CoreEx.Validation, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5")]
 
-using CoreEx.Configuration;
-using Microsoft.Extensions.Caching.Memory;
-using System;
-using System.Runtime.CompilerServices;
+namespace CoreEx.Abstractions;
 
-[assembly: 
-    InternalsVisibleTo("CoreEx.AspNetCore, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5"),
-    InternalsVisibleTo("CoreEx.Azure, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5"),
-    InternalsVisibleTo("CoreEx.Database.SqlServer, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5"),
-    InternalsVisibleTo("CoreEx.Solace, PublicKey=00240000048000009400000006020000002400005253413100040000010001007dee530af6d801902d40685e9cd0a3d8991ddbf545be3ef6147c9f79bacd7464d92fbd94fee34e885c37e3dff4ea15a4f9978f1f614798e0f48e3a3d5bf15e8b2fba9c19b6966838f97444bc247bc101454946d70ac93207cf2c611956aed59c316f81f1bf8c8486f8f0b3f9adf93c2f07e06a86745f6dc4b819c2bc2f3fdad5"),
-]
-
-namespace CoreEx.Abstractions
+/// <summary>
+/// Provides shareable internal capabilities.
+/// </summary>
+/// <remarks>This is intended largely for internal usage only; use with caution.</remarks>
+public static class Internal
 {
+    private static readonly IConfiguration _emptyConfig = new ConfigurationBuilder().Build();
+    private static IMemoryCache? _fallbackCache;
+
+    /// <summary>
+    /// Gets an empty configuration instance that contains no settings or values.
+    /// </summary>
+    public static IConfiguration EmptyConfiguration => _emptyConfig;
+
+    /// <summary>
+    /// Gets the internal cache service key.
+    /// </summary>
+    internal static string CacheServiceKey = "__coreex_internal_cache";
+
+    /// <summary>
+    /// Gets the <b>CoreEx</b> internal <see cref="IMemoryCache"/>.
+    /// </summary>
+    internal static IMemoryCache MemoryCache => ExecutionContext.GetKeyedService<IMemoryCache>(CacheServiceKey) ?? (_fallbackCache ??= new MemoryCache(new MemoryCacheOptions()));
+
     /// <summary>
-    /// Provides shareable internal capabilities.
+    /// Tries to get the configuration value for the specified <paramref name="key"/>.
     /// </summary>
-    /// <remarks>This is intended for internal usage only; use with caution.</remarks>
-    public static class Internal
+    /// <typeparam name="T">The configuration value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The key of the configuration section.</param>
+    /// <param name="value">The converted value.</param>
+    /// <param name="configuration">The optional <see cref="IConfiguration"/>; otherwise, defaults from <see cref="ExecutionContext"/>.</param>
+    /// <returns><see langword="true"/> indicates the configuration setting exists; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetConfigurationValue<T>(string key, out T? value, IConfiguration? configuration = null)
     {
-        private static IMemoryCache? _fallbackCache;
-
-        /// <summary>
-        /// Gets the <b>CoreEx</b> <see cref="IInternalCache"/>.
-        /// </summary>
-        internal static IMemoryCache MemoryCache => ExecutionContext.GetService<IInternalCache>() ?? (_fallbackCache ??= new MemoryCache(new MemoryCacheOptions()));
-
-        /// <summary>
-        /// Represents a cache for internal capabilities.
-        /// </summary>
-        public interface IInternalCache : IMemoryCache { }
-
-        /// <summary>
-        /// Indicates whether the specified <typeparamref name="TException"/> should be logged.
-        /// </summary>
-        /// <typeparam name="TException">The <see cref="IExtendedException"/> <see cref="Type"/>.</typeparam>
-        internal static bool ShouldExceptionBeLogged<TException>() where TException : Exception, IExtendedException => MemoryCache.GetOrCreate(typeof(TException), entry => 
-        { 
-            entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(5);
-            return ExecutionContext.GetService<SettingsBase>()?.GetCoreExValue<bool?>($"Log{typeof(TException).Name}") ?? false;
-        });
+        var config = configuration ?? ExecutionContext.GetService<IConfiguration>();
+        if (config?.GetSection(key)?.Value is null)
+        {
+            value = default!;
+            return false;
+        }
+
+        value = config.ThrowWhen(config => config is null).GetValue<T>(key);
+        return true;
+    }
+
+    /// <summary>
+    /// Gets the configuration value for the specified <paramref name="key"/>.
+    /// </summary>
+    /// <typeparam name="T">The configuration value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The key of the configuration section.</param>
+    /// <param name="defaultValue">The default value to use if no value is found.</param>
+    /// <param name="configuration">The optional <see cref="IConfiguration"/>; otherwise, defaults from <see cref="ExecutionContext"/>.</param>
+    /// <returns>The converted value.</returns>
+    public static T? GetConfigurationValue<T>(string key, T? defaultValue = default, IConfiguration? configuration = null)
+        => TryGetConfigurationValue<T>(key, out var value, configuration) ? value : defaultValue;
+
+    /// <summary>
+    /// Gets the configuration value for the specified <paramref name="key"/> and where not found uses the alternate <paramref name="fallbackKey"/>.
+    /// </summary>
+    /// <typeparam name="T">The configuration value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The key of the configuration section.</param>
+    /// <param name="fallbackKey">The alternate key of the configuration section.</param>
+    /// <param name="defaultValue">The default value to use if no value is found.</param>
+    /// <param name="configuration">The optional <see cref="IConfiguration"/>; otherwise, defaults from <see cref="ExecutionContext"/>.</param>
+    /// <returns>The converted value.</returns>
+    public static T? GetConfigurationValueWithFallback<T>(string key, string fallbackKey, T? defaultValue = default, IConfiguration? configuration = null)
+        => GetConfigurationValueWithFallback(key, () => fallbackKey, defaultValue, configuration);
+
+    /// <summary>
+    /// Gets the configuration value for the specified <paramref name="key"/> and where not found uses the alternate <paramref name="getFallbackKey"/>.
+    /// </summary>
+    /// <typeparam name="T">The configuration value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The key of the configuration section.</param>
+    /// <param name="getFallbackKey">The function to get the alternate key of the configuration section (only where needed).</param>
+    /// <param name="defaultValue">The default value to use if no value is found.</param>
+    /// <param name="configuration">The optional <see cref="IConfiguration"/>; otherwise, defaults from <see cref="ExecutionContext"/>.</param>
+    /// <returns>The converted value.</returns>
+    /// <remarks>This is intended to minimize the need to generate a fallback key until actually needed.</remarks>
+    public static T? GetConfigurationValueWithFallback<T>(string key, Func<string> getFallbackKey, T? defaultValue = default, IConfiguration? configuration = null)
+    {
+        var config = configuration ?? ExecutionContext.GetService<IConfiguration>();
+        if (config is null)
+            return defaultValue;
+
+        if (TryGetConfigurationValue<T>(key, out var value, config))
+            return value;
+
+        return GetConfigurationValue(getFallbackKey.ThrowIfNull()(), defaultValue, config);
+    }
+
+    /// <summary>
+    /// Gets the value from the provided <paramref name="valueOrKey"/> where it is a reference to a <paramref name="configuration"/> key; otherwise, returns the value as-is.
+    /// </summary>
+    /// <param name="valueOrKey">The value or key.</param>
+    /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
+    /// <returns>The configured value or value as-is.</returns>
+    /// <remarks>Supports the retrieval of the value from <paramref name="configuration"/> where prefixed with '<c>config:</c>' or '<c>^</c>', or is wrapped with '<c>%</c>'.</remarks>
+    public static string GetValueFromConfigurationWhereApplicable(string valueOrKey, IConfiguration? configuration = null)
+    {
+        const string configPrefix = "config:";
+        bool isConfigReference = false;
+
+        if (valueOrKey.ThrowIfNullOrEmpty().StartsWith(configPrefix, StringComparison.OrdinalIgnoreCase))
+        {
+            valueOrKey = valueOrKey[configPrefix.Length..];
+            isConfigReference = true;
+        }
+        else if (valueOrKey.StartsWith('^'))
+        {
+            valueOrKey = valueOrKey[1..];
+            isConfigReference = true;
+        }
+        else if (valueOrKey.StartsWith('%') && valueOrKey.EndsWith('%'))
+        {
+            valueOrKey = valueOrKey[1..^1];
+            isConfigReference = true;
+        }
+
+        return isConfigReference
+            ? GetConfigurationValue<string>(valueOrKey, configuration: configuration) ?? throw new InvalidOperationException($"The required configuration key '{valueOrKey}' was not found.")
+            : valueOrKey;
+    }
+
+    /// <summary>
+    /// Casts a <paramref name="value"/> of type <typeparamref name="TFrom"/> to type <typeparamref name="TTo"/> (where they must be the same type).
+    /// </summary>
+    /// <typeparam name="TFrom">The from <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TTo">The to <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to cast.</param>
+    /// <param name="trustMe">Indicates whether to bypass the type check; use with extreme caution!</param>
+    /// <returns>The casted value.</returns>
+    /// <remarks>This uses a <see cref="Unsafe.As{TFrom, TTo}(ref TFrom)"/> to perform as it is fastest means possible. Where there is a mismatch of types an <see cref="InvalidCastException"/> will be thrown.</remarks>
+    internal static TTo Cast<TFrom, TTo>(TFrom value, bool trustMe = false)
+    {
+        if (value is null)
+            return default!;
+
+        if (value is TTo t)
+            return t;
+
+        // Must be identical types, uses Unsafe.As to avoid boxing of value types.
+        if (typeof(TFrom) == typeof(TTo))
+            return Unsafe.As<TFrom, TTo>(ref value);
+
+        // Allow bypass of type check where caller is certain of compatibility (use with extreme caution).
+        if (trustMe)
+            return Unsafe.As<TFrom, TTo>(ref value);
+
+        // Not compatible.
+        throw new InvalidCastException($"Cannot cast from {typeof(TFrom).Name} to {typeof(TTo).Name}. Only exact matches are supported.");
+    }
+
+    /// <summary>
+    /// Gets a friendly formatted <see cref="Type"/> name with namespace.
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/>.</param>
+    /// <returns>The friendly formatted <see cref="Type"/> name with namespace.</returns>
+    public static string GetNamespaceFormattedName(Type type) => type.Namespace is null ? GetFormattedName(type) : $"{type.Namespace}.{GetFormattedName(type)}";
+
+    /// <summary>
+    /// Gets a friendly formatted <see cref="Type"/> name.
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/>.</param>
+    /// <returns>The friendly formatted <see cref="Type"/> name.</returns>
+    public static string GetFormattedName(Type type) => type.IsGenericType ? GetGenericFormattedName(type) : type.Name;
+
+    /// <summary>
+    /// Gets the formatted name for a generic type.
+    /// </summary>
+    private static string GetGenericFormattedName(Type type)
+    {
+        var name = type.Name;
+        var tick = name.IndexOf('`');
+        if (tick > 0)
+            name = name[..tick];
+
+        return $"{name}<{string.Join(',', type.GetGenericArguments().Select(GetFormattedName))}>";
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/ObjectExtensions.cs b/src/CoreEx/Abstractions/ObjectExtensions.cs
deleted file mode 100644
index efbd6c40..00000000
--- a/src/CoreEx/Abstractions/ObjectExtensions.cs
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Text;
-using System;
-using System.Diagnostics.CodeAnalysis;
-#if NET6_0_OR_GREATER
-using System.Runtime.CompilerServices;
-#endif
-
-namespace CoreEx
-{
-    /// <summary>
-    /// Provides standard <see cref="object"/> extensions.
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public static class ObjectExtensions
-    {
-        /// <summary>
-        /// Enables adjustment (changes) to a <paramref name="value"/> via an <paramref name="adjuster"/> action.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to adjust.</param>
-        /// <param name="adjuster">The adjusting action (invoked only where the <paramref name="value"/> is not <c>null</c>).</param>
-        /// <returns>The adjusted value (same instance).</returns>
-        /// <remarks>Useful in scenarios to in-line simple changes to a value to simplify code.</remarks>
-        [return: NotNullIfNotNull(nameof(value))]
-        public static T? Adjust<T>(this T? value, Action<T> adjuster)
-        {
-            if (value is not null)
-                adjuster?.Invoke(value);
-
-            return value!;
-        }
-
-        /// <summary>
-        /// Enables adjustment (changes) to a <paramref name="value"/> via an <paramref name="adjuster"/> action when the <paramref name="predicate"/> is <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to adjust.</param>
-        /// <param name="predicate">The <see cref="Predicate{T}"/> that determines whether the <paramref name="predicate"/> is invoked.</param>
-        /// <param name="adjuster">The adjusting action (invoked only where the <paramref name="value"/> is not <c>null</c> and the <paramref name="predicate"/> results in <c>true</c>).</param>
-        /// <returns>The adjusted value (same instance).</returns>
-        /// <remarks>Useful in scenarios to in-line simple changes to a value to simplify code.</remarks>
-        [return: NotNullIfNotNull(nameof(value))]
-        public static T? AdjustWhen<T>(this T? value, Predicate<T> predicate, Action<T> adjuster)
-        {
-            if (value is not null && predicate(value))
-                adjuster?.Invoke(value);
-
-            return value!;
-        }
-
-        /// <summary>
-        /// Converts a <see cref="string"/> into sentence case.
-        /// </summary>
-        /// <param name="text">The text to convert.</param>
-        /// <returns>The <see cref="string"/> as sentence case.</returns>
-        /// <remarks>For example a value of '<c>VarNameDB</c>' would return '<c>Var Name DB</c>'.
-        /// <para>Uses the <see cref="SentenceCase.ToSentenceCase(string?)"/> function to perform the conversion.</para></remarks>
-        [return: NotNullIfNotNull(nameof(text))]
-        public static string? ToSentenceCase(this string? text) => SentenceCase.ToSentenceCase(text);
-
-#if NET6_0_OR_GREATER
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <c>null</c>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate as non-null.</param>
-        /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
-        /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
-        public static T ThrowIfNull<T>([NotNull] this T? value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
-        {
-            ArgumentNullException.ThrowIfNull(value, paramName);
-            return value;
-        }
-#else
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <c>null</c>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate as non-null.</param>
-        /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
-        /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
-        public static T ThrowIfNull<T>([NotNull] this T? value, string? paramName = "value")
-        {
-            if (value is null)
-                throw new ArgumentNullException(paramName);
-            
-            return value;
-        }
-#endif
-
-#if NET7_0_OR_GREATER
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <c>null</c> or <see cref="string.Empty"/>.
-        /// </summary>
-        /// <param name="value">The value to validate as non-null.</param>
-        /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
-        /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
-        public static string ThrowIfNullOrEmpty([NotNull] this string? value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(value, paramName);
-            return value;
-        }
-#else
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <c>null</c> or <see cref="string.Empty"/>.
-        /// </summary>
-        /// <param name="value">The value to validate as non-null.</param>
-        /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
-        /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
-        public static string ThrowIfNullOrEmpty([NotNull] this string? value, string? paramName = "value")
-        {
-            if (string.IsNullOrEmpty(value))
-                throw new ArgumentNullException(paramName);
-            
-            return value;
-        }
-#endif
-
-#if NET7_0_OR_GREATER
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <c>null</c> or <see cref="string.Empty"/>.
-        /// </summary>
-        /// <param name="value">The value to validate as non-null.</param>
-        /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
-        /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
-        public static string? ThrowIfEmpty(this string? value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
-        {
-            if (value is not null && 0 == value.Length)
-                throw new ArgumentException("The value cannot be an empty string.", paramName);
-
-            return value;
-        }
-#else
-        /// <summary>
-        /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <c>null</c> or <see cref="string.Empty"/>.
-        /// </summary>
-        /// <param name="value">The value to validate as non-null.</param>
-        /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
-        /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
-        public static string? ThrowIfEmpty(this string? value, string? paramName = "value")
-        {
-            if (value is not null && 0 == value.Length)
-                throw new ArgumentException("The value cannot be an empty string.", paramName);
-
-            return value;
-        }
-#endif
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/README.md b/src/CoreEx/Abstractions/README.md
deleted file mode 100644
index 2da79648..00000000
--- a/src/CoreEx/Abstractions/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# CoreEx.Abstractions
-
-The `CoreEx.Abstractions` namespace provides key abstractions, or other largely internal capabilities.
-
-<br/>
-
-## Motivation
-
-To enable other capabilities generally leveraged internally within _CoreEx_.
-
-<br/>
-
-## Reflection
-
-The `Reflection` namespace is used internally whenever [reflection](https://learn.microsoft.com/en-us/dotnet/framework/reflection-and-codedom/reflection) is needed; this provides extended reusable capabilities, and caching thereof to improve overall performance. The key classes are as follows: [`TypeReflector`](./Reflection/TypeReflector.cs) [`PropertyReflector`](./Reflection/PropertyReflector.cs), and [`PropertyExpression`](./Reflection/PropertyExpression.cs). 
-
-<br/>
-
-## Extension methods
-
-A number of [extensions methods](https://learn.microsoft.com/en-us/dotnet/csharp/programming-guide/classes-and-structs/extension-methods) are defined to enable additional features. The naming convention for these is such that the file suffix is `Extentions`; e.g. [`ObjectExtensions`](./ObjectExtensions.cs). 
-
-_Note:_ This convention is used in other namespaces as required to house additional extension methods where applicable.
-
-<br/>
-
-## ETag generation
-
-The [`ETagGenerator`](./ETagGenerator.cs) is used, primary within the [`WebApis`](../WebApis/README.md) capabilities, to generate an [ETag](https://en.wikipedia.org/wiki/HTTP_ETag) value where not provided by the underlying data source. Essentially this is implemented by serializing the payload and hashing with [SHA256](https://learn.microsoft.com/en-us/dotnet/api/system.security.cryptography.sha256) to get a mostly unique value to be used for caching and/or concurrency.
diff --git a/src/CoreEx/Abstractions/Reflection/IPropertyExpression.cs b/src/CoreEx/Abstractions/Reflection/IPropertyExpression.cs
deleted file mode 100644
index 0d3ed8a3..00000000
--- a/src/CoreEx/Abstractions/Reflection/IPropertyExpression.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Enables the property <see cref="Expression"/> capabilities.
-    /// </summary>
-    public interface IPropertyExpression
-    {
-        /// <summary>
-        /// Gets the corresponding <see cref="System.Reflection.PropertyInfo"/>.
-        /// </summary>
-        PropertyInfo PropertyInfo { get; }
-
-        /// <summary>
-        /// Gets the property name.
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// Gets the JSON property name (where applicable).
-        /// </summary>
-        string? JsonName { get; }
-
-        /// <summary>
-        /// Indicates whether the property is JSON serializable.
-        /// </summary>
-        bool IsJsonSerializable { get; }
-
-        /// <summary>
-        /// Indicates that the property is a class with properties (and is not a <see cref="string"/>).
-        /// </summary>
-        bool IsClass { get; }
-
-        /// <summary>
-        /// Gets the property text.
-        /// </summary>
-        LText Text { get; }
-
-        /// <summary>
-        /// Gets the default value.
-        /// </summary>
-        /// <returns>The default value.</returns>
-        object? GetDefault();
-
-        /// <summary>
-        /// Gets the property value for the given entity.
-        /// </summary>
-        /// <param name="entity">The entity value.</param>
-        /// <returns>The corresponding property value.</returns>
-        object? GetValue(object? entity);
-
-        /// <summary>
-        /// Sets the property value for the given entity.
-        /// </summary>
-        /// <param name="entity">The entity value.</param>
-        /// <param name="value">The corresponding property value.</param>
-        void SetValue(object entity, object? value);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/IPropertyReflector.cs b/src/CoreEx/Abstractions/Reflection/IPropertyReflector.cs
deleted file mode 100644
index dc21b113..00000000
--- a/src/CoreEx/Abstractions/Reflection/IPropertyReflector.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Enables a reflector for a given class property.
-    /// </summary>
-    public interface IPropertyReflector
-    {
-        /// <summary>
-        /// Gets the property name.
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// Gets the JSON property name.
-        /// </summary>
-        string? JsonName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="TypeReflectorArgs"/>.
-        /// </summary>
-        TypeReflectorArgs Args { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Dictionary{TKey, TValue}"/> for storing additional data.
-        /// </summary>
-        Dictionary<string, object?> Data { get; }
-
-        /// <summary>
-        /// Gets the corresponding <see cref="IPropertyExpression"/>.
-        /// </summary>
-        IPropertyExpression PropertyExpression { get; }
-
-        /// <summary>
-        /// Gets the corresponding <see cref="PropertyInfo"/>;
-        /// </summary>
-        PropertyInfo PropertyInfo { get; }
-
-        /// <summary>
-        /// Indicates that the property is a class with properties (and is not a <see cref="string"/>).
-        /// </summary>
-        bool IsClass { get; }
-
-        /// <summary>
-        /// Indicates that the property is <see cref="IEnumerable"/> (and is not a <see cref="string"/>).
-        /// </summary>
-        bool IsEnumerable { get; }
-
-        /// <summary>
-        /// Gets the parent entity <see cref="System.Type"/>.
-        /// </summary>
-        Type EntityType { get; }
-
-        /// <summary>
-        /// Gets the property <see cref="System.Type"/>.
-        /// </summary>
-        Type Type { get; }
-
-        /// <summary>
-        /// Gets the property <see cref="TypeReflectorTypeCode"/>.
-        /// </summary>
-        TypeReflectorTypeCode TypeCode { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ITypeReflector"/> for the property.
-        /// </summary>
-        /// <returns>The corresponding <see cref="ITypeReflector"/>.</returns>
-        ITypeReflector? GetTypeReflector();
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="x">The first value.</param>
-        /// <param name="y">The second value.</param>
-        /// <returns><c>true</c> indicates that they are equal; otherwise, <c>false</c>.</returns>
-        bool Compare(object? x, object? y);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/IReflectionCache.cs b/src/CoreEx/Abstractions/Reflection/IReflectionCache.cs
deleted file mode 100644
index 110afd26..00000000
--- a/src/CoreEx/Abstractions/Reflection/IReflectionCache.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Caching.Memory;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Represents a cache for reflection operations.
-    /// </summary>
-    public interface IReflectionCache : IMemoryCache { }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/ITypeReflector.cs b/src/CoreEx/Abstractions/Reflection/ITypeReflector.cs
deleted file mode 100644
index e70235ee..00000000
--- a/src/CoreEx/Abstractions/Reflection/ITypeReflector.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Enables a reflector for a given <see cref="Type"/>.
-    /// </summary>
-    public interface ITypeReflector
-    {
-        /// <summary>
-        /// Gets the <see cref="TypeReflectorArgs"/>.
-        /// </summary>
-        TypeReflectorArgs Args { get; }
-
-        /// <summary>
-        /// Gets the entity <see cref="Type"/>.
-        /// </summary>
-        Type Type { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Type"/> <see cref="TypeReflectorTypeCode"/>.
-        /// </summary>
-        TypeReflectorTypeCode TypeCode { get; }
-
-        /// <summary>
-        /// Gets the underlying item <see cref="System.Type"/> where <see cref="Type"/> implements <see cref="IEnumerable"/>. 
-        /// </summary>
-        Type? ItemType { get; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="ItemType"/> <see cref="TypeReflectorTypeCode"/>.
-        /// </summary>
-        TypeReflectorTypeCode? ItemTypeCode { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Dictionary{TKey, TValue}"/> for storing additional data.
-        /// </summary>
-        Dictionary<string, object?> Data { get; }
-
-        /// <summary>
-        /// Gets all the properties for the <see cref="Type"/>.
-        /// </summary>
-        IEnumerable<IPropertyReflector> GetProperties();
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyReflector"/> for the specified property name where it exists.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        /// <param name="property">The <see cref="IPropertyReflector"/> where property exists; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where the property exists; otherwise, <c>false</c>.</returns>
-        bool TryGetProperty(string name, [NotNullWhen(true)] out IPropertyReflector? property);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyReflector"/> for the specified property name.
-        /// </summary>
-        /// <param name="name">The property name.</param>
-        /// <returns>The <see cref="IPropertyReflector"/>.</returns>
-        IPropertyReflector GetProperty(string name);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyReflector"/> for the specified JSON name.
-        /// </summary>
-        /// <param name="jsonName">The JSON name.</param>
-        /// <returns>The <see cref="IPropertyReflector"/>.</returns>
-        /// <remarks>Uses the <see cref="TypeReflectorArgs.NameComparer"/> to match the JSON name.</remarks>
-        IPropertyReflector? GetJsonProperty(string jsonName);
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="Type"/> using the default empty constructor.
-        /// </summary>
-        /// <returns>A new instance of the <see cref="Type"/>.</returns>
-        object CreateInstance() => Activator.CreateInstance(Type)!;
-
-        /// <summary>
-        /// Gets the <see cref="ITypeReflector"/> for <see cref="ItemType"/>.
-        /// </summary>
-        /// <returns>The corresponding <see cref="ITypeReflector"/>.</returns>
-        ITypeReflector? GetItemTypeReflector();
-
-        /// <summary>
-        /// Compares two values for equality;
-        /// </summary>
-        /// <param name="x">The first value.</param>
-        /// <param name="y">The second value.</param>
-        /// <returns><c>true</c> indicates that they are equal; otherwise, <c>false</c>.</returns>
-        bool Compare(object? x, object? y);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/PropertyExpression.cs b/src/CoreEx/Abstractions/Reflection/PropertyExpression.cs
deleted file mode 100644
index e7b1182a..00000000
--- a/src/CoreEx/Abstractions/Reflection/PropertyExpression.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.Localization;
-using CoreEx.Text;
-using Microsoft.Extensions.Caching.Memory;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Provides access to the common property expression capabilities.
-    /// </summary>
-    public static partial class PropertyExpression
-    {
-        /// <summary>
-        /// Gets the <see cref="IMemoryCache"/>.
-        /// </summary>
-        internal static IMemoryCache Cache => ExecutionContext.GetService<IReflectionCache>() ?? Internal.MemoryCache;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IMemoryCache"/> absolute expiration <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>4</c> hours.</remarks>
-        public static TimeSpan? AbsoluteExpirationTimespan { get; set; } = TimeSpan.FromHours(4);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IMemoryCache"/> sliding expiration <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>30</c> minutes.</remarks>
-        public static TimeSpan? SlidingExpirationTimespan { get; set; } = TimeSpan.FromMinutes(30);
-
-        /// <summary>
-        /// Gets or sets the function to create the <see cref="LText"/> for the specified entity <see cref="Type"/>, <see cref="PropertyInfo"/> and <i>inferred</i> text (being either the corresponding <see cref="DisplayAttribute.Name"/> where specified
-        /// or the <see cref="MemberInfo.Name"/> converted to <see cref="SentenceCase.ToSentenceCase"/>).
-        /// </summary>
-        /// <remarks>Defaults the <see cref="LText.KeyAndOrText"/> to the fully qualified name (being <see cref="Type.FullName"/> + '.' + <see cref="MemberInfo.Name"/>) and the <see cref="LText.FallbackText"/> to the <i>inferred</i> text.</remarks>
-        public static Func<Type, PropertyInfo, string, LText> CreatePropertyLText { get; set; } = (entityType, propertyInfo, text) => new LText($"{entityType.FullName}.{propertyInfo.Name}", text);
-
-        /// <summary>
-        /// Validates, creates and compiles the property expression; whilst also determinig the property friendly <see cref="PropertyExpression{TEntity, TProperty}.Text"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="JsonSerializer.Default"/> where not specified.</param>
-        /// <returns>A <see cref="PropertyExpression{TEntity, TProperty}"/> which contains (in order) the compiled <see cref="System.Func{TEntity, TProperty}"/>, member name and resulting property text.</returns>
-        /// <remarks>Caching is used to improve performance; subsequent calls will return the corresponding cached value.</remarks>
-        public static PropertyExpression<TEntity, TProperty> Create<TEntity, TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, IJsonSerializer? jsonSerializer = null)
-            => PropertyExpression<TEntity, TProperty>.CreateInternal(propertyExpression.ThrowIfNull(nameof(propertyExpression)), DetermineJsonSerializer(jsonSerializer));
-
-        /// <summary>
-        /// Gets the <see cref="PropertyExpression{TEntity, TProperty}"/> from the cache.
-        /// </summary>
-        /// <param name="entityType">The entity <see cref="Type"/>.</param>
-        /// <param name="propertyName">The property name.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="JsonSerializer.Default"/> where not specified.</param>
-        /// <returns>The <see cref="IPropertyExpression"/> where found; otherwise, <c>null</c>.</returns>
-        public static IPropertyExpression? Get(Type entityType, string propertyName, IJsonSerializer? jsonSerializer = null)
-            => (IPropertyExpression?)Cache.Get((entityType, propertyName, DetermineJsonSerializer(jsonSerializer).GetType())) ?? null;
-
-        /// <summary>
-        /// Determine the <see cref="IJsonSerializer"/> by firstly using the <see cref="ExecutionContext.ServiceProvider"/> to find, then falling back to the <see cref="JsonSerializer.Default"/>.
-        /// </summary>
-        /// <returns>The <see cref="IJsonSerializer"/>.</returns>
-        /// <remarks>This does scream <i>Service Locator</i>, which is considered an anti-pattern by some, but this avoids the added complexity of passing the <see cref="IJsonSerializer"/> where most implementations will default to the
-        /// <see cref="CoreEx.Json.JsonSerializer"/> implementation - this just avoids unnecessary awkwardness for sake of purity. Finally, this class is intended for largely internal use only.</remarks>
-        private static IJsonSerializer DetermineJsonSerializer(IJsonSerializer? jsonSerializer) => jsonSerializer ?? ExecutionContext.GetService<IJsonSerializer>() ?? JsonSerializer.Default;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/PropertyExpressionT.cs b/src/CoreEx/Abstractions/Reflection/PropertyExpressionT.cs
deleted file mode 100644
index 8c4c62e7..00000000
--- a/src/CoreEx/Abstractions/Reflection/PropertyExpressionT.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.Localization;
-using CoreEx.RefData;
-using Microsoft.Extensions.Caching.Memory;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Provides property <see cref="Expression"/> capability.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-    /// <remarks>The internal reflection comes at a performance cost; as such the resulting <see cref="PropertyExpression{TEntity, TProperty}"/> is cached using an <see cref="IMemoryCache"/>. The <see cref="PropertyExpression.AbsoluteExpirationTimespan"/>
-    /// and <see cref="PropertyExpression.SlidingExpirationTimespan"/> enable additional basic policy configuration for the cached items.</remarks>
-    public class PropertyExpression<TEntity, TProperty> : IPropertyExpression
-    {
-        private readonly Func<TEntity, TProperty> _getValue;
-        private readonly Action<TEntity, TProperty>? _setValue;
-
-        /// <summary>
-        /// Validates, creates and compiles the property expression; whilst also determinig the property friendly <see cref="Text"/>.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="JsonSerializer.Default"/> where not specified.</param>
-        /// <returns>A <see cref="PropertyExpression{TEntity, TProperty}"/> which contains (in order) the compiled <see cref="System.Func{TEntity, TProperty}"/>, member name and resulting property text.</returns>
-        internal static PropertyExpression<TEntity, TProperty> CreateInternal(Expression<Func<TEntity, TProperty>> propertyExpression, IJsonSerializer jsonSerializer)
-        {
-            if (propertyExpression.ThrowIfNull(nameof(propertyExpression)).Body.NodeType != ExpressionType.MemberAccess)
-                throw new InvalidOperationException("Only Member access expressions are supported.");
-
-            var cache = PropertyExpression.Cache;
-            var me = (MemberExpression)propertyExpression.Body;
-
-            // Check cache and reuse as this is a *really* expensive operation. Key contains: Entity type, property name, and json serializer (in case configuration is different).
-            return cache.GetOrCreate((typeof(TEntity), me.Member.Name, jsonSerializer.GetType()), ce =>
-            {
-                if (PropertyExpression.AbsoluteExpirationTimespan.HasValue)
-                    ce.SetAbsoluteExpiration(PropertyExpression.AbsoluteExpirationTimespan.Value);
-
-                if (PropertyExpression.SlidingExpirationTimespan.HasValue)
-                    ce.SetSlidingExpiration(PropertyExpression.SlidingExpirationTimespan.Value);
-
-                if (me.Member.MemberType != MemberTypes.Property)
-                    throw new InvalidOperationException("Expression results in a Member that is not a Property.");
-
-                if (!me.Member.DeclaringType!.GetTypeInfo().IsAssignableFrom(typeof(TEntity).GetTypeInfo()))
-                    throw new InvalidOperationException("Expression results in a Member for a different Entity class.");
-
-                string name = me.Member.Name;
-
-                // Get the JSON property name (where configured).
-                var isSerializable = jsonSerializer.TryGetJsonName(me.Member, out var jn);
-                if (!isSerializable)
-                {
-                    // Probe corresponding 'Sid' or 'Sids' properties (using the standardised naming convention) where IReferenceData Type.
-                    if (me.Member is PropertyInfo rpi && rpi.PropertyType.IsClass && rpi.PropertyType.GetInterfaces().Contains(typeof(IReferenceData)))
-                    {
-                        var spi = me.Member.DeclaringType!.GetProperty($"{name}Sid") ?? me.Member.DeclaringType.GetProperty($"{name}Sids");
-                        if (spi != null)
-                            jsonSerializer.TryGetJsonName(spi, out jn);
-                    }
-                }
-
-                // Either get the friendly text from a corresponding DisplayAttribute or split the member name into friendlier sentence case text.
-                DisplayAttribute? ca = me.Member.GetCustomAttribute<DisplayAttribute>(true);
-
-                // Create a setter from the getter.
-                var pi = (PropertyInfo)me.Member;
-                Action<TEntity, TProperty>? setValue = null;
-                if (pi.CanWrite)
-                {
-                    var pte = Expression.Parameter(typeof(TEntity), "e");
-                    var ptp = Expression.Parameter(typeof(TProperty), "p");
-                    var exp = Expression.Lambda<Action<TEntity, TProperty>>(Expression.Call(pte, pi.GetSetMethod()!, ptp), pte, ptp);
-                    setValue = exp.Compile();
-                }
-
-                // Create expression (with compilation also).
-                return new PropertyExpression<TEntity, TProperty>(pi, name, jn, ca?.Name, isSerializable, propertyExpression.Compile(), setValue);
-            })!;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyExpression"/> class.
-        /// </summary>
-        private PropertyExpression(PropertyInfo pi, string name, string? jsonName, string? text, bool isSerializable, Func<TEntity, TProperty> getValue, Action<TEntity, TProperty>? setValue)
-        {
-            PropertyInfo = pi;
-            Name = name;
-            JsonName = jsonName;
-            Text = PropertyExpression.CreatePropertyLText(typeof(TEntity), pi, text ?? Name.ToSentenceCase());
-            IsJsonSerializable = isSerializable;
-            IsClass = PropertyInfo.PropertyType.IsClass && PropertyInfo.PropertyType != typeof(string);
-            _getValue = getValue;
-            _setValue = setValue;
-        }
-
-        /// <inheritdoc/>
-        public PropertyInfo PropertyInfo { get; }
-
-        /// <inheritdoc/>
-        public string Name { get; }
-
-        /// <inheritdoc/>
-        public string? JsonName { get; }
-
-        /// <inheritdoc/>
-        public LText Text { get; }
-
-        /// <inheritdoc/>
-        public bool IsJsonSerializable { get;  }
-
-        /// <inheritdoc/>
-        public bool IsClass { get; }
-
-        /// <inheritdoc/>
-        object? IPropertyExpression.GetDefault() => default;
-
-        /// <summary>
-        /// Gets the default value.
-        /// </summary>
-        /// <returns></returns>
-        public TProperty? GetDefault() => default;
-
-        /// <inheritdoc/>
-        object? IPropertyExpression.GetValue(object? entity) => GetValue((TEntity)entity!);
-
-        /// <summary>
-        /// Gets the property value for the given entity.
-        /// </summary>
-        /// <param name="entity">The entity value.</param>
-        /// <returns>The corresponding property value.</returns>
-        public TProperty? GetValue(TEntity? entity) => entity == null ? default : _getValue.Invoke(entity);
-
-        /// <inheritdoc/>
-        void IPropertyExpression.SetValue(object entity, object? value) => SetValue((TEntity)entity, value == null ? default : (TProperty?)value);
-
-        /// <summary>
-        /// Sets the property value for the given entity.
-        /// </summary>
-        /// <param name="entity">The entity value.</param>
-        /// <param name="value">The corresponding property value.</param>
-        public void SetValue(TEntity entity, TProperty? value)
-        {
-            if (_setValue == null)
-                throw new InvalidOperationException($"Property '{Name}' does not support a set (write) operation.");
-
-            _setValue(entity.ThrowIfNull(nameof(entity)), value!);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/PropertyReflector.cs b/src/CoreEx/Abstractions/Reflection/PropertyReflector.cs
deleted file mode 100644
index 2b25b4a4..00000000
--- a/src/CoreEx/Abstractions/Reflection/PropertyReflector.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Provides a reflector for a given <see cref="Type"/> property.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TProperty">The property <see cref="System.Type"/>.</typeparam>
-    public class PropertyReflector<TEntity, TProperty> : IPropertyReflector
-    {
-        private readonly Lazy<Dictionary<string, object?>> _data = new(true);
-        private ITypeReflector? _typeReflector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyReflector{TEntity, TProperty}"/> class.
-        /// </summary>
-        /// <param name="args">The <see cref="TypeReflectorArgs"/>.</param>
-        /// <param name="propertyExpression">The <see cref="LambdaExpression"/> to reference the source entity property.</param>
-        public PropertyReflector(TypeReflectorArgs args, Expression<Func<TEntity, TProperty>> propertyExpression)
-        {
-            Args = args.ThrowIfNull(nameof(args));
-            PropertyExpression = Reflection.PropertyExpression.Create(propertyExpression.ThrowIfNull(nameof(propertyExpression)), args.JsonSerializer);
-            TypeCode = IsClass ? TypeReflectorTypeCode.Complex : TypeReflectorTypeCode.Simple;
-            IsEnumerable = IsClass && (PropertyInfo.PropertyType.IsArray || PropertyInfo.PropertyType.GetInterfaces().Any(x => x == typeof(IEnumerable)));
-            if (IsEnumerable)
-            {
-                _typeReflector = TypeReflector.GetReflector(Args, Type);
-                TypeCode = _typeReflector!.TypeCode;
-            }
-        }
-
-        /// <inheritdoc/>
-        public string Name => PropertyExpression.Name;
-
-        /// <inheritdoc/>
-        public string? JsonName => PropertyExpression.JsonName;
-
-        /// <inheritdoc/>
-        public TypeReflectorArgs Args { get; }
-
-        /// <inheritdoc/>
-        public Dictionary<string, object?> Data { get => _data.Value; }
-
-        /// <inheritdoc/>
-        IPropertyExpression IPropertyReflector.PropertyExpression => PropertyExpression;
-
-        /// <summary>
-        /// Gets the compiled <see cref="PropertyExpression{TEntity, TProperty}"/>.
-        /// </summary>
-        public PropertyExpression<TEntity, TProperty> PropertyExpression { get; }
-
-        /// <inheritdoc/>
-        public PropertyInfo PropertyInfo => PropertyExpression.PropertyInfo;
-
-        /// <inheritdoc/>
-        public bool IsClass => PropertyExpression.IsClass;
-
-        /// <inheritdoc/>
-        public bool IsEnumerable { get; }
-
-        /// <inheritdoc/>
-        public Type EntityType => typeof(TEntity);
-
-        /// <inheritdoc/>
-        public Type Type => typeof(TProperty);
-
-        /// <inheritdoc/>
-        public TypeReflectorTypeCode TypeCode { get; }
-
-        /// <inheritdoc/>
-        public ITypeReflector? GetTypeReflector() => _typeReflector ??= TypeReflector.GetReflector(Args, Type);
-
-        /// <inheritdoc/>
-        bool IPropertyReflector.Compare(object? x, object? y) => Compare((TProperty)(x ?? default(TProperty)!), (TProperty)(y ?? default(TProperty)!));
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="x">The first value.</param>
-        /// <param name="y">The second value.</param>
-        /// <returns><c>true</c> indicates that they are equal; otherwise, <c>false</c>.</returns>
-        public bool Compare(TProperty? x, TProperty? y)
-        {
-            if (ReferenceEquals(x, y))
-                return true;
-
-            var left = x == null ? y : x;
-            var right = x == null ? x : y;
-            if (left == null || right == null)
-                return false;
-
-            if (left is IEquatable<TProperty> eq)
-                return eq.Equals(right!);
-            else if (IsEnumerable)
-                return GetTypeReflector()!.Compare(x, y);
-            else
-                return EqualityComparer<TProperty>.Default.Equals(left, right);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/TypeReflector.cs b/src/CoreEx/Abstractions/Reflection/TypeReflector.cs
deleted file mode 100644
index e86ecdfe..00000000
--- a/src/CoreEx/Abstractions/Reflection/TypeReflector.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Caching.Memory;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Provides common <see cref="Type"/> reflection capabilities.
-    /// </summary>
-    public class TypeReflector
-    {
-        /// <summary>
-        /// Gets all of the properties (<see cref="PropertyInfo"/>) for a <paramref name="type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/> to reflect.</param>
-        /// <param name="bindingFlags">The <see cref="BindingFlags"/>.</param>
-        /// <returns>The corresponding <see cref="PropertyInfo"/> <see cref="Array"/>.</returns>
-        /// <remarks>The default <paramref name="bindingFlags"/> where not overridden are: <see cref="BindingFlags.Public"/>, <see cref="BindingFlags.GetProperty"/>, <see cref="BindingFlags.SetProperty"/> and <see cref="BindingFlags.Instance"/>.</remarks>
-        public static PropertyInfo[] GetProperties(Type type, BindingFlags? bindingFlags = null)
-            => type.ThrowIfNull(nameof(type)).GetProperties(bindingFlags ?? (BindingFlags.Public | BindingFlags.GetProperty | BindingFlags.SetProperty | BindingFlags.Instance))
-                .Where(x => x.GetIndexParameters().Length == 0).GroupBy(x => x.Name).Select(g => g.First()).ToArray();
-
-        /// <summary>
-        /// Gets the <see cref="PropertyInfo"/> for a <paramref name="type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/> to reflect.</param>
-        /// <param name="propertyName">The property name to find.</param>
-        /// <param name="bindingFlags">The <see cref="BindingFlags"/>.</param>
-        /// <returns>The corresponding <see cref="PropertyInfo"/> where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>The default <paramref name="bindingFlags"/> where not overridden are: <see cref="BindingFlags.Public"/>, <see cref="BindingFlags.GetProperty"/>, <see cref="BindingFlags.SetProperty"/> and <see cref="BindingFlags.Instance"/>.</remarks>
-        public static PropertyInfo? GetPropertyInfo(Type type, string propertyName, BindingFlags? bindingFlags = null)
-        {
-            var pis = type.ThrowIfNull(nameof(type)).GetProperties(bindingFlags ?? (BindingFlags.Public | BindingFlags.GetProperty | BindingFlags.SetProperty | BindingFlags.Instance))
-                .Where(x => x.Name == propertyName.ThrowIfNull(nameof(propertyName))).ToArray();
-
-            return pis.Length switch
-            {
-                0 => null,
-                1 => pis[0],
-                _ => pis.FirstOrDefault(x => x.DeclaringType == type) ?? pis.First()
-            };
-        }
-
-        /// <summary>
-        /// Gets (creates) the cached <see cref="TypeReflector{TEntity}"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="args">The <see cref="TypeReflectorArgs"/>.</param>
-        /// <returns>The <see cref="TypeReflector{TEntity}"/>.</returns>
-        public static TypeReflector<TEntity> GetReflector<TEntity>(TypeReflectorArgs? args = null)
-            => (args ??= TypeReflectorArgs.Default).Cache.GetOrCreate(typeof(TEntity), ce =>
-            {
-                var tr = new TypeReflector<TEntity>(args);
-                args.TypeBuilder?.Invoke(tr);
-                return (TypeReflector<TEntity>)ConfigureCacheEntry(ce, tr);
-            })!;
-
-        /// <summary>
-        /// Gets the <see cref="ITypeReflector"/> for the specified <paramref name="type"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="TypeReflectorArgs"/>.</param>
-        /// <param name="type">The entity <see cref="Type"/>.</param>
-        /// <returns>The <see cref="ITypeReflector"/>.</returns>
-        public static ITypeReflector GetReflector(TypeReflectorArgs? args, Type type) 
-            => (args ??= TypeReflectorArgs.Default).Cache.GetOrCreate(type.ThrowIfNull(nameof(args)), ce =>
-            {
-                var ec = typeof(TypeReflector<>).MakeGenericType(type).GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic, null, [typeof(TypeReflectorArgs)], null)!;
-                var tr = (ITypeReflector)ec.Invoke([args]);
-                args.TypeBuilder?.Invoke(tr);
-                return ConfigureCacheEntry(ce, tr);
-            })!;
-
-        /// <summary>
-        /// Configure the cache entry setting expirations.
-        /// </summary>
-        private static ITypeReflector ConfigureCacheEntry(ICacheEntry ce, ITypeReflector tr)
-        {
-            ce.SetAbsoluteExpiration(tr.Args.AbsoluteExpirationTimespan);
-            ce.SetSlidingExpiration(tr.Args.SlidingExpirationTimespan);
-            return tr;
-        }
-
-        #region Collections
-
-        /// <summary>
-        /// Gets the underlying item <see cref="Type"/> where an <see cref="Array"/>, <see cref="IDictionary"/>, <see cref="ICollection"/> or <see cref="IEnumerable"/>. 
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/>.</param>
-        /// <returns>The <see cref="TypeReflectorTypeCode"/> and corresponding item <see cref="Type"/> where a collection.</returns>
-        public static (TypeReflectorTypeCode TypeCode, Type? ItemType) GetCollectionItemType(Type type)
-        {
-            if ((type.ThrowIfNull(nameof(type))) == typeof(string) || type.IsPrimitive || type.IsValueType)
-                return (TypeReflectorTypeCode.Simple, null);
-
-            if (type.IsArray)
-                return (TypeReflectorTypeCode.Array, type.GetElementType());
-
-            var (_, valueType) = GetDictionaryType(type);
-            if (valueType != null)
-                return (TypeReflectorTypeCode.IDictionary, valueType);
-
-            var t = GetCollectionType(type);
-            if (t != null)
-                return (TypeReflectorTypeCode.ICollection, t);
-
-            t = GetEnumerableType(type);
-            if (t != null)
-                return (TypeReflectorTypeCode.IEnumerable, t);
-
-            var (ItemType, _) = GetEnumerableTypeFromAdd(type);
-            if (ItemType != null)
-                return (TypeReflectorTypeCode.IEnumerable, ItemType);
-
-            return (TypeReflectorTypeCode.Complex, null);
-        }
-
-        /// <summary>
-        /// Gets the underlying <see cref="ICollection{T}"/> Type.
-        /// </summary>
-        private static Type? GetCollectionType(Type type)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(ICollection<>))
-                return type.GetGenericArguments()[0];
-
-            var t = type.GetInterfaces().FirstOrDefault(x => x.GetTypeInfo().IsGenericType && x.GetGenericTypeDefinition() == typeof(ICollection<>));
-            if (t == null)
-                return null;
-
-            return ((t == typeof(ICollection<>)) ? type : t).GetGenericArguments()[0];
-        }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IEnumerable"/> Type.
-        /// </summary>
-        private static Type? GetEnumerableType(Type type)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
-                return type.GetGenericArguments()[0];
-
-            var t = type.GetInterfaces().FirstOrDefault(x => x.GetTypeInfo().IsGenericType && x.GetGenericTypeDefinition() == typeof(IEnumerable<>));
-            if (t == null)
-            {
-                t = type.GetInterfaces().FirstOrDefault(x => x == typeof(IEnumerable));
-                if (t == null)
-                    return null;
-            }
-
-            var gas = ((t == typeof(IEnumerable)) ? type : t).GetGenericArguments();
-            if (gas.Length == 0)
-                return null;
-
-            if (type == typeof(IEnumerable<>).MakeGenericType([gas[0]]))
-                return gas[0];
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IDictionary{TKey, TValue}"/> Types.
-        /// </summary>
-        public static (Type? keyType, Type? valueType) GetDictionaryType(Type type)
-        {
-            Type? t;
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IDictionary<,>))
-                t = type;
-            else
-                t = type.GetInterfaces().FirstOrDefault(x => (x.GetTypeInfo().IsGenericType && x.GetGenericTypeDefinition() == typeof(IDictionary<,>)));
-
-            if (t == null)
-                return (null, null);
-
-            var gas = t.GetGenericArguments();
-            if (gas.Length != 2)
-                return (null, null);
-
-            return (gas[0], gas[1]);
-        }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IEnumerable"/> Type by inferring from the Add method.
-        /// </summary>
-        private static (Type? ItemType, MethodInfo? AddMethod) GetEnumerableTypeFromAdd(Type type)
-        {
-            var mi = type.GetMethod("Add");
-            if (mi == null)
-                return (null, null);
-
-            var ps = mi.GetParameters();
-            return ps.Length == 1 ? (ps[0].ParameterType, mi) : (null, null);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/TypeReflectorArgs.cs b/src/CoreEx/Abstractions/Reflection/TypeReflectorArgs.cs
deleted file mode 100644
index 4f77d526..00000000
--- a/src/CoreEx/Abstractions/Reflection/TypeReflectorArgs.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Reflection;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Provides the arguments passed to and through a <see cref="TypeReflector"/>.
-    /// </summary>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    /// <param name="cache">The <see cref="IReflectionCache"/> to use versus instantiating each <see cref="TypeReflector"/> per use (expensive operation).</param>
-    public class TypeReflectorArgs(IJsonSerializer? jsonSerializer = null, IReflectionCache? cache = null)
-    {
-        private static readonly Lazy<TypeReflectorArgs> _default = new(() => new TypeReflectorArgs());
-
-        /// <summary>
-        /// Gets the default <see cref="TypeReflectorArgs"/>.
-        /// </summary>
-        public static TypeReflectorArgs Default => (ExecutionContext.HasCurrent ? ExecutionContext.Current?.ServiceProvider?.GetService<TypeReflectorArgs>() : null) ?? _default.Value;
-
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public IJsonSerializer JsonSerializer { get; } = jsonSerializer ?? Json.JsonSerializer.Default;
-
-        /// <summary>
-        /// Gets the <see cref="IMemoryCache"/> to use versus instantiating each <see cref="TypeReflector"/> per use.
-        /// </summary>
-        /// <remarks>The <see cref="AbsoluteExpirationTimespan"/> and <see cref="SlidingExpirationTimespan"/> enable additional basic policy configuration for the cached items.</remarks>
-        public IMemoryCache Cache { get; } = (MemoryCache?)cache ?? new MemoryCache(new MemoryCacheOptions());
-
-        /// <summary>
-        /// Gets or sets the <see cref="IMemoryCache"/> absolute expiration <see cref="TimeSpan"/>. Default to <c>24</c> hours.
-        /// </summary>
-        public TimeSpan AbsoluteExpirationTimespan { get; set; } = TimeSpan.FromHours(24);
-
-        /// <summary>
-        /// Gets or sets the <see cref="IMemoryCache"/> sliding expiration <see cref="TimeSpan"/>. Default to <c>30</c> minutes.
-        /// </summary>
-        public TimeSpan SlidingExpirationTimespan { get; set; } = TimeSpan.FromMinutes(30);
-
-        /// <summary>
-        /// Gets or sets the action to invoke to perform additional logic when reflecting/building the <b>entity</b> <see cref="Type"/>.
-        /// </summary>
-        public Action<ITypeReflector>? TypeBuilder { get; set; } = null;
-
-        /// <summary>
-        /// Indicates whether to automatically populate the entity properties. Defaults to <c>true</c>.
-        /// </summary>
-        /// <remarks>Will invoked the optional <see cref="PropertyBuilder"/> as each property is being added.</remarks>
-        public bool AutoPopulateProperties { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the function to invoke to perform additional logic when reflecting/building the <b>property</b> <see cref="Type"/>; the result determines whether the
-        /// property should be included (<c>true</c>) or not (<c>false</c>) within the underlying properties collection.
-        /// </summary>
-        public Func<IPropertyReflector, bool>? PropertyBuilder { get; set; } = null;
-
-        /// <summary>
-        /// Defines the <see cref="StringComparer"/> for finding the property/JSON names (defaults to <see cref="StringComparer.Ordinal"/>).
-        /// </summary>
-        public StringComparer NameComparer { get; set; } = StringComparer.Ordinal;
-
-        /// <summary>
-        /// Gets or sets the <see cref="BindingFlags"/> override when getting the properties for the <see cref="Type"/>. Defaults to <c>null</c> (use the default).
-        /// </summary>
-        public BindingFlags? PropertyBindingFlags { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/TypeReflectorT.cs b/src/CoreEx/Abstractions/Reflection/TypeReflectorT.cs
deleted file mode 100644
index 2f8ecc8d..00000000
--- a/src/CoreEx/Abstractions/Reflection/TypeReflectorT.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq.Expressions;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Provides a reflector for a given <see cref="Type"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-    public class TypeReflector<TEntity> : ITypeReflector
-    {
-        private readonly Dictionary<string, IPropertyReflector> _properties;
-        private readonly Dictionary<string, IPropertyReflector> _jsonProperties;
-        private readonly Lazy<Dictionary<string, object?>> _data = new(true);
-        private IItemEqualityComparer? _itemEqualityComparer;
-        private ITypeReflector? _itemReflector;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypeReflector{TEntity}"/> class.
-        /// </summary>
-        /// <param name="args">The optional <see cref="TypeReflectorArgs"/>. Defaults to <see cref="TypeReflectorArgs.Default"/>.</param>
-        internal TypeReflector(TypeReflectorArgs? args = null)
-        {
-            Args = args ?? TypeReflectorArgs.Default;
-            _properties = new Dictionary<string, IPropertyReflector>(StringComparer.Ordinal);
-            _jsonProperties = new Dictionary<string, IPropertyReflector>(Args.NameComparer ?? StringComparer.OrdinalIgnoreCase);
-
-            var tr = TypeReflector.GetCollectionItemType(Type);
-            ItemType = tr.ItemType;
-            TypeCode = tr.TypeCode;
-            if (ItemType != null)
-                ItemTypeCode = TypeReflector.GetCollectionItemType(ItemType).TypeCode;
-
-            if (!Args.AutoPopulateProperties)
-                return;
-
-            var pe = Expression.Parameter(typeof(TEntity), "x");
-
-            foreach (var p in TypeReflector.GetProperties(typeof(TEntity), Args.PropertyBindingFlags))
-            {
-                var lex = Expression.Lambda(Expression.Property(pe, p), pe);
-                var pr = (IPropertyReflector)Activator.CreateInstance(typeof(PropertyReflector<,>).MakeGenericType(typeof(TEntity), p.PropertyType), Args, lex)!;
-
-                if (Args.PropertyBuilder != null && !Args.PropertyBuilder(pr))
-                    continue;
-
-                AddProperty(pr);
-            }
-        }
-
-        /// <inheritdoc/>
-        public TypeReflectorArgs Args { get; private set; }
-
-        /// <inheritdoc/>
-        public Type Type => typeof(TEntity);
-
-        /// <inheritdoc/>
-        public TypeReflectorTypeCode TypeCode { get; }
-
-        /// <inheritdoc/>
-        public Type? ItemType { get; }
-
-        /// <inheritdoc/>
-        public TypeReflectorTypeCode? ItemTypeCode { get; }
-
-        /// <inheritdoc/>
-        public Dictionary<string, object?> Data { get => _data.Value; }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyReflector{TEntity, TProperty}"/> to the reflector.
-        /// </summary>
-        /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the entity property.</param>
-        /// <returns>The <see cref="PropertyReflector{TEntity, TProperty}"/>.</returns>
-        public PropertyReflector<TEntity, TProperty> Property<TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression)
-        {
-            var pr = new PropertyReflector<TEntity, TProperty>(Args, propertyExpression.ThrowIfNull(nameof(propertyExpression)));
-            AddProperty(pr);
-            return pr;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="IPropertyReflector"/> to the underlying property collections.
-        /// </summary>
-        private void AddProperty(IPropertyReflector propertyReflector)
-        {
-            if (_properties.ContainsKey(propertyReflector.ThrowIfNull(nameof(propertyReflector)).Name))
-                throw new ArgumentException($"Property with name '{propertyReflector.Name}' can not be specified more than once.", nameof(propertyReflector));
-
-            if (propertyReflector.PropertyExpression.IsJsonSerializable && propertyReflector.JsonName != null)
-            {
-                if (_jsonProperties.ContainsKey(propertyReflector.JsonName))
-                    throw new ArgumentException($"Property with name '{propertyReflector.JsonName}' can not be specified more than once.", nameof(propertyReflector));
-
-                _jsonProperties.Add(propertyReflector.JsonName, propertyReflector);
-            }
-
-            _properties.Add(propertyReflector.Name, propertyReflector);
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetProperty(string name, [NotNullWhen(true)] out IPropertyReflector? property) => _properties.TryGetValue(name, out property);
-
-        /// <inheritdoc/>
-        public IPropertyReflector GetProperty(string name)
-        {
-            _properties.TryGetValue(name, out var value);
-            return value ?? throw new ArgumentException($"Property '{name}' not found for type '{Type.Name}'.", nameof(name));
-        }
-
-        /// <inheritdoc/>
-        public IPropertyReflector? GetJsonProperty(string jsonName)
-        {
-            _jsonProperties.TryGetValue(jsonName, out var value);
-            return value;
-        }
-
-        /// <summary>
-        /// Gets all the properties.
-        /// </summary>
-        public IEnumerable<IPropertyReflector> GetProperties() => _properties.Values;
-
-        /// <inheritdoc/>
-        public ITypeReflector? GetItemTypeReflector() => _itemReflector ??= TypeReflector.GetReflector(Args, ItemType!);
-
-        #region Compare
-
-        /// <inheritdoc/>
-        bool ITypeReflector.Compare(object? x, object? y) => Compare((TEntity?)x, (TEntity?)y);
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="x">The first value.</param>
-        /// <param name="y">The second value.</param>
-        /// <returns><c>true</c> indicates that they are equal; otherwise, <c>false</c>.</returns>
-        public bool Compare(TEntity? x, TEntity? y)
-        {
-            if (ReferenceEquals(x, y))
-                return true;
-
-            var left = x ?? y;
-            var right = x == null ? x : y;
-            if (left == null || right == null)
-                return false;
-
-            if (left is IEquatable<TEntity> eq)
-                return eq.Equals(right!);
-            else if (ItemTypeCode.HasValue)
-                return CompareSequence(x, y);
-            else
-                return EqualityComparer<TEntity>.Default.Equals(left, right);
-        }
-
-        /// <summary>
-        /// Determines whether two sequences are equal by comparing the elements by using the default equality comparer for their type.
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The second value.</param>
-        /// <returns><c>true</c> if the two source sequences are of equal length and their corresponding elements are equal according to the default equality comparer for their type; otherwise, <c>false</c>.</returns>
-        private bool CompareSequence(object? left, object? right)
-        {
-            _itemEqualityComparer ??= (IItemEqualityComparer)Activator.CreateInstance(typeof(ItemEqualityComparer<>).MakeGenericType(ItemType!))!;
-
-            switch (TypeCode)
-            {
-                case TypeReflectorTypeCode.Array:
-                    var al = (Array)left!;
-                    var ar = (Array)right!;
-                    if (al.Length != ar.Length)
-                        return false;
-
-                    break;
-
-                case TypeReflectorTypeCode.ICollection:
-                    var cl = (ICollection)left!;
-                    var cr = (ICollection)right!;
-                    if (cl.Count != cr.Count)
-                        return false;
-
-                    break;
-
-                case TypeReflectorTypeCode.IDictionary:
-                    var dl = (IDictionary)left!;
-                    var dr = (IDictionary)right!;
-                    if (dl.Count != dr.Count)
-                        return false;
-
-                    var edl = dl.GetEnumerator();
-                    while (edl.MoveNext())
-                    {
-                        if (!dr.Contains(edl.Key))
-                            return false;
-
-                        if (!_itemEqualityComparer!.IsEqual(edl.Value!, dr[edl.Key]!))
-                            return false;
-                    }
-
-                    return true;
-            }
-
-            // Inspired by: https://referencesource.microsoft.com/#System.Core/System/Linq/Enumerable.cs,9bdd6ef7ba6a5615
-            var el = ((IEnumerable)left!).GetEnumerator();
-            var er = ((IEnumerable)right!).GetEnumerator();
-            while (el.MoveNext())
-            {
-                if (!(er.MoveNext() && _itemEqualityComparer!.IsEqual(el.Current, er.Current)))
-                    return false;
-            }
-
-            if (er.MoveNext())
-                return false;
-
-            return true;
-        }
-
-        #endregion
-    }
-
-    /// <summary>
-    /// Enables a non-generics equality comparer.
-    /// </summary>
-    internal interface IItemEqualityComparer
-    {
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="x">The first value.</param>
-        /// <param name="y">The second value.</param>
-        /// <returns><c>true</c> indicates that they are equal; otherwise, <c>false</c>.</returns>
-        bool IsEqual(object x, object y);
-    }
-
-    /// <summary>
-    /// Provides the non-generics equality generic comparer; leveraging the generics comparer within.
-    /// </summary>
-    internal class ItemEqualityComparer<T> : IItemEqualityComparer
-    {
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="x">The first value.</param>
-        /// <param name="y">The second value.</param>
-        /// <returns><c>true</c> indicates that they are equal; otherwise, <c>false</c>.</returns>
-        public bool IsEqual(object x, object y) => EqualityComparer<T>.Default.Equals((T)x, (T)y);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Reflection/TypeReflectorTypeCode.cs b/src/CoreEx/Abstractions/Reflection/TypeReflectorTypeCode.cs
deleted file mode 100644
index a29b95be..00000000
--- a/src/CoreEx/Abstractions/Reflection/TypeReflectorTypeCode.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Abstractions.Reflection
-{
-    /// <summary>
-    /// Represents the <see cref="TypeReflector"/> <see cref="Type"/> code.
-    /// </summary>
-    public enum TypeReflectorTypeCode
-    {
-        /// <summary>
-        /// Is a <c>struct</c> or <see cref="string"/>, i.e. not any of the others.
-        /// </summary>
-        Simple,
-
-        /// <summary>
-        /// Is a complex type being a class with properties (not identified as one of the possible collection types).
-        /// </summary>
-        Complex,
-
-        /// <summary>
-        /// Is an <see cref="System.Array"/>.
-        /// </summary>
-        Array,
-
-        /// <summary>
-        /// Is an <see cref="System.Collections.ICollection"/>.
-        /// </summary>
-        ICollection,
-
-        /// <summary>
-        /// Is an <see cref="System.Collections.IEnumerable"/>.
-        /// </summary>
-        IEnumerable,
-
-        /// <summary>
-        /// Is an <see cref="System.Collections.IDictionary"/>.
-        /// </summary>
-        IDictionary,
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Abstractions/Resource.cs b/src/CoreEx/Abstractions/Resource.cs
index b60f6082..133b7f09 100644
--- a/src/CoreEx/Abstractions/Resource.cs
+++ b/src/CoreEx/Abstractions/Resource.cs
@@ -1,68 +1,44 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Abstractions;
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace CoreEx.Abstractions
+/// <summary>
+/// Provides utility functionality for embedded resources. 
+/// </summary>
+public static class Resource
 {
     /// <summary>
-    /// Provides utility functionality for embedded resources. 
+    /// Gets the named embedded resource <see cref="Stream"/> from the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
     /// </summary>
-    public static class Resource
-    {
-        /// <summary>
-        /// Gets the named embedded resource <see cref="Stream"/> from the specified <paramref name="assembly"/>.
-        /// </summary>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
-        /// <returns>The <see cref="Stream"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.</returns>
-        public static Stream GetStream(string resourceName, Assembly? assembly = null)
-        {
-            assembly ??= Assembly.GetCallingAssembly();
-            var coll = assembly.GetManifestResourceNames().Where(x => x.EndsWith(resourceName, StringComparison.OrdinalIgnoreCase));
-            return coll.Count() switch
-            {
-                0 => throw new ArgumentException($"No embedded resource ending with '{resourceName}' was found in {assembly.FullName}.", nameof(resourceName)),
-                1 => assembly.GetManifestResourceStream(coll.First())!,
-                _ => GetPrefixedStream(resourceName, assembly)
-            };
-        }
+    /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> to find manifest resources (see <see cref="Assembly.GetManifestResourceStream(string)"/>).</typeparam>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
+    /// <returns>The <see cref="Stream"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.</returns>
+    public static Stream GetStream<TResource>(string resourceName) => GetStream(resourceName, typeof(TResource).Assembly);
 
-        /// <summary>
-        /// Multiple resources found so try prefixed stream as a fallback before failing.
-        /// </summary>
-        private static Stream GetPrefixedStream(string resourceName, Assembly assembly)
+    /// <summary>
+    /// Gets the named embedded resource <see cref="Stream"/> from the specified <paramref name="assembly"/>.
+    /// </summary>
+    /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
+    /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
+    /// <returns>The <see cref="Stream"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.</returns>
+    public static Stream GetStream(string resourceName, Assembly? assembly = null)
+    {
+        assembly ??= Assembly.GetCallingAssembly();
+        var coll = assembly.GetManifestResourceNames().Where(x => x.EndsWith(resourceName.ThrowIfNullOrEmpty(), StringComparison.OrdinalIgnoreCase));
+        return coll.Count() switch
         {
-            if (resourceName.Length == 0 || resourceName[0] == '.')
-                throw new ArgumentException($"More than one embedded resource ending with '{resourceName}' was found in {assembly.FullName}.", nameof(resourceName));
-
-            return GetStream("." + resourceName, assembly);
-        }
-
-        /// <summary>
-        /// Gets the named embedded resource <see cref="Stream"/> from the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> to find manifest resources (see <see cref="Assembly.GetManifestResourceStream(string)"/>).</typeparam>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <returns>The <see cref="Stream"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.</returns>
-        public static Stream GetStream<TResource>(string resourceName) => GetStream(resourceName, typeof(TResource).Assembly);
+            0 => throw new ArgumentException($"No embedded resource ending with '{resourceName}' was found in '{assembly.FullName}'.", nameof(resourceName)),
+            1 => assembly.GetManifestResourceStream(coll.First())!,
+            _ => GetPrefixedStream(resourceName, assembly)
+        };
+    }
 
-        /// <summary>
-        /// Gets the named embedded resource <see cref="StreamReader"/> from the specified <paramref name="assembly"/>.
-        /// </summary>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <param name="assembly">The <see cref="Assembly"/> that contains the embedded resource; defaults to <see cref="Assembly.GetCallingAssembly"/>.</param>
-        /// <returns>The <see cref="StreamReader"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.</returns>
-        public static StreamReader GetStreamReader(string resourceName, Assembly? assembly = null) => new(GetStream(resourceName, assembly ?? Assembly.GetCallingAssembly()));
+    /// <summary>
+    /// Multiple resources found so try prefixed stream as a fallback before failing.
+    /// </summary>
+    private static Stream GetPrefixedStream(string resourceName, Assembly assembly)
+    {
+        if (resourceName.Length == 0 || resourceName[0] == '.')
+            throw new ArgumentException($"More than one embedded resource ending with '{resourceName}' was found in '{assembly.FullName}'.", nameof(resourceName));
 
-        /// <summary>
-        /// Gets the named embedded resource <see cref="StreamReader"/> from the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> to find manifest resources (see <see cref="Assembly.GetManifestResourceStream(string)"/>).</typeparam>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <returns>The <see cref="StreamReader"/>; otherwise, an <see cref="ArgumentException"/> will be thrown.</returns>
-        public static StreamReader GetStreamReader<TResource>(string resourceName) => GetStreamReader(resourceName, typeof(TResource).Assembly);
+        return GetStream("." + resourceName, assembly);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/AuthenticationException.cs b/src/CoreEx/AuthenticationException.cs
index 9e6b976c..a6b8e4cd 100644
--- a/src/CoreEx/AuthenticationException.cs
+++ b/src/CoreEx/AuthenticationException.cs
@@ -1,72 +1,31 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents an <b>Authentication</b> exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>An authentication error occurred; the credentials provided are not valid.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class AuthenticationException(LText? message, Exception? innerException) 
+    : ExtendedException<AuthenticationException>(message ?? new LText(typeof(AuthenticationException).FullName, _message), innerException)
 {
+    private const string _message = "An authentication error occurred; the credentials provided are not valid.";
+
     /// <summary>
-    /// Represents an <b>Authentication</b> exception.
+    /// Initializes a new instance of the <see cref="AuthenticationException"/> class.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>An authentication error occured; the credentials you provided are not valid.</i></remarks>
-    public class AuthenticationException : Exception, IExtendedException
-    {
-        private const string _message = "An authentication error occurred; the credentials you provided are not valid.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<AuthenticationException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationException"/> class.
-        /// </summary>
-        public AuthenticationException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public AuthenticationException(string? message) : base(message ?? new LText(typeof(AuthenticationException).FullName, _message)) { }
+    public AuthenticationException() : this(null) { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthenticationException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public AuthenticationException(string? message, Exception innerException) : base(message ?? new LText(typeof(AuthenticationException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.AuthenticationError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.AuthenticationError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.AuthenticationError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.AuthenticationError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.Unauthorized"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.Unauthorized;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AuthenticationException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public AuthenticationException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "authentication";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.Unauthorized);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/AuthorizationException.cs b/src/CoreEx/AuthorizationException.cs
index a912030e..aeb560cb 100644
--- a/src/CoreEx/AuthorizationException.cs
+++ b/src/CoreEx/AuthorizationException.cs
@@ -1,72 +1,31 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents an <b>Authorization</b> exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>An authorization error occurred; you are not permitted to perform this action.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class AuthorizationException(LText? message, Exception? innerException) 
+    : ExtendedException<AuthorizationException>(message ?? new LText(typeof(AuthorizationException).FullName, _message), innerException)
 {
+    private const string _message = "An authorization error occurred; you are not permitted to perform this action.";
+
     /// <summary>
-    /// Represents an <b>Authorization</b> exception.
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>An authorization error occurred; you are not permitted to perform this action.</i></remarks>
-    public class AuthorizationException : Exception, IExtendedException
-    {
-        private const string _message = "An authorization error occurred; you are not permitted to perform this action.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<AuthorizationException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthorizationException"/> class.
-        /// </summary>
-        public AuthorizationException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthorizationException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public AuthorizationException(string? message) : base(message ?? new LText(typeof(AuthorizationException).FullName, _message)) { }
+    public AuthorizationException() : this(null) { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AuthorizationException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public AuthorizationException(string? message, Exception innerException) : base(message ?? new LText(typeof(AuthorizationException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.AuthorizationError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.AuthorizationError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.AuthorizationError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.AuthorizationError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.Forbidden"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.Forbidden;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AuthorizationException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public AuthorizationException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "authorization";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.Forbidden);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/BusinessException.cs b/src/CoreEx/BusinessException.cs
index 26cf68b3..64ff4a3c 100644
--- a/src/CoreEx/BusinessException.cs
+++ b/src/CoreEx/BusinessException.cs
@@ -1,73 +1,34 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a <b>Business</b> exception.
+/// </summary>
+/// <remarks>This is a special purpose exception intended for a business-oriented error that could be returned to the consumer as-is. These are typically errors that are unlikely to be known upfront by the consuming
+/// application and would be difficult to guard against. These are likely to occur regularly in a correctly functioning system. For example, a business rule violation such as "Customer cannot be deleted as they have
+/// active orders" would be a good candidate for this type of exception. As distinct from a <see cref="ValidationException"/> which is intended for known/expected errors, for example, "Customer name is required".
+/// <para>There is no default <see cref="Exception.Message"/>.</para></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class BusinessException(LText? message, Exception? innerException) 
+    : ExtendedException<BusinessException>(message ?? new LText(typeof(BusinessException).FullName, _message), innerException)
 {
+    private const string _message = "A business error occurred.";
+
     /// <summary>
-    /// Represents a <b>Business</b> exception.
+    /// Gets the business error type.
     /// </summary>
-    /// <remarks>This is typically used for a business-oriented error that should be returned to the consumer.
-    /// <para>The <see cref="Exception.Message"/> defaults to: <i>A business error occurred.</i></para></remarks>
-    public class BusinessException : Exception, IExtendedException
-    {
-        private const string _message = "A business error occurred.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<BusinessException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BusinessException"/> class.
-        /// </summary>
-        public BusinessException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BusinessException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public BusinessException(string? message) : base(message ?? new LText(typeof(BusinessException).FullName, _message)) { }
+    public const string BusinessErrorType = "business";
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BusinessException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public BusinessException(string? message, Exception innerException) : base(message ?? new LText(typeof(BusinessException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.BusinessError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.BusinessError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.BusinessError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.BusinessError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.BadRequest"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.BadRequest;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BusinessException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public BusinessException(LText? message) : this(message.ThrowIfNull(), null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = BusinessErrorType;
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.BadRequest);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Caching/CacheStrategy.cs b/src/CoreEx/Caching/CacheStrategy.cs
new file mode 100644
index 00000000..dca01c11
--- /dev/null
+++ b/src/CoreEx/Caching/CacheStrategy.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.Caching;
+
+/// <summary>
+/// Represents the underlying cache strategy.
+/// </summary>
+[Flags]
+public enum CacheStrategy
+{
+    /// <summary>
+    /// Caching is applied locally; generally in-memory.
+    /// </summary>
+    Local = 1,
+
+    /// <summary>
+    /// Caching is applied in a distributed manner.
+    /// </summary>
+    Distributed = 2,
+
+    /// <summary>
+    /// Indicates caching is applied both <see cref="Local"/> (L1) and <see cref="Distributed"/> (L2).
+    /// </summary>
+    Hybrid = Local | Distributed,
+}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/DefaultCacheKeyProvider.cs b/src/CoreEx/Caching/DefaultCacheKeyProvider.cs
new file mode 100644
index 00000000..c4bce7c5
--- /dev/null
+++ b/src/CoreEx/Caching/DefaultCacheKeyProvider.cs
@@ -0,0 +1,26 @@
+namespace CoreEx.Caching;
+
+/// <summary>
+/// Provides the default implementation of <see cref="ICacheKeyProvider"/>.
+/// </summary>
+/// <param name="hostSettings">The optional <see cref="IHostSettings"/>.</param>
+/// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+/// <remarks>This implementation uses <see cref="IHostSettings.DomainName"/> and <see cref="ExecutionContext.TenantId"/> to provide namespacing/partitioning of cache keys where applicable.</remarks>
+public sealed class DefaultCacheKeyProvider(IHostSettings? hostSettings = null, ExecutionContext? executionContext = null) : ICacheKeyProvider
+{
+    private readonly IHostSettings? _hostSettings = hostSettings;
+    private readonly ExecutionContext? _executionContext = executionContext;
+
+    /// <inheritdoc/>
+    /// <remarks>This implementation uses the following format: '<c>{DomainName}:{TenantId}:{Key}</c>' where <c>DomainName</c> is obtained from <see cref="IHostSettings.DomainName"/> and <c>TenantId</c> is obtained from <see cref="ExecutionContext.TenantId"/>.
+    /// Where either value is not available, it is simply omitted along with the associated colon ('<c>:</c>').</remarks>
+    public string GetFullyQualifiedCacheKey(string key) => _hostSettings is null
+        ? _executionContext?.TenantId is null ? key : $"{_executionContext.TenantId}:{key}"
+        : _executionContext?.TenantId is null ? $"{_hostSettings.DomainName}:{key}" : $"{_hostSettings.DomainName}:{_executionContext.TenantId}:{key}";
+
+    /// <inheritdoc/>
+    /// <remarks>This implementation uses the <see cref="IEntityKey"/> <see cref="Type"/> <see cref="MemberInfo.Name"/> of <typeparamref name="T"/> as a prefix, then a '<c>:</c>', followed by the <see cref="CompositeKey.ToString()"/>. For example, 
+    /// the '<c>CoreEx.Testing.Product</c>' class with a key or 'Abc' would result in '<c>Product:Abc</c>'.
+    /// </remarks>
+    public string GetEntityCacheKey<T>(CompositeKey key) where T : IEntityKey => $"{typeof(T).Name}:{key.ToString() ?? string.Empty}";
+}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/HybridCacheEntryOptions.cs b/src/CoreEx/Caching/HybridCacheEntryOptions.cs
new file mode 100644
index 00000000..b2847809
--- /dev/null
+++ b/src/CoreEx/Caching/HybridCacheEntryOptions.cs
@@ -0,0 +1,121 @@
+namespace CoreEx.Caching;
+
+/// <summary>
+/// Provides the <see cref="IHybridCache"/> entry options, including strategy, expiration and tags.
+/// </summary>
+public record class HybridCacheEntryOptions
+{
+    private static CacheStrategy? _defaultStrategy;
+    private static TimeSpan? _defaultLocalExpiration;
+    private static TimeSpan? _defaultDistributedExpiration;
+
+    /// <summary>
+    /// Gets or sets the default <see cref="Strategy"/>.
+    /// </summary>
+    /// <remarks>Defaults to settings '<c>CoreEx:Caching:DefaultStrategy</c>'; otherwise, <see cref="CacheStrategy.Hybrid"/>.</remarks>
+    public static CacheStrategy DefaultStrategy
+    {
+        get => _defaultStrategy ??= Internal.GetConfigurationValue("CoreEx:Caching:DefaultStrategy", CacheStrategy.Hybrid);
+        set => _defaultStrategy = value;
+    }
+
+    /// <summary>
+    /// Gets or sets the default <see cref="LocalExpiration"/>.
+    /// </summary>
+    /// <remarks>Defaults to settings '<c>CoreEx:Caching:DefaultLocalExpiration</c>'; otherwise, five (<c>5</c>) minutes.</remarks>
+    public static TimeSpan DefaultLocalExpiration
+    {
+        get => _defaultLocalExpiration ??= Internal.GetConfigurationValue("CoreEx:Caching:DefaultLocalExpiration", TimeSpan.FromMinutes(5));
+        set => _defaultLocalExpiration = value;
+    }
+
+    /// <summary>
+    /// Gets or sets the default <see cref="LocalExpiration"/>.
+    /// </summary>
+    /// <remarks>Defaults to settings '<c>CoreEx:Caching:DistributedExpiration</c>'; otherwise, five (<c>5</c>) minutes.</remarks>
+    public static TimeSpan DefaultDistributedExpiration
+    {
+        get => _defaultDistributedExpiration ??= Internal.GetConfigurationValue("CoreEx:Caching:DefaultDistributedExpiration", TimeSpan.FromMinutes(5));
+        set => _defaultDistributedExpiration = value;
+    }
+
+    /// <summary>
+    /// Creates a new <see cref="HybridCacheEntryOptions"/> using the defaults.
+    /// </summary>
+    /// <returns>The <see cref="HybridCacheEntryOptions"/>.</returns>
+    public static HybridCacheEntryOptions CreateDefault() => new()
+    {
+        Strategy = DefaultStrategy,
+        LocalExpiration = DefaultLocalExpiration,
+        DistributedExpiration = DefaultDistributedExpiration
+    };
+
+    /// <summary>
+    /// Creates a new <see cref="HybridCacheEntryOptions"/> using the specified configuration <paramref name="name"/> to retrieve the underlying configuration settings.
+    /// </summary>
+    /// <param name="name">The configuration name..</param>
+    /// <param name="localExpiration">The default local expiration <see cref="TimeSpan"/> used where not configured.</param>
+    /// <param name="distributedExpiration">The default distributed expiration <see cref="TimeSpan"/> used where not configured.</param>
+    /// <param name="strategy">The default <see cref="CacheStrategy"/> used where not configured.</param>
+    /// <returns>The <see cref="HybridCacheEntryOptions"/>.</returns>
+    public static HybridCacheEntryOptions CreateForName(string name, TimeSpan? localExpiration = null, TimeSpan? distributedExpiration = null, CacheStrategy? strategy = null)
+    {
+        var config = ExecutionContext.GetService<IConfiguration>() ?? Internal.EmptyConfiguration; // Avoids passing null.
+
+        // Default from configuration.
+        return new HybridCacheEntryOptions
+        {
+            LocalExpiration = Internal.GetConfigurationValue($"CoreEx:Caching:{name}:LocalExpiration", localExpiration ?? DefaultLocalExpiration, config),
+            DistributedExpiration = Internal.GetConfigurationValue($"CoreEx:Caching:{name}:DistributedExpiration", distributedExpiration ?? DefaultDistributedExpiration, config),
+            Strategy = Internal.GetConfigurationValue<CacheStrategy>($"CoreEx:Caching:{name}:Strategy", strategy ?? DefaultStrategy, config)
+        };
+    }
+
+    /// <summary>
+    /// Creates a new <see cref="HybridCacheEntryOptions"/> using the specified <typeparamref name="T"/> name to retrieve the underlying configuration settings.
+    /// </summary>
+    /// <typeparam name="T">The cache <see cref="Type"/>.</typeparam>
+    /// <param name="localExpiration">The default local expiration <see cref="TimeSpan"/> used where not configured.</param>
+    /// <param name="distributedExpiration">The default distributed expiration <see cref="TimeSpan"/> used where not configured.</param>
+    /// <param name="strategy">The default <see cref="CacheStrategy"/> used where not configured.</param>
+    /// <returns>A <see cref="HybridCacheEntryOptions"/> instance associated with the specified type.</returns>
+    /// <remarks>The <typeparamref name="T"/> <see cref="MemberInfo.Name"/> is used as the name; see <see cref="CreateForName(string, TimeSpan?, TimeSpan?, CacheStrategy?)"/>.</remarks>
+    public static HybridCacheEntryOptions CreateFor<T>(TimeSpan? localExpiration = null, TimeSpan? distributedExpiration = null, CacheStrategy? strategy = null)
+        => CreateForName(nameof(T), localExpiration, distributedExpiration, strategy);
+
+    /// <summary>
+    /// Gets or sets the <see cref="CacheStrategy"/>.
+    /// </summary>
+    public CacheStrategy Strategy { get; set; } = CacheStrategy.Hybrid;
+
+    /// <summary>
+    /// Gets or sets the local cache expiration <see cref="TimeSpan"/> where applicable.
+    /// </summary>
+    /// <remarks>Where <see langword="null"/> then the <see cref="IHybridCache"/> implementation default local expiration is applied.</remarks>
+    public TimeSpan? LocalExpiration { get; set; }
+
+    /// <summary>
+    /// Gets or sets the distributed cache expiration <see cref="TimeSpan"/> where applicable.
+    /// </summary>
+    /// <remarks>Where <see langword="null"/> then the <see cref="IHybridCache"/> implementation default distributed expiration is applied.</remarks>
+    public TimeSpan? DistributedExpiration { get; set; }
+
+    /// <summary>
+    /// Gets or sets the associated tags used when setting the underlying cache entry.
+    /// </summary>
+    /// <remarks>Tags enable grouped cache entry management where supported by the underlying cache implementation(s).</remarks>
+    public string[]? Tags { get; set; }
+
+    /// <summary>
+    /// Adds the specified tags to the cache entry options.
+    /// </summary>
+    /// <param name="tags">The tags.</param>
+    /// <returns>The <see cref="HybridCacheEntryOptions"/> to support fluent-style method-chaining.</returns>
+    public HybridCacheEntryOptions WithTags(params IEnumerable<string> tags)
+    {
+        if (tags.Any())
+            Tags = Tags is null ? [.. tags] : [.. Tags.Concat(tags).Distinct()];
+
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/ICacheKey.cs b/src/CoreEx/Caching/ICacheKey.cs
deleted file mode 100644
index 88c1d572..00000000
--- a/src/CoreEx/Caching/ICacheKey.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Caching
-{
-    /// <summary>
-    /// Provides the <see cref="CacheKey"/>.
-    /// </summary>
-    public interface ICacheKey : IUniqueKey
-    {
-        /// <summary>
-        /// Gets the cache key.
-        /// </summary>
-        [JsonIgnore]
-        public CompositeKey CacheKey { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/ICacheKeyProvider.cs b/src/CoreEx/Caching/ICacheKeyProvider.cs
new file mode 100644
index 00000000..44bbcddf
--- /dev/null
+++ b/src/CoreEx/Caching/ICacheKeyProvider.cs
@@ -0,0 +1,24 @@
+namespace CoreEx.Caching;
+
+/// <summary>
+/// Enables fully-qualified key formatting of a cache key where partitioning or namespacing is required.
+/// </summary>
+/// <remarks>This is used to ensure that cache keys are unique across an application or service; for example, by prefixing with the domain and/or tenant names. See <see cref="DefaultCacheKeyProvider"/> which implements as described.</remarks>
+public interface ICacheKeyProvider
+{
+    /// <summary>
+    /// Gets the fully-qualified cache key.
+    /// </summary>
+    /// <param name="key">The cache key.</param>
+    /// <returns>The fully-qualified cache key.</returns>
+    string GetFullyQualifiedCacheKey(string key);
+
+    /// <summary>
+    /// Gets the non-qualified cache key using the <see cref="IEntityKey"/> <see cref="Type"/> of <typeparamref name="T"/> and <paramref name="key"/> value.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <returns>The cache key.</returns>
+    /// <remarks>The result of this should still be passed through the <see cref="GetFullyQualifiedCacheKey(string)"/> to get the final fully-qualified cache key.</remarks>
+    string GetEntityCacheKey<T>(CompositeKey key) where T : IEntityKey;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/IHybridCache.cs b/src/CoreEx/Caching/IHybridCache.cs
new file mode 100644
index 00000000..bf3d3e63
--- /dev/null
+++ b/src/CoreEx/Caching/IHybridCache.cs
@@ -0,0 +1,79 @@
+namespace CoreEx.Caching;
+
+/// <summary>
+/// Enables a hybrid cache (i.e. local and/or distributed) as defined by the <see cref="CacheStrategy"/>.
+/// </summary>
+/// <remarks>The <see cref="HybridCacheEntryOptions"/> is required for each method to specify the underlying cache behavior; therefore, it is important that the same options are reused
+/// when accessing the same key as this may result in inconsistent/unexpected behavior.</remarks>
+public interface IHybridCache
+{
+    /// <summary>
+    /// Gets the <see cref="ICacheKeyProvider"/>.
+    /// </summary>
+    ICacheKeyProvider KeyProvider { get; }
+
+    /// <summary>
+    /// Tries to get the cached value for the specified key. 
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The cache key.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A tuple with a <see langword="bool"/> indicating whether the entry exists and the associated value where found (otherwise, <see langword="default"/>).</returns>
+    Task<(bool Exists, T? Value)> TryGetByKeyAsync<T>(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the cached value for the specified key.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The cache key.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The cached value or default.</returns>
+    Task<T?> GetOrDefaultByKeyAsync<T>(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Sets or overwrites the cache value for the specified key.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The cache key.</param>
+    /// <param name="value">The cache value.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task SetByKeyAsync<T>(string key, T value, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the cached value for the specified key using the <paramref name="factory"/> to create and set where not found.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="key">The cache key.</param>
+    /// <param name="factory">The function used to create the cache value.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The cached value.</returns>
+    Task<T> GetOrCreateByKeyAsync<T>(string key, Func<CancellationToken, Task<T>> factory, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Removes the cached value for the specified key.
+    /// </summary>
+    /// <param name="key">The cache key.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task RemoveByKeyAsync(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Remove all cached values that have the specified tag.
+    /// </summary>
+    /// <param name="tag">The cache tag.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task RemoveByTagAsync(string tag, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Remove all cached values that have the specified tags.
+    /// </summary>
+    /// <param name="tags">The cache tags.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task RemoveByTagAsync(IEnumerable<string> tags, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/IRequestCache.cs b/src/CoreEx/Caching/IRequestCache.cs
deleted file mode 100644
index fffafda5..00000000
--- a/src/CoreEx/Caching/IRequestCache.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Caching
-{
-    /// <summary>
-    /// Enables the short-lived request caching; intended to reduce data chattiness within the context of a request scope.
-    /// </summary>
-    public interface IRequestCache
-    {
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key of the value to get.</param>
-        /// <param name="value">The cached value where found; otherwise, the default value for the <see cref="Type"/>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetValue<T>(CompositeKey key, out T? value);
-
-        /// <summary>
-        /// Sets (adds or overrides) the cache value for the specified <see cref="Type"/> and <see cref="CompositeKey"/> and returns <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key of the value to set.</param>
-        /// <param name="value">The value to set.</param>
-        /// <returns>The <paramref name="value"/>.</returns>
-        [return: NotNullIfNotNull(nameof(value))]
-        T? SetValue<T>(CompositeKey key, T? value);
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns><c>true</c> where found and removed; otherwise, <c>false</c>.</returns>
-        bool Remove<T>(CompositeKey key);
-
-        /// <summary>
-        /// Clears the cache for the specified <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        void Clear<T>();
-
-        /// <summary>
-        /// Clears the cache for all <see cref="Type">types</see>.
-        /// </summary>
-        void ClearAll();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/MemoryOnlyHybridCache.cs b/src/CoreEx/Caching/MemoryOnlyHybridCache.cs
new file mode 100644
index 00000000..3d741c07
--- /dev/null
+++ b/src/CoreEx/Caching/MemoryOnlyHybridCache.cs
@@ -0,0 +1,65 @@
+namespace CoreEx.Caching;
+
+/// <summary>
+/// Provides an <see cref="IHybridCache"/> implementation that uses in-memory caching only regardless of the specified <see cref="HybridCacheEntryOptions.Strategy"/>.
+/// </summary>
+/// <param name="cacheKeyProvider">The optional <see cref="ICacheKeyProvider"/>.</param>
+/// <param name="memoryCache">The optional <see cref="IMemoryCache"/>.</param>
+public sealed class MemoryOnlyHybridCache(ICacheKeyProvider? cacheKeyProvider = null, IMemoryCache? memoryCache = null) : IHybridCache
+{
+    private readonly IMemoryCache _memoryCache = memoryCache ?? new MemoryCache(new MemoryCacheOptions());
+
+    /// <inheritdoc/>
+    public ICacheKeyProvider KeyProvider { get; } = cacheKeyProvider ?? new DefaultCacheKeyProvider();
+
+    /// <inheritdoc/>
+    public async Task<(bool Exists, T? Value)> TryGetByKeyAsync<T>(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        if (_memoryCache.TryGetValue<T>(KeyProvider.GetFullyQualifiedCacheKey(key), out T? value))
+            return (true, value);
+
+        return (false, default);
+    }
+
+    /// <inheritdoc/>
+    public async Task<T> GetOrCreateByKeyAsync<T>(string key, Func<CancellationToken, Task<T>> factory, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        if (_memoryCache.TryGetValue<T>(KeyProvider.GetFullyQualifiedCacheKey(key), out T? value))
+            return value!;
+
+        var result = await factory(cancellationToken).ConfigureAwait(false)!;
+        _memoryCache.Set(KeyProvider.GetFullyQualifiedCacheKey(key), result, options?.LocalExpiration ?? HybridCacheEntryOptions.DefaultLocalExpiration);
+        return result;
+    }
+        
+    /// <inheritdoc/>
+    public Task<T?> GetOrDefaultByKeyAsync<T>(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        if (_memoryCache.TryGetValue<T>(KeyProvider.GetFullyQualifiedCacheKey(key), out T? value))
+            return Task.FromResult<T?>(value);
+
+        return Task.FromResult<T?>(default);
+    }
+
+    /// <inheritdoc/>
+    public Task SetByKeyAsync<T>(string key, T value, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        _memoryCache.Set(KeyProvider.GetFullyQualifiedCacheKey(key), value, options?.LocalExpiration ?? HybridCacheEntryOptions.DefaultLocalExpiration);
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    public Task RemoveByKeyAsync(string key, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default)
+    {
+        _memoryCache.Remove(KeyProvider.GetFullyQualifiedCacheKey(key));
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>Throws a <see cref="NotSupportedException"/>.</remarks>
+    public Task RemoveByTagAsync(string tag, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default) => throw new NotSupportedException();
+
+    /// <inheritdoc/>
+    /// <remarks>Throws a <see cref="NotSupportedException"/>.</remarks>
+    public Task RemoveByTagAsync(IEnumerable<string> tags, HybridCacheEntryOptions? options = null, CancellationToken cancellationToken = default) => throw new NotSupportedException();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/README.md b/src/CoreEx/Caching/README.md
index cb730ada..94288aad 100644
--- a/src/CoreEx/Caching/README.md
+++ b/src/CoreEx/Caching/README.md
@@ -1,15 +1,41 @@
-# CoreEx.Caching
+# CoreEx.Caching
 
-The `CoreEx.Caching` namespace provides additional caching capabilities.
+> Provides the `IHybridCache` abstraction and `ICacheKeyProvider` for decoupled, strategy-driven local and/or distributed caching, with a built-in in-memory implementation for testing and simple scenarios.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Caching` defines a provider-agnostic caching contract that supports three strategies: local (in-process), distributed, and hybrid (L1 local + L2 distributed). Consuming code depends only on `IHybridCache`, which is resolved via DI — the concrete implementation (`MemoryOnlyHybridCache` for in-process, or `CoreEx.Caching.FusionCache` for production hybrid caching) is swapped without changing any call sites.
 
-To provide additional capabilities to cache data to improve runtime performance.
+`HybridCacheEntryOptions` carries per-call configuration — strategy, local expiration, distributed expiration, and optional tags — and reads its defaults from `IConfiguration` (`CoreEx:Caching:*`), so production and test environments can tune caching behavior without code changes.
 
-<br/>
+`ICacheKeyProvider` handles key namespacing: the default implementation prefixes keys with the domain name and tenant ID from `HostSettings` and `ExecutionContext`, ensuring that multi-tenant or multi-domain deployments share a cache store safely.
 
-## Request cache
+## Key capabilities
 
-The [`IRequestCache`](./IRequestCache.cs) interface and corresponding [`RequestCache`](./RequestCache.cs) implementation are intended to provide generic short-lived request caching; for example, to reduce data chattiness within the context of a request scope.
\ No newline at end of file
+- 🏗️ **Strategy abstraction**: `CacheStrategy` flags enum (`Local`, `Distributed`, `Hybrid`) decouples cache topology from business logic; per-call strategy is set via `HybridCacheEntryOptions`.
+- 🔑 **Structured key namespacing**: `ICacheKeyProvider` qualifies raw cache keys with domain name and tenant ID, preventing cross-tenant cache collisions in a shared store.
+- 🧩 **In-memory built-in**: `MemoryOnlyHybridCache` provides a fully functional `IHybridCache` using `IMemoryCache`, suitable for unit tests and single-node scenarios without any external dependency.
+- ⚙️ **Configuration-driven defaults**: `HybridCacheEntryOptions` defaults (`DefaultStrategy`, `DefaultLocalExpiration`, `DefaultDistributedExpiration`) are read from `IConfiguration`, allowing environment-specific tuning.
+- 🏷️ **Cache tags**: `HybridCacheEntryOptions.Tags` supports tag-based invalidation for implementations that support it (e.g. `CoreEx.Caching.FusionCache`).
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`DefaultCacheKeyProvider`](./DefaultCacheKeyProvider.cs)** | Default `ICacheKeyProvider` that qualifies keys as `{DomainName}:{TenantId}:{key}`, omitting absent segments. Also produces entity keys as `{TypeName}:{CompositeKey}`. |
+| **[`HybridCacheEntryOptions`](./HybridCacheEntryOptions.cs)** | Per-entry options record specifying `CacheStrategy`, `LocalExpiration`, `DistributedExpiration`, and `Tags`; reads global defaults from `IConfiguration`. |
+| **[`MemoryOnlyHybridCache`](./MemoryOnlyHybridCache.cs)** | `IHybridCache` implementation backed by `IMemoryCache`; ignores the `Strategy` setting and always stores locally. |
+| **[`CacheStrategy`](./CacheStrategy.cs)** | Flags enum: `Local` (in-process), `Distributed`, or `Hybrid` (both). |
+| [`IHybridCache`](./IHybridCache.cs) | Core cache interface: `TryGetByKeyAsync`, `GetOrCreateByKeyAsync`, `GetOrDefaultByKeyAsync`, `SetByKeyAsync`, `RemoveByKeyAsync`, and tag-based `RemoveByTagAsync`. |
+| [`ICacheKeyProvider`](./ICacheKeyProvider.cs) | Interface for producing fully-qualified string cache keys from raw keys or `IEntityKey` / `CompositeKey` pairs. |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - `ExecutionContext` and `HostSettings` (via `IHostSettings`) supply the tenant ID and domain name used for key namespacing.
+- **[`CoreEx.Caching.FusionCache`](../../CoreEx.Caching.FusionCache/README.md)** - Production hybrid cache implementation wrapping ZiggyCreatures FusionCache; backs the `IHybridCache` contract with L1+L2 support.
+- **[`CoreEx.Hosting`](../Hosting/README.md)** - `HybridCacheSynchronizer` (in Hosting.Synchronization) uses `IHybridCache` for distributed lock coordination.
+- **[`CoreEx.RefData`](../RefData/README.md)** - `ReferenceDataOrchestrator` and `IReferenceDataCache` use `IHybridCache` to cache loaded reference data collections.
+
+## Additional Resources
+
+- [ZiggyCreatures FusionCache](https://github.com/ZiggyCreatures/FusionCache) - The third-party library used by `CoreEx.Caching.FusionCache` to provide the production hybrid cache implementation.
\ No newline at end of file
diff --git a/src/CoreEx/Caching/RequestCache.cs b/src/CoreEx/Caching/RequestCache.cs
deleted file mode 100644
index 95f24a79..00000000
--- a/src/CoreEx/Caching/RequestCache.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace CoreEx.Caching
-{
-    /// <summary>
-    /// Provides a basic concurrent dictionary backed cache for short-lived data within the context of a request scope to reduce data-layer chattiness.
-    /// </summary>
-    public class RequestCache : IRequestCache
-    {
-        private readonly Lazy<ConcurrentDictionary<(Type, CompositeKey), object?>> _caching = new(true);
-
-        /// <summary>
-        /// Gets the <see cref="CompositeKey"/> from the <paramref name="value"/> based on an order of precedence of <see cref="ICacheKey"/>, then <see cref="IEntityKey"/>, then <see cref="CompositeKey.Empty"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <returns>The resulting <see cref="CompositeKey"/>.</returns>
-        /// <remarks>Where the <paramref name="value"/> implements <see cref="ICacheKey"/> then the <see cref="ICacheKey.CacheKey"/> will be returned, then where implements <see cref="IEntityKey"/> then the <see cref="IEntityKey.EntityKey"/>
-        /// will be returned; otherwise, <see cref="CompositeKey.Empty"/> will be returned.</remarks>
-        internal static CompositeKey GetKeyFromValue<T>(T value) where T : IUniqueKey
-        {
-            if (value is null)
-                return CompositeKey.Empty;
-            else if (value is ICacheKey ck)
-                return ck.CacheKey;
-            else if (value is IEntityKey ek)
-                return ek.EntityKey;
-            else
-                return CompositeKey.Empty;
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetValue<T>(CompositeKey key, out T? value)
-        {
-            if (_caching.IsValueCreated && _caching.Value.TryGetValue(new (typeof(T), key), out object? val))
-            {
-                value = (T?)val;
-                return true;
-            }
-
-            value = default!;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        [return: NotNullIfNotNull(nameof(value))]
-        public T? SetValue<T>(CompositeKey key, T? value)
-        {
-            _caching.Value.AddOrUpdate(new(typeof(T), key), value, (_, __) => value);
-            return value;
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and key.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns><c>true</c> where found and removed; otherwise, <c>false</c>.</returns>
-        public bool Remove<T>(CompositeKey key) => _caching.IsValueCreated && _caching.Value.TryRemove(new (typeof(T), key), out _);
-
-        /// <summary>
-        /// Clears the cache for the specified <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        public void Clear<T>()
-        {
-            if (!_caching.IsValueCreated)
-                return;
-
-            foreach (var item in _caching.Value.Where(x => x.Key.Item1 == typeof(T)).ToList())
-            {
-                _caching.Value.TryRemove(item.Key, out _);
-            }
-        }
-
-        /// <summary>
-        /// Clears the cache for all <see cref="Type">types</see>.
-        /// </summary>
-        public void ClearAll()
-        {
-            if (_caching.IsValueCreated)
-                _caching.Value.Clear();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/RequestCacheExtensions.cs b/src/CoreEx/Caching/RequestCacheExtensions.cs
deleted file mode 100644
index c955b6d8..00000000
--- a/src/CoreEx/Caching/RequestCacheExtensions.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-
-namespace CoreEx.Caching
-{
-    /// <summary>
-    /// Provides <see cref="IRequestCache"/> extension methods.
-    /// </summary>
-    public static class RequestCacheExtensions
-    {
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="IUniqueKey"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get.</param>
-        /// <param name="value">The cached value where found; otherwise, the default value for the <see cref="Type"/>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        public static bool TryGetValue<T>(this IRequestCache cache, IUniqueKey key, out T? value) => cache.TryGetValue(RequestCache.GetKeyFromValue(key), out value);
-
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/> (converted to a <see cref="CompositeKey"/>).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get.</param>
-        /// <param name="value">The cached value where found; otherwise, the default value for the <see cref="Type"/>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        public static bool TryGetValue<T>(this IRequestCache cache, object? key, out T? value) => cache.TryGetValue(new CompositeKey(key), out value);
-
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/> where it exists; otherwise, adds and returns the value created by the <paramref name="addFactory"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get or add.</param>
-        /// <param name="addFactory">The factory function to create the value.</param>
-        /// <returns>The cached value (existing or new).</returns>
-        public static async Task<T?> GetOrAddAsync<T>(this IRequestCache cache, CompositeKey key, Func<Task<T?>> addFactory)
-        {
-            addFactory.ThrowIfNull(nameof(addFactory));
-
-            if (cache.TryGetValue<T>(key, out var value))
-                return value;
-
-            value = await addFactory().ConfigureAwait(false);
-            return cache.SetValue(key, value);
-        }
-
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/> (converted to a <see cref="CompositeKey"/>) where it exists; otherwise, adds and returns the value created by the <paramref name="addFactory"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get or add.</param>
-        /// <param name="addFactory">The factory function to create the value.</param>
-        /// <returns>The cached value (existing or new).</returns>
-        public static Task<T?> GetOrAddAsync<T>(this IRequestCache cache, object? key, Func<Task<T?>> addFactory) => cache.GetOrAddAsync(new CompositeKey(key), addFactory);
-
-        /// <summary>
-        /// Sets (adds or overrides) the cache value for the specified <see cref="Type"/> and <paramref name="key"/>1 and returns <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to set.</param>
-        /// <param name="value">The value to set.</param>
-        /// <returns>The <paramref name="value"/>.</returns>
-        [return: NotNullIfNotNull(nameof(value))]
-        public static T? SetValue<T>(this IRequestCache cache, object? key, T? value) => cache.SetValue(new CompositeKey(key), value);
-
-        /// <summary>
-        /// Sets (adds or overrides) the cache value for the specified <see cref="IUniqueKey"/> <see cref="Type"/> and returns <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="value">The value to set.</param>
-        /// <returns>The <paramref name="value"/>.</returns>
-        [return: NotNullIfNotNull(nameof(value))]
-        public static T? SetValue<T>(this IRequestCache cache, T? value) where T : IUniqueKey => value is null ? value : cache.SetValue(RequestCache.GetKeyFromValue(value), value);
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <see cref="IUniqueKey"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns><c>true</c> where found and removed; otherwise, <c>false</c>.</returns>
-        public static bool Remove<T>(this IRequestCache cache, IUniqueKey key) => cache.Remove<T>(RequestCache.GetKeyFromValue(key));
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/> (converted to a <see cref="CompositeKey"/>).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns><c>true</c> where found and removed; otherwise, <c>false</c>.</returns>
-        public static bool Remove<T>(this IRequestCache cache, object? key) => cache.Remove<T>(new CompositeKey(key));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Caching/ResultExtensions.cs b/src/CoreEx/Caching/ResultExtensions.cs
deleted file mode 100644
index ba0ecbc9..00000000
--- a/src/CoreEx/Caching/ResultExtensions.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Caching
-{
-    /// <summary>
-    /// Provides <see cref="Result"/>-based <see cref="IRequestCache"/> extension methods.
-    /// </summary>
-    public static class ResultExtensions
-    {
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/> where it exists; otherwise, adds and returns the value created by the <paramref name="addFactory"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get or add.</param>
-        /// <param name="addFactory">The factory function to create the <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result<T>> CacheGetOrAddAsync<T>(this Result result, IRequestCache cache, object? key, Func<Task<Result<T>>> addFactory)
-            => CacheGetOrAddAsync(result, cache, new CompositeKey(key), addFactory);
-
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/> where it exists; otherwise, adds and returns the value created by the <paramref name="addFactory"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get or add.</param>
-        /// <param name="addFactory">The factory function to create the <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result<T>> CacheGetOrAddAsync<T>(this Result result, IRequestCache cache, CompositeKey key, Func<Task<Result<T>>> addFactory)
-            => Task.FromResult(result).CacheGetOrAddAsync(cache, key, addFactory);
-
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/> where it exists; otherwise, adds and returns the value created by the <paramref name="addFactory"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get or add.</param>
-        /// <param name="addFactory">The factory function to create the <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result<T>> CacheGetOrAddAsync<T>(this Task<Result> result, IRequestCache cache, object? key, Func<Task<Result<T>>> addFactory)
-            => CacheGetOrAddAsync(result, cache, new CompositeKey(key), addFactory);
-
-        /// <summary>
-        /// Gets the cached value associated with the specified <see cref="Type"/> and <see cref="CompositeKey"/> where it exists; otherwise, adds and returns the value created by the <paramref name="addFactory"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to get or add.</param>
-        /// <param name="addFactory">The factory function to create the <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static async Task<Result<T>> CacheGetOrAddAsync<T>(this Task<Result> result, IRequestCache cache, CompositeKey key, Func<Task<Result<T>>> addFactory)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            addFactory.ThrowIfNull(nameof(addFactory));
-
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(async () =>
-            {
-                if (cache.TryGetValue<T>(key, out var val))
-                    return Result.Ok(val!);
-
-                var ar = await addFactory().ConfigureAwait(false);
-                return ar.Then(v =>
-                {
-                    cache.SetValue(key, v);
-                    return Result.Ok(v);
-                });
-            });
-        }
-
-        /// <summary>
-        /// Sets (caches) the <see cref="Result{T}.Value"/> into the supplied <paramref name="cache"/> (using the underlying <see cref="IUniqueKey"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/> which must be an <see cref="IUniqueKey"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Result<T> CacheSet<T>(this Result<T> result, IRequestCache cache) where T : IUniqueKey
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(r => { cache.SetValue(r); });
-        }
-
-        /// <summary>
-        /// Sets (caches) the <see cref="Result{T}.Value"/> into the supplied <paramref name="cache"/> using the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to set.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Result<T> CacheSet<T>(this Result<T> result, IRequestCache cache, CompositeKey key)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(r => { cache.SetValue(key, r); });
-        }
-
-        /// <summary>
-        /// Sets (caches) the <see cref="Result{T}.Value"/> into the supplied <paramref name="cache"/> (using the underlying <see cref="IUniqueKey"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/> which must be an <see cref="IUniqueKey"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result<T>> CacheSet<T>(this Task<Result<T>> result, IRequestCache cache) where T : IUniqueKey
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(r => { cache.SetValue(r); });
-        }
-
-        /// <summary>
-        /// Sets (caches) the <see cref="Result{T}.Value"/> into the supplied <paramref name="cache"/> using the specified <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to set.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result<T>> CacheSet<T>(this Task<Result<T>> result, IRequestCache cache, CompositeKey key)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(r => { cache.SetValue(key, r); });
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The cached value <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Result CacheRemove<T>(this Result result, IRequestCache cache, CompositeKey key)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(() => { cache.Remove<T>(key); });
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The cached value <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Result CacheRemove<T>(this Result result, IRequestCache cache, object? key)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(() => { cache.Remove<T>(key); });
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> (using the underlying <see cref="IUniqueKey"/>).
-        /// </summary>
-        /// <typeparam name="T">The cached value <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Result<T> CacheRemove<T>(this Result<T> result, IRequestCache cache) where T : IUniqueKey
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(r => { cache.Remove<T>(r is null ? CompositeKey.Empty : RequestCache.GetKeyFromValue(r)); });
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The cached value <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result> CacheRemove<T>(this Task<Result> result, IRequestCache cache, CompositeKey key)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(() => { cache.Remove<T>(key); });
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> and <paramref name="key"/>.
-        /// </summary>
-        /// <typeparam name="T">The cached value <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <param name="key">The key of the value to remove.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result> CacheRemove<T>(this Task<Result> result, IRequestCache cache, object? key)
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(() => { cache.Remove<T>(key); });
-        }
-
-        /// <summary>
-        /// Removes the cached value associated with the specified <see cref="Type"/> (using the underlying <see cref="IUniqueKey"/>).
-        /// </summary>
-        /// <typeparam name="T">The cached value <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="cache">The <see cref="IRequestCache"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The caching is only performed where the corresponding <paramref name="result"/> has <see cref="IResult.IsSuccess"/>.</remarks>
-        public static Task<Result<T>> CacheRemove<T>(this Task<Result<T>> result, IRequestCache cache) where T : IUniqueKey
-        {
-            cache.ThrowIfNull(nameof(cache));
-            return result.Then(r => { cache.Remove<T>(r is null ? CompositeKey.Empty : RequestCache.GetKeyFromValue(r)); });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/ConcurrencyException.cs b/src/CoreEx/ConcurrencyException.cs
index ba1cdfd8..3f4d867c 100644
--- a/src/CoreEx/ConcurrencyException.cs
+++ b/src/CoreEx/ConcurrencyException.cs
@@ -1,72 +1,31 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a data <b>Concurrency</b> exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A concurrency error occurred; please refresh the data and try again.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class ConcurrencyException(LText? message, Exception? innerException) 
+    : ExtendedException<ConcurrencyException>(message ?? new LText(typeof(ConcurrencyException).FullName, _message), innerException)
 {
+    private const string _message = "A concurrency error occurred; please refresh the data and try again.";
+
     /// <summary>
-    /// Represents a data <b>Concurrency</b> exception.
+    /// Initializes a new instance of the <see cref="ConcurrencyException"/> class.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A concurrency error occurred; please refresh the data and try again.</i></remarks>
-    public class ConcurrencyException : Exception, IExtendedException
-    {
-        private const string _message = "A concurrency error occurred; please refresh the data and try again.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<ConcurrencyException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrencyException"/> class.
-        /// </summary>
-        public ConcurrencyException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrencyException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public ConcurrencyException(string? message) : base(message ?? new LText(typeof(ConcurrencyException).FullName, _message)) { }
+    public ConcurrencyException() : this(null) { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConcurrencyException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public ConcurrencyException(string? message, Exception innerException) : base(message ?? new LText(typeof(ConcurrencyException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.ConcurrencyError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.ConcurrencyError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.ConcurrencyError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.ConcurrencyError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.PreconditionFailed"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.PreconditionFailed;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConcurrencyException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public ConcurrencyException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "concurrency";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.PreconditionFailed);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Configuration/DefaultSettings.cs b/src/CoreEx/Configuration/DefaultSettings.cs
deleted file mode 100644
index 5fc2c2ba..00000000
--- a/src/CoreEx/Configuration/DefaultSettings.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Configuration;
-
-namespace CoreEx.Configuration
-{
-    /// <summary>
-    /// Provides a <i>default</i> <see cref="SettingsBase"/> implementation with no <i>prefixes</i> defined.
-    /// </summary>
-    /// <remarks>This is essentially just a light-weight wrapper over <see cref="IConfiguration"/>.</remarks>
-    /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-    public class DefaultSettings(IConfiguration? configuration = null) : SettingsBase(configuration) { }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Configuration/DeploymentInfo.cs b/src/CoreEx/Configuration/DeploymentInfo.cs
deleted file mode 100644
index e5df18f7..00000000
--- a/src/CoreEx/Configuration/DeploymentInfo.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Configuration;
-
-namespace CoreEx.Configuration
-{
-    /// <summary>
-    /// Provides the common deployment information setting. 
-    /// </summary>
-    /// <remarks>This class should be inherited to add additional properties where required.</remarks>
-    /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-    public class DeploymentInfo(IConfiguration? configuration)
-    {
-        private const string Unspecified = "<unspecified>";
-        private readonly IConfiguration? _configuration = configuration;
-
-        /// <summary>
-        /// Gets the username who performed the deployment.
-        /// </summary>
-        public virtual string By => _configuration?.GetValue<string>("Deployment.By") ?? Unspecified;
-
-        /// <summary>
-        /// Gets the deployment build number.
-        /// </summary>
-        public virtual string Build => _configuration?.GetValue<string>("Deployment.Build") ?? Unspecified;
-
-        /// <summary>
-        /// Gets the name of the deployment job that deployed the <see cref="Build"/>.
-        /// </summary>
-        public virtual string Name => _configuration?.GetValue<string>("Deployment.Name") ?? Unspecified;
-
-        /// <summary> 
-        /// Gets the deployment build version, such as the Git information (branch and commit) of the deployed <see cref="Build"/>.
-        /// </summary>
-        public virtual string Version => _configuration?.GetValue<string>("Deployment.Version") ?? Unspecified;
-
-        /// <summary>
-        /// Gets the date and time (UTC) when deployment <see cref="Name"/> was performed.
-        /// </summary>
-        public virtual string DateUtc => _configuration?.GetValue<string>("Deployment.Date") ?? Unspecified;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Configuration/README.md b/src/CoreEx/Configuration/README.md
deleted file mode 100644
index 5d50dae1..00000000
--- a/src/CoreEx/Configuration/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# CoreEx.Configuration
-
-The `CoreEx.Configuration` namespace primarily extends the .NET [configuration](https://learn.microsoft.com/en-us/dotnet/core/extensions/configuration), specifically the [`IConfiguration`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.configuration.iconfiguration) capabilities.
-
-<br/>
-
-## Motivation
-
-To provide a more flexible, strongly typed, `IConfiguration` encapsulated provider; as well as providing a capability for _CoreEx_ to house and manage configuration. 
-
-<br/>
-
-## Settings base
-
-The [`SettingsBase`](./SettingsBase.cs) class provides the foundational abstract capabilities for retrieving configured settings. Enables the standard `GetValue` and `GetRequiredValue` methods to retrieve.
-
-The underlying constructor requires an `IConfiguration` instance and zero or more prefixes to use in order of precedence, first through to last, to find the underlying key/value pair. The prefixes enable a probing order, where specific overrides and common setting values can be supported.
-
-For example, in a microservices architecture, there may be multiple domains. So if there is a `Product` domain, then the following prefixes could be used: `Product` and `Common`. The `GetValue` method where passed a key of `ConnectionString`, would the search for the following (in order) stopping where the value has been configured: `Product/ConnectionString`, `Common/ConnectionString` and `ConnectionString`. This allows for shared settings with the opportunity to easily override where applicable. 
-
-_Note:_ This plays nicely with the likes of the equivalent pattern that can used within the likes of [Azure App Configuration](https://learn.microsoft.com/en-us/azure/azure-app-configuration/overview).
-
-<br/>
-
-### Pre-configured settings
-
-There are a number of pre-configured settings within the [`SettingsBase`](./SettingsBase.cs) class that are used directly by _CoreEx_; these are intended to be overridden where applicable. Other `CoreEx` projects may add others leveraging extension methods within where applicable.
-
-<br/>
-
-## Default settings
-
-The [`DefaultSettings`](./DefaultSettings.cs) class provides a basic implementation of `SettingsBase` to be used where no additional prefixing is required. This is also used throughout `CoreEx` as a default where a `SettingsBase` is expected, but not provided.
-
-<br/>
-
-## Deployment info
-
-The [`DeploymentInfo`](./DeploymentInfo.cs) class provides a base line configuration for capturing and recording deployment information when the underlying application is deployed. These can then be accessed at run-time when performing the likes of [health checks](../HealthChecks/README.md) to validate the deployed version.
-
-
diff --git a/src/CoreEx/Configuration/SettingsBase.cs b/src/CoreEx/Configuration/SettingsBase.cs
deleted file mode 100644
index 00a04511..00000000
--- a/src/CoreEx/Configuration/SettingsBase.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Hosting.Work;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-
-namespace CoreEx.Configuration
-{
-    /// <summary>
-    /// Provides the base <see cref="Configuration"/>-backed settings; see <see cref="GetValue{T}(string, T)"/> to further understand capabilities.
-    /// </summary>
-    public abstract class SettingsBase
-    {
-        private readonly List<string> _prefixes = [];
-        private bool? _validationUseJsonNames;
-        private DateTimeTransform? _dateTimeTransform;
-        private StringTransform? _stringTransform;
-        private StringTrim? _stringTrim;
-        private StringCase? _stringCase;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SettingsBase"/> class.
-        /// </summary>
-        /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-        /// <param name="prefixes">The key prefixes to use in order of precedence, first through to last.</param>
-        public SettingsBase(IConfiguration? configuration, params string[] prefixes)
-        {
-            Configuration = configuration;
-            Deployment = new DeploymentInfo(configuration);
-
-            foreach (var prefix in prefixes)
-            {
-                if (string.IsNullOrEmpty(prefix))
-                    throw new ArgumentException("A prefix cannot be null or empty.", nameof(prefixes));
-
-                _prefixes.Add(prefix.EndsWith('/') ? prefix : string.Concat(prefix, '/'));
-            }
-        }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IConfiguration"/>.
-        /// </summary>
-        public IConfiguration? Configuration { get; }
-
-        /// <summary>
-        /// Gets the value using the specified <paramref name="key"/> excluding any prefix (key is inferred where not specified using <see cref="CallerMemberNameAttribute"/>).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key excluding any prefix (key is inferred where not specified using <see cref="CallerMemberNameAttribute"/>).</param>
-        /// <param name="defaultValue">The default fallback value used where no non-default value is found.</param>
-        /// <returns>The corresponding setting value.</returns>
-        /// <remarks>Where <paramref name="key"/> is '<c>Foo</c>' and the provided prefixes are '<c>Product</c>' and '<c>Common</c>', then the following full keys will be attempted until a non-default value is found:
-        /// '<c>Product/Foo</c>', '<c>Common/Foo</c>', '<c>Foo</c>' (no prefix), then finally the <paramref name="defaultValue"/> will be returned.</remarks>
-        public T GetValue<T>([CallerMemberName] string key = "", T defaultValue = default!)
-        {
-            // One-off replace double underscore with colon; enables support for both types.
-            var ckey = key.ThrowIfNullOrEmpty(nameof(key)).Replace("__", ":");
-
-            if (Configuration is null)
-                return defaultValue;
-
-            // Try each prefix until found.
-            T kv;
-            foreach (var prefix in _prefixes)
-            {
-                if (TryGetValue(string.Concat(prefix, ckey), out kv))
-                    return kv;
-            }
-
-            // Final without prefix.
-            return TryGetValue(ckey, out kv) ? kv : defaultValue;
-        }
-
-        /// <summary>
-        /// Try get the value with key and alternate format alternatives.
-        /// </summary>
-        private bool TryGetValue<T>(string key, out T value)
-        {
-            // Try the key as specified.
-            if (Configuration is not null && Configuration.GetSection(key)?.Value != null)
-            {
-                value = Configuration.GetValue<T>(key)!;
-                return true;
-            }
-
-            value = default!;
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the value using the specified <paramref name="key"/> excluding any prefix (key is inferred where not specified using <see cref="CallerMemberNameAttribute"/>) and throws an <see cref="ArgumentException"/> where no corresponding
-        /// value has been configured.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key excluding any prefix (key is inferred where not specified using <see cref="CallerMemberNameAttribute"/>).</param>
-        /// <returns>The corresponding setting value.</returns>
-        /// <remarks>Where <paramref name="key"/> is '<c>Foo</c>' and the provided prefixes are '<c>Product</c>' and '<c>Common</c>', then the following full keys will be attempted until a non-default value is found:
-        /// '<c>Product/Foo</c>', '<c>Common/Foo</c>', '<c>Foo</c>' (no prefix), then finally an <see cref="ArgumentException"/> will be thrown.</remarks>
-        /// <exception cref="ArgumentException">Thrown where the <paramref name="key"/> has not been configured.</exception>
-        public T GetRequiredValue<T>([CallerMemberName] string key = "")
-        {
-            // One-off replace double underscore with colon; enables support for both types.
-            var ckey = key.ThrowIfNullOrEmpty(nameof(key)).Replace("__", ":");
-
-            if (Configuration == null)
-                throw new InvalidOperationException($"An IConfiguration instance is required where {nameof(GetRequiredValue)} is used.");
-
-            // Try each prefix until found.
-            T kv;
-            foreach (var prefix in _prefixes)
-            {
-                if (TryGetValue(string.Concat(prefix, ckey), out kv))
-                    return kv;
-            }
-
-            // Final without prefix.
-            return TryGetValue(ckey, out kv) ? kv : throw new ArgumentException($"Configuration key '{key}' has not been configured and the value is required.", nameof(key));
-        }
-
-        /// <summary>
-        /// Gets the value using the specified <paramref name="key"/> excluding any prefix (key is inferred where not specified using <see cref="CallerMemberNameAttribute"/>).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key excluding any prefix (key is inferred where not specified using <see cref="CallerMemberNameAttribute"/>).</param>
-        /// <param name="defaultValue">The default fallback value used where no non-default value is found.</param>
-        /// <returns>The corresponding setting value.</returns>
-        /// <remarks>This is considered a standard setting and will be checked within the <c>CoreEx:</c> nested strructure first to enable clear separation.</remarks>
-        internal T GetCoreExValue<T>([CallerMemberName] string key = "", T defaultValue = default!) => TryGetValue<T>($"CoreEx:{key.ThrowIfNullOrEmpty(nameof(key))}", out var value) ? value : GetValue(key, defaultValue);
-
-        /// <summary>
-        /// Indicates whether to the include the underlying <see cref="Exception"/> content in the externally returned result.
-        /// </summary>
-        /// <remarks>Defaults to <c>false</c>.</remarks>
-        public bool IncludeExceptionInResult => GetCoreExValue(nameof(IncludeExceptionInResult), false);
-
-        /// <summary>
-        /// Gets the default maximum event publish collection size.
-        /// </summary>
-        /// <remarks>Defaults to <c>100</c>.</remarks>
-        public int MaxPublishCollSize => GetCoreExValue(nameof(MaxPublishCollSize), 100);
-
-        /// <summary> 
-        /// Gets the <see cref="DeploymentInfo"/> from the environment variables. 
-        /// </summary>
-        public DeploymentInfo Deployment { get; }
-
-        /// <summary>
-        /// Indicates whether to include any extra Health Check data that might be considered sensitive.
-        /// </summary>
-        /// <remarks>Defaults to <c>false</c>.</remarks>
-        public bool IncludeSensitiveHealthCheckData => GetCoreExValue(nameof(IncludeSensitiveHealthCheckData), false);
-
-        /// <summary>
-        /// Gets the <see cref="Entities.PagingArgs.DefaultTake"/>; i.e. page size.
-        /// </summary>
-        /// <remarks>Defaults to <c>100</c>.</remarks>
-        public long PagingDefaultTake => GetCoreExValue<long>(nameof(PagingDefaultTake), 100);
-
-        /// <summary>
-        /// Gets the <see cref="Entities.PagingArgs.MaxTake"/>; i.e. absolute maximum page size.
-        /// </summary>
-        /// <remarks>Defaults to <c>1000</c>.</remarks>
-        public long PagingMaxTake => GetCoreExValue<long>(nameof(PagingMaxTake), 1000);
-
-        /// <summary>
-        /// Gets the default <see cref="RefData.ReferenceDataOrchestrator"/> <see cref="ICacheEntry.AbsoluteExpirationRelativeToNow"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>2</c> hours.</remarks>
-        public TimeSpan? RefDataCacheAbsoluteExpirationRelativeToNow => GetCoreExValue($"RefDataCache:{nameof(ICacheEntry.AbsoluteExpirationRelativeToNow)}", TimeSpan.FromHours(2));
-
-        /// <summary>
-        /// Gets the default <see cref="RefData.ReferenceDataOrchestrator"/> <see cref="ICacheEntry.SlidingExpiration"/>. 
-        /// </summary>
-        /// <remarks>Defaults to <c>30</c> minutes.</remarks>
-        public TimeSpan? RefDataCacheSlidingExpiration => GetCoreExValue($"RefDataCache:{nameof(ICacheEntry.SlidingExpiration)}", TimeSpan.FromMinutes(30));
-
-        /// <summary>
-        /// Indicates whether the validation (<c>CoreEx.Validation</c>) should use JSON names.
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>.
-        /// <para>The value is cached on first use and is then considered immutable as a change in behaviour may have unintended consequences.</para></remarks>
-        public bool ValidationUseJsonNames => _validationUseJsonNames ??= GetCoreExValue(nameof(ValidationUseJsonNames), true);
-
-        /// <summary>
-        /// Gets the <see cref="WorkStateOrchestrator"/> <see cref="WorkStateOrchestrator.ExpiryTimeSpan"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>1</c> hour.</remarks>
-        public TimeSpan WorkerExpiryTimeSpan => GetCoreExValue(nameof(WorkerExpiryTimeSpan), TimeSpan.FromHours(1));
-
-        /// <summary>
-        /// Gets the <see cref="Cleaner"/> <see cref="Entities.DateTimeTransform"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Cleaner.DefaultDateTimeTransform"/>.
-        /// <para>The value is cached on first use and is then considered immutable as a change in behaviour may have unintended consequences.</para></remarks>
-        public DateTimeTransform DateTimeTransform => _dateTimeTransform ??= GetCoreExValue($"{nameof(Cleaner)}:{nameof(DateTimeTransform)}", Cleaner.DefaultDateTimeTransform);
-
-        /// <summary>
-        /// Gets the <see cref="Cleaner"/> <see cref="Entities.StringTransform"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Cleaner.DefaultStringTransform"/>.
-        /// <para>The value is cached on first use and is then considered immutable as a change in behaviour may have unintended consequences.</para></remarks>
-        public StringTransform StringTransform => _stringTransform ??= GetCoreExValue($"{nameof(Cleaner)}:{nameof(StringTransform)}", Cleaner.DefaultStringTransform);
-
-        /// <summary>
-        /// Gets the <see cref="Cleaner"/> <see cref="Entities.StringCase"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Cleaner.DefaultStringCase"/>.
-        /// <para>The value is cached on first use and is then considered immutable as a change in behaviour may have unintended consequences.</para></remarks>
-        public StringCase StringCase => _stringCase ??= GetCoreExValue($"{nameof(Cleaner)}:{nameof(StringCase)}", Cleaner.DefaultStringCase);
-
-        /// <summary>
-        /// Gets the <see cref="Cleaner"/> <see cref="Entities.StringTrim"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Cleaner.DefaultStringTrim"/>.
-        /// <para>The value is cached on first use and is then considered immutable as a change in behaviour may have unintended consequences.</para></remarks>
-        public StringTrim StringTrim => _stringTrim ??= GetCoreExValue($"{nameof(Cleaner)}:{nameof(StringTrim)}", Cleaner.DefaultStringTrim);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/ConflictException.cs b/src/CoreEx/ConflictException.cs
index 9869f9c3..daae493b 100644
--- a/src/CoreEx/ConflictException.cs
+++ b/src/CoreEx/ConflictException.cs
@@ -1,73 +1,30 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents an <b>Conflict</b> exception.
+/// </summary>
+/// <remarks>An example would be where the identifier provided for a create operation already exists.
+/// <para>The <see cref="Exception.Message"/> defaults to: <i>A data conflict occurred.</i></para></remarks>
+public class ConflictException(LText? message, Exception? innerException) 
+    : ExtendedException<ConflictException>(message ?? new LText(typeof(ConflictException).FullName, _message), innerException)
 {
+    private const string _message = "A data conflict occurred.";
+
     /// <summary>
-    /// Represents an <b>Conflict</b> exception.
+    /// Initializes a new instance of the <see cref="ConflictException"/> class.
     /// </summary>
-    /// <remarks>An example would be where the identifier provided for a Create operation already exists.
-    /// <para>The <see cref="Exception.Message"/> defaults to: <i>A data conflict occurred.</i></para></remarks>
-    public class ConflictException : Exception, IExtendedException
-    {
-        private const string _message = "A data conflict occurred.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<ConflictException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConflictException"/> class.
-        /// </summary>
-        public ConflictException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConflictException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public ConflictException(string? message) : base(message ?? new LText(typeof(ConflictException).FullName, _message)) { }
+    public ConflictException() : this(null) { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConflictException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public ConflictException(string? message, Exception innerException) : base(message ?? new LText(typeof(ConflictException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.ConflictError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.ConflictError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.ConflictError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.ConflictError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.Conflict"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.Conflict;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConflictException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public ConflictException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "conflict";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.Conflict);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/CoreEx.csproj b/src/CoreEx/CoreEx.csproj
index 9eb1b2d9..df2a95c4 100644
--- a/src/CoreEx/CoreEx.csproj
+++ b/src/CoreEx/CoreEx.csproj
@@ -1,74 +1,50 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.1</TargetFrameworks>
-    <RootNamespace>CoreEx</RootNamespace>
-    <Product>CoreEx</Product>
-    <Title>CoreEx .NET backend Extensions.</Title>
-    <Description>CoreEx .NET backend Extensions.</Description>
-    <PackageTags>coreex entity microservices referencedata jsonserializer eventdata events httpclient settings railway-oriented</PackageTags>
-    <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
+    <Title>CoreEx .NET extensions.</Title>
+    <Description>Core .NET extensions and abstractions for the development of backend services.</Description>
+    <PackageTags>coreex microservices domain-based event-driven railway-oriented reference-data</PackageTags>
   </PropertyGroup>
 
-  <Import Project="..\..\Common.targets" />
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.1" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.1" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.1" />
-    <PackageReference Include="System.Memory.Data" Version="9.0.1" />
-    <PackageReference Include="System.Text.Json" Version="9.0.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
-    <PackageReference Include="System.Memory.Data" Version="8.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.33" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
-    <PackageReference Include="System.Memory.Data" Version="6.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+  <!-- Bundle the Roslyn source generator into this package. -->
+  <!-- ProjectReference ensures CoreEx.Generator is built before CoreEx is packed. -->
+  <ItemGroup>
+    <ProjectReference Include="..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj"
+                      ReferenceOutputAssembly="false"
+                      SetTargetFramework="TargetFramework=netstandard2.0"
+                      OutputItemType="Analyzer" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.31" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="6.0.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
-    <PackageReference Include="System.Memory.Data" Version="6.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
-  </ItemGroup>
+  <!-- Resolve generator dependency paths dynamically from CPM versions + NuGet global cache.
+       This avoids hardcoding versions that are already owned by Directory.Packages.props. -->
+  <Target Name="ResolveGeneratorDepPaths" BeforeTargets="_GetPackageFiles">
+    <PropertyGroup>
+      <!-- $(NuGetPackageRoot) is set by the .NET SDK on all platforms (~/.nuget/packages/ on Linux). -->
+      <_NuGetPackagesDir>$(NuGetPackageRoot)</_NuGetPackagesDir>
+    </PropertyGroup>
+
+    <!-- Read versions from CPM PackageVersion items. -->
+    <ItemGroup>
+      <_HandlebarsVersion Include="@(PackageVersion)" Condition="'%(Identity)' == 'Handlebars.Net'" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <None Include="../../gen/CoreEx.Generator/bin/$(Configuration)/netstandard2.0/CoreEx.Generator.dll"
+            Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+      <None Include="$(_NuGetPackagesDir)handlebars.net\%(_HandlebarsVersion.Version)\lib\netstandard2.0\Handlebars.dll"
+            Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+      <None Include="../../gen/CoreEx.Generator/bin/$(Configuration)/netstandard2.0/Pluralize.NET.dll"
+            Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    </ItemGroup>
+  </Target>
 
   <ItemGroup>
-    <PackageReference Include="CloudNative.CloudEvents.SystemTextJson" Version="2.8.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="YamlDotNet" Version="16.3.0" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Process" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
+    <PackageReference Include="System.Memory.Data" />
   </ItemGroup>
-
 </Project>
diff --git a/src/CoreEx/CoreExExtensions.ApplicationBuilder.cs b/src/CoreEx/CoreExExtensions.ApplicationBuilder.cs
new file mode 100644
index 00000000..998931c7
--- /dev/null
+++ b/src/CoreEx/CoreExExtensions.ApplicationBuilder.cs
@@ -0,0 +1,137 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.Hosting;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExExtensions
+{
+    /// <summary>
+    /// Adds a <b>singleton</b> <see cref="IHostSettings"/> service.
+    /// </summary>
+    /// <param name="builder">The <see cref="IHostApplicationBuilder"/>.</param>
+    /// <param name="solutionName">The solution name; for example: '<c>Contoso</c>.</param>
+    /// <param name="domainName">The domain name; for example: '<c>Shopping</c>.</param>
+    /// <param name="source">The source <see cref="Uri"/>; for example '<c>urn:contoso:products</c>'.</param>
+    /// <returns>The <see cref="IHostApplicationBuilder"/> for fluent-style method-chaining.</returns>
+    public static IHostApplicationBuilder AddHostSettings(this IHostApplicationBuilder builder, string? solutionName = null, string? domainName = null, Uri? source = null)
+    {
+        builder.ThrowIfNull();
+
+        var env = builder.Configuration.GetValue<string?>("CoreEx:Host:EnvironmentName")
+            ?? builder.Configuration.GetValue<string?>("COREEX_ENVIRONMENT")
+            ?? Environment.GetEnvironmentVariable("COREEX_ENVIRONMENT")
+            ?? builder.Environment.EnvironmentName;
+
+        var hs = HostSettings.Create(builder.Configuration, env, solutionName, domainName, source);
+        builder.Properties[nameof(HostSettings)] = hs;
+        builder.Services.AddSingleton<IHostSettings>(hs);
+        return builder;
+    }
+
+    /// <summary>
+    /// Adds an opinionated <i>typed</i> <see cref="HttpClient"/> with idempotency key handler and standard resilience handlers.
+    /// </summary>
+    /// <typeparam name="TClient">The typed client.</typeparam>
+    /// <param name="builder">The <see cref="IHostApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the <see cref="HttpClient"/>.</param>
+    /// <param name="configureClient">An optional action to configure the <see cref="HttpClient"/>.</param>
+    /// <param name="configureIdempotency">An optional action to configure the <see cref="IdempotencyKeyHandler"/>.</param>
+    /// <returns>The <see cref="IHttpClientBuilder"/> for fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="name"/> also represents the configuration section name for the <see cref="HttpClient"/>; as a minimum define the <see cref="HttpClient.BaseAddress"/>.
+    /// <para>The two handlers added are added, in order specified, as follows:
+    /// <list type="bullet">
+    /// <item><description><see cref="IdempotencyKeyHandler"/> - Adds an idempotency key to outgoing HTTP requests.</description></item>
+    /// <item><description><see href="https://learn.microsoft.com/en-us/dotnet/core/resilience/http-resilience">Standard resilience handlers</see> - Adds standard resilience policies as enabled by <see href="https://www.nuget.org/packages/Microsoft.Extensions.Http.Resilience">Microsoft.Extensions.Http.Resilience</see>.</description></item>
+    /// </list>
+    /// </para>
+    /// <para>Example configuration section for a <see cref="HttpClient"/> named '<c>ProductsApi</c>':
+    /// <code>
+    /// {
+    ///   "ProductsApi": {
+    ///     "BaseAddress": "https://api.contoso.com/",
+    ///     "Resilience": {
+    ///       ... // Resilience configuration as per Microsoft.Extensions.Http.Resilience documentation.
+    ///     }
+    ///   }
+    /// }
+    /// </code>
+    /// </para></remarks>
+    public static IHttpClientBuilder AddTypedHttpClient<TClient>(this IHostApplicationBuilder builder, string name, Action<HttpClient>? configureClient = null, Action<IServiceProvider, IdempotencyKeyHandler>? configureIdempotency = null)
+        where TClient : class
+    {
+        var config = builder.Configuration.GetSection(name) ?? throw new ArgumentException($"Unable to find configuration section for '{name}'.");
+
+        var cb = builder.ThrowIfNull().Services.AddHttpClient(name, client =>
+        {
+            // Set the standard configured setting.
+            client.BaseAddress = config.GetValue<Uri?>("BaseAddress") ?? throw new ArgumentException($"Unable to find '{nameof(HttpClient.BaseAddress)}' configuration for '{name}'.");
+            configureClient?.Invoke(client);
+        });
+
+        cb.AddIdempotencyKeyHandler((sp, handler) => configureIdempotency?.Invoke(sp, handler));
+
+        if (config.GetSection("Resilience").Exists())
+            cb.AddStandardResilienceHandler(config);
+        else
+            cb.AddStandardResilienceHandler();
+
+        cb.AddTypedClient<TClient>();
+
+        return cb;
+    }
+
+    /// <summary>
+    /// Adds an opinionated <i>typed</i> <see cref="HttpClient"/> with idempotency key handler and standard resilience handlers.
+    /// </summary>
+    /// <typeparam name="TClient">The typed client.</typeparam>
+    /// <typeparam name="TImplementation">The the typed client implementation.</typeparam>
+    /// <param name="builder">The <see cref="IHostApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the <see cref="HttpClient"/>.</param>
+    /// <param name="configureClient">An optional action to configure the <see cref="HttpClient"/>.</param>
+    /// <param name="configureIdempotency">An optional action to configure the <see cref="IdempotencyKeyHandler"/>.</param>
+    /// <returns>The <see cref="IHttpClientBuilder"/> for fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="name"/> also represents the configuration section name for the <see cref="HttpClient"/>; as a minimum define the <see cref="HttpClient.BaseAddress"/>.
+    /// <para>The two handlers added are added, in order specified, as follows:
+    /// <list type="bullet">
+    /// <item><description><see cref="IdempotencyKeyHandler"/> - Adds an idempotency key to outgoing HTTP requests.</description></item>
+    /// <item><description><see href="https://learn.microsoft.com/en-us/dotnet/core/resilience/http-resilience">Standard resilience handlers</see> - Adds standard resilience policies as enabled by <see href="https://www.nuget.org/packages/Microsoft.Extensions.Http.Resilience">Microsoft.Extensions.Http.Resilience</see>.</description></item>
+    /// </list>
+    /// </para>
+    /// <para>Example configuration section for a <see cref="HttpClient"/> named '<c>ProductsApi</c>':
+    /// <code>
+    /// {
+    ///   "ProductsApi": {
+    ///     "BaseAddress": "https://api.contoso.com/",
+    ///     "Resilience": {
+    ///       ... // Resilience configuration as per Microsoft.Extensions.Http.Resilience documentation.
+    ///     }
+    ///   }
+    /// }
+    /// </code>
+    /// </para></remarks>
+    public static IHttpClientBuilder AddTypedHttpClient<TClient, TImplementation>(this IHostApplicationBuilder builder, string name, Action<HttpClient>? configureClient = null, Action<IServiceProvider, IdempotencyKeyHandler>? configureIdempotency = null)
+        where TClient : class where TImplementation : class, TClient
+    {
+        var config = builder.Configuration.GetSection(name) ?? throw new ArgumentException($"Unable to find configuration section for '{name}'.");
+
+        var cb = builder.ThrowIfNull().Services.AddHttpClient(name, client =>
+        {
+            // Set the standard configured setting.
+            client.BaseAddress = config.GetValue<Uri?>("BaseAddress") ?? throw new ArgumentException($"Unable to find '{nameof(HttpClient.BaseAddress)}' configuration for '{name}'.");
+            configureClient?.Invoke(client);
+        });
+
+        cb.AddIdempotencyKeyHandler((sp, handler) => configureIdempotency?.Invoke(sp, handler));
+
+        if (config.GetSection("Resilience").Exists())
+            cb.AddStandardResilienceHandler(config);
+        else
+            cb.AddStandardResilienceHandler();
+
+        cb.AddTypedClient<TClient, TImplementation>();
+
+        return cb;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/CoreExExtensions.DependencyInjection.cs b/src/CoreEx/CoreExExtensions.DependencyInjection.cs
new file mode 100644
index 00000000..37d3a9ba
--- /dev/null
+++ b/src/CoreEx/CoreExExtensions.DependencyInjection.cs
@@ -0,0 +1,263 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace Microsoft.Extensions.DependencyInjection;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class CoreExExtensions
+{
+    /// <summary>
+    /// Adds a <b>scoped</b> service to instantiate a new <see cref="ExecutionContext"/> instance using an <paramref name="executionContextFactory"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="executionContextFactory">The function to override the creation of the <see cref="ExecutionContext"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Where the <paramref name="executionContextFactory"/> is <see langword="null"/>, then the <see cref="ExecutionContext.Create"/> is used to create.</remarks>
+    public static IServiceCollection AddExecutionContext(this IServiceCollection services, Func<IServiceProvider, ExecutionContext>? executionContextFactory = null) => services.ThrowIfNull().AddScoped(sp =>
+    {
+        var ec = executionContextFactory?.Invoke(sp) ?? ExecutionContext.Create?.Invoke() ??
+            throw new InvalidOperationException("Unable to create 'ExecutionContext' instance; either (in order) 'executionContextFactory' resulted in null, or 'ExecutionContext.Create' resulted in null.");
+
+        ec.ServiceProvider = sp;
+
+        ExecutionContext.Reset();
+        ExecutionContext.SetCurrent(ec);
+
+        return ec;
+    });
+
+    /// <summary>
+    /// Adds a <b>scoped</b> service to instantiate and <paramref name="configure"/> a new <see cref="ExecutionContext"/> instance.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="ExecutionContext"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddExecutionContext(this IServiceCollection services, Action<IServiceProvider, ExecutionContext>? configure) => services.ThrowIfNull().AddScoped(sp =>
+    {
+        var ec = ExecutionContext.Create?.Invoke() ??
+            throw new InvalidOperationException("Unable to create 'ExecutionContext' instance; the 'ExecutionContext.Create' resulted in null.");
+
+        ec.ServiceProvider = sp;
+
+        configure?.Invoke(sp, ec);
+
+        ExecutionContext.Reset();
+        ExecutionContext.SetCurrent(ec);
+
+        return ec;
+    });
+
+    /// <summary>
+    /// Adds a <b>singleton</b> service to instantiate a new <see cref="PrecisionTimeProvider"/> instance with the specified <paramref name="decimalPlaces"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="decimalPlaces">The number of decimal places (0-7) for fractional seconds. Defaults to 6 (microseconds) for database compatibility.</param>
+    /// <param name="innerProvider">The optional inner <see cref="TimeProvider"/> to use. Defaults to null.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddPrecisionTimeProvider(this IServiceCollection services, int decimalPlaces = 6, TimeProvider? innerProvider = null)
+        => services.ThrowIfNull().AddSingleton<TimeProvider>(new PrecisionTimeProvider(decimalPlaces, innerProvider));
+
+    /// <summary>
+    /// Dynamically registers all types within the specified assembly that have a defined <see cref="ServiceLifetimeAttribute"/> as inferred by (using) the specified generic type.
+    /// </summary>
+    /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddDynamicServicesUsing<TAssembly1>(this IServiceCollection services)
+        => services.ThrowIfNull().AddDynamicServicesUsing(typeof(TAssembly1).Assembly);
+
+    /// <summary>
+    /// Dynamically registers all types within the specified assemblies that have a defined <see cref="ServiceLifetimeAttribute"/> as inferred by (using) the specified generic types.
+    /// </summary>
+    /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddDynamicServicesUsing<TAssembly1, TAssembly2>(this IServiceCollection services)
+        => services.ThrowIfNull().AddDynamicServicesUsing(typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly);
+
+    /// <summary>
+    /// Dynamically registers all types within the specified assemblies that have a defined <see cref="ServiceLifetimeAttribute"/> as inferred by (using) the specified generic types.
+    /// </summary>
+    /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <typeparam name="TAssembly3">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddDynamicServicesUsing<TAssembly1, TAssembly2, TAssembly3>(this IServiceCollection services)
+        => services.ThrowIfNull().AddDynamicServicesUsing(typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly, typeof(TAssembly3).Assembly);
+
+    /// <summary>
+    /// Dynamically registers all types within the specified assemblies that have a defined <see cref="ServiceLifetimeAttribute"/> as inferred by (using) the specified generic types.
+    /// </summary>
+    /// <typeparam name="TAssembly1">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <typeparam name="TAssembly2">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <typeparam name="TAssembly3">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <typeparam name="TAssembly4">The <see cref="Type"/> to infer the <see cref="Assembly"/> from.</typeparam>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddDynamicServicesUsing<TAssembly1, TAssembly2, TAssembly3, TAssembly4>(this IServiceCollection services)
+        => services.ThrowIfNull().AddDynamicServicesUsing(typeof(TAssembly1).Assembly, typeof(TAssembly2).Assembly, typeof(TAssembly3).Assembly, typeof(TAssembly4).Assembly);
+
+    /// <summary>
+    /// Dynamically registers all types within the specified <paramref name="assemblies"/> that have a defined <see cref="ServiceLifetimeAttribute"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="assemblies">The assemblies to probe for all types.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddDynamicServicesUsing(this IServiceCollection services, params IEnumerable<Assembly> assemblies)
+    {
+        foreach (var assembly in assemblies.Distinct())
+        {
+            foreach (var match in from type in assembly.GetTypes()
+                                  where !type.IsAbstract && !type.IsGenericTypeDefinition
+                                  let sla = ServiceLifetimeAttribute.GetCustomAttribute(type)
+                                  where sla is not null
+                                  select new { type, sla })
+            {
+                match.sla?.AddService(services, match.type);
+            }
+        }
+
+        return services;
+    }
+
+    /// <summary>
+    /// Adds a <b>singleton</b> service for the internal <see cref="IMemoryCache"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Where not explicitly registered then a static internal <see cref="IMemoryCache"/> will be used.</remarks>
+    public static IServiceCollection AddInternalCache(this IServiceCollection services) => services.ThrowIfNull().AddKeyedSingleton<IMemoryCache, MemoryCache>(CoreEx.Abstractions.Internal.CacheServiceKey);
+
+    /// <summary>
+    /// Adds a <b>scoped</b> service for the <see cref="ICacheKeyProvider"/> using the <see cref="DefaultCacheKeyProvider"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddDefaultCacheKeyProvider(this IServiceCollection services) => services.ThrowIfNull().AddScoped<ICacheKeyProvider, DefaultCacheKeyProvider>();
+
+    /// <summary>
+    /// Adds a <b>scoped</b> service for the <see cref="IHybridCache"/> using the <see cref="MemoryOnlyHybridCache"/>.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddMemoryOnlyHybridCache(this IServiceCollection services) => services.ThrowIfNull().AddScoped<IHybridCache, MemoryOnlyHybridCache>();
+
+    /// <summary>
+    /// Adds the <see cref="IdempotencyKeyHandler"/> to the HTTP client pipeline which automatically manages the addition of idempotency keys to requests.
+    /// </summary>
+    /// <param name="builder">The <see cref="IHttpClientBuilder"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="IdempotencyKeyHandler"/> instance.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="IdempotencyKeyHandler"/> for further details.</remarks>
+    public static IHttpClientBuilder AddIdempotencyKeyHandler(this IHttpClientBuilder builder, Action<IServiceProvider, IdempotencyKeyHandler>? configure = null) => builder.ThrowIfNull().AddHttpMessageHandler(sp =>
+    {
+        var handler = new IdempotencyKeyHandler();
+        configure?.Invoke(sp, handler);
+        return handler;
+    });
+
+    /// <summary>
+    /// Adds a <b>scoped</b> <see cref="HybridCacheSynchronizer"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="HybridCacheSynchronizer"/> instance.</param>
+    /// <param name="addAsISynchronizer">Indicates whether to also register as the <see cref="ISynchronizer"/> service.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddHybridCacheSynchronizer(this IServiceCollection services, Action<IServiceProvider, HybridCacheSynchronizer>? configure = null, bool addAsISynchronizer = true)
+    {
+        services.ThrowIfNull().AddScoped(sp =>
+        {
+            var synchronizer = ActivatorUtilities.CreateInstance<HybridCacheSynchronizer>(sp);
+            configure?.Invoke(sp, synchronizer);
+            return synchronizer;
+        });
+
+        if (addAsISynchronizer)
+            services.AddScoped<ISynchronizer, HybridCacheSynchronizer>(sp => sp.GetRequiredService<HybridCacheSynchronizer>());
+
+        return services;
+    }
+
+    /// <summary>
+    /// Registers a post-configuration for all health checks to further configure and add the <see cref="HealthCheckTags.Startup"/> and <see cref="HealthCheckTags.Ready"/> tags where not currently defined.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The function to configure <i>each</i> <see cref="HealthCheckRegistration"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="configure"/> function should return <see langword="true"/> to add the default tags, otherwise, <see langword="false"/> to skip.</remarks>
+    public static IServiceCollection PostConfigureAllHealthChecks(this IServiceCollection services, Func<HealthCheckRegistration, bool>? configure = null)
+    {
+        return services.ThrowIfNull().PostConfigureAll<HealthCheckServiceOptions>(options =>
+        {
+            foreach (var registration in options.Registrations)
+            {
+                if (configure?.Invoke(registration) ?? true)
+                {
+                    registration.Tags.Add(nameof(HealthCheckTags.Startup));
+                    registration.Tags.Add(nameof(HealthCheckTags.Ready));
+                }
+            }
+        });
+    }
+
+    /// <summary>
+    /// Adds a <b>singleton</b> <see cref="HostedServiceManager"/> service.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="configure">The action to configure the <see cref="HostedServiceManager"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    public static IServiceCollection AddHostedServiceManager(this IServiceCollection services, Action<IServiceProvider, HostedServiceManager>? configure = null)
+    {
+        return services.ThrowIfNull().AddSingleton(sp =>
+        {
+            var hsm = ActivatorUtilities.CreateInstance<HostedServiceManager>(sp);
+            configure?.Invoke(sp, hsm);
+            return hsm;
+        });
+    }
+
+    /// <summary>
+    /// Adds a <b>singleton</b> <typeparamref name="THostedService"/> keyed service that will be executed as a hosted service (i.e. in the background).
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The keyed singleton and health check key.</param>
+    /// <param name="configure">An optional action to configure the <typeparamref name="THostedService"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Also automatically adds a health-check for the hosted service.</remarks>
+    public static IServiceCollection AddHostedService<THostedService>(this IServiceCollection services, string serviceKey, Action<IServiceProvider, THostedService>? configure = null) where THostedService : HostedServiceBase
+        => AddHostedService<THostedService>(services, serviceKey, sp => ActivatorUtilities.CreateInstance<THostedService>(sp, sp.GetRequiredService<ILoggerFactory>().CreateLogger<THostedService>()), configure);
+
+    /// <summary>
+    /// Adds a <b>singleton</b> <typeparamref name="THostedService"/> keyed service that will be executed as a hosted service (i.e. in the background).
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="serviceKey">The keyed singleton and health check key.</param>
+    /// <param name="factory">The function to create the <typeparamref name="THostedService"/> instance.</param>
+    /// <param name="configure">An optional action to configure the <typeparamref name="THostedService"/> instance.</param>
+    /// <returns>The <see cref="IServiceCollection"/> for fluent-style method-chaining.</returns>
+    /// <remarks>Also automatically adds a health-check for the hosted service.</remarks>
+    public static IServiceCollection AddHostedService<THostedService>(this IServiceCollection services, string serviceKey, Func<IServiceProvider, THostedService> factory, Action<IServiceProvider, THostedService>? configure = null) where THostedService : HostedServiceBase
+    {
+        factory.ThrowIfNull();
+
+        // Register health check for the hosted service.
+        var hc = new HostedServiceHealthCheck();
+        services.ThrowIfNull().AddHealthChecks().AddCheck(serviceKey.ThrowIfNullOrEmpty(), hc, tags: HealthCheckTags.StartUpAndReadyOnly);
+
+        // Register the hosted service - this allows access to the instance by the service key where required; need by the HostedServiceManager.
+        services.AddKeyedSingleton<HostedServiceBase>(serviceKey, (sp, _) =>
+        {
+            var hs = factory(sp);
+            hs.ServiceName = serviceKey;
+            hs.HealthCheck = hc;
+            configure?.Invoke(sp, hs);
+            return hs;
+        });
+
+        // Does not use 'AddHostedService' as this does not allow multiple instances to be registered with the same type; see https://github.com/dotnet/runtime/issues/38751.
+        return services.AddSingleton<IHostedService>(sp => sp.GetRequiredKeyedService<HostedServiceBase>(serviceKey));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/CoreExExtensions.OpenTelemetry.cs b/src/CoreEx/CoreExExtensions.OpenTelemetry.cs
new file mode 100644
index 00000000..3bb59960
--- /dev/null
+++ b/src/CoreEx/CoreExExtensions.OpenTelemetry.cs
@@ -0,0 +1,38 @@
+#pragma warning disable IDE0130 // Namespace does not match folder structure; by design.
+namespace OpenTelemetry.Trace;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static class CoreExExtensions
+{
+    /// <summary>
+    /// Enables <i>CoreEx</i> OpenTelemetry instrumentation (including <see cref="WithCoreExSources(TracerProviderBuilder)"/>).
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static OpenTelemetryBuilder WithCoreExTelemetry(this OpenTelemetryBuilder builder)
+        => builder.ThrowIfNull().ThrowIfNull()
+            .WithTracing(t => t.AddHttpClientInstrumentation().WithCoreExSources())
+            .WithMetrics(m => m.AddHttpClientInstrumentation().AddRuntimeInstrumentation().AddProcessInstrumentation().AddMeter("Polly"));
+
+    /// <summary>
+    /// Enables (adds) the <i>CoreEx</i>-specified OpenTelemetry tracing sources.
+    /// </summary>
+    /// <param name="builder">The <see cref="OpenTelemetryBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static TracerProviderBuilder WithCoreExSources(this TracerProviderBuilder builder) => builder.ThrowIfNull()
+        .AddInvokerAsSource<CoreEx.Hosting.Work.WorkOrchestratorInvoker>()
+        .AddInvokerAsSource<CoreEx.Hosting.HostedServiceInvoker>()
+        .AddInvokerAsSource<CoreEx.RefData.ReferenceDataOrchestratorInvoker>();
+
+    /// <summary>
+    /// Adds the <typeparamref name="TInvoker"/> as the <see cref="TracerProviderBuilder.AddSource(string[])"/> using the <see cref="InvokerNameAttribute.GetName{T}()"/>.
+    /// </summary>
+    /// <typeparam name="TInvoker">The <see cref="InvokerBase"/> <see cref="Type"/>.</typeparam>
+    /// <param name="builder">The <see cref="TracerProviderBuilder"/>.</param>
+    /// <returns>The <paramref name="builder"/> to support fluent-style method-chaining.</returns>
+    public static TracerProviderBuilder AddInvokerAsSource<TInvoker>(this TracerProviderBuilder builder) where TInvoker : InvokerBase
+        => builder.ThrowIfNull().AddSource(InvokerNameAttribute.GetName<TInvoker>());
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/DataExtensions.ITotalCount.cs b/src/CoreEx/Data/DataExtensions.ITotalCount.cs
new file mode 100644
index 00000000..9616d1c2
--- /dev/null
+++ b/src/CoreEx/Data/DataExtensions.ITotalCount.cs
@@ -0,0 +1,90 @@
+namespace CoreEx.Data;
+
+public static partial class DataExtensions
+{
+    /// <summary>
+    /// Sets the <see cref="ITotalCount.TotalCount"/> of the elements in the sequence where <see cref="ITotalCount.IsCountRequested"/> is <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The <see cref="ITotalCount"/>.</param>
+    /// <param name="totalCount">The total count of the elements in the sequence.</param>
+    /// <returns>The <paramref name="source"/> to support fluent-style method-chaining.</returns>
+    public static TSource WithTotalCount<TSource>(this TSource source, long totalCount) where TSource : ITotalCount => source.WithTotalCount(() => totalCount);
+
+    /// <summary>
+    /// Sets the <see cref="ITotalCount.TotalCount"/> of the elements in the sequence where <see cref="ITotalCount.IsCountRequested"/> is <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The <see cref="ITotalCount"/>.</param>
+    /// <param name="totalCount">The function to determine the total count of the elements in the sequence.</param>
+    /// <returns>The <paramref name="source"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="totalCount"/> function is wrapped in a try/catch, and will swallow and log any exception that occurs versus failing. The <see cref="PagingResult.TotalCount"/> in the event of an exception will
+    /// be set to <see langword="null"/> indicating that the total count is unknown.</remarks>
+    public static TSource WithTotalCount<TSource>(this TSource source, Func<long> totalCount) where TSource : ITotalCount
+    {
+        source.ThrowIfNull();
+        if (!source.IsCountRequested || totalCount is null)
+            return source;
+
+        try
+        {
+            source.WithTotalCount(totalCount());
+        }
+        catch (Exception ex)
+        {
+            WithTotalCountException(ex);
+        }
+
+        return source;
+    }
+
+    /// <summary>
+    /// Sets the <see cref="ITotalCount.TotalCount"/> of the elements in the sequence where <see cref="ITotalCount.IsCountRequested"/> is <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The <see cref="ITotalCount"/>.</param>
+    /// <param name="totalCount">The function to determine the total count of the elements in the sequence.</param>
+    /// <returns>The <paramref name="source"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="totalCount"/> function is wrapped in a try/catch, and will swallow and log any exception that occurs versus failing. The <see cref="PagingResult.TotalCount"/> in the event of an exception will
+    /// be set to <see langword="null"/> indicating that the total count is unknown.</remarks>
+    public static async Task<TSource> WithTotalCountAsync<TSource>(this TSource source, Func<Task<long?>> totalCount) where TSource : ITotalCount
+        => await WithTotalCountAsync(source, async _ => await totalCount().ConfigureAwait(false), default).ConfigureAwait(false);
+
+    /// <summary>
+    /// Sets the <see cref="ITotalCount.TotalCount"/> of the elements in the sequence where <see cref="ITotalCount.IsCountRequested"/> is <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The <see cref="ITotalCount"/>.</param>
+    /// <param name="totalCount">The function to determine the total count of the elements in the sequence.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <paramref name="source"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>The <paramref name="totalCount"/> function is wrapped in a try/catch, and will swallow and log any exception that occurs versus failing. The <see cref="PagingResult.TotalCount"/> in the event of an exception will
+    /// be set to <see langword="null"/> indicating that the total count is unknown.</remarks>
+    public async static Task<TSource> WithTotalCountAsync<TSource>(this TSource source, Func<CancellationToken, Task<long?>> totalCount, CancellationToken cancellationToken = default) where TSource : ITotalCount
+    {
+        source.ThrowIfNull();
+        if (!source.IsCountRequested || totalCount is null)
+            return source;
+
+        try
+        {
+            source.WithTotalCount(await totalCount(cancellationToken).ConfigureAwait(false));
+        }
+        catch (Exception ex)
+        {
+            WithTotalCountException(ex);
+        }
+
+        return source;
+    }
+
+    /// <summary>
+    /// Common total count exception handling; i.e. logging the exception as a warning where possible.
+    /// </summary>
+    private static void WithTotalCountException(Exception ex)
+    {
+        var logger = ExecutionContext.GetService<ILoggerFactory>()?.CreateLogger(typeof(ITotalCount));
+        if (logger is not null && logger.IsEnabled(LogLevel.Warning))
+            logger.LogWarning(ex, "Unable to determine the total count of the elements in the sequence; the total count will not be returned as a result: {Message}.", ex.Message);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/DataExtensions.Where.cs b/src/CoreEx/Data/DataExtensions.Where.cs
new file mode 100644
index 00000000..8ba5c935
--- /dev/null
+++ b/src/CoreEx/Data/DataExtensions.Where.cs
@@ -0,0 +1,93 @@
+namespace CoreEx.Data;
+
+public static partial class DataExtensions
+{
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence of values based on a <paramref name="predicate"/> only <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="when">Indicates to perform an underlying <see cref="Queryable.Where{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}})"/> <i>only</i> when <see langword="true"/>; otherwise, no <i>Where</i> is invoked.</param>
+    /// <param name="predicate">A function to test each element for a condition.</param>
+    /// <returns>An <see cref="IQueryable{T}"/> that contains elements from the input sequence that satisfy the condition.</returns>
+    public static IQueryable<TSource> WhereWhen<TSource>(this IQueryable<TSource> source, bool when, Expression<Func<TSource, bool>> predicate) => when ? source.Where(predicate) : source;
+
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence based on a <paramref name="predicate"/> only when the <paramref name="with"/> is not the default value for the <typeparamref name="TWith"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TWith">The with value <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="with">Indicates to perform an underlying <see cref="Queryable.Where{TSource}(IQueryable{TSource}, Expression{Func{TSource, bool}})"/> only when the with is not the default value; otherwise, no <b>Where</b> is invoked.</param>
+    /// <param name="predicate">A function to test each element for a condition.</param>
+    /// <returns>An <see cref="IQueryable{T}"/> that contains elements from the input sequence that satisfy the condition.</returns>
+    /// <remarks>Where the <paramref name="with"/> is an <see cref="IEnumerable"/> it will also ensure there is at least a single item.</remarks>
+    public static IQueryable<TSource> WhereWith<TSource, TWith>(this IQueryable<TSource> source, TWith with, Expression<Func<TSource, bool>> predicate)
+    {
+        if (Comparer<TWith>.Default.Compare(with, default!) != 0)
+        {
+            if (with is not string && with is IEnumerable ie && !ie.GetEnumerator().MoveNext())
+                return source;
+
+            return source.Where(predicate);
+        }
+
+        return source;
+    }
+
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence using the specified <paramref name="selector"/> and <paramref name="pattern"/> containing supported wildcards.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="selector">The function to select the element value to <paramref name="pattern"/> match.</param>
+    /// <param name="pattern">The pattern to <paramref name="wildcard"/> match the result of each element <paramref name="selector"/>.</param>
+    /// <param name="ignoreCase">Indicates whether the comparison should ignore case (default) or not.</param>
+    /// <param name="checkForNull">Indicates whether a <see langword="null"/> check should also be performed before the comparion occurs (defaults to <see langword="true"/>).</param>
+    /// <param name="wildcard">The <see cref="Wildcard"/> configuration to use; where <see langword="null"/> it will use <see cref="Wildcard.Default"/>.</param>
+    /// <returns>An <see cref="IQueryable{T}"/> that contains the elements from the <paramref name="source"/> sequence after applying the wildcard <paramref name="pattern"/>.</returns>
+    public static IQueryable<TSource> WhereWildcard<TSource>(this IQueryable<TSource> source, Expression<Func<TSource, string?>> selector, string? pattern, bool ignoreCase = true, bool checkForNull = true, Wildcard? wildcard = null) where TSource : class
+    {
+        selector.ThrowIfNull();
+
+        var wc = wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
+        var wr = wc.Parse(pattern).ThrowOnError();
+
+        // Exit stage left where nothing to do.
+        if (wr.Selection.HasFlag(WildcardSelection.None) || wr.Selection.HasFlag(WildcardSelection.Single))
+            return source;
+
+        // Check the expression.
+        if (selector.Body is not MemberExpression me)
+            throw new ArgumentException("Selector expression must be of Type MemberExpression.", nameof(selector));
+
+        Expression exp = me;
+        var s = wr.GetTextWithoutWildcards();
+        if (ignoreCase)
+        {
+            s = s?.ToUpper(CultureInfo.CurrentCulture);
+            exp = Expression.Call(me, typeof(string).GetMethod("ToUpper", Type.EmptyTypes)!)!;
+        }
+
+        if (wr.Selection.HasFlag(WildcardSelection.Equal))
+            exp = Expression.Equal(exp, Expression.Constant(s));
+        else if (wr.Selection.HasFlag(WildcardSelection.EndsWith))
+            exp = Expression.Call(exp, "EndsWith", null, Expression.Constant(s));
+        else if (wr.Selection.HasFlag(WildcardSelection.StartsWith))
+            exp = Expression.Call(exp, "StartsWith", null, Expression.Constant(s));
+        else if (wr.Selection.HasFlag(WildcardSelection.Contains))
+            exp = Expression.Call(exp, "Contains", null, Expression.Constant(s));
+        else
+            throw new ArgumentException("Wildcard selection pattern is not supported for an IQueryable; must result in an Equal, StartsWith, EndsWith or Contains only.", nameof(pattern));
+
+        // Add check for not null.
+        if (checkForNull)
+        {
+            var ee = Expression.NotEqual(me, Expression.Constant(null));
+            exp = Expression.AndAlso(ee, exp);
+        }
+
+        // Create the final lambda expression.
+        return source.Where(Expression.Lambda<Func<TSource, bool>>(exp, selector.Parameters));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/DataExtensions.With.cs b/src/CoreEx/Data/DataExtensions.With.cs
new file mode 100644
index 00000000..8c0823b1
--- /dev/null
+++ b/src/CoreEx/Data/DataExtensions.With.cs
@@ -0,0 +1,21 @@
+namespace CoreEx.Data;
+
+public static partial class DataExtensions
+{
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence according to the specified <paramref name="paging"/> or <see cref="PagingArgs.Create"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <returns>An <see cref="IQueryable{T}"/> that contains the elements from the <paramref name="source"/> sequence after applying the <paramref name="paging"/>.</returns>
+    /// <remarks>The <paramref name="paging"/> where <see langword="null"/> will default to <see cref="PagingArgs.Create"/>.</remarks>
+    public static IQueryable<TSource> WithPaging<TSource>(this IQueryable<TSource> source, PagingArgs? paging = null)
+    {
+        if (paging?.IsNone ?? false)
+            return source;
+
+        paging ??= PagingArgs.Create();
+        return source.Skip(paging.Skip).Take(paging.Take);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/DataExtensions.cs b/src/CoreEx/Data/DataExtensions.cs
new file mode 100644
index 00000000..c9d8cd94
--- /dev/null
+++ b/src/CoreEx/Data/DataExtensions.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Provides standard data extensions.
+/// </summary>
+public static partial class DataExtensions { }
diff --git a/src/CoreEx/Data/IItemsResult.cs b/src/CoreEx/Data/IItemsResult.cs
new file mode 100644
index 00000000..1e301db1
--- /dev/null
+++ b/src/CoreEx/Data/IItemsResult.cs
@@ -0,0 +1,34 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables the <see cref="Paging"/> and <see cref="Items"/> for a collection result.
+/// </summary>
+/// <remarks>Generally an <see cref="IItemsResult"/> is not intended for serialized <see cref="HttpResponseMessage"/>; the underlying <see cref="Items"/> is serialized with the <see cref="Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.</remarks>
+public interface IItemsResult
+{
+    /// <summary>
+    /// Gets the underlying item <see cref="Type"/>.
+    /// </summary>
+    Type ItemType { get; }
+
+    /// <summary>
+    /// Gets the underlying <see cref="IEnumerable"/>.
+    /// </summary>
+    IEnumerable? Items { get; }
+
+    /// <summary>
+    /// Gets the <see cref="PagingResult"/>.
+    /// </summary>
+    PagingResult? Paging { get; }
+
+    /// <summary>
+    /// Indicates whether there are one or more <see cref="Items"/>.
+    /// </summary>
+    bool ItemsHasAny();
+
+    /// <summary>
+    /// Gets the count of the <see cref="Items"/>.
+    /// </summary>
+    /// <returns>The <see cref="Items"/> count.</returns>
+    int GetItemsCount();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IItemsResultT.cs b/src/CoreEx/Data/IItemsResultT.cs
new file mode 100644
index 00000000..31eccf8f
--- /dev/null
+++ b/src/CoreEx/Data/IItemsResultT.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables the typed <typeparamref name="TItem"/> <see cref="Items"/> (for a <see cref="IItemsResult"/>).
+/// </summary>
+/// <typeparam name="TItem">The underlying item <see cref="Type"/>.</typeparam>
+/// <remarks>Generally an <see cref="IItemsResult"/> is not intended to be serialized and returned as <see cref="HttpResponseMessage"/> content; 
+/// the underlying <see cref="Items"/> should be serialized with the <see cref="IItemsResult.Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.</remarks>
+public interface IItemsResult<TItem> : IItemsResult
+{
+    /// <inheritdoc/>
+    Type IItemsResult.ItemType => typeof(TItem);
+
+    /// <inheritdoc/>
+    IEnumerable? IItemsResult.Items => Items;
+
+    /// <summary>
+    /// Gets or sets the underlying collection.
+    /// </summary>
+    new IEnumerable<TItem>? Items { get; }
+
+    /// <inheritdoc/>
+    bool IItemsResult.ItemsHasAny() => Items?.Any() ?? false;
+
+    /// <inheritdoc/>
+    int IItemsResult.GetItemsCount() => Items is null ? 0 : Items.Count();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/ILogicallyDeleted.cs b/src/CoreEx/Data/ILogicallyDeleted.cs
new file mode 100644
index 00000000..979abfa3
--- /dev/null
+++ b/src/CoreEx/Data/ILogicallyDeleted.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a mutable logical <see cref="IsDeleted"/> data model state.
+/// </summary>
+public interface ILogicallyDeleted : IReadOnlyLogicallyDeleted
+{
+    /// <inheritdoc/>
+    bool IReadOnlyLogicallyDeleted.IsDeleted => IsDeleted;
+
+    /// <summary>
+    /// Indicates whether the data model is considered logically deleted.
+    /// </summary>
+    new bool IsDeleted { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IPartitionKey.cs b/src/CoreEx/Data/IPartitionKey.cs
new file mode 100644
index 00000000..4c622119
--- /dev/null
+++ b/src/CoreEx/Data/IPartitionKey.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a mutable <see cref="PartitionKey"/>.
+/// </summary>
+public interface IPartitionKey : IReadOnlyPartitionKey
+{
+    /// <inheritdoc/>
+    string? IReadOnlyPartitionKey.PartitionKey => PartitionKey;
+
+    /// <summary>
+    /// Gets or sets the partition key.
+    /// </summary>
+    new string? PartitionKey { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IPrimaryKey.cs b/src/CoreEx/Data/IPrimaryKey.cs
new file mode 100644
index 00000000..353a727c
--- /dev/null
+++ b/src/CoreEx/Data/IPrimaryKey.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables the read-only <see cref="PrimaryKey"/>.
+/// </summary>
+public interface IPrimaryKey : IEntityKey
+{
+    /// <summary>
+    /// Gets the <i>primary key</i> (represented as a <see cref="CompositeKey"/>).
+    /// </summary>
+    [JsonIgnore]
+    CompositeKey PrimaryKey { get; }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    CompositeKey IEntityKey.EntityKey => PrimaryKey;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IReadOnlyLogicallyDeleted.cs b/src/CoreEx/Data/IReadOnlyLogicallyDeleted.cs
new file mode 100644
index 00000000..2f326022
--- /dev/null
+++ b/src/CoreEx/Data/IReadOnlyLogicallyDeleted.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a read-only logical <see cref="IsDeleted"/> data model state.
+/// </summary>
+public interface IReadOnlyLogicallyDeleted
+{
+    /// <summary>
+    /// Indicates whether the data model is considered logically deleted.
+    /// </summary>
+    bool IsDeleted { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IReadOnlyPartitionKey.cs b/src/CoreEx/Data/IReadOnlyPartitionKey.cs
new file mode 100644
index 00000000..ac8e1f99
--- /dev/null
+++ b/src/CoreEx/Data/IReadOnlyPartitionKey.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a read-only <see cref="PartitionKey"/>.
+/// </summary>
+public interface IReadOnlyPartitionKey
+{
+    /// <summary>
+    /// Gets the partition key.
+    /// </summary>
+    string? PartitionKey { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IReadOnlyTenantId.cs b/src/CoreEx/Data/IReadOnlyTenantId.cs
new file mode 100644
index 00000000..fa04b53f
--- /dev/null
+++ b/src/CoreEx/Data/IReadOnlyTenantId.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a read-only <see cref="TenantId"/>.
+/// </summary>
+public interface IReadOnlyTenantId
+{
+    /// <summary>
+    /// Gets the tenant identifier.
+    /// </summary>
+    string? TenantId { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/IReadOnlyTypeDiscriminator.cs b/src/CoreEx/Data/IReadOnlyTypeDiscriminator.cs
new file mode 100644
index 00000000..f2853303
--- /dev/null
+++ b/src/CoreEx/Data/IReadOnlyTypeDiscriminator.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a read-only <see cref="TypeDiscriminator"/> to identify the underlying type of the data model.
+/// </summary>
+public interface IReadOnlyTypeDiscriminator
+{
+    /// <summary>
+    /// Gets the type discriminator name.
+    /// </summary>
+    /// <remarks>This defaults to the corresponding <see cref="SchemaAttribute.Name"/>; otherwise, the underlying <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
+    string? TypeDiscriminator { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/ITenantId.cs b/src/CoreEx/Data/ITenantId.cs
new file mode 100644
index 00000000..bae84f71
--- /dev/null
+++ b/src/CoreEx/Data/ITenantId.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a mutable <see cref="TenantId"/>.
+/// </summary>
+public interface ITenantId : IReadOnlyTenantId
+{
+    /// <inheritdoc/>
+    string? IReadOnlyTenantId.TenantId => TenantId;
+
+    /// <summary>
+    /// Gets the tenant identifier.
+    /// </summary>
+    new string? TenantId { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/ITotalCount.cs b/src/CoreEx/Data/ITotalCount.cs
new file mode 100644
index 00000000..5e6538b3
--- /dev/null
+++ b/src/CoreEx/Data/ITotalCount.cs
@@ -0,0 +1,28 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables the total count capabilities for a sequence.
+/// </summary>
+public interface ITotalCount
+{
+    /// <summary>
+    /// Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <see langword="false"/>).
+    /// </summary>
+    /// <remarks>This may result in a secondary query and therefore impact overall performance; this should be used judiciously.
+    /// <para>There are no guarantees that a count will be performed, as this will depend on the underlying implementation; hence, it is simply a request.</para></remarks>
+    public bool IsCountRequested { get; }
+
+    /// <summary>
+    /// Gets the total count of the elements in the sequence.
+    /// </summary>
+    /// <remarks>A <see langword="null"/> value indicates that the total count is unknown.</remarks>
+    public long? TotalCount { get; }
+
+    /// <summary>
+    /// Sets the total count of the elements in the sequence.
+    /// </summary>
+    /// <param name="totalCount">The total count of the elements in the sequence.</param>
+    /// <remarks>A <see langword="null"/> or negative value indicates that the total count is unknown.
+    /// <para>The <see cref="TotalCount"/> is only set when <see cref="IsCountRequested"/> is <see langword="true"/>.</para></remarks>
+    void WithTotalCount(long? totalCount);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/ITypeDiscriminator.cs b/src/CoreEx/Data/ITypeDiscriminator.cs
new file mode 100644
index 00000000..8932a4e7
--- /dev/null
+++ b/src/CoreEx/Data/ITypeDiscriminator.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Enables a mutable <see cref="TypeDiscriminator"/> to identify the underlying type of the data model.
+/// </summary>
+public interface ITypeDiscriminator : IReadOnlyTypeDiscriminator
+{
+    /// <inheritdoc/>
+    string? IReadOnlyTypeDiscriminator.TypeDiscriminator => TypeDiscriminator;
+
+    /// <summary>
+    /// Gets or sets the type discriminator name.
+    /// </summary>
+    /// <remarks>This defaults to the corresponding <see cref="SchemaAttribute.Name"/>; otherwise, the underlying <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
+    new string? TypeDiscriminator { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/ItemsResultT.cs b/src/CoreEx/Data/ItemsResultT.cs
new file mode 100644
index 00000000..05decf86
--- /dev/null
+++ b/src/CoreEx/Data/ItemsResultT.cs
@@ -0,0 +1,53 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Provides an <see cref="IItemsResult{TItem}"/> that supports <see cref="Items"/> and corresponding <see cref="Paging"/>.
+/// </summary>
+/// <typeparam name="TItem">The underlying entity <see cref="Type"/>.</typeparam>
+/// <remarks>Generally an <see cref="IItemsResult"/> is not intended to be serialized and returned as <see cref="HttpResponseMessage"/> content; 
+/// the underlying <see cref="Items"/> should be serialized with the <see cref="IItemsResult.Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.
+/// <para>Use <see cref="PagingArgs.None"/> to specify that no paging was requested/applied.</para></remarks>
+public sealed record class ItemsResult<TItem> : IItemsResult<TItem>, ITotalCount
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ItemsResult{TItem}"/> class defaulting the <see cref="Paging"/>.
+    /// </summary>
+    public ItemsResult() : this(new PagingArgs()) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ItemsResult{TItem}"/> class with <paramref name="paging"/> (defaults where <see langword="null"/>).
+    /// </summary>
+    /// <param name="paging">Defaults the <see cref="IItemsResult.Paging"/> to the specified <see cref="PagingArgs"/>.</param>
+    public ItemsResult(PagingArgs? paging)
+    {
+        if (paging is null || !paging.IsNone)
+            Paging = new PagingResult(paging);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ItemsResult{TItem}"/> class with the specified <paramref name="items"/> and optional <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="items">The initial items.</param>
+    /// <param name="paging">Defaults the <see cref="IItemsResult.Paging"/> to the requesting <see cref="PagingArgs"/>.</param>
+    public ItemsResult(IEnumerable<TItem>? items, PagingArgs? paging = null) : this(paging ?? PagingArgs.None) => Items = items;
+
+    /// <inheritdoc/>
+    public IEnumerable<TItem>? Items { get; set => field = field is null ? value : throw new InvalidOperationException($"{nameof(Items)} can only be set once."); }
+
+    /// <inheritdoc/>
+    public PagingResult? Paging { get; private set; }
+
+    /// <summary>
+    /// Indicates whether the total count has been requested.
+    /// </summary>
+    private bool IsCountRequested => Paging is not null && Paging.IsCountRequested;
+
+    /// <inheritdoc/>
+    bool ITotalCount.IsCountRequested => IsCountRequested;
+
+    /// <inheritdoc/>
+    long? ITotalCount.TotalCount => IsCountRequested ? Paging?.TotalCount : null;
+
+    /// <inheritdoc/>
+    void ITotalCount.WithTotalCount(long? totalCount) => Paging.AdjustWhen(_ => IsCountRequested, p => p.WithTotalCount(totalCount));
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/Model.cs b/src/CoreEx/Data/Model.cs
new file mode 100644
index 00000000..831476a9
--- /dev/null
+++ b/src/CoreEx/Data/Model.cs
@@ -0,0 +1,143 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Provides utility capabilities for models.
+/// </summary>
+public static class Model
+{
+    /// <summary>
+    /// Prepares the model for <i>Create</i> by setting (overriding) the <see cref="ITenantId.TenantId"/>, <see cref="IChangeLogEx.CreatedBy"/>, and <see cref="IChangeLogEx.CreatedOn"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="model">The model.</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <paramref name="model"/>.</returns>
+    /// <remarks>Invokes the following:
+    ///   <list type="bullet">
+    ///     <item><see cref="PrepareTenantId"/>.</item>
+    ///     <item><see cref="PrepareTypeDiscriminator"/>.</item>
+    ///     <item><see cref="PrepareCreateChangeLog"/>.</item>
+    ///   </list>
+    /// </remarks>
+    [return: NotNullIfNotNull(nameof(model))]
+    public static TModel? PrepareCreate<TModel>(TModel? model, ExecutionContext? executionContext = null)
+    {
+        if (executionContext is null)
+            ExecutionContext.TryGetCurrent(out executionContext);
+
+        return PrepareCreateChangeLog(PrepareTypeDiscriminator(PrepareTenantId(model, executionContext)), executionContext);
+    }
+
+    /// <summary>
+    /// Prepares the model for <i>Update</i> by setting (overriding) the <see cref="ITenantId.TenantId"/>, <see cref="IChangeLogEx.UpdatedBy"/>, and <see cref="IChangeLogEx.UpdatedOn"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="model">The model.</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <paramref name="model"/>.</returns>
+    /// <remarks>Invokes the following:
+    ///   <list type="bullet">
+    ///     <item><see cref="PrepareTenantId"/>.</item>
+    ///     <item><see cref="PrepareTypeDiscriminator"/>.</item>
+    ///     <item><see cref="PrepareUpdateChangeLog"/>.</item>
+    ///   </list>
+    /// </remarks>
+    [return: NotNullIfNotNull(nameof(model))]
+    public static TModel? PrepareUpdate<TModel>(TModel? model, ExecutionContext? executionContext = null)
+    {
+        if (executionContext is null)
+            ExecutionContext.TryGetCurrent(out executionContext);
+
+        return PrepareUpdateChangeLog(PrepareTypeDiscriminator(PrepareTenantId(model, executionContext)), executionContext);
+    }
+
+    /// <summary>
+    /// Prepares the <see cref="ITenantId.TenantId"/> by setting (overriding) with the <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.TenantId"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="model">The model.</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <paramref name="model"/>.</returns>
+    [return: NotNullIfNotNull(nameof(model))]
+    public static TModel? PrepareTenantId<TModel>(TModel? model, ExecutionContext? executionContext = null)
+    {
+        if (model is null || model is not ITenantId ti)
+            return model;
+
+        if (executionContext is null)
+            ExecutionContext.TryGetCurrent(out executionContext);
+
+        ti.TenantId = executionContext?.TenantId;
+        return model;
+    }
+
+    /// <summary>
+    /// Prepares the <see cref="ITypeDiscriminator.TypeDiscriminator"/> by setting (overriding) with the specified <paramref name="typeDiscriminator"/> or, where not specified, the <see cref="SchemaAttribute.Name"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="model">The model.</param>
+    /// <param name="typeDiscriminator">The optional type discriminator override.</param>
+    /// <returns>The <paramref name="model"/>.</returns>
+    [return: NotNullIfNotNull(nameof(model))]
+    public static TModel? PrepareTypeDiscriminator<TModel>(TModel? model, string? typeDiscriminator = null)
+    {
+        if (model is null || model is not ITypeDiscriminator td)
+            return model;
+
+        if (string.IsNullOrEmpty(typeDiscriminator) && Schema.TryGetMetadata<TModel>(out var metadata))
+            typeDiscriminator = metadata.Name;
+
+        td.TypeDiscriminator = typeDiscriminator;
+        return model;
+    }
+
+    /// <summary>
+    /// Prepares the <see cref="IChangeLog"/> or <see cref="IChangeLogEx"/> for <i>Create</i> by setting (overriding) the <see cref="IChangeLogEx.CreatedBy"/> and <see cref="IChangeLogEx.CreatedOn"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="model">The model.</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <paramref name="model"/>.</returns>
+    [return: NotNullIfNotNull(nameof(model))]
+    public static TModel? PrepareCreateChangeLog<TModel>(TModel? model, ExecutionContext? executionContext = null)
+    {
+        if (model is null)
+            return model;
+
+        if (model is IChangeLog changeLog)
+            changeLog.ChangeLog = ChangeLog.CreateCreated(executionContext);
+        else if (model is IChangeLogEx changeLogEx)
+        {
+            var (UserName, Timestamp) = ChangeLog.GetChangeLogInfo(executionContext);
+            changeLogEx.CreatedBy = UserName;
+            changeLogEx.CreatedOn = Timestamp;
+        }
+
+        return model;
+    }
+
+    /// <summary>
+    /// Prepares the <see cref="IChangeLog"/> or <see cref="IChangeLogEx"/> for <i>Update</i> by setting (overriding) the <see cref="IChangeLogEx.UpdatedBy"/> and <see cref="IChangeLogEx.UpdatedOn"/>.
+    /// </summary>
+    /// <typeparam name="TModel">The model <see cref="Type"/>.</typeparam>
+    /// <param name="model">The model.</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>The <paramref name="model"/>.</returns>
+    [return: NotNullIfNotNull(nameof(model))]
+    public static TModel? PrepareUpdateChangeLog<TModel>(TModel? model, ExecutionContext? executionContext = null)
+    {
+        if (model is null)
+            return model;
+
+        if (model is IChangeLog changeLog)
+            changeLog.ChangeLog = ChangeLog.CreateChanged(changeLog.ChangeLog, executionContext);
+        else if (model is IChangeLogEx changeLogEx)
+        {
+            var (UserName, Timestamp) = ChangeLog.GetChangeLogInfo(executionContext);
+            changeLogEx.UpdatedBy = UserName;
+            changeLogEx.UpdatedOn = Timestamp;
+        }
+
+        return model;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/PagingArgs.cs b/src/CoreEx/Data/PagingArgs.cs
new file mode 100644
index 00000000..87ba66d8
--- /dev/null
+++ b/src/CoreEx/Data/PagingArgs.cs
@@ -0,0 +1,91 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Represents position-based paging arguments; specifically <see cref="Skip"/> and <see cref="Take"/>.
+/// </summary>
+public record class PagingArgs
+{
+    private static int? _defaultTake;
+    private static int? _maximumTake;
+
+    /// <summary>
+    /// Creates a new default <see cref="PagingArgs"/> with <i>no</i> <see cref="IsCountRequested"/>.
+    /// </summary>
+    /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
+    /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
+    /// <param name="count">Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query.</param>
+    public static PagingArgs Create(int skip = 0, int? take = null, bool count = false) => new(skip, take, count);
+
+    /// <summary>
+    /// Creates a new default <see cref="PagingArgs"/> <i>with</i> <see cref="IsCountRequested"/>.
+    /// </summary>
+    /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
+    /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
+    public static PagingArgs CreateWithCount(int skip = 0, int? take = null) => new(skip, take, count: true);
+
+    /// <summary>
+    /// Gets or sets the default <see cref="Take"/>.
+    /// </summary>
+    /// <remarks>Defaults to settings '<c>CoreEx:Data:PagingArgs:DefaultTake</c>'; otherwise, <c>25</c>.</remarks>
+    public static int DefaultTake
+    {
+        get => _defaultTake ?? Internal.GetConfigurationValue("CoreEx:Data:PagingArgs:DefaultTake", 25);
+        set => _defaultTake = value < 1 ? null : value;
+    }
+
+    /// <summary>
+    /// Gets or sets the maximum <see cref="Take"/>.
+    /// </summary>
+    /// <remarks>Defaults to settings '<c>CoreEx:Data:PagingArgs:MaximumTake</c>'; otherwise, <c>1000</c>.</remarks>
+    public static int MaximumTake
+    {
+        get => _maximumTake ?? Internal.GetConfigurationValue("CoreEx:Data:PagingArgs:MaximumTake", 1000);
+        set => _maximumTake = value < 1 ? null : value;
+    }
+
+    /// <summary>
+    /// Represents a <see cref="PagingArgs"/> that will explicitly <b>not</b> be applied.
+    /// </summary>
+    /// <remarks>This instance is immutable.</remarks>
+    public static PagingArgs None { get; } = new() { IsNone = true };
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PagingArgs"/> class.
+    /// </summary>
+    /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
+    /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
+    /// <param name="count">Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query.</param>
+    public PagingArgs(int skip = 0, int? take = null, bool count = false)
+    {
+        Skip = skip;
+        Take = take ?? DefaultTake;
+        IsCountRequested = count;
+    }
+
+    /// <summary>
+    /// Gets the specified number of elements in a sequence to bypass.
+    /// </summary>
+    public int Skip { get => field; init => CheckImmutable(field = value < 0 ? 0 : value); }
+
+    /// <summary>
+    /// Gets the specified number of contiguous elements from the start of a sequence.
+    /// </summary>
+    public int Take { get => field; init => field = CheckImmutable(value <= 0 ? DefaultTake : Math.Min(MaximumTake, value)); }
+
+    /// <summary>
+    /// Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <see langword="false"/>).
+    /// </summary>
+    /// <remarks>This may result in a secondary query and therefore impact overall performance; this should be used judiciously.
+    /// <para>There are no guarantees that a count will be performed, as this will depend on the underlying implementation; hence, it is simply a request.</para></remarks>
+    public bool IsCountRequested { get; init => field = CheckImmutable(value); }
+
+    /// <summary>
+    /// Immutability value check for <see cref="Skip"/> and <see cref="Take"/> properties where <see cref="IsNone"/>.
+    /// </summary>
+    private T CheckImmutable<T>(T value) => IsNone ? throw new InvalidOperationException($"The {nameof(PagingArgs)} cannot be mutated when {nameof(IsNone)} is true.") : value;
+
+    /// <summary>
+    /// Indicates whether the <see cref="PagingArgs"/> is the <see cref="None"/> instance.
+    /// </summary>
+    public bool IsNone { get; private init; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/PagingResult.cs b/src/CoreEx/Data/PagingResult.cs
new file mode 100644
index 00000000..864a32dd
--- /dev/null
+++ b/src/CoreEx/Data/PagingResult.cs
@@ -0,0 +1,35 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Represents the resulting paging response including <see cref="TotalCount"/>.
+/// </summary>
+public record class PagingResult : PagingArgs, ITotalCount
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PagingResult"/> class with the specified <see cref="PagingArgs"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PagingResult(PagingArgs? paging = null)
+    {
+        Skip = paging?.Skip ?? 0;
+        Take = paging?.Take ?? DefaultTake;
+        IsCountRequested = paging?.IsCountRequested ?? false;
+    }
+
+    /// <inheritdoc/>
+    public long? TotalCount { get; private set; }
+
+    /// <inheritdoc/>
+    void ITotalCount.WithTotalCount(long? totalCount) => WithTotalCount(totalCount);
+
+    /// <summary>
+    /// Sets the <see cref="TotalCount"/> of the elements in the sequence.
+    /// </summary>
+    /// <param name="totalCount">The total count of the elements in the sequence.</param>
+    /// <returns>The <see cref="PagingResult"/> to support fluent-style method-chaining.</returns>
+    public PagingResult WithTotalCount(long? totalCount)
+    {
+        TotalCount = totalCount is null || totalCount.Value < 0 ? null : totalCount.Value;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/PartitionKey.cs b/src/CoreEx/Data/PartitionKey.cs
new file mode 100644
index 00000000..1cf24f1f
--- /dev/null
+++ b/src/CoreEx/Data/PartitionKey.cs
@@ -0,0 +1,79 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Provides the <see cref="IReadOnlyPartitionKey.PartitionKey"/> capabilities.
+/// </summary>
+public class PartitionKey
+{
+    /// <summary>
+    /// Gets the default partition size.
+    /// </summary>
+    public const int DefaultPartitionSize = 4;
+
+    /// <summary>
+    /// Gets the maximum byte count for stack allocation when converting strings to UTF-8.
+    /// </summary>
+    private const int MaxStackAllocByteCount = 256;
+
+    /// <summary>
+    /// Gets the hash-based partition identifier/number for the specified <paramref name="partitionKey"/> based on the planned <paramref name="partitionSize"/>.
+    /// </summary>
+    /// <param name="partitionKey">The deterministic partition key.</param>
+    /// <param name="partitionSize">The partition size (i.e the number of possible partitions).</param>
+    /// <param name="ignoreCase">Indicates whether to ignore case.</param>
+    /// <returns>The resulting partition identifier/number.</returns>
+    /// <remarks>The <paramref name="partitionKey"/> <b>must</b> be a universal, deterministic, and culture-independent <see cref="string"/>; where in doubt use <see cref="CompositeKey.ToString"/> which will enable.</remarks>
+    public static int GetPartitionId(string partitionKey, int partitionSize = DefaultPartitionSize, bool ignoreCase = true)
+    {
+        partitionKey = partitionKey.ThrowIfNull().Trim().ThrowIfNullOrEmpty().ThrowWhen(pk => pk.Length > 256, nameof(partitionKey));
+        partitionSize.ThrowWhen(ps => ps <= 0 || ps > 256, nameof(partitionSize));
+
+        static int GenerateIdFromHash(ReadOnlySpan<byte> bytes, int partitionSize)
+        {
+            Span<byte> hash = stackalloc byte[32];
+            SHA256.HashData(bytes, hash);
+            uint value = BinaryPrimitives.ReadUInt32LittleEndian(hash);
+
+            return (partitionSize & (partitionSize - 1)) == 0
+                ? (int)(value & (uint)(partitionSize - 1))
+                : (int)(value % (uint)partitionSize);
+        }
+
+        // Faster path for GUIDs: hash the 16-byte representation directly.
+        if (Guid.TryParse(partitionKey, out var guid))
+        {
+            Span<byte> guidBytes = stackalloc byte[16];
+            guid.TryWriteBytes(guidBytes);
+            return GenerateIdFromHash(guidBytes, partitionSize);
+        }
+
+        // Slower path for strings as casing and encoding is an additional step.
+        var normalized = ignoreCase ? partitionKey.ToUpperInvariant() : partitionKey;
+        var byteCount = Encoding.UTF8.GetByteCount(normalized);
+        Span<byte> utf8 = byteCount <= MaxStackAllocByteCount ? stackalloc byte[byteCount] : new byte[byteCount];
+        Encoding.UTF8.GetBytes(normalized.AsSpan(), utf8);
+        return GenerateIdFromHash(utf8, partitionSize);
+    }
+
+    /// <summary>
+    /// Gets the hash-based partition identifier/number for the specified <paramref name="partitionKey"/> based on the planned <paramref name="partitionSize"/> formatted as a string with leading zeros where appropriate.
+    /// </summary>
+    /// <param name="partitionKey">The deterministic partition key.</param>
+    /// <param name="partitionSize">The partition size (i.e the number of possible partitions).</param>
+    /// <param name="ignoreCase">Indicates whether to ignore case.</param>
+    /// <returns>The resulting partition identifier/number.</returns>
+    /// <remarks>The <paramref name="partitionKey"/> <b>must</b> be a universal, deterministic, and culture-independent <see cref="string"/>; where in doubt use <see cref="CompositeKey.ToString"/> which will enable.</remarks>
+    public static string GetPartitionIdAsString(string partitionKey, int partitionSize = DefaultPartitionSize, bool ignoreCase = true)
+    {
+        var id = GetPartitionId(partitionKey, partitionSize, ignoreCase);
+        var maxId = partitionSize - 1;
+        var digits = maxId switch
+        {
+            < 10 => 1,
+            < 100 => 2,
+            _ => 3
+        };
+
+        return id.ToString($"D{digits}", CultureInfo.InvariantCulture);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/PartitionPicker.cs b/src/CoreEx/Data/PartitionPicker.cs
new file mode 100644
index 00000000..f685ac76
--- /dev/null
+++ b/src/CoreEx/Data/PartitionPicker.cs
@@ -0,0 +1,191 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Determines which partitions a worker should probe on a given polling iteration.
+/// </summary>
+/// <remarks>
+/// Design goals:
+/// <list type="bullet">
+///  <item>No sticky ownership of partitions (workers can come and go freely).</item>
+///  <item>Deterministic distribution across workers (reduces repository contention / herd effects).</item>
+///  <item>Temporal locality: if a partition just produced work, try it again first.</item>
+///  <item>Stable behavior across OS/arch.</item>
+/// </list>
+/// <para><i>Note</i>: this class is <b>not</b> thread-safe for concurrent use by multiple workers; create one instance per worker task (to be used for its lifetime).</para>
+/// </remarks>
+public sealed class PartitionPicker
+{
+    /* To be clear up-front; this has been largely developed with assistance from AI - suggest using it to explain where applicable :-) */
+
+    private readonly Guid _workerId = Guid.NewGuid();
+    private readonly int _partitionSize; 
+    private readonly int _perWorkerPartitionCount; 
+    private readonly int _rotationSeconds;
+    private readonly int _epochSkew;
+    private int _prioritizedPartition = -1;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PartitionPicker"/> class.
+    /// </summary>
+    /// <param name="partitionSize">The total number of partitions available for distribution.</param>
+    /// <param name="perWorkerPartitionCount">The number of partitions assigned to each worker (is essentially the probe count per polling loop).</param>
+    /// <param name="rotationSeconds">The time interval, in seconds, for rotating partition assignments.</param>
+    public PartitionPicker(int partitionSize, int perWorkerPartitionCount, int rotationSeconds = 5)
+    {
+        _partitionSize = partitionSize.ThrowWhen(_partitionSize => _partitionSize <= 0);
+        _perWorkerPartitionCount = perWorkerPartitionCount.ThrowWhen(perWorkerPartitionCount => perWorkerPartitionCount <= 0 || perWorkerPartitionCount > partitionSize);
+        _rotationSeconds = rotationSeconds.ThrowWhen(rotationSeconds => rotationSeconds <= 0);
+
+        // Derive a small deterministic skew from worker-id so epoch boundaries do not cause synchronized shifts.
+        static uint Hash32(byte[] bytes)
+        {
+            var hash = SHA256.HashData(bytes);
+            return (uint)(hash[0] | (hash[1] << 8) | (hash[2] << 16) | (hash[3] << 24));
+        }
+
+        _epochSkew = (int)(Hash32(_workerId.ToByteArray()) % 3);
+    }
+
+    /// <summary>
+    /// Gets the total number of partitions available for distribution.
+    /// </summary>
+    public int PartitionSize => _partitionSize;
+
+    /// <summary>
+    /// Gets the number of partitions assigned to each worker.
+    /// </summary>
+    public int PerWorkerPartitionCount => _perWorkerPartitionCount;
+
+    /// <summary>
+    /// Gets the time interval, in seconds, for rotating partition assignments.
+    /// </summary>
+    public int RotationSeconds => _rotationSeconds;
+
+    /// <summary>
+    /// Gets an ordered set of partitions to probe during the next poll loop.
+    /// </summary>
+    public int[] GetNextPartitions(DateTimeOffset utcNow)
+    {
+        long epoch = utcNow.ToUnixTimeSeconds() / _rotationSeconds;
+
+        // Apply worker-specific skew to reduce boundary synchronization.
+        epoch += _epochSkew;
+
+        // Fast path: probe all partitions: useful in local dev when running a single worker and you want full sweep.
+        if (_perWorkerPartitionCount == _partitionSize)
+        {
+            var all = new int[_partitionSize];
+            int ls = System.Threading.Volatile.Read(ref _prioritizedPartition);
+            int idx = 0;
+
+            // Drain last-success first (temporal locality)
+            if ((uint)ls < (uint)_partitionSize)
+                all[idx++] = ls;
+
+            for (int p = 0; p < _partitionSize; p++)
+            {
+                if (p == ls) continue;
+                all[idx++] = p;
+            }
+
+            return all;
+        }
+
+        // Fast path: only one partition per loop. Minimizes repository chatter but may slow discovery of work.
+        if (_perWorkerPartitionCount == 1)
+        {
+            int ls = System.Threading.Volatile.Read(ref _prioritizedPartition);
+            if ((uint)ls < (uint)_partitionSize)
+                return [ls];
+
+            int start = (int)(Hash32(_workerId, epoch, salt: 1) % (uint)_partitionSize);
+            return [start];
+        }
+
+        // Deterministic start position for this worker + epoch.
+        int startPos = (int)(Hash32(_workerId, epoch, salt: 1) % (uint)_partitionSize);
+
+        // Deterministic stride ensures good coverage of partitions; for power-of-two totals (32), stride must be odd.
+        int strideCandidate = (int)(Hash32(_workerId, epoch, salt: 2) % (uint)(_partitionSize - 1)) + 1;
+        int stride = EnsureCoprimeStride(_partitionSize, strideCandidate);
+
+        var result = new List<int>(_perWorkerPartitionCount + 1);
+        var seen = new HashSet<int>(_perWorkerPartitionCount + 1);
+
+        // Prefer last successful partition first.
+        int last = System.Threading.Volatile.Read(ref _prioritizedPartition);
+        if ((uint)last < (uint)_partitionSize && seen.Add(last))
+            result.Add(last);
+
+        // Walk partitions in (start + i*stride) mod total; long arithmetic avoids overflow.
+        for (int i = 0; result.Count < _perWorkerPartitionCount; i++)
+        {
+            int p = (int)(((long)startPos + ((long)i * stride)) % _partitionSize);
+
+            if (seen.Add(p))
+                result.Add(p);
+        }
+
+        return [.. result];
+    }
+
+    /// <summary>
+    /// Hashes worker-id + epoch + salt into a stable 32-bit value to avoid runtime-dependent GetHashCode behavior.
+    /// </summary>
+    private static uint Hash32(Guid workerId, long epoch, int salt)
+    {
+        Span<byte> buffer = stackalloc byte[16 + sizeof(long) + sizeof(int)];
+
+        workerId.TryWriteBytes(buffer);
+        BitConverter.TryWriteBytes(buffer[16..], epoch);
+        BitConverter.TryWriteBytes(buffer[(16 + sizeof(long))..], salt);
+
+        var hash = SHA256.HashData(buffer);
+        return (uint)(hash[0] | (hash[1] << 8) | (hash[2] << 16) | (hash[3] << 24));
+    }
+
+    /// <summary>
+    /// Ensures stride is coprime with total. For power-of-two totals (e.g., 32), coprime means odd.
+    /// </summary>
+    private static int EnsureCoprimeStride(int total, int candidate)
+    {
+        // Computes the greatest common divisor (GCD) of two integers using the classic Euclidean algorithm.
+        static int Gcd(int a, int b)
+        {
+            while (b != 0)
+            {
+                int t = a % b;
+                a = b;
+                b = t;
+            }
+
+            return Math.Abs(a);
+        }
+
+        if ((total & (total - 1)) == 0)
+        {
+            candidate |= 1;
+            if (candidate >= total) candidate -= 2;
+            if (candidate <= 0) candidate = 1;
+            return candidate;
+        }
+
+        while (Gcd(candidate, total) != 1)
+        {
+            candidate++;
+            if (candidate >= total) candidate = 1;
+        }
+        return candidate;
+    }
+
+    /// <summary>
+    /// Prioritizes the specified partition for the next pick, by virtue of it being the most likely to have immediate work given recent successful processing.
+    /// </summary>
+    /// <remarks>This should only be called where work was completed successfully for the specified <paramref name="partitionId"/> and that there is a high-likelihood of immediate work for that partition.
+    /// This is a hint and not a guarantee that the partition will be picked first next time, but it will increase the likelihood.</remarks>
+    public void PrioritizePartition(int partitionId)
+    {
+        if ((uint)partitionId < (uint)_partitionSize)
+            System.Threading.Volatile.Write(ref _prioritizedPartition, partitionId);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/QueryArgs.cs b/src/CoreEx/Data/QueryArgs.cs
new file mode 100644
index 00000000..6be8dd0e
--- /dev/null
+++ b/src/CoreEx/Data/QueryArgs.cs
@@ -0,0 +1,91 @@
+namespace CoreEx.Data;
+
+/// <summary>
+/// Represents basic dynamic query arguments.
+/// </summary>
+/// <remarks>This is <b>not</b> intended to be a replacement for OData, GraphQL, etc. but to provide a limited, explicitly supported, dynamic capability to filter and order an underlying query.</remarks>
+public class QueryArgs
+{
+    /// <summary>
+    /// Create a new <see cref="QueryArgs"/>.
+    /// </summary>
+    /// <param name="filter">The basic dynamic <i>OData-like</i> <c>$filter</c> statement.</param>
+    /// <param name="orderBy">The basic dynamic <i>OData-like</i> <c>$orderby</c> statement.</param>
+    public static QueryArgs Create(string? filter = null, string? orderBy = null) => new() { Filter = filter, OrderBy = orderBy };
+
+    /// <summary>
+    /// Gets or sets the basic dynamic <i>OData-like</i> <c>$filter</c> statement.
+    /// </summary>
+    public string? Filter { get; set; }
+
+    /// <summary>
+    /// Gets or sets the basic dynamic <i>OData-like</i> <c>$orderby</c> statement.
+    /// </summary>
+    public string? OrderBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the list of <b>included</b> fields.
+    /// </summary>
+    /// <remarks>The <see cref="IncludeFields"/> and <see cref="ExcludeFields"/> are mutually exclusive.</remarks>
+    public List<string>? IncludeFields { get; set; }
+
+    /// <summary>
+    /// Gets or sets the list of <b>excluded</b> fields.
+    /// </summary>
+    /// <remarks>The <see cref="IncludeFields"/> and <see cref="ExcludeFields"/> are mutually exclusive.</remarks>
+    public List<string>? ExcludeFields { get; set; }
+
+    /// <summary>
+    /// Indicates whether to include any related texts for the resulting item(s).
+    /// </summary>
+    public bool IsIncludeText { get; set; }
+
+    /// <summary>
+    /// Indicates whether to include inactive items for the resulting item(s).
+    /// </summary>
+    public bool IsIncludeInactive { get; set; }
+
+    /// <summary>
+    /// Adds the specified fields to the <see cref="IncludeFields"/> list.
+    /// </summary>
+    /// <param name="fields">The fields to include.</param>
+    /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
+    public QueryArgs WithFields(params IEnumerable<string> fields)
+    {
+        IncludeFields ??= [];
+        IncludeFields.AddRange(fields);
+        return this;
+    }
+
+    /// <summary>
+    /// Adds the specified fields to the <see cref="ExcludeFields"/> list.`
+    /// </summary>
+    /// <param name="fields">The fields to exclude.</param>
+    /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
+    public QueryArgs WithoutFields(params IEnumerable<string> fields)
+    {
+        ExcludeFields ??= [];
+        ExcludeFields.AddRange(fields);
+        return this;
+    }
+
+    /// <summary>
+    /// Indicates whether to include any related texts for the resulting item(s); see <see cref="IsIncludeText"/>.
+    /// </summary>
+    /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
+    public QueryArgs IncludeText()
+    {
+        IsIncludeText = true;
+        return this;
+    }
+
+    /// <summary>
+    /// Indicates whether to include inactive items for the resulting item(s); see <see cref="IsIncludeInactive"/>.
+    /// </summary>
+    /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
+    public QueryArgs IncludeInactive()
+    {
+        IsIncludeInactive = true;
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Data/README.md b/src/CoreEx/Data/README.md
new file mode 100644
index 00000000..7c1d42f7
--- /dev/null
+++ b/src/CoreEx/Data/README.md
@@ -0,0 +1,49 @@
+# CoreEx.Data
+
+> Provides lightweight data-access primitives for paging, querying, partitioning, multi-tenancy, logical deletion, type discrimination, and model preparation — shared across all CoreEx data-layer packages.
+
+## Overview
+
+`CoreEx.Data` defines the foundational contracts and utilities that database and ORM packages (`CoreEx.Database`, `CoreEx.EntityFrameworkCore`, etc.) depend on. It extends the entity contract interfaces from `CoreEx.Entities` with data-specific concerns: `IPrimaryKey` for key-based access, `IPartitionKey` for partitioned storage, `ITenantId` for multi-tenancy, `ILogicallyDeleted` for soft-delete, and `ITypeDiscriminator` for polymorphic persistence.
+
+`PagingArgs` and `PagingResult` are the universal paging contract across all query-returning operations, carrying `Skip`/`Take` and optionally the total count. `ItemsResult<T>` bundles a collection of results with its associated `PagingResult` for transport from repository to API layer. `QueryArgs` provides a lightweight OData-like `$filter` and `$orderby` for explicitly supported dynamic querying — not a full OData stack, but sufficient for controlled dynamic search scenarios.
+
+The `Model` static utility class automates the most common model preparation tasks on create and update: setting tenant ID, populating type discriminator, and stamping the audit change-log from the ambient `ExecutionContext`.
+
+## Key capabilities
+
+- 📄 **Paging**: `PagingArgs` (skip/take with configurable defaults) and `PagingResult` (total count, was-paged flag) provide a uniform paging contract across all list operations.
+- 📦 **Paged results**: `ItemsResult<T>` pairs a typed item collection with `PagingResult`, conveying both data and paging metadata from repository to API without extra wrapper types.
+- 🔍 **Dynamic querying**: `QueryArgs` carries OData-like `$filter`, `$orderby`, and include/exclude field lists for explicitly supported, limited dynamic search.
+- 🏢 **Multi-tenancy**: `ITenantId` / `IReadOnlyTenantId` mark entities that carry a tenant identifier; `Model.PrepareTenantId` stamps the current tenant from `ExecutionContext`.
+- 🗂️ **Partitioning**: `IPartitionKey` / `IReadOnlyPartitionKey` and `PartitionKey` utility compute deterministic hash-based partition IDs for partitioned storage systems; `PartitionPicker` selects a partition from a pool.
+- 🗑️ **Logical deletion**: `ILogicallyDeleted` / `IReadOnlyLogicallyDeleted` mark entities that are soft-deleted rather than physically removed.
+- 🔠 **Type discrimination**: `ITypeDiscriminator` / `IReadOnlyTypeDiscriminator` carry a discriminator value for polymorphic entity persistence.
+- 🛠️ **Model preparation**: `Model` static utility stamps tenant ID, type discriminator, and audit change-log fields for create and update operations from the ambient `ExecutionContext`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ItemsResult<T>`](./ItemsResultT.cs)** | Sealed record pairing a typed item collection with a `PagingResult`; the standard return type for paginated list operations. |
+| **[`Model`](./Model.cs)** | Static utility preparing models for create/update by stamping tenant ID, type discriminator, and audit change-log from the ambient `ExecutionContext`. |
+| **[`PagingArgs`](./PagingArgs.cs)** | Record carrying `Skip`, `Take`, and a `IsCountRequested` flag; configurable global `DefaultTake` and `MaximumTake` via `IConfiguration`. |
+| **[`PagingResult`](./PagingResult.cs)** | Record carrying `Skip`, `Take`, `TotalCount` (optional), and `IsSkipped` / `IsPaged` convenience properties. |
+| **[`PartitionKey`](./PartitionKey.cs)** | Static utility computing a deterministic hash-based partition identifier from a string key and a partition size. |
+| **[`PartitionPicker`](./PartitionPicker.cs)** | Selects a partition key value from a configured pool using `PartitionKey.GetPartitionId`. |
+| **[`QueryArgs`](./QueryArgs.cs)** | Carries OData-like `$filter`, `$orderby`, and include/exclude field lists for controlled dynamic querying. |
+| [`IItemsResult`](./IItemsResult.cs) | Non-generic interface for `ItemsResult<T>` providing `Items` as `IEnumerable` and `Paging` as `PagingResult`. |
+| [`IItemsResult<T>`](./IItemsResultT.cs) | Generic extension of `IItemsResult` adding strongly-typed `Items`. |
+| [`ILogicallyDeleted`](./ILogicallyDeleted.cs) | Mutable interface adding `IsDeleted` for soft-delete; counterpart to `IReadOnlyLogicallyDeleted`. |
+| [`IPartitionKey`](./IPartitionKey.cs) | Mutable interface adding `PartitionKey` for partitioned storage; counterpart to `IReadOnlyPartitionKey`. |
+| [`IPrimaryKey`](./IPrimaryKey.cs) | Interface marking an entity as having a primary key; typically combined with `IEntityKey`. |
+| [`ITenantId`](./ITenantId.cs) | Mutable interface adding `TenantId` for multi-tenant entities; counterpart to `IReadOnlyTenantId`. |
+| [`ITotalCount`](./ITotalCount.cs) | Interface adding a nullable `TotalCount` property; implemented by `PagingResult` and `ItemsResult<T>`. |
+| [`ITypeDiscriminator`](./ITypeDiscriminator.cs) | Mutable interface adding a `TypeDiscriminator` string for polymorphic persistence; counterpart to `IReadOnlyTypeDiscriminator`. |
+
+## Related Namespaces
+
+- **[`CoreEx.Entities`](../Entities/README.md)** - Defines the upstream entity contract interfaces (`IIdentifier<T>`, `IETag`, `IChangeLog`, `CompositeKey`) that data-layer interfaces here extend.
+- **[`CoreEx.Database`](../../CoreEx.Database/README.md)** - Database package built on these primitives; uses `PagingArgs`, `QueryArgs`, `IPartitionKey`, `ILogicallyDeleted`, and `Model`.
+- **[`CoreEx.EntityFrameworkCore`](../../CoreEx.EntityFrameworkCore/README.md)** - EF Core integration consuming `PagingArgs`, `QueryArgs`, and the entity contract interfaces from this namespace.
+- **[`CoreEx.Data`](../../CoreEx.Data/README.md)** - Separate `CoreEx.Data` NuGet package providing higher-level query filtering and ordering utilities built on top of these primitives.
\ No newline at end of file
diff --git a/src/CoreEx/DataConsistencyException.cs b/src/CoreEx/DataConsistencyException.cs
index e62bd01b..bf0846b8 100644
--- a/src/CoreEx/DataConsistencyException.cs
+++ b/src/CoreEx/DataConsistencyException.cs
@@ -1,73 +1,34 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a <b>Data Consistency</b> exception.
+/// </summary>
+/// <remarks>An example would be where the operation would result in data consistency error; i.e. possible data corruption may occur.
+/// <para>This is not considered an error (<see cref="IExtendedException.IsError"/> is set to <see langword="false"/>).</para>
+/// <para>The <see cref="Exception.Message"/> defaults to: <i>A potential data consistency error occurred.</i></para></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class DataConsistencyException(LText? message, Exception? innerException) 
+    : ExtendedException<DataConsistencyException>(message ?? new LText(typeof(DataConsistencyException).FullName, _message), innerException, true)
 {
+    private const string _message = "A potential data consistency error occurred.";
+
     /// <summary>
-    /// Represents a data <b>Consistency</b> exception.
+    /// Initializes a new instance of the <see cref="DataConsistencyException"/> class.
     /// </summary>
-    /// <remarks>An example would be where the operation would result in data consistency error; i.e. possible data corruption may occur.
-    /// <para>The <see cref="Exception.Message"/> defaults to: <i>A potential data consistency error occurred.</i></para></remarks>
-    public class DataConsistencyException : Exception, IExtendedException
-    {
-        private const string _message = "A potential data consistency error occurred.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<DataConsistencyException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataConsistencyException"/> class.
-        /// </summary>
-        public DataConsistencyException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataConsistencyException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public DataConsistencyException(string? message) : base(message ?? new LText(typeof(DataConsistencyException).FullName, _message)) { }
+    public DataConsistencyException() : this(null) { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataConsistencyException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public DataConsistencyException(string? message, Exception innerException) : base(message ?? new LText(typeof(DataConsistencyException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.DuplicateError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.DataConsistencyError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.DuplicateError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.DataConsistencyError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.Conflict"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.Conflict;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataConsistencyException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public DataConsistencyException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "data-consistency";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.InternalServerError);
+        IsError = false;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/README.md b/src/CoreEx/DependencyInjection/README.md
new file mode 100644
index 00000000..ce84d590
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/README.md
@@ -0,0 +1,34 @@
+# CoreEx.DependencyInjection
+
+> Provides service lifetime attributes (`[ScopedService]`, `[SingletonService]`, `[TransientService]`) that mark implementation types for automatic discovery and registration into the .NET DI container.
+
+## Overview
+
+`CoreEx.DependencyInjection` simplifies service registration by letting implementation classes declare their own DI lifetime via an attribute, rather than requiring manual `services.AddScoped<TService, TImpl>()` call-outs in `Program.cs` or startup code.
+
+Types decorated with one of the lifetime attributes are discovered at startup by `AddDynamicServicesUsing<T1, T2, ...>()` (defined in `CoreExExtensions.DependencyInjection.cs`) and registered automatically. The attribute can specify the service type to register against, and/or an optional key for keyed-service scenarios.
+
+This pattern is used consistently across CoreEx's own infrastructure implementations — repositories, application services, and invokers — to keep startup code thin and to make service dependencies self-describing on the implementation class itself.
+
+## Key capabilities
+
+- 🏷️ **Declarative lifetime**: Apply `[ScopedService]`, `[SingletonService]`, or `[TransientService]` to an implementation class to declare its DI lifetime alongside the code that implements it.
+- 🔗 **Explicit service type**: Optionally specify the service interface type (`[ScopedService<IMyService>]`) to control what the type is registered as; defaults to itself where not provided.
+- 🔑 **Keyed service support**: Set `Key` on any attribute to register the type as a keyed service for scenarios requiring multiple implementations of the same interface.
+- 🔍 **Auto-discovery**: `AddDynamicServicesUsing<T>()` scans assemblies containing the specified marker types and registers all attributed types, removing the need for manual per-type registration.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ScopedServiceAttribute`](./ScopedServiceAttribute.cs)** | Marks an implementation class for registration as `ServiceLifetime.Scoped`. |
+| **[`ScopedServiceAttribute<TService>`](./ScopedServiceAttributeT.cs)** | Typed variant of `ScopedServiceAttribute` specifying the service interface type explicitly. |
+| **[`SingletonServiceAttribute`](./SingletonServiceAttribute.cs)** | Marks an implementation class for registration as `ServiceLifetime.Singleton`. |
+| **[`SingletonServiceAttribute<TService>`](./SingletonServiceAttributeT.cs)** | Typed variant of `SingletonServiceAttribute` specifying the service interface type explicitly. |
+| **[`TransientServiceAttribute`](./TransientServiceAttribute.cs)** | Marks an implementation class for registration as `ServiceLifetime.Transient`. |
+| **[`TransientServiceAttribute<TService>`](./TransientServiceAttributeT.cs)** | Typed variant of `TransientServiceAttribute` specifying the service interface type explicitly. |
+| _[`ServiceLifetimeAttribute`](./ServiceLifetimeAttribute.cs)_ | Abstract base attribute providing `Lifetime`, `Key`, and the service-type resolution logic shared by all three lifetime attributes. |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - `CoreExExtensions.DependencyInjection.cs` contains `AddDynamicServicesUsing<T>()` and `AddExecutionContext()` — the DI registration entry points that consume these attributes.
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/ScopedServiceAttribute.cs b/src/CoreEx/DependencyInjection/ScopedServiceAttribute.cs
new file mode 100644
index 00000000..89de5483
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/ScopedServiceAttribute.cs
@@ -0,0 +1,11 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Indicates that the underlying implementation <see cref="Type"/> should be registered as a <see cref="ServiceLifetime.Scoped"/> service with an optional <see cref="ServiceLifetimeAttribute.Key"/>.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public class ScopedServiceAttribute : ServiceLifetimeAttribute
+{
+    /// <inheritdoc/>
+    public override ServiceLifetime Lifetime => ServiceLifetime.Scoped;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/ScopedServiceAttributeT.cs b/src/CoreEx/DependencyInjection/ScopedServiceAttributeT.cs
new file mode 100644
index 00000000..7b0d1018
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/ScopedServiceAttributeT.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Indicates that the underlying implementation <see cref="Type"/> should be registered as a <see cref="ServiceLifetime.Scoped"/> service with an optional <see cref="ServiceLifetimeAttribute.Key"/>.
+/// </summary>
+/// <typeparam name="TService">The service <see cref="Type"/>.</typeparam>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public class ScopedServiceAttribute<TService>() : ServiceLifetimeAttribute(typeof(TService))
+{
+    /// <inheritdoc/>
+    public override ServiceLifetime Lifetime => ServiceLifetime.Scoped;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/ServiceLifetimeAttribute.cs b/src/CoreEx/DependencyInjection/ServiceLifetimeAttribute.cs
new file mode 100644
index 00000000..3fa3b0f2
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/ServiceLifetimeAttribute.cs
@@ -0,0 +1,63 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Provides the base <see cref="IServiceCollection"/> <see cref="ServiceLifetime"/> auto-registering capability with optional <see cref="Key"/>.
+/// </summary>
+/// <param name="ServiceType">The service <see cref="Type"/>.</param>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+public abstract class ServiceLifetimeAttribute(Type? ServiceType = null) : Attribute
+{
+    /// <summary>
+    /// Gets the <see cref="ServiceLifetime"/>.
+    /// </summary>
+    public abstract ServiceLifetime Lifetime { get; }
+
+    /// <summary>
+    /// Gets or sets the key of the service.
+    /// </summary>
+    public string? Key { get; set; }
+
+    /// <summary>
+    /// Gets or sets the service <see cref="Type"/>.
+    /// </summary>
+    public Type? ServiceType { get; set; } = ServiceType;
+
+    /// <summary>
+    /// Adds the <paramref name="implementationType"/> to the specified <see cref="IServiceCollection"/> using the underlying configuration.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="implementationType">The implementation <see cref="Type"/>.</param>
+    public void AddService(IServiceCollection services, Type implementationType)
+    {
+        services.ThrowIfNull();
+        implementationType.ThrowIfNull();
+
+        if (ServiceType is not null && !ServiceType.IsAssignableFrom(implementationType))
+            throw new InvalidOperationException($"The service type '{ServiceType}' is not assignable from the implementation type '{implementationType}'.");
+
+        services.TryAdd(new ServiceDescriptor(ServiceType ?? implementationType, Key, implementationType, Lifetime));
+    }
+
+    /// <summary>
+    /// Adds the <paramref name="implementationType"/> to the specified <see cref="IServiceCollection"/> using the underlying configuration.
+    /// </summary>
+    /// <param name="services">The <see cref="IServiceCollection"/>.</param>
+    /// <param name="implementationType">The implementation <see cref="Type"/>.</param>
+    /// <param name="factory">The factory method to create the service.</param>
+    public void AddService(IServiceCollection services, Type implementationType, Func<IServiceProvider, object?, object> factory)
+    {
+        services.ThrowIfNull();
+        implementationType.ThrowIfNull();
+        if (ServiceType is not null && !ServiceType.IsAssignableFrom(implementationType))
+            throw new InvalidOperationException($"The service type '{ServiceType}' is not assignable from the implementation type '{implementationType}'.");
+
+        services.TryAdd(new ServiceDescriptor(ServiceType ?? implementationType, Key, factory.ThrowIfNull(), Lifetime));
+    }
+
+    /// <summary>
+    /// Gets the <see cref="ServiceLifetimeAttribute"/> for the specified <see cref="Type"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/> to get the <see cref="ServiceLifetimeAttribute"/> for.</param>
+    /// <returns>The <see cref="ServiceLifetimeAttribute"/> where found; otherwise, <see langword="null"/>.</returns>
+    public static ServiceLifetimeAttribute? GetCustomAttribute(Type type) => type.GetCustomAttributes(typeof(ServiceLifetimeAttribute), true).SingleOrDefault() as ServiceLifetimeAttribute;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/SingletonServiceAttribute.cs b/src/CoreEx/DependencyInjection/SingletonServiceAttribute.cs
new file mode 100644
index 00000000..9e71bf74
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/SingletonServiceAttribute.cs
@@ -0,0 +1,11 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Indicates that the underlying implementation <see cref="Type"/> should be registered as a <see cref="ServiceLifetime.Singleton"/> service with an optional <see cref="ServiceLifetimeAttribute.Key"/>.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public class SingletonServiceAttribute : ServiceLifetimeAttribute
+{
+    /// <inheritdoc/>
+    public override ServiceLifetime Lifetime => ServiceLifetime.Singleton;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/SingletonServiceAttributeT.cs b/src/CoreEx/DependencyInjection/SingletonServiceAttributeT.cs
new file mode 100644
index 00000000..bc63c8aa
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/SingletonServiceAttributeT.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Indicates that the underlying implementation <see cref="Type"/> should be registered as a <see cref="ServiceLifetime.Singleton"/> service with an optional <see cref="ServiceLifetimeAttribute.Key"/>.
+/// </summary>
+/// <typeparam name="TService">The service <see cref="Type"/>.</typeparam>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public class SingletonServiceAttribute<TService>() : ServiceLifetimeAttribute(typeof(TService))
+{
+    /// <inheritdoc/>
+    public override ServiceLifetime Lifetime => ServiceLifetime.Singleton;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/TransientServiceAttribute.cs b/src/CoreEx/DependencyInjection/TransientServiceAttribute.cs
new file mode 100644
index 00000000..f73d00d4
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/TransientServiceAttribute.cs
@@ -0,0 +1,11 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Indicates that the underlying implementation <see cref="Type"/> should be registered as a <see cref="ServiceLifetime.Transient"/> service with an optional <see cref="ServiceLifetimeAttribute.Key"/>.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public class TransientServiceAttribute : ServiceLifetimeAttribute
+{
+    /// <inheritdoc/>
+    public override ServiceLifetime Lifetime => ServiceLifetime.Transient;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DependencyInjection/TransientServiceAttributeT.cs b/src/CoreEx/DependencyInjection/TransientServiceAttributeT.cs
new file mode 100644
index 00000000..b31773b0
--- /dev/null
+++ b/src/CoreEx/DependencyInjection/TransientServiceAttributeT.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.DependencyInjection;
+
+/// <summary>
+/// Indicates that the underlying implementation <see cref="Type"/> should be registered as a <see cref="ServiceLifetime.Transient"/> service with an optional <see cref="ServiceLifetimeAttribute.Key"/>.
+/// </summary>
+/// <typeparam name="TService">The service <see cref="Type"/>.</typeparam>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+public class TransientServiceAttribute<TService>() : ServiceLifetimeAttribute(typeof(TService))
+{
+    /// <inheritdoc/>
+    public override ServiceLifetime Lifetime => ServiceLifetime.Transient;
+}
\ No newline at end of file
diff --git a/src/CoreEx/DuplicateException.cs b/src/CoreEx/DuplicateException.cs
index 8e75c22f..ac4e3da8 100644
--- a/src/CoreEx/DuplicateException.cs
+++ b/src/CoreEx/DuplicateException.cs
@@ -1,72 +1,31 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a data <b>Duplicate</b> exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A duplicate error occurred.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class DuplicateException(LText? message, Exception? innerException) 
+    : ExtendedException<DuplicateException>(message ?? new LText(typeof(DuplicateException).FullName, _message), innerException)
 {
+    private const string _message = "A duplicate error occurred.";
+
     /// <summary>
-    /// Represents a data <b>Duplicate</b> exception.
+    /// Initializes a new instance of the <see cref="DuplicateException"/> class.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A duplicate error occurred.</i></remarks>
-    public class DuplicateException : Exception, IExtendedException
-    {
-        private const string _message = "A duplicate error occurred.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<DuplicateException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DuplicateException"/> class.
-        /// </summary>
-        public DuplicateException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DuplicateException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public DuplicateException(string? message) : base(message ?? new LText(typeof(DuplicateException).FullName, _message)) { }
+    public DuplicateException() : this(null) { }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DuplicateException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public DuplicateException(string? message, Exception innerException) : base(message ?? new LText(typeof(DuplicateException).FullName, _message), innerException) { }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.DuplicateError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.DuplicateError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.DuplicateError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.DuplicateError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.Conflict"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.Conflict;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DuplicateException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public DuplicateException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "duplicate";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.Conflict);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Abstractions/IIdentifier.cs b/src/CoreEx/Entities/Abstractions/IIdentifier.cs
new file mode 100644
index 00000000..6948e2a7
--- /dev/null
+++ b/src/CoreEx/Entities/Abstractions/IIdentifier.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Entities.Abstractions;
+
+/// <summary>
+/// Enables a mutable <see cref="Id"/> capability.
+/// </summary>
+public interface IIdentifier : IReadOnlyIdentifier
+{
+    /// <inheritdoc/>
+    object? IIdentifierCore.Id => Id;
+
+    /// <summary>
+    /// Gets or sets the identifier.
+    /// </summary>
+    new object? Id { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Abstractions/IIdentifierCore.cs b/src/CoreEx/Entities/Abstractions/IIdentifierCore.cs
new file mode 100644
index 00000000..430a6b31
--- /dev/null
+++ b/src/CoreEx/Entities/Abstractions/IIdentifierCore.cs
@@ -0,0 +1,31 @@
+namespace CoreEx.Entities.Abstractions;
+
+/// <summary>
+/// Enables the core read-only <see cref="Id"/> and related <see cref="IEntityKey"/> capabilities.
+/// </summary>
+public interface IIdentifierCore : IEntityKey
+{
+    /// <summary>
+    /// Gets the identifier.
+    /// </summary>
+    object? Id { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Id"/> <see cref="Type"/>.
+    /// </summary>
+    [JsonIgnore]
+    Type IdType { get; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="Id"/> is read-only.
+    /// </summary>
+    [JsonIgnore]
+    bool IsIdReadOnly { get; }
+
+    /// <summary>
+    /// Sets (overrides) the identifier.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    /// <remarks>Must not be <see cref="IsIdReadOnly"/>.</remarks>
+    void SetIdentifier(object? id);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Abstractions/IReadOnlyIdentifier.cs b/src/CoreEx/Entities/Abstractions/IReadOnlyIdentifier.cs
new file mode 100644
index 00000000..4ab063c0
--- /dev/null
+++ b/src/CoreEx/Entities/Abstractions/IReadOnlyIdentifier.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Entities.Abstractions;
+
+/// <summary>
+/// Enables a read-only <see cref="IIdentifierCore.Id"/> capability.
+/// </summary>
+public interface IReadOnlyIdentifier : IIdentifierCore { }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ChangeLog.cs b/src/CoreEx/Entities/ChangeLog.cs
index 4aaa813f..72a705a5 100644
--- a/src/CoreEx/Entities/ChangeLog.cs
+++ b/src/CoreEx/Entities/ChangeLog.cs
@@ -1,94 +1,129 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using System;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Provides a <see cref="IReadOnlyChangeLogEx"/> implementation.
+/// </summary>
+public record class ChangeLog() : IReadOnlyChangeLogEx, IRuntimeMetadata, IDefault
 {
+    private static readonly ChangeLog _empty = new();
+
     /// <summary>
-    /// Provides a <see cref="IChangeLogAudit"/>.
+    /// Gets the username and timestamp information for <see cref="ChangeLog"/> usage.
     /// </summary>
-    public class ChangeLog : IChangeLogAudit
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>The user and timestamp information.</returns>
+    public static (string? UserName, DateTimeOffset Timestamp) GetChangeLogInfo(ExecutionContext? executionContext = null)
     {
-        /// <summary>
-        /// Gets or sets the created <see cref="DateTime"/>.
-        /// </summary>
-        public DateTime? CreatedDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the created by (username).
-        /// </summary>
-        public string? CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the updated <see cref="DateTime"/>.
-        /// </summary>
-        public DateTime? UpdatedDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the updated by (username).
-        /// </summary>
-        public string? UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Prepares the <see cref="ChangeLog"/> by setting the <c>Created</c> properties.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <remarks>Creates or updates the <see cref="ChangeLog"/> where <paramref name="value"/> implements <see cref="IChangeLog"/>.</remarks>
-        public static void PrepareCreated<T>(T value, ExecutionContext? executionContext = null)
-        {
-            if (value != null && value is IChangeLogAuditLog cl)
-                cl.ChangeLogAudit = PrepareCreated(cl.ChangeLogAudit ?? new ChangeLog(), executionContext);
-        }
+        if (executionContext is null)
+            ExecutionContext.TryGetCurrent(out executionContext);
+
+        return (executionContext?.User?.UserName ?? AuthenticationUser.EnvironmentUser.UserName, executionContext?.Timestamp ?? Runtime.UtcNow);
+    }
 
-        /// <summary>
-        /// Prepares the <paramref name="changeLog"/> by setting the <c>Created</c> properties.
-        /// </summary>
-        /// <param name="changeLog">The <see cref="IChangeLogAudit"/>.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <returns>A new or updated <see cref="ChangeLog"/> with <c>Created</c> properties set.</returns>
-        public static IChangeLogAudit PrepareCreated(IChangeLogAudit changeLog, ExecutionContext? executionContext = null)
+    /// <summary>
+    /// Creates a new <see cref="ChangeLog"/> setting the <see cref="ChangeLog.CreatedBy"/> and <see cref="ChangeLog.CreatedOn"/>.
+    /// </summary>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>A <see cref="ChangeLog"/>.</returns>
+    public static ChangeLog CreateCreated(ExecutionContext? executionContext = null)
+    {
+        var (UserName, Timestamp) = GetChangeLogInfo(executionContext);
+
+        return new ChangeLog
         {
-            changeLog.ThrowIfNull(nameof(changeLog)).CreatedBy = GetUsername(executionContext);
-            changeLog.CreatedDate = GetTimestamp(executionContext);
-            return changeLog;
-        }
+            CreatedBy = UserName,
+            CreatedOn = Timestamp
+        };
+    }
+
+    /// <summary>
+    /// Creates a <see cref="ChangeLog"/> copy (or new) setting the <see cref="ChangeLog.UpdatedBy"/> and <see cref="ChangeLog.UpdatedOn"/>.
+    /// </summary>
+    /// <param name="changeLog">The optional <see cref="ChangeLog"/> to copy from.</param>
+    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
+    /// <returns>A <see cref="ChangeLog"/>.</returns>
+    public static ChangeLog CreateChanged(ChangeLog? changeLog = null, ExecutionContext? executionContext = null)
+    {
+        var (UserName, Timestamp) = GetChangeLogInfo(executionContext);
 
-        /// <summary>
-        /// Prepares the <see cref="ChangeLog"/> by setting the <c>Updated</c> properties.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <remarks>Creates or updates the <see cref="ChangeLog"/> where <paramref name="value"/> implements <see cref="IChangeLog"/>.</remarks>
-        public static void PrepareUpdated<T>(T value, ExecutionContext? executionContext = null)
+        return new ChangeLog
         {
-            if (value is not null && value is IChangeLogAuditLog cl)
-                cl.ChangeLogAudit = PrepareUpdated(cl.ChangeLogAudit ?? new ChangeLog(), executionContext);
-        }
+            CreatedBy = changeLog?.CreatedBy,
+            CreatedOn = changeLog?.CreatedOn,
+            UpdatedBy = UserName,
+            UpdatedOn = Timestamp
+        };
+    }
 
-        /// <summary>
-        /// Prepares the <paramref name="changeLog"/> by setting the <c>Updated</c> properties.
-        /// </summary>
-        /// <param name="changeLog">The <see cref="ChangeLog"/>.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <returns>A new or updated <see cref="ChangeLog"/> with <c>Updated</c> properties set.</returns>
-        public static IChangeLogAudit PrepareUpdated(IChangeLogAudit changeLog, ExecutionContext? executionContext = null)
+    /// <summary>
+    /// Creates a new <see cref="ChangeLog"/> from an <see cref="IReadOnlyChangeLogEx"/>.
+    /// </summary>
+    /// <param name="changeLog">The <see cref="IReadOnlyChangeLogEx"/>.</param>
+    /// <returns>The <see cref="ChangeLog"/> where the result is not <see cref="IsDefault"/>; otherwise, <see langword="null"/>.</returns>
+    public static ChangeLog? CreateFrom(IReadOnlyChangeLogEx? changeLog)
+    {
+        var cl = new ChangeLog(changeLog);
+        return cl.IsDefault() ? null : cl;
+    }
+
+    /// <inheritdoc/>
+    public static IEnumerable<IPropertyRuntimeMetadata> GetStaticPropertyRuntimeMetadata()
+    {
+        yield return new PropertyRuntimeMetadata<ChangeLog, string?>(nameof(CreatedBy), static e => e.CreatedBy, clean: CleanOption.CleanAndDefault);
+        yield return new PropertyRuntimeMetadata<ChangeLog, DateTimeOffset?>(nameof(CreatedOn), static e => e.CreatedOn, clean: CleanOption.CleanAndDefault);
+        yield return new PropertyRuntimeMetadata<ChangeLog, string?>(nameof(UpdatedBy), static e => e.UpdatedBy, clean: CleanOption.CleanAndDefault);
+        yield return new PropertyRuntimeMetadata<ChangeLog, DateTimeOffset?>(nameof(UpdatedOn), static e => e.UpdatedOn, clean: CleanOption.CleanAndDefault);
+    }
+
+    /// <summary>
+    /// Gets an empty <see cref="ChangeLog"/> instance.
+    /// </summary>
+    public static ChangeLog Empty => _empty;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ChangeLog"/> class with an <see cref="IReadOnlyChangeLog"/>.
+    /// </summary>
+    /// <param name="changeLog">The <see cref="IReadOnlyChangeLog"/>.</param>
+    public ChangeLog(IReadOnlyChangeLog? changeLog) : this((IReadOnlyChangeLogEx?)changeLog?.ChangeLog) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ChangeLog"/> class.
+    /// </summary>
+    /// <param name="changeLog">The optional <see cref="IReadOnlyChangeLogEx"/>.</param>
+    public ChangeLog(IReadOnlyChangeLogEx? changeLog) : this()
+    {
+        if (changeLog is not null)
         {
-            changeLog.ThrowIfNull(nameof(changeLog)).UpdatedBy = GetUsername(executionContext);
-            changeLog.UpdatedDate = GetTimestamp(executionContext);
-            return changeLog;
+            CreatedBy = changeLog.CreatedBy;
+            CreatedOn = changeLog.CreatedOn;
+            UpdatedBy = changeLog.UpdatedBy;
+            UpdatedOn = changeLog.UpdatedOn;
         }
+    }
 
-        /// <summary>
-        /// Gets the username.
-        /// </summary>
-        private static string GetUsername(ExecutionContext? ec) => ec != null ? ec.UserName : (ExecutionContext.HasCurrent ? ExecutionContext.Current.UserName : ExecutionContext.EnvironmentUserName);
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public string? CreatedBy { get; init => field = Cleaner.Clean(value); }
 
-        /// <summary>
-        /// Gets the timestamp.
-        /// </summary>
-        private static DateTime GetTimestamp(ExecutionContext? ec) => ec != null ? ec.Timestamp : SystemTime.Timestamp;
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public DateTimeOffset? CreatedOn { get; init; }
+
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public string? UpdatedBy { get; init => field = Cleaner.Clean(value); }
+
+    /// <inheritdoc/>
+    [ReadOnly(true)]
+    public DateTimeOffset? UpdatedOn { get; init; }
+
+    /// <inheritdoc/>
+    public virtual IEnumerable<IPropertyRuntimeMetadata> GetPropertyRuntimeMetadata()
+    {
+        foreach (var pr in GetStaticPropertyRuntimeMetadata())
+            yield return pr;
     }
+
+    /// <inheritdoc/>
+    public bool IsDefault() => RuntimeMetadata.IsDefault(this);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/CleanOption.cs b/src/CoreEx/Entities/CleanOption.cs
new file mode 100644
index 00000000..72c75f89
--- /dev/null
+++ b/src/CoreEx/Entities/CleanOption.cs
@@ -0,0 +1,31 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Represents the option for cleaning an <see cref="IContract"/> property value.
+/// </summary>
+public enum CleanOption
+{
+    /// <summary>
+    /// Indicates that the <see cref="Cleaner.DefaultCleanOption"/> value should be used.
+    /// </summary>
+    UseDefault,
+
+    /// <summary>
+    /// No cleaning required, the value will remain as-is.
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// The value will be cleaned.
+    /// </summary>
+    /// <remarks>Where the property is an <see cref="IContract"/> all sub-properties will also be cleaned (where applicable).
+    /// <para>Where the property is <i>not</i> an <see cref="IContract"/> then the <see cref="Clean"/> and <see cref="CleanAndDefault"/> will have the same outcome.</para></remarks>
+    Clean,
+
+    /// <summary>
+    /// The value will be cleaned and defaulted.
+    /// </summary>
+    /// <remarks>Where the property is an <see cref="IContract"/> all sub-properties will also be cleaned (where applicable). Also, where the property is <see cref="Extended.IDefault.IsDefault"/> the value will be <see langword="default">defaulted</see>.
+    /// <para>Where the property is <i>not</i> an <see cref="IContract"/> then the <see cref="Clean"/> and <see cref="CleanAndDefault"/> will have the same outcome.</para></remarks>
+    CleanAndDefault
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Cleaner.cs b/src/CoreEx/Entities/Cleaner.cs
index 8089cf83..8e4181fb 100644
--- a/src/CoreEx/Entities/Cleaner.cs
+++ b/src/CoreEx/Entities/Cleaner.cs
@@ -1,333 +1,197 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using CoreEx.Configuration;
-using CoreEx.Globalization;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Provides capabilities to clean a specified value.
+/// </summary>
+public static class Cleaner
 {
+    private static StringTrim? _stringTrim;
+    private static StringTransform? _stringTransform;
+    private static StringCase? _stringCase;
+    private static DateTimeTransform? _dateTimeTransform;
+    private static CleanOption? _cleanOption;
+
     /// <summary>
-    /// Provides capabilities to clean a specified value.
+    /// Resets the <see cref="DefaultStringTrim"/>, <see cref="DefaultStringTransform"/>, and <see cref="DefaultStringCase"/> to their respective default values.
     /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public static class Cleaner
+    public static void ResetDefaults()
     {
-        private static DateTimeTransform _dateTimeTransform = DateTimeTransform.DateTimeUtc;
-        private static StringTransform _stringTransform = StringTransform.EmptyToNull;
-        private static StringTrim _stringTrim = StringTrim.End;
-        private static StringCase _stringCase = StringCase.None;
-
-        /// <summary>
-        /// Gets or sets the default <see cref="Entities.DateTimeTransform"/> for all entities unless explicitly overridden. Defaults to <see cref="DateTimeTransform.DateTimeUtc"/>.
-        /// </summary>
-        public static DateTimeTransform DefaultDateTimeTransform
-        {
-            get => _dateTimeTransform;
-            set => _dateTimeTransform = value == DateTimeTransform.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultDateTimeTransform)) : value;
-        }
-
-        /// <summary>
-        /// Gets or sets the default <see cref="Entities.StringTransform"/> for all entities unless explicitly overridden. Defaults to <see cref="StringTransform.EmptyToNull"/>.
-        /// </summary>
-        public static StringTransform DefaultStringTransform
-        {
-            get => _stringTransform;
-            set => _stringTransform = value == StringTransform.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultStringTransform)) : value;
-        }
-
-        /// <summary>
-        /// Gets or sets the default <see cref="Entities.StringTrim"/> for all entities unless explicitly overridden. Defaults to <see cref="StringTrim.End"/>.
-        /// </summary>
-        public static StringTrim DefaultStringTrim
-        {
-            get => _stringTrim;
-            set => _stringTrim = value == StringTrim.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultStringTrim)) : value;
-        }
-
-        /// <summary>
-        /// Gets or sets the default <see cref="Entities.StringCase"/> for all entities unless explicitly overridden. Defaults to <see cref="StringCase.None"/>.
-        /// </summary>
-        public static StringCase DefaultStringCase
-        {
-            get => _stringCase;
-            set => _stringCase = value == StringCase.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultStringCase)) : value;
-        }
-
-        /// <summary>
-        /// Cleans a <see cref="string"/>.
-        /// </summary>
-        /// <param name="value">The value to clean.</param>
-        /// <returns>The cleaned value.</returns>
-        /// <remarks>The <paramref name="value"/> will be trimmed and transformed using the respective <see cref="DefaultStringTrim"/> and <see cref="DefaultStringTransform"/> values.</remarks>
-        public static string? Clean(string? value) => Clean(value, StringTrim.UseDefault, StringTransform.UseDefault, StringCase.UseDefault);
-
-        /// <summary>
-        /// Cleans a <see cref="string"/> using the specified <paramref name="trim"/> and <paramref name="transform"/>.
-        /// </summary>
-        /// <param name="value">The value to clean.</param>
-        /// <param name="trim">The <see cref="StringTrim"/> (defaults to <see cref="DefaultStringTrim"/>).</param>
-        /// <param name="transform">The <see cref="StringTransform"/> (defaults to <see cref="DefaultStringTransform"/>).</param>
-        /// <param name="casing">The <see cref="StringCase"/> (defaults to <see cref="DefaultStringCase"/>).</param>
-        /// <returns>The cleaned value.</returns>
-        public static string? Clean(string? value, StringTrim trim = StringTrim.UseDefault, StringTransform transform = StringTransform.UseDefault, StringCase casing = StringCase.UseDefault)
-        {
-            if (transform == StringTransform.UseDefault)
-                transform = ExecutionContext.GetService<SettingsBase>()?.StringTransform ?? DefaultStringTransform;
-
-            // Handle a null string.
-            if (value == null)
-            {
-                if (transform == StringTransform.NullToEmpty)
-                    return string.Empty;
-                else
-                    return value;
-            }
-
-            if (trim == StringTrim.UseDefault)
-                trim = ExecutionContext.GetService<SettingsBase>()?.StringTrim ?? DefaultStringTrim;
+        _stringTrim = null;
+        _stringTransform = null;
+        _stringCase = null;
+        _dateTimeTransform = null;
+        _cleanOption = null;
+    }
 
-            // Trim the string.
-            var tmp = trim switch
-            {
-                StringTrim.Both => value.Trim(),
-                StringTrim.Start => value.TrimStart(),
-                StringTrim.End => value.TrimEnd(),
-                _ => value,
-            };
+    /// <summary>
+    /// Gets or sets the default <see cref="StringTrim"/> for all values unless explicitly overridden. Defaults to <see cref="StringTrim.End"/>.
+    /// </summary>
+    public static StringTrim DefaultStringTrim
+    {
+        get => _stringTrim ??= Internal.GetConfigurationValue("CoreEx:Entities:Cleaner:DefaultStringTrim", StringTrim.End);
+        set => _stringTrim = value == StringTrim.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultStringTrim)) : value;
+    }
 
-            // Transform the string.
-            tmp = transform switch
-            {
-                StringTransform.EmptyToNull => (tmp.Length == 0) ? null : tmp,
-                StringTransform.NullToEmpty => tmp ?? string.Empty,
-                _ => tmp,
-            };
+    /// <summary>
+    /// Gets or sets the default <see cref="StringTransform"/> for all values unless explicitly overridden. Defaults to <see cref="StringTransform.EmptyToNull"/>.
+    /// </summary>
+    public static StringTransform DefaultStringTransform
+    {
+        get => _stringTransform ??= Internal.GetConfigurationValue("CoreEx:Entities:Cleaner:DefaultStringTransform", StringTransform.EmptyToNull);
+        set => _stringTransform = value == StringTransform.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultStringTransform)) : value;
+    }
 
-            if (string.IsNullOrEmpty(tmp))
-                return tmp;
+    /// <summary>
+    /// Gets or sets the default <see cref="StringCase"/> for all values unless explicitly overridden. Defaults to <see cref="StringCase.None"/>.
+    /// </summary>
+    public static StringCase DefaultStringCase
+    {
+        get => _stringCase ??= Internal.GetConfigurationValue("CoreEx:Entities:Cleaner:DefaultStringCase", StringCase.None);
+        set => _stringCase = value == StringCase.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultStringCase)) : value;
+    }
 
-            // Apply casing to the string.
-            if (casing == StringCase.UseDefault)
-                casing = ExecutionContext.GetService<SettingsBase>()?.StringCase ?? DefaultStringCase;
+    /// <summary>
+    /// Gets or sets the default <see cref="DateTimeTransform"/> for all values unless explicitly overridden. Defaults to <see cref="DateTimeTransform.DateTimeUtc"/>.
+    /// </summary>
+    public static DateTimeTransform DefaultDateTimeTransform
+    {
+        get => _dateTimeTransform ??= Internal.GetConfigurationValue("CoreEx:Entities:Cleaner:DefaultDateTimeTransform", DateTimeTransform.DateTimeUtc);
+        set => _dateTimeTransform = value == DateTimeTransform.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultDateTimeTransform)) : value;
+    }
 
-            return casing switch
-            {
-                StringCase.Lower => CultureInfo.CurrentCulture.TextInfo.ToCasing(tmp, TextInfoCasing.Lower),
-                StringCase.Upper => CultureInfo.CurrentCulture.TextInfo.ToCasing(tmp, TextInfoCasing.Upper),
-                StringCase.Title => CultureInfo.CurrentCulture.TextInfo.ToCasing(tmp, TextInfoCasing.Title),
-                _ => tmp,
-            };
-        }
+    /// <summary>
+    /// Gets or sets the default <see cref="CleanOption"/> for all values unless explicitly overridden. Defaults to <see cref="CleanOption.CleanAndDefault"/>.
+    /// </summary>
+    public static CleanOption DefaultCleanOption
+    {
+        get => _cleanOption ??= Internal.GetConfigurationValue("CoreEx:Entities:Cleaner:DefaultCleanOption", CleanOption.CleanAndDefault);
+        set => _cleanOption = value == CleanOption.UseDefault ? throw new ArgumentException("The default cannot be set to UseDefault.", nameof(DefaultCleanOption)) : value;
+    }
 
-        /// <summary>
-        /// Cleans a <see cref="DateTime"/> value.
-        /// </summary>
-        /// <param name="value">The value to clean.</param>
-        /// <returns>The cleaned value.</returns>
-        /// <remarks>The <paramref name="value"/> will be transformed using <see cref="DateTimeTransform.UseDefault"/>.</remarks>
-        public static DateTime Clean(DateTime value) => Clean(value, DateTimeTransform.UseDefault);
+    /// <summary>
+    /// Cleans a <see cref="string"/> using the specified <paramref name="trim"/> and <paramref name="transform"/>.
+    /// </summary>
+    /// <param name="value">The value to clean.</param>
+    /// <param name="trim">The <see cref="StringTrim"/> (defaults to <see cref="DefaultStringTrim"/>).</param>
+    /// <param name="transform">The <see cref="StringTransform"/> (defaults to <see cref="DefaultStringTransform"/>).</param>
+    /// <param name="casing">The <see cref="StringCase"/> (defaults to <see cref="DefaultStringCase"/>).</param>
+    /// <returns>The cleaned value.</returns>
+    public static string? Clean(string? value, StringTrim trim = StringTrim.UseDefault, StringTransform transform = StringTransform.UseDefault, StringCase casing = StringCase.UseDefault)
+    {
+        if (transform == StringTransform.UseDefault)
+            transform = DefaultStringTransform;
 
-        /// <summary>
-        /// Cleans a <see cref="DateTime"/> value.
-        /// </summary>
-        /// <param name="value">The value to clean.</param>
-        /// <param name="transform">The <see cref="DateTimeTransform"/> to be applied.</param>
-        /// <returns>The cleaned value.</returns>
-        /// <remarks>Will attempt to use <see cref="SettingsBase.DateTimeTransform"/> as a default where possible.</remarks>
-        public static DateTime Clean(DateTime value, DateTimeTransform transform)
+        // Handle a null string.
+        if (value is null)
         {
-            if (transform == DateTimeTransform.UseDefault)
-                transform = ExecutionContext.GetService<SettingsBase>()?.DateTimeTransform ?? DefaultDateTimeTransform;
-
-            switch (transform)
-            {
-                case DateTimeTransform.DateOnly:
-                    if (value.Kind == DateTimeKind.Unspecified && value.TimeOfDay == TimeSpan.Zero)
-                        return value;
-                    else
-                        return DateTime.SpecifyKind(value.Date, DateTimeKind.Unspecified);
-
-                case DateTimeTransform.DateTimeLocal:
-                    if (value.Kind != DateTimeKind.Local)
-                    {
-                        if (value == DateTime.MinValue || value == DateTime.MaxValue || value.Kind == DateTimeKind.Unspecified)
-                            return DateTime.SpecifyKind(value, DateTimeKind.Local);
-                        else
-                            return (value.Kind == DateTimeKind.Local) ? value : TimeZoneInfo.ConvertTime(value, TimeZoneInfo.Local);
-                    }
-
-                    break;
-
-                case DateTimeTransform.DateTimeUtc:
-                    if (value.Kind != DateTimeKind.Utc)
-                    {
-                        if (value == DateTime.MinValue || value == DateTime.MaxValue || value.Kind == DateTimeKind.Unspecified)
-                            return DateTime.SpecifyKind(value, DateTimeKind.Utc);
-                        else
-                            return (value.Kind == DateTimeKind.Utc) ? value : TimeZoneInfo.ConvertTime(value, TimeZoneInfo.Utc);
-                    }
-
-                    break;
-
-                case DateTimeTransform.DateTimeUnspecified:
-                    if (value.Kind != DateTimeKind.Unspecified)
-                        return DateTime.SpecifyKind(value, DateTimeKind.Unspecified);
-
-                    break;
-            }
-
-            return value;
+            if (transform == StringTransform.NullToEmpty)
+                return string.Empty;
+            else
+                return null;
         }
 
-        /// <summary>
-        /// Cleans a <see cref="DateTime"/> value.
-        /// </summary>
-        /// <param name="value">The value to clean.</param>
-        /// <returns>The cleaned value.</returns>
-        /// <remarks>The <paramref name="value"/> will be transformed using <see cref="DateTimeTransform.UseDefault"/>.</remarks>
-        public static DateTime? Clean(DateTime? value) => Clean(value, DateTimeTransform.UseDefault);
+        if (trim == StringTrim.UseDefault)
+            trim = DefaultStringTrim;
 
-        /// <summary>
-        /// Cleans a <see cref="Nullable{DateTime}"/> value.
-        /// </summary>
-        /// <param name="value">The value to clean.</param>
-        /// <param name="transform">The <see cref="DateTimeTransform"/> to be applied.</param>
-        /// <returns>The cleaned value.</returns>
-        public static DateTime? Clean(DateTime? value, DateTimeTransform transform)
+        // Trim the string.
+        var tmp = trim switch
+        {
+            StringTrim.End => value.TrimEnd(),
+            StringTrim.Both => value.Trim(),
+            StringTrim.Start => value.TrimStart(),
+            _ => value,
+        };
+
+        // Transform the string.
+        tmp = transform switch
         {
-            if (value == null || !value.HasValue)
-                return value;
+            StringTransform.EmptyToNull => string.IsNullOrEmpty(tmp) ? null : tmp,
+            StringTransform.NullToEmpty => tmp ?? string.Empty,
+            _ => tmp,
+        };
 
-            return Clean(value.Value, transform);
-        }
+        if (string.IsNullOrEmpty(tmp))
+            return tmp;
 
-        /// <summary>
-        /// Cleans a value and overrides the value with <c>null</c> when the value is <see cref="IInitial.IsInitial"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to clean.</param>
-        /// <returns>The cleaned value.</returns>
-        /// <remarks>This invokes <see cref="Clean{T}(T, bool)"/> with '<c>overrideWithDefaultWhenIsInitial</c>' parameter set to <c>true</c>.</remarks>
-        public static T Clean<T>(T value) => Clean(value, true);
+        // Apply casing to the string.
+        if (casing == StringCase.UseDefault)
+            casing = DefaultStringCase;
 
-        /// <summary>
-        /// Cleans a value.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to clean.</param>
-        /// <param name="overrideWithDefaultWhenIsInitial">Indicates whether to override the value with <c>default</c> when the value is <see cref="IInitial.IsInitial"/>.</param>
-        /// <returns>The cleaned value.</returns>
-        public static T Clean<T>(T value, bool overrideWithDefaultWhenIsInitial)
+        return casing switch
         {
-            if (value is string str)
-                return (T)Convert.ChangeType(Clean(str, StringTrim.UseDefault, StringTransform.UseDefault, StringCase.UseDefault), typeof(string), CultureInfo.CurrentCulture)!;
-            else if (value is DateTime dte)
-                return (T)Convert.ChangeType(Clean(dte, DateTimeTransform.UseDefault), typeof(DateTime), CultureInfo.CurrentCulture);
-
-            if (value is ICleanUp ic)
-                ic.CleanUp();
-
-            if (overrideWithDefaultWhenIsInitial && value is IInitial ii && ii.IsInitial)
-                return default!;
+            StringCase.None => tmp,
+            StringCase.Lower => CultureInfo.CurrentCulture.TextInfo.ToCasing(tmp, TextInfoCasing.Lower),
+            StringCase.Upper => CultureInfo.CurrentCulture.TextInfo.ToCasing(tmp, TextInfoCasing.Upper),
+            StringCase.Title => CultureInfo.CurrentCulture.TextInfo.ToCasing(tmp, TextInfoCasing.Title),
+            _ => tmp
+        };
+    }
 
-            return value;
-        }
+    /// <summary>
+    /// Cleans a <see cref="DateTime"/> value.
+    /// </summary>
+    /// <param name="value">The value to clean.</param>
+    /// <param name="transform">The <see cref="DateTimeTransform"/> to be applied.</param>
+    /// <returns>The cleaned value.</returns>
+    public static DateTime Clean(DateTime value, DateTimeTransform transform)
+    {
+        if (transform == DateTimeTransform.UseDefault)
+            transform = DefaultDateTimeTransform;
 
-        /// <summary>
-        /// Cleans one or more values where they implement <see cref="ICleanUp"/>.
-        /// </summary>
-        /// <param name="values">The values to clean.</param>
-        public static void CleanUp(params object?[] values)
+        switch (transform)
         {
-            if (values != null)
-            {
-                foreach (object? o in values)
+            case DateTimeTransform.DateTimeUtc:
+                if (value.Kind != DateTimeKind.Utc)
                 {
-                    if (o != null && o is ICleanUp value)
-                        value.CleanUp();
+                    if (value == DateTime.MinValue || value == DateTime.MaxValue || value.Kind == DateTimeKind.Unspecified)
+                        return DateTime.SpecifyKind(value, DateTimeKind.Utc);
+                    else
+                        return (value.Kind == DateTimeKind.Utc) ? value : TimeZoneInfo.ConvertTime(value, TimeZoneInfo.Utc);
                 }
-            }
-        }
 
-        /// <summary>
-        /// Indicates whether a value is considered in its default state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to check.</param>
-        /// <returns><c>true</c> indicates that the value is initial; otherwise, <c>false</c>.</returns>
-        /// <remarks>This determines whether is initial by comparing against its default value; this does not leverage <see cref="IInitial.IsInitial"/>.</remarks>
-        public static bool IsDefault<T>(T value) => value == null || Comparer<T>.Default.Compare(value, default!) == 0;
+                break;
 
-        /// <summary>
-        /// Indicates whether a value is considered in its default state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to check.</param>
-        /// <param name="default">The default value override.</param>
-        /// <returns><c>true</c> indicates that the value is initial; otherwise, <c>false</c>.</returns>
-        /// <remarks>This determines whether is initial by comparing against its default value; this does not leverage <see cref="IInitial.IsInitial"/>.</remarks>
-        public static bool IsDefault<T>(T value, T @default) => Comparer<T>.Default.Compare(value, @default) == 0;
+            case DateTimeTransform.DateTimeLocal:
+                if (value.Kind != DateTimeKind.Local)
+                {
+                    if (value == DateTime.MinValue || value == DateTime.MaxValue || value.Kind == DateTimeKind.Unspecified)
+                        return DateTime.SpecifyKind(value, DateTimeKind.Local);
+                    else
+                        return (value.Kind == DateTimeKind.Local) ? value : TimeZoneInfo.ConvertTime(value, TimeZoneInfo.Local);
+                }
 
-        /// <summary>
-        /// Resets the <see cref="ITenantId.TenantId"/> by overridding with <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.TenantId"/> where <see cref="ExecutionContext.HasCurrent"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        public static void ResetTenantId<T>(T? value, ExecutionContext? executionContext = null)
-        {
-            if (value == null || value is not ITenantId ti)
-                return;
+                break;
 
-            if (executionContext is null)
-            {
+            case DateTimeTransform.DateOnly:
+                if (value.Kind == DateTimeKind.Unspecified && value.TimeOfDay == TimeSpan.Zero)
+                    return value;
+                else
+                    return DateTime.SpecifyKind(value.Date, DateTimeKind.Unspecified);
 
-                if (ExecutionContext.HasCurrent)
-                    ti.TenantId = ExecutionContext.Current.TenantId;
-            }
-            else
-                ti.TenantId = executionContext.TenantId;
-        }
+            case DateTimeTransform.DateTimeUnspecified:
+                if (value.Kind != DateTimeKind.Unspecified)
+                    return DateTime.SpecifyKind(value, DateTimeKind.Unspecified);
 
-        /// <summary>
-        /// Prepares the value for create by encapsulating <see cref="ChangeLog.PrepareCreated{T}(T, ExecutionContext?)"/> and <see cref="ResetTenantId"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <returns>The value to support fluent-style method-chaining.</returns>
-        [return: NotNullIfNotNull(nameof(value))]
-        public static T? PrepareCreate<T>(T? value, ExecutionContext? executionContext = null)
-        {
-            if (value is not null)
-            {
-                ChangeLog.PrepareCreated(value, executionContext);
-                ResetTenantId(value, executionContext);
-            }
-
-            return value;
+                break;
         }
 
-        /// <summary>
-        /// Prepares the value for update by encapsulating <see cref="ChangeLog.PrepareUpdated{T}(T, ExecutionContext?)"/> and <see cref="ResetTenantId"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <returns>The value to support fluent-style method-chaining.</returns>
-        [return: NotNullIfNotNull(nameof(value))]
-        public static T? PrepareUpdate<T>(T? value, ExecutionContext? executionContext = null)
-        {
-            if (value is not null)
-            {
-                ChangeLog.PrepareUpdated(value, executionContext);
-                ResetTenantId(value, executionContext);
-            }
-
-            return value;
-        }
+        return value;
     }
+
+    /// <summary>
+    /// Cleans a <see cref="Nullable{DateTime}"/> value.
+    /// </summary>
+    /// <param name="value">The value to clean.</param>
+    /// <param name="transform">The <see cref="DateTimeTransform"/> to be applied.</param>
+    /// <returns>The cleaned value.</returns>
+    [return: NotNullIfNotNull(nameof(value))]
+    public static DateTime? Clean(DateTime? value, DateTimeTransform transform) => value is null || !value.HasValue ? value : Clean(value.Value, transform);
+
+    /// <summary>
+    /// Cleans a value.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to clean.</param>
+    /// <returns>The cleaned <paramref name="value"/>.</returns>
+    public static T? Clean<T>(T value) => RuntimeMetadata.Clean<T>(value);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/CollectionResult.cs b/src/CoreEx/Entities/CollectionResult.cs
deleted file mode 100644
index bcf4c4f6..00000000
--- a/src/CoreEx/Entities/CollectionResult.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents a basic <see cref="ICollectionResult{TEntity}"/> class with a <see cref="PagingResult"/> and underlying <see cref="Items"/>.
-    /// </summary>
-    /// <typeparam name="TColl">The result collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The underlying entity <see cref="Type"/>.</typeparam>
-    /// <remarks>Generally an <see cref="CollectionResult{TColl, TItem}"/> is not intended to be (de)serialized. For an <see cref="HttpResponseMessage"/> the underlying <see cref="Items"/> is (de)serialized only, with the <see cref="Paging"/> 
-    /// included within the corresponding <see cref="HttpResponseMessage.Headers"/>. The <see cref="Json.IJsonSerializer"/> implementations have specific functionality included to (de)serialize the <see cref="Items"/> only, dropping the
-    /// <see cref="Paging"/>; see <see cref="Text.Json.CollectionResultConverterFactory"/> as an example.</remarks>
-    [System.Diagnostics.DebuggerStepThrough]
-    public abstract class CollectionResult<TColl, TItem> : ICollectionResult<TColl, TItem>, IPagingResult
-        where TColl : List<TItem>, new()
-        where TItem : class
-    {
-        private TColl? _collection;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollectionResult{TColl, TEntity}"/> class.
-        /// </summary>
-        public CollectionResult() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CollectionResult{TColl, TEntity}"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">Defaults the <see cref="Paging"/> to the requesting <see cref="PagingArgs"/>.</param>
-        protected CollectionResult(PagingArgs? paging)
-        {
-            if (paging is not null)
-                Paging = new PagingResult(paging);
-        }
-
-        /// <inheritdoc/>
-        public TColl Items
-        {
-            get => _collection ??= new TColl();
-            set => _collection = value.ThrowIfNull(nameof(value));
-        }
-
-        /// <inheritdoc/>
-        public PagingResult? Paging { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/CompositeKey.Conversion.cs b/src/CoreEx/Entities/CompositeKey.Conversion.cs
new file mode 100644
index 00000000..e9d9e362
--- /dev/null
+++ b/src/CoreEx/Entities/CompositeKey.Conversion.cs
@@ -0,0 +1,178 @@
+namespace CoreEx.Entities;
+
+public partial struct CompositeKey
+{
+    /// <summary>
+    /// Implicitly converts a <see cref="string"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(string? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts an <see cref="short"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(short identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="short"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(short? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts an <see cref="int"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(int identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="int"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(int? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="long"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(long identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="long"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(long? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Guid"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(Guid identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="Guid"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(Guid? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="char"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(char identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="char"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(char? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="bool"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(bool identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="bool"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(bool? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="DateTime"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(DateTime identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="DateTime"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(DateTime? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="DateTimeOffset"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(DateTimeOffset identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="DateTimeOffset"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(DateTimeOffset? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts an <see cref="ushort"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(ushort identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/>  <see cref="ushort"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(ushort? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts an <see cref="uint"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(uint identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/>  <see cref="uint"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(uint? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="ulong"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(ulong identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="ulong"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(ulong? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="DateOnly"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(DateOnly identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="DateOnly"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(DateOnly? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="TimeOnly"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(TimeOnly identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="Nullable{T}"/> <see cref="TimeOnly"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(TimeOnly? identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts a <see cref="byte"/> <see cref="Array"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="identifier">The identifier.</param>
+    public static implicit operator CompositeKey(byte[] identifier) => Create(identifier);
+
+    /// <summary>
+    /// Implicitly converts an <see cref="object"/> <see cref="Array"/> to a <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    public static implicit operator CompositeKey(object?[]? key) => key is null ? new() : new(key);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/CompositeKey.cs b/src/CoreEx/Entities/CompositeKey.cs
index 73f133a7..f743ecfd 100644
--- a/src/CoreEx/Entities/CompositeKey.cs
+++ b/src/CoreEx/Entities/CompositeKey.cs
@@ -1,534 +1,217 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System;
-using System.Collections.Immutable;
-using System.Globalization;
-using System.Text;
-
-namespace CoreEx.Entities
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Represents an immutable composite key.
+/// </summary>
+/// <remarks>May contain zero or more <see cref="Args"/> that represent the composite key.
+/// <para><b>NOTE:</b> For performance-critical scenarios with 1-4 arguments, use the generic <see cref="Create{T}(T)"/> overloads to avoid boxing of value types.</para>
+/// <para>The <see cref="CompositeKey"/> is largely intended for .NET code use only, as such there is no specific JSON serialization support enabled by design. The following code snippet demonstrates intended usage.</para>
+/// <code>
+/// public class SalesOrderItem
+/// {
+///     [JsonPropertyName("order")]
+///     public string? OrderNumber { get; set; }
+///     
+///     [JsonPropertyName("item")]
+///     public int ItemNumber { get; set; }
+///     
+///     [JsonIgnore()]
+///     public CompositeKey SalesOrderItemKey => CompositeKey.Create(OrderNumber, ItemNumber);
+/// }
+/// </code>
+/// </remarks>
+public readonly partial struct CompositeKey() : IEquatable<CompositeKey>
 {
+    private readonly ImmutableArray<object?> _args = [];
+    private readonly object? _fastPath = null;
+    private readonly byte _count = 0;
+
     /// <summary>
-    /// Represents an immutable composite key.
+    /// Creates a new <see cref="CompositeKey"/> from the argument values.
     /// </summary>
-    /// <remarks>May contain zero or more <see cref="Args"/> that represent the composite key. A subset of the the .NET <see href="https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/builtin-types/built-in-types">built-in types</see>
-    /// are supported: <see cref="string"/>, <see cref="char"/>, <see cref="short"/>, <see cref="int"/>, <see cref="long"/>, <see cref="ushort"/>, <see cref="uint"/>, <see cref="ulong"/>, <see cref="Guid"/>, <see cref="DateTimeOffset"/> (converted to a <see cref="DateTime"/>) and <see cref="DateTime"/>.
-    /// Extended support is enabled for <see cref="IReferenceData"/> types such that the <see cref="IReferenceData.Code"/> is used.
-    /// <para>A <see cref="CompositeKey"/> is not generally intended to be a first-class JSON-serialized property type, although is supported (see <see cref="CoreEx.Text.Json.CompositeKeyConverterFactory"/>); but, to be used in a read-only non-serialized manner to group (encapsulate) other properties
-    /// into a single value. The <see cref="CompositeKey"/> is also used within the <see cref="IEntityKey"/>, <see cref="IIdentifier"/> and <see cref="IPrimaryKey"/>.</para><para>Example as follows:
-    /// <code>
-    /// public class SalesOrderItem
-    /// {
-    ///     [JsonPropertyName("order")]
-    ///     public string? OrderNumber { get; set; }
-    ///     
-    ///     [JsonPropertyName("item")]
-    ///     public int ItemNumber { get; set; }
-    ///     
-    ///     [JsonIgnore()]
-    ///     public CompositeKey SalesOrderItemKey => CompositeKey.Create(OrderNumber, ItemNumber);
-    /// }
-    /// </code></para></remarks>
-    [System.Diagnostics.DebuggerStepThrough]
-    [System.Diagnostics.DebuggerDisplay("Args = {ToString()}")]
-    public readonly struct CompositeKey : IEquatable<CompositeKey>
-    {
-        private static readonly string[] _singleEmptyArray = [string.Empty];
-        private readonly ImmutableArray<object?> _args;
-
-        /// <summary>
-        /// Represents an empty <see cref="CompositeKey"/>.
-        /// </summary>
-        public static readonly CompositeKey Empty = new();
-
-        /// <summary>
-        /// Creates a new <see cref="CompositeKey"/> from the argument values,
-        /// </summary>
-        /// <param name="args">The argument values for the key.</param>
-        /// <returns>The <see cref="CompositeKey"/>.</returns>
-        public static CompositeKey Create(params object?[] args) => new(args);
-
-        /// <summary>
-        /// Initializes a new <see cref="CompositeKey"/> structure.
-        /// </summary>
-#if NET8_0_OR_GREATER
-        public CompositeKey() => _args = [];
-#else
-        public CompositeKey() => _args = ImmutableArray<object?>.Empty;
-#endif
-
-        /// <summary>
-        /// Initializes a new <see cref="CompositeKey"/> structure with one or more values that represent the composite key.
-        /// </summary>
-        /// <param name="args">The argument values for the key.</param>
-        public CompositeKey(params object?[] args)
-        {
-            if (args == null)
-            {
-#if NET8_0_OR_GREATER
-                _args = [null];
-#else
-                _args = new object?[] { null }.ToImmutableArray();
-#endif
-                return;
-            }
-
-#if !RELEASE
-            // Validate supported types in Debug-mode only; fast-path for Release.
-            object? temp;
-            for (int idx = 0; idx < args.Length; idx++)
-            {
-                temp = args[idx] == null ? null : args[idx] switch
-                {
-                    string str => str,
-                    char c => c,
-                    short s => s,
-                    int i => i,
-                    long l => l,
-                    Guid g => g,
-                    DateTime dt => dt,
-                    DateTimeOffset dto => dto,
-                    ushort us => us,
-                    uint ui => ui,
-                    ulong ul => ul,
-                    IReferenceData rd => rd?.Code,
-                    _ => throw new ArgumentException($"{nameof(CompositeKey)} argument Type '{args[idx]!.GetType().FullName}' is not supported; must be one of the following: "
-                        + "string, char, short, int, long, ushort, uint, ulong, Guid, DateTime and DateTimeOffset.")
-                };
-            }
-#endif
-
-#if NET8_0_OR_GREATER
-            _args = [.. args];
-#else
-            _args = args.ToImmutableArray();
-#endif
-        }
-
-        /// <summary>
-        /// Gets the argument values for the key.
-        /// </summary>
-        /// <remarks>The <see cref="Args"/> are immutable.</remarks>
-        public ImmutableArray<object?> Args => _args;
+    /// <param name="args">The argument values for the key.</param>
+    /// <returns>The <see cref="CompositeKey"/>.</returns>
+    public static CompositeKey Create(params IEnumerable<object?> args) => new(args);
 
-        /// <summary>
-        /// Asserts the <see cref="Args"/> length and throws an <see cref="ArgumentException"/> where the length is not as expected.
-        /// </summary>
-        /// <param name="length">The expected length.</param>
-        /// <returns>The <see cref="CompositeKey"/> to support fluent-style method-chaining.</returns>
-        public CompositeKey AssertLength(int length)
-        {
-            if (length < 0)
-                throw new ArgumentOutOfRangeException(nameof(length), "Length must be greater than or equal to zero.");
-
-            if (_args.Length != length)
-                throw new ArgumentException($"The number of arguments within the {nameof(CompositeKey)} must equal {length}.", nameof(length));
-
-            return this;
-        }
+    /// <summary>
+    /// Creates a new <see cref="CompositeKey"/> from a single argument value without boxing (performance optimized).
+    /// </summary>
+    /// <typeparam name="T">The argument <see cref="Type"/>.</typeparam>
+    /// <param name="arg">The argument value for the key.</param>
+    /// <returns>The <see cref="CompositeKey"/>.</returns>
+    public static CompositeKey Create<T>(T arg) => new(ValueTuple.Create(arg), 1);
 
-        /// <summary>
-        /// Determines whether the current <see cref="CompositeKey"/> is equal to another <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="other">The other <see cref="CompositeKey"/>.</param>
-        /// <returns><c>true</c> if the values are equal; otherwise, <c>false</c>.</returns>
-        /// <remarks>Uses the <see cref="CompositeKeyComparer.Equals(CompositeKey, CompositeKey)"/>.</remarks>
-        public bool Equals(CompositeKey other) => CompositeKeyComparer.Default.Equals(this, other);
+    /// <summary>
+    /// Creates a new <see cref="CompositeKey"/> from two argument values without boxing (performance optimized).
+    /// </summary>
+    /// <typeparam name="T1">The first argument <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T2">The second argument <see cref="Type"/>.</typeparam>
+    /// <param name="arg1">The first argument value.</param>
+    /// <param name="arg2">The second argument value.</param>
+    /// <returns>The <see cref="CompositeKey"/>.</returns>
+    public static CompositeKey Create<T1, T2>(T1 arg1, T2 arg2) => new((arg1, arg2), 2);
 
-        /// <summary>
-        /// Determines whether the current <see cref="CompositeKey"/> is equal to another <see cref="Object"/>.
-        /// </summary>
-        /// <param name="obj">The other <see cref="object"/>.</param>
-        /// <returns><c>true</c> if the values are equal; otherwise, <c>false</c>.</returns>
-        public override bool Equals(object? obj) => obj is CompositeKey key && Equals(key);
+    /// <summary>
+    /// Creates a new <see cref="CompositeKey"/> from three argument values without boxing (performance optimized).
+    /// </summary>
+    /// <typeparam name="T1">The first argument <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T2">The second argument <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T3">The third argument <see cref="Type"/>.</typeparam>
+    /// <param name="arg1">The first argument value.</param>
+    /// <param name="arg2">The second argument value.</param>
+    /// <param name="arg3">The third argument value.</param>
+    /// <returns>The <see cref="CompositeKey"/>.</returns>
+    public static CompositeKey Create<T1, T2, T3>(T1 arg1, T2 arg2, T3 arg3) => new((arg1, arg2, arg3), 3);
 
-        /// <summary>
-        /// Returns a hash code for the <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <returns>A hash code for the <see cref="CompositeKey"/>.</returns>
-        /// <remarks>Uses the <see cref="CompositeKeyComparer.GetHashCode(CompositeKey)"/>.</remarks>
-        public override int GetHashCode() => CompositeKeyComparer.Default.GetHashCode(this);
+    /// <summary>
+    /// Creates a new <see cref="CompositeKey"/> from four argument values without boxing (performance optimized).
+    /// </summary>
+    /// <typeparam name="T1">The first argument <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T2">The second argument <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T3">The third argument <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T4">The fourth argument <see cref="Type"/>.</typeparam>
+    /// <param name="arg1">The first argument value.</param>
+    /// <param name="arg2">The second argument value.</param>
+    /// <param name="arg3">The third argument value.</param>
+    /// <param name="arg4">The fourth argument value.</param>
+    /// <returns>The <see cref="CompositeKey"/>.</returns>
+    public static CompositeKey Create<T1, T2, T3, T4>(T1 arg1, T2 arg2, T3 arg3, T4 arg4) => new((arg1, arg2, arg3, arg4), 4);
 
-        /// <summary>
-        /// Compares two <see cref="CompositeKey"/> types for equality.
-        /// </summary>
-        /// <param name="left">The left <see cref="CompositeKey"/>.</param>
-        /// <param name="right">The right <see cref="CompositeKey"/>.</param>
-        /// <returns><c>true</c> indicates equal; otherwise, <c>false</c> for not equal.</returns>
-        public static bool operator ==(CompositeKey left, CompositeKey right) => left.Equals(right);
+    /// <summary>
+    /// Initializes a new <see cref="CompositeKey"/> from the argument values.
+    /// </summary>
+    /// <param name="args">The argument values for the key. Passing an explicit <see langword="null"/> creates a key with one null value; passing no arguments creates an empty key.</param>
+    public CompositeKey(params IEnumerable<object?>? args) : this() => _args = args is null ? [null] : [.. args];
 
-        /// <summary>
-        /// Compares two <see cref="CompositeKey"/> types for non-equality.
-        /// </summary>
-        /// <param name="left">The left <see cref="CompositeKey"/>.</param>
-        /// <param name="right">The right <see cref="CompositeKey"/>.</param>
-        /// <returns><c>true</c> indicates not equal; otherwise, <c>false</c> for equal.</returns>
-        public static bool operator !=(CompositeKey left, CompositeKey right) => !(left == right);
+    /// <summary>
+    /// Initializes a new <see cref="CompositeKey"/> using fast path storage (no boxing).
+    /// </summary>
+    private CompositeKey(object? fastPath, byte count) : this([])
+    {
+        _fastPath = fastPath;
+        _count = count;
+        _args = default;
+    }
 
-        /// <summary>
-        /// Determines whether the <see cref="CompositeKey"/> is considered initial; i.e. all <see cref="Args"/> have their default value.
-        /// </summary>
-        /// <returns><c>true</c> indicates that the <see cref="CompositeKey"/> is initial; otherwise, <c>false</c>.</returns>
-        public bool IsInitial
-        {
-            get
-            {
-                if (Args == null || Args.Length == 0)
-                    return true;
+    /// <summary>
+    /// Gets the argument values for the key.
+    /// </summary>
+    /// <remarks>The <see cref="Args"/> are immutable. When using fast path storage, this property materializes the arguments from the tuple.</remarks>
+    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+    public ImmutableArray<object?> Args => _count == 0 ? _args : MaterializeArgs();
 
-                foreach (var arg in Args)
-                {
-                    if (arg != null && !arg.Equals(GetDefaultValue(arg.GetType())))
-                        return false;
-                }
+    /// <summary>
+    /// Gets whether this key uses fast path storage (no boxing).
+    /// </summary>
+    internal bool IsFastPath => _count > 0;
 
-                return true;
-            }
-        }
+    /// <summary>
+    /// Gets the fast path storage object (tuple).
+    /// </summary>
+    internal object? FastPath => _fastPath;
 
-        /// <summary>
-        /// Gets the default value for a specified <paramref name="type"/>.
-        /// </summary>
-        private static object? GetDefaultValue(Type type) => type.IsValueType ? Activator.CreateInstance(type) : null;
+    /// <summary>
+    /// Gets the count of arguments in fast path storage.
+    /// </summary>
+    internal byte FastPathCount => _count;
 
-        /// <summary>
-        /// Returns the <see cref="CompositeKey"/> as a comma-separated <see cref="Args"/> <see cref="string"/>.
-        /// </summary>
-        /// <returns>The composite key as a <see cref="string"/>.</returns>
-        /// <remarks>Each <see cref="Args"/> value is formatted in an invariant manner for portability and consistency. A <c>null</c> is formatted as <see cref="string.Empty"/>. A <see cref="string"/>
-        /// is written as-is, there is no special escaping et. performed.</remarks>
-        public override string? ToString() => ToString(',');
+    /// <summary>
+    /// Materializes the arguments from fast path storage into an immutable array.
+    /// </summary>
+    private ImmutableArray<object?> MaterializeArgs()
+    {
+        if (_fastPath is not ITuple tuple)
+            return [];
 
-        /// <summary>
-        /// Returns the <see cref="CompositeKey"/> as a <see cref="string"/> with the <see cref="Args"/> separated by the <paramref name="separator"/>.
-        /// </summary>
-        /// <param name="separator">The seperator character.</param>
-        /// <returns>The composite key as a <see cref="string"/>.</returns>
-        public string? ToString(char separator)
+        return _count switch
         {
-            if (Args.Length == 0 || (Args.Length == 1 && Args[0] is null))
-                return null;
-
-            if (Args.Length == 1 && Args[0] is string s)
-                return s;
-
-            var sb = new StringBuilder();
-            for (int i = 0; i < Args.Length; i++)
-            {
-                if (i > 0)
-                    sb.Append(separator);
-
-                if (Args[i] is null)
-                    continue;
-
-                switch (Args[i]!.GetType())
-                {
-                    case Type t when t == typeof(int) || t == typeof(long) || t == typeof(short) || t == typeof(uint) || t == typeof(ulong) || t == typeof(ushort):
-                        sb.AppendFormat(NumberFormatInfo.InvariantInfo, "{0}", Args[i]);
-                        break;
-
-                    case Type t when t == typeof(DateTime) || t == typeof(DateTimeOffset):
-                        sb.AppendFormat(DateTimeFormatInfo.InvariantInfo, "{0:O}", Args[i]);
-                        break;
-
-                    default:
-                        sb.Append(Args[i]);
-                        break;
-                }
-            }
-
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Returns the <see cref="CompositeKey"/> as a JSON <see cref="string"/>.
-        /// </summary>
-        /// <returns>The composite key as a JSON <see cref="string"/>.</returns>
-        /// <remarks>Uses the <see cref="Json.JsonSerializer.Default"/> internally.</remarks>
-        public string ToJsonString() => Json.JsonSerializer.Default.Serialize(this);
-
-        /// <summary>
-        /// Creates a new <see cref="CompositeKey"/> from serialized <paramref name="json"/> (see <see cref="ToJsonString"/>);
-        /// </summary>
-        /// <param name="json">The JSON string.</param>
-        /// <returns>The <see cref="CompositeKey"/>.</returns>
-        /// <remarks>Uses the <see cref="Json.JsonSerializer.Default"/> internally.</remarks>
-        public static CompositeKey CreateFromJson(string json) => (string.IsNullOrEmpty(json) || json == "null") ? new CompositeKey() : Json.JsonSerializer.Default.Deserialize<CompositeKey>(json);
-
-        /// <summary>
-        /// Try and create a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> (<see cref="ToString()"/>) where the key is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <typeparam name="T">The key <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.
-        /// <para>There is no specific character escaping etc. performed automatically.</para></remarks>
-        public static bool TryCreateFromString<T>(string? key, out CompositeKey compositeKey) => TryCreateFromString(key, [typeof(T)], out compositeKey);
-
-        /// <summary>
-        /// Creates a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> (<see cref="ToString()"/>) where each underlying part is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <typeparam name="T1">The key <see cref="Type"/> for the first part.</typeparam>
-        /// <typeparam name="T2">The key <see cref="Type"/> for the second part.</typeparam>
-        /// <param name="key">The key.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString<T1, T2>(string? key, out CompositeKey compositeKey) => TryCreateFromString(key, [typeof(T1), typeof(T2)], out compositeKey);
-
-        /// <summary>
-        /// Creates a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> (<see cref="ToString()"/>) where each underlying part is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <typeparam name="T1">The key <see cref="Type"/> for the first part.</typeparam>
-        /// <typeparam name="T2">The key <see cref="Type"/> for the second part.</typeparam>
-        /// <typeparam name="T3">The key <see cref="Type"/> for the third part.</typeparam>
-        /// <param name="key">The key.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString<T1, T2, T3>(string? key, out CompositeKey compositeKey) => TryCreateFromString(key, [typeof(T1), typeof(T2), typeof(T3)], out compositeKey);
-
-        /// <summary>
-        /// Try and create a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> representation (<see cref="ToString()"/>) where each underlying part is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="types">The <see cref="Type"/> array.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString(string? key, Type[] types, out CompositeKey compositeKey) => TryCreateFromString(key, ',', types, out compositeKey);
+            1 => [tuple[0]],
+            2 => [tuple[0], tuple[1]],
+            3 => [tuple[0], tuple[1], tuple[2]],
+            4 => [tuple[0], tuple[1], tuple[2], tuple[3]],
+            _ => []
+        };
+    }
 
-        /// <summary>
-        /// Try and create a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> (<see cref="ToString()"/>) where the key is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <typeparam name="T">The key <see cref="Type"/>.</typeparam>
-        /// <param name="key">The key.</param>
-        /// <param name="separator">The seperator character.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString<T>(string? key, char separator, out CompositeKey compositeKey) => TryCreateFromString(key, separator, [typeof(T)], out compositeKey);
+    /// <summary>
+    /// Determines whether the current <see cref="CompositeKey"/> is equal to another <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="other">The other <see cref="CompositeKey"/>.</param>
+    /// <returns><see langword="true"/> if the values are equal; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Uses the <see cref="CompositeKeyComparer.Equals(CompositeKey, CompositeKey)"/>.</remarks>
+    public bool Equals(CompositeKey other) => CompositeKeyComparer.Default.Equals(this, other);
 
-        /// <summary>
-        /// Creates a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> (<see cref="ToString()"/>) where each underlying part is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <typeparam name="T1">The key <see cref="Type"/> for the first part.</typeparam>
-        /// <typeparam name="T2">The key <see cref="Type"/> for the second part.</typeparam>
-        /// <param name="key">The key.</param>
-        /// <param name="separator">The seperator character.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString<T1, T2>(string? key, char separator, out CompositeKey compositeKey) => TryCreateFromString(key, separator, [typeof(T1), typeof(T2)], out compositeKey);
+    /// <summary>
+    /// Determines whether the current <see cref="CompositeKey"/> is equal to another <see cref="Object"/>.
+    /// </summary>
+    /// <param name="obj">The other <see cref="object"/>.</param>
+    /// <returns><see langword="true"/> if the values are equal; otherwise, <see langword="false"/>.</returns>
+    public override bool Equals(object? obj) => obj is CompositeKey key && Equals(key);
 
-        /// <summary>
-        /// Creates a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> (<see cref="ToString()"/>) where each underlying part is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <typeparam name="T1">The key <see cref="Type"/> for the first part.</typeparam>
-        /// <typeparam name="T2">The key <see cref="Type"/> for the second part.</typeparam>
-        /// <typeparam name="T3">The key <see cref="Type"/> for the third part.</typeparam>
-        /// <param name="key">The key.</param>
-        /// <param name="separator">The seperator character.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString<T1, T2, T3>(string? key, char separator, out CompositeKey compositeKey) => TryCreateFromString(key, separator, [typeof(T1), typeof(T2), typeof(T3)], out compositeKey);
+    /// <summary>
+    /// Returns a hash code for the <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <returns>A hash code for the <see cref="CompositeKey"/>.</returns>
+    /// <remarks>Uses the <see cref="CompositeKeyComparer.GetHashCode(CompositeKey)"/>.</remarks>
+    public override int GetHashCode() => CompositeKeyComparer.Default.GetHashCode(this);
 
-        /// <summary>
-        /// Try and create a new <see cref="CompositeKey"/> from a string-based <paramref name="key"/> representation (<see cref="ToString()"/>) where each underlying part is of the <see cref="Type"/> specified.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="separator">The seperator character.</param>
-        /// <param name="types">The <see cref="Type"/> array.</param>
-        /// <param name="compositeKey">The resulting <see cref="CompositeKey"/></param>
-        /// <returns><c>true</c> indicates that the <paramref name="compositeKey"/> was successfully created; otherwise, <c>false</c></returns>
-        /// <remarks>The types specified must represent exact match of underlying <paramref name="key"/> parts.</remarks>
-        public static bool TryCreateFromString(string? key, char separator, Type[] types, out CompositeKey compositeKey)
-        {
-            var parts = string.IsNullOrEmpty(key) ? _singleEmptyArray : key.Split(separator, StringSplitOptions.None);
-            if (parts.Length != types.Length)
-            {
-                compositeKey = Empty;
-                return false;
-            }
+    /// <summary>
+    /// Compares two <see cref="CompositeKey"/> types for equality.
+    /// </summary>
+    /// <param name="left">The left <see cref="CompositeKey"/>.</param>
+    /// <param name="right">The right <see cref="CompositeKey"/>.</param>
+    /// <returns><see langword="true"/> indicates equal; otherwise, <see langword="false"/> for not equal.</returns>
+    public static bool operator ==(CompositeKey left, CompositeKey right) => left.Equals(right);
 
-            var args = new object?[types.Length];
+    /// <summary>
+    /// Compares two <see cref="CompositeKey"/> types for non-equality.
+    /// </summary>
+    /// <param name="left">The left <see cref="CompositeKey"/>.</param>
+    /// <param name="right">The right <see cref="CompositeKey"/>.</param>
+    /// <returns><see langword="true"/> indicates not equal; otherwise, <see langword="false"/> for equal.</returns>
+    public static bool operator !=(CompositeKey left, CompositeKey right) => !(left == right);
 
-            for (int i = 0; i < parts.Length; i++)
-            {
-                var part = parts[i];
-                var type = Nullable.GetUnderlyingType(types[i]);
-                if (type is not null)
-                {
-                    if (string.IsNullOrEmpty(part))
-                    {
-                        args[i] = null;
-                        continue;
-                    }
-                }
-                else
-                    type = types[i];
+    /// <summary>
+    /// Gets the string representation of the <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <returns>The string representation.</returns>
+    /// <remarks>Uses the configured <see cref="ToStringFormatter"/>.</remarks>
+    public override string? ToString() => ToStringFormatter(this);
 
-                if (!(type switch
-                {
-                    Type t when t == typeof(string) => TryParse(args, i, () => (true, part.Length == 0 ? null : part)),
-                    Type t when t == typeof(char) => TryParse(args, i, () => part.Length == 0 ? (true, ' ') : (part.Length == 1 ? (true, part[0]) : (false, ' '))),
-                    Type t when t == typeof(short) => TryParse(args, i, () => short.TryParse(part, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out short v) ? (true, v) : (false, 0)),
-                    Type t when t == typeof(int) => TryParse(args, i, () => int.TryParse(part, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out int v) ? (true, v) : (false, 0)),
-                    Type t when t == typeof(long) => TryParse(args, i, () => long.TryParse(part, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out long v) ? (true, v) : (false, 0)),
-                    Type t when t == typeof(Guid) => TryParse(args, i, () => Guid.TryParse(part, out Guid v) ? (true, v) : (false, Guid.Empty)),
-                    Type t when t == typeof(DateTime) => TryParse(args, i, () => DateTime.TryParseExact(part, "O", DateTimeFormatInfo.InvariantInfo, DateTimeStyles.RoundtripKind, out DateTime v) ? (true, v) : (false, DateTime.MinValue)),
-                    Type t when t == typeof(DateTimeOffset) => TryParse(args, i, () => DateTimeOffset.TryParseExact(part, "O", DateTimeFormatInfo.InvariantInfo, DateTimeStyles.RoundtripKind, out DateTimeOffset v) ? (true, v) : (false, DateTimeOffset.MinValue)),
-                    Type t when t == typeof(uint) => TryParse(args, i, () => uint.TryParse(part, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out uint v) ? (true, v) : (false, 0)),
-                    Type t when t == typeof(ulong) => TryParse(args, i, () => ulong.TryParse(part, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out ulong v) ? (true, v) : (false, 0)),
-                    Type t when t == typeof(ushort) => TryParse(args, i, () => ushort.TryParse(part, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out ushort v) ? (true, v) : (false, 0)),
-                    _ => TryParse(args, i, () => (false, part))
-                }))
-                { 
-                    compositeKey = Empty;
-                    return false;
-                }
-            }
+    /// <summary>
+    /// Gets or sets the <see cref="ToString"/> formatter function.
+    /// </summary>
+    /// <remarks>The default implementation will format each argument (from the <see cref="Args"/>) to be universal, deterministic, and culture-independent.</remarks>
+    public static Func<CompositeKey, string> ToStringFormatter
+    {
+        get;
+        set => field = value.ThrowIfNull();
+    } = ck => string.Join(',', ck.Args.Select(ArgumentToString));
 
-            compositeKey = new CompositeKey(args);
-            return true;
-        }
+    /// <summary>
+    /// Converts an argument into a universal, deterministic, and culture-independent <see cref="string"/>.
+    /// </summary>
+    private static string? ArgumentToString(object? arg)
+    {
+        if (arg is null)
+            return null;
 
-        /// <summary>
-        /// Attempt parse and update the array.
-        /// </summary>
-        private static bool TryParse<T>(object?[] args, int index, Func<(bool, T)> parse)
+        return arg switch
         {
-            (bool parsed, T value) = parse();
-            args[index] = value;
-            return parsed;
-        }
-
-        /// <summary>
-        /// Implicitly converts a <see cref="string"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(string? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="short"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(short identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="short"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(short? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="int"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(int identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="int"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(int? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="long"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(long identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="long"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(long? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Guid"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(Guid identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Guid"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(Guid? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="char"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(char? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="char"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(char identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="DateTime"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(DateTime? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="DateTime"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(DateTime identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="DateTimeOffset"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(DateTimeOffset? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="DateTimeOffset"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(DateTimeOffset identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="ushort"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(ushort identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="ushort"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(ushort? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="uint"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(uint identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="uint"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(uint? identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="ulong"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(ulong identifier) => new(identifier);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="ulong"/> to a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="identifier">The identifier.</param>
-        public static implicit operator CompositeKey(ulong? identifier) => new(identifier);
+            string s => s,
+            Guid g => g.ToString("D"),
+            DateTimeOffset dto => dto.ToUniversalTime().ToString("o", CultureInfo.InvariantCulture),
+            DateTime dt => dt.ToString("o", CultureInfo.InvariantCulture),
+            float f => f.ToString("R", CultureInfo.InvariantCulture),
+            double d => d.ToString("R", CultureInfo.InvariantCulture),
+            decimal m => m.ToString("G", CultureInfo.InvariantCulture),
+            bool b => b ? "true" : "false",
+            byte[] bytes => Convert.ToBase64String(bytes),
+            TimeSpan ts => ts.ToString("c", CultureInfo.InvariantCulture),
+            DateOnly d => d.ToString("O", CultureInfo.InvariantCulture),
+            TimeOnly t => t.ToString("O", CultureInfo.InvariantCulture),
+            char c => c.ToString(),
+            _ => Convert.ToString(arg, CultureInfo.InvariantCulture),
+        };
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/CompositeKeyComparer.cs b/src/CoreEx/Entities/CompositeKeyComparer.cs
index 17a3828e..9f401476 100644
--- a/src/CoreEx/Entities/CompositeKeyComparer.cs
+++ b/src/CoreEx/Entities/CompositeKeyComparer.cs
@@ -1,67 +1,134 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using System.Collections.Generic;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Represents a comparer of equality for a <see cref="CompositeKey"/>.
+/// </summary>
+public class CompositeKeyComparer : IEqualityComparer<CompositeKey>
 {
+    private static readonly CompositeKeyComparer _default = new();
+    private static readonly object _nothing = new();
+
+    /// <summary>
+    /// Gets the default <see cref="CompositeKeyComparer"/> instance.
+    /// </summary>
+    public static CompositeKeyComparer Default => _default;
+
+    /// <summary>
+    /// Determines whether the specified values are equal from a <see cref="CompositeKey"/> perspective.
+    /// </summary>
+    /// <param name="x">The first object to compare.</param>
+    /// <param name="y">The second object to compare.</param>
+    /// <returns><see langword="true"/> if the values are equal; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>This method supports comparing both <see cref="CompositeKey"/> and <see cref="IEntityKey"/> values.</remarks>
+    public new bool Equals(object? x, object? y)
+    {
+        if (x is CompositeKey ckx && y is CompositeKey cky)
+            return Equals(ckx, cky);
+        else if (x is IEntityKey ekx && y is IEntityKey eky)
+            return Equals(ekx.EntityKey, eky.EntityKey);
+        else
+            return false;
+    }
+
     /// <summary>
-    /// Represents a comparer of equality for a <see cref="CompositeKey"/>.
+    /// Determines whether the specified <see cref="CompositeKey"/> values are equal.
     /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class CompositeKeyComparer : IEqualityComparer<CompositeKey>
+    /// <param name="x">The first <see cref="CompositeKey"/> to compare.</param>
+    /// <param name="y">The second <see cref="CompositeKey"/> to compare.</param>
+    /// <returns><see langword="true"/> if the values are equal; otherwise, <see langword="false"/>.</returns>
+    public bool Equals(CompositeKey x, CompositeKey y)
     {
-        private static readonly CompositeKeyComparer _default = new();
-        private static readonly object _nullObject = new();
-
-        /// <summary>
-        /// Gets the default <see cref="CompositeKeyComparer"/> instance.
-        /// </summary>
-        public static CompositeKeyComparer Default => _default;
-
-        /// <summary>
-        /// Determines whether the specified <see cref="CompositeKey"/> values are equal.
-        /// </summary>
-        /// <param name="x">The first <see cref="CompositeKey"/> to compare.</param>
-        /// <param name="y">The second <see cref="CompositeKey"/> to compare.</param>
-        /// <returns><c>true</c> if the values are equal; otherwise, <c>false</c>.</returns>
-        public bool Equals(CompositeKey x, CompositeKey y)
+        // Fast path optimization: compare tuples directly without boxing
+        if (x.IsFastPath && y.IsFastPath)
         {
-            if (x.Args == null && y.Args == null)
-                return true;
-            else if (x.Args == null || y.Args == null)
+            if (x.FastPathCount != y.FastPathCount)
                 return false;
-            else if (x.Args!.Length != y.Args!.Length)
+
+            if (x.FastPath is not ITuple tupleX || y.FastPath is not ITuple tupleY)
                 return false;
 
-            for (int i = 0; i < x.Args.Length; i++)
+            for (int i = 0; i < x.FastPathCount; i++)
             {
-                if (!GetArgValue(x.Args[i]).Equals(GetArgValue(y.Args[i])))
+                if (!GetArgValue(tupleX[i]).Equals(GetArgValue(tupleY[i])))
                     return false;
             }
 
             return true;
         }
 
-        /// <summary>
-        /// Returns a hash code for the <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/> for which a hash code is to be returned.</param>
-        /// <returns>A hash code for the <see cref="CompositeKey"/>.</returns>
-        public int GetHashCode(CompositeKey key)
+        // Fallback to Args comparison (materializes if needed)
+        if (x.Args == null && y.Args == null)
+            return true;
+        else if (x.Args == null || y.Args == null)
+            return false;
+        else if (x.Args!.Length != y.Args!.Length)
+            return false;
+
+        for (int i = 0; i < x.Args.Length; i++)
         {
-            if (key.Args.Length == 0)
-                return 0;
+            if (!GetArgValue(x.Args[i]).Equals(GetArgValue(y.Args[i])))
+                return false;
+        }
 
-            int hashCode = 0;
-            for (int i = 0; i < key.Args.Length; i++)
-                hashCode ^= GetArgValue(key.Args[i]).GetHashCode();
+        return true;
+    }
 
-            return hashCode;
+    /// <summary>
+    /// Returns a hash code for the specified value.
+    /// </summary>
+    /// <param name="value">The value for which a hash code is to be returned.</param>
+    /// <returns>A hash code for the <see cref="CompositeKey"/>.</returns>
+    /// <remarks>This method supports both <see cref="CompositeKey"/> and <see cref="IEntityKey"/> values.</remarks>
+    public int GetHashCode(object? value)
+    {
+        if (value is CompositeKey key)
+            return GetHashCode(key);
+        else if (value is IEntityKey entityKey)
+            return GetHashCode(entityKey.EntityKey);
+        else
+            return value is null ? _nothing.GetHashCode() : value.GetHashCode();
+    }
+
+    /// <summary>
+    /// Returns a hash code for the <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <param name="key">The <see cref="CompositeKey"/> for which a hash code is to be returned.</param>
+    /// <returns>A hash code for the <see cref="CompositeKey"/>.</returns>
+    public int GetHashCode(CompositeKey key)
+    {
+        // Fast path optimization: compute hash without boxing
+        if (key.IsFastPath)
+        {
+            if (key.FastPath is not ITuple tuple)
+                return 0;
+
+            return key.FastPathCount switch
+            {
+                0 => 0,
+                1 => GetArgValue(tuple[0]).GetHashCode(),
+                2 => HashCode.Combine(GetArgValue(tuple[0]), GetArgValue(tuple[1])),
+                3 => HashCode.Combine(GetArgValue(tuple[0]), GetArgValue(tuple[1]), GetArgValue(tuple[2])),
+                4 => HashCode.Combine(GetArgValue(tuple[0]), GetArgValue(tuple[1]), GetArgValue(tuple[2]), GetArgValue(tuple[3])),
+                _ => 0
+            };
         }
 
-        /// <summary>
-        /// Gets the argument value (handles a null value).
-        /// </summary>
-        private static object GetArgValue(object? arg) => arg ?? _nullObject;
+        // Fallback to Args (materializes if needed)
+        if (key.Args.Length == 0)
+            return 0;
+
+        if (key.Args.Length == 1)
+            return GetArgValue(key.Args[0]).GetHashCode();
+
+        var hashCode = new HashCode();
+        for (int i = 0; i < key.Args.Length; i++)
+            hashCode.Add(GetArgValue(key.Args[i]));
+
+        return hashCode.ToHashCode();
     }
+
+    /// <summary>
+    /// Gets the argument value or nothing.
+    /// </summary>
+    private static object GetArgValue(object? arg) => arg ?? _nothing;
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/DataMap.cs b/src/CoreEx/Entities/DataMap.cs
new file mode 100644
index 00000000..2d9ce219
--- /dev/null
+++ b/src/CoreEx/Entities/DataMap.cs
@@ -0,0 +1,49 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Provides a simple extension of <see cref="Dictionary{TKey, TValue}"/> for use as a data map with <see cref="string"/>-based keys and <typeparamref name="TValue"/> values.
+/// </summary>
+/// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+/// <remarks>Additionally, the <see cref="string"/>-based key when serialized to JSON will <i>not</i> be converted to camelCase as is often the default for JSON serialization. This is to ensure that the key
+/// is preserved as-is when serialized and deserialized, which is important for scenarios where the key may be case-sensitive or where the original casing needs to be maintained.
+/// <para>See <see cref="JsonDataMapConverterFactory"/>.</para>
+/// <para>Note that the <see cref="System.Collections.Specialized.StringDictionary"/> documentation indicates that it should be considered obsolete; hence not used, and <see cref="DataMap{TValue}"/> is provided as a modern alternative.</para></remarks>
+public class DataMap<TValue> : Dictionary<string, TValue>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataMap{TValue}"/> class.
+    /// </summary>
+    public DataMap() : base() { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataMap{TValue}"/> class with the specified dictionary.
+    /// </summary>
+    /// <param name="dictionary">The dictionary whose elements are copied to the new <see cref="DataMap{TValue}"/>.</param>
+    public DataMap(IDictionary<string, TValue> dictionary) : base(dictionary) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataMap{TValue}"/> class that uses the specified string comparer for key comparisons.
+    /// </summary>
+    /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> to use for comparing keys.</param>
+    public DataMap(IEqualityComparer<string>? comparer) : base(comparer) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataMap{TValue}"/> class with the specified initial capacity.
+    /// </summary>
+    /// <param name="capacity">The number of elements that the <see cref="DataMap{TValue}"/> can initially contain.</param>
+    public DataMap(int capacity) : base(capacity) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataMap{TValue}"/> class with the specified dictionary and string comparer for key comparisons.
+    /// </summary>
+    /// <param name="dictionary">The dictionary whose elements are copied to the new <see cref="DataMap{TValue}"/>.</param>
+    /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> to use for comparing keys.</param>
+    public DataMap(IDictionary<string, TValue> dictionary, IEqualityComparer<string>? comparer) : base(dictionary, comparer) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataMap{TValue}"/> class with the specified initial capacity and key comparer.
+    /// </summary>
+    /// <param name="capacity">The number of elements that the <see cref="DataMap{TValue}"/> can initially contain.</param>
+    /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> to use for comparing keys.</param>
+    public DataMap(int capacity, IEqualityComparer<string>? comparer) : base(capacity, comparer) { }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/DateTimeTransform.cs b/src/CoreEx/Entities/DateTimeTransform.cs
index f058ef5e..48a63618 100644
--- a/src/CoreEx/Entities/DateTimeTransform.cs
+++ b/src/CoreEx/Entities/DateTimeTransform.cs
@@ -1,44 +1,38 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using System;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Represents a transform option for a <see cref="DateTime"/> value.
+/// </summary>
+/// <remarks><para><i>Note:</i> consider using a <see cref="System.DateOnly"/> or <see cref="DateTimeOffset"/> type as these may be more applicable.</para>See <see cref="Cleaner"/>.</remarks>
+public enum DateTimeTransform
 {
     /// <summary>
-    /// Represents a transform option for a <see cref="DateTime"/> value.
+    /// Indicates that the <see cref="Cleaner.DefaultDateTimeTransform"/> value should be used.
     /// </summary>
-    /// <remarks>The option to perform specified <see cref="DateTime"/> transformations ensures that a class is updated with the correctly specified <see cref="DateTime"/> values and <see cref="DateTime.Kind"/>.
-    /// This is especially important where serialization is required across the likes of time-zones to ensure that the correct values are passed.</remarks>
-    public enum DateTimeTransform
-    {
-        /// <summary>
-        /// Indicates that the <see cref="Cleaner.DefaultDateTimeTransform"/> value should be used.
-        /// </summary>
-        UseDefault,
+    UseDefault,
 
-        /// <summary>
-        /// No transform required; the <see cref="DateTime"/> value will be updated as-is.
-        /// </summary>
-        None,
+    /// <summary>
+    /// No transform required; the <see cref="DateTime"/> value will be left as-is.
+    /// </summary>
+    None,
 
-        /// <summary>
-        /// A <b>DateOnly</b> transform is required; the <see cref="DateTime"/> value will be updated with the <see cref="DateTime.Date"/> only and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Unspecified"/>.
-        /// </summary>
-        DateOnly,
+    /// <summary>
+    /// A <b>DateOnly</b> transform is required; the <see cref="DateTime"/> value will be updated with the <see cref="DateTime.Date"/> only and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Unspecified"/>.
+    /// </summary>
+    DateOnly,
 
-        /// <summary>
-        /// A <b>DateTime</b> transform is required; the <see cref="DateTime"/> value will be updated as-is and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Local"/>.
-        /// </summary>
-        DateTimeLocal,
+    /// <summary>
+    /// A <b>DateTime</b> transform is required; the <see cref="DateTime"/> value will be updated as-is and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Local"/>.
+    /// </summary>
+    DateTimeLocal,
 
-        /// <summary>
-        /// A <b>DateTime</b> transform is required; the <see cref="DateTime"/> value will be updated as-is and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Utc"/>.
-        /// </summary>
-        DateTimeUtc,
+    /// <summary>
+    /// A <b>DateTime</b> transform is required; the <see cref="DateTime"/> value will be updated as-is and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Utc"/>.
+    /// </summary>
+    DateTimeUtc,
 
-        /// <summary>
-        /// A <b>DateTime</b> transform is required; the <see cref="DateTime"/> value will be updated as-is and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Unspecified"/>.
-        /// </summary>
-        DateTimeUnspecified
-    }
+    /// <summary>
+    /// A <b>DateTime</b> transform is required; the <see cref="DateTime"/> value will be updated as-is and the <see cref="DateTime.Kind"/> will be set to <see cref="DateTimeKind.Unspecified"/>.
+    /// </summary>
+    DateTimeUnspecified
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ETag.cs b/src/CoreEx/Entities/ETag.cs
new file mode 100644
index 00000000..e609e958
--- /dev/null
+++ b/src/CoreEx/Entities/ETag.cs
@@ -0,0 +1,198 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Provides the <see cref="IReadOnlyETag.ETag"/> capabilities.
+/// </summary>
+public static class ETag
+{
+    /// <summary>
+    /// Compares two <see cref="IReadOnlyETag.ETag"/> values.
+    /// </summary>
+    /// <param name="etagA">The first entity tag.</param>
+    /// <param name="etagB">The second entity tag.</param>
+    /// <returns><c>true</c> where the <see cref="IReadOnlyETag.ETag"/> values match; otherwise, <c>false</c>.</returns>
+    public static bool TryCompare(IReadOnlyETag? etagA, IReadOnlyETag? etagB) => TryCompare(etagA?.ETag, etagB?.ETag);
+
+    /// <summary>
+    /// Compares two ETag <see cref="string"/> values.
+    /// </summary>
+    /// <param name="etagA">The first entity tag.</param>
+    /// <param name="etagB">The second entity tag.</param>
+    /// <returns><c>true</c> where the <see cref="IReadOnlyETag.ETag"/> values match; otherwise, <c>false</c>.</returns>
+    public static bool TryCompare(string? etagA, string? etagB) => etagA == etagB;
+
+    /// <summary>
+    /// Compares two <see cref="IReadOnlyETag.ETag"/> values and throws a <see cref="ConcurrencyException"/> where they do not match.
+    /// </summary>
+    /// <param name="etagA">The first entity tag.</param>
+    /// <param name="etagB">The second entity tag.</param>
+    /// <param name="message">The <see cref="Exception.Message"/> override.</param>
+    /// <param name="adjuster">The <see cref="ConcurrencyException"/> adjuster.</param>
+    public static void Compare(IReadOnlyETag? etagA, IReadOnlyETag? etagB, LText? message = null, Action<ConcurrencyException>? adjuster = null) => Compare(etagA?.ETag, etagB?.ETag, message, adjuster);
+
+    /// <summary>
+    /// Compares two ETag <see cref="string"/> values and throws a <see cref="ConcurrencyException"/> where they do not match.
+    /// </summary>
+    /// <param name="etagA">The first entity tag.</param>
+    /// <param name="etagB">The second entity tag.</param>
+    /// <param name="message">The <see cref="Exception.Message"/> override.</param>
+    /// <param name="adjuster">The <see cref="ConcurrencyException"/> adjuster.</param>
+    public static void Compare(string? etagA, string? etagB, LText? message = null, Action<ConcurrencyException>? adjuster = null)
+    {
+        if (TryCompare(etagA, etagB))
+            return;
+
+        var cex = new ConcurrencyException(message);
+        adjuster?.Invoke(cex);
+        throw cex;
+    }
+
+    /// <summary>
+    /// Compares two <see cref="IReadOnlyETag.ETag"/> values and returns a <see cref="Result.ConcurrencyError"/> where they do not match.
+    /// </summary>
+    /// <param name="etagA">The first entity tag.</param>
+    /// <param name="etagB">The second entity tag.</param>
+    /// <param name="message">The <see cref="Exception.Message"/> override.</param>
+    /// <param name="adjuster">The <see cref="ConcurrencyException"/> adjuster.</param>
+    /// <returns><see cref="Result.Success"/> where the <see cref="IReadOnlyETag.ETag"/> values match; otherwise, <see cref="Result.ConcurrencyError"/>.</returns>
+    public static Result CompareWithResult(IReadOnlyETag? etagA, IReadOnlyETag? etagB, LText? message = null, Action<ConcurrencyException>? adjuster = null) => CompareWithResult(etagA?.ETag, etagB?.ETag, message, adjuster);
+
+    /// <summary>
+    /// Compares two ETag <see cref="string"/> values and returns a <see cref="Result.ConcurrencyError"/> where they do not match.
+    /// </summary>
+    /// <param name="etagA">The first entity tag.</param>
+    /// <param name="etagB">The second entity tag.</param>
+    /// <param name="message">The <see cref="Exception.Message"/> override.</param>
+    /// <param name="adjuster">The <see cref="ConcurrencyException"/> adjuster.</param>
+    /// <returns><see cref="Result.Success"/> where the <see cref="IReadOnlyETag.ETag"/> values match; otherwise, <see cref="Result.ConcurrencyError"/>.</returns>
+    public static Result CompareWithResult(string? etagA, string? etagB, LText? message = null, Action<ConcurrencyException>? adjuster = null)
+    {
+        if (TryCompare(etagA, etagB))
+            return Result.Success;
+
+        var cex = new ConcurrencyException(message);
+        adjuster?.Invoke(cex);
+        return cex;
+    }
+
+    /// <summary>
+    /// Formats a <paramref name="value"/> as an <see cref="IReadOnlyETag.ETag"/> by bookending with the requisite double quotes character; for example '<c>abc</c>' would be formatted as '<c>"abc"</c>'.
+    /// </summary>
+    /// <param name="value">The value to format.</param>
+    /// <returns>The formatted <see cref="IReadOnlyETag.ETag"/>.</returns>
+    [return: NotNullIfNotNull(nameof(value))]
+    public static string? FormatETag(string? value)
+    {
+        if (value is null)
+            return value;
+
+        if (value.StartsWith('\"') && value.EndsWith('\"'))
+            return value;
+
+        if (value.StartsWith("W/\"") && value.EndsWith('\"'))
+            return value[2..];
+
+        return $"\"{value}\"";
+    }
+
+    /// <summary>
+    /// Parses an <see cref="IReadOnlyETag.ETag"/> by removing any weak prefix ('<c>W/</c>') double quotes character bookends; for example '<c>"abc"</c>' would be formatted as '<c>abc</c>'.
+    /// </summary>
+    /// <param name="etag">The <see cref="IReadOnlyETag.ETag"/> to unformat.</param>
+    /// <returns>The unformatted value.</returns>
+    [return: NotNullIfNotNull(nameof(etag))]
+    public static string? ParseETag(string? etag) => string.IsNullOrEmpty(etag) ? etag : ParseETag(etag.AsSpan());
+
+    /// <summary>
+    /// Parses an <see cref="ReadOnlySpan{T}"/> by removing any weak prefix ('<c>W/</c>') double quotes character bookends; for example '<c>"abc"</c>' would be formatted as '<c>abc</c>'.
+    /// </summary>
+    /// <param name="etag">The <see cref="IReadOnlyETag.ETag"/> to unformat.</param>
+    /// <returns>The unformatted value.</returns>
+    [return: NotNullIfNotNull(nameof(etag))]
+    public static string ParseETag(ReadOnlySpan<char> etag)
+    {
+        if (etag.IsEmpty)
+            return etag.ToString();
+
+        if (etag[0] == '\"' && etag[^1] == '\"')
+            return etag[1..^1].ToString();
+
+        if (etag.StartsWith("W/\"") && etag[^1] == '\"')
+            return etag[2..^1].ToString();
+
+        return etag.ToString();
+    }
+
+    /// <summary>
+    /// Generates an ETag for a <paramref name="value"/> by serializing to JSON and using an <see cref="SHA256"/> hash.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="parts">Additional parts to include in the hash.</param>
+    /// <returns>The generated ETag.</returns>
+    [return: NotNullIfNotNull(nameof(value))]
+    public static string? Generate<T>(T? value, JsonSerializerOptions? jsonSerializerOptions = null, params IEnumerable<string> parts)
+    {
+        if (value is null)
+            return null;
+
+        // Serialize to JSON and then hash.
+        var bytes = JsonSerializer.SerializeToUtf8Bytes(value, jsonSerializerOptions ?? JsonDefaults.SerializerOptions);
+        byte[] hash;
+
+        if (!parts.Any())
+            hash = SHA256.HashData(bytes);
+        else
+        {
+            using var ih = IncrementalHash.CreateHash(HashAlgorithmName.SHA256);
+            ih.AppendData(bytes);
+            foreach (var part in parts)
+            {
+                ih.AppendData(new BinaryData(part));
+            }
+
+            hash = ih.GetCurrentHash();
+        }
+
+        return ConvertHash(hash);
+    }
+
+    /// <summary>
+    /// Generates an ETag of the <paramref name="parts"/> using an <see cref="SHA256"/> hash.
+    /// </summary>
+    /// <param name="parts">The parts to hash.</param>
+    /// <returns>The generated ETag.</returns>
+    public static string? Generate(params string[] parts)
+    {
+        if (parts is null || parts.Length == 0)
+            return null;
+
+        byte[] hash;
+
+        if (parts.Length == 1)
+            hash = SHA256.HashData(new BinaryData(parts[0]));
+        else
+        {
+            using var ih = IncrementalHash.CreateHash(HashAlgorithmName.SHA256);
+            foreach (var part in parts)
+            {
+                ih.AppendData(new BinaryData(part));
+            }
+
+            hash = ih.GetCurrentHash();
+        }
+
+        return ConvertHash(hash);
+    }
+
+    /// <summary>
+    /// Converts the hash into a twelve (12) character string.
+    /// </summary>
+    private static string ConvertHash(byte[] hash)
+    {
+        // A hash function produces a fixed-size output — for SHA-256 that’s 256 bits (32 bytes). For an ETag we do not need the whole 256 bits. Hash functions like SHA-256 distribute entropy evenly across all bytes.
+        // There is no “hot” region — any subset of bytes is just as random and unique-looking as any other. Therefore, grabbing the first 6 bytes is a perfectly valid way to shorten it.
+        return Convert.ToHexString(hash, 0, 6).ToLowerInvariant();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/EntitiesExtensions.FeatureSupport.cs b/src/CoreEx/Entities/EntitiesExtensions.FeatureSupport.cs
new file mode 100644
index 00000000..af5c6247
--- /dev/null
+++ b/src/CoreEx/Entities/EntitiesExtensions.FeatureSupport.cs
@@ -0,0 +1,46 @@
+namespace CoreEx.Entities;
+
+public static partial class EntitiesExtensions
+{
+    extension(FeatureSupport support)
+    {
+        /// <summary>
+        /// Indicates whether the <paramref name="support"/> is <see cref="FeatureSupport.NotSupported"/>.
+        /// </summary>
+        public bool IsNone => support == FeatureSupport.NotSupported;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="support"/> is <see cref="FeatureSupport.ReadOnly"/>.
+        /// </summary>
+        public bool IsReadOnly => support == FeatureSupport.ReadOnly;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="support"/> is <see cref="FeatureSupport.Mutable"/>.
+        /// </summary>
+        public bool IsMutable => support == FeatureSupport.Mutable;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="support"/> is supported (not <see cref="FeatureSupport.NotSupported"/>).
+        /// </summary>
+        public bool IsSupported => support != FeatureSupport.NotSupported;
+
+        /// <summary>
+        /// Determines whether the <typeparamref name="T"/> has the specified feature; being <see cref="FeatureSupport.NotSupported"/>, <see cref="FeatureSupport.ReadOnly"/> or <see cref="FeatureSupport.Mutable"/>.
+        /// </summary>
+        /// <typeparam name="T">The <see cref="Type"/> to determine the feature support for.</typeparam>
+        /// <typeparam name="TMutable">The mutable <see cref="Type"/> (is assignable from) feature.</typeparam>
+        /// <typeparam name="TReadonly">The read-only <see cref="Type"/> (is assignable from) feature.</typeparam>
+        /// <returns>The <see cref="FeatureSupport"/>.</returns>
+        /// <remarks>Where <typeparamref name="T"/> implements <typeparamref name="TMutable"/> then returns <see cref="FeatureSupport.Mutable"/>; otherwise, where <typeparamref name="T"/> implements 
+        /// <typeparamref name="TReadonly"/> then returns <see cref="FeatureSupport.ReadOnly"/>, finally returning <see cref="FeatureSupport.NotSupported"/></remarks>
+        public static FeatureSupport Determine<T, TMutable, TReadonly>()
+        {
+            if (typeof(TMutable).IsAssignableFrom(typeof(T)))
+                return FeatureSupport.Mutable;
+            else if (typeof(TReadonly).IsAssignableFrom(typeof(T)))
+                return FeatureSupport.ReadOnly;
+            else
+                return FeatureSupport.NotSupported;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/EntitiesExtensions.IEnumerable.cs b/src/CoreEx/Entities/EntitiesExtensions.IEnumerable.cs
new file mode 100644
index 00000000..6de5f34b
--- /dev/null
+++ b/src/CoreEx/Entities/EntitiesExtensions.IEnumerable.cs
@@ -0,0 +1,123 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Provides entity-oriented extension methods.
+/// </summary>
+public static partial class EntitiesExtensions
+{
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence of values based on a <paramref name="predicate"/> only <paramref name="when"/> <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="when">Indicates to perform an underlying <see cref="System.Linq.Enumerable.Where{TSource}(IEnumerable{TSource}, Func{TSource, bool})"/> <i>only</i> when <see langword="true"/>; otherwise, no <i>Where</i> is invoked.</param>
+    /// <param name="predicate">A function to test each element for a condition.</param>
+    /// <returns>An <see cref="IEnumerable{T}"/> that contains elements from the input sequence that satisfy the condition.</returns>
+    public static IEnumerable<TSource> WhereWhen<TSource>(this IEnumerable<TSource> source, bool when, Func<TSource, bool> predicate) => when ? source.Where(predicate) : source;
+
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence based on a <paramref name="predicate"/> only when the <paramref name="with"/> is not the default value for the <typeparamref name="TWith"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TWith">The with value <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="with">Indicates to perform an underlying <see cref="Queryable.Where{TSource}(IQueryable{TSource}, System.Linq.Expressions.Expression{Func{TSource, bool}})"/> only when the with is not the default value; otherwise, no <b>Where</b> is invoked.</param>
+    /// <param name="predicate">A function to test each element for a condition.</param>
+    /// <returns>An <see cref="IEnumerable{T}"/> that contains elements from the input sequence that satisfy the condition.</returns>
+    /// <remarks>Where the <paramref name="with"/> is an <see cref="IEnumerable"/> it will also ensure there is at least a single item.</remarks>
+    public static IEnumerable<TSource> WhereWith<TSource, TWith>(this IEnumerable<TSource> source, TWith with, Func<TSource, bool> predicate)
+    {
+        if (Comparer<TWith>.Default.Compare(with, default!) != 0)
+        {
+            if (with is not string && with is IEnumerable ie && !ie.GetEnumerator().MoveNext())
+                return source;
+
+            return source.Where(predicate);
+        }
+
+        return source;
+    }
+
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence using the specified <paramref name="selector"/> and <paramref name="pattern"/> containing supported wildcards.
+    /// </summary>
+    /// <typeparam name="TSource">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="selector">The function to select the element value to <paramref name="pattern"/> match.</param>
+    /// <param name="pattern">The pattern to <paramref name="wildcard"/> match the result of each element <paramref name="selector"/>.</param>
+    /// <param name="ignoreCase">Indicates whether the comparison should ignore case (default) or not.</param>
+    /// <param name="checkForNull">Indicates whether a <see langword="null"/> check should also be performed before the comparion occurs (defaults to <see langword="true"/>).</param>
+    /// <param name="wildcard">The <see cref="Wildcard"/> configuration to use; where <see langword="null"/> it will use <see cref="Wildcard.Default"/>.</param>
+    /// <returns>An <see cref="IEnumerable{T}"/> that contains the elements from the <paramref name="source"/> sequence after applying the wildcard <paramref name="pattern"/>.</returns>
+    public static IEnumerable<TSource> WhereWildcard<TSource>(this IEnumerable<TSource> source, Func<TSource, string?> selector, string? pattern, bool ignoreCase = true, bool checkForNull = true, Wildcard? wildcard = null) where TSource : class
+    {
+        selector.ThrowIfNull();
+
+        var wc = wildcard ?? Wildcard.Default ?? Wildcard.MultiBasic;
+        var wr = wc.Parse(pattern).ThrowOnError();
+
+        // Exit stage left where nothing to do.
+        if (wr.Selection.HasFlag(WildcardSelection.None))
+            return source;
+
+        // Handle the Equal.
+        var sc = ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture;
+        if (wr.Selection.HasFlag(WildcardSelection.Equal))
+            return source.Where(x =>
+            {
+                var v = selector(x);
+                return checkForNull ? v is not null && v.Equals(pattern, sc) : v!.Equals(pattern, sc);
+            });
+
+        // Handle the easy Contains/StartsWith/Endswith.
+        if (!wr.Selection.HasFlag(WildcardSelection.SingleWildcard) && !wr.Selection.HasFlag(WildcardSelection.Embedded))
+        {
+            if (wr.Selection.HasFlag(WildcardSelection.Single))
+                return source;
+
+            if (wr.Selection.HasFlag(WildcardSelection.Contains))
+                return source.Where(x =>
+                {
+                    var v = selector(x);
+                    return checkForNull ? v is not null && v.Contains(wr.GetTextWithoutWildcards()!, sc) : v!.Contains(wr.GetTextWithoutWildcards()!, sc);
+                });
+            else if (wr.Selection.HasFlag(WildcardSelection.StartsWith))
+                return source.Where(x =>
+                {
+                    var v = selector(x);
+                    return checkForNull ? v is not null && v.StartsWith(wr.GetTextWithoutWildcards()!, sc) : v!.StartsWith(wr.GetTextWithoutWildcards()!, sc);
+                });
+            else if (wr.Selection.HasFlag(WildcardSelection.EndsWith))
+                return source.Where(x =>
+                {
+                    var v = selector(x);
+                    return checkForNull ? v is not null && v.EndsWith(wr.GetTextWithoutWildcards()!, sc) : v!.EndsWith(wr.GetTextWithoutWildcards()!, sc);
+                });
+        }
+
+        // Handle the remainder using a regex.
+        var regex = wr.CreateRegex(ignoreCase);
+        return source.Where(x =>
+        {
+            var v = selector(x);
+            return v is not null && regex.IsMatch(v);
+        });
+    }
+
+    /// <summary>
+    /// Filters a <paramref name="source"/> sequence according to the specified <paramref name="paging"/> or <see cref="PagingArgs.Create"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="source"/> element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The sequence of elements.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <returns>An <see cref="IEnumerable{T}"/> that contains the elements from the <paramref name="source"/> sequence after applying the <paramref name="paging"/>.</returns>
+    /// <remarks>The <paramref name="paging"/> where <see langword="null"/> will default to <see cref="PagingArgs.Create"/>.</remarks>
+    public static IEnumerable<T> WithPaging<T>(this IEnumerable<T> source, PagingArgs? paging = null)
+    {
+        if (paging?.IsNone ?? false)
+            return source;
+
+        paging ??= PagingArgs.Create();
+        return source.Skip(paging.Skip).Take(paging.Take);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/EntityKeyCollection.cs b/src/CoreEx/Entities/EntityKeyCollection.cs
deleted file mode 100644
index 509bdbb7..00000000
--- a/src/CoreEx/Entities/EntityKeyCollection.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections.Generic;
-using System.Linq;
-using System;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents an <see cref="ICompositeKeyCollection"/> with <see cref="IEntityKey"/>-based items.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="IEntityKey"/> item <see cref="System.Type"/>.</typeparam>
-    /// <remarks>This class is underpinned by a <see cref="List{T}"/> and does <i>not</i> manage/guarantee uniqueness.</remarks>
-    public class EntityKeyCollection<T> : List<T>, ICompositeKeyCollection<T> where T : IEntityKey
-    {
-        /// <inheritdoc/>
-        public bool ContainsKey(CompositeKey key) => this.Any(x => key.Equals(x.EntityKey));
-
-        /// <summary>
-        /// Indicates whether an item with the specified <paramref name="keys"/> exists.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns><c>true</c> where the item exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsKey(params object?[] keys) => ContainsKey(new CompositeKey(keys));
-
-        /// <inheritdoc/>
-        public T? GetByKey(CompositeKey key) => this.Where(x => key.Equals(x.EntityKey)).FirstOrDefault();
-
-        /// <summary>
-        /// Gets the first item with the specified <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The item where found; otherwise, <c>null</c>.</returns>
-        public T? GetByKey(params object?[] keys) => GetByKey(new CompositeKey(keys));
-
-        /// <inheritdoc/>
-        public bool IsAnyDuplicates() => Count != Math.Min(1, this.Count(x => x == null)) + this.Where(x => x != null).Select(x => x.EntityKey).Distinct(CompositeKeyComparer.Default).Count();
-
-        /// <inheritdoc/>
-        public void RemoveByKey(CompositeKey key) => this.Where(x => x.EntityKey == key).ToList().ForEach(pk => Remove(pk));
-
-        /// <summary>
-        /// Removes all items with the specified primary <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        public void RemoveByKey(params object?[] keys) => RemoveByKey(new CompositeKey(keys));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/ChangeLogEx.cs b/src/CoreEx/Entities/Extended/ChangeLogEx.cs
deleted file mode 100644
index 1ba6cfc9..00000000
--- a/src/CoreEx/Entities/Extended/ChangeLogEx.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents an extended <see cref="EntityBase"/> <see cref="IChangeLogAudit"/>.
-    /// </summary>
-    public class ChangeLogEx : EntityBase, IChangeLogAudit
-    {
-        private DateTime? _createdDate;
-        private string? _createdBy;
-        private DateTime? _updatedDate;
-        private string? _updatedBy;
-
-        /// <summary>
-        /// Gets or sets the created <see cref="DateTime"/>.
-        /// </summary>
-        public DateTime? CreatedDate { get => _createdDate; set => SetValue(ref _createdDate, value); }
-
-        /// <summary>
-        /// Gets or sets the created by (username).
-        /// </summary>
-        public string? CreatedBy { get => _createdBy; set => SetValue(ref _createdBy, value); }
-
-        /// <summary>
-        /// Gets or sets the updated <see cref="DateTime"/>.
-        /// </summary>
-        public DateTime? UpdatedDate { get => _updatedDate; set => SetValue(ref _updatedDate, value); }
-
-        /// <summary>
-        /// Gets or sets the updated by (username).
-        /// </summary>
-        public string? UpdatedBy { get => _updatedBy; set => SetValue(ref _updatedBy, value); }
-
-        /// <inheritdoc/>
-        protected override IEnumerable<IPropertyValue> GetPropertyValues()
-        {
-            yield return CreateProperty(nameof(CreatedDate), CreatedDate, v => CreatedDate = v);
-            yield return CreateProperty(nameof(CreatedBy), CreatedBy, v => CreatedBy = v);
-            yield return CreateProperty(nameof(UpdatedDate), UpdatedDate, v => UpdatedDate = v);
-            yield return CreateProperty(nameof(CreatedBy), UpdatedBy, v => UpdatedBy = v);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/CollectionItemChangedEventArgs.cs b/src/CoreEx/Entities/Extended/CollectionItemChangedEventArgs.cs
deleted file mode 100644
index 7974350b..00000000
--- a/src/CoreEx/Entities/Extended/CollectionItemChangedEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.ComponentModel;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Provides data for the <see cref="INotifyCollectionItemChanged.CollectionItemChanged"/> when an <i>item</i> within an collection is changed.
-    /// </summary>
-    /// <param name="item">The item that had the property change.</param>
-    /// <param name="propertyName">The name of the property that changed.</param>
-    public class CollectionItemChangedEventArgs(object? item, string? propertyName) : PropertyChangedEventArgs(propertyName)
-    {
-        /// <summary>
-        /// Gets the item that had the property change.
-        /// </summary>
-        public object? Item { get; } = item;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/CollectionItemChangedEventHandler.cs b/src/CoreEx/Entities/Extended/CollectionItemChangedEventHandler.cs
deleted file mode 100644
index 376bd6d0..00000000
--- a/src/CoreEx/Entities/Extended/CollectionItemChangedEventHandler.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents the method that will handle the <see cref="INotifyCollectionItemChanged.CollectionItemChanged"/> event raised when a property is changed on a collection item.
-    /// </summary>
-    /// <param name="sender">The source of the event.</param>
-    /// <param name="e">The <see cref="CollectionItemChangedEventArgs"/>.</param>
-    public delegate void CollectionItemChangedEventHandler(object sender, CollectionItemChangedEventArgs e);
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityBase.cs b/src/CoreEx/Entities/Extended/EntityBase.cs
deleted file mode 100644
index 4dd7cd8a..00000000
--- a/src/CoreEx/Entities/Extended/EntityBase.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Provides the base capabilities for an entended entity.
-    /// </summary>
-    /// <remarks>Inherits from <see cref="EntityCore"/> and implements <see cref="ICleanUp"/>, <see cref="IInitial"/> and <see cref="ICopyFrom"/>. These additional capabilities are internally implemented by using the <see cref="GetPropertyValues"/>
-    /// which must return a <see cref="PropertyValue{T}"/> for each and every updateable property. 
-    /// </remarks>
-    [System.Diagnostics.DebuggerStepThrough]
-    public abstract class EntityBase : EntityCore, ICleanUp, IInitial, ICopyFrom
-    {
-        /// <summary>
-        /// Creates a new <see cref="PropertyValue{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The property <see cref="Type"/>.</typeparam>
-        /// <param name="name">The property name.</param>
-        /// <param name="value">The property value.</param>
-        /// <param name="setValue">The action to set (override) the value with the specified value.</param>
-        /// <param name="defaultValue">The optional default value.</param>
-        /// <returns>The <see cref="PropertyValue{T}"/>.</returns>
-        protected static PropertyValue<T> CreateProperty<T>(string name, T value, Action<T?> setValue, T? defaultValue = default) => new(name,value, setValue, defaultValue);
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public virtual bool IsInitial => !GetPropertyValues().Any(x => !x.IsInitial);
-
-        /// <summary>
-        /// Gets all the property values (<see cref="IPropertyValue"/>) for the entity.
-        /// </summary>
-        /// <returns>An <see cref="IEnumerable{T}"/> for all properties.</returns>
-        /// <remarks>Used to enable additional capabilities such as <see cref="CleanUp"/>, <see cref="IsInitial"/>, <see cref="object.GetHashCode"/>, <see cref="object.Equals(object)"/>, <see cref="CopyFrom(object?)"/>,
-        /// <see cref="OnAcceptChanges"/> and <see cref="OnMakeReadOnly"/>.</remarks>
-        protected abstract IEnumerable<IPropertyValue> GetPropertyValues();
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            var hash = new HashCode();
-            GetPropertyValues().ForEach(pv => hash.Add(pv.GetHashCode()));
-            return hash.ToHashCode();
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object? other)
-        {
-            if (other is not EntityBase otherv)
-                return false;
-            else if (ReferenceEquals(this, other))
-                return true;
-            else if (GetType() != other.GetType())
-                return false;
-
-            var el = GetPropertyValues().GetEnumerator();
-            var er = otherv.GetPropertyValues().GetEnumerator();
-            while (el.MoveNext())
-            {
-                er.MoveNext();
-                if (!el.Current.AreEqual(er.Current))
-                    return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="a"><see cref="ChangeLogEx"/> A.</param>
-        /// <param name="b"><see cref="ChangeLogEx"/> B.</param>
-        /// <returns><c>true</c> indicates equal; otherwise, <c>false</c> for not equal.</returns>
-        public static bool operator ==(EntityBase? a, EntityBase? b) => Equals(a, b);
-
-        /// <summary>
-        /// Compares two values for non-equality.
-        /// </summary>
-        /// <param name="a"><see cref="ChangeLogEx"/> A.</param>
-        /// <param name="b"><see cref="ChangeLogEx"/> B.</param>
-        /// <returns><c>true</c> indicates not equal; otherwise, <c>false</c> for equal.</returns>
-        public static bool operator !=(EntityBase? a, EntityBase? b) => !Equals(a, b);
-
-        /// <summary>
-        /// Performs a deep copy from another object updating this instance.
-        /// </summary>
-        /// <param name="other">The object to copy from.</param>
-        public virtual void CopyFrom(object? other)
-        {
-            if (ReferenceEquals(this, other))
-                return;
-
-            if (other is EntityBase otherv)
-            {
-                var t = GetType();
-                var to = other.GetType();
-                if (t == other.GetType())
-                {
-                    var el = GetPropertyValues().GetEnumerator();
-                    var er = otherv.GetPropertyValues().GetEnumerator();
-                    while (el.MoveNext())
-                    {
-                        er.MoveNext();
-                        el.Current.CopyFrom(er.Current);
-                    }
-
-                    return;
-                }
-
-                if (t.IsAssignableFrom(to) || t.IsSubclassOf(to))
-                {
-                    var el = GetPropertyValues().GetEnumerator();
-                    var er = otherv.GetPropertyValues().GetEnumerator();
-
-                    var opvc = new PropertyValueCollection();
-                    while (er.MoveNext()) { opvc.Add(er.Current); }
-
-                    while (el.MoveNext())
-                    {
-                        if (opvc.TryGetValue(el.Current.Name, out var opv))
-                            el.Current.CopyFrom(opv);
-                    }
-
-                    return;
-                }
-            }
-
-            throw new ArgumentException($"Other value must be the same type or is assignable/subclass from: {GetType().FullName}.", nameof(other));
-        }
-
-        private class PropertyValueCollection : KeyedCollection<string, IPropertyValue>
-        {
-            protected override string GetKeyForItem(IPropertyValue item) => item.Name;
-        }
-
-        /// <inheritdoc/>
-        public virtual void CleanUp() => GetPropertyValues().ForEach(pv => pv.Clean());
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (this is IIdentifier ii)
-                return $"{base.ToString()} Id={ii.Id}";
-            else if (this is IPrimaryKey pk)
-                return $"{base.ToString()} PrimaryKey={pk.PrimaryKey}";
-            else if (this is IEntityKey ek)
-                return $"{base.ToString()} EntityKey={ek.EntityKey}";
-            else
-                return base.ToString()!;
-        }
-
-        /// <inheritdoc/>
-        protected override void OnAcceptChanges()
-        {
-            foreach (var pv in GetPropertyValues())
-            {
-                if (pv.Value is EntityCore ec)
-                    ec.AcceptChanges();
-            }
-        }
-
-        /// <inheritdoc/>
-        protected override void OnMakeReadOnly()
-        {
-            foreach (var pv in GetPropertyValues())
-            {
-                if (pv.Value is EntityCore ec)
-                    ec.MakeReadOnly();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityBaseCollection.cs b/src/CoreEx/Entities/Extended/EntityBaseCollection.cs
deleted file mode 100644
index c796abe2..00000000
--- a/src/CoreEx/Entities/Extended/EntityBaseCollection.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents an <see cref="EntityBase"/> collection class.
-    /// </summary>
-    /// <typeparam name="TEntity">The <see cref="EntityBase"/> <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="EntityBase"/> collection <see cref="Type"/> itself.</typeparam>
-    [System.Diagnostics.DebuggerStepThrough]
-    public abstract class EntityBaseCollection<TEntity, TSelf> : ObservableCollection<TEntity>, INotifyCollectionItemChanged, IEntityBaseCollection
-        where TEntity : EntityBase
-        where TSelf : EntityBaseCollection<TEntity, TSelf>, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityBaseCollection{TEntity, TSelf}" /> class.
-        /// </summary>
-        protected EntityBaseCollection() : base() => OnInitialization();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityBaseCollection{TEntity, TSelf}" /> class.
-        /// </summary>
-        /// <param name="collection">The collection to add.</param>
-        protected EntityBaseCollection(IEnumerable<TEntity> collection) : base(collection) => OnInitialization();
-
-        /// <summary>
-        /// Provides an opportunity to extend initialization when the object is constructed.
-        /// </summary>
-        /// <remarks>Added to support scenarios whether the class is defined using the likes of partial classes to provide a means to easily add functionality during the constructor process.</remarks>
-        protected virtual void OnInitialization() { }
-
-        /// <summary>
-        /// Adds the items of the specified collection to the end of the <see cref="EntityBaseCollection{TEntity, TSelf}"/>.
-        /// </summary>
-        /// <param name="collection">The collection containing the items to add.</param>
-        public void AddRange(IEnumerable<TEntity> collection)
-        {
-            if (collection == null)
-                return;
-
-            foreach (TEntity item in collection)
-            {
-                Add(item);
-            }
-        }
-
-        /// <summary>
-        /// Gets a <see cref="IEnumerable{TEntity}"/> wrapper around the <see cref="EntityBaseCollection{TEntity, TSelf}"/>.
-        /// </summary>
-        /// <remarks>This is provided to enable the likes of <b>LINQ</b> based queries over the collection.</remarks>
-        public new IEnumerable<TEntity> Items => base.Items;
-
-        /// <summary>
-        /// Creates a deep copy of the entity collection (all items will also be cloned).
-        /// </summary>
-        /// <returns>A deep copy of the entity collection.</returns>
-        public object Clone()
-        {
-            var clone = new TSelf();
-            this.ForEach(item => clone.Add(item.ForceClone()));
-            return clone;
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object? other)
-        {
-            if (other is not TSelf otherv)
-                return false;
-            else if (ReferenceEquals(this, other))
-                return true;
-            else if (other == null)
-                return false;
-            else if (Count != otherv.Count)
-                return false;
-
-            for (int i = 0; i < Count; i++)
-            {
-                if (!this[i].Equals(otherv[i]))
-                    return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="a"><see cref="EntityBaseCollection{TEntity, TSelf}"/> A.</param>
-        /// <param name="b"><see cref="EntityBaseCollection{TEntity, TSelf}"/> B.</param>
-        /// <returns><c>true</c> indicates equal; otherwise, <c>false</c> for not equal.</returns>
-        public static bool operator ==(EntityBaseCollection<TEntity, TSelf>? a, EntityBaseCollection<TEntity, TSelf>? b) => Equals(a, b);
-
-        /// <summary>
-        /// Compares two values for non-equality.
-        /// </summary>
-        /// <param name="a"><see cref="EntityBaseCollection{TEntity, TSelf}"/> A.</param>
-        /// <param name="b"><see cref="EntityBaseCollection{TEntity, TSelf}"/> B.</param>
-        /// <returns><c>true</c> indicates not equal; otherwise, <c>false</c> for equal.</returns>
-        public static bool operator !=(EntityBaseCollection<TEntity, TSelf>? a, EntityBaseCollection<TEntity, TSelf>? b) => !Equals(a, b);
-
-        /// <summary>
-        /// Returns a hash code for the <see cref="EntityBaseCollection{TEntity, TSelf}"/>.
-        /// </summary>
-        /// <returns>A hash code for the <see cref="EntityBaseCollection{TEntity, TSelf}"/>.</returns>
-        public override int GetHashCode()
-        {
-            var hash = new HashCode();
-            foreach (var item in this)
-            {
-                hash.Add(item.GetHashCode());
-            }
-
-            return hash.ToHashCode();
-        }
-
-        /// <summary>
-        /// Performs a clean-up of the <see cref="EntityBaseCollection{TEntity, TSelf}"/> resetting item values as appropriate to ensure a basic level of data consistency.
-        /// </summary>
-        public void CleanUp() => this.ForEach(item => item.CleanUp());
-
-        /// <summary>
-        /// Collections do not support an initial state; will always be <c>false</c>.
-        /// </summary>
-        /// <remarks>The collection reference should be set to <c>null</c> to achieve <see cref="IInitial.IsInitial"/>.</remarks>
-        bool IInitial.IsInitial => false;
-
-        /// <summary>
-        /// Overrides the <see cref="ObservableCollection{T}.OnCollectionChanged"/> method.
-        /// </summary>
-        /// <param name="e">The <see cref="System.Collections.Specialized.NotifyCollectionChangedEventArgs"/>.</param>
-        /// <remarks>Sets <see cref="IsChanged"/> to <c>true</c>.</remarks>
-        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
-        {
-            if (IsReadOnly)
-                throw new InvalidOperationException("Collection is read only; item(s) cannot be added, updated or deleted.");
-
-            base.OnCollectionChanged(e);
-
-            if (e?.OldItems != null)
-            {
-                foreach (var item in e.OldItems)
-                {
-                    var ei = (EntityBase)item;
-                    if (ei != null)
-                        ei.PropertyChanged -= Item_PropertyChanged;
-                }
-            }
-
-            if (e?.NewItems != null)
-            {
-                foreach (var item in e.NewItems)
-                {
-                    var ei = (EntityBase)item;
-                    if (ei != null)
-                        ei.PropertyChanged += Item_PropertyChanged;
-                }
-            }
-
-            IsChanged = true;
-        }
-
-        /// <summary>
-        /// Handles the item change and propogates.
-        /// </summary>
-        private void Item_PropertyChanged(object? sender, PropertyChangedEventArgs e)
-        {
-            IsChanged = true;
-            OnItemChanged(new CollectionItemChangedEventArgs(sender, e.PropertyName));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="CollectionItemChanged"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="CollectionItemChangedEventArgs"/>.</param>
-        protected void OnItemChanged(CollectionItemChangedEventArgs e) => CollectionItemChanged?.Invoke(this, e);
-
-        /// <inheritdoc/>
-        public event CollectionItemChangedEventHandler? CollectionItemChanged;
-
-        /// <summary>
-        /// Resets the entity state to unchanged by accepting the changes.
-        /// </summary>
-        /// <remarks>This will trigger an <see cref="EntityCore.AcceptChanges"/> for each item.</remarks>
-        public virtual void AcceptChanges()
-        {
-            this.ForEach(item => item.AcceptChanges());
-            IsChanged = false;
-        }
-
-        /// <summary>
-        /// Indicates whether the collection has changed.
-        /// </summary>
-        public bool IsChanged { get; private set; }
-
-        /// <inheritdoc/>
-        public bool IsReadOnly { get; private set; }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <remarks>This will trigger a <see cref="EntityCore.MakeReadOnly"/> for each item.</remarks>
-        public void MakeReadOnly()
-        {
-            this.ForEach(item => item.MakeReadOnly());
-            IsChanged = false;
-            IsReadOnly = true;
-        }
-
-        /// <inheritdoc/>
-        protected override void ClearItems()
-        {
-            CheckReadOnly(() =>
-            {
-                CheckReentrancy();
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, this));
-                base.ClearItems();
-            });
-        }
-
-        /// <inheritdoc/>
-        protected override void InsertItem(int index, TEntity item) => CheckReadOnly(() => base.InsertItem(index, item));
-
-        /// <inheritdoc/>
-        protected override void MoveItem(int oldIndex, int newIndex) => CheckReadOnly(() => base.MoveItem(oldIndex, newIndex));
-
-        /// <inheritdoc/>
-        protected override void RemoveItem(int index) => CheckReadOnly(() => base.RemoveItem(index));
-
-        /// <inheritdoc/>
-        protected override void SetItem(int index, TEntity item) => CheckReadOnly(() => base.SetItem(index, item));
-
-        /// <summary>
-        /// Checks if readonly and throws; otherwise, executes action.
-        /// </summary>
-        private void CheckReadOnly(Action action)
-        {
-            if (IsReadOnly)
-                throw new InvalidOperationException("Collection is read only; item(s) cannot be added, updated or deleted.");
-            else
-                action();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityBaseDictionary.cs b/src/CoreEx/Entities/Extended/EntityBaseDictionary.cs
deleted file mode 100644
index 738dbc54..00000000
--- a/src/CoreEx/Entities/Extended/EntityBaseDictionary.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents an <see cref="EntityBase"/> dictionary class with a key of Type <see cref="string"/>.
-    /// </summary>
-    /// <typeparam name="TEntity">The <see cref="EntityBase"/> <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="EntityBase"/> dictionary <see cref="Type"/> itself.</typeparam>
-    /// <remarks>The key is constrained to be of Type <see cref="string"/> as this is a constraint related to JSON serialization.</remarks>
-    public class EntityBaseDictionary<TEntity, TSelf> : ObservableDictionary<string, TEntity>, INotifyPropertyChanged, INotifyCollectionItemChanged, IEntityBaseCollection
-        where TEntity : EntityBase, new()
-        where TSelf : EntityBaseDictionary<TEntity, TSelf>, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityBaseDictionary{TEntity, TSelf}" /> class using the <see cref="StringComparer.OrdinalIgnoreCase"/> for the comparer.
-        /// </summary>
-        protected EntityBaseDictionary() : base(StringComparer.OrdinalIgnoreCase) => OnInitialization();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityBaseDictionary{TEntity, TSelf}" /> class using the <see cref="StringComparer.OrdinalIgnoreCase"/> for the comparer adding the passed <paramref name="items"/>.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        protected EntityBaseDictionary(IEnumerable<KeyValuePair<string, TEntity>> items) : base(items, StringComparer.OrdinalIgnoreCase) => OnInitialization();
-
-        /// <summary>
-        /// Provides an opportunity to extend initialization when the object is constructed.
-        /// </summary>
-        /// <remarks>Added to support scenarios whether the class is defined using the likes of partial classes to provide a means to easily add functionality during the constructor process.</remarks>
-        protected virtual void OnInitialization() { }
-
-        /// <summary>
-        /// Gets or sets the automatic key selector from the item where the key is not explicitly specified.
-        /// </summary>
-        /// <remarks>Default is to use the <see cref="IEntityKey.EntityKey"/> where implemented and results in a non-null <see cref="string"/>; otherwise, an <see cref="InvalidOperationException"/></remarks>
-        protected Func<TEntity, string> ItemKeySelector { get; set; } = item => (item is IEntityKey ek ? ek.EntityKey.ToString() : null) ?? throw new InvalidOperationException($"The item must implement {nameof(IEntityKey)} to automatically infer the key which also must not be null.");
-
-        /// <summary>
-        /// Adds a range of <paramref name="items"/> to the dictionary inferring the key from each item using the <see cref="ItemKeySelector"/>.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        public void AddRange(IEnumerable<TEntity> items) => items.ForEach(Add);
-
-        /// <summary>
-        /// Adds an item to the dictionary inferring the key from the <paramref name="item"/> itself using the <see cref="ItemKeySelector"/>.
-        /// </summary>
-        /// <param name="item">The item to add.</param>
-        public void Add(TEntity item) => Add(ItemKeySelector(item), item);
-
-        /// <summary>
-        /// Creates a deep copy of the entity dictionary (all items will also be cloned).
-        /// </summary>
-        /// <returns>A deep copy of the entity dictionary.</returns>
-        public object Clone()
-        {
-            var clone = new TSelf();
-            this.ForEach(item => clone.Add(item.Key, item.Value == null ? default! : item.Value.Clone()));
-            return clone;
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object? other)
-        {
-            if (other is not TSelf otherv)
-                return false;
-            else if (ReferenceEquals(this, other))
-                return true;
-            else if (other == null)
-                return false;
-            else if (Count != otherv.Count)
-                return false;
-
-            foreach (var item in this)
-            {
-                if (!otherv.TryGetValue(item.Key, out var value))
-                    return false;
-
-                if (!item.Value.Equals(value))
-                    return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="a"><see cref="EntityBaseDictionary{TEntity, TSelf}"/> A.</param>
-        /// <param name="b"><see cref="EntityBaseDictionary{TEntity, TSelf}"/> B.</param>
-        /// <returns><c>true</c> indicates equal; otherwise, <c>false</c> for not equal.</returns>
-        public static bool operator ==(EntityBaseDictionary<TEntity, TSelf>? a, EntityBaseDictionary<TEntity, TSelf>? b) => Equals(a, b);
-
-        /// <summary>
-        /// Compares two values for non-equality.
-        /// </summary>
-        /// <param name="a"><see cref="ChangeLogEx"/> A.</param>
-        /// <param name="b"><see cref="ChangeLogEx"/> B.</param>
-        /// <returns><c>true</c> indicates not equal; otherwise, <c>false</c> for equal.</returns>
-        public static bool operator !=(EntityBaseDictionary<TEntity, TSelf>? a, EntityBaseDictionary<TEntity, TSelf>? b) => !Equals(a, b);
-
-        /// <summary>
-        /// Returns a hash code for the <see cref="EntityBaseDictionary{TEntity, TSelf}"/>.
-        /// </summary>
-        /// <returns>A hash code for the <see cref="EntityBaseDictionary{TEntity, TSelf}"/>.</returns>
-        public override int GetHashCode()
-        {
-            var hash = new HashCode();
-            foreach (var item in this)
-            {
-                hash.Add(item.Key.GetHashCode());
-                hash.Add(item.Value?.GetHashCode() ?? 0);
-            }
-
-            return hash.ToHashCode();
-        }
-
-        /// <summary>
-        /// Performs a clean-up of the <see cref="EntityBaseCollection{TEntity, TSelf}"/> resetting item values as appropriate to ensure a basic level of data consistency.
-        /// </summary>
-        public void CleanUp() => this.ForEach(item => item.Value?.CleanUp());
-
-        /// <summary>
-        /// Collections do not support an initial state; will always be <c>false</c>.
-        /// </summary>
-        /// <remarks>The collection reference should be set to <c>null</c> to achieve <see cref="IInitial.IsInitial"/>.</remarks>
-        bool IInitial.IsInitial => false;
-
-        /// <summary>
-        /// Overrides the <see cref="ObservableDictionary{TKey, TValue}.OnCollectionChanged"/> method.
-        /// </summary>
-        /// <param name="e">The <see cref="System.Collections.Specialized.NotifyCollectionChangedEventArgs"/>.</param>
-        /// <remarks>Sets <see cref="IsChanged"/> to <c>true</c>.</remarks>
-        protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
-        {
-            if (IsReadOnly)
-                throw new InvalidOperationException("Collection is read only; item(s) cannot be added, updated or deleted.");
-
-            base.OnCollectionChanged(e);
-
-            if (e?.OldItems != null)
-            {
-                foreach (var item in e.OldItems)
-                {
-                    var ci = (KeyValuePair<string, TEntity>)item;
-                    var ei = (EntityBase)ci.Value;
-                    if (ei != null)
-                        ei.PropertyChanged -= Item_PropertyChanged;
-                }
-            }
-
-            if (e?.NewItems != null)
-            {
-                foreach (var item in e.NewItems)
-                {
-                    var ci = (KeyValuePair<string, TEntity>)item;
-                    var ei = (EntityBase)ci.Value;
-                    if (ei != null)
-                        ei.PropertyChanged += Item_PropertyChanged;
-                }
-            }
-
-            IsChanged = true;
-        }
-
-        /// <summary>
-        /// Handles the item change and propogates.
-        /// </summary>
-        private void Item_PropertyChanged(object? sender, PropertyChangedEventArgs e)
-        {
-            IsChanged = true;
-            OnItemChanged(new CollectionItemChangedEventArgs(sender, e.PropertyName));
-        }
-
-        /// <summary>
-        /// Raises the <see cref="CollectionItemChanged"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="CollectionItemChangedEventArgs"/>.</param>
-        protected void OnItemChanged(CollectionItemChangedEventArgs e) => CollectionItemChanged?.Invoke(this, e);
-
-        /// <inheritdoc/>
-        public event CollectionItemChangedEventHandler? CollectionItemChanged;
-
-        /// <summary>
-        /// Resets the entity state to unchanged by accepting the changes.
-        /// </summary>
-        /// <remarks>This will trigger an <see cref="EntityCore.AcceptChanges"/> for each item.</remarks>
-        public virtual void AcceptChanges()
-        {
-            this.ForEach(item => item.Value?.AcceptChanges());
-            IsChanged = false;
-        }
-
-        /// <summary>
-        /// Indicates whether the collection has changed.
-        /// </summary>
-        public bool IsChanged { get; private set; }
-
-        /// <inheritdoc/>
-        public bool IsReadOnly { get; private set; }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <remarks>This will trigger a <see cref="EntityCore.MakeReadOnly"/> for each item.</remarks>
-        public void MakeReadOnly()
-        {
-            this.ForEach(item => item.Value?.MakeReadOnly());
-            IsChanged = false;
-            IsReadOnly = true;
-        }
-
-        /// <inheritdoc/>
-        protected override void ClearItems()
-        {
-            CheckReadOnly(() =>
-            {
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, this));
-                base.ClearItems();
-            });
-        }
-
-        /// <inheritdoc/>
-        protected override void AddItem(KeyValuePair<string, TEntity> item) => CheckReadOnly(() => base.AddItem(item));
-
-        /// <inheritdoc/>
-        protected override void ReplaceItem(KeyValuePair<string, TEntity> oldItem, KeyValuePair<string, TEntity> newItem) => CheckReadOnly(() => base.ReplaceItem(oldItem, newItem));
-
-        /// <inheritdoc/>
-        protected override bool RemoveItem(KeyValuePair<string, TEntity> item) => CheckReadOnly(() => base.RemoveItem(item));
-
-        /// <summary>
-        /// Checks if readonly and throws; otherwise, executes action.
-        /// </summary>
-        private void CheckReadOnly(Action action)
-        {
-            if (IsReadOnly)
-                throw new InvalidOperationException("Collection is read only; item(s) cannot be added, updated or deleted.");
-            else
-                action();
-        }
-
-        /// <summary>
-        /// Checks if readonly and throws; otherwise, executes action.
-        /// </summary>
-        private bool CheckReadOnly(Func<bool> func)
-        {
-            if (IsReadOnly)
-                throw new InvalidOperationException("Collection is read only; item(s) cannot be added, updated or deleted.");
-            else
-                return func();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityCollectionResult.cs b/src/CoreEx/Entities/Extended/EntityCollectionResult.cs
deleted file mode 100644
index 323d338e..00000000
--- a/src/CoreEx/Entities/Extended/EntityCollectionResult.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents an <see cref="EntityBaseCollection{TEntity, TSelf}"/> class with a <see cref="PagingResult"/> and underlying <see cref="Items"/>.
-    /// </summary>
-    /// <typeparam name="TColl">The collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TEntity">The entity item <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The entity <see cref="Type"/> itself.</typeparam>
-    /// <remarks>Generally an <see cref="EntityCollectionResult{TColl, TEntity, TSelf}"/> is not intended for serialized <see cref="HttpResponseMessage"/>; the underlying <see cref="Items"/> is serialized with the <see cref="Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.</remarks>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class EntityCollectionResult<TColl, TEntity, TSelf> : EntityBase, ICollectionResult<TColl, TEntity>, IPagingResult
-        where TColl : EntityBaseCollection<TEntity, TColl>, new()
-        where TEntity : EntityBase, new()
-        where TSelf : EntityCollectionResult<TColl, TEntity, TSelf>, new()
-    {
-        private PagingResult? _paging;
-        private TColl? _collection;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityCollectionResult{TColl, TEntity, TSelf}"/> class.
-        /// </summary>
-        public EntityCollectionResult() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityCollectionResult{TColl, TEntity, TSelf}"/> class.
-        /// </summary>
-        /// <param name="paging">Defaults the <see cref="Paging"/> to the requesting <see cref="PagingArgs"/>.</param>
-        public EntityCollectionResult(PagingArgs? paging)
-        {
-            if (paging != null)
-                _paging = Paging is PagingResult pr ? pr : new PagingResult(paging);
-        }
-
-        /// <summary>
-        /// Gets or sets the underlying collection.
-        /// </summary>
-        public TColl Items { get => _collection ??= new TColl(); set => SetValue(ref _collection, value); }
-
-        /// <summary>
-        /// Gets or sets the <see cref="PagingResult"/>.
-        /// </summary>
-        /// <remarks>Where this value is <c>null</c> it indicates that the paging was unable to be determined.</remarks>
-        public PagingResult? Paging { get => _paging; set => SetValue(ref _paging, value); }
-
-        /// <summary>
-        /// Gets the item <see cref="Type"/>.
-        /// </summary>
-        Type ICollectionResult.ItemType => typeof(TEntity);
-
-        /// <inheritdoc/>
-        protected override IEnumerable<IPropertyValue> GetPropertyValues()
-        {
-            yield return CreateProperty(nameof(Paging), Paging, v => Paging = v);
-            yield return CreateProperty(nameof(Items), Items, v => Items = v!);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityConsts.cs b/src/CoreEx/Entities/Extended/EntityConsts.cs
deleted file mode 100644
index da6a378c..00000000
--- a/src/CoreEx/Entities/Extended/EntityConsts.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Provides constants for the extended entities.
-    /// </summary>
-    public static class EntityConsts
-    {
-        /// <summary>
-        /// Gets or sets the value is immutable message.
-        /// </summary>
-        public static string ValueIsImmutableMessage { get; set; } = "Value is immutable; cannot be changed once already set to a value.";
-
-        /// <summary>
-        /// Gets or sets the entity is read only message.
-        /// </summary>
-        public static string EntityIsReadOnlyMessage { get; set; } = "Entity is read only; property cannot be changed.";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityCore.cs b/src/CoreEx/Entities/Extended/EntityCore.cs
deleted file mode 100644
index e0ed66db..00000000
--- a/src/CoreEx/Entities/Extended/EntityCore.cs
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents the core <b>Entity</b> capabilities including <see cref="INotifyPropertyChanged"/> <see cref="IChangeTracking"/> support.
-    /// </summary>
-    /// <remarks>The <see cref="EntityCore"/> class is not thread-safe; it does however, place a lock around all <b>set</b> operations to minimise concurrency challenges.</remarks>
-    [System.Diagnostics.DebuggerStepThrough]
-    public abstract class EntityCore : INotifyPropertyChanged, IChangeTracking, IReadOnly
-    {
-#if NET9_0_OR_GREATER
-        private readonly System.Threading.Lock _lock = new();
-#else
-        private readonly object _lock = new();
-#endif
-        private Dictionary<string, PropertyChangedEventHandler>? _propertyEventHandlers;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityCore"/> class.
-        /// </summary>
-        protected EntityCore() => OnInitialization();
-
-        /// <summary>
-        /// Provides an opportunity to extend initialization when the object is constructed.
-        /// </summary>
-        /// <remarks>Added to support scenarios whether the class is defined using the likes of partial classes to provide a means to easily add functionality during the constructor process.</remarks>
-        protected virtual void OnInitialization() { }
-
-        /// <summary>
-        /// Occurs when a property value changes.
-        /// </summary>
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        /// <summary>
-        /// Trigger the property(s) changed.
-        /// </summary>
-        private void TriggerPropertyChanged(string propertyName, params string[] propertyNames)
-        {
-            IsChanged = true;
-
-            OnPropertyChanged(propertyName);
-
-            foreach (string name in propertyNames)
-            {
-                if (!string.IsNullOrEmpty(name))
-                    OnPropertyChanged(name);
-            }
-        }
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event (typically overridden with additional logic).
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        protected virtual void OnPropertyChanged(string propertyName) => RaisePropertyChanged(propertyName);
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event only (<see cref="OnPropertyChanged"/>).
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        protected void RaisePropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName.ThrowIfNull(nameof(propertyName))));
-
-        /// <summary>
-        /// Gets a property value (automatically instantiating new where current value is null).
-        /// </summary>
-        /// <typeparam name="T">The property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyValue">The property value to get.</param>
-        static protected T GetAutoValue<T>(ref T propertyValue) where T : class, new() => propertyValue ??= new T();
-
-        /// <summary>
-        /// Sets a property value and raises the <see cref="PropertyChanged"/> event where applicable.
-        /// </summary>
-        /// <param name="propertyValue">The property value to set.</param>
-        /// <param name="setValue">The value to set.</param>
-        /// <param name="default">The default value to perform immutable check against.</param>
-        /// <param name="immutable">Indicates whether the value is immutable; can not be changed once set.</param>
-        /// <param name="propertyName">The name of the primary property that changed.</param>
-        /// <returns><c>true</c> indicates that the property value changed; otherwise, <c>false</c>.</returns>
-        protected bool SetValue<T>(ref T propertyValue, T setValue, bool immutable = false, T @default = default!, [CallerMemberName] string? propertyName = null)
-        { 
-            propertyName.ThrowIfNullOrEmpty(nameof(propertyName));
-
-            lock (_lock)
-            {
-                // Check and see if the value has changed or not; exit if being set to same value.
-                var isChanged = true;
-                T val = Cleaner.Clean(setValue, false);
-                if (ReferenceEquals(propertyValue, val))
-                    isChanged = false;
-                else if (propertyValue is IComparable<T>)
-                {
-                    if (Comparer<T>.Default.Compare(val, propertyValue) == 0)
-                        isChanged = false;
-                }
-
-                if (!isChanged)
-                    return false;
-
-                // Test is read only.
-                if (IsReadOnly)
-                    throw new InvalidOperationException(EntityConsts.EntityIsReadOnlyMessage);
-
-                // Test immutability.
-                if (immutable && Comparer<T>.Default.Compare(propertyValue, @default) != 0)
-                    throw new InvalidOperationException(EntityConsts.ValueIsImmutableMessage);
-
-                // Unwire old value.
-                INotifyPropertyChanged? npc;
-                if (propertyValue != null)
-                {
-                    npc = propertyValue as INotifyPropertyChanged;
-                    if (npc != null)
-                        npc.PropertyChanged -= GetValue_PropertyChanged(propertyName);
-                }
-
-                // Update the property and trigger the property changed.
-                propertyValue = val;
-                TriggerPropertyChanged(propertyName);
-
-                // Wire up new value.
-                if (val != null)
-                {
-                    npc = val as INotifyPropertyChanged;
-                    if (npc != null)
-                        npc.PropertyChanged += GetValue_PropertyChanged(propertyName);
-                }
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Gets the <see cref="PropertyChangedEventHandler"/> for the named property.
-        /// </summary>
-        private PropertyChangedEventHandler GetValue_PropertyChanged(string propertyName)
-        {
-            _propertyEventHandlers ??= [];
-
-            if (!_propertyEventHandlers.ContainsKey(propertyName))
-                _propertyEventHandlers.Add(propertyName, (sender, e) => TriggerPropertyChanged(propertyName));
-
-            return _propertyEventHandlers[propertyName];
-        }
-
-        /// <summary>
-        /// Sets a <see cref="string"/> property value and raises the <see cref="PropertyChanged"/> event where applicable.
-        /// </summary>
-        /// <param name="propertyValue">The property value to set.</param>
-        /// <param name="setValue">The value to set.</param>
-        /// <param name="trim">The <see cref="StringTrim"/>.</param>
-        /// <param name="transform">The <see cref="StringTransform"/> (defaults to <see cref="StringTransform.UseDefault"/>).</param>
-        /// <param name="casing">The <see cref="StringCase"/> (defaults to <see cref="StringCase.UseDefault"/>).</param>
-        /// <param name="immutable">Indicates whether the value is immutable; can not be changed once set.</param>
-        /// <param name="propertyName">The name of the primary property that changed.</param>
-        /// <returns><c>true</c> indicates that the property value changed; otherwise, <c>false</c>.</returns>
-        protected bool SetValue(ref string? propertyValue, string? setValue, StringTrim trim, StringTransform transform = StringTransform.UseDefault, StringCase casing = StringCase.UseDefault, bool immutable = false, [CallerMemberName] string? propertyName = null)
-        {
-            propertyName.ThrowIfNullOrEmpty(nameof(propertyName));
-
-            lock (_lock)
-            {
-                string? val = Cleaner.Clean(setValue, trim, transform, casing);
-                if (val == propertyValue)
-                    return false;
-
-                if (IsReadOnly)
-                    throw new InvalidOperationException(EntityConsts.EntityIsReadOnlyMessage);
-
-                if (immutable && propertyValue != null)
-                    throw new InvalidOperationException(EntityConsts.ValueIsImmutableMessage);
-
-                propertyValue = val!;
-                TriggerPropertyChanged(propertyName);
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Sets a <see cref="string"/> property value and raises the <see cref="PropertyChanged"/> event where applicable.
-        /// </summary>
-        /// <param name="propertyValue">The property value to set.</param>
-        /// <param name="setValue">The value to set.</param>
-        /// <param name="trim">The <see cref="StringTrim"/>.</param>
-        /// <param name="transform">The <see cref="StringTransform"/> (defaults to <see cref="StringTransform.UseDefault"/>).</param>
-        /// <param name="casing">The <see cref="StringCase"/> (defaults to <see cref="StringCase.UseDefault"/>).</param>
-        /// <param name="immutable">Indicates whether the value is immutable; can not be changed once set.</param>
-        /// <param name="propertyName">The name of the primary property that changed.</param>
-        /// <returns><c>true</c> indicates that the property value changed; otherwise, <c>false</c>.</returns>
-        protected bool SetValue(ref string? propertyValue, string? setValue, StringTransform transform, StringTrim trim = StringTrim.UseDefault, StringCase casing = StringCase.UseDefault, bool immutable = false, [CallerMemberName] string? propertyName = null)
-            => SetValue(ref propertyValue, setValue, trim, transform, casing, immutable, propertyName);
-
-        /// <summary>
-        /// Sets a <see cref="string"/> property value and raises the <see cref="PropertyChanged"/> event where applicable.
-        /// </summary>
-        /// <param name="propertyValue">The property value to set.</param>
-        /// <param name="setValue">The value to set.</param>
-        /// <param name="trim">The <see cref="StringTrim"/>.</param>
-        /// <param name="transform">The <see cref="StringTransform"/> (defaults to <see cref="StringTransform.UseDefault"/>).</param>
-        /// <param name="casing">The <see cref="StringCase"/> (defaults to <see cref="StringCase.UseDefault"/>).</param>
-        /// <param name="immutable">Indicates whether the value is immutable; can not be changed once set.</param>
-        /// <param name="propertyName">The name of the primary property that changed.</param>
-        /// <returns><c>true</c> indicates that the property value changed; otherwise, <c>false</c>.</returns>
-        protected bool SetValue(ref string? propertyValue, string? setValue, StringCase casing, StringTransform transform = StringTransform.UseDefault, StringTrim trim = StringTrim.UseDefault, bool immutable = false, [CallerMemberName] string? propertyName = null)
-            => SetValue(ref propertyValue, setValue, trim, transform, casing, immutable, propertyName);
-
-        /// <summary>
-        /// Sets a <see cref="DateTime"/> property value and raises the <see cref="PropertyChanged"/> event where applicable.
-        /// </summary>
-        /// <param name="propertyValue">The property value to set.</param>
-        /// <param name="setValue">The value to set.</param>
-        /// <param name="transform">The <see cref="DateTimeTransform"/> to be applied (defaults to <see cref="DateTimeTransform.UseDefault"/>).</param>
-        /// <param name="immutable">Indicates whether the value is immutable; can not be changed once set.</param>
-        /// <param name="propertyName">The name of the primary property that changed.</param>
-        /// <returns><c>true</c> indicates that the property value changed; otherwise, <c>false</c>.</returns>
-        protected bool SetValue(ref DateTime propertyValue, DateTime setValue, DateTimeTransform transform = DateTimeTransform.UseDefault, bool immutable = false, [CallerMemberName] string? propertyName = null)
-        {
-            propertyName.ThrowIfNullOrEmpty(nameof(propertyName));
-
-            lock (_lock)
-            {
-                DateTime val = Cleaner.Clean(setValue, transform);
-                if (val == propertyValue)
-                    return false;
-
-                if (IsReadOnly)
-                    throw new InvalidOperationException(EntityConsts.EntityIsReadOnlyMessage);
-
-                if (immutable && propertyValue != DateTime.MinValue)
-                    throw new InvalidOperationException(EntityConsts.ValueIsImmutableMessage);
-
-                propertyValue = val;
-                TriggerPropertyChanged(propertyName);
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Sets a <see cref="Nullable{DateTime}"/> property value and raises the <see cref="PropertyChanged"/> event where applicable.
-        /// </summary>
-        /// <param name="propertyValue">The property value to set.</param>
-        /// <param name="setValue">The value to set.</param>
-        /// <param name="immutable">Indicates whether the value is immutable; can not be changed once set.</param>
-        /// <param name="transform">The <see cref="DateTimeTransform"/> to be applied.</param>
-        /// <param name="propertyName">The name of the primary property that changed.</param>
-        /// <returns><c>true</c> indicates that the property value changed; otherwise, <c>false</c>.</returns>
-        protected bool SetValue(ref DateTime? propertyValue, DateTime? setValue, DateTimeTransform transform, bool immutable = false, [CallerMemberName] string? propertyName = null)
-        {
-            propertyName.ThrowIfNullOrEmpty(nameof(propertyName));
-
-            lock (_lock)
-            {
-                DateTime? val = Cleaner.Clean(setValue, transform);
-                if (val == propertyValue)
-                    return false;
-
-                if (IsReadOnly)
-                    throw new InvalidOperationException(EntityConsts.EntityIsReadOnlyMessage);
-
-                if (immutable && propertyValue != null)
-                    throw new InvalidOperationException(EntityConsts.ValueIsImmutableMessage);
-
-                propertyValue = val;
-                TriggerPropertyChanged(propertyName);
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <remarks>This will trigger the <see cref="OnAcceptChanges"/> to perform the operation for all properties.</remarks>
-        public void AcceptChanges()
-        {
-            lock (_lock)
-            {
-                OnAcceptChanges();
-                IsChanged = false;
-            }
-        }
-
-        /// <summary>
-        /// Applies the <see cref="AcceptChanges"/> to all the underlying properties.
-        /// </summary>
-        protected virtual void OnAcceptChanges() { }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public bool IsChanged { get; private set; }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public bool IsReadOnly { get; private set; }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <remarks>This will trigger the <see cref="OnMakeReadOnly"/> to perform the operation for all properties.</remarks>
-        public void MakeReadOnly()
-        {
-            lock (_lock)
-            {
-                OnMakeReadOnly();
-                IsChanged = false;
-                IsReadOnly = true;
-            }
-        }
-
-        /// <summary>
-        /// Applies the <see cref="MakeReadOnly"/> to all the underlying properties.
-        /// </summary>
-        protected virtual void OnMakeReadOnly() { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/EntityKeyBaseCollection.cs b/src/CoreEx/Entities/Extended/EntityKeyBaseCollection.cs
deleted file mode 100644
index 0f1cd662..00000000
--- a/src/CoreEx/Entities/Extended/EntityKeyBaseCollection.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents an <see cref="EntityBase"/> <see cref="ICompositeKeyCollection{T}"/> class.
-    /// </summary>
-    /// <typeparam name="TEntity">The <see cref="IEntityKey"/> <see cref="EntityBase"/> <see cref="System.Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="EntityBase"/> collection <see cref="Type"/> itself.</typeparam>
-    [System.Diagnostics.DebuggerStepThrough]
-    public abstract class EntityKeyBaseCollection<TEntity, TSelf> : EntityBaseCollection<TEntity, TSelf>, ICompositeKeyCollection<TEntity>
-        where TEntity : EntityBase, IEntityKey
-        where TSelf : EntityBaseCollection<TEntity, TSelf>, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityKeyBaseCollection{TEntity, TSelf}" /> class.
-        /// </summary>
-        protected EntityKeyBaseCollection() : base() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EntityKeyBaseCollection{TEntity, TSelf}" /> class.
-        /// </summary>
-        /// <param name="collection">The entities to add.</param>
-        protected EntityKeyBaseCollection(IEnumerable<TEntity> collection) : base(collection) { }
-
-        /// <inheritdoc/>
-        public bool ContainsKey(CompositeKey key) => Items.Any(x => key.Equals(x.EntityKey));
-
-        /// <summary>
-        /// Indicates whether an item with the specified <paramref name="keys"/> exists.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns><c>true</c> where the item exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsKey(params object?[] keys) => ContainsKey(new CompositeKey(keys));
-
-        /// <summary>
-        /// Gets the first item by the specified primary <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <returns>The first item where found; otherwise, <c>default</c>.</returns>
-        public TEntity? GetByKey(CompositeKey key) => Items.Where(x => key.Equals(x.EntityKey)).FirstOrDefault();
-
-        /// <summary>
-        /// Gets the first item by the specified primary <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        /// <returns>The first item where found; otherwise, <c>default</c>.</returns>
-        public TEntity? GetByKey(params object?[] keys) => GetByKey(new CompositeKey(keys));
-
-        /// <inheritdoc/>
-        public bool IsAnyDuplicates() => Count != Math.Min(1, this.Count(ek => ek == null)) + this.Where(ek => ek != null).Select(ek => ek.EntityKey).Distinct(CompositeKeyComparer.Default).Count();
-
-        /// <inheritdoc/>
-        public void RemoveByKey(CompositeKey key) => this.Where(ek => ek.EntityKey == key).ToList().ForEach(ek => Remove(ek));
-
-        /// <summary>
-        /// Removes all items with the specified primary <paramref name="keys"/>.
-        /// </summary>
-        /// <param name="keys">The key values.</param>
-        public void RemoveByKey(params object?[] keys) => RemoveByKey(new CompositeKey(keys));
-
-        /// <inheritdoc/>
-        public override bool Equals(object? obj) => base.Equals(obj);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => base.GetHashCode();
-
-        /// <summary>
-        /// Compares two values for equality.
-        /// </summary>
-        /// <param name="a"><see cref="ChangeLogEx"/> A.</param>
-        /// <param name="b"><see cref="ChangeLogEx"/> B.</param>
-        /// <returns><c>true</c> indicates equal; otherwise, <c>false</c> for not equal.</returns>
-        public static bool operator ==(EntityKeyBaseCollection<TEntity, TSelf>? a, EntityKeyBaseCollection<TEntity, TSelf>? b) => Equals(a, b);
-
-        /// <summary>
-        /// Compares two values for non-equality.
-        /// </summary>
-        /// <param name="a"><see cref="ChangeLogEx"/> A.</param>
-        /// <param name="b"><see cref="ChangeLogEx"/> B.</param>
-        /// <returns><c>true</c> indicates not equal; otherwise, <c>false</c> for equal.</returns>
-        public static bool operator !=(EntityKeyBaseCollection<TEntity, TSelf>? a, EntityKeyBaseCollection<TEntity, TSelf>? b) => !Equals(a, b);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/ExtendedExtensions.cs b/src/CoreEx/Entities/Extended/ExtendedExtensions.cs
deleted file mode 100644
index 47f20d11..00000000
--- a/src/CoreEx/Entities/Extended/ExtendedExtensions.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Provides extension methods for the extended entities capabilities.
-    /// </summary>
-    public static class ExtendedExtensions
-    {
-        /// <summary>
-        /// Creates a clone of <see cref="Type"/> <typeparamref name="T"/> by instantiating a new instance and performing a <see cref="ICopyFrom.CopyFrom(object?)"/> from the <paramref name="from"/> value.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="from">The from value.</param>
-        /// <returns>The new cloned instance.</returns>
-        public static T Clone<T>(this T from) where T : ICopyFrom, new()
-        {
-            var clone = new T();
-            clone.CopyFrom(from);
-            return clone;
-        }
-
-        /// <summary>
-        /// Creates (attempts even where default contstructor status is unknown) a clone of <see cref="Type"/> <typeparamref name="T"/> by instantiating a new instance and performing a <see cref="ICopyFrom.CopyFrom(object?)"/> from the <paramref name="from"/> value.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="from">The from value.</param>
-        /// <returns>The new cloned instance.</returns>
-        internal static T ForceClone<T>(this T from) where T : EntityBase
-        {
-            var clone = Activator.CreateInstance<T>();
-            clone.CopyFrom(from);
-            return clone;
-        }
-
-        /// <summary>
-        /// Creates a new <typeparamref name="T"/> instance and performs a <see cref="ICopyFrom.CopyFrom(object?)"/> using the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
-        /// <param name="value">The from value.</param>
-        /// <returns>The new copied instance.</returns>
-        public static T CopyFromAs<T>(this EntityBase value) where T : EntityBase, new() => new T().Adjust(v => v.CopyFrom(value));
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/IChangeLogEx.cs b/src/CoreEx/Entities/Extended/IChangeLogEx.cs
deleted file mode 100644
index 8663dd22..00000000
--- a/src/CoreEx/Entities/Extended/IChangeLogEx.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Provides an extended <see cref="EntityBase"/> <see cref="ChangeLog"/>.
-    /// </summary>
-    public interface IChangeLogEx : IChangeLogAuditLog
-    {
-        /// <inheritdoc/>
-        IChangeLogAudit? IChangeLogAuditLog.ChangeLogAudit
-        {
-            get => ChangeLog;
-            set
-            {
-                if (value is null)
-                    ChangeLog = null;
-                else if (value is ChangeLogEx cl)
-                    ChangeLog = cl;
-                else
-                {
-                    ChangeLog = new ChangeLogEx
-                    {
-                        CreatedBy = value.CreatedBy,
-                        CreatedDate = value.CreatedDate,
-                        UpdatedBy = value.UpdatedBy,
-                        UpdatedDate = value.UpdatedDate
-                    };
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or set the <see cref="ChangeLog"/>.
-        /// </summary>
-        ChangeLogEx? ChangeLog { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/ICopyFrom.cs b/src/CoreEx/Entities/Extended/ICopyFrom.cs
new file mode 100644
index 00000000..da39144d
--- /dev/null
+++ b/src/CoreEx/Entities/Extended/ICopyFrom.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Entities.Extended;
+
+/// <summary>
+/// Enables a <see cref="CopyFrom"/>.
+/// </summary>
+public interface ICopyFrom
+{
+    /// <summary>
+    /// Copies <paramref name="from"/> into this.
+    /// </summary>
+    /// <param name="from">The from value.</param>
+    /// <remarks>Only mutable (set) properties will be copied; i.e. read-only (get) properties will remain unchanged.</remarks>
+    void CopyFrom<TFrom>(TFrom from) where TFrom : class;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/IDefault.cs b/src/CoreEx/Entities/Extended/IDefault.cs
new file mode 100644
index 00000000..f1eb2485
--- /dev/null
+++ b/src/CoreEx/Entities/Extended/IDefault.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Entities.Extended;
+
+/// <summary>
+/// Enables a means to determine if a value is in its default state.
+/// </summary>
+/// <remarks>For example; all underlying properties for an object have their respective default value.</remarks>
+public interface IDefault
+{
+    /// <summary>
+    /// Indicates whether the value is in its default state.
+    /// </summary>
+    /// <returns><see langword="true"/> indicates that the value is considered default; otherwise, <see langword="false"/>.</returns>
+    bool IsDefault();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/IEntityBaseCollection.cs b/src/CoreEx/Entities/Extended/IEntityBaseCollection.cs
deleted file mode 100644
index 5822b2f5..00000000
--- a/src/CoreEx/Entities/Extended/IEntityBaseCollection.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Represents an <see cref="EntityBase"/> collection and therefore certain capabilities can be assumed.
-    /// </summary>
-    public interface IEntityBaseCollection : ICloneable, ICleanUp, IInitial { }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/IIdentifierGenerator.cs b/src/CoreEx/Entities/Extended/IIdentifierGenerator.cs
new file mode 100644
index 00000000..8cc9d3ef
--- /dev/null
+++ b/src/CoreEx/Entities/Extended/IIdentifierGenerator.cs
@@ -0,0 +1,36 @@
+namespace CoreEx.Entities.Extended;
+
+/// <summary>
+/// Enables the generation of a new identifier value for <i>any</i> identifier <see cref="Type"/>.
+/// </summary>
+public interface IIdentifierGenerator
+{
+    /// <summary>
+    /// Generates a new <see cref="Guid"/> (version 7 or other sequential GUID preferred).
+    /// </summary>
+    /// <returns>The newly generated <see cref="Guid"/>.</returns>
+    Guid GenerateGuid();
+
+    /// <summary>
+    /// Generate a new identifier value.
+    /// </summary>
+    /// <typeparam name="TId">The identifier <see cref="System.Type"/>.</typeparam>
+    /// <returns>The newly generated identifier.</returns>
+    Task<TId> GenerateIdentifierAsync<TId>();
+
+    /// <summary>
+    /// Generate a new identifier value.
+    /// </summary>
+    /// <typeparam name="TId">The identifier <see cref="System.Type"/>.</typeparam>
+    /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
+    /// <returns>The newly generated identifier.</returns>
+    /// <remarks>The <typeparamref name="TFor"/> allows for the likes of different identity sequences per <see cref="System.Type"/> for example.</remarks>
+    Task<TId> GenerateIdentifierAsync<TId, TFor>() where TFor : class;
+
+    /// <summary>
+    /// Assigns a generated identifier to the <paramref name="value"/> where the <see cref="IIdentifier.Id"/> has a default value.
+    /// </summary>
+    /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
+    /// <param name="value">The value to assign an identifier for.</param>
+    Task AssignIdentifierAsync<TFor>(TFor value) where TFor : class;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/INotifyCollectionItemChanged.cs b/src/CoreEx/Entities/Extended/INotifyCollectionItemChanged.cs
deleted file mode 100644
index 94cd6c13..00000000
--- a/src/CoreEx/Entities/Extended/INotifyCollectionItemChanged.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Notifies consumers when an underlying collection item changes.
-    /// </summary>
-    public interface INotifyCollectionItemChanged
-    {
-        /// <summary>
-        /// Occurs when the contents for a collection item is changed.
-        /// </summary>
-        event CollectionItemChangedEventHandler CollectionItemChanged;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/IPropertyValue.cs b/src/CoreEx/Entities/Extended/IPropertyValue.cs
deleted file mode 100644
index 6fb68735..00000000
--- a/src/CoreEx/Entities/Extended/IPropertyValue.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Defines the property value capabilities enabled by <see cref="EntityBase.GetPropertyValues"/>.
-    /// </summary>
-    public interface IPropertyValue
-    {
-        /// <summary>
-        /// Gets the property name.
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// Gets the property value.
-        /// </summary>
-        object? Value { get; }
-
-        /// <summary>
-        /// Indicates whether the value is considered the initial value.
-        /// </summary>
-        bool IsInitial { get; }
-
-        /// <summary>
-        /// Cleans a value and overrides the value with <c>null</c> when the value is <see cref="IInitial.IsInitial"/>.
-        /// </summary>
-        public void Clean();
-
-        /// <summary>
-        /// Sets (overrides) the underlying <see cref="Value"/> with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <param name="value">The overridding value.</param>
-        /// <remarks>This is needed to support <see cref="ICopyFrom"/> and <see cref="ICloneable"/> functionality.</remarks>
-        void SetValue(object? value);
-
-        /// <summary>
-        /// Indicates whether the other <paramref name="propertyValue"/> is equal to this.
-        /// </summary>
-        /// <param name="propertyValue">The <see cref="IPropertyValue"/> to compare to.</param>
-        /// <returns><c>true</c> indicates they are equal; otherwise, <c>false</c> for not equal.</returns>
-        bool AreEqual(IPropertyValue propertyValue);
-
-        /// <summary>
-        /// Gets the hash code for the <see cref="Value"/>.
-        /// </summary>
-        /// <returns>The hash code for the <see cref="Value"/>.</returns>
-        int GetHashCode();
-
-        /// <summary>
-        /// Performs a copy or clone from the other <paramref name="propertyValue"/>.
-        /// </summary>
-        /// <param name="propertyValue">The <see cref="IPropertyValue"/> to copy or clone from.</param>
-        void CopyFrom(IPropertyValue propertyValue);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/ObservableDictionary.cs b/src/CoreEx/Entities/Extended/ObservableDictionary.cs
deleted file mode 100644
index 23265ac6..00000000
--- a/src/CoreEx/Entities/Extended/ObservableDictionary.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// An observable <see cref="Dictionary{TKey, TValue}"/> that supports <see cref="INotifyCollectionChanged"/>.
-    /// </summary>
-    /// <typeparam name="TKey">The key <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-    public class ObservableDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IDictionary, IReadOnlyDictionary<TKey, TValue>, INotifyCollectionChanged, INotifyPropertyChanged where TKey : notnull
-    {
-        private readonly Dictionary<TKey, TValue> _dict;
-        private Func<TKey, TKey>? _keyModifier;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableDictionary{TKey, TValue}"/> with the default <see cref="IEqualityComparer{T}"/> for the type of the key.
-        /// </summary>
-        public ObservableDictionary() => _dict = [];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableDictionary{TKey, TValue}"/> with the specified <paramref name="comparer"/>.
-        /// </summary>
-        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> implementation to use when comparing keys, or null to use the default <see cref="IEqualityComparer{T}"/> for the type of the key.</param>
-        public ObservableDictionary(IEqualityComparer<TKey> comparer) => _dict = new(comparer);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableDictionary{TKey, TValue}"/> with the default <see cref="IEqualityComparer{T}"/> for the type of the key adding the passed <paramref name="collection"/>.
-        /// </summary>
-        /// <param name="collection">The items to add.</param>
-        public ObservableDictionary(IEnumerable<KeyValuePair<TKey, TValue>> collection) => _dict = new(collection);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObservableDictionary{TKey, TValue}"/> with the specified <paramref name="comparer"/> adding the passed <paramref name="collection"/>.
-        /// </summary>
-        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> implementation to use when comparing keys, or null to use the default <see cref="IEqualityComparer{T}"/> for the type of the key.</param>
-        /// <param name="collection">The items to add.</param>
-        public ObservableDictionary(IEnumerable<KeyValuePair<TKey, TValue>> collection, IEqualityComparer<TKey> comparer) => _dict = new(collection, comparer);
-
-        /// <summary>
-        /// Gets or sets the function that enabled modification of the key before usage.
-        /// </summary>
-        /// <remarks>Enables an opportunity to modify the key before used internally; for example, to modify so that the key value is always uppercase.
-        /// <para>The <see cref="OnModifyKey"/> by default leverages this function; however, the <see cref="OnModifyKey"/> when overridden may chose to ignore.</para></remarks>
-        public Func<TKey, TKey>? KeyModifier 
-        {
-            get => _keyModifier;
-            set
-            {
-                if (_dict.Count > 0)
-                    throw new InvalidOperationException($"{nameof(KeyModifier)} can only be updated when there are no items contained already within the dictionary; i.e. {nameof(Count)} must be zero.");
-
-                _keyModifier = value;
-            }
-        }
-
-        /// <inheritdoc/>
-        public int Count => _dict.Count;
-
-        /// <inheritdoc/>
-        bool IDictionary.IsFixedSize => ((IDictionary)_dict).IsFixedSize;
-
-        /// <inheritdoc/>
-        bool ICollection.IsSynchronized => ((IDictionary)_dict).IsSynchronized;
-
-        /// <inheritdoc/>
-        bool IDictionary.IsReadOnly => ((IDictionary)_dict).IsReadOnly;
-
-        /// <inheritdoc/>
-        bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly => ((ICollection<KeyValuePair<TKey, TValue>>)_dict).IsReadOnly;
-
-        /// <inheritdoc/>
-        object ICollection.SyncRoot => ((IDictionary)_dict).SyncRoot;
-
-        /// <inheritdoc/>
-        ICollection IDictionary.Keys => ((IDictionary)_dict).Keys;
-
-        /// <inheritdoc/>
-        public IEnumerable<TKey> Keys => ((IReadOnlyDictionary<TKey, TValue>)_dict).Keys;
-
-        /// <inheritdoc/>
-        ICollection<TKey> IDictionary<TKey, TValue>.Keys => ((IDictionary<TKey, TValue>)_dict).Keys;
-
-        /// <inheritdoc/>
-        ICollection IDictionary.Values => ((IDictionary)_dict).Values;
-
-        /// <inheritdoc/>
-        public IEnumerable<TValue> Values => ((IReadOnlyDictionary<TKey, TValue>)_dict).Values;
-
-        /// <inheritdoc/>
-        ICollection<TValue> IDictionary<TKey, TValue>.Values => ((IDictionary<TKey, TValue>)_dict).Values;
-
-        /// <inheritdoc/>
-        public object? this[object key] { get => this[(TKey)key]; set => this[(TKey)key] = (TValue)value!; }
-
-        /// <inheritdoc/>
-        TValue IDictionary<TKey, TValue>.this[TKey key] { get => this[key]; set => this[key] = value; }
-
-        /// <inheritdoc/>
-        public TValue this[TKey key]
-        {
-            get => _dict[OnModifyKey(key)];
-
-            set
-            {
-                if (TryGetValue(key, out var old))
-                {
-                    if (ReferenceEquals(old, value))
-                        return;
-                    else
-                        ReplaceItem(new KeyValuePair<TKey, TValue>(key, old), new KeyValuePair<TKey, TValue>(key, value));
-                }
-                else
-                    AddItem(new KeyValuePair<TKey, TValue>(key, value));
-            }
-        }
-
-        /// <inheritdoc/>
-        void IDictionary.Add(object key, object? value) => Add((TKey)key, (TValue)value!);
-
-        /// <inheritdoc/>
-        public void Add(TKey key, TValue value) => AddItem(new KeyValuePair<TKey, TValue>(key, value));
-
-        /// <inheritdoc/>
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item) => AddItem(item);
-
-        /// <inheritdoc/>
-        void ICollection.CopyTo(Array array, int index) => ((ICollection)_dict).CopyTo(array, index);
-
-        /// <inheritdoc/>
-        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex) => ((ICollection<KeyValuePair<TKey, TValue>>)_dict).CopyTo(array, arrayIndex);
-
-        /// <inheritdoc/>
-        void IDictionary.Remove(object key) => Remove((TKey)key);
-
-        /// <inheritdoc/>
-        IDictionaryEnumerator IDictionary.GetEnumerator() => ((IDictionary)_dict).GetEnumerator();
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_dict).GetEnumerator();
-
-        /// <inheritdoc/>
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() => _dict.GetEnumerator();
-
-        /// <inheritdoc/>
-        public bool Contains(object key) => ContainsKey((TKey)key);
-
-        /// <inheritdoc/>
-        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item) => ((ICollection<KeyValuePair<TKey, TValue>>)_dict).Contains(item);
-
-        /// <inheritdoc/>
-        public bool ContainsKey(TKey key) => _dict.ContainsKey(OnModifyKey(key));
-
-        /// <inheritdoc/>
-        public bool TryGetValue(TKey key, [NotNullWhen(true)] out TValue value) => _dict.TryGetValue(OnModifyKey(key), out value!);
-
-        /// <inheritdoc/>
-        public bool Remove(TKey key) => TryGetValue(key, out var value) && RemoveItem(new KeyValuePair<TKey, TValue>(key, value));
-
-        /// <inheritdoc/>
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item) => RemoveItem(item);
-
-        /// <inheritdoc/>
-        public void Clear()
-        {
-            if (Count > 0)
-                ClearItems();
-        }
-
-        /// <summary>
-        /// Clears all items from the dictionary.
-        /// </summary>
-        protected virtual void ClearItems()
-        {
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, this.ToList()));
-            _dict.Clear();
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-            RaisePropertyChanged();
-        }
-
-        /// <summary>
-        /// Replaces the item within the dictionary.
-        /// </summary>
-        /// <param name="oldItem">The old item being replaced.</param>
-        /// <param name="newItem">The new replacement item.</param>
-        protected virtual void ReplaceItem(KeyValuePair<TKey, TValue> oldItem, KeyValuePair<TKey, TValue> newItem)
-        {
-            oldItem = new KeyValuePair<TKey, TValue>(OnModifyKey(oldItem.Key), oldItem.Value);
-            newItem = new KeyValuePair<TKey, TValue>(OnModifyKey(newItem.Key), newItem.Value);
-
-            _dict[newItem.Key] = newItem.Value;
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, newItem, oldItem));
-            RaisePropertyChanged();
-        }
-
-        /// <summary>
-        /// Adds the item to the dictionary.
-        /// </summary>
-        /// <param name="item">The <see cref="KeyValuePair{TKey, TValue}"/> that was added.</param>
-        protected virtual void AddItem(KeyValuePair<TKey, TValue> item)
-        {
-            item = new KeyValuePair<TKey, TValue>(OnModifyKey(item.Key), item.Value);
-
-            _dict.Add(item.Key, item.Value);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
-            RaisePropertyChanged();
-        }
-
-        /// <summary>
-        /// Removes the item from the dictionary.
-        /// </summary>
-        /// <param name="item">The <see cref="KeyValuePair{TKey, TValue}"/> that was removed.</param>
-        /// <returns><c>true</c> if the item was successfully removed from the <see cref="ObservableDictionary{TKey, TValue}"/>; otherwise, <c>false</c>.</returns>
-        protected virtual bool RemoveItem(KeyValuePair<TKey, TValue> item)
-        {
-            item = new KeyValuePair<TKey, TValue>(OnModifyKey(item.Key), item.Value);
-            if (!_dict.Remove(item.Key))
-                return false;
-
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item));
-            RaisePropertyChanged();
-            return true;
-        }
-
-        /// <summary>
-        /// Raises the <see cref="CollectionChanged"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="NotifyCollectionChangedEventArgs"/>.</param>
-        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e) => CollectionChanged?.Invoke(this, e);
-
-        /// <summary>
-        /// Occurs when the collection changes, either by adding or removing an item.
-        /// </summary>
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-
-        /// <summary>
-        /// Invokes the <see cref="OnPropertyChanged"/> method.
-        /// </summary>
-        private void RaisePropertyChanged() => OnPropertyChanged(new PropertyChangedEventArgs(nameof(Count)));
-
-        /// <summary>
-        /// Raises the <see cref="PropertyChanged"/> event.
-        /// </summary>
-        /// <param name="e">The <see cref="PropertyChangedEventArgs"/>.</param>
-        protected virtual void OnPropertyChanged(PropertyChangedEventArgs e) => PropertyChanged?.Invoke(this, e);
-
-        /// <summary>
-        /// Occurs when a property changes, either within the dictionary or to an item within.
-        /// </summary>
-        public event PropertyChangedEventHandler? PropertyChanged;
-
-        /// <summary>
-        /// Modifies the key before usage; by default uses the <see cref="KeyModifier"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns>The modified key.</returns>
-        /// <remarks>Enables an opportunity to modify the key before used internally; for example, to modify so that it is always uppercase.</remarks>
-        protected virtual TKey OnModifyKey(TKey key) => KeyModifier is null ? key : KeyModifier(key);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Extended/PropertyValue.cs b/src/CoreEx/Entities/Extended/PropertyValue.cs
deleted file mode 100644
index 299728f5..00000000
--- a/src/CoreEx/Entities/Extended/PropertyValue.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Entities.Extended
-{
-    /// <summary>
-    /// Provides the property value capabilities enabled by <see cref="EntityBase.GetPropertyValues"/>.
-    /// </summary>
-    /// <param name="name">The property name.</param>
-    /// <param name="value">The property value.</param>
-    /// <param name="setValue">The action to set (override) the value with the specified value.</param>
-    /// <param name="defaultValue">The optional default value override.</param>
-    public struct PropertyValue<T>(string name, T value, Action<T?> setValue, T? defaultValue = default) : IPropertyValue
-    {
-        private readonly Action<T?> _setValue = setValue;
-
-        /// <inheritdoc/>
-        public string Name { get; } = name.ThrowIfNullOrEmpty(nameof(name));
-
-        /// <inheritdoc/>
-        readonly object? IPropertyValue.Value => Value;
-
-        /// <summary>
-        /// Gets the property value.
-        /// </summary>
-        public T? Value { get; private set; } = value;
-
-        /// <summary>
-        /// Gets the default value.
-        /// </summary>
-        public T? DefaultValue { get; } = defaultValue ?? default;
-
-        /// <inheritdoc/>
-        public void Clean() => SetValue(Cleaner.Clean(Value));
-
-        /// <inheritdoc/>
-        public readonly bool IsInitial => Cleaner.IsDefault(Value, DefaultValue);
-
-        /// <inheritdoc/>
-        void IPropertyValue.SetValue(object? value) => SetValue((T)value!);
-
-        /// <summary>
-        /// Sets (override) the underlying <see cref="Value"/> with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <param name="value">The overridding value.</param>
-        public void SetValue(T? value)
-        {
-            _setValue(value); 
-            Value = value;
-        }
-
-        /// <inheritdoc/>
-        readonly bool IPropertyValue.AreEqual(IPropertyValue value) => AreEqual((PropertyValue<T>)value!);
-
-        /// <summary>
-        /// Indicates whether the other <paramref name="propertyValue"/> is equal to this.
-        /// </summary>
-        /// <param name="propertyValue">The value to compare to.</param>
-        /// <returns><c>true</c> indicates they are equal; otherwise, <c>false</c> for not equal.</returns>
-        public readonly bool AreEqual(PropertyValue<T> propertyValue) => Value == null && propertyValue.Value == null || (Value == null ? propertyValue.Value!.Equals(Value) : Value.Equals(propertyValue.Value));
-
-        /// <inheritdoc/>
-        public override readonly int GetHashCode() => Value?.GetHashCode() ?? 0;
-
-        /// <summary>
-        /// Performs a copy or clone from the other <paramref name="propertyValue"/>.
-        /// </summary>
-        /// <param name="propertyValue">The <see cref="IPropertyValue"/> to copy or clone from.</param>
-        void IPropertyValue.CopyFrom(IPropertyValue propertyValue) => CopyFrom((PropertyValue<T>)propertyValue);
-
-        /// <inheritdoc/>
-        void CopyFrom(PropertyValue<T> propertyValue)
-        {
-            if (propertyValue.Value is null || Comparer<T>.Default.Compare(propertyValue.Value, default!) == 0)
-            {
-                SetValue(default);
-                return;
-            }
-
-            if (propertyValue.Value is string s)
-            {
-                SetValue((T)(object)s);
-                return;
-            }
-
-            if (propertyValue is ICloneable clone)
-            {
-                SetValue((T)clone);
-                return;
-            }
-
-            if (propertyValue.Value is EntityBase eb)
-            {
-                var v = Activator.CreateInstance<T>() as EntityBase;
-                v!.CopyFrom(eb);
-                SetValue((T)(object)v);
-                return;
-            }
-
-            if (propertyValue.Value is IEntityBaseCollection ebc)
-            {
-                SetValue((T)ebc.Clone());
-                return;
-            }
-
-            SetValue(propertyValue.Value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/FeatureSupport.cs b/src/CoreEx/Entities/FeatureSupport.cs
new file mode 100644
index 00000000..ae83be75
--- /dev/null
+++ b/src/CoreEx/Entities/FeatureSupport.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Represents the feature support.
+/// </summary>
+public enum FeatureSupport
+{
+    /// <summary>
+    /// Indicates that the feature is not supported.
+    /// </summary>
+    NotSupported,
+
+    /// <summary>
+    /// Indicates that the feature is partially supported; i.e. is read-only.
+    /// </summary>
+    ReadOnly,
+
+    /// <summary>
+    /// Indicates that the feature is fully supported; i.e. is mutable.
+    /// </summary>
+    Mutable
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IChangeLog.cs b/src/CoreEx/Entities/IChangeLog.cs
index e758477d..816ef55d 100644
--- a/src/CoreEx/Entities/IChangeLog.cs
+++ b/src/CoreEx/Entities/IChangeLog.cs
@@ -1,38 +1,15 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-namespace CoreEx.Entities
+/// <summary>
+/// Enables a mutable <see cref="ChangeLog"/>.
+/// </summary>
+public interface IChangeLog : IReadOnlyChangeLog
 {
+    /// <inheritdoc/>
+    ChangeLog? IReadOnlyChangeLog.ChangeLog => ChangeLog;
+
     /// <summary>
-    /// Provides the <see cref="ChangeLog"/>.
+    /// Gets the <see cref="ChangeLog"/>.
     /// </summary>
-    public interface IChangeLog : IChangeLogAuditLog
-    {
-        /// <inheritdoc/>
-        IChangeLogAudit? IChangeLogAuditLog.ChangeLogAudit
-        { 
-            get => ChangeLog;
-            set
-            {
-                if (value is null)
-                    ChangeLog = null;
-                else if (value is ChangeLog cl)
-                    ChangeLog = cl;
-                else
-                {
-                    ChangeLog = new ChangeLog
-                    {
-                        CreatedBy = value.CreatedBy,
-                        CreatedDate = value.CreatedDate,
-                        UpdatedBy = value.UpdatedBy,
-                        UpdatedDate = value.UpdatedDate
-                    };
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or set the <see cref="ChangeLog"/>.
-        /// </summary>
-        ChangeLog? ChangeLog { get; set; }
-    }
+    new ChangeLog? ChangeLog { get; set; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IChangeLogAudit.cs b/src/CoreEx/Entities/IChangeLogAudit.cs
deleted file mode 100644
index 45d0177e..00000000
--- a/src/CoreEx/Entities/IChangeLogAudit.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the <see cref="IChangeLog"/> audit properties.
-    /// </summary>
-    public interface IChangeLogAudit
-    {
-        /// <summary>
-        /// Gets or sets the created <see cref="DateTime"/>.
-        /// </summary>
-        DateTime? CreatedDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the created by (username).
-        /// </summary>
-        string? CreatedBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the updated <see cref="DateTime"/>.
-        /// </summary>
-        DateTime? UpdatedDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the updated by (username).
-        /// </summary>
-        string? UpdatedBy { get; set; }
-
-        /// <summary>
-        /// Indicates whether all the properties for the <see cref="IChangeLogAudit"/> are initial (default).
-        /// </summary>
-        public bool IsInitial => CreatedDate == default && CreatedBy == default && UpdatedDate == default && UpdatedBy == default;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IChangeLogAuditLog.cs b/src/CoreEx/Entities/IChangeLogAuditLog.cs
deleted file mode 100644
index ae74f53a..00000000
--- a/src/CoreEx/Entities/IChangeLogAuditLog.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the <see cref="ChangeLogAudit"/>.
-    /// </summary>
-    public interface IChangeLogAuditLog
-    {
-        /// <summary>
-        /// Gets or set the <see cref="IChangeLogAudit"/> value.
-        /// </summary>
-        IChangeLogAudit? ChangeLogAudit { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IChangeLogEx.cs b/src/CoreEx/Entities/IChangeLogEx.cs
new file mode 100644
index 00000000..98daa127
--- /dev/null
+++ b/src/CoreEx/Entities/IChangeLogEx.cs
@@ -0,0 +1,39 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a mutable <see cref="CreatedBy"/>, <see cref="CreatedOn"/>, <see cref="UpdatedBy"/>, and <see cref="UpdatedOn"/>.
+/// </summary>
+public interface IChangeLogEx : IReadOnlyChangeLogEx
+{
+    /// <inheritdoc/>
+    string? IReadOnlyChangeLogEx.CreatedBy => CreatedBy;
+
+    /// <inheritdoc/>
+    DateTimeOffset? IReadOnlyChangeLogEx.CreatedOn => CreatedOn;
+
+    /// <inheritdoc/>
+    string? IReadOnlyChangeLogEx.UpdatedBy => UpdatedBy;
+
+    /// <inheritdoc/>
+    DateTimeOffset? IReadOnlyChangeLogEx.UpdatedOn => UpdatedOn;
+
+    /// <summary>
+    /// Gets or sets the user who created the entity.
+    /// </summary>
+    new string? CreatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the timestamp of when the entity was created.
+    /// </summary>
+    new DateTimeOffset? CreatedOn { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user who last updated the entity.
+    /// </summary>
+    new string? UpdatedBy { get; set; }
+
+    /// <summary>
+    /// Gets or sets the timestamp of when the entity was last updated.
+    /// </summary>
+    new DateTimeOffset? UpdatedOn { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICleanUp.cs b/src/CoreEx/Entities/ICleanUp.cs
deleted file mode 100644
index 1d9f6cbb..00000000
--- a/src/CoreEx/Entities/ICleanUp.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides a means to <see cref="CleanUp"/> the class.
-    /// </summary>
-    /// <remarks>See <see cref="Cleaner"/>.</remarks>
-    public interface ICleanUp
-    {
-        /// <summary>
-        /// Cleans up the properties/state of the class.
-        /// </summary>
-        void CleanUp();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICollectionResult.cs b/src/CoreEx/Entities/ICollectionResult.cs
deleted file mode 100644
index 84848395..00000000
--- a/src/CoreEx/Entities/ICollectionResult.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Net.Http;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the <see cref="Paging"/> and <see cref="Items"/> for a collection result.
-    /// </summary>
-    /// <remarks>Generally an <see cref="ICollectionResult"/> is not intended for serialized <see cref="HttpResponseMessage"/>; the underlying <see cref="Items"/> is serialized with the <see cref="Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.</remarks>
-    public interface ICollectionResult
-    {
-        /// <summary>
-        /// Gets the underlying item <see cref="Type"/>.
-        /// </summary>
-        Type ItemType { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Items"/> <see cref="Type"/>.
-        /// </summary>
-        Type CollectionType { get;  }
-
-        /// <summary>
-        /// Gets or sets the <see cref="PagingResult"/>.
-        /// </summary>
-        PagingResult? Paging { get; set; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="ICollection"/>.
-        /// </summary>
-        ICollection Items { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICollectionResultT.cs b/src/CoreEx/Entities/ICollectionResultT.cs
deleted file mode 100644
index ea0448ca..00000000
--- a/src/CoreEx/Entities/ICollectionResultT.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the typed <typeparamref name="TItem"/> <see cref="Items"/>.
-    /// </summary>
-    /// <typeparam name="TItem">The The underlying item <see cref="Type"/>.</typeparam>
-    /// <remarks>Generally an <see cref="ICollectionResult"/> is not intended for serialized <see cref="HttpResponseMessage"/>; the underlying <see cref="Items"/> is serialized with the <see cref="ICollectionResult.Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.</remarks>
-    public interface ICollectionResult<TItem> : ICollectionResult
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="ICollection{TItem}"/>.
-        /// </summary>
-        new ICollection<TItem> Items { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICollectionResultT2.cs b/src/CoreEx/Entities/ICollectionResultT2.cs
deleted file mode 100644
index 2585c88c..00000000
--- a/src/CoreEx/Entities/ICollectionResultT2.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net.Http;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the typed <typeparamref name="TItem"/> <see cref="Items"/>.
-    /// </summary>
-    /// <typeparam name="TColl">The result collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TItem">The underlying item <see cref="Type"/>.</typeparam>
-    /// <remarks>Generally an <see cref="ICollectionResult"/> is not intended for serialized <see cref="HttpResponseMessage"/>; the underlying <see cref="Items"/> is serialized with the <see cref="ICollectionResult.Paging"/> returned as <see cref="HttpResponseMessage.Headers"/>.</remarks>
-    public interface ICollectionResult<TColl, TItem> : ICollectionResult<TItem> where TColl : ICollection<TItem>, new()
-    {
-        /// <inheritdoc/>
-        Type ICollectionResult.ItemType => typeof(TItem);
-
-        /// <inheritdoc/>
-        Type ICollectionResult.CollectionType => typeof(TColl);
-
-        /// <summary>
-        /// Gets or sets the underlying collection.
-        /// </summary>
-        new TColl Items { get; set; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="ICollection"/>.
-        /// </summary>
-        ICollection ICollectionResult.Items { get => (ICollection)Items; set => Items = value == null ? new TColl() : (TColl)value; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="ICollection{TEntity}"/>.
-        /// </summary>
-        ICollection<TItem> ICollectionResult<TItem>.Items { get => Items; set => Items = value == null ? new TColl() : (TColl)value; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICompositeKeyCollection.cs b/src/CoreEx/Entities/ICompositeKeyCollection.cs
deleted file mode 100644
index 9fa5abd3..00000000
--- a/src/CoreEx/Entities/ICompositeKeyCollection.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Enables the <see cref="CompositeKey"/> collection capabilities.
-    /// </summary>
-    public interface ICompositeKeyCollection: ICollection, IList
-    {
-        /// <summary>
-        /// Indicates whether an item with the specified <paramref name="key"/> exists.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <returns><c>true</c> where the item exists; otherwise, <c>false</c>.</returns>
-        bool ContainsKey(CompositeKey key);
-
-        /// <summary>
-        /// Gets the first item with the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <returns>The item where found; otherwise, <c>null</c>.</returns>
-        object? GetByKey(CompositeKey key);
-
-        /// <summary>
-        /// Removes all items with the specified primary <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        void RemoveByKey(CompositeKey key);
-
-        /// <summary>
-        /// Indicates whether there are any duplicate items in the collection.
-        /// </summary>
-        /// <returns><c>true</c> where there are one or more duplicates; otherwise, <c>false</c> where all items are unique.</returns>
-        bool IsAnyDuplicates();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICompositeKeyCollectionT.cs b/src/CoreEx/Entities/ICompositeKeyCollectionT.cs
deleted file mode 100644
index fba87577..00000000
--- a/src/CoreEx/Entities/ICompositeKeyCollectionT.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections.Generic;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the typed <see cref="ICompositeKeyCollection"/> capabilities.
-    /// </summary>
-    /// <typeparam name="T">The collection item <see cref="System.Type"/>.</typeparam>
-    public interface ICompositeKeyCollection<T> : ICompositeKeyCollection, ICollection<T>
-    {
-        /// <inheritdoc/>
-        object? ICompositeKeyCollection.GetByKey(CompositeKey key) => GetByKey(key);
-
-        /// <summary>
-        /// Gets the first item using the specified primary <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="CompositeKey"/>.</param>
-        /// <returns>The item where found; otherwise, <c>null</c>.</returns>
-        new T? GetByKey(CompositeKey key);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IContract.cs b/src/CoreEx/Entities/IContract.cs
new file mode 100644
index 00000000..ff002781
--- /dev/null
+++ b/src/CoreEx/Entities/IContract.cs
@@ -0,0 +1,6 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables the core contract capabilities.
+/// </summary>
+public interface IContract : IRuntimeMetadata, Extended.ICopyFrom, Extended.IDefault { }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IContractT.cs b/src/CoreEx/Entities/IContractT.cs
new file mode 100644
index 00000000..083f402c
--- /dev/null
+++ b/src/CoreEx/Entities/IContractT.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables the core contract capabilities.
+/// </summary>
+/// <typeparam name="T">The contract <see cref="Type"/>.</typeparam>
+public interface IContract<T> : IContract, IEquatable<T> { }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ICopyFrom.cs b/src/CoreEx/Entities/ICopyFrom.cs
deleted file mode 100644
index c174169b..00000000
--- a/src/CoreEx/Entities/ICopyFrom.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the ability to perform a deep <see cref="CopyFrom"/> another object.
-    /// </summary>
-    public interface ICopyFrom
-    {
-        /// <summary>
-        /// Performs a deep copy from another object updating this instance.
-        /// </summary>
-        /// <param name="other">The other value to copy from.</param>
-        void CopyFrom(object? other);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IETag.cs b/src/CoreEx/Entities/IETag.cs
index 1619efc2..e649d7d4 100644
--- a/src/CoreEx/Entities/IETag.cs
+++ b/src/CoreEx/Entities/IETag.cs
@@ -1,15 +1,15 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-namespace CoreEx.Entities
+/// <summary>
+/// Enables a mutable <see cref="ETag"/> for the likes of versioning (optimistic concurrency).
+/// </summary>
+public interface IETag : IReadOnlyETag
 {
+    /// <inheritdoc/>
+    string? IReadOnlyETag.ETag => ETag;
+
     /// <summary>
-    /// Provides the <see cref="ETag"/> property for the likes of versioning (optimistic concurrency).
+    /// Gets or sets the entity tag.
     /// </summary>
-    public interface IETag
-    {
-        /// <summary>
-        /// Gets or sets the entity tag.
-        /// </summary>
-        string? ETag { get; set; }
-    }
+    new string? ETag { get; set; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IEntityKey.cs b/src/CoreEx/Entities/IEntityKey.cs
index 24962805..456f4e2f 100644
--- a/src/CoreEx/Entities/IEntityKey.cs
+++ b/src/CoreEx/Entities/IEntityKey.cs
@@ -1,21 +1,15 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using CoreEx.Abstractions;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Enables base entity key support using a <see cref="CompositeKey"/>.
+/// </summary>
+/// <remarks>To enable key-based support in a consistent and standardized manner then this interface must be implemented; for example, see <see cref="IIdentifierCore"/>.</remarks>
+public interface IEntityKey
 {
     /// <summary>
-    /// Provides base entity key support using a <see cref="CompositeKey"/>.
+    /// Gets the key for the entity as a <see cref="CompositeKey"/>.
     /// </summary>
-    /// <remarks>To enable key-based support in a consistent and standardized manner then this interface must be implemented; i.e. <see cref="IIdentifier"/> and <see cref="IPrimaryKey"/>.</remarks>
-    public interface IEntityKey : IUniqueKey
-    {
-        /// <summary>
-        /// Gets the key for the entity as a <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <returns>The key represented as a <see cref="CompositeKey"/>.</returns>
-        [JsonIgnore]
-        CompositeKey EntityKey { get; }
-    }
+    /// <returns>The key represented as a <see cref="CompositeKey"/>.</returns>
+    [JsonIgnore]
+    CompositeKey EntityKey { get; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IIdentifier.cs b/src/CoreEx/Entities/IIdentifier.cs
deleted file mode 100644
index f7a27bf7..00000000
--- a/src/CoreEx/Entities/IIdentifier.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Enables the <see cref="Id"/> capability.
-    /// </summary>
-    public interface IIdentifier : IEntityKey
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        object? Id { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="Id"/> <see cref="Type"/>.
-        /// </summary>
-        [JsonIgnore]
-        Type IdType { get; }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        CompositeKey IEntityKey.EntityKey => new(Id);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IIdentifierGenerator.cs b/src/CoreEx/Entities/IIdentifierGenerator.cs
deleted file mode 100644
index a03b0bfb..00000000
--- a/src/CoreEx/Entities/IIdentifierGenerator.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Enables the generation of a new identifier value for <i>any</i> identifier <see cref="Type"/>.
-    /// </summary>
-    public interface IIdentifierGenerator
-    {
-        /// <summary>
-        /// Generate a new identifier value.
-        /// </summary>
-        /// <typeparam name="TId">The identifier <see cref="System.Type"/>.</typeparam>
-        /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
-        /// <returns>The newly generated identifier.</returns>
-        /// <remarks>The <typeparamref name="TFor"/> allows for the likes of different identity sequences per <see cref="System.Type"/> for example.</remarks>
-        Task<TId> GenerateIdentifierAsync<TId, TFor>();
-
-        /// <summary>
-        /// Assigns a generated identifier to the <paramref name="value"/> where the <see cref="IIdentifier.Id"/> has a default value.
-        /// </summary>
-        /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
-        /// <param name="value">The value to assign an identifier for.</param>
-        Task AssignIdentifierAsync<TFor>(TFor value);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IIdentifierGeneratorT.cs b/src/CoreEx/Entities/IIdentifierGeneratorT.cs
deleted file mode 100644
index 10b27b17..00000000
--- a/src/CoreEx/Entities/IIdentifierGeneratorT.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Threading.Tasks;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Enables the generation of a new identifier value.
-    /// </summary>
-    /// <typeparam name="TId">The identifier <see cref="System.Type"/>.</typeparam>
-    public interface IIdentifierGenerator<TId>
-    {
-        /// <summary>
-        /// Generate a new identifier value.
-        /// </summary>
-        /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
-        /// <returns>The newly generated identifier.</returns>
-        /// <remarks>The <typeparamref name="TFor"/> allows for the likes of different identity sequences per <see cref="System.Type"/> for example.</remarks>
-        Task<TId> GenerateIdentifierAsync<TFor>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IIdentifierT.cs b/src/CoreEx/Entities/IIdentifierT.cs
index 0989dde4..06c14b85 100644
--- a/src/CoreEx/Entities/IIdentifierT.cs
+++ b/src/CoreEx/Entities/IIdentifierT.cs
@@ -1,28 +1,41 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using System;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Enables a mutable identifier (<see cref="Id"/>) capability.
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+/// <remarks>The <typeparamref name="TId"/> is intended for primitive types; e.g. <see cref="string"/>, <see cref="int"/>, <see cref="long"/> and <see cref="Guid"/>.
+/// <para>See also the immutable <see cref="IReadOnlyIdentifier{TId}"/>.</para></remarks>
+public interface IIdentifier<TId> : IIdentifier, IReadOnlyIdentifier<TId>
 {
+    /// <inheritdoc/>
+    TId IReadOnlyIdentifier<TId>.Id => Id;
+
+    /// <summary>
+    /// Gets or sets the identifier.
+    /// </summary>
+    new TId Id { get; set; }
+
+    /// <inheritdoc/>
+    object? IIdentifierCore.Id => Id;
+
+    /// <inheritdoc/>
+    object? IIdentifier.Id { get => Id; set => Id = (TId)value!; }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    Type IIdentifierCore.IdType => typeof(TId);
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    bool IIdentifierCore.IsIdReadOnly => false;
+
+    /// <inheritdoc/>
+    void IIdentifierCore.SetIdentifier(object? id) => Id = (TId)id!;
+
     /// <summary>
-    /// Enables the identifier (<see cref="Id"/>) capability.
+    /// Sets (overrides) the identifier.
     /// </summary>
-    /// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
-    /// <remarks>The <typeparamref name="TId"/> is contrained to <see cref="IComparable{T}"/> and <see cref="IEquatable{T}"/> to largely limit the <see cref="Id"/> to primitive types; e.g. <see cref="string"/>, <see cref="int"/>,
-    /// <see cref="long"/> and <see cref="Guid"/>.</remarks>
-    public interface IIdentifier<TId> : IIdentifier where TId : IComparable<TId>, IEquatable<TId>
-    {
-        /// <inheritdoc/>
-        object? IIdentifier.Id { get => Id; set => Id = (TId)value!; }
-
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        new TId? Id { get; set; }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        Type IIdentifier.IdType => typeof(TId);
-    }
+    /// <param name="id">The identifier.</param>
+    public void SetIdentifier(TId id) => Id = id;
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IInitial.cs b/src/CoreEx/Entities/IInitial.cs
deleted file mode 100644
index aa803115..00000000
--- a/src/CoreEx/Entities/IInitial.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides a means to determine if a class is in its initial/default state and therefore the reference to this value should be reset to <c>null</c> during a <see cref="Cleaner.Clean{T}(T)"/> or <see cref="Cleaner.Clean{T}(T, bool)"/>
-    /// as per the <c>overrideWithNullWhenIsInitial</c> parameter.
-    /// </summary>
-    /// <remarks>See <see cref="Cleaner"/>.</remarks>
-    public interface IInitial
-    {
-        /// <summary>
-        /// Indicates whether considered initial; i.e. all properties have their initial/default value.
-        /// </summary>
-        bool IsInitial { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ILogicallyDeleted.cs b/src/CoreEx/Entities/ILogicallyDeleted.cs
deleted file mode 100644
index c3bca045..00000000
--- a/src/CoreEx/Entities/ILogicallyDeleted.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Enables an entity to identify whether it is logically deleted.
-    /// </summary>
-    public interface ILogicallyDeleted
-    {
-        /// <summary>
-        /// Indicates whether the entity is considered logically deleted.
-        /// </summary>
-        bool? IsDeleted { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IPagingResult.cs b/src/CoreEx/Entities/IPagingResult.cs
deleted file mode 100644
index e41954e1..00000000
--- a/src/CoreEx/Entities/IPagingResult.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides a <see cref="Paging"/> <see cref="PagingResult"/>.
-    /// </summary>
-    public interface IPagingResult
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="PagingResult"/>.
-        /// </summary>
-        PagingResult? Paging { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IPartitionKey.cs b/src/CoreEx/Entities/IPartitionKey.cs
deleted file mode 100644
index b7e6ed33..00000000
--- a/src/CoreEx/Entities/IPartitionKey.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the <see cref="PartitionKey"/>.
-    /// </summary>
-    public interface IPartitionKey
-    {
-        /// <summary>
-        /// Gets the partition key.
-        /// </summary>
-        public string? PartitionKey { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IPrimaryKey.cs b/src/CoreEx/Entities/IPrimaryKey.cs
deleted file mode 100644
index 0d0f6462..00000000
--- a/src/CoreEx/Entities/IPrimaryKey.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the <see cref="PrimaryKey"/>.
-    /// </summary>
-    public interface IPrimaryKey : IEntityKey
-    {
-        /// <summary>
-        /// Gets the <i>primary key</i> (represented as a <see cref="CompositeKey"/>).
-        /// </summary>
-        [JsonIgnore]
-        CompositeKey PrimaryKey { get; }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        CompositeKey IEntityKey.EntityKey => PrimaryKey;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IReadOnly.cs b/src/CoreEx/Entities/IReadOnly.cs
deleted file mode 100644
index 6a2fe77f..00000000
--- a/src/CoreEx/Entities/IReadOnly.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides a means to <see cref="MakeReadOnly"/> the class.
-    /// </summary>
-    public interface IReadOnly
-    {
-        /// <summary>
-        /// Indicates whether the entity is read only (see <see cref="MakeReadOnly"/>).
-        /// </summary>
-        public bool IsReadOnly { get; }
-
-        /// <summary>
-        /// Makes the entity read-only; such that it will no longer support any property changes (see <see cref="IsReadOnly"/>).
-        /// </summary>
-        public void MakeReadOnly();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IReadOnlyChangeLog.cs b/src/CoreEx/Entities/IReadOnlyChangeLog.cs
new file mode 100644
index 00000000..9d7f247e
--- /dev/null
+++ b/src/CoreEx/Entities/IReadOnlyChangeLog.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a read-only <see cref="ChangeLog"/>.
+/// </summary>
+public interface IReadOnlyChangeLog
+{
+    /// <summary>
+    /// Gets the <see cref="ChangeLog"/>.
+    /// </summary>
+    ChangeLog? ChangeLog { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IReadOnlyChangeLogEx.cs b/src/CoreEx/Entities/IReadOnlyChangeLogEx.cs
new file mode 100644
index 00000000..39f33ab9
--- /dev/null
+++ b/src/CoreEx/Entities/IReadOnlyChangeLogEx.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a read-only <see cref="CreatedBy"/>, <see cref="CreatedOn"/>, <see cref="UpdatedBy"/>, and <see cref="UpdatedOn"/>.
+/// </summary>
+public interface IReadOnlyChangeLogEx
+{
+    /// <summary>
+    /// Gets the user who created the entity.
+    /// </summary>
+    string? CreatedBy { get; }
+
+    /// <summary>
+    /// Gets the timestamp of when the entity was created.
+    /// </summary>
+    DateTimeOffset? CreatedOn { get; }
+
+    /// <summary>
+    /// Gets the user who last updated the entity.
+    /// </summary>
+    string? UpdatedBy { get; }
+
+    /// <summary>
+    /// Gets the timestamp of when the entity was last updated.
+    /// </summary>
+    DateTimeOffset? UpdatedOn { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IReadOnlyETag.cs b/src/CoreEx/Entities/IReadOnlyETag.cs
new file mode 100644
index 00000000..b8cc90ab
--- /dev/null
+++ b/src/CoreEx/Entities/IReadOnlyETag.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a read-only <see cref="ETag"/> for the likes of versioning (optimistic concurrency).
+/// </summary>
+public interface IReadOnlyETag
+{
+    /// <summary>
+    /// Gets the entity tag.
+    /// </summary>
+    string? ETag { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IReadOnlyIdentifierT.cs b/src/CoreEx/Entities/IReadOnlyIdentifierT.cs
new file mode 100644
index 00000000..33bc8cf5
--- /dev/null
+++ b/src/CoreEx/Entities/IReadOnlyIdentifierT.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a read-only identifier (<see cref="Id"/>) capability.
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+/// <remarks>The <typeparamref name="TId"/> is intended for primitive types; e.g. <see cref="string"/>, <see cref="int"/>, <see cref="long"/> and <see cref="Guid"/>.
+/// <para>See also the mutable <see cref="IIdentifier{TId}"/>.</para></remarks>
+public interface IReadOnlyIdentifier<TId> : IReadOnlyIdentifier
+{
+    /// <inheritdoc/>
+    object? IIdentifierCore.Id { get => Id; }
+
+    /// <summary>
+    /// Gets the identifier.
+    /// </summary>
+    new TId Id { get; }
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    Type IIdentifierCore.IdType => typeof(TId);
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    CompositeKey IEntityKey.EntityKey => CompositeKey.Create(Id);
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    bool IIdentifierCore.IsIdReadOnly => true;
+
+    /// <inheritdoc/>
+    void IIdentifierCore.SetIdentifier(object? id) => throw new InvalidOperationException("Identifier is read-only.");
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ITenantId.cs b/src/CoreEx/Entities/ITenantId.cs
deleted file mode 100644
index 1544d717..00000000
--- a/src/CoreEx/Entities/ITenantId.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Provides the <see cref="TenantId"/>.
-    /// </summary>
-    public interface ITenantId
-    {
-        /// <summary>
-        /// Gets or sets the tenant identifier.
-        /// </summary>
-        string? TenantId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IValueResult.cs b/src/CoreEx/Entities/IValueResult.cs
new file mode 100644
index 00000000..1e725fa7
--- /dev/null
+++ b/src/CoreEx/Entities/IValueResult.cs
@@ -0,0 +1,19 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a <see cref="Value"/> result wrapper (non-error) that contains additional context.
+/// </summary>
+/// <remarks>This is not intended for error scenarios, as the likes of an <see cref="Exception"/>, <see cref="Result"/> or <see cref="Result{T}"/> enable accordingly.</remarks>
+internal interface IValueResult
+{
+    /// <summary>
+    /// Gets the value.
+    /// </summary>
+    object? Value { get; }
+
+    /// <summary>
+    /// Gets the resulting <see cref="HttpStatusCode"/>.
+    /// </summary>
+    /// <remarks>This does not imply that the result has to be used in an HTTP context; just that this represents a number of well-known statuses.</remarks>
+    HttpStatusCode? StatusCode { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IValueResultT.cs b/src/CoreEx/Entities/IValueResultT.cs
new file mode 100644
index 00000000..638518c7
--- /dev/null
+++ b/src/CoreEx/Entities/IValueResultT.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Enables a typed <see cref="Value"/> result wrapper (non-error) that contains additional context.
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+/// <remarks>This is not intended for error scenarios, as the likes of an <see cref="Exception"/>, <see cref="Result"/> or <see cref="Result{T}"/> enable accordingly.</remarks>
+internal interface IValueResult<T> : IValueResult
+{
+    /// <inheritdoc/>
+    object? IValueResult.Value => Value;
+
+    /// <summary>
+    /// Gets the value.
+    /// </summary>
+    new T Value { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/IdentifierGenerator.cs b/src/CoreEx/Entities/IdentifierGenerator.cs
index 36b4eb42..f8165bc4 100644
--- a/src/CoreEx/Entities/IdentifierGenerator.cs
+++ b/src/CoreEx/Entities/IdentifierGenerator.cs
@@ -1,54 +1,51 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Provides a <see cref="string"/> and <see cref="Guid"/> <see cref="IIdentifierGenerator"/> where each is created using a <see cref="Guid"/>.
+/// </summary>
+/// <remarks>A custom <see cref="IIdentifierGenerator"/> can be used to support different identifier generation strategies and identifier types as necessary.</remarks>
+public class IdentifierGenerator : IIdentifierGenerator
 {
+    private static readonly IIdentifierGenerator _default = new IdentifierGenerator();
+
     /// <summary>
-    /// Provides an <see cref="IIdentifierGenerator{T}"/> for both a <see cref="string"/> and <see cref="Guid"/> where each is created using <see cref="Guid.NewGuid()"/>.
+    /// Gets the current <see cref="IIdentifierGenerator"/> from the <see cref="ExecutionContext"/>, or the default <see cref="IdentifierGenerator"/> where not available.
     /// </summary>
-    public class IdentifierGenerator : IIdentifierGenerator, IIdentifierGenerator<string>, IIdentifierGenerator<Guid>
-    {
-        /// <inheritdoc/>
-        public async Task<TId> GenerateIdentifierAsync<TId, TFor>() => typeof(TId) switch
-        {
-            Type _ when typeof(TId) == typeof(string) => (TId)Convert.ChangeType(await ((IIdentifierGenerator<string>)this).GenerateIdentifierAsync<TFor>().ConfigureAwait(false), typeof(TId)),
-            Type _ when typeof(TId) == typeof(Guid) => (TId)Convert.ChangeType(await ((IIdentifierGenerator<Guid>)this).GenerateIdentifierAsync<TFor>().ConfigureAwait(false), typeof(TId)),
-            _ => throw new NotSupportedException($"Identifier Type '{typeof(TId).Name}' is not supported; only String or Guid.")
-        };
+    public static IIdentifierGenerator Current => ExecutionContext.GetService<IIdentifierGenerator>() ?? _default;
 
-        /// <inheritdoc/>
-        public async Task AssignIdentifierAsync<TFor>(TFor value)
-        {
-            if (value is not IIdentifier ii)
-                return;
+    /// <inheritdoc/>
+    public Guid GenerateGuid()
+#if NET9_0_OR_GREATER
+        => Guid.CreateVersion7();
+#else
+        => Guid.NewGuid();
+#endif
 
-            if (value is IIdentifier<string> iis)
-                iis.Id ??= await ((IIdentifierGenerator<string>)this).GenerateIdentifierAsync<TFor>().ConfigureAwait(false);
-            else if (value is IIdentifier<Guid> iig)
-            {
-                if (iig.Id == Guid.Empty)
-                    iig.Id = await ((IIdentifierGenerator<Guid>)this).GenerateIdentifierAsync<TFor>().ConfigureAwait(false);
-            }
-            else
-                throw new NotSupportedException($"Identifier Type '{ii.IdType.Name}' is not supported; only String or Guid.");
-        }
+    /// <inheritdoc/>
+    public Task<TId> GenerateIdentifierAsync<TId>() => Task.FromResult(typeof(TId) switch
+    {
+        Type _ when typeof(TId) == typeof(string) => Internal.Cast<string, TId>(GenerateGuid().ToString()),
+        Type _ when typeof(TId) == typeof(Guid) => Internal.Cast<Guid, TId>(GenerateGuid()),
+        _ => throw new NotSupportedException($"Identifier Type '{typeof(TId).Name}' is not supported; only String or Guid.")
+    });
+
+    /// <inheritdoc/>
+    public async Task<TId> GenerateIdentifierAsync<TId, TFor>() where TFor : class => await GenerateIdentifierAsync<TId>().ConfigureAwait(false);
 
-        /// <summary>
-        /// Generate a new identifier value being a <see cref="Guid.NewGuid()"/> formatted as a <see cref="string"/>.
-        /// </summary>
-        /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
-        /// <returns>The newly generated identifier.</returns>
-        /// <remarks>The <typeparamref name="TFor"/> allows for the likes of different identity sequences per <see cref="System.Type"/> for example.</remarks>
-        public Task<string> GenerateIdentifierAsync<TFor>() => Task.FromResult(Guid.NewGuid().ToString());
+    /// <inheritdoc/>
+    public async Task AssignIdentifierAsync<TFor>(TFor value) where TFor : class
+    {
+        if (value is not IReadOnlyIdentifier ii)
+            return;
 
-        /// <summary>
-        /// Generate a new identifier value being a <see cref="Guid.NewGuid()"/>
-        /// </summary>
-        /// <typeparam name="TFor">The <see cref="System.Type"/> to generate for.</typeparam>
-        /// <returns>The newly generated identifier.</returns>
-        /// <remarks>The <typeparamref name="TFor"/> allows for the likes of different identity sequences per <see cref="System.Type"/> for example.</remarks>
-        Task<Guid> IIdentifierGenerator<Guid>.GenerateIdentifierAsync<TFor>() => Task.FromResult(Guid.NewGuid());
+        if (value is IIdentifier<string> iis)
+            iis.Id ??= await GenerateIdentifierAsync<string, TFor>().ConfigureAwait(false);
+        else if (value is IIdentifier<Guid> iig)
+        {
+            if (iig.Id == Guid.Empty)
+                iig.Id = await GenerateIdentifierAsync<Guid, TFor>().ConfigureAwait(false);
+        }
+        else
+            throw new NotSupportedException($"Identifier Type '{ii.IdType.Name}' is not supported; only String or Guid.");
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/MessageCollection.cs b/src/CoreEx/Entities/MessageCollection.cs
new file mode 100644
index 00000000..b4500a77
--- /dev/null
+++ b/src/CoreEx/Entities/MessageCollection.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Represents a <see cref="MessageItem"/> collection.
+/// </summary>
+public class MessageItemCollection : ObservableCollection<MessageItem>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MessageItemCollection" /> class.
+    /// </summary>
+    public MessageItemCollection() { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MessageItemCollection" /> class.
+    /// </summary>
+    /// <param name="messages">Initial messages to add.</param>
+    public MessageItemCollection(IEnumerable<MessageItem> messages) : base(messages) { }
+
+    /// <summary>
+    /// Adds zero or more <paramref name="messages"/> to the collection.
+    /// </summary>
+    /// <param name="messages">The messages.</param>
+    public void AddRange(IEnumerable<MessageItem> messages)
+    {
+        foreach (var m in messages)
+            Add(m);
+    }
+
+    /// <summary>
+    /// Determines whether a <see cref="MessageItem"/> exists for a selected <see cref="MessageType"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <returns><see langword="true"/> if a message exists; otherwise, <see langword="false"/>.</returns>
+    public bool ContainsType(MessageType type) => this.Any(x => x.Type == type);
+
+    /// <summary>
+    /// Gets a new <see cref="MessageItemCollection"/> items for the selected <see cref="MessageType"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <returns>The new <see cref="MessageItemCollection"/>.</returns>
+    public MessageItemCollection GetMessagesForType(MessageType type) => new(this.Where(x => x.Type == type));
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/MessageItem.Create.cs b/src/CoreEx/Entities/MessageItem.Create.cs
new file mode 100644
index 00000000..cfd03088
--- /dev/null
+++ b/src/CoreEx/Entities/MessageItem.Create.cs
@@ -0,0 +1,95 @@
+namespace CoreEx.Entities;
+
+public partial record class MessageItem
+{
+    /// <summary>
+    /// Creates a new <see cref="MessageItem"/> with a specified <see cref="MessageType"/> and text.
+    /// </summary>
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <param name="text">The message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateMessage(MessageType type, LText text) => new() { Type = type, Text = text };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageItem"/> with a specified <see cref="MessageType"/>, text format and and additional values included in the text.
+    /// </summary>
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateMessage(MessageType type, LText format, params IEnumerable<object?> values) => new() { Type = type, Text = format.EnsureNoArgs().WithArgs(values) };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageItem"/> with the specified <see cref="Property"/>, <see cref="MessageType"/> and text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <param name="text">The message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateMessage(string? property, MessageType type, LText text) => new() { Property = property, Type = type, Text = text };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageItem"/> with the specified <see cref="Property"/>, <see cref="MessageType"/>, text format and additional values included in the text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateMessage(string? property, MessageType type, LText format, params IEnumerable<object?> values)
+        => new() { Property = property, Type = type, Text = format.EnsureNoArgs().WithArgs(values) };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified <see cref="Property"/> and text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="text">The message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateErrorMessage(string? property, LText text) => new() { Property = property, Type = MessageType.Error, Text = text };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified <see cref="Property"/>, text format and additional values included in the text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateErrorMessage(string? property, LText format, params IEnumerable<object?> values)
+        => new() { Property = property, Type = MessageType.Error, Text = format.EnsureNoArgs().WithArgs(values) };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Warning"/> <see cref="MessageItem"/> with the specified <see cref="Property"/> and text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="text">The message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateWarningMessage(string? property, LText text) => new() { Property = property, Type = MessageType.Warning, Text = text };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Warning"/> <see cref="MessageItem"/> with the specified <see cref="Property"/>, text format and additional values included in the text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateWarningMessage(string? property, LText format, params IEnumerable<object?> values)
+        => new() { Property = property, Type = MessageType.Warning, Text = format.EnsureNoArgs().WithArgs(values) };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Info"/> <see cref="MessageItem"/> with the specified <see cref="Property"/> and text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="text">The message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateInfoMessage(string? property, LText text) => new() { Property = property, Type = MessageType.Info, Text = text };
+
+    /// <summary>
+    /// Creates a new <see cref="MessageType.Info"/> <see cref="MessageItem"/> with the specified <see cref="Property"/>, text format and additional values included in the text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>A <see cref="MessageItem"/>.</returns>
+    public static MessageItem CreateInfoMessage(string? property, LText format, params IEnumerable<object?> values)
+        => new() { Property = property, Type = MessageType.Info, Text = format.EnsureNoArgs().WithArgs(values) };
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/MessageItem.cs b/src/CoreEx/Entities/MessageItem.cs
index 38bf4d80..9ade7577 100644
--- a/src/CoreEx/Entities/MessageItem.cs
+++ b/src/CoreEx/Entities/MessageItem.cs
@@ -1,113 +1,48 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using CoreEx.Localization;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Represents a <see cref="MessageItem"/>.
+/// </summary>
+[DebuggerDisplay("Type = {Type}, Text = {Text}, Property = {Property}")]
+public partial record class MessageItem()
 {
     /// <summary>
-    /// Represents a <see cref="MessageItem"/>.
+    /// Creates a new instance of the <see cref="MessageItem"/> class.
     /// </summary>
-    [System.Diagnostics.DebuggerDisplay("Type = {Type}, Text = {Text}, Property = {Property}")]
-    [System.Diagnostics.DebuggerStepThrough]
-    public class MessageItem
+    /// <param name="type">The <see cref="MessageType"/>.</param>
+    /// <param name="text">The message <see cref="LText"/>.</param>
+    /// <param name="property">The optional property that the message relates to.</param>
+    public MessageItem(MessageType type, LText text, string? property = null) : this()
     {
-        #region Static
-
-        /// <summary>
-        /// Creates a new <see cref="MessageItem"/> with a specified <see cref="MessageType"/> and text.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public static MessageItem CreateMessage(MessageType type, LText text) => new() { Type = type, Text = text };
-
-        /// <summary>
-        /// Creates a new <see cref="MessageItem"/> with a specified <see cref="MessageType"/>, text format and and additional values included in the text.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public static MessageItem CreateMessage(MessageType type, LText format, params object[] values) => new() { Type = type, Text = string.Format(System.Globalization.CultureInfo.CurrentCulture, format, values) };
-
-        /// <summary>
-        /// Creates a new <see cref="MessageItem"/> with the specified <see cref="Property"/>, <see cref="MessageType"/> and text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public static MessageItem CreateMessage(string? property, MessageType type, LText text) => new() { Property = property, Type = type, Text = text };
-
-        /// <summary>
-        /// Creates a new <see cref="MessageItem"/> with the specified <see cref="Property"/>, <see cref="MessageType"/>, text format and additional values included in the text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public static MessageItem CreateMessage(string? property, MessageType type, LText format, params object?[] values)
-            => new() { Property = property, Type = type, Text = string.Format(System.Globalization.CultureInfo.CurrentCulture, format, values) };
-
-        /// <summary>
-        /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified <see cref="Property"/> and text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public static MessageItem CreateErrorMessage(string? property, LText text) => new() { Property = property, Type = MessageType.Error, Text = text };
-
-        /// <summary>
-        /// Creates a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> with the specified <see cref="Property"/>, text format and additional values included in the text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public static MessageItem CreateErrorMessage(string property, LText format, params object?[] values) 
-            => new() { Property = property, Type = MessageType.Error, Text = string.Format(System.Globalization.CultureInfo.CurrentCulture, format, values) };
-
-        #endregion
-
-        /// <summary>
-        /// Gets the message severity type.
-        /// </summary>
-        public MessageType Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the message text.
-        /// </summary>
-        public string? Text { get; set; }
+        Type = type;
+        Text = text;
+        Property = property;
+    }
 
-        /// <summary>
-        /// Gets or sets the name of the property that the message relates to.
-        /// </summary>
-        public string? Property { get; set; }
+    /// <summary>
+    /// Gets the message severity type.
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public MessageType Type { get; set; }
 
-        /// <summary>
-        /// Gets or sets an optional user tag associated with the message.
-        /// </summary>
-        /// <remarks>Note: This property is not serialized/deserialized.</remarks>
-        [JsonIgnore]
-        public object? Tag { get; set; }
+    /// <summary>
+    /// Gets or sets the message <see cref="LText"/>.
+    /// </summary>
+    public LText? Text { get; set; }
 
-        /// <summary>
-        /// Returns the message <see cref="Text"/>.
-        /// </summary>
-        /// <returns>The message <see cref="Text"/>.</returns>
-        public override string ToString() => Text ?? string.Empty;
+    /// <summary>
+    /// Gets or sets the name of the property that the message relates to.
+    /// </summary>
+    public string? Property { get; set; }
 
-        /// <summary>
-        /// Sets the <see cref="Property"/> and returns <see cref="MessageItem"/> instance to enable fluent-style.
-        /// </summary>
-        /// <param name="property">The name of the property that the message relates to.</param>
-        /// <returns>This <see cref="MessageItem"/> instance.</returns>
-        public MessageItem SetProperty(string property)
-        {
-            Property = property;
-            return this;
-        }
+    /// <summary>
+    /// Sets the <see cref="Property"/>.
+    /// </summary>
+    /// <param name="property">The name of the property that the message relates to.</param>
+    /// <returns>This <see cref="MessageItem"/> to support fluent-style method-chaining.</returns>
+    public MessageItem WithProperty(string property)
+    {
+        Property = property;
+        return this;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/MessageItemCollection.cs b/src/CoreEx/Entities/MessageItemCollection.cs
deleted file mode 100644
index 192b3673..00000000
--- a/src/CoreEx/Entities/MessageItemCollection.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Localization;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents a <see cref="MessageItem"/> collection.
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class MessageItemCollection : ObservableCollection<MessageItem>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MessageItemCollection" /> class.
-        /// </summary>
-        public MessageItemCollection() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MessageItemCollection" /> class.
-        /// </summary>
-        /// <param name="messages">Initial messages to add.</param>
-        public MessageItemCollection(IEnumerable<MessageItem> messages) : base(messages) { }
-
-        /// <summary>
-        /// Adds zero or more <paramref name="messages"/> to the collection.
-        /// </summary>
-        /// <param name="messages">The messages.</param>
-        public void AddRange(IEnumerable<MessageItem> messages) => messages.ForEach(Add);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageItem"/> for a specified <see cref="MessageType"/> and text.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem Add(MessageType type, LText text)
-        {
-            MessageItem item = MessageItem.CreateMessage(type, text);
-            this.Add(item);
-            return item;
-        }
-
-        /// <summary>
-        /// Adds a new <see cref="MessageItem"/> for a specified <see cref="MessageType"/>, text format and additional values included in the text.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem Add(MessageType type, LText format, params object[] values)
-        {
-            MessageItem item = MessageItem.CreateMessage(type, format, values);
-            this.Add(item);
-            return item;
-        }
-
-        /// <summary>
-        /// Adds a new <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/>, <see cref="MessageType"/> and text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem Add(string? property, MessageType type, LText text)
-        {
-            MessageItem item = MessageItem.CreateMessage(property, type, text);
-            this.Add(item);
-            return item;
-        }
-
-        /// <summary>
-        /// Adds a new <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/>, <see cref="MessageType"/>, text format and additional values included in the text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem Add(string? property, MessageType type, LText format, params object?[] values)
-        {
-            MessageItem item = MessageItem.CreateMessage(property, type, format, values);
-            this.Add(item);
-            return item;
-        }
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> for a specified text.
-        /// </summary>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddError(LText text) => Add(MessageType.Error, text);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> for a specified text format and additional values included in the text.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddError(LText format, params object[] values) => Add(MessageType.Error, format, values);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/> and text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddPropertyError(string property, LText text) => Add(property, MessageType.Error, text);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Error"/> <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/>, text format and and additional values included in the text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddPropertyError(string property, LText format, params object[] values) => Add(property, MessageType.Error, format, values);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Warning"/> <see cref="MessageItem"/> for a specified text.
-        /// </summary>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddWarning(LText text) => Add(MessageType.Warning, text);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Warning"/> <see cref="MessageItem"/> for a specified text format and additional values included in the text.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddWarning(LText format, params object[] values) => Add(MessageType.Warning, format, values);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Warning"/> <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/> and text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddPropertyWarning(string property, LText text) => Add(property, MessageType.Warning, text);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Warning"/> <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/>, text format and and additional values included in the text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddPropertyWarning(string property, LText format, params object[] values) => Add(property, MessageType.Warning, format, values);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Info"/> <see cref="MessageItem"/> for a specified text.
-        /// </summary>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddInfo(LText text) => Add(MessageType.Info, text);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Info"/> <see cref="MessageItem"/> for a specified text format and additional values included in the text.
-        /// </summary>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddInfo(LText format, params object[] values) => Add(MessageType.Info, format, values);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Info"/> <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/> and text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="text">The message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddPropertyInfo(string property, LText text) => Add(property, MessageType.Info, text);
-
-        /// <summary>
-        /// Adds a new <see cref="MessageType.Info"/> <see cref="MessageItem"/> for the specified <see cref="MessageItem.Property"/>, text format and and additional values included in the text.
-        /// </summary>
-        /// <param name="property">The property name.</param>
-        /// <param name="format">The composite format string.</param>
-        /// <param name="values">The values that form part of the message text.</param>
-        /// <returns>A <see cref="MessageItem"/>.</returns>
-        public MessageItem AddPropertyInfo(string property, LText format, params object[] values) => Add(property, MessageType.Info, format, values);
-
-        /// <summary>
-        /// Gets a new <see cref="MessageItemCollection"/> for a selected <see cref="MessageType"/>.
-        /// </summary>
-        /// <param name="type">Message severity type.</param>
-        /// <returns>A new <see cref="MessageItemCollection"/>.</returns>
-        public MessageItemCollection GetMessagesForType(MessageType type) => new(this.Where(x => x.Type == type));
-
-        /// <summary>
-        /// Gets a new <see cref="MessageItemCollection"/> for a selected <see cref="MessageType"/> and <see cref="MessageItem.Property"/>.
-        /// </summary>
-        /// <param name="type">Message severity type.</param>
-        /// <param name="property">The name of the property that the message relates to.</param>
-        /// <returns>A new <see cref="MessageItemCollection"/>.</returns>
-        public MessageItemCollection GetMessagesForType(MessageType type, string property) => new(this.Where(x => x.Type == type && x.Property == property));
-
-        /// <summary>
-        /// Gets a new <see cref="MessageItemCollection"/> for a selected <see cref="MessageItem.Property"/>.
-        /// </summary>
-        /// <param name="property">The name of the property that the message relates to.</param>
-        /// <returns>A new <see cref="MessageItemCollection"/>.</returns>
-        public MessageItemCollection GetMessagesForProperty(string property) => new(this.Where(x => x.Property == property));
-
-        /// <summary>
-        /// Determines whether a message exists for a <see cref="MessageItem.Property"/> <see cref="MessageType.Error"/>.
-        /// </summary>
-        /// <param name="property">The name of the property that the message relates to.</param>
-        /// <returns><c>true</c> if a message exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsError(string property) => ContainsType(MessageType.Error, property);
-
-        /// <summary>
-		/// Determines whether a message exists for a selected <see cref="MessageType"/>.
-		/// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-		/// <returns><c>true</c> if a message exists; otherwise, <c>false</c>.</returns>
-		public bool ContainsType(MessageType type) => this.Any(x => x.Type == type);
-
-        /// <summary>
-        /// Determines whether a message exists for a selected <see cref="MessageType"/> and <see cref="MessageItem.Property"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="MessageType"/>.</param>
-        /// <param name="property">The name of the property that the message relates to.</param>
-        /// <returns><c>true</c> if a message exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsType(MessageType type, string property) => this.Any(x => x.Type == type && x.Property == property);
-
-        /// <summary>
-        /// Determines whether a message exists for a selected <see cref="MessageItem.Property"/>.
-        /// </summary>
-        /// <param name="property">The name of the property that the message relates to.</param>
-        /// <returns><c>true</c> if a message exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsProperty(string property) => this.Any(x => x.Property == property);
-
-        /// <summary>
-        /// Outputs the list of messages as a <see cref="string"/>.
-        /// </summary>
-        /// <returns>The list of messages as a <see cref="string"/>.</returns>
-        public override string ToString()
-        {
-            if (Count == 0)
-                return new LText("None.");
-
-            var sb = new StringBuilder();
-            foreach (var item in this)
-            {
-                if (sb.Length > 0)
-                    sb.AppendLine();
-
-                sb.Append($"{item.Type}: {item.Text}");
-                if (!string.IsNullOrEmpty(item.Property))
-                    sb.Append($" [{item.Property}]");
-            }
-
-            return sb.ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/MessageType.cs b/src/CoreEx/Entities/MessageType.cs
index 51d0d963..ab8fab60 100644
--- a/src/CoreEx/Entities/MessageType.cs
+++ b/src/CoreEx/Entities/MessageType.cs
@@ -1,25 +1,22 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-namespace CoreEx.Entities
+/// <summary>
+/// Represents the type of <see cref="MessageItem"/>.
+/// </summary>
+public enum MessageType
 {
     /// <summary>
-    /// Represents the type of <see cref="MessageItem"/>.
+    /// Indicates an informational message.
     /// </summary>
-    public enum MessageType
-    {
-        /// <summary>
-        /// Indicates an informational message.
-        /// </summary>
-        Info = 0,
+    Info = 0,
 
-        /// <summary>
-        /// Indicates a warning message.
-        /// </summary>
-        Warning = 1,
+    /// <summary>
+    /// Indicates a warning message.
+    /// </summary>
+    Warning = 1,
 
-        /// <summary>
-        /// Indicates an error message.
-        /// </summary>
-        Error = 2,
-    }
+    /// <summary>
+    /// Indicates an error message.
+    /// </summary>
+    Error = 2,
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/PagingArgs.cs b/src/CoreEx/Entities/PagingArgs.cs
deleted file mode 100644
index 549e5fb4..00000000
--- a/src/CoreEx/Entities/PagingArgs.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using System;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents position-based paging being a) <see cref="Page"/> and <see cref="Size"/>, b) <see cref="Skip"/> and <see cref="Take"/>, or c) <see cref="Token"/> and <see cref="Take"/>. The <see cref="DefaultTake"/> and <see cref="MaxTake"/> (and <see cref="DefaultIsGetCount"/>) 
-    /// are static settings to encourage page-size consistency, as well as limit the maximum value possible. 
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class PagingArgs : IEquatable<PagingArgs>
-    {
-        private static long? _defaultTake;
-        private static long? _maxTake;
-
-        /// <summary>
-        /// Gets or sets the default <see cref="Take"/> size.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="SettingsBase.PagingDefaultTake"/> where specified; otherwise, <c>100</c>.</remarks>
-        public static long DefaultTake
-        {
-            get => _defaultTake ?? ExecutionContext.GetService<SettingsBase>()?.PagingDefaultTake ?? 100;
-
-            set
-            {
-                if (value > 0)
-                    _defaultTake = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the absolute maximum <see cref="Take"/> size allowed.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="SettingsBase.PagingMaxTake"/> where specified; otherwise, <c>1000</c>.</remarks>
-        public static long MaxTake
-        {
-            get => _maxTake ?? ExecutionContext.GetService<SettingsBase>()?.PagingMaxTake ?? 1000;
-
-            set
-            {
-                if (value > 0)
-                    _maxTake = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the default <see cref="IsGetCount"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>false</c>.</remarks>
-        public static bool DefaultIsGetCount { get; set; }
-
-        /// <summary>
-        /// Indicates whether <see cref="Token"/>-based paging is supported.
-        /// </summary>
-        /// <remarks>Defaults to <c>false</c>.</remarks>
-        public static bool IsTokenSupported { get; set; } = false;
-
-        /// <summary>
-        /// Creates a <see cref="PagingArgs"/> for a specified page number and size.
-        /// </summary>
-        /// <param name="page">The <see cref="Page"/> number.</param>
-        /// <param name="size">The page <see cref="Size"/> (defaults to <see cref="DefaultTake"/>).</param>
-        /// <param name="isGetCount">Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <see cref="DefaultIsGetCount"/> where <c>null</c>).</param>
-        /// <returns>The <see cref="PagingArgs"/>.</returns>
-        public static PagingArgs CreatePageAndSize(long page, long? size = null, bool? isGetCount = null)
-        {
-            var pa = new PagingArgs
-            {
-                Page = page < 0 ? 1 : page,
-                Take = !size.HasValue || size.Value < 1 ? DefaultTake : Math.Min(size.Value, MaxTake),
-                IsGetCount = isGetCount == null ? DefaultIsGetCount : isGetCount.Value
-            };
-
-            pa.Skip = (pa.Page.Value - 1) * pa.Size;
-            return pa;
-        }
-
-        /// <summary>
-        /// Creates a <see cref="PagingArgs"/> for a specified skip and take.
-        /// </summary>
-        /// <param name="skip">The <see cref="Skip"/> value.</param>
-        /// <param name="take">The <see cref="Take"/> value (defaults to <see cref="DefaultTake"/>).</param>
-        /// <param name="isGetCount">Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <see cref="DefaultIsGetCount"/> where <c>null</c>).</param>
-        /// <returns>The <see cref="PagingArgs"/>.</returns>
-        public static PagingArgs CreateSkipAndTake(long skip, long? take = null, bool? isGetCount = null) => new()
-        {
-            Skip = skip < 0 ? 0 : skip,
-            Take = !take.HasValue || take.Value < 1 ? DefaultTake : (take.Value > MaxTake ? MaxTake : take.Value),
-            IsGetCount = isGetCount == null ? DefaultIsGetCount : isGetCount.Value
-        };
-
-        /// <summary>
-        /// Creates a <see cref="PagingArgs"/> for a specified token and take.
-        /// </summary>
-        /// <param name="token">The <see cref="Token"/> to use to get the next page of elements.</param>
-        /// <param name="take">The <see cref="Take"/> value (defaults to <see cref="DefaultTake"/>).</param>
-        /// <param name="isGetCount">Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <see cref="DefaultIsGetCount"/> where <c>null</c>).</param>
-        /// <returns>The <see cref="PagingArgs"/>.</returns>
-        public static PagingArgs CreateTokenAndTake(string token, long? take = null, bool? isGetCount = null) => new ()
-        {
-            Token = IsTokenSupported ? token.ThrowIfNullOrEmpty() : throw new NotSupportedException($"{nameof(Token)}-based paging is not supported."),
-            Take = !take.HasValue || take.Value< 1 ? DefaultTake : (take.Value > MaxTake? MaxTake : take.Value),
-            IsGetCount = isGetCount == null ? DefaultIsGetCount : isGetCount.Value
-        };
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PagingArgs"/> class with default <see cref="Skip"/> and <see cref="Take"/>.
-        /// </summary>
-        public PagingArgs()
-        {
-            Skip = 0;
-            Take = DefaultTake;
-            IsGetCount = DefaultIsGetCount;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PagingArgs"/> class copying the values from <paramref name="pagingArgs"/>.
-        /// </summary>
-        /// <param name="pagingArgs">The <see cref="PagingArgs"/> to copy from.</param>
-        public PagingArgs(PagingArgs pagingArgs)
-        {
-            Skip = pagingArgs.ThrowIfNull().Skip;
-            Take = pagingArgs.Take;
-            Page = pagingArgs.Page;
-            Token = pagingArgs.Token;
-            IsGetCount = pagingArgs.IsGetCount;
-        }
-
-        /// <summary>
-        /// Gets the page number for the elements in a sequence to select (see <see cref="CreatePageAndSize(long, long?, bool?)"/>).
-        /// </summary>
-        public long? Page { get; internal protected set; }
-
-        /// <summary>
-        /// Gets the specified number of elements in a sequence to bypass.
-        /// </summary>
-        public long? Skip { get; internal protected set; }
-
-        /// <summary>
-        /// Gets the token to use to get the next page of elements (see <see cref="CreateTokenAndTake(string?, long?, bool?)"/>).
-        /// </summary>
-        public string? Token { get; internal protected set; }
-
-        /// <summary>
-        /// Indicates the <see cref="PagingOption"/>.
-        /// </summary>
-        public PagingOption Option => Page is not null ? PagingOption.PageAndSize : (Token is not null ? PagingOption.TokenAndTake : PagingOption.SkipAndTake);
-
-        /// <summary>
-        /// Gets the page size (synonym for <see cref="Take"/>).
-        /// </summary>
-        [JsonIgnore]
-        public long Size => Take;
-
-        /// <summary>
-        /// Gets the specified number of contiguous elements from the start of a sequence.
-        /// </summary>
-        public long Take { get; internal protected set; }
-
-        /// <summary>
-        /// Overrides/updates the <see cref="Skip"/> value.
-        /// </summary>
-        /// <param name="skip">The new skip value.</param>
-        /// <returns>The <see cref="PagingArgs"/> instance to support fluent-style method chaining.</returns>
-        public PagingArgs OverrideSkip(long skip)
-        {
-            if (Option == PagingOption.TokenAndTake)
-                throw new InvalidOperationException($"Cannot override {nameof(Skip)} where {nameof(Option)} is {nameof(PagingOption.TokenAndTake)}.");
-
-            if (skip == Skip)
-                return this;
-
-            Skip = skip < 0 ? 0 : skip;
-            return this;
-        }
-
-        /// <summary>
-        /// Overrides/updates the <see cref="Take"/> value bypassing the <see cref="MaxTake"/> checking.
-        /// </summary>
-        /// <param name="take">The new take value.</param>
-        /// <returns>The <see cref="PagingArgs"/> instance to support fluent-style method chaining.</returns>
-        public PagingArgs OverrideTake(long take)
-        {
-            Take = take < 0 ? 0 : take;
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <c>false</c>).
-        /// </summary>
-        [JsonPropertyName("count")]
-        public bool IsGetCount { get; set; } = false;
-
-        #region Equality
-
-        /// <inheritdoc/>
-        public override bool Equals(object? obj) => obj is PagingArgs pa && Equals(pa);
-
-        /// <inheritdoc/>
-        public bool Equals(PagingArgs? other) => other is not null && Skip == other.Skip && Take == other.Take && Page == other.Page && Token == other.Token && IsGetCount == other.IsGetCount;
-
-        /// <summary>
-        /// Indicates whether the current <see cref="PagingArgs"/> is equal to another <see cref="PagingArgs"/>.
-        /// </summary>
-        public static bool operator ==(PagingArgs? left, PagingArgs? right) => (left is null && right is null) || (left is not null && right is not null && left.Equals(right));
-
-        /// <summary>
-        /// Indicates whether the current <see cref="PagingArgs"/> is not equal to another <see cref="PagingArgs"/>.
-        /// </summary>
-        public static bool operator !=(PagingArgs? left, PagingArgs? right) => !(left == right);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => HashCode.Combine(Skip, Take, Page, Token, IsGetCount);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/PagingOption.cs b/src/CoreEx/Entities/PagingOption.cs
deleted file mode 100644
index 56985ede..00000000
--- a/src/CoreEx/Entities/PagingOption.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents the <see cref="PagingArgs"/> option.
-    /// </summary>
-    public enum PagingOption
-    {
-        /// <summary>
-        /// Indicates that the <see cref="PagingArgs.CreatePageAndSize(long, long?, bool?)"/> was used to instantiate.
-        /// </summary>
-        PageAndSize,
-
-        /// <summary>
-        /// Indicates that the <see cref="PagingArgs.CreateSkipAndTake(long, long?, bool?)"/> was used to instantiate.
-        /// </summary>
-        SkipAndTake,
-
-        /// <summary>
-        /// Indicates that the <see cref="PagingArgs.CreateTokenAndTake(string?, long?, bool?)"/> was used to instantiate.
-        /// </summary>
-        TokenAndTake
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/PagingResult.cs b/src/CoreEx/Entities/PagingResult.cs
deleted file mode 100644
index 3068805a..00000000
--- a/src/CoreEx/Entities/PagingResult.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Drawing;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents the resulting paging response including <see cref="TotalCount"/> and <see cref="TotalPages"/> where applicable for the subsequent query.
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class PagingResult : PagingArgs, IEquatable<PagingResult>
-    {
-        /// <summary>
-        /// Creates a <see cref="PagingResult"/> for a specified page number and size.
-        /// </summary>
-        /// <param name="page">The <see cref="PagingArgs.Page"/> number.</param>
-        /// <param name="size">The page <see cref="Size"/> (defaults to <see cref="PagingArgs.DefaultTake"/>).</param>
-        /// <param name="isGetCount">Indicates whether to get the total count (see <see cref="TotalCount"/>) when performing the underlying query (defaults to <see cref="PagingArgs.DefaultIsGetCount"/> where <c>null</c>).</param>
-        /// <returns>The <see cref="PagingResult"/>.</returns>
-        public static new PagingResult CreatePageAndSize(long page, long? size = null, bool? isGetCount = null) => new(PagingArgs.CreatePageAndSize(page, size, isGetCount));
-
-        /// <summary>
-        /// Creates a <see cref="PagingResult"/> for a specified skip and take.
-        /// </summary>
-        /// <param name="skip">The <see cref="PagingArgs.Skip"/> value.</param>
-        /// <param name="take">The <see cref="PagingArgs.Take"/> value (defaults to <see cref="PagingArgs.DefaultTake"/>).</param>
-        /// <param name="isGetCount">Indicates whether to get the total count (see <see cref="TotalCount"/>) when performing the underlying query (defaults to <see cref="PagingArgs.DefaultIsGetCount"/> where <c>null</c>).</param>
-        /// <returns>The <see cref="PagingResult"/>.</returns>
-        public static new PagingResult CreateSkipAndTake(long skip, long? take = null, bool? isGetCount = null) => new(PagingArgs.CreateSkipAndTake(skip, take, isGetCount));
-
-        /// <summary>
-        /// Creates a <see cref="PagingResult"/> for a specified token and take.
-        /// </summary>
-        /// <param name="token">The <see cref="PagingArgs.Token"/> to use to get the next page of elements.</param>
-        /// <param name="take">The <see cref="PagingArgs.Take"/> value (defaults to <see cref="PagingArgs.DefaultTake"/>).</param>
-        /// <param name="isGetCount">Indicates whether to get the total count (see <see cref="PagingResult.TotalCount"/>) when performing the underlying query (defaults to <see cref="PagingArgs.DefaultIsGetCount"/> where <c>null</c>).</param>
-        /// <returns>The <see cref="PagingResult"/>.</returns>
-        public static new PagingResult CreateTokenAndTake(string token, long? take = null, bool? isGetCount = null) => new(PagingArgs.CreateTokenAndTake(token, take, isGetCount));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PagingResult"/> class from a <paramref name="pagingArgs"/> and optional <paramref name="totalCount"/>.
-        /// </summary>
-        /// <param name="pagingArgs">The <see cref="PagingArgs"/>.</param>
-        /// <param name="totalCount">The total record count where applicable.</param>
-        /// <remarks>Where the <paramref name="pagingArgs"/> and <paramref name="totalCount"/> are both provided the <see cref="TotalPages"/> will be automatically created.</remarks>
-        public PagingResult(PagingArgs? pagingArgs = null, long? totalCount = null)
-        {
-            pagingArgs ??= new PagingArgs();
-
-            Skip = pagingArgs.Skip;
-            Take = pagingArgs.Take;
-            Page = pagingArgs.Page;
-            Token = pagingArgs.Token;
-            IsGetCount = pagingArgs.IsGetCount;
-            TotalCount = (totalCount.HasValue && totalCount.Value < 0) ? null : totalCount;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PagingResult"/> class from a <see cref="PagingResult"/> (copies values).
-        /// </summary>
-        /// <param name="pagingResult">The <see cref="PagingResult"/>.</param>
-        public PagingResult(PagingResult pagingResult) : this(pagingResult, pagingResult?.TotalCount) { }
-
-        /// <summary>
-        /// Gets or sets the total count of the elements in the sequence (a <c>null</c> value indicates that the total count is unknown).
-        /// </summary>
-        public long? TotalCount { get; set; }
-
-        /// <summary>
-        /// Gets the calculated total pages for all elements in the sequence where the <see cref="PagingArgs.Option"/> is equal to <see cref="PagingOption.PageAndSize"/>.
-        /// </summary>
-        [JsonIgnore()]
-        public long? TotalPages => Option == PagingOption.PageAndSize && TotalCount.HasValue ? (long)System.Math.Ceiling(TotalCount.Value / (double)Take) : null;
-
-        #region Equality
-
-        /// <inheritdoc/>
-        public override bool Equals(object? obj) => obj is PagingResult pr && Equals(pr);
-
-        /// <inheritdoc/>
-        public bool Equals(PagingResult? other) => other is not null && Skip == other.Skip && Take == other.Take && Page == other.Page && Token == other.Token && IsGetCount == other.IsGetCount && TotalCount == other.TotalCount;
-
-        /// <summary>
-        /// Indicates whether the current <see cref="PagingResult"/> is equal to another <see cref="PagingResult"/>.
-        /// </summary>
-        public static bool operator ==(PagingResult? left, PagingResult? right) => (left is null && right is null) || (left is not null && right is not null && left.Equals(right));
-
-        /// <summary>
-        /// Indicates whether the current <see cref="PagingResult"/> is not equal to another <see cref="PagingResult"/>.
-        /// </summary>
-        public static bool operator !=(PagingResult? left, PagingResult? right) => !(left == right);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => HashCode.Combine(Skip, Take, Page, Token, IsGetCount, TotalCount);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/QueryArgs.cs b/src/CoreEx/Entities/QueryArgs.cs
deleted file mode 100644
index 0910c9ef..00000000
--- a/src/CoreEx/Entities/QueryArgs.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System.Collections.Generic;
-
-namespace CoreEx.Entities
-{
-    /// <summary>
-    /// Represents basic dynamic query arguments.
-    /// </summary>
-    /// <remarks>This is <b>not</b> intended to be a replacement for OData, GraphQL, etc. but to provide a limited, explicitly supported, dynamic capability to filter and order an underlying query.</remarks>
-    public class QueryArgs
-    {
-        /// <summary>
-        /// Create a new <see cref="QueryArgs"/>.
-        /// </summary>
-        /// <param name="filter">The basic dynamic <i>OData-like</i> <c>$filter</c> statement.</param>
-        /// <param name="orderBy">The basic dynamic <i>OData-like</i> <c>$orderby</c> statement.</param>
-        public static QueryArgs Create(string? filter = null, string? orderBy = null) => new() { Filter = filter, OrderBy = orderBy  };
-
-        /// <summary>
-        /// Gets or sets the basic dynamic <i>OData-like</i> <c>$filter</c> statement.
-        /// </summary>
-        public string? Filter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the basic dynamic <i>OData-like</i> <c>$orderby</c> statement.
-        /// </summary>
-        public string? OrderBy { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of <b>included</b> fields.
-        /// </summary>
-        /// <remarks>Currently these are <b>only</b> used within <i>CoreEx</i> for JSON serialization filtering (see <see cref="CoreEx.Json.IJsonSerializer.TryApplyFilter{T}(T, IEnumerable{string}?, out object, Json.JsonPropertyFilter, System.StringComparison, System.Action{Json.IJsonPreFilterInspector}?)"/>).</remarks>
-        public List<string>? IncludeFields { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of <b>excluded</b> fields.
-        /// </summary>
-        /// <remarks>Currently these are <b>only</b> used within <i>CoreEx</i> for JSON serialization filtering (see <see cref="CoreEx.Json.IJsonSerializer.TryApplyFilter{T}(T, IEnumerable{string}?, out object, Json.JsonPropertyFilter, System.StringComparison, System.Action{Json.IJsonPreFilterInspector}?)"/>).</remarks>
-        public List<string>? ExcludeFields { get; set; }
-
-        /// <summary>
-        /// Indicates whether to include any related texts for the item(s).
-        /// </summary>
-        /// <remarks>For example, include corresponding <see cref="IReferenceData.Text"/> for any <b>ReferenceData</b> values returned in the JSON response payload.</remarks>
-        public bool IsTextIncluded { get; set; }
-
-        /// <summary>
-        /// Appends the <paramref name="fields"/> to the <see cref="IncludeFields"/>.
-        /// </summary>
-        /// <param name="fields">The fields to append.</param>
-        /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
-        public QueryArgs Include(params string[] fields)
-        {
-            (IncludeFields ??= []).AddRange(fields);
-            return this;
-        }
-
-        /// <summary>
-        /// Appends the <paramref name="fields"/> to the <see cref="ExcludeFields"/>.
-        /// </summary>
-        /// <param name="fields">The fields to append.</param>
-        /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
-        public QueryArgs Exclude(params string[] fields)
-        {
-            (ExcludeFields ??= []).AddRange(fields);
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates whether to include any related texts for the item(s); see <see cref="IsTextIncluded"/>.
-        /// </summary>
-        /// <returns>The <see cref="QueryArgs"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>For example, include corresponding <see cref="IReferenceData.Text"/> for any <b>ReferenceData</b> values returned in the JSON response payload.</remarks>
-        public QueryArgs IncludeText()
-        {
-            IsTextIncluded = true;
-            return this;
-        }
-
-        /// <summary>
-        /// An implicit cast from a filter <see cref="string"/> to a <see cref="QueryArgs"/>.
-        /// </summary>
-        /// <param name="filter">The <see cref="Filter"/>.</param>
-        /// <returns>The corresponding <see cref="QueryArgs"/>.</returns>
-        public static implicit operator QueryArgs(string? filter) => Create(filter);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/README.md b/src/CoreEx/Entities/README.md
index b1801c4c..151d47c7 100644
--- a/src/CoreEx/Entities/README.md
+++ b/src/CoreEx/Entities/README.md
@@ -1,132 +1,58 @@
-# CoreEx.Entities
-
-The `CoreEx.Entities` namespace is a key namespace used for the definition of entities and/or models to enable additional and extended capabilities.
-
-<br/>
-
-## Motivation
-
-Entities ([aggregate roots](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/microservice-domain-model#the-domain-entity-pattern) (i.e. [DDD](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/ddd-oriented-microservice)), [value-objects](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/implement-value-objects), [POCO](https://en.wikipedia.org/wiki/Plain_old_CLR_object)s, whatever in your parlance) and [data models](https://learn.microsoft.com/en-us/dotnet/architecture/microservices/microservice-ddd-cqrs-patterns/infrastructure-persistence-layer-design) play a key role within an application architecture. They are often implemented using a pattern of sorts to standardized functionality, implementation, etc. This namespace provides a number of common/standard capabilities that can be leveraged to standardize and create functionally richer entities and/or data models (where they leverage these features).
-
-<br/>
-
-## Entity key
-
-Where an entity needs to be uniquely identified a key of some description is required; it will consist of one or more values. The [`CompositeKey`](./CompositeKey.cs) struct provides a standardized representation of the key value, with a corresponding [`IEntityKey`](./IEntityKey.cs) interface enabling the base `CompositeKey` value access.
-
-However, in practice one of the following two interfaces should be used to enable the key:
-
-Interface | Description
--|-
-[`IIdentifier<TId>`](./IIdentifierT.cs) | Enables a single `Id` property. This is the most common means to name and represent a single identifier value; the underlying type can be a `string`, `int`, `Guid`, etc.
-[`IPrimaryKey`](./IPrimaryKey.cs) | Enables a primary key that can consist of one or more values, represented as a `CompositeKey`. The values that represent the composite key must in turn be represented as properties for the entity as the underlying composite`IPrimaryKey.PrimaryKey` property is read-only.
-
-Additionally, there is an [`EntityKeyCollection`](./EntityKeyCollection.cs) that supports objects that implement `IEntityKey`. This collection does _not_ manage/guarantee uniqueness by design, instead provides an `IsAnyDuplicates` to identify. Where uniqueness is required, then some form of `IDictionary` should be leveraged instead.
-
-<br/>
-
-### Identifier generation
-
-Where an identfier value needs to be _generated_ at runtime the following enable:
-
-Type | Description
--|-
-[`IIdentifierGenerator<TId>`](./IIdentifierGeneratorT.cs) | Provides the logic to generate a new identifier for a specified `Id` type.
-[`IIdentifierGenerator`](./IIdentifierGenerator.cs) | Provides the logic to generate an identifier for an entity value.
-[`IdentifierGenerator`](./IdentifierGenerator.cs) | Provides the default logic to generate a `string` or `Guid` identifier (from a new `Guid`).
-
-Where an alternate identifier generation is required, for example [nanoid](https://github.com/codeyu/nanoid-net), then a new [`IIdentifierGenerator`](./IIdentifierGenerator.cs) implementation will be required.
-
-<br/>
-
-## Paging
-
-Within an application, where dealing with entity collections, a standardized approach to paging may be desired. The [`PagingArgs`](./PagingArgs.cs) provides a standard means to specify the `Page` and `Size`, or alternative `Skip` and `Take`; with an additional request to get the _total count_ (`IsGetCount`). There is a corresponding [`PagingResult`](./PagingResult.cs) that is intended to house the resulting `TotalCount` where requested.
-
-The [`ICollectionResult`](./ICollectionResult.cs) interface and corresponding [`CollectionResult`](./CollectionResult.cs) implementation provide a standardized means to capture the result of the likes of a paged query, to access the `Paging` result and underlying collection `Items`. The [WebApis](../WebApis) namespace leverages this to manage the serialization of this result in a consistent manner.
-
-<br/>
-
-## Cleaning
-
-An entity and its properties, generatlly where represented as a POCO, may contain state that is not considered consistent and is a candidate for cleaning; being the replacement (change) of the property where it meets one of the generic conditions to cleanse. This does not imply post this that an entity should be considered in a final valid state, only specific validation logic can ascertain this; however, at least some basic value assumptions can be made as a result.
-
-The [`Cleaner`](./Cleaner.cs) class enables the cleansing logic. Provides `Clean` methods to cleanse the following .NET types as follows:
-
-Type | Description
--|-
-`string` | Cleans using following: <br/>&#8226; [`StringTrim`](./StringTrim.cs): `None`, `Both`, `Start` or `End` (default). <br/>&#8226;  [`StringTransform`](./StringTransform.cs): `None`, `NullToEmpty` or `EmptyToNull` (default). <br/>&#8226;  [`StringCase`](./StringCase.cs): `None` (default), `Lower`, `Upper` or `Title`.
-`DateTime` | Cleans using [`DateTimeTransform`](./DateTimeTransform.cs): `None`, `DateOnly`, `DateTimeLocal`, `DateTimeUtc (default)`, or `DateTimeUnspecified`.
-[`IInitial`](./IInitial.cs) | Provides a means to determine if the value is in its initial/default (`IsInitial`) state and therefore the reference to this should be set to `null`. This is essentially the equivalent of the `StringTransform.EmptyToNull`, but for an object.
-[`ICleanUp`](./ICleanUp.cs) | Enables additional cleansing for the object instance by invoking the `CleanUp` method where implemented.
-
-</br>
-
-## Change audit
-
-This relates to the standardized change auditing, being the capture of the respective create and update, user and timestamp. The [`IChangeLogAudit`](./IChangeLogAudit.cs) interface defines the standard properties, with the [`ChangeLog`](./ChangeLog.cs) class representing an implementation. 
-
-Within an implementation the base [`IChangeLogAuditLog`](./IChangeLogAuditLog.cs) interface, generally accessed via the [`IChangeLog`](./IChangeLog.cs) interface, enables access to the underlying `ChangeLog` property.
-
-Additionally, the [`ChangeLog`](./ChangeLog.cs) class provides static methods to either `PrepareCreated` or `PrepareUpdated` to set the underlying properties accordingly. This is the preferred method to perform this action.
-
-</br>
-
-## Messages
-
-The [`MessageItem`](./MessageItem.cs) and corresponding [`MessageItemCollection`](./MessageItemCollection.cs) provide a _CoreEx_-wide standardized means to define and manage messages; including a [`MessageType`](./MessageType.cs) (`Error`, `Warning` or `Info`) and `Text`, with optional `Property` for usage by the likes of [Validation](../Validation) where applicable.
-
-A number of static `Create` methods are also provided to simplify the creation leveraging [composite formatting](https://learn.microsoft.com/en-us/dotnet/standard/base-types/composite-formatting) and [`LText`](../Localization/LText.cs) (for localization and/or multilingual).
-
-<br/>
-
-## Additional capabilities
-
-The following enable additional ad-hoc capabilties to be enabled.
-
-</br>
-
-### Optimistic concurrency
-
-Where the likes of entity versioning and/or optimistic concurrency is required then the [`IETag`](./IEtag.cs) interface provides the requisite [`ETag`](https://en.wikipedia.org/wiki/HTTP_ETag). This is the preferred approach for the likes of RESTful APIs that support [`If-Match`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-Match). 
-
-Additionally, see how the [WebApis](../WebApis) namespace leverages; including the corresponding [`ETagGenerator`](../Abstractions/ETagGenerator.cs).
-
-</br>
-
-### Multi-tenancy
-
-Within a multi-tenanted implementation the [`ITenantId`](./ITenantId.cs) interface can enable the underlying `TenantId` where it needs to be attributed to an entity (or most likely the underlying data model).
-
-</br>
-
-### Logical delete
-
-Within an implementation the [`ILogicallyDeleted`](./ILogicallyDeleted.cs) interface can enable logical versus physical delete (`IsDeleted`) to be attributed to an entity (or most likely the underlying data model).
-
-<br/>
-
-## Extended capabilities
-
-The `CoreEx.Entities.Extended` namespace contains extended, more advanced, capabilties as follows.
-
-<br/>
-
-### Entity base
-
-To support more advanced entity capabilities there are two key base classes depending on the desired functionality required, the latter inherits from the former.
-
-Class | Description
--|-
-[`EntityCore`](./Extended/EntityCore.cs) | Provides the core [`INotifyPropertyChanged`](https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifypropertychanged), [`IChangeTracking`](https://learn.microsoft.com/en-us/dotnet/api/system.componentmodel.ichangetracking), and [`IReadOnly`](./IReadonly.cs) support. The underlying `SetValue` method must be used for all property value updates to enable.
-[`EntityBase`](./Extended/EntityBase.cs) | Extends the above `EntityCore`, adding [`ICleanUp`](./ICleanUp.cs), [`IInitial`](./IInitial.cs) and [`ICopyFrom`](./ICopyFrom.cs) support. To function correctly, the underlying `GetPropertyValues` method must be overridden with each property [yielded](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/statements/yield) as a [`PropertyValue`](./Extended/PropertyValue.cs) to enable. See [`ChangeLogEx`](./Extended/ChangeLogEx.cs) as an example implementation. There is an `EntityBase` extension method to support deep `Clone` operations (note that the `ICloneable` interface is _not_ explicitly supported by default).
-
-There is a corresponding [`EntityBaseCollection`](./Extended/EntityBaseCollection.cs) and [`EntityCollectionResult`](./Extended/EntityCollectionResult.cs) to support an `EntityBase` collection and paging result equivalence.
-
-Additionally, there is an [`EntityBaseDictionary`](./Extended/EntityBaseDictionary.cs) that inherits from the [`ObservableDictionary`](./Extended/ObservableDictionary.cs) where an `IDictionary` implementation is required.
-
-<br/>
-
-### Extended change audit
-
-The [`ChangeLogEx`](./Extended/ChangeLogEx.cs) is an extended (inherits `EntityBase`) implementation of the [`ChangeLog`](./ChangeLog.cs) that offers equivalent audit properties; however, supports all extended features where applicable. 
+# CoreEx.Entities
+
+> Provides the core entity contract interfaces, audit change-log types, composite key support, message items, string/datetime cleaning utilities, and identifier generation used as the common domain contract shape across all CoreEx layers.
+
+## Overview
+
+`CoreEx.Entities` defines the shared vocabulary for domain entities within the CoreEx framework. Rather than mandating a base class, it exposes a set of fine-grained interfaces that consuming types opt into selectively — `IIdentifier<T>` for typed identity, `IETag` for optimistic concurrency, `IChangeLog` for audit tracking, `IEntityKey` for key-equality, and `IContract` as the aggregate contract used by generated and hand-authored domain types alike.
+
+These interfaces are intentionally lightweight and read/write split. Every mutable interface (e.g. `IIdentifier<T>`, `IETag`, `IChangeLog`) has a corresponding read-only counterpart (`IReadOnlyIdentifier<T>`, `IReadOnlyETag`, `IReadOnlyChangeLog`), enabling infrastructure layers to consume and produce values without inadvertently mutating the entity.
+
+The namespace also includes supporting utilities: `Cleaner` for normalizing string and `DateTime` values before persistence, `MessageItem` and `MessageItemCollection` for structured field-level validation messages, `CompositeKey` for allocation-efficient multi-part keys, and `IdentifierGenerator` for new GUID-based identifier creation.
+
+## Key capabilities
+
+- 🆔 **Identity contracts**: `IIdentifier<T>` / `IReadOnlyIdentifier<T>` provide a typed identifier property used uniformly across API, application, and infrastructure layers.
+- 🏷️ **ETag / optimistic concurrency**: `IETag` / `IReadOnlyETag` carry the entity tag string used for HTTP and data-layer concurrency checking; `ETag` static utility handles comparison and conflict detection.
+- 📋 **Audit change log**: `IChangeLog` / `IChangeLogEx` track `CreatedBy`, `CreatedDate`, `UpdatedBy`, `UpdatedDate`; `ChangeLog` record implements the full audit trail populated from the ambient `ExecutionContext`.
+- 🔑 **Composite keys**: `CompositeKey` is an immutable, allocation-efficient struct supporting 1–4 typed arguments without boxing, used as a key type across data-layer filtering and repository operations.
+- 📨 **Message items**: `MessageItem` and `MessageItemCollection` carry structured field-level messages (Error, Warning, Info) from validation and service operations back to the consumer.
+- 🧹 **Cleaning and normalization**: `Cleaner` applies configurable `StringTrim`, `StringTransform` (null/empty), `StringCase` (upper/lower/title), and `DateTimeTransform` (UTC/local) policies across entity properties before save.
+- 📐 **Feature detection**: `FeatureSupport` and extension methods allow infrastructure code to detect which interfaces an entity implements and act accordingly (e.g. auto-populate ETags or change logs).
+- ✍️ **Write-intent descriptors**: `Writable` enum and `[Writable]` attribute annotate entity properties with create-only / update-only / never-writable semantics for OpenAPI documentation and tooling.
+- 🔧 **Identifier generation**: `IdentifierGenerator` and `IIdentifierGenerator` provide DI-replaceable new `Guid`/`string` identifier creation (using `Guid.CreateVersion7()` on .NET 9+).
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ChangeLog`](./ChangeLog.cs)** | Record implementing `IReadOnlyChangeLogEx`; captures created/updated by and timestamp, populated from the ambient `ExecutionContext`. |
+| **[`Cleaner`](./Cleaner.cs)** | Static utility applying configurable string trimming, transformation, casing, and `DateTime` normalization to entity values. |
+| **[`CompositeKey`](./CompositeKey.cs)** | Immutable struct representing a multi-part entity key with boxing-free generic `Create<T1,T2,...>` overloads for up to four arguments. |
+| **[`CompositeKeyComparer`](./CompositeKeyComparer.cs)** | `IEqualityComparer<CompositeKey>` for use in dictionaries and collections keyed by `CompositeKey`. |
+| **[`DataMap<TValue>`](./DataMap.cs)** | String-keyed dictionary whose keys are preserved as-is (no camelCase conversion) during JSON serialization; used for arbitrary data maps on entities. |
+| **[`ETag`](./ETag.cs)** | Static utility for comparing ETag strings and throwing `ConcurrencyException` on mismatch; also generates ETag hashes from entity values. |
+| **[`FeatureSupport`](./FeatureSupport.cs)** | Enum of flags indicating which entity contract interfaces a type implements, used by infrastructure to decide which fields to auto-populate. |
+| **[`IdentifierGenerator`](./Extended/IdentifierGenerator.cs)** | Default `IIdentifierGenerator` producing `Guid` or `string` identifiers (`Guid.CreateVersion7()` on .NET 9+; `Guid.NewGuid()` on earlier targets). |
+| **[`MessageItem`](./MessageItem.cs)** | Record carrying a single structured message — type (Error/Warning/Info), text (`LText`), and optional property name — returned from validation and service operations. |
+| **[`MessageCollection`](./MessageCollection.cs)** | Collection of `MessageItem` instances; attached to `ValidationException` and surfaced via `ExecutionContext.Messages`. |
+| **[`ValueResult`](./ValueResult.cs)** | Wraps a value alongside an `IResult` to carry both a typed result and an associated result state. |
+| **[`Writable`](./Writable.cs)** | Enum describing property write intent: `Always`, `Never`, `CreateOnly`, or `UpdateOnly`; used with `[WritableAttribute]` for OpenAPI tooling. |
+| [`IContract`](./IContract.cs) | Marker interface combining `IRuntimeMetadata`, `ICopyFrom`, and `IDefault` — the aggregate contract implemented by generated domain types. |
+| [`IContract<T>`](./IContractT.cs) | Generic version of `IContract` providing strongly-typed `CopyFrom(T)` and `IsDefault()` implementations via `RuntimeMetadata`. |
+| [`IEntityKey`](./IEntityKey.cs) | Interface exposing `EntityKey` as a `CompositeKey` for uniform entity identity across repository and service boundaries. |
+| [`IIdentifier<T>`](./IIdentifierT.cs) | Mutable interface adding a typed `Id` property; counterpart to `IReadOnlyIdentifier<T>`. |
+| [`IETag`](./IETag.cs) | Mutable interface adding an `ETag` string property; counterpart to `IReadOnlyETag`. |
+| [`IChangeLog`](./IChangeLog.cs) | Mutable interface adding `CreatedBy`, `CreatedDate`, `UpdatedBy`, `UpdatedDate` audit properties. |
+| [`IChangeLogEx`](./IChangeLogEx.cs) | Extended version of `IChangeLog` using `DateTimeOffset` instead of `DateTime` for timezone-aware audit timestamps. |
+| [`IIdentifierGenerator`](./Extended/IIdentifierGenerator.cs) | DI-replaceable interface for generating new typed identifiers (`Guid`, `string`). |
+| [`ICopyFrom`](./Extended/ICopyFrom.cs) | Interface enabling an entity to copy its state from another instance of itself. |
+| [`IDefault`](./Extended/IDefault.cs) | Interface enabling an entity to determine whether it is in its default (unset) state. |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - Defines `ExecutionContext` and `AuthenticationUser` consumed by `ChangeLog` to populate audit fields.
+- **[`CoreEx.Metadata`](../Metadata/README.md)** - `RuntimeMetadata` and `IPropertyRuntimeMetadata` underpin `IContract<T>` equality, copy, cleaning, and hash operations.
+- **[`CoreEx.Mapping`](../Mapping/README.md)** - `Mapper` utility maps standard entity properties (`IIdentifier`, `IETag`, `IChangeLog`, etc.) between source and destination types.
+- **[`CoreEx.Data`](../Data/README.md)** - Data-layer primitives such as `IPrimaryKey`, `IPartitionKey`, and `ILogicallyDeleted` extend the entity contract interfaces defined here.
+- **[`CoreEx.Validation`](../../CoreEx.Validation/README.md)** - Validation rules produce `MessageItem` instances that are collected into a `ValidationException`.
\ No newline at end of file
diff --git a/src/CoreEx/Entities/StringCase.cs b/src/CoreEx/Entities/StringCase.cs
index feb2f755..c1185869 100644
--- a/src/CoreEx/Entities/StringCase.cs
+++ b/src/CoreEx/Entities/StringCase.cs
@@ -1,38 +1,33 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-using System.Globalization;
-
-namespace CoreEx.Entities
+/// <summary>
+/// Represents a <see cref="string"/> casing conversion option.
+/// </summary>
+/// <remarks>See <see cref="Cleaner"/>.</remarks>
+public enum StringCase
 {
     /// <summary>
-    /// Represents a <see cref="string"/> casing conversion option.
+    /// Indicates that the <see cref="Cleaner.DefaultStringCase"/> value should be used.
     /// </summary>
-    /// <remarks>See <see cref="Cleaner"/>.</remarks>
-    public enum StringCase
-    {
-        /// <summary>
-        /// Indicates that the <see cref="Cleaner.DefaultStringCase"/> value should be used.
-        /// </summary>
-        UseDefault,
+    UseDefault,
 
-        /// <summary>
-        /// No casing conversion required; the <see cref="string"/> value will remain as-is.
-        /// </summary>
-        None,
+    /// <summary>
+    /// No casing conversion required; the <see cref="string"/> value will remain as-is.
+    /// </summary>
+    None,
 
-        /// <summary>
-        /// The string value will be converted to lower case (see <see cref="TextInfo.ToLower(string)"/>).
-        /// </summary>
-        Lower,
+    /// <summary>
+    /// The string value will be converted to lower case (see <see cref="TextInfo.ToLower(string)"/>).
+    /// </summary>
+    Lower,
 
-        /// <summary>
-        /// The string value will be converted to upper case (see <see cref="TextInfo.ToUpper(string)"/>).
-        /// </summary>
-        Upper,
+    /// <summary>
+    /// The string value will be converted to upper case (see <see cref="TextInfo.ToUpper(string)"/>).
+    /// </summary>
+    Upper,
 
-        /// <summary>
-        /// The string value will be converted to title case (see <see cref="TextInfo.ToTitleCase(string)"/>).
-        /// </summary>
-        Title
-    }
+    /// <summary>
+    /// The string value will be converted to title case (see <see cref="TextInfo.ToTitleCase(string)"/>).
+    /// </summary>
+    Title
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/StringTransform.cs b/src/CoreEx/Entities/StringTransform.cs
index de75db80..971208f8 100644
--- a/src/CoreEx/Entities/StringTransform.cs
+++ b/src/CoreEx/Entities/StringTransform.cs
@@ -1,31 +1,28 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-namespace CoreEx.Entities
+/// <summary>
+/// Represents a transform option for a <see cref="string"/> value.
+/// </summary>
+/// <remarks>See <see cref="Cleaner"/>.</remarks>
+public enum StringTransform
 {
     /// <summary>
-    /// Represents a transform option for a <see cref="string"/> value.
+    /// Indicates that the <see cref="Cleaner.DefaultStringTransform"/> value should be used.
     /// </summary>
-    /// <remarks>See <see cref="Cleaner"/>.</remarks>
-    public enum StringTransform
-    {
-        /// <summary>
-        /// Indicates that the <see cref="Cleaner.DefaultStringTransform"/> value should be used.
-        /// </summary>
-        UseDefault,
+    UseDefault,
 
-        /// <summary>
-        /// No transform required; the <see cref="string"/> value will remain as-is.
-        /// </summary>
-        None,
+    /// <summary>
+    /// No transform required; the <see cref="string"/> value will remain as-is.
+    /// </summary>
+    None,
 
-        /// <summary>
-        /// The string will be transformed from a <c>null</c> to <see cref="string.Empty"/> value.
-        /// </summary>
-        NullToEmpty,
+    /// <summary>
+    /// The string will be transformed from a <see langword="null"/> to <see cref="string.Empty"/> value.
+    /// </summary>
+    NullToEmpty,
 
-        /// <summary>
-        /// The string will be transformed from an <see cref="string.Empty"/> value to a <c>null</c>.
-        /// </summary>
-        EmptyToNull
-    }
+    /// <summary>
+    /// The string will be transformed from an <see cref="string.Empty"/> value to a <see langword="null"/>.
+    /// </summary>
+    EmptyToNull
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/StringTrim.cs b/src/CoreEx/Entities/StringTrim.cs
index f17f8220..0d47c57b 100644
--- a/src/CoreEx/Entities/StringTrim.cs
+++ b/src/CoreEx/Entities/StringTrim.cs
@@ -1,36 +1,33 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Entities;
 
-namespace CoreEx.Entities
+/// <summary>
+/// Represents the trimming of white space characters from a <see cref="string"/>.
+/// </summary>
+/// <remarks>See <see cref="Cleaner"/>.</remarks>
+public enum StringTrim
 {
     /// <summary>
-    /// Represents the trimming of white space characters from a <see cref="string"/>.
+    /// Indicates that the <see cref="Cleaner.DefaultStringTrim"/> value should be used.
     /// </summary>
-    /// <remarks>See <see cref="Cleaner"/>.</remarks>
-    public enum StringTrim
-    {
-        /// <summary>
-        /// Indicates that the <see cref="Cleaner.DefaultStringTrim"/> value should be used.
-        /// </summary>
-        UseDefault,
+    UseDefault,
 
-        /// <summary>
-        /// The string is left unchanged.
-        /// </summary>
-        None,
+    /// <summary>
+    /// The string is left unchanged.
+    /// </summary>
+    None,
 
-        /// <summary>
-        /// Removes all occurences of white space characters from the beginning and ending of a string; i.e. <see cref="string.Trim()"/>
-        /// </summary>
-        Both,
+    /// <summary>
+    /// Removes all occurrences of white space characters from the beginning and ending of a string; i.e. <see cref="string.Trim()"/>
+    /// </summary>
+    Both,
 
-        /// <summary>
-        /// Removes all occurences of white space characters from the beginning of a string; i.e. <see cref="string.TrimStart()"/>
-        /// </summary>
-        Start,
+    /// <summary>
+    /// Removes all occurrences of white space characters from the beginning of a string; i.e. <see cref="string.TrimStart()"/>
+    /// </summary>
+    Start,
 
-        /// <summary>
-        /// Removes all occurences of white space characters from the end of a string; i.e. <see cref="string.TrimEnd()"/>
-        /// </summary>
-        End
-    }
+    /// <summary>
+    /// Removes all occurrences of white space characters from the end of a string; i.e. <see cref="string.TrimEnd()"/>
+    /// </summary>
+    End
 }
\ No newline at end of file
diff --git a/src/CoreEx/Entities/ValueResult.cs b/src/CoreEx/Entities/ValueResult.cs
new file mode 100644
index 00000000..ced4b2c9
--- /dev/null
+++ b/src/CoreEx/Entities/ValueResult.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Provides a typed <see cref="Value"/> result wrapper (non-error) that contains additional context.
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+/// <remarks>This is not intended for error scenarios, as the likes of an <see cref="Exception"/>, <see cref="Result"/> or <see cref="Result{T}"/> enable accordingly.</remarks>
+/// <param name="value">The value.</param>
+/// <param name="statusCode">The resulting <see cref="HttpStatusCode"/>.</param>
+public class ValueResult<T>(T value = default!, HttpStatusCode? statusCode = null) : IValueResult<T>
+{
+    /// <summary>
+    /// Gets or sets the value.
+    /// </summary>
+    public T Value { get; set; } = value;
+
+    /// <summary>
+    /// Gets or sets the resulting <see cref="HttpStatusCode"/>.
+    /// </summary>
+    /// <remarks>This does not imply that the result has to be used in an HTTP context; just that this represents a number of well-known statuses.</remarks>
+    public HttpStatusCode? StatusCode { get; set; } = statusCode;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/Writable.cs b/src/CoreEx/Entities/Writable.cs
new file mode 100644
index 00000000..aa86b4bb
--- /dev/null
+++ b/src/CoreEx/Entities/Writable.cs
@@ -0,0 +1,30 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Represents the intended writable state of an entity property, indicating whether it can be modified and under what conditions.
+/// </summary>
+/// <remarks>This is typically used to indicate the allowed operations for a property, such as whether it can be modified during creation, update, or both. It, however, does not enforce these rules;
+/// it is merely descriptive. This is intended for the likes of OpenAPI for example, to mark up the properties as indicated.
+/// <para>See also <see cref="WritableAttribute"/>.</para></remarks>
+public enum Writable
+{
+    /// <summary>
+    /// The property is always writable, meaning it can be modified during both creation and update operations.
+    /// </summary>
+    Always = 0,
+
+    /// <summary>
+    /// The property is never writable, meaning it cannot be modified during either creation or update operations; is effectively read-only.
+    /// </summary>
+    Never = 1,
+
+    /// <summary>
+    /// The property is writable only during creation operations, meaning it can be set when an entity is created but cannot be modified during update operations.
+    /// </summary>
+    CreateOnly = 2,
+
+    /// <summary>
+    /// The property is writable only during update operations, meaning it cannot be set when an entity is created but can be modified during update operations.
+    /// </summary>
+    UpdateOnly = 3
+}
\ No newline at end of file
diff --git a/src/CoreEx/Entities/WritableAttribute.cs b/src/CoreEx/Entities/WritableAttribute.cs
new file mode 100644
index 00000000..023430c5
--- /dev/null
+++ b/src/CoreEx/Entities/WritableAttribute.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Entities;
+
+/// <summary>
+/// Specifies the intended writable state of an entity property, indicating whether it can be modified and under what conditions.
+/// </summary>
+/// <remarks>This is typically used to indicate the allowed operations for a property, such as whether it can be modified during creation, update, or both. It, however, does not enforce these rules;
+/// it is merely descriptive. This is intended for the likes of OpenAPI for example, to mark up the properties as indicated.
+/// <para>See also <see cref="Writable"/>.</para></remarks>
+[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
+public class WritableAttribute(Writable writable = Writable.Always) : Attribute
+{
+    /// <summary>
+    /// Gets the <see cref="Entities.Writable"/> intent.
+    /// </summary>
+    public Writable Writable { get; } = writable;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Attachments/EventAttachment.cs b/src/CoreEx/Events/Attachments/EventAttachment.cs
deleted file mode 100644
index 3b3f238f..00000000
--- a/src/CoreEx/Events/Attachments/EventAttachment.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Events.Attachments
-{
-    /// <summary>
-    /// Represents the attachment reference metadata.
-    /// </summary>
-    public class EventAttachment
-    {
-        /// <summary>
-        /// Gets or sets the optional attachment content type.
-        /// </summary>
-        public string? ContentType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventData.Value"/> attachment reference (i.e. file location).
-        /// </summary>
-        public string? Attachment { get; set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="Attachment"/> is considered empty (not specified).
-        /// </summary>
-        public bool IsEmpty => string.IsNullOrEmpty(Attachment) && string.IsNullOrEmpty(ContentType);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Attachments/IAttachmentStorage.cs b/src/CoreEx/Events/Attachments/IAttachmentStorage.cs
deleted file mode 100644
index 23dcfd56..00000000
--- a/src/CoreEx/Events/Attachments/IAttachmentStorage.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events.Attachments
-{
-    /// <summary>
-    /// Enables the reading and writing of a <see cref="EventData.Value"/> attachment that exceeds the <see cref="MaxDataSize"/> as identified by a corresponding <see cref="EventAttachment"/>.
-    /// </summary>
-    /// <remarks>This is the enabling interface to support the <see href="https://learn.microsoft.com/en-us/azure/architecture/patterns/claim-check">Claim-Check pattern</see>. This should be used
-    /// by the <see cref="IEventSerializer"/> to perform in an underlying messaging sub-system agnostic manner.</remarks>
-    public interface IAttachmentStorage
-    {
-        /// <summary>
-        /// Gets or sets the maximum size (length) of the <see cref="BinaryData"/> representation to become an attachment.
-        /// </summary>
-        /// <remarks>Typically it is the serialized <see cref="EventData.Value"/> used for the <see cref="BinaryData"/>; however, additional metadata depending on the serializer may (and is likely) to be sent and therefore
-        /// should be considered when setting this value; i.e. this should be less than the maximum value supported by the underlying messaging sub-system. In addition, just because a messaging sub-system can support a large message
-        /// length does not necessarily mean that this is the best approach; it may be more efficient or less costly to store separately.</remarks>
-        int MaxDataSize { get; set; }
-
-        /// <summary>
-        /// Writes the <paramref name="attachmentData"/> to the underlying storage and returns the <see cref="EventAttachment"/> details.
-        /// </summary>
-        /// <param name="event">The initiating <see cref="EventData"/>.</param>
-        /// <param name="attachmentData">The attachment contents serialized as <see cref="BinaryData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventAttachment"/> details.</returns>
-        Task<EventAttachment> WriteAsync(EventData @event, BinaryData attachmentData, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Reads the <paramref name="attachment"/> from the underlying storage and returns the contents as <see cref="BinaryData"/>.
-        /// </summary>
-        /// <param name="attachment">The <see cref="EventAttachment"/> details.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The attachment contents as <see cref="BinaryData"/>.</returns>
-        Task<BinaryData> ReadAync(EventAttachment attachment, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/CloudEventSerializerBase.cs b/src/CoreEx/Events/CloudEventSerializerBase.cs
deleted file mode 100644
index def781ec..00000000
--- a/src/CoreEx/Events/CloudEventSerializerBase.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CloudNative.CloudEvents;
-using CoreEx.Events.Attachments;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the base <see cref="CloudEvent"/> <see cref="IEventSerializer"/> capabilities.
-    /// </summary>
-    /// <param name="eventDataFormatter">The <see cref="Events.EventDataFormatter"/>.</param>
-    public abstract class CloudEventSerializerBase(EventDataFormatter? eventDataFormatter) : IEventSerializer
-    {
-        private const string SubjectName = "subject";
-        private const string ActionName = "action";
-        private const string CorrelationIdName = "correlationid";
-        private const string PartitionKeyName = "partitionkey";
-        private const string TenantIdName = "tenantid";
-        private const string ETagName = "etag";
-        private const string KeyName = "key";
-
-        /// <summary>
-        /// Gets the list of reserved attribute names.
-        /// </summary>
-        /// <remarks>The reserved names are as follows: '<c>id</c>', '<c>time</c>', '<c>type</c>', '<c>source</c>', '<c>subject</c>', '<c>action</c>', '<c>correlationid</c>', '<c>tenantid</c>', '<c>etag</c>', '<c>partitionkey</c>', '<c>key</c>'. Also,
-        /// an attribute name must consist of lowercase letters and digits only; any that contain other characters will be ignored.</remarks>
-        public static string[] ReservedNames { get; } = ["id", "time", "type", "source", SubjectName, ActionName, CorrelationIdName, TenantIdName, ETagName, PartitionKeyName, KeyName];
-
-        /// <inheritdoc/>
-        public EventDataFormatter EventDataFormatter { get; } = eventDataFormatter ?? new EventDataFormatter();
-
-        /// <inheritdoc/>
-        public IAttachmentStorage? AttachmentStorage { get; set; }
-
-        /// <inheritdoc/>
-        public CustomEventSerializers CustomSerializers { get; } = new();
-
-        /// <inheritdoc/>
-        public async Task<EventData> DeserializeAsync(BinaryData eventData, CancellationToken cancellationToken = default)
-        {
-            CloudEvent ce;
-            var @event = new EventData();
-            if (AttachmentStorage is null)
-            {
-                ce = await DecodeAsync(eventData, cancellationToken).ConfigureAwait(false);
-                @event.Value = ce.Data;
-            }
-            else
-            {
-                ce = await DecodeAsync<EventAttachment>(eventData, cancellationToken).ConfigureAwait(false);
-                if (ce.Data is not null && ce.Data is EventAttachment attachment && !attachment.IsEmpty)
-                {
-                    var val = await AttachmentStorage.ReadAync(attachment, cancellationToken).ConfigureAwait(false)!;
-                    @event.Value = EventDataFormatter.JsonSerializer!.Deserialize(val)!;
-                }
-                else
-                {
-                    ce = await DecodeAsync(eventData, cancellationToken).ConfigureAwait(false);
-                    @event.Value = ce.Data;
-                }
-            }
-
-            DeserializeFromCloudEvent(ce, @event);
-            return @event;
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventData<T>> DeserializeAsync<T>(BinaryData eventData, CancellationToken cancellationToken = default)
-        {
-            CloudEvent ce;
-            var @event = new EventData<T>();
-            if (AttachmentStorage is null)
-            {
-                ce = await DecodeAsync<T>(eventData, cancellationToken).ConfigureAwait(false);
-                @event.Value = (T)ce.Data!;
-            }
-            else
-            {
-                ce = await DecodeAsync<EventAttachment>(eventData, cancellationToken).ConfigureAwait(false);
-                if (ce.Data is not null && ce.Data is EventAttachment attachment && !attachment.IsEmpty)
-                {
-                    var val = await AttachmentStorage.ReadAync(attachment, cancellationToken).ConfigureAwait(false)!;
-                    @event.Value = EventDataFormatter.JsonSerializer!.Deserialize<T>(val)!;
-                }
-                else
-                {
-                    ce = await DecodeAsync<T>(eventData, cancellationToken).ConfigureAwait(false);
-                    @event.Value = (T)ce.Data!;
-                }
-            }
-
-            DeserializeFromCloudEvent(ce, @event);
-            return @event;
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventData> DeserializeAsync(BinaryData eventData, Type valueType, CancellationToken cancellationToken = default)
-        {
-            var mi = GetType().GetMethod(nameof(DeserializeAsync), 1, [typeof(BinaryData), typeof(CancellationToken)])!;
-            dynamic task = mi.MakeGenericMethod(valueType.ThrowIfNull(nameof(valueType))).Invoke(this, new object[] { eventData, cancellationToken })!;
-            return await task.ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Deserializes from the <paramref name="cloudEvent"/> into the <paramref name="event"/>.
-        /// </summary>
-        private void DeserializeFromCloudEvent(CloudEvent cloudEvent, EventData @event)
-        {
-            @event.Id = cloudEvent.Id;
-            @event.Timestamp = cloudEvent.Time;
-            @event.Type = cloudEvent.Type;
-            @event.Source = cloudEvent.Source;
-
-            if (TryGetExtensionAttribute(cloudEvent, SubjectName, out string? val))
-                @event.Subject = val;
-
-            if (TryGetExtensionAttribute(cloudEvent, ActionName, out val))
-                @event.Action = val;
-
-            if (TryGetExtensionAttribute(cloudEvent, CorrelationIdName, out val))
-                @event.CorrelationId = val;
-            else
-                @event.CorrelationId = null;
-
-            if (TryGetExtensionAttribute(cloudEvent, PartitionKeyName, out val))
-                @event.PartitionKey = val;
-            
-            if (TryGetExtensionAttribute(cloudEvent, TenantIdName, out val))
-                @event.TenantId = val;
-
-            if (TryGetExtensionAttribute(cloudEvent, ETagName, out val))
-                @event.ETag = val;
-
-            if (TryGetExtensionAttribute(cloudEvent, KeyName, out val))
-                @event.Key = val;
-
-            foreach (var att in cloudEvent.ExtensionAttributes)
-            {
-                if (!ReservedNames.Contains(att.Name) && TryGetExtensionAttribute(cloudEvent, att.Name, out val))
-                    @event.AddAttribute(att.Name, val);
-            }
-
-            OnDeserialize(cloudEvent, @event);
-        }
-
-        /// <summary>
-        /// Invoked after the standard <see cref="EventData"/> properties have been updated from the <see cref="CloudEvent"/> to enable further customization where required.
-        /// </summary>
-        /// <param name="event">The source <see cref="EventData"/>.</param>
-        /// <param name="cloudEvent">The corresponding <see cref="CloudEvent"/>.</param>
-        protected virtual void OnDeserialize(CloudEvent cloudEvent, EventData @event) { }
-
-        /// <summary>
-        /// Decodes (deserializes) the JSON <paramref name="eventData"/> into a <see cref="CloudEvent"/>.
-        /// </summary>
-        /// <returns>The <see cref="CloudEvent"/>.</returns>
-        protected abstract Task<CloudEvent> DecodeAsync(BinaryData eventData, CancellationToken cancellation);
-
-        /// <summary>
-        /// Decodes (deserializes) the typed <paramref name="eventData"/> into a <see cref="CloudEvent"/>.
-        /// </summary>
-        /// <returns>The <see cref="CloudEvent"/>.</returns>
-        protected abstract Task<CloudEvent> DecodeAsync<T>(BinaryData eventData, CancellationToken cancellation);
-
-        /// <inheritdoc/>
-        public Task<BinaryData> SerializeAsync(EventData @event, CancellationToken cancellationToken = default)
-        {
-            @event = @event.ThrowIfNull(nameof(@event)).Copy();
-            return SerializeToCloudEventAsync(@event, cancellationToken);
-        }
-
-        /// <inheritdoc/>
-        public Task<BinaryData> SerializeAsync<T>(EventData<T> @event, CancellationToken cancellationToken = default)
-        {
-            @event = @event.ThrowIfNull(nameof(@event)).Copy();
-            return SerializeToCloudEventAsync(@event, cancellationToken);
-        }
-
-        /// <summary>
-        /// Serializes the <paramref name="event"/>.
-        /// </summary>
-        private async Task<BinaryData> SerializeToCloudEventAsync(EventData @event, CancellationToken cancellationToken)
-        {
-            var ce = new CloudEvent
-            {
-                Id = @event.Id,
-                Time = @event.Timestamp,
-                Type = @event.Type ?? throw new InvalidOperationException($"CloudEvents must have a Type; the {nameof(EventDataFormatter)} should be updated to set."),
-                Source = @event.Source ?? throw new InvalidOperationException($"CloudEvents must have a Source; the {nameof(EventDataFormatter)} should be updated to set.")
-            };
-
-            SetExtensionAttribute(ce, SubjectName, @event.Subject);
-            SetExtensionAttribute(ce, ActionName, @event.Action);
-            SetExtensionAttribute(ce, CorrelationIdName, @event.CorrelationId);
-            SetExtensionAttribute(ce, PartitionKeyName, @event.PartitionKey);
-            SetExtensionAttribute(ce, TenantIdName, @event.TenantId);
-            SetExtensionAttribute(ce, ETagName, @event.ETag);
-            SetExtensionAttribute(ce, KeyName, @event.Key);
-
-            if (@event.Attributes != null)
-            {
-                foreach (var att in @event.Attributes.Where(x => !string.IsNullOrEmpty(x.Key) && x.Key.All(c => char.IsLetterOrDigit(c))))
-                {
-                    SetExtensionAttribute(ce, EventDataFormatter.TextInfo.ToLower(att.Key), att.Value);
-                }
-            }
-
-            OnSerialize(@event, ce);
-
-            if (@event.Value is not null)
-            {
-                ce.DataContentType = MediaTypeNames.Application.Json;
-                ce.Data = CustomSerializers.SerializeToBinaryData(@event, EventDataFormatter.JsonSerializer!, true);
-
-                // Where attachments are supported, check the size of the data and write to the attachment storage if required.
-                if (AttachmentStorage is not null)
-                {
-                    var data = CustomSerializers.SerializeToBinaryData(@event, EventDataFormatter.JsonSerializer!, true);
-                    if (data.ToMemory().Length >= AttachmentStorage!.MaxDataSize)
-                        ce.Data = await AttachmentStorage.WriteAsync(@event, data, cancellationToken).ConfigureAwait(false);
-                }
-            }
-
-            return await EncodeAsync(ce, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Encodes (serializes) the <paramref name="cloudEvent"/> into a <see cref="BinaryData"/>.
-        /// </summary>
-        /// <param name="cloudEvent">The <see cref="CloudEvent"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="BinaryData"/>.</returns>
-        protected abstract Task<BinaryData> EncodeAsync(CloudEvent cloudEvent, CancellationToken cancellationToken); 
-
-        /// <summary>
-        /// Invoked after the standard <see cref="EventData"/> properties have been updated to the <see cref="CloudEvent"/> to enable further customization where required.
-        /// </summary>
-        /// <param name="event">The source <see cref="EventDataBase"/>.</param>
-        /// <param name="cloudEvent">The corresponding <see cref="CloudEvent"/>.</param>
-        protected virtual void OnSerialize(EventDataBase @event, CloudEvent cloudEvent) { }
-
-        /// <summary>
-        /// Sets the <see cref="CloudEvent"/> extension attribute where not default value.
-        /// </summary>
-        /// <param name="ce">The <see cref="CloudEvent"/>.</param>
-        /// <param name="name">The attribute name.</param>
-        /// <param name="value">The attribute value.</param>
-        protected static void SetExtensionAttribute<T>(CloudEvent ce, string name, T value)
-        {
-            if (Comparer<T>.Default.Compare(value, default!) == 0)
-                return;
-
-            ce[name] = value;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="CloudEvent"/> extension attribute value.
-        /// </summary>
-        /// <param name="ce">The <see cref="CloudEvent"/>.</param>
-        /// <param name="name">The attribute name.</param>
-        /// <param name="value">The attribute value.</param>
-        /// <returns><c>true</c> indicates that the extension attribute exists; otherwise, <c>false</c>.</returns>
-        private static bool TryGetExtensionAttribute<T>(CloudEvent ce, string name, [NotNullWhen(true)] out T? value)
-        {
-            value = default!;
-            var val = ce[name];
-            if (val == null)
-                return false;
-
-            value = (T)val;
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/CustomEventSerializers.cs b/src/CoreEx/Events/CustomEventSerializers.cs
deleted file mode 100644
index 7cc3c1a2..00000000
--- a/src/CoreEx/Events/CustomEventSerializers.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Enables the adding of <see cref="CustomEventSerializer"/> for specific <see cref="EventData.Value"/> types to customize the serialization.
-    /// </summary>
-    /// <remarks>This allows the JSON to be manipulated before it is sent; for example, to remove properties and/or mask content where applicable.</remarks>
-    public class CustomEventSerializers
-    {
-        private readonly Dictionary<Type, CustomEventSerializer> _serializers = [];
-
-        /// <summary>
-        /// Adds a serializer for the specified <see cref="EventData.Value"/> type.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="EventData.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="serializer">The <see cref="CustomEventSerializer"/> to be used to perform the <see cref="BinaryData"/> serialization.</param>
-        /// <returns>The <see cref="CustomEventSerializers"/> to enable fluent-style method-chaining.</returns>
-        public CustomEventSerializers Add<T>(CustomEventSerializer serializer)
-        {
-            _serializers.Add(typeof(T), serializer);
-            return this;
-        }
-
-        /// <summary>
-        /// Serialize the <paramref name="event"/> (<see cref="EventData.Value"/>) to JSON <see cref="BinaryData"/>.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData"/> for serialization.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/> to be used.</param>
-        /// <param name="serializeValueOnly">Indicates whether the <see cref="EventData.Value"/> is serialized only (<c>true</c>); or alternatively, the complete <see cref="EventData"/> including all metadata (<c>false</c>).</param>
-        /// <returns>The JSON <see cref="BinaryData"/>.</returns>
-        public virtual BinaryData SerializeToBinaryData(EventData @event, IJsonSerializer jsonSerializer, bool serializeValueOnly)
-        {
-            @event.ThrowIfNull(nameof(@event));
-            jsonSerializer.ThrowIfNull(nameof(jsonSerializer));
-
-            if (@event.Value is not null && _serializers.TryGetValue(@event.Value.GetType(), out var serializer))
-                return serializer(@event, jsonSerializer, serializeValueOnly);
-            else
-                return DefaultEventSerializer(@event, jsonSerializer, serializeValueOnly);
-        }
-
-        /// <summary>
-        /// Provides the default event serialization.
-        /// </summary>
-        public static CustomEventSerializer DefaultEventSerializer { get; } = (@event, jsonSerializer, serializeValueOnly) =>
-        {
-            @event.ThrowIfNull(nameof(@event));
-            jsonSerializer.ThrowIfNull(nameof(jsonSerializer));
-
-            return serializeValueOnly ? jsonSerializer.SerializeToBinaryData(@event.Value) : jsonSerializer.SerializeToBinaryData(@event);
-        };
-    }
-
-    /// <summary>
-    /// Represents the method that provides the custom event serialization.
-    /// </summary>
-    /// <param name="event">The <see cref="EventData"/> for serialization.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/> to be used.</param>
-    /// <param name="serializeValueOnly">Indicates whether the <see cref="EventData.Value"/> is serialized only (<c>true</c>); or alternatively, the complete <see cref="EventData"/> including all metadata (<c>false</c>).</param>
-    /// <returns></returns>
-    public delegate BinaryData CustomEventSerializer(EventData @event, IJsonSerializer jsonSerializer, bool serializeValueOnly);
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventData.cs b/src/CoreEx/Events/EventData.cs
deleted file mode 100644
index 582b2813..00000000
--- a/src/CoreEx/Events/EventData.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents the core event data with a generic <see cref="object"/> <see cref="Value"/>.
-    /// </summary>
-    public class EventData : EventDataBase
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventData"/> class.
-        /// </summary>
-        public EventData() : base() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventData"/> class copying from another <paramref name="event"/> (excludes <see cref="Value"/>).
-        /// </summary>
-        /// <param name="event">The <paramref name="event"/> to copy from.</param>
-        /// <remarks>Does not copy the underlying <see cref="Value"/>; this must be set explicitly.</remarks>
-        public EventData(EventDataBase @event) : base(@event) { }
-
-        /// <summary>
-        /// Gets or sets the underlying data.
-        /// </summary>
-        public object? Value { get; set; }
-
-        /// <summary>
-        /// Copies the <see cref="EventData"/> (including the <see cref="Value"/>) creating a new instance.
-        /// </summary>
-        /// <returns>A new <see cref="EventData"/> instance.</returns>
-        public EventData Copy() => new(this) { Value = Value };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventDataBase.cs b/src/CoreEx/Events/EventDataBase.cs
deleted file mode 100644
index 18d41ca0..00000000
--- a/src/CoreEx/Events/EventDataBase.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the base event data.
-    /// </summary>
-    public abstract class EventDataBase : IIdentifier<string>, ITenantId, IPartitionKey, IETag
-    {
-        private Dictionary<string, object?>? _internal;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventData"/> class.
-        /// </summary>
-        protected EventDataBase() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventDataBase"/> class copying the metadata from another <paramref name="event"/>.
-        /// </summary>
-        /// <param name="event">The <paramref name="event"/> to copy the metadata from.</param>
-        protected EventDataBase(EventDataBase @event) => CopyMetadata(@event);
-
-        /// <summary>
-        /// Gets or sets the unique event identifier.
-        /// </summary>
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event subject.
-        /// </summary>
-        /// <remarks>This is the core subject. Often this will be the name (noun) of the entity being published.</remarks>
-        public string? Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event action.
-        /// </summary>
-        /// <remarks>This is the action or command (verb) related to the <see cref="Subject"/>.</remarks>
-        public string? Action { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event type.
-        /// </summary>
-        /// <remarks>This describes the type of occurrence which has happened. Often this attribute is used for routing, observability, policy enforcement, etc.</remarks>
-        public string? Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event source.
-        /// </summary>
-        /// <remarks>This describes the event producer. Often this will include information such as the type of the event source, the organization publishing the event, the process that produced the event, and some unique identifiers.</remarks>
-        public Uri? Source { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event timestamp.
-        /// </summary>
-        public DateTimeOffset? Timestamp { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event correlation identifier.
-        /// </summary>
-        public string? CorrelationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the event key. 
-        /// </summary>
-        public string? Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tenant identifier.
-        /// </summary>
-        public string? TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the partition key.
-        /// </summary>
-        public string? PartitionKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the entity tag.
-        /// </summary>
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the list of extended/additional attributes to be published/sent.
-        /// </summary>
-        /// <remarks>The key and value are both of <see cref="System.Type"/> <see cref="string"/> to ensure that the dictionary can be serialized/deserialized consistently where required.
-        /// <para>It is recommeded to use the <see cref="Internal"/> for data not intended for publishing/sending purposes.</para></remarks>
-        public IDictionary<string, string>? Attributes { get; set; }
-
-        /// <summary>
-        /// Indicates whether there are any items within the <see cref="Attributes"/> dictionary.
-        /// </summary>
-        [JsonIgnore()]
-        public bool HasAttributes => Attributes != null && Attributes.Count > 0;
-
-        /// <summary>
-        /// Adds a new attribute to the <see cref="Attributes"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="value">The value.</param>
-        public void AddAttribute(string key, string value) => (Attributes ??= new Dictionary<string, string>()).Add(key, value.ThrowIfNull(nameof(value)));
-
-        /// <summary>
-        /// Determines whether the <see cref="Attributes"/> contain an attribute with the specified <paramref name="key"/>. 
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <returns><c>true</c> indicates that the attribute exists; otherwise, <c>false</c>.</returns>
-        public bool HasAttribute(string key) => Attributes is not null && Attributes.ContainsKey(key);
-
-        /// <summary>
-        /// Gets the <see cref="Attributes"/> <paramref name="value"/> associated with the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="value">The value where exists; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> indicates that the attribute exists; otherwise, <c>false</c>.</returns>
-        public bool TryGetAttribute(string key, [NotNullWhen(true)] out string? value)
-        {
-            if (Attributes is null)
-            {
-                value = null;
-                return false;
-            }
-
-            return Attributes.TryGetValue(key, out value);
-        }
-
-        /// <summary>
-        /// Gets the internal properties; note that these are for internal storage pre-publishing and sending; and therefore are not automatically published.
-        /// </summary>
-        /// <remarks>It is recommened to use the <see cref="Attributes"/> for the purposes of publishing and sending of additional data.</remarks>
-        [JsonIgnore()]
-        public IDictionary<string, object?> Internal => _internal ??= [];
-
-        /// <summary>
-        /// Indicates whether there are any items within the <see cref="Internal"/> dictionary.
-        /// </summary>
-        [JsonIgnore()]
-        public bool HasInternal => _internal != null && _internal.Count > 0;
-
-        /// <summary>
-        /// Copies the metadata from the specified <paramref name="event"/> replacing existing.
-        /// </summary>
-        /// <param name="event">The <see cref="EventDataBase"/> to copy from.</param>
-        public void CopyMetadata(EventDataBase @event)
-        {
-            Id = (@event.ThrowIfNull(nameof(@event))).Id;
-            Timestamp = @event.Timestamp;
-            Subject = @event.Subject;
-            Action = @event.Action;
-            Type = @event.Type;
-            Source = @event.Source;
-            CorrelationId = @event.CorrelationId;
-            TenantId = @event.TenantId;
-            PartitionKey = @event.PartitionKey;
-            ETag = @event.ETag;
-            Key = @event.Key;
-
-            if (@event.HasAttributes)
-            {
-                Attributes ??= new Dictionary<string, string>();
-                Attributes.Clear();
-                foreach (var attribute in @event.Attributes!)
-                    Attributes.Add(attribute.Key, attribute.Value);
-            }
-            else
-                Attributes?.Clear();
-
-            if (@event.HasInternal)
-            {
-                _internal ??= new Dictionary<string, object?>(@event.Internal);
-                _internal.Clear();
-                foreach (var attribute in @event.Internal)
-                    _internal.Add(attribute.Key, attribute.Value);
-            }
-            else
-                _internal?.Clear();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventDataFormatter.cs b/src/CoreEx/Events/EventDataFormatter.cs
deleted file mode 100644
index 7f1cd194..00000000
--- a/src/CoreEx/Events/EventDataFormatter.cs
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Globalization;
-using CoreEx.Json;
-using System;
-using System.Globalization;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the <see cref="EventData"/> formatting options and corresponding <see cref="Format(EventData)"/>.
-    /// </summary>
-    /// <remarks>This enables further standardized formatting of the <see cref="EventData"/> prior to serialization.
-    /// <para>The <see cref="EventDataBase.Id"/>, <see cref="EventDataBase.Timestamp"/> and <see cref="EventDataBase.CorrelationId"/> will default, where <c>null</c>, to <see cref="Guid.NewGuid()"/>, <see cref="SystemTime.Timestamp"/> and
-    /// <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.CorrelationId"/> respectively.</para></remarks>
-    public class EventDataFormatter
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventDataFormatter"/> class.
-        /// </summary>
-        public EventDataFormatter() => TypeDefault = _ => TypeDefaultToValueTypeName ? "None" : null;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventData"/> property selection; where a property is not selected its value will be reset to <c>null</c>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="EventDataProperty.All"/>.</remarks>
-        public EventDataProperty PropertySelection { get; set; } = EventDataProperty.All;
-
-        /// <summary>
-        /// Gets or sets the <see cref="System.Globalization.TextInfo"/> to manage the underlying <see cref="TextInfoCasing"/> applications.
-        /// </summary>
-        public TextInfo TextInfo { get; set; } = CultureInfo.InvariantCulture.TextInfo;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Type"/> value casing conversion.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="TextInfoCasing.Lower"/>.</remarks>
-        public TextInfoCasing TypeCasing = TextInfoCasing.Lower;
-
-        /// <summary>
-        /// Indicates whether to append the <see cref="EventDataBase.Key"/> to the <see cref="EventDataBase.Type"/> value.
-        /// </summary>
-        /// <remarks>This is applied before <see cref="TypeAppendEntityKey"/>.</remarks>
-        public bool TypeAppendKey { get; set; } = false;
-
-        /// <summary>
-        /// Indicates whether to append the <see cref="IEntityKey.EntityKey"/> to the <see cref="EventDataBase.Type"/> value.
-        /// </summary>
-        /// <remarks>This is applied after <see cref="TypeAppendKey"/>.</remarks>
-        public bool TypeAppendEntityKey { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Type"/> separator character.
-        /// </summary>
-        /// <remarks>Defaults to '<c>.</c>'.</remarks>
-        public char TypeSeparatorCharacter { get; set; } = '.';
-
-        /// <summary>
-        /// Indicates whether to default the <see cref="EventDataBase.Type"/> to the <see cref="EventData.Value"/> value <see cref="Type.FullName"/> where <c>null</c>.
-        /// </summary>
-        public bool TypeDefaultToValueTypeName { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Subject"/> value casing conversion.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="TextInfoCasing.Lower"/>.</remarks>
-        public TextInfoCasing SubjectCasing = TextInfoCasing.Lower;
-
-        /// <summary>
-        /// Indicates whether to append the <see cref="EventDataBase.Key"/> to the <see cref="EventDataBase.Subject"/> value.
-        /// </summary>
-        /// <remarks>This is applied before <see cref="SubjectAppendEntityKey"/>.</remarks>
-        public bool SubjectAppendKey { get; set; } = false;
-
-        /// <summary>
-        /// Indicates whether to append the <see cref="IEntityKey.EntityKey"/> to the <see cref="EventDataBase.Subject"/> value.
-        /// </summary>
-        /// <remarks>This is applied after <see cref="SubjectAppendKey"/>.</remarks>
-        public bool SubjectAppendEntityKey { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Subject"/> separator character.
-        /// </summary>
-        /// <remarks>Defaults to '<c>.</c>'.</remarks>
-        public char SubjectSeparatorCharacter { get; set; } = '.';
-
-        /// <summary>
-        /// Indicates whether to default the <see cref="EventDataBase.Subject"/> to the <see cref="EventData.Value"/> value <see cref="Type.FullName"/> where <c>null</c>.
-        /// </summary>
-        public bool SubjectDefaultToValueTypeName { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Action"/> value casing conversion.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="TextInfoCasing.Lower"/>.</remarks>
-        public TextInfoCasing ActionCasing = TextInfoCasing.Lower;
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Source"/> default delegate to be used where not specified.
-        /// </summary>
-        /// <remarks>Defaults to <c>null</c>.</remarks>
-        public Func<EventData, Uri?>? SourceDefault { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Type"/> default delegate to be used where not specified.
-        /// </summary>
-        /// <remarks>Defaults to a function that returns '<c>None</c>' when <see cref="TypeDefaultToValueTypeName"/> is <c>true</c>.</remarks>
-        public Func<EventData, string?>? TypeDefault { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Key"/> separator character.
-        /// </summary>
-        /// <remarks>Defaults to '<c>,</c>'.</remarks>
-        public char KeySeparatorCharacter { get; set; } = ',';
-
-        /// <summary>
-        /// Indicates whether to default the <see cref="EventDataBase.ETag"/> to the <see cref="EventData.Value"/> value where it implements <see cref="IETag"/>.
-        /// </summary>
-        /// <remarks>This is applied before <see cref="ETagDefaultGenerated"/>.</remarks>
-        public bool ETagDefaultFromValue { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether to default the <see cref="EventDataBase.ETag"/> to the <see cref="EventData.Value"/> value by using the <see cref="ETagGenerator"/>.
-        /// </summary>
-        /// <remarks>This is applied after <see cref="ETagDefaultFromValue"/>.</remarks>
-        public bool ETagDefaultGenerated { get; set; } = false;
-
-        /// <summary>
-        /// Indicates whether to default the <see cref="EventDataBase.PartitionKey"/> to the <see cref="EventData.Value"/> value where it implements <see cref="IPartitionKey"/>.
-        /// </summary>
-        public bool PartitionKeyDefaultFromValue { get; set; } = true;
-
-        /// <summary>
-        /// Indicates whether to default the <see cref="EventDataBase.TenantId"/> to the <see cref="EventData.Value"/> value where it implements <see cref="ITenantId"/>.
-        /// </summary>
-        public bool TenantIdDefaultFromValue { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        /// <remarks>Required for the <see cref="ETagDefaultGenerated"/>.</remarks>
-        public IJsonSerializer? JsonSerializer { get; set; }
-
-        /// <summary>
-        /// Formats the <paramref name="event"/> using the configured formatting options where applicable.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData"/> to format.</param>
-        public virtual void Format(EventData @event)
-        {
-            var value = @event.Value;
-
-            @event.Id ??= Guid.NewGuid().ToString();
-            @event.Timestamp ??= new DateTimeOffset(SystemTime.Timestamp);
-
-            if (PropertySelection.HasFlag(EventDataProperty.Key))
-            {
-                if (@event.Key is null && value is not null && value is IEntityKey ek)
-                    @event.Key = ek.EntityKey.ToString(KeySeparatorCharacter);
-            }
-
-            if (PropertySelection.HasFlag(EventDataProperty.Subject))
-            {
-                if (@event.Subject == null && SubjectDefaultToValueTypeName && value != null)
-                    @event.Subject = TextInfo.ToCasing(GetDataType(value, SubjectSeparatorCharacter), SubjectCasing);
-                else if (@event.Subject != null && SubjectCasing != TextInfoCasing.None)
-                    @event.Subject = TextInfo.ToCasing(@event.Subject, SubjectCasing);
-
-                if (SubjectAppendKey && @event.Key != null)
-                    @event.Subject = Concatenate(@event.Subject, SubjectSeparatorCharacter, @event.Key);
-                else if (SubjectAppendEntityKey && value is IEntityKey ek)
-                    @event.Subject = Concatenate(@event.Subject, SubjectSeparatorCharacter, ek.EntityKey.ToString(KeySeparatorCharacter));
-            }
-            else
-                @event.Subject = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.Action))
-            {
-                if (@event.Action != null && ActionCasing != TextInfoCasing.None)
-                    @event.Action = TextInfo.ToCasing(@event.Action, ActionCasing);
-            }
-            else
-                @event.Action = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.Type))
-            {
-                if (@event.Type == null && TypeDefaultToValueTypeName && value != null)
-                    @event.Type = TextInfo.ToCasing(GetDataType(value, TypeSeparatorCharacter), TypeCasing);
-                else if (@event.Type != null && TypeCasing != TextInfoCasing.None)
-                    @event.Type = TextInfo.ToCasing(@event.Type, TypeCasing);
-
-                if (TypeAppendKey && @event.Key != null)
-                    @event.Type = Concatenate(@event.Type, TypeSeparatorCharacter, @event.Key);
-                else if (TypeAppendEntityKey && value is IEntityKey ek)
-                    @event.Type = Concatenate(@event.Type, TypeSeparatorCharacter, ek.EntityKey.ToString(KeySeparatorCharacter));
-
-                @event.Type ??= TextInfo.ToCasing(TypeDefault?.Invoke(@event), TypeCasing);
-            }
-            else
-                @event.Type = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.CorrelationId))
-                @event.CorrelationId ??= ExecutionContext.HasCurrent ? ExecutionContext.Current.CorrelationId : @event.Id;
-            else
-                @event.CorrelationId = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.TenantId))
-            {
-                if (@event.TenantId is null && TenantIdDefaultFromValue && value is not null && value is ITenantId tid)
-                    @event.TenantId = tid.TenantId;
-            }
-            else
-                @event.TenantId = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.PartitionKey))
-            {
-                if (@event.PartitionKey is null && PartitionKeyDefaultFromValue && value is not null && value is IPartitionKey pk)
-                    @event.PartitionKey = pk.PartitionKey;
-            }
-            else
-                @event.PartitionKey = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.ETag))
-            {
-                if (@event.ETag == null)
-                {
-                    if (ETagDefaultFromValue && value != null && value is IETag etag)
-                        @event.ETag = etag.ETag;
-
-                    if (@event.ETag == null && ETagDefaultGenerated && value != null)
-                        @event.ETag = ETagGenerator.Generate(JsonSerializer ?? throw new InvalidOperationException($"The {nameof(JsonSerializer)} must be provided for the {nameof(ETagDefaultGenerated)} to function."), value);
-                }
-            }
-            else
-                @event.ETag = null;
-
-            if (!PropertySelection.HasFlag(EventDataProperty.Attributes) && @event.HasAttributes)
-                @event.Attributes = null;
-
-            if (PropertySelection.HasFlag(EventDataProperty.Source))
-                @event.Source ??= SourceDefault?.Invoke(@event);
-            else
-                @event.Source = null;
-
-            if (!PropertySelection.HasFlag(EventDataProperty.Key))
-                @event.Key = null;
-
-            if (@event.Value is not null && @event.Value is IEventDataFormatter formattable)
-                formattable.Format(@event);
-        }
-
-        /// <summary>
-        /// Gets the formatted EventData.Data Type name.
-        /// </summary>
-        private static string? GetDataType(object? val, char separator)
-        {
-            if (val == null)
-                return null;
-
-            var name = val.GetType().FullName;
-            return separator == '.' ? name : name?.Replace('.', separator);
-        }
-
-        /// <summary>
-        /// Concatenate to make new string value.
-        /// </summary>
-        private static string? Concatenate(string? left, char separator, string? right)
-        {
-            if (string.IsNullOrEmpty(left))
-                return right;
-            else if (string.IsNullOrEmpty(right))
-                return left;
-            else
-                return string.Concat(left, separator, right);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventDataProperty.cs b/src/CoreEx/Events/EventDataProperty.cs
deleted file mode 100644
index 72305cba..00000000
--- a/src/CoreEx/Events/EventDataProperty.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents the <see cref="EventDataBase"/> property selection.
-    /// </summary>
-    /// <remarks>The <see cref="EventDataBase.Id"/>, <see cref="EventDataBase.Timestamp"/> and <see cref="EventData.Value"/> are non-selectable; i.e. are always included.</remarks>
-    [Flags]
-    public enum EventDataProperty
-    {
-        /// <summary>
-        /// Represents no properties.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.Subject"/> property.
-        /// </summary>
-        Subject = 1,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.Action"/> property.
-        /// </summary>
-        Action = 2,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.Type"/> property.
-        /// </summary>
-        Type = 4,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.Source"/> property.
-        /// </summary>
-        Source = 8,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.TenantId"/> property.
-        /// </summary>
-        TenantId = 16,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.PartitionKey"/> property.
-        /// </summary>
-        PartitionKey = 32,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.ETag"/> property.
-        /// </summary>
-        ETag = 64,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.CorrelationId"/> property.
-        /// </summary>
-        CorrelationId = 128,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.Key"/> property.
-        /// </summary>
-        Key = 256,
-
-        /// <summary>
-        /// Selects the <see cref="EventDataBase.Attributes"/> property.
-        /// </summary>
-        Attributes = 512,
-
-        /// <summary>
-        /// Selects all of the properties.
-        /// </summary>
-        All = AllExceptAttributes | Attributes,
-
-        /// <summary>
-        /// Selects all of the properties except <see cref="Attributes"/>.
-        /// </summary>
-        AllExceptAttributes = Subject | Action | Type | Source | TenantId | PartitionKey | ETag | CorrelationId | Key,
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventDataSerializerBase.cs b/src/CoreEx/Events/EventDataSerializerBase.cs
deleted file mode 100644
index 88f06a46..00000000
--- a/src/CoreEx/Events/EventDataSerializerBase.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events.Attachments;
-using CoreEx.Json;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the base <see cref="EventData"/> <see cref="IEventSerializer"/> capabilities.
-    /// </summary>
-    /// <remarks>The <see cref="SerializeValueOnly"/> indicates whether the <see cref="EventData.Value"/> is serialized only (default); or alternatively, the complete <see cref="EventData"/>.</remarks>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    /// <param name="eventDataFormatter">The <see cref="Events.EventDataFormatter"/>.</param>
-    public abstract class EventDataSerializerBase(IJsonSerializer jsonSerializer, EventDataFormatter? eventDataFormatter) : IEventSerializer
-    {
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public IJsonSerializer JsonSerializer { get; } = jsonSerializer.ThrowIfNull(nameof(jsonSerializer));
-
-        /// <inheritdoc/>
-        public EventDataFormatter EventDataFormatter { get; } = eventDataFormatter ?? new EventDataFormatter();
-
-        /// <inheritdoc/>
-        public IAttachmentStorage? AttachmentStorage { get; set; }
-
-        /// <inheritdoc/>
-        public CustomEventSerializers CustomSerializers { get; } = new();
-
-        /// <summary>
-        /// Indicates whether the <see cref="EventData.Value"/> is serialized only (<c>true</c>); or alternatively, the complete <see cref="EventData"/> including all metadata (<c>false</c>).
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>.</remarks>
-        public bool SerializeValueOnly { get; set; } = true;
-
-        /// <inheritdoc/>
-        public async Task<EventData> DeserializeAsync(BinaryData eventData, CancellationToken cancellationToken = default)
-        {
-            var (Attachment, Data) = await DeserializeAttachmentAsync(eventData, cancellationToken).ConfigureAwait(false);
-
-            if (SerializeValueOnly)
-                return new EventData { Value = JsonSerializer.Deserialize(Data) };
-
-            if (AttachmentStorage is null || Attachment is null)
-                return JsonSerializer.Deserialize<EventData>(eventData)!;
-
-            return new EventData(DeserializeAsBase(eventData)) { Value = JsonSerializer.Deserialize(Data)! };
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventData<T>> DeserializeAsync<T>(BinaryData eventData, CancellationToken cancellationToken = default)
-        {
-            var (Attachment, Data) = await DeserializeAttachmentAsync(eventData, cancellationToken).ConfigureAwait(false);
-
-            if (SerializeValueOnly)
-                return new EventData<T> { Value = JsonSerializer.Deserialize<T>(Data)! };
-
-            if (AttachmentStorage is null || Attachment is null)
-                return JsonSerializer.Deserialize<EventData<T>>(Data)!;
-
-            return new EventData<T>(DeserializeAsBase(eventData)) { Value = JsonSerializer.Deserialize<T>(Data)! };
-        }
-
-        /// <inheritdoc/>
-        public async Task<EventData> DeserializeAsync(BinaryData eventData, Type valueType, CancellationToken cancellationToken = default)
-        {
-            valueType.ThrowIfNull(nameof(valueType));
-            var (Attachment, Data) = await DeserializeAttachmentAsync(eventData, cancellationToken).ConfigureAwait(false);
-            var edvt = typeof(EventData<>).MakeGenericType(valueType);
-            EventData ed;
-
-            if (SerializeValueOnly)
-            {
-                ed = (EventData)Activator.CreateInstance(edvt)!;
-                ed.Value = JsonSerializer.Deserialize(Data, valueType);
-                return ed;
-            }
-
-            if (AttachmentStorage is null || Attachment is null)
-                return (EventData)JsonSerializer.Deserialize(Data, edvt)!;
-
-            ed = (EventData)Activator.CreateInstance(edvt)!;
-            ed.CopyMetadata(DeserializeAsBase(eventData));
-            ed.Value = JsonSerializer.Deserialize(Data, valueType);
-            return ed;
-        }
-
-        /// <summary>
-        /// Determine whether the event data is an attachment reference; and if so, replace current event data with the attachment contents.
-        /// </summary>
-        private async Task<(EventAttachment? Attachment, BinaryData Data)> DeserializeAttachmentAsync(BinaryData eventData, CancellationToken cancellationToken)
-        {
-            EventAttachment? attachment = null;
-            var data = eventData;
-            if (AttachmentStorage is not null)
-            {
-                attachment = SerializeValueOnly ? JsonSerializer.Deserialize<EventAttachment>(eventData) : JsonSerializer.Deserialize<EventData<EventAttachment>>(eventData)?.Value;
-                if (attachment is not null && !attachment.IsEmpty)
-                    data = await AttachmentStorage.ReadAync(attachment, cancellationToken).ConfigureAwait(false);
-            }
-
-            return (attachment is not null && attachment.IsEmpty ? null : attachment, data);
-        }
-
-        /// <summary>
-        /// Deserializes as the base <see cref="EventData"/>.
-        /// </summary>
-        private EventData DeserializeAsBase(BinaryData eventData)
-            => SerializeValueOnly ? new EventData { Value = JsonSerializer.Deserialize(eventData) } : JsonSerializer.Deserialize<EventData>(eventData)!;
-
-        /// <inheritdoc/>
-        public Task<BinaryData> SerializeAsync(EventData @event, CancellationToken cancellationToken = default)
-            => SerializeInternalAsync(@event, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<BinaryData> SerializeAsync<T>(EventData<T> @event, CancellationToken cancellationToken = default)
-            => SerializeInternalAsync(@event, cancellationToken);
-
-        /// <summary>
-        /// Serializes the <see cref="EventData"/> to a <see cref="BinaryData"/> and optionally writes any attachment.
-        /// </summary>
-        private async Task<BinaryData> SerializeInternalAsync(EventData @event, CancellationToken cancellationToken = default)
-        {
-            BinaryData data;
-            EventAttachment attachment;
-
-            // Only serializes the value.
-            if (SerializeValueOnly)
-            {
-                data = CustomSerializers.SerializeToBinaryData(@event, JsonSerializer, SerializeValueOnly);
-                if (AttachmentStorage is null || data.ToMemory().Length <= AttachmentStorage!.MaxDataSize)
-                    return data;
-
-                // Create the attachment and serialize the event with the attachment reference.
-                attachment = await AttachmentStorage.WriteAsync(@event, data, cancellationToken).ConfigureAwait(false);
-                return JsonSerializer.SerializeToBinaryData(attachment);
-            }
-
-            // Serializes the complete event including metadata.
-            if (AttachmentStorage is null)
-                return CustomSerializers.SerializeToBinaryData(@event, JsonSerializer, SerializeValueOnly);
-
-            // Serialize the value and check if needs to be an attachment.
-            data = CustomSerializers.SerializeToBinaryData(@event, JsonSerializer, true);
-            if (data.ToMemory().Length < AttachmentStorage!.MaxDataSize)
-                return CustomSerializers.SerializeToBinaryData(@event, JsonSerializer, false);
-
-            // Create the attachment and re-serialize the event with the attachment reference.
-            attachment = await AttachmentStorage.WriteAsync(@event, data, cancellationToken).ConfigureAwait(false);
-            return JsonSerializer.SerializeToBinaryData(new EventData(@event) { Value = attachment });
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventDataT.cs b/src/CoreEx/Events/EventDataT.cs
deleted file mode 100644
index 72f26085..00000000
--- a/src/CoreEx/Events/EventDataT.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents the <see cref="EventData"/> with a typed <see cref="Value"/>.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
-    public class EventData<T> : EventData
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventData"/> class.
-        /// </summary>
-        public EventData() : base() => Value = default!;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventData"/> class copying from another <paramref name="event"/> (excludes <see cref="Value"/>).
-        /// </summary>
-        /// <param name="event">The <paramref name="event"/> to copy from.</param>
-        /// <remarks>Does not copy the underlying <see cref="Value"/>; this must be set explicitly.</remarks>
-        public EventData(EventDataBase @event) : base(@event) { }
-
-        /// <summary>
-        /// Gets or sets the event data.
-        /// </summary>
-        public new T Value { get => (T)base.Value!; set => base.Value = value; }
-
-        /// <summary>
-        /// Copies the <see cref="EventData"/> (including the <see cref="Value"/>) creating a new instance.
-        /// </summary>
-        /// <returns>A new <see cref="EventData"/> instance.</returns>
-        public new EventData<T> Copy() => new(this) { Value = Value };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventExtensions.cs b/src/CoreEx/Events/EventExtensions.cs
deleted file mode 100644
index 5705475e..00000000
--- a/src/CoreEx/Events/EventExtensions.cs
+++ /dev/null
@@ -1,587 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides extension methods for events.
-    /// </summary>
-    public static class EventExtensions
-    {
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, string? subject = null) => publisher.Publish(CreateEvent(publisher, subject, null));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, string? subject, string? action = null) => publisher.Publish(CreateEvent(publisher, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, string? subject, string? action, CompositeKey? key) => publisher.Publish(CreateEvent(publisher, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, string? subject, string? action, params object?[] keyArgs) => publisher.Publish(CreateEvent(publisher, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, Uri source, string? subject = null) => publisher.Publish(CreateEvent(publisher, source, subject));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, Uri source, string? subject, string? action = null) => publisher.Publish(CreateEvent(publisher, source, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, Uri source, string? subject, string? action, CompositeKey? key) => publisher.Publish(CreateEvent(publisher, source, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishEvent(this IEventPublisher publisher, Uri source, string? subject, string? action, params object?[] keyArgs) => publisher.Publish(CreateEvent(publisher, source, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject = null)
-            => publisher.Publish(CreateValueEvent(publisher, value, source, subject));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject, string? action = null)
-            => publisher.Publish(CreateValueEvent(publisher, value, source, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject, string? action, CompositeKey? key) 
-            => publisher.Publish(CreateValueEvent(publisher, value, source, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject, string? action, params object?[] keyArgs)
-            => publisher.Publish(CreateValueEvent(publisher, value, source, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, string? subject = null)
-            => publisher.Publish(CreateValueEvent(publisher, value, subject, null));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, string? subject, string? action = null)
-            => publisher.Publish(CreateValueEvent(publisher, value, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, string? subject, string? action, CompositeKey? key)
-            => publisher.Publish(CreateValueEvent(publisher, value, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishValueEvent<T>(this IEventPublisher publisher, T value, string? subject, string? action, params object?[] keyArgs)
-            => publisher.Publish(CreateValueEvent(publisher, value, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, Uri source, string? subject = null) => publisher.PublishNamed(name, CreateEvent(publisher, source, subject));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, Uri source, string? subject, string? action = null) => publisher.PublishNamed(name, CreateEvent(publisher, source, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, Uri source, string? subject, string? action, CompositeKey? key) => publisher.PublishNamed(name, CreateEvent(publisher, source, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, Uri source, string? subject, string? action, params object?[] keyArgs) => publisher.PublishNamed(name, CreateEvent(publisher, source, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, string? subject = null) => publisher.PublishNamed(name, CreateEvent(publisher, subject, null));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, string? subject, string? action = null) => publisher.PublishNamed(name, CreateEvent(publisher, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, string? subject, string? action, CompositeKey? key) => publisher.PublishNamed(name, CreateEvent(publisher, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public static IEventPublisher PublishNamedEvent(this IEventPublisher publisher, string name, string? subject, string? action, params object?[] keyArgs) => publisher.PublishNamed(name, CreateEvent(publisher, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, Uri source, string? subject = null) => publisher.PublishNamed(name, CreateValueEvent(publisher, value, source, subject));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, Uri source, string? subject, string? action = null) => publisher.PublishNamed(name, CreateValueEvent(publisher, value, source, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, Uri source, string? subject, string? action, CompositeKey? key)
-            => publisher.PublishNamed(name, CreateValueEvent(publisher, value, source, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, Uri source, string? subject, string? action, params object?[] keyArgs)
-            => publisher.PublishNamed(name, CreateValueEvent(publisher, value, source, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, string? subject = null) => publisher.PublishNamed(name, CreateValueEvent(publisher, value, subject, null));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> and <see cref="IEventPublisher.PublishNamed(string, EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, string? subject, string? action = null) => publisher.PublishNamed(name, CreateValueEvent(publisher, value, subject, action));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="key"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, string? subject, string? action, CompositeKey? key)
-            => publisher.PublishNamed(name, CreateValueEvent(publisher, value, subject, action, key));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="keyArgs"/> and <see cref="IEventPublisher.Publish(EventData[])">publishes</see> to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="name">The destination name.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static IEventPublisher PublishNamedValueEvent<T>(this IEventPublisher publisher, string name, T value, string? subject, string? action, params object?[] keyArgs)
-            => publisher.PublishNamed(name, CreateValueEvent(publisher, value, subject, action, keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, string? subject = null)
-            => UpdateEventData(publisher, new() { Subject = subject }, null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, string? subject, string? action = null)
-            => UpdateEventData(publisher, new() { Subject = subject, Action = action }, null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, string? subject, string? action, CompositeKey? key)
-            => UpdateEventData(publisher, new() { Subject = subject, Action = action }, key);
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="keyArgs"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, string? subject, string? action, params object?[] keyArgs)
-            => CreateEvent(publisher, subject, action, new CompositeKey(keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, Uri source, string? subject = null)
-            => UpdateEventData(publisher, new() { Source = source.ThrowIfNull(nameof(source)), Subject = subject }, null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, Uri source, string? subject, string? action = null)
-            => UpdateEventData(publisher, new() { Source = source.ThrowIfNull(nameof(source)), Subject = subject, Action = action }, null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, Uri source, string? subject, string? action, CompositeKey? key)
-            => UpdateEventData(publisher, new() { Source = source.ThrowIfNull(nameof(source)), Subject = subject, Action = action }, key);
-
-        /// <summary>
-        /// Creates an <see cref="EventData"/> including the specified <paramref name="keyArgs"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public static EventData CreateEvent(this IEventPublisher publisher, Uri source, string? subject, string? action, params object?[] keyArgs)
-            => CreateEvent(publisher, source, subject, action, new CompositeKey(keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, string? subject = null)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Subject = subject }, value is IEntityKey ek ? (CompositeKey?)ek.EntityKey : null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, string? subject, string? action = null)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Subject = subject, Action = action }, value is IEntityKey ek ? (CompositeKey?)ek.EntityKey : null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, string? subject, string? action, CompositeKey key)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Subject = subject, Action = action }, key);
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="keyArgs"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, string? subject, string? action, params object?[] keyArgs)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Subject = subject, Action = action }, keyArgs.Length == 1 && keyArgs[0] is CompositeKey ck ? ck : new CompositeKey(keyArgs));
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject = null)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Source = source.ThrowIfNull(nameof(source)), Subject = subject }, value is IEntityKey ek ? (CompositeKey?)ek.EntityKey : null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject, string? action = null)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Source = source.ThrowIfNull(nameof(source)), Subject = subject, Action = action }, value is IEntityKey ek ? (CompositeKey?)ek.EntityKey : null);
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="key"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="key">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject, string? action, CompositeKey key)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Source = source.ThrowIfNull(nameof(source)), Subject = subject, Action = action }, key);
-
-        /// <summary>
-        /// Creates an <see cref="EventData{T}"/> including the specified <paramref name="keyArgs"/>.
-        /// </summary>
-        /// <param name="publisher">The <see cref="IEventPublisher"/>.</param>
-        /// <param name="value">The <see cref="EventData{T}.Value"/>.</param>
-        /// <param name="source">The <see cref="EventDataBase.Source"/>.</param>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/>.</param>
-        /// <param name="action">The <see cref="EventDataBase.Action"/>.</param>
-        /// <param name="keyArgs">The <see cref="EventDataBase.Key"/> <see cref="CompositeKey.Args"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        /// <remarks>The <see cref="EventDataBase.Key"/> is automatically inferred from the <see cref="IEntityKey.EntityKey"/> where implemented.</remarks>
-        public static EventData<T> CreateValueEvent<T>(this IEventPublisher publisher, T value, Uri source, string? subject, string? action, params object?[] keyArgs)
-            => (EventData<T>)UpdateEventData(publisher, new EventData<T>() { Value = value.ThrowIfNull(nameof(value)), Source = source.ThrowIfNull(nameof(source)), Subject = subject, Action = action }, keyArgs.Length == 1 && keyArgs[0] is CompositeKey ck ? ck : new CompositeKey(keyArgs));
-
-        /// <summary>
-        /// Adds the formatted <paramref name="key"/> to the <paramref name="event"/> and stores the underlying <see cref="CompositeKey.Args"/> within <see cref="EventDataBase.Internal"/>.  
-        /// </summary>
-        private static EventData UpdateEventData(IEventPublisher publisher, EventData @event, CompositeKey? key)
-        {
-            if (key is not null)
-            {
-                @event.Key = key.Value.ToString(publisher.EventDataFormatter.KeySeparatorCharacter);
-                @event.Internal.Add(nameof(EventDataBase.Key), key.Value.Args);
-            }
-
-            return @event;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventPublisher.cs b/src/CoreEx/Events/EventPublisher.cs
deleted file mode 100644
index 6a4ac0cb..00000000
--- a/src/CoreEx/Events/EventPublisher.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the event publishing and sending; being the <see cref="EventData">event</see> <see cref="EventDataFormatter.Format(EventData)">formatting</see>, 
-    /// <see cref="IEventSerializer.SerializeAsync{T}(EventData{T}, CancellationToken)">serialization</see> and <see cref="IEventSender.SendAsync(IEnumerable{EventSendData}, CancellationToken)">send</see>.
-    /// </summary>
-    /// <param name="eventDataFormatter">The <see cref="EventDataFormatter"/>.</param>
-    /// <param name="eventSerializer">The <see cref="IEventSerializer"/>.</param>
-    /// <param name="eventSender">The <see cref="IEventSender"/>.</param>
-    public class EventPublisher(EventDataFormatter? eventDataFormatter, IEventSerializer eventSerializer, IEventSender eventSender) : IEventPublisher, IDisposable
-    {
-        private readonly ConcurrentQueue<(string? Destination, EventData Event)> _queue = new();
-
-        /// <summary>
-        /// Gets the <see cref="Events.EventDataFormatter"/>.
-        /// </summary>
-        public EventDataFormatter EventDataFormatter { get; } = eventDataFormatter ?? new EventDataFormatter();
-
-        /// <summary>
-        /// Gets the <see cref="IEventSerializer"/>.
-        /// </summary>
-        public IEventSerializer EventSerializer { get; } = eventSerializer.ThrowIfNull(nameof(eventSerializer));
-
-        /// <summary>
-        /// Gets the <see cref="IEventSender"/>.
-        /// </summary>
-        public IEventSender EventSender { get; } = eventSender.ThrowIfNull(nameof(eventSender));
-
-        /// <inheritdoc/>
-        public bool IsEmpty => _queue.IsEmpty;
-
-        /// <summary>
-        /// Sends one or more <see cref="EventData"/> objects.
-        /// </summary>
-        /// <param name="events">One or more <see cref="EventData"/> objects to be published.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        public IEventPublisher Publish(params EventData[] events) => PublishInternal(null, events);
-
-        /// <summary>
-        /// Sends one or more <see cref="EventData"/> objects to a named destination (e.g. queue or topic).
-        /// </summary>
-        /// <param name="name">The destination name.</param>
-        /// <param name="events">One or more <see cref="EventData"/> objects to be published.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <paramref name="name"/> could represent a queue name or equivalent where appropriate.</remarks>
-        public IEventPublisher PublishNamed(string name, params EventData[] events) => PublishInternal(name.ThrowIfNullOrEmpty(nameof(name)), events);
-
-        /// <summary>
-        /// Performs the formatting and queues internally.
-        /// </summary>
-        private EventPublisher PublishInternal(string? name, params EventData[] events)
-        {
-            foreach (var @event in events)
-            {
-                EventDataFormatter.Format(@event);
-                _queue.Enqueue((name, @event));
-            }
-
-            return this;
-        }
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <param name="cancellationToken"><inheritdoc/></param>
-        /// <remarks>Initially performs the <see cref="EventSerializer">serialization</see> for each queued event, then performs a single <see cref="EventSender">send</see> for all.</remarks>
-        public Task SendAsync(CancellationToken cancellationToken = default) => EventPublisherInvoker.Current.InvokeAsync(this, async (_, cancellationToken) =>
-        {
-            var list = new List<EventSendData>();
-            while (_queue.TryDequeue(out var item))
-            { 
-                var bd = await EventSerializer.SerializeAsync(item.Event, cancellationToken).ConfigureAwait(false);
-                var esd = new EventSendData(item.Event) { Destination = item.Destination, Data = bd };
-                await OnEventSendAsync(item.Destination, item.Event, esd, cancellationToken).ConfigureAwait(false);
-                list.Add(esd);
-            }
-
-            await EventSender.SendAsync([.. list], cancellationToken).ConfigureAwait(false);
-        }, cancellationToken);
-
-        /// <summary>
-        /// Invoked on the send of the <see cref="EventSendData"/>.
-        /// </summary>
-        /// <param name="name">The destination name.</param>
-        /// <param name="eventData">The <see cref="EventData"/> (after the <see cref="EventDataFormatter.Format(EventData)"/> is applied).</param>
-        /// <param name="eventSendData">The corresponding <see cref="EventSendData"/> after <see cref="EventSerializer"/> invocation.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected virtual Task OnEventSendAsync(string? name, EventData eventData, EventSendData eventSendData, CancellationToken cancellationToken) => Task.CompletedTask;
-
-        /// <inheritdoc/>
-        public virtual void Reset() => _queue.Clear();
-
-        /// <summary>
-        /// Dispose of resources.
-        /// </summary>
-        /// <exception cref="InvalidOperationException">Thrown when there are unsent events.</exception>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="EventPublisher"/> and optionally releases the managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing) { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventPublisherInvoker.cs b/src/CoreEx/Events/EventPublisherInvoker.cs
deleted file mode 100644
index b6af9e5b..00000000
--- a/src/CoreEx/Events/EventPublisherInvoker.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the invocation wrapping for the <see cref="EventPublisher"/> instances.
-    /// </summary>
-    public class EventPublisherInvoker : InvokerBase<EventPublisher>
-    {
-        private const string InvokerEventSender = "invoker.eventsender";
-        private static EventPublisherInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static EventPublisherInvoker Current => CoreEx.ExecutionContext.GetService<EventPublisherInvoker>() ?? (_default ??= new EventPublisherInvoker());
-
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, EventPublisher invoker, Func<InvokeArgs, TResult> func) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        protected override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, EventPublisher invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
-        {
-            invokeArgs.Activity?.AddTag(InvokerEventSender, invoker.EventSender.GetType().FullName);
-            return base.OnInvokeAsync(invokeArgs, invoker, func, cancellationToken);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventSendData.cs b/src/CoreEx/Events/EventSendData.cs
deleted file mode 100644
index 3428fdfe..00000000
--- a/src/CoreEx/Events/EventSendData.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents the <see cref="EventData"/> where the <see cref="Data"/> is the serialized (see <see cref="IEventSerializer.SerializeAsync(EventData, System.Threading.CancellationToken)"/> or 
-    /// <see cref="IEventSerializer.SerializeAsync{T}(EventData{T}, System.Threading.CancellationToken)"/>) representation that is to used for a <see cref="IEventSender.SendAsync(System.Collections.Generic.IEnumerable{EventSendData}, System.Threading.CancellationToken)"/>.
-    /// </summary>
-    public class EventSendData : EventDataBase
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSendData"/> class.
-        /// </summary>
-        public EventSendData() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSendData"/> class copying from another <paramref name="event"/> excluding the underlying <see cref="Data"/> and <see cref="EventData{T}.Value"/>.
-        /// </summary>
-        /// <param name="event">The <see cref="EventDataBase"/>.</param>
-        public EventSendData(EventDataBase @event) : base(@event) { }
-
-        /// <summary>
-        /// Get or sets the optional <see cref="IEventPublisher.PublishNamed(string, EventData[])"/> destination name (i.e. queue or topic).
-        /// </summary>
-        public string? Destination { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="BinaryData"/>.
-        /// </summary>
-        public BinaryData? Data { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventSendException.cs b/src/CoreEx/Events/EventSendException.cs
deleted file mode 100644
index 9ed26e15..00000000
--- a/src/CoreEx/Events/EventSendException.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents an <see cref="IEventSender.SendAsync(IEnumerable{EventSendData}, System.Threading.CancellationToken)"/> <see cref="Exception"/> with a collection of <see cref="NotSentEvents"/>.
-    /// </summary>
-    public class EventSendException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSendException"/> class with a <paramref name="message"/> and <paramref name="notSentEvents"/>.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="notSentEvents">The events that were not sent.</param>
-        public EventSendException(string message, IEnumerable<EventSendData>? notSentEvents = null) : base(message) => NotSentEvents = notSentEvents;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSendException"/> class with a <paramref name="message"/>, <paramref name="innerException"/> and <paramref name="notSentEvents"/>.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        /// <param name="notSentEvents">The events that were not sent.</param>
-        public EventSendException(string message, Exception innerException, IEnumerable<EventSendData>? notSentEvents = null) : base(message, innerException) => NotSentEvents = notSentEvents;
-
-        /// <summary>
-        /// Gets the events that were not sent to enable further exception processing of these where required.
-        /// </summary>
-        public IEnumerable<EventSendData>? NotSentEvents { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventSubscriberBase.cs b/src/CoreEx/Events/EventSubscriberBase.cs
deleted file mode 100644
index 7ebd6e9f..00000000
--- a/src/CoreEx/Events/EventSubscriberBase.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Events.Subscribing;
-using CoreEx.Hosting.Work;
-using CoreEx.Localization;
-using CoreEx.Validation;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides the base event subscriber capabilities.
-    /// </summary>
-    /// <param name="eventDataConverter">The <see cref="IEventDataConverter"/>.</param>
-    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="eventSubscriberInvoker">The <see cref="EventSubscriberInvoker"/>.</param>
-    public abstract class EventSubscriberBase(IEventDataConverter eventDataConverter, ExecutionContext executionContext, SettingsBase settings, ILogger<EventSubscriberBase> logger, EventSubscriberInvoker? eventSubscriberInvoker = null) : IErrorHandling
-    {
-        private static EventSubscriberInvoker? _invoker;
-        private ErrorHandler? _errorHandler;
-
-        /// <summary>
-        /// Gets the standard message error text.
-        /// </summary>
-        public static readonly LText MessageErrorText = new($"{typeof(BusinessException).FullName}.{nameof(MessageErrorText)}", "Invalid message; body was not provided, contained invalid JSON, or was incorrectly formatted:");
-
-        /// <summary>
-        /// Gets the standard required value error text.
-        /// </summary>
-        public static readonly LText RequiredErrorText = new($"{typeof(BusinessException).FullName}.{nameof(RequiredErrorText)}", $"{MessageErrorText} Value is required.");
-
-        /// <summary>
-        /// Gets the standard null event error text.
-        /// </summary>
-        public static readonly LText NullEventErrorText = new($"{typeof(BusinessException).FullName}.{nameof(NullEventErrorText)}", $"{MessageErrorText} Event deserialized as null.");
-
-        /// <summary>
-        /// Gets the <see cref="IEventDataConverter"/>.
-        /// </summary>
-        public IEventDataConverter EventDataConverter { get; } = eventDataConverter.ThrowIfNull(nameof(eventDataConverter));
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.ExecutionContext"/>.
-        /// </summary>
-        public ExecutionContext ExecutionContext { get; } = executionContext.ThrowIfNull(nameof(executionContext));
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        public SettingsBase Settings { get; } = settings.ThrowIfNull(nameof(settings));
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        public ILogger Logger { get; } = logger.ThrowIfNull(nameof(logger));
-
-        /// <summary>
-        /// Gets the <see cref="Subscribing.EventSubscriberInvoker"/>.
-        /// </summary>
-        public EventSubscriberInvoker EventSubscriberInvoker { get; } = eventSubscriberInvoker ?? (_invoker ??= new EventSubscriberInvoker());
-
-        /// <summary>
-        /// Gets or sets the <see cref="ErrorHandling"/> where an <see cref="Exception"/> occurs during <see cref="EventData"/>/<see cref="EventData{T}"/> <see cref="IEventSerializer.DeserializeAsync(BinaryData, CancellationToken)"/>/<see cref="IEventSerializer.DeserializeAsync{T}(BinaryData, CancellationToken)"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling EventDataDeserializationErrorHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling UnhandledHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling SecurityHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.Retry"/>.</remarks>
-        public ErrorHandling TransientHandling { get; set; } = ErrorHandling.Retry;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling NotFoundHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling ConcurrencyHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling DataConsistencyHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling InvalidDataHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.</remarks>
-        public ErrorHandling? WorkStateAlreadyFinishedHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="IEventSubscriberInstrumentation"/>.
-        /// </summary>
-        public IEventSubscriberInstrumentation? Instrumentation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="Hosting.Work.WorkStateOrchestrator"/> to orchestrate and track <see cref="WorkState"/>; this enables the likes of the <i>async request-response</i> pattern.
-        /// </summary>
-        /// <remarks>The <see cref="WorkState.Id"/> is set from the <see cref="EventDataBase.Id"/> and the <see cref="WorkState.TypeName"/> is set from the <see cref="EventDataBase.Type"/> to enable the underlying operations. Where an
-        /// <see cref="EventSubscriberException"/> is thrown the <see cref="WorkState.Status"/> will be set to <see cref="WorkStatus.Indeterminate"/> as it is unknown as to whether the message will be reprocessed.</remarks>
-        public WorkStateOrchestrator? WorkStateOrchestrator { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="ErrorHandler"/>.
-        /// </summary>
-        public ErrorHandler ErrorHandler { get => _errorHandler ??= new ErrorHandler(); set => _errorHandler = value; }
-
-        /// <summary>
-        /// Performs any checks prior to the processing of the <paramref name="originatingMessage"/>.
-        /// </summary>
-        /// <param name="identifier">The unique identifier from the originiating message.</param>
-        /// <param name="originatingMessage">The originating message.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that processing can continue; otherwise, <c>false</c>.</returns>
-        /// <remarks>Where there is a corresponding <see cref="WorkState"/> for the <paramref name="originatingMessage"/> and it is not in a state that is considered valid for processing then processing will not occur.</remarks>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Future proofing.")]
-        protected async Task<bool> OnBeforeProcessingAsync(string identifier, object originatingMessage, EventSubscriberArgs args, CancellationToken cancellationToken = default)
-        {
-            args.ThrowIfNull(nameof(args));
-            if (WorkStateOrchestrator is null)
-            {
-                args.SetState(this, identifier, null);
-                return true;
-            }
-
-            var wr = await WorkStateOrchestrator.GetAsync(identifier, cancellationToken).ConfigureAwait(false);
-            args.SetState(this, identifier, wr);
-            if (wr is null || WorkStatus.InProgress.HasFlag(wr.Status))
-                return true;
-
-            if (wr.Status == WorkStatus.Created)
-            {
-                await WorkStateOrchestrator.StartAsync(identifier, cancellationToken).ConfigureAwait(false);
-                return true;
-            }
-
-            if (WorkStateAlreadyFinishedHandling is null)
-                return true;
-
-            await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException($"Unable to process message as corresponding work state status is {wr.Status}: {wr.Reason ?? "Unexpected state."}") { ExceptionSource = EventSubscriberExceptionSource.WorkStateAlreadyFinished }, WorkStateAlreadyFinishedHandling.Value, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = null }, cancellationToken).ConfigureAwait(false);
-            return false;
-        }
-
-        /// <summary>
-        /// Deserializes (<see cref="EventDataConverter"/>) the <paramref name="originatingMessage"/> into the specified <see cref="EventData"/> value containg metadata only. 
-        /// </summary>
-        /// <param name="originatingMessage">The originating message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected Task<EventData> DeserializeEventMetaDataOnlyAsync(object originatingMessage, CancellationToken cancellationToken = default)
-            => EventDataConverter.ConvertFromMetadataOnlyAsync(originatingMessage, cancellationToken);
-
-        /// <summary>
-        /// Deserializes (<see cref="EventDataConverter"/>) the <paramref name="originatingMessage"/> into the specified <see cref="EventData"/> value. 
-        /// </summary>
-        /// <param name="identifier">The unique identifier from the originiating message.</param>
-        /// <param name="originatingMessage">The originating message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/> where deserialized successfully; otherwise, <c>null</c>.</returns>
-        protected async Task<EventData?> DeserializeEventAsync(string identifier, object originatingMessage, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                var @event = await EventDataConverter.ConvertFromAsync(originatingMessage, cancellationToken).ConfigureAwait(false);
-                if (@event is not null)
-                    return @event;
-            }
-            catch (Exception ex)
-            {
-                await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException($"{MessageErrorText} {ex.Message}", ex) { ExceptionSource = EventSubscriberExceptionSource.EventDataDeserialization }, EventDataDeserializationErrorHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-                return null;
-            }
-
-            await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException(NullEventErrorText) { ExceptionSource = EventSubscriberExceptionSource.EventDataDeserialization }, EventDataDeserializationErrorHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            return null;
-        }
-
-        /// <summary>
-        /// Deserializes (<see cref="EventDataConverter"/>) the <paramref name="originatingMessage"/> into the specified <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="identifier">The unique identifier from the originiating message.</param>
-        /// <param name="originatingMessage">The originating message.</param>
-        /// <param name="valueType">The optional <see cref="EventData{T}.Value"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/> or <see cref="EventData{T}"/> (<paramref name="valueType"/>) where deserialized successfully; otherwise, the corresponding <see cref="EventSubscriberException"/>.</returns>
-        protected async Task<EventData?> DeserializeEventAsync(string identifier, object originatingMessage, Type? valueType, CancellationToken cancellationToken = default)
-        {
-            if (valueType is null)
-                return await DeserializeEventAsync(identifier, originatingMessage, cancellationToken).ConfigureAwait(false);
-
-            try
-            {
-                var @event = await EventDataConverter.ConvertFromAsync(originatingMessage, valueType, cancellationToken).ConfigureAwait(false)!;
-                if (@event is not null)
-                    return @event;
-            }
-            catch (Exception ex)
-            {
-                await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException($"{MessageErrorText} {ex.Message}", ex) { ExceptionSource = EventSubscriberExceptionSource.EventDataDeserialization }, EventDataDeserializationErrorHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-                return null;
-            }
-
-            await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException(NullEventErrorText) { ExceptionSource = EventSubscriberExceptionSource.EventDataDeserialization }, EventDataDeserializationErrorHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            return null;
-        }
-
-        /// <summary>
-        /// Deserializes (<see cref="EventDataConverter"/>) the <paramref name="originatingMessage"/> into the specified <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="identifier">The unique identifier from the originiating message.</param>
-        /// <param name="originatingMessage">The originating message.</param>
-        /// <param name="valueIsRequired">Indicates whether the value is required; will consider invalid where null.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/> to validate the deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/> where deserialized successfully; otherwise, the corresponding <see cref="Exception"/>.</returns>
-        /// <remarks>Will result in an <see cref="EventSubscriberException"/> where a deserialization error occurs, or <see cref="ValidationException"/> where <paramref name="valueIsRequired"/> or <paramref name="validator"/> error occurs.</remarks>
-        protected async Task<EventData<T>?> DeserializeEventAsync<T>(string identifier, object originatingMessage, bool valueIsRequired = true, IValidator<T>? validator = null, CancellationToken cancellationToken = default)
-        {
-            // Deserialize the event.
-            EventData<T>? @event;
-            try
-            {
-                @event = await EventDataConverter.ConvertFromAsync<T>(originatingMessage, cancellationToken).ConfigureAwait(false)!;
-            }
-            catch (Exception ex)
-            {
-                await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException($"{MessageErrorText} {ex.Message}", ex) { ExceptionSource = EventSubscriberExceptionSource.EventDataDeserialization }, EventDataDeserializationErrorHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-                return null;
-            }
-
-            if (@event is null)
-            {
-                await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException(NullEventErrorText) { ExceptionSource = EventSubscriberExceptionSource.EventDataDeserialization }, EventDataDeserializationErrorHandling, Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-                return null;
-            }
-
-            // Perform the requested validation where applicable.
-            Exception? vex = null;
-            if (valueIsRequired && @event.Value == null)
-                vex = new ValidationException(RequiredErrorText);
-            else if (@event.Value != null && validator != null)
-            {
-                var vr = await validator.ValidateAsync(@event.Value, cancellationToken).ConfigureAwait(false);
-                if (vr.HasErrors)
-                    vex = vr.ToException();
-            }
-
-            // Exit where the event is considered valid.
-            if (vex is null)
-                return @event;
-
-            // Handle the validation exception.
-            await ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(identifier, new EventSubscriberException(vex.Message, vex), ErrorHandler.DetermineErrorHandling(this, vex), Logger) { Instrumentation = Instrumentation, WorkOrchestrator = WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/EventSubscriberException.cs b/src/CoreEx/Events/EventSubscriberException.cs
deleted file mode 100644
index ff7b13b3..00000000
--- a/src/CoreEx/Events/EventSubscriberException.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Events.Subscribing;
-using System;
-using System.Net;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents an event subscriber <see cref="Exception"/> that implements <see cref="IExtendedException"/>, that also takes on the characterics of the <see cref="Exception.InnerException"/> where applicable.
-    /// </summary>
-    /// <remarks>This is intended for internal <i>CoreEx</i> use only to manage <see cref="IEventSubscriber"/> errors/exceptions; throwing or catching directly may result in unintended side-effects.</remarks>
-    public sealed class EventSubscriberException : Exception, IExtendedException
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSendException"/> class with a <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The <see cref="Exception.Message"/>.</param>
-        public EventSubscriberException(string message) : base(message) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSendException"/> class with a <paramref name="message"/> and <paramref name="innerException"/>
-        /// </summary>
-        /// <param name="message">The <see cref="Exception.Message"/>.</param>
-        /// <param name="innerException">The <see cref="Exception.InnerException"/>.</param>
-        public EventSubscriberException(string message, Exception innerException) : base(message, innerException) => IsTransient = InnerExtendedException?.IsTransient ?? false;
-
-        /// <summary>
-        /// Gets the <see cref="EventSubscriberExceptionSource"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="EventSubscriberExceptionSource.Subscriber"/>.</remarks>
-        public EventSubscriberExceptionSource ExceptionSource { get; set; } = EventSubscriberExceptionSource.Subscriber;
-
-        /// <summary>
-        /// Gets the <see cref="Exception.InnerException"/> as an <see cref="IExtendedException"/> where applicable.
-        /// </summary>
-        private IExtendedException? InnerExtendedException => InnerException is IExtendedException eex ? eex : null;
-
-        /// <summary>
-        /// Indicates that there is an <see cref="Exception.InnerException"/> and that it implements <see cref="IExtendedException"/>.
-        /// </summary>
-        public bool HasInnerExtendedException => InnerException is IExtendedException;
-
-        /// <summary>
-        /// Gets or sets the <see cref="ErrorHandling"/> used when handling the error.
-        /// </summary>
-        /// <remarks>See <see cref="ErrorHandler.HandleErrorAsync"/>.</remarks>
-        public ErrorHandling ErrorHandling { get; set; } = ErrorHandling.HandleByHost;
-
-        /// <summary>
-        /// Gets the error type/reason.
-        /// </summary>
-        /// <remarks>See either the <see cref="Abstractions.ErrorType"/> or <see cref="EventSubscriberExceptionSource"/> for standard values.</remarks>
-        public string ErrorType => InnerExtendedException?.ErrorType ?? (ExceptionSource == EventSubscriberExceptionSource.Subscriber ? Abstractions.ErrorType.UnhandledError.ToString() : ExceptionSource.ToString());
-
-        /// <inheritdoc/>
-        public int ErrorCode => InnerExtendedException?.ErrorCode ?? (int)ExceptionSource;
-
-        /// <inheritdoc/>
-        public HttpStatusCode StatusCode => InnerExtendedException?.StatusCode ?? HttpStatusCode.InternalServerError;
-
-        /// <inheritdoc/>
-        public bool IsTransient { get; set; }
-
-        /// <inheritdoc/>
-        public bool ShouldBeLogged => false;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/HealthChecks/EventPublisherHealthCheck.cs b/src/CoreEx/Events/HealthChecks/EventPublisherHealthCheck.cs
deleted file mode 100644
index 1c206354..00000000
--- a/src/CoreEx/Events/HealthChecks/EventPublisherHealthCheck.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events.HealthChecks
-{
-    /// <summary>
-    /// Provides a health check for the <see cref="IEventSender"/> by sending a health-check <see cref="EventData"/> (see <see cref="EventPublisherHealthCheckOptions.EventData"/>).
-    /// </summary>
-    /// <param name="eventPublisher">The <see cref="IEventPublisher"/>.</param>
-    /// <remarks><i>Note:</i> Only use where the corresponding subscriber(s)/consumer(s) are aware and can ignore/filter to avoid potential downstream challenges.</remarks>
-    public class EventPublisherHealthCheck(IEventPublisher eventPublisher) : IHealthCheck
-    {
-        private readonly IEventPublisher _eventPublisher = eventPublisher.ThrowIfNull(nameof(eventPublisher));
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventPublisherHealthCheckOptions"/>.
-        /// </summary>
-        public EventPublisherHealthCheckOptions Options { get; } = new EventPublisherHealthCheckOptions();
-
-        /// <inheritdoc/>
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            var options = Options ?? new EventPublisherHealthCheckOptions();
-            var @event = options.EventData.Copy();
-            if (options.Destination is null)
-                _eventPublisher.Publish(@event);
-            else
-                _eventPublisher.PublishNamed(options.Destination, @event);
-
-            await _eventPublisher.SendAsync(cancellationToken).ConfigureAwait(false);
-            return HealthCheckResult.Healthy(null, new Dictionary<string, object> { { "destination", options.Destination ?? "<default>" }, { "published", @event } } );
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/HealthChecks/EventPublisherHealthCheckOptions.cs b/src/CoreEx/Events/HealthChecks/EventPublisherHealthCheckOptions.cs
deleted file mode 100644
index 8905c793..00000000
--- a/src/CoreEx/Events/HealthChecks/EventPublisherHealthCheckOptions.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Events.HealthChecks
-{
-    /// <summary>
-    /// Gets or sets the health-check options for the <see cref="EventPublisherHealthCheck"/>.
-    /// </summary>
-    public class EventPublisherHealthCheckOptions
-    {
-        /// <summary>
-        /// Gets or sets the destination name (e.g. queue or topic).
-        /// </summary>
-        public string? Destination { get; set; }
-
-        /// <summary>
-        /// Gets or sets the health-check <see cref="EventData"/> template.
-        /// </summary>
-        public EventData EventData { get; } = new EventData
-        {
-            Subject = "health.check",
-            Action = "probe",
-            Type = "health.check",
-            Source = new Uri("health/detailed", UriKind.Relative)
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/IEventConverterT.cs b/src/CoreEx/Events/IEventConverterT.cs
deleted file mode 100644
index e97ba48b..00000000
--- a/src/CoreEx/Events/IEventConverterT.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Enables conversion between <see cref="EventData"/> and <typeparamref name="TMessage"/> type.
-    /// </summary>
-    /// <typeparam name="TMessage">The messaging sub-system <see cref="Type"/>.</typeparam>
-    public interface IEventDataConverter<TMessage> : IEventDataConverter where TMessage : class
-    {
-        /// <inheritdoc/>
-        async Task<object> IEventDataConverter.ConvertToAsync(EventData @event, CancellationToken cancellationToken) => await ConvertToAsync(@event, cancellationToken).ConfigureAwait(false);
-
-        /// <inheritdoc/>
-        Task<EventData> IEventDataConverter.ConvertFromMetadataOnlyAsync(object message, CancellationToken cancellationToken) => ConvertFromMetadataOnlyAsync((TMessage)message, cancellationToken);
-
-        /// <inheritdoc/>
-        Task<EventData> IEventDataConverter.ConvertFromAsync(object message, CancellationToken cancellationToken) => ConvertFromAsync(message, null, cancellationToken);
-
-        /// <inheritdoc/>
-        Task<EventData> IEventDataConverter.ConvertFromAsync(object message, Type? valueType, CancellationToken cancellationToken) => ConvertFromAsync((TMessage)message, valueType, cancellationToken);
-
-        /// <inheritdoc/>
-        Task<EventData<T>> IEventDataConverter.ConvertFromAsync<T>(object message, CancellationToken cancellationToken) => ConvertFromAsync<T>((TMessage)message, cancellationToken);
-
-        /// <summary>
-        /// Converts the <paramref name="event"/> to a <typeparamref name="TMessage"/>.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <typeparamref name="TMessage"/> value.</returns>
-        new Task<TMessage> ConvertToAsync(EventData @event, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Converts from a messaging sub-system value to an <see cref="EventData"/> value the metadata properties only (that underlying <see cref="EventDataBase"/> should be ignored).
-        /// </summary>
-        /// <param name="message">The messaging sub-system value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        Task<EventData> ConvertFromMetadataOnlyAsync(TMessage message, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Converts from a <typeparamref name="TMessage"/> to an <see cref="EventData"/> value. 
-        /// </summary>
-        /// <param name="message">The <typeparamref name="TMessage"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/> value.</returns>
-        public Task<EventData> ConvertFromAsync(TMessage message, CancellationToken cancellationToken) => ConvertFromAsync(message, null, cancellationToken);
-
-        /// <summary>
-        /// Converts from a <typeparamref name="TMessage"/> to an <see cref="EventData"/> or <see cref="EventData{T}"/> value depending on <paramref name="valueType"/>. 
-        /// </summary>
-        /// <param name="message">The <typeparamref name="TMessage"/> value.</param>
-        /// <param name="valueType">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/> or <see cref="EventData{T}"/> value.</returns>
-        Task<EventData> ConvertFromAsync(TMessage message, Type? valueType, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Converts from a <typeparamref name="TMessage"/> to an <see cref="EventData{T}"/> value.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="message">The <typeparamref name="TMessage"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/> value.</returns>
-        Task<EventData<T>> ConvertFromAsync<T>(TMessage message, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/IEventDataConverter.cs b/src/CoreEx/Events/IEventDataConverter.cs
deleted file mode 100644
index 675b5cf4..00000000
--- a/src/CoreEx/Events/IEventDataConverter.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Enables conversion between <see cref="EventData"/> and messaging sub-system type.
-    /// </summary>
-    public interface IEventDataConverter
-    {
-        /// <summary>
-        /// Converts the <paramref name="event"/> to a messaging sub-system value.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The messaging sub-system value.</returns>
-        Task<object> ConvertToAsync(EventData @event, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Converts from a messaging sub-system value to an <see cref="EventData"/> value the metadata properties only (that underlying <see cref="EventDataBase"/> should be ignored).
-        /// </summary>
-        /// <param name="message">The messaging sub-system value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        Task<EventData> ConvertFromMetadataOnlyAsync(object message, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Converts from a messaging sub-system value to an <see cref="EventData"/> value.
-        /// </summary>
-        /// <param name="message">The messaging sub-system value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        public Task<EventData> ConvertFromAsync(object message, CancellationToken cancellationToken) => ConvertFromAsync(message, null, cancellationToken);
-
-        /// <summary>
-        /// Converts from a messaging sub-system value to an <see cref="EventData"/> or <see cref="EventData{T}"/> depending on <paramref name="valueType"/>. 
-        /// </summary>
-        /// <param name="message">The messaging sub-system value.</param>
-        /// <param name="valueType">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/> or <see cref="EventData{T}"/>.</returns>
-        Task<EventData> ConvertFromAsync(object message, Type? valueType, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Converts from a messaging sub-system value to an <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="message">The messaging sub-system value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        Task<EventData<T>> ConvertFromAsync<T>(object message, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/IEventDataFormatter.cs b/src/CoreEx/Events/IEventDataFormatter.cs
deleted file mode 100644
index 9a877a9f..00000000
--- a/src/CoreEx/Events/IEventDataFormatter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Enables additional formatting of an <see cref="EventData"/> by the <see cref="EventDataFormatter"/>.
-    /// </summary>
-    /// <remarks>Invoked by the <see cref="EventDataFormatter.Format(EventData)"/> where formatting an <see cref="EventData.Value"/> and the corresponding value implements.</remarks>
-    public interface IEventDataFormatter
-    {
-        /// <summary>
-        /// Format the <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="eventData">The <see cref="EventData"/> being formatted.</param>
-        void Format(EventData eventData);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/IEventPublisher.cs b/src/CoreEx/Events/IEventPublisher.cs
deleted file mode 100644
index d525c252..00000000
--- a/src/CoreEx/Events/IEventPublisher.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Defines the standardized <b>Event</b> publishing and sending (generally encapsulates the <see cref="IEventSerializer"/> and <see cref="IEventSender"/> orchestration). 
-    /// </summary>
-    /// <remarks>Note to implementers: The <i>Publish*</i> methods should only cache/store the events queue (order must be maintained) to be sent; they should only be sent where <see cref="SendAsync"/> is explicitly requested.
-    /// The key reason for queuing the published events it to promote a single atomic send operation; i.e. all events should be sent together, and either succeed or fail together.
-    /// <para>The <see cref="EventExtensions.CreateEvent(IEventPublisher, Uri, string?, string?)"/> convenience methods will create an <see cref="EventData"/> or <see cref="EventData{T}"/> formatting the <see cref="EventDataBase.Key"/> (where applicable) using the
-    /// <see cref="EventDataFormatter.KeySeparatorCharacter"/>; whilst also, adding the corresponding <see cref="CompositeKey.Args"/> to <see cref="EventDataBase.Internal"/> with a key of '<c>Key</c>'. These can be further 
-    /// referenced during formal formatting/publish to add additional context/functionality as required.</para></remarks>
-    public interface IEventPublisher
-    {
-        /// <summary>
-        /// Gets the corresponding <see cref="Events.EventDataFormatter"/>.
-        /// </summary>
-        EventDataFormatter EventDataFormatter { get; }
-
-        /// <summary>
-        /// Indicates whether the internal queue is empty.
-        /// </summary>
-        /// <returns><c>true</c> where empty; otherwise, <c>false</c>.</returns>
-        /// <remarks>The queue will not be empty where events have been published but not <see cref="SendAsync">sent</see> or <see cref="Reset">cleared</see>.</remarks>
-        bool IsEmpty { get; }
-
-        /// <summary>
-        /// Publishes (queues in-process) one or more <see cref="EventData"/> objects ready for <see cref="SendAsync"/>.
-        /// </summary>
-        /// <param name="events">One or more <see cref="EventData"/> objects to be published.</param>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        IEventPublisher Publish(params EventData[] events);
-
-        /// <summary>
-        /// Publishes (queues in-process) one or more <see cref="EventData"/> objects for a <paramref name="name">named</paramref> destination (e.g. queue or topic) ready for <see cref="SendAsync"/>.
-        /// </summary>
-        /// <param name="name">The destination name.</param>
-        /// <param name="events">One or more <see cref="EventData"/> objects to be published.</param>
-        /// <remarks>The name could represent a queue name or equivalent where appropriate.</remarks>
-        /// <returns>The <see cref="IEventPublisher"/> to support fluent-style method-chaining.</returns>
-        IEventPublisher PublishNamed(string name, params EventData[] events);
-
-        /// <summary>
-        /// Sends all previously published (queued) events.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task SendAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Resets by clearing the internal cache/store.
-        /// </summary>
-        void Reset();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/IEventSender.cs b/src/CoreEx/Events/IEventSender.cs
deleted file mode 100644
index 6f5f145f..00000000
--- a/src/CoreEx/Events/IEventSender.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Defines the standardized <b>Event</b> sending via the actual messaging platform/protocol.
-    /// </summary>
-    /// <remarks>The <see cref="EventSendData.Data"/> is expected to be already serialized <see cref="IEventSerializer"/>.</remarks>
-    public interface IEventSender
-    {
-        /// <summary>
-        /// Sends one or more <see cref="EventSendData"/> objects.
-        /// </summary>
-        /// <param name="events">One or more <see cref="EventData"/> objects to be sent.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Occurs after a successful <see cref="SendAsync"/>.
-        /// </summary>
-        event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/IEventSerializer.cs b/src/CoreEx/Events/IEventSerializer.cs
deleted file mode 100644
index 9a760978..00000000
--- a/src/CoreEx/Events/IEventSerializer.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events.Attachments;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Defines an <see cref="EventData"/> to/from <see cref="BinaryData"/> serializer.
-    /// </summary>
-    public interface IEventSerializer
-    {
-        /// <summary>
-        /// Gets the <see cref="Events.EventDataFormatter"/>.
-        /// </summary>
-        EventDataFormatter EventDataFormatter { get; }
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="IAttachmentStorage"/> to use for an <see cref="EventAttachment"/>.
-        /// </summary>
-        public IAttachmentStorage? AttachmentStorage { get; set; }
-
-        /// <summary>
-        /// Gets the <see cref="CustomEventSerializers"/> which enables the <see cref="EventData"/> or <see cref="EventData.Value"/> serialization to be customized per <see cref="EventData.Value"/> <see cref="Type"/>.
-        /// </summary>
-        public CustomEventSerializers CustomSerializers { get; }
-
-        /// <summary>
-        /// Serializes the <see cref="EventData"/> to a <see cref="BinaryData"/>.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The event <see cref="BinaryData"/>.</returns>
-        Task<BinaryData> SerializeAsync(EventData @event, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Serializes the <see cref="EventData{T}"/> to a <see cref="BinaryData"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="event">The <see cref="EventData{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The event <see cref="BinaryData"/>.</returns>
-        Task<BinaryData> SerializeAsync<T>(EventData<T> @event, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Deserializes the <see cref="BinaryData"/> to an <see cref="EventData"/>.
-        /// </summary>
-        /// <param name="eventData">The event <see cref="BinaryData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        Task<EventData> DeserializeAsync(BinaryData eventData, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Deserializes the <see cref="BinaryData"/> to an <see cref="EventData{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="eventData">The event <see cref="BinaryData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData{T}"/>.</returns>
-        Task<EventData<T>> DeserializeAsync<T>(BinaryData eventData, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Deserializes the <see cref="BinaryData"/> to a specified <see cref="EventData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <param name="eventData">The event <see cref="BinaryData"/>.</param>
-        /// <param name="valueType">The <see cref="EventData.Value"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="EventData"/>.</returns>
-        Task<EventData> DeserializeAsync(BinaryData eventData, Type valueType, CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/InMemoryPublisher.cs b/src/CoreEx/Events/InMemoryPublisher.cs
deleted file mode 100644
index 4813a464..00000000
--- a/src/CoreEx/Events/InMemoryPublisher.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides an in-memory publisher which can be used for the likes of testing.
-    /// </summary>
-    /// <remarks>Where a <see cref="ILogger"/> is provided then each <see cref="EventData"/> will also be logged during <i>Send</i>.</remarks>
-    /// <param name="logger">The optional <see cref="ILogger"/> for logging the events (each <see cref="EventData"/>).</param>
-    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/> for the logging. Defaults to <see cref="JsonSerializer.Default"/></param>
-    /// <param name="eventDataFormatter">The <see cref="EventDataFormatter"/>; defaults where not specified.</param>
-    /// <param name="eventSerializer">The optional <see cref="IEventSerializer"/>. Defaults to <see cref="Text.Json.EventDataSerializer"/>.</param>
-    public class InMemoryPublisher(ILogger? logger = null, IJsonSerializer? jsonSerializer = null, EventDataFormatter? eventDataFormatter = null, IEventSerializer? eventSerializer = null) : EventPublisher(eventDataFormatter, eventSerializer ?? new Text.Json.EventDataSerializer(), new InMemorySender())
-    {
-        private readonly ILogger? _logger = logger;
-        private readonly IJsonSerializer _jsonSerializer = jsonSerializer ?? Json.JsonSerializer.Default;
-        private readonly ConcurrentDictionary<string, ConcurrentQueue<EventData>> _dict = new();
-        private const string NullName = "!@#$%";
-
-        /// <inheritdoc/>
-        protected override Task OnEventSendAsync(string? name, EventData eventData, EventSendData eventSendData, CancellationToken cancellationToken)
-        {
-            var queue = _dict.GetOrAdd(name ?? NullName, _ => new ConcurrentQueue<EventData>());
-            queue.Enqueue(eventData);
-
-            if (_logger != null)
-            {
-                var sb = new StringBuilder("Event send");
-                if (!string.IsNullOrEmpty(name))
-                    sb.Append($" (destination: '{name}')");
-
-                sb.AppendLine(" ->");
-
-                var json = _jsonSerializer.Serialize(eventData, JsonWriteFormat.Indented);
-                sb.Append(json);
-                _logger.LogInformation("{Event}", sb.ToString());
-            }
-
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Gets the list of destination names (i.e. queue or topic) used for sending. 
-        /// </summary>
-        /// <returns>An array of names.</returns>
-        /// <remarks>Where <see cref="EventPublisher.Publish(EventData[])"/> (with no name) is used the underlying destination name will be <c>null</c>.</remarks>
-        public string?[] GetNames() => [.. _dict.Keys];
-
-        /// <summary>
-        /// Gets the events sent (in order) to the named destination.
-        /// </summary>
-        /// <param name="name">The destination name.</param>
-        /// <returns>The corresponding events.</returns>
-        public EventData[] GetEvents(string? name = null) => _dict.TryGetValue(name ?? NullName, out var queue) ? [.. queue] : [];
-
-        /// <summary>
-        /// Resets (clears) the in-memory state.
-        /// </summary>
-        public override void Reset()
-        {
-            base.Reset();
-            _dict.Clear();
-            ((InMemorySender)EventSender).Reset();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/InMemorySender.cs b/src/CoreEx/Events/InMemorySender.cs
deleted file mode 100644
index 305e2630..00000000
--- a/src/CoreEx/Events/InMemorySender.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Provides an in-memory sender which can be used for the likes of testing.
-    /// </summary>
-    public class InMemorySender : IEventSender
-    {
-        private readonly ConcurrentQueue<EventSendData> _queue = new();
-
-        /// <inheritdoc/>
-        public Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellationToken = default)
-        {
-            events.ForEach(_queue.Enqueue);
-            AfterSend?.Invoke(this, EventArgs.Empty);
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Gets the events sent (in order).
-        /// </summary>
-        public EventSendData[] GetEvents() => [.. _queue];
-
-        /// <summary>
-        /// Resets (clears) the in-memory state.
-        /// </summary>
-        public void Reset() => _queue.Clear();
-
-        /// <inheritdoc/>
-        public event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/LoggerEventPublisher.cs b/src/CoreEx/Events/LoggerEventPublisher.cs
deleted file mode 100644
index 61ed60db..00000000
--- a/src/CoreEx/Events/LoggerEventPublisher.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents an <see cref="ILogger"/> event publisher; whereby the events are output using <see cref="LoggerExtensions.LogInformation(ILogger, string, object[])"/>.
-    /// </summary>
-    /// <remarks>This is intended for testing and/or prototyping purposes.</remarks>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="eventDataFormatter">The <see cref="EventDataFormatter"/>. Defaults where not specified.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="JsonSerializer.Default"/>.</param>
-    public class LoggerEventPublisher(ILogger<LoggerEventPublisher> logger, EventDataFormatter? eventDataFormatter, IJsonSerializer? jsonSerializer) : EventPublisher(eventDataFormatter, new CoreEx.Text.Json.EventDataSerializer(), new NullEventSender())
-    {
-        private readonly ILogger _logger = logger.ThrowIfNull(nameof(logger));
-        private readonly IJsonSerializer _jsonSerializer = jsonSerializer ?? JsonSerializer.Default;
-
-        /// <inheritdoc/>
-        protected override Task OnEventSendAsync(string? name, EventData eventData, EventSendData eventSendData, CancellationToken cancellation)
-        {
-            var sb = new StringBuilder("Event send");
-            if (!string.IsNullOrEmpty(name))
-                sb.Append($" (destination: '{name}')");
-
-            sb.AppendLine(" ->");
-
-            var json = _jsonSerializer.Serialize(eventData, JsonWriteFormat.Indented);
-            sb.Append(json);
-            _logger.LogInformation("{Event}", sb.ToString());
-
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/LoggerEventSender.cs b/src/CoreEx/Events/LoggerEventSender.cs
deleted file mode 100644
index 5287fa7f..00000000
--- a/src/CoreEx/Events/LoggerEventSender.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Nodes;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents an <see cref="ILogger"/> event sender; whereby the <see cref="EventSendData.Data"/> is output using <see cref="LoggerExtensions.LogInformation(ILogger, string, object[])"/>.
-    /// </summary>
-    /// <remarks>This is intended for testing and/or prototyping purposes.</remarks>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public class LoggerEventSender(ILogger<LoggerEventSender> logger) : IEventSender
-    {
-        private readonly ILogger _logger = logger.ThrowIfNull(nameof(logger));
-
-        /// <inheritdoc/>
-        public Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellation)
-        {
-            var i = 0;
-            foreach (var @event in events)
-            {
-                string data;
-
-                try
-                {
-                    var jo = JsonNode.Parse(@event.Data);
-                    data = jo == null ? "<null>" : jo.ToJsonString(new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
-                }
-                catch
-                {
-                    data = @event.Data == null ? "<null>" : @event.Data.ToString();
-                }
-
-                _logger.LogInformation("{Event}", $"Event[{i}].Metadata = {Json.JsonSerializer.Default.Serialize(new EventData(@event), Json.JsonWriteFormat.Indented)}{Environment.NewLine}Event[{i}].Data = {data}");
-                i++;
-            }
-
-            AfterSend?.Invoke(this, EventArgs.Empty);
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/NullEventPublisher.cs b/src/CoreEx/Events/NullEventPublisher.cs
deleted file mode 100644
index 4f94b751..00000000
--- a/src/CoreEx/Events/NullEventPublisher.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents a <c>null</c> event publisher; whereby the events are simply swallowed/discarded on send.
-    /// </summary>
-    public class NullEventPublisher : EventPublisher
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NullEventPublisher"/> class.
-        /// </summary>
-        public NullEventPublisher() : base(null, new Text.Json.EventDataSerializer(), new NullEventSender()) { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/NullEventSender.cs b/src/CoreEx/Events/NullEventSender.cs
deleted file mode 100644
index 8f3a71b6..00000000
--- a/src/CoreEx/Events/NullEventSender.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events
-{
-    /// <summary>
-    /// Represents a <c>null</c> event sender; whereby the events are simply swallowed/discarded on send.
-    /// </summary>
-    public class NullEventSender : IEventSender
-    {
-        /// <inheritdoc/>
-        public Task SendAsync(IEnumerable<EventSendData> events, CancellationToken cancellationToken = default)
-        {
-            AfterSend?.Invoke(this, EventArgs.Empty);
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler? AfterSend;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/README.md b/src/CoreEx/Events/README.md
deleted file mode 100644
index e0b3c308..00000000
--- a/src/CoreEx/Events/README.md
+++ /dev/null
@@ -1,123 +0,0 @@
-# CoreEx.Events
-
-The `CoreEx.Events` namespace provides extended capabilities to facilitate the publishing and subscribing of events (messages) in a consistent, but flexible, manner.
-
-<br/>
-
-## Motivation
-
-To provide an event/message publishing capability that is flexible enough to support varying message formatting, from basic JSON payloads, all the way through to more advanced formatting such as [CloudEvents](https://cloudevents.io/). Additionally, to decouple the message formatting from the actual sending in a _pluggable_ manner, to be able to leverage any messaging platform (e.g. [Azure Service Bus](https://azure.microsoft.com/en-us/services/service-bus), [Solace](https://solace.com/), [Kafka](https://kafka.apache.org/), etc.) consistently. 
-
-<br/>
-
-## Publishing
-
-Event publishing is enabled by the following key capabilities:
-
-Capability | Description
--|-
-[`EventData`](./EventDataT.cs) | Provides the core properties (data) for an event/message. The standard properties are enabled by [`EventDataBase`](./EventDataBase.cs). Additional `Attributes` can be added where required; however, the key properties for most scenarios should be accounted for.
-[`EventDataFormatter`](./EventDataFormatter.cs) | Formats an `EventData` instance, setting additional properties, etc. to meet the requirements of the application. There are a number of options within this class to support a rich level of formatting, and this class can be inherited to support more advanced scenarios as necessary.
-[`IEventSerializer`](./IEventSerializer.cs) | Provides the capbilities to serialize the `EventData` into a corresponding [`BinaryData`](https://docs.microsoft.com/en-us/dotnet/api/system.binarydata) (i.e. `byte[]`) format ready for sending. An [`EventDataSerializerBase`](./EventDataSerializerBase.cs) and [`CloudEventSerializerBase`](./CloudEventSerializerBase.cs) provide the base implementation to perform basic JSON serialization or CloudEvents JSON serialization respectively, using either `System.Text.Json` or `Newtonsoft.Json` as required.
-[`IEventSender`](./IEventSender.cs) | Performs the event sending via the actual messaging platform/protocol. For example, an Azure [`ServiceBusSender`](../../CoreEx.Azure/ServiceBus/ServiceBusSender.cs) implementation is provided.
-[`IEventPublisher`](./IEventPublisher.cs) | Enables the publishing via the `Publish` method to internally queue the messages, and when ready perform a `SendAsync` to send the one or more published events in an atomic operation. The `IEventPublisher` is responsible for __orchestrating__ the `EventDataFormatter`, `IEventSerializer` and `IEventSender`. The [`EventPublisher`](./EventPublisher.cs) provides the default implementation.<br/><br/>To enable the likes of unit testing, the [`InMemoryPublisher`](./InMemoryPublisher.cs) provides an in-memory implementation that enables the logically sent events to be inspected to verify content, etc. <br/><br/>The [`NullEventPublisher`](./NullEventPublisher.cs) represents an event publisher whereby the events are simply swallowed/discarded on send.<br/><br/>The [`LoggerEventPublisher`](./LoggerEventPublisher.cs) represents an event publisher whereby the events are logged (`ILogger.LogInformation`) on send.
-
-<br/>
-
-### ServiceBusSender
-
-The [`ServiceBusSender`](../../CoreEx.Azure/ServiceBus/ServiceBusSender.cs) is an [Azure Service Bus](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) `IEventSender` implementation; this is designed to _batch_ publish one or more messages to one or more queues/topics. See the corresponding [documentation](../../CoreEx.Azure/ServiceBus/README.md) for more information.
-
-<br/>
-
-### EventOutboxEnqueueBase
-
-The [`EventOutboxEnqueueBase`](../../CoreEx.Database.SqlServer/Outbox/EventOutboxEnqueueBase.cs) provides a Microsoft SQL Server `IEventSender` to support the [transactional outbox pattern](https://microservices.io/patterns/data/transactional-outbox.html); i.e. persists the events within the database within a [transactional](https://learn.microsoft.com/en-us/dotnet/api/system.transactions.transactionscope) context.
-
-[_DbEx_](https://github.com/Avanade/DbEx/blob/main/docs/SqlServerEventOutbox.md) provides the capabilities to generate the required Microsoft SQL Server and C# artefacts to support. The [`MyEf.Hr`](https://github.com/Avanade/Beef/tree/master/samples/MyEf.Hr) sample within [_Beef_](https://github.com/Avanade/Beef) demonstrates end-to-end usage.
-
-<br/>
-
-## Subscribing
-
-Event subscribing is more tightly coupled, in that the implementation is going to be more aligned to the capabilities of the underlying messaging platform. However, the intent is to still decouple the messaging platform from the underlying processing by deserializing the message back into the originating (formatted) [`EventData`](./EventData.cs) or [`EventData<T>`](./EventDataT.cs) where required using the previously discussed [`IEventSerializer`](./IEventSerializer.cs). This has the added advantage that the underlying messaging platform can evolve over time within minimal change, whilst the underlying processing logic can remain largely constant.
-
-The [`EventSubscriberBase`](./EventSubscriberBase.cs) provides the messaging platform host agnostic base functionality that should be inherited. This provides the base [`IErrorHandling`](./Subscribing/IErrorHandling.cs) configuration, being the corresponding [`ErrorHandling`](./Subscribing/ErrorHandling.cs) action per error type.
-
-The `EventSubscriberBase.DeserializeEventAsync` methods manage the deserialization of the originating message using an [`IEventDataConverter`](./IEventDataConverter.cs) that encapsulates the `IEventSerializer` functionality (including handling exceptions) to perform the message conversion into the corresponding [`EventData`](./EventDataT.cs) or [`EventData<T>`](./EventDataT.cs). 
-
-The [`EventSubscriberInvoker`](./Subscribing/EventSubscriberInvoker.cs) via the `EventSubscriberBase.EventSubscriberInvoker` property **must** be used to invoke the underlying processing as this includes the [`IErrorHandling`](./Subscribing/IErrorHandling.cs) logic; converting any errors into an [`EventSubscriberException`](./EventSubscriberException.cs). The `EventSubscriberException.IsTransient` property allows for the inheriting host to _retry_ where applicable and/or supported (versus possible [dead letter](https://en.wikipedia.org/wiki/Dead_letter_queue) where supported).
-
-<br/>
-
-### ServiceBusSubscriber
-
-The [`ServiceBusSubscriber`](../../CoreEx.Azure/ServiceBus/ServiceBusSubscriber.cs) is an [Azure Service Bus](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) implementation; this is designed to process messages from a queue/topic that has a singlular [`EventData`](./EventData.cs) or [`EventData<T>`](./EventDataT.cs) type. See the corresponding [documentation](../../CoreEx.Azure/ServiceBus/README.md) for more information.
-
-<br/>
-
-## Orchestrated subscribing
-
-Within an [event-driven architecture](https://learn.microsoft.com/en-us/azure/architecture/guide/architecture-styles/event-driven) multiple events (message types) may be published/produced to the same underlying messaging platform. Therefore, there may be the need to subscribe/consume to one or more events (message types) in the published order (sequence). 
-
-To enable the [`EventSubscriberOrchestrator`](./subscribing/EventSubscriberOrchestrator.cs) enables none or more subscribers ([`IEventSubscriber`](./subscribing/IEventSubscriber.cs)) to be added (`EventSubscriberOrchestrator.AddSubscribers`). To simplify the implementation of an `IEventSubscriber` the [`SubscriberBase`](./subscribing/SubscriberBase.cs) and [`SubscriberBase<T>`](./subscribing/SubscriberBaseT.cs) enable. These also include [`IErrorHandling`](./Subscribing/IErrorHandling.cs) configuration, being the corresponding [`ErrorHandling`](./Subscribing/ErrorHandling.cs) action per error type to enable _subscriber_-specific handling where applicable.
-
-The `IEventSubscriber` implementation provides the corresponding `ReceiveAsync` method that must be overridden to implement the specific processing functionality. Additionally, the [`SubscriberBase<T>`](./subscribing/SubscriberBaseT.cs) supports the specification of an [`IValidator<T>`](../Validation/IValidatorT.cs) to pre-validate the `EventData<T>.Value` before invoking the `ReceiveAsync`.
-
-One or more [`EventSubscriberAttribute`](./subscribing/EventSubscriberAttribute.cs) must be specified for the `IEventSubscriber` to configure the subscription matching criteria (includes wildcard support). The `EventSubscriberOrchestrator` for each event invocation will iterate through the subscribers (`IEventSubscriber`) and use the `EventSubscriberAttribute` to match; where there is a single match that matched `IEventSubscriber` will be invoked.
-
-The underlying `IEventSubscriber` must also be registered as services (see `IServiceCollection.AddEventSubscribers`) so that they can be instantiated using the underlying `IServivceProvider` from the host (enables dependency injection).
-
-The following demonstrates an `IEventSubscriber` implementation.
-
-``` csharp
-[EventSubscriber("my.hr.employee", "created", "updated")]
-public class EmployeeeSubscriber : SubscriberBase<Employee>
-{
-    public override Task<Result> ReceiveAsync(EventData<Employee> @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-    {
-        // Perform requisite business logic.
-        return Task.FromResult(Result.Success);
-    }
-```
-
-<br/>
-
-### ServiceBusOrchestratedSubscriber
-
-The [`ServiceBusOrchestratedSubscriber`](../../CoreEx.Azure/ServiceBus/ServiceBusOrchestratedSubscriber.cs) is an [Azure Service Bus](https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) implementation that inherits from ``EventSubscriberBase`` and supports `EventSubscriberOrchestrator` functionality. See the corresponding [documentation](../../CoreEx.Azure/ServiceBus/README.md) for more information.
-
-The [`MyEf.Hr`](https://github.com/Avanade/Beef/tree/master/samples/MyEf.Hr) sample within [_Beef_](https://github.com/Avanade/Beef) demonstrates end-to-end usage.
-
-<br/>
-
-## Advanced
-
-The following provides further advanced capabilities.
-
-<br/>
-
-### Claim-check pattern
-
-The [claim-check pattern](https://docs.microsoft.com/en-us/azure/architecture/patterns/claim-check) is a messaging pattern that enables the payload to be stored externally to the message. This is useful where the payload is large and/or the message is to be published to multiple subscribers.
-
-The [`IAttachmentStorage`](./Attachments/IAttachmentStorage.cs) enables a pluggable approach to support the storage of the payload attachment (represented by an [`EventAttachment`](./Attachments/EventAttachment.cs)); enabling flexibility with respect to persistence; e.g. Azure, AWS, on-premises, etc. Azure blob storage support is provided by the [`BlobStorageAttachmentStorage`](../../CoreEx.Azure/Storage/BlobAttachmentStorage.cs) and [`BlobSasStorageAttachmentStorage`](../../CoreEx.Azure/Storage/BlobSasAttachmentStorage.cs) implementations.
-
-To further simplify the implementation, and to separate this capability from the underlying messaging sub-system, the [`IEventSerializer.AttachmentStorage`](./IEventSerializer.cs) property enables the optional specification. Where this value is non-null and the serialized `EventData.Value` length is greater than or equal to the `IAttachmentStorage.MaxDataSize`, then this will be stored as an attachment and the `EventData.Value` will be set to the corresponding `EventAttachment` value. The [`IEventSender`](./IEventSender.cs) is _not_ attachment aware, the [`EventSendData.Data`](./EventSendData.cs) will simply contain the appropriate serialized `BinaryData` (original content or `EventAttachment`) essentially decoupling serialization from sending.
-
-The following demonstrates an example `EventAttachment` serialization where the attachment reference (e.g. filename) is set to the underlying unique `EventData.Id` value.
-
-``` json
-{
-  "contentType": "application/json",
-  "attachment": "550e8400-e29b-41d4-a716-446655440000.json"
-}
-```
-
-The following demonstrates the dependency injection registration to configure the `AttachmentStorage` property for a given `IEventSerializer`.
-
-``` csharp
-services.AddCloudEventSerializer((sp, ces) => ces.AttachmentStorage = new XxxAttachmentStorage { MaxDataSize = 1000000 });
-```
-
-_Note:_ the attachments are not automatically deleted; this is the responsibility of the consuming developer/application.
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/ErrorHandler.cs b/src/CoreEx/Events/Subscribing/ErrorHandler.cs
deleted file mode 100644
index 4e296971..00000000
--- a/src/CoreEx/Events/Subscribing/ErrorHandler.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the standardized error handling to ensure/enable consistency of behaviour.
-    /// </summary>
-    /// <remarks>The only reason this class is not sealed is to allow the <see cref="FailFast"/> to be overridden to enable specific functionality to the environment where required.</remarks>
-    public class ErrorHandler
-    {
-        private const string LogFormat = "{Message} [Source: {Source}, Handling: {Handling}]";
-
-        /// <summary>
-        /// Determines the <see cref="ErrorHandling"/> based on the <paramref name="errorHandling"/> and <paramref name="exception"/>.
-        /// </summary>
-        /// <param name="errorHandling">The <see cref="IErrorHandling"/> configuration.</param>
-        /// <param name="exception">The <see cref="Exception"/>.</param>
-        /// <returns>The <see cref="ErrorHandling"/>.</returns>
-        public static ErrorHandling DetermineErrorHandling(IErrorHandling errorHandling, Exception exception)
-            => (exception.ThrowIfNull(nameof(exception))) is IExtendedException eex ? DetermineErrorHandling(errorHandling, eex) : errorHandling.UnhandledHandling;
-
-        /// <summary>
-        /// Determines the <see cref="ErrorHandling"/> based on the <paramref name="errorHandling"/> and <paramref name="extendedException"/>.
-        /// </summary>
-        /// <param name="errorHandling">The <see cref="IErrorHandling"/> configuration.</param>
-        /// <param name="extendedException">The <see cref="IExtendedException"/>.</param>
-        /// <returns>The <see cref="ErrorHandling"/>.</returns>
-        public static ErrorHandling DetermineErrorHandling(IErrorHandling errorHandling, IExtendedException extendedException) => (extendedException.ThrowIfNull(nameof(extendedException))).ErrorCode switch
-        {
-            (int)ErrorType.AuthenticationError or (int)ErrorType.AuthorizationError => errorHandling.SecurityHandling,
-            (int)ErrorType.BusinessError or (int)ErrorType.ConflictError or (int)ErrorType.DuplicateError or (int)ErrorType.ValidationError => errorHandling.InvalidDataHandling,
-            (int)ErrorType.ConcurrencyError => errorHandling.ConcurrencyHandling,
-            (int)ErrorType.DataConsistencyError => errorHandling.DataConsistencyHandling,
-            (int)ErrorType.NotFoundError => errorHandling.NotFoundHandling,
-            (int)ErrorType.TransientError => errorHandling.TransientHandling,
-            _ => errorHandling.UnhandledHandling
-        };
-
-        /// <summary>
-        /// Handles (actions) the error as defined by the <paramref name="args"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="ErrorHandlerArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where the <see cref="ErrorHandlerArgs.Exception"/> is not thrown from within or the existing exception is bubbled, then subsequent processing should be <i>assumed</i> to complete gracefully without continuing.
-        /// <para>An <see name="ErrorHandlerArgs.ErrorHandling"/> value of <see cref="ErrorHandling.HandleByHost"/> will result in a throw as it has already been converted into a <see cref="EventSubscriberException"/>; as such, <see cref="ErrorHandling.HandleByHost"/> should generally be handled prior to invocation.</para></remarks>
-        public async Task HandleErrorAsync(ErrorHandlerArgs args, CancellationToken cancellationToken)
-        {
-            // Set the configured error handling for the exception.
-            if (args.ErrorHandling != ErrorHandling.HandleByHost)
-                args.Exception.ErrorHandling = args.ErrorHandling;
-
-            // Where the exception is known then exception and stack trace need not be logged.
-            var ex = args.Exception.HasInnerExtendedException ? null : args.Exception;
-
-            // Handle based on error handling configuration.
-            switch (args.ErrorHandling)
-            {
-                case ErrorHandling.HandleByHost:
-                case ErrorHandling.HandleBySubscriber:
-                    args.Exception.IsTransient = false;
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.IndeterminateAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    throw args.Exception;
-
-                case ErrorHandling.Retry:
-                    args.Exception.IsTransient = true;
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.IndeterminateAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-                    
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    throw args.Exception;
-
-                case ErrorHandling.CompleteAsSilent:
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.FailAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    args.Logger.LogDebug(ex, LogFormat, args.Exception.Message, args.Exception.ExceptionSource, args.ErrorHandling.ToString());
-                    break;
-
-                case ErrorHandling.CompleteWithInformation:
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.FailAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    args.Logger.LogInformation(ex, LogFormat, args.Exception.Message, args.Exception.ExceptionSource, args.ErrorHandling.ToString());
-                    break;
-
-                case ErrorHandling.CompleteWithWarning:
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.FailAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    args.Logger.LogWarning(ex, LogFormat, args.Exception.Message, args.Exception.ExceptionSource, args.ErrorHandling.ToString());
-                    break;
-
-                case ErrorHandling.CompleteWithError:
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.FailAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    args.Logger.LogError(ex, LogFormat, args.Exception.Message, args.Exception.ExceptionSource, args.ErrorHandling.ToString());
-                    break;
-
-                case ErrorHandling.CriticalFailFast:
-                    args.Exception.IsTransient = false;
-                    if (args.WorkOrchestrator is not null)
-                        await args.WorkOrchestrator.FailAsync(args.Identifier!, args.Exception.Message, cancellationToken);
-
-                    args.Instrumentation?.Instrument(args.ErrorHandling, args.Exception);
-                    args.Logger.LogCritical(ex, LogFormat, args.Exception.Message, args.Exception.ExceptionSource, args.ErrorHandling.ToString());
-                    FailFast(args.Exception);
-                    throw args.Exception; // A backup in case FailFast does not function as expected; should _not_ get here!
-            }
-        }
-
-        /// <summary>
-        /// Handles the <see cref="ErrorHandling.CriticalFailFast"/>.
-        /// </summary>
-        /// <param name="eventSubscriberException">The <see cref="EventSubscriberException"/>.</param>
-        /// <remarks>By default invokes <see cref="Environment.FailFast(string, Exception)"/>. This method should be overridden where a different behaviour is required.</remarks>
-        protected virtual void FailFast(EventSubscriberException eventSubscriberException) => Environment.FailFast(eventSubscriberException.Message, eventSubscriberException);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/ErrorHandlerArgs.cs b/src/CoreEx/Events/Subscribing/ErrorHandlerArgs.cs
deleted file mode 100644
index 358787e7..00000000
--- a/src/CoreEx/Events/Subscribing/ErrorHandlerArgs.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using Microsoft.Extensions.Logging;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the <see cref="ErrorHandler.HandleErrorAsync"/> arguments.
-    /// </summary>
-    /// <param name="identifier">The corresponding unique identifier.</param>
-    /// <param name="eventSubscriberException">The <see cref="EventSubscriberException"/>.</param>
-    /// <param name="errorHandling">The <see cref="Subscribing.ErrorHandling"/> option.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public sealed class ErrorHandlerArgs(string? identifier, EventSubscriberException eventSubscriberException, ErrorHandling errorHandling, ILogger logger)
-    {
-        /// <summary>
-        /// Gets the corresponding unique identifier.
-        /// </summary>
-        public string? Identifier { get; } = identifier;
-
-        /// <summary>
-        /// Gets the <see cref="EventSubscriberException"/>.
-        /// </summary>
-        public EventSubscriberException Exception { get; } = eventSubscriberException.ThrowIfNull(nameof(eventSubscriberException));
-
-        /// <summary>
-        /// Gets the <see cref="Subscribing.ErrorHandling"/> option.
-        /// </summary>
-        public ErrorHandling ErrorHandling { get; } = errorHandling;
-        
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        public ILogger Logger { get; } = logger.ThrowIfNull(nameof(logger));
-        
-        /// <summary>
-        /// Gets or sets the optional <see cref="IEventSubscriberInstrumentation"/>.
-        /// </summary>
-        public IEventSubscriberInstrumentation? Instrumentation { get; set; }
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="WorkOrchestrator"/>.
-        /// </summary>
-        public WorkStateOrchestrator? WorkOrchestrator { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/ErrorHandling.cs b/src/CoreEx/Events/Subscribing/ErrorHandling.cs
deleted file mode 100644
index f74c9d00..00000000
--- a/src/CoreEx/Events/Subscribing/ErrorHandling.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Logging;
-using System;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the result <see cref="ErrorHandler"/> options.
-    /// </summary>
-    public enum ErrorHandling
-    {
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs the underlying <see cref="System.Exception"/> will continue to bubble up the stack as unhandled to the executing host.
-        /// </summary>
-        /// <remarks>The host is the process that initiated the underlying <see cref="EventSubscriberBase"/>.</remarks>
-        HandleByHost,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs that it should be handled by the subscriber.
-        /// </summary>
-        /// <remarks>Depending on the underlying messaging subsystem this may result in the likes of the message being deadlettered (or equivalent) where supported. May result in <see cref="HandleByHost"/> (bubble up the stack as unhandled to the executing host)
-        /// where subscriber is unable to handle appropriately.
-        /// <para>Where the underlying <see cref="Exception"/> implements <see cref="Abstractions.IExtendedException"/> and the <see cref="Abstractions.IExtendedException.IsTransient"/> property is set to <c>true</c> any configured retries
-        /// will be performed until exhausted; then will bubble up the stack as unhandled to the executing host.</para></remarks>
-        HandleBySubscriber,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs that it may be transient and should be retried (where possible).
-        /// </summary>
-        /// <remarks>Results in a <see cref="EventSubscriberException"/> where the <see cref="Abstractions.IExtendedException.IsTransient"/> property is set (overridden) to <c>true</c>.
-        /// <para>A <i>retry</i> will <i>only</i> occur where the <see cref="EventSubscriberBase"/> implementation supports/enables.</para></remarks>
-        Retry,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs this is expected and the current event/message should be completed without further processing and logging (i.e. silently).
-        /// </summary>
-        /// <remarks>A <see cref="LogLevel.Debug"/> will be logged where applicable to support debugging.</remarks>
-        CompleteAsSilent,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs this is expected and should be completed without further processing after logging as <see cref="LogLevel.Information"/>.
-        /// </summary>
-        CompleteWithInformation,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs this is expected and should be completed without further processing after logging as <see cref="LogLevel.Warning"/>.
-        /// </summary>
-        CompleteWithWarning,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs this is expected and should be completed without further processing after logging as <see cref="LogLevel.Error"/>.
-        /// </summary>
-        CompleteWithError,
-
-        /// <summary>
-        /// Indicates that when the corresponding <i>error</i> occurs the <see cref="ErrorHandler.FailFast(EventSubscriberException)"/> is invoked to immediately terminate the underlying process.
-        /// </summary>
-        /// <remarks><i>Note:</i> this <b>must</b> be tested thoroughly by the developer to ensure that there are no negative side-effects of the process terminating; equally, the <see cref="ErrorHandler.FailFast(EventSubscriberException)"/>
-        /// may need to be overridden to achieve the desired outcome. Before termination the error will be logged as <see cref="LogLevel.Critical"/>.</remarks>
-        CriticalFailFast
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/EventSubscriberArgs.cs b/src/CoreEx/Events/Subscribing/EventSubscriberArgs.cs
deleted file mode 100644
index c8432fa1..00000000
--- a/src/CoreEx/Events/Subscribing/EventSubscriberArgs.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the <see cref="EventSubscriberBase"/> arguments; is ostensibly a <see cref="Dictionary{TKey, TValue}"/> with a <see cref="string"/> key and <see cref="object"/> value.
-    /// </summary>
-    /// <remarks>This enables runtime state to passed through to the underlying subscriber receive logic where applicable.</remarks>
-    public class EventSubscriberArgs : Dictionary<string, object?> 
-    {
-        private EventSubscriberBase? _owner;
-        private string? _id;
-        private WorkState? _workState;
-
-        /// <summary>
-        /// Sets the initial subscriber state.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="EventSubscriberBase"/>.</param>
-        /// <param name="id">The event/messagage identifier.</param>
-        /// <param name="workState">The corresponding <see cref="WorkState"/> (where applicable).</param>
-        internal void SetState(EventSubscriberBase owner, string id, WorkState? workState)
-        {
-            if (_owner is not null)
-                throw new InvalidOperationException($"An existing {nameof(EventSubscriberArgs)} instance may not be reused across subscriber executions; a new instance is required per event/message.");
-
-            _owner = owner.ThrowIfNull(nameof(owner));
-            _id = id.ThrowIfNullOrEmpty(nameof(id));
-            _workState = workState;
-        }
-
-        /// <summary>
-        /// Gets the owning <see cref="EventSubscriberBase"/>.
-        /// </summary>
-        /// <remarks>This is set automatically by the <see cref="EventSubscriberBase"/>.</remarks>
-        public EventSubscriberBase Owner => _owner ?? throw new InvalidOperationException($"The {nameof(Owner)} property has not yet been configured by the {nameof(EventSubscriberBase)} infrastructure.");
-
-        /// <summary>
-        /// Gets the event/messagage identifier.
-        /// </summary>
-        public string Id => _id ?? throw new InvalidOperationException($"The {nameof(Id)} property has not yet been configured by the {nameof(EventSubscriberBase)} infrastructure.");
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> (where applicable).
-        /// </summary>
-        public WorkState? WorkState => _workState ?? throw new InvalidOperationException($"The {nameof(WorkState)} property has not yet been configured by the {nameof(EventSubscriberBase)} infrastructure.");
-
-        /// <summary>
-        /// Indicates whether the subscribing event/message has corresponding <see cref="WorkState"/>.
-        /// </summary>
-        public bool HasWorkState => _workState != null;
-
-        /// <summary>
-        /// Sets the corresponding <see cref="WorkState"/> result data with the specified <paramref name="data"/> (where <see cref="HasWorkState"/>).
-        /// </summary>
-        /// <param name="data">The <see cref="BinaryData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task SetWorkStateDataAsync(BinaryData data, CancellationToken cancellationToken = default)
-        {
-            if (!HasWorkState)
-                throw new InvalidOperationException($"This event/message is not being {nameof(WorkState)} tracked/orchestrated therefore tracking data is unable to be set.");
-
-            return Owner.WorkStateOrchestrator!.SetDataAsync(Id, data, cancellationToken);
-        }
-
-        /// <summary>
-        /// Sets the corresponding <see cref="WorkState"/> result data with the specified <paramref name="value"/> serialized as JSON (where <see cref="HasWorkState"/>).
-        /// </summary>
-        /// <param name="value">The value to JSON serialize as the result data.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task SetWorkStateDataAsync<TValue>(TValue value, CancellationToken cancellationToken = default)
-        {
-            if (!HasWorkState)
-                throw new InvalidOperationException($"This event/message is not being {nameof(WorkState)} tracked/orchestrated therefore tracking data is unable to be set.");
-
-            return Owner.WorkStateOrchestrator!.SetDataAsync(Id, value, cancellationToken);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/EventSubscriberAttribute.cs b/src/CoreEx/Events/Subscribing/EventSubscriberAttribute.cs
deleted file mode 100644
index ce6aae7b..00000000
--- a/src/CoreEx/Events/Subscribing/EventSubscriberAttribute.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Wildcards;
-using System;
-using System.Linq;
-using System.Reflection;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Defines the <see cref="IEventSubscriber"/> matching criteria.
-    /// </summary>
-    /// <remarks>The matching supports wildcards where specifically allowed; this is performed by <see cref="IsMatch(string?, string?, char)"/> (<see cref="IsMatch(string?, string?, char)">see</see> for supported capabilities).</remarks>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
-    public sealed class EventSubscriberAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSubscriberAttribute"/> class.
-        /// </summary>
-        /// <param name="subject">The <see cref="EventDataBase.Subject"/> template path (may contain wildcards).</param>
-        /// <param name="actions">The <see cref="EventDataBase.Action"/> templates where at least one must match where specified (may contain wildcards).</param>
-        public EventSubscriberAttribute(string? subject = null, params string[]? actions)
-        {
-            Subject = subject;
-            Actions = actions;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventSubscriberAttribute"/> class.
-        /// </summary>
-        /// <param name="source">The <see cref="EventDataBase.Source"/> template <see cref="Uri"/> (may contain wildcards)</param>
-        /// <param name="type">The <see cref="EventDataBase.Type"/> template path (may contain wildcards).</param>
-        public EventSubscriberAttribute(Uri source, string? type = null)
-        {
-            Source = source;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Subject"/> template path (may contain wildcards).
-        /// </summary>
-        public string? Subject { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Action"/> template(s) where at least one must match where specified (may contain wildcards).
-        /// </summary>
-        public string[]? Actions { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Source"/> template <see cref="Uri"/> (<see cref="Uri.AbsolutePath"/> may contain wildcards).
-        /// </summary>
-        public Uri? Source { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="EventDataBase.Type"/> template path (may contain wildcards).
-        /// </summary>
-        public string? Type { get; set; }
-
-        /// <summary>
-        /// Indicates whether the matching should ignore case (default) or not.
-        /// </summary>
-        public bool IgnoreCase { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the extended match method name that is to be invoked on the <see cref="IEventSubscriber"/> to perform any extended match for the declared <see cref="EventSubscriberAttribute"/>.
-        /// </summary>
-        /// <remarks>The extended match method signature must be: <c>public static bool ExtendedMatchName(EventData, EventSubscriberArgs)</c>. The current <see cref="EventData"/> will be passed as the parameter. The method must return a <c>bool</c> where <c>true</c>
-        /// indicates a match; otherwise, <c>false</c>.
-        /// <para>The static method will only be invoked where the <see cref="Subject"/>, <see cref="Type"/> and <see cref="Actions"/> have resulted in a match; i.e. this allows additional match filtering.</para></remarks>
-        public string? ExtendedMatchMethod { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="ExtendedMatchMethod"/> <see cref="MethodInfo"/>.
-        /// </summary>
-        internal MethodInfo? ExtendedMatchMethodInfo { get; set; }
-
-        /// <summary>
-        /// Indicates whether the actual event metadata matches the subscribing criteria.
-        /// </summary>
-        /// <param name="formatter">The <see cref="EventDataFormatter"/>.</param>
-        /// <param name="event">The actual <see cref="EventData"/> to match.</param>
-        /// <returns><c>true</c> indicates a match; otherwise, <c>false</c>.</returns>
-        /// <remarks>Where the actual event metadata values are all <c>null</c> then it will immediately fail the match.</remarks>
-        public bool IsMatch(EventDataFormatter formatter, EventData @event) => IsMatch(formatter, @event.Subject, @event.Type, @event.Action, @event.Source);
-
-        /// <summary>
-        /// Matches on the key subject, type and action properties.
-        /// </summary>
-        private bool IsMatch(EventDataFormatter formatter, string? subject, string? type, string? action, Uri? source)
-        {
-            if (string.IsNullOrEmpty(subject) && string.IsNullOrEmpty(type) && string.IsNullOrEmpty(action) && source is null)
-                return false;
-
-            if (subject != null && !IsMatch(Subject, subject, formatter.SubjectSeparatorCharacter))
-                return false;
-
-            if (type != null && !IsMatch(Type, type, formatter.TypeSeparatorCharacter))
-                return false;
-
-            if (source != null && !IsMatchSource(Source, source))
-                return false;
-
-            if (Actions == null || Actions.Length == 0)
-                return true;
-
-            if (action == null)
-                return false;
-
-            foreach (var at in Actions)
-            {
-                if (string.IsNullOrEmpty(at) || at == action || at == "*")
-                    return true;
-
-                if (Wildcard.Default.Parse(at).CreateRegex(IgnoreCase).IsMatch(action))
-                    return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Splits template and action into parts using seperator, then compares part by part using wildcards to determine match.
-        /// </summary>
-        /// <param name="template">The template.</param>
-        /// <param name="actual">The actual value.</param>
-        /// <param name="seperator">The seperator character.</param>
-        /// <remarks>Wildcards are matached using the <see cref="Wildcard.Default"/> functionality; supports the standard wildcards characters being '<c>*</c>' (<see cref="Wildcard.MultiWildcardCharacter"/>) and '<c>?</c>' (<see cref="Wildcard.SingleWildcardCharacter"/>).
-        /// <para>To support matching the contents of all children paths (regardless of depth) the double wilcard '<c>**</c>' must be used; for example '<c>root/**</c>' allows '<c>root/abc</c>' and '<c>root/abc/def</c>', etc.</para></remarks>
-        public bool IsMatch(string? template, string? actual, char seperator = '/')
-        {
-            if (string.IsNullOrEmpty(template) || template == "*" || template == actual)
-                return true;
-
-            if (string.IsNullOrEmpty(actual))
-                return false;
-
-            var tparts = template.Split(seperator);
-            var aparts = actual.Split(seperator);
-
-            if (tparts.Length > aparts.Length)
-                return false;
-
-            for (int i = 0; i < tparts.Length; i++)
-            {
-                if (i > aparts.Length)
-                    return false;
-
-                if (!Wildcard.Default.Parse(tparts[i]).CreateRegex(IgnoreCase).IsMatch(aparts[i]))
-                    return false;
-            }
-
-            if (aparts.Length > tparts.Length && tparts.Last() != "**")
-                return false;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Matches the source URI.
-        /// </summary>
-        private bool IsMatchSource(Uri? template, Uri actual)
-        {
-            if (template == null || (!template.IsAbsoluteUri && template.OriginalString == "*"))
-                return true;
-
-            if (!template.IsAbsoluteUri)
-                return IsMatch(template.OriginalString, RemoveLeadingSeperator(actual.IsAbsoluteUri ? actual.AbsolutePath : actual.OriginalString, '/'), '/');
-
-            if (!actual.IsAbsoluteUri)
-                return false;
-
-            if (template.Host != actual.Host || template.HostNameType != actual.HostNameType || template.Port != actual.Port || template.Scheme != actual.Scheme)
-                return false;
-
-            return IsMatch(RemoveLeadingSeperator(template.AbsolutePath, '/'), RemoveLeadingSeperator(actual.AbsolutePath, '/'), '/');
-        }
-
-        /// <summary>
-        /// Removes the leading seperator.
-        /// </summary>
-        private static string RemoveLeadingSeperator(string text, char seperator) => text.StartsWith(seperator) ? text[1..] : text;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/EventSubscriberExceptionSource.cs b/src/CoreEx/Events/Subscribing/EventSubscriberExceptionSource.cs
deleted file mode 100644
index 01823642..00000000
--- a/src/CoreEx/Events/Subscribing/EventSubscriberExceptionSource.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides additional context related to the source of the <see cref="EventSubscriberException"/>.
-    /// </summary>
-    public enum EventSubscriberExceptionSource
-    {
-        /// <summary>
-        /// Indicates that the <see cref="EventSubscriberException"/> relates to the execution of the underlying <i>subscriber</i> receiving as implemented by the consumer (see also <seealso cref="IErrorHandling"/>).
-        /// </summary>
-        Subscriber = 2201,
-
-        /// <summary>
-        /// Indicates that the <see cref="EventSubscriberException"/> relates to the <see cref="EventSubscriberBase.EventDataDeserializationErrorHandling"/>.
-        /// </summary>
-        EventDataDeserialization = 2202,
-
-        /// <summary>
-        /// Indicates that the <see cref="EventSubscriberException"/> relates to the <see cref="EventSubscriberOrchestrator.NotSubscribedHandling"/>. 
-        /// </summary>
-        OrchestratorNotSubscribed = 2203,
-
-        /// <summary>
-        /// Indicates that the <see cref="EventSubscriberException"/> relates to the <see cref="EventSubscriberOrchestrator.AmbiquousSubscriberHandling"/>. 
-        /// </summary>
-        OrchestratorAmbiquousSubscriber = 2204,
-
-        /// <summary>
-        /// Indicates that the <see cref="EventSubscriberException"/> relates to the <see cref="WorkStateOrchestrator"/> having a <see cref="WorkState.Status"/> of <see cref="WorkStatus.Finished"/>.
-        /// </summary>
-        WorkStateAlreadyFinished = 2205
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/EventSubscriberInstrumentationBase.cs b/src/CoreEx/Events/Subscribing/EventSubscriberInstrumentationBase.cs
deleted file mode 100644
index b0ff214c..00000000
--- a/src/CoreEx/Events/Subscribing/EventSubscriberInstrumentationBase.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using System;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the base <see cref="IEventSubscriberInstrumentation"/> capabilities; specifically the <see cref="GetInstrumentName(string, ErrorHandling?, Exception?)"/> method.
-    /// </summary>
-    public abstract class EventSubscriberInstrumentationBase : IEventSubscriberInstrumentation
-    {
-        private enum SubscriberResult
-        {
-            Complete,
-            Retry,
-            Error,
-            Critical
-        }
-
-        /// <summary>
-        /// Gets or sets the instrumentation name format.
-        /// </summary>
-        /// <remarks>The '<c>{0}</c>' represents the supplied prefix, the '<c>{1}</c>' represents the result ('Complete', 'Retry', 'Error', 'Critical'), and the '<c>{2}</c>' represents the suffix ('Success' or corresponding error suffix).
-        /// <para>The following represent possible outcomes: '<c>Prefix.Complete.Success</c>', '<c>Prefix.Complete.NotSubscribed</c>', '<c>Prefix.Retry.AuthenticationError</c>', '<c>Prefix.Error.NotFoundError</c>', etc.</para></remarks>
-        public string InstrumentationNameFormat { get; set; } = "{0}.{1}.{2}";
-
-        /// <summary>
-        /// Gets or sets the instrumentation result where considered complete. 
-        /// </summary>
-        public string CompleteResultText { get; set; } = nameof(SubscriberResult.Complete);
-
-        /// <summary>
-        /// Gets or sets the instrumentation result where considered an error. 
-        /// </summary>
-        public string ErrorResultText { get; set; } = nameof(SubscriberResult.Error);
-
-        /// <summary>
-        /// Gets or sets the instrumentation result where a <see cref="ErrorHandling.Retry"/>.
-        /// </summary>
-        public string RetryResultText { get; set; } = nameof(SubscriberResult.Retry);
-
-        /// <summary>
-        /// Gets or sets the instrumentation result where considered critical (see <see cref="ErrorHandling.CriticalFailFast"/>).
-        /// </summary>
-        public string CriticalResultText { get; set; } = nameof(SubscriberResult.Critical);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a successful completion.
-        /// </summary>
-        public string SuccessSuffix { get; set; } = "Success";
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for an see <see cref="ErrorHandling.HandleByHost"/> or <see cref="ErrorType.UnhandledError"/>.
-        /// </summary>
-        public string UnhandledErrorSuffix { get; set; } = nameof(ErrorType.UnhandledError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="EventSubscriberExceptionSource.EventDataDeserialization"/>.
-        /// </summary>
-        public string EventDataErrorSuffix { get; set; } = $"{nameof(EventSubscriberExceptionSource.EventDataDeserialization)}Error";
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="EventSubscriberExceptionSource.OrchestratorAmbiquousSubscriber"/>.
-        /// </summary>
-        public string AmbiquousSubscriberErrorSuffix { get; set; } = $"{nameof(EventSubscriberExceptionSource.OrchestratorAmbiquousSubscriber)}Error";
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="EventSubscriberExceptionSource.OrchestratorNotSubscribed"/>.
-        /// </summary>
-        public string NotSubscribedSuffix { get; set; } = "NotSubscribed";
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.ValidationError"/>.
-        /// </summary>
-        public string ValidationErrorSuffix { get; set; } = nameof(ErrorType.ValidationError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.BusinessError"/>.
-        /// </summary>
-        public string BusinessErrorSuffix { get; set; } = nameof(ErrorType.BusinessError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.AuthorizationError"/>.
-        /// </summary>
-        public string AuthorizationErrorSuffix { get; set; } = nameof(ErrorType.AuthorizationError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.ConcurrencyError"/>.
-        /// </summary>
-        public string ConcurrencyErrorSuffix { get; set; } = nameof(ErrorType.ConcurrencyError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.NotFoundError"/>.
-        /// </summary>
-        public string NotFoundErrorSuffix { get; set; } = nameof(ErrorType.NotFoundError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.ConflictError"/>.
-        /// </summary>
-        public string ConflictErrorSuffix { get; set; } = nameof(ErrorType.ConflictError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.DuplicateError"/>.
-        /// </summary>
-        public string DuplicateErrorSuffix { get; set; } = nameof(ErrorType.DuplicateError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.AuthenticationError"/>.
-        /// </summary>
-        public string AuthenticationErrorSuffix { get; set; } = nameof(ErrorType.AuthenticationError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a see <see cref="ErrorType.DataConsistencyError"/>.
-        /// </summary>
-        public string DataConsistencyErrorSuffix { get; set; } = nameof(ErrorType.DataConsistencyError);
-
-        /// <summary>
-        /// Gets or sets the instrumentation suffix for a <see cref="ErrorType.TransientError"/>.
-        /// </summary>
-        public string TransientErrorSuffix { get; set; } = nameof(ErrorType.TransientError);
-
-        /// <summary>
-        /// Indicates whether to always set the suffix to <see cref="SuccessSuffix"/> where the result is a <see cref="CompleteResultText"/>.
-        /// </summary>
-        /// <remarks>When set this will ignore all the other potential <i>error</i> suffixes where the overall result is considered as success.</remarks>
-        public bool AlwaysSuffixSuccessOnResultOfComplete { get; set; } = false;
-
-        /// <inheritdoc/>
-        public abstract void Instrument(ErrorHandling? errorHandling = null, Exception? exception = null);
-
-        /// <summary>
-        /// Gets the instrumentation name based on the configured <see cref="InstrumentationNameFormat"/>, <paramref name="prefix"/>, <paramref name="errorHandling"/> and <paramref name="exception"/> values.
-        /// </summary>
-        /// <param name="prefix">The instrumentation prefix.</param>
-        /// <param name="errorHandling">The <see cref="ErrorHandling"/> where applicable; otherwise, <c>null</c> which indicates success.</param>
-        /// <param name="exception">The <see cref="Exception"/> where applicable.</param>
-        /// <returns>The corresponding instrumentation name.</returns>
-        /// <remarks>See also <see cref="InstrumentationNameFormat"/>.</remarks>
-        protected string GetInstrumentName(string prefix, ErrorHandling? errorHandling, Exception? exception)
-        {
-            var (result, resultText) = errorHandling switch
-            {
-                null or ErrorHandling.CompleteAsSilent or ErrorHandling.CompleteWithInformation or ErrorHandling.CompleteWithWarning or ErrorHandling.CompleteWithError => (SubscriberResult.Complete, CompleteResultText),
-                ErrorHandling.Retry => (SubscriberResult.Retry, RetryResultText),
-                ErrorHandling.CriticalFailFast => (SubscriberResult.Critical, CriticalResultText),
-                _ => (SubscriberResult.Error, ErrorResultText)
-            };
-
-            var suffix = errorHandling switch
-            {
-                null => SuccessSuffix,
-                _ => result == SubscriberResult.Complete && AlwaysSuffixSuccessOnResultOfComplete ? SuccessSuffix : GetExceptionSuffix(exception)
-            };
-
-            return string.Format(InstrumentationNameFormat, prefix.ThrowIfNullOrEmpty(nameof(prefix)), resultText, suffix);
-        }
-
-        /// <summary>
-        /// Gets the suffix from the exception.
-        /// </summary>
-        private string GetExceptionSuffix(Exception? exception) => (exception is not null && exception is EventSubscriberException esex) ? esex.ExceptionSource switch
-        {
-            EventSubscriberExceptionSource.OrchestratorNotSubscribed => NotSubscribedSuffix,
-            EventSubscriberExceptionSource.EventDataDeserialization => EventDataErrorSuffix,
-            EventSubscriberExceptionSource.OrchestratorAmbiquousSubscriber => AmbiquousSubscriberErrorSuffix,
-            _ => esex.ErrorCode switch
-            {
-                (int)ErrorType.ValidationError => ValidationErrorSuffix,
-                (int)ErrorType.BusinessError => BusinessErrorSuffix,
-                (int)ErrorType.AuthorizationError => AuthorizationErrorSuffix,
-                (int)ErrorType.ConcurrencyError => ConcurrencyErrorSuffix,
-                (int)ErrorType.NotFoundError => NotFoundErrorSuffix,
-                (int)ErrorType.ConflictError => ConflictErrorSuffix,
-                (int)ErrorType.DuplicateError => DuplicateErrorSuffix,
-                (int)ErrorType.AuthenticationError => AuthenticationErrorSuffix,
-                (int)ErrorType.TransientError => TransientErrorSuffix,
-                (int)ErrorType.DataConsistencyError => DataConsistencyErrorSuffix,
-                _ => UnhandledErrorSuffix
-            }
-        } : UnhandledErrorSuffix;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/EventSubscriberInvoker.cs b/src/CoreEx/Events/Subscribing/EventSubscriberInvoker.cs
deleted file mode 100644
index d77c7d03..00000000
--- a/src/CoreEx/Events/Subscribing/EventSubscriberInvoker.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the standard <see cref="EventSubscriberBase"/> invoker functionality.
-    /// </summary>
-    public class EventSubscriberInvoker : InvokerBase<EventSubscriberBase> { }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/EventSubscriberOrchestrator.cs b/src/CoreEx/Events/Subscribing/EventSubscriberOrchestrator.cs
deleted file mode 100644
index 50e57415..00000000
--- a/src/CoreEx/Events/Subscribing/EventSubscriberOrchestrator.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using System.Threading;
-using Microsoft.Extensions.DependencyInjection;
-using CoreEx.Abstractions;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Represents an orchestrator that leverages <see cref="EventData"/>-metadata to match a <see cref="AddSubscribers(Type[])">subscribed</see> <see cref="SubscriberBase"/> based on the corresponding
-    /// <see cref="EventSubscriberAttribute"/>(s) defined enabling the processing of multiple subscribers.
-    /// </summary>
-    /// <remarks>Additionally, <see cref="NotSubscribedHandling"/> (and alike) can be defined to further manage the processing of events/messages, both expected and unexpected.</remarks>
-    /// <param name="serviceProvider">The optional <see cref="IServiceProvider"/> (where not specified will attempt to use <see cref="ExecutionContext.GetRequiredService{T}"/>, etc).</param>
-    public class EventSubscriberOrchestrator(IServiceProvider? serviceProvider = null)
-    {
-        private readonly List<(IEnumerable<EventSubscriberAttribute> Attributes, Type SubscriberType, Type? ValueType)> _subscribers = [];
-
-        /// <summary>
-        /// Gets all the <see cref="SubscriberBase"/> types for a given <typeparamref name="TAssembly"/> that have at least one <see cref="EventSubscriberAttribute"/>.
-        /// </summary>
-        /// <typeparam name="TAssembly">The <see cref="Type"/> to infer the underlying <see cref="Type.Assembly"/>.</typeparam>
-        /// <param name="includeInternalTypes">Indicates whether to include internally defined types.</param>
-        /// <returns>The <see cref="SubscriberBase"/> types.</returns>
-        public static Type[] GetSubscribers<TAssembly>(bool includeInternalTypes = false)
-            => (from type in includeInternalTypes ? typeof(TAssembly).Assembly.GetTypes() : typeof(TAssembly).Assembly.GetExportedTypes()
-                where !type.IsAbstract && !type.IsGenericTypeDefinition
-                let inherits = typeof(SubscriberBase).IsAssignableFrom(type)
-                let attributes = type.GetCustomAttributes<EventSubscriberAttribute>(true)
-                where inherits && attributes.Any()
-                select type).ToArray();
-
-        /// <summary>
-        /// Gets the <see cref="IServiceProvider"/>.
-        /// </summary>
-        protected IServiceProvider? ServiceProvider { get; } = serviceProvider;
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="EventDataFormatter"/>.
-        /// </summary>
-        /// <remarks>Where not specified an instance will be requested from the <see cref="IServiceProvider"/>; otherwise, a default instance will be instantiated.</remarks>
-        public EventDataFormatter? EventDataFormatter { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="ErrorHandling"/> where an <i>event</i> is encountered that has not been <see cref="AddSubscribers">subscribed</see> to. Defaults to <see cref="ErrorHandling.HandleBySubscriber"/>.
-        /// </summary>
-        public ErrorHandling NotSubscribedHandling { get; set; } = ErrorHandling.HandleBySubscriber;
-
-        /// <summary>
-        /// Gets or sets the <see cref="ErrorHandling"/> where an <i>event</i> is encountered that has more than one <see cref="AddSubscribers">subscriber</see> (is ambiguous). Defaults to <see cref="ErrorHandling.CriticalFailFast"/>.
-        /// </summary>
-        public ErrorHandling AmbiquousSubscriberHandling { get; set; } = ErrorHandling.CriticalFailFast;
-
-        /// <summary>
-        /// Use (set) the <see cref="NotSubscribedHandling"/> <see cref="ErrorHandling"/> where an <i>event</i> is encountered that has not been <see cref="AddSubscribers">subscribed</see> to.
-        /// </summary>
-        /// <param name="notSubscribedHandling">The <see cref="ErrorHandling"/>.</param>
-        /// <returns>The <see cref="EventSubscriberOrchestrator"/> to support fluent-style method-chaining.</returns>
-        public EventSubscriberOrchestrator UseNotSubscribedHandling(ErrorHandling notSubscribedHandling)
-        {
-            NotSubscribedHandling = notSubscribedHandling;
-            return this;
-        }
-
-        /// <summary>
-        /// Use (set) the <see cref="AmbiquousSubscriberHandling"/> <see cref="ErrorHandling"/> where an <i>event</i> is encountered that has more than one <see cref="AddSubscribers">subscriber</see> (is ambiguous).
-        /// </summary>
-        /// <param name="ambiquousSubscriberHandling">The <see cref="ErrorHandling"/>.</param>
-        /// <returns>The <see cref="EventSubscriberOrchestrator"/> to support fluent-style method-chaining.</returns>
-        public EventSubscriberOrchestrator UseAmbiquousSubscriberHandling(ErrorHandling ambiquousSubscriberHandling)
-        {
-            AmbiquousSubscriberHandling = ambiquousSubscriberHandling;
-            return this;
-        }
-
-        /// <summary>
-        /// Adds the <typeparamref name="TSubscriber"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TSubscriber">The <see cref="SubscriberBase"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The <see cref="EventSubscriberOrchestrator"/> to support fluent-style method-chaining.</returns>
-        public EventSubscriberOrchestrator AddSubscriber<TSubscriber>() where TSubscriber : SubscriberBase => AddSubscribers(typeof(TSubscriber));
-
-        /// <summary>
-        /// Adds the subscribers; being where the <see cref="Type"/> is <see cref="SubscriberBase"/> and has at least one <see cref="EventSubscriberAttribute"/> applied.
-        /// </summary>
-        /// <param name="types">The <see cref="IEventSubscriber"/> types to add.</param>
-        /// <returns>The <see cref="EventSubscriberOrchestrator"/> to support fluent-style method-chaining.</returns>
-        public EventSubscriberOrchestrator AddSubscribers(params Type[] types)
-        {
-            foreach (var type in types.Distinct())
-            {
-                if (_subscribers.Any(x => x.SubscriberType == type))
-                    continue;
-
-                if (!TryGetEventDataValueType(type, out var valueType))
-                    throw new ArgumentException($"Type '{type.FullName}' must inherit from {typeof(SubscriberBase).Name} or {typeof(SubscriberBase<>).Name}.", nameof(types));
-
-                var atts = type.GetCustomAttributes<EventSubscriberAttribute>(true);
-                if (atts != null && atts.Any())
-                {
-                    foreach (var att in atts)
-                    {
-                        if (att.ExtendedMatchMethod is not null)
-                        {
-                            var mi = type.GetMethod(att.ExtendedMatchMethod, BindingFlags.Public | BindingFlags.Static);
-                            if (mi == null || mi.ReturnParameter.ParameterType != typeof(bool) || mi.GetParameters().Length != 2 || mi.GetParameters()[0].ParameterType != typeof(EventData) || mi.GetParameters()[1].ParameterType != typeof(EventSubscriberArgs))
-                                throw new ArgumentException($"Type '{type.FullName}' has Attribute with {nameof(EventSubscriberAttribute.ExtendedMatchMethod)} of {att.ExtendedMatchMethod} that either does not exist or has an invalid method signature defined.", nameof(types));
-
-                            att.ExtendedMatchMethodInfo = mi;
-                        }
-                    }
-
-                    _subscribers.Add((atts, type, valueType));
-                }
-                else
-                    throw new ArgumentException($"Type '{type.FullName}' must have at least one {nameof(EventSubscriberAttribute)} applied.", nameof(types));
-            }
-
-            return this;
-        }
-
-        /// <summary>
-        /// Trys to determine whether inherits from <see cref="SubscriberBase"/> or <see cref="SubscriberBase{TValue}"/> and what the <see cref="EventData.Value"/> <see cref="Type"/> is where applicable.
-        /// </summary>
-        private static bool TryGetEventDataValueType(Type subscriberType, out Type? valueType)
-        {
-            Type? t = subscriberType;
-            while (t != null && t != typeof(object))
-            {
-                if (t.IsGenericType && t.GetGenericTypeDefinition() == typeof(SubscriberBase<>))
-                {
-                    valueType = t.GetGenericArguments()[0];
-                    return true;
-                }
-
-                t = t.BaseType;
-            }
-
-            valueType = null;
-            return typeof(SubscriberBase).IsAssignableFrom(subscriberType);
-        }
-
-        /// <summary>
-        /// Trys to match and return a <see cref="IEventSubscriber"/> from within the registered <see cref="AddSubscriber{TSubscriber}">subscribers</see>; whilst also determining the resulting <see cref="EventData.Value"/> <see cref="Type"/>.
-        /// </summary>
-        /// <param name="parent">The parent (owning) <see cref="EventSubscriberBase"/>.</param>
-        /// <param name="event">The actual <see cref="EventData"/>.</param>
-        /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
-        /// <returns>The resulting match (<c>bool</c>), <see cref="IEventSubscriber"/> and <see cref="EventData.Value"/> <see cref="Type"/> where found.</returns>
-        public (bool Matched, IEventSubscriber? Subscriber, Type? ValueType) TryMatchSubscriber(EventSubscriberBase parent, EventData @event, EventSubscriberArgs args)
-        {
-            parent.ThrowIfNull(nameof(parent));
-            @event.ThrowIfNull(nameof(@event));
-
-            if (TryMatchSubscriberInternal(@event, args, out var subscriber, out var valueType))
-                return (true, subscriber, valueType);
-
-            return (false, subscriber, valueType);
-        }
-
-        /// <summary>
-        /// Try and match a subscriber.
-        /// </summary>
-        private bool TryMatchSubscriberInternal(EventData @event, EventSubscriberArgs args, out IEventSubscriber? subscriber, out Type? valueType)
-        {
-            subscriber = null;
-            valueType = null;
-            var eventDataFormatter = EventDataFormatter ?? ServiceProvider?.GetService<EventDataFormatter>() ?? ExecutionContext.GetService<EventDataFormatter>() ?? new EventDataFormatter();
-
-            foreach (var item in _subscribers)
-            {
-                foreach (var att in item.Attributes)
-                {
-                    if (att.IsMatch(eventDataFormatter, @event))
-                    {
-                        if (subscriber != null)
-                            return false;
-
-                        if (att.ExtendedMatchMethodInfo is not null && !(bool)att.ExtendedMatchMethodInfo.Invoke(null, [@event, args])!)
-                            return false;
-
-                        subscriber = (IEventSubscriber)(ServiceProvider?.GetService(item.SubscriberType) ?? ExecutionContext.GetRequiredService(item.SubscriberType));
-                        valueType = item.ValueType;
-                    }
-                }
-            }
-
-            return subscriber != null;
-        }
-
-        /// <summary>
-        /// Receive and process the <paramref name="event"/>.
-        /// </summary>
-        /// <param name="parent">The parent (owning) <see cref="EventSubscriberBase"/>.</param>
-        /// <param name="subscriber">The <see cref="IEventSubscriber"/> that should receive the <paramref name="event"/>.</param>
-        /// <param name="event">The <see cref="EventData"/>.</param>
-        /// <param name="args">The optional <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async virtual Task ReceiveAsync(EventSubscriberBase parent, IEventSubscriber subscriber, EventData @event, EventSubscriberArgs? args = null, CancellationToken cancellationToken = default)
-        {
-            parent.ThrowIfNull(nameof(parent));
-            subscriber.ThrowIfNull(nameof(subscriber));
-            @event.ThrowIfNull(nameof(@event));
-
-            try
-            {
-                await parent.EventSubscriberInvoker.InvokeAsync(parent, async (_, ct) =>
-                {
-                    var result = await subscriber!.ReceiveAsync(@event, args ??= [], ct);
-                    result.ThrowOnError();
-
-                    // Perform the complete/success instrumentation.
-                    if (parent.WorkStateOrchestrator is not null)
-                        await parent.WorkStateOrchestrator.CompleteAsync(@event.Id!, ct).ConfigureAwait(false);
-
-                    parent.Instrumentation?.Instrument();
-                }, cancellationToken).ConfigureAwait(false);
-            }
-            catch (EventSubscriberException) { throw; } // This is considered as handled and should not be rethrown.
-            catch (Exception ex) when (ex is IExtendedException eex)
-            {
-                // Handle the exception based on the subscriber configuration.
-                var handling = ErrorHandler.DetermineErrorHandling(subscriber, eex);
-                if (handling == ErrorHandling.HandleByHost)
-                    throw;
-
-                await parent.ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(@event.Id, new EventSubscriberException(ex.Message, ex), handling, parent.Logger) { Instrumentation = parent.Instrumentation, WorkOrchestrator = parent.WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex) when (subscriber.UnhandledHandling != ErrorHandling.HandleByHost) // Where unhandled is none, just let the unhandled exception bubble up.
-            {
-                await parent.ErrorHandler.HandleErrorAsync(new ErrorHandlerArgs(@event.Id, new EventSubscriberException(ex.Message, ex), subscriber.UnhandledHandling, parent.Logger) { Instrumentation = parent.Instrumentation, WorkOrchestrator = parent.WorkStateOrchestrator }, cancellationToken).ConfigureAwait(false);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/IErrorHandling.cs b/src/CoreEx/Events/Subscribing/IErrorHandling.cs
deleted file mode 100644
index 5a8e4e8b..00000000
--- a/src/CoreEx/Events/Subscribing/IErrorHandling.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Hosting.Work;
-using System;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Provides the standard <see cref="ErrorHandling"/> options based on the <see cref="Type"/> of <see cref="Exception"/> encountered.
-    /// </summary>
-    /// <remarks>The <see cref="ErrorHandler"/> is largely responsible for the handling at runtime.</remarks>
-    public interface IErrorHandling
-    {
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when an unhandled <see cref="Exception"/> (none of the others) is encountered.
-        /// </summary>
-        ErrorHandling UnhandledHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when a <see cref="AuthenticationException"/> or <see cref="AuthorizationException"/> is encountered.
-        /// </summary>
-        ErrorHandling SecurityHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when a <see cref="TransientException"/> is encountered.
-        /// </summary>
-        ErrorHandling TransientHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when a <see cref="NotFoundException"/> is encountered.
-        /// </summary>
-        ErrorHandling NotFoundHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when a <see cref="ConcurrencyException"/> is encountered.
-        /// </summary>
-        ErrorHandling ConcurrencyHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when a <see cref="DataConsistencyException"/> is encountered.
-        /// </summary>
-        ErrorHandling DataConsistencyHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when a <see cref="ValidationException"/>, <see cref="BusinessException"/>, <see cref="DuplicateException"/> or <see cref="ConflictException"/> is encountered.
-        /// </summary>
-        ErrorHandling InvalidDataHandling { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ErrorHandling"/> for when the corresponding <see cref="WorkState"/> has a <see cref="WorkState.Status"/> already of <see cref="WorkStatus.Finished"/>.
-        /// </summary>
-        /// <remarks>A <c>null</c> indicates that the <see cref="WorkState"/> should not be verified before processing and work should occur regardless.</remarks>
-        ErrorHandling? WorkStateAlreadyFinishedHandling { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/IEventSubscriber.cs b/src/CoreEx/Events/Subscribing/IEventSubscriber.cs
deleted file mode 100644
index b3999564..00000000
--- a/src/CoreEx/Events/Subscribing/IEventSubscriber.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using CoreEx.Results;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Defines the core event subscriber capabilities.
-    /// </summary>
-    public interface IEventSubscriber : IErrorHandling
-    {
-        /// <summary>
-        /// Gets the <see cref="EventData"/> or <see cref="EventData{T}"/> <see cref="Type"/>.
-        /// </summary>
-        Type EventDataType { get; }
-
-        /// <summary>
-        /// Gets the <see cref="EventData.Value"/> <see cref="Type"/> if any.
-        /// </summary>
-        Type? ValueType { get; }
-
-        /// <summary>
-        /// Received and process the subscribed <paramref name="event"/>.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData"/>.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/IEventSubscriberInstrumentation.cs b/src/CoreEx/Events/Subscribing/IEventSubscriberInstrumentation.cs
deleted file mode 100644
index 89a99d21..00000000
--- a/src/CoreEx/Events/Subscribing/IEventSubscriberInstrumentation.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Enables instrumentation for an <see cref="SubscriberBase"/>.
-    /// </summary>
-    /// <remarks>See also <see cref="EventSubscriberInstrumentationBase"/>.</remarks>
-    public interface IEventSubscriberInstrumentation
-    {
-        /// <summary>
-        /// Records instrumentation based on the <paramref name="errorHandling"/> and <paramref name="exception"/> values.
-        /// </summary>
-        /// <param name="errorHandling">The corresponding <see cref="ErrorHandling"/> value where an error ocurred; otherwise, <c>null</c> for success.</param>
-        /// <param name="exception">The corresponding <see cref="Exception"/> where there is an error (will be of Type <see cref="EventSubscriberException"/> where <paramref name="errorHandling"/> is not <see cref="ErrorHandling.HandleByHost"/>).</param>
-        void Instrument(ErrorHandling? errorHandling = null, Exception? exception = null);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/SubscriberBase.cs b/src/CoreEx/Events/Subscribing/SubscriberBase.cs
deleted file mode 100644
index 32c0ab6b..00000000
--- a/src/CoreEx/Events/Subscribing/SubscriberBase.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using CoreEx.Results;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Represents an <see cref="IEventSubscriber"/> with no <see cref="ValueType"/> (supports <see cref="EventData"/>).
-    /// </summary>
-    /// <remarks>This is for use when the <see cref="EventData"/> has no corresponding <see cref="EventData.Value"/>; or the <see cref="EventData.Value"/> does not need to be deserialized.</remarks>
-    public abstract class SubscriberBase : IEventSubscriber
-    {
-        /// <inheritdoc/>
-        public virtual Type EventDataType => typeof(EventData);
-
-        /// <inheritdoc/>
-        public virtual Type? ValueType => null;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.UnhandledHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling UnhandledHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.SecurityHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling SecurityHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.TransientHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling TransientHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.NotFoundHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling NotFoundHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.ConcurrencyHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling ConcurrencyHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.DataConsistencyHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling DataConsistencyHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.InvalidDataHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling InvalidDataHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <see cref="ErrorHandling.HandleByHost"/> indicating that the <see cref="EventSubscriberBase.InvalidDataHandling"/> configuration will be used; override explicitly to set specific handling behaviour where applicable.</remarks>
-        public virtual ErrorHandling? WorkStateAlreadyFinishedHandling => ErrorHandling.HandleByHost;
-
-        /// <inheritdoc/>
-        public abstract Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Events/Subscribing/SubscriberBaseT.cs b/src/CoreEx/Events/Subscribing/SubscriberBaseT.cs
deleted file mode 100644
index 0639a11a..00000000
--- a/src/CoreEx/Events/Subscribing/SubscriberBaseT.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Validation;
-using System;
-using System.Threading.Tasks;
-using System.Threading;
-using CoreEx.Results;
-
-namespace CoreEx.Events.Subscribing
-{
-    /// <summary>
-    /// Represents an <see cref="IEventSubscriber"/> with a <see cref="ValueType"/> of <typeparamref name="TValue"/> (supports <see cref="EventData{T}"/>).
-    /// </summary>
-    /// <typeparam name="TValue">The <see cref="EventData{T}.Value"/> <see cref="Type"/>.</typeparam>
-    /// <param name="valueValidator">The optional <see cref="IValidator{T}"/> for the value.</param>
-    /// <param name="valueIsRequired">Indicates whether the <see cref="EventData{T}.Value"/> is required; defaults to <c>true</c>.</param>
-    /// <remarks>This is for use when the <see cref="EventData{T}"/> has to be deserialized.
-    /// <para>Additionally, <see cref="ValueIsRequired"/> and <see cref="ValueValidator"/> enable a consistent validation approach prior to the underlying <see cref="ReceiveAsync(EventData{TValue}, EventSubscriberArgs, CancellationToken)"/> being invoked.</para></remarks>
-    public abstract class SubscriberBase<TValue>(IValidator<TValue>? valueValidator = null, bool valueIsRequired = true) : SubscriberBase
-    {
-        /// <inheritdoc/>
-        public override Type EventDataType => typeof(EventData<TValue>);
-
-        /// <inheritdoc/>
-        public override Type? ValueType => typeof(TValue);
-
-        /// <summary>
-        /// Indicates whether the <see cref="EventData{T}.Value"/> is required.
-        /// </summary>
-        protected bool ValueIsRequired { get; set; } = valueIsRequired;
-
-        /// <summary>
-        /// Gets or sets the optional <see cref="IValidator{T}"/> for the value.
-        /// </summary>
-        protected IValidator<TValue>? ValueValidator { get; set; } = valueValidator;
-
-        /// <inheritdoc/>
-        public async sealed override Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-        {
-            return await Result.Go(@event.ThrowIfNull(nameof(@event)))
-                .When(ed => ValueIsRequired && ed.Value is null, _ => Result<EventData>.ValidationError(EventSubscriberBase.RequiredErrorText))
-                .ThenAs(ed => ed is EventData<TValue> edvx ? edvx : new EventData<TValue>(ed).Adjust(e => e.Value = (TValue)ed.Value!))
-                .WhenAsync(ed => ValueValidator != null, async ed =>
-                {
-                    var vr = await ValueValidator!.ValidateAsync(ed.Value, cancellationToken).ConfigureAwait(false);
-                    return vr.HasErrors ? Result<EventData<TValue>>.ValidationError(vr.Messages) : Result.Ok(ed);
-                })
-                .ThenAsAsync(ed => ReceiveAsync(ed, args, cancellationToken));
-        }
-
-        /// <summary>
-        /// Receive and process the subscribed typed <paramref name="event"/>.
-        /// </summary>
-        /// <param name="event">The <see cref="EventData{T}"/>.</param>
-        /// <param name="args">The <see cref="EventSubscriberArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Where <see cref="ValueIsRequired"/> and/or <see cref="ValueValidator"/> are specified then this method will only be invoked where the aforementioned validation has occured and the underlying <see cref="EventData{T}.Value"/>
-        /// is considered valid.</remarks>
-        public abstract Task<Result> ReceiveAsync(EventData<TValue> @event, EventSubscriberArgs args, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/ExecutionContext.Infra.cs b/src/CoreEx/ExecutionContext.Infra.cs
new file mode 100644
index 00000000..dd40f9cb
--- /dev/null
+++ b/src/CoreEx/ExecutionContext.Infra.cs
@@ -0,0 +1,220 @@
+namespace CoreEx;
+
+public partial class ExecutionContext
+{
+    private static readonly AsyncLocal<ExecutionContext?> _asyncLocal = new();
+
+    private bool _disposed;
+#if NET9_0_OR_GREATER
+    private readonly Lock _lock = new();
+#else
+    private readonly object _lock = new();
+#endif
+
+    /// <summary>
+    /// Gets or sets the function to create a default <see cref="ExecutionContext"/> instance.
+    /// </summary>
+    public static Func<ExecutionContext>? Create { get; set; } = () => new();
+
+    /// <summary>
+    /// Indicates whether the <see cref="ExecutionContext"/> <see cref="Current"/> has a value.
+    /// </summary>
+    public static bool HasCurrent => _asyncLocal.Value is not null;
+
+    /// <summary>
+    /// Gets the current <see cref="ExecutionContext"/> for the executing thread graph (see <see cref="AsyncLocal{T}"/>).
+    /// </summary>
+    /// <remarks>Where not previously set (see <see cref="SetCurrent(ExecutionContext?)"/>) then the <see cref="Create"/> will be invoked as a backup to create an instance on first access. 
+    /// <para>The <see cref="Reset"/> should be used to dispose and clear the current where no longer needed.</para>
+    /// <para>Finally, where no current instance a <see cref="InvalidOperationException"/> will be thrown.</para></remarks>
+    public static ExecutionContext Current => _asyncLocal.Value ??= Create?.Invoke() ??
+        throw new InvalidOperationException("There is currently no ExecutionContext.Current instance; this must be set (SetCurrent) prior to access. Use ExecutionContext.HasCurrent to verify value and avoid this exception if appropriate.");
+
+    /// <summary>
+    /// Tries to get the current <see cref="ExecutionContext"/> for the executing thread graph (see <see cref="AsyncLocal{T}"/>).
+    /// </summary>
+    /// <param name="executionContext">The <see cref="Current"/> <see cref="ExecutionContext"/> where <see cref="HasCurrent"/>; otherwise, <see langword="null"/>.</param>
+    /// <param name="throwWhereNull">Indicates whether to throw an <see cref="InvalidOperationException"/> when there is no current instance.</param>
+    /// <returns><see langword="true"/> when <see cref="HasCurrent"/>; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetCurrent([NotNullWhen(true)] out ExecutionContext? executionContext, bool throwWhereNull = false)
+    {
+        executionContext = _asyncLocal.Value;
+
+        if (executionContext is null && throwWhereNull)
+            throw new InvalidOperationException("There is currently no ExecutionContext.Current instance; this must be set (SetCurrent) prior to access.");
+
+        return executionContext is not null;
+    }
+
+    /// <summary>
+    /// Resets (clears) the <see cref="Current"/> <see cref="ExecutionContext"/>.
+    /// </summary>
+    public static void Reset()
+    {
+        if (TryGetCurrent(out var executionContext))
+            executionContext.Dispose();
+
+        _asyncLocal.Value = null;
+    }
+
+    /// <summary>
+    /// Sets the <see cref="Current"/> instance (only allowed where <see cref="HasCurrent"/> is <see langword="false"/>).
+    /// </summary>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/> instance.</param>
+    public static void SetCurrent(ExecutionContext executionContext)
+    {
+        if (HasCurrent)
+            throw new InvalidOperationException("The SetCurrent method can only be used where there is no Current instance.");
+
+        _asyncLocal.Value = executionContext.ThrowIfNull();
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <typeparamref name="T"/> from the <see cref="Current"/> <see cref="ServiceProvider"/>.
+    /// </summary>
+    /// <typeparam name="T">The service <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding instance.</returns>
+    public static T? GetService<T>()
+    {
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetService<T>();
+
+        return default;
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <typeparamref name="T"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> using the <paramref name="serviceKey"/> .
+    /// </summary>
+    /// <typeparam name="T">The service <see cref="Type"/>.</typeparam>
+    /// <param name="serviceKey">The service key.</param>
+    /// <returns>The corresponding instance.</returns>
+    public static T? GetKeyedService<T>(object? serviceKey)
+    {
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetKeyedService<T>(serviceKey);
+
+        return default;
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <typeparamref name="T"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> and will throw an <see cref="InvalidOperationException"/> where not found.
+    /// </summary>
+    /// <typeparam name="T">The service <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding instance.</returns>
+    public static T GetRequiredService<T>() where T : notnull
+    {
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetRequiredService<T>();
+
+        throw new InvalidOperationException($"Attempted to get service '{typeof(T).FullName}' but there is either no ExecutionContext.Current or the ExecutionContext.ServiceProvider has not been configured.");
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <typeparamref name="T"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> using the <paramref name="serviceKey"/> and will throw an <see cref="InvalidOperationException"/> where not found.
+    /// </summary>
+    /// <typeparam name="T">The service <see cref="Type"/>.</typeparam>
+    /// <param name="serviceKey">The service key.</param>
+    /// <returns>The corresponding instance.</returns>
+    public static T GetRequiredKeyedService<T>(object? serviceKey) where T : notnull
+    {
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetRequiredKeyedService<T>(serviceKey);
+
+        throw new InvalidOperationException($"Attempted to get service '{typeof(T).FullName}' but there is either no ExecutionContext.Current or the ExecutionContext.ServiceProvider has not been configured.");
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <paramref name="type"/> from the <see cref="Current"/> <see cref="ServiceProvider"/>.
+    /// </summary>
+    /// <param name="type">The service <see cref="Type"/>.</param>
+    /// <returns>The corresponding instance.</returns>
+    public static object? GetService(Type type)
+    {
+        type.ThrowIfNull();
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetService(type);
+
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <paramref name="type"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> using the <paramref name="serviceKey"/> .
+    /// </summary>
+    /// <param name="type">The service <see cref="Type"/>.</param>
+    /// <param name="serviceKey">The service key.</param>
+    /// <returns>The corresponding instance.</returns>
+    public static object? GetKeyedService(Type type, object? serviceKey)
+    {
+        type.ThrowIfNull();
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetKeyedServices(type, serviceKey).FirstOrDefault(s => s?.GetType() == type);
+
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <paramref name="type"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> and will throw an <see cref="InvalidOperationException"/> where not found.
+    /// </summary>
+    /// <param name="type">The service <see cref="Type"/>.</param>
+    /// <returns>The corresponding instance.</returns>
+    public static object GetRequiredService(Type type)
+    {
+        type.ThrowIfNull();
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetRequiredService(type);
+
+        throw new InvalidOperationException($"Attempted to get service '{type.FullName}' but there is either no ExecutionContext.Current or the ExecutionContext.ServiceProvider has not been configured.");
+    }
+
+    /// <summary>
+    /// Gets the service of <see cref="Type"/> <paramref name="type"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> using the <paramref name="serviceKey"/> and will throw an <see cref="InvalidOperationException"/> where not found.
+    /// </summary>
+    /// <param name="type">The service <see cref="Type"/>.</param>
+    /// <param name="serviceKey">The service key.</param>
+    /// <returns>The corresponding instance.</returns>
+    public static object GetRequiredKeyedService(Type type, object? serviceKey)
+    {
+        type.ThrowIfNull();
+        if (TryGetCurrent(out var executionContext) && executionContext.ServiceProvider is not null)
+            return executionContext.ServiceProvider.GetRequiredKeyedService(type, serviceKey);
+
+        throw new InvalidOperationException($"Attempted to get service '{type.FullName}' but there is either no ExecutionContext.Current or the ExecutionContext.ServiceProvider has not been configured.");
+    }
+
+    /// <summary>
+    /// Gets the related <paramref name="text"/> where the <see cref="Current"/> <see cref="IncludeRelatedText"/> is <see langword="true"/>; otherwise, returns <see langword="null"/>.
+    /// </summary>
+    /// <param name="text">The text function that is <i>only</i> executed where <see cref="IncludeRelatedText"/> is <see langword="true"/>.</param>
+    public static string? GetRelatedText(Func<string?> text) => TryGetCurrent(out var ec) && ec.IncludeRelatedText ? text.ThrowIfNull()() : null;
+
+    /// <summary>
+    /// Dispose of resources.
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Releases the unmanaged resources used by the <see cref="ExecutionContext"/> and optionally releases the managed resources.
+    /// </summary>
+    /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (disposing && !_disposed)
+        {
+            lock (_lock)
+            {
+                if (!_disposed)
+                {
+                    if (_asyncLocal.Value == this)
+                        _asyncLocal.Value = null;
+
+                    _disposed = true;
+                    ServiceProvider = null;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/ExecutionContext.cs b/src/CoreEx/ExecutionContext.cs
index 488601d8..e5f144e2 100644
--- a/src/CoreEx/ExecutionContext.cs
+++ b/src/CoreEx/ExecutionContext.cs
@@ -1,375 +1,113 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.RefData;
-using CoreEx.Results;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a thread-bound (request) execution context using <see cref="AsyncLocal{ExecutionContext}"/>.
+/// </summary>
+/// <remarks>Used to house/pass context parameters and capabilities that are outside of the general operation arguments. This class should be extended by consumers where additional properties are required.
+/// <para>The <see cref="ExecutionContext"/> implements <see cref="IDisposable"/>; however, from a standard implementation perspective there are no unmanaged resources leveraged. The <see cref="Dispose()"/> will result in a <see cref="Reset"/>.</para></remarks>
+public partial class ExecutionContext : IDisposable, IReadOnlyTenantId
 {
+    private DateTimeOffset? _timestamp;
+    private MessageItemCollection? _messages;
+    private Lazy<ConcurrentDictionary<string, object?>> _attributes = new(true);
+    private bool _isCopied;
+
     /// <summary>
-    /// Represents a thread-bound (request) execution context using <see cref="AsyncLocal{ExecutionContext}"/>.
+    /// Gets or sets the <see cref="IServiceProvider"/>.
     /// </summary>
-    /// <remarks>Used to house/pass context parameters and capabilities that are outside of the general operation arguments. This class should be extended by consumers where additional properties are required.
-    /// <para>The <see cref="ExecutionContext"/> implements <see cref="IDisposable"/>; however, from a standard implementation perspective there are no unmanaged resources leveraged. The <see cref="Dispose()"/> will result in a <see cref="Reset"/>.</para></remarks>
-    public class ExecutionContext : ITenantId, IDisposable
-    {
-        private static readonly AsyncLocal<ExecutionContext?> _asyncLocal = new();
-
-        private DateTime? _timestamp;
-        private Lazy<MessageItemCollection> _messages = new(CreateWithNoErrorTypeSupport, true);
-        private Lazy<ConcurrentDictionary<string, object?>> _properties = new(true);
-        private IReferenceDataContext? _referenceDataContext;
-        private HashSet<string>? _roles;
-        private HashSet<string>? _permissions;
-        private bool _isCopied;
-        private bool _disposed;
-#if NET9_0_OR_GREATER
-        private readonly System.Threading.Lock _lock = new();
-#else
-        private readonly object _lock = new();
-#endif
-
-        /// <summary>
-        /// Gets or sets the function to create a default <see cref="ExecutionContext"/> instance.
-        /// </summary>
-        public static Func<ExecutionContext>? Create { get; set; } = () => new ExecutionContext();
-
-        /// <summary>
-        /// Indicates whether the <see cref="ExecutionContext"/> <see cref="Current"/> has a value.
-        /// </summary>
-        public static bool HasCurrent => _asyncLocal.Value != null;
-
-        /// <summary>
-        /// Gets the current <see cref="ExecutionContext"/> for the executing thread graph (see <see cref="AsyncLocal{T}"/>).
-        /// </summary>
-        /// <remarks>Where not previously set (see <see cref="SetCurrent(ExecutionContext?)"/>) then the <see cref="Create"/> will be invoked as a backup to create an instance on first access. 
-        /// <para>The <see cref="Reset"/> should be used to dispose and clear the current where no longer needed.</para></remarks>
-        public static ExecutionContext Current => _asyncLocal.Value ??= Create?.Invoke() ?? 
-            throw new InvalidOperationException("There is currently no ExecutionContext.Current instance; this must be set (SetCurrent) prior to access. Use ExecutionContext.HasCurrent to verify value and avoid this exception if appropriate.");
-
-        /// <summary>
-        /// Resets (disposes and clears) the <see cref="Current"/> <see cref="ExecutionContext"/>.
-        /// </summary>
-        public static void Reset()
-        {
-            if (HasCurrent)
-                Current.Dispose();
-
-            _asyncLocal.Value = null;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Current"/> instance (only allowed where <see cref="HasCurrent"/> is <c>false</c>).
-        /// </summary>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/> instance.</param>
-        public static void SetCurrent(ExecutionContext executionContext)
-        {
-            if (HasCurrent)
-                throw new InvalidOperationException("The SetCurrent method can only be used where there is no Current instance.");
-
-            _asyncLocal.Value = executionContext.ThrowIfNull(nameof(executionContext));
-        }
-
-        /// <summary>
-        /// Gets the service of <see cref="Type"/> <typeparamref name="T"/> from the <see cref="Current"/> <see cref="ServiceProvider"/>.
-        /// </summary>
-        /// <typeparam name="T">The service <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding instance.</returns>
-        public static T? GetService<T>()
-        {
-            if (HasCurrent && Current.ServiceProvider != null)
-                return Current.ServiceProvider.GetService<T>();
-
-            return default;
-        }
-
-        /// <summary>
-        /// Gets the service of <see cref="Type"/> <typeparamref name="T"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> and will throw an <see cref="InvalidOperationException"/> where not found.
-        /// </summary>
-        /// <typeparam name="T">The service <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding instance.</returns>
-        public static T GetRequiredService<T>() where T : notnull
-        {
-            if (HasCurrent && Current.ServiceProvider != null)
-                return Current.ServiceProvider.GetRequiredService<T>();
-
-            throw new InvalidOperationException($"Attempted to get service '{typeof(T).FullName}' but there is either no ExecutionContext.Current or the ExecutionContext.ServiceProvider has not been configured.");
-        }
-
-        /// <summary>
-        /// Gets the service of <see cref="Type"/> <paramref name="type"/> from the <see cref="Current"/> <see cref="ServiceProvider"/>.
-        /// </summary>
-        /// <param name="type">The service <see cref="Type"/>.</param>
-        /// <returns>The corresponding instance.</returns>
-        public static object? GetService(Type type)
-        {
-            type.ThrowIfNull(nameof(type));
-            if (HasCurrent && Current.ServiceProvider != null)
-                return Current.ServiceProvider.GetService(type);
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the service of <see cref="Type"/> <paramref name="type"/> from the <see cref="Current"/> <see cref="ServiceProvider"/> and will throw an <see cref="InvalidOperationException"/> where not found.
-        /// </summary>
-        /// <param name="type">The service <see cref="Type"/>.</param>
-        /// <returns>The corresponding instance.</returns>
-        public static object GetRequiredService(Type type)
-        {
-            type.ThrowIfNull(nameof(type));
-            if (HasCurrent && Current.ServiceProvider != null)
-                return Current.ServiceProvider.GetRequiredService(type);
-
-            throw new InvalidOperationException($"Attempted to get service '{type.FullName}' but there is either no ExecutionContext.Current or the ExecutionContext.ServiceProvider has not been configured.");
-        }
-
-        /// <summary>
-        /// Gets the username from the <see cref="Environment"/> settings.
-        /// </summary>
-        /// <returns>The fully qualified username.</returns>
-        public static string EnvironmentUserName => Environment.UserDomainName == null ? Environment.UserName : Environment.UserDomainName + "\\" + Environment.UserName;
-
-        /// <summary>
-        /// Gets the <see cref="ServiceProvider"/>.
-        /// </summary>
-        /// <remarks>This is automatically set via the <see cref="IServiceCollectionExtensions.AddExecutionContext(IServiceCollection, Func{IServiceProvider, ExecutionContext}?)"/>.</remarks>
-        public IServiceProvider? ServiceProvider { get; set; }
-
-        /// <summary>
-        /// Gets or sets the correlation identifier.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Guid.NewGuid"/>.</remarks>
-        public string CorrelationId { get; set; } = Guid.NewGuid().ToString().ToLowerInvariant();
-
-        /// <summary>
-        /// Gets or sets the <see cref="OperationType"/>.
-        /// </summary>
-        public OperationType OperationType { get; set; }
-
-        /// <summary>
-        /// Indicates whether text serialization is enabled; see <see cref="HttpConsts.IncludeTextQueryStringName"/>.
-        /// </summary>
-        public bool IsTextSerializationEnabled { get; set; }
-
-        /// <summary>
-        /// Gets or sets the corresponding user name.
-        /// </summary>
-        public string UserName { get; set; } = EnvironmentUserName;
-
-        /// <summary>
-        /// Gets or sets the corresponding user identifier.
-        /// </summary>
-        public string? UserId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tenant identifier.
-        /// </summary>
-        public string? TenantId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timestamp for the <see cref="ExecutionContext"/> lifetime; i.e (to enable consistent execution-related timestamping).
-        /// </summary>
-        /// <remarks>Defaults to <see cref="ISystemTime.UtcNow"/>; where this has not been registered it will default to <see cref="SystemTime.UtcNow"/>. The value will also be passed through <see cref="Cleaner.Clean(DateTime)"/> and will have the configured <see cref="DateTimeTransform"/> applied.
-        /// <para>This value will remain unchanged for the life of the <see cref="ExecutionContext"/> to ensure consistency of the value.</para></remarks>
-        public DateTime Timestamp { get => _timestamp ??= Cleaner.Clean(SystemTime.Get().UtcNow); set => _timestamp = Cleaner.Clean(value); }
-
-        /// <summary>
-        /// Gets the <see cref="MessageItemCollection"/> that is intended to be returned to the originating consumer.
-        /// </summary>
-        /// <remarks>This is not intended to be a replacement for returning errors/exceptions; as such, if a <see cref="MessageItem"/> with a <see cref="MessageItem.Type"/> of <see cref="MessageType.Error"/> is added a corresponding
-        /// <see cref="InvalidOperationException"/> will be thrown. This is ultimately intended for warning and information messages that provide additional context outside of the intended operation result.
-        /// <para>There are no guarantees that these messages will be returned; it is the responsibility of the hosting process to manage.</para></remarks>
-        public MessageItemCollection Messages { get => _messages.Value; }
-
-        /// <summary>
-        /// Indicates whether there are any <see cref="Messages"/>.
-        /// </summary>
-        public bool HasMessages => _messages.IsValueCreated && _messages.Value.Count > 0;
-
-        /// <summary>
-        /// Gets the properties <see cref="ConcurrentDictionary{TKey, TValue}"/> for passing/storing additional data.
-        /// </summary>
-        public ConcurrentDictionary<string, object?> Properties { get => _properties.Value; }
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataContext"/>.
-        /// </summary>
-        /// <remarks>Where not configured will automatically instantiate a <see cref="ReferenceDataContext"/> on first access.</remarks>
-        public IReferenceDataContext ReferenceDataContext => _referenceDataContext ??= (GetService<IReferenceDataContext>() ?? new ReferenceDataContext());
+    public IServiceProvider? ServiceProvider { get; set; }
 
-        /// <summary>
-        /// Indicates whether this instance was created as a result of a <see cref="CreateCopy"/> operation.
-        /// </summary>
-        public bool IsACopy => _isCopied;
+    /// <inheritdoc/>
+    public string? TenantId { get; set; }
 
-        /// <summary>
-        /// Creates a new <see cref="ExecutionContext"/> (or uses the specified <paramref name="executionContext"/>) and returns the <i>new</i> <see cref="Current"/> <see cref="ExecutionContext"/>.
-        /// </summary>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>.</param>
-        /// <returns>The <see cref="ExecutionContext"/> as an <see cref="IDisposable"/>.</returns>
-        /// <remarks>Performs a <see cref="Reset"/> followed by a corresponding <see cref="SetCurrent(ExecutionContext)"/>.
-        /// <para>Useful for scoped scenarios where the underlying <see cref="IDisposable"/> will be automatically invoked, such as the following:
-        /// <code>
-        /// using var ec = ExecutionContext.CreateNew();
-        /// 
-        /// // or
-        /// 
-        /// using (ExecutionContext.CreateNew())
-        /// {
-        /// }
-        /// </code>
-        /// </para></remarks>
-        public static ExecutionContext CreateNew(ExecutionContext? executionContext = null)
-        {
-            Reset();
-            SetCurrent(executionContext ?? Create?.Invoke() ?? new ExecutionContext());
-            return Current;
-        } 
-
-        /// <summary>
-        /// Creates a copy of the <see cref="ExecutionContext"/> using the <see cref="Create"/> function to instantiate before copying or referencing all underlying properties.
-        /// </summary>
-        /// <returns>The new <see cref="ExecutionContext"/> instance.</returns>
-        /// <remarks>This is intended for <b>advanced scenarios</b> and may have unintended consequences where not used correctly.
-        /// <i>Note:</i> the <see cref="Messages"/>, <see cref="Properties"/>, <see cref="ReferenceDataContext"/>, <see cref="GetRoles">Roles</see> and <see cref="GetPermissions">Permissions</see> share same instance, i.e. are not copied.</remarks>
-        public virtual ExecutionContext CreateCopy()
-        {
-            var ec = Create == null ? throw new InvalidOperationException($"The {nameof(Create)} function must not be null to create a copy.") : Create();
-            ec._timestamp = _timestamp;
-            ec._messages = _messages;
-            ec._properties = _properties;
-            ec._referenceDataContext = _referenceDataContext;
-            ec._roles = _roles;
-            ec._permissions = _permissions;
-            ec.ServiceProvider = ServiceProvider;
-            ec.CorrelationId = CorrelationId;
-            ec.OperationType = OperationType;
-            ec.IsTextSerializationEnabled = IsTextSerializationEnabled;
-            ec.UserName = UserName;
-            ec.UserId = UserId;
-            ec.TenantId = TenantId;
-            ec._isCopied = true;
-            return ec;
-        }
-
-        /// <summary>
-        /// Dispose of resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="ExecutionContext"/> and optionally releases the managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing && !_disposed)
-            {
-                lock (_lock)
-                {
-                    if (!_disposed)
-                    {
-                        if (!_isCopied && _messages.IsValueCreated)
-                            _messages.Value.CollectionChanged -= Messages_CollectionChanged;
-
-                        _disposed = true;
-                    }
-                }
-            }
-        }
+    /// <summary>
+    /// Gets or sets the timestamp (<see cref="TimeProvider.GetUtcNow"/>) for the <see cref="ExecutionContext"/> lifetime; i.e (to enable consistent execution-related timestamping).
+    /// </summary>
+    /// <remarks>This value is intended to remain unchanged for the life of the <see cref="ExecutionContext"/> to ensure consistency of the value.</remarks>
+    public DateTimeOffset Timestamp { get => _timestamp ??= ServiceProvider?.GetService<TimeProvider>()?.GetUtcNow() ?? TimeProvider.System.GetUtcNow(); set => _timestamp = value; }
 
-        /// <summary>
-        /// Create a new <see cref="MessageItemCollection"/> with the contrainst that no <see cref="MessageType.Error"/> messages can be added.
-        /// </summary>
-        private static MessageItemCollection CreateWithNoErrorTypeSupport()
-        {
-            var messages = new MessageItemCollection();
-            messages.CollectionChanged += Messages_CollectionChanged;
-            return messages;
-        }
+    /// <summary>
+    /// Gets the execution <see cref="MessageItemCollection"/> that should generally be returned to the end-consumer.
+    /// </summary>
+    public MessageItemCollection? Messages => _messages;
 
-        /// <summary>
-        /// Handles the <c>CollectionChanged</c> event to ensure that no error messages are added.
-        /// </summary>
-        private static void Messages_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            if (e.NewItems is not null && e.NewItems.OfType<MessageItem>().Any(m => m.Type == MessageType.Error))
-                throw new InvalidOperationException("An error message cannot be added to the ExecutionContext.Messages collection; this is intended for warning and information messages only.");
-        }
+    /// <summary>
+    /// Indicates whether there are any <see cref="Messages"/>.
+    /// </summary>
+    public bool HasMessages => _messages is not null && _messages.Count > 0;
 
-        #region Security
+    /// <summary>
+    /// Gets the additional execution context attributes.
+    /// </summary>
+    public ConcurrentDictionary<string, object?> Attributes { get => _attributes.Value; }
 
-        /// <summary>
-        /// Gets the list of roles for the <see cref="UserName"/> (as previously <see cref="SetRoles(IEnumerable{string})">set</see>).
-        /// </summary>
-        public IEnumerable<string> GetRoles() => _roles == null ? Array.Empty<string>() : _roles;
+    /// <summary>
+    /// Gets or sets the corresponding <see cref="AuthenticationUser"/>.
+    /// </summary>
+    public AuthenticationUser User { get; set => field = value.ThrowIfNull(); } = AuthenticationUser.EnvironmentUser;
 
-        /// <summary>
-        /// Sets (replaces) the roles the current user is in (the roles should be unique).
-        /// </summary>
-        /// <param name="roles">The <see cref="IEnumerable{String}"/> of roles the user is in.</param>
-        public virtual void SetRoles(IEnumerable<string> roles) => _roles = new HashSet<string>(roles);
+    /// <summary>
+    /// Gets or sets the UI <see cref="CultureInfo"/>.
+    /// </summary>
+    public CultureInfo UICulture { get; set; } = CultureInfo.CurrentUICulture;
 
-        /// <summary>
-        /// Gets the list of permissions for the <see cref="UserName"/> (as previously <see cref="SetPermissions(IEnumerable{string})">set</see>).
-        /// </summary>
-        public IEnumerable<string> GetPermissions() => _permissions == null ? Array.Empty<string>() : _permissions;
+    /// <summary>
+    /// Indicates whether <see cref="HttpNames.IncludeTextQueryStringName"/> is specified within the current request to include related text(s) where available.
+    /// </summary>
+    public bool IncludeRelatedText { get; set; }
 
-        /// <summary>
-        /// Sets (replaces) the permissions the current user is in (the roles should be unique).
-        /// </summary>
-        /// <param name="roles">The <see cref="IEnumerable{String}"/> of roles the user is in.</param>
-        public virtual void SetPermissions(IEnumerable<string> roles) => _permissions = new HashSet<string>(roles);
+    /// <summary>
+    /// Gets or sets the corresponding <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> operation type (Create, Read, Update and Delete).
+    /// </summary>
+    public OperationType OperationType { get; set; } = OperationType.Unspecified;
 
-        /// <summary>
-        /// Checks whether the user has the required <paramref name="permission"/> (see <see cref="SetPermissions"/> and <see cref="GetPermissions"/>).
-        /// </summary>
-        /// <param name="permission">The permission to validate.</param>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        public virtual Result UserIsAuthorized(string permission)
-        {
-            permission.ThrowIfNullOrEmpty(nameof(permission));
-            return _permissions is not null && _permissions.Contains(permission) ? Result.Success : Result.AuthorizationError();
-        }
+    /// <summary>
+    /// Adds a <see cref="MessageType.Warning"/> message to the <see cref="Messages"/>.
+    /// </summary>
+    /// <param name="text">The message text.</param>
+    /// <returns>The <see cref="ExecutionContext"/> to support fluent-style method-chaining.</returns>
+    public ExecutionContext AddWarningMessage(LText text)
+    {
+        (_messages ??= []).Add(new MessageItem(MessageType.Warning, text));
+        return this;
+    }
 
-        /// <summary>
-        /// Checks whether the user has the required permission (as a combination of an <paramref name="entity"/> and <paramref name="action"/>).
-        /// </summary>
-        /// <param name="entity">The entity name.</param>
-        /// <param name="action">The action name.</param>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        /// <remarks>This default implementation formats as <c>{entity}.{action}</c> and invokes <see cref="UserIsAuthorized(string)"/>.
-        /// <para>An example is <c>Customer</c> and <c>Create</c> formatted as <c>Customer.Create</c>.</para></remarks>
-        public virtual Result UserIsAuthorized(string entity, string action)
-        {
-            entity.ThrowIfNullOrEmpty(nameof(entity));
-            action.ThrowIfNullOrEmpty(nameof(action));
-            return UserIsAuthorized($"{entity}.{action}");
-        }
+    /// <summary>
+    /// Adds a <see cref="MessageType.Info"/> message to the <see cref="Messages"/>.
+    /// </summary>
+    /// <param name="text">The message text.</param>
+    /// <returns>The <see cref="ExecutionContext"/> to support fluent-style method-chaining.</returns>
+    public ExecutionContext AddInfoMessage(LText text)
+    {
+        (_messages ??= []).Add(new MessageItem(MessageType.Info, text));
+        return this;
+    }
 
-        /// <summary>
-        /// Determines whether the user is in the specified role (see <see cref="SetRoles"/> and <see cref="GetRoles"/>).
-        /// </summary>
-        /// <param name="role">The role name.</param>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        public virtual Result UserIsInRole(string role)
-        {
-            role.ThrowIfNullOrEmpty(nameof(role));
-            return _roles is not null && _roles.Contains(role) ? Result.Success : Result.AuthorizationError();
-        }
+    /// <summary>
+    /// Indicates whether this instance was created as a result of a <see cref="CreateCopy"/> operation.
+    /// </summary>
+    public bool IsACopy => _isCopied;
 
-        #endregion
+    /// <summary>
+    /// Creates a copy of the <see cref="ExecutionContext"/> using the <see cref="Create"/> function to instantiate before copying or referencing all underlying properties.
+    /// </summary>
+    /// <returns>The new <see cref="ExecutionContext"/> instance.</returns>
+    /// <remarks>This is intended for <b>advanced scenarios</b> and may have unintended consequences where not used correctly.
+    /// <i>Note:</i> the <see cref="User"/>, <see cref="Messages"/> and <see cref="Attributes"/> share the same instance, i.e. are not copied. The <see cref="IsACopy"/> is updated accordingly to indicate the current copy state.</remarks>
+    public virtual ExecutionContext CreateCopy()
+    {
+        var ec = Create is null ? throw new InvalidOperationException($"The {nameof(Create)} function must not be null to create a copy.") : Create();
+        ec._timestamp = _timestamp;
+        ec._messages = _messages;
+        ec.ServiceProvider = ServiceProvider;
+        ec.User = User;
+        ec.TenantId = TenantId;
+        ec.UICulture = UICulture;
+        ec._isCopied = true;
+
+        if (_attributes.IsValueCreated)
+            ec._attributes = new Lazy<ConcurrentDictionary<string, object?>>(new ConcurrentDictionary<string, object?>(_attributes.Value));
+
+        return ec;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.ExtendedException.cs b/src/CoreEx/Extensions.ExtendedException.cs
new file mode 100644
index 00000000..3b92c1d3
--- /dev/null
+++ b/src/CoreEx/Extensions.ExtendedException.cs
@@ -0,0 +1,83 @@
+namespace CoreEx;
+
+public static partial class Extensions
+{
+    /// <summary>
+    /// Gets the extension name for the <see cref="ExtendedException"/> <see cref="ExtendedException.Extensions"/> dictionary to use for the <see cref="WithKey{TException, TKey}(TException, TKey)"/> value.
+    /// </summary>
+    public const string KeyExtensionName = "key";
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="exception"/> <see cref="ExtendedException.ErrorCode"/> to the specified <paramref name="errorCode"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="errorCode">The error code.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    public static TException WithErrorCode<TException>(this TException exception, string errorCode) where TException : ExtendedException
+        => exception.ThrowIfNull().Adjust(ex => ex.ErrorCode = errorCode.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="exception"/> <see cref="ExtendedException.ErrorType"/> to the specified <paramref name="errorType"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="errorType">The error type.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    public static TException WithErrorType<TException>(this TException exception, string errorType) where TException : ExtendedException
+        => exception.ThrowIfNull().Adjust(ex => ex.ErrorType = errorType.ThrowIfNullOrEmpty());
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="exception"/> <see cref="ExtendedException.StatusCode"/> to the specified <paramref name="statusCode"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="statusCode">The <see cref="HttpStatusCode"/>.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    public static TException WithStatusCode<TException>(this TException exception, HttpStatusCode statusCode) where TException : ExtendedException
+        => exception.ThrowIfNull().Adjust(ex => ex.StatusCode = statusCode);
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="exception"/> <see cref="ExtendedException.Detail"/> to the specified <paramref name="detail"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="detail">The error detail.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    public static TException WithDetail<TException>(this TException exception, string detail) where TException : ExtendedException
+        => exception.ThrowIfNull().Adjust(ex => ex.Detail = detail);
+
+    /// <summary>
+    /// Adds (overrides) the specified <paramref name="key"/> (using <see cref="KeyExtensionName"/> within the <see cref="ExtendedException.Extensions"/> dictionary).
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TKey">The <paramref name="key"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="key">The key value.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>This is a convenience method for adding a key using the <see cref="KeyExtensionName"/> (see <see cref="WithExtension{TException, T}(TException, string, T)"/>).</remarks>
+    public static TException WithKey<TException, TKey>(this TException exception, TKey key) where TException : ExtendedException
+        => exception.ThrowIfNull().WithExtension(KeyExtensionName, key);
+
+    /// <summary>
+    /// Adds (overrides) the specified <paramref name="name"/> and <paramref name="value"/> pair within the <see cref="ExtendedException.Extensions"/> dictionary.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="name">The extension name.</param>
+    /// <param name="value">The extension value.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    public static TException WithExtension<TException, T>(this TException exception, string name, T value) where TException : ExtendedException
+        => exception.ThrowIfNull().Adjust(ex => ex.Extensions[name.ThrowIfNullOrEmpty()] = value.ThrowIfNull());
+
+    /// <summary>
+    /// Sets (overrides) the <paramref name="exception"/> <see cref="ExtendedException.IsTransient"/> to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="exception">The <see cref="ExtendedException{TSelf}"/>.</param>
+    /// <param name="retryAfter">The optional retry-after interval; defaults to <see cref="TransientException.DefaultRetryAfter"/>.</param>
+    /// <returns>The <paramref name="exception"/> to support fluent-style method-chaining.</returns>
+    public static TException AsTransient<TException>(this TException exception, TimeSpan? retryAfter = null) where TException : ExtendedException
+        => exception.ThrowIfNull().Adjust(ex => ex.IsTransient = true).Adjust(ex => ex.RetryAfter = retryAfter ?? TransientException.DefaultRetryAfter);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.HttpRequestMessage.cs b/src/CoreEx/Extensions.HttpRequestMessage.cs
new file mode 100644
index 00000000..fe3b6d6f
--- /dev/null
+++ b/src/CoreEx/Extensions.HttpRequestMessage.cs
@@ -0,0 +1,159 @@
+namespace CoreEx;
+
+public static partial class Extensions
+{
+    /// <summary>
+    /// Adds the <see cref="HttpRequestMessage"/> <see cref="HttpRequestHeaders.IfMatch"/> with the specified <paramref name="etag"/> (where no <see langword="null"/>).
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="etag">The entity tag value.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithIfMatch(this HttpRequestMessage request, string? etag)
+    {
+        request.ThrowIfNull();
+
+        if (etag is not null)
+            request.Headers.IfMatch.Add(new EntityTagHeaderValue(ETag.FormatETag(etag)));
+
+        return request;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="HttpRequestMessage"/> <see cref="HttpRequestHeaders.IfNoneMatch"/> with the specified <paramref name="etag"/> (where no <see langword="null"/>).
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="etag">The entity tag value.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithIfNoneMatch(this HttpRequestMessage request, string? etag)
+    {
+        request.ThrowIfNull();
+
+        if (etag is not null)
+            request.Headers.IfNoneMatch.Add(new EntityTagHeaderValue(ETag.FormatETag(etag)));
+
+        return request;
+    }
+
+    /// <summary>
+    /// Sets the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.Content"/> <see cref="HttpContent.Headers"/> <see cref="HttpContentHeaders.ContentType"/> to <see cref="HttpNames.MergePatchJsonMediaTypeName"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithMergePatchJsonContentType(this HttpRequestMessage request)
+    {
+        request.ThrowIfNull().Content?.Headers.ContentType = new MediaTypeHeaderValue(HttpNames.MergePatchJsonMediaTypeName);
+        return request;
+    }
+
+    /// <summary>
+    /// Adds the <see cref="HttpRequestMessage"/> <see cref="HttpNames.IdempotencyKeyHeaderName"/> with the specified <paramref name="idempotencyKey"/> or allow to default .
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="idempotencyKey">The idempotency key.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Where no <paramref name="idempotencyKey"/> is specified, a new <see cref="Guid"/> is generated and used.</remarks>
+    public static HttpRequestMessage WithIdempotencyKey(this HttpRequestMessage request, string? idempotencyKey = null)
+    {
+        request.ThrowIfNull().Headers.Add(HttpNames.IdempotencyKeyHeaderName, idempotencyKey ?? Guid.NewGuid().ToString());
+        return request;
+    }
+
+    /// <summary>
+    /// Adds <see cref="PagingArgs"/> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.RequestUri"/> by adding to the <see cref="Uri.Query"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithPaging(this HttpRequestMessage request, PagingArgs? paging)
+        => request.ThrowIfNull().WithPaging(paging?.Skip, paging?.Take, paging?.IsCountRequested ?? false);
+
+    /// <summary>
+    /// Adds <see cref="PagingArgs"/> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.RequestUri"/> by adding to the <see cref="Uri.Query"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="skip">The specified number of elements in a sequence to bypass.</param>
+    /// <param name="take">The specified number of contiguous elements from the start of a sequence.</param>
+    /// <param name="count">Indicates whether to get the total count when performing the underlying query</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithPaging(this HttpRequestMessage request, long? skip = null, long? take = null, bool count = false)
+        => AddQuery(request, qb => qb
+            .AddQuery(HttpNames.PagingSkipQueryStringName, skip?.ToString())
+            .AddQuery(HttpNames.PagingTakeQueryStringName, take?.ToString())
+            .AddQuery(HttpNames.PagingCountQueryStringName, count ? "true" : null));
+
+    /// <summary>
+    /// Adds <see cref="QueryArgs"/> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.RequestUri"/> by adding to the <see cref="Uri.Query"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="query">The <see cref="QueryArgs"/>.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithQuery(this HttpRequestMessage request, QueryArgs? query)
+        => WithQuery(request, query?.Filter, query?.OrderBy, query?.IncludeFields, query?.ExcludeFields);
+
+    /// <summary>
+    /// Adds <see cref="QueryArgs"/> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.RequestUri"/> by adding to the <see cref="Uri.Query"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="filter">The basic dynamic <i>OData-like</i> <c>$filter</c> statement.</param>
+    /// <param name="orderBy">The basic dynamic <i>OData-like</i> <c>$orderby</c> statement.</param>
+    /// <param name="include">The list of <b>included</b> fields.</param>
+    /// <param name="exclude">The list of <b>excluded</b> fields.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithQuery(this HttpRequestMessage request, string? filter = null, string? orderBy = null, IEnumerable<string>? include = null, IEnumerable<string>? exclude = null)
+        => AddQuery(request, qb => qb
+            .AddQuery(HttpNames.QueryFilterQueryStringName, filter)
+            .AddQuery(HttpNames.QueryOrderByQueryStringName, orderBy)
+            .AddQuery(HttpNames.IncludeFieldsQueryStringName, include is null ? null : string.Join(',', include.Select(i => i?.Trim()).Where(i => !string.IsNullOrEmpty(i))))
+            .AddQuery(HttpNames.ExcludeFieldsQueryStringName, exclude is null ? null : string.Join(',', exclude.Select(e => e?.Trim()).Where(e => !string.IsNullOrEmpty(e)))));
+
+    /// <summary>
+    /// Adds <see cref="QueryArgs.IncludeFields"/> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.RequestUri"/> by adding to the <see cref="Uri.Query"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="fields">The list of included fields.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithFields(this HttpRequestMessage request, params IEnumerable<string> fields) => WithQuery(request, include: fields);
+
+    /// <summary>
+    /// Adds <see cref="QueryArgs.ExcludeFields"/> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.RequestUri"/> by adding to the <see cref="Uri.Query"/>.
+    /// </summary>
+    /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
+    /// <param name="fields">The list of excluded fields.</param>
+    /// <returns>The <paramref name="request"/> to support fluent-style method-chaining.</returns>
+    public static HttpRequestMessage WithoutFields(this HttpRequestMessage request, params IEnumerable<string> fields) => WithQuery(request, exclude: fields);
+
+    /// <summary>
+    /// Adds URI query parameters to the <see cref="Uri.Query"/>.
+    /// </summary>
+    private static HttpRequestMessage AddQuery(HttpRequestMessage request, Action<StringBuilder> queryBuilder)
+    {
+        request.ThrowIfNull();
+
+        var builder = new UriBuilder(request.RequestUri!);
+        var sb = new StringBuilder(builder.Query);
+
+        queryBuilder(sb);
+
+        builder.Query = sb.ToString();
+        request.RequestUri = builder.Uri;
+
+        return request;
+
+    }
+
+    /// <summary>
+    /// Adds a URI query parameter to the <see cref="StringBuilder"/>.
+    /// </summary>
+    private static StringBuilder AddQuery(this StringBuilder sb, string name, string? value)
+    {
+        value = value?.Trim();
+        if (string.IsNullOrEmpty(value))
+            return sb;
+
+        if (sb.Length > 0)
+            sb.Append('&');
+
+        sb.Append($"{name}={value}");
+        return sb;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.HttpResponseMessage.cs b/src/CoreEx/Extensions.HttpResponseMessage.cs
new file mode 100644
index 00000000..a8b0e273
--- /dev/null
+++ b/src/CoreEx/Extensions.HttpResponseMessage.cs
@@ -0,0 +1,161 @@
+namespace CoreEx;
+
+public static partial class Extensions
+{
+    /// <summary>
+    /// Converts the <see cref="HttpResponseMessage"/> into a <see cref="ProblemDetailsException"/> where not <see cref="HttpResponseMessage.IsSuccessStatusCode"/> and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>.
+    /// </summary>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationTokenSource"/>.</param>
+    /// <returns>The corresponding <see cref="ProblemDetailsException"/> or <see langword="null"/>.</returns>
+    public static async Task<ProblemDetailsException?> ToProblemDetailsAsync(this HttpResponseMessage response, CancellationToken cancellationToken = default)
+    {
+        if (response.ThrowIfNull().IsSuccessStatusCode)
+            return null;
+
+        if (!MediaTypeNames.Application.ProblemJson.Equals(response.Content.Headers.ContentType?.MediaType, StringComparison.OrdinalIgnoreCase))
+            return null;
+
+        try
+        {
+            var content = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            var pd = await JsonSerializer.DeserializeAsync<ProblemDetails>(new MemoryStream(Encoding.UTF8.GetBytes(content)), JsonDefaults.SerializerOptions, cancellationToken).ConfigureAwait(false);
+            if (pd is not null)
+                return new ProblemDetailsException(pd, new HttpRequestException($"{CreateMessage(response)} Problem details:{content}"));
+        }
+        catch { } // Swallow and assume not a problem details.
+
+        return null;
+    }
+
+    /// <summary>
+    /// Where the <see cref="HttpResponseMessage"/> is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, this method
+    /// converts the <see cref="HttpResponseMessage"/> into a <see cref="ProblemDetailsException"/> (see <see cref="ToProblemDetailsAsync(HttpResponseMessage, CancellationToken)"/> and invokes <see cref="ProblemDetailsException.ThrowOnBusinessException"/>;
+    /// otherwise, continues without error.
+    /// </summary>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationTokenSource"/>.</param>
+    /// <returns>The corresponding <see cref="ProblemDetailsException"/> or <see langword="null"/>.</returns>
+    public static async Task<ProblemDetailsException?> ThrowOnBusinessExceptionAsync(this HttpResponseMessage response, CancellationToken cancellationToken = default)
+    {
+        var pde = await response.ToProblemDetailsAsync(cancellationToken).ConfigureAwait(false);
+        pde?.ThrowOnBusinessException();
+        return pde;
+    }
+
+    /// <summary>
+    /// Where the <see cref="HttpResponseMessage"/> is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) will throw a corresponding exception; otherwise, continues without error.
+    /// </summary>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationTokenSource"/>.</param>
+    /// <remarks>Where the response is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, the content is
+    /// converted into a <see cref="ProblemDetailsException"/> and returned as the error; otherwise, an <see cref="HttpRequestException"/> is returned as the error.
+    /// <para>Additionally, where the <see cref="ProblemDetailsException"/> is considered a <see cref="BusinessException"/>, it is thrown as such.</para>
+    /// <para>Finally, where the response is successful, not action is taken.</para></remarks>
+    public static async Task ThrowOnErrorAsync(this HttpResponseMessage response, CancellationToken cancellationToken = default)
+    {
+        if (response.IsSuccessStatusCode)
+            return;
+
+        var pde = await response.ThrowOnBusinessExceptionAsync(cancellationToken).ConfigureAwait(false);
+        if (pde is not null)
+            throw pde;
+
+        throw new HttpRequestException(CreateMessage(response), null, response.StatusCode);
+    }
+
+    /// <summary>
+    /// Creates the standard error message for a non-successful <see cref="HttpResponseMessage"/>.
+    /// </summary>
+    private static string CreateMessage(HttpResponseMessage response) => string.IsNullOrWhiteSpace(response.ReasonPhrase)
+        ? $"Response status code does not indicate success: {(int)response.StatusCode}."
+        : $"Response status code does not indicate success: {(int)response.StatusCode} ({response.ReasonPhrase}).";
+
+    /// <summary>
+    /// Converts the <see cref="HttpResponseMessage"/> into a <see cref="Result"/>.
+    /// </summary>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="Result"/>.</returns>
+    /// <remarks>Where the response is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, the content is
+    /// converted into a <see cref="ProblemDetailsException"/> and returned as the error; otherwise, an <see cref="HttpRequestException"/> is returned as the error.
+    /// <para>Additionally, where the <see cref="ProblemDetailsException"/> is considered a <see cref="BusinessException"/>, it is returned as such.</para>
+    /// <para>Finally, where the response is successful, a <see cref="Result.Success"/> is returned.</para></remarks>
+    public static async Task<Result> ToResultAsync(this HttpResponseMessage response, CancellationToken cancellationToken = default)
+    {
+        if (response.ThrowIfNull().IsSuccessStatusCode)
+            return Result.Success;
+
+        var pde = await response.ToProblemDetailsAsync(cancellationToken).ConfigureAwait(false);
+        if (pde is not null)
+            return pde.TryGetBusinessException(out var be) ? be : pde;
+
+        return Result.Fail(new HttpRequestException(CreateMessage(response), null, response.StatusCode));
+    }
+
+    /// <summary>
+    /// Converts the <see cref="HttpResponseMessage"/> into a <see cref="Result{T}"/> including the deserialized JSON response value where successful.
+    /// </summary>
+    /// <typeparam name="T">The response value <see cref="Type"/>.</typeparam>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where the response is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, the content is
+    /// converted into a <see cref="ProblemDetailsException"/> and returned as the error; otherwise, an <see cref="HttpRequestException"/> is returned as the error.
+    /// <para>Additionally, where the <see cref="ProblemDetailsException"/> is considered a <see cref="BusinessException"/>, it is returned as such.</para>
+    /// <para>Finally, where the response is successful, a <see cref="Result{T}"/> is returned that includes the deserialized response value.</para></remarks>
+    public static async Task<Result<T?>> ToResultAsync<T>(this HttpResponseMessage response, JsonSerializerOptions? jsonSerializerOptions = null, CancellationToken cancellationToken = default)
+    {
+        // Where not successful, reuse the non-generic version above to get the error details.
+        if (!response.ThrowIfNull().IsSuccessStatusCode)
+            return await ToResultAsync(response, cancellationToken).ConfigureAwait(false);
+
+        // Where successful, attempt to read the content as JSON and return as the value.
+        var value = await response.Content.ReadFromJsonAsync<T>(jsonSerializerOptions ?? JsonDefaults.SerializerOptions, cancellationToken).ConfigureAwait(false);
+        return value;
+    }
+
+    /// <summary>
+    /// Converts the <see cref="HttpResponseMessage"/> into a <see cref="Result{T}"/> including the deserialized JSON response value where successful.
+    /// </summary>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where the response is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, the content is
+    /// converted into a <see cref="ProblemDetailsException"/> and returned as the error; otherwise, an <see cref="HttpRequestException"/> is returned as the error.
+    /// <para>Additionally, where the <see cref="ProblemDetailsException"/> is considered a <see cref="BusinessException"/>, it is returned as such.</para>
+    /// <para>Finally, where the response is successful, a <see cref="Result{T}"/> is returned that includes the deserialized response value.</para></remarks>
+    public static Task<Result<T?>> ToResultAsync<T>(this HttpResponseMessage response, CancellationToken cancellationToken = default) => ToResultAsync<T>(response, null, cancellationToken);
+
+    /// <summary>
+    /// Gets the deserialized JSON response value from the <see cref="HttpResponseMessage"/> where successful; otherwise, will throw a corresponding exception.
+    /// </summary>
+    /// <typeparam name="T">The response value <see cref="Type"/>.</typeparam>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value where successful.</returns>
+    /// <remarks>Where the response is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, the content is
+    /// converted into a <see cref="ProblemDetailsException"/> and returned as the error; otherwise, an <see cref="HttpRequestException"/> is returned as the error.
+    /// <para>Additionally, where the <see cref="ProblemDetailsException"/> is considered a <see cref="BusinessException"/>, it is thrown as such.</para>
+    /// <para>Finally, where the response is successful, the deserialized response value is returned.</para></remarks>
+    public async static Task<T?> GetValueAsync<T>(this HttpResponseMessage response, JsonSerializerOptions? jsonSerializerOptions, CancellationToken cancellationToken = default)
+    {
+        var result = await response.ThrowIfNull().ToResultAsync<T>(jsonSerializerOptions, cancellationToken).ConfigureAwait(false);
+        return result.Value;
+    }
+
+    /// <summary>
+    /// Gets the deserialized JSON response value from the <see cref="HttpResponseMessage"/> where successful; otherwise, will throw a corresponding exception.
+    /// </summary>
+    /// <typeparam name="T">The response value <see cref="Type"/>.</typeparam>
+    /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The value where successful.</returns>
+    /// <remarks>Where the response is not successful (<see cref="HttpResponseMessage.IsSuccessStatusCode"/>) and the content media type is <see cref="MediaTypeNames.Application.ProblemJson"/>, the content is
+    /// converted into a <see cref="ProblemDetailsException"/> and returned as the error; otherwise, an <see cref="HttpRequestException"/> is returned as the error.
+    /// <para>Additionally, where the <see cref="ProblemDetailsException"/> is considered a <see cref="BusinessException"/>, it is thrown as such.</para>
+    /// <para>Finally, where the response is successful, the deserialized response value is returned.</para></remarks>
+    public static Task<T?> GetValueAsync<T>(this HttpResponseMessage response, CancellationToken cancellationToken = default) => GetValueAsync<T>(response, null, cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.IEnumerable.cs b/src/CoreEx/Extensions.IEnumerable.cs
new file mode 100644
index 00000000..610f15dd
--- /dev/null
+++ b/src/CoreEx/Extensions.IEnumerable.cs
@@ -0,0 +1,41 @@
+namespace CoreEx;
+
+public static partial class Extensions
+{
+    /// <summary>
+    /// Creates a <see cref="DataMap{TValue}"/> from an <see cref="IEnumerable{TSource}"/> according to a specified key selector and element selector functions.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TElement">The element <see cref="Type"/>.</typeparam>
+    /// <param name="source">The source sequence.</param>
+    /// <param name="keySelector">A function to extract the key from each element.</param>
+    /// <param name="elementSelector">A function to map each element to the value.</param>
+    /// <param name="comparer">An optional equality comparer for the keys.</param>
+    /// <returns>A <see cref="DataMap{TValue}"/> containing the mapped elements.</returns>
+    public static DataMap<TElement> ToDataMap<TSource, TElement>(this IEnumerable<TSource> source, Func<TSource, string> keySelector, Func<TSource, TElement> elementSelector, IEqualityComparer<string>? comparer = null)
+    {
+        source.ThrowIfNull();
+        keySelector.ThrowIfNull();
+        elementSelector.ThrowIfNull();
+
+        if (source is ICollection<TSource> collection)
+        {
+            if (collection.Count == 0)
+                return new(comparer);
+
+            var dataMap = new DataMap<TElement>(collection.Count);
+            foreach (var item in collection)
+                dataMap.Add(keySelector(item), elementSelector(item));
+
+            return dataMap;
+        }
+        else
+        {
+            var dataMap = new DataMap<TElement>(comparer);
+            foreach (var item in source)
+                dataMap.Add(keySelector(item), elementSelector(item));
+
+            return dataMap;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.IHybridCache.cs b/src/CoreEx/Extensions.IHybridCache.cs
new file mode 100644
index 00000000..3c55e868
--- /dev/null
+++ b/src/CoreEx/Extensions.IHybridCache.cs
@@ -0,0 +1,117 @@
+namespace CoreEx;
+
+public static partial class Extensions
+{
+    /// <summary>
+    /// Tries to get the cached value for the specified key. 
+    /// </summary>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A tuple with a <see langword="bool"/> indicating whether the entry exists and the associated value where found (otherwise, <see langword="default"/>).</returns>
+    public static async Task<(bool Exists, T? Value)> TryGetAsync<T>(this IHybridCache cache, CompositeKey key, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await TryGetAsync<T>(cache, key, null, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Tries to get the cached value for the specified key. 
+    /// </summary>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A tuple with a <see langword="bool"/> indicating whether the entry exists and the associated value where found (otherwise, <see langword="default"/>).</returns>
+    public static async Task<(bool Exists, T? Value)> TryGetAsync<T>(this IHybridCache cache, CompositeKey key, HybridCacheEntryOptions? options, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.TryGetByKeyAsync<T>(cache.KeyProvider.GetEntityCacheKey<T>(key), options ?? HybridCacheEntryOptions.CreateFor<T>(), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Gets the cached value for the specified key or the default where not found.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The cached value or the default where not found.</returns>
+    public static async Task<T?> GetOrDefaultAsync<T>(this IHybridCache cache, CompositeKey key, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await GetOrDefaultAsync<T>(cache, key, null, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Gets the cached value for the specified key or the default where not found.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The cached value or the default where not found.</returns>
+    public static async Task<T?> GetOrDefaultAsync<T>(this IHybridCache cache, CompositeKey key, HybridCacheEntryOptions? options, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.GetOrDefaultByKeyAsync<T>(cache.KeyProvider.GetEntityCacheKey<T>(key), options ?? HybridCacheEntryOptions.CreateFor<T>(), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Sets or overwrites the cache <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="value">The cache value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Uses the <see cref="IHybridCache.KeyProvider"/> <see cref="ICacheKeyProvider.GetEntityCacheKey{T}(CompositeKey)"/> to determine the cache key.</remarks>
+    public static async Task SetAsync<T>(this IHybridCache cache, T value, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await SetAsync<T>(cache, value, null, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Sets or overwrites the cache <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="value">The cache value.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Uses the <see cref="IHybridCache.KeyProvider"/> <see cref="ICacheKeyProvider.GetEntityCacheKey{T}(CompositeKey)"/> to determine the cache key.</remarks>
+    public static async Task SetAsync<T>(this IHybridCache cache, T value, HybridCacheEntryOptions? options, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.SetByKeyAsync<T>(cache.KeyProvider.GetEntityCacheKey<T>(value.EntityKey), value, options ?? HybridCacheEntryOptions.CreateFor<T>(), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Gets the cached value for the specified key using the <paramref name="factory"/> to create and set where not found.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="factory">The function used to create the cache value.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Uses the <see cref="IHybridCache.KeyProvider"/> <see cref="ICacheKeyProvider.GetEntityCacheKey{T}(CompositeKey)"/> to determine the cache key.</remarks>
+    public static async Task<T> GetOrCreateAsync<T>(this IHybridCache cache, CompositeKey key, Func<CancellationToken, Task<T>> factory, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.GetOrCreateByKeyAsync<T>(cache.KeyProvider.GetEntityCacheKey<T>(key), factory, null, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Gets the cached value for the specified key using the <paramref name="factory"/> to create and set where not found.
+    /// </summary>
+    /// <typeparam name="T">The cache value <see cref="Type"/>.</typeparam>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="factory">The function used to create the cache value.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Uses the <see cref="IHybridCache.KeyProvider"/> <see cref="ICacheKeyProvider.GetEntityCacheKey{T}(CompositeKey)"/> to determine the cache key.</remarks>
+    public static async Task<T> GetOrCreateAsync<T>(this IHybridCache cache, CompositeKey key, Func<CancellationToken, Task<T>> factory, HybridCacheEntryOptions? options, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.GetOrCreateByKeyAsync<T>(cache.KeyProvider.GetEntityCacheKey<T>(key), factory, options ?? HybridCacheEntryOptions.CreateFor<T>(), cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Removes the cached value for the specified key.
+    /// </summary>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Uses the <see cref="IHybridCache.KeyProvider"/> <see cref="ICacheKeyProvider.GetEntityCacheKey{T}(CompositeKey)"/> to determine the cache key.</remarks>
+    public static async Task RemoveAsync<T>(this IHybridCache cache, CompositeKey key, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.RemoveAsync<T>(key, null, cancellationToken).ConfigureAwait(false);
+
+    /// <summary>
+    /// Removes the cached value for the specified key.
+    /// </summary>
+    /// <param name="cache">The <see cref="IHybridCache"/>.</param>
+    /// <param name="key">The <see cref="CompositeKey"/>.</param>
+    /// <param name="options">The optional <see cref="HybridCacheEntryOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Uses the <see cref="IHybridCache.KeyProvider"/> <see cref="ICacheKeyProvider.GetEntityCacheKey{T}(CompositeKey)"/> to determine the cache key.</remarks>
+    public static async Task RemoveAsync<T>(this IHybridCache cache, CompositeKey key, HybridCacheEntryOptions? options, CancellationToken cancellationToken = default) where T : IEntityKey
+        => await cache.RemoveByKeyAsync(cache.KeyProvider.GetEntityCacheKey<T>(key), options ?? HybridCacheEntryOptions.CreateFor<T>(), cancellationToken).ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.OperationType.cs b/src/CoreEx/Extensions.OperationType.cs
new file mode 100644
index 00000000..c60e2040
--- /dev/null
+++ b/src/CoreEx/Extensions.OperationType.cs
@@ -0,0 +1,42 @@
+namespace CoreEx;
+
+public static partial class Extensions
+{
+    extension(OperationType operationType)
+    {
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is a <see cref="OperationType.Get"/>.
+        /// </summary>
+        public bool IsGet => operationType == OperationType.Get;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is a <see cref="OperationType.Create"/>.
+        /// </summary>
+        public bool IsCreate => operationType == OperationType.Create;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is aN <see cref="OperationType.Update"/>.
+        /// </summary>
+        public bool IsUpdate => operationType == OperationType.Update;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is a <see cref="OperationType.Delete"/>.
+        /// </summary>
+        public bool IsDelete => operationType == OperationType.Delete;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is <see cref="OperationType.Unspecified"/>.
+        /// </summary>
+        public bool IsUnspecified => operationType == OperationType.Unspecified;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is a <see cref="OperationType.Get"/> or <see cref="OperationType.Query"/>.
+        /// </summary>
+        public bool IsRead => operationType == OperationType.Get || operationType == OperationType.Query;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="operationType"/> is a <see cref="OperationType.Create"/> or <see cref="OperationType.Update"/> or <see cref="OperationType.Delete"/>.
+        /// </summary>
+        public bool IsMutation => operationType == OperationType.Create || operationType == OperationType.Update || operationType == OperationType.Delete;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Extensions.cs b/src/CoreEx/Extensions.cs
new file mode 100644
index 00000000..3507ed5e
--- /dev/null
+++ b/src/CoreEx/Extensions.cs
@@ -0,0 +1,187 @@
+namespace CoreEx;
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class Extensions
+{
+    /// <summary>
+    /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <see langword="null"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate as non-null.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    [return: NotNull]
+    public static T ThrowIfNull<T>([NotNull] this T? value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+    {
+        ArgumentNullException.ThrowIfNull(value, paramName);
+        return value;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <see langword="null"/> or <see cref="string.Empty"/>.
+    /// </summary>
+    /// <param name="value">The value to validate as non-null.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    [return: NotNull]
+    public static string ThrowIfNullOrEmpty([NotNull] this string? value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(value, paramName);
+        return value;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentNullException"/> if the <paramref name="value"/> is <see cref="string.Empty"/>.
+    /// </summary>
+    /// <param name="value">The value to validate as non-null.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    [return: NotNullIfNotNull(nameof(value))]
+    public static string? ThrowIfEmpty(this string? value, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+    {
+        if (value is not null && value.Length == 0)
+            throw new ArgumentException("The value cannot be an empty string.", paramName);
+
+        return value;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentException"/> <i>when</i> the <paramref name="predicate"/> execution results in <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="predicate">The predicate.</param>
+    /// <param name="message">The error message; defaults to the predicate expression.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    [return: NotNullIfNotNull(nameof(value))]
+    public static T ThrowWhen<T>(this T value, Func<T, bool> predicate, [CallerArgumentExpression(nameof(predicate))] string? message = null, [CallerArgumentExpression(nameof(value))] string? paramName = null)
+    {
+        if (predicate(value))
+            throw new ArgumentException(message, paramName);
+
+        return value;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentOutOfRangeException"/> <i>when</i> the <paramref name="value"/> is less than zero.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="message">The optional message to include in the exception if the condition is met.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    public static T ThrowIfLessThanZero<T>(this T value, string? message = null, [CallerArgumentExpression(nameof(value))] string? paramName = null) where T : System.Numerics.INumber<T>
+        => (value < T.Zero) ? throw new ArgumentOutOfRangeException(paramName, message.ThrowIfEmpty() ?? "The value cannot be less than zero.") : value;
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentOutOfRangeException"/> <i>when</i> the <paramref name="value"/> is less than or equal to zero.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="message">The optional message to include in the exception if the condition is met.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    public static T ThrowIfLessThanOrEqualToZero<T>(this T value, string? message = null, [CallerArgumentExpression(nameof(value))] string? paramName = null) where T : System.Numerics.INumber<T>
+        => (value <= T.Zero) ? throw new ArgumentOutOfRangeException(paramName, message.ThrowIfEmpty() ?? "The value cannot be less than or equal to zero.") : value;
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentOutOfRangeException"/> <i>when</i> the <paramref name="value"/> is greater than zero.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="message">The optional message to include in the exception if the condition is met.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    public static T ThrowIfGreaterThanZero<T>(this T value, string? message = null, [CallerArgumentExpression(nameof(value))] string? paramName = null) where T : System.Numerics.INumber<T>
+        => (value > T.Zero) ? throw new ArgumentOutOfRangeException(paramName, message.ThrowIfEmpty() ?? "The value cannot be greater than zero.") : value;
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentOutOfRangeException"/> <i>when</i> the <paramref name="value"/> is greater than or equal to zero.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="message">The optional message to include in the exception if the condition is met.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    public static T ThrowIfGreaterThanOrEqualToZero<T>(this T value, string? message = null, [CallerArgumentExpression(nameof(value))] string? paramName = null) where T : System.Numerics.INumber<T>
+        => (value >= T.Zero) ? throw new ArgumentOutOfRangeException(paramName, message.ThrowIfEmpty() ?? "The value cannot be greater than or equal to zero.") : value;
+
+    /// <summary>
+    /// Throws an <see cref="ArgumentOutOfRangeException"/> <i>when</i> the <paramref name="value"/> is equal to zero.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="message">The optional message to include in the exception if the condition is met.</param>
+    /// <param name="paramName">The name of the parameter with which the <paramref name="value"/> corresponds.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [DebuggerStepThrough]
+    public static T ThrowIfEqualToZero<T>(this T value, string? message = null, [CallerArgumentExpression(nameof(value))] string? paramName = null) where T : System.Numerics.INumber<T>
+        => (value == T.Zero) ? throw new ArgumentOutOfRangeException(paramName, message.ThrowIfEmpty() ?? "The value cannot be equal to zero.") : value;
+
+    /// <summary>
+    /// Enables adjustment (changes) to a <paramref name="value"/> via an <paramref name="adjuster"/> action.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to adjust.</param>
+    /// <param name="adjuster">The adjusting action (invoked only where the <paramref name="value"/> is not <see langword="null"/>).</param>
+    /// <returns>The adjusted value (same instance).</returns>
+    /// <remarks>Useful in scenarios to in-line simple changes to a value to simplify code.</remarks>
+    [DebuggerStepThrough]
+    [return: NotNullIfNotNull(nameof(value))]
+    public static T? Adjust<T>(this T? value, Action<T>? adjuster)
+    {
+        if (value is not null)
+            adjuster?.Invoke(value);
+
+        return value!;
+    }
+
+    /// <summary>
+    /// Enables adjustment (changes) to a <paramref name="value"/> via an <paramref name="adjuster"/> action when the <paramref name="predicate"/> is <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to adjust.</param>
+    /// <param name="predicate">The <see cref="Predicate{T}"/> that determines whether the <paramref name="predicate"/> is invoked.</param>
+    /// <param name="adjuster">The adjusting action (invoked only where the <paramref name="value"/> is not <see langword="null"/> and the <paramref name="predicate"/> results in <see langword="true"/>).</param>
+    /// <returns>The adjusted value (same instance).</returns>
+    /// <remarks>Useful in scenarios to in-line simple changes to a value to simplify code.</remarks>
+    [DebuggerStepThrough]
+    [return: NotNullIfNotNull(nameof(value))]
+    public static T? AdjustWhen<T>(this T? value, Predicate<T> predicate, Action<T> adjuster)
+    {
+        if (value is not null && predicate(value))
+            adjuster?.Invoke(value);
+
+        return value!;
+    }
+
+    /// <summary>
+    /// Converts a <see cref="string"/> into sentence case.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <returns>The <see cref="string"/> as sentence case.</returns>
+    /// <remarks>For example a value of '<c>VarNameDB</c>' would return '<c>Var name DB</c>'.
+    /// <para>Uses <see cref="SentenceCase.ToSentenceCase(string?)"/> to perform the conversion.</para></remarks>
+    [DebuggerStepThrough]
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToSentenceCase(this string? text) => SentenceCase.ToSentenceCase(text);
+
+    /// <summary>
+    /// Indicates whether the exception is <see cref="OperationCanceledException"/> (including <see cref="AggregateException"/> <see cref="Exception.InnerException"/>).
+    /// </summary>
+    /// <param name="ex">The <see cref="Exception"/>.</param>
+    /// <returns><see langword="true"/> indicates canceled; otherwise, <see langword="false"/>.</returns>
+    [DebuggerStepThrough]
+    public static bool IsCanceled(this Exception ex) => ex is OperationCanceledException || (ex is AggregateException aex && aex.InnerException is OperationCanceledException);
+}
\ No newline at end of file
diff --git a/src/CoreEx/GlobalUsing.cs b/src/CoreEx/GlobalUsing.cs
new file mode 100644
index 00000000..28a4372a
--- /dev/null
+++ b/src/CoreEx/GlobalUsing.cs
@@ -0,0 +1,61 @@
+global using CoreEx;
+global using CoreEx.Abstractions;
+global using CoreEx.Caching;
+global using CoreEx.Data;
+global using CoreEx.DependencyInjection;
+global using CoreEx.Entities;
+global using CoreEx.Entities.Abstractions;
+global using CoreEx.Entities.Extended;
+global using CoreEx.Globalization;
+global using CoreEx.HealthChecks;
+global using CoreEx.Hosting;
+global using CoreEx.Http;
+global using CoreEx.Http.Abstractions;
+global using CoreEx.Hosting.Synchronization;
+global using CoreEx.Invokers;
+global using CoreEx.Json;
+global using CoreEx.Localization;
+global using CoreEx.Mapping.Converters.Abstractions;
+global using CoreEx.RefData.Abstractions;
+global using CoreEx.Results;
+global using CoreEx.Results.Abstractions;
+global using CoreEx.Metadata;
+global using CoreEx.Schemas;
+global using CoreEx.Security;
+global using CoreEx.Text;
+global using CoreEx.Wildcards;
+global using Microsoft.Extensions.Caching.Memory;
+global using Microsoft.Extensions.Configuration;
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.DependencyInjection.Extensions;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
+global using Microsoft.Extensions.Hosting;
+global using Microsoft.Extensions.Logging;
+global using OpenTelemetry;
+global using OpenTelemetry.Metrics;
+global using OpenTelemetry.Trace;
+global using System.Buffers;
+global using System.Buffers.Binary;
+global using System.Collections;
+global using System.Collections.Concurrent;
+global using System.Collections.Immutable;
+global using System.Collections.ObjectModel;
+global using System.ComponentModel;
+global using System.ComponentModel.DataAnnotations;
+global using System.Diagnostics;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Globalization;
+global using System.Linq.Expressions;
+global using System.Net;
+global using System.Net.Http.Headers;
+global using System.Net.Http.Json;
+global using System.Net.Mime;
+global using System.Reflection;
+global using System.Runtime.CompilerServices;
+global using System.Security.Cryptography;
+global using System.Text;
+global using System.Text.Json;
+global using System.Text.Json.Nodes;
+global using System.Text.Json.Serialization;
+global using System.Text.RegularExpressions;
+global using ExecutionContext = CoreEx.ExecutionContext;
\ No newline at end of file
diff --git a/src/CoreEx/Globalization/GlobalizationExtensions.cs b/src/CoreEx/Globalization/GlobalizationExtensions.cs
new file mode 100644
index 00000000..438a4e45
--- /dev/null
+++ b/src/CoreEx/Globalization/GlobalizationExtensions.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.Globalization;
+
+/// <summary>
+/// Provides <see cref="TextInfo"/> extension methods.
+/// </summary>
+public static class GlobalizationExtensions
+{
+    /// <summary>
+    /// Converts the specified <paramref name="text"/> to the selected <see cref="TextInfoCasing"/>.
+    /// </summary>
+    /// <param name="textInfo">The <see cref="TextInfo"/>.</param>
+    /// <param name="text">The text to convert.</param>
+    /// <param name="casing">The selected <see cref="TextInfoCasing"/>.</param>
+    /// <returns>The converted text.</returns>
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToCasing(this TextInfo textInfo, string? text, TextInfoCasing casing) => casing switch
+    {
+        TextInfoCasing.Lower => text is null ? null : textInfo.ToLower(text),
+        TextInfoCasing.Upper => text is null ? null : textInfo.ToUpper(text),
+        TextInfoCasing.Title => text is null ? null : textInfo.ToTitleCase(text),
+        _ => text
+    };
+}
\ No newline at end of file
diff --git a/src/CoreEx/Globalization/README.md b/src/CoreEx/Globalization/README.md
index dc0792fd..b78ff549 100644
--- a/src/CoreEx/Globalization/README.md
+++ b/src/CoreEx/Globalization/README.md
@@ -1,17 +1,25 @@
-# CoreEx.Globalization
+# CoreEx.Globalization
 
-The `CoreEx.Globalization` namespace provides additional globalization capabilities.
+> Provides `TextInfoCasing` utility and `GlobalizationExtensions` for culture-aware string casing operations used in entity cleaning and reference data normalization.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Globalization` is a small utility namespace that wraps `System.Globalization.TextInfo` to provide deterministic, culture-aware `ToUpperCase`, `ToLowerCase`, and `ToTitleCase` operations used by `Cleaner` (via `StringCase`) and reference data code normalization.
 
-To enable additional globalization capabilities.
+By centralizing these calls here, CoreEx ensures that casing operations consistently use the invariant culture (or a configured `CultureInfo`) rather than the ambient thread culture, avoiding locale-sensitive bugs in entity normalization.
 
-<br/>
+## Key capabilities
 
-## String casing
+- 🔤 **Culture-aware casing**: `TextInfoCasing` wraps `TextInfo.ToUpper`, `ToLower`, and `ToTitleCase` to apply casing with a specified (or invariant) culture.
+- 🧩 **Extension methods**: `GlobalizationExtensions` provides `ToUpperInvariant`, `ToLowerInvariant`, and `ToTitleCaseInvariant` string extension methods as convenience wrappers.
 
-Added a [`TextInfoCasing`](./TextInfoCasing.cs) enum and corresponding [`TextInfo`](https://learn.microsoft.com/en-us/dotnet/api/system.globalization.textinfo).[`ToCasing`](./TextInfoExtensions.cs) extension method to perform the selected casing.
+## Key types
 
+| Type | Description |
+|------|-------------|
+| **[`TextInfoCasing`](./TextInfoCasing.cs)** | Utility providing `ToUpper(string)`, `ToLower(string)`, and `ToTitleCase(string)` using a configured `CultureInfo` (default: `CultureInfo.InvariantCulture`). |
+| **[`GlobalizationExtensions`](./GlobalizationExtensions.cs)** | String extension methods: `ToUpperInvariant()`, `ToLowerInvariant()`, `ToTitleCaseInvariant()` delegating to `TextInfoCasing`. |
 
+## Related Namespaces
+
+- **[`CoreEx.Entities`](../Entities/README.md)** - `Cleaner` uses `GlobalizationExtensions` for the `StringCase.Upper`, `Lower`, and `Title` transformations applied to entity property values during cleaning.
\ No newline at end of file
diff --git a/src/CoreEx/Globalization/TextInfoCasing.cs b/src/CoreEx/Globalization/TextInfoCasing.cs
index 95744b72..73a64eb6 100644
--- a/src/CoreEx/Globalization/TextInfoCasing.cs
+++ b/src/CoreEx/Globalization/TextInfoCasing.cs
@@ -1,32 +1,27 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Globalization;
 
-using System.Globalization;
-
-namespace CoreEx.Globalization
+/// <summary>
+/// Provides the <see cref="TextInfo"/> casing selection.
+/// </summary>
+public enum TextInfoCasing
 {
     /// <summary>
-    /// Provides the <see cref="TextInfo"/> casing selection.
+    /// No text casing is to be applied; leave as-is.
     /// </summary>
-    public enum TextInfoCasing
-    {
-        /// <summary>
-        /// No text casing is to be applied; leave as-is.
-        /// </summary>
-        None,
+    None,
 
-        /// <summary>
-        /// Use <see cref="TextInfo.ToLower(string)"/>.
-        /// </summary>
-        Lower,
+    /// <summary>
+    /// Use <see cref="TextInfo.ToLower(string)"/>.
+    /// </summary>
+    Lower,
 
-        /// <summary>
-        /// Use <see cref="TextInfo.ToUpper(string)"/>.
-        /// </summary>
-        Upper,
+    /// <summary>
+    /// Use <see cref="TextInfo.ToUpper(string)"/>.
+    /// </summary>
+    Upper,
 
-        /// <summary>
-        /// Use <see cref="TextInfo.ToTitleCase(string)"/>.
-        /// </summary>
-        Title
-    }
+    /// <summary>
+    /// Use <see cref="TextInfo.ToTitleCase(string)"/>.
+    /// </summary>
+    Title
 }
\ No newline at end of file
diff --git a/src/CoreEx/Globalization/TextInfoExtensions.cs b/src/CoreEx/Globalization/TextInfoExtensions.cs
deleted file mode 100644
index d34e1787..00000000
--- a/src/CoreEx/Globalization/TextInfoExtensions.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Globalization;
-
-namespace CoreEx.Globalization
-{
-    /// <summary>
-    /// Provides <see cref="TextInfo"/> extension methods.
-    /// </summary>
-    public static class TextInfoExtensions
-    {
-        /// <summary>
-        /// Converts the specified <paramref name="text"/> to the selected <see cref="TextInfoCasing"/>.
-        /// </summary>
-        /// <param name="textInfo">The <see cref="TextInfo"/>.</param>
-        /// <param name="text">The text to convert.</param>
-        /// <param name="casing">The selected <see cref="TextInfoCasing"/>.</param>
-        /// <returns>The converted text.</returns>
-        public static string? ToCasing(this TextInfo textInfo, string? text, TextInfoCasing casing) => casing switch
-        {
-            TextInfoCasing.Lower => text == null ? null : textInfo.ToLower(text),
-            TextInfoCasing.Upper => text == null ? null : textInfo.ToUpper(text),
-            TextInfoCasing.Title => text == null ? null : textInfo.ToTitleCase(text),
-            _ => text
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/HealthChecks/Extensions.cs b/src/CoreEx/HealthChecks/Extensions.cs
new file mode 100644
index 00000000..2f4f085e
--- /dev/null
+++ b/src/CoreEx/HealthChecks/Extensions.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.HealthChecks;
+
+/// <summary>
+/// Provides extension methods for <see cref="HealthCheckTags"/>.
+/// </summary>
+public static class Extensions
+{
+    extension(HealthCheckTags healthCheckTags)
+    {
+        /// <summary>
+        /// Gets the <see cref="HealthCheckTags.Startup"/> and <see cref="HealthCheckTags.Ready"/> tags.
+        /// </summary>
+        public static string[] StartUpAndReadyOnly => [nameof(HealthCheckTags.Startup), nameof(HealthCheckTags.Ready)];
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/HealthChecks/HealthCheckTags.cs b/src/CoreEx/HealthChecks/HealthCheckTags.cs
new file mode 100644
index 00000000..4cef1c77
--- /dev/null
+++ b/src/CoreEx/HealthChecks/HealthCheckTags.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.HealthChecks;
+
+/// <summary>
+/// Provides the standard health check tags.
+/// </summary>
+public enum HealthCheckTags
+{
+    /// <summary>
+    /// Liveness probe.
+    /// </summary>
+    Live,
+
+    /// <summary>
+    /// Readiness probe.
+    /// </summary>
+    Ready,
+
+    /// <summary>
+    /// Startup probe.
+    /// </summary>
+    Startup
+}
\ No newline at end of file
diff --git a/src/CoreEx/HealthChecks/README.md b/src/CoreEx/HealthChecks/README.md
new file mode 100644
index 00000000..207a2c50
--- /dev/null
+++ b/src/CoreEx/HealthChecks/README.md
@@ -0,0 +1,25 @@
+# CoreEx.HealthChecks
+
+> Provides `HealthCheckTags` constants and extension methods for standardizing health check registration with CoreEx-defined tag conventions across all CoreEx host types.
+
+## Overview
+
+`CoreEx.HealthChecks` is a small, focused namespace that bridges CoreEx with the .NET `Microsoft.Extensions.Diagnostics.HealthChecks` infrastructure. It defines the standard tag names used when registering health checks (`live`, `startup`, `ready`) and provides extension methods that apply those tags consistently so that liveness and readiness probes can be separated at the `IHealthChecksBuilder` level without each host re-defining the tag strings.
+
+## Key capabilities
+
+- 🏷️ **Standard tags**: `HealthCheckTags.Live` (`"live"`), `HealthCheckTags.Startup` (`"startup"`) and `HealthCheckTags.Ready` (`"ready"`) are the canonical tag names used by CoreEx hosts to distinguish liveness from readiness checks.
+- 🔧 **Registration extensions**: `Extensions.AddCoreExHealthChecks(IHealthChecksBuilder)` registers the standard CoreEx health checks (e.g. `HostedServiceManager`) with the correct tags and names.
+- 🎯 **Filtering integration**: Tags align with the standard ASP.NET Core health-check filtering convention, allowing `/health/live`, `/health/startup` and `/health/ready` endpoints to filter by tag without custom predicates.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`HealthCheckTags`](./HealthCheckTags.cs)** | Static constants: `Live` (`"live"`), `Startup` (`"startup"`), `Ready` (`"ready"`), and `All` array for use in `IHealthChecksBuilder.AddCheck(..., tags: HealthCheckTags.All)`. |
+| **[`Extensions`](./Extensions.cs)** | `IHealthChecksBuilder` extension methods applying CoreEx health check registrations with standard tags. |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - Root package; `Program.cs` hosts call `PostConfigureAllHealthChecks()` which uses these tags.
+- **[`CoreEx.Hosting`](../Hosting/README.md)** - `HostedServiceHealthCheck` registers itself under the `HealthCheckTags.Ready` tag.
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/ConcurrentSynchronizer.cs b/src/CoreEx/Hosting/ConcurrentSynchronizer.cs
deleted file mode 100644
index 84cad8b4..00000000
--- a/src/CoreEx/Hosting/ConcurrentSynchronizer.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// An <see cref="IServiceSynchronizer"/> that performs <b>no</b> synchronization in that <see cref="Enter"/> will always return <c>true</c> resulting in concurrent execution.
-    /// </summary>
-    /// <remarks>This should be used in scenarios where synchronization is not required as this is handled externally or is not needed.</remarks>
-    public sealed class ConcurrentSynchronizer : IServiceSynchronizer
-    {
-        /// <inheritdoc/>
-        public bool Enter<T>(string? name = null) => true;
-
-        /// <inheritdoc/>
-        public void Exit<T>(string? name) { }
-
-        /// <inheritdoc/>
-        public void Dispose() { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Extensions.ServiceStatus.cs b/src/CoreEx/Hosting/Extensions.ServiceStatus.cs
new file mode 100644
index 00000000..d693b8de
--- /dev/null
+++ b/src/CoreEx/Hosting/Extensions.ServiceStatus.cs
@@ -0,0 +1,58 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Provides standard extensions.
+/// </summary>
+public static partial class Extensions
+{
+    extension(ServiceStatus status)
+    {
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in its initial state.
+        /// </summary>
+        /// <remarks>Being <see cref="ServiceStatus.Initializing"/>.</remarks>
+        public bool IsInitializing => status == ServiceStatus.Initializing;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a pause state.
+        /// </summary>
+        /// <remarks>Being either <see cref="ServiceStatus.Pausing"/> or <see cref="ServiceStatus.Paused"/>.</remarks>
+        public bool IsPause => status == ServiceStatus.Pausing || status == ServiceStatus.Paused;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a stop state.
+        /// </summary>
+        /// <remarks>Being either <see cref="ServiceStatus.Stopping"/> or <see cref="ServiceStatus.Stopped"/>.</remarks>
+        public bool IsStop => status == ServiceStatus.Stopping || status == ServiceStatus.Stopped;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a sleep state.
+        /// </summary>
+        /// <remarks>Being <see cref="ServiceStatus.Sleeping"/>.</remarks>
+        public bool IsAsleep => status == ServiceStatus.Sleeping;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a running state.
+        /// </summary>
+        /// <remarks>Being <see cref="ServiceStatus.Running"/>.</remarks>
+        public bool IsRunning => status == ServiceStatus.Running;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a state that the service can be started.
+        /// </summary>
+        /// <remarks>Note that the service can only be started from the <see cref="ServiceStatus.Initializing"/> state.</remarks>
+        public bool CanStart => status.IsInitializing;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a state that the service can be paused.
+        /// </summary>
+        /// <remarks>Note that the service can be paused from either the <see cref="ServiceStatus.Sleeping"/> or <see cref="ServiceStatus.Running"/> states.</remarks>
+        public bool CanPause => status == ServiceStatus.Sleeping || status == ServiceStatus.Running;
+
+        /// <summary>
+        /// Indicates whether the <paramref name="status"/> is in a state that the service can be resumed.
+        /// </summary>
+        /// <remarks>Note that the service can only be resumed from the <see cref="ServiceStatus.Paused"/> state.</remarks>
+        public bool CanResume => status == ServiceStatus.Paused;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/FileLockSynchronizer.cs b/src/CoreEx/Hosting/FileLockSynchronizer.cs
deleted file mode 100644
index 05eb0129..00000000
--- a/src/CoreEx/Hosting/FileLockSynchronizer.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Concurrent;
-using System.IO;
-using System.Linq;
-using CoreEx.Configuration;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// An <see cref="IServiceSynchronizer"/> that performs synchronization by taking an exclusive lock on a file.
-    /// </summary>
-    /// <remarks>A lock file is created per <see cref="Type"/> with a name of <see cref="Type.FullName"/> and extension of '.lock'; e.g. '<c>Namespace.Class.lock</c>'. For this to function correctly all running
-    /// instances must be referencing the same shared directory as specified by the <see cref="ConfigKey"/> (see <see cref="SettingsBase.GetValue{T}(string, T)"/>).</remarks>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    public class FileLockSynchronizer(SettingsBase settings) : IServiceSynchronizer
-    {
-        /// <summary>
-        /// Gets the configuration key that defines the directory path for the exclusive lock files.
-        /// </summary>
-        public const string ConfigKey = "FileLockSynchronizerPath";
-
-        private readonly string _path = settings.ThrowIfNull(nameof(settings)).GetCoreExValue<string>(ConfigKey) ?? throw new ArgumentException($"Configuration setting '{ConfigKey}' either does not exist or has no value.", nameof(settings));
-        private readonly ConcurrentDictionary<string, FileStream> _dict = new();
-        private bool _disposed;
-
-        /// <inheritdoc/>
-        public bool Enter<T>(string? name = null)
-        {
-            if (!Directory.Exists(_path))
-                throw new ArgumentException($"Configuration setting '{ConfigKey}' path does not exist: {_path}");
-
-            var fn = Path.Combine(_path, $"{typeof(T).FullName}{(name == null ? "" : $".{name}")}.lock");
-
-            try
-            {
-                // Is exclusive for this invocation only where genuinely creating.
-                bool exclusiveLock = false;
-                _dict.GetOrAdd(GetName<T>(name), _ => { exclusiveLock = true; return File.Create(fn, 1, FileOptions.DeleteOnClose); });
-                return exclusiveLock;
-            }
-            catch (IOException) { return false; } // Already exists and locked!
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException($"Unexpected exception whilst attemptiong to create file '{fn}' with an exclusive lock: {ex.Message}", ex);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Exit<T>(string? name)
-        {
-            if (_dict.TryRemove(GetName<T>(name), out var fs))
-                fs.Dispose();
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            if (!_disposed)
-            {
-                _disposed = true;
-                _dict.Values.ForEach(fs => fs.Dispose());
-            }
-
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="FileLockSynchronizer"/> and optionally releases the managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing) { }
-
-        /// <summary>
-        /// Gets the full name.
-        /// </summary>
-        private static string GetName<T>(string? name) => $"{typeof(T).FullName}{(name == null ? "" : $".{name}")}";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HealthChecks/TimerHostedServiceHealthCheck.cs b/src/CoreEx/Hosting/HealthChecks/TimerHostedServiceHealthCheck.cs
deleted file mode 100644
index 2a258487..00000000
--- a/src/CoreEx/Hosting/HealthChecks/TimerHostedServiceHealthCheck.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting.HealthChecks
-{
-    /// <summary>
-    /// Provides an <see cref="IHealthCheck"/> for a <see cref="TimerHostedServiceBase"/> reporting its <see cref="TimerHostedServiceBase.Status"/>.
-    /// </summary>
-    /// <remarks>The <see cref="Data"/> indicates current state; assumes healthy where reported.</remarks>
-    public sealed class TimerHostedServiceHealthCheck : IHealthCheck
-    {
-        private volatile Dictionary<string, object>? _data;
-
-        /// <summary>
-        /// Gets or sets the last updated health check data.
-        /// </summary>
-        /// <remarks>An initial <c>null</c> value indicates unhealthy as no status has been reported.</remarks>
-        public Dictionary<string, object>? Data { get => _data; set => _data = value.ThrowIfNull(nameof(Data)); }
-
-        /// <summary>
-        /// Gets or sets the latest <see cref="HealthCheckResult"/> to report.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HealthCheckResult.Unhealthy"/>; no health check reported.</remarks>
-        public HealthCheckResult Result { get; set; } = HealthCheckResult.Unhealthy("No health check reported.");
-
-        /// <inheritdoc/>
-        public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default) => Task.FromResult(Result);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostSettings.cs b/src/CoreEx/Hosting/HostSettings.cs
new file mode 100644
index 00000000..58e097c2
--- /dev/null
+++ b/src/CoreEx/Hosting/HostSettings.cs
@@ -0,0 +1,51 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Provides standardized runtime/host settings.
+/// </summary>
+public class HostSettings : IHostSettings
+{
+    private Uri? _source;
+
+    /// <summary>
+    /// Creates a new <see cref="HostSettings"/> using the <paramref name="configuration"/> to realize the <see cref="SolutionName"/> and <see cref="DomainName"/> properties where not specifically provided.
+    /// </summary>
+    /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
+    /// <param name="environmentName">The environment name; for example '<c>Development</c>'.</param>
+    /// <param name="solutionName">The area name; for example '<c>contoso</c>'.</param>
+    /// <param name="domainName">The domain name; for example '<c>products</c>'.</param>
+    /// <param name="source">The source <see cref="Uri"/>; for example '<c>urn:contoso:products</c>'.</param>
+    /// <returns>The <see cref="HostSettings"/>.</returns>
+    public static HostSettings Create(IConfiguration configuration, string environmentName, string? solutionName = null, string? domainName = null, Uri? source = null)
+    {
+        configuration.ThrowIfNull();
+
+        var sn = solutionName ?? Internal.GetConfigurationValue<string>("CoreEx:Host:SolutionName", null, configuration) ?? throw new ArgumentException($"{nameof(SolutionName)} must either be specified or configured 'CoreEx:Host:SolutionName'");
+        var dn = domainName ?? Internal.GetConfigurationValue<string>("CoreEx:Host:DomainName", null, configuration) ?? throw new ArgumentException($"{nameof(DomainName)} must either be specified or configured 'CoreEx:Host:DomainName'");
+        var su = source ?? Internal.GetConfigurationValue<Uri?>("CoreEx:Host:Source", null, configuration);
+
+        return new HostSettings
+        {
+            SolutionName = sn,
+            DomainName = dn,
+            EnvironmentName = environmentName,
+            Source = su
+        };
+    }
+
+    /// <inheritdoc/>
+    public required string SolutionName { get; init => field = value.ThrowIfNullOrEmpty(); }
+
+    /// <inheritdoc/>
+    public required string DomainName { get; init => field = value.ThrowIfNullOrEmpty(); }
+
+    /// <inheritdoc/>
+    public required string EnvironmentName { get; init => field = value.ThrowIfNullOrEmpty(); }
+
+    /// <inheritdoc/>
+    public Uri? Source
+    {
+        get => _source ??= new Uri($"urn:{SolutionName.Replace('.', ':').ToLowerInvariant()}:{DomainName.ToLowerInvariant()}");
+        init => _source = value;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostStartup.cs b/src/CoreEx/Hosting/HostStartup.cs
deleted file mode 100644
index bd3a7acd..00000000
--- a/src/CoreEx/Hosting/HostStartup.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Provides standardized host startup capabilities
-    /// </summary>
-    public class HostStartup : IHostStartup
-    {
-        /// <inheritdoc/>
-        public virtual void ConfigureAppConfiguration(HostBuilderContext context, IConfigurationBuilder config) { }
-
-        /// <inheritdoc/>
-        public virtual void ConfigureHostConfiguration(IConfigurationBuilder config) { }
-
-        /// <inheritdoc/>
-        public virtual void ConfigureServices(IServiceCollection services) { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostStartupExtensions.cs b/src/CoreEx/Hosting/HostStartupExtensions.cs
deleted file mode 100644
index e9c91683..00000000
--- a/src/CoreEx/Hosting/HostStartupExtensions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Hosting;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Provides <see cref="IHostBuilder"/> extensions.
-    /// </summary>
-    public static class HostStartupExtensions
-    {
-        /// <summary>
-        /// Configures the <see cref="IHostBuilder"/> with the <see cref="IHostStartup"/> capabilities.
-        /// </summary>
-        /// <typeparam name="TStartup">The <see cref="IHostedService"/>.</typeparam>
-        /// <param name="hostBuilder">The <see cref="IHostBuilder"/>.</param>
-        /// <returns>The <see cref="IHostBuilder"/>.</returns>
-        public static IHostBuilder ConfigureHostStartup<TStartup>(this IHostBuilder hostBuilder) where TStartup : class, IHostStartup, new()
-        {
-            var startup = new TStartup();
-            return hostBuilder.ThrowIfNull(nameof(hostBuilder)).ConfigureAppConfiguration(startup.ConfigureAppConfiguration)
-                .ConfigureHostConfiguration(startup.ConfigureHostConfiguration)
-                .ConfigureServices((hbc, sc) => startup.ConfigureServices(sc));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostedServiceBase.cs b/src/CoreEx/Hosting/HostedServiceBase.cs
new file mode 100644
index 00000000..8a412386
--- /dev/null
+++ b/src/CoreEx/Hosting/HostedServiceBase.cs
@@ -0,0 +1,380 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Represents a base class for an <see cref="IHostedService"/>.
+/// </summary>
+/// <remarks>Provides common properties and methods for hosted services including status reporting and health check integration.
+/// <para>The <see cref="OnInitializeAsync(CancellationToken)"/> should be used to initialize the service, such as reading configuration settings, etc. versus via the constructor.</para></remarks>
+public abstract class HostedServiceBase : IHostedService, IDisposable
+{
+    private string? _serviceConfigurationSectionName;
+    private string? _serviceName;
+    private HostedServiceHealthCheck? _healthCheck;
+    private ServiceStatus _status = ServiceStatus.Initializing;
+    private int _disposed;
+
+    /// <summary>
+    /// Gets the argument for specifying that the <see cref="HostedServiceBase"/> should execute as a no-op (i.e. no operation); i.e. do nothing.
+    /// </summary>
+    /// <remarks>This is to support the likes of testing where the underlying hosted services should not execute.</remarks>
+    public const string NoOpArgument = "--no-op-hosted-services";
+
+    /// <summary>
+    /// Gets the <see cref="HostedServiceInvoker"/> to be used for all hosted services.
+    /// </summary>
+    protected static HostedServiceInvoker HostedServiceInvoker { get; } = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="HostedServiceBase"/> class.
+    /// </summary>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public HostedServiceBase(IServiceProvider serviceProvider, ILogger logger)
+    {
+        ServiceProvider = serviceProvider.ThrowIfNull();
+        Logger = logger.ThrowIfNull();
+        Configuration = ServiceProvider.GetService<IConfiguration>() ?? throw new InvalidOperationException($"No {nameof(IConfiguration)} available in the service provider.");
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IServiceProvider"/>.
+    /// </summary>
+    protected IServiceProvider ServiceProvider { get; }
+
+    /// <summary>
+    /// Gets the <see cref="IConfiguration"/>.
+    /// </summary>
+    protected IConfiguration Configuration { get; }
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    protected ILogger Logger { get; }
+
+    /// <summary>
+    /// Gets ot sets the service configuration section name (used for configuration lookup).
+    /// </summary>
+    /// <remarks>Defaults to the <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
+    public string ServiceConfigurationSectionName
+    {
+        get => _serviceConfigurationSectionName ??= GetType().Name;
+        set => _serviceConfigurationSectionName = SetValueWhenStatusIsInitializedOnly(value.ThrowIfEmpty());
+    }
+
+    /// <summary>
+    /// Gets or sets the service name (used for logging).
+    /// </summary>
+    /// <remarks>Defaults to the <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
+    public string ServiceName
+    {
+        get => _serviceName ??= GetType().Name;
+        set => _serviceName = SetValueWhenStatusIsInitializedOnly(value.ThrowIfEmpty());
+    }
+
+    /// <summary>
+    /// Gets or sets the optional <see cref="HostedServiceHealthCheck"/> to report health; where set the health status will be reported on each <see cref="Status"/> change.
+    /// </summary>
+    public HostedServiceHealthCheck? HealthCheck { get => _healthCheck; set => _healthCheck = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Get or sets an optional tag that can be used to store additional information about the service instance; e.g. assigning a tenant identifier where applicable.
+    /// </summary>
+    public object? Tag { get; set; }
+
+    /// <summary>
+    /// Gets the synchronization lock.
+    /// </summary>
+#if NET9_0_OR_GREATER
+    protected Lock SyncLock { get; } = new();
+#else
+    protected object SyncLock { get; } = new();
+#endif
+
+    /// <summary>
+    /// Indicates whether <see cref="PauseAsync(CancellationToken)"/> and <see cref="ResumeAsync(CancellationToken)"/> are supported.
+    /// </summary>
+    public bool ArePauseAndResumeSupported { get; protected set; } = false;
+
+    /// <summary>
+    /// Gets the current <see cref="ServiceStatus"/>.
+    /// </summary>
+    /// <remarks>The <see cref="Status"/> should always be updated within a <see cref="SyncLock"/> to ensure thread safety.</remarks>
+    public ServiceStatus Status
+    {
+        get => _status;
+        protected set => _status = ReportHealthStatus(value);
+    }
+
+    /// <summary>
+    /// Reports the <see cref="HealthCheckResult"/> on status change.
+    /// </summary>
+    /// <param name="status">The <see cref="ServiceStatus"/>.</param>
+    /// <returns>The <paramref name="status"/>.</returns>
+    private ServiceStatus ReportHealthStatus(ServiceStatus status)
+    {
+        if (_healthCheck is not null)
+        {
+            var data = new Dictionary<string, object>
+                {
+                    { "service", ServiceName },
+                    { "status", status.ToString() }
+                };
+
+            _healthCheck.Result = OnReportHealthStatus(data);
+        }
+
+        return status;
+    }
+
+    /// <summary>
+    /// Sets the value when the <see cref="Status"/> is <see cref="ServiceStatus.Initializing"/> only; otherwise, throws an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <returns>The value to support fluent-style method-chaining.</returns>
+    protected T SetValueWhenStatusIsInitializedOnly<T>(T value)
+    {
+        if (!Status.IsInitializing)
+            throw new InvalidOperationException($"Cannot set value when status is {Status}.");
+
+        return value;
+    }
+
+    /// <inheritdoc/>
+    public async Task StartAsync(CancellationToken cancellationToken)
+    {
+        if (Abstractions.Internal.TryGetConfigurationValue<bool?>(NoOpArgument, out var nop, Configuration) && (nop is null || nop.Value))
+        {
+            lock (SyncLock)
+            {
+                Status = ServiceStatus.NoOp;
+                if (Logger.IsEnabled(LogLevel.Information))
+                    Logger.LogInformation("{ServiceName} no-op.", ServiceName);
+            }
+
+            return;
+        }
+
+        lock (SyncLock)
+        {
+            Status = ServiceStatus.Initializing;
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} initializing.", ServiceName);
+        }
+
+        await OnInitializeAsync(cancellationToken).ConfigureAwait(false);
+
+        lock (SyncLock)
+        {
+            Status = ServiceStatus.Starting;
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} starting.", ServiceName);
+        }
+
+        var status = await OnStartAsync(cancellationToken).ConfigureAwait(false);
+
+        lock (SyncLock)
+        {
+            if (Status == ServiceStatus.Starting)
+                Status = status;
+
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} started.", ServiceName);
+        }
+    }
+
+    /// <summary>
+    /// The hosted service is being initialized.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is called prior to the <see cref="OnStartAsync(CancellationToken)"/> and provides an opportunity to perform any initialization logic.
+    /// <para><b>Note:</b> where overriding invoke the base <see cref="OnInitializeAsync(CancellationToken)"/> first to ensure initialization occurs in the correct sequence. Failing to invoke the base
+    /// will likely result in unintended side-effects/errors.</para></remarks>
+    protected virtual Task OnInitializeAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    /// <summary>
+    /// A hosted service start has been requested.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="ServiceStatus"/> as a result of the start; typically either <see cref="ServiceStatus.Running"/> or <see cref="ServiceStatus.Sleeping"/>.</returns>
+    protected abstract Task<ServiceStatus> OnStartAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Pauses the hosted service.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Pausing will only be performed where the current <see cref="Status"/> is either <see cref="ServiceStatus.Running"/> or <see cref="ServiceStatus.Sleeping"/>.</remarks>
+    public async Task PauseAsync(CancellationToken cancellationToken)
+    {
+        if (!ArePauseAndResumeSupported)
+            throw new NotSupportedException($"{ServiceName} does not support pausing and resuming.");
+
+        lock (SyncLock)
+        {
+            if (!Status.CanPause)
+                return;
+
+            Status = ServiceStatus.Pausing;
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} pausing.", ServiceName);
+        }
+
+        await OnPauseAsync(cancellationToken).ConfigureAwait(false);
+
+        lock (SyncLock)
+        {
+            if (Status == ServiceStatus.Pausing)
+            {
+                Status = ServiceStatus.Paused;
+                if (Logger.IsEnabled(LogLevel.Information))
+                    Logger.LogInformation("{ServiceName} paused.", ServiceName);
+            }
+        }
+    }
+
+    /// <summary>
+    /// A hosted service pause has been requested.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The <see cref="Status"/> will automatically be set to <see cref="ServiceStatus.Pausing"/> prior to execution. It will then be automatically set to <see cref="ServiceStatus.Paused"/> post execution
+    /// where the <see cref="Status"/> is still <see cref="ServiceStatus.Pausing"/>.</remarks>
+    protected virtual Task OnPauseAsync(CancellationToken cancellationToken) => throw new NotImplementedException($"Where pause and resume are supported then the {nameof(OnPauseAsync)} method must be implemented.");
+
+    /// <summary>
+    /// Initiates a <see cref="PauseAsync(CancellationToken)"/> without waiting for completion (fire-and-forget).
+    /// </summary>
+    /// <remarks>Use this method only when calling from likes of API endpoints or in loops where you need an immediate return.</remarks>
+    public void Pause() => _ = Task.Run(async () =>
+    {
+        try
+        {
+            await PauseAsync(CancellationToken.None).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            if (Logger.IsEnabled(LogLevel.Error))
+                Logger.LogError(ex, "{ServiceName} pause (fire-and-forget) failed: {Error}", ServiceName, ex.Message);
+        }
+    });
+
+    /// <summary>
+    /// Resumes the hosted service.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>Resuming will only be performed where the current <see cref="Status"/> is <see cref="ServiceStatus.Paused"/>.
+    /// <para>The <see cref="OnResumeAsync(CancellationToken)"/> is responsible for updating the <see cref="Status"/>.</para></remarks>
+    public async Task ResumeAsync(CancellationToken cancellationToken)
+    {
+        if (!ArePauseAndResumeSupported)
+            throw new NotSupportedException($"{ServiceName} does not support pausing and resuming.");
+
+        lock (SyncLock)
+        { 
+            if (!Status.CanResume)
+                return;
+
+            Status = ServiceStatus.Resuming;
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} resuming.", ServiceName);
+        }
+
+        await OnResumeAsync(cancellationToken).ConfigureAwait(false);
+
+        lock (SyncLock)
+        {
+            if (Status == ServiceStatus.Resuming)
+            {
+                Status = ServiceStatus.Running;
+
+                if (Logger.IsEnabled(LogLevel.Information))
+                    Logger.LogInformation("{ServiceName} resumed.", ServiceName);
+            }
+        }
+    }
+
+    /// <summary>
+    /// A hosted service resume has been requested.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The <see cref="Status"/> will automatically be set to <see cref="ServiceStatus.Resuming"/> prior to execution. It will then be automatically set to <see cref="ServiceStatus.Running"/> post execution
+    /// where the <see cref="Status"/> is still <see cref="ServiceStatus.Resuming"/>.</remarks>
+    protected virtual Task OnResumeAsync(CancellationToken cancellationToken) => throw new NotImplementedException($"Where pause and resume are supported then the {nameof(OnResumeAsync)} method must be implemented.");
+
+    /// <summary>
+    /// Initiates a <see cref="ResumeAsync(CancellationToken)"/> without waiting for completion (fire-and-forget).
+    /// </summary>
+    /// <remarks>Use this method only when calling from likes of API endpoints or in loops where you need an immediate return.</remarks>
+    public void Resume() => _ = Task.Run(async () =>
+    {
+        try
+        {
+            await ResumeAsync(CancellationToken.None).ConfigureAwait(false);
+        }
+        catch (Exception ex)
+        {
+            if (Logger.IsEnabled(LogLevel.Error))
+                Logger.LogError(ex, "{ServiceName} resume (fire-and-forget) failed: {Error}", ServiceName, ex.Message);
+        }
+    });
+
+    /// <inheritdoc/>
+    /// <remarks>A stop will always be executed regardless of current <see cref="Status"/>.</remarks>
+    public async Task StopAsync(CancellationToken cancellationToken)
+    {
+        lock (SyncLock)
+        {
+            if (Status.IsStop)
+
+            Status = ServiceStatus.Stopping;
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} stop requested.", ServiceName);
+        }
+
+        await OnStopAsync(cancellationToken);
+
+        lock (SyncLock)
+        {
+            Status = ServiceStatus.Stopped;
+            if (Logger.IsEnabled(LogLevel.Information))
+                Logger.LogInformation("{ServiceName} stopped.", ServiceName);
+        }
+    }
+
+    /// <summary>
+    /// A hosted service stop has been requested.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>The <see cref="Status"/> will automatically be set to <see cref="ServiceStatus.Stopping"/> prior to execution. It will then be automatically set to <see cref="ServiceStatus.Stopped"/> post execution.</remarks>
+    protected abstract Task OnStopAsync(CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Provides an opportunity to override the health status reporting.
+    /// </summary>
+    /// <param name="data">The status data.</param>
+    /// <returns>The <see cref="HealthCheckResult"/>.</returns>
+    protected abstract HealthCheckResult OnReportHealthStatus(Dictionary<string, object> data);
+
+    /// <summary>
+    /// Dispose of resources.
+    /// </summary>
+    public void Dispose()
+    {
+        if (Interlocked.Exchange(ref _disposed, 1) == 0)
+        {
+            lock (SyncLock)
+            {
+                Status = ServiceStatus.Stopped;
+            }
+
+            Dispose(true);
+        }
+
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Releases the unmanaged resources used by the <see cref="TimerHostedServiceBase"/> and optionally releases the managed resources.
+    /// </summary>
+    /// <param name="disposing"><see langword="true"/> to release both managed and unmanaged resources; <see langword="false"/> to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing) { }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostedServiceHealthCheck.cs b/src/CoreEx/Hosting/HostedServiceHealthCheck.cs
new file mode 100644
index 00000000..e6ea2034
--- /dev/null
+++ b/src/CoreEx/Hosting/HostedServiceHealthCheck.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Provides an <see cref="IHealthCheck"/> for a <see cref="HostedServiceBase"/> reporting its <see cref="HostedServiceBase.Status"/>.
+/// </summary>
+/// <remarks>The <see cref="Data"/> indicates current state; assumes healthy where reported.</remarks>
+public sealed class HostedServiceHealthCheck : IHealthCheck
+{
+    private volatile Dictionary<string, object>? _data;
+
+    /// <summary>
+    /// Gets or sets the last updated health check data.
+    /// </summary>
+    /// <remarks>An initial <c>null</c> value indicates unhealthy as no status has been reported.</remarks>
+    public Dictionary<string, object>? Data { get => _data; set => _data = value.ThrowIfNull(nameof(Data)); }
+
+    /// <summary>
+    /// Gets or sets the latest <see cref="HealthCheckResult"/> to report.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="HealthCheckResult.Unhealthy"/>; no health check reported.</remarks>
+    public HealthCheckResult Result { get; set; } = HealthCheckResult.Unhealthy("No health check reported.");
+
+    /// <inheritdoc/>
+    public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default) => Task.FromResult(Result);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostedServiceInvoker.cs b/src/CoreEx/Hosting/HostedServiceInvoker.cs
new file mode 100644
index 00000000..29419a87
--- /dev/null
+++ b/src/CoreEx/Hosting/HostedServiceInvoker.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Provides the <see cref="IHostedService"/> invoker.
+/// </summary>
+[InvokerName("CoreEx.Hosting.HostedService")]
+public class HostedServiceInvoker : InvokerBase<IHostedService>
+{
+    /// <inheritdoc/>
+    /// <remarks>Tracing is disabled for this invoker as the <see cref="IHostedService"/> is typically used for background processing and therefore may be long-running, or high-frequency, and therefore not ideal for tracing.</remarks>
+    public override bool IsTracingDisabled => true;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/HostedServiceManager.cs b/src/CoreEx/Hosting/HostedServiceManager.cs
new file mode 100644
index 00000000..ce6c3c67
--- /dev/null
+++ b/src/CoreEx/Hosting/HostedServiceManager.cs
@@ -0,0 +1,117 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Provides management capabilities for <see cref="HostedServiceBase"/> instances.
+/// </summary>
+/// <remarks>The <see cref="HostedServiceBase"/> instances must also be registered as a <see cref="IHostedService"/>.</remarks>
+public sealed class HostedServiceManager(IServiceProvider serviceProvider)
+{
+    private readonly IServiceProvider _serviceProvider = serviceProvider.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the pre-check function that is invoked prior to any operation.
+    /// </summary>
+    /// <remarks>This function can be used to perform any necessary validation, such as authorization, before operations are executed on a hosted service. The <see cref="string"/> parameter is the selected <see cref="HostedServiceBase.ServiceName"/>
+    /// where specified; otherwise, <see cref="string.Empty"/> represents <i>All</i>.</remarks>
+    public Func<string, CancellationToken, Task<Result>> PreCheckAsync { get; set => field = value.ThrowIfNull(); } = (_, _) => Result.SuccessTask;
+
+    /// <summary>
+    /// Gets the status of all registered hosted services.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A dictionary of hosted service and corresponding service pairs.</returns>
+    public Task<Result<Dictionary<string, ServiceStatus>>> GetAllStatusesAsync(CancellationToken cancellationToken = default)
+        => PreCheckAsync(string.Empty, cancellationToken)
+            .ThenAs(() =>
+             {
+                 var dict = new Dictionary<string, ServiceStatus>();
+                 foreach (var service in GetAllHostedServices())
+                 {
+                     if (!dict.TryAdd(service.ServiceName, service.Status))
+                         return Result.ValidationError($"The hosted service with key '{service.ServiceName}' is ambiguous; more than one exists with name.");
+                 }
+
+                 return Result<Dictionary<string, ServiceStatus>>.Ok(dict);
+             });
+
+    /// <summary>
+    /// Pauses all registered hosted services.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is a fire-and-forget operation and each pause will occur in the background; therefore, it may immediately appear as if the status did not change.</remarks>
+    public Task<Result> PauseAllAsync(CancellationToken cancellationToken = default)
+        => PreCheckAsync(string.Empty, cancellationToken)
+            .Then(() =>
+            {
+                foreach (var service in GetAllHostedServices())
+                    service.Pause();
+            });
+
+    /// <summary>
+    /// Resumes all registered hosted services.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is a fire-and-forget operation and each resume will occur in the background; therefore, it may immediately appear as if the status did not change.</remarks>
+    public Task<Result> ResumeAllAsync(CancellationToken cancellationToken = default)
+        => PreCheckAsync(string.Empty, cancellationToken)
+            .Then(() =>
+            {
+                foreach (var service in GetAllHostedServices())
+                    service.Resume();
+            });
+
+    /// <summary>
+    /// Gets all the registered hosted services, optionally filtered by the specified service name.
+    /// </summary>
+    private IEnumerable<HostedServiceBase> GetAllHostedServices(string? serviceName = null)
+        => _serviceProvider.GetServices<IHostedService>().OfType<HostedServiceBase>().Where(s => serviceName is null || s.ServiceName == serviceName);
+
+    /// <summary>
+    /// Gets the status of the specified hosted service.
+    /// </summary>
+    /// <param name="serviceKey">The unique hosted service key.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="ServiceStatus"/>.</returns>
+    public Task<Result<ServiceStatus>> GetStatusAsync(string serviceKey, CancellationToken cancellationToken = default)
+        => GetHostedServiceAsync(serviceKey, cancellationToken)
+            .ThenAs(hs => hs.Status);
+
+    /// <summary>
+    /// Initiates a pause for the specified hosted service.
+    /// </summary>
+    /// <param name="serviceKey">The unique hosted service key.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is a fire-and-forget operation and will occur in the background; therefore, it may immediately appear as if the status did not change.</remarks>
+    public Task<Result> PauseAsync(string serviceKey, CancellationToken cancellationToken = default)
+        => GetHostedServiceAsync(serviceKey, cancellationToken)
+            .ThenAs(hs => hs.Pause());
+
+    /// <summary>
+    /// Initiates a resume for the specified hosted service.
+    /// </summary>
+    /// <param name="serviceKey">The unique hosted service key.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>This is a fire-and-forget operation and will occur in the background; therefore, it may immediately appear as if the status did not change.</remarks>
+    public Task<Result> ResumeAsync(string serviceKey, CancellationToken cancellationToken = default)
+        => GetHostedServiceAsync(serviceKey, cancellationToken)
+            .ThenAs(hs => hs.Resume());
+
+    /// <summary>
+    /// Gets the <see cref="HostedServiceBase"/> for the specified <paramref name="serviceKey"/>.
+    /// </summary>
+    /// <param name="serviceKey">The unique hosted service key.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="HostedServiceBase"/>.</returns>
+    private Task<Result<HostedServiceBase>> GetHostedServiceAsync(string serviceKey, CancellationToken cancellationToken)
+        => PreCheckAsync(serviceKey.ThrowIfNullOrEmpty(), cancellationToken)
+            .ThenAs(() =>
+            {
+                var hsc = GetAllHostedServices(serviceKey).ToArray();
+                return hsc.Length switch
+                {
+                    0 => Result.NotFoundError($"The hosted service with key '{serviceKey}' is not registered."),
+                    1 => Result.Ok(hsc[0]),
+                    _ => Result.ValidationError($"The hosted service with key '{serviceKey}' is ambiguous; more than one exists with name.")
+                };
+            });
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/IHostSettings.cs b/src/CoreEx/Hosting/IHostSettings.cs
new file mode 100644
index 00000000..555cc40b
--- /dev/null
+++ b/src/CoreEx/Hosting/IHostSettings.cs
@@ -0,0 +1,29 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Enables standardized runtime/host settings.
+/// </summary>
+public interface IHostSettings
+{
+    /// <summary>
+    /// Gets the solution name.
+    /// </summary>
+    string SolutionName { get; }
+
+    /// <summary>
+    /// Gets the domain name. 
+    /// </summary>
+    string DomainName { get; }
+
+    /// <summary>
+    /// Gets the environment name.
+    /// </summary>
+    /// <remarks>This is automatically set by the following environment variables: <c>COREEX_ENVIRONMENT</c> (primary) or <c>ASPNETCORE_ENVIRONMENT</c> (secondary).</remarks>
+    string EnvironmentName { get; }
+
+    /// <summary>
+    /// Gets the source <see cref="Uri"/>.
+    /// </summary>
+    /// <remarks>This typically represents the base application/service URL used for the likes of event source.</remarks>
+    Uri? Source { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/IHostStartup.cs b/src/CoreEx/Hosting/IHostStartup.cs
deleted file mode 100644
index 6990b6a7..00000000
--- a/src/CoreEx/Hosting/IHostStartup.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Enables standardized host startup capabilities
-    /// </summary>
-    public interface IHostStartup
-    {
-        /// <summary>
-        /// Sets up the configuration for the remainder of the build process and application.
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="config"></param>
-        /// <remarks>This is intended to be invoked by the <see cref="IHostBuilder.ConfigureAppConfiguration(System.Action{HostBuilderContext, IConfigurationBuilder})"/>.</remarks>
-        void ConfigureAppConfiguration(HostBuilderContext context, IConfigurationBuilder config);
-
-        /// <summary>
-        /// Sets up the configuration for the builder itself to initialize the <see cref="IHostEnvironment"/>.
-        /// </summary>
-        /// <param name="config">The <see cref="IConfigurationBuilder"/>.</param>
-        /// <remarks>This is intended to be invoked by the <see cref="IHostBuilder.ConfigureHostConfiguration(System.Action{IConfigurationBuilder})"/>.</remarks>
-        void ConfigureHostConfiguration(IConfigurationBuilder config);
-
-        /// <summary>
-        /// Adds services to the container.
-        /// </summary>
-        /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        /// <remarks>This is intended to be invoked by the <see cref="IHostBuilder.ConfigureServices(System.Action{HostBuilderContext, IServiceCollection})"/>.</remarks>
-        void ConfigureServices(IServiceCollection services);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/IServiceSynchronizer.cs b/src/CoreEx/Hosting/IServiceSynchronizer.cs
deleted file mode 100644
index 818791ef..00000000
--- a/src/CoreEx/Hosting/IServiceSynchronizer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Enables concurrency management to synchronize the underlying execution.
-    /// </summary>
-    /// <remarks>The <see cref="Enter{T}"/> must acquire and hold a lock until the corresponding <see cref="Exit"/> is invoked. Where a lock is unable to be acquired then a <c>false</c> must be returned to advise the caller
-    /// that processing can not occur at this time as another process is currently executing. A result of <c>true</c> indicates the lock was acquired and will be held until the corresponding <see cref="Exit"/>.</remarks>
-    public interface IServiceSynchronizer : IDisposable
-    {
-        /// <summary>
-        /// Acquires a lock on the specified <typeparamref name="T"/> and optional <paramref name="name"/>.
-        /// </summary>
-        /// <returns><c>true</c> if the lock is aquired; otherwise, <c>false</c>.</returns>
-        /// <typeparam name="T">The <see cref="Type"/> to lock.</typeparam>
-        bool Enter<T>(string? name = null);
-
-        /// <summary>
-        /// Releases the lock on the specified <typeparamref name="T"/> and optional <paramref name="name"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to unlock.</typeparam>
-        void Exit<T>(string? name = null);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/README.md b/src/CoreEx/Hosting/README.md
index 8862ec52..878617d4 100644
--- a/src/CoreEx/Hosting/README.md
+++ b/src/CoreEx/Hosting/README.md
@@ -1,67 +1,47 @@
-# CoreEx.Hosting
+# CoreEx.Hosting
 
-The `CoreEx.Hosting` namespace provides additional [hosted service (worker)](https://learn.microsoft.com/en-us/dotnet/core/extensions/workers) runtime capabilities.
+> Provides base classes for timer-driven and synchronized hosted services, `HostSettings` for standardized host configuration, and `WorkOrchestrator` for tracking long-running distributed work state with pluggable storage.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Hosting` addresses two distinct but related concerns: running background work reliably within an .NET hosted-service model, and tracking the state of long-running distributed operations that outlive a single request or host invocation.
 
-To enable improved hosted service consistency and testability, plus additional [`IHostedService`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.hosting.ihostedservice) runtime capabilities.
+The hosted service base classes (`TimerHostedServiceBase`, `SynchronizedTimerHostedServiceBase`) provide a consistent foundation for background polling workers — handling pause/resume, error-interval back-off, no-op mode for tests, DI-scoped execution, and health check integration via `HostedServiceHealthCheck`. `HostSettings` standardizes how a host, including ASP.NET Core, exposes its solution name, domain name, environment, and source URI to the rest of the application.
 
-<br/>
+`WorkOrchestrator` tracks the lifecycle of explicitly managed long-running work items (think: async job processing, background import, orchestration hand-off). Each work item has a `WorkState` record persisted via a pluggable `IWorkProvider`, with a `WorkStatus` lifecycle (Created → Started → Indeterminate/Completed/Failed/Abandoned) and automatic expiry.
 
-## Host startup
+## Key capabilities
 
-To improve consistency and testability the [`IHostStartup`](./IHostStartup.cs) and [`HostStartup`](./HostStartup) implementations are provided. By seperating out the key [Dependency Injection (DI)](https://learn.microsoft.com/en-us/dotnet/core/extensions/dependency-injection) configuration from the underlying host configuration enables the DI configuration to be tested in isolation against a _test-host_ where applicable.
+- ⏱️ **Timer hosted service**: `TimerHostedServiceBase` runs `OnExecuteAsync` on a configurable interval with randomized first-start staggering, error back-off interval, and pause-on-exception support.
+- 🔒 **Synchronized timer hosted service**: `SynchronizedTimerHostedServiceBase` wraps `TimerHostedServiceBase` with an `ISynchronizer` lock, ensuring only one instance across a multi-host deployment executes at a time.
+- ♥ **Health check integration**: `HostedServiceHealthCheck` reports `ServiceStatus` as a named health check entry; `HostedServiceManager` aggregates multiple service statuses for a single health endpoint.
+- ⚙️ **Host settings**: `HostSettings` standardizes solution name, domain name, environment name, and source URI — read from `IConfiguration` or provided explicitly — for use by caching, event naming, and logging.
+- 📋 **Work orchestration**: `WorkOrchestrator` manages the create → start → complete/fail lifecycle for long-running work items, with automatic expiry and pluggable `IWorkProvider` storage.
+- 🗄️ **Cache-backed work provider**: `HybridCacheWorkProvider` implements `IWorkProvider` using `IHybridCache`, enabling work state persistence without requiring a dedicated database.
+- 🔗 **Distributed synchronization**: `ISynchronizer` / `HybridCacheSynchronizer` provide a distributed advisory lock used by `SynchronizedTimerHostedServiceBase` to prevent concurrent execution across host replicas.
 
-The following is an example of a `HostStartup` implementation.
+## Key types
 
-```csharp
-public class Startup : HostStartup
-{
-    public override void ConfigureAppConfiguration(HostBuilderContext context, IConfigurationBuilder config)
-    {
-        config.AddEnvironmentVariables("Prefix_");
-    }
+| Type | Description |
+|------|-------------|
+| _[`HostedServiceBase`](./HostedServiceBase.cs)_ | Abstract base `IHostedService` providing `ServiceStatus` tracking, health check registration, no-op mode (via `--no-op-hosted-services` arg), and scoped DI execution. |
+| _[`TimerHostedServiceBase`](./TimerHostedServiceBase.cs)_ | Abstract timer-driven hosted service with configurable `Interval`, `FirstInterval`, error back-off, and pause/resume support. |
+| _[`SynchronizedTimerHostedServiceBase`](./SynchronizedTimerHostedServiceBase.cs)_ | Abstract timer hosted service that acquires an `ISynchronizer` lock before each execution to prevent concurrent runs across replicas. |
+| **[`HostedServiceHealthCheck`](./HostedServiceHealthCheck.cs)** | `IHealthCheck` implementation that reports the `ServiceStatus` of a registered `HostedServiceBase`. |
+| **[`HostedServiceManager`](./HostedServiceManager.cs)** | Manages registration of multiple hosted services and provides aggregated status and health-check access. |
+| **[`HostSettings`](./HostSettings.cs)** | Standardized host configuration: `SolutionName`, `DomainName`, `EnvironmentName`, `Source` URI. Created via `HostSettings.Create(IConfiguration, ...)`. |
+| **[`WorkOrchestrator`](./Work/WorkOrchestrator.cs)** | Tracks the lifecycle of long-running work items: create, start, mark indeterminate/complete/failed/abandoned, with automatic expiry. |
+| **[`WorkState`](./Work/WorkState.cs)** | Persisted record for a single work item: `Id`, `TypeName`, `Key`, `WorkStatus`, `Result`, `Reason`, trace parent/state, and timestamps. |
+| **[`HybridCacheWorkProvider`](./Work/HybridCacheWorkProvider.cs)** | `IWorkProvider` implementation backed by `IHybridCache`, storing `WorkState` entries with configurable expiry. |
+| **[`HybridCacheSynchronizer`](./Synchronization/HybridCacheSynchronizer.cs)** | `ISynchronizer` implementation using `IHybridCache` as a distributed advisory lock store. |
+| **[`ServiceStatus`](./ServiceStatus.cs)** | Enum representing hosted service lifecycle: `Initializing`, `NoOp`, `Starting`, `Sleeping`, `Running`, `Paused`, `Stopping`, `Stopped`. |
+| **[`WorkStatus`](./Work/WorkStatus.cs)** | Enum representing work item lifecycle: `Created`, `Started`, `Indeterminate`, `Completed`, `Failed`, `Abandoned`. |
+| [`IHostSettings`](./IHostSettings.cs) | Interface exposing `SolutionName`, `DomainName`, `EnvironmentName`, and `Source` from `HostSettings`. |
+| [`IWorkProvider`](./Work/IWorkProvider.cs) | Pluggable storage interface for `WorkState` persistence: get, create, update. |
+| [`ISynchronizer`](./Synchronization/ISynchronizer.cs) | Distributed advisory lock interface: `EnterAsync<T>` / `ExitAsync<T>` for type-and-name-scoped locking. |
 
-    /// <inheritdoc/>
-    public override void ConfigureServices(IServiceCollection services)
-    {
-        services
-            .AddSettings()
-            .AddExecutionContext()
-            .AddJsonSerializer();
-	}
-}
-```
+## Related Namespaces
 
-The following is an example of a `Program` implementation that initiates a host and uses the [`ConfigureHostStartup`](HostStartupExtensions.cs) extension method to integrate the `Startup` functionality. This has an added advantage of being able to add specific startup capabilities directly to a host that should not be available to the _test-host_ (as demonstrated by `ConfigureFunctionsWorkerDefaults`).
-
-```csharp
-new HostBuilder()
-    .ConfigureFunctionsWorkerDefaults()
-    .ConfigureHostStartup<Startup>()
-    .Build().Run();
-```
-
-<br/>
-
-## Hosted services
-
-The following additional [`IHostedService`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.hosting.ihostedservice) implementations are provided.
-
-Class | Description
--|-
-[`TimerHostedServiceBase`](./TimerHostedServiceBase.cs) | Provides an `IHostedService` implementation that performs _work_ at a specified `Interval`.
-[`SynchronizedTimerHostedServiceBase`](./SynchronizedTimerHostedServiceBase.cs) | Extends `TimerHostedServiceBase` adding [concurrency synchronization](#Concurrency-synchronization) to ensure only a single host can perform _work_ at a time (synchronously).
-
-<br/>
-
-## Concurrency synchronization
-
-To ensure only a single host can perform _work_ at a time concurrency implementation is required; this is enabled by implementing the `Enter` and `Exit` methods defined by the [`IServiceSynchronizer`](./IServiceSynchronizer.cs) interface. The following implementations are provided.
-
-Class | Description
--|-
-[`ConcurrentSynchronizer`](./ConcurrentSynchronizer.cs) | Performs _no_ synchronization in that `Enter` will always return `true` resulting in concurrent execution.
-[`FileLockSynchronizer`](./FileLockSynchronizer.cs) | Performs synchronization by taking an exclusive lock on a file.
\ No newline at end of file
+- **[`CoreEx`](../README.md)** - `ExecutionContext` is created per hosted service invocation; `HostSettings` is consumed by `DefaultCacheKeyProvider` and event naming.
+- **[`CoreEx.Caching`](../Caching/README.md)** - `IHybridCache` is the backing store for both `HybridCacheWorkProvider` and `HybridCacheSynchronizer`.
+- **[`CoreEx.Invokers`](../Invokers/README.md)** - `HostedServiceInvoker` and `WorkOrchestratorInvoker` use the invoker tracing pipeline to emit OpenTelemetry spans for hosted service and work executions.
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/ServiceBase.cs b/src/CoreEx/Hosting/ServiceBase.cs
deleted file mode 100644
index c69281d3..00000000
--- a/src/CoreEx/Hosting/ServiceBase.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Represents the base class for a self-orchestrated service to <see cref="ExecuteAsync(CancellationToken)"/> for a specified <see cref="MaxIterations"/>.
-    /// </summary>
-    public abstract class ServiceBase
-    {
-        private string? _name;
-        private int? _maxIterations;
-
-        /// <summary>
-        /// The configuration settings name for <see cref="MaxIterations"/>.
-        /// </summary>
-        public const string MaxIterationsName = nameof(MaxIterations);
-
-        /// <summary>
-        /// Gets or sets the default used where the specified <see cref="MaxIterations"/> is less than or equal to zero. Defaults to <b>one</b> iteration.
-        /// </summary>
-        public static int DefaultMaxIterations { get; set; } = 1;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServiceBase"/> class.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>; defaults to instance from the <paramref name="serviceProvider"/> where not specified.</param>
-        public ServiceBase(IServiceProvider serviceProvider, ILogger logger, SettingsBase? settings = null)
-        {
-            ServiceProvider = serviceProvider.ThrowIfNull(nameof(serviceProvider));
-            Logger = logger.ThrowIfNull(nameof(logger));
-            Settings = settings ?? ServiceProvider.GetService<SettingsBase>() ?? new DefaultSettings(ServiceProvider.GetRequiredService<IConfiguration>());
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IServiceProvider"/>.
-        /// </summary>
-        protected IServiceProvider ServiceProvider;
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        protected SettingsBase Settings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        protected ILogger Logger { get; }
-
-        /// <summary>
-        /// Gets the service name (used for the likes of configuration and logging).
-        /// </summary>
-        /// <remarks>Defaults to the <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
-        public virtual string ServiceName => _name ??= GetType().Name;
-
-        /// <summary>
-        /// Gets or sets the maximum number of iterations per execution.
-        /// </summary>
-        public virtual int MaxIterations
-        {
-            get => _maxIterations ?? DefaultMaxIterations;
-            set => _maxIterations = value <= 0 ? DefaultMaxIterations : value;
-        }
-
-        /// <summary>
-        /// <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> up to the specified number of <see cref="MaxIterations"/>.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each invocation of the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI) <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> that is passed for direct usage.</remarks>
-        public async Task ExecuteAsync(CancellationToken cancellationToken)
-        {
-            for (int i = 0; i < MaxIterations; i++)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                    return;
-
-                await ServiceInvoker.Current.InvokeAsync(this, async (_, cancellationToken) =>
-                {
-                    // Create a scope in which to perform the execution.
-                    using var scope = ServiceProvider.CreateScope();
-                    ExecutionContext.Reset();
-
-                    try
-                    {
-                        if (!await ExecuteAsync(scope.ServiceProvider, cancellationToken).ConfigureAwait(false))
-                            return;
-                    }
-                    catch (Exception ex)
-                    {
-                        if (ex is TaskCanceledException || (ex is AggregateException aex && aex.InnerException is TaskCanceledException))
-                            return;
-
-                        Logger.LogCritical(ex, "{ServiceName} failure as a result of an unexpected exception: {Error}", ServiceName, ex.Message);
-                        throw;
-                    }
-                }, cancellationToken).ConfigureAwait(false);
-            }
-        }
-
-        /// <summary>
-        /// Invoked to perform the per-iteration work.
-        /// </summary>
-        /// <param name="scopedServiceProvider">The scoped <see cref="IServiceProvider"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates to execute the next iteration (i.e. continue); otherwise, <c>false</c> to stop.</returns>
-        /// <remarks>Each invocation of the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI) <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> that is passed for direct usage.</remarks>
-        protected abstract Task<bool> ExecuteAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/ServiceInvoker.cs b/src/CoreEx/Hosting/ServiceInvoker.cs
deleted file mode 100644
index 0a71520f..00000000
--- a/src/CoreEx/Hosting/ServiceInvoker.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Provides the invocation wrapping for the service instances.
-    /// </summary>
-    public class ServiceInvoker : InvokerBase<object>
-    {
-        private static ServiceInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static ServiceInvoker Current => CoreEx.ExecutionContext.GetService<ServiceInvoker>() ?? (_default ??= new ServiceInvoker());
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/ServiceStatus.cs b/src/CoreEx/Hosting/ServiceStatus.cs
new file mode 100644
index 00000000..8533b450
--- /dev/null
+++ b/src/CoreEx/Hosting/ServiceStatus.cs
@@ -0,0 +1,58 @@
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Represents the status of a service; for example, <see cref="HostedServiceBase"/> and <see cref="TimerHostedServiceBase"/>.
+/// </summary>
+public enum ServiceStatus
+{
+    /// <summary>
+    /// Initializing, but not started.
+    /// </summary>
+    Initializing,
+
+    /// <summary>
+    /// No-op; i.e. the service has been explicitly requested to not perform any work.
+    /// </summary>
+    NoOp,
+
+    /// <summary>
+    /// Starting; i.e. the start has been initiated.
+    /// </summary>
+    Starting,
+
+    /// <summary>
+    /// Sleeping; the service is in between executions.
+    /// </summary>
+    Sleeping,
+
+    /// <summary>
+    /// Running; the service is executing work.
+    /// </summary>
+    Running,
+
+    /// <summary>
+    /// Pausing; i.e. the pause has been initiated.
+    /// </summary>
+    Pausing,
+
+    /// <summary>
+    /// Paused; the service is paused.
+    /// </summary>
+    Paused,
+
+    /// <summary>
+    /// Resuming; i.e. the resume has been initiated.
+    /// </summary>
+    /// <remarks>There is no <i>Resumed</i> status; should return to either <see cref="Sleeping"/> or <see cref="Running"/>.</remarks>
+    Resuming,
+
+    /// <summary>
+    /// Stopping; i.e. the stop has been initiated.
+    /// </summary>
+    Stopping,
+
+    /// <summary>
+    /// Stopped; the service is stopped.
+    /// </summary>
+    Stopped
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Synchronization/HybridCacheSynchronizer.cs b/src/CoreEx/Hosting/Synchronization/HybridCacheSynchronizer.cs
new file mode 100644
index 00000000..82dafbd2
--- /dev/null
+++ b/src/CoreEx/Hosting/Synchronization/HybridCacheSynchronizer.cs
@@ -0,0 +1,81 @@
+namespace CoreEx.Hosting.Synchronization;
+
+/// <summary>
+/// Provides an <see cref="IHybridCache"/>-based <see cref="ISynchronizer"/>.
+/// </summary>
+/// <param name="cache">The <see cref="IHybridCache"/>.</param>
+public sealed class HybridCacheSynchronizer(IHybridCache cache) : ISynchronizer
+{
+    private readonly IHybridCache _cache = cache.ThrowIfNull();
+    private readonly ConcurrentDictionary<string, (HybridCacheEntryOptions Options, string UId)> _options = new();
+
+    /// <summary>
+    /// Gets or sets the optional (default) <see cref="HybridCacheEntryOptions"/>.
+    /// </summary>
+    public HybridCacheEntryOptions? Options { get; set; }
+
+    /// <summary>
+    /// Indicates whether instrumentation is enabled.
+    /// </summary>
+    /// <remarks><para>Default is <see langword="false"/>.</para>
+    /// A synchronizer is likely to be used frequently and as such cause instrumentation noise; therefore, is disabled by default.</remarks>
+    public bool IsInstrumentationEnabled { get; set; } = false;
+
+    /// <inheritdoc/>
+    public async Task<bool> EnterAsync<T>(string? name = null, CancellationToken cancellationToken = default)
+    {
+        var key = GetFullName<T>(name);
+        var uid = Runtime.NewId();
+        var opt = Options ?? HybridCacheEntryOptions.CreateFor<T>();
+
+        // Copy the options and add a tag with the unique identifier.
+        opt = (opt with { }).WithTags(uid);
+
+        using (SuppressInstrumentationScope.Begin(!IsInstrumentationEnabled))
+        {
+            // Attempt to add the value; if it already exists, then another process has entered.
+            var cuid = await _cache.GetOrCreateByKeyAsync(key, _ =>
+            {
+                _options.TryAdd(key, (opt, uid));
+                return Task.FromResult(uid);
+            }, opt, cancellationToken);
+
+            return cuid == uid;
+        }
+    }
+
+    /// <inheritdoc/>
+    public async Task ExitAsync<T>(string? name = null, CancellationToken cancellationToken = default)
+    {
+        var key = GetFullName<T>(name);
+        if (_options.TryRemove(key, out var val))
+        {
+            using (SuppressInstrumentationScope.Begin(!IsInstrumentationEnabled))
+            {
+                // Remove the cache entry by the unique tag. If another process has entered or entry has expired, there is nothing we can do about it at this point.
+                await _cache.RemoveByTagAsync(val.UId, val.Options, cancellationToken);
+            }
+
+            return;
+        }
+
+        throw new InvalidOperationException($"The synchronizer for '{key}' has not been entered by this process.");
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask DisposeAsync()
+    {
+        // Clean-up any remaining owned locks using the uid; there should be none where all have been properly exited.
+        foreach (var entry in _options)
+        {
+            await _cache.RemoveByTagAsync(entry.Value.UId, entry.Value.Options);
+        }
+
+        _options.Clear();
+    }
+
+    /// <summary>
+    /// Gets the full name.
+    /// </summary>
+    private static string GetFullName<T>(string? name) => $"{typeof(T).Name}{(name == null ? "" : $":{name}")}";
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Synchronization/ISynchronizer.cs b/src/CoreEx/Hosting/Synchronization/ISynchronizer.cs
new file mode 100644
index 00000000..b43cbe81
--- /dev/null
+++ b/src/CoreEx/Hosting/Synchronization/ISynchronizer.cs
@@ -0,0 +1,26 @@
+namespace CoreEx.Hosting.Synchronization;
+
+/// <summary>
+/// Enables concurrency management to synchronize the underlying execution.
+/// </summary>
+/// <remarks>The <see cref="EnterAsync{T}"/> must acquire and hold a lock until the corresponding <see cref="ExitAsync"/> is invoked. Where a lock is unable to be acquired then a <see langword="false"/> must be returned to advise the caller
+/// that processing can not occur at this time as another process is currently executing. A result of <see langword="true"/> indicates the lock was acquired and will be held until the corresponding <see cref="ExitAsync"/>.</remarks>
+public interface ISynchronizer : IAsyncDisposable
+{
+    /// <summary>
+    /// Acquires a lock on the specified <typeparamref name="T"/> and optional <paramref name="name"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to lock.</typeparam>
+    /// <param name="name">The optional name to differentiate the lock.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> where the lock is aquired; otherwise,<see langword="false"/>.</returns>
+    Task<bool> EnterAsync<T>(string? name = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Releases the lock on the specified <typeparamref name="T"/> and optional <paramref name="name"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to unlock.</typeparam>
+    /// <param name="name">The optional name to differentiate the lock.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task ExitAsync<T>(string? name = null, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/SynchronizedTimerHostedServiceBase.cs b/src/CoreEx/Hosting/SynchronizedTimerHostedServiceBase.cs
index 40e34fe9..652037fe 100644
--- a/src/CoreEx/Hosting/SynchronizedTimerHostedServiceBase.cs
+++ b/src/CoreEx/Hosting/SynchronizedTimerHostedServiceBase.cs
@@ -1,68 +1,52 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Hosting;
 
-using CoreEx.Configuration;
-using CoreEx.Hosting.HealthChecks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting
+/// <summary>
+/// Extends the <see cref="TimerHostedServiceBase"/> and adds <see cref="ISynchronizer"/> support to the <see cref="TimerHostedServiceBase.OnExecuteAsync(CoreEx.ExecutionContext, CancellationToken)"/> to manage synchronized concurrency of execution.
+/// </summary>
+/// <typeparam name="TSynchronizer">The <see cref="ISynchronizer"/> <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The implementing (self) <see cref="Type"/>; also used for synchronization.</typeparam>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+/// <remarks>Each timer-based invocation of the <see cref="SynchronizedExecuteAsync(ExecutionContext, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
+/// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> and <see cref="ISynchronizer"/>. As the <see cref="ISynchronizer"/> may be scoped, it will be automatically resolved from the <i>scoped</i> <paramref name="serviceProvider"/> before use.
+/// <para>A <see cref="TimerHostedServiceBase.OneOffIntervalAdjust(TimeSpan)"/> is provided to enable a one-off change to the timer where required.</para></remarks>
+public abstract class SynchronizedTimerHostedServiceBase<TSynchronizer, TSelf>(IServiceProvider serviceProvider, ILogger logger)
+    : TimerHostedServiceBase(serviceProvider, logger) where TSynchronizer : class, ISynchronizer where TSelf : SynchronizedTimerHostedServiceBase<TSynchronizer, TSelf>
 {
     /// <summary>
-    /// Extends the <see cref="TimerHostedServiceBase"/> and adds <see cref="IServiceSynchronizer"/> to the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> to manage concurrency of execution.
+    /// Gets or sets the optional name to differentiate the synchronization lock.
     /// </summary>
-    /// <typeparam name="TSync">The <see cref="Type"/> in which to perform the <see cref="Synchronizer"/> <see cref="IServiceSynchronizer.Enter{T}(string?)"/> for.</typeparam>
-    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>; defaults to instance from the <paramref name="serviceProvider"/> where not specified.</param>
-    /// <param name="synchronizer">The <see cref="IServiceSynchronizer"/>; defaults to <see cref="ConcurrentSynchronizer"/> where not specified.</param>
-    /// <param name="healthCheck">The optional <see cref="TimerHostedServiceHealthCheck"/> to report health.</param>
-    public abstract class SynchronizedTimerHostedServiceBase<TSync>(IServiceProvider serviceProvider, ILogger logger, SettingsBase? settings = null, IServiceSynchronizer? synchronizer = null, TimerHostedServiceHealthCheck? healthCheck = null) 
-        : TimerHostedServiceBase(serviceProvider, logger, settings, healthCheck)
+    protected string? SynchronizerName { get; set; }
+
+    /// <inheritdoc/>
+    protected sealed override async Task<bool> OnExecuteAsync(ExecutionContext executionContext, CancellationToken cancellationToken)
     {
-        /// <summary>
-        /// Gets the <see cref="IServiceSynchronizer"/>.
-        /// </summary>
-        protected IServiceSynchronizer Synchronizer { get; } = synchronizer ?? new ConcurrentSynchronizer();
+        var synchronizer = ExecutionContext.GetRequiredService<TSynchronizer>();
 
-        /// <summary>
-        /// Gets or sets the optional synchronization name (used by <see cref="IServiceSynchronizer.Enter{T}(string?)"/> and <see cref="IServiceSynchronizer.Exit{T}(string?)"/>).
-        /// </summary>
-        protected string? SynchronizationName { get; set; }
+        // Attempt to enter the synchronizer; if not successful, simply exit.
+        var entered = await synchronizer.EnterAsync<TSelf>(SynchronizerName, cancellationToken).ConfigureAwait(false);
+        if (!entered)
+            return false;
 
-        /// <summary>
-        /// Triggered to perform the work as a result of the <see cref="TimerHostedServiceBase.Interval"/> is a synchronized manner.
-        /// </summary>
-        /// <param name="scopedServiceProvider">The scoped <see cref="IServiceProvider"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks><b>Note:</b> do <b>not</b> override this method as this implements the sychronization management; use <see cref="SynchronizedExecuteAsync(IServiceProvider, CancellationToken)"/> to implement desired functionality.
-        /// <para>Each timer-based invocation of the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
-        /// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> that is passed for direct usage.</para></remarks>
-        protected async override Task ExecuteAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken)
+        // Execute within the synchronizer; and exit once complete (regardless of outcome).
+        try
         {
-            // Ensure we have synchronized control; if not exit immediately.
-            if (!Synchronizer.Enter<TSync>(SynchronizationName))
-                return;
-
-            try
-            {
-                await SynchronizedExecuteAsync(scopedServiceProvider, cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                Synchronizer.Exit<TSync>(SynchronizationName);
-            }
+            return await SynchronizedExecuteAsync(executionContext, cancellationToken).ConfigureAwait(false);
+        }
+        finally
+        {
+            await synchronizer.ExitAsync<TSelf>(SynchronizerName, cancellationToken).ConfigureAwait(false);
         }
-
-        /// <summary>
-        /// Triggered to perform the work as a result of the <see cref="TimerHostedServiceBase.Interval"/> with the context of a <see cref="IServiceSynchronizer.Enter{T}(string?)"/> and <see cref="IServiceSynchronizer.Exit{T}(string?)"/>.
-        /// </summary>
-        /// <param name="scopedServiceProvider">The scoped <see cref="IServiceProvider"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each timer-based invocation of the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
-        /// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> that is passed for direct usage.</remarks>
-        protected abstract Task SynchronizedExecuteAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken);
     }
+
+    /// <summary>
+    /// Triggered to perform the work as a result of the <see cref="TimerHostedServiceBase.Interval"/> within a <i>scoped</i> <see cref="ExecutionContext"/> and synchronized via the <see cref="ISynchronizer"/>.
+    /// </summary>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> indicates that the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> should be re-executed immediately (without an interval); otherwise, 
+    /// <see langword="false"/> to re-execute after the configured <see cref="TimerHostedServiceBase.Interval"/>.</returns>
+    /// <remarks>Each timer-based invocation of the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
+    /// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> and corresponding <see cref="ExecutionContext"/>.</remarks>
+    protected abstract Task<bool> SynchronizedExecuteAsync(ExecutionContext executionContext, CancellationToken cancellationToken);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/TimerHostedServiceBase.cs b/src/CoreEx/Hosting/TimerHostedServiceBase.cs
index 33848147..a30efe27 100644
--- a/src/CoreEx/Hosting/TimerHostedServiceBase.cs
+++ b/src/CoreEx/Hosting/TimerHostedServiceBase.cs
@@ -1,343 +1,519 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Hosting.HealthChecks;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting
+namespace CoreEx.Hosting;
+
+/// <summary>
+/// Represents a base class for an <see cref="IHostedService"/> based on an <see cref="Interval"/> to <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> work.
+/// </summary>
+/// <remarks>Each timer-based invocation of the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
+/// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see>.
+/// <para>A <see cref="OneOffIntervalAdjust(TimeSpan)"/> is provided to enable a one-off change to the timer where required.</para></remarks>
+public abstract class TimerHostedServiceBase : HostedServiceBase
 {
+    private readonly SemaphoreSlim _signal = new(0);
+    private Task? _backgroundTask;
+    private CancellationTokenSource? _backgroundCts;
+    private CancellationTokenSource? _delayCts;
+    private TimeSpan? _oneOffInterval;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TimerHostedServiceBase"/> class.
+    /// </summary>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
+    /// <param name="logger">The <see cref="ILogger"/>.</param>
+    public TimerHostedServiceBase(IServiceProvider serviceProvider, ILogger logger) : base(serviceProvider, logger) => ArePauseAndResumeSupported = true;
+
+    /// <summary>
+    /// Gets or sets the action to configure the <see cref="ExecutionContext"/> prior to executing the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> method.
+    /// </summary>
+    public Action<ExecutionContext>? ExecutionContextConfigure { get; set; }
+
+    /// <summary>
+    /// Gets or sets the <i>first</i> timer start interval. 
+    /// </summary>
+    /// <remarks>Defaults to <see cref="Interval"/>. This is used as a maximum, in that the actual start is determined using a random value up to this value to ensure staggering of execution where multiple hosts are triggered at the same time.</remarks>
+    public TimeSpan FirstInterval { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Gets or sets the timer interval <see cref="TimeSpan"/>.
+    /// </summary>
+    /// <remarks>Defaults to 500 milliseconds.</remarks>
+    public TimeSpan Interval { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); } = TimeSpan.FromMilliseconds(500);
+
+    /// <summary>
+    /// Gets or sets the timer start interval after an unhandled <see cref="Exception"/> that occurs during the execution where <see cref="PauseOnUnhandledException"/> is <see langword="false"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="Interval"/>.</remarks>
+    public TimeSpan OnUnhandledInterval { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); }
+
+    /// <summary>
+    /// Indicates whether to automatically halt the service on an unhandled <see cref="Exception"/> that occurs during the execution of the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> method.
+    /// </summary>
+    /// <returns><see langword="true"/> indicates that the service should be <see cref="ServiceStatus.Paused"/>; otherwise, <see langword="false"/> indicates to continue executing after the next interval.</returns>
+    /// <remarks>Defaults to <see langword="true"/>.</remarks>
+    public bool PauseOnUnhandledException { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value); } = true;
+
+    /// <summary>
+    /// Gets or sets the maximum number of consecutive immediate executions (i.e. without an interval) before forcing a sleep interval.
+    /// </summary>
+    /// <remarks>Defaults to 100. This is a safety mechanism to prevent runaway execution where the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> method continually returns <see langword="true"/> indicating to execute immediately without an interval.</remarks>
+    public int MaxConsecutiveExecutions { get => field; set => field = SetValueWhenStatusIsInitializedOnly(value.ThrowIfLessThanOrEqualToZero()); } = 100;
+
+    /// <summary>
+    /// Gets the last execution <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset LastExecuted { get; protected set; } = DateTimeOffset.MinValue;
+
+    /// <summary>
+    /// Gets the last execution <see cref="Exception"/>; <see langword="null"/> indicates success.
+    /// </summary>
+    public Exception? LastException { get; protected set; }
+
     /// <summary>
-    /// Represents a base class for an <see cref="IHostedService"/> based on an <see cref="Interval"/> to <see cref="Execute(object?)"/> work.
+    /// Provides an opportunity to explicitly handle an unhandled <see cref="Exception"/> that occurs during the execution of the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> method.
     /// </summary>
-    /// <remarks>Each timer-based invocation of the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> will be managed witin the context of a new Dependency Injection (DI)
-    /// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see>.
-    /// <para>A <see cref="OneOffIntervalAdjust(TimeSpan, bool)"/> is provided to enable a one-off change to the timer where required.</para></remarks>
-    public abstract class TimerHostedServiceBase : IHostedService, IDisposable
+    /// <param name="exception">The unhandled <see cref="Exception"/>.</param>
+    /// <returns><see langword="true"/> indicates that the service should be <see cref="ServiceStatus.Paused"/>; otherwise, <see langword="false"/> indicates to continue executing after the next interval.</returns>
+    /// <remarks>The <paramref name="exception"/> is automatically logged prior to invoking this method.
+    /// <para>The default result is the <see cref="PauseOnUnhandledException"/>.</para>
+    /// <para>Also, consider using the <see cref="OneOffTrigger(TimeSpan?)"/> to adjust the next interval where applicable.</para></remarks>
+    protected virtual bool OnUnhandledException(Exception exception) => PauseOnUnhandledException;
+
+    /// <inheritdoc/>
+    protected async override Task OnInitializeAsync(CancellationToken cancellationToken)
+    {
+        // Execute the base initialization to ensure potential dependencies are available.
+        await base.OnInitializeAsync(cancellationToken).ConfigureAwait(false);
+
+        // Helper to get the default-value where the provided value is not valid (i.e. less than or equal to zero); otherwise, returns the provided value.
+        static TimeSpan GetDefault(TimeSpan value, TimeSpan defaultValue) => value <= TimeSpan.Zero ? defaultValue : value;
+
+        // Get the configuration-based settings.
+        Interval = Internal.GetConfigurationValueWithFallback<TimeSpan>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:Interval", "CoreEx:Host:Services:Interval", Interval, Configuration).ThrowWhen(interval => interval <= TimeSpan.Zero, nameof(Interval), "Interval must be positive.");
+        FirstInterval = Internal.GetConfigurationValueWithFallback<TimeSpan>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:FirstInterval", "CoreEx:Host:Services:FirstInterval", GetDefault(FirstInterval, Interval), Configuration).ThrowWhen(firstInterval => firstInterval <= TimeSpan.Zero, nameof(FirstInterval), "FirstInterval must be positive.");
+        OnUnhandledInterval = Internal.GetConfigurationValueWithFallback<TimeSpan>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:OnUnhandledInterval", "CoreEx:Host:Services:OnUnhandledInterval", GetDefault(OnUnhandledInterval, Interval), Configuration).ThrowWhen(onUnhandledInterval => onUnhandledInterval <= TimeSpan.Zero, nameof(OnUnhandledInterval), "OnUnhandledInterval must be positive.");
+        PauseOnUnhandledException = Internal.GetConfigurationValueWithFallback<bool>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:PauseOnUnhandledException", "CoreEx:Host:Services:PauseOnUnhandledException", PauseOnUnhandledException, Configuration);
+        MaxConsecutiveExecutions = Internal.GetConfigurationValueWithFallback<int>($"CoreEx:Host:Services:{ServiceConfigurationSectionName}:MaxConsecutiveExecutions", "CoreEx:Host:Services:MaxConsecutiveExecutions", MaxConsecutiveExecutions, Configuration).ThrowWhen(max => max <= 0, nameof(MaxConsecutiveExecutions), "MaxConsecutiveExecutions must be positive.");
+
+        if (Logger.IsEnabled(LogLevel.Information))
+            Logger.LogInformation("{ServiceName} settings: Interval={Interval}, FirstInterval={FirstInterval}, OnUnhandledInterval={OnUnhandledInterval}, PauseOnUnhandledException={PauseOnUnhandledException}, MaxConsecutiveExecutions={MaxConsecutiveExecutions}",
+                ServiceName, Interval, FirstInterval, OnUnhandledInterval, PauseOnUnhandledException, MaxConsecutiveExecutions);
+    }
+
+    /// <inheritdoc/>
+    protected sealed override async Task<ServiceStatus> OnStartAsync(CancellationToken cancellationToken)
     {
-        private static readonly Random _random = new();
-
-#if NET9_0_OR_GREATER
-        private readonly System.Threading.Lock _lock = new();
-#else
-        private readonly object _lock = new();
-#endif
-        private readonly TimerHostedServiceHealthCheck? _healthCheck;
-        private TimerHostedServiceStatus _status = TimerHostedServiceStatus.Initialized;
-        private string? _name;
-        private CancellationTokenSource? _cts;
-        private Timer? _timer;
-        private TimeSpan? _oneOffInterval;
-        private Task? _executeTask;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TimerHostedServiceBase"/> class.
-        /// </summary>
-        /// <param name="serviceProvider">The <see cref="IServiceProvider"/>.</param>
-        /// <param name="logger">The <see cref="ILogger"/>.</param>
-        /// <param name="settings">The <see cref="SettingsBase"/>; defaults to instance from the <paramref name="serviceProvider"/> where not specified.</param>
-        /// <param name="healthCheck">The optional <see cref="TimerHostedServiceHealthCheck"/> to report health.</param>
-        public TimerHostedServiceBase(IServiceProvider serviceProvider, ILogger logger, SettingsBase? settings = null, TimerHostedServiceHealthCheck? healthCheck = null)
+        if (Logger.IsEnabled(LogLevel.Debug))
+            Logger.LogDebug("{ServiceName} starting. Timer first/interval {FirstInterval}/{Interval}.", ServiceName, FirstInterval, Interval);
+
+        _backgroundCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+        await OnStartingAsync(_backgroundCts.Token).ConfigureAwait(false);
+
+        // Start the background loop.
+        _backgroundTask = Task.Run(async () =>
         {
-            ServiceProvider = serviceProvider.ThrowIfNull(nameof(serviceProvider));
-            Logger = logger.ThrowIfNull(nameof(logger));
-            Settings = settings ?? ServiceProvider.GetService<SettingsBase>() ?? new DefaultSettings(ServiceProvider.GetRequiredService<IConfiguration>());
-            _healthCheck = healthCheck;
-        }
+            try
+            {
+                await RunPeriodicAsync(_backgroundCts.Token).ConfigureAwait(false);
+            }
+            catch (Exception ex) when (!ex.IsCanceled())
+            {
+                if (Logger.IsEnabled(LogLevel.Critical))
+                    Logger.LogCritical(ex, "{ServiceName} background task failed unexpectedly.", ServiceName);
+            }
+        }, _backgroundCts.Token);
+
+        // And, ... sleep.
+        return ServiceStatus.Sleeping;
+    }
+
+    /// <summary>
+    /// Triggered when the <see cref="TimerHostedServiceBase"/> is starting (prior to initiating the timer).
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected virtual Task OnStartingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    /// <summary>
+    /// Performs the asynchronous background loop.
+    /// </summary>
+    private async Task RunPeriodicAsync(CancellationToken cancellationToken)
+    {
+        // Initial staggered (pseudo jitter) delay.
+        var maxMs = Math.Max(1, (int)Math.Min(FirstInterval.TotalMilliseconds, (double)int.MaxValue));
+        var nextInterval = TimeSpan.FromMilliseconds(Random.Shared.Next(1, maxMs + 1));
 
-        /// <summary>
-        /// Gets the <see cref="IServiceProvider"/>.
-        /// </summary>
-        protected IServiceProvider ServiceProvider;
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        protected SettingsBase Settings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        protected ILogger Logger { get; }
-
-        /// <summary>
-        /// Gets the service name (used for the likes of configuration and logging).
-        /// </summary>
-        /// <remarks>Defaults to the <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
-        public virtual string ServiceName => _name ??= GetType().Name;
-
-        /// <summary>
-        /// Gets or sets the <i>first</i> timer start interval. 
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Interval"/>. This is used as a maximum, in that the actual start is determined using a random value up to this value to ensure staggering of execution where multiple hosts are triggered at the same time.</remarks>
-        public virtual TimeSpan? FirstInterval { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timer interval <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <remarks>Defaults to one hour.</remarks>
-        public virtual TimeSpan Interval { get; set; } = TimeSpan.FromMinutes(60);
-
-        /// <summary>
-        /// Gets the current <see cref="TimerHostedServiceStatus"/>.
-        /// </summary>
-        public TimerHostedServiceStatus Status 
+        // Loop-de-loop until cancellation is requested.
+        while (!cancellationToken.IsCancellationRequested)
         {
-            get => _status;
-            private set => _status = ReportHealthStatus(value);
+            // Wait for either the interval to expire or an explicit signal.
+            try
+            {
+                if (nextInterval == Timeout.InfiniteTimeSpan)
+                    await _signal.WaitAsync(cancellationToken).ConfigureAwait(false);
+                else
+                {
+                    _delayCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+                    var delayTask = Task.Delay(nextInterval, _delayCts.Token);
+                    var signalTask = _signal.WaitAsync(cancellationToken);
+                    await Task.WhenAny(delayTask, signalTask).ConfigureAwait(false);
+                    _delayCts?.Dispose();
+                    _delayCts = null;
+                }
+            }
+            catch (Exception ex) when (ex.IsCanceled()) { break; }
+
+            lock (SyncLock)
+            {
+                // Where not currently sleeping, then we need to wait for a status change.
+                if (!Status.IsAsleep)
+                {
+                    nextInterval = Timeout.InfiniteTimeSpan;
+                    continue;
+                }
+
+                LastException = null;
+                Status = ServiceStatus.Running;
+
+                if (Logger.IsEnabled(LogLevel.Debug))
+                    Logger.LogDebug("{ServiceName} execution triggered.", ServiceName);
+            }
+
+            // Do the actual work!
+            try
+            {
+                await ScopedExecuteAsync(cancellationToken).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                if (ex.IsCanceled())
+                    break;
+
+                ExceptionHandling(ex);
+            }
+
+            // Confirm the status and determine next interval.
+            if (!ManageStatusAndGetNextInterval(out nextInterval))
+                break;
         }
+    }
 
-        /// <summary>
-        /// Gets the last execution <see cref="DateTime"/>.
-        /// </summary>
-        public DateTime LastExecuted { get; private set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Gets the last execution <see cref="Exception"/>; <c>null</c> indicates success.
-        /// </summary>
-        public Exception? LastException { get; private set; }
-
-        /// <summary>
-        /// Indicates whether to bubble exceptions from the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> method.
-        /// </summary>
-        /// <remarks>The default of <c>false</c> indicates that any <see cref="Exception"/> is to log and then swallowed; i.e. will continue and re-execute on next timer.</remarks>
-        public bool BubbleExceptionsFromExecuteAsync { get; protected set; }
-
-        /// <summary>
-        /// Provides an opportunity to make a one-off change to the underlying timer to trigger using the specified <paramref name="oneOffInterval"/>.
-        /// </summary>
-        /// <param name="oneOffInterval">The one-off interval.</param>
-        /// <param name="leaveWhereTimeRemainingIsLess">Indicates whether to <i>not</i> adjust the time where the time remaining is less than the one-off interval specified.</param>
-        /// <remarks>A negative <paramref name="oneOffInterval"/> will have no effect.</remarks>
-        protected void OneOffIntervalAdjust(TimeSpan oneOffInterval, bool leaveWhereTimeRemainingIsLess = false)
+    /// <summary>
+    /// Orchestrates the scoped execution.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="Task"/> that represents the long running operation.</returns>
+    private async Task ScopedExecuteAsync(CancellationToken cancellationToken)
+    {
+        var immediate = false;
+        int consecutiveExecutionCount = 0;
+
+        do
         {
-            if (oneOffInterval < TimeSpan.Zero)
-                return;
+            // Where the cancellation token is requested, exit the loop and stop processing.
+            if (cancellationToken.IsCancellationRequested)
+                break;
+
+            // Manage the status and confirm can keep running.
+            if (!ManageStatusAndGetNextInterval(out _, checkCanKeepRunningStatus: true))
+                break;
+
+            // Create a scope in which to perform the execution.
+            await using var scope = ServiceProvider.CreateAsyncScope();
+
+            // Instantiate and configure the execution context.
+            var ec = scope.ServiceProvider.GetRequiredService<ExecutionContext>();
+            ExecutionContextConfigure?.Invoke(ec);
 
-            lock (_lock)
+            await HostedServiceInvoker.InvokeAsync(this, async (_, cancellationToken) =>
             {
-                if (Status == TimerHostedServiceStatus.Stopping || Status == TimerHostedServiceStatus.Stopped)
-                    return;
+                // Enable logging scope data.
+                var sd = new Dictionary<string, object?>();
+                AddLoggingScope(sd);
 
-                // Where already executing save the one-off value and use when ready.
-                if (_executeTask != null)
-                    _oneOffInterval = oneOffInterval;
-                else
+                using (Logger.BeginScope(sd))
                 {
-                    _oneOffInterval = null;
-
-                    // Where less time remaining than specified and requested to leave then do nothing.
-                    if (leaveWhereTimeRemainingIsLess && (DateTime.UtcNow - LastExecuted) < oneOffInterval)
-                        return;
+                    // Execute the work!
+                    try
+                    {
+                        immediate = await OnExecuteAsync(ec, cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (Exception ex)
+                    {
+                        if (ex.IsCanceled())
+                            return;
 
-                    _timer?.Change(oneOffInterval, oneOffInterval);
+                        immediate = false;
+                        ExceptionHandling(ex);
+                    }
                 }
+            }, cancellationToken).ConfigureAwait(false);
+
+            if (immediate && ++consecutiveExecutionCount > MaxConsecutiveExecutions)
+            {
+                immediate = false;
+                if (Logger.IsEnabled(LogLevel.Warning))
+                    Logger.LogWarning("{ServiceName} exceeded {Max} consecutive executions, forcing sleep.", ServiceName, MaxConsecutiveExecutions);
             }
         }
+        while (immediate);
+    }
 
-        /// <summary>
-        /// Provides an opportunity to explicitly trigger the service execution versus waiting for the next scheduled interval.
-        /// </summary>
-        /// <param name="oneOffInterval">The one-off interval before triggering; defaults to <c>null</c> which represents an immediate trigger.</param>
-        /// <param name="leaveWhereTimeRemainingIsLess">Indicates whether to <i>not</i> adjust the time where the time remaining is less than the one-off interval specified.</param>
-        /// <remarks>Invokes the <see cref="OneOffIntervalAdjust(TimeSpan, bool)"/>.</remarks>
-        public void OneOffTrigger(TimeSpan? oneOffInterval = null, bool leaveWhereTimeRemainingIsLess = true) => OneOffIntervalAdjust(oneOffInterval ?? TimeSpan.Zero, leaveWhereTimeRemainingIsLess);
-
-        /// <summary>
-        /// Triggered when the application host is ready to start the service.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        async Task IHostedService.StartAsync(CancellationToken cancellationToken)
+    /// <summary>
+    /// Provides the common/standardized exception handling.
+    /// </summary>
+    private void ExceptionHandling(Exception ex)
+    {
+        lock (SyncLock)
         {
-            Status = TimerHostedServiceStatus.Starting;
-            Logger.LogInformation("{ServiceName} started. Timer first/interval {FirstInterval}/{Interval}.", ServiceName, FirstInterval ?? Interval, Interval);
-            _cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
-            await StartingAsync(_cts.Token).ConfigureAwait(false);
-            _timer = new Timer(Execute, null, TimeSpan.FromMilliseconds(_random.Next(1, (int)(FirstInterval ?? Interval).TotalMilliseconds)), Interval);
-        }
+            LastException = ex;
 
-        /// <summary>
-        /// Triggered when the <see cref="TimerHostedServiceBase"/> is starting (prior to initiating the timer).
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected virtual Task StartingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+            // Stop where requested; otherwise, swallow and continue.
+            if (OnUnhandledException(ex))
+            {
+                OneOffIntervalAdjustInternal(Timeout.InfiniteTimeSpan);
+                if (Logger.IsEnabled(LogLevel.Critical))
+                    Logger.LogCritical(ex, "{ServiceName} pausing due to failure: {Error}", ServiceName, ex.Message);
+            }
+            else
+            {
+                OneOffIntervalAdjustInternal(OnUnhandledInterval);
+                if (Logger.IsEnabled(LogLevel.Error))
+                    Logger.LogError(ex, "{ServiceName} failure; continuation in {NextInterval}: {Error}", ServiceName, _oneOffInterval ?? Interval, ex.Message);
+            }
+        }
+    }
 
-        /// <summary>
-        /// Performs the internal execution.
-        /// </summary>
-        private void Execute(object? state)
+    /// <summary>
+    /// Manage the status and report accordingly and advise whether can continue.
+    /// </summary>
+    private bool ManageStatusAndGetNextInterval(out TimeSpan nextInterval, bool checkCanKeepRunningStatus = false)
+    {
+        lock (SyncLock)
         {
-            // Stop the timer as no more work should be initiated until after complete.
-            lock (_lock)
+            if (Status.IsStop)
             {
-                _timer!.Change(Timeout.Infinite, Timeout.Infinite);
-                Status = TimerHostedServiceStatus.Running;
-                LastException = null;
-                Logger.LogDebug("{ServiceName} execution triggered by timer.", ServiceName);
-
-                _executeTask = Task.Run(async () => await ScopedExecuteAsync(_cts!.Token).ConfigureAwait(false));
+                nextInterval = Timeout.InfiniteTimeSpan;
+                return false;
             }
 
-            _executeTask.Wait();
+            var interval = _oneOffInterval ?? Interval;
+            _oneOffInterval = null;
+
+            if (interval == Timeout.InfiniteTimeSpan)
+            {
+                if (Status != ServiceStatus.Paused)
+                {
+                    Status = ServiceStatus.Paused;
+                    if (LastException is null && Logger.IsEnabled(LogLevel.Warning))
+                        Logger.LogWarning("{ServiceName} execution completed. Paused with no scheduled continuation.", ServiceName);
+                }
 
-            // Restart the timer.
-            lock (_lock)
+                nextInterval = Timeout.InfiniteTimeSpan;
+            }
+            else
             {
-                Status = TimerHostedServiceStatus.Sleeping;
-                _executeTask = null;
-                LastExecuted = DateTime.UtcNow;
+                if (!Status.IsAsleep)
+                {
+                    LastExecuted = DateTimeOffset.UtcNow;
 
-                if (_cts!.IsCancellationRequested)
-                    return;
+                    if (Status.IsRunning && checkCanKeepRunningStatus)
+                    {
+                        Status = ServiceStatus.Running; // Forces report of health.
+                        nextInterval = interval;
+                        return true;
+                    }
 
-                var interval = _oneOffInterval ?? Interval;
-                _oneOffInterval = null;
+                    Status = ServiceStatus.Sleeping;
+                    if (Logger.IsEnabled(LogLevel.Debug))
+                        Logger.LogDebug("{ServiceName} execution completed. Sleeping with continuation in {Interval}.", ServiceName, interval);
 
-                Logger.LogDebug("{ServiceName} execution completed. Retry in {interval}.", ServiceName, Interval);
-                _timer?.Change(interval, interval);
+                    nextInterval = interval;
+                }
+                else
+                {
+                    nextInterval = interval;
+                }
             }
+
+            return true;
         }
+    }
 
-        /// <summary>
-        /// Orchestrates the scoped execution.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="Task"/> that represents the long running operation.</returns>
-        private Task ScopedExecuteAsync(CancellationToken cancellationToken) => ServiceInvoker.Current.InvokeAsync(this, async (_, cancellationToken) =>
+    /// <summary>
+    /// Triggered to perform the work within a <i>scoped</i> <see cref="ExecutionContext"/>.
+    /// </summary>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> indicates that the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> should be re-executed immediately (without an interval); otherwise, 
+    /// <see langword="false"/> to re-execute after the configured <see cref="Interval"/>.</returns>
+    /// <remarks>Each timer-based invocation of the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
+    /// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> and corresponding <see cref="ExecutionContext"/>.</remarks>
+    protected abstract Task<bool> OnExecuteAsync(ExecutionContext executionContext, CancellationToken cancellationToken);
+
+    /// <inheritdoc/>
+    protected override Task OnPauseAsync(CancellationToken cancellationToken)
+    {
+        lock (SyncLock)
         {
-            // Create a scope in which to perform the execution.
-            using var scope = ServiceProvider.CreateScope();
-            ExecutionContext.Reset();
+            _oneOffInterval = Timeout.InfiniteTimeSpan;
+            SignalWakeUp();
+        }
 
-            try
-            {
-                await ExecuteAsync(scope.ServiceProvider, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex)
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc/>
+    protected override Task OnResumeAsync(CancellationToken cancellationToken)
+    {
+        lock (SyncLock)
+        {
+            if (Status == ServiceStatus.Resuming)
             {
-                if (ex is TaskCanceledException || (ex is AggregateException aex && aex.InnerException is TaskCanceledException))
-                    return;
+                _oneOffInterval = Interval;
+                Status = ServiceStatus.Sleeping;
+                LastException = null;
 
-                LastException = ex;
-                Logger.LogCritical(ex, "{ServiceName} failure as a result of an unexpected exception: {Error}", ServiceName, ex.Message);
+                if (Logger.IsEnabled(LogLevel.Information))
+                    Logger.LogInformation("{ServiceName} resumed. Status reset to Sleeping.", ServiceName);
 
-                // Only bubble where asked to do so; otherwise, swallow and continue.
-                if (BubbleExceptionsFromExecuteAsync)
-                    throw;
+                SignalWakeUp();
             }
-        }, cancellationToken);
-
-        /// <summary>
-        /// Triggered to perform the work as a result of the <see cref="Interval"/>.
-        /// </summary>
-        /// <param name="scopedServiceProvider">The scoped <see cref="IServiceProvider"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>Each timer-based invocation of the <see cref="ExecuteAsync(IServiceProvider, CancellationToken)"/> will be managed within the context of a new Dependency Injection (DI)
-        /// <see cref="ServiceProviderServiceExtensions.CreateScope">scope</see> that is passed for direct usage.</remarks>
-        protected abstract Task ExecuteAsync(IServiceProvider scopedServiceProvider, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Triggered when the application host is performing a graceful shutdown.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/></param>
-        async Task IHostedService.StopAsync(CancellationToken cancellationToken)
-        {
-            Status = TimerHostedServiceStatus.Stopping;
-            Logger.LogInformation("{ServiceName} stop requested.", ServiceName);
-            _timer!.Change(Timeout.Infinite, Timeout.Infinite);
+        }
+
+        return Task.CompletedTask;
+    }
 
+    /// <summary>
+    /// Triggered when the application host is performing a graceful shutdown.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/></param>
+    protected sealed override async Task OnStopAsync(CancellationToken cancellationToken)
+    {
+        try
+        {
+            _delayCts?.Cancel();
+            _backgroundCts?.Cancel();
+        }
+        finally
+        {
             try
             {
-                _cts!.Cancel();
+                if (_backgroundTask != null)
+                    await _backgroundTask.WaitAsync(cancellationToken).ConfigureAwait(false);
             }
-            finally
+            catch (Exception ex) when (ex.IsCanceled())
             {
-                await Task.WhenAny(_executeTask ?? Task.CompletedTask, Task.Delay(Timeout.Infinite, cancellationToken)).ConfigureAwait(false);
+                // Graceful shutdown timeout exceeded - this is acceptable.
             }
+        }
 
-            await StoppingAsync(cancellationToken).ConfigureAwait(false);
+        await OnStoppingAsync(cancellationToken).ConfigureAwait(false);
+    }
 
-            Status = TimerHostedServiceStatus.Stopped;
-            Logger.LogInformation("{ServiceName} stopped.", ServiceName);
-        }
+    /// <summary>
+    /// Triggered when the <see cref="TimerHostedServiceBase"/> is stopping (after <see cref="OnExecuteAsync"/> has stopped).
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    protected virtual Task OnStoppingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 
-        /// <summary>
-        /// Triggered when the <see cref="TimerHostedServiceBase"/> is stopping (after <see cref="ExecuteAsync"/> has stopped).
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        protected virtual Task StoppingAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-
-        /// <summary>
-        /// Reports the <see cref="HealthCheckResult"/> on status change.
-        /// </summary>
-        /// <param name="status">The <see cref="TimerHostedServiceStatus"/>.</param>
-        /// <returns>The <paramref name="status"/>.</returns>
-        private TimerHostedServiceStatus ReportHealthStatus(TimerHostedServiceStatus status)
-        {
-            if (_healthCheck is not null)
-            {
-                var data = new Dictionary<string, object>
-                {
-                    { "service", ServiceName },
-                    { "status", status.ToString() },
-                    { "lastExecuted", LastExecuted },
-                    { "interval", Interval.ToString() },
-                    { "firstInterval", FirstInterval?.ToString() ?? Interval.ToString() }
-                };
-
-                _healthCheck.Result = OnReportHealthStatus(data);
-            }
+    /// <inheritdoc/>
+    protected override HealthCheckResult OnReportHealthStatus(Dictionary<string, object> data)
+    {
+        data.Add("interval", Interval.ToString());
+        data.Add("firstInterval", FirstInterval.ToString());
+        data.Add("onUnhandledInterval", OnUnhandledInterval.ToString());
+        data.Add("pauseOnUnhandledException", PauseOnUnhandledException);
+        data.Add("maxConsecutiveExecutions", MaxConsecutiveExecutions);
+        data.Add("lastExecuted", LastExecuted);
+
+        return Status.IsPause
+            ? HealthCheckResult.Degraded("Service is in a paused state.", null, data)
+            : (LastException is null ? HealthCheckResult.Healthy(null, data) : HealthCheckResult.Degraded(null, LastException, data));
+    }
+
+    /// <summary>
+    /// Provides an opportunity to add additional logging scope data for the <see cref="ILogger"/> during the execution of the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> method.
+    /// </summary>
+    /// <param name="data">The <see cref="IDictionary{TKey, TValue}"/> to add scope data to.</param>
+    protected virtual void AddLoggingScope(IDictionary<string, object?> data) { }
 
-            return status;
+    /// <summary>
+    /// Provides an opportunity to make a one-off change to the underlying timer to trigger using the specified <paramref name="oneOffInterval"/>.
+    /// </summary>
+    /// <param name="oneOffInterval">The one-off interval.</param>
+    /// <remarks>A negative <paramref name="oneOffInterval"/> will result in <see cref="Timeout.InfiniteTimeSpan"/> leading to a status change to paused.</remarks>
+    protected void OneOffIntervalAdjust(TimeSpan oneOffInterval)
+    {
+        lock (SyncLock)
+        {
+            OneOffIntervalAdjustInternal(oneOffInterval);
         }
+    }
 
-        /// <summary>
-        /// Provides an opportunity to override the health status reporting.
-        /// </summary>
-        /// <param name="data">The status data.</param>
-        /// <returns>The <see cref="HealthCheckResult"/>.</returns>
-        /// <remarks>Returns <see cref="HealthCheckResult.Healthy"/> where the <see cref="LastException"/> is <c>null</c>; otherwise, <see cref="HealthCheckResult.Unhealthy"/>.</remarks>
-        protected virtual HealthCheckResult OnReportHealthStatus(Dictionary<string, object> data) => LastException is null ? HealthCheckResult.Healthy(null, data) : HealthCheckResult.Unhealthy(null, LastException, data);
-
-        /// <summary>
-        /// Dispose of resources.
-        /// </summary>
-        public void Dispose()
+    /// <summary>
+    /// Adjusts the interval for the next scheduled execution to a one-off value, overriding the regular interval for a single occurrence.
+    /// </summary>
+    private void OneOffIntervalAdjustInternal(TimeSpan oneOffInterval)
+    {
+        if (Status.IsStop)
+            return;
+
+        if (oneOffInterval < TimeSpan.Zero)
+            oneOffInterval = Timeout.InfiniteTimeSpan;
+
+        _oneOffInterval = oneOffInterval;
+        SignalWakeUp();
+    }
+
+    /// <summary>
+    /// Provides an opportunity to explicitly trigger the service execution versus waiting for the next scheduled interval.
+    /// </summary>
+    /// <param name="oneOffInterval">The one-off interval before triggering; defaults to <c>null</c> which represents an immediate trigger.</param>
+    /// <remarks>A negative <paramref name="oneOffInterval"/> will result in <see cref="Timeout.InfiniteTimeSpan"/> leading to a status change to paused.
+    /// <para>Invokes the <see cref="OneOffIntervalAdjust(TimeSpan)"/> internally to perform.</para></remarks>
+    public void OneOffTrigger(TimeSpan? oneOffInterval = null) => OneOffIntervalAdjust(oneOffInterval ?? TimeSpan.Zero);
+
+    /// <summary>
+    /// Signals the background loop to wake up immediately by canceling any active delay and releasing the semaphore.
+    /// </summary>
+    private void SignalWakeUp()
+    {
+        _delayCts?.Cancel();
+        if (_signal.CurrentCount == 0)
+            _signal.Release();
+    }
+
+    /// <inheritdoc/>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
         {
-            if (!_disposed)
+            try { _backgroundCts?.Cancel(); } catch { }
+            try { _delayCts?.Cancel(); } catch { }
+
+            try
             {
-                lock (_lock)
-                {
-                    if (!_disposed)
-                    {
-                        Status = TimerHostedServiceStatus.Stopped;
-                        _timer?.Dispose();
-                        _cts?.Cancel();
-                        _cts?.Dispose();
-                        _timer = null;
-                        _cts = null;
-                        _disposed = true;
-                    }
-                }
+                _signal?.Dispose();
+                _delayCts?.Dispose();
+                _backgroundCts?.Dispose();
+            }
+            catch { }
+            finally
+            {
+                _delayCts = null;
+                _backgroundTask = null;
+                _backgroundCts = null;
             }
-
-            Dispose(true);
-            GC.SuppressFinalize(this);
         }
 
-        /// <summary>
-        /// Releases the unmanaged resources used by the <see cref="TimerHostedServiceBase"/> and optionally releases the managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing) { }
+        base.Dispose(disposing);
     }
+
+    /// <summary>
+    /// Performs a one-off <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> of the service work outside of the timer-based schedule.
+    /// </summary>
+    /// <param name="executionContext">The <see cref="ExecutionContext"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns><see langword="true"/> indicates that the <see cref="OnExecuteAsync(ExecutionContext, CancellationToken)"/> should be re-executed immediately (without an interval); otherwise, 
+    /// <see langword="false"/> to re-execute after the configured <see cref="Interval"/>.</returns>
+    /// <remarks><b>Warning:</b> this is intended for advanced scenarios, such as testing, and improper usage may result in unexpected behavior.</remarks>
+    public async Task<bool> OneOffExecuteAsync(ExecutionContext executionContext, CancellationToken cancellationToken) => await OnExecuteAsync(executionContext, cancellationToken).ConfigureAwait(false);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/TimerHostedServiceStatus.cs b/src/CoreEx/Hosting/TimerHostedServiceStatus.cs
deleted file mode 100644
index 210049f8..00000000
--- a/src/CoreEx/Hosting/TimerHostedServiceStatus.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Hosting;
-
-namespace CoreEx.Hosting
-{
-    /// <summary>
-    /// Represents the status of a <see cref="TimerHostedServiceBase"/>.
-    /// </summary>
-    public enum TimerHostedServiceStatus
-    {
-        /// <summary>
-        /// Initialized, but not started.
-        /// </summary>
-        Initialized,
-
-        /// <summary>
-        /// Starting; i.e. <see cref="IHostedService.StartAsync"/> has been called.
-        /// </summary>
-        Starting,
-
-        /// <summary>
-        /// Sleeping; i.e. the timer is waiting for the next interval.
-        /// </summary>
-        Sleeping,
-
-        /// <summary>
-        /// Running; i.e. the timer is executing the <see cref="TimerHostedServiceBase.ExecuteAsync"/> method.
-        /// </summary>
-        Running,
-
-        /// <summary>
-        /// Stopping; i.e. <see cref="IHostedService.StopAsync"/> has been called.
-        /// </summary>
-        Stopping,
-
-        /// <summary>
-        /// Stopped; the service has been stopped.
-        /// </summary>
-        Stopped
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/FileWorkStatePersistence.cs b/src/CoreEx/Hosting/Work/FileWorkStatePersistence.cs
deleted file mode 100644
index fb733fca..00000000
--- a/src/CoreEx/Hosting/Work/FileWorkStatePersistence.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Json;
-using System;
-using System.IO;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting.Work
-{
-    /// <summary>
-    /// An <see cref="IWorkStatePersistence"/> that persists the <see cref="WorkState"/> (as JSON) to a file and the related <see cref="BinaryData"/> to a separate file.
-    /// </summary>
-    public class FileWorkStatePersistence : IWorkStatePersistence
-    {
-        private static readonly Regex _invalidFileNameChars = new($"[{Regex.Escape(new string(Path.GetInvalidFileNameChars()))}]", RegexOptions.Compiled);
-
-        private readonly string _path;
-        private readonly IJsonSerializer _jsonSerializer;
-
-        /// <summary>
-        /// Gets the configuration key that defines the directory path for the work persistence files.
-        /// </summary>
-        public const string ConfigKey = "FileWorkPersistencePath";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileWorkStatePersistence"/> class.
-        /// </summary>
-        /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="JsonSerializer.Default"/>.</param>
-        public FileWorkStatePersistence(SettingsBase settings, IJsonSerializer? jsonSerializer = null)
-        {
-            _path = settings.ThrowIfNull(nameof(settings)).GetCoreExValue<string>(ConfigKey);
-
-            if (string.IsNullOrEmpty(_path))
-                throw new ArgumentException($"Configuration setting '{ConfigKey}' either does not exist or has no value.", nameof(settings));
-
-            if (!Directory.Exists(_path))
-                throw new ArgumentException($"Configuration setting '{ConfigKey}' path does not exist: {_path}");
-
-            _jsonSerializer = jsonSerializer ?? JsonSerializer.Default;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> <see cref="FileInfo"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-        /// <returns>The <see cref="FileInfo"/>.</returns>
-        public FileInfo GetStateFileInfo(string id) => new(Path.Combine(_path, $"{GetSanitizedName(id)}.json"));
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> data <see cref="FileInfo"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-        /// <returns>The <see cref="FileInfo"/>.</returns>
-        public FileInfo GetDataFileInfo(string id) => new(Path.Combine(_path, $"{GetSanitizedName(id)}.data"));
-
-        /// <summary>
-        /// Gets a sanitized file name by replacing any invalid characters with an underscore.
-        /// </summary>
-        private static string GetSanitizedName(string name) => _invalidFileNameChars.Replace(name, "_");
-
-        /// <inheritdoc/>
-        public async Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken = default)
-        {
-            var fi = GetStateFileInfo(id);
-            if (!fi.Exists)
-                return default!;
-
-            using var stream = fi.OpenRead();
-            var json = await BinaryData.FromStreamAsync(stream, cancellationToken).ConfigureAwait(false);
-            return _jsonSerializer.Deserialize<WorkState>(json);
-        }
-
-        /// <inheritdoc/>
-        public Task CreateAsync(WorkState state, CancellationToken cancellationToken = default) => ReplaceAsync(state, true, cancellationToken);
-
-        /// <inheritdoc/>
-        public Task UpdateAsync(WorkState state, CancellationToken cancellationToken = default) => ReplaceAsync(state, false, cancellationToken);
-
-        /// <summary>
-        /// Replace the <see cref="WorkState"/> file.
-        /// </summary>
-        private async Task ReplaceAsync(WorkState state, bool isCreate, CancellationToken cancellationToken = default)
-        {
-            var fi = GetStateFileInfo(state.Id.ThrowIfNull());
-            if (isCreate && fi.Exists)
-                throw new ArgumentException("Create can not be performed as the WorkState already exists; the type and identifier combination should be unique.", nameof(state));
-
-            if (fi.Directory is not null && !fi.Directory.Exists)
-                fi.Directory.Create();
-
-            using var stream = fi.Open(fi.Exists ? FileMode.Truncate : FileMode.Create);
-            var json = _jsonSerializer.SerializeToBinaryData(state);
-            await stream.WriteAsync(json, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public Task DeleteAsync(string id, CancellationToken cancellationToken = default)
-        {
-            var fi = GetStateFileInfo(id);
-            if (fi.Exists)
-                fi.Delete();
-
-            fi = GetDataFileInfo(id);
-            if (fi.Exists)
-                fi.Delete();
-
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public async Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken)
-        {
-            var fi = GetDataFileInfo(id);
-            if (!fi.Exists)
-                return null;
-
-            using var fs = fi.OpenRead();
-            return await BinaryData.FromStreamAsync(fs, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken)
-        {
-            var fi = GetDataFileInfo(id);
-            using var fs = fi.Open(fi.Exists ? FileMode.Truncate : FileMode.Create);
-            await data.ToStream().CopyToAsync(fs, cancellationToken).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/HybridCacheWorkProvider.cs b/src/CoreEx/Hosting/Work/HybridCacheWorkProvider.cs
new file mode 100644
index 00000000..1c1448b0
--- /dev/null
+++ b/src/CoreEx/Hosting/Work/HybridCacheWorkProvider.cs
@@ -0,0 +1,117 @@
+namespace CoreEx.Hosting.Work;
+
+/// <summary>
+/// Provides the <see cref="IWorkProvider"/> implementation using an underlying <see cref="IHybridCache"/>.
+/// </summary>
+/// <param name="hybridCache">The <see cref="IHybridCache"/>.</param>
+public class HybridCacheWorkProvider(IHybridCache hybridCache) : IWorkProvider
+{
+    /// <summary>
+    /// Gets the underlying <see cref="IHybridCache"/>.
+    /// </summary>
+    public IHybridCache HybridCache { get; } = hybridCache.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the <see cref="HybridCacheEntryOptions"/>.
+    /// </summary>
+    public HybridCacheEntryOptions? CacheEntryOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum <see cref="SetDataAsync(string, BinaryData, CancellationToken)"/> cached data size in bytes.
+    /// </summary>
+    /// <remarks>The default is 512 * 1024 (512 KB).</remarks>
+    public int MaxCachedDataSize { get; set => field = value.ThrowWhen(value => value <= 0); } = 512 * 1024;
+
+    /// <summary>
+    /// Gets the <see cref="CacheEntryOptions"/> and defaults where not specified.
+    /// </summary>
+    private HybridCacheEntryOptions GetCacheEntryOptions()
+    {
+        if (CacheEntryOptions is not null)
+            return CacheEntryOptions;
+
+        // Create default with double the WorkState expiry time span.
+        var expiry = WorkOrchestrator.DefaultExpiryTimeSpan * 2;
+        return HybridCacheEntryOptions.CreateFor<WorkState>(expiry, expiry, CacheStrategy.Hybrid).WithTags(nameof(WorkState));
+    }
+
+    /// <inheritdoc/>
+    public async Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken)
+    {
+        var (Exists, Value) = await HybridCache.TryGetAsync<WorkStateCacheItem>(id, GetCacheEntryOptions(), cancellationToken);
+        return Exists ? Value!.State : null;
+    }
+
+    /// <inheritdoc/>
+    public async Task CreateAsync(WorkState state, CancellationToken cancellationToken)
+    {
+        var exists = true;
+        await HybridCache.GetOrCreateAsync(state.ThrowIfNull().Id.ThrowIfNullOrEmpty(), _ =>
+        {
+            exists = false;
+            return Task.FromResult(new WorkStateCacheItem { Id = state.Id!, State = state });
+        }, GetCacheEntryOptions(), cancellationToken);
+
+        if (exists)
+            throw new InvalidOperationException($"A work state with the identifier '{state.Id}' already exists.");
+    }
+
+    /// <inheritdoc/>
+    public async Task UpdateAsync(WorkState state, CancellationToken cancellationToken)
+    {
+        var (Exists, Value) = await HybridCache.TryGetAsync<WorkStateCacheItem>(state.ThrowIfNull().Id.ThrowIfNullOrEmpty(), GetCacheEntryOptions(), cancellationToken).ConfigureAwait(false);
+        if (!Exists || Value is null)
+            throw new NotFoundException();
+
+        Value.State = state;
+        await HybridCache.SetAsync(Value, GetCacheEntryOptions(), cancellationToken);
+    }
+
+    /// <inheritdoc/>
+    public Task DeleteAsync(string id, CancellationToken cancellationToken) => HybridCache.RemoveAsync<WorkStateCacheItem>(id, cancellationToken);
+
+    /// <inheritdoc/>
+    public async Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken)
+    {
+        var (Exists, Value) = await HybridCache.TryGetAsync<WorkStateCacheItem>(id.ThrowIfNullOrEmpty(), GetCacheEntryOptions(), cancellationToken).ConfigureAwait(false);
+        if (!Exists || Value is null)
+            return null;
+
+        return Value.Data;
+    }
+
+    /// <inheritdoc/>
+    public async Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken)
+    {
+        var (Exists, Value) = await HybridCache.TryGetAsync<WorkStateCacheItem>(id.ThrowIfNullOrEmpty(), GetCacheEntryOptions(), cancellationToken).ConfigureAwait(false);
+        if (!Exists || Value is null)
+            throw new NotFoundException();
+
+        if (data.Length > MaxCachedDataSize)
+            throw new InvalidOperationException($"The data size of {data.Length} bytes exceeds the maximum allowed size of {MaxCachedDataSize} bytes.");
+
+        Value.Data = data;
+        await HybridCache.SetAsync(Value, GetCacheEntryOptions(), cancellationToken);
+    }
+
+    /// <summary>
+    /// Provides the underlying work state cache item.
+    /// </summary>
+    private record class WorkStateCacheItem : IReadOnlyIdentifier<string>
+    {
+        /// <summary>
+        /// Gets the identifier.
+        /// </summary>
+        public required string Id { get; init; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="WorkState"/>.
+        /// </summary>
+        public required WorkState State { get; set; }
+
+        /// <summary>
+        /// Gets or sets the associated data.
+        /// </summary>
+        public BinaryData? Data { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/IWorkProvider.cs b/src/CoreEx/Hosting/Work/IWorkProvider.cs
new file mode 100644
index 00000000..82939607
--- /dev/null
+++ b/src/CoreEx/Hosting/Work/IWorkProvider.cs
@@ -0,0 +1,57 @@
+namespace CoreEx.Hosting.Work;
+
+/// <summary>
+/// Provides the underlying <see cref="WorkState"/> implementation services.
+/// </summary>
+/// <remarks>The <see cref="WorkOrchestrator"/> contains all orchestration logic, including validation, etc. which is performed prior to invoking the <see cref="IWorkProvider"/>. Therefore, there is no need
+/// to repeat within the provider implementation; i.e. simply provide the persistence as requested.
+/// <para>The <see cref="GetDataAsync"/> and <see cref="SetDataAsync"/> enable simple (smallish) result data persistence; large data should be persisted independently with the result data here representing a link
+/// to a file/blob for example.</para></remarks>
+public interface IWorkProvider
+{
+    /// <summary>
+    /// Gets (reads) the <see cref="WorkState"/> from the persistence store using the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
+    /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Creates (saves) the <paramref name="state"/> to the persistence store as new.
+    /// </summary>
+    /// <param name="state">The <see cref="WorkState"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task CreateAsync(WorkState state, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Updates (saves) the <paramref name="state"/> to the persistence store replacing existing.
+    /// </summary>
+    /// <param name="state">The <see cref="WorkState"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task UpdateAsync(WorkState state, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Deletes the <see cref="WorkState"/> from the persistence store using the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>A delete should be considered idempotent and therefore should not fail where not found.</remarks>
+    Task DeleteAsync(string id, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets the <see cref="WorkState"/> <see cref="BinaryData"/> using the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="BinaryData"/> where found; otherwise, <c>null</c>.</returns>
+    Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Gets the <see cref="WorkState"/> <see cref="BinaryData"/> for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="WorkState.Id"/>.</param>
+    /// <param name="data">The <see cref="BinaryData"/> to persist.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/IWorkStatePersistence.cs b/src/CoreEx/Hosting/Work/IWorkStatePersistence.cs
deleted file mode 100644
index 8dd8586a..00000000
--- a/src/CoreEx/Hosting/Work/IWorkStatePersistence.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting.Work
-{
-    /// <summary>
-    /// Provides the <see cref="WorkState"/> persistence capabilities for the <see cref="WorkStateOrchestrator"/>
-    /// </summary>
-    /// <remarks>The <see cref="WorkStateOrchestrator"/> contains all orchestration logic, including validation, etc. which is performed prior to invoking the <see cref="IWorkStatePersistence"/>. Therefore, there is no need to repeat within the persistence implementation; 
-    /// i.e. simply perist as requested.<para>The <see cref="GetDataAsync"/> and <see cref="SetDataAsync"/> enable simple (smallish) result data persistence; large data should be persisted independently with the result data here representing a link to a file/blob for example.</para></remarks>
-    public interface IWorkStatePersistence
-    {
-        /// <summary>
-        /// Gets (reads) the <see cref="WorkState"/> from the persistence store using the specified <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-        /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Creates (saves) the <paramref name="state"/> to the persistence store as new.
-        /// </summary>
-        /// <param name="state">The <see cref="WorkState"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task CreateAsync(WorkState state, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Updates (saves) the <paramref name="state"/> to the persistence store replacing existinf.
-        /// </summary>
-        /// <param name="state">The <see cref="WorkState"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task UpdateAsync(WorkState state, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Deletes the <see cref="WorkState"/> from the persistence store using the specified <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>A delete should be considered idempotent and therefore should not fail where not found.</remarks>
-        Task DeleteAsync(string id, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> <see cref="BinaryData"/> using the specified <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="BinaryData"/> where found; otherwise, <c>null</c>.</returns>
-        Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> <see cref="BinaryData"/> for the specified <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="WorkState.Id"/>.</param>
-        /// <param name="data">The <see cref="BinaryData"/> to persist.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/InMemoryWorkStatePersistence.cs b/src/CoreEx/Hosting/Work/InMemoryWorkStatePersistence.cs
deleted file mode 100644
index c8397c45..00000000
--- a/src/CoreEx/Hosting/Work/InMemoryWorkStatePersistence.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting.Work
-{
-    /// <summary>
-    /// An <see cref="IWorkStatePersistence"/> that persists the <see cref="WorkState"/> in-memory which can be used for the likes of testing.
-    /// </summary>
-    /// <param name="logger">The <see cref="ILogger"/>.</param>
-    public class InMemoryWorkStatePersistence(ILogger<InMemoryWorkStatePersistence>? logger = null) : IWorkStatePersistence
-    {
-        private readonly Dictionary<string, WorkState> _workStates = [];
-        private readonly Dictionary<string, BinaryData> _workData = [];
-        private readonly ILogger? _logger = logger;
-
-        /// <summary>
-        /// Gets all the <see cref="WorkState"/> entries.
-        /// </summary>
-        public WorkState[] GetWorkStates() => [.. _workStates.Values];
-
-        /// <inheritdoc/>
-        public Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken)
-            => Task.FromResult(_workStates.TryGetValue(id, out var state) ? state : null);
-
-        /// <inheritdoc/>
-        public Task CreateAsync(WorkState state, CancellationToken cancellationToken)
-        {
-            if (_workStates.ContainsKey(state.Id.ThrowIfNull()))
-                throw new ArgumentException("Create can not be performed as the WorkState already exists; the type and identifier combination should be unique.", nameof(state));
-
-            _logger?.LogDebug("Creating WorkState: {Id}", state.Id);
-            _workStates.Add(state.Id, state);
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public Task UpdateAsync(WorkState state, CancellationToken cancellationToken)
-        {
-            _logger?.LogDebug("Updating WorkState: {Id}", state.Id);
-            _workStates[state.Id.ThrowIfNull()] = state;
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public Task DeleteAsync(string id, CancellationToken cancellationToken)
-        {
-            _logger?.LogDebug("Deleting WorkState: {Id}", id);
-            _workStates.Remove(id);
-            _workData.Remove(id);
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken)
-        {
-            _logger?.LogDebug("Getting WorkState data for: {Id}", id);
-            return Task.FromResult(_workData.TryGetValue(id, out var data) ? data : null);
-        }
-
-        /// <inheritdoc/>
-        public Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken)
-        {
-            _logger?.LogDebug("Setting WorkState data for: {Id}", id);
-            _workData[id] = data;
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Clears the in-memory persistence.
-        /// </summary>
-        public void Clear()
-        {
-            _logger?.LogDebug("Clearing WorkState persistence.");
-            _workStates.Clear();
-            _workData.Clear();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkArgs.cs b/src/CoreEx/Hosting/Work/WorkArgs.cs
new file mode 100644
index 00000000..2a7bbcaa
--- /dev/null
+++ b/src/CoreEx/Hosting/Work/WorkArgs.cs
@@ -0,0 +1,64 @@
+namespace CoreEx.Hosting.Work;
+
+/// <summary>
+/// Represents the <see cref="WorkOrchestrator.CreateAsync"/> arguments.
+/// </summary>
+public record class WorkArgs : IReadOnlyIdentifier<string>
+{
+    /// <summary>
+    /// Gets the underlying <see cref="Type"/> name for the specified <typeparamref name="T"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
+    /// <returns>The <see cref="Type.FullName"/>.</returns>
+    public static string GetTypeName<T>() => typeof(T).FullName ?? typeof(T).Name;
+
+    /// <summary>
+    /// Creates the <see cref="WorkArgs"/> using the <typeparamref name="T"/> <see cref="Type.FullName"/> as the <see cref="TypeName"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
+    /// <param name="id">The work identifier.</param>
+    /// <returns>The newly instantiated <see cref="WorkArgs"/>.</returns>
+    public static WorkArgs Create<T>(string? id = null) => new(GetTypeName<T>(), id);
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WorkArgs"/> class.
+    /// </summary>
+    /// <param name="typeName">The type name.</param>
+    /// <param name="id">The identifier.</param>
+    public WorkArgs(string typeName, string? id = null)
+    {
+        TypeName = typeName.ThrowIfNullOrEmpty();
+        Id = id.ThrowIfEmpty() ?? Runtime.NewId();
+    }
+
+    /// <summary>
+    /// Gets or sets the <see cref="WorkOrchestrator"/> type name.
+    /// </summary>
+    /// <remarks>Enables separation between one or more <see cref="WorkState"/> types; see <see cref="WorkOrchestrator.GetAsync(string, CancellationToken)"/> to minimize cross-type access challenges.</remarks>
+    public string TypeName { get; }
+
+    /// <inheritdoc/>
+    public string Id { get; }
+
+    /// <summary>
+    /// Gets or sets the expiry <see cref="TimeSpan"/>.
+    /// </summary>
+    /// <remarks>The <see cref="WorkState.Expiry"/> will default to the <see cref="WorkOrchestrator.ExpiryTimeSpan"/> where not specified.</remarks>
+    public TimeSpan? Expiry { get; set; }
+
+    /// <summary>
+    /// Gets or sets the trace parent (defaults to see <see cref="System.Diagnostics.Activity.Id"/>).
+    /// </summary>
+    public string? TraceParent { get; set; }
+
+    /// <summary>
+    /// Gets or sets the trace state (defaults to see <see cref="System.Diagnostics.Activity.TraceStateString"/>).
+    /// </summary>
+    public string? TraceState { get; set; }
+
+    /// <summary>
+    /// Gets or sets the owning <see cref="AuthenticationUser"/>.
+    /// </summary>
+    /// <remarks>This provides a basic authorization-style opportunity by verifying <i>only</i> the initiating user has ongoing access.</remarks>
+    public AuthenticationUser? User { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkOrchestrator.cs b/src/CoreEx/Hosting/Work/WorkOrchestrator.cs
new file mode 100644
index 00000000..fc8a1377
--- /dev/null
+++ b/src/CoreEx/Hosting/Work/WorkOrchestrator.cs
@@ -0,0 +1,385 @@
+namespace CoreEx.Hosting.Work;
+
+/// <summary>
+/// Represents the long-running work (see <see cref="WorkState"/>) tracking orchestrator.
+/// </summary>
+/// <param name="provider">The <see cref="IWorkProvider"/>.</param>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+/// <remarks>There are some basic consistency checks that occur for the methods to ensure largely correct usage (sequence of execution). The onus is primarily on the developer to ensure correct usage.</remarks>
+public class WorkOrchestrator(IWorkProvider provider, JsonSerializerOptions? jsonSerializerOptions = null)
+{
+    private readonly WorkOrchestratorInvoker _invoker = WorkOrchestratorInvoker.Default;
+    private TimeSpan? _expiryTimeSpan;
+
+    /// <summary>
+    /// Gets the default <see cref="ExpiryTimeSpan"/>.
+    /// </summary>
+    internal static TimeSpan DefaultExpiryTimeSpan => Internal.GetConfigurationValue<TimeSpan>("CoreEx:Hosting:Work:Expiry", TimeSpan.FromDays(1));
+
+    /// <summary>
+    /// Gets the <see cref="IWorkProvider"/>.
+    /// </summary>
+    public IWorkProvider Provider = provider.ThrowIfNull(nameof(provider));
+
+    /// <summary>
+    /// Gets the <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="JsonDefaults.SerializerOptions"/>.</remarks>
+    public JsonSerializerOptions JsonSerializerOptions = jsonSerializerOptions ?? JsonDefaults.SerializerOptions;
+
+    /// <summary>
+    /// Gets or sets the work expiry <see cref="TimeSpan"/>.
+    /// </summary>
+    /// <remarks>Defaults to configuration setting '<c>CoreEx:Hosting:Work:Expiry</c>'; otherwise, one (1) day.</remarks>
+    public TimeSpan ExpiryTimeSpan
+    {
+        get => _expiryTimeSpan ??= DefaultExpiryTimeSpan;
+        set => _expiryTimeSpan = value;
+    }
+
+    /// <summary>
+    /// Indicates whether to check the <see cref="WorkState.User"/> where not <see langword="null"/> where performing a <see cref="GetWithTypeAsync(string, string, CancellationToken)"/> or <see cref="GetWithTypeAsync{T}(string, CancellationToken)"/>.
+    /// </summary>
+    public bool CheckUser { get; set; } = true;
+
+    /// <summary>
+    /// Gets the <see cref="WorkState"/> for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="WorkState"/> where found; otherwise, <see langword="null"/>.</returns>
+    /// <remarks>Will automatically set the <see cref="WorkState.Status"/> to <see cref="WorkStatus.Expired"/> when the work is <i>not</i> <see cref="WorkStatus.Finished"/> and has expired (see <see cref="WorkState.Expiry"/>).</remarks>
+    public Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken = default) => _invoker.InvokeAsync(this, async (_, cancellationToken) =>
+    {
+        var ws = await Provider.GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return null;
+
+        // Automatically expire where it has been hanging around unfinished for too long.
+        if (!WorkStatus.Finished.HasFlag(ws.Status) && Runtime.UtcNow >= ws.Expiry)
+        {
+            var wsr = await ExpireAsync(id, "The work has not finished within the expiry timeframe and is assumed to have expired.", cancellationToken).ConfigureAwait(false);
+            return wsr.Value;
+        }
+
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Creates and persists a <b>new</b> <see cref="WorkState"/> with a <see cref="WorkStatus.Created"/> status.
+    /// </summary>
+    /// <param name="args">The <see cref="WorkArgs"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="WorkState"/>.</returns>
+    public Task<WorkState> CreateAsync(WorkArgs args, CancellationToken cancellationToken = default) => _invoker.InvokeAsync(this, async (_, cancellationToken) =>
+    {
+        args.ThrowIfNull();
+        var now = Runtime.UtcNow;
+
+        var ws = new WorkState()
+        {
+            Id = args.Id,
+            TypeName = args.TypeName.ThrowIfNullOrEmpty(),
+            Status = WorkStatus.Created,
+            Created = now,
+            Expiry = now.Add(args.Expiry ?? ExpiryTimeSpan),
+            User = args.User,
+            TraceParent = args.TraceParent,
+            TraceState = args.TraceState
+        };
+
+        if (ws.User is null && ExecutionContext.TryGetCurrent(out var ec))
+            ws.User = ec.User;
+
+        if (string.IsNullOrEmpty(args.TraceParent) && Activity.Current is not null)
+        {
+            args.TraceParent = Activity.Current.Id;
+            args.TraceState = Activity.Current.TraceStateString;
+        }
+
+        await Provider.CreateAsync(ws, cancellationToken).ConfigureAwait(false);
+
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Starts a previously <see cref="WorkStatus.Created"/> <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Starting work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> StartAsync(string id, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result<WorkState>>(this, async (_, cancellationToken) =>
+    {
+        var ws = await Provider.GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.NotFoundError();
+
+        if (WorkStatus.Finished.HasFlag(ws.Status))
+            return ws;
+
+        if (ws.Status != WorkStatus.Created)
+            throw new InvalidOperationException($"Work '{id}' cannot be started due to current status of '{ws.Status}'.");
+
+        ws.Status = WorkStatus.Started;
+        ws.Started = Runtime.UtcNow;
+
+        await Provider.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Sets a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/> to <see cref="WorkStatus.Indeterminate"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="reason">The indeterminate reason.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Setting work to indeterminate that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> IndeterminateAsync(string id, string reason, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result<WorkState>>(this, async (_, cancellationToken) =>
+    {
+        var ws = await GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.NotFoundError();
+
+        if (WorkStatus.Finished.HasFlag(ws.Status))
+            return ws;
+
+        if (!WorkStatus.InProgress.HasFlag(ws.Status))
+            throw new InvalidOperationException($"Work '{id}' cannot be set to indeterminate due to current status of '{ws.Status}'.");
+
+        ws.Status = WorkStatus.Indeterminate;
+        ws.Indeterminate = Runtime.UtcNow;
+        ws.Reason = reason.ThrowIfNullOrEmpty();
+
+        await Provider.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Completes a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Completing work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> CompleteAsync(string id, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result<WorkState>>(this, async (_, cancellationToken) =>
+    {
+        var ws = await GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.NotFoundError();
+
+        if (WorkStatus.Finished.HasFlag(ws.Status))
+            return ws;
+
+        if (!WorkStatus.InProgress.HasFlag(ws.Status))
+            throw new InvalidOperationException($"Work '{id}' cannot be completed due to current status of '{ws.Status}'.");
+
+        ws.Status = WorkStatus.Completed;
+        ws.Finished = Runtime.UtcNow;
+        ws.Reason = null;
+
+        await Provider.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Fails a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="reason">The failure reason.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Failing work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> FailAsync(string id, string reason, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result<WorkState>>(this, async (_, cancellationToken) =>
+    {
+        var ws = await GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.NotFoundError();
+
+        if (WorkStatus.Finished.HasFlag(ws.Status))
+            return ws;
+
+        if (!WorkStatus.InProgress.HasFlag(ws.Status))
+            throw new InvalidOperationException($"Work '{id}' cannot be failed due to current status of '{ws.Status}'.");
+
+        ws.Status = WorkStatus.Failed;
+        ws.Finished = Runtime.UtcNow;
+        ws.Reason = reason.ThrowIfNullOrEmpty();
+
+        await Provider.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Fails a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="exception">The unhandled <see cref="Exception"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Failing work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> FailAsync(string id, Exception exception, CancellationToken cancellationToken = default)
+        => FailAsync(id, $"Work failed due to an unexpected error: {exception.ThrowIfNull(nameof(exception)).Message}", cancellationToken);
+
+    /// <summary>
+    /// Expires a <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="reason">The cancellation reason.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Expiring work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> ExpireAsync(string id, string reason, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result<WorkState>>(this, async (_, cancellationToken) =>
+    {
+        var ws = await Provider.GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.NotFoundError();
+
+        if (WorkStatus.Finished.HasFlag(ws.Status))
+            return ws;
+
+        ws.Status = WorkStatus.Expired;
+        ws.Finished = Runtime.UtcNow;
+        ws.Reason = reason.ThrowIfNullOrEmpty();
+
+        await Provider.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Cancels a <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="reason">The cancellation reason.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The updated <see cref="WorkState"/>.</returns>
+    /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Cancelling work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
+    public Task<Result<WorkState>> CancelAsync(string id, string reason, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result<WorkState>>(this, async (_, cancellationToken) =>
+    {
+        var ws = await Provider.GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.NotFoundError();
+
+        if (WorkStatus.Finished.HasFlag(ws.Status))
+            return ws;
+
+        ws.Status = WorkStatus.Canceled;
+        ws.Finished = Runtime.UtcNow;
+        ws.Reason = reason.ThrowIfNullOrEmpty(nameof(reason));
+
+        await Provider.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
+        return ws;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Deletes a <see cref="WorkState"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <remarks>A <see cref="Result.ConflictError"/> will be returned where attempting to delete work that is not <see cref="WorkStatus.Finished"/>.</remarks>
+    public Task<Result> DeleteAsync(string id, CancellationToken cancellationToken = default) => _invoker.InvokeAsync<Result>(this, async (_, cancellationToken) =>
+    {
+        var ws = await GetAsync(id.ThrowIfNullOrEmpty(), cancellationToken).ConfigureAwait(false);
+        if (ws is null)
+            return Result.Success;
+
+        if (!WorkStatus.Finished.HasFlag(ws.Status))
+            return Result.ConflictError($"Work '{id}' can not be deleted due to current status of '{ws.Status}'; must be considered 'Finished'.");
+
+        await Provider.DeleteAsync(id, cancellationToken).ConfigureAwait(false);
+        return Result.Success;
+    }, cancellationToken);
+
+    /// <summary>
+    /// Gets the result data as <see cref="BinaryData"/> and then JSON deserializes to the specified <typeparamref name="TValue"/>.
+    /// </summary>
+    /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The deserialized value where found; otherwise, <see langword="default"/>.</returns>
+    public async Task<TValue?> GetDataValueAsync<TValue>(string id, CancellationToken cancellationToken = default)
+    {
+        var data = await GetDataAsync(id, cancellationToken).ConfigureAwait(false);
+        if (data is null)
+            return default;
+
+        return JsonSerializer.Deserialize<TValue>(data, JsonSerializerOptions);
+    }
+
+    /// <summary>
+    /// Gets the result data as a <see cref="BinaryData"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="BinaryData"/> where found; otherwise, <c>null</c>.</returns>
+    public Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken = default) => _invoker.InvokeAsync(this, (_, cancellationToken) =>
+    {
+        return Provider.GetDataAsync(id.ThrowIfNullOrEmpty(), cancellationToken);
+    });
+
+    /// <summary>
+    /// Sets the result data as the specified <paramref name="value"/> serialized as JSON.
+    /// </summary>
+    /// <typeparam name="TValue">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="value">The value to JSON serialize as the result data.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task SetDataValueAsync<TValue>(string id, TValue value, CancellationToken cancellationToken = default)
+    {
+        var bd = BinaryData.FromObjectAsJson<TValue>(value, JsonSerializerOptions);
+        await SetDataAsync(id, bd, cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Sets the result data as the specified <see cref="BinaryData"/>.
+    /// </summary>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="data">The <see cref="BinaryData"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    public async Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken = default)
+    {
+        if (await GetAsync(id, cancellationToken).ConfigureAwait(false) is null)
+            throw new ArgumentException($"Work '{id}' does not exist.", nameof(id));
+
+        await _invoker.InvokeAsync(this, async (_, cancellationToken) =>
+        {
+            await Provider.SetDataAsync(id.ThrowIfNullOrEmpty(), data.ThrowIfNull(), cancellationToken).ConfigureAwait(false);
+        }, cancellationToken).ConfigureAwait(false);
+    }
+
+    #region WithType
+
+    /// <summary>
+    /// Gets the <see cref="WorkState"/> for the specified <paramref name="typeName"/> and <paramref name="id"/>.
+    /// </summary>
+    /// <param name="typeName">The <see cref="WorkState.TypeName"/>.</param>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
+    /// <remarks>Will automatically set the <see cref="WorkState.Status"/> to <see cref="WorkStatus.Expired"/> when the work is <i>not</i> <see cref="WorkStatus.Finished"/> and has expired (see <see cref="WorkState.Expiry"/>).
+    /// <para>Additionally, the <paramref name="typeName"/> must equal the <see cref="WorkState.TypeName"/>; and, if <see cref="CheckUser"/> is <see langword="true"/> then the <see cref="WorkState.User"/> must equal the <see cref="ExecutionContext.User"/>
+    /// ensuring that the initiating user can only interact with their <see cref="WorkState"/>. Where the aforementioned does not equal then a <see langword="null"/> will be returned.</para></remarks>
+    public async Task<WorkState?> GetWithTypeAsync(string typeName, string id, CancellationToken cancellationToken = default)
+    {
+        var ws = await GetAsync(id, cancellationToken).ConfigureAwait(false);
+        if (ws is null || ws.TypeName != typeName)
+            return null;
+
+        return CheckUser && ws.User is not null && ExecutionContext.TryGetCurrent(out var ec) && ec.User is not null && ws.User != ec.User ? null : ws;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="WorkState"/> for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
+    /// <param name="id">The work identifier.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
+    /// <remarks>Will automatically set the <see cref="WorkState.Status"/> to <see cref="WorkStatus.Expired"/> when the work is <i>not</i> <see cref="WorkStatus.Finished"/> and has expired (see <see cref="WorkState.Expiry"/>).
+    /// <para>Additionally, the <typeparamref name="T"/> must equal the <see cref="WorkState.TypeName"/>; and, if <see cref="CheckUser"/> is <see langword="true"/> then the <see cref="WorkState.User"/> must equal the <see cref="ExecutionContext.User"/>
+    /// ensuring that the initiating user can only interact with their <see cref="WorkState"/>. Where the aforementioned does not equal then a <see langword="null"/> will be returned.</para></remarks>
+    public Task<WorkState?> GetWithTypeAsync<T>(string id, CancellationToken cancellationToken = default) => GetWithTypeAsync(WorkArgs.GetTypeName<T>(), id, cancellationToken);
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkOrchestratorInvoker.cs b/src/CoreEx/Hosting/Work/WorkOrchestratorInvoker.cs
new file mode 100644
index 00000000..2bfb1fe9
--- /dev/null
+++ b/src/CoreEx/Hosting/Work/WorkOrchestratorInvoker.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Hosting.Work;
+
+/// <summary>
+/// Provides the <see cref="WorkOrchestrator"/> invoker.
+/// </summary>
+[InvokerName("CoreEx.Hosting.Work.WorkOrchestrator")]
+public class WorkOrchestratorInvoker : InvokerBase<WorkOrchestrator>
+{
+    private static WorkOrchestratorInvoker? _default;
+
+    /// <summary>
+    /// Gets the default <see cref="WorkOrchestratorInvoker"/> instance.
+    /// </summary>
+    public static WorkOrchestratorInvoker Default => ExecutionContext.GetService<WorkOrchestratorInvoker>() ?? (_default ??= new WorkOrchestratorInvoker());
+}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkState.cs b/src/CoreEx/Hosting/Work/WorkState.cs
index be25a377..533ddc1a 100644
--- a/src/CoreEx/Hosting/Work/WorkState.cs
+++ b/src/CoreEx/Hosting/Work/WorkState.cs
@@ -1,77 +1,75 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Hosting.Work;
 
-using CoreEx.Entities;
-using System;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Hosting.Work
+/// <summary>
+/// Represents the status and result of a long-running <see cref="WorkOrchestrator"/>-tracked work instance.
+/// </summary>
+public class WorkState : IIdentifier<string?>
 {
+    /// <inheritdoc/>
+    /// <remarks>The identifier must be globally unique across all work types.</remarks>
+    public string? Id { get; set; }
+
     /// <summary>
-    /// Represents the status and result of a long-running <see cref="WorkStateOrchestrator"/>-tracked work instance.
+    /// Gets or sets the <see cref="WorkOrchestrator"/> type name.
     /// </summary>
-    public class WorkState : IIdentifier<string>
-    {
-        /// <inheritdoc/>
-        /// <remarks>The identifier must be globally unique across all work types.</remarks>
-        public string? Id { get; set; }
+    /// <remarks>Enables separation between one or more <see cref="WorkState"/> types.</remarks>
+    [JsonPropertyName("type")]
+    public string? TypeName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStateOrchestrator"/> type name.
-        /// </summary>
-        /// <remarks>Enables separation between one or more <see cref="WorkState"/> types.</remarks>
-        [JsonPropertyName("type")]
-        public string? TypeName { get; set; }
+    /// <summary>
+    /// Gets or sets the related entity key where applicable.
+    /// </summary>
+    public string? Key { get; set; }
 
-        /// <summary>
-        /// Gets or sets the related entity key where applicable.
-        /// </summary>
-        public string? Key { get; set; }
+    /// <summary>
+    /// Gets or sets the trace parent (defaults to see <see cref="System.Diagnostics.Activity.Id"/>).
+    /// </summary>
+    public string? TraceParent { get; set; }
 
-        /// <summary>
-        /// Gets or sets the correlation identifier.
-        /// </summary>
-        public string? CorrelationId { get; set; }
+    /// <summary>
+    /// Gets or sets the trace state (defaults to see <see cref="System.Diagnostics.Activity.TraceStateString"/>).
+    /// </summary>
+    public string? TraceState { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStatus"/>.
-        /// </summary>
-        public WorkStatus Status { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkStatus"/>.
+    /// </summary>
+    public WorkStatus Status { get; set; }
 
-        /// <summary>
-        /// Gets or sets the owning user name.
-        /// </summary>
-        /// <remarks>This provides a basic authorization-style opportunity by verifying <i>only</i> the initiating user has ongoing access.</remarks>
-        public string? UserName { get; set; }
+    /// <summary>
+    /// Gets or sets the owning <see cref="AuthenticationUser"/>.
+    /// </summary>
+    /// <remarks>This provides a basic authorization-style opportunity by verifying <i>only</i> the initiating user has ongoing access.</remarks>
+    public AuthenticationUser? User { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStatus.Created"/> <see cref="DateTimeOffset"/>.
-        /// </summary>
-        public DateTimeOffset Created { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkStatus.Created"/> <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset Created { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStateOrchestrator"/> expiry <see cref="DateTimeOffset"/>.
-        /// </summary>
-        /// <remarks>Where the work has not <see cref="WorkStatus.Finished"/> by the expiry it will be automatically <see cref="WorkStatus.Expired"/>.</remarks>
-        public DateTimeOffset Expiry { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkOrchestrator"/> expiry <see cref="DateTimeOffset"/>.
+    /// </summary>
+    /// <remarks>Where the work has not <see cref="WorkStatus.Finished"/> by the expiry it will be automatically <see cref="WorkStatus.Expired"/>.</remarks>
+    public DateTimeOffset Expiry { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStatus.Started"/> <see cref="DateTimeOffset"/>.
-        /// </summary>
-        public DateTimeOffset? Started { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkStatus.Started"/> <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset? Started { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStatus.Indeterminate"/> <see cref="DateTimeOffset"/>.
-        /// </summary>
-        public DateTimeOffset? Indeterminate { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkStatus.Indeterminate"/> <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset? Indeterminate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStatus.Finished"/> <see cref="DateTimeOffset"/>.
-        /// </summary>
-        public DateTimeOffset? Finished { get; set; }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkStatus.Finished"/> <see cref="DateTimeOffset"/>.
+    /// </summary>
+    public DateTimeOffset? Finished { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStatus.Failed"/> or <see cref="WorkStatus.Expired"/> reason.
-        /// </summary>
-        public string? Reason { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the <see cref="WorkStatus.Failed"/> or <see cref="WorkStatus.Expired"/> reason.
+    /// </summary>
+    public string? Reason { get; set; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkStateArgs.cs b/src/CoreEx/Hosting/Work/WorkStateArgs.cs
deleted file mode 100644
index f955689a..00000000
--- a/src/CoreEx/Hosting/Work/WorkStateArgs.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx.Hosting.Work
-{
-    /// <summary>
-    /// Represents the <see cref="WorkStateOrchestrator.CreateAsync"/> arguments.
-    /// </summary>
-    public class WorkStateArgs(string typeName, string? id = null) : IIdentifier<string>
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="Type"/> name for the specified <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
-        /// <returns>The <see cref="Type.FullName"/>.</returns>
-        public static string GetTypeName<T>() => typeof(T).FullName ?? typeof(T).Name;
-
-        /// <summary>
-        /// Creates the <see cref="WorkStateArgs"/> using the <typeparamref name="T"/> <see cref="Type.FullName"/> as the <see cref="TypeName"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
-        /// <param name="id">The work identifier.</param>
-        /// <returns>The newly instantiated <see cref="WorkStateArgs"/>.</returns>
-        public static WorkStateArgs Create<T>(string? id = null) => new(GetTypeName<T>(), id);
-
-        /// <summary>
-        /// Gets or sets the <see cref="WorkStateOrchestrator"/> type name.
-        /// </summary>
-        /// <remarks>Enables separation between one or more <see cref="WorkState"/> types; see <see cref="WorkStateOrchestrator.GetAsync(string, string, System.Threading.CancellationToken)"/> to minimize cross-type access challenges.</remarks>
-        public string TypeName { get; } = typeName.ThrowIfNullOrEmpty(nameof(typeName));
-
-        /// <inheritdoc/>
-        /// <remarks>The <see cref="WorkState.Id"/> will default to the <see cref="WorkStateOrchestrator.IdentifierGenerator"/> <see cref="IIdentifierGenerator.GenerateIdentifierAsync{TId, TFor}"/> value.</remarks>
-        public string? Id { get; set; } = id;
-
-        /// <summary>
-        /// Gets or sets the related entity key where applicable.
-        /// </summary>
-        public string? Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the correlation identifier.
-        /// </summary>
-        /// <remarks>The <see cref="WorkState.CorrelationId"/> will default to the <see cref="ExecutionContext.CorrelationId"/> where not specified.</remarks>
-        public string? CorrelationId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the expiry <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <remarks>The <see cref="WorkState.Expiry"/> will default to the <see cref="WorkStateOrchestrator.ExpiryTimeSpan"/> where not specified.</remarks>
-        public TimeSpan? Expiry { get; set; }
-
-        /// <summary>
-        /// Gets or sets the owning user name.
-        /// </summary>
-        /// <remarks>This provides a basic authorization opportunity by verifying only the initiating user has ongoing access. This will default to <see cref="ExecutionContext.UserName"/>; otherwise, <c>null</c>.</remarks>
-        public string? UserName { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkStateOrchestrator.cs b/src/CoreEx/Hosting/Work/WorkStateOrchestrator.cs
deleted file mode 100644
index 9eb1ee64..00000000
--- a/src/CoreEx/Hosting/Work/WorkStateOrchestrator.cs
+++ /dev/null
@@ -1,381 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Hosting.Work
-{
-    /// <summary>
-    /// Represents the long-running work (see <see cref="WorkState"/>) tracking orchestrator.
-    /// </summary>
-    /// <param name="persistence">The <see cref="IWorkStatePersistence"/>.</param>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-    /// <param name="settings">The <see cref="SettingsBase"/>.</param>
-    /// <param name="identifierGenerator">The <see cref="IIdentifierGenerator"/>.</param>
-    /// <remarks>There are some basic consistency checks that occur for the methods to ensure largely correct usage (sequence of execution).</remarks>
-    public class WorkStateOrchestrator(IWorkStatePersistence persistence, SettingsBase? settings = null, IJsonSerializer? jsonSerializer = null, IIdentifierGenerator? identifierGenerator = null)
-    {
-        private TimeSpan? _expiryTimeSpan;
-
-        /// <summary>
-        /// Gets the <see cref="IWorkStatePersistence"/>.
-        /// </summary>
-        public IWorkStatePersistence Persistence = persistence.ThrowIfNull(nameof(persistence));
-
-        /// <summary>
-        /// Gets the <see cref="IIdentifierGenerator"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Entities.IdentifierGenerator"/></remarks>
-        public IIdentifierGenerator IdentifierGenerator = identifierGenerator ?? new IdentifierGenerator();
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="DefaultSettings"/>.</remarks>
-        public SettingsBase Settings = settings ?? new DefaultSettings();
-
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Json.JsonSerializer.Default"/>.</remarks>
-        public IJsonSerializer JsonSerializer = jsonSerializer ?? Json.JsonSerializer.Default;
-
-        /// <summary>
-        /// Gets or sets the work expiry <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="SettingsBase.WorkerExpiryTimeSpan"/>.</remarks>
-        public TimeSpan ExpiryTimeSpan
-        {
-            get => _expiryTimeSpan ??= Settings.WorkerExpiryTimeSpan;
-            set => _expiryTimeSpan = value;
-        }
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="WorkState.UserName"/> where not <c>null</c> where performing a <see cref="GetAsync(string, string, CancellationToken)"/> or <see cref="GetAsync{T}(string, CancellationToken)"/>.
-        /// </summary>
-        public bool CheckUserName { get; set; } = true;
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> for the specified <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Will automatically set the <see cref="WorkState.Status"/> to <see cref="WorkStatus.Expired"/> when the work is <i>not</i> <see cref="WorkStatus.Finished"/> and has expired (see <see cref="WorkState.Expiry"/>).</remarks>
-        public async Task<WorkState?> GetAsync(string id, CancellationToken cancellationToken = default)
-        {
-            var ws = await Persistence.GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return null;
-
-            // Automatically cancel where expired.
-            if (ws.Status != WorkStatus.Finished && DateTimeOffset.UtcNow >= ws.Expiry)
-            {
-                var wsr = await ExpireAsync(id, "The work has not finished within the expiry timeframe and is assumed to have expired.", cancellationToken).ConfigureAwait(false);
-                return wsr.Value;
-            }
-
-            return ws;
-        }
-
-        /// <summary>
-        /// Creates and persists a <b>new</b> <see cref="WorkState"/> with a <see cref="WorkStatus.Created"/> status.
-        /// </summary>
-        /// <param name="args">The <see cref="WorkStateArgs"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="WorkState"/>.</returns>
-        /// <remarks>The <see cref="WorkState.CorrelationId"/> will default to the <see cref="ExecutionContext.CorrelationId"/> where not specified.</remarks>
-        public async Task<WorkState> CreateAsync(WorkStateArgs args, CancellationToken cancellationToken = default)
-        {
-            args.ThrowIfNull(nameof(args));
-            var now = DateTimeOffset.UtcNow;
-            var ws = new WorkState()
-            {
-                Id = string.IsNullOrEmpty(args.Id) ? await IdentifierGenerator.GenerateIdentifierAsync<string, WorkStateOrchestrator>().ConfigureAwait(false) : args.Id,
-                TypeName = args.TypeName,
-                Key = args?.Key,
-                CorrelationId = args?.CorrelationId ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current.CorrelationId : Guid.NewGuid().ToString()),
-                Status = WorkStatus.Created,
-                Created = now,
-                Expiry = now.Add(args?.Expiry ?? ExpiryTimeSpan),
-                UserName = args?.UserName ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current.UserName : null)
-            };
-
-            await Persistence.CreateAsync(ws, cancellationToken).ConfigureAwait(false);
-
-            return ws;
-        }
-
-        /// <summary>
-        /// Starts a previously <see cref="WorkStatus.Created"/> <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> or <see cref="Result.ConflictError"/> may also be returned.</remarks>
-        public async Task<Result<WorkState>> StartAsync(string id, CancellationToken cancellationToken = default)
-        {
-            var ws = await Persistence.GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.NotFoundError();
-
-            if (ws.Status != WorkStatus.Created)
-                return Result.ConflictError($"Work '{id}' can not be started due to current status of '{ws.Status}'.");
-
-            ws.Status = WorkStatus.Started;
-            ws.Started = DateTimeOffset.UtcNow;
-
-            await Persistence.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
-            return ws;
-        }
-
-        /// <summary>
-        /// Sets a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/> to <see cref="WorkStatus.Indeterminate"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="reason">The indeterminate reason.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> or <see cref="Result.ConflictError"/> may also be returned.</remarks>
-        public async Task<Result<WorkState>> IndeterminateAsync(string id, string reason, CancellationToken cancellationToken = default)
-        {
-            var ws = await GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.NotFoundError();
-
-            if (!WorkStatus.InProgress.HasFlag(ws.Status))
-                return Result.ConflictError($"Work '{id}' can not be set to indeterminate due to current status of '{ws.Status}'.");
-
-            ws.Status = WorkStatus.Indeterminate;
-            ws.Indeterminate = DateTimeOffset.UtcNow;
-            ws.Reason = reason.ThrowIfNullOrEmpty(nameof(reason));
-
-            await Persistence.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
-            return ws;
-        }
-
-        /// <summary>
-        /// Completes a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> or <see cref="Result.ConflictError"/> may also be returned.</remarks>
-        public async Task<Result<WorkState>> CompleteAsync(string id, CancellationToken cancellationToken = default)
-        { 
-            var ws = await GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.NotFoundError();
-
-            if (!WorkStatus.InProgress.HasFlag(ws.Status))
-                return Result.ConflictError($"Work '{id}' can not be completed due to current status of '{ws.Status}'.");
-
-            ws.Status = WorkStatus.Completed;
-            ws.Finished = DateTimeOffset.UtcNow;
-            ws.Reason = null;
-
-            await Persistence.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
-            return ws;
-        }
-
-        /// <summary>
-        /// Fails a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="reason">The failure reason.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> or <see cref="Result.ConflictError"/> may also be returned.</remarks>
-        public async Task<Result<WorkState>> FailAsync(string id, string reason, CancellationToken cancellationToken = default)
-        {
-            var ws = await GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.NotFoundError();
-
-            if (!WorkStatus.InProgress.HasFlag(ws.Status))
-                return Result.ConflictError($"Work '{id}' can not be failed due to current status of '{ws.Status}'.");
-
-            ws.Status = WorkStatus.Failed;
-            ws.Finished = DateTimeOffset.UtcNow;
-            ws.Reason = reason.ThrowIfNullOrEmpty(nameof(reason));
-
-            await Persistence.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
-            return ws;
-        }
-
-        /// <summary>
-        /// Fails a previously <see cref="WorkStatus.Started"/> <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="exception">The unhandled <see cref="Exception"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> or <see cref="Result.ConflictError"/> may also be returned.</remarks>
-        public Task<Result<WorkState>> FailAsync(string id, Exception exception, CancellationToken cancellationToken = default)
-            => FailAsync(id, $"Work failed due to an error: {exception.ThrowIfNull(nameof(exception)).Message}", cancellationToken);
-
-        /// <summary>
-        /// Expires a <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="reason">The cancellation reason.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Expiring work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
-        public async Task<Result<WorkState>> ExpireAsync(string id, string reason, CancellationToken cancellationToken = default)
-        {
-            var ws = await GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.NotFoundError();
-
-            if (!WorkStatus.Finished.HasFlag(ws.Status))
-                return ws;
-
-            ws.Status = WorkStatus.Expired;
-            ws.Finished = DateTimeOffset.UtcNow;
-            ws.Reason = reason.ThrowIfNullOrEmpty(nameof(reason));
-
-            await Persistence.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
-            return ws;
-        }
-
-        /// <summary>
-        /// Cancels a <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="reason">The cancellation reason.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The updated <see cref="WorkState"/>.</returns>
-        /// <remarks>A <see cref="Result.NotFoundError"/> may also be returned. Cancelling work that has already <see cref="WorkStatus.Finished"/> will not update the <see cref="WorkStatus"/>.</remarks>
-        public async Task<Result<WorkState>> CancelAsync(string id, string reason, CancellationToken cancellationToken = default)
-        {
-            var ws = await GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.NotFoundError();
-
-            if (WorkStatus.Finished.HasFlag(ws.Status))
-                return Result.Fail($"A cancellation can not be performed when the current status is {ws.Status}.");
-
-            ws.Status = WorkStatus.Canceled;
-            ws.Finished = DateTimeOffset.UtcNow;
-            ws.Reason = reason.ThrowIfNullOrEmpty(nameof(reason));
-
-            await Persistence.UpdateAsync(ws, cancellationToken).ConfigureAwait(false);
-            return ws;
-        }
-
-        /// <summary>
-        /// Deletes a <see cref="WorkState"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>A <see cref="Result.ConflictError"/> will be returned where attempting to delete work that is not <see cref="WorkStatus.Finished"/>.</remarks>
-        public async Task<Result> DeleteAsync(string id, CancellationToken cancellationToken = default)
-        {
-            var ws = await GetAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken).ConfigureAwait(false);
-            if (ws is null)
-                return Result.Success;
-
-            if (!WorkStatus.Finished.HasFlag(ws.Status))
-                return Result.ConflictError($"Work '{id}' can not be deleted due to current status of '{ws.Status}'; must be considered 'Finished'.");
-
-            await Persistence.DeleteAsync(id, cancellationToken).ConfigureAwait(false);
-            return Result.Success;
-        }
-
-        /// <summary>
-        /// Gets the result data as <see cref="BinaryData"/> and then JSON deserializes to the specified <typeparamref name="TValue"/>.
-        /// </summary>
-        /// <typeparam name="TValue">The value <see cref="Type"/>.</typeparam>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The deserialized value where found; otherwise, <c>default</c>.</returns>
-        public async Task<TValue?> GetDataAsync<TValue>(string id, CancellationToken cancellationToken = default)
-        {
-            var data = await GetDataAsync(id, cancellationToken).ConfigureAwait(false);
-            if (data is null)
-                return default;
-
-            return JsonSerializer.Deserialize<TValue>(data);
-        }
-
-        /// <summary>
-        /// Gets the result data as a <see cref="BinaryData"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="BinaryData"/> where found; otherwise, <c>null</c>.</returns>
-        public Task<BinaryData?> GetDataAsync(string id, CancellationToken cancellationToken = default)
-            => Persistence.GetDataAsync(id.ThrowIfNullOrEmpty(nameof(id)), cancellationToken);
-
-        /// <summary>
-        /// Sets the result data as the specified <paramref name="value"/> serialized as JSON.
-        /// </summary>
-        /// <typeparam name="TValue">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="value">The value to JSON serialize as the result data.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public Task SetDataAsync<TValue>(string id, TValue value, CancellationToken cancellationToken = default)
-        {
-            var json = JsonSerializer.SerializeToBinaryData(value.ThrowIfNull(nameof(value)));
-            return SetDataAsync(id, json, cancellationToken);
-        }
-
-        /// <summary>
-        /// Sets the result data as the specified <see cref="BinaryData"/>.
-        /// </summary>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="data">The <see cref="BinaryData"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        public async Task SetDataAsync(string id, BinaryData data, CancellationToken cancellationToken = default)
-        {
-            if (await GetAsync(id, cancellationToken).ConfigureAwait(false) is null)
-                throw new ArgumentException($"Work '{id}' does not exist.", nameof(id));
-
-            await Persistence.SetDataAsync(id.ThrowIfNullOrEmpty(nameof(id)), data.ThrowIfNull(nameof(data)), cancellationToken).ConfigureAwait(false);
-        }
-
-        #region WithType
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> for the specified <paramref name="type"/> and <paramref name="id"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="WorkState.TypeName"/>.</param>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Will automatically set the <see cref="WorkState.Status"/> to <see cref="WorkStatus.Expired"/> when the work is <i>not</i> <see cref="WorkStatus.Finished"/> and has expired (see <see cref="WorkState.Expiry"/>).
-        /// <para>Additionally, the <paramref name="type"/> must equal the <see cref="WorkState.TypeName"/>; and, if <see cref="CheckUserName"/> is <c>true</c> then the <see cref="WorkState.UserName"/> must equal the <see cref="ExecutionContext.UserName"/>
-        /// ensuring that the initiating user can only interact with their <see cref="WorkState"/>. Where the aforementioned does not equal then a <c>null</c> will be returned.</para></remarks>
-        public async Task<WorkState?> GetAsync(string type, string id, CancellationToken cancellationToken = default)
-        {
-            var ws = await GetAsync(id, cancellationToken).ConfigureAwait(false);
-            if (ws is null || ws.TypeName != type)
-                return null;
-
-            if (CheckUserName && ws.UserName is not null && ws.UserName != (ExecutionContext.HasCurrent ? ExecutionContext.Current.UserName : null))
-                return null;
-
-            return ws;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="WorkState"/> for the specified <paramref name="id"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to infer the <see cref="WorkState.TypeName"/> enabling state separation.</typeparam>
-        /// <param name="id">The work identifier.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="WorkState"/> where found; otherwise, <c>null</c>.</returns>
-        /// <remarks>Will automatically set the <see cref="WorkState.Status"/> to <see cref="WorkStatus.Expired"/> when the work is <i>not</i> <see cref="WorkStatus.Finished"/> and has expired (see <see cref="WorkState.Expiry"/>).
-        /// <para>Additionally, the <typeparamref name="T"/> must equal the <see cref="WorkState.TypeName"/>; and, if <see cref="CheckUserName"/> is <c>true</c> then the <see cref="WorkState.UserName"/> must equal the <see cref="ExecutionContext.UserName"/>
-        /// ensuring that the initiating user can only interact with their <see cref="WorkState"/>. Where the aforementioned does not equal then a <c>null</c> will be returned.</para></remarks>
-        public Task<WorkState?> GetAsync<T>(string id, CancellationToken cancellationToken = default) => GetAsync(WorkStateArgs.GetTypeName<T>(), id, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Hosting/Work/WorkStatus.cs b/src/CoreEx/Hosting/Work/WorkStatus.cs
index 6300378b..aff046ed 100644
--- a/src/CoreEx/Hosting/Work/WorkStatus.cs
+++ b/src/CoreEx/Hosting/Work/WorkStatus.cs
@@ -1,66 +1,63 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Hosting.Work;
 
-namespace CoreEx.Hosting.Work
+/// <summary>
+/// Represents the long-running work status.
+/// </summary>
+public enum WorkStatus
 {
     /// <summary>
-    /// Represents the long-running work status.
+    /// Indicates that the work as been created; however, it is not yet <see cref="Started"/>.
     /// </summary>
-    public enum WorkStatus
-    {
-        /// <summary>
-        /// Indicates that the work as been created; however, it is not yet <see cref="Started"/>.
-        /// </summary>
-        Created = 1,
+    Created = 1,
 
-        /// <summary>
-        /// Indicates that the underlying work has been started and is in progress.
-        /// </summary>
-        Started = 2,
+    /// <summary>
+    /// Indicates that the underlying work has been started and is in progress.
+    /// </summary>
+    Started = 2,
 
-        /// <summary>
-        /// Indicates that the underlying work is in progress; however, the progress is indeterminate, see associated <see cref="WorkState.Reason"/> for details.
-        /// </summary>
-        /// <remarks>This may occur as a result of a possible retry of processing and as such may or may not be completed; will eventually automatically expire without explicit completion.</remarks>
-        Indeterminate = 4,
+    /// <summary>
+    /// Indicates that the underlying work is in progress; however, the progress is indeterminate, see associated <see cref="WorkState.Reason"/> for details.
+    /// </summary>
+    /// <remarks>This may occur as a result of a possible retry of processing and as such may or may not be completed; will eventually automatically expire without explicit completion.</remarks>
+    Indeterminate = 4,
 
-        /// <summary>
-        /// Indicates that the underlying work has been completed successfully.
-        /// </summary>
-        Completed = 8,
+    /// <summary>
+    /// Indicates that the underlying work has been completed successfully.
+    /// </summary>
+    Completed = 8,
 
-        /// <summary>
-        /// Indicates that the underlying work has failed.
-        /// </summary>
-        Failed = 32,
+    /// <summary>
+    /// Indicates that the underlying work has failed.
+    /// </summary>
+    Failed = 32,
 
-        /// <summary>
-        /// Indicates that the underlying work has expired.
-        /// </summary>
-        Expired = 64,
+    /// <summary>
+    /// Indicates that the underlying work has expired.
+    /// </summary>
+    Expired = 64,
 
-        /// <summary>
-        /// Indicates that the underlying work has been cancelled.
-        /// </summary>
-        Canceled = 128,
+    /// <summary>
+    /// Indicates that the underlying work has been canceled.
+    /// </summary>
+    Canceled = 128,
 
-        /// <summary>
-        /// Indicates that the underlying work is in progress; either started or indeterminate.
-        /// </summary>
-        InProgress = Started | Indeterminate,
+    /// <summary>
+    /// Indicates that the underlying work is in progress; either <see cref="Started"/> or <see cref="Indeterminate"/>.
+    /// </summary>
+    InProgress = Started | Indeterminate,
 
-        /// <summary>
-        /// Indicates that the underlying work is executing; either created or in progress.
-        /// </summary>
-        Executing = Created | InProgress,
+    /// <summary>
+    /// Indicates that the underlying work is executing; either <see cref="Created"/> or <see cref="InProgress"/>.
+    /// </summary>
+    Executing = Created | InProgress,
 
-        /// <summary>
-        /// Indicates the the underlying work has been terminated; either expired, failed or cancelled.
-        /// </summary>
-        Terminated = Expired | Failed | Canceled,
+    /// <summary>
+    /// Indicates the the underlying work has been terminated; either <see cref="Expired"/>, <see cref="Failed"/> or <see cref="Canceled"/>.
+    /// </summary>
+    Terminated = Expired | Failed | Canceled,
 
-        /// <summary>
-        /// Indicates that the underlying work has been completed, expired, failed or cancelled.
-        /// </summary>
-        Finished = Completed | Expired | Failed | Canceled
-    }
-}   
\ No newline at end of file
+    /// <summary>
+    /// Indicates that the underlying work has been <see cref="Completed"/>, <see cref="Expired"/>, <see cref="Failed"/> or <see cref="Canceled"/>.
+    /// </summary>
+    Finished = Completed | Expired | Failed | Canceled
+}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Abstractions/ProblemDetails.cs b/src/CoreEx/Http/Abstractions/ProblemDetails.cs
new file mode 100644
index 00000000..d6b92ccf
--- /dev/null
+++ b/src/CoreEx/Http/Abstractions/ProblemDetails.cs
@@ -0,0 +1,74 @@
+namespace CoreEx.Http.Abstractions;
+
+/// <summary>
+/// Represents a problem details for HTTP APIs based on <see href="https://tools.ietf.org/html/rfc7807"/>.
+/// </summary>
+/// <remarks>This is required for scenarios where there is no explicit ASP.NET Core dependencies to access the out-of-the-box <see href="https://github.com/dotnet/aspnetcore/blob/main/src/Http/Http.Abstractions/src/ProblemDetails/ProblemDetails.cs">ProblemDetails</see>.</remarks>
+public class ProblemDetails
+{
+    /// <summary>
+    /// Gets the default key used for validation errors in the <see cref="Extensions"/> dictionary.
+    /// </summary>
+    /// <remarks>See <see cref="GetValidationErrors(string?)"/>.</remarks>
+    public const string ErrorsKey = "errors";
+
+    /// <summary>
+    /// Get or sets a URI reference [RFC3986] that identifies the problem type.
+    /// </summary>
+    [JsonPropertyName("type")]
+    public string? Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets a short, human-readable summary of the problem type.
+    /// </summary>
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    /// <summary>
+    /// Gets or sets the status code representing the current state of the operation.
+    /// </summary>
+    [JsonPropertyName("status")]
+    public int? Status { get; set; }
+
+    /// <summary>
+    /// Gets or sets the detailed description or additional information associated with the object.
+    /// </summary>
+    [JsonPropertyName("detail")]
+    public string? Detail { get; set; }
+
+    /// <summary>
+    /// Gets or sets a URI reference that identifies the specific occurrence of the problem.
+    /// </summary>
+    [JsonPropertyName("instance")]
+    public string? Instance { get; set; }
+
+    /// <summary>
+    /// Gets a collection of validation errors, grouped by field name.
+    /// </summary>
+    /// <param name="extensionsKey">The <see cref="Extensions"/> key to use to retrieve the validation errors.</param>
+    /// <remarks>Each key in the dictionary represents a field or property name, and the associated value is an array of related error messages for that field.</remarks>
+    public IDictionary<string, string[]>? GetValidationErrors(string? extensionsKey = ErrorsKey) 
+        => Extensions is not null && Extensions.TryGetValue(extensionsKey ?? ErrorsKey, out var errorsObj) && errorsObj is IDictionary<string, object?> errorsDict
+            ? errorsDict.ToDictionary(kvp => kvp.Key, kvp => (kvp.Value as IEnumerable<string>)?.ToArray() ?? [])
+            : null;
+
+    /// <summary>
+    /// Gets or sets the extensions for the problem details.
+    /// </summary>
+    [JsonExtensionData]
+    public IDictionary<string, object?>? Extensions { get; set; } = new Dictionary<string, object?>(StringComparer.Ordinal);
+
+    /// <summary>
+    /// Gets the error type associated with the problem details; see <see cref="IExtendedException.ErrorType"/>.
+    /// </summary>
+    /// <remarks>This is a <see cref="CoreEx"/>-specific extension to provide additional error context.</remarks>
+    [JsonPropertyName("errorType")]
+    public string? ErrorType { get; set; }
+
+    /// <summary>
+    /// Gets the error code associated with the problem details; see <see cref="IExtendedException.ErrorCode"/>.
+    /// </summary>
+    /// <remarks>This is a <see cref="CoreEx"/>-specific extension to provide additional error context.</remarks>
+    [JsonPropertyName("errorCode")]
+    public string? ErrorCode { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Extended/ITypedHttpClientOptions.cs b/src/CoreEx/Http/Extended/ITypedHttpClientOptions.cs
deleted file mode 100644
index d2a71fe5..00000000
--- a/src/CoreEx/Http/Extended/ITypedHttpClientOptions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Http.Extended
-{
-    /// <summary>
-    /// Provides access to the <see cref="DefaultOptions"/> and <see cref="SendOptions"/>.
-    /// </summary>
-    internal interface ITypedHttpClientOptions
-    {
-        /// <summary>
-        /// Gets the default <see cref="TypedHttpClientOptions"/> used by all invocations.
-        /// </summary>
-        TypedHttpClientOptions DefaultOptions { get; }
-
-        /// <summary>
-        /// Gets the <see cref="TypedHttpClientOptions"/> used <i>per</i> <see cref="TypedHttpClientBase.SendAsync(System.Net.Http.HttpRequestMessage, System.Threading.CancellationToken)"/> invocation.
-        /// </summary>
-        TypedHttpClientOptions SendOptions { get; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="SendOptions"/> are being configured.
-        /// </summary>
-        bool HasSendOptions { get; } 
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Extended/ITypedMappedHttpClient.cs b/src/CoreEx/Http/Extended/ITypedMappedHttpClient.cs
deleted file mode 100644
index e182be5e..00000000
--- a/src/CoreEx/Http/Extended/ITypedMappedHttpClient.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-using System.Net.Http;
-
-namespace CoreEx.Http.Extended
-{
-    /// <summary>
-    /// Provides <see cref="IMapper"/> support for a typed <see cref="HttpClient"/>.
-    /// </summary>
-    public interface ITypedMappedHttpClient
-    {
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        IMapper Mapper { get; }
-
-        /// <summary>
-        /// Maps the <typeparamref name="TResponseHttp"/> value to the <typeparamref name="TResponse"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="httpResult">The <see cref="HttpResult{T}"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-        public HttpResult<TResponse> MapResponse<TResponse, TResponseHttp>(HttpResult<TResponseHttp> httpResult)
-            => httpResult.ThrowIfNull().IsSuccess
-                ? new(httpResult.Response, httpResult.BinaryContent, Mapper.Map<TResponse>(httpResult.Value, OperationTypes.Get)!)
-                : new(httpResult.Response, httpResult.BinaryContent, httpResult.Exception);
-
-        /// <summary>
-        /// Maps the <typeparamref name="TRequest"/> <paramref name="value"/> to the <typeparamref name="TRequestHttp"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="value">The request value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The mapped <typeparamref name="TRequestHttp"/> value.</returns>
-        public TRequestHttp MapRequest<TRequest, TRequestHttp>(TRequest value, OperationTypes operationType) => value is null ? default! : Mapper.Map<TRequestHttp>(value, operationType);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Extended/TypedHttpClientOptions.cs b/src/CoreEx/Http/Extended/TypedHttpClientOptions.cs
deleted file mode 100644
index bdae307e..00000000
--- a/src/CoreEx/Http/Extended/TypedHttpClientOptions.cs
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http.Extended
-{
-    /// <summary>
-    /// Represents the <see cref="TypedHttpClientBase{TSelf}"/> <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/> options.
-    /// </summary>
-    public sealed class TypedHttpClientOptions
-    {
-        private readonly TypedHttpClientOptions? _defaultOptions;
-        private readonly ITypedHttpClientOptions? _owner;
-        private List<HttpStatusCode>? _ensureStatusCodes;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedHttpClientOptions"/> class.
-        /// </summary>
-        /// <param name="defaultOptions">Optional default <see cref="TypedHttpClientOptions"/> to copy from; also copied as a result of a <see cref="Reset"/>.</param>
-        public TypedHttpClientOptions(TypedHttpClientOptions? defaultOptions = null)
-        {
-            _defaultOptions = defaultOptions;
-            if (_defaultOptions is not null)
-                Reset();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <i>Default</i> <see cref="TypedHttpClientOptions"/> class.
-        /// </summary>
-        /// <param name="owner">The <see cref="ITypedHttpClientOptions"/>.</param>
-        internal TypedHttpClientOptions(ITypedHttpClientOptions owner)
-        {
-            _owner = owner;
-            CheckDefaultNotBeingUpdatedInSendMode();
-        }
-
-        /// <summary>
-        /// Indicates whether to ensure success; see <see cref="EnsureSuccess"/>.
-        /// </summary>
-        public bool ShouldEnsureSuccess { get; private set; }
-
-        /// <summary>
-        /// Gets the list of expected status codes; see <see cref="Ensure"/>.
-        /// </summary>
-        public ReadOnlyCollection<HttpStatusCode>? ExpectedStatusCodes => _ensureStatusCodes == null ? null : new(_ensureStatusCodes);
-
-        /// <summary>
-        /// Indicates whether a <see cref="TransientException"/> should be thrown; see <see cref="ThrowTransientException"/>.
-        /// </summary>
-        public bool ShouldThrowTransientException { get; private set; }
-
-        /// <summary>
-        /// Gets the predicate that determines whether is transient; see <see cref="ThrowTransientException"/>.
-        /// </summary>
-        public Func<HttpResponseMessage?, Exception?, (bool result, string error)> IsTransientPredicate { get; private set; } = TypedHttpClientBase.IsTransient;
-
-        /// <summary>
-        /// Indicates whether a known exception is thrown; see <see cref="ThrowKnownException(bool)"/>.
-        /// </summary>
-        public bool ShouldThrowKnownException { get; private set; }
-
-        /// <summary>
-        /// Indicates whether the content should be thrown in the known exception; see <see cref="ThrowKnownException(bool)"/>.
-        /// </summary>
-        public bool ShouldThrowKnownUseContentAsMessage { get; private set; }
-
-        /// <summary>
-        /// Indicates that a <c>null/default</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> (on <see cref="HttpMethod.Get"/> only).
-        /// </summary>
-        public bool ShouldNullOnNotFound { get; private set; }
-
-        /// <summary>
-        /// Gets the function to update the <see cref="HttpRequestMessage"/> before the request is sent; see <see cref="OnBeforeRequest(Func{HttpRequestMessage, CancellationToken, Task}?)"/>.
-        /// </summary>
-        public Func<HttpRequestMessage, CancellationToken, Task>? BeforeRequest { get; private set; }
-
-        /// <summary>
-        /// Checks whether the default is being updated when in send mode which is not allowed.
-        /// </summary>
-        private void CheckDefaultNotBeingUpdatedInSendMode()
-        {
-            if (_owner is not null && _owner.HasSendOptions)
-                throw new InvalidOperationException($"The {nameof(ITypedHttpClientOptions.DefaultOptions)} can not be updated where individual {nameof(ITypedHttpClientOptions.SendOptions)} have been configured; must first perform a TypedHttpClientBase<TSelf>.SendAsync or TypedHttpClientBase<TSelf>.Reset to update.");
-        }
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="HttpResponseMessage"/> and where considered a transient error then a <see cref="TransientException"/> will be thrown.
-        /// </summary>
-        /// <param name="predicate">An optional predicate to determine whether the error is considered transient. Defaults to <see cref="TypedHttpClientBase.IsTransient(HttpResponseMessage?, Exception?)"/> where not specified.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TypedHttpClientOptions ThrowTransientException(Func<HttpResponseMessage?, Exception?, (bool result, string error)>? predicate = null)
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            ShouldThrowTransientException = true;
-            IsTransientPredicate = predicate ?? TypedHttpClientBase.IsTransient;
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="HttpResponseMessage.StatusCode"/> and where it matches one of the <i>known</i> <see cref="IExtendedException.StatusCode"/> values then that <see cref="IExtendedException"/> will be thrown.
-        /// </summary>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TypedHttpClientOptions ThrowKnownException(bool useContentAsErrorMessage = false)
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            ShouldThrowKnownException = true;
-            ShouldThrowKnownUseContentAsMessage = useContentAsErrorMessage;
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates whether to automatically perform an <see cref="HttpResponseMessage.EnsureSuccessStatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TypedHttpClientOptions EnsureSuccess()
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            ShouldEnsureSuccess = true;
-            return this;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.OK"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TypedHttpClientOptions EnsureOK() => Ensure(HttpStatusCode.OK);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.NoContent"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TypedHttpClientOptions EnsureNoContent() => Ensure(HttpStatusCode.NoContent);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.Accepted"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TypedHttpClientOptions EnsureAccepted() => Ensure(HttpStatusCode.Accepted);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.Created"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TypedHttpClientOptions EnsureCreated() => Ensure(HttpStatusCode.Created);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.NotFound"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TypedHttpClientOptions EnsureNotFound() => Ensure(HttpStatusCode.NotFound);
-
-        /// <summary>
-        /// Adds the <paramref name="statusCodes"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <param name="statusCodes">One or more <see cref="HttpStatusCode">status codes</see> to be verified.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TypedHttpClientOptions Ensure(params HttpStatusCode[] statusCodes)
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            if (statusCodes != null && statusCodes.Length > 0)
-            {
-                if (_ensureStatusCodes == null)
-                    _ensureStatusCodes = new List<HttpStatusCode>(statusCodes);
-                else
-                    _ensureStatusCodes.AddRange(statusCodes);
-            }
-
-            return this;
-        }
-
-        /// <summary>
-        /// Indicates that a <c>null/default</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> (on <see cref="HttpMethod.Get"/> only).
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TypedHttpClientOptions NullOnNotFound()
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            ShouldNullOnNotFound = true;
-            return this;
-        }
-
-        /// <summary>
-        /// Sets the function to update the <see cref="HttpRequestMessage"/> before the request is sent.
-        /// </summary>
-        /// <param name="beforeRequest">The function to update the <see cref="HttpRequestMessage"/>.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This is <see cref="Reset"/> after each invocation; see <see cref="TypedHttpClientBase.SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TypedHttpClientOptions OnBeforeRequest(Func<HttpRequestMessage, CancellationToken, Task>? beforeRequest)
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            BeforeRequest = beforeRequest;
-            return this;
-        }
-
-        /// <summary>
-        /// Resets the <see cref="TypedHttpClientOptions"/> to its default state.
-        /// </summary>
-        public void Reset()
-        {
-            CheckDefaultNotBeingUpdatedInSendMode();
-            if (_defaultOptions is null)
-            {
-                ShouldThrowTransientException = false;
-                IsTransientPredicate = TypedHttpClientBase.IsTransient;
-                ShouldThrowKnownException = false;
-                ShouldThrowKnownUseContentAsMessage = false;
-                ShouldEnsureSuccess = false;
-                _ensureStatusCodes = null;
-                ShouldNullOnNotFound = false;
-                BeforeRequest = null;
-            }
-            else
-            {
-                ShouldThrowTransientException = _defaultOptions.ShouldThrowTransientException;
-                IsTransientPredicate = _defaultOptions.IsTransientPredicate;
-                ShouldThrowKnownException = _defaultOptions.ShouldThrowKnownException;
-                ShouldThrowKnownUseContentAsMessage = _defaultOptions.ShouldThrowKnownUseContentAsMessage;
-                ShouldEnsureSuccess = _defaultOptions.ShouldEnsureSuccess;
-                _ensureStatusCodes = _defaultOptions.ExpectedStatusCodes == null ? null : new(_defaultOptions.ExpectedStatusCodes);
-                ShouldNullOnNotFound = _defaultOptions.ShouldNullOnNotFound;
-                BeforeRequest = _defaultOptions.BeforeRequest;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Extended/TypedMappedHttpClient.cs b/src/CoreEx/Http/Extended/TypedMappedHttpClient.cs
deleted file mode 100644
index 9890d86a..00000000
--- a/src/CoreEx/Http/Extended/TypedMappedHttpClient.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.Mapping;
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http.Extended
-{
-    /// <summary>
-    /// Provides a basic typed <see cref="HttpClient"/> implementation (see <see cref="TypedHttpClientCore{TSelf}"/>) that supports <see cref="HttpMethod.Head"/>, <see cref="HttpMethod.Get"/>, <see cref="HttpMethod.Post"/>, <see cref="HttpMethod.Put"/>, <see cref="HttpMethod.Patch"/> and <see cref="HttpMethod.Delete"/>.
-    /// </summary>
-    public sealed class TypedMappedHttpClient : TypedMappedHttpClientCore<TypedMappedHttpClient>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedHttpClientCore{TBase}"/>.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="mapper">The optional <see cref="IMapper"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-        /// <param name="onBeforeRequest">The optional <see cref="TypedHttpClientBase{TSelf}.OnBeforeRequest(HttpRequestMessage, CancellationToken)"/> function. Defaults to <c>null</c>.</param>
-        /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-        public TypedMappedHttpClient(HttpClient client, IMapper? mapper = null, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null, Func<HttpRequestMessage, CancellationToken, Task>? onBeforeRequest = null) 
-            : base(client, mapper, jsonSerializer, executionContext) 
-            => DefaultOptions.OnBeforeRequest(onBeforeRequest);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Extended/TypedMappedHttpClientBase.cs b/src/CoreEx/Http/Extended/TypedMappedHttpClientBase.cs
deleted file mode 100644
index 77db1126..00000000
--- a/src/CoreEx/Http/Extended/TypedMappedHttpClientBase.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http.Extended
-{
-    /// <summary>
-    /// Represents a typed <see cref="HttpClient"/> base wrapper with request/response <see cref="Mapper"/> support.
-    /// </summary>
-    /// <typeparam name="TSelf">The self <see cref="Type"/> for support fluent-style method-chaining.</typeparam>
-    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-    /// <param name="mapper">The optional <see cref="IMapper"/>.</param>
-    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-    /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-    public abstract class TypedMappedHttpClientBase<TSelf>(HttpClient client, IMapper? mapper = null, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null)
-        : TypedHttpClientBase<TSelf>(client, jsonSerializer, executionContext), ITypedMappedHttpClient where TSelf : TypedMappedHttpClientBase<TSelf>
-    {
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        public IMapper Mapper { get; } = mapper ?? ExecutionContext.GetService<IMapper>() ?? throw new ArgumentNullException(nameof(mapper));
-
-        /// <summary>
-        /// Maps the <typeparamref name="TResponseHttp"/> value to the <typeparamref name="TResponse"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="httpResult">The <see cref="HttpResult{T}"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-        protected HttpResult<TResponse> MapResponse<TResponse, TResponseHttp>(HttpResult<TResponseHttp> httpResult) => (this as ITypedMappedHttpClient).MapResponse<TResponse, TResponseHttp>(httpResult);
-
-        /// <summary>
-        /// Maps the <typeparamref name="TRequest"/> <paramref name="value"/> to the <typeparamref name="TRequestHttp"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="value">The request value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The mapped <typeparamref name="TRequestHttp"/> value.</returns>
-        protected TRequestHttp MapRequest<TRequest, TRequestHttp>(TRequest value, OperationTypes operationType) => (this as ITypedMappedHttpClient).MapRequest<TRequest, TRequestHttp>(value, operationType);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Get"/> request to the specified Uri as an asynchronous operation and deserialize the JSON <see cref="HttpResponseMessage.Content"/> to the specified <typeparamref name="TResponse"/> <see cref="Type"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> GetMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> GetMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await GetAsync<TResponseHttp>(requestUri, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        #region PostMappedAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected Task<HttpResult> PostMappedAsync<TRequest, TRequestHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected Task<HttpResult> PostMappedAsync<TRequest, TRequestHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => PostAsync(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PostAsync<TResponseHttp>(requestUri, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PostAsync<TResponseHttp>(requestUri, content, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>) and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PostMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PostMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PostAsync<TRequestHttp, TResponseHttp>(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        #endregion
-
-        #region PutMappedAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PutMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PutMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PutAsync<TResponseHttp>(requestUri, content, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected Task<HttpResult> PutMappedAsync<TRequest, TRequestHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected Task<HttpResult> PutMappedAsync<TRequest, TRequestHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => PutAsync(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>) and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PutMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PutMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-           => MapResponse<TResponse, TResponseHttp>(await PutAsync<TRequestHttp, TResponseHttp>(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        #endregion
-
-        #region PatchMappedAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PatchAsync<TResponseHttp>(requestUri, content, requestOptions, args, cancellationToken));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="json"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="json">The JSON formatted as per the selected <paramref name="patchOption"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpPatchOption patchOption, [StringSyntax(StringSyntaxAttribute.Json)] string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpPatchOption patchOption, string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PatchAsync<TResponseHttp>(requestUri, patchOption, json, requestOptions, args, cancellationToken));
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/Extended/TypedMappedHttpClientCore.cs b/src/CoreEx/Http/Extended/TypedMappedHttpClientCore.cs
deleted file mode 100644
index cdde42e6..00000000
--- a/src/CoreEx/Http/Extended/TypedMappedHttpClientCore.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http.Extended
-{
-    /// <summary>
-    /// Represents a typed <see cref="HttpClient"/> base wrapper that supports <see cref="HttpMethod.Head"/>, <see cref="HttpMethod.Get"/>, <see cref="HttpMethod.Post"/>, <see cref="HttpMethod.Put"/>, <see cref="HttpMethod.Patch"/> and <see cref="HttpMethod.Delete"/>.
-    /// </summary>
-    /// <typeparam name="TSelf">The self <see cref="Type"/> for support fluent-style method-chaining.</typeparam>
-    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-    /// <param name="mapper">The optional <see cref="IMapper"/>.</param>
-    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-    /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-    public abstract class TypedMappedHttpClientCore<TSelf>(HttpClient client, IMapper? mapper = null, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null) 
-        : TypedHttpClientCore<TSelf>(client, jsonSerializer, executionContext), ITypedMappedHttpClient where TSelf : TypedMappedHttpClientCore<TSelf>
-    {
-        /// <summary>
-        /// Gets the <see cref="IMapper"/>.
-        /// </summary>
-        public IMapper Mapper { get; } = mapper ?? ExecutionContext.GetService<IMapper>() ?? throw new ArgumentNullException(nameof(mapper));
-
-        /// <summary>
-        /// Maps the <typeparamref name="TResponseHttp"/> value to the <typeparamref name="TResponse"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="httpResult">The <see cref="HttpResult{T}"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-        protected HttpResult<TResponse> MapResponse<TResponse, TResponseHttp>(HttpResult<TResponseHttp> httpResult) => (this as ITypedMappedHttpClient).MapResponse<TResponse, TResponseHttp>(httpResult);
-
-        /// <summary>
-        /// Maps the <typeparamref name="TRequest"/> <paramref name="value"/> to the <typeparamref name="TRequestHttp"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="value">The request value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The mapped <typeparamref name="TRequestHttp"/> value.</returns>
-        protected TRequestHttp MapRequest<TRequest, TRequestHttp>(TRequest value, OperationTypes operationType) => (this as ITypedMappedHttpClient).MapRequest<TRequest, TRequestHttp>(value, operationType);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Get"/> request to the specified Uri as an asynchronous operation and deserialize the JSON <see cref="HttpResponseMessage.Content"/> to the specified <typeparamref name="TResponse"/> <see cref="Type"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> GetMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> GetMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await GetAsync<TResponseHttp>(requestUri, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        #region PostMappedAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public Task<HttpResult> PostMappedAsync<TRequest, TRequestHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public Task<HttpResult> PostMappedAsync<TRequest, TRequestHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => PostAsync(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PostAsync<TResponseHttp>(requestUri, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PostMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PostAsync<TResponseHttp>(requestUri, content, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>) and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PostMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PostMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PostAsync<TRequestHttp, TResponseHttp>(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        #endregion
-
-        #region PutMappedAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PutMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PutMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PutAsync<TResponseHttp>(requestUri, content, requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public Task<HttpResult> PutMappedAsync<TRequest, TRequestHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public Task<HttpResult> PutMappedAsync<TRequest, TRequestHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => PutAsync(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> (mapped to <typeparamref name="TRequestHttp"/>) and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TRequestHttp">The request HTTP <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PutMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PutMappedAsync<TRequest, TRequestHttp, TResponse, TResponseHttp>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PutAsync<TRequestHttp, TResponseHttp>(requestUri, MapRequest<TRequest, TRequestHttp>(value, OperationTypes.Create), requestOptions, args, cancellationToken).ConfigureAwait(false));
-
-        #endregion
-
-        #region PatchMappedAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PatchAsync<TResponseHttp>(requestUri, content, requestOptions, args, cancellationToken));
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="json"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/> (mapped from <typeparamref name="TResponseHttp"/>).
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponseHttp">The response HTTP <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="json">The JSON formatted as per the selected <paramref name="patchOption"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The mapped <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpPatchOption patchOption, [StringSyntax(StringSyntaxAttribute.Json)] string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult<TResponse>> PatchMappedAsync<TResponse, TResponseHttp>(string requestUri, HttpPatchOption patchOption, string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => MapResponse<TResponse, TResponseHttp>(await PatchAsync<TResponseHttp>(requestUri, patchOption, json, requestOptions, args, cancellationToken));
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HealthChecks/TypedHttpClientCoreHealthCheck.cs b/src/CoreEx/Http/HealthChecks/TypedHttpClientCoreHealthCheck.cs
deleted file mode 100644
index 01a72555..00000000
--- a/src/CoreEx/Http/HealthChecks/TypedHttpClientCoreHealthCheck.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-
-namespace CoreEx.Http.HealthChecks
-{
-    /// <summary>
-    /// Health check for typed <see cref="HttpClient"/> inheriting from <see cref="TypedHttpClientCore{T}"/>.
-    /// </summary>
-    public class TypedHttpClientCoreHealthCheck<T> : IHealthCheck where T : TypedHttpClientCore<T>
-    {
-        private readonly T? _client;
-        private readonly IReadOnlyDictionary<string, object> _data;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedHttpClientCoreHealthCheck{T}"/> class.
-        /// </summary>
-        public TypedHttpClientCoreHealthCheck(T client)
-        {
-            _client = client;
-            _data = new Dictionary<string, object>
-            {
-                { "host", _client?.BaseAddress?.Host ?? "unknown" }
-            };
-        }
-
-        /// <inheritdoc/>
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            if (_client == null)
-                return new HealthCheckResult(context.Registration.FailureStatus, $"Typed Http client dependency for '{typeof(T)}' not resolved.", data: _data);
-
-            try
-            {
-                var result = await _client.HealthCheckAsync(cancellationToken);
-                result.Response.EnsureSuccessStatusCode();
-                return HealthCheckResult.Healthy(data: _data);
-            }
-            catch (Exception ex)
-            {
-                return new HealthCheckResult(context.Registration.FailureStatus, exception: ex, data: _data);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HealthChecks/TypedHttpClientHealthCheck.cs b/src/CoreEx/Http/HealthChecks/TypedHttpClientHealthCheck.cs
deleted file mode 100644
index 53659d16..00000000
--- a/src/CoreEx/Http/HealthChecks/TypedHttpClientHealthCheck.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-
-namespace CoreEx.Http.HealthChecks
-{
-    /// <summary>
-    /// Health check for typed <see cref="HttpClient"/> inheriting from <see cref="TypedHttpClientBase{T}"/>.
-    /// </summary>
-    public class TypedHttpClientHealthCheck<T> : IHealthCheck where T : TypedHttpClientBase<T>
-    {
-        private readonly T? _client;
-        private readonly IReadOnlyDictionary<string, object> _data;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedHttpClientHealthCheck{T}"/> class.
-        /// </summary>
-        public TypedHttpClientHealthCheck(T client)
-        {
-            _client = client;
-            _data = new Dictionary<string, object>
-            {
-                { "host", _client?.BaseAddress?.Host ?? "unknown" }
-            };
-        }
-
-        /// <inheritdoc/>
-        public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            if (_client == null)
-                return new HealthCheckResult(context.Registration.FailureStatus, $"Typed Http client dependency for '{typeof(T)}' not resolved.", data: _data);
-
-            try
-            {
-                var result = await _client.HealthCheckAsync(cancellationToken);
-                result.Response.EnsureSuccessStatusCode();
-                return HealthCheckResult.Healthy(data: _data);
-            }
-            catch (Exception ex)
-            {
-                return new HealthCheckResult(context.Registration.FailureStatus, exception: ex, data: _data);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpArg.cs b/src/CoreEx/Http/HttpArg.cs
deleted file mode 100644
index a5c377f2..00000000
--- a/src/CoreEx/Http/HttpArg.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Json;
-using CoreEx.RefData;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Represents an <see cref="IHttpArgTypeArg"/> argument for an <see cref="HttpRequestMessage"/> where updating <see cref="HttpRequestMessage.RequestUri"/> or <see cref="HttpRequestMessage.Content"/> (body).
-    /// </summary>
-    /// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
-    /// <param name="name">The argument <see cref="IHttpArgTypeArg.Name"/>.</param>
-    /// <param name="value">The argument <see cref="Value"/>.</param>
-    /// <param name="argType">The <see cref="IHttpArgTypeArg.ArgType"/>.</param>
-    public class HttpArg<T>(string name, T value, HttpArgType argType = HttpArgType.FromUri) : IHttpArgTypeArg
-    {
-        private bool _isUsed = false;
-
-        /// <summary>
-        /// Gets the argument name.
-        /// </summary>
-        public string Name { get; } = name.ThrowIfNull(nameof(name));
-
-        /// <summary>
-        /// Gets the <see cref="HttpArgType"/> that determines how the argument is applied.
-        /// </summary>
-        public HttpArgType ArgType { get; } = argType;
-
-        /// <summary>
-        /// Gets the argument value.
-        /// </summary>
-        public T Value { get; } = value;
-
-        /// <inheritdoc/>
-        public string? ToEscapeDataString()
-        {
-            if (ArgType != HttpArgType.FromUri)
-                return null;
-
-            _isUsed = true;
-            string? str;
-            if (Value == null)
-                return null;
-            else if (Value is IReferenceData rd)
-                str = rd?.Code;
-            else if (Value is DateTime dt)
-                str = dt.ToString("o", CultureInfo.InvariantCulture);
-            else if (Value is DateTimeOffset dto)
-                str = dto.ToString("o", CultureInfo.InvariantCulture);
-            else if (Value is bool b)
-                str = b.ToString().ToLowerInvariant();
-            else if (Value is IFormattable fmt)
-                str = fmt.ToString(null, CultureInfo.InvariantCulture);
-            else
-                str = Value.ToString();
-
-            return str == null ? null : Uri.EscapeDataString(str);
-        }
-
-        /// <inheritdoc/>
-        public void AddToQueryString(NameValueCollection queryString, IJsonSerializer? jsonSerializer = null)
-        {
-            if (_isUsed || ArgType == HttpArgType.FromBody || Comparer<T>.Default.Compare(Value, default!) == 0)
-                return;
-
-            if (AddNameValue(queryString, Name, Value))
-                return;
-
-            if (Value is IEnumerable enumerable)
-            {
-                foreach (var v in enumerable)
-                {
-                    if (v != null)
-                    {
-                        if (!AddNameValue(queryString, Name, v) && (ArgType == HttpArgType.FromUriUseProperties || ArgType == HttpArgType.FromUriUsePropertiesAndPrefix))
-                            AddComplexType(queryString, Value, jsonSerializer);
-                    }
-                }
-
-                return;
-            }
-
-            if (ArgType == HttpArgType.FromUriUseProperties || ArgType == HttpArgType.FromUriUsePropertiesAndPrefix)
-                AddComplexType(queryString, Value, jsonSerializer);
-        }
-
-        /// <summary>
-        /// Adds the named value.
-        /// </summary>
-        private static bool AddNameValue(NameValueCollection queryString, string name, object? value)
-        {
-            if (value == null)
-                return true;
-
-            if (value is string str)
-                return AddNameValue(queryString, name, str);
-
-            if (value is char ch)
-                return AddNameValue(queryString, name, ch.ToString());
-
-            if (value is DateTime dt)
-                return AddNameValue(queryString, name, dt.ToString("o", CultureInfo.InvariantCulture));
-
-            if (value is DateTimeOffset dto)
-                return AddNameValue(queryString, name, dto.ToString("o", CultureInfo.InvariantCulture));
-
-            if (value is IReferenceData rd && rd.Code is not null)
-                return AddNameValue(queryString, name, rd.Code);
-
-            if (value is Enum en)
-                return AddNameValue(queryString, name, en.ToString());
-
-            if (value is bool bo)
-                return AddNameValue(queryString, name, bo.ToString().ToLowerInvariant());
-
-            if (value is IFormattable fmt)
-                return AddNameValue(queryString, name, fmt.ToString(null, CultureInfo.InvariantCulture));
-
-            return false;
-        }
-
-        /// <summary>
-        /// Adds the name and value
-        /// </summary>
-        private static bool AddNameValue(NameValueCollection queryString, string name, string value)
-        {
-            queryString.Add(name, value);
-            return true;
-        }
-
-        /// <summary>
-        /// Adds the complex type to the query string.
-        /// </summary>
-        private void AddComplexType(NameValueCollection queryString, object? value, IJsonSerializer? jsonSerializer)
-        {
-            if (value == null)
-                return;
-
-            var tr = TypeReflector.GetReflector(new TypeReflectorArgs(jsonSerializer), value.GetType());
-            foreach (var pr in tr.GetProperties())
-            {
-                var pv = pr.PropertyInfo.GetValue(value, null);
-                var name = $"{(ArgType == HttpArgType.FromUriUsePropertiesAndPrefix ? $"{Name}." : "")}{pr.JsonName ?? pr.Name}";
-                if (pv is not string && pv is IEnumerable ie)
-                {
-                    foreach (var iv in ie)
-                    {
-                        if (!AddNameValue(queryString, name, iv))
-                            throw new InvalidOperationException($"Type '{tr.Type.Name}' cannot be serialized to a URI; Type should be passed using Request Body [FromBody] given complexity.");
-                    }
-                }
-                else
-                {
-                    if (!AddNameValue(queryString, name, pv))
-                        throw new InvalidOperationException($"Type '{tr.Type.Name}' cannot be serialized to a URI; Type should be passed using Request Body [FromBody] given complexity.");
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public Task ModifyHttpRequestAsync(HttpRequestMessage request, IJsonSerializer jsonSerializer, CancellationToken cancellationToken = default)
-        {
-            if (request.Content != null || ArgType != HttpArgType.FromBody || Value == null)
-                return Task.CompletedTask;
-
-            request.Content = new StringContent(jsonSerializer.Serialize(Value, JsonWriteFormat.None), Encoding.UTF8, MediaTypeNames.Application.Json);
-            return Task.CompletedTask;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpArgType.cs b/src/CoreEx/Http/HttpArgType.cs
deleted file mode 100644
index 5ade5982..00000000
--- a/src/CoreEx/Http/HttpArgType.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Defines the <see cref="HttpArg{T}.ArgType"/>.
-    /// </summary>
-    public enum HttpArgType
-    {
-        /// <summary>
-        /// Indicates the argument should be passed in the body.
-        /// </summary>
-        FromBody,
-
-        /// <summary>
-        /// Indicates the argument should be passed as part of the URI query string.
-        /// </summary>
-        FromUri,
-
-        /// <summary>
-        /// Indicates the properties of the argument should be passed as part of the URI query string with no prefix.
-        /// </summary>
-        FromUriUseProperties,
-
-        /// <summary>
-        /// Indicates the properties of the argument should be passed as part of the URI query string with a prefix.
-        /// </summary>
-        FromUriUsePropertiesAndPrefix
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpArgs.cs b/src/CoreEx/Http/HttpArgs.cs
deleted file mode 100644
index c9ae5736..00000000
--- a/src/CoreEx/Http/HttpArgs.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides <see cref="IHttpArg"/> helpers.
-    /// </summary>
-    public static class HttpArgs
-    {
-        /// <summary>
-        /// Creates an <see cref="IHttpArg"/> <see cref="IEnumerable{T}"/> from the passed <paramref name="args"/>.
-        /// </summary>
-        /// <param name="args">The <see cref="IHttpArg"/> arguments.</param>
-        /// <returns>The <see cref="IHttpArg"/> <see cref="IEnumerable{T}"/>.</returns>
-        public static IEnumerable<IHttpArg> Create(params IHttpArg[] args) => args.AsEnumerable();
-
-        /// <summary>
-        /// Includes <paramref name="paging"/> by updating <paramref name="requestOptions"/> <see cref="HttpRequestOptions.Paging"/>.
-        /// </summary>
-        /// <param name="requestOptions">The <see cref="HttpRequestOptions"/> (can be <c>null</c>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The <see cref="HttpRequestOptions"/>.</returns>
-        /// <remarks>Will create a new <see cref="HttpRequestOptions"/> where the <paramref name="requestOptions"/> is <c>null</c> and the corresponding <paramref name="paging"/> is not <c>null</c>; otherwise, overrides the 
-        /// existing <paramref name="requestOptions"/> <see cref="HttpRequestOptions.Paging"/>.</remarks>
-        public static HttpRequestOptions? IncludePaging(this HttpRequestOptions? requestOptions, PagingArgs? paging)
-        {
-            if (requestOptions == null && paging == null)
-                return requestOptions;
-
-            requestOptions ??= new HttpRequestOptions();
-            requestOptions.WithPaging(paging);
-            return requestOptions;
-        }
-
-        /// <summary>
-        /// Includes the <paramref name="query"/> by updating <paramref name="requestOptions"/> <see cref="HttpRequestOptions.Query"/>.
-        /// </summary>
-        /// <param name="requestOptions">The <see cref="HttpRequestOptions"/> (can be <c>null</c>).</param>
-        /// <param name="query">The <see cref="QueryArgs"/>.</param>
-        /// <returns>The <see cref="HttpRequestOptions"/>.</returns>
-        /// <remarks>Will create a new <see cref="HttpRequestOptions"/> where the <paramref name="requestOptions"/> is <c>null</c> and the corresponding <paramref name="query"/> is not <c>null</c>; otherwise, overrides the 
-        /// existing <paramref name="requestOptions"/> <see cref="HttpRequestOptions.Query"/>.</remarks>
-        public static HttpRequestOptions? IncludeQuery(this HttpRequestOptions? requestOptions, QueryArgs? query)
-        {
-            if (requestOptions == null && query == null)
-                return requestOptions;
-
-            requestOptions ??= new HttpRequestOptions();
-            requestOptions.WithQuery(query);
-            return requestOptions;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpConsts.cs b/src/CoreEx/Http/HttpConsts.cs
deleted file mode 100644
index 2950cbdd..00000000
--- a/src/CoreEx/Http/HttpConsts.cs
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System.Collections.Generic;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides HTTP configurable consts for Headers and QueryString.
-    /// </summary>
-    public static class HttpConsts
-    {
-        #region HeaderName
-
-        /// <summary>
-        /// Gets or sets the header name for the exception error type value.
-        /// </summary>
-        public static string ErrorTypeHeaderName { get; set; } = "x-error-type";
-
-        /// <summary>
-        /// Gets or sets the header name for the exception error code value.
-        /// </summary>
-        public static string ErrorCodeHeaderName { get; set; } = "x-error-code";
-
-        /// <summary>
-        ///  Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingArgs.Page"/>.
-        /// </summary>
-        public static string PagingPageNumberHeaderName { get; set; } = "x-paging-page-number";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingArgs.Take"/>.
-        /// </summary>
-        public static string PagingPageSizeHeaderName { get; set; } = "x-paging-page-size";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingArgs.Skip"/>.
-        /// </summary>
-        public static string PagingSkipHeaderName { get; set; } = "x-paging-skip";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingArgs.Take"/>.
-        /// </summary>
-        public static string PagingTakeHeaderName { get; set; } = "x-paging-take";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingArgs.Token"/>.
-        /// </summary>
-        public static string PagingTokenHeaderName { get; set; } = "x-paging-token";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingResult.TotalCount"/>.
-        /// </summary>
-        public static string PagingTotalCountHeaderName { get; set; } = "x-paging-total-count";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="PagingResult"/> <see cref="PagingResult.TotalPages"/>.
-        /// </summary>
-        public static string PagingTotalPagesHeaderName { get; set; } = "x-paging-total-pages";
-
-        /// <summary>
-        /// Gets or sets the header name for the messages.
-        /// </summary>
-        public static string MessagesHeaderName { get; set; } = "x-messages";
-
-        /// <summary>
-        /// Gets or sets the header name for the <see cref="ExecutionContext.CorrelationId"/>.
-        /// </summary>
-        public static string CorrelationIdHeaderName { get; set; } = "x-correlation-id";
-
-        #endregion
-
-        #region QueryStringName
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Query"/> <see cref="QueryArgs.IncludeFields"/> query string name.
-        /// </summary>
-        public static string IncludeFieldsQueryStringName { get; set; } = "$fields";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Query"/> <see cref="QueryArgs.IncludeFields"/> query string name.
-        /// </summary>
-        public static string ExcludeFieldsQueryStringName { get; set; } = "$exclude";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Paging"/> <see cref="PagingArgs.Page"/> query string name.
-        /// </summary>
-        public static string PagingArgsPageQueryStringName { get; set; } = "$page";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Paging"/> <see cref="PagingArgs.Size"/> query string name.
-        /// </summary>
-        public static string PagingArgsSizeQueryStringName { get; set; } = "$size";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Paging"/> <see cref="PagingArgs.Skip"/> query string name.
-        /// </summary>
-        public static string PagingArgsSkipQueryStringName { get; set; } = "$skip";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Paging"/> <see cref="PagingArgs.Take"/> query string name.
-        /// </summary>
-        public static string PagingArgsTakeQueryStringName { get; set; } = "$take";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Paging"/> <see cref="PagingArgs.Token"/> query string name.
-        /// </summary>
-        public static string PagingArgsTokenQueryStringName { get; set; } = "$token";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Paging"/> <see cref="PagingArgs.IsGetCount"/> query string name.
-        /// </summary>
-        public static string PagingArgsCountQueryStringName { get; set; } = "$count";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Query"/> <see cref="QueryArgs.Filter"/> query string name.
-        /// </summary>
-        public static string QueryArgsFilterQueryStringName { get; set; } = "$filter";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.Query"/> <see cref="QueryArgs.OrderBy"/> query string name.
-        /// </summary>
-        public static string QueryArgsOrderByQueryStringName { get; set; } = "$orderby";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.IncludeText"/> query string name.
-        /// </summary>
-        /// <remarks>See <see cref="ExecutionContext.IsTextSerializationEnabled"/>.</remarks>
-        public static string IncludeTextQueryStringName { get; set; } = "$text";
-
-        /// <summary>
-        /// Gets or sets the <see cref="HttpRequestOptions.IncludeInactive"/> query string name.
-        /// </summary>
-        public static string IncludeInactiveQueryStringName { get; set; } = "$inactive";
-
-        #endregion
-
-        #region QueryStringNames
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="PagingArgs.Page"/> query string names.
-        /// </summary>
-        public static List<string> PagingArgsPageQueryStringNames { get; set; } = new List<string>(["$page", "$pageNumber", "paging-page"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="PagingArgs.Skip"/> query string names.
-        /// </summary>
-        public static List<string> PagingArgsSkipQueryStringNames { get; set; } = new List<string>(["$skip", "$offset", "paging-skip"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="PagingArgs.Take"/> query string names.
-        /// </summary>
-        public static List<string> PagingArgsTakeQueryStringNames { get; set; } = new List<string>(["$take", "$top", "$size", "$pageSize", "$limit", "paging-take", "paging-size", "paging-limit"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="PagingArgs.Take"/> query string names.
-        /// </summary>
-        public static List<string> PagingArgsTokenQueryStringNames { get; set; } = new List<string>(["$token", "$after", "$cursor", "paging-token", "paging-after", "paging-cursor"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="PagingArgs.IsGetCount"/> query string names.
-        /// </summary>
-        public static List<string> PagingArgsCountQueryStringNames { get; set; } = new List<string>(["$count", "$totalCount", "paging-count"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="QueryArgs.Filter"/> query string names.
-        /// </summary>
-        public static List<string> QueryArgsFilterQueryStringNames { get; set; } = new List<string>(["$filter"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="QueryArgs.OrderBy"/> query string names.
-        /// </summary>
-        public static List<string> QueryArgsOrderByQueryStringNames { get; set; } = new List<string>(["$orderby", "$order-by"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="HttpRequestOptions.Query"/> <see cref="QueryArgs.IncludeFields"/> query string names.
-        /// </summary>
-        public static List<string> IncludeFieldsQueryStringNames { get; set; } = new List<string>(["$fields", "$includeFields", "$include", "include-fields"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible<see cref="HttpRequestOptions.Query"/> <see cref="QueryArgs.ExcludeFields"/> query string names.
-        /// </summary>
-        public static List<string> ExcludeFieldsQueryStringNames { get; set; } = new List<string>(["$excludeFields", "$exclude", "exclude-fields"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="HttpRequestOptions.IncludeText"/> query string names.
-        /// </summary>
-        public static List<string> IncludeTextQueryStringNames { get; set; } = new List<string>(["$text", "$includeText", "include-text"]);
-
-        /// <summary>
-        /// Gets or sets the list of possible <see cref="HttpRequestOptions.IncludeInactive"/> query string names.
-        /// </summary>
-        public static List<string> IncludeInactiveQueryStringNames { get; set; } = new List<string>(["$inactive", "$includeInactive", "include-inactive"]);
-
-        #endregion
-
-        #region MediaTypeName
-
-        /// <summary>
-        /// Gets the <see cref="HttpPatchOption.JsonPatch"/> media type name.
-        /// </summary>
-        public const string JsonPatchMediaTypeName = "application/json-patch+json";
-
-        /// <summary>
-        /// Gets the <see cref="HttpPatchOption.MergePatch"/> media type name.
-        /// </summary>
-        public const string MergePatchMediaTypeName = "application/merge-patch+json";
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpExtensions.cs b/src/CoreEx/Http/HttpExtensions.cs
deleted file mode 100644
index 26ebbae8..00000000
--- a/src/CoreEx/Http/HttpExtensions.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Http.Extended;
-using CoreEx.Json;
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// HTTP-related Extension methods.
-    /// </summary>
-    public static class HttpExtensions
-    {
-        /// <summary>
-        /// Creates a <see cref="TypedHttpClient"/> for the <paramref name="httpClient"/>.
-        /// </summary>
-        /// <param name="httpClient">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-        /// <param name="onBeforeRequest">The optional <see cref="TypedHttpClientBase{TSelf}.OnBeforeRequest(HttpRequestMessage, CancellationToken)"/> function. Defaults to <c>null</c>.</param>
-        /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defauls.</remarks>
-        /// <returns>The <see cref="TypedHttpClient"/>.</returns>
-        public static TypedHttpClient CreateTypedClient(this HttpClient httpClient, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null, Func<HttpRequestMessage, CancellationToken, Task>? onBeforeRequest = null)
-            => new(httpClient, jsonSerializer, executionContext, onBeforeRequest);
-
-        /// <summary>
-        /// Creates a <see cref="TypedMappedHttpClient"/> for the <paramref name="httpClient"/>.
-        /// </summary>
-        /// <param name="httpClient">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="mapper">The <see cref="IMapper"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-        /// <param name="onBeforeRequest">The optional <see cref="TypedHttpClientBase{TSelf}.OnBeforeRequest(HttpRequestMessage, CancellationToken)"/> function. Defaults to <c>null</c>.</param>
-        /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defauls.</remarks>
-        /// <returns>The <see cref="TypedHttpClient"/>.</returns>
-        public static TypedMappedHttpClient CreateTypedMappedClient(this HttpClient httpClient, IMapper? mapper = null, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null, Func<HttpRequestMessage, CancellationToken, Task>? onBeforeRequest = null)
-            => new(httpClient, mapper, jsonSerializer, executionContext, onBeforeRequest);
-
-        /// <summary>
-        /// Applies the <see cref="HttpRequestOptions"/> to the <see cref="HttpRequestMessage"/>.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="requestOptions">The <see cref="HttpRequestOptions"/>.</param>
-        /// <returns>The <see cref="HttpRequestMessage"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>This will automatically invoke <see cref="ApplyETag(HttpRequestMessage, string)"/> where there is an <see cref="HttpRequestOptions.ETag"/> value.</remarks>
-        public static HttpRequestMessage ApplyRequestOptions(this HttpRequestMessage httpRequest, HttpRequestOptions? requestOptions)
-        {
-            httpRequest.ThrowIfNull(nameof(httpRequest));
-
-            if (requestOptions == null)
-                return httpRequest;
-
-            // Apply the ETag header.
-            ApplyETag(httpRequest, requestOptions.ETag);
-
-            // Apply updates to the query string.
-            var qs = requestOptions.AddToQueryString(httpRequest.RequestUri?.Query);
-            var ub = httpRequest.RequestUri == null ? new UriBuilder() : new UriBuilder(httpRequest.RequestUri);
-            if (qs is not null)
-                ub.Query = qs;
-
-            httpRequest.RequestUri = ub.Uri;
-            return httpRequest;
-        }
-
-        /// <summary>
-        /// Applies the <i>ETag</i> to the <see cref="HttpRequestMessage"/> <see cref="HttpRequestMessage.Headers"/> as an <see cref="HttpRequestHeader.IfNoneMatch"/> (where <see cref="HttpRequestMessage.Method"/> is <see cref="HttpMethod.Get"/>
-        /// or <see cref="HttpMethod.Head"/>); otherwise, an <see cref="HttpRequestHeader.IfMatch"/>.
-        /// </summary>
-        /// <param name="httpRequest">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="etag">The <i>ETag</i> value.</param>
-        /// <returns>The <see cref="HttpRequestMessage"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Automatically adds quoting to be ETag format compliant and sets the ETag as weak ('<c>W/</c>').</remarks>
-        public static HttpRequestMessage ApplyETag(this HttpRequestMessage httpRequest, string? etag)
-        {
-            // Apply the ETag header.
-            if (!string.IsNullOrEmpty(etag))
-            {
-                if (httpRequest.Method == HttpMethod.Get || httpRequest.Method == HttpMethod.Head)
-                    httpRequest.Headers.IfNoneMatch.Add(new System.Net.Http.Headers.EntityTagHeaderValue(ETagGenerator.FormatETag(etag)!, true));
-                else
-                    httpRequest.Headers.IfMatch.Add(new System.Net.Http.Headers.EntityTagHeaderValue(ETagGenerator.FormatETag(etag)!, true));
-            }
-
-            return httpRequest;
-        }
-
-        /// <summary>
-        /// Trys to get the <see cref="PagingResult"/> from the <paramref name="response"/> headers.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="result">The <see cref="PagingResult"/> where found.</param>
-        /// <returns><c>true</c> where the <see cref="PagingResult"/> is found; otherwise, <c>false</c>.</returns>
-        public static bool TryGetPagingResult(this HttpResponseMessage response, [NotNullWhen(true)] out PagingResult? result)
-        {
-            var skip = ParseLongValue(TryGetHeaderValue(response, HttpConsts.PagingSkipHeaderName, out var vs) ? vs : null);
-            var page = skip.HasValue ? null : ParseLongValue(TryGetHeaderValue(response, HttpConsts.PagingPageNumberHeaderName, out var vpn) ? vpn : null);
-            var token = TryGetHeaderValue(response, HttpConsts.PagingTokenHeaderName, out var vtk) ? vtk : null;
-
-            if (!string.IsNullOrEmpty(token))
-                result = new PagingResult(PagingArgs.CreateTokenAndTake(token, ParseLongValue(TryGetHeaderValue(response, HttpConsts.PagingTakeHeaderName, out var vt) ? vt : null)));
-            else if (skip.HasValue)
-                result = new PagingResult(PagingArgs.CreateSkipAndTake(skip.Value, ParseLongValue(TryGetHeaderValue(response, HttpConsts.PagingTakeHeaderName, out var vt) ? vt : null)));
-            else if (page.HasValue)
-                result = new PagingResult(PagingArgs.CreatePageAndSize(page.Value, ParseLongValue(TryGetHeaderValue(response, HttpConsts.PagingPageSizeHeaderName, out var vps) ? vps : null)));
-            else
-            {
-                result = null;
-                return false;
-            }
-
-            result.TotalCount = ParseLongValue(TryGetHeaderValue(response, HttpConsts.PagingTotalCountHeaderName, out var vtc) ? vtc : null);
-            return true;
-        }
-
-        /// <summary>
-        /// Trys to get the first named <see cref="HttpResponseMessage.Headers"/> value from the <paramref name="response"/>.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="name">The header name.</param>
-        /// <param name="value">The header value where found.</param>
-        /// <returns><c>true</c> where the header value is found; otherwise, <c>false</c>.</returns>
-        public static bool TryGetHeaderValue(this HttpResponseMessage response, string name, [NotNullWhen(true)] out string? value)
-        {
-            value = null;
-            if (response == null || response.Headers == null || string.IsNullOrEmpty(name))
-                return false;
-
-            if (response.Headers.TryGetValues(name, out IEnumerable<string>? values))
-            {
-                value = values.First();
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Converts the <see cref="HttpResponseMessage"/> to the equivalent <see cref="IExtendedException"/> based on the <see cref="HttpStatusCode"/>.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IExtendedException"/> where applicable; otherwise, <c>null</c>.</returns>
-        public async static Task<IExtendedException?> ToExtendedExceptionAsync(this HttpResponseMessage response, bool useContentAsErrorMessage = true, CancellationToken cancellationToken = default)
-        {
-            if (response == null || response.IsSuccessStatusCode)
-                return null;
-
-#if NETSTANDARD2_1
-            var content = response.Content == null ? null : await response.Content.ReadAsStringAsync().ConfigureAwait(false);
-#else
-            var content = response.Content == null ? null : await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-#endif
-            if (string.IsNullOrEmpty(content))
-                content = $"Response status code does not indicate success: {(int)response.StatusCode} ({(string.IsNullOrEmpty(response.ReasonPhrase) ? response.StatusCode : response.ReasonPhrase)}).";
-
-            return HttpResultBase.CreateExtendedException(response, content, useContentAsErrorMessage);
-        }
-
-        /// <summary>
-        /// Parses the value as a <see cref="long"/>.
-        /// </summary>
-        public static long? ParseLongValue(string? value)
-        {
-            if (value == null)
-                return null;
-
-            if (!long.TryParse(value, out long val))
-                return null;
-
-            return val;
-        }
-
-        /// <summary>
-        /// Parses the value as a <see cref="bool"/>.
-        /// </summary>
-        public static bool ParseBoolValue(string? value)
-        {
-            if (value == null)
-                return false;
-
-            if (!bool.TryParse(value, out bool val))
-                return false;
-
-            return val;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpNames.cs b/src/CoreEx/Http/HttpNames.cs
new file mode 100644
index 00000000..61835447
--- /dev/null
+++ b/src/CoreEx/Http/HttpNames.cs
@@ -0,0 +1,102 @@
+namespace CoreEx.Http;
+
+/// <summary>
+/// Provides the standard names for HTTP headers and query strings.
+/// </summary>
+public static class HttpNames
+{
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.Skip"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string PagingSkipQueryStringName { get; set; } = "$skip";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.Take"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string PagingTakeQueryStringName { get; set; } = "$take";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.IsCountRequested"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string PagingCountQueryStringName { get; set; } = "$count";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.Skip"/> <see cref="HttpResponseMessage.Headers"/> name.
+    /// </summary>
+    public static string PagingSkipHeaderName { get; set; } = "X-Paging-Skip";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingArgs.Take"/> <see cref="HttpResponseMessage.Headers"/> name.
+    /// </summary>
+    public static string PagingTakeHeaderName { get; set; } = "X-Paging-Take";
+
+    /// <summary>
+    /// Gets or sets the <see cref="PagingResult.TotalCount"/> <see cref="HttpResponseMessage.Headers"/> name.
+    /// </summary>
+    public static string PagingTotalCountHeaderName { get; set; } = "X-Paging-Total-Count";
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryArgs.Filter"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string QueryFilterQueryStringName { get; set; } = "$filter";
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryArgs.OrderBy"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string QueryOrderByQueryStringName { get; set; } = "$orderby";
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryArgs.IncludeFields"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string IncludeFieldsQueryStringName { get; set; } = "$fields";
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryArgs.ExcludeFields"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string ExcludeFieldsQueryStringName { get; set; } = "$exclude";
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryArgs.IncludeText"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string IncludeTextQueryStringName { get; set; } = "$text";
+
+    /// <summary>
+    /// Gets or sets the <see cref="QueryArgs.IncludeInactive"/> <see cref="HttpRequestMessage.RequestUri"/> <see cref="Uri.Query"/> name.
+    /// </summary>
+    public static string IncludeInactiveQueryStringName { get; set; } = "$inactive";
+
+    /// <summary>
+    /// Gets or sets the <see cref="IExtendedException.ErrorType"/> problem extensions name.
+    /// </summary>
+    public static string ErrorTypeName { get; set; } = "errorType";
+
+    /// <summary>
+    /// Gets or sets the <see cref="IExtendedException.ErrorCode"/> problem extensions name.
+    /// </summary>
+    public static string ErrorCodeName { get; set; } = "errorCode";
+
+    /// <summary>
+    /// Gets or sets the tracing <see cref="Activity.Id"/> problem extensions name.
+    /// </summary>
+    public static string TraceIdName { get; set; } = "traceId";
+
+    /// <summary>
+    /// Gets or sets the <see cref="MessageType.Warning"/> <see cref="MessageItem"/>(s) <see cref="HttpResponseMessage.Headers"/> name.
+    /// </summary>
+    public static string WarningMessagesHeaderName { get; set; } = "X-Warning-Messages";
+
+    /// <summary>
+    /// Getsor sets  the <see cref="MessageType.Info"/> <see cref="MessageItem"/>(s) <see cref="HttpResponseMessage.Headers"/> name.
+    /// </summary>
+    public static string InfoMessagesHeaderName { get; set; } = "X-Info-Messages";
+
+    /// <summary>
+    /// Gets the JSON Merge Patch <see cref="MediaTypeNames.Application"/> name as per <see href="https://tools.ietf.org/html/rfc7396"/>.
+    /// </summary>
+    public const string MergePatchJsonMediaTypeName = "application/merge-patch+json";
+
+    /// <summary>
+    /// Gets the Idempotency Key <see cref="HttpRequestMessage.Headers"/> name.
+    /// </summary>
+    public const string IdempotencyKeyHeaderName = "Idempotency-Key";
+}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpPatchOption.cs b/src/CoreEx/Http/HttpPatchOption.cs
deleted file mode 100644
index fa8d0d84..00000000
--- a/src/CoreEx/Http/HttpPatchOption.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Net.Http;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Specifies the <see cref="HttpMethod.Patch"/> option.
-    /// </summary>
-    public enum HttpPatchOption
-    {
-        /// <summary>
-        /// Indicates that no valid patch option has been specified.
-        /// </summary>
-        NotSpecified,
-
-        /// <summary>
-        /// Indicates a <b>json-patch</b>. Requires a Content-Type of 'application/json-patch+json'. See https://tools.ietf.org/html/rfc6902 for more details.
-        /// </summary>
-        JsonPatch,
-
-        /// <summary>
-        /// Indicates a <b>merge-patch</b>. Requires a Content-Type of 'application/merge-patch+json'. See https://tools.ietf.org/html/rfc7396 for more details.
-        /// </summary>
-        MergePatch
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpRequestOptions.cs b/src/CoreEx/Http/HttpRequestOptions.cs
deleted file mode 100644
index 6cd811bd..00000000
--- a/src/CoreEx/Http/HttpRequestOptions.cs
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.RefData;
-using System;
-using System.Collections.Specialized;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Web;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Represents additional (optional) request options for an <see cref="HttpRequestMessage"/>.
-    /// </summary>
-    /// <remarks>Usage assumes that the HTTP endpoint supports and actions accordingly; i.e. by sending there is no guarantee that the desired outcome will occur as selected.</remarks>
-    public class HttpRequestOptions
-    {
-        /// <summary>
-        /// Creates a new instance of the <see cref="HttpRequestOptions"/> class.
-        /// </summary>
-        /// <param name="paging">The optional <see cref="PagingArgs"/>.</param>
-        /// <returns>The <see cref="HttpRequestOptions"/>.</returns>
-        public static HttpRequestOptions Create(PagingArgs? paging = null) => new() { Paging = paging };
-
-        /// <summary>
-        /// Gets or sets the <see cref="QueryArgs.IncludeFields"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.IncludeFieldsQueryStringName"/>.</remarks>
-        public string QueryStringNameIncludeFields { get; set; } = HttpConsts.IncludeFieldsQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="QueryArgs.ExcludeFields"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.ExcludeFieldsQueryStringName"/>.</remarks>
-        public string QueryStringNameExcludeFields { get; set; } = HttpConsts.ExcludeFieldsQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Paging"/> <see cref="PagingArgs.Page"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.PagingArgsPageQueryStringName"/>.</remarks>
-        public string QueryStringNamePagingArgsPage { get; set; } = HttpConsts.PagingArgsPageQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Paging"/> <see cref="PagingArgs.Size"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.PagingArgsSizeQueryStringName"/>.</remarks>
-        public string QueryStringNamePagingArgsSize { get; set; } = HttpConsts.PagingArgsSizeQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Paging"/> <see cref="PagingArgs.Skip"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.PagingArgsSkipQueryStringName"/>.</remarks>
-        public string QueryStringNamePagingArgsSkip { get; set; } = HttpConsts.PagingArgsSkipQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Paging"/> <see cref="PagingArgs.Take"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.PagingArgsTakeQueryStringName"/>.</remarks>
-        public string QueryStringNamePagingArgsTake { get; set; } = HttpConsts.PagingArgsTakeQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Paging"/> <see cref="PagingArgs.Token"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.PagingArgsTokenQueryStringName"/>.</remarks>
-        public string QueryStringNamePagingArgsToken { get; set; } = HttpConsts.PagingArgsTokenQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Paging"/> <see cref="PagingArgs.IsGetCount"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.PagingArgsCountQueryStringName"/>.</remarks>
-        public string QueryStringNamePagingArgsCount { get; set; } = HttpConsts.PagingArgsCountQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IncludeText"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.IncludeTextQueryStringName"/>.</remarks>
-        public string QueryStringNameIncludeText { get; set; } = HttpConsts.IncludeTextQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IncludeInactive"/> query string name.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.IncludeInactiveQueryStringName"/>.</remarks>
-        public string QueryStringNameIncludeInactive { get; set; } = HttpConsts.IncludeInactiveQueryStringName;
-
-        /// <summary>
-        /// Gets or sets the entity tag that will be passed as either a <c>If-None-Match</c> header where <see cref="HttpMethod.Get"/>; otherwise, an <c>If-Match</c> header.
-        /// </summary>
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Appends the <paramref name="fields"/> to the <see cref="QueryArgs"/> <see cref="QueryArgs.IncludeFields"/>.
-        /// </summary>
-        /// <param name="fields">The fields to append.</param>
-        /// <returns>The current <see cref="HttpRequestOptions"/> instance to support fluent-style method-chaining.</returns>
-        public HttpRequestOptions Include(params string[] fields)
-        {
-            Query ??= new QueryArgs();
-            Query.Include(fields);
-            return this;
-        }
-
-        /// <summary>
-        /// Appends the <paramref name="fields"/> to the <see cref="QueryArgs"/> <see cref="QueryArgs.ExcludeFields"/>.
-        /// </summary>
-        /// <param name="fields">The fields to append.</param>
-        /// <returns>The current <see cref="HttpRequestOptions"/> instance to support fluent-style method-chaining.</returns>
-        public HttpRequestOptions Exclude(params string[] fields)
-        {
-            Query ??= new QueryArgs();
-            Query.Exclude(fields);
-            return this;
-        }
-
-        /// <summary>
-        /// Updates (overrides) the <see cref="Query"/> <see cref="QueryArgs.Filter"/> using a basic dynamic <i>OData-like</i> <c>$filter</c> statement.
-        /// </summary>
-        /// <param name="filter">The filter.</param>
-        /// <returns>The current <see cref="HttpRequestOptions"/> instance to support fluent-style method-chaining.</returns>
-        public HttpRequestOptions Filter(string? filter)
-        {
-            Query ??= new QueryArgs();
-            Query.Filter = filter;
-            return this;
-        }
-
-        /// <summary>
-        /// Updates (overrides) the <see cref="Query"/> <see cref="QueryArgs.OrderBy"/> using a basic dynamic <i>OData-like</i> <c>$orderby</c> statement.
-        /// </summary>
-        /// <param name="orderby">The order by.</param>
-        /// <returns>The current <see cref="HttpRequestOptions"/> instance to support fluent-style method-chaining.</returns>
-        public HttpRequestOptions OrderBy(string orderby)
-        {
-            Query ??= new QueryArgs();
-            Query.OrderBy = orderby;
-            return this;
-        }
-
-        /// <summary>
-        /// Updates (overrides) the <see cref="Query"/>.
-        /// </summary>
-        /// <param name="query">The <see cref="QueryArgs"/>.</param>
-        /// <returns>The current <see cref="HttpRequestOptions"/> instance to support fluent-style method-chaining.</returns>
-        /// <remarks>Any existing <see cref="Include(string[])"/> and/or <see cref="Exclude(string[])"/> fields will be integrated into the <paramref name="query"/>.</remarks>
-        public HttpRequestOptions WithQuery(QueryArgs? query)
-        {
-            if (Query is not null && query is not null)
-            {
-                if (Query.IncludeFields is not null)
-                    query.Include([.. Query.IncludeFields]);
-
-                if (Query.ExcludeFields is not null)
-                    query.Exclude([.. Query.ExcludeFields]);
-
-                if (Query.IsTextIncluded)
-                    query.IsTextIncluded = true;
-            }
-
-            Query = query;
-            return this;
-        }
-
-        /// <summary>
-        /// Updates (overrides) the <see cref="Paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <returns>The current <see cref="HttpRequestOptions"/> instance to support fluent-style method-chaining.</returns>
-        public HttpRequestOptions WithPaging(PagingArgs? paging)
-        {
-            Paging = paging;
-            return this;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="PagingArgs"/>.
-        /// </summary>
-        public PagingArgs? Paging { get; private set; }
-
-        /// <summary>
-        /// Gets the dynamic <see cref="QueryArgs"/>.
-        /// </summary>
-        public QueryArgs? Query { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the optional query string value to include within the <see cref="Uri.Query"/>.
-        /// </summary>
-        /// <remarks>It is assumed that the contents of these are valid as no encoding will be employed; i.e. will be used as-is. The specification of any leading '<c>&amp;</c>' and '<c>?</c>' characters is not required.</remarks>
-        public string? UrlQueryString { get; set; }
-
-        /// <summary>
-        /// Indicates whether to include any related texts for the item(s).
-        /// </summary>
-        /// <remarks>For example, include corresponding <see cref="IReferenceData.Text"/> for any <b>ReferenceData</b> values returned in the JSON response payload.</remarks>
-        public bool IncludeText { get; set; }
-
-        /// <summary>
-        /// Indicates whether to include any inactive item(s); 
-        /// </summary>
-        /// <remarks>For example, include item(s) where <see cref="IReferenceData.IsActive"/> is <c>false</c>.</remarks>
-        public bool IncludeInactive { get; set; }
-
-        /// <summary>
-        /// Adds the <see cref="HttpRequestOptions"/> to a <paramref name="queryString"/>.
-        /// </summary>
-        /// <param name="queryString">The query string.</param>
-        /// <returns>The updated query string.</returns>
-        public string? AddToQueryString(string? queryString) => AddToQueryString(string.IsNullOrEmpty(queryString) ? null : HttpUtility.ParseQueryString(queryString));
-
-        /// <summary>
-        /// Adds the <see cref="HttpRequestOptions"/> to a <see cref="NameValueCollection"/>.
-        /// </summary>
-        /// <param name="queryString">The <see cref="NameValueCollection"/>.</param>
-        /// <returns>The updated query string.</returns>
-        public string? AddToQueryString(NameValueCollection? queryString)
-        {
-            var sb = new StringBuilder();
-            if (queryString is not null)
-                AddNameValueCollection(sb, queryString);
-
-            if (Paging is not null)
-            {
-                switch (Paging.Option)
-                {
-                    case PagingOption.SkipAndTake:
-                        AddNameValuePair(sb, QueryStringNamePagingArgsSkip, Paging.Skip?.ToString(), false);
-                        AddNameValuePair(sb, QueryStringNamePagingArgsTake, Paging.Take.ToString(), false);
-                        break;
-
-                    case PagingOption.PageAndSize:
-                        AddNameValuePair(sb, QueryStringNamePagingArgsPage, Paging.Page?.ToString() ?? 1.ToString(), false);
-                        AddNameValuePair(sb, QueryStringNamePagingArgsSize, Paging.Size.ToString(), false);
-                        break;
-
-                    default:
-                        AddNameValuePair(sb, QueryStringNamePagingArgsToken, Paging.Token, false);
-                        AddNameValuePair(sb, QueryStringNamePagingArgsTake, Paging.Take.ToString(), false);
-                        break;
-
-                }
-
-                if (Paging.IsGetCount)
-                    AddNameValuePair(sb, QueryStringNamePagingArgsCount, "true", false);
-            }
-
-            if (Query is not null)
-            {
-                if (!string.IsNullOrEmpty(Query.Filter))
-                    AddNameValuePair(sb, HttpConsts.QueryArgsFilterQueryStringName, Query.Filter, true);
-
-                if (!string.IsNullOrEmpty(Query.OrderBy))
-                    AddNameValuePair(sb, HttpConsts.QueryArgsOrderByQueryStringName, Query.OrderBy, true);
-
-                if (Query.IncludeFields != null && Query.IncludeFields.Count > 0)
-                    AddNameValuePairs(sb, QueryStringNameIncludeFields, Query.IncludeFields.Where(x => !string.IsNullOrEmpty(x)).Select(x => HttpUtility.UrlEncode(x)).ToArray(), false, true);
-
-                if (Query.ExcludeFields != null && Query.ExcludeFields.Count > 0)
-                    AddNameValuePairs(sb, QueryStringNameExcludeFields, Query.ExcludeFields.Where(x => !string.IsNullOrEmpty(x)).Select(x => HttpUtility.UrlEncode(x)).ToArray(), false, true);
-            }
-
-            if (IncludeText || (Query is not null && Query.IsTextIncluded))
-                AddNameValuePair(sb, QueryStringNameIncludeText, "true", false);
-
-            if (IncludeInactive)
-                AddNameValuePair(sb, QueryStringNameIncludeInactive, "true", false);
-
-            var qs = sb.Length == 0 ? null : sb.ToString();
-            if (!string.IsNullOrEmpty(UrlQueryString))
-            {
-                if (qs is null)
-                    return UrlQueryString.StartsWith('?') ? UrlQueryString : $"?{(UrlQueryString.StartsWith('&') ? UrlQueryString[1..] : UrlQueryString)}";
-                else
-                    return $"{qs}{(UrlQueryString.StartsWith('&') ? UrlQueryString : $"&{UrlQueryString}")}";
-            }
-            else
-                return qs;
-        }
-
-        /// <summary>
-        /// Add the name/value(s) pair(s) to the string builder.
-        /// </summary>
-        private static void AddNameValueCollection(StringBuilder sb, NameValueCollection nvc)
-        {
-            foreach (var name in nvc.AllKeys)
-            {
-                AddNameValuePairs(sb, name, nvc.GetValues(name), true, false);
-            }
-        }
-
-        /// <summary>
-        /// Add the name/value(s) pair to the string builder.
-        /// </summary>
-        private static void AddNameValuePairs(StringBuilder sb, string? name, string[]? values, bool encode = false, bool concatenateValues = false)
-        {
-            if (values is null || values.Length == 0)
-                return;
-            else if (concatenateValues)
-                AddNameValuePair(sb, name, string.Join(",", values), encode);
-            else
-            {
-                foreach (var value in values)
-                {
-                    AddNameValuePair(sb, name, value, encode);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Add the name/value pair to the string builder.
-        /// </summary>
-        private static void AddNameValuePair(StringBuilder sb, string? name, string? value, bool encode = false)
-        {
-            var nne = string.IsNullOrEmpty(name);
-            var vne = string.IsNullOrEmpty(value);
-
-            if (nne && vne)
-                return;
-
-            sb.Append(sb.Length == 0 ? '?' : '&');
-            if (!nne)
-                sb.Append(name);
-
-            if (!vne)
-            {
-                sb.Append('=');
-                sb.Append(encode ? HttpUtility.UrlEncode(value) : value);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpResult.cs b/src/CoreEx/Http/HttpResult.cs
deleted file mode 100644
index e5eaf602..00000000
--- a/src/CoreEx/Http/HttpResult.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Json;
-using CoreEx.Results;
-using System;
-using System.Globalization;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides the <see cref="HttpResponseMessage"/> result with no value.
-    /// </summary>
-    public class HttpResult : HttpResultBase, IToResult
-    {
-        /// <summary>
-        /// Creates a new <see cref="HttpResult"/> with no value.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-        public static async Task<HttpResult> CreateAsync(HttpResponseMessage response, CancellationToken cancellationToken = default)
-#if NETSTANDARD2_1
-            => new HttpResult(response.ThrowIfNull(nameof(response)), 
-                response.Content == null || response.Content.Headers.ContentLength == 0 ? null : new BinaryData(await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false)));
-#else
-            => new HttpResult(response.ThrowIfNull(nameof(response)), 
-                response.Content == null || response.Content.Headers.ContentLength == 0 ? null : new BinaryData(await response.Content.ReadAsByteArrayAsync(cancellationToken).ConfigureAwait(false)));
-#endif
-
-        /// <summary>
-        /// Creates a new <see cref="HttpResult{T}"/> with a <see cref="HttpResult{T}.Value"/>.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/> for deserializing the <see cref="HttpResult{T}.Value"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-        public static async Task<HttpResult<T>> CreateAsync<T>(HttpResponseMessage response, IJsonSerializer? jsonSerializer = default, CancellationToken cancellationToken = default)
-        {
-#if NETSTANDARD2_1
-            var content = (response.ThrowIfNull(nameof(response))).Content == null || response.Content.Headers.ContentLength == 0 
-                ? null : new BinaryData(await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false));
-#else
-            var content = (response.ThrowIfNull(nameof(response))).Content == null || response.Content.Headers.ContentLength == 0 
-                ? null : new BinaryData(await response.Content.ReadAsByteArrayAsync(cancellationToken).ConfigureAwait(false));
-#endif
-
-            if (!response.IsSuccessStatusCode || content == BinaryData.Empty)
-                return new HttpResult<T>(response, content, default(T)!);
-
-            if (typeof(T) == typeof(string) && StringComparer.OrdinalIgnoreCase.Compare(response.Content.Headers?.ContentType?.MediaType, MediaTypeNames.Text.Plain) == 0)
-            {
-                try
-                {
-                    return content == null 
-                        ? new HttpResult<T>(response, content, default(T)!)
-                        : new HttpResult<T>(response, content, (T)Convert.ChangeType(content.ToString(), typeof(T), CultureInfo.CurrentCulture));
-                }
-                catch (Exception ex)
-                {
-                    return new HttpResult<T>(response, content, new InvalidOperationException($"Unable to convert the content [{MediaTypeNames.Text.Plain}] content to Type {typeof(T).Name}.", ex));
-                }
-            }
-
-            try
-            {
-                var value = content == null ? default! : (jsonSerializer ?? ExecutionContext.GetService<IJsonSerializer>() ?? JsonSerializer.Default).Deserialize<T>(content);
-                if (value != null && value is IETag etag && etag.ETag == null && response.Headers.ETag != null)
-                    etag.ETag = response.Headers.ETag.Tag;
-
-                // Where the value is an ICollectionResult then update the Paging property from the corresponding response headers.
-                if (value is ICollectionResult cr && cr != null)
-                {
-                    if (response.TryGetPagingResult(out var paging))
-                        cr.Paging = paging;
-                }
-
-                return new HttpResult<T>(response, content, value!);
-            }
-            catch (Exception ex)
-            {
-                return new HttpResult<T>(response, content, new InvalidOperationException($"Unable to deserialize the JSON [{response.Content.Headers?.ContentType?.MediaType ?? "not specified"}] content to Type {typeof(T).FullName}.", ex));
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResult"/> class.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="content">The <see cref="HttpResponseMessage.Content"/> as <see cref="BinaryData"/> (see <see cref="HttpContent.ReadAsByteArrayAsync()"/>).</param>
-        internal HttpResult(HttpResponseMessage response, BinaryData? content) : base(response, content) { }
-
-        /// <summary>
-        /// Throws an exception if the request was not successful (see <see cref="HttpResultBase.IsSuccess"/>).
-        /// </summary>
-        /// <param name="throwKnownException">Indicates whether to check the <see cref="HttpResponseMessage.StatusCode"/> and where it matches one of the <i>known</i> <see cref="IExtendedException.StatusCode"/> values then that <see cref="IExtendedException"/> will be thrown.</param>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>The <see cref="HttpResult"/> instance to support fluent-style method-chaining.</returns>
-        public HttpResult ThrowOnError(bool throwKnownException = true, bool useContentAsErrorMessage = true)
-        {
-            if (IsSuccess)
-                return this;
-
-            if (throwKnownException)
-            {
-                var eex = CreateExtendedException(Response, Content, useContentAsErrorMessage);
-                if (eex != null)
-                    throw (Exception)eex;
-            }
-
-            Response.EnsureSuccessStatusCode();
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public Result ToResult() => ToResult(true);
-
-        /// <summary>
-        /// Converts the <see cref="HttpResult"/> into an equivalent <see cref="Result"/>.
-        /// </summary>
-        /// <param name="convertToKnownException">Indicates whether to check the <see cref="HttpResponseMessage.StatusCode"/> and where it matches one of the <i>known</i> <see cref="IExtendedException.StatusCode"/> values then that <see cref="IExtendedException"/> will be used.</param>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public Result ToResult(bool convertToKnownException, bool useContentAsErrorMessage = true)
-        {
-            if (IsSuccess)
-                return Result.Success;
-
-            if (convertToKnownException)
-            {
-                var eex = CreateExtendedException(Response, Content, useContentAsErrorMessage);
-                if (eex != null)
-                    return new Result((Exception)eex);
-            }
-
-            return new Result(new HttpRequestException(Content));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpResultBase.cs b/src/CoreEx/Http/HttpResultBase.cs
deleted file mode 100644
index f65fe5e1..00000000
--- a/src/CoreEx/Http/HttpResultBase.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides the <see cref="HttpResponseMessage"/> result base capabilities.
-    /// </summary>
-    public abstract class HttpResultBase
-    {
-        private readonly Lazy<string?> _errorType;
-        private readonly Lazy<int?> _errorCode;
-        private readonly Lazy<MessageItemCollection?> _messages;
-        private string? _content;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResultBase"/> class.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="content">The <see cref="HttpResponseMessage.Content"/> as <see cref="BinaryData"/>.</param>
-        protected HttpResultBase(HttpResponseMessage response, BinaryData? content)
-        {
-            Response = response.ThrowIfNull(nameof(response));
-            BinaryContent = content;
-
-            _errorType = new Lazy<string?>(() =>
-            {
-                if (Response.TryGetHeaderValue(HttpConsts.ErrorTypeHeaderName, out var et))
-                    return et;
-                else
-                    return null;
-            });
-
-            _errorCode = new Lazy<int?>(() =>
-            {
-                if (Response.TryGetHeaderValue(HttpConsts.ErrorCodeHeaderName, out var ec) && int.TryParse(ec, out var code))
-                    return code;
-                else
-                    return null;
-            });
-
-            _messages = new Lazy<MessageItemCollection?>(() =>
-            {
-                if (!Response.TryGetHeaderValue(HttpConsts.MessagesHeaderName, out var mic) || string.IsNullOrEmpty(mic))
-                    return null;
-
-                try
-                {
-                    return Json.JsonSerializer.Default.Deserialize<MessageItemCollection>(mic);
-                }
-                catch
-                {
-                    return null;  // Swallow any deserialization errors.
-                }
-            });
-        }
-
-        /// <summary>
-        /// Gets the <see cref="HttpResponseMessage"/>.
-        /// </summary>
-        public HttpResponseMessage Response { get; }
-
-        /// <summary>
-        /// Gets the <see cref="HttpResponseMessage.Content"/> as <see cref="BinaryData"/>.
-        /// </summary>
-        public BinaryData? BinaryContent { get; }
-
-        /// <summary>
-        /// Gets the <see cref="BinaryContent"/> as a <see cref="string"/>.
-        /// </summary>
-        public string? Content { get => WillResultInNullAsNotFound ? null : _content ??= BinaryContent?.ToString(); }
-
-        /// <summary>
-        /// Gets the underlying <see cref="HttpRequestMessage"/>.
-        /// </summary>
-        public HttpRequestMessage? Request => Response.RequestMessage;
-
-        /// <summary>
-        /// Gets the <see cref="HttpStatusCode"/>.
-        /// </summary>
-        public virtual HttpStatusCode StatusCode => WillResultInNullAsNotFound ? HttpStatusCode.NoContent : Response.StatusCode;
-
-        /// <summary>
-        /// Indicates whether the request was successful.
-        /// </summary>
-        public virtual bool IsSuccess => WillResultInNullAsNotFound || Response.IsSuccessStatusCode;
-
-        /// <summary>
-        /// Gets the <see cref="MessageItemCollection"/>.
-        /// </summary>
-        public MessageItemCollection? Messages => _messages.Value;
-
-        /// <summary>
-        /// Gets the error type using the <see cref="HttpConsts.ErrorTypeHeaderName"/>.
-        /// </summary>
-        public string? ErrorType => WillResultInNullAsNotFound ? null : _errorType.Value;
-
-        /// <summary>
-        /// Gets the error code using the <see cref="HttpConsts.ErrorCodeHeaderName"/>
-        /// </summary>
-        public int? ErrorCode => WillResultInNullAsNotFound ? null : _errorCode.Value;
-
-        /// <summary>
-        /// Indicates whether a <c>null/default</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>; i.e. it acts as <see cref="HttpStatusCode.NoContent"/>.
-        /// </summary>
-        /// <remarks>When set to <c>true</c> and the corresponding <see cref="Response"/> has a <see cref="StatusCode"/> is <see cref="HttpStatusCode.NotFound"/>, then <see cref="IsSuccess"/> will return <c>true</c> and <see cref="Content"/> will return <c>null</c>.</remarks>
-        public bool NullOnNotFoundResponse { get; set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="HttpResult"/> will result in a <c>null</c> response where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/>
-        /// </summary>
-        /// <remarks>See <see cref="NullOnNotFoundResponse"/>.</remarks>
-        public bool WillResultInNullAsNotFound => NullOnNotFoundResponse && Response.StatusCode == HttpStatusCode.NotFound;
-
-        /// <summary>
-        /// Creates an <see cref="IExtendedException"/> from the <see cref="HttpResponseMessage"/> based on the <see cref="HttpStatusCode"/>.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="content">The <see cref="HttpResponseMessage.Content"/> as a <see cref="string"/> (see <see cref="HttpContent.ReadAsStringAsync()"/>).</param>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>The corresponding <see cref="IExtendedException"/> where applicable; otherwise, <c>null</c>.</returns>
-        internal static IExtendedException? CreateExtendedException(HttpResponseMessage response, string? content, bool useContentAsErrorMessage = true)
-        {
-            if (response == null || response.IsSuccessStatusCode)
-                return null;
-
-            if (!(response.TryGetHeaderValue(HttpConsts.ErrorTypeHeaderName, out var et) && Enum.TryParse(et, out ErrorType errorType)))
-                errorType = Abstractions.ErrorType.UnhandledError;
-
-            var message = useContentAsErrorMessage ? content : null;
-
-            switch (response.StatusCode)
-            {
-                case HttpStatusCode.BadRequest:
-                    if (errorType == Abstractions.ErrorType.BusinessError)
-                        return new BusinessException(message, new HttpRequestException(content));
-                    else
-                    {
-                        var mic = CreateMessageItems(content);
-                        if (mic == null)
-                            return new ValidationException(message, new HttpRequestException(content));
-                        else
-                            return new ValidationException(mic);
-                    }
-
-                case HttpStatusCode.Unauthorized: return new AuthenticationException(message, new HttpRequestException(content));
-                case HttpStatusCode.Forbidden: return new AuthorizationException(message, new HttpRequestException(content));
-                case HttpStatusCode.PreconditionFailed: return new ConcurrencyException(message, new HttpRequestException(content));
-                case HttpStatusCode.NotFound: return new NotFoundException(message, new HttpRequestException(content));
-                case HttpStatusCode.ServiceUnavailable: return new TransientException(message, new HttpRequestException(content));
-
-                case HttpStatusCode.Conflict:
-                    return errorType switch
-                    {
-                        Abstractions.ErrorType.DuplicateError => new DuplicateException(message, new HttpRequestException(content)),
-                        Abstractions.ErrorType.DataConsistencyError => new DataConsistencyException(message, new HttpRequestException(content)),
-                        _ => new ConflictException(message, new HttpRequestException(content)),
-                    };
-
-                default: return null;
-            }
-        }
-
-        /// <summary>
-        /// Create <see cref="MessageItemCollection"/> from <paramref name="content"/>.
-        /// </summary>
-        /// <param name="content">The <see cref="HttpResponseMessage.Content"/> as a <see cref="string"/> (see <see cref="HttpContent.ReadAsStringAsync()"/>).</param>
-        /// <returns>The <see cref="MessageItemCollection"/> where successfully deserialized; otherwise, <c>null</c>.</returns>
-        internal static MessageItemCollection? CreateMessageItems(string? content)
-        {
-            MessageItemCollection? mic = null;
-
-            if (content != null)
-            {
-                try
-                {
-                    var errors = System.Text.Json.JsonSerializer.Deserialize<Dictionary<string, string[]>>(content);
-                    if (errors != null)
-                    {
-                        foreach (var kvp in errors.Where(x => !string.IsNullOrEmpty(x.Key)))
-                        {
-                            foreach (var error in kvp.Value.Where(x => !string.IsNullOrEmpty(x)))
-                            {
-                                (mic ??= []).AddPropertyError(kvp.Key, error);
-                            }
-                        }
-                    }
-                }
-                catch { } // Swallow any deserialization errors.
-            }
-
-            return mic;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/HttpResultT.cs b/src/CoreEx/Http/HttpResultT.cs
deleted file mode 100644
index 96058fd5..00000000
--- a/src/CoreEx/Http/HttpResultT.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Results;
-using System;
-using System.Net;
-using System.Net.Http;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides the <see cref="HttpResponseMessage"/> result with a <see cref="Value"/>.
-    /// </summary>
-    public class HttpResult<T> : HttpResultBase, IToResult<T>
-    {
-        private readonly T _value;
-        private readonly Exception? _internalException = null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResult{T}"/> class.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="content">The <see cref="HttpResponseMessage.Content"/> as <see cref="BinaryData"/> (see <see cref="HttpContent.ReadAsByteArrayAsync()"/>).</param>
-        /// <param name="value">The deserialized value where <see cref="HttpResultBase.IsSuccess"/>; otherwise, <c>default</c>.</param>
-        internal HttpResult(HttpResponseMessage response, BinaryData? content, T value) : base(response, content) => _value = value;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpResult{T}"/> class that has an exception.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="content">The <see cref="HttpResponseMessage.Content"/> as <see cref="BinaryData"/> (see <see cref="HttpContent.ReadAsByteArrayAsync()"/>).</param>
-        /// <param name="internalException">The internal <see cref="Exception"/>.</param>
-        internal HttpResult(HttpResponseMessage response, BinaryData? content, Exception? internalException) : this(response, content, default(T)!) => _internalException = internalException;
-
-        /// <summary>
-        /// Gets the response value.
-        /// </summary>
-        /// <remarks>Performs a <see cref="HttpResult.ThrowOnError"/> before returning the resulting deserialized value.</remarks>
-        public T Value
-        {
-            get
-            {
-                ThrowOnError();
-                return _value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the internal exception where the request/response handling was not successful; i.e. JSON deserialization error.
-        /// </summary>
-        public Exception? Exception => _internalException;
-
-        /// <inheritdoc/>
-        public override bool IsSuccess => _internalException is null && base.IsSuccess;
-
-        /// <inheritdoc/>
-        public override HttpStatusCode StatusCode => _internalException is not null ? HttpStatusCode.InternalServerError : base.StatusCode;
-
-        /// <summary>
-        /// Throws an exception if the request was not successful (see <see cref="HttpResultBase.IsSuccess"/>).
-        /// </summary>
-        /// <param name="throwKnownException">Indicates whether to check the <see cref="HttpResponseMessage.StatusCode"/> and where it matches one of the <i>known</i> <see cref="IExtendedException.StatusCode"/> values then that <see cref="IExtendedException"/> will be thrown.</param>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>The <see cref="HttpResult"/> instance to support fluent-style method-chaining.</returns>
-        public HttpResult<T> ThrowOnError(bool throwKnownException = true, bool useContentAsErrorMessage = true)
-        {
-            if (IsSuccess)
-                return this;
-
-            if (_internalException is not null)
-                throw _internalException;
-
-            if (throwKnownException)
-            {
-                var eex = CreateExtendedException(Response, Content, useContentAsErrorMessage);
-                if (eex != null)
-                    throw (Exception)eex;
-            }
-
-            Response.EnsureSuccessStatusCode();
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public Result<T> ToResult() => ToResult(true);
-
-        /// <summary>
-        /// Converts the <see cref="HttpResult"/> into an equivalent <see cref="Result"/>.
-        /// </summary>
-        /// <param name="convertToKnownException">Indicates whether to check the <see cref="HttpResponseMessage.StatusCode"/> and where it matches one of the <i>known</i> <see cref="IExtendedException.StatusCode"/> values then that <see cref="IExtendedException"/> will be used.</param>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public Result<T> ToResult(bool convertToKnownException, bool useContentAsErrorMessage = true)
-        {
-            if (_internalException is not null)
-                return new Result<T>(_internalException);
-
-            if (IsSuccess)
-                return Result.Ok(Value);
-
-            if (convertToKnownException)
-            {
-                var eex = CreateExtendedException(Response, Content, useContentAsErrorMessage);
-                if (eex != null)
-                    return new Result<T>((Exception)eex);
-            }
-
-            return new Result<T>(new HttpRequestException(Content));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/IHttpArg.cs b/src/CoreEx/Http/IHttpArg.cs
deleted file mode 100644
index 9e0818e6..00000000
--- a/src/CoreEx/Http/IHttpArg.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System.Collections.Specialized;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Enables an HTTP argument that may <see cref="AddToQueryString"/> and/or <see cref="ModifyHttpRequestAsync"/>.
-    /// </summary>
-    public interface IHttpArg
-    {
-        /// <summary>
-        /// Adds the <see cref="IHttpArg"/> to the <paramref name="queryString"/>.
-        /// </summary>
-        /// <param name="queryString">The <see cref="NameValueCollection"/>.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        void AddToQueryString(NameValueCollection queryString, IJsonSerializer jsonSerializer);
-
-        /// <summary>
-        /// Modifies the <see cref="HttpRequestMessage"/> from the <see cref="IHttpArg"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        Task ModifyHttpRequestAsync(HttpRequestMessage request, IJsonSerializer jsonSerializer, CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/IHttpArgTypeArg.cs b/src/CoreEx/Http/IHttpArgTypeArg.cs
deleted file mode 100644
index fc6f3103..00000000
--- a/src/CoreEx/Http/IHttpArgTypeArg.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Enables an argument with an <see cref="ArgType"/> and <see cref="Name"/> that also supports request URI template replacement via <see cref="ToEscapeDataString"/>.
-    /// </summary>
-    public interface IHttpArgTypeArg : IHttpArg
-    {
-        /// <summary>
-        /// Gets the argument name.
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// Gets the <see cref="HttpArgType"/> that determines how the argument is applied.
-        /// </summary>
-        public HttpArgType ArgType { get; }
-
-        /// <summary>
-        /// Returns a <see cref="Uri.EscapeDataString(string)"/> representation of the value for URI template replacement use.
-        /// </summary>
-        /// <returns>The escaped data string.</returns>
-        string? ToEscapeDataString();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/IdempotencyKeyHandler.cs b/src/CoreEx/Http/IdempotencyKeyHandler.cs
new file mode 100644
index 00000000..69f4f8dd
--- /dev/null
+++ b/src/CoreEx/Http/IdempotencyKeyHandler.cs
@@ -0,0 +1,44 @@
+namespace CoreEx.Http;
+
+/// <summary>
+/// Provides an <see cref="HttpClient"/> <see cref="DelegatingHandler"/> that adds an idempotency-key (see <see cref="HttpNames.IdempotencyKeyHeaderName"/>) to outgoing HTTP requests.
+/// </summary>
+/// <remarks>Only <see cref="HttpMethod.Post"/> requests are supported by default; see <see cref="SupportedMethods"/>.
+/// <para>It is expected that the <see cref="HttpMethod.Put"/> and <see cref="HttpMethod.Patch"/> endpoints being consumed support ETag's (optimistic concurrency) and as such this functionality will ensure idempotency.
+/// Otherwise, the <see cref="HttpMethod.Get"/> and <see cref="HttpMethod.Delete"/> are assumed to be idempotent and are excluded. Adjust the <see cref="SupportedMethods"/> to support the given use-case.</para>
+/// <para>Where an <see cref="HttpRequestMessage"/> already has the idempotency-key (<see cref="HeaderName"/>) defined this will be respected (i.e. will not be overridden).</para></remarks>
+public sealed class IdempotencyKeyHandler : DelegatingHandler
+{
+    /// <summary>
+    /// Gets or sets the supported HTTP methods for adding an idempotency key.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="HttpMethod.Post"/> only.</remarks>
+    public HttpMethod[] SupportedMethods { get; set; } = [HttpMethod.Post];
+
+    /// <summary>
+    /// Gets or sets the header name to use for the idempotency key.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="HttpNames.IdempotencyKeyHeaderName"/>.</remarks>
+    public string HeaderName { get; set => field = value.ThrowIfNullOrEmpty(); } = HttpNames.IdempotencyKeyHeaderName;
+
+    /// <summary>
+    /// Gets or sets the key generator function to use for generating the idempotency key value.
+    /// </summary>
+    /// <remarks>Defaults to generating a new <see cref="Guid"/> string.</remarks>
+    public Func<string> KeyGenerator { get; set => field = value.ThrowIfNull(); } = () => Guid.NewGuid().ToString();
+
+    /// <inheritdoc/>
+    protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        // Only applicable for supported methods.
+        if (SupportedMethods.Contains(request.Method))
+        {
+            // Respect existing idempotency key value.
+            if (!request.Headers.Contains(HeaderName))
+                request.Headers.Add(HeaderName, KeyGenerator());
+        }
+
+        // Continue processing; send it baby!
+        return await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Http/ProblemDetailsException.cs b/src/CoreEx/Http/ProblemDetailsException.cs
new file mode 100644
index 00000000..f2258a1c
--- /dev/null
+++ b/src/CoreEx/Http/ProblemDetailsException.cs
@@ -0,0 +1,91 @@
+namespace CoreEx.Http;
+
+/// <summary>
+/// Represents a <see cref="Abstractions.ProblemDetails"/> <see cref="Exception"/>.
+/// </summary>
+/// <param name="problemDetails">The <see cref="Abstractions.ProblemDetails"/> associated with the exception.</param>
+/// <param name="innerException">The exception that is the cause of the current exception.</param>
+/// <remarks>This exception does not implement <see cref="IExtendedException"/> by design; this is effectively an internal exception and behaves as such. To enable such behavior then the
+/// <see cref="ToException{TException}"/> method can be used and orchestrated accordingly.</remarks>
+public class ProblemDetailsException(ProblemDetails problemDetails, Exception? innerException) : Exception(problemDetails.ThrowIfNull().Title ?? problemDetails.Detail, innerException)
+{
+    /// <summary>
+    /// Gets the <see cref="Abstractions.ProblemDetails"/> associated with the exception.
+    /// </summary>
+    public ProblemDetails ProblemDetails { get; } = problemDetails;
+
+    /// <summary>
+    /// Maps the underlying <see cref="ProblemDetails"/> to an exception of type <typeparamref name="TException"/>.
+    /// </summary>
+    /// <typeparam name="TException">THe <see cref="ExtendedException{TSelf}"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="Exception"/>.</returns>
+    /// <remarks>This is a best effort mapping as there is no means to preserve all information from the originating exception as some fidelity will be lost.</remarks>
+    public TException ToException<TException>() where TException : ExtendedException<TException>
+    {
+        var exception = (TException)Activator.CreateInstance(typeof(TException), (LText)Message, this)!;
+
+        exception.Detail = ProblemDetails.Detail;
+
+        if (ProblemDetails.Status is not null)
+            exception.StatusCode = (HttpStatusCode)ProblemDetails.Status.Value;
+
+        exception.ErrorType = ProblemDetails.ErrorType;
+        exception.ErrorCode = ProblemDetails.ErrorCode;
+        exception.Detail = ProblemDetails.Detail;
+
+        if (ProblemDetails.Extensions is not null)
+        {
+            foreach (var (key, value) in ProblemDetails.Extensions)
+            {
+                if (key == HttpNames.ErrorCodeName && value is string errorCode)
+                {
+                    exception.ErrorCode = errorCode;
+                    continue;
+                }
+
+                if (key == HttpNames.ErrorTypeName && value is string errorType)
+                {
+                    exception.ErrorType = errorType;
+                    continue;
+                }
+
+                exception.Extensions[key] = value;
+            }
+        }
+
+        return exception;
+    }
+
+    /// <summary>
+    /// Tries to get the <see cref="BusinessException"/> from the underlying <see cref="ProblemDetails"/>.
+    /// </summary>
+    /// <param name="exception">The resulting <see cref="BusinessException"/>.</param>
+    /// <returns><c>true</c> indicates that the problem details has been determined as a valid <see cref="BusinessException"/>; otherwise, <c>false</c>.</returns>
+    /// <remarks>A <see cref="BusinessException"/> is considered valid where its <see cref="IExtendedException.ErrorType"/> is <see cref="BusinessException.BusinessErrorType"/>.</remarks>
+    public bool TryGetBusinessException([NotNullWhen(true)] out BusinessException? exception)
+    {
+        // Check that the error type is the expected business error type; this is required as the problem details may be representing some other exception type and we want to ensure that we only attempt
+        // to map to a business exception where appropriate. 
+        if (BusinessException.BusinessErrorType.Equals(ProblemDetails.ErrorType, StringComparison.OrdinalIgnoreCase))
+        {
+            exception = ToException<BusinessException>();
+            return true;
+        }
+
+        exception = null;
+        return false;
+    }
+
+    /// <summary>
+    /// Determines if the underlying <see cref="ProblemDetails"/> represents a <see cref="BusinessException"/> and if so, throws it.
+    /// </summary>
+    /// <returns>The <see cref="ProblemDetailsException"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>See <see cref="TryGetBusinessException(out BusinessException?)"/>.</remarks>
+    public ProblemDetailsException ThrowOnBusinessException()
+    {
+        if (TryGetBusinessException(out var exception))
+            throw exception;
+
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Http/README.md b/src/CoreEx/Http/README.md
index a7a89899..3ee08650 100644
--- a/src/CoreEx/Http/README.md
+++ b/src/CoreEx/Http/README.md
@@ -1,95 +1,40 @@
-# CoreEx.Http
+# CoreEx.Http
 
-The `CoreEx.Http` namespace provides additional HTTP capabilities.
+> Provides shared HTTP abstractions — `ProblemDetails`, `ProblemDetailsException`, standard header/query-string names, and paging-result HTTP header conventions — used by both client and server HTTP layers without requiring ASP.NET Core dependencies.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Http` defines the portable HTTP contract types that are shared between typed HTTP client code and the ASP.NET Core server layer, deliberately avoiding a hard dependency on `Microsoft.AspNetCore.*`. This allows `CoreEx.Database`, service-bus subscribers, and other non-HTTP projects to reference paging or problem-details types without pulling in the web stack.
 
-To encapsulate and enrich the `HttpClient` experience simplifying advanced scenarios, such as retries for the likes of transient errors, and supporting timeouts, etc.
+`ProblemDetails` follows [RFC 7807](https://tools.ietf.org/html/rfc7807) and adds a `GetValidationErrors()` helper for extracting field-level errors from the `errors` extension property. `ProblemDetailsException` wraps a `ProblemDetails` into an exception and provides `ToException<TException>()` to map it back to a typed CoreEx semantic exception. `HttpNames` centralizes all standard query-string and response-header names used for paging so that client and server agree on field names without duplication.
 
-<br/>
+The `Abstractions` sub-namespace defines additional lightweight types and interfaces used across both client and server without an ASP.NET Core reference.
 
-## Typed HttpClient
+## Key capabilities
 
-Provides capabilities to enable extended [typed](https://docs.microsoft.com/en-us/aspnet/core/fundamentals/http-requests#typed-clients) [`HttpClient`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) functionality providing a fluent-style method-chaining to enable the likes of `WithRetry`, `EnsureSuccess`, `Timeout`, and `ThrowTransientException`, etc. to improve the per invocation experience.
+- 📄 **RFC 7807 Problem Details**: `ProblemDetails` represents a typed HTTP API error with `type`, `title`, `status`, `detail`, `instance`, and an `extensions` dictionary; `GetValidationErrors()` extracts field-level error messages from the standard `errors` key.
+- 🔁 **Problem Details ↔ exception round-trip**: `ProblemDetailsException.ToException<TException>()` maps a received `ProblemDetails` back to a typed CoreEx `ExtendedException<T>`, preserving `Detail`, `StatusCode`, `ShouldBeLogged`, and optional message items.
+- 🏷️ **Standard HTTP names**: `HttpNames` provides configurable static properties for the paging query-string names (`$skip`, `$take`, `$count`, `$page`) and response-header names (`x-paging-skip`, `x-paging-take`, `x-paging-count`, `x-paging-page`), allowing application-wide renaming from a single location.
+- 🔒 **Idempotency key header**: `HttpNames.IdempotencyKeyHeaderName` (`x-idempotency-key`) is the agreed header name for idempotency key propagation between clients and the `[IdempotencyKey]` server filter.
+- 🌐 **Portable HTTP result types**: `HttpResult` and `HttpResult<T>` wrap an `HttpResponseMessage` alongside a deserialized value or `ProblemDetails`, enabling clients to inspect both the raw response and the typed outcome without re-parsing.
 
-Class | Description
--|-
-[`TypedHttpClientBase`](./TypedHttpClientBase.cs) | Provides the base foundational abstract capabilities.
-[`TypedHttpClientBase<TSelf>`](./TypedHttpClientBaseT.cs) | Extends `TypedHttpClientBase` adding the abstract fluent-style method-chaining capabilities and supporting `SendAsync` logic.
-[`TypedHttpClientCore<TSelf>`](./TypedHttpClientCore.cs) | Extends `TypedHttpClientBase<TSelf>` adding abstract support for `Head`, `Get`, `Post`, `Put`, `Patch` and `Delete` HTTP methods.
-[`TypedHttpClient`](./TypedHttpClient.cs) | Provides `TypedHttpClientCore<TSelf>` implementation encapsulating an `HttpClient`.
+## Key types
 
-<br/>
+| Type | Description |
+|------|-------------|
+| **[`ProblemDetails`](./Abstractions/ProblemDetails.cs)** | RFC 7807 problem-details record with `Type`, `Title`, `Status`, `Detail`, `Instance`, and an `Extensions` dictionary; includes `GetValidationErrors(string? key)`. |
+| **[`ProblemDetailsException`](./ProblemDetailsException.cs)** | Exception wrapping a `ProblemDetails`; provides `ToException<TException>()` to convert it back to a typed CoreEx semantic exception. |
+| **[`HttpNames`](./HttpNames.cs)** | Static class of configurable string properties for all standard paging query-string names, response-header names, and the idempotency-key header name. |
+| **[`HttpResult`](./HttpResult.cs)** | Readonly struct pairing an `HttpResponseMessage` with either a deserialized value or a `ProblemDetails` from the response; exposes `IsSuccess`, `StatusCode`, and `ThrowOnError()`. |
+| **[`HttpResult<T>`](./HttpResultT.cs)** | Typed variant of `HttpResult` adding a strongly-typed `Value` property for the deserialized response body. |
+| [`IExtendedHttpClient`](./Abstractions/IExtendedHttpClient.cs) | Interface implemented by `TypedHttpClientBase<TSelf>` for type-safe HTTP client wrappers; exposes `SendAsync`, `GetAsync`, `PostAsync`, `PutAsync`, `PatchAsync`, `DeleteAsync` returning `HttpResult<T>`. |
 
-### Options
+## Related Namespaces
 
-The [`TypedHttpClientOptions`](./Extended/TypedHttpClientOptions.cs) houses the fluent-style method-chaining options for a [`TypedHttpClientBase<TSelf>`](./TypedHttpClientBaseT.cs) via an underlying `DefaultOptions` property. This enables the standardized configuration that will be used for each request, versus configuring per-request directly. Once a request has completed the `TypedHttpClientBase<TSelf>` will reset to the `DefaultOptions`.
+- **[`CoreEx`](../README.md)** - Semantic exception types (`ValidationException`, `NotFoundException`, etc.) are the target for `ProblemDetailsException.ToException<TException>()` mapping.
+- **[`CoreEx.AspNetCore`](../../CoreEx.AspNetCore/README.md)** - Server-side `WebApi` helpers consume `ProblemDetails` and `HttpNames` and translate `Result`/exceptions to `ProblemDetails` HTTP responses.
+- **[`CoreEx.Http`](../../CoreEx.Http/README.md)** - The separate `CoreEx.Http` NuGet package builds on these abstractions to provide `TypedHttpClientBase<TSelf>`, retry policies, and client-side HTTP result handling.
 
-<br/>
+## Additional Resources
 
-### Fluent-style method-chaining
-
-The fluent-style method-chaining capabilities are as follows.
-
-Method | Description
--|-
-`Ensure` | Adds the [`HttpStatusCode`](https://learn.microsoft.com/en-us/dotnet/api/system.net.httpstatuscode)(s) to the accepted list to be verified against the resulting [`StatusCode`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpresponsemessage.statuscode).
-`EnsureAccepted` | Adds the [`HttpStatusCode.Accepted`](https://learn.microsoft.com/en-us/dotnet/api/system.net.httpstatuscode#system-net-httpstatuscode-accepted) to the accepted list to be verified against the resulting [`StatusCode`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpresponsemessage.statuscode).
-`EnsureCreated` | Adds the [`HttpStatusCode.Created`](https://learn.microsoft.com/en-us/dotnet/api/system.net.httpstatuscode#system-net-httpstatuscode-created) to the accepted list to be verified against the resulting [`StatusCode`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpresponsemessage.statuscode).
-`EnsureNoContent` | Adds the [`HttpStatusCode.NoContent`](https://learn.microsoft.com/en-us/dotnet/api/system.net.httpstatuscode#system-net-httpstatuscode-nocontent) to the accepted list to be verified against the resulting [`StatusCode`](https://learn.microsoft.com/noconetnten-us/dotnet/api/system.net.http.httpresponsemessage.statuscode).
-`EnsureNotFound` | Adds the [`HttpStatusCode.NotFound`](https://learn.microsoft.com/en-us/dotnet/api/system.net.httpstatuscode#system-net-httpstatuscode-notfound) to the accepted list to be verified against the resulting [`StatusCode`](https://learn.microsoft.com/noconetnten-us/dotnet/api/system.net.http.httpresponsemessage.statuscode).
-`EnsureOK` | Adds the [`HttpStatusCode.OK`](https://learn.microsoft.com/en-us/dotnet/api/system.net.httpstatuscode#system-net-httpstatuscode-ok) to the accepted list to be verified against the resulting [`StatusCode`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpresponsemessage.statuscode).
-`EnsureSuccess` | Specifies whether to automatically perform a [`HttpResponseMessage.EnsureSuccessStatusCode`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpresponsemessage.ensuresuccessstatuscode).
-`NullOnNotFound` | Specifies that a `null`/`default` value is returned where the _response_ has a `HttpStatusCode.NotFound` (applicable to an HTTP `GET` only).
-`OnBeforeRequest` | Specifies the [function](https://learn.microsoft.com/en-us/dotnet/api/system.func-3) to update the [`HttpRequestMessage`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httprequestmessage) before the request is sent. 
-`ThrowKnownException` | Specifies that the [`IExtendedException`](../Abstractions/IExtendedException.cs) exception implementation for the HTTP status code is thrown when encountered.
-`ThrowTransientException` | Specifies that a [`TransientException`](../TransientException.cs) is thrown when a transient error is encountered.
-`WithMaxRetryDelay` | Specifies the max retry delay that polly retries will be capped with.
-`WithCustomRetryPolicy` | Specifies a custom retry policy; overridding the default.
-`WithRetry` | Specifies a retry, including count and delay seconds (exponential), where a transient error is encountered.
-`WithTimeout` | Specifies the timeout for a request.
-
-<br/>
-
-### Request options
-
-The [`HttpRequestOptions`](./HttpRequestOptions.cs) enable additional standardized options to be specified per request where applicable.
-
-<br/>
-
-### Result
-
-The [`HttpResult`](./HttpResult.cs) and [`HttpResult<T>`](./HttpResultT.cs) provide a standardized result that encapsulates the underlying [`HttpResponseMessage`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpresponsemessage); including the underlying JSON deserialization of underlying value.
-
-<br/>
-
-### Example
-
-The following demonstrates usage.
-
-``` csharp
-public class XxxAgent : TypedHttpClientCore<XxxAgent>
-{
-    public XxxwAgent(HttpClient client, IJsonSerializer jsonSerializer, CoreEx.ExecutionContext executionContext, SettingsBase settings, ILogger<XxxAgent> logger)
-        : base(client, jsonSerializer, executionContext, settings, logger)
-    {
-        DefaultOptions.WithRetry();
-    }
-}
-
-...
-
-var hr = await _xxxAgent.EnsureOK().EnsureNotFound().PostAsync<dynamic, int>("foo/bar", new { trackerId = id }).ConfigureAwait(false);
-if (hr.StatusCode == HttpStatusCode.NotFound)
-    return -1;
-
-return hr.Value;
-```
-
-<br/>
-
-## Extended
-
-The [`CoreEx.Http.Extended`](./Extended) namespace enables extended Typed HttpClient types where request and response [mapping](../Mapping) is also included.
+- [RFC 7807 — Problem Details for HTTP APIs](https://tools.ietf.org/html/rfc7807) - The specification that `ProblemDetails` implements.
\ No newline at end of file
diff --git a/src/CoreEx/Http/TypedHttpClient.cs b/src/CoreEx/Http/TypedHttpClient.cs
deleted file mode 100644
index 8b5f56a3..00000000
--- a/src/CoreEx/Http/TypedHttpClient.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides a basic typed <see cref="HttpClient"/> implementation (see <see cref="TypedHttpClientCore{TSelf}"/>) that supports <see cref="HttpMethod.Head"/>, <see cref="HttpMethod.Get"/>, <see cref="HttpMethod.Post"/>, <see cref="HttpMethod.Put"/>, <see cref="HttpMethod.Patch"/> and <see cref="HttpMethod.Delete"/>.
-    /// </summary>
-    public sealed class TypedHttpClient : TypedHttpClientCore<TypedHttpClient>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedHttpClientCore{TBase}"/>.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-        /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-        /// <param name="onBeforeRequest">The optional <see cref="TypedHttpClientBase{TSelf}.OnBeforeRequest(HttpRequestMessage, CancellationToken)"/> function. Defaults to <c>null</c>.</param>
-        /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-        public TypedHttpClient(HttpClient client, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null, Func<HttpRequestMessage, CancellationToken, Task>? onBeforeRequest = null) 
-            : base(client, jsonSerializer, executionContext) 
-            => DefaultOptions.OnBeforeRequest(onBeforeRequest);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/TypedHttpClientBase.cs b/src/CoreEx/Http/TypedHttpClientBase.cs
deleted file mode 100644
index a0704c8f..00000000
--- a/src/CoreEx/Http/TypedHttpClientBase.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Mime;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Web;
-using CoreEx.Entities;
-using CoreEx.Json;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Represents a typed <see cref="HttpClient"/> foundation wrapper.
-    /// </summary>
-    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-    public abstract class TypedHttpClientBase(HttpClient client, IJsonSerializer? jsonSerializer = null)
-    {
-        /// <summary>
-        /// Gets the underlying <see cref="HttpClient"/>.
-        /// </summary>
-        protected HttpClient Client { get; } = client.ThrowIfNull(nameof(client));
-
-        /// <summary>
-        /// Gets the Base Address of the client
-        /// </summary>
-        public Uri? BaseAddress => Client?.BaseAddress;
-
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        protected IJsonSerializer JsonSerializer { get; } = jsonSerializer ?? ExecutionContext.GetService<IJsonSerializer>() ?? Json.JsonSerializer.Default;
-
-        /// <summary>
-        /// Create an <see cref="HttpRequestMessage"/> with no specified content.
-        /// </summary>
-        /// <param name="method">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpRequestMessage"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected Task<HttpRequestMessage> CreateRequestAsync(HttpMethod method, [StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected Task<HttpRequestMessage> CreateRequestAsync(HttpMethod method, string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => CreateRequestInternalAsync(method, requestUri, null, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Create an <see cref="HttpRequestMessage"/> with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="method">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpRequestMessage"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected Task<HttpRequestMessage> CreateContentRequestAsync(HttpMethod method, [StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected Task<HttpRequestMessage> CreateContentRequestAsync(HttpMethod method, string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => CreateRequestInternalAsync(method, requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Create an <see cref="HttpRequestMessage"/> serializing the <paramref name="value"/> as JSON content.
-        /// </summary>
-        /// <typeparam name="TReq">The request <see cref="Type"/>.</typeparam>
-        /// <param name="method">The <see cref="HttpMethod"/>.</param>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value to be serialized to JSON.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpRequestMessage"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected Task<HttpRequestMessage> CreateJsonRequestAsync<TReq>(HttpMethod method, [StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TReq value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected Task<HttpRequestMessage> CreateJsonRequestAsync<TReq>(HttpMethod method, string requestUri, TReq value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => CreateContentRequestAsync(method, requestUri, new StringContent(JsonSerializer.Serialize(value), Encoding.UTF8, MediaTypeNames.Application.Json), ApplyValueETagToRequestOptions(value, requestOptions), args, cancellationToken);
-
-        /// <summary>
-        /// Applies the <paramref name="value"/> <see cref="IETag"/> to the <see cref="HttpRequestOptions"/> where not already specified.
-        /// </summary>
-        private static HttpRequestOptions? ApplyValueETagToRequestOptions<TReq>(TReq value, HttpRequestOptions? requestOptions = null)
-        {
-            if (value == null || (requestOptions != null && requestOptions.ETag != null))
-                return requestOptions;
-
-            if (value is IETag et && et.ETag != null)
-            {
-                if (requestOptions == null)
-                    return new HttpRequestOptions { ETag = et.ETag };
-
-                requestOptions.ETag = et.ETag;
-            }
-
-            return requestOptions;
-        }
-
-        /// <summary>
-        /// Create the request applying the specified options and args.
-        /// </summary>
-        private async Task<HttpRequestMessage> CreateRequestInternalAsync(HttpMethod method, string requestUri, HttpContent? content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-        {
-            // Replace any format placeholders within request uri.
-            requestUri = FormatReplacement(requestUri, args);
-
-            // Access the query string.
-            var uri = new Uri(requestUri, UriKind.RelativeOrAbsolute);
-            var ub = new UriBuilder(uri.IsAbsoluteUri ? uri : new Uri(new Uri("https://coreex"), requestUri));
-            var qs = HttpUtility.ParseQueryString(ub.Query);
-
-            // Extend the query string from the IHttpArgs.
-            foreach (var arg in (args ??= []).Where(x => x != null))
-            {
-                arg.AddToQueryString(qs, JsonSerializer);
-            }
-
-            // Extend the query string to include additional options.
-            ub.Query = (requestOptions ?? new HttpRequestOptions()).AddToQueryString(qs);
-
-            // Create the request and include ETag if any.
-            var request = new HttpRequestMessage(method, uri.IsAbsoluteUri ? ub.Uri.ToString() : ub.Uri.PathAndQuery).ApplyETag(requestOptions?.ETag);
-            if (content != null)
-                request.Content = content;
-
-            // Apply the body/content IHttpArg.
-            foreach (var arg in args.Where(x => x != null))
-            {
-                await arg.ModifyHttpRequestAsync(request, JsonSerializer, cancellationToken).ConfigureAwait(false);
-            }
-
-            return request;
-        }
-
-        /// <summary>
-        /// Format replacement inspired by: https://github.com/dotnet/runtime/blob/main/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LogValuesFormatter.cs
-        /// </summary>
-        private static string FormatReplacement(string requestUri, IEnumerable<IHttpArg>? args)
-        {
-            var sb = new StringBuilder();
-            var scanIndex = 0;
-            var endIndex = requestUri.Length;
-
-            while (scanIndex < endIndex)
-            {
-                var openBraceIndex = FindBraceIndex(requestUri, '{', scanIndex, endIndex);
-                if (scanIndex == 0 && openBraceIndex == endIndex)
-                    return requestUri;  // No holes found.
-
-                var closeBraceIndex = FindBraceIndex(requestUri, '}', openBraceIndex, endIndex);
-                if (closeBraceIndex == endIndex)
-                {
-                    sb.Append(requestUri, scanIndex, endIndex - scanIndex);
-                    scanIndex = endIndex;
-                }
-                else
-                {
-                    sb.Append(requestUri, scanIndex, openBraceIndex - scanIndex);
-
-                    if (args != null)
-                    {
-                        var arg = args.OfType<IHttpArgTypeArg>().Where(x => x != null && MemoryExtensions.Equals(requestUri.AsSpan(openBraceIndex + 1, closeBraceIndex - openBraceIndex - 1), x.Name, StringComparison.Ordinal)).FirstOrDefault();
-                        if (arg != null)
-                            sb.Append(arg.ToEscapeDataString());
-                    }
-
-                    scanIndex = closeBraceIndex + 1;
-                }
-            }
-
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Find the brace index within specified range.
-        /// </summary>
-        private static int FindBraceIndex(string format, char brace, int startIndex, int endIndex)
-        {
-            // Example: {{prefix{{{Argument}}}suffix}}.
-            var braceIndex = endIndex;
-            var scanIndex = startIndex;
-            var braceOccurenceCount = 0;
-
-            while (scanIndex < endIndex)
-            {
-                if (braceOccurenceCount > 0 && format[scanIndex] != brace)
-                {
-                    if (braceOccurenceCount % 2 == 0)
-                    {
-                        // Even number of '{' or '}' found. Proceed search with next occurence of '{' or '}'.
-                        braceOccurenceCount = 0;
-                        braceIndex = endIndex;
-                    }
-                    else
-                    {
-                        // An unescaped '{' or '}' found.
-                        break;
-                    }
-                }
-                else if (format[scanIndex] == brace)
-                {
-                    if (brace == '}')
-                    {
-                        if (braceOccurenceCount == 0)
-                        {
-                            // For '}' pick the first occurence.
-                            braceIndex = scanIndex;
-                        }
-                    }
-                    else
-                    {
-                        // For '{' pick the last occurence.
-                        braceIndex = scanIndex;
-                    }
-
-                    braceOccurenceCount++;
-                }
-
-                scanIndex++;
-            }
-
-            return braceIndex;
-        }
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="HttpResponseMessage.Content"/> into <see cref="Type"/> of <typeparamref name="TResp"/>.
-        /// </summary>
-        /// <typeparam name="TResp">The response <see cref="Type"/>.</typeparam>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The deserialized response value.</returns>
-        protected async Task<TResp> ReadAsJsonAsync<TResp>(HttpResponseMessage response, CancellationToken cancellationToken = default)
-        {
-            response.EnsureSuccessStatusCode();
-            if (response.Content == null)
-                return default!;
-
-#if NETSTANDARD2_1
-            var data = await response.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
-#else
-            var data = await response.Content.ReadAsByteArrayAsync(cancellationToken).ConfigureAwait(false);
-#endif
-            return JsonSerializer.Deserialize<TResp>(new BinaryData(data))!;
-        }
-
-        /// <summary>
-        /// Sends the <paramref name="request"/> returning the <see cref="HttpResponseMessage"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResponseMessage"/>.</returns>
-        protected abstract Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Determines whether the <paramref name="response"/> or <paramref name="exception"/> result is transient in nature, and as such is a candidate for a retry.
-        /// </summary>
-        /// <param name="response">The <see cref="HttpResponseMessage"/>.</param>
-        /// <param name="exception">The <see cref="Exception"/>.</param>
-        /// <returns><c>true</c> indicates transient; otherwise, <c>false</c>.</returns>
-        public static (bool result, string error) IsTransient(HttpResponseMessage? response = null, Exception? exception = null)
-        {
-            if (exception != null)
-            {
-                if (exception is HttpRequestException)
-                    return (true, $"Http Request Exception occurred: {exception.Message}");
-
-                if (exception is TaskCanceledException)
-                    return (true, "Task was canceled.");
-            }
-
-            if (response == null)
-                return (false, string.Empty);
-
-            if ((int)response.StatusCode >= 500)
-                return (true, $"Response status code was {response.StatusCode} >= 500.");
-
-            if (response.StatusCode == HttpStatusCode.RequestTimeout)
-                return (true, $"Response status code was {HttpStatusCode.RequestTimeout} ({(int)HttpStatusCode.RequestTimeout}).");
-
-            if (response.StatusCode == HttpStatusCode.TooManyRequests)
-                return (true, $"Response status code was {HttpStatusCode.TooManyRequests} ({(int)HttpStatusCode.TooManyRequests}).");
-
-            return (false, string.Empty);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/TypedHttpClientBaseT.cs b/src/CoreEx/Http/TypedHttpClientBaseT.cs
deleted file mode 100644
index 6bbe1671..00000000
--- a/src/CoreEx/Http/TypedHttpClientBaseT.cs
+++ /dev/null
@@ -1,667 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Http.Extended;
-using CoreEx.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Represents a typed <see cref="HttpClient"/> base wrapper.
-    /// </summary>
-    /// <typeparam name="TSelf">The self <see cref="Type"/> for support fluent-style method-chaining.</typeparam>
-    public abstract class TypedHttpClientBase<TSelf> : TypedHttpClientBase, ITypedHttpClientOptions where TSelf : TypedHttpClientBase<TSelf>
-    {
-        private TypedHttpClientOptions? _defaultOptions;
-        private TypedHttpClientOptions? _sendOptions;
-
-        /// <summary>
-        /// Gets or sets an action that is invoked during instance instantiation of the <see cref="TypedHttpClientBase{TSelf}"/> to enable additional runtime configuration of the <see cref="DefaultOptions"/> to be performed on the instance itself.
-        /// </summary>
-        /// <remarks>This is required as there is currently no means to configure prior to usage when using Dependency Injection (DI) leveraging the out-of-the-box <see href="https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.dependencyinjection.httpclientfactoryservicecollectionextensions.addhttpclient">AddHttpClient</see>.</remarks>
-        public static Action<TypedHttpClientOptions>? OnDefaultOptionsConfiguration { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypedHttpClientBase{TSelf}"/>.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>. Defaults to a new instance.</param>
-        /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-        public TypedHttpClientBase(HttpClient client, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null) : base(client, jsonSerializer)
-        {
-            ExecutionContext = executionContext ?? (ExecutionContext.HasCurrent ? ExecutionContext.Current : new ExecutionContext());
-            OnDefaultOptionsConfiguration?.Invoke(DefaultOptions);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.ExecutionContext"/>.
-        /// </summary>
-        protected ExecutionContext ExecutionContext { get; }
-
-        /// <summary>
-        /// Gets the default <see cref="TypedHttpClientOptions"/> used by all invocations (<see cref="Reset"/> after each <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>).
-        /// </summary>
-        /// <remarks>It is recommended that a <see cref="Reset"/> is performed after setting (unless set within the constructor) to ensure latest values are used.</remarks>
-        public TypedHttpClientOptions DefaultOptions => _defaultOptions ??= new TypedHttpClientOptions(this);
-
-        /// <summary>
-        /// Gets the <see cref="TypedHttpClientOptions"/> used <i>per</i> <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/> invocation then is immediately <see cref="Reset"/>.
-        /// </summary>
-        /// <remarks>This is <see cref="Reset"/> automatically after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>. The <see cref="Reset"/> will updated to the pre-configured <see cref="DefaultOptions"/>.</remarks>
-        public TypedHttpClientOptions SendOptions => _sendOptions ??= new TypedHttpClientOptions(_defaultOptions);
-
-        /// <inheritdoc/>
-        bool ITypedHttpClientOptions.HasSendOptions => _sendOptions is not null;
-
-        /// <summary>
-        /// Gets the list of correlation header names.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="HttpConsts.CorrelationIdHeaderName"/> and '<c>x-ms-client-tracking-id</c>'.</remarks>
-        protected virtual IEnumerable<string> CorrelationHeaderNames { get; } = [HttpConsts.CorrelationIdHeaderName, "x-ms-client-tracking-id"];
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="HttpResponseMessage"/> and where considered a transient error then a <see cref="TransientException"/> will be thrown.
-        /// </summary>
-        /// <param name="predicate">An optional predicate to determine whether the error is considered transient. Defaults to <see cref="TypedHttpClientBase.IsTransient(HttpResponseMessage?, Exception?)"/> where not specified.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TSelf ThrowTransientException(Func<HttpResponseMessage?, Exception?, (bool result, string error)>? predicate = null)
-        {
-            SendOptions.ThrowTransientException(predicate);
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Indicates whether to check the <see cref="HttpResponseMessage.StatusCode"/> and where it matches one of the <i>known</i> <see cref="IExtendedException.StatusCode"/> values then that <see cref="IExtendedException"/> will be thrown.
-        /// </summary>
-        /// <param name="useContentAsErrorMessage">Indicates whether to use the <see cref="HttpResponseMessage.Content"/> as the resulting exception message.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TSelf ThrowKnownException(bool useContentAsErrorMessage = false)
-        {
-            SendOptions.ThrowKnownException(useContentAsErrorMessage);
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Indicates whether to automatically perform an <see cref="HttpResponseMessage.EnsureSuccessStatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TSelf EnsureSuccess()
-        {
-            SendOptions.EnsureSuccess();
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.OK"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TSelf EnsureOK() => Ensure(HttpStatusCode.OK);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.NoContent"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TSelf EnsureNoContent() => Ensure(HttpStatusCode.NoContent);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.Accepted"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TSelf EnsureAccepted() => Ensure(HttpStatusCode.Accepted);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.Created"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TSelf EnsureCreated() => Ensure(HttpStatusCode.Created);
-
-        /// <summary>
-        /// Adds the <see cref="HttpStatusCode.NotFound"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TSelf EnsureNotFound() => Ensure(HttpStatusCode.NotFound);
-
-        /// <summary>
-        /// Adds the <paramref name="statusCodes"/> to the accepted list to be verified against the resulting <see cref="HttpResponseMessage.StatusCode"/>.
-        /// </summary>
-        /// <param name="statusCodes">One or more <see cref="HttpStatusCode">status codes</see> to be verified.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Will result in a <see cref="HttpRequestException"/> where condition is not met.</para></remarks>
-        public TSelf Ensure(params HttpStatusCode[] statusCodes)
-        {
-            SendOptions.Ensure(statusCodes);
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Indicates that a <c>null/default</c> is to be returned where the <b>response</b> has a <see cref="HttpStatusCode"/> of <see cref="HttpStatusCode.NotFound"/> (on <see cref="HttpMethod.Get"/> only).
-        /// </summary>
-        /// <remarks>
-        /// This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.
-        /// <para>Results in the corresponding <see cref="HttpResult"/> <see cref="HttpResultBase.NullOnNotFoundResponse"/> being set to get the desired outcome.</para></remarks>
-        public TSelf NullOnNotFound()
-        {
-            SendOptions.NullOnNotFound();
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Sets the function to update the <see cref="HttpRequestMessage"/> before the request is sent.
-        /// </summary>
-        /// <param name="beforeRequest">The function to update the <see cref="HttpRequestMessage"/>.</param>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        /// <remarks>This references the equivalent method within the <see cref="SendOptions"/>. This is <see cref="Reset"/> after each invocation; see <see cref="SendAsync(HttpRequestMessage, CancellationToken)"/>.</remarks>
-        public TSelf OnBeforeRequest(Func<HttpRequestMessage, CancellationToken, Task>? beforeRequest)
-        {
-            SendOptions.OnBeforeRequest(beforeRequest);
-            return (TSelf)this;
-        }
-
-        /// <summary>
-        /// Resets the <see cref="TypedHttpClientBase{TSelf}"/> to its initial <see cref="DefaultOptions"/> state.
-        /// </summary>
-        /// <returns>This instance to support fluent-style method-chaining.</returns>
-        public virtual TSelf Reset()
-        {
-            _sendOptions = null;
-            return (TSelf)this;
-        }
-
-        #region SendAsync
-
-        /// <summary>
-        /// Sends the <paramref name="request"/> returning the <see cref="HttpResponseMessage"/>.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResponseMessage"/>.</returns>
-        protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            try
-            {
-                return await TypedHttpClientInvoker.Current.InvokeAsync(this, async (_, cancellationToken) => await SendInternalAsync(request, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            }
-            finally
-            {
-                Reset();
-            }
-        }
-
-        /// <summary>
-        /// Sends the <paramref name="request"/> returning the <see cref="HttpResponseMessage"/> internal.
-        /// </summary>
-        private async Task<HttpResponseMessage> SendInternalAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            HttpResponseMessage? response = null;
-            var options = SendOptions;
-
-            try
-            {
-                CorrelationHeaderNames.ForEach(n => request.Headers.TryAddWithoutValidation(n, ExecutionContext.CorrelationId));
-
-                if (options.BeforeRequest != null)
-                    await options.BeforeRequest(request, cancellationToken).ConfigureAwait(false);
-
-                await OnBeforeRequest(request, cancellationToken).ConfigureAwait(false);
-
-                response = await Client.SendAsync(request, cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex) when (ex is TimeoutException || ex is SocketException)
-            {
-                // Both TimeoutException and SocketException are transient and indicate a connection was terminated.
-                if (options.ShouldThrowTransientException)
-                    throw new TransientException(ex.Message, ex);
-
-                throw;
-            }
-            catch (HttpRequestException hrex)
-            {
-                (bool isTransient, string error) = options.IsTransientPredicate(null, hrex);
-                if (options.ShouldThrowTransientException && isTransient)
-                    throw new TransientException(error, hrex);
-
-                throw;
-            }
-
-            // Further check if transient and throw accordingly.
-            (bool wasTransient, string errorMsg) = options.IsTransientPredicate(response, null);
-            if (options.ShouldThrowTransientException && wasTransient)
-                throw new TransientException(errorMsg);
-
-            if (options.ShouldThrowKnownException)
-            {
-                var eex = await response.ToExtendedExceptionAsync(options.ShouldThrowKnownUseContentAsMessage, cancellationToken).ConfigureAwait(false);
-                if (eex != null)
-                    throw (Exception)eex;
-            }
-
-            if (options.ShouldEnsureSuccess)
-                response.EnsureSuccessStatusCode();
-
-            if (options.ExpectedStatusCodes != null && !options.ExpectedStatusCodes.Contains(response.StatusCode))
-                throw new HttpRequestException($"Response status code {response.StatusCode}; expected one of the following: {string.Join(", ", options.ExpectedStatusCodes)}.");
-
-            return response;
-        }
-
-        /// <summary>
-        /// Provides an opportunity to update the <paramref name="request"/> before sending.
-        /// </summary>
-        /// <param name="request">The <see cref="HttpRequestMessage"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/></param>
-        protected virtual Task OnBeforeRequest(HttpRequestMessage request, CancellationToken cancellationToken) => Task.CompletedTask;
-
-        #endregion
-
-        #region HeadAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Head"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public async Task<HttpResult> HeadAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public async Task<HttpResult> HeadAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => await HttpResult.CreateAsync(await SendAsync(await CreateRequestAsync(HttpMethod.Head, requestUri, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-        #endregion
-
-        #region GetAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Get"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> GetAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> GetAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var nullOnNotFoundResponse = _sendOptions is not null && _sendOptions.ShouldNullOnNotFound;
-            var hr = await HttpResult.CreateAsync(await SendAsync(await CreateRequestAsync(HttpMethod.Get, requestUri, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            hr.NullOnNotFoundResponse = nullOnNotFoundResponse;
-            return hr;
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Get"/> request to the specified Uri as an asynchronous operation and deserialize the JSON <see cref="HttpResponseMessage.Content"/> to the specified .NET object <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> GetAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> GetAsync<TResponse>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var nullOnNotFoundResponse = _sendOptions is not null && _sendOptions.ShouldNullOnNotFound;
-            var response = await SendAsync(await CreateRequestAsync(HttpMethod.Get, requestUri, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            var hr = await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken).ConfigureAwait(false);
-            hr.NullOnNotFoundResponse = nullOnNotFoundResponse;
-            return hr;
-        }
-
-        #endregion
-
-        #region PostAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PostAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PostAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => await HttpResult.CreateAsync(await SendAsync(await CreateRequestAsync(HttpMethod.Post, requestUri, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PostAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PostAsync(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => await HttpResult.CreateAsync(await SendAsync(await CreateContentRequestAsync(HttpMethod.Post, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PostAsync<TRequest>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PostAsync<TRequest>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = (value is HttpContent content)
-                ? await SendAsync(await CreateContentRequestAsync(HttpMethod.Post, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false)
-                : await SendAsync(await CreateJsonRequestAsync(HttpMethod.Post, requestUri, value, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-            return await HttpResult.CreateAsync(response, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PostAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PostAsync<TResponse>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = await SendAsync(await CreateRequestAsync(HttpMethod.Post, requestUri, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PostAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args =  null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PostAsync<TResponse>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args =  null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = await SendAsync(await CreateContentRequestAsync(HttpMethod.Post, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PostAsync<TRequest, TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args =  null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PostAsync<TRequest, TResponse>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args =  null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = await SendAsync(await CreateJsonRequestAsync(HttpMethod.Post, requestUri, value, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken);
-        }
-
-        #endregion
-
-        #region PutAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PutAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PutAsync(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => await HttpResult.CreateAsync(await SendAsync(await CreateContentRequestAsync(HttpMethod.Put, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PutAsync<TRequest>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PutAsync<TRequest>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = (value is HttpContent content)
-                ? await SendAsync(await CreateContentRequestAsync(HttpMethod.Put, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false)
-                : await SendAsync(await CreateJsonRequestAsync(HttpMethod.Put, requestUri, value, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-            return await HttpResult.CreateAsync(response, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PutAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PutAsync<TResponse>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = await SendAsync(await CreateContentRequestAsync(HttpMethod.Put, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PutAsync<TRequest, TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PutAsync<TRequest, TResponse>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = await SendAsync(await CreateJsonRequestAsync(HttpMethod.Put, requestUri, value, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken);
-        }
-
-        #endregion
-
-        #region PatchAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PatchAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PatchAsync(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => await HttpResult.CreateAsync(await SendAsync(await CreateContentRequestAsync(HttpMethod.Patch, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="json"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="json">The JSON formatted as per the selected <paramref name="patchOption"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> PatchAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpPatchOption patchOption, [StringSyntax(StringSyntaxAttribute.Json)] string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> PatchAsync(string requestUri, HttpPatchOption patchOption, string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            if (patchOption == HttpPatchOption.NotSpecified)
-                throw new ArgumentException("A valid patch option must be specified.", nameof(patchOption));
-
-            var content = new StringContent(json, Encoding.UTF8, patchOption == HttpPatchOption.JsonPatch ? HttpConsts.JsonPatchMediaTypeName : HttpConsts.MergePatchMediaTypeName);
-            return await HttpResult.CreateAsync(await SendAsync(await CreateContentRequestAsync(HttpMethod.Patch, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PatchAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PatchAsync<TResponse>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            var response = await SendAsync(await CreateContentRequestAsync(HttpMethod.Patch, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="json"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="json">The JSON formatted as per the selected <paramref name="patchOption"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult<TResponse>> PatchAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpPatchOption patchOption, [StringSyntax(StringSyntaxAttribute.Json)] string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult<TResponse>> PatchAsync<TResponse>(string requestUri, HttpPatchOption patchOption, string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-        {
-            if (patchOption == HttpPatchOption.NotSpecified)
-                throw new ArgumentException("A valid patch option must be specified.", nameof(patchOption));
-
-            var content = new StringContent(json, Encoding.UTF8, patchOption == HttpPatchOption.JsonPatch ? HttpConsts.JsonPatchMediaTypeName : HttpConsts.MergePatchMediaTypeName);
-            var response = await SendAsync(await CreateContentRequestAsync(HttpMethod.Patch, requestUri, content, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-            return await HttpResult.CreateAsync<TResponse>(response, JsonSerializer, cancellationToken).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Delete"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        protected async Task<HttpResult> DeleteAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        protected async Task<HttpResult> DeleteAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => await HttpResult.CreateAsync(await SendAsync(await CreateRequestAsync(HttpMethod.Delete, requestUri, requestOptions, args?.ToArray()!, cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false), cancellationToken).ConfigureAwait(false);
-
-        #endregion
-
-        #region Healthcheck
-
-        /// <summary>
-        /// Performs a health check by sending a <see cref="HttpMethod.Head"/> request to base Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-        public virtual Task<HttpResult> HealthCheckAsync(CancellationToken cancellationToken = default)
-            => HeadAsync(string.Empty, null, null, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/TypedHttpClientCore.cs b/src/CoreEx/Http/TypedHttpClientCore.cs
deleted file mode 100644
index 0362b548..00000000
--- a/src/CoreEx/Http/TypedHttpClientCore.cs
+++ /dev/null
@@ -1,343 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Represents a typed <see cref="HttpClient"/> base wrapper that supports <see cref="HttpMethod.Head"/>, <see cref="HttpMethod.Get"/>, <see cref="HttpMethod.Post"/>, <see cref="HttpMethod.Put"/>, <see cref="HttpMethod.Patch"/> and <see cref="HttpMethod.Delete"/>.
-    /// </summary>
-    /// <typeparam name="TSelf">The self <see cref="Type"/> for support fluent-style method-chaining.</typeparam>
-    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    /// <param name="executionContext">The optional <see cref="ExecutionContext"/>. Defaults to a new instance.</param>
-    /// <remarks><see cref="ExecutionContext.GetService{T}"/> is used to default each parameter to a configured service where present before final described defaults.</remarks>
-    public abstract class TypedHttpClientCore<TSelf>(HttpClient client, IJsonSerializer? jsonSerializer = null, ExecutionContext? executionContext = null) : TypedHttpClientBase<TSelf>(client, jsonSerializer, executionContext) where TSelf : TypedHttpClientCore<TSelf>
-    {
-        #region HeadAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Head"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> HeadAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> HeadAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.HeadAsync(requestUri, requestOptions, args, cancellationToken);
-
-        #endregion
-
-        #region GetAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Get"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> GetAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> GetAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.GetAsync(requestUri, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Get"/> request to the specified Uri as an asynchronous operation and deserialize the JSON <see cref="HttpResponseMessage.Content"/> to the specified .NET object <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> GetAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> GetAsync<TResponse>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.GetAsync<TResponse>(requestUri, requestOptions, args, cancellationToken);
-
-        #endregion
-
-        #region PostAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PostAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PostAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PostAsync(requestUri, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PostAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PostAsync(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PostAsync(requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PostAsync<TRequest>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PostAsync<TRequest>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PostAsync<TRequest>(requestUri, value, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation and deserialize the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PostAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PostAsync<TResponse>(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PostAsync<TResponse>(requestUri, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PostAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PostAsync<TResponse>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PostAsync<TResponse>(requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Post"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PostAsync<TRequest, TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PostAsync<TRequest, TResponse>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PostAsync<TRequest, TResponse>(requestUri, value, requestOptions, args, cancellationToken);
-
-        #endregion
-
-        #region PutAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PutAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PutAsync(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PutAsync(requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PutAsync<TRequest>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PutAsync<TRequest>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PutAsync<TRequest>(requestUri, value, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PutAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PutAsync<TResponse>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PutAsync<TResponse>(requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Put"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="value"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TRequest">The request <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="value">The request value.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PutAsync<TRequest, TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PutAsync<TRequest, TResponse>(string requestUri, TRequest value, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PutAsync<TRequest, TResponse>(requestUri, value, requestOptions, args, cancellationToken);
-
-        #endregion
-
-        #region PatchAsync
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PatchAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PatchAsync(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PatchAsync(requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="json"/>.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="json">The JSON formatted as per the selected <paramref name="patchOption"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> PatchAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpPatchOption patchOption, [StringSyntax(StringSyntaxAttribute.Json)] string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> PatchAsync(string requestUri, HttpPatchOption patchOption, string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PatchAsync(requestUri, patchOption, json, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="content"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="content">The <see cref="HttpContent"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PatchAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PatchAsync<TResponse>(string requestUri, HttpContent content, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PatchAsync<TResponse>(requestUri, content, requestOptions, args, cancellationToken);
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Patch"/> request to the specified Uri as an asynchronous operation with the specified <paramref name="json"/> and deserializes the response JSON <see cref="HttpResponseMessage.Content"/> to <typeparamref name="TResponse"/>.
-        /// </summary>
-        /// <typeparam name="TResponse">The response <see cref="Type"/>.</typeparam>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="json">The JSON formatted as per the selected <paramref name="patchOption"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult{T}"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult<TResponse>> PatchAsync<TResponse>([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpPatchOption patchOption, [StringSyntax(StringSyntaxAttribute.Json)] string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult<TResponse>> PatchAsync<TResponse>(string requestUri, HttpPatchOption patchOption, string json, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.PatchAsync<TResponse>(requestUri, patchOption, json, requestOptions, args, cancellationToken);
-
-        #endregion
-
-        #region Delete
-
-        /// <summary>
-        /// Send a <see cref="HttpMethod.Delete"/> request to the specified Uri as an asynchronous operation.
-        /// </summary>
-        /// <param name="requestUri">The Uri the request is sent to.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="args">Zero or more <see cref="IHttpArg"/> objects for <paramref name="requestUri"/> templating, query string additions, and content body specification.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="HttpResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public new Task<HttpResult> DeleteAsync([StringSyntax(StringSyntaxAttribute.Uri)] string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#else
-        public new Task<HttpResult> DeleteAsync(string requestUri, HttpRequestOptions? requestOptions = null, IEnumerable<IHttpArg>? args = null, CancellationToken cancellationToken = default)
-#endif
-            => base.DeleteAsync(requestUri, requestOptions, args, cancellationToken);
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Http/TypedHttpClientInvoker.cs b/src/CoreEx/Http/TypedHttpClientInvoker.cs
deleted file mode 100644
index 84e3b236..00000000
--- a/src/CoreEx/Http/TypedHttpClientInvoker.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-
-namespace CoreEx.Http
-{
-    /// <summary>
-    /// Provides the invocation wrapping for the <see cref="TypedHttpClientBase"/> instances.
-    /// </summary>
-    public class TypedHttpClientInvoker : InvokerBase<object>
-    {
-        private static TypedHttpClientInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static TypedHttpClientInvoker Current => CoreEx.ExecutionContext.GetService<TypedHttpClientInvoker>() ?? (_default ??= new TypedHttpClientInvoker());
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/ISystemTime.cs b/src/CoreEx/ISystemTime.cs
deleted file mode 100644
index 109ee193..00000000
--- a/src/CoreEx/ISystemTime.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx
-{
-    /// <summary>
-    /// Enables the specification/overrinding of the system time.
-    /// </summary>
-    public interface ISystemTime
-    {
-        /// <summary>
-        /// Gets the current system time in UTC.
-        /// </summary>
-        DateTime UtcNow { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/DataInvoker.cs b/src/CoreEx/Invokers/DataInvoker.cs
deleted file mode 100644
index 42154e99..00000000
--- a/src/CoreEx/Invokers/DataInvoker.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Wraps a <b>Data invoke</b> enabling standard <b>business tier</b> functionality to be added to all invocations.
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class DataInvoker : InvokerBase
-    {
-        private static DataInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static DataInvoker Current => CoreEx.ExecutionContext.GetService<DataInvoker>() ?? (_default ??= new DataInvoker());
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/DataSvcInvoker.cs b/src/CoreEx/Invokers/DataSvcInvoker.cs
deleted file mode 100644
index 6bb1110f..00000000
--- a/src/CoreEx/Invokers/DataSvcInvoker.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Wraps a <b>Data Service invoke</b> enabling standard <b>business tier</b> functionality to be added to all invocations.
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class DataSvcInvoker : InvokerBase
-    {
-        private static DataSvcInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static DataSvcInvoker Current => CoreEx.ExecutionContext.GetService<DataSvcInvoker>() ?? (_default ??= new DataSvcInvoker());
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/IInvoker.cs b/src/CoreEx/Invokers/IInvoker.cs
index 126ac5e2..60e2764b 100644
--- a/src/CoreEx/Invokers/IInvoker.cs
+++ b/src/CoreEx/Invokers/IInvoker.cs
@@ -1,34 +1,65 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Invokers;
 
-using System.Diagnostics;
-using System;
-using Microsoft.Extensions.Logging;
-
-namespace CoreEx.Invokers
+/// <summary>
+/// Enables standardized invocation capabilities.
+/// </summary>
+public interface IInvoker
 {
     /// <summary>
-    /// Enables the standardized invoker capabilities.
-    /// </summary>
-    public interface IInvoker
-    {
-        /// <summary>
-        /// Gets the start of an <see cref="Activity"/> action.
-        /// </summary>
-        Action<InvokeArgs>? OnActivityStart { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Activity"/>  <see cref="Exception"/> action.
-        /// </summary>
-        Action<InvokeArgs, Exception>? OnActivityException { get; }
-
-        /// <summary>
-        /// Gets the completion of an <see cref="Activity"/> action.
-        /// </summary>
-        Action<InvokeArgs>? OnActivityComplete { get; }
-
-        /// <summary>
-        /// Get the caller information <see cref="ILogger"/> formatter.
-        /// </summary>
-        Func<InvokeArgs, string> CallerLoggerFormatter { get; }
-    }
+    /// Gets the invoker <see cref="System.Type"/>.
+    /// </summary>
+    Type Type { get; }
+
+    /// <summary>
+    /// Gets the invoker name.
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// Gets the optional <see cref="IServiceProvider"/>.
+    /// </summary>
+    public IServiceProvider? ServiceProvider { get; }
+
+    /// <summary>
+    /// Gets the optional <see cref="ILogger"/>.
+    /// </summary>
+    ILogger? Logger { get; }
+
+    /// <summary>
+    /// Gets the optional <see cref="IConfiguration"/>.
+    /// </summary>
+    IConfiguration? Configuration { get; }
+
+    /// <summary>
+    /// Gets the <see cref="System.Diagnostics.ActivityKind"/> associated with the invoker.
+    /// </summary>
+    ActivityKind ActivityKind { get; }
+
+    /// <summary>
+    /// Indicates whether the tracing is explicitly disabled for the invoker; i.e. will never happen regardless of configuration or other factors.
+    /// </summary>
+    bool IsTracingDisabled { get; }
+
+    /// <summary>
+    /// Indicates whether the logging is explicitly disabled for the invoker; i.e. will never happen regardless of configuration or other factors.
+    /// </summary>
+    bool IsLoggingDisabled { get; }
+
+    /// <summary>
+    /// Invoked on <see cref="Activity"/> start.
+    /// </summary>
+    /// <param name="tracer">The <see cref="InvokerTracer"/>.</param>
+    void OnActivityStart(InvokerTracer tracer);
+
+    /// <summary>
+    /// Invoked where the invocation resulted in an <paramref name="exception"/> for an <see cref="Activity"/>.
+    /// </summary>
+    /// <remarks><see cref="OnActivityComplete(InvokerTracer)"/> and <see cref="OnActivityException(InvokerTracer, Exception)"/> are mutually exclusive.</remarks>
+    void OnActivityException(InvokerTracer tracer, Exception exception);
+
+    /// <summary>
+    /// Invoked where the invocation completes successfully for an <see cref="Activity"/>.
+    /// </summary>
+    /// <remarks><see cref="OnActivityComplete(InvokerTracer)"/> and <see cref="OnActivityException(InvokerTracer, Exception)"/> are mutually exclusive.</remarks>
+    void OnActivityComplete(InvokerTracer tracer);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokeArgs.cs b/src/CoreEx/Invokers/InvokeArgs.cs
deleted file mode 100644
index c93a2c7f..00000000
--- a/src/CoreEx/Invokers/InvokeArgs.cs
+++ /dev/null
@@ -1,284 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Configuration;
-using CoreEx.Results;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics;
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Represents the runtime arguments for an <see cref="InvokerBase{TInvoker}"/> or <see cref="InvokerBase{TInvoker, TArgs}"/> invocation.
-    /// </summary>
-    public struct InvokeArgs
-    {
-        private static readonly ConcurrentDictionary<Type, ActivitySource> _activitySources = new();
-
-        private const string NullName = "null";
-        private const string InvokerTypeName = "invoker.type";
-        private const string InvokerOwnerName = "invoker.owner";
-        private const string InvokerMemberName = "invoker.member";
-        private const string InvokerResultName = "invoker.result";
-        private const string InvokerFailureName = "invoker.failure";
-        private const string CompleteStateText = "Complete";
-        private const string SuccessStateText = "Success";
-        private const string FailureStateText = "Failure";
-        private const string ExceptionStateText = "Exception";
-
-        private Type? _ownerType;
-        private bool _isComplete;
-
-        /// <summary>
-        /// Determines whether tracing is enabled for the <paramref name="invokerType"/>.
-        /// </summary>
-        private static bool IsTracingEnabled(Type invokerType)
-        {
-            var settings = ExecutionContext.GetService<SettingsBase>() ?? new DefaultSettings(ExecutionContext.GetService<IConfiguration>());
-            if (settings.Configuration is null)
-                return true;
-
-            return settings.GetCoreExValue<bool?>($"Invokers:{invokerType.FullName}:TracingEnabled") ?? settings.GetCoreExValue<bool?>("Invokers:Default:TracingEnabled") ?? true;
-        }
-
-        /// <summary>
-        /// Determines whether logging is enabled for the <paramref name="invokerType"/>.
-        /// </summary>
-        private static bool IsLoggingEnabled(Type invokerType)
-        {
-            var settings = ExecutionContext.GetService<SettingsBase>() ?? new DefaultSettings(ExecutionContext.GetService<IConfiguration>());
-            if (settings.Configuration is null)
-                return true;
-
-            return settings.GetCoreExValue<bool?>($"Invokers:{invokerType.FullName}:LoggingEnabled") ?? settings.GetCoreExValue<bool?>("Invokers:Default:LoggingEnabled") ?? true;
-        }
-
-        /// <summary>
-        /// Provides the default <see cref="IInvoker.CallerLoggerFormatter"/> implementation.
-        /// </summary>
-        /// <param name="args">The <see cref="InvokeArgs"/>.</param>
-        /// <returns>The caller information to be included in the log output.</returns>
-        public static string DefaultCallerLogFormatter(InvokeArgs args) => args.OwnerType is null ? args.MemberName ?? NullName : $"{args.OwnerType}->{args.MemberName ?? NullName}";
-
-        /// <summary>
-        /// Gets or sets the <see cref="ICacheEntry.AbsoluteExpirationRelativeToNow"/> <see cref="TimeSpan"/> for <i>tracing</i> and <i>logging</i> enablement determination.
-        /// </summary>
-        /// <remarks>These are cached to avoid the overhead of repeated configuration lookups and allow for dynamic configuration changes.</remarks>
-        public static TimeSpan AbsoluteExpirationTimeSpan { get; set; } = TimeSpan.FromMinutes(5);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvokeArgs"/> struct.
-        /// </summary>
-        /// <remarks>This will throw a <see cref="NotSupportedException"/>.</remarks>
-        public InvokeArgs() => throw new NotSupportedException($"The {nameof(InvokeArgs)} default constructor is not supported; please use other(s).");
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InvokeArgs"/> struct.
-        /// </summary>
-        /// <param name="invoker">The initiating <see cref="IInvoker"/>.</param>
-        /// <param name="owner">The invoking (owner) value.</param>
-        /// <param name="memberName">The calling member name.</param>
-        /// <param name="invokeArgs">The optional parent <see cref="InvokeArgs"/>.</param>
-        /// <remarks>Creates the tracing <see cref="Activity.OperationName"/> by concatenating the invoking <see name="OwnerType"/> (<see cref="Type.FullName"/>) and <paramref name="memberName"/> separated by '<c> -> </c>'. This is <i>not</i>
-        /// meant to represent the fully-qualified member/method name.</remarks>
-        public InvokeArgs(IInvoker invoker, object? owner, string? memberName, InvokeArgs? invokeArgs)
-        {
-            Invoker = invoker ?? throw new ArgumentNullException(nameof(invoker));
-            InvokerType = invoker.GetType();
-            Owner = owner;
-            MemberName = memberName;
-
-            try
-            {
-                var enabled = Internal.MemoryCache.GetOrCreate<(bool IsTracingEnabled, bool IsLoggingEnabled)>(InvokerType, e =>
-                {
-                    // These are cached to avoid the overhead of repeated configuration lookups and allow for dynamic configuration changes.
-                    var type = (Type)e.Key;
-                    e.SetAbsoluteExpiration(TimeSpan.FromMinutes(5));
-                    return (IsTracingEnabled(type), IsLoggingEnabled(type));
-                });
-                
-                if (enabled.IsTracingEnabled)
-                {
-                    var activitySource = _activitySources.GetOrAdd(InvokerType, type => new ActivitySource(type.FullName ?? NullName));
-                    Activity = activitySource.CreateActivity(OwnerType is null ? memberName ?? NullName : $"{OwnerType}->{memberName ?? NullName}", ActivityKind.Internal);
-                    if (Activity is not null)
-                    {
-                        if (invokeArgs.HasValue && invokeArgs.Value.Activity is not null)
-                            Activity.SetParentId(invokeArgs.Value.Activity!.TraceId, invokeArgs.Value.Activity.SpanId, invokeArgs.Value.Activity.ActivityTraceFlags);
-
-                        Activity.SetTag(InvokerTypeName, activitySource.Name);
-                        Activity.SetTag(InvokerOwnerName, OwnerType?.FullName);
-                        Activity.SetTag(InvokerMemberName, memberName);
-                        Invoker.OnActivityStart?.Invoke(this);
-                        Activity.Start();
-                    }
-                }
-
-                if (enabled.IsLoggingEnabled)
-                {
-                    Logger = ExecutionContext.GetService<ILogger<Invoker>>();
-                    if (Logger is null || !Logger.IsEnabled(LogLevel.Debug))
-                        Logger = null;
-                    else
-                    {
-                        Logger.LogDebug("{InvokerType}: Start {InvokerCaller}.", InvokerType.ToString(), Invoker.CallerLoggerFormatter(this));
-                        Stopwatch = Stopwatch.StartNew();
-                    }
-                }
-            }
-            catch
-            {
-                // Continue; do not allow tracing/logging to impact the execution.
-                Activity = null;
-                Logger = null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the initiating <see cref="IInvoker"/>.
-        /// </summary>
-        public IInvoker Invoker { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IInvoker"/> <see cref="Type"/>.
-        /// </summary>
-        public Type InvokerType { get; }
-
-        /// <summary>
-        /// Gets the owning invocation value.
-        /// </summary>
-        public object? Owner { get; }
-
-        /// <summary>
-        /// Gets the owning invocation <see cref="Type"/>
-        /// </summary>
-        public Type? OwnerType => _ownerType ??= Owner?.GetType();
-
-        /// <summary>
-        /// Gets the calling member name.
-        /// </summary>
-        public string? MemberName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="System.Diagnostics.Activity"/> leveraged for standardized (open-telemetry) tracing.
-        /// </summary>
-        /// <remarks>Will be <c>null</c> where tracing is <i>not</i> enabled.</remarks>
-        public Activity? Activity { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/> leveraged for standardized invoker logging.
-        /// </summary>
-        public ILogger? Logger { get; }
-
-        /// <summary>
-        /// Gets the <see cref="Stopwatch"/> leveraged for standardized invoker timing.
-        /// </summary>
-        public Stopwatch? Stopwatch { get; }
-
-        /// <summary>
-        /// Adds the result outcome to the <see cref="Activity"/> (where started).
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="result">The result value.</param>
-        /// <returns>The <paramref name="result"/>.</returns>
-        /// <remarks>Where the <typeparamref name="TResult"/> is a <see cref="Result"/> then the underlying <see cref="Result.Success"/> or <see cref="Result.Error"/> will be recorded accordingly.</remarks>
-        public TResult TraceResult<TResult>(TResult result)
-        {
-            if (Activity is not null)
-            {
-                var ir = result as IResult;
-                Activity.SetTag(InvokerResultName, ir is null ? CompleteStateText : (ir.IsSuccess ? SuccessStateText : FailureStateText));
-                if (ir is not null && ir.IsFailure)
-                    Activity.SetTag(InvokerFailureName, $"{ir.Error.Message} ({ir.Error.GetType()})");
-
-                Invoker.OnActivityComplete?.Invoke(this);
-                _isComplete = true;
-            }
-
-            if (Logger is not null)
-            {
-                Stopwatch!.Stop();
-                var ir = result as IResult;
-                Logger.LogDebug("{InvokerType}: {InvokerResult} {InvokerCaller}{InvokerFailure} [{Elapsed}ms].", 
-                    InvokerType.ToString(), ir is null ? CompleteStateText : (ir.IsSuccess ? SuccessStateText : FailureStateText), Invoker.CallerLoggerFormatter(this), (ir is not null && ir.IsFailure) ? $" {ir.Error.Message} ({ir.Error.GetType()})" : string.Empty, Stopwatch.Elapsed.TotalMilliseconds);
-               
-                _isComplete = true;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Completes the <see cref="Activity"/> tracing (where started) recording the <see cref="InvokerResultName"/> with the <see cref="ExceptionStateText"/> and capturing the corresponding <see cref="Exception.Message"/>.
-        /// </summary>
-        /// <param name="ex">The <see cref="System.Exception"/>.</param>
-        public void TraceException(Exception ex)
-        {
-            if (Activity is not null && ex is not null)
-            {
-                Activity.SetTag(InvokerResultName, ExceptionStateText);
-                Activity.SetTag(InvokerFailureName, $"{ex.Message} ({ex.GetType()})");
-                Invoker.OnActivityException?.Invoke(this, ex);
-                _isComplete = true;
-            }
-
-            if (Logger is not null && ex is not null)
-            {
-                Stopwatch!.Stop();
-                Logger.LogDebug("{InvokerType}: {InvokerResult} {InvokerCaller}{InvokerFailure} [{Elapsed}ms].", InvokerType.ToString(), ExceptionStateText, Invoker.CallerLoggerFormatter(this), $" {ex.Message} ({ex.GetType()})", Stopwatch.Elapsed.TotalMilliseconds);
-                _isComplete = true;
-            }
-        }
-
-        /// <summary>
-        /// Completes (stops) the <see cref="Activity"/> tracing (where started).
-        /// </summary>
-        /// <remarks>Where not previously recorded as complete will set the <see cref="InvokerResultName"/> to <see cref="ExceptionStateText"/>.</remarks>
-        public readonly void TraceComplete()
-        {
-            if (Activity is not null)
-            {
-                // Where no result then it can only be as a result of an exception.
-                if (!_isComplete)
-                {
-                    Activity.SetTag(InvokerResultName, ExceptionStateText);
-                    Invoker.OnActivityException?.Invoke(this, new InvalidOperationException("The invocation was not completed successfully."));
-                }
-
-                Activity.Stop();
-            }
-
-            if (Logger is not null && !_isComplete)
-            {
-                Stopwatch!.Stop();
-                Logger.LogDebug("{InvokerType}: {InvokerResult} {InvokerCaller} [{Elapsed}ms].", InvokerType.ToString(), ExceptionStateText, Invoker.CallerLoggerFormatter(this), Stopwatch.Elapsed.TotalMilliseconds);
-            }
-        }
-
-        /// <summary>
-        /// Creates (and started) a new <see cref="InvokeArgs"/> instance for a related invocation.
-        /// </summary>
-        /// <param name="invoker">The invoker used to manage the activity sources.</param>
-        /// <param name="owner">The invoking (owner) value.</param>
-        /// <param name="memberName">The calling member name.</param>
-        /// <returns>The <see cref="InvokeArgs"/>.</returns>
-        public readonly InvokeArgs StartNewRelated(IInvoker invoker, object? owner, string? memberName) => new(invoker, owner, memberName, this);
-
-        /// <summary>
-        /// Releases (disposes) all <see cref="ActivitySource"/> instances.
-        /// </summary>
-        public static void ReleaseAll()
-        {
-            foreach (var item in _activitySources.ToArray())
-            {
-                if (_activitySources.TryRemove(item.Key, out var activitySource))
-                    activitySource?.Dispose();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/Invoker.cs b/src/CoreEx/Invokers/Invoker.cs
index 8db4b485..08a2571e 100644
--- a/src/CoreEx/Invokers/Invoker.cs
+++ b/src/CoreEx/Invokers/Invoker.cs
@@ -1,53 +1,50 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Invokers;
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Invokers
+/// <summary>
+/// Provides a generic invoker.
+/// </summary>
+[InvokerName("CoreEx.Invokers.Invoker")]
+public sealed class Invoker : InvokerBase
 {
     /// <summary>
-    /// Provides invoking capabilities including <see cref="RunSync(Func{Task})"/> and <see cref="RunSync{T}(Func{Task{T}})"/> to execute an async <see cref="Task"/> synchronously.
+    /// Gets the default <see cref="Invoker"/> for general-purpose use.
     /// </summary>
-    public class Invoker
-    {
-        private static readonly TaskFactory _taskFactory = new(CancellationToken.None, TaskCreationOptions.None, TaskContinuationOptions.None, TaskScheduler.Default);
+    /// <remarks>Note that both <see cref="IsLoggingDisabled"/> and <see cref="IsTracingDisabled"/> are <see langword="true"/>; i.e. they are disabled.</remarks>
+    public static Invoker Default { get; } = new Invoker();
 
-        /// <summary>
-        /// Returns the <paramref name="task"/> where not <c>null</c>; otherwise, a <see cref="Task.CompletedTask"/>.
-        /// </summary>
-        /// <param name="task">The <see cref="Task"/>.</param>
-        /// <returns>The <paramref name="task"/> where not <c>null</c>; otherwise, a <see cref="Task.CompletedTask"/>.</returns>
-        public static Task InvokeAsync(Task? task) => task ?? Task.CompletedTask;
+    /// <summary>
+    /// Executes an async <paramref name="func"/> synchronously.
+    /// </summary>
+    /// <param name="func">The async function.</param>
+    /// <remarks>The general guidance is to avoid sync over async as this may result in deadlock, so please consider all options before using. There are many <see href="https://stackoverflow.com/questions/5095183/how-would-i-run-an-async-taskt-method-synchronously">articles</see>
+    /// written discussing this subject; however, if sync over async is needed this method provides a consistent approach to perform.</remarks>
+    public static void RunSync(Func<Task> func)
+    {
+        var task = func();
+        if (!task.IsCompleted)
+            task.GetAwaiter().GetResult();
+    }
 
-        /// <summary>
-        /// Returns the <paramref name="task"/> where not <c>null</c>; otherwise, a <see cref="Task.FromResult{TResult}(TResult)"/> with a default value.
-        /// </summary>
-        /// <param name="task">The <see cref="Task"/>.</param>
-        /// <returns>The <paramref name="task"/> where not <c>null</c>; otherwise, a <see cref="Task.FromResult{TResult}(TResult)"/> with a default value.</returns>
-        public static Task<T> InvokeAsync<T>(Task<T>? task) => task ?? Task.FromResult<T>(default!);
+    /// <summary>
+    /// Executes an async <paramref name="func"/> synchronously with a result.
+    /// </summary>
+    /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
+    /// <param name="func">The async function.</param>
+    /// <returns>The resulting value.</returns>
+    /// <remarks>The general guidance is to avoid sync over async as this may result in deadlock, so please consider all options before using. There are many <see href="https://stackoverflow.com/questions/5095183/how-would-i-run-an-async-taskt-method-synchronously">articles</see>
+    /// written discussing this subject; however, if sync over async is needed this method provides a consistent approach to perform.</remarks>
+    public static T RunSync<T>(Func<Task<T>> func)
+    {
+        var task = func();
+        if (task.IsCompleted)
+            return task.Result;
 
-        /// <summary>
-        /// Executes an async <see cref="Task"/> sychronously.
-        /// </summary>
-        /// <param name="task">The async <see cref="Task"/>.</param>
-        /// <remarks>The general guidance is to avoid sync over async as this may result in deadlock, so please consider all options before using. There are many <see href="https://stackoverflow.com/questions/5095183/how-would-i-run-an-async-taskt-method-synchronously">articles</see>
-        /// written discussing this subject; however, if sync over async is needed this method provides a consistent approach to perform. This implementation has been inspired by <see href="https://www.ryadel.com/en/asyncutil-c-helper-class-async-method-sync-result-wait/"/>.</remarks>
-        public static void RunSync(Func<Task> task) => _taskFactory.StartNew(task.ThrowIfNull(nameof(task))).Unwrap().GetAwaiter().GetResult();
+        return task.GetAwaiter().GetResult();
+    }
 
-        /// <summary>
-        /// Executes an async <see cref="Task"/> sychronously with a result.
-        /// </summary>
-        /// <typeparam name="T">The result <see cref="Type"/>.</typeparam>
-        /// <param name="task">The async <see cref="Task"/>.</param>
-        /// <returns>The resulting value.</returns>
-        /// <remarks>The general guidance is to avoid sync over async as this may result in deadlock, so please consider all options before using. There are many <see href="https://stackoverflow.com/questions/5095183/how-would-i-run-an-async-taskt-method-synchronously">articles</see>
-        /// written discussing this subject; however, if sync over async is needed this method provides a consistent approach to perform. This implementation has been inspired by <see href="https://www.ryadel.com/en/asyncutil-c-helper-class-async-method-sync-result-wait/"/>.</remarks>
-        public static T RunSync<T>(Func<Task<T>> task) => _taskFactory.StartNew(task.ThrowIfNull(nameof(task))).Unwrap().GetAwaiter().GetResult();
+    /// <inheritdoc/>>
+    public override bool IsLoggingDisabled => true;
 
-        /// <summary>
-        /// Private constructor.
-        /// </summary>
-        private Invoker() { }
-    }
+    /// <inheritdoc/>>
+    public override bool IsTracingDisabled => true;
 }
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerArgs.cs b/src/CoreEx/Invokers/InvokerArgs.cs
deleted file mode 100644
index 82be1b64..00000000
--- a/src/CoreEx/Invokers/InvokerArgs.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using System;
-using System.Transactions;
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Provides arguments for the <see cref="InvokerBase"/> to manage the likes of <see cref="Transaction">transactions</see> and <see cref="EventPublisher">event sending.</see>.
-    /// </summary>
-    public struct InvokerArgs
-    {
-        /// <summary>
-        /// Gets or sets the <i>default</i> <see cref="InvokerArgs"/> where <see cref="IncludeTransactionScope"/> is <c>false</c> and <see cref="OperationType"/> is <c>null</c>.
-        /// </summary>
-        public static InvokerArgs Default { get; set; } = new InvokerArgs();
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="OperationType"/> is <see cref="CoreEx.OperationType.Read"/> and <see cref="IncludeTransactionScope"/> is <c>false</c>.
-        /// </summary>
-        public static InvokerArgs Read { get; } = new InvokerArgs { OperationType = CoreEx.OperationType.Read };
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="OperationType"/> is <see cref="CoreEx.OperationType.Create"/> and <see cref="IncludeTransactionScope"/> is <c>false</c>.
-        /// </summary>
-        public static InvokerArgs Create { get; } = new InvokerArgs { OperationType = CoreEx.OperationType.Create };
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="OperationType"/> is <see cref="CoreEx.OperationType.Update"/> and <see cref="IncludeTransactionScope"/> is <c>false</c>.
-        /// </summary>
-        public static InvokerArgs Update { get; } = new InvokerArgs { OperationType = CoreEx.OperationType.Update };
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="OperationType"/> is <see cref="CoreEx.OperationType.Delete"/> and <see cref="IncludeTransactionScope"/> is <c>false</c>.
-        /// </summary>
-        public static InvokerArgs Delete { get; } = new InvokerArgs { OperationType = CoreEx.OperationType.Delete };
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="OperationType"/> is <see cref="CoreEx.OperationType.Unspecified"/> and <see cref="IncludeTransactionScope"/> is <c>false</c>.
-        /// </summary>
-        public static InvokerArgs Unspecified { get; } = new InvokerArgs { OperationType = CoreEx.OperationType.Unspecified };
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="IncludeTransactionScope"/> is <c>true</c> and <see cref="TransactionScopeOption"/> is <see cref="TransactionScopeOption.Suppress"/>.
-        /// </summary>
-        public static InvokerArgs TransactionSuppress { get; } = new InvokerArgs { IncludeTransactionScope = true, TransactionScopeOption = TransactionScopeOption.Suppress };
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/> where <see cref="IncludeTransactionScope"/> is <c>true</c> and <see cref="TransactionScopeOption"/> is <see cref="TransactionScopeOption.RequiresNew"/>.
-        /// </summary>
-        public static InvokerArgs TransactionRequiresNew { get; } = new InvokerArgs { IncludeTransactionScope = true, TransactionScopeOption = TransactionScopeOption.RequiresNew };
-
-        /// <summary>
-        /// Initialises a new instance of the <see cref="InvokerArgs"/> struct.
-        /// </summary>
-        public InvokerArgs() { }
-
-        /// <summary>
-        /// Indicates whether to wrap the invocation with a <see cref="TransactionScope"/> (see <see cref="TransactionScopeOption"/>). Defaults to <c>false</c>.
-        /// </summary>
-        public bool IncludeTransactionScope { get; set; } = false;
-
-        /// <summary>
-        /// Gets or sets the <see cref="System.Transactions.TransactionScopeOption"/> (see <see cref="IncludeTransactionScope"/>). Defaults to <see cref="TransactionScopeOption.Required"/>.
-        /// </summary>
-        public TransactionScopeOption TransactionScopeOption { get; set; } = TransactionScopeOption.Required;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IEventPublisher"/> to automatically perform an <see cref="IEventPublisher.SendAsync(System.Threading.CancellationToken)"/> on success.
-        /// </summary>
-        /// <remarks>Where set will automatically perform an <see cref="IEventPublisher.SendAsync(System.Threading.CancellationToken)"/>. This will be initiated before the <see cref="IncludeTransactionScope">corresponding</see> <see cref="Transaction"/>
-        /// is <see cref="TransactionScope.Complete">completed</see>; to ensure success before the final commit, otherwise a transaction rollback/cancel will occur.</remarks>
-        public IEventPublisher? EventPublisher { get; set; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="CoreEx.OperationType"/> to override the <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.OperationType"/>.
-        /// </summary>
-        /// <remarks>Note that this is not thread-safe in the sense that where set across multiple concurrent tasks the order in which they execute will update the shared <see cref="ExecutionContext.OperationType"/>. It is recommended that 
-        /// this is set at the top of the call stack before any further concurrent tasks are performed.</remarks>
-        public CoreEx.OperationType? OperationType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the unhandled <see cref="Exception"/> handler.
-        /// </summary>
-        public Action<Exception>? ExceptionHandler { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerBase.cs b/src/CoreEx/Invokers/InvokerBase.cs
index 1bfe7af5..52467139 100644
--- a/src/CoreEx/Invokers/InvokerBase.cs
+++ b/src/CoreEx/Invokers/InvokerBase.cs
@@ -1,102 +1,77 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Invokers;
 
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Transactions;
-
-namespace CoreEx.Invokers
+/// <summary>
+/// Enables standard functionality to be added to an invocation including tracing (and logging). 
+/// </summary>
+public abstract class InvokerBase : IInvoker
 {
     /// <summary>
-    /// Adds capabilities (wraps) an <see cref="InvokerBase{TOwner, TParam}"/> enabling standard functionality to be added to all <b>business services tier</b> (backend) invocations using a <see cref="InvokerArgs"/> to configure the 
-    /// supporting capabilities (for example, <see cref="InvokerArgs.IncludeTransactionScope">transactions</see> and <see cref="InvokerArgs.EventPublisher">event publishing</see>).
+    /// Initializes a new instance of the <see cref="InvokerBase{TSelf}"/> class.
     /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public abstract class InvokerBase : InvokerBase<object, InvokerArgs>
+    /// <param name="serviceProvider">The optional <i>root</i> <see cref="IServiceProvider"/> needed where there is no <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.ServiceProvider"/>.</param>
+    public InvokerBase(IServiceProvider? serviceProvider = null)
     {
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, object owner, Func<InvokeArgs, TResult> func, InvokerArgs args)
-        {
-            InvokerArgs bia = args;
-            TransactionScope? txn = null;
-            var ot = CoreEx.ExecutionContext.Current.OperationType;
-            if (bia.OperationType.HasValue)
-                CoreEx.ExecutionContext.Current.OperationType = bia.OperationType.Value;
+        Type = GetType();
+        Name = InvokerNameAttribute.GetName(Type);
+        ServiceProvider = serviceProvider;
+        Logger = serviceProvider?.GetService<ILoggerFactory>()?.CreateLogger(Type);
+        Configuration = serviceProvider?.GetService<IConfiguration>();
+    }
 
-            try
-            {
-                // Initiate a transaction where requested.
-                if (bia.IncludeTransactionScope)
-                    txn = new TransactionScope(bia.TransactionScopeOption, TransactionScopeAsyncFlowOption.Enabled);
+    /// <inheritdoc/>
+    public Type Type { get; }
 
-                // Invoke the underlying logic.
-                var result = func(invokeArgs);
+    /// <inheritdoc/>
+    public string Name { get; }
 
-                // Where using Railway-oriented programming, rollback the transaction where a failure has occurred.
-                if (result is IResult r && r.IsFailure)
-                    return result;
+    /// <summary>
+    /// Gets the optional <see cref="IServiceProvider"/>.
+    /// </summary>
+    public IServiceProvider? ServiceProvider { get; }
 
-                // Send any published events where applicable.
-                if (bia.EventPublisher != null)
-                    Invoker.RunSync(() => bia.EventPublisher.SendAsync(default));
+    /// <inheritdoc/>
+    public ILogger? Logger { get; }
 
-                // Complete the transaction where requested to orchestrate one.
-                txn?.Complete();
-                return result;
-            }
-            catch (Exception ex)
-            {
-                bia.ExceptionHandler?.Invoke(ex);
-                throw;
-            }
-            finally
-            {
-                txn?.Dispose();
-                CoreEx.ExecutionContext.Current.OperationType = ot;
-            }
-        }
+    /// <inheritdoc/>
+    public IConfiguration? Configuration { get; }
 
-        /// <inheritdoc/>
-        protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, object owner, Func<InvokeArgs, CancellationToken, Task<TResult>> func, InvokerArgs args, CancellationToken cancellationToken)
-        {
-            InvokerArgs bia = args;
-            TransactionScope? txn = null;
-            var ot = CoreEx.ExecutionContext.Current.OperationType;
-            if (bia.OperationType.HasValue)
-                CoreEx.ExecutionContext.Current.OperationType = bia.OperationType.Value;
+    /// <inheritdoc/>
+    /// <remarks>Defaults to <see cref="ActivityKind.Internal"/>.</remarks>
+    public virtual ActivityKind ActivityKind => ActivityKind.Internal;
 
-            try
-            {
-                // Initiate a transaction where requested.
-                if (bia.IncludeTransactionScope)
-                    txn = new TransactionScope(bia.TransactionScopeOption, TransactionScopeAsyncFlowOption.Enabled);
+    /// <inheritdoc/>
+    public virtual bool IsTracingDisabled => false;
 
-                // Invoke the underlying logic.
-                var result = await func(invokeArgs, cancellationToken).ConfigureAwait(false);
+    /// <inheritdoc/>
+    public virtual bool IsLoggingDisabled => false;
 
-                // Where using Railway-oriented programming, rollback the transaction where a failure has occurred.
-                if (result is IResult r && r.IsFailure)
-                    return result;
+    /// <inheritdoc/>
+    void IInvoker.OnActivityStart(InvokerTracer args) => OnActivityStart(args);
 
-                // Send any published events where applicable.
-                if (bia.EventPublisher != null)
-                    await bia.EventPublisher.SendAsync(cancellationToken).ConfigureAwait(false);
+    /// <inheritdoc/>
+    void IInvoker.OnActivityException(InvokerTracer args, Exception exception) => OnActivityException(args, exception);
 
-                // Complete the transaction where requested to orchestrate one.
-                txn?.Complete();
-                return result;
-            }
-            catch (Exception ex)
-            {
-                bia.ExceptionHandler?.Invoke(ex);
-                throw;
-            }
-            finally
-            {
-                txn?.Dispose();
-                CoreEx.ExecutionContext.Current.OperationType = ot;
-            }
-        }
-    }
+    /// <inheritdoc/>
+    void IInvoker.OnActivityComplete(InvokerTracer args) => OnActivityComplete(args);
+
+    /// <summary>
+    /// Invoked on <see cref="Activity"/> start.
+    /// </summary>
+    /// <param name="args">The <see cref="InvokerTracer"/>.</param>
+    /// <remarks>Where overriding the base <see cref="OnActivityStart"/> <b>must</b> be invoked.</remarks>
+    protected virtual void OnActivityStart(InvokerTracer args) { }
+
+    /// <summary>
+    /// Invoked where the invocation resulted in an <paramref name="exception"/> for an <see cref="Activity"/>.
+    /// </summary>
+    /// <remarks>Where overriding the base <see cref="OnActivityException"/> <b>must</b> be invoked.
+    /// <para><see cref="OnActivityComplete(InvokerTracer)"/> and <see cref="OnActivityException(InvokerTracer, Exception)"/> are mutually exclusive.</para></remarks>
+    protected virtual void OnActivityException(InvokerTracer args, Exception exception) { }
+
+    /// <summary>
+    /// Invoked where the invocation completes successfully for an <see cref="Activity"/>.
+    /// </summary>
+    /// <remarks>Where overriding the base <see cref="OnActivityComplete"/> <b>must</b> be invoked.
+    /// <para><see cref="OnActivityComplete(InvokerTracer)"/> and <see cref="OnActivityException(InvokerTracer, Exception)"/> are mutually exclusive.</para></remarks>
+    protected virtual void OnActivityComplete(InvokerTracer args) { }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerBaseT.cs b/src/CoreEx/Invokers/InvokerBaseT.cs
index 93a5930d..c31726cd 100644
--- a/src/CoreEx/Invokers/InvokerBaseT.cs
+++ b/src/CoreEx/Invokers/InvokerBaseT.cs
@@ -1,350 +1,86 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Invokers
+namespace CoreEx.Invokers;
+
+/// <summary>
+/// Wraps an <b>Invoke</b> enabling standard functionality (tracing and logging) to be added to an invocation. 
+/// </summary>
+/// <typeparam name="TCaller">The calling (invoking) <see cref="Type"/>.</typeparam>
+/// <param name="serviceProvider">The optional <i>root</i> <see cref="IServiceProvider"/> needed where there is no <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.ServiceProvider"/>.</param>
+public abstract class InvokerBase<TCaller>(IServiceProvider? serviceProvider = null) : InvokerBase(serviceProvider)
 {
     /// <summary>
-    /// Wraps an <b>Invoke</b> enabling standard functionality to be added to all invocations. 
+    /// Invokes a <paramref name="func"/> with a <typeparamref name="TResult"/> asynchronously.
     /// </summary>
-    /// <typeparam name="TInvoker">The owner (invoking) <see cref="Type"/>.</typeparam>
-    /// <remarks>All public methods result in either the synchronous <see cref="OnInvoke"/> or asynchronous <see cref="OnInvokeAsync"/>virtual methods being called to manage the underlying invocation; therefore, where overridding each should
-    /// be overridden with the same logic. Where no result is specified this defaults to '<c>object?</c>' for the purposes of execution.</remarks>
-    public abstract class InvokerBase<TInvoker> : IInvoker
-    {
-        /// <inheritdoc/>
-        public Action<InvokeArgs>? OnActivityStart { get; protected set; }
-
-        /// <inheritdoc/>
-        public Action<InvokeArgs, Exception>? OnActivityException { get; protected set; }
-
-        /// <inheritdoc/>
-        public Action<InvokeArgs>? OnActivityComplete { get; protected set; }
-
-        /// <inheritdoc/>
-        public Func<InvokeArgs, string> CallerLoggerFormatter { get; protected set; } = InvokeArgs.DefaultCallerLogFormatter;
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="tracer">The <see cref="InvokerTracer"/>.</param>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The result.</returns>
+    /// <remarks>Where overriding the base <see cref="OnInvokeAsync"/> <b>must</b> be invoked; do <b>not</b> invoke the <paramref name="func"/> directly.</remarks>
+    protected virtual Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, TCaller caller, Func<InvokerTracer, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken) 
+        => func(tracer, cancellationToken);
 
-        /// <summary>
-        /// Invokes a <paramref name="func"/> with a <typeparamref name="TResult"/> synchronously.
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="invokeArgs">The <see cref="InvokeArgs"/>.</param>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The result.</returns>
-        protected virtual TResult OnInvoke<TResult>(InvokeArgs invokeArgs, TInvoker invoker, Func<InvokeArgs, TResult> func) => func(invokeArgs);
-
-        /// <summary>
-        /// Invokes a <paramref name="func"/> with a <typeparamref name="TResult"/> asynchronously.
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="invokeArgs">The <see cref="InvokeArgs"/>.</param>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The result.</returns>
-        protected virtual Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken) => func(invokeArgs, cancellationToken);
+    /// <summary>
+    /// Invoke the <see cref="OnInvokeAsync"/> with tracing and logging.
+    /// </summary>
+    private async Task<TResult> TraceOnInvokeAsync<TResult>(TCaller caller, Func<InvokerTracer, CancellationToken, Task<TResult>> func, string? memberName, CancellationToken cancellationToken)
+    {
+        var isSuccess = true;
+        using var tracer = new InvokerTracer(this, caller, memberName, null);
 
-        /// <summary>
-        /// Invoke the <see cref="OnInvoke"/> with tracing.
-        /// </summary>
-        private TResult TraceOnInvoke<TResult>(TInvoker invoker, Func<InvokeArgs, TResult> func, string? memberName)
+        try
         {
-            var ia = new InvokeArgs(this, invoker, memberName, null);
-            try
-            {
-                return ia.TraceResult(OnInvoke(ia, invoker, func));
-            }
-            catch (Exception ex)
-            {
-                ia.TraceException(ex);
-                throw;
-            }
-            finally
-            {
-                ia.TraceComplete();
-            }
+            return await OnInvokeAsync(tracer, caller, func, cancellationToken).ConfigureAwait(false);
         }
-
-        /// <summary>
-        /// Invoke the <see cref="OnInvokeAsync"/> with tracing.
-        /// </summary>
-        private async Task<TResult> TraceOnInvokeAsync<TResult>(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, string? memberName, CancellationToken cancellationToken)
+        catch (Exception ex)
         {
-            var ia = new InvokeArgs(this, invoker, memberName, null);
-            try
-            {
-                return ia.TraceResult(await OnInvokeAsync(ia, invoker, func, cancellationToken).ConfigureAwait(false));
-            }
-            catch (Exception ex)
-            {
-                ia.TraceException(ex);
-                throw;
-            }
-            finally
-            {
-                ia.TraceComplete();
-            }
+            isSuccess = false;
+            tracer.TraceException(ex);
+            throw;
         }
+        finally
+        {
+            tracer.TraceComplete(isSuccess);
+        }
+    }
 
-        #region Sync/NoResult
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke(TInvoker invoker, Action<InvokeArgs> action, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia); return null!; }, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1>(TInvoker invoker, T1 p1, Action<InvokeArgs, T1> action, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1); return null!; }, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="p2">Parameter 2 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1, T2>(TInvoker invoker, T1 p1, T2 p2, Action<InvokeArgs, T1, T2> action, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1, p2); return null!; }, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="p2">Parameter 2 to pass through to the action.</param>
-        /// <param name="p3">Parameter 3 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1, T2, T3>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Action<InvokeArgs, T1, T2, T3> action, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1, p2, p3); return null!; }, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="p2">Parameter 2 to pass through to the action.</param>
-        /// <param name="p3">Parameter 3 to pass through to the action.</param>
-        /// <param name="p4">Parameter 4 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1, T2, T3, T4>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Action<InvokeArgs, T1, T2, T3, T4> action, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1, p2, p3, p4); return null!; }, memberName);
-
-        #endregion
-
-        #region Sync/Result
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<TResult>(TInvoker invoker, Func<InvokeArgs, TResult> func, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia), memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, TResult>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, TResult> func, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1), memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, T2, TResult>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, TResult> func, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1, p2), memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, T2, T3, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, TResult> func, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1, p2, p3), memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, T2, T3, T4, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, TResult> func, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1, p2, p3, p4), memberName);
-
-        #endregion
-
-        #region Async/NoResult
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, ct).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, ct).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, ct).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2, T3>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, p3, ct).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2, T3, T4>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, p3, p4, ct).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
-
-        #endregion
-
-        #region Async/Result
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<TResult>(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, ct), memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The result.</returns>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task<TResult> InvokeAsync<T1, TResult>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, ct), memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The result.</returns>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task<TResult> InvokeAsync<T1, T2, TResult>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, ct), memberName, cancellationToken);
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    public Task InvokeAsync(TCaller caller, Func<InvokerTracer, Task> func, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), async (tracer, _) => { await func(tracer).ConfigureAwait(false); return (object?)null!; }, memberName, default);
 
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The result.</returns>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task<TResult> InvokeAsync<T1, T2, T3, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, p3, ct), memberName, cancellationToken);
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    public Task InvokeAsync(TCaller caller, Func<InvokerTracer, CancellationToken, Task> func, CancellationToken cancellationToken, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), async (tracer, ct) => { await func(tracer, ct).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
 
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The result.</returns>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task<TResult> InvokeAsync<T1, T2, T3, T4, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, p3, p4, ct), memberName, cancellationToken);
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    /// <returns>The result.</returns>
+    public Task<TResult> InvokeAsync<TResult>(TCaller caller, Func<InvokerTracer, Task<TResult>> func, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), (tracer, _) => func(tracer), memberName, default);
 
-        #endregion
-    }
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    /// <returns>The result.</returns>
+    public Task<TResult> InvokeAsync<TResult>(TCaller caller, Func<InvokerTracer, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), (tracer, ct) => func(tracer, ct), memberName, cancellationToken);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerBaseT2.cs b/src/CoreEx/Invokers/InvokerBaseT2.cs
index 49c25fb4..21eb4ddc 100644
--- a/src/CoreEx/Invokers/InvokerBaseT2.cs
+++ b/src/CoreEx/Invokers/InvokerBaseT2.cs
@@ -1,498 +1,92 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Invokers
+namespace CoreEx.Invokers;
+
+/// <summary>
+/// Wraps an <b>Invoke</b> enabling standard functionality (tracing and logging) to be added to an invocation including <typeparamref name="TArgs"/>. 
+/// </summary>
+/// <typeparam name="TCaller">The calling (invoking) <see cref="Type"/>.</typeparam>
+/// <typeparam name="TArgs">The arguments <see cref="Type"/>.</typeparam>
+/// <param name="serviceProvider">The optional <i>root</i> <see cref="IServiceProvider"/> needed where there is no <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.ServiceProvider"/>.</param>
+public abstract class InvokerBase<TCaller, TArgs>(IServiceProvider? serviceProvider = null) : InvokerBase(serviceProvider)
 {
     /// <summary>
-    /// Wraps an <b>Invoke</b> enabling standard functionality to be added to all invocations. 
+    /// Invokes a <paramref name="func"/> with a <typeparamref name="TResult"/> asynchronously.
     /// </summary>
-    /// <typeparam name="TInvoker">The owner (invoking) <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TArgs">The arguments <see cref="Type"/>.</typeparam>
-    /// <remarks>All public methods result in either the synchronous <see cref="OnInvoke"/> or asynchronous <see cref="OnInvokeAsync"/> virtual methods being called to manage the underlying invocation; therefore, where overridding each should
-    /// be overridden with the same logic. Where no result is specified this defaults to '<c>object?</c>' for the purposes of execution.</remarks>
-    public abstract class InvokerBase<TInvoker, TArgs> : IInvoker
-    {
-        /// <inheritdoc/>
-        public Action<InvokeArgs>? OnActivityStart { get; protected set; }
-
-        /// <inheritdoc/>
-        public Action<InvokeArgs, Exception>? OnActivityException { get; protected set; }
+    /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
+    /// <param name="tracer">The <see cref="InvokerTracer"/>.</param>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="args">The caller arguments.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The result.</returns>
+    /// <remarks>Where overriding the base <see cref="OnInvokeAsync"/> <b>must</b> be invoked; do <b>not</b> invoke the <paramref name="func"/> directly.</remarks>
+    protected virtual Task<TResult> OnInvokeAsync<TResult>(InvokerTracer tracer, TCaller caller, TArgs args, Func<InvokerTracer, TArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken) 
+        => func(tracer, args, cancellationToken);
 
-        /// <inheritdoc/>
-        public Action<InvokeArgs>? OnActivityComplete { get; protected set; }
-
-        /// <inheritdoc/>
-        public Func<InvokeArgs, string> CallerLoggerFormatter { get; protected set; } = InvokeArgs.DefaultCallerLogFormatter;
-
-        /// <summary>
-        /// Invokes a <paramref name="func"/> with a <typeparamref name="TResult"/> synchronously.
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="invokeArgs">The <see cref="InvokeArgs"/>.</param>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <returns>The result.</returns>
-        protected virtual TResult OnInvoke<TResult>(InvokeArgs invokeArgs, TInvoker invoker, Func<InvokeArgs, TResult> func, TArgs? args) => func(invokeArgs);
-
-        /// <summary>
-        /// Invokes a <paramref name="func"/> with a <typeparamref name="TResult"/> asynchronously.
-        /// </summary>
-        /// <typeparam name="TResult">The result <see cref="Type"/>.</typeparam>
-        /// <param name="invokeArgs">The <see cref="InvokeArgs"/>.</param>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The result.</returns>
-        protected virtual Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, TArgs? args, CancellationToken cancellationToken) => func(invokeArgs, cancellationToken);
+    /// <summary>
+    /// Invoke the <see cref="OnInvokeAsync"/> with tracing.
+    /// </summary>
+    private async Task<TResult> TraceOnInvokeAsync<TResult>(TCaller caller, TArgs args, Func<InvokerTracer, TArgs, CancellationToken, Task<TResult>> func, string? memberName, CancellationToken cancellationToken)
+    {
+        var isSuccess = true;
+        using var tracer = new InvokerTracer(this, caller, memberName, null);
 
-        /// <summary>
-        /// Invoke the <see cref="OnInvoke"/> with tracing.
-        /// </summary>
-        private TResult TraceOnInvoke<TResult>(TInvoker invoker, Func<InvokeArgs, TResult> func, TArgs? args, string? memberName)
+        try
         {
-            var ia = new InvokeArgs(this, invoker, memberName, null);
-            try
-            {
-                return ia.TraceResult(OnInvoke(ia, invoker, func, args));
-            }
-            catch (Exception ex)
-            {
-                ia.TraceException(ex);
-                throw;
-            }
-            finally
-            {
-                ia.TraceComplete();
-            }
+            return await OnInvokeAsync(tracer, caller, args, func, cancellationToken).ConfigureAwait(false);
         }
-
-        /// <summary>
-        /// Invoke the <see cref="OnInvokeAsync"/> with tracing.
-        /// </summary>
-        private async Task<TResult> TraceOnInvokeAsync<TResult>(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, TArgs? args, string? memberName, CancellationToken cancellationToken)
+        catch (Exception ex)
         {
-            var ia = new InvokeArgs(this, invoker, memberName, null);
-            try
-            {
-                return ia.TraceResult(await OnInvokeAsync(ia, invoker, func, args, cancellationToken).ConfigureAwait(false));
-            }
-            catch (Exception ex)
-            {
-                ia.TraceException(ex);
-                throw;
-            }
-            finally
-            {
-                ia.TraceComplete();
-            }
+            isSuccess = false;
+            tracer.TraceException(ex);
+            throw;
         }
+        finally
+        {
+            tracer.TraceComplete(isSuccess);
+        }
+    }
 
-        #region Sync/NoResult
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke(TInvoker invoker, Action<InvokeArgs> action, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia); return null!; }, args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1>(TInvoker invoker, T1 p1, Action<InvokeArgs, T1> action, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1); return null!; }, args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="p2">Parameter 2 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1, T2>(TInvoker invoker, T1 p1, T2 p2, Action<InvokeArgs, T1, T2> action, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1, p2); return null!; }, args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="p2">Parameter 2 to pass through to the action.</param>
-        /// <param name="p3">Parameter 3 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1, T2, T3>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Action<InvokeArgs, T1, T2, T3> action, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1, p2, p3); return null!; }, args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="action"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the action.</param>
-        /// <param name="p2">Parameter 2 to pass through to the action.</param>
-        /// <param name="p3">Parameter 3 to pass through to the action.</param>
-        /// <param name="p4">Parameter 4 to pass through to the action.</param>
-        /// <param name="action">The action to invoke.</param>
-        /// <param name="args">The arguments passed to the invoke.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public void Invoke<T1, T2, T3, T4>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Action<InvokeArgs, T1, T2, T3, T4> action, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke<object?>(invoker.ThrowIfNull(nameof(invoker)), ia => { (action.ThrowIfNull(nameof(action))).Invoke(ia, p1, p2, p3, p4); return null!; }, args, memberName);
-
-        #endregion
-
-        #region Sync/Result
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<TResult>(TInvoker invoker, Func<InvokeArgs, TResult> func, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia), args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, TResult>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, TResult> func, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1), args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, T2, TResult>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, TResult> func, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1, p2), args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, T2, T3, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, TResult> func, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1, p2, p3), args, memberName);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> synchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public TResult Invoke<T1, T2, T3, T4, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, TResult> func, TArgs? args = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvoke(invoker.ThrowIfNull(nameof(invoker)), ia => func(ia, p1, p2, p3, p4), args, memberName);
-
-        #endregion
-
-        #region Async/NoResult
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, ct).ConfigureAwait(false); return (object?)null!; }, args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, CancellationToken, Task> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, ct).ConfigureAwait(false); return (object?)null!; }, args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, CancellationToken, Task> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, ct).ConfigureAwait(false); return (object?)null!; }, args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2, T3>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, CancellationToken, Task> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, p3, ct).ConfigureAwait(false); return (object?)null!; }, args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2, T3, T4>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, CancellationToken, Task> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, p3, p4, ct).ConfigureAwait(false); return (object?)null!; }, args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, ct).ConfigureAwait(false); return (object?)null!; }, default, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, ct).ConfigureAwait(false); return (object?)null!; }, default, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, ct).ConfigureAwait(false); return (object?)null!; }, default, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2, T3>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, p3, ct).ConfigureAwait(false); return (object?)null!; }, default, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        public Task InvokeAsync<T1, T2, T3, T4>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, CancellationToken, Task> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), async (ia, ct) => { await func(ia, p1, p2, p3, p4, ct).ConfigureAwait(false); return (object?)null!; }, default, memberName, cancellationToken);
-
-        #endregion
-
-        #region Async/Result
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<TResult>(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, ct), args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, TResult>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, CancellationToken, Task<TResult>> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, ct), args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, T2, TResult>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, CancellationToken, Task<TResult>> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, ct), args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, T2, T3, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, CancellationToken, Task<TResult>> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, p3, ct), args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="args">The <typeparamref name="TArgs"/> value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, T2, T3, T4, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, CancellationToken, Task<TResult>> func, TArgs? args, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, p3, p4, ct), args, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<TResult>(TInvoker invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, ct), default, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">TParameter 1 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, TResult>(TInvoker invoker, T1 p1, Func<InvokeArgs, T1, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, ct), default, memberName, cancellationToken);
-
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, T2, TResult>(TInvoker invoker, T1 p1, T2 p2, Func<InvokeArgs, T1, T2, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, ct), default, memberName, cancellationToken);
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="args">The caller arguments.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    public Task InvokeAsync(TCaller caller, TArgs args, Func<InvokerTracer, TArgs, Task> func, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), args, async (tracer, args, _) => { await func(tracer, args).ConfigureAwait(false); return (object?)null!; }, memberName, default);
 
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, T2, T3, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, Func<InvokeArgs, T1, T2, T3, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, p3, ct), default, memberName, cancellationToken);
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="args">The caller arguments.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    public Task InvokeAsync(TCaller caller, TArgs args, Func<InvokerTracer, TArgs, CancellationToken, Task> func, CancellationToken cancellationToken, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), args, async (tracer, args, cancellationToken) => { await func(tracer, args, cancellationToken).ConfigureAwait(false); return (object?)null!; }, memberName, cancellationToken);
 
-        /// <summary>
-        /// Invokes an <paramref name="func"/> asynchronously.
-        /// </summary>
-        /// <param name="invoker">The invoker (owner).</param>
-        /// <param name="p1">Parameter 1 to pass through to the function.</param>
-        /// <param name="p2">Parameter 2 to pass through to the function.</param>
-        /// <param name="p3">Parameter 3 to pass through to the function.</param>
-        /// <param name="p4">Parameter 4 to pass through to the function.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
-        /// <returns>The result.</returns>
-        public Task<TResult> InvokeAsync<T1, T2, T3, T4, TResult>(TInvoker invoker, T1 p1, T2 p2, T3 p3, T4 p4, Func<InvokeArgs, T1, T2, T3, T4, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
-            => TraceOnInvokeAsync(invoker.ThrowIfNull(nameof(invoker)), (ia, ct) => func(ia, p1, p2, p3, p4, ct), default, memberName, cancellationToken);
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="args">The caller arguments.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    /// <returns>The result.</returns>
+    public Task<TResult> InvokeAsync<TResult>(TCaller caller, TArgs args, Func<InvokerTracer, TArgs, Task<TResult>> func, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), args, (tracer, args, _) => func(tracer, args), memberName, default);
 
-        #endregion
-    }
+    /// <summary>
+    /// Invokes an <paramref name="func"/> asynchronously.
+    /// </summary>
+    /// <param name="caller">The caller (invoker).</param>
+    /// <param name="args">The caller arguments.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <param name="memberName">The calling member name (uses <see cref="CallerMemberNameAttribute"/> to default).</param>
+    /// <returns>The result.</returns>
+    public Task<TResult> InvokeAsync<TResult>(TCaller caller, TArgs args, Func<InvokerTracer, TArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken = default, [CallerMemberName] string? memberName = null)
+        => TraceOnInvokeAsync(caller.ThrowIfNull(), args, (tracer, args, cancellationToken) => func(tracer, args, cancellationToken), memberName, cancellationToken);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerLogger.cs b/src/CoreEx/Invokers/InvokerLogger.cs
new file mode 100644
index 00000000..c513c770
--- /dev/null
+++ b/src/CoreEx/Invokers/InvokerLogger.cs
@@ -0,0 +1,22 @@
+namespace CoreEx.Invokers;
+
+/// <summary>
+/// Provides high-performance logging for invokers.
+/// </summary>
+internal static partial class InvokerLogger
+{
+    [LoggerMessage(Message = "{invoker}: {operation} {status}.")]
+    public static partial void InvokeStart(this ILogger logger, LogLevel logLevel, string invoker, string operation, string status);
+
+    [LoggerMessage(Message = "{invoker}: {operation} {status} - {error}. [{elapsed}ms]")]
+    public static partial void InvokeError(this ILogger logger, LogLevel logLevel, string invoker, string operation, string status, string? error, double elapsed);
+
+    [LoggerMessage(Message = "{invoker}: {operation} {status} - {error}: {exception} [{elapsed}ms]")]
+    public static partial void InvokeException(this ILogger logger, LogLevel logLevel, string invoker, string operation, string status, string? error, string exception, double elapsed);
+
+    [LoggerMessage(Message = "{invoker}: {operation} {status}. [{elapsed}ms]")]
+    public static partial void InvokeComplete(this ILogger logger, LogLevel logLevel, string invoker, string operation, string status, double elapsed);
+
+    [LoggerMessage(Message = "{invoker}: {operation} {status} - {context}")]
+    public static partial void InvokeContext(this ILogger logger, LogLevel logLevel, string invoker, string operation, string status, string context);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerNameAttribute.cs b/src/CoreEx/Invokers/InvokerNameAttribute.cs
new file mode 100644
index 00000000..33aae8e7
--- /dev/null
+++ b/src/CoreEx/Invokers/InvokerNameAttribute.cs
@@ -0,0 +1,29 @@
+namespace CoreEx.Invokers;
+
+/// <summary>
+/// Provides an attribute to override the <see cref="IInvoker.Name"/> name.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+public class InvokerNameAttribute(string name) : Attribute
+{
+    private static readonly ConcurrentDictionary<Type, InvokerNameAttribute> _cache = [];
+
+    /// <summary>
+    /// Gets the name.
+    /// </summary>
+    public string Name { get; } = name.ThrowIfNullOrEmpty();
+
+    /// <summary>
+    /// Gets the name for the specified <typeparamref name="T"/> using the <see cref="InvokerNameAttribute"/> where defined; otherwise, uses the formatted name from the <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Type"/>.</typeparam>
+    /// <returns>The name.</returns>
+    public static string GetName<T>() => GetName(typeof(T));
+
+    /// <summary>
+    /// Gets the name for the specified <paramref name="type"/> using the <see cref="InvokerNameAttribute"/> where defined; otherwise, uses the formatted name from the <see cref="Type"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/>.</param>
+    /// <returns>The name.</returns>
+    public static string GetName(Type type) => _cache.GetOrAdd(type.ThrowIfNull(), t => t.GetCustomAttribute<InvokerNameAttribute>(true) ?? new InvokerNameAttribute(Internal.GetNamespaceFormattedName(t))).Name;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/InvokerTracer.cs b/src/CoreEx/Invokers/InvokerTracer.cs
new file mode 100644
index 00000000..7a715d5b
--- /dev/null
+++ b/src/CoreEx/Invokers/InvokerTracer.cs
@@ -0,0 +1,235 @@
+namespace CoreEx.Invokers;
+
+/// <summary>
+/// Provides the standardized invocation runtime tracing (and logging) capabilities.
+/// </summary>
+/// <remarks>This encapsulates the <see cref="Activity"/> to ensure consistency of implementation/usage.</remarks>
+public readonly struct InvokerTracer : IDisposable
+{
+    private const string NullName = "null";
+    private const string InvokerResultName = "operation.result";
+    private const string InvokerErrorName = "error.type";
+    private const string InvokerErrorCodeName = "error.code";
+    private const string InvokerErrorMessageName = "error.message";
+    private const string InvokerTenantName = "tenant.id";
+    private const string StartStateText = "Start";
+    private const string CompleteStateText = "Complete";
+    private const string ErrorStateText = "Error";
+    private const string ExceptionStateText = "Exception";
+    private const string ContextStateText = "Context";
+
+    private static readonly ConcurrentDictionary<string, ActivitySource> _activitySources = new();
+
+    /// <summary>
+    /// Determines whether tracing is enabled for the <paramref name="invokerType"/>.
+    /// </summary>
+    private static bool IsTracingEnabled(Type invokerType, IConfiguration? configuration)
+        => Internal.GetConfigurationValueWithFallback($"CoreEx:Invokers:{invokerType.FullName}:TracingEnabled", () => "CoreEx:Invokers:TracingEnabled", true, configuration);
+
+    /// <summary>
+    /// Determines whether logging is enabled for the <paramref name="invokerType"/>.
+    /// </summary>
+    private static bool IsLoggingEnabled(Type invokerType, IConfiguration? configuration)
+        => Internal.GetConfigurationValueWithFallback($"CoreEx:Invokers:{invokerType.FullName}:LoggingEnabled", () => "CoreEx:Invokers:LoggingEnabled", true, configuration);
+
+    /// <summary>
+    /// Gets or sets the <see cref="ICacheEntry.SlidingExpiration"/> <see cref="TimeSpan"/> for <i>tracing</i> and <i>logging</i> enablement determination.
+    /// </summary>
+    /// <remarks>These are cached to avoid the overhead of repeated configuration lookups and allow for dynamic configuration changes.</remarks>
+    public static TimeSpan SlidingExpirationTimeSpan { get; set; } = TimeSpan.FromMinutes(15);
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InvokerTracer"/> struct as a no-op; not intended for general use.
+    /// </summary>
+    /// <remarks>This constructor leverages the <see cref="Invokers.Invoker.Default"/> which is essentially a no-op; as in no tracing and/or logging is ever performed.
+    /// <para>This is not intended for general use.</para></remarks>
+    [Obsolete("Parameterless constructor is not supported.", true)]
+    public InvokerTracer() => throw new NotSupportedException();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="InvokerTracer"/> struct.
+    /// </summary>
+    /// <param name="invoker">The initiating <see cref="IInvoker"/>.</param>
+    /// <param name="caller">The caller (owner) value.</param>
+    /// <param name="memberName">The calling member name.</param>
+    /// <param name="parent">The optional parent <see cref="InvokerTracer"/>.</param>
+    /// <remarks>Creates the tracing <see cref="Activity.OperationName"/> by concatenating the invoking <see name="CallerName"/> (<see cref="Type.FullName"/>) and <paramref name="memberName"/> separated by '<c> -> </c>'. This is <i>not</i>
+    /// meant to represent the fully-qualified member/method name.</remarks>
+    internal InvokerTracer(IInvoker invoker, object? caller, string? memberName, InvokerTracer? parent)
+    {
+        Invoker = invoker.ThrowIfNull();
+        Caller = caller;
+        CallerName = Caller is null ? NullName : InvokerNameAttribute.GetName(Caller.GetType());
+        MemberName = memberName ?? NullName;
+        OperationName = $"{CallerName}->{MemberName}";
+
+        try
+        {
+            var enabled = Internal.MemoryCache.GetOrCreate<(bool IsTracingEnabled, bool IsLoggingEnabled)>(Invoker.Type, e =>
+            {
+                // These are cached to avoid the overhead of repeated configuration lookups.
+                var type = (Type)e.Key;
+                e.SlidingExpiration = SlidingExpirationTimeSpan;
+                return (!invoker.IsTracingDisabled && IsTracingEnabled(type, invoker.Configuration), !invoker.IsLoggingDisabled && IsLoggingEnabled(type, invoker.Configuration));
+            });
+
+            if (enabled.IsTracingEnabled)
+            {
+                var activitySource = _activitySources.GetOrAdd(Invoker.Name, name => new ActivitySource(name));
+                Activity = activitySource.CreateActivity(OperationName, Invoker.ActivityKind);
+                if (Activity is not null)
+                {
+                    if (parent.HasValue && parent.Value.Activity is not null)
+                        Activity.SetParentId(parent.Value.Activity!.TraceId, parent.Value.Activity.SpanId, parent.Value.Activity.ActivityTraceFlags);
+
+                    if (ExecutionContext.TryGetCurrent(out var ec) && ec.TenantId is not null)
+                        Activity.SetTag(InvokerTenantName, ec.TenantId);
+
+                    Invoker.OnActivityStart(this);
+                    Activity.Start();
+                }
+            }
+
+            if (enabled.IsLoggingEnabled)
+            {
+                Logger = invoker.Logger ?? ExecutionContext.GetService<ILogger<Invoker>>();
+                if (Logger is null || !Logger.IsEnabled(LogLevel.Debug))
+                    Logger = null;
+                else
+                {
+                    InvokerLogger.InvokeStart(Logger, LogLevel.Debug, Invoker.Name, OperationName, StartStateText);
+                    Stopwatch = Stopwatch.StartNew();
+                }
+            }
+        }
+        catch
+        {
+            // Continue; do not allow tracing/logging to impact the execution!
+            Activity?.Dispose();
+            Activity = null;
+            Logger = null;
+        }
+    }
+
+    /// <summary>
+    /// Gets the initiating <see cref="IInvoker"/>.
+    /// </summary>
+    public readonly IInvoker Invoker { get; }
+
+    /// <summary>
+    /// Gets the caller instance.
+    /// </summary>
+    public readonly object? Caller { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Caller"/> name.
+    /// </summary>
+    public readonly string CallerName { get; }
+
+    /// <summary>
+    /// Gets the calling member name.
+    /// </summary>
+    public readonly string MemberName { get; }
+
+    /// <summary>
+    /// Gets the operation name.
+    /// </summary>
+    public readonly string OperationName { get; }
+
+    /// <summary>
+    /// Gets the <see cref="System.Diagnostics.Activity"/> leveraged for standardized (open-telemetry) tracing.
+    /// </summary>
+    /// <remarks>Will be <see langword="null"/> where tracing is <i>not</i> enabled.</remarks>
+    public Activity? Activity { get; }
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/> leveraged for standardized invoker logging.
+    /// </summary>
+    public ILogger? Logger { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Stopwatch"/> leveraged for standardized invoker timing.
+    /// </summary>
+    public Stopwatch? Stopwatch { get; }
+
+    /// <inheritdoc/>
+    public override readonly string ToString() => OperationName;
+
+    /// <summary>
+    /// Adds the result outcome to the <see cref="Activity"/> (where successful) then performs an <see cref="Activity.Stop"/>.
+    /// </summary>
+    internal readonly void TraceComplete(bool isSuccess)
+    {
+        if (isSuccess)
+        {
+            if (Activity is not null)
+            {
+                Activity.SetTag(InvokerResultName, CompleteStateText);
+                Invoker.OnActivityComplete(this);
+                Activity.SetStatus(ActivityStatusCode.Ok);
+                Activity.Stop();
+            }
+
+            if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+            {
+                Stopwatch!.Stop();
+                InvokerLogger.InvokeComplete(Logger, LogLevel.Debug, Invoker.Name, OperationName, CompleteStateText, Stopwatch.Elapsed.TotalMilliseconds);
+            }
+        }
+
+        Activity?.Stop();
+    }
+
+    /// <summary>
+    /// Completes the <see cref="Activity"/> tracing (where started) recording the <see cref="InvokerResultName"/> with the <see cref="ExceptionStateText"/> and capturing the corresponding <see cref="Exception.Message"/>.
+    /// </summary>
+    /// <param name="ex">The <see cref="Exception"/>.</param>
+    internal readonly void TraceException(Exception ex)
+    {
+        Stopwatch?.Stop();
+
+        if (ex is IExtendedException eex && eex.IsError)
+        {
+            Activity?.SetTag(InvokerResultName, ErrorStateText).SetTag(InvokerErrorName, eex.ErrorType).SetTag(InvokerErrorMessageName, eex.Message).SetTag(InvokerErrorCodeName, eex.ErrorCode);
+            Activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+                InvokerLogger.InvokeError(Logger, LogLevel.Debug, Invoker.Name, OperationName, ErrorStateText, eex.ErrorType, Stopwatch!.Elapsed.TotalMilliseconds);
+        }
+        else
+        {
+            Activity?.SetTag(InvokerResultName, ExceptionStateText).SetTag(InvokerErrorName, ex.GetType().Name).SetTag(InvokerErrorMessageName, ex.Message);
+            Activity?.SetStatus(ActivityStatusCode.Error, ex.Message);
+            if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+                InvokerLogger.InvokeException(Logger, LogLevel.Debug, Invoker.Name, OperationName, ExceptionStateText, ex.GetType().Name, ex.Message, Stopwatch!.Elapsed.TotalMilliseconds);
+        }
+
+        if (Activity is not null)
+            Invoker.OnActivityException(this, ex);
+    }
+
+    /// <summary>
+    /// Logs additional <see cref="LogLevel.Debug"/> <paramref name="context"/> where the <see cref="Logger"/> is enabled.
+    /// </summary>
+    /// <param name="context">The context message.</param>
+    /// <remarks>This is intended to provide additional <paramref name="context"/> in a log message structured similarly to those automatically output.</remarks>
+    public readonly void LogContext(string context)
+    {
+        if (Logger?.IsEnabled(LogLevel.Debug) ?? false)
+            InvokerLogger.InvokeContext(Logger, LogLevel.Debug, Invoker.Name, OperationName, ContextStateText, context ?? NullName);
+    }
+
+    /// <inheritdoc/>
+    public readonly void Dispose() => Activity?.Dispose();
+
+    /// <summary>
+    /// Releases (disposes) all <see cref="ActivitySource"/> instances.
+    /// </summary>
+    public static void ReleaseAll()
+    {
+        foreach (var item in _activitySources.ToArray())
+        {
+            if (_activitySources.TryRemove(item.Key, out var activitySource))
+                activitySource?.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/ManagerInvoker.cs b/src/CoreEx/Invokers/ManagerInvoker.cs
deleted file mode 100644
index eccdab58..00000000
--- a/src/CoreEx/Invokers/ManagerInvoker.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Wraps a <b>Manager invoke</b> enabling standard <b>business tier</b> functionality to be added to all invocations.
-    /// </summary>
-    [System.Diagnostics.DebuggerStepThrough]
-    public class ManagerInvoker : InvokerBase
-    {
-        private static ManagerInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static ManagerInvoker Current => CoreEx.ExecutionContext.GetService<ManagerInvoker>() ?? (_default ??= new ManagerInvoker());
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/README.md b/src/CoreEx/Invokers/README.md
index a0079151..20f88faf 100644
--- a/src/CoreEx/Invokers/README.md
+++ b/src/CoreEx/Invokers/README.md
@@ -1,70 +1,36 @@
-# CoreEx.Invokers
+# CoreEx.Invokers
 
-The `CoreEx.Invokers` namespace provides invocation capabilities.
+> Provides the `InvokerBase<TCaller>` infrastructure for wrapping method invocations with consistent OpenTelemetry tracing, structured logging, and error tagging — the mechanism through which all CoreEx operations emit spans and log entries uniformly.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Invokers` defines a lightweight, inheritance-based invocation pipeline. Any service or infrastructure component that wants consistent tracing and logging derives its invoker from `InvokerBase<TCaller>` (or the non-generic `InvokerBase`) and overrides `OnInvokeAsync` to add cross-cutting behavior — OpenTelemetry activity creation, ILogger entries, exception tagging, and result recording.
 
-To enable a standardized approach to the invocation of logic enabling a means to add surrounding runtime execution logic decoupled from the initial implementation; enabling additional functionality to be added separately where desired (i.e. logging).
+`InvokerTracer` is the runtime context passed into every invocation: it creates and manages the `Activity` span, tags it with operation result, error type, error code, error message, and tenant ID, and writes structured log entries at the appropriate severity. Tracing and logging can each be enabled or disabled per invoker type via `IConfiguration` (`CoreEx:Invokers:{TypeName}:TracingEnabled` / `LoggingEnabled`), making it easy to reduce telemetry noise in specific scenarios.
 
-By default the invoke represents a standardized [tracing/instrumentation](https://learn.microsoft.com/en-us/dotnet/core/diagnostics/distributed-tracing-instrumentation-walkthroughs#add-basic-instrumentation) boundary.
+The built-in `HostedServiceInvoker` and `WorkOrchestratorInvoker` implementations apply this same pattern to hosted service and work-orchestrator executions, giving those operations first-class spans without any additional instrumentation work.
 
-<br/>
+## Key capabilities
 
-## Base capabilities
+- 📡 **OpenTelemetry spans**: Each invocation opens an `Activity` with a structured name (`{invoker}.{caller}.{member}`), tags result, error type, error code, message, and tenant ID, then closes the span on completion — success or failure.
+- 📝 **Structured logging**: `InvokerTracer` logs Start, Complete, Error, and Exception events at configurable log levels, with invoker, caller, and member name as structured properties.
+- ⚙️ **Per-type configuration**: Tracing and logging can be switched on/off per invoker type name via `IConfiguration`, allowing hot control without code changes.
+- 🔌 **Override-friendly pipeline**: `OnInvokeAsync` is a `virtual` method; derived invokers add behavior by overriding it and calling the base, following a decorator chain. The caller func is never invoked directly.
+- 🔑 **Caller-typed base**: `InvokerBase<TCaller>` constrains the caller type at compile time, ensuring type-safe invoker/caller pairings in the override signature.
+- 🏠 **Built-in hosted service and work invokers**: `HostedServiceInvoker` and `WorkOrchestratorInvoker` extend `InvokerBase<T>` to apply the standard tracing/logging pipeline to hosted service and work-orchestration executions.
 
-The [`InvokerBase<TInvoker>`](./InvokerBaseT.cs) and [`InvokerBase<TInvoker, TArgs>`](./InvokerBaseT2.cs) provide the base functionality to invoke an underlying `Action` or `Func` either synchronously or asynchronously. The virtual `OnInvoke` (synchronous) and `OnInvokeAsync` (asynchronous) methods must be overridden to extend the functionality.
+## Key types
 
-<br/>
-
-### Instrumentation
-
-Internally an [`InvokeArgs`](./InvokeArgs.cs) is created to provide the context for the invocation. This is passed to the `Invoke` or `InvokeAsync` methods and provides access to an underlying [`Activity`](https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.activity) property.
-
-By default where tracing is enable the following standard properties are recorded:
-
-Property | Description
--|-
-`invoker.type` | The .NET type name of the invoker.
-`invoker.owner` | The .NET type name of the invoker owner/caller.
-`invoker.member` | The .NET member name of the invoker.
-`invoker.result` | The result of the invocation. Where the result is an [`IResult`](../Results/IResult.cs) (see [Railway-oriented programming](../Results/README.md)) will be either `Success` or `Failure`; otherwise `Complete`. An unhandled exception will be `Exception` (not that the underlying exception details are not recorded).
-`invoker.failure` | Where the result is an `IResult` and its state is `IsFailure` then corresponding `Error.Message` is recorded.
-
-Additional tracing properties may be included where these specifically have been added.
-
-<br/>
-
-### Usage
-
-The general usage pattern is to provide a concrete implementation, for example [`DatabaseInvoker`](../../CoreEx.Database/DatabaseInvoker.cs) and then leverage within application to invoke (wrap) key logic. To then enable runtime overridding, the owning class would allow an instance to be provided within the constructor (i.e. Dependency Injection), for example [`Database`](../../CoreEx.Database/Database.cs); or provide a static instance (i.e. Singleton), for example [`ValidationInvoker`](../Validation/ValidationInvoker.cs) via the `Current` property.
-
-<br/>
-
-## Business logic invoker
-
-The [`InvokerBase`](./InvokerBase.cs) and corresponding [`InvokerArgs`](./InvokerArgs.cs) provides standardized (common) business services logic (leveraged where applicable).
-
-1. Copy the [`OperationType`](../OperationType.cs) from `ExecutionContext.Current`; and reset after execution.
-2. Override the `ExecutionContext.Current` when `InvokerArgs.OperationType` is specified.
-3. Initiate a tranasction ([TransactionScope](https://learn.microsoft.com/en-us/dotnet/api/system.transactions.transactionscope)) when `InvokerArgs.IncludeTransactionScope` is specified.
-4. **Invoke** the underlying `Action` or `Func` (overrides virtual `OnInvokeAsync` method).
-5. Send any events (see [`IEventPublisher.SendAsync`](../Events/IEventPublisher.cs)) when `InvokerArgs.EventPublisher` is specified.
-6. Complete the tranasction ([TransactionScope](https://learn.microsoft.com/en-us/dotnet/api/system.transactions.transactionscope)) where previously initiated.
-7. On **`Exception`** invoke the `InvokerArgs.ExceptionHandler` where specified.
-
-The [`ManagerInvoker`](./ManagerInvoker.cs), [`DataSvcInvoker`](./DataSvcInvoker.cs) and [`DataInvoker`](./DataInvoker.cs) provide implementations of the `InvokerBase` that enable usage within these named common business services logic layers where applicable.
-
-<br/>
-
-## Invoker
-
-The [`Invoker`](./Invoker.cs) provides the following common functions.
-
-Method | Description
--|-
-`InvokeAsync` | Invokes the passed `Task` where not `null`; otherwise returns `Task.CompletedTask`. This is useful to invoke a `Task` where it is not known until runtime whether it is `null` or not, encapsulating the conditional logic.
-`RunSync` | Runs (invokes) the passed `Task` synchronously. The general guidance is to avoid sync over async as this may result in deadlock, so please consider all options before using. There are many [articles]("https://stackoverflow.com/questions/5095183/how-would-i-run-an-async-taskt-method-synchronously") written discussing this subject; however, if sync over async is needed this method provides a consistent approach to perform. This implementation has been inspired by https://www.ryadel.com/en/asyncutil-c-helper-class-async-method-sync-result-wait/".
+| Type | Description |
+|------|-------------|
+| _[`InvokerBase`](./InvokerBase.cs)_ | Non-generic abstract base; holds the `IServiceProvider` reference and the root `Invoke` / `InvokeAsync` entry-point methods used by calling code. |
+| _[`InvokerBase<TCaller>`](./InvokerBaseT.cs)_ | Generic abstract base constraining the caller type; defines `OnInvokeAsync<TResult>` as the virtual override point for cross-cutting behavior. |
+| **[`InvokerTracer`](./InvokerTracer.cs)** | Readonly struct managing the `Activity` span lifecycle; writes Start/Complete/Error/Exception log events; tags span with result, error type/code/message, and tenant ID. |
+| **[`HostedServiceInvoker`](./HostedServiceInvoker.cs)** | Concrete invoker used by `HostedServiceBase` to wrap every `OnExecuteAsync` call with a span and log entries. |
+| **[`WorkOrchestratorInvoker`](./WorkOrchestratorInvoker.cs)** | Concrete invoker used by `WorkOrchestrator` to wrap work-item lifecycle operations with spans and log entries. |
 
+## Related Namespaces
 
+- **[`CoreEx`](../README.md)** - `ExecutionContext.Current` provides the `IServiceProvider` and tenant ID accessed inside `InvokerTracer` to tag spans.
+- **[`CoreEx.Hosting`](../Hosting/README.md)** - `HostedServiceBase` and `WorkOrchestrator` each hold a static `HostedServiceInvoker` / `WorkOrchestratorInvoker` instance used for all their executions.
+- **[`CoreEx.AspNetCore`](../../CoreEx.AspNetCore/README.md)** - `WebApiInvoker` is an `InvokerBase<WebApi>` implementation used by the `WebApi` helpers to trace every HTTP operation.
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/ResultInvokerWith.cs b/src/CoreEx/Invokers/ResultInvokerWith.cs
deleted file mode 100644
index 8311f529..00000000
--- a/src/CoreEx/Invokers/ResultInvokerWith.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Results;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Represents the <see cref="IResult"/> <see cref="InvokerBase"/> with capability.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-    /// <remarks>
-    /// Initializes a new instance of the <see cref="ResultInvokerWith{T}"/>.
-    /// </remarks>
-    /// <param name="result">The originating <see cref="IResult"/>.</param>
-    /// <param name="invoker">The <see cref="InvokerBase"/>.</param>
-    /// <param name="owner">The owner/invoker.</param>
-    /// <param name="args">The <see cref="InvokerArgs"/>.</param>
-    public readonly struct ResultInvokerWith<T>(T result, InvokerBase invoker, object owner, InvokerArgs? args = null) where T : IResult
-    {
-        /// <summary>
-        /// Gets the originating result.
-        /// </summary>
-        public T Result { get; } = result ?? throw new System.ArgumentNullException(nameof(result));
-
-        /// <summary>
-        /// Gets the <see cref="InvokerBase"/>.
-        /// </summary>
-        public InvokerBase Invoker { get; } = invoker ?? throw new System.ArgumentNullException(nameof(invoker));
-
-        /// <summary>
-        /// Gets the owner/invoker.
-        /// </summary>
-        public object Owner { get; } = owner ?? throw new System.ArgumentNullException(nameof(owner));
-
-        /// <summary>
-        /// Gets the <see cref="InvokerArgs"/>.
-        /// </summary>
-        public InvokerArgs Args { get; } = args ?? InvokerArgs.Default;
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <see cref="Result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="func">The <see cref="Func{T, TResult}"/> to invoke.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public T With(Func<T, T> func)
-        {
-            var result = Result;
-            return result.IsSuccess ? Invoker.Invoke(Owner, _ => func(result), Args) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <see cref="Result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="func">The <see cref="Func{T, TResult}"/> to invoke.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public Task<T> WithAsync(Func<T, Task<T>> func)
-        {
-            var result = Result;
-            return result.IsSuccess ? Invoker.InvokeAsync(Owner, (_, __) => func(result), Args, default) : Task.FromResult(result);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <see cref="Result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <param name="func">The <see cref="Func{T, TResult}"/> to invoke.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public U WithAs<U>(Func<T, U> func) where U : IResult
-        {
-            var result = Result;
-            return result.IsSuccess ? Invoker.Invoke(Owner, _ => func(result), Args) : default!;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <see cref="Result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <param name="func">The <see cref="Func{T, TResult}"/> to invoke.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public async Task<U> WithAsAsync<U>(Func<T, Task<U>> func) where U : IResult
-        {
-            var result = Result;
-            return result.IsSuccess ? await Invoker.InvokeAsync(Owner, (_, __) => func(result), Args, default).ConfigureAwait(false) : default!;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Invokers/ResultInvokerWithExtensions.cs b/src/CoreEx/Invokers/ResultInvokerWithExtensions.cs
deleted file mode 100644
index ecce8f79..00000000
--- a/src/CoreEx/Invokers/ResultInvokerWithExtensions.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Results;
-using System;
-
-namespace CoreEx.Invokers
-{
-    /// <summary>
-    /// Provides the <see cref="ResultInvokerWith{T}"/> extension methods.
-    /// </summary>
-    public static class ResultInvokerWithExtensions
-    {
-        /// <summary>
-        /// Initiates a <see cref="ManagerInvoker"/>-with operation (see <see cref="ResultInvokerWith{T}"/>) where <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The originating <see cref="IResult"/>.</param>
-        /// <param name="owner">The owner/invoker.</param>
-        /// <param name="args">The <see cref="InvokerArgs"/>.</param>
-        /// <returns>The <see cref="ResultInvokerWith{T}"/>.</returns>
-        public static ResultInvokerWith<T> Manager<T>(this T result, object owner, InvokerArgs? args = null) where T : IResult => new(result, ManagerInvoker.Current, owner, args);
-
-        /// <summary>
-        /// Initiates a <see cref="DataSvcInvoker"/>-with operation (see <see cref="ResultInvokerWith{T}"/>) where <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The originating <see cref="IResult"/>.</param>
-        /// <param name="owner">The owner/invoker.</param>
-        /// <param name="args">The <see cref="InvokerArgs"/>.</param>
-        /// <returns>The <see cref="ResultInvokerWith{T}"/>.</returns>
-        public static ResultInvokerWith<T> DataSvc<T>(this T result, object owner, InvokerArgs? args = null) where T : IResult => new(result, DataSvcInvoker.Current, owner, args);
-
-        /// <summary>
-        /// Initiates a <see cref="DataInvoker"/>-with operation (see <see cref="ResultInvokerWith{T}"/>) where <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="IResult"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The originating <see cref="IResult"/>.</param>
-        /// <param name="owner">The owner/invoker.</param>
-        /// <param name="args">The <see cref="InvokerArgs"/>.</param>
-        /// <returns>The <see cref="ResultInvokerWith{T}"/>.</returns>
-        public static ResultInvokerWith<T> Data<T>(this T result, object owner, InvokerArgs? args = null) where T : IResult => new(result, DataInvoker.Current, owner, args);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Compare/JsonElementComparer.cs b/src/CoreEx/Json/Compare/JsonElementComparer.cs
deleted file mode 100644
index 9dac85ec..00000000
--- a/src/CoreEx/Json/Compare/JsonElementComparer.cs
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Text.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-
-namespace CoreEx.Json.Compare
-{
-    /// <summary>
-    /// Provides a <see cref="JsonElement"/> comparer where property order is not significant.
-    /// </summary>
-    /// <remarks>Influenced by <see href="https://stackoverflow.com/questions/60580743/what-is-equivalent-in-jtoken-deepequals-in-system-text-json"/>.</remarks>
-    /// <param name="options">The <see cref="JsonElementComparerOptions"/>; defaults to <see cref="JsonElementComparerOptions.Default"/>.</param>
-    public sealed class JsonElementComparer(JsonElementComparerOptions? options = null) : IEqualityComparer<JsonElement>, IEqualityComparer<string>
-    {
-        /// <summary>
-        /// Gets the <see cref="JsonElementComparerOptions"/>.
-        /// </summary>
-        public JsonElementComparerOptions Options { get; } = options ?? JsonElementComparerOptions.Default;
-
-        /// <summary>
-        /// Compare two object values for equality; each value is JSON-serialized (uses <see cref="JsonSerializer.Default"/>) and then compared.
-        /// </summary>
-        /// <param name="left">The left value.</param>
-        /// <param name="right">The right value.</param>
-        /// <param name="pathsToIgnore">Optional list of paths to exclude from the comparison. Qualified paths, that include indexing, are also supported.</param>
-        /// <returns>The <see cref="JsonElementComparerResult"/>.</returns>
-        public JsonElementComparerResult CompareValue<TLeft, TRight>(TLeft left, TRight right, params string[] pathsToIgnore)
-            =>  Compare(SerializeValue(Options.JsonSerializer ??= JsonSerializer.Default, left, nameof(left)), SerializeValue(Options.JsonSerializer, right, nameof(right)), pathsToIgnore);
-
-        /// <summary>
-        /// Serialize the value to JSON.
-        /// </summary>
-        private static string SerializeValue<T>(IJsonSerializer jsonSerializer, T value, string name)
-        {
-            if (value is JsonElement je)
-                return je.ToString();
-
-            try
-            {
-                return jsonSerializer.Serialize(value);
-            }
-            catch (Exception ex)
-            {
-                throw new ArgumentException($"Failed to serialize value '{value?.GetType().FullName ?? "null"}' to JSON.", name, ex);
-            }
-        }
-
-        /// <summary>
-        /// Compare two JSON strings for equality.
-        /// </summary>
-        /// <param name="left">The left JSON <see cref="string"/>.</param>
-        /// <param name="right">The right JSON <see cref="string"/>.</param>
-        /// <param name="pathsToIgnore">Optional list of paths to exclude from the comparison. Qualified paths, that include indexing, are also supported.</param>
-        /// <returns>The <see cref="JsonElementComparerResult"/>.</returns>
-#if NET7_0_OR_GREATER
-        public JsonElementComparerResult Compare([StringSyntax(StringSyntaxAttribute.Json)] string left, [StringSyntax(StringSyntaxAttribute.Json)] string right, params string[] pathsToIgnore)
-#else
-        public JsonElementComparerResult Compare(string left, string right, params string[] pathsToIgnore)
-#endif
-        {
-            var ljr = new Utf8JsonReader(new BinaryData(left));
-            if (!JsonElement.TryParseValue(ref ljr, out JsonElement? lje))
-                throw new ArgumentException("JSON is not considered valid.", nameof(left));
-
-            var rjr = new Utf8JsonReader(new BinaryData(right));
-            if (!JsonElement.TryParseValue(ref rjr, out JsonElement? rje))
-                throw new ArgumentException("JSON is not considered valid.", nameof(right));
-
-            return Compare(lje.Value, rje.Value, pathsToIgnore);
-        }
-
-        /// <summary>
-        /// Compare two <see cref="JsonElement"/> values for equality.
-        /// </summary>
-        /// <param name="left">The left <see cref="JsonElement"/>.</param>
-        /// <param name="right">The right <see cref="JsonElement"/>.</param>
-        /// <param name="pathsToIgnore">Optional list of paths to exclude from the comparison. Qualified paths, that include indexing, are also supported.</param>
-        /// <returns>The <see cref="JsonElementComparerResult"/>.</returns>
-        public JsonElementComparerResult Compare(JsonElement left, JsonElement right, params string[] pathsToIgnore)
-        {
-            var result = new JsonElementComparerResult(left, right, Options.MaxDifferences, Options.ReplaceAllArrayItemsOnMerge);
-            Compare(left, right, new CompareState(result, Options.PathComparer, pathsToIgnore));
-            return result;
-        }
-
-        /// <summary>
-        /// Perform the <see cref="JsonElement"/> comparison.
-        /// </summary>
-        private void Compare(JsonElement left, JsonElement right, CompareState state)
-        {
-            if (left.ValueKind != right.ValueKind)
-            {
-                state.AddDifference(left, right, JsonElementDifferenceType.Kind);
-                return;
-            }
-
-            switch (left.ValueKind)
-            {
-                case JsonValueKind.Null:
-                case JsonValueKind.True:
-                case JsonValueKind.False:
-                    // These are the same by kind, so carry on!
-                    break;
-
-                case JsonValueKind.String:
-                    switch (Options.ValueComparison)
-                    {
-                        case JsonElementComparison.Exact:
-                            if (left.GetRawText() != right.GetRawText())
-                                state.AddDifference(left, right, JsonElementDifferenceType.Value);
-
-                            break;
-
-                        default:
-                            if (left.GetRawText() == right.GetRawText())
-                                break;
-
-                            if (left.TryGetDateTimeOffset(out var ldto) && right.TryGetDateTimeOffset(out var rdto))
-                            {
-                                if (ldto != rdto)
-                                    state.AddDifference(left, right, JsonElementDifferenceType.Value);
-                            }
-                            else if (left.TryGetDateTime(out var ldt) && right.TryGetDateTime(out var rdt))
-                            {
-                                if (ldt != rdt)
-                                    state.AddDifference(left, right, JsonElementDifferenceType.Value);
-                            }
-                            else if (left.TryGetGuid(out var lg) && right.TryGetGuid(out var rg))
-                            {
-                                if (lg != rg)
-                                    state.AddDifference(left, right, JsonElementDifferenceType.Value);
-                            }
-                            else if (left.GetString() != right.GetString())
-                                state.AddDifference(left, right, JsonElementDifferenceType.Value);
-
-                            break;
-                    }
-
-                    break;
-
-                case JsonValueKind.Number:
-                    switch (Options.ValueComparison)
-                    {
-                        case JsonElementComparison.Exact:
-                            if (left.GetRawText() != right.GetRawText())
-                                state.AddDifference(left, right, JsonElementDifferenceType.Value);
-
-                            break;
-
-                        default:
-                            if (left.GetRawText() == right.GetRawText())
-                                break;
-
-                            if (left.TryGetDecimal(out var ldec) && right.TryGetDecimal(out var rdec))
-                            {
-                                if (ldec != rdec)
-                                    state.AddDifference(left, right, JsonElementDifferenceType.Value);
-                            }
-                            else if (left.TryGetDouble(out var ldbl) && right.TryGetDouble(out var rdbl))
-                            {
-                                if (ldbl != rdbl)
-                                    state.AddDifference(left, right, JsonElementDifferenceType.Value);
-                            }
-                            else
-                                state.AddDifference(left, right, JsonElementDifferenceType.Value);
-
-                            break;
-                    }
-
-                    break;
-
-                case JsonValueKind.Object:
-                    foreach (var l in left.EnumerateObject())
-                    {
-                        state.Compare(l.Name, () =>
-                        {
-                            if (TryGetProperty(right, l.Name, out var r))
-                                Compare(l.Value, r, state);
-                            else
-                            {
-                                if (l.Value.ValueKind == JsonValueKind.Null && Options.NullComparison == JsonElementComparison.Semantic)
-                                    return;
-
-                                state.AddDifference(left, right, JsonElementDifferenceType.RightNone);
-                            }
-                        });
-
-                        if (state.MaxDifferencesFound)
-                            break;
-                    }
-
-                    foreach (var r in right.EnumerateObject())
-                    {
-                        state.Compare(r.Name, () =>
-                        {
-                            if (!TryGetProperty(left, r.Name, out var _))
-                            {
-                                if (r.Value.ValueKind == JsonValueKind.Null && Options.NullComparison == JsonElementComparison.Semantic)
-                                    return;
-
-                                state.AddDifference(left, right, JsonElementDifferenceType.LeftNone);
-                            }
-                        });
-
-                        if (state.MaxDifferencesFound)
-                            break;
-                    }
-
-                    break;
-
-                case JsonValueKind.Array:
-                    if (left.GetArrayLength() != right.GetArrayLength())
-                    {
-                        state.AddDifference(left, right, JsonElementDifferenceType.ArrayLength);
-                        break;
-                    }
-
-                    var i = 0;
-                    var rja = right.EnumerateArray();
-                    foreach (var lje in left.EnumerateArray())
-                    {
-                        rja.MoveNext();
-                        state.Compare(i++, () => Compare(lje, rja.Current, state));
-                        if (state.MaxDifferencesFound)
-                            break;
-                    }
-
-                    break;
-
-                case JsonValueKind.Undefined:
-                    // Ignore Undefined, assume irrelevant (i.e. not included in comparison).
-                    break;
-
-                default:
-                    throw new InvalidOperationException($"Unexpected JsonValueKind {left.ValueKind}.");
-            }
-        }
-
-        /// <summary>
-        /// Performs the configured TryGetProperty; using the comparer.
-        /// </summary>
-        private bool TryGetProperty(JsonElement json, string propertyName, out JsonElement value)
-            => Options.PropertyNameComparer is null ? json.TryGetProperty(propertyName, out value) : json.TryGetProperty(propertyName, Options.PropertyNameComparer, out value);
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public bool Equals([StringSyntax(StringSyntaxAttribute.Json)] string? x, [StringSyntax(StringSyntaxAttribute.Json)] string? y)
-#else
-        public bool Equals(string? x, string? y)
-#endif
-        {
-            if (x == null && y == null)
-                return true;
-            else if (x == null || y == null)
-                return false;
-
-            var ljr = new Utf8JsonReader(new BinaryData(x));
-            if (!JsonElement.TryParseValue(ref ljr, out JsonElement? lje))
-                throw new ArgumentException("JSON is not considered valid.", nameof(x));
-
-            var rjr = new Utf8JsonReader(new BinaryData(y));
-            if (!JsonElement.TryParseValue(ref rjr, out JsonElement? rje))
-                throw new ArgumentException("JSON is not considered valid.", nameof(y));
-
-            var state = new CompareState(new JsonElementComparerResult(lje.Value, rje.Value, 1), Options.PathComparer);
-            Compare(lje.Value, rje.Value, state);
-            return !state.MaxDifferencesFound;
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(JsonElement x, JsonElement y)
-        {
-            var state = new CompareState(new JsonElementComparerResult(x, y, 1), Options.PathComparer);
-            Compare(x, y, state);
-            return !state.MaxDifferencesFound;
-        }
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public int GetHashCode([StringSyntax(StringSyntaxAttribute.Json)] string json)
-#else
-        public int GetHashCode(string json)
-#endif
-        {
-            if (json == null)
-                return 0;
-
-            var jr = new Utf8JsonReader(new BinaryData(json));
-            if (!JsonElement.TryParseValue(ref jr, out JsonElement? je))
-                throw new ArgumentException("JSON is not considered valid.", nameof(json));
-
-            return GetHashCode(je.Value);
-        }
-
-        /// <inheritdoc/>
-        public int GetHashCode(JsonElement json)
-        {
-            var hash = new HashCode();
-            ComputeHashCode(json, ref hash);
-            return hash.ToHashCode();
-        }
-
-        /// <summary>
-        /// Computes the hash code.
-        /// </summary>
-        private static void ComputeHashCode(JsonElement json, ref HashCode hash)
-        {
-            hash.Add(json.ValueKind);
-
-            switch (json.ValueKind)
-            {
-                case JsonValueKind.Null:
-                    break;
-
-                case JsonValueKind.True:
-                    hash.Add(true.GetHashCode());
-                    break;
-
-                case JsonValueKind.False:
-                    hash.Add(false.GetHashCode());
-                    break;
-
-                case JsonValueKind.Number:
-                    hash.Add(json.GetDecimal().GetHashCode());
-                    break;
-
-                case JsonValueKind.String:
-                    hash.Add(json.GetString());
-                    break;
-
-                case JsonValueKind.Array:
-                    foreach (var item in json.EnumerateArray())
-                    {
-                        ComputeHashCode(item, ref hash);
-                    }
-
-                    break;
-
-                case JsonValueKind.Object:
-                    foreach (var property in json.EnumerateObject().OrderBy(p => p.Name, StringComparer.Ordinal))
-                    {
-                        hash.Add(property.Name);
-                        ComputeHashCode(property.Value, ref hash);
-                    }
-
-                    break;
-
-                case JsonValueKind.Undefined:
-                    break;
-
-                default:
-                    throw new JsonException(string.Format("Unknown JsonValueKind {0}", json.ValueKind));
-            }
-        }
-
-        /// <summary>
-        /// Provides internal state needed to support the comparison.
-        /// </summary>
-        private sealed class CompareState
-        {
-            private readonly Stack<string> _unqualifiedPaths = new(["$"]);
-            private readonly Stack<string> _paths = new(["$"]);
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="CompareState"/> class.
-            /// </summary>
-            /// <param name="result">The <see cref="JsonElementComparerResult"/>.</param>
-            /// <param name="pathComparer">The <see cref="IEqualityComparer{String}"/> to use for comparing JSON paths.</param>
-            /// <param name="pathsToIgnore">The paths to ignore from the comparison.</param>
-            public CompareState(JsonElementComparerResult result, IEqualityComparer<string>? pathComparer, params string[] pathsToIgnore)
-            {
-                Result = result;
-                PathComparer = pathComparer ?? StringComparer.InvariantCultureIgnoreCase;
-                var maxDepth = 0;
-                PathsToIgnore = new(JsonFilterer.CreateDictionary(pathsToIgnore, JsonPropertyFilter.Exclude, StringComparison.Ordinal, ref maxDepth, true).Keys);
-            }
-
-            /// <summary>
-            /// Gets the <see cref="JsonElementComparerResult"/>.
-            /// </summary>
-            public JsonElementComparerResult Result { get; }
-
-            /// <summary>
-            /// Gets or sets the <see cref="IEqualityComparer{String}"/> to use for comparing JSON paths.
-            /// </summary>
-            /// <remarks>Defaults to <see cref="StringComparer.InvariantCultureIgnoreCase"/>.</remarks>
-            public IEqualityComparer<string> PathComparer { get; }
-
-            /// <summary>
-            /// Indicates whether the maximum number of differences specified to detect has been found.
-            /// </summary>
-            public bool MaxDifferencesFound => Result.IsMaxDifferencesFound;
-
-            /// <summary>
-            /// Get paths to exclude.
-            /// </summary>
-            public HashSet<string> PathsToIgnore { get; }
-
-            /// <summary>
-            /// Gets the unqualified path (excludes indexing).
-            /// </summary>
-            public string UnqualifiedPath => _unqualifiedPaths.Peek();
-
-            /// <summary>
-            /// Gets the path.
-            /// </summary>
-            public string Path => _paths.Peek();
-
-            /// <summary>
-            /// Encapsulates a path comparison action.
-            /// </summary>
-            /// <param name="name">The path name.</param>
-            /// <param name="action">The action to execute.</param>
-            public void Compare(string name, Action action)
-            {
-                var unqualifiedPath = $"{UnqualifiedPath}.{name}";
-                if (PathsToIgnore.Contains(unqualifiedPath, PathComparer))
-                    return;
-
-                var path = $"{Path}.{name}";
-                if (PathsToIgnore.Contains(path, PathComparer))
-                    return;
-
-                _unqualifiedPaths.Push(unqualifiedPath);
-                _paths.Push(path);
-
-                action.Invoke();
-
-                _unqualifiedPaths.Pop();
-                _paths.Pop();
-            }
-
-            /// <summary>
-            /// Encapsulates an array item comparison.
-            /// </summary>
-            /// <param name="index">The array index.</param>
-            /// <param name="action">The action to execute.</param>
-            public void Compare(int index, Action action)
-            {
-                _paths.Push($"{Path}[{index}]");
-
-                action.Invoke();
-
-                _paths.Pop();
-            }
-
-            /// <summary>
-            /// Adds a difference to the result.
-            /// </summary>
-            /// <param name="left">The left <see cref="JsonElement"/>.</param>
-            /// <param name="right">The right <see cref="JsonElement"/>.</param>
-            /// <param name="type">The <see cref="JsonElementDifferenceType"/>.</param>
-            public void AddDifference(JsonElement left, JsonElement right, JsonElementDifferenceType type) 
-                => Result.AddDifference(new JsonElementDifference(Path, left, right, type));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Compare/JsonElementComparerOptions.cs b/src/CoreEx/Json/Compare/JsonElementComparerOptions.cs
deleted file mode 100644
index a55c8e49..00000000
--- a/src/CoreEx/Json/Compare/JsonElementComparerOptions.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Text.Json;
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-
-namespace CoreEx.Json.Compare
-{
-    /// <summary>
-    /// Provides the options for <see cref="JsonElementComparer"/>.
-    /// </summary>
-    public sealed class JsonElementComparerOptions
-    {
-        private static JsonElementComparerOptions? _default;
-
-        /// <summary>
-        /// Gets or sets the default <see cref="JsonElementComparer"/> instance.
-        /// </summary>
-        public static JsonElementComparerOptions Default
-        {
-            get => _default ??= new();
-            set => _default = value.ThrowIfNull(nameof(value));
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IEqualityComparer{String}"/> to use for comparing JSON paths.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>.</remarks>
-        public IEqualityComparer<string> PathComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IEqualityComparer{String}"/> to use for comparing property names.
-        /// </summary>
-        /// <remarks>Where not specified will use the native (fast) <see cref="JsonElement.TryGetProperty(string, out JsonElement)"/> exact comparison; otherwise, will use 
-        /// <see cref="JsonExtensions.TryGetProperty(JsonElement, string, IEqualityComparer{string}, out JsonElement)"/> which is less performant (however, enables semantic comparison where applicable).</remarks>
-        public IEqualityComparer<string>? PropertyNameComparer { get; set; }
-
-        /// <summary>
-        /// Gets or sets the maximum number of differences to detect where performing a comparison.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="int.MaxValue"/>.</remarks>
-        public int MaxDifferences { get; set; } = int.MaxValue;
-
-        /// <summary>
-        /// Gets or sets the <see cref="JsonElementComparison"/> used for property value comparisons.
-        /// </summary>
-        /// <remarks>When <see cref="JsonElementComparison.Semantic"/>: a <see cref="JsonValueKind.String"/> the comparison will be performed using <see cref="JsonElement.GetDateTimeOffset"/>, <see cref="JsonElement.GetDateTime"/>, <see cref="JsonElement.GetGuid"/> and <see cref="JsonElement.GetString"/>
-        /// (in order specified) until match found; otherwise, for a <see cref="JsonValueKind.Number"/> the comparison will be performed using <see cref="JsonElement.GetDecimal"/> and <see cref="JsonElement.GetDouble"/> (in order specified) until a match
-        /// found.<para>Defaults to <see cref="JsonElementComparison.Semantic"/>.</para></remarks>
-        public JsonElementComparison ValueComparison { get; set; } = JsonElementComparison.Semantic;
-
-        /// <summary>
-        /// Gets or sets the <see cref="JsonElementComparison"/> used for null value comparisons.
-        /// </summary>
-        /// <remarks>When <see cref="JsonElementComparison.Semantic"/>: a <see cref="JsonValueKind.Null"/> where the other property does not exist assumes is equivalent null by default.</remarks>
-        public JsonElementComparison NullComparison { get; set; } = JsonElementComparison.Exact;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="Json.JsonSerializer.Default"/> where not specified.</remarks>
-        public IJsonSerializer? JsonSerializer { get; set; }
-
-        /// <summary>
-        /// Indicates whether to always replace all array items where at least one item has changed when performing a corresponding <see cref="JsonElementComparerResult.ToMergePatch(string[])"/>.
-        /// </summary>
-        /// <remarks>The formal specification <see href="https://tools.ietf.org/html/rfc7396"/> explictly states that an <see cref="System.Text.Json.JsonValueKind.Array"/> is to be a replacement operation.
-        /// <para>Where set to <c>false</c> and there is an array length difference this will always result in a replace (i.e. all); no means to reliably determine what has been added, deleted, modified, resequenced, etc.</para></remarks>
-        public bool ReplaceAllArrayItemsOnMerge { get; set; } = true;
-
-        /// <summary>
-        /// Clones the <see cref="JsonElementComparerOptions"/>.
-        /// </summary>
-        /// <returns>A new (cloned) instance.</returns>
-        public JsonElementComparerOptions Clone() => new()
-        {
-            PathComparer = PathComparer,
-            PropertyNameComparer = PropertyNameComparer,
-            MaxDifferences = MaxDifferences,
-            ValueComparison = ValueComparison,
-            NullComparison = NullComparison,
-            JsonSerializer = JsonSerializer,
-            ReplaceAllArrayItemsOnMerge = ReplaceAllArrayItemsOnMerge
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Compare/JsonElementComparerResult.cs b/src/CoreEx/Json/Compare/JsonElementComparerResult.cs
deleted file mode 100644
index c7fd4a1b..00000000
--- a/src/CoreEx/Json/Compare/JsonElementComparerResult.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Text.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Json.Compare
-{
-    /// <summary>
-    /// Represents the result of a <see cref="JsonElementComparer"/>.
-    /// </summary>
-    public sealed class JsonElementComparerResult
-    {
-        private List<JsonElementDifference>? _differences;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonElementComparerResult"/> class.
-        /// </summary>
-        /// <param name="left">The left <see cref="JsonElement"/>.</param>
-        /// <param name="right">The right <see cref="JsonElement"/>.</param>
-        /// <param name="maxDifferences">The maximum number of differences to detect.</param>
-        /// <param name="replaceAllArrayItemsOnMerge">Indicates whether to always replace all array items where at least one item has changed when performing a corresponding <see cref="ToMergePatch(string[])"/>.</param>
-        internal JsonElementComparerResult(JsonElement left, JsonElement right, int maxDifferences, bool replaceAllArrayItemsOnMerge = true)
-        {
-            Left = left;
-            Right = right;
-            MaxDifferences = maxDifferences;
-            ReplaceAllArrayItemsOnMerge = replaceAllArrayItemsOnMerge;
-        }
-
-        /// <summary>
-        /// Gets the left <see cref="JsonElement"/>.
-        /// </summary>
-        public JsonElement Left { get; }
-
-        /// <summary>
-        /// Gets the right <see cref="JsonElement"/>.
-        /// </summary>
-        public JsonElement Right { get; }
-
-        /// <summary>
-        /// Gets the maximum number of differences to detect.
-        /// </summary>
-        public int MaxDifferences { get; }
-
-        /// <summary>
-        /// Indicates whether the two JSON elements are considered equal.
-        /// </summary>
-        public bool AreEqual => DifferenceCount == 0;
-
-        /// <summary>
-        /// Indicates whether there are any differences between the two JSON elements based on the specified criteria.
-        /// </summary>
-        public bool HasDifferences => DifferenceCount != 0;
-
-        /// <summary>
-        /// Gets the current number of differences detected.
-        /// </summary>
-        public int DifferenceCount => _differences?.Count ?? 0;
-
-        /// <summary>
-        /// Indicates whether the maximum number of differences specified to detect has been found.
-        /// </summary>
-        public bool IsMaxDifferencesFound => DifferenceCount >= MaxDifferences;
-
-        /// <summary>
-        /// Indicates whether to always replace all array items where at least one item has changed when performing a corresponding <see cref="ToMergePatch(string[])"/>.
-        /// </summary>
-        /// <remarks>The formal specification <see href="https://tools.ietf.org/html/rfc7396"/> explictly states that an <see cref="System.Text.Json.JsonValueKind.Array"/> is to be a replacement operation.
-        /// <para>Where set to <c>false</c> and there is an array length difference this will always result in a replace (i.e. all); no means to reliably determine what has been added, deleted, modified, resequenced, etc.</para></remarks>
-        public bool ReplaceAllArrayItemsOnMerge { get; }
-
-        /// <summary>
-        /// Gets the <see cref="JsonElementDifference"/> array.
-        /// </summary>
-        /// <remarks>The differences found up to the <see cref="MaxDifferences"/> specified.</remarks>
-        public JsonElementDifference[] GetDifferences() => _differences is null ? [] : [.. _differences];
-
-        /// <summary>
-        /// Adds a <see cref="JsonElementDifference"/>.
-        /// </summary>
-        /// <param name="difference">The <see cref="JsonElementDifference"/>.</param>
-        internal void AddDifference(JsonElementDifference difference) => (_differences ??= []).Add(difference);
-
-        /// <inheritdoc/>
-        public override string ToString()
-        {
-            if (AreEqual)
-                return "No differences detected.";
-
-            var sb = new StringBuilder();
-            foreach (var d in _differences!)
-            {
-                if (sb.Length > 0)
-                    sb.AppendLine();
-
-                sb.Append(d.ToString());
-            }
-
-            if (IsMaxDifferencesFound)
-            {
-                sb.AppendLine();
-                sb.Append($"Maximum difference count of '{MaxDifferences}' found; comparison stopped.");
-            }
-
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Creates a JSON Merge Patch (<c>application/merge-patch+json</c>) <see cref="JsonNode"/> from the <see cref="Right"/> <see cref="JsonElement"/> (used within the comparison) based on the differences (<see cref="GetDifferences"/>) 
-        /// found and the optional <paramref name="pathsToInclude"/>.
-        /// </summary>
-        /// <param name="pathsToInclude">Optional list of paths to additionally include. Qualified paths, that include indexing, are also supported.</param>
-        /// <returns>A JSON Merge Patch (<c>application/merge-patch+json</c>) <see cref="JsonNode"/> originally sourced as the <see cref="Right"/> <see cref="JsonElement"/>.</returns>
-        /// <remarks>The <paramref name="pathsToInclude"/> enables additional paths to always be included regardless of whether any differences were found for those paths; i.e those paths will always be included. Additionally,
-        /// to further include or exclude consider the <see cref="JsonFilterer"/> which is conveniently enabled as <see cref="JsonNode"/> extensions methods <see cref="JsonExtensions.ApplyInclude(JsonNode, string[])"/> and
-        /// <see cref="JsonExtensions.ApplyExclude(JsonNode, string[])"/>.</remarks>
-        public JsonNode ToMergePatch(params string[] pathsToInclude)
-        {
-            var maxDepth = 0;
-            var state = new MergePatchState(
-                _differences is null ? null : JsonFilterer.CreateDictionary(_differences.Select(x => x.Path), JsonPropertyFilter.Include, StringComparison.Ordinal, ref maxDepth, true),
-                pathsToInclude.Length == 0 ? null : JsonFilterer.CreateDictionary(pathsToInclude, JsonPropertyFilter.Include, StringComparison.Ordinal, ref maxDepth, true));
-
-            switch (Right.ValueKind)
-            {
-                case JsonValueKind.Object:
-                    var jo = JsonObject.Create(Right)!;
-                    MergePatch(jo, state);
-                    return jo;
-
-                case JsonValueKind.Array:
-                    var ja = JsonArray.Create(Right)!;
-                    MergePatch(ja, state);
-                    return ja;
-
-                case JsonValueKind.Undefined:
-                    throw new InvalidOperationException("Cannot create a JSON Merge Patch from an undefined JSON element.");
-
-                default:
-                    return JsonValue.Create(Right)!;
-            }
-        }
-
-        /// <summary>
-        /// Merge patch based on node type.
-        /// </summary>
-        private PathMatch MergePatch(JsonNode? jn, MergePatchState state)
-        {
-            if (jn == null)
-                return PathMatch.None;
-
-            var match = state.GetMatch(jn);
-            if (match != PathMatch.Partial)
-                return match;
-
-            return jn switch
-            {
-                JsonValue => PathMatch.Partial,
-                JsonObject jo => MergePatch(jo, state),
-                JsonArray ja => MergePatch(ja, state),
-                _ => throw new NotSupportedException($"Unsupported JSON node type '{jn.GetType().Name}'.")
-            };
-        }
-
-        /// <summary>
-        /// Merge patch an object.
-        /// </summary>
-        private PathMatch MergePatch(JsonObject jo, MergePatchState state)
-        {
-            PathMatch match;
-            var overall = PathMatch.None;
-
-            foreach (var jn in jo.ToArray())
-            {
-                if (jn.Value is null)
-                {
-                    var path = $"{jo.GetPath()}.{jn.Key}";
-                    match = state.GetMatch(path);
-                }
-                else
-                    match = MergePatch(jn.Value, state);
-
-                overall = MergePatchState.ConsolidateMatch(overall, match);
-                if (match != PathMatch.Full)
-                    jo.Remove(jn.Key);
-            }
-
-            return overall;
-        }
-
-        /// <summary>
-        /// Merge patch an array.
-        /// </summary>
-        private PathMatch MergePatch(JsonArray ja, MergePatchState state)
-        {
-            PathMatch match;
-            var overall = PathMatch.None;
-
-            if (ReplaceAllArrayItemsOnMerge && state.GetMatch(ja) != PathMatch.None)
-                return PathMatch.Full;
-
-            for (var i = ja.Count - 1; i >= 0; i--)
-            {
-                var jn = ja[i];
-                match = jn is null ? state.GetMatch($"{ja.GetPath()}[{i}]") : MergePatch(ja[i], state);
-                overall = MergePatchState.ConsolidateMatch(overall, match);
-                if (match != PathMatch.Full)
-                    ja.RemoveAt(i);
-            }
-
-            return overall;
-        }
-
-        /// <summary>
-        /// Provides internal state needed to support the merge patch.
-        /// </summary>
-        /// <param name="differencePaths">The differences paths for inclusion.</param>
-        /// <param name="includePaths">The additional paths for inclusion.</param>
-        private sealed class MergePatchState(Dictionary<string, bool>? differencePaths, Dictionary<string, bool>? includePaths)
-        {
-            /// <summary>
-            /// Gets the differences paths for inclusion.
-            /// </summary>
-            public Dictionary<string, bool>? DifferencePaths { get; } = differencePaths;
-
-            /// <summary>
-            /// Gets the additional paths for inclusion.
-            /// </summary>
-            public Dictionary<string, bool>? IncludePaths { get; } = includePaths;
-
-            /// <summary>
-            /// Gets the difference and include match for the specified <see cref="JsonNode"/>.
-            /// </summary>
-            public PathMatch GetMatch(JsonNode jsonNode) => GetMatch(jsonNode.GetPath());
-
-            /// <summary>
-            /// Gets the difference and include match for the specified path.
-            /// </summary>
-            public PathMatch GetMatch(string path)
-            {
-                var match = GetMatchAsIs(path);
-                return match != PathMatch.Full && JsonFilterer.TryRemovePathIndexes(path, out var unindexed) ? ConsolidateMatch(GetMatchAsIs(unindexed), match) : match;
-            }
-
-            /// <summary>
-            /// Gets the difference and include match for the specified path as-is.
-            /// </summary>
-            private PathMatch GetMatchAsIs(string path)
-            {
-                var dm = GetDifferenceMatch(path);
-                if (dm == PathMatch.Full)
-                    return PathMatch.Full;
-
-                var im = GetIncludeMatch(path);
-                if (im == PathMatch.Full)
-                    return PathMatch.Full;
-                else if (dm == PathMatch.Partial || im == PathMatch.Partial)
-                    return PathMatch.Partial;
-                else
-                    return PathMatch.None;
-            }
-
-            /// <summary>
-            /// Gets the difference match for the specified path.
-            /// </summary>
-            public PathMatch GetDifferenceMatch(string path) => (DifferencePaths is not null && DifferencePaths.TryGetValue(path, out var match)) ? (match ? PathMatch.Full : PathMatch.Partial) : PathMatch.None;
-
-            /// <summary>
-            /// Gets the include match for the specified path.
-            /// </summary>
-            public PathMatch GetIncludeMatch(string path) => (IncludePaths is not null && IncludePaths.TryGetValue(path, out var match)) ? (match ? PathMatch.Full : PathMatch.Partial) : PathMatch.None;
-
-            /// <summary>
-            /// Consolidate the existing and matched and return the mostest (sic) match.
-            /// </summary>
-            public static PathMatch ConsolidateMatch(PathMatch existing, PathMatch matched)
-                => existing == PathMatch.Full || matched == PathMatch.Full ? PathMatch.Full : (existing == PathMatch.Partial || matched == PathMatch.Partial ? PathMatch.Partial : PathMatch.None);
-        }
-
-        /// <summary>
-        /// Represents the result of path matching.
-        /// </summary>
-        private enum PathMatch
-        {
-            /// <summary>
-            /// Indicates no match.
-            /// </summary>
-            None,
-
-            /// <summary>
-            /// Indicates a partial match.
-            /// </summary>
-            Partial,
-
-            /// <summary>
-            /// Indicates a full match.
-            /// </summary>
-            Full
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Compare/JsonElementComparison.cs b/src/CoreEx/Json/Compare/JsonElementComparison.cs
deleted file mode 100644
index 33480323..00000000
--- a/src/CoreEx/Json/Compare/JsonElementComparison.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Text.Json;
-
-namespace CoreEx.Json.Compare
-{
-    /// <summary>
-    /// Defines the <see cref="JsonElement"/> comparison option where <see cref="JsonElement.ValueKind"/> is either a <see cref="JsonValueKind.String"/>, <see cref="JsonValueKind.Number"/> or <see cref="JsonValueKind.Null"/>.
-    /// </summary>
-    public enum JsonElementComparison
-    {
-        /// <summary>
-        /// Indicates that a semantic match is to used for the comparison.
-        /// </summary>
-        Semantic,
-
-        /// <summary>
-        /// Indicates that an exact match is to used for the comparison.
-        /// </summary>
-        /// <remarks>Uses the <see cref="JsonElement.GetRawText"/> for the value comparison.</remarks>
-        Exact
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Compare/JsonElementDifference.cs b/src/CoreEx/Json/Compare/JsonElementDifference.cs
deleted file mode 100644
index 233f2307..00000000
--- a/src/CoreEx/Json/Compare/JsonElementDifference.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Text.Json;
-
-namespace CoreEx.Json.Compare
-{
-    /// <summary>
-    /// Represents a <see cref="JsonElementComparerResult"/> <see cref="JsonElement"/> comparison difference.
-    /// </summary>
-    public readonly struct JsonElementDifference
-    {
-        /// <summary>
-        /// Initializes a the <see cref="JsonElementDifference"/> struct.
-        /// </summary>
-        /// <param name="path">The JSON path.</param>
-        /// <param name="left">The left <see cref="JsonElement"/> where applicable.</param>
-        /// <param name="right">The right <see cref="JsonElement"/> where applicable.</param>
-        /// <param name="type">The <see cref="JsonElementDifferenceType"/>.</param>
-        internal JsonElementDifference(string path, JsonElement? left, JsonElement? right, JsonElementDifferenceType type)
-        {
-            Path = path;
-            Left = left;
-            Right = right;
-            Type = type;
-        }
-
-        /// <summary>
-        /// Gets the JSON path.
-        /// </summary>
-        public string Path { get; }
-
-        /// <summary>
-        /// Gets the left <see cref="JsonElement"/> where applicable.
-        /// </summary>
-        public JsonElement? Left { get; }
-
-        /// <summary>
-        /// Gets the right <see cref="JsonElement"/> where applicable.
-        /// </summary>
-        public JsonElement? Right { get; }
-
-        /// <summary>
-        /// Gets the <see cref="JsonElementDifferenceType"/>.
-        /// </summary>
-        public JsonElementDifferenceType Type { get; }
-
-        /// <inheritdoc/>
-        public override string ToString() => $"Path '{Path}': {Type switch
-        {
-            JsonElementDifferenceType.LeftNone => "Does not exist in left JSON.",
-            JsonElementDifferenceType.RightNone => "Does not exist in right JSON.",
-            JsonElementDifferenceType.ArrayLength => $"Array lengths are not equal: {Left?.GetArrayLength()} != {Right?.GetArrayLength()}.",
-            JsonElementDifferenceType.Kind => $"Kind is not equal: {Left?.ValueKind} != {Right?.ValueKind}.",
-            _ => $"Value is not equal: {Left?.GetRawText()} != {Right?.GetRawText()}.",
-        }}";
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Compare/JsonElementDifferenceType.cs b/src/CoreEx/Json/Compare/JsonElementDifferenceType.cs
deleted file mode 100644
index 3f560cc0..00000000
--- a/src/CoreEx/Json/Compare/JsonElementDifferenceType.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Text.Json;
-
-namespace CoreEx.Json.Compare
-{
-    /// <summary>
-    /// Defines the type of difference identified.
-    /// </summary>
-    public enum JsonElementDifferenceType
-    {
-        /// <summary>
-        /// Indicates that the left and right <see cref="JsonElement"/> <see cref="JsonValueKind"/> is different.
-        /// </summary>
-        Kind,
-
-        /// <summary>
-        /// Indicates that the left and right <see cref="JsonElement"/> values are different.
-        /// </summary>
-        Value,
-
-        /// <summary>
-        /// Indicates that the corresponding path does not exist in the left <see cref="JsonElement"/>.
-        /// </summary>
-        LeftNone,
-
-        /// <summary>
-        /// Indicates that the corresponding path does not exist in the right <see cref="JsonElement"/>.
-        /// </summary>
-        RightNone,
-
-        /// <summary>
-        /// Indicates that the left and right <see cref="JsonElement"/> array lengths are different.
-        /// </summary>
-        ArrayLength
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Data/JsonDataReader.cs b/src/CoreEx/Json/Data/JsonDataReader.cs
deleted file mode 100644
index 27547a4a..00000000
--- a/src/CoreEx/Json/Data/JsonDataReader.cs
+++ /dev/null
@@ -1,515 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.RefData;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text.Json;
-using System.Threading.Tasks;
-using YamlDotNet.Core.Events;
-using YamlDotNet.Serialization;
-
-namespace CoreEx.Json.Data
-{
-    /// <summary>
-    /// Reads JSON or YAML data and converts into a corresponding typed collection.
-    /// </summary>
-    public sealed class JsonDataReader : IDisposable
-    {
-        private readonly JsonDocument _jsonDocument;
-        private readonly JsonProperty _json;
-        private readonly JsonDataReaderArgs _args;
-        private readonly bool _disposeDocument;
-        private readonly ExecutionContext _executionContext;
-        private readonly TypeReflectorArgs _typeReflectorArgs;
-
-        private class YamlNodeTypeResolver : INodeTypeResolver
-        {
-            private static readonly string[] boolValues = ["true", "false"];
-
-            /// <inheritdoc/>
-            bool INodeTypeResolver.Resolve(NodeEvent? nodeEvent, ref Type currentType)
-            {
-                if (nodeEvent is Scalar scalar && scalar.Style == YamlDotNet.Core.ScalarStyle.Plain)
-                {
-                    if (decimal.TryParse(scalar.Value, out _))
-                    {
-                        if (scalar.Value.Length > 1 && scalar.Value.StartsWith('0')) // Valid JSON does not support a number that starts with a zero.
-                            currentType = typeof(string);
-                        else
-                            currentType = typeof(decimal);
-
-                        return true;
-                    }
-
-                    if (boolValues.Contains(scalar.Value))
-                    {
-                        currentType = typeof(bool);
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Reads and parses the YAML from the named embedded resource <see cref="Stream"/> within the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> to find manifest resources (see <see cref="Assembly.GetManifestResourceStream(string)"/>).</typeparam>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        public static JsonDataReader ParseYaml<TResource>(string resourceName, JsonDataReaderArgs? args = null) => ParseYaml(Resource.GetStream<TResource>(resourceName), args);
-
-        /// <summary>
-        /// Reads and parses the YAML <see cref="string"/>.
-        /// </summary>
-        /// <param name="yaml">The YAML <see cref="string"/>.</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        public static JsonDataReader ParseYaml(string yaml, JsonDataReaderArgs? args = null)
-        {
-            using var sr = new StringReader(yaml);
-            return ParseYaml(sr, args);
-        }
-
-        /// <summary>
-        /// Reads and parses the YAML <see cref="Stream"/>.
-        /// </summary>
-        /// <param name="s">The YAML <see cref="Stream"/>.</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        public static JsonDataReader ParseYaml(Stream s, JsonDataReaderArgs? args = null) => ParseYaml(new StreamReader(s), args);
-
-        /// <summary>
-        /// Reads and parses the YAML <see cref="TextReader"/>.
-        /// </summary>
-        /// <param name="tr">The YAML <see cref="TextReader"/>.</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        public static JsonDataReader ParseYaml(TextReader tr, JsonDataReaderArgs? args = null)
-        {
-            var yaml = new DeserializerBuilder().WithNodeTypeResolver(new YamlNodeTypeResolver()).Build().Deserialize(tr);
-            var json = new SerializerBuilder().JsonCompatible().Build().Serialize(yaml!);
-            return new(JsonDocument.Parse(json) ?? throw new InvalidOperationException("JsonNode.Parse resulted in a null."), args, true);
-        }
-
-        /// <summary>
-        /// Reads and parses the JSON from the named embedded resource <see cref="Stream"/> within the <see name="Assembly"/> inferred from the <typeparamref name="TResource"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TResource">The <see cref="Type"/> to infer the <see cref="Assembly"/> to find manifest resources (see <see cref="Assembly.GetManifestResourceStream(string)"/>).</typeparam>
-        /// <param name="resourceName">The embedded resource name (matches to the end of the fully qualifed resource name).</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        public static JsonDataReader ParseJson<TResource>(string resourceName, JsonDataReaderArgs? args = null) => ParseJson(Resource.GetStream<TResource>(resourceName), args);
-
-        /// <summary>
-        /// Reads and parses the JSON <see cref="string"/>.
-        /// </summary>
-        /// <param name="json">The JSON <see cref="string"/>.</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-#if NET7_0_OR_GREATER
-        public static JsonDataReader ParseJson([StringSyntax(StringSyntaxAttribute.Json)] string json, JsonDataReaderArgs? args = null)
-#else
-        public static JsonDataReader ParseJson(string json, JsonDataReaderArgs? args = null)
-#endif
-            => new(JsonDocument.Parse(json) ?? throw new InvalidOperationException("JsonNode.Parse resulted in a null."), args, true);
-
-        /// <summary>
-        /// Reads and parses the JSON <see cref="Stream"/>.
-        /// </summary>
-        /// <param name="s">The JSON <see cref="Stream"/>.</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        public static JsonDataReader ParseJson(Stream s, JsonDataReaderArgs? args = null) => new(JsonDocument.Parse(s) ?? throw new InvalidOperationException("JsonNode.Parse resulted in a null."), args, true);
-
-        /// <summary>
-        /// Reads and parses the <see cref="JsonDocument"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonDocument"/>.</param>
-        /// <param name="args">The optional <see cref="JsonDataReaderArgs"/>.</param>
-        /// <returns>The <see cref="JsonDataReader"/>.</returns>
-        /// <remarks>A <see cref="JsonDocument"/> is only used to read and navigate the JSON, any serialization operation will use the specified <see cref="JsonDataReaderArgs.JsonSerializer"/>.</remarks>
-        public static JsonDataReader ParseJson(JsonDocument json, JsonDataReaderArgs? args = null) => new(json, args, false);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonDataReader"/> class.
-        /// </summary>
-        private JsonDataReader(JsonDocument json, JsonDataReaderArgs? args, bool disposeDocument)
-        {
-            _jsonDocument = json.ThrowIfNull(nameof(json));
-            try
-            {
-                if (_jsonDocument.RootElement.ValueKind != JsonValueKind.Object)
-                    throw new ArgumentException("JSON root element must be an Object.", nameof(json));
-
-                _json = json.RootElement.EnumerateObject().FirstOrDefault();
-                if (_json.Value.ValueKind != JsonValueKind.Array)
-                    throw new ArgumentException("JSON root element must be an Object with an underlying array.", nameof(json));
-            }
-            catch
-            {
-                if (disposeDocument)
-                    _jsonDocument.Dispose();
-
-                throw;
-            }
-
-            _args = args ?? new JsonDataReaderArgs();
-            _disposeDocument = disposeDocument;
-            _executionContext = new ExecutionContext { UserName = (string)_args.Parameters[JsonDataReaderArgs.UserNameKey]!, Timestamp = (DateTime)_args.Parameters[JsonDataReaderArgs.DateTimeNowKey]! };
-            _typeReflectorArgs = new(_args.JsonSerializer);
-        }
-
-        /// <summary>
-        /// Deserializes the contents of the named element into a collection of the specified <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to deserialize to.</typeparam>
-        /// <param name="name">The element name where the array of items to deserialize are housed. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="items">The resulting collection of items.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized; otherwise, <c>false</c> for none found.</returns>
-        public bool TryDeserialize<T>(string? name, [NotNullWhen(true)] out List<T>? items)
-        {
-            items = null;
-
-            // Find the named object and deserialize corresponding items.
-            foreach (var ji in _json.Value.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.Object))
-            {
-                foreach (var jo in ji.EnumerateObject().Where(x => x.Name == (name ?? typeof(T).Name) && x.Value.ValueKind == JsonValueKind.Array))
-                {
-                    foreach (var jd in jo.Value.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.Object))
-                    {
-                        var item = Deserialize<T>(jd);
-                        if (item != null)
-                        {
-                            (items ??= []).Add(item);
-                            _args.IdentifierGenerator?.AssignIdentifierAsync(item);
-                            ChangeLog.PrepareCreated(item, _executionContext);
-
-                            // Only reset tenant id where not explicitly set.
-                            if (item is ITenantId tenantId && tenantId is null)
-                                Cleaner.ResetTenantId(item, _executionContext);
-
-                            PrepareReferenceData(typeof(T), item, jd, items.Count - 1);
-                        }
-                    }
-                }
-            }
-
-            return items != null;
-        }
-
-        /// <summary>
-        /// Deserializes the contents of the named element into a collection of the specified <paramref name="type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="Type"/> to deserialize to.</param>
-        /// <param name="name">The element name where the array of items to deserialize are housed. Defaults to the <see cref="Type"/> name.</param>
-        /// <param name="items">The resulting collection of items.</param>
-        /// <returns><c>true</c> indicates that one or more items were deserialized; otherwise, <c>false</c> for none found.</returns>
-        public bool TryDeserialize(Type type, string? name, [NotNullWhen(true)] out List<object>? items)
-        {
-            items = null;
-
-            // Find the named object and deserialize corresponding items.
-            foreach (var ji in _json.Value.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.Object))
-            {
-                foreach (var jo in ji.EnumerateObject().Where(x => x.Name == (name ?? type.Name) && x.Value.ValueKind == JsonValueKind.Array))
-                {
-                    foreach (var jd in jo.Value.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.Object))
-                    {
-                        var item = Deserialize(type, jd);
-                        if (item != null)
-                        {
-                            (items ??= []).Add(item);
-                            _args.IdentifierGenerator?.AssignIdentifierAsync(item);
-                            ChangeLog.PrepareCreated(item, _executionContext);
-
-                            // Only reset tenant id where not explicitly set.
-                            if (item is ITenantId tenantId && tenantId is null)
-                                Cleaner.ResetTenantId(item, _executionContext);
-
-                            PrepareReferenceData(type, item, jd, items.Count - 1);
-                        }
-                    }
-                }
-            }
-
-            return items != null;
-        }
-
-        /// <summary>
-        /// Enumerate the named element and invoke the <paramref name="json"/> action per item.
-        /// </summary>
-        /// <param name="name">The element name where the array of items to invoke are housed.</param>
-        /// <param name="json">The resulting <see cref="JsonElement"/> item function.</param>
-        /// <returns><c>true</c> indicates that one or more items were invoked; otherwise, <c>false</c> for none found.</returns>
-        public async Task<bool> EnumerateJsonAsync(string name, Func<JsonElement, Task> json)
-        {
-            name.ThrowIfNullOrEmpty(nameof(name));
-            json.ThrowIfNull(nameof(json));
-            bool any = false;
-
-            // Find the named object and action.
-            foreach (var ji in _json.Value.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.Object))
-            {
-                foreach (var jo in ji.EnumerateObject().Where(x => x.Name == name && x.Value.ValueKind == JsonValueKind.Array))
-                {
-                    foreach (var jd in jo.Value.EnumerateArray().Where(x => x.ValueKind == JsonValueKind.Object))
-                    {
-                        await json(jd).ConfigureAwait(false);
-                        any = true;
-                    }
-                }
-            }
-
-            return any;
-        }
-
-        /// <summary>
-        /// Deserialize the JSON replacing any dynamic parameters.
-        /// </summary>
-        private T? Deserialize<T>(JsonElement json)
-        {
-            using var ms = new MemoryStream();
-            using var jw = new Utf8JsonWriter(ms);
-
-            // Copy and replace JSON.
-            CopyAndReplace(json, jw);
-            jw.Flush();
-
-            // Deserialize the new JSON.
-            return _args.JsonSerializer.Deserialize<T>(new BinaryData(ms.ToArray()));
-        }
-
-        /// <summary>
-        /// Deserialize the JSON replacing any dynamic parameters.
-        /// </summary>
-        private object? Deserialize(Type type, JsonElement json)
-        {
-            using var ms = new MemoryStream();
-            using var jw = new Utf8JsonWriter(ms);
-
-            // Copy and replace JSON.
-            CopyAndReplace(json, jw);
-            jw.Flush();
-
-            // Deserialize the new JSON.
-            return _args.JsonSerializer.Deserialize(new BinaryData(ms.ToArray()), type);
-        }
-
-        /// <summary>
-        /// Copy existing and replace any dynamic parameters.
-        /// </summary>
-        private void CopyAndReplace(JsonElement je, Utf8JsonWriter jw)
-        {
-            switch (je.ValueKind)
-            {
-                case JsonValueKind.Array:
-                    jw.WriteStartArray();
-                    je.EnumerateArray().ForEach(j => CopyAndReplace(j, jw));
-                    jw.WriteEndArray();
-                    break;
-
-                case JsonValueKind.Object:
-                    jw.WriteStartObject();
-                    je.EnumerateObject().ForEach(j =>
-                    {
-                        jw.WritePropertyName(j.Name);
-                        CopyAndReplace(j.Value, jw);
-                    });
-
-                    jw.WriteEndObject();
-                    break;
-
-                case JsonValueKind.String:
-                    ReplaceDynamicParameter(je, jw);
-                    break;
-
-                default:
-                    je.WriteTo(jw);
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Replace any '^' placholders.
-        /// </summary>
-        private void ReplaceDynamicParameter(JsonElement je, Utf8JsonWriter jw)
-        {
-            var str = je.GetString();
-            if (!string.IsNullOrEmpty(str) && str.Length > 1 && str[0] == '^')
-            {
-                if (str.StartsWith("^(") && str.EndsWith(')'))
-                {
-                    var val = GetRuntimeValue(_args.Parameters, str[2..^1]);
-                    if (val == null)
-                    {
-                        jw.WriteNullValue();
-                        return;
-                    }
-
-                    switch (val)
-                    {
-                        case string sv: jw.WriteStringValue(sv); break;
-                        case Guid gv: jw.WriteStringValue(gv); break;
-                        case DateTime dv: jw.WriteStringValue(dv); break;
-                        case DateTimeOffset ov: jw.WriteStringValue(ov); break;
-#if NET7_0_OR_GREATER
-                        case DateOnly dv: jw.WriteStringValue(dv.ToString("yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture)); break;
-                        case TimeOnly tv: jw.WriteStringValue(tv.ToString("HH:mm:ss.FFFFFFF", System.Globalization.CultureInfo.InvariantCulture)); break;
-#endif
-                        case bool bv: jw.WriteBooleanValue(bv); break;
-                        case short nsv: jw.WriteNumberValue(nsv); break;
-                        case int niv: jw.WriteNumberValue(niv); break;
-                        case long nlv: jw.WriteNumberValue(nlv); break;
-                        case ushort nusv: jw.WriteNumberValue(nusv); break;
-                        case uint nuiv: jw.WriteNumberValue(nuiv); break;
-                        case ulong nulv: jw.WriteNumberValue(nulv); break;
-                        case decimal ndv: jw.WriteNumberValue(ndv); break;
-                        case double n2v: jw.WriteNumberValue(n2v); break;
-                        case float nfv: jw.WriteNumberValue(nfv); break;
-                        default: jw.WriteStringValue(val.ToString()); break;
-                    }
-
-                    return;
-                }
-                else if (_args.ReplaceShorthandGuids && int.TryParse(str[1..], out var i))
-                {
-                    jw.WriteStringValue(new Guid(i, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-                    return;
-                }
-            }
-
-            je.WriteTo(jw);
-        }
-
-        /// <summary>
-        /// Gets the runtime value for the specified key.
-        /// </summary>
-        public static object? GetRuntimeValue(IDictionary<string, object?> parameters, string key)
-        {
-            // Check against known values and runtime parameters.
-            if ((parameters.ThrowIfNull(nameof(parameters))).TryGetValue(key.ThrowIfNull(nameof(key)), out object? dval))
-                return dval;
-
-            // Try instantiating as defined.
-            var (val, msg) = GetSystemRuntimeValue(key);
-            if (msg == null)
-                return val;
-
-            // Try again adding the System namespace.
-            (val, msg) = GetSystemRuntimeValue("System." + key);
-            if (msg == null)
-                return val;
-
-            throw new ArgumentException(msg, nameof(key));
-        }
-
-        /// <summary>
-        /// Get the system runtime value.
-        /// </summary>
-        private static (object? value, string? message) GetSystemRuntimeValue(string param)
-        {
-            var ns = param.Split(",");
-            if (ns.Length > 2)
-                return (null, $"Runtime value parameter '{param}' is invalid; incorrect format.");
-
-            var parts = ns[0].Split(".");
-            if (parts.Length <= 1)
-                return (null, $"Runtime value parameter '{param}' is invalid; incorrect format.");
-
-            Type? type = null;
-            int i = parts.Length;
-            for (; i >= 0; i--)
-            {
-                if (ns.Length == 1)
-                    type = Type.GetType(string.Join('.', parts[0..^(parts.Length - i)]));
-                else
-                    type = Type.GetType(string.Join('.', parts[0..^(parts.Length - i)]) + "," + ns[1]);
-
-                if (type != null)
-                    break;
-            }
-
-            if (type == null)
-                return (null, $"Runtime value parameter '{param}' is invalid; no Type can be found.");
-
-            return GetSystemPropertyValue(param, type, null, parts[i..]);
-        }
-
-        /// <summary>
-        /// Recursively navigates the properties and values to discern the value.
-        /// </summary>
-        private static (object? value, string? message) GetSystemPropertyValue(string param, Type type, object? obj, string[] parts)
-        {
-            if (parts == null || parts.Length == 0)
-                return (obj, null);
-
-            var part = parts[0];
-            if (part.EndsWith("()"))
-            {
-                var mi = type.GetMethod(part[0..^2], []);
-                if (mi == null || mi.GetParameters().Length != 0)
-                    return (null, $"Runtime value parameter '{param}' is invalid; specified method '{part}' is invalid.");
-
-                return GetSystemPropertyValue(param, mi.ReturnType, mi.Invoke(obj, null), parts[1..]);
-            }
-            else
-            {
-                var pi = type.GetProperty(part);
-                if (pi == null || !pi.CanRead)
-                    return (null, $"Runtime value parameter '{param}' is invalid; specified property '{part}' is invalid.");
-
-                return GetSystemPropertyValue(param, pi.PropertyType, pi.GetValue(obj, null), parts[1..]);
-            }
-        }
-
-        /// <summary>
-        /// Prepare the <see cref="IReferenceData"/> value.
-        /// </summary>
-        private void PrepareReferenceData(Type type, object item, JsonElement json, int index)
-        {
-            if (item is not IReferenceData rd)
-                return;
-
-            if (rd.Code == null && rd.Text == null && json.EnumerateObject().Count() == 1)
-            {
-                var jp = json.EnumerateObject().Single();
-                if (jp.Value.ValueKind == JsonValueKind.String)
-                {
-                    rd.Code = jp.Name;
-                    rd.Text = jp.Value.GetString();
-                }
-            }
-
-            if (_args.RefDataColumnDefaults.Count == 0)
-                return;
-
-            var tr = TypeReflector.GetReflector(_typeReflectorArgs, type);
-            foreach (var rp in _args.RefDataColumnDefaults)
-            {
-                // Check json name and property name overrides.
-                var pr = tr.GetProperty(rp.Key);
-                if ((pr.JsonName != null && !json.TryGetProperty(pr.JsonName, out _)) && !json.TryGetProperty(pr.Name, out _))
-                {
-                    pr.PropertyExpression.SetValue(item, rp.Value(index));
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            if (_disposeDocument)
-                _jsonDocument.Dispose();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Data/JsonDataReaderArgs.cs b/src/CoreEx/Json/Data/JsonDataReaderArgs.cs
deleted file mode 100644
index f49a524c..00000000
--- a/src/CoreEx/Json/Data/JsonDataReaderArgs.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.RefData;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Json.Data
-{
-    /// <summary>
-    /// Represents the <see cref="JsonDataReader"/> arguments.
-    /// </summary>
-    public class JsonDataReaderArgs
-    {
-        /// <summary>
-        /// Gets the <c>UserName</c> <see cref="Parameters"/> key.
-        /// </summary>
-        public const string UserNameKey = "UserName";
-
-        /// <summary>
-        /// Gets the <c>DateTimeNow</c> <see cref="Parameters"/> key.
-        /// </summary>
-        public const string DateTimeNowKey = "DateTimeNow";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonDataReaderArgs"/> class.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>.</param>
-        /// <param name="username">The user name. Defaults to '<c><see cref="Environment.UserDomainName"/>\<see cref="Environment.UserName"/></c>'.</param>
-        /// <param name="dateTimeNow">The current <see cref="DateTime"/>. Defaults to <see cref="SystemTime.Timestamp"/>.</param>
-        /// <remarks>The <paramref name="jsonSerializer"/> defaults to a new <see cref="Text.Json.JsonSerializer"/> instance with a <see cref="Text.Json.NumberToStringConverter"/> added to the default <see cref="System.Text.Json.JsonSerializerOptions"/>
-        /// to support numbers specified as strings which YAML is more permissive with.</remarks>
-        public JsonDataReaderArgs(IJsonSerializer? jsonSerializer = null, string? username = null, DateTime? dateTimeNow = null)
-        {
-            Parameters.Add(UserNameKey, username ?? (Environment.UserDomainName == null ? Environment.UserName : $"{Environment.UserDomainName}\\{Environment.UserName}"));
-            Parameters.Add(DateTimeNowKey, dateTimeNow ?? SystemTime.Timestamp);
-
-            RefDataColumnDefaults.Add(nameof(IReferenceData.IsActive), _ => true);
-            RefDataColumnDefaults.Add(nameof(IReferenceData.SortOrder), i => i + 1);
-
-            if (jsonSerializer is null)
-            {
-                var jo = new System.Text.Json.JsonSerializerOptions(Text.Json.JsonSerializer.DefaultOptions);
-                jo.Converters.Add(new Text.Json.NumberToStringConverter());
-                JsonSerializer = new Text.Json.JsonSerializer(jo);
-            }
-            else
-                JsonSerializer = jsonSerializer;
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public IJsonSerializer JsonSerializer { get; }
-
-        /// <summary>
-        /// Indiates whether to replace '<c>^n</c>' values where '<c>n</c>' is an integer with a <see cref="Guid"/> equivalent; e.g. '<c>^1</c>' will be '<c>00000001-0000-0000-0000-000000000000</c>'
-        /// </summary>
-        public bool ReplaceShorthandGuids { get; set; } = true;
-
-        /// <summary>
-        /// Gets or sets the <see cref="IIdentifierGenerator"/>.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="IdentifierGenerator"/>.</remarks>
-        public IIdentifierGenerator? IdentifierGenerator { get; set; } = new IdentifierGenerator();
-
-        /// <summary>
-        /// Gets or sets the reference data property defaults dictionary.
-        /// </summary>
-        /// <remarks>The dictionary should contain the property name and corresponding function that returns the default value; the input to the function is the item index (zero-based).
-        /// <para>Defaults following properties:
-        /// <list type="bullet">
-        ///   <item><see cref="IReferenceData.IsActive"/> with function '<c>_ => true</c>' (always <c>true</c>).</item>
-        ///   <item><see cref="IReferenceData.SortOrder"/> with function '<c>i => i + 1</c>' (increment by 1 from 1).</item>
-        /// </list>
-        /// </para></remarks>
-        public Dictionary<string, Func<int, object?>> RefDataColumnDefaults { get; } = [];
-
-        /// <summary>
-        /// Gets the runtime parameters.
-        /// </summary>
-        public Dictionary<string, object?> Parameters { get; } = [];
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/IJsonPreFilterInspector.cs b/src/CoreEx/Json/IJsonPreFilterInspector.cs
deleted file mode 100644
index 6342ea8b..00000000
--- a/src/CoreEx/Json/IJsonPreFilterInspector.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Json
-{
-    /// <summary>
-    /// Defines pre (prior) to filtering JSON inspector.
-    /// </summary>
-    /// <remarks>Enables access to the serialized value before the filtering occurs.</remarks>
-    public interface IJsonPreFilterInspector
-    {
-        /// <summary>
-        /// Gets the underlying JSON object (as per the underlying <see cref="IJsonSerializer"/> implementation).
-        /// </summary>
-        object Json { get; }
-
-        /// <summary>
-        /// Returns the JSON string.
-        /// </summary>
-        /// <returns>The JSON string.</returns>
-        string? ToJsonString();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/IJsonSerializer.cs b/src/CoreEx/Json/IJsonSerializer.cs
deleted file mode 100644
index 2edd92e1..00000000
--- a/src/CoreEx/Json/IJsonSerializer.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace CoreEx.Json
-{
-    /// <summary>
-    /// Provides the core (common) JSON Serialize and Deserialize capabilities.
-    /// </summary>
-    public interface IJsonSerializer
-    {
-        /// <summary>
-        /// Gets the underlying serializer configuration settings/options.
-        /// </summary>
-        object Options { get; }
-
-        /// <summary>
-        /// Serialize the <paramref name="value"/> to a JSON <see cref="string"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to serialize.</param>
-        /// <param name="format">Where specified overrides the serialization write formatting.</param>
-        /// <returns>The JSON <see cref="string"/>.</returns>
-        string Serialize<T>(T value, JsonWriteFormat? format = null);
-
-        /// <summary>
-        /// Serialize the <paramref name="value"/> to a JSON <see cref="BinaryData"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to serialize.</param>
-        /// <param name="format">Where specified overrides the serialization write formatting.</param>
-        /// <returns>The JSON <see cref="BinaryData"/>.</returns>
-        BinaryData SerializeToBinaryData<T>(T value, JsonWriteFormat? format = null);
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="string"/> to an underlying JSON object.
-        /// </summary>
-        /// <param name="json">The JSON <see cref="string"/>.</param>
-        /// <returns>The JSON object (as per the underlying implementation).</returns>
-#if NET7_0_OR_GREATER
-        object? Deserialize([StringSyntax(StringSyntaxAttribute.Json)] string json);
-#else
-        object? Deserialize(string json);
-#endif
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="string"/> to the specified <paramref name="type"/>.
-        /// </summary>
-        /// <param name="json">The JSON <see cref="string"/>.</param>
-        /// <param name="type">The <see cref="Type"/> to convert to.</param>
-        /// <returns>The corresponding typed value.</returns>
-#if NET7_0_OR_GREATER
-        object? Deserialize([StringSyntax(StringSyntaxAttribute.Json)] string json, Type type);
-#else
-        object? Deserialize(string json, Type type);
-#endif
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="string"/> to the <see cref="Type"/> of <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to convert to.</typeparam>
-        /// <param name="json">The JSON <see cref="string"/>.</param>
-        /// <returns>The corresponding typed value.</returns>
-#if NET7_0_OR_GREATER
-        T? Deserialize<T>([StringSyntax(StringSyntaxAttribute.Json)] string json);
-#else
-        T? Deserialize<T>(string json);
-#endif
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="BinaryData"/> to an underlying JSON object.
-        /// </summary>
-        /// <param name="json">The JSON <see cref="BinaryData"/>.</param>
-        /// <returns>The JSON object (as per the underlying implementation).</returns>
-        object? Deserialize(BinaryData json);
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="BinaryData"/> to the specified <paramref name="type"/>.
-        /// </summary>
-        /// <param name="json">The JSON <see cref="BinaryData"/>.</param>
-        /// <param name="type">The <see cref="Type"/> to convert to.</param>
-        /// <returns>The corresponding typed value.</returns>
-        object? Deserialize(BinaryData json, Type type);
-
-        /// <summary>
-        /// Deserialize the JSON <see cref="BinaryData"/> to the <see cref="Type"/> of <typeparamref name="T"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Type"/> to convert to.</typeparam>
-        /// <param name="json">The JSON <see cref="BinaryData"/>.</param>
-        /// <returns>The corresponding typed value.</returns>
-        T? Deserialize<T>(BinaryData json);
-
-        /// <summary>
-        /// Trys to apply the JSON property <paramref name="filter"/> (using JSON <paramref name="names"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="names">The list of JSON property names to <paramref name="filter"/>.</param>
-        /// <param name="json">The corresponding JSON <paramref name="value"/> <see cref="string"/> with the filtering applied.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="comparison">The names <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <param name="preFilterInspector">The <see cref="IJsonPreFilterInspector"/> action.</param>
-        /// <returns><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</returns>
-        bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out string json, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null);
-
-        /// <summary>
-        /// Trys to apply the JSON property <paramref name="filter"/> (using JSON <paramref name="names"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="names">The list of JSON property names to <paramref name="filter"/>.</param>
-        /// <param name="json">The corresponding <paramref name="value"/> JSON object (as per the underlying implementation) with the filtering applied.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="comparison">The names <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <param name="preFilterInspector">The <see cref="IJsonPreFilterInspector"/> action.</param>
-        /// <returns><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</returns>
-        bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out object json, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null);
-
-        /// <summary>
-        /// Trys and gets the corresponding JSON name for the <paramref name="memberInfo"/>.
-        /// </summary>
-        /// <param name="memberInfo">The <see cref="MemberInfo"/></param>
-        /// <param name="jsonName">The JSON name where underlying JSON attribute is defined or not; <c>null</c> where not serializable.</param>
-        /// <returns><c>true</c> indicates that the property is considered serializable; otherwise, <c>false</c>.</returns>
-        bool TryGetJsonName(MemberInfo memberInfo, [NotNullWhen(true)] out string? jsonName);
-
-        /// <summary>
-        /// Serialize the <paramref name="value"/> to a JSON <see cref="string"/> using the specified <see cref="JsonPropertyFilter.Include"/> property <paramref name="names"/> filter (<see cref="StringComparison.OrdinalIgnoreCase"/>).
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to serialize.</param>
-        /// <param name="names">The list of JSON property names to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <returns>The JSON <see cref="string"/>.</returns>
-        /// <remarks>This is a wrapper for <see cref="TryApplyFilter{T}(T, IEnumerable{string}?, out string, JsonPropertyFilter, StringComparison, Action{IJsonPreFilterInspector}?)"/>.</remarks>
-        public string SerializeWithIncludeFilter<T>(T value, params string[] names)
-        {
-            TryApplyFilter(value, names, out string json, JsonPropertyFilter.Include, StringComparison.OrdinalIgnoreCase);
-            return json;
-        }
-
-        /// <summary>
-        /// Serialize the <paramref name="value"/> to a JSON <see cref="string"/> using the specified <see cref="JsonPropertyFilter.Include"/> property <paramref name="names"/> filter (<see cref="StringComparison.OrdinalIgnoreCase"/>).
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to serialize.</param>
-        /// <param name="names">The list of JSON property names to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <returns>The JSON <see cref="string"/>.</returns>
-        /// <remarks>This is a wrapper for <see cref="TryApplyFilter{T}(T, IEnumerable{string}?, out string, JsonPropertyFilter, StringComparison, Action{IJsonPreFilterInspector}?)"/>.</remarks>
-        public string SerializeWithExcludeFilter<T>(T value, params string[] names)
-        {
-            TryApplyFilter(value, names, out string json, JsonPropertyFilter.Exclude, StringComparison.OrdinalIgnoreCase);
-            return json;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/IReferenceDataContentJsonSerializer.cs b/src/CoreEx/Json/IReferenceDataContentJsonSerializer.cs
deleted file mode 100644
index 1c184324..00000000
--- a/src/CoreEx/Json/IReferenceDataContentJsonSerializer.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-
-namespace CoreEx.Json
-{
-    /// <summary>
-    /// Provides the JSON Serialize and Deserialize capabilities to allow <see cref="IReferenceData"/> types to serialize contents.
-    /// </summary>
-    /// <remarks>Generally, <see cref="IReferenceData"/> types will serialize the <see cref="IReferenceData.Code"/> as the value; this allows for full <see cref="IReferenceData"/> contents to be serialized.</remarks>
-    public interface IReferenceDataContentJsonSerializer : IJsonSerializer { }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonDataMapConverterFactory.cs b/src/CoreEx/Json/JsonDataMapConverterFactory.cs
new file mode 100644
index 00000000..2cd86527
--- /dev/null
+++ b/src/CoreEx/Json/JsonDataMapConverterFactory.cs
@@ -0,0 +1,58 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides a generic JSON converter factory for <see cref="DataMap{TValue}"/> types that preserves the original casing of the underlying keys.
+/// </summary>
+public class JsonDataMapConverterFactory : JsonConverterFactory
+{
+    /// <inheritdoc/>
+    public override bool CanConvert(Type typeToConvert)
+    {
+        if (!typeToConvert.IsGenericType)
+            return false;
+
+        var genericType = typeToConvert.GetGenericTypeDefinition();
+        return genericType == typeof(DataMap<>);
+    }
+
+    /// <inheritdoc/>
+    public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    {
+        var valueType = typeToConvert.GetGenericArguments()[0];
+        var converterType = typeof(JsonDataMapConverter<>).MakeGenericType(valueType);
+        return (JsonConverter?)Activator.CreateInstance(converterType);
+    }
+
+    /// <summary>
+    /// Provides the JSON converter for <see cref="DataMap{TValue}"/> types, which handles the serialization and deserialization of the dictionary while preserving the original casing of the keys.
+    /// </summary>
+    private sealed class JsonDataMapConverter<TValue> : JsonConverter<DataMap<TValue>>
+    {
+        /// <inheritdoc/>
+        public override DataMap<TValue>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var dict = JsonSerializer.Deserialize<IDictionary<string, TValue>>(ref reader, options);
+            return dict is null ? null : new(dict);
+        }
+
+        /// <inheritdoc/>
+        public override void Write(Utf8JsonWriter writer, DataMap<TValue> value, JsonSerializerOptions options)
+        {
+            if (value == null)
+            {
+                writer.WriteNullValue();
+                return;
+            }
+
+            writer.WriteStartObject();
+
+            foreach (var kvp in value)
+            {
+                writer.WritePropertyName(kvp.Key);
+                JsonSerializer.Serialize(writer, kvp.Value, options);
+            }
+
+            writer.WriteEndObject();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonDefaults.cs b/src/CoreEx/Json/JsonDefaults.cs
new file mode 100644
index 00000000..902c61f0
--- /dev/null
+++ b/src/CoreEx/Json/JsonDefaults.cs
@@ -0,0 +1,49 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides <see cref="System.Text.Json"/> defaults; such as the primary <see cref="Configuration"/> and runtime <see cref="SerializerOptions"/> accessor.
+/// </summary>
+public class JsonDefaults
+{
+    /// <summary>
+    /// Gets the default <see cref="JsonDefaultConfiguration"/>.
+    /// </summary>
+    /// <remarks>Use this property to customize the default behaviors for JSON serialization throughout the application.</remarks>
+    public static JsonDefaultConfiguration Configuration { get; } = new();
+
+    /// <summary>
+    /// Gets the current <see cref="JsonSerializerOptions"/> from the <see cref="ExecutionContext"/> where found; otherwise, the references the <see cref="Configuration"/> instance.
+    /// </summary>
+    /// <remarks>Do not make changes to the underlying <see cref="JsonSerializerOptions"/> via this method as the instance may vary at runtime; changes should be made via <see cref="Configuration"/>
+    /// or during service registration at application startup.</remarks>
+    public static JsonSerializerOptions SerializerOptions => ExecutionContext.GetService<JsonSerializerOptions>() ?? Configuration.SerializerOptions;
+
+    /// <summary>
+    /// Provides the default JSON configuration settings for the application, which can be customized as needed. 
+    /// </summary>
+    /// <remarks>This encapsulates the default <see cref="JsonSerializerOptions"/> and allows for centralized management of JSON serialization settings.</remarks>
+    public sealed class JsonDefaultConfiguration
+    {
+        private readonly JsonSubstituteNamingPolicy _jsonSubstituteNamingPolicy = new();
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonDefaultConfiguration"/> class with <see cref="CoreEx"/> default settings.
+        /// </summary>
+        public JsonDefaultConfiguration()
+        {
+            SerializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web)
+            {
+                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
+                WriteIndented = false, 
+                PropertyNamingPolicy = _jsonSubstituteNamingPolicy,
+                DictionaryKeyPolicy = _jsonSubstituteNamingPolicy,
+                Converters = { new JsonStringEnumConverter(), new JsonReferenceDataConverter(), new JsonResultConverter(), new JsonDataMapConverterFactory() }
+            };
+        }
+
+        /// <summary>
+        /// Gets or sets the default <see cref="JsonSerializerOptions"/> configuration.
+        /// </summary>
+        public JsonSerializerOptions SerializerOptions { get; set => field = value.ThrowIfNull(); }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonExceptionConverterFactory.cs b/src/CoreEx/Json/JsonExceptionConverterFactory.cs
new file mode 100644
index 00000000..be38b9da
--- /dev/null
+++ b/src/CoreEx/Json/JsonExceptionConverterFactory.cs
@@ -0,0 +1,53 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides a generic JSON converter factory for <see cref="Exception"/> types.
+/// </summary>
+public class JsonExceptionConverterFactory : JsonConverterFactory
+{
+    /// <inheritdoc/>
+    public override bool CanConvert(Type typeToConvert) => typeof(Exception).IsAssignableFrom(typeToConvert);
+
+    /// <inheritdoc/>
+    public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        => (JsonConverter)Activator.CreateInstance(typeof(JsonExceptionConverter<>).MakeGenericType(typeToConvert))!;
+
+    /// <summary>
+    /// Provides a reflection-based JSON converter for <see cref="Exception"/> types.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
+    private sealed class JsonExceptionConverter<TException> : JsonConverter<TException> where TException : Exception
+    {
+        /// <inheritdoc/>
+        public override TException? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotSupportedException();
+
+        /// <inheritdoc/>
+        public override void Write(Utf8JsonWriter writer, TException value, JsonSerializerOptions options)
+        {
+            var serializableProperties = value.GetType().GetProperties()
+                .Select(uu => new 
+                { 
+                    uu.Name,
+                    Value = uu.GetValue(value),
+                    Ignore = uu.GetCustomAttribute<JsonIgnoreAttribute>(),
+                    JsonName = uu.GetCustomAttribute<JsonPropertyNameAttribute>()?.Name 
+                })
+                .Where(uu => uu.Ignore is not null && uu.Name != nameof(Exception.TargetSite));
+
+            if (options?.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingNull)
+                serializableProperties = serializableProperties.Where(uu => uu.Value is not null);
+
+            if (serializableProperties.Any())
+            {
+                writer.WriteStartObject();
+                foreach (var prop in serializableProperties)
+                {
+                    writer.WritePropertyName(prop.JsonName ?? options?.PropertyNamingPolicy?.ConvertName(prop.Name) ?? prop.Name);
+                    JsonSerializer.Serialize(writer, prop.Value, options);
+                }
+
+                writer.WriteEndObject();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonFilter.cs b/src/CoreEx/Json/JsonFilter.cs
new file mode 100644
index 00000000..442f2821
--- /dev/null
+++ b/src/CoreEx/Json/JsonFilter.cs
@@ -0,0 +1,422 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides a means to apply a filter to include or exclude JSON properties (in effect removing the unwanted properties).
+/// </summary>
+/// <remarks>The JSON path matching is exact (other than specified <see cref="StringComparison"/>) in that the path matches with no indexing or fully indexed; i.e. no mixing is supported. For example, a JSON path of 
+/// '<c>$.projects[0].technologies[1]</c>' will only match based on a filter of either '<c>$.projects[0].technologies[1]</c>' (fully indexed) or '<c>$.projects.technologies</c>' (no indexing); not on 
+/// '<c>$.projects.technologies[1]</c>' (mixed). Property names that contain special characters such as dots may be specified using bracket notation, e.g. <c>$.entries['stackExchange.Redis']</c> or
+/// <c>$.entries["stackExchange.Redis"]</c>. Note that the '<c>$.</c>' JSON path prefix for the filter is optional.</remarks>
+public static partial class JsonFilter
+{
+    private static readonly Regex _regex = IndexesRegex();
+
+    /// <summary>
+    /// Gets the standard JSON root path.
+    /// </summary>
+    public const string JsonRootPath = "$";
+
+    /// <summary>
+    /// Prepends the JSON <paramref name="path"/> with the <see cref="JsonRootPath"/> where not already present.
+    /// </summary>
+    /// <param name="path">The JSON path.</param>
+    /// <returns>The resulting JSON path.</returns>
+    public static string PrependRootPath(string path) => string.IsNullOrEmpty(path) ? JsonRootPath : (!path.StartsWith(JsonRootPath) ? (path.StartsWith('[') ? $"{JsonRootPath}{path}" : $"{JsonRootPath}.{path}") : path);
+
+    /// <summary>
+    /// Removes all numeric (integer) array indexes from the specified <paramref name="input"/> JSON path; bracket-notation string property names (e.g. <c>['name']</c>) are preserved.
+    /// </summary>
+    /// <param name="input">The input JSON path.</param>
+    /// <param name="path">The resulting JSON path.</param>
+    /// <returns><see langword="true"/> indicates indexes were removed; otherwise, <see langword="false"/>.</returns>
+    public static bool TryRemovePathIndexes(string input, out string path)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            path = input;
+            return false;
+        }
+
+        path = _regex.Replace(input, string.Empty);
+        return path.Length != input.Length;
+    }
+
+    /// <summary>
+    /// Tries to apply the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a JSON <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
+    /// </summary>
+    /// <param name="value">The JSON value.</param>
+    /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
+    /// <param name="json">The corresponding JSON <paramref name="value"/> <see cref="string"/> with the filtering applied.</param>
+    /// <param name="filter">The <see cref="JsonFilterOption"/>; defaults to <see cref="JsonFilterOption.Include"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
+    /// <returns><see langword="true"/> indicates that at least one JSON node was filtered (removed); otherwise, <see langword="false"/> for no changes.</returns>
+    public static bool TryJsonFilter([StringSyntax(StringSyntaxAttribute.Json)] string value, IEnumerable<string>? paths, out string json, JsonFilterOption filter = JsonFilterOption.Include, JsonSerializerOptions? jsonSerializerOptions = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
+    {
+        var j = JsonNode.Parse(value.ThrowIfNull())!;
+        var r = Filter(j, paths, filter, comparison);
+        json = j?.ToJsonString(jsonSerializerOptions ?? JsonDefaults.SerializerOptions) ?? "null";
+        return r;
+    }
+
+    /// <summary>
+    /// Tries to apply the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
+    /// <param name="json">The corresponding JSON <paramref name="value"/> <see cref="string"/> with the filtering applied.</param>
+    /// <param name="filter">The <see cref="JsonFilterOption"/>; defaults to <see cref="JsonFilterOption.Include"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
+    /// <returns><see langword="true"/> indicates that at least one JSON node was filtered (removed); otherwise, <see langword="false"/> for no changes.</returns>
+    public static bool TryFilter<T>(T value, IEnumerable<string>? paths, out string json, JsonFilterOption filter = JsonFilterOption.Include, JsonSerializerOptions? jsonSerializerOptions = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
+    {
+        var r = TryFilter(value, paths, out JsonNode node, filter, jsonSerializerOptions, comparison);
+        json = node?.ToJsonString(jsonSerializerOptions ?? JsonDefaults.SerializerOptions) ?? "null";
+        return r;
+    }
+
+    /// <summary>
+    /// Tries to apply the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
+    /// <param name="json">The corresponding <paramref name="value"/> <see cref="JsonNode"/> with the filtering applied.</param>
+    /// <param name="filter">The <see cref="JsonFilterOption"/>; defaults to <see cref="JsonFilterOption.Include"/>.</param>
+    /// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
+    /// <returns><see langword="true"/> indicates that at least one JSON node was filtered (removed); otherwise, <see langword="false"/> for no changes.</returns>
+    public static bool TryFilter<T>(T value, IEnumerable<string>? paths, out JsonNode json, JsonFilterOption filter = JsonFilterOption.Include, JsonSerializerOptions? jsonSerializerOptions = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
+    {
+        json = JsonSerializer.SerializeToNode(value, jsonSerializerOptions ?? JsonDefaults.SerializerOptions)!;
+        return Filter(json, paths, filter, comparison);
+    }
+
+    /// <summary>
+    /// Applies the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a specified <see cref="JsonNode"/>.
+    /// </summary>
+    /// <param name="json">The <see cref="JsonNode"/> value.</param>
+    /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
+    /// <param name="filter">The <see cref="JsonFilterOption"/>; defaults to <see cref="JsonFilterOption.Include"/>.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
+    /// <remarks><see langword="true"/> indicates that at least one JSON node was filtered (removed); otherwise, <see langword="false"/> for no changes.</remarks>
+    public static bool Filter(JsonNode json, IEnumerable<string>? paths, JsonFilterOption filter = JsonFilterOption.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
+    {
+        if (json is null)
+            return false;
+
+        var maxDepth = 0;
+        var dict = CreateDictionary(paths, filter, comparison, ref maxDepth, true);
+        var args = new JsonFilterArgs { MaxDepth = maxDepth, Paths = dict };
+
+        if (filter == JsonFilterOption.Include)
+            FilterInclude(json, args);
+        else if (maxDepth > 0)
+            FilterExclude(json, args, 1);
+
+        return args.IsFiltered;
+    }
+
+    /// <summary>
+    /// Gets the first <see cref="JsonNode"/> that matches the JSON <paramref name="path"/> from within the specified <see cref="JsonNode"/>.
+    /// </summary>
+    /// <param name="json">The <see cref="JsonNode"/> value.</param>
+    /// <param name="path">The JSON path to match.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
+    /// <returns>The first matched <see cref="JsonNode"/> where found; otherwise, <see langword="null"/>.</returns>
+    public static JsonNode? GetMatched(JsonNode json, string path, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
+    {
+        var maxDepth = 0;
+        var dict = CreateDictionary([path.ThrowIfNullOrEmpty()], JsonFilterOption.Include, comparison, ref maxDepth, true);
+        var args = new JsonFilterArgs { MaxDepth = maxDepth, Paths = dict };
+
+        FilterInclude(json, args);
+        return args.MatchedNode;
+    }
+
+    /// <summary>
+    /// Create a <see cref="Dictionary{TKey, TValue}"/> from the <paramref name="paths"/> and expands list with intermediary paths where <paramref name="filter"/> is <see cref="JsonFilterOption.Include"/>.
+    /// </summary>
+    /// <param name="paths">The list of JSON paths.</param>
+    /// <param name="filter">The <see cref="JsonFilterOption"/>.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>.</param>
+    /// <param name="maxDepth">The maximum hierarchy depth for all specified <paramref name="paths"/>.</param>
+    /// <returns>The <see cref="Dictionary{TKey, TValue}"/>.</returns>
+    /// <remarks>Where the <see cref="bool"/> is <see langword="true"/> this indicates the specified path; versus, <see langword="false"/> that indicates an intermediary path.</remarks>
+    public static Dictionary<string, bool> CreateDictionary(IEnumerable<string>? paths, JsonFilterOption filter, StringComparison comparison, ref int maxDepth)
+        => CreateDictionary(paths, filter, comparison, ref maxDepth, false);
+
+    /// <summary>
+    /// Create a <see cref="Dictionary{TKey, TValue}"/> from the <paramref name="paths"/> and expands list with intermediary paths where <paramref name="filter"/> is <see cref="JsonFilterOption.Include"/>.
+    /// </summary>
+    /// <param name="paths">The list of JSON paths.</param>
+    /// <param name="filter">The <see cref="JsonFilterOption"/>.</param>
+    /// <param name="comparison">The paths <see cref="StringComparison"/>.</param>
+    /// <param name="maxDepth">The maximum hierarchy depth for all specified  <paramref name="paths"/>.</param>
+    /// <param name="prependRootPath">Indicates whether to prepend the <see cref="JsonRootPath"/> to each path.</param>
+    /// <returns>The <see cref="Dictionary{TKey, TValue}"/>.</returns>
+    /// <remarks>Where the <see cref="bool"/> is <see langword="true"/> this indicates the specified path; versus, <see langword="false"/> that indicates an intermediary path.</remarks>
+    private static Dictionary<string, bool> CreateDictionary(IEnumerable<string>? paths, JsonFilterOption filter, StringComparison comparison, ref int maxDepth, bool prependRootPath)
+    {
+        var dict = new Dictionary<string, bool>(StringComparer.FromComparison(comparison));
+        paths ??= [];
+
+        // Add each 'specified' path.
+        foreach (var path in paths)
+        {
+            var normalized = NormalizeDoubleQuoteBrackets(prependRootPath ? PrependRootPath(path) : path);
+            dict.TryAdd(normalized, true);
+        }
+
+        // Add each 'intermediary' path where applicable.
+        if (filter == JsonFilterOption.Include)
+        {
+            foreach (var kvp in dict.ToArray())
+            {
+                var depth = 0;
+                foreach (var segment in GetCumulativeSegments(kvp.Key))
+                {
+                    dict.TryAdd(segment, false);
+                    maxDepth = Math.Max(maxDepth, ++depth);
+                }
+
+                if (TryRemovePathIndexes(kvp.Key, out var indexless))
+                {
+                    foreach (var segment in GetCumulativeSegments(indexless))
+                        dict.TryAdd(segment, false);
+                }
+            }
+
+            foreach (var kvp in dict.ToArray())
+            {
+                if (dict.Keys.Any(x => !x.Equals(kvp.Key, comparison) && x.StartsWith(kvp.Key, comparison)))
+                    dict[kvp.Key] = false;
+            }
+        }
+        else
+            maxDepth = Math.Max(maxDepth, dict.Count == 0 ? 0 : dict.Max(x => GetCumulativeSegments(x.Key).Count()));
+
+        return dict;
+    }
+
+    /// <summary>
+    /// Recursively filters the JSON <paramref name="json"/> based on the specified <paramref name="args"/> and results in true where should be excluded (removed).
+    /// This is used for the <see cref="JsonFilterOption.Include"/> option.
+    /// </summary>
+    private static bool FilterInclude(JsonNode json, JsonFilterArgs args)
+    {
+        var path = json.GetPath();
+        if (args.Paths.TryGetValue(path, out var isSpecifiedPath))
+        {
+            if (isSpecifiedPath)
+            {
+                args.MatchedNode = json;
+                return false;
+            }
+        }
+        else
+        {
+            if (TryRemovePathIndexes(path, out var pathWithoutIndexes))
+            {
+                if (args.Paths.TryGetValue(pathWithoutIndexes, out isSpecifiedPath) && isSpecifiedPath)
+                {
+                    args.MatchedNode = json;
+                    return false;
+                }
+            }
+            else
+                return true;
+        }
+
+        if (json is JsonObject jo)
+        {
+            foreach (var jn in jo.ToArray())
+            {
+                if (FilterInclude(jn.Value ?? throw new InvalidOperationException(), args))
+                {
+                    jo.Remove(jn.Key);
+                    args.IsFiltered = true;
+                }
+                else
+                    isSpecifiedPath = true;
+            }
+        }
+        else if (json is JsonArray ja)
+        {
+            for (var i = ja.Count - 1; i >= 0; i--)
+            {
+                var jn = ja[i]!;
+                if (FilterInclude(jn, args))
+                {
+                    ja.RemoveAt(i);
+                    args.IsFiltered = true;
+                }
+                else
+                    isSpecifiedPath = true;
+            }
+        }
+
+        return !isSpecifiedPath;
+    }
+
+    /// <summary>
+    /// Recursively filters the JSON <paramref name="json"/> based on the specified <paramref name="args"/> and results in true where should be excluded (removed).
+    /// This is used for the <see cref="JsonFilterOption.Exclude"/> option.
+    /// </summary>
+    private static bool FilterExclude(JsonNode json, JsonFilterArgs args, int depth)
+    {
+        if (depth > args.MaxDepth)
+            return false;
+
+        var path = json.GetPath();
+        if (args.Paths.TryGetValue(path, out var isSpecifiedPath))
+        {
+            if (isSpecifiedPath)
+                return true;
+        }
+        else
+        {
+            if (TryRemovePathIndexes(path, out var pathWithoutIndexes))
+            {
+                if (args.Paths.TryGetValue(pathWithoutIndexes, out isSpecifiedPath) && isSpecifiedPath)
+                    return true;
+            }
+        }
+
+        if (json is JsonObject jo)
+        {
+            depth++;
+            foreach (var jn in jo.ToArray())
+            {
+                if (FilterExclude(jn.Value ?? throw new InvalidOperationException(), args, depth))
+                {
+                    jo.Remove(jn.Key);
+                    args.IsFiltered = true;
+                }
+            }
+        }
+        else if (json is JsonArray ja)
+        {
+            for (var i = ja.Count - 1; i >= 0; i--)
+            {
+                var jn = ja[i]!;
+                if (FilterExclude(jn, args, depth))
+                {
+                    ja.RemoveAt(i);
+                    args.IsFiltered = true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Provides the generated <see cref="Regex"/> for <see cref="TryRemovePathIndexes"/>.
+    /// </summary>
+    [GeneratedRegex(@"\[\d+\]", RegexOptions.Compiled)]
+    private static partial Regex IndexesRegex();
+
+    /// <summary>
+    /// Yields the cumulative path prefix after each token in <paramref name="path"/>, correctly handling bracket-notation
+    /// string properties (e.g. <c>['name']</c>, <c>["name"]</c>) as well as numeric array indexes (e.g. <c>[0]</c>) and
+    /// standard dot-notation properties.
+    /// </summary>
+    /// <remarks>
+    /// For example, <c>$.entries['stackExchange.Redis'].enabled</c> yields:
+    /// <c>$</c>, <c>$.entries</c>, <c>$.entries['stackExchange.Redis']</c>, <c>$.entries['stackExchange.Redis'].enabled</c>.
+    /// </remarks>
+    private static IEnumerable<string> GetCumulativeSegments(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+            yield break;
+
+        var sb = new StringBuilder();
+        var i = 0;
+
+        while (i < path.Length)
+        {
+            var c = path[i];
+
+            if (c == '[')
+            {
+                // Bracket token: ['name'], ["name"], or [N] — consume up to and including the closing ].
+                var start = i++;
+                if (i < path.Length && (path[i] == '\'' || path[i] == '"'))
+                {
+                    var quote = path[i++];
+                    while (i < path.Length && path[i] != quote)
+                        i++;
+                    if (i < path.Length) i++; // skip closing quote
+                }
+                else
+                {
+                    while (i < path.Length && path[i] != ']')
+                        i++;
+                }
+                if (i < path.Length) i++; // skip ']'
+                sb.Append(path, start, i - start);
+                yield return sb.ToString();
+            }
+            else if (c == '.' && sb.Length > 0)
+            {
+                // Dot-notation segment: consume '.' plus all chars up to the next '.' or '['.
+                var start = i++;
+                while (i < path.Length && path[i] != '.' && path[i] != '[')
+                    i++;
+                sb.Append(path, start, i - start);
+                yield return sb.ToString();
+            }
+            else
+            {
+                // Dollar root (or any leading non-dot/non-bracket chars).
+                while (i < path.Length && path[i] != '.' && path[i] != '[')
+                    sb.Append(path[i++]);
+                yield return sb.ToString();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Normalizes double-quote bracket-notation property segments to single-quote form so that user-supplied filter paths
+    /// match the single-quote output of <see cref="JsonNode.GetPath"/>. For example, <c>$.a["b.c"]</c> becomes <c>$.a['b.c']</c>.
+    /// </summary>
+    private static string NormalizeDoubleQuoteBrackets(string path) =>
+        path.Contains("[\"", StringComparison.Ordinal)
+            ? DoubleQuoteBracketsRegex().Replace(path, static m => $"['{m.Groups[1].Value}']")
+            : path;
+
+    /// <summary>
+    /// Provides the generated <see cref="Regex"/> for <see cref="NormalizeDoubleQuoteBrackets"/>.
+    /// </summary>
+    [GeneratedRegex(@"\[""([^""]*)""\]", RegexOptions.Compiled)]
+    private static partial Regex DoubleQuoteBracketsRegex();
+
+    /// <summary>
+    /// Represents the internal arguments for the JSON filter state.
+    /// </summary>
+    private sealed class JsonFilterArgs
+    {
+        /// <summary>
+        /// Gets the selected JSON paths to include/exclude.
+        /// </summary>
+        public required Dictionary<string, bool> Paths { get; init; }
+
+        /// <summary>
+        /// Gets the maximum depth of the JSON hierarchy of the <see cref="Paths"/> specified.
+        /// </summary>
+        public int MaxDepth { get; init; } = 0;
+
+        /// <summary>
+        /// Indicates whether a filter took place; i.e. there was at least one JSON node removed.
+        /// </summary>
+        public bool IsFiltered { get; set; }
+
+        /// <summary>
+        /// Gets or sets the last fully matched JSON node for am <see cref="JsonFilterOption.Include"/>.
+        /// </summary>
+        public JsonNode? MatchedNode { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonFilterOption.cs b/src/CoreEx/Json/JsonFilterOption.cs
new file mode 100644
index 00000000..c40e4cf6
--- /dev/null
+++ b/src/CoreEx/Json/JsonFilterOption.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Defines the JSON filter option (either to <see cref="Include"/> or <see cref="Exclude"/> the specified paths) for the <see cref="JsonFilter"/>.
+/// </summary>
+public enum JsonFilterOption
+{
+    /// <summary>
+    /// Indicates whether to <i>include</i> only those property paths that have been specified.
+    /// </summary>
+    Include,
+
+    /// <summary>
+    /// Indicates whether to <i>exclude</i> those property paths that have been specified.
+    /// </summary>
+    Exclude
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonMergePatch.cs b/src/CoreEx/Json/JsonMergePatch.cs
new file mode 100644
index 00000000..d7bbb595
--- /dev/null
+++ b/src/CoreEx/Json/JsonMergePatch.cs
@@ -0,0 +1,385 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides a JSON Merge Patch ('<c>application/merge-patch+json</c>') whereby the contents of a JSON document are merged into an existing JSON document resulting in a new merged JSON document as per <see href="https://tools.ietf.org/html/rfc7396"/>.
+/// </summary>
+/// <param name="options">The optional <see cref="JsonMergePatchOptions"/>.</param>
+/// <remarks><i>Note:</i> The formal specification <see href="https://tools.ietf.org/html/rfc7396"/> explicitly states that an <see cref="JsonValueKind.Array"/> is to be a replacement operation. Additionally, <see langword="null"/>
+/// values in the merge patch are given special meaning to indicate the removal of existing values in the target.</remarks>
+public sealed class JsonMergePatch(JsonMergePatchOptions? options = null)
+{
+    /// <summary>
+    /// Gets the <see cref="JsonMergePatchOptions"/>.
+    /// </summary>
+    public JsonMergePatchOptions Options { get; } = options ?? new JsonMergePatchOptions();
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> content into the <paramref name="target"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="target">The target to merge into.</param>
+    /// <returns>The <see cref="JsonMergePatchResult{T}"/> <see cref="Result{T}"/>.</returns>
+    public Result<JsonMergePatchResult<T>> Merge<T>([StringSyntax(StringSyntaxAttribute.Json)] string patch, T target) => Merge(new BinaryData(patch.ThrowIfNull()), target);
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> content into the <paramref name="target"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="target">The target to merge into.</param>
+    /// <returns>The <see cref="JsonMergePatchResult{T}"/> <see cref="Result{T}"/>.</returns>
+    public Result<JsonMergePatchResult<T>> Merge<T>(BinaryData patch, T target)
+    {
+        // Parse ensuring the JSON is valid for the type and can be navigated before attempting merge.
+        if (!TryParseJson<T>(patch.ThrowIfNull(), out var r))
+            return r;
+
+        // No merge will occur when the target is null.
+        if (target is null)
+            return new JsonMergePatchResult<T>();
+
+        // Perform the merge patch.
+        return MergePatch(patch, target);
+    }
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> content into the value returned by the <paramref name="getTarget"/> function.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="getTarget">The function to get the target to merge into.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="JsonMergePatchResult{T}"/> <see cref="Result{T}"/>.</returns>
+    /// <remarks>Provides the opportunity to validate the JSON before getting the value where this execution order is important; i.e. get operation is expensive (latency). A <paramref name="getTarget"/> that returns <see langword="null"/>
+    /// will immediately exit without performing any merge.</remarks>
+    public Task<Result<JsonMergePatchResult<T>>> MergeAsync<T>(BinaryData patch, Func<CancellationToken, Task<T?>> getTarget, CancellationToken cancellationToken = default)
+        => MergeWithResultAsync(patch, async ct => Result.Ok(await getTarget.ThrowIfNull()(ct).ConfigureAwait(false)), cancellationToken);
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> content into the value returned by the <paramref name="getTarget"/> function.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="getTarget">The function to get the target to merge into.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="JsonMergePatchResult{T}"/> <see cref="Result{T}"/>.</returns>
+    /// <remarks>Provides the opportunity to validate the JSON before getting the value where this execution order is important; i.e. get operation is expensive (latency). A <paramref name="getTarget"/> that returns <see langword="null"/>
+    /// will immediately exit without performing any merge.</remarks>
+    public async Task<Result<JsonMergePatchResult<T>>> MergeWithResultAsync<T>(BinaryData patch, Func<CancellationToken, Task<Result<T?>>> getTarget, CancellationToken cancellationToken = default)
+    {
+        // Parse ensuring the JSON is valid for the type and can be navigated.
+        if (!TryParseJson<T>(patch.ThrowIfNull(), out var r))
+            return r;
+
+        // Get the value and exit where nothing to merge into.
+        var target = await getTarget.ThrowIfNull().Invoke(cancellationToken).ConfigureAwait(false);
+        if (target.IsFailure)
+            return target.Error;
+
+        if (target.Value is null)
+            return new JsonMergePatchResult<T>();
+
+        // Perform the merge patch.
+        return MergePatch(patch, target.Value);
+    }
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> content into the <paramref name="target"/>.
+    /// </summary>
+    private Result<JsonMergePatchResult<T>> MergePatch<T>(BinaryData patch, T target)
+    {
+        // Serialize the merge into value as will be using JsonElements to perform.
+        var vje = JsonSerializer.SerializeToElement(target, Options.JsonSerializerOptions);
+
+        // Perform the root merge patch and return the corresponding result.
+        var jd = JsonDocument.Parse(patch.ToMemory());
+        if (!TryMerge(jd.RootElement, vje, out ArrayBufferWriter<byte>? merged))
+            return Result.Ok(new JsonMergePatchResult<T> { HasChanges = false, Merged = target });
+
+        var reader = new Utf8JsonReader(merged.WrittenSpan);
+        return Result.Ok(new JsonMergePatchResult<T> { HasChanges = true, Merged = JsonSerializer.Deserialize<T>(ref reader, Options.JsonSerializerOptions) });
+    }
+
+    /// <summary>
+    /// Tries to parse the JSON outputting a failed result where unsuccessful.
+    /// </summary>
+    private bool TryParseJson<T>(BinaryData patch, out Result<JsonMergePatchResult<T>> result)
+    {
+        try
+        {
+            patch.ToObjectFromJson<T>(Options.JsonSerializerOptions);
+            result = new();
+            return true;
+        }
+        catch (JsonException jex)
+        {
+            result = new Result<JsonMergePatchResult<T>>(jex);
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> with the <paramref name="target"/> with a merged result.
+    /// </summary>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="target">The JSON target to merge with (into).</param>
+    /// <returns>The resulting merged JSON.</returns>
+    public string Merge([StringSyntax(StringSyntaxAttribute.Json)] string patch, [StringSyntax(StringSyntaxAttribute.Json)] string target)
+        => Merge(JsonDocument.Parse(patch.ThrowIfNullOrEmpty()).RootElement, JsonDocument.Parse(target.ThrowIfNullOrEmpty()).RootElement).GetRawText();
+
+    /// <summary>
+    /// Merges the <paramref name="json"/> with the <paramref name="target"/>.
+    /// </summary>
+    /// <param name="json">The JSON to merge patch.</param>
+    /// <param name="target">The JSON target to merge with (into).</param>
+    /// <returns>The resulting merged <see cref="JsonElement"/>.</returns>
+    public JsonElement Merge(JsonElement json, JsonElement target)
+    {
+        TryMerge(json, target, out JsonElement merged);
+        return merged;
+    }
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> with the <paramref name="target"/> resulting in merged JSON where changes were made.
+    /// </summary>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="target">The JSON to merge with (into).</param>
+    /// <param name="merged">The resulting merged JSON.</param>
+    /// <returns><see langword="true"/> indicates that changes were made as a result of the merge (see resulting <paramref name="merged"/>); otherwise, <see langword="false"/> for no changes.</returns>
+    public bool TryMerge([StringSyntax(StringSyntaxAttribute.Json)] string patch, [StringSyntax(StringSyntaxAttribute.Json)] string target, [NotNullWhen(true)] out string? merged)
+    {
+        if (!TryMerge(JsonDocument.Parse(patch.ThrowIfNullOrEmpty()).RootElement, JsonDocument.Parse(target.ThrowIfNullOrEmpty()).RootElement, out ArrayBufferWriter<byte>? buffer))
+        {
+            merged = null;
+            return false;
+        }
+
+        // Read the merged writer and parse.
+        var reader = new Utf8JsonReader(buffer.WrittenSpan);
+        merged = JsonElement.ParseValue(ref reader).Clone().GetRawText();
+        return true;
+    }
+
+    /// <summary>
+    /// Merges the <paramref name="patch"/> with the <paramref name="target"/> resulting in the <paramref name="merged"/> where changes were made.
+    /// </summary>
+    /// <param name="patch">The JSON to merge patch.</param>
+    /// <param name="target">The JSON to merge with (into).</param>
+    /// <param name="merged">The resulting merged JSON.</param>
+    /// <returns><see langword="true"/> indicates that changes were made as a result of the merge (see resulting <paramref name="merged"/>); otherwise, <see langword="false"/> for no changes.</returns>
+    public bool TryMerge(JsonElement patch, JsonElement target, out JsonElement merged)
+    {
+        // Merge and where no changes then return the target as-is.
+        if (!TryMerge(patch, target, out ArrayBufferWriter<byte>? buffer))
+        {
+            merged = target;
+            return false;
+        }
+
+        // Read the merged writer and parse.
+        var reader = new Utf8JsonReader(buffer.WrittenSpan);
+        merged = JsonElement.ParseValue(ref reader).Clone();
+        return true;
+    }
+
+    /// <summary>
+    /// Merge the JSON elements (root).
+    /// </summary>
+    private bool TryMerge(JsonElement patch, JsonElement target, [NotNullWhen(true)] out ArrayBufferWriter<byte>? merged)
+    {
+        // Create writer for the merged output.
+        var buffer = new ArrayBufferWriter<byte>();
+        using var writer = new Utf8JsonWriter(buffer);
+
+        // Merge for real!
+        var changed = TryMerge(patch, target, writer, false);
+
+        // Where no changes then return the target as-is.
+        if (!changed)
+        {
+            merged = null;
+            return false;
+        }
+
+        // Read the merged writer and parse.
+        writer.Flush();
+        merged = buffer;
+        return true;
+    }
+
+    /// <summary>
+    /// Merge the JSON elements (recursive).
+    /// </summary>
+    private bool TryMerge(JsonElement patch, JsonElement target, Utf8JsonWriter writer, bool changed)
+    {
+        // Where the kinds are different then simply accept the merge and acknowledge as changed.
+        if (patch.ValueKind != target.ValueKind)
+        {
+            patch.WriteTo(writer);
+            return true;
+        }
+
+        // Where the kinds are the same then process accordingly.
+        switch (patch.ValueKind)
+        {
+            case JsonValueKind.Object:
+                // An object is a property-by-property merge.
+                return TryObjectMerge(patch, target, writer, changed);
+
+            case JsonValueKind.Array:
+                // An array is always a replacement.
+                patch.WriteTo(writer);
+#if NET8_0
+                if (patch.GetArrayLength() != target.GetArrayLength() || !DeepEquals(patch, target))
+#else
+                if (patch.GetArrayLength() != target.GetArrayLength() || !JsonElement.DeepEquals(patch, target))
+#endif
+                    changed = true;
+
+                break;
+
+            default:
+                // Accept merge as-is.
+                patch.WriteTo(writer);
+#if NET8_0
+                if (!DeepEquals(patch, target))
+#else
+                if (!JsonElement.DeepEquals(patch, target))
+#endif
+                    changed = true;
+
+                break;
+        }
+
+        return changed;
+    }
+
+    /// <summary>
+    /// Merge the JSON object and properties and record changed.
+    /// </summary>
+    private bool TryObjectMerge(JsonElement patch, JsonElement target, Utf8JsonWriter writer, bool changed)
+    {
+        writer.WriteStartObject();
+
+        // Apply merge add/override.
+        foreach (var j in patch.EnumerateObject())
+        {
+            // Where the property is new then add.
+            if (!TryGetProperty(target, j.Name, out var t))
+            {
+                if (j.Value.ValueKind != JsonValueKind.Null)
+                    j.WriteTo(writer);
+
+                changed = true;
+                continue;
+            }
+
+            // Null is a remove; otherwise, override.
+            if (j.Value.ValueKind != JsonValueKind.Null)
+            {
+                writer.WritePropertyName(j.Name);
+                changed = TryMerge(j.Value, t, writer, changed);
+            }
+            else
+                changed = true;
+        }
+
+        // Add existing target properties not being merged.
+        foreach (var t in target.EnumerateObject())
+        {
+            // Where found then consider as handled above and ignore!
+            if (TryGetProperty(patch, t.Name, out _))
+                continue;
+
+            t.WriteTo(writer);
+        }
+
+        writer.WriteEndObject();
+        return changed;
+    }
+
+    /// <summary>
+    /// Performs the TryGetProperty using the configured comparer.
+    /// </summary>
+    private bool TryGetProperty(JsonElement json, string propertyName, out JsonElement value)
+        => Options.PropertyNameComparer is null ? json.TryGetProperty(propertyName, out value) : TryGetPropertyWithComparer(json, propertyName, Options.PropertyNameComparer, out value);
+
+    /// <summary>
+    /// Performs the TryGetProperty using the specified comparer (this will impact performance).
+    /// </summary>
+    private static bool TryGetPropertyWithComparer(JsonElement json, string propertyName, StringComparer comparer, out JsonElement value)
+    {
+        foreach (var j in json.EnumerateObject())
+        {
+            if (comparer.Equals(j.Name, propertyName))
+            {
+                value = j.Value;
+                return true;
+            }
+        }
+
+        value = default;
+        return false;
+    }
+
+#if NET8_0
+    /// <summary>
+    /// Provides a deep equals for two <see cref="JsonElement"/> instances.
+    /// </summary>
+    /// <param name="left">The left <see cref="JsonElement"/>.</param>
+    /// <param name="right">The right <see cref="JsonElement"/>.</param>
+    internal static bool DeepEquals(JsonElement left, JsonElement right)
+    {
+        if (left.ValueKind != right.ValueKind)
+        {
+            return false;
+        }
+
+        switch (left.ValueKind)
+        {
+            case JsonValueKind.Null:
+            case JsonValueKind.False:
+            case JsonValueKind.True:
+                // These are the same by kind, so carry on!
+                return true;
+
+            case JsonValueKind.Number:
+            case JsonValueKind.String:
+                return left.GetRawText() == right.GetRawText();
+
+            case JsonValueKind.Array:
+                if (left.GetArrayLength() != right.GetArrayLength())
+                    return false;
+
+                var rja = right.EnumerateArray();
+                foreach (var lje in left.EnumerateArray())
+                {
+                    rja.MoveNext();
+                    if (!DeepEquals(lje, rja.Current))
+                        return false;
+                }
+
+                return true;
+
+            default:
+                foreach (var l in left.EnumerateObject())
+                {
+                    if (!right.TryGetProperty(l.Name, out var r))
+                    {
+                        if (!DeepEquals(l.Value, r))
+                            return false;
+                    }
+                }
+
+                foreach (var r in right.EnumerateObject())
+                {
+                    if (!left.TryGetProperty(r.Name, out var _))
+                        return false;
+                }
+
+                return true;
+        }
+    }
+#endif
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonMergePatchOptions.cs b/src/CoreEx/Json/JsonMergePatchOptions.cs
new file mode 100644
index 00000000..adc4f6da
--- /dev/null
+++ b/src/CoreEx/Json/JsonMergePatchOptions.cs
@@ -0,0 +1,18 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// The <see cref="JsonMergePatch"/> options.
+/// </summary>
+/// <param name="jsonSerializerOptions">The optional <see cref="JsonSerializerOptions"/>.</param>
+public class JsonMergePatchOptions(JsonSerializerOptions? jsonSerializerOptions = null)
+{
+    /// <summary>
+    /// Gets the <see cref="JsonSerializerOptions"/>.
+    /// </summary>
+    public JsonSerializerOptions JsonSerializerOptions { get; } = jsonSerializerOptions ?? JsonDefaults.SerializerOptions;
+
+    /// <summary>
+    /// Gets or sets the <see cref="StringComparer"/> for matching the JSON name (defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>).
+    /// </summary>
+    public StringComparer PropertyNameComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonMergePatchResult.cs b/src/CoreEx/Json/JsonMergePatchResult.cs
new file mode 100644
index 00000000..d6875be4
--- /dev/null
+++ b/src/CoreEx/Json/JsonMergePatchResult.cs
@@ -0,0 +1,17 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// The <see cref="JsonMergePatch"/> result.
+/// </summary>
+public class JsonMergePatchResult<T>
+{
+    /// <summary>
+    /// Indicates whether changes were identified whilst merging into the <see cref="Merged"/> value.
+    /// </summary>
+    public bool HasChanges { get; internal set; }
+
+    /// <summary>
+    /// Gets the resulting <see cref="Merged"/> value.
+    /// </summary>
+    public T? Merged { get; internal set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonPropertyFilter.cs b/src/CoreEx/Json/JsonPropertyFilter.cs
deleted file mode 100644
index 7cd1597f..00000000
--- a/src/CoreEx/Json/JsonPropertyFilter.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections.Generic;
-
-namespace CoreEx.Json
-{
-    /// <summary>
-    /// Defines the JSON property filter (<see cref="Include"/> or <see cref="Exclude"/>) for the <see cref="IJsonSerializer.TryApplyFilter{T}(T, IEnumerable{string}?, out object, JsonPropertyFilter, System.StringComparison, System.Action{IJsonPreFilterInspector}?)"/>
-    /// and <see cref="IJsonSerializer.TryApplyFilter{T}(T, IEnumerable{string}?, out string, JsonPropertyFilter, System.StringComparison, System.Action{IJsonPreFilterInspector}?)"/>.
-    /// </summary>
-    public enum JsonPropertyFilter
-    {
-        /// <summary>
-        /// Indicates whether to <i>include</i> only those properties that have been specified.
-        /// </summary>
-        Include,
-
-        /// <summary>
-        /// Indicates whether to <i>exclude</i> those properties that have been specified.
-        /// </summary>
-        Exclude
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonReferenceDataConverter.cs b/src/CoreEx/Json/JsonReferenceDataConverter.cs
new file mode 100644
index 00000000..41b545e2
--- /dev/null
+++ b/src/CoreEx/Json/JsonReferenceDataConverter.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides an <see cref="IReferenceData"/> converter to ensure the correct type is used to serialize.
+/// </summary>
+/// <remarks>This converter only supports serialization and not deserialization due to the lack of native polymorphic support for <see cref="IReferenceData"/>.</remarks>
+public class JsonReferenceDataConverter : JsonConverter<IReferenceData>
+{
+    /// <inheritdoc/>
+    public override IReferenceData? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        => throw new NotSupportedException($"Deserialization is not supported for an {nameof(IReferenceData)} value as there is no native polymorphic support.");
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, IReferenceData value, JsonSerializerOptions options)
+        => JsonSerializer.Serialize(writer, value, value.GetType(), options);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonResultConverter.cs b/src/CoreEx/Json/JsonResultConverter.cs
new file mode 100644
index 00000000..82a01fb6
--- /dev/null
+++ b/src/CoreEx/Json/JsonResultConverter.cs
@@ -0,0 +1,36 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides an <see cref="IResult"/> converter to ensure the correct type is used to serialize.
+/// </summary>
+/// <remarks>This converter only supports serialization and not deserialization as an <see cref="IResult"/> is not a type expected to be exchanged.</remarks>
+public class JsonResultConverter : JsonConverter<IResult>
+{
+    /// <inheritdoc/>
+    public override bool CanConvert(Type typeToConvert) => typeToConvert == typeof(Result) || typeToConvert == typeof(Result<>);
+
+    /// <inheritdoc/>
+    public override IResult? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        => throw new NotSupportedException($"Deserialization is not supported for an {nameof(IResult)} as this type is not expected to be exchanged.");
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, IResult value, JsonSerializerOptions options)
+    {
+        writer.WriteStartObject();
+        writer.WritePropertyName("IsSuccess");
+        writer.WriteBooleanValue(value.IsSuccess);
+
+        if (value.IsSuccess)
+        {
+            writer.WritePropertyName("Value");
+            JsonSerializer.Serialize(writer, value.Value, value.Value?.GetType() ?? typeof(object), options);
+        }
+        else
+        {
+            writer.WritePropertyName("Error");
+            JsonSerializer.Serialize(writer, value.Error, value.Error?.GetType() ?? typeof(Exception), options);
+        }
+
+        writer.WriteEndObject();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonSerializer.cs b/src/CoreEx/Json/JsonSerializer.cs
deleted file mode 100644
index 061f3eb8..00000000
--- a/src/CoreEx/Json/JsonSerializer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Json
-{
-    /// <summary>
-    /// Provides the <see cref="Default"/> <see cref="IJsonSerializer"/> instance.
-    /// </summary>
-    public static class JsonSerializer
-    {
-        private static IJsonSerializer? _jsonSerializer = new CoreEx.Text.Json.JsonSerializer();
-
-        /// <summary>
-        /// Gets or sets the default <see cref="IJsonSerializer"/> instance.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="CoreEx.Text.Json.JsonSerializer"/>.</remarks>
-        public static IJsonSerializer Default
-        {
-            get => _jsonSerializer ?? throw new InvalidOperationException($"No default {nameof(IJsonSerializer)} has been defined; this must be set prior to access.");
-            set => _jsonSerializer = value.ThrowIfNull(nameof(value));
-        }
-
-        /// <summary>
-        /// Gets the dictionary of JSON name substitutions that will be used during serialization to rename the .NET property to the specified JSON name.
-        /// </summary>
-        /// <remarks>The dictionary key is the .NET property name and the value is the corresponding JSON name.</remarks>
-        public static Dictionary<string, string> NameSubstitutions { get; } = new Dictionary<string, string> { { "ETag", "etag" } };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonSubstituteNamingPolicy.cs b/src/CoreEx/Json/JsonSubstituteNamingPolicy.cs
new file mode 100644
index 00000000..f12209c6
--- /dev/null
+++ b/src/CoreEx/Json/JsonSubstituteNamingPolicy.cs
@@ -0,0 +1,32 @@
+namespace CoreEx.Json;
+
+/// <summary>
+/// Provides JSON naming substitution.
+/// </summary>
+/// <remarks>Defaults the following substitutions: '<c>ETag</c>' and '<c>eTag</c>', to '<c>etag</c>'.
+/// <para>Additional <see cref="Substitutions"/> can be added.</para></remarks>
+public class JsonSubstituteNamingPolicy : JsonNamingPolicy
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonSubstituteNamingPolicy"/> class.
+    /// </summary>
+    public JsonSubstituteNamingPolicy()
+    {
+        Substitutions.TryAdd("ETag", "etag");
+        Substitutions.TryAdd("eTag", "etag");
+    }
+
+    /// <summary>
+    /// Gets or sets the fallback policy where no <see cref="Substitutions"/> found.
+    /// </summary>
+    public JsonNamingPolicy FallbackPolicy { get; set; } = CamelCase;
+
+    /// <summary>
+    /// Gets or sets the substitutions.
+    /// </summary>
+    public ConcurrentDictionary<string, string> Substitutions { get; } = [];
+
+    /// <inheritdoc/>
+    /// <remarks>Converts using the <see cref="Substitutions"/> then the <see cref="FallbackPolicy"/>.</remarks>
+    public override string ConvertName(string name) => Substitutions.TryGetValue(name, out var substitution) ? substitution : CamelCase.ConvertName(name);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Json/JsonWriteFormat.cs b/src/CoreEx/Json/JsonWriteFormat.cs
deleted file mode 100644
index b0866c49..00000000
--- a/src/CoreEx/Json/JsonWriteFormat.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Json
-{
-    /// <summary>
-    /// Defines the JSON serialization write format.
-    /// </summary>
-    public enum JsonWriteFormat
-    {
-        /// <summary>
-        /// Indicates that no formatting is to occur.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// Indicates that pretty-printing indented formatting is to occur.
-        /// </summary>
-        Indented
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/IJsonObjectMapper.cs b/src/CoreEx/Json/Mapping/IJsonObjectMapper.cs
deleted file mode 100644
index ff79269b..00000000
--- a/src/CoreEx/Json/Mapping/IJsonObjectMapper.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Defines a <see cref="JsonObject"/> mapper.
-    /// </summary>
-    public interface IJsonObjectMapper
-    {
-        /// <summary>
-        /// Gets the <see cref="Text.Json.JsonSerializer"/>.
-        /// </summary>
-        Text.Json.JsonSerializer JsonSerializer { get; }
-
-        /// <summary>
-        /// Gets the source <see cref="Type"/> being mapped from/to a <see cref="JsonObject"/>.
-        /// </summary>
-        Type SourceType { get; }
-
-        /// <summary>
-        /// Maps from an <paramref name="json"/> creating a corresponding instance of the <see cref="SourceType"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonObject"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of the <see cref="SourceType"/>.</returns>
-        object? MapFromJson(JsonObject json, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="json"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="json">The <see cref="JsonObject"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToJson(object? value, JsonObject json, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/IJsonObjectMapperMappings.cs b/src/CoreEx/Json/Mapping/IJsonObjectMapperMappings.cs
deleted file mode 100644
index c883e846..00000000
--- a/src/CoreEx/Json/Mapping/IJsonObjectMapperMappings.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Gets the <see cref="IPropertyJsonMapper"/> mappings.
-    /// </summary>
-    public interface IJsonObjectMapperMappings
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyJsonMapper"/> mappings.
-        /// </summary>
-        IEnumerable<IPropertyJsonMapper> Mappings { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyJsonMapper"/> from the <see cref="Mappings"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The property name.</param>
-        /// <returns>The <see cref="IPropertyJsonMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        IPropertyJsonMapper this[string propertyName] { get; }
-
-        /// <summary>
-        /// Attempts to get the <see cref="IPropertyJsonMapper"/> for the specified <paramref name="propertyName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <param name="propertyColumnMapper">The corresponding <see cref="IPropertyJsonMapper"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyJsonMapper? propertyColumnMapper);
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyJsonMapper.JsonName"/>.
-        /// </summary>
-        /// <param name="propertyName">The source property name.</param>
-        /// <returns>The <see cref="IPropertyJsonMapper.JsonName"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        string GetJsonName(string propertyName);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/IJsonObjectMapperT.cs b/src/CoreEx/Json/Mapping/IJsonObjectMapperT.cs
deleted file mode 100644
index eed7c996..00000000
--- a/src/CoreEx/Json/Mapping/IJsonObjectMapperT.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Mapping;
-using System;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Defines a typed <see cref="JsonObject"/> mapper.
-    /// </summary>
-    public interface IJsonObjectMapper<TSource> : IJsonObjectMapper
-    {
-        /// <inheritdoc/>
-        Type IJsonObjectMapper.SourceType => typeof(TSource);
-
-        /// <inheritdoc/>
-        object? IJsonObjectMapper.MapFromJson(JsonObject json, OperationTypes operationType) => MapFromJson(json, operationType)!;
-
-        /// <inheritdoc/>
-        void IJsonObjectMapper.MapToJson(object? value, JsonObject json, OperationTypes operationType) => MapToJson((TSource?)value, json, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="json"/> creating a corresponding instance of <typeparamref name="TSource"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonObject"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The corresponding instance of <typeparamref name="TSource"/>.</returns>
-        new TSource? MapFromJson(JsonObject json, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="json"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="json">The <see cref="JsonObject"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToJson(TSource? value, JsonObject json, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/IPropertyJsonMapper.cs b/src/CoreEx/Json/Mapping/IPropertyJsonMapper.cs
deleted file mode 100644
index 15d01392..00000000
--- a/src/CoreEx/Json/Mapping/IPropertyJsonMapper.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping.Converters;
-using CoreEx.Mapping;
-using System;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Enables bi-directional property and <see cref="JsonObject"/> property mapping.
-    /// </summary>
-    public interface IPropertyJsonMapper
-    {
-        /// <summary>
-        /// Gets the <see cref="IPropertyExpression"/>.
-        /// </summary>
-        IPropertyExpression PropertyExpression { get; }
-
-        /// <summary>
-        /// Gets the source property name.
-        /// </summary>
-        string PropertyName { get; }
-
-        /// <summary>
-        /// Gets the source property <see cref="Type"/>.
-        /// </summary>
-        Type PropertyType { get; }
-
-        /// <summary>
-        /// Indicates whether the underlying source property is a complex type.
-        /// </summary>
-        bool IsSrcePropertyComplex { get; }
-
-        /// <summary>
-        /// Gets the destination <see cref="JsonObject"/> property name.
-        /// </summary>
-        string JsonName { get; }
-
-        /// <summary>
-        /// Gets the <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property (default to <see cref="OperationTypes.Any"/>).
-        /// </summary>
-        OperationTypes OperationTypes { get; }
-
-        /// <summary>
-        /// Indicates whether the property forms part of the primary key. 
-        /// </summary>
-        bool IsPrimaryKey { get; }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/>).
-        /// </summary>
-        void SetPrimaryKey();
-
-        /// <summary>
-        /// Gets the <see cref="IConverter"/> (used where a specific source and destination type conversion is required).
-        /// </summary>
-        IConverter? Converter { get; }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        void SetConverter(IConverter converter);
-
-        /// <summary>
-        /// Gets the <see cref="IJsonObjectMapper"/> to map complex types.
-        /// </summary>
-        IJsonObjectMapper? Mapper { get; }
-
-        /// <summary>
-        /// Set the <see cref="IJsonObjectMapper"/> to map complex types.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IJsonObjectMapper"/>.</param>
-        /// <remarks>The <see cref="Mapper"/> and <see cref="Converter"/> are mutually exclusive.</remarks>
-        void SetMapper(IJsonObjectMapper mapper);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="json"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="json">The <see cref="JsonObject"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapToJson(object value, JsonObject json, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps from a <paramref name="json"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonObject"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        void MapFromJson(JsonObject json, object value, OperationTypes operationType = OperationTypes.Unspecified);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/JsonObjectMapper.cs b/src/CoreEx/Json/Mapping/JsonObjectMapper.cs
deleted file mode 100644
index aa7ee004..00000000
--- a/src/CoreEx/Json/Mapping/JsonObjectMapper.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Enables <see cref="Create{TSource}"/> or <see cref="CreateAuto{TSource}(string[])"/> of a <see cref="JsonObjectMapper{TSource}"/>.
-    /// </summary>
-    public class JsonObjectMapper
-    {
-        /// <summary>
-        /// Creates a <see cref="JsonObjectMapper{TSource}"/> where properties are added manually.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="Text.Json.JsonSerializer"/>; defaults where not specified.</param>
-        /// <returns>A <see cref="JsonObjectMapper{TSource}"/>.</returns>
-        public static JsonObjectMapper<TSource> Create<TSource>(Text.Json.JsonSerializer? jsonSerializer = null) where TSource : class, new() => new(jsonSerializer, false);
-
-        /// <summary>
-        /// Creates a <see cref="JsonObjectMapper{TSource}"/> where properties are added automatically (assumes the property and column names share the same name).
-        /// </summary>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        /// <returns>A <see cref="JsonObjectMapper{TSource}"/>.</returns>
-        public static JsonObjectMapper<TSource> CreateAuto<TSource>(params string[] ignoreSrceProperties) where TSource : class, new() => new(null, true, ignoreSrceProperties);
-
-        /// <summary>
-        /// Creates a <see cref="JsonObjectMapper{TSource}"/> where properties are added automatically (assumes the property and column names share the same name).
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="Text.Json.JsonSerializer"/>; defaults where not specified.</param>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        /// <returns>A <see cref="JsonObjectMapper{TSource}"/>.</returns>
-        public static JsonObjectMapper<TSource> CreateAuto<TSource>(Text.Json.JsonSerializer? jsonSerializer, params string[] ignoreSrceProperties) where TSource : class, new() => new(jsonSerializer, true, ignoreSrceProperties);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/JsonObjectMapperT.cs b/src/CoreEx/Json/Mapping/JsonObjectMapperT.cs
deleted file mode 100644
index 449d2fb3..00000000
--- a/src/CoreEx/Json/Mapping/JsonObjectMapperT.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Provides mapping from a <typeparamref name="TSource"/> <see cref="Type"/> and <see cref="JsonObject"/>.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    public class JsonObjectMapper<TSource> : IJsonObjectMapper<TSource>, IJsonObjectMapperMappings where TSource : class, new()
-    {
-        private readonly List<IPropertyJsonMapper> _mappings = [];
-        private readonly bool _implementsIIdentifier = typeof(IIdentifier).IsAssignableFrom(typeof(TSource));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonObjectMapper{TSource}"/> class.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="Text.Json.JsonSerializer"/>; defaults where not specified.</param>
-        /// <param name="autoMap">Indicates whether the entity should automatically map all public get/set properties, where the property and column names are all assumed to share the same name.</param>
-        /// <param name="ignoreSrceProperties">An array of source property names to ignore.</param>
-        public JsonObjectMapper(Text.Json.JsonSerializer? jsonSerializer = null, bool autoMap = false, params string[] ignoreSrceProperties)
-        {
-            if (typeof(TSource) == typeof(string)) throw new InvalidOperationException("TSource must not be a String.");
-
-            JsonSerializer = jsonSerializer ?? (CoreEx.Json.JsonSerializer.Default is Text.Json.JsonSerializer js ? js : new Text.Json.JsonSerializer());
-            if (autoMap)
-                AutomagicallyMap(ignoreSrceProperties);
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Text.Json.JsonSerializer"/>.
-        /// </summary>
-        public Text.Json.JsonSerializer JsonSerializer { get; }
-
-        /// <inheritdoc/>
-        IEnumerable<IPropertyJsonMapper> IJsonObjectMapperMappings.Mappings => _mappings.AsEnumerable();
-
-        /// <inheritdoc/>
-        public IPropertyJsonMapper this[string propertyName] => TryGetProperty(propertyName, out var pcm) ? pcm : throw new ArgumentException($"Property '{propertyName}' does not exist.", nameof(propertyName));
-
-        /// <summary>
-        /// Gets the <see cref="IPropertyJsonMapper"/> for the specified source <paramref name="propertyExpression"/>.
-        /// </summary>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <returns>The <see cref="IPropertyJsonMapper"/> where found.</returns>
-        /// <exception cref="ArgumentException">Thrown when the property does not exist.</exception>
-        public IPropertyJsonMapper this[Expression<Func<TSource, object?>> propertyExpression]
-        {
-            get
-            {
-                MemberExpression? me = null;
-                if (propertyExpression.ThrowIfNull(nameof(propertyExpression)).Body.NodeType == ExpressionType.MemberAccess)
-                    me = propertyExpression.Body as MemberExpression;
-                else if (propertyExpression.Body.NodeType == ExpressionType.Convert)
-                {
-                    if (propertyExpression.Body is UnaryExpression ue)
-                        me = ue.Operand as MemberExpression;
-                }
-
-                if (me == null)
-                    throw new InvalidOperationException("Only Member access expressions are supported.");
-
-                return this[me.Member.Name];
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetProperty(string propertyName, [NotNullWhen(true)] out IPropertyJsonMapper? propertyColumnMapper)
-        {
-            propertyColumnMapper = _mappings.Where(x => x.PropertyName == propertyName).FirstOrDefault();
-            return propertyColumnMapper != null;
-        }
-
-        /// <inheritdoc/>
-        public string GetJsonName(string propertyName) => this[propertyName].JsonName;
-
-        /// <summary>
-        /// Automatically add each public get/set property.
-        /// </summary>
-        private void AutomagicallyMap(string[] ignoreSrceProperties)
-        {
-            foreach (var sp in TypeReflector.GetProperties(typeof(TSource)))
-            {
-                // Do not auto-map where ignore has been specified.
-                if (ignoreSrceProperties.Contains(sp.Name))
-                    continue;
-
-                // Create the lambda expression for the property and add to the mapper.
-                var spe = Expression.Parameter(typeof(TSource), "x");
-                var sex = Expression.Lambda(Expression.Property(spe, sp), spe);
-                typeof(JsonObjectMapper<TSource>)
-                    .GetMethod(nameof(AutoProperty), BindingFlags.NonPublic | BindingFlags.Instance)!
-                    .MakeGenericMethod([sp.PropertyType])
-                    .Invoke(this, [sex, null, OperationTypes.Any]);
-            }
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> to the mapper with additiional auto-logic.
-        /// </summary>
-        private PropertyJsonMapper<TSource, TSourceProperty> AutoProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? jsonName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            var pcm = Property(propertyExpression, jsonName, operationTypes);
-
-            // Automatically set primary key where IIdentifier.
-            if (_implementsIIdentifier && pcm.PropertyName == nameof(IIdentifier.Id))
-                pcm.SetPrimaryKey();
-
-            return pcm;
-        }
-
-        /// <summary>
-        /// Adds a <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> to the mapper.
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="columnName">The <i>Dataverse</i> column name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <returns>The <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/>.</returns>
-        public PropertyJsonMapper<TSource, TSourceProperty> Property<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? columnName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            var pcm = new PropertyJsonMapper<TSource, TSourceProperty>(this, propertyExpression, columnName, operationTypes);
-            AddMapping(pcm);
-            return pcm;
-        }
-
-        /// <summary>
-        /// Validates and adds a new IPropertyJsonMapper.
-        /// </summary>
-        private void AddMapping<TSourceProperty>(PropertyJsonMapper<TSource, TSourceProperty> propertyJsonMapper)
-        {
-            if (_mappings.Any(x => x.PropertyName == propertyJsonMapper.PropertyName))
-                throw new ArgumentException($"Source property '{propertyJsonMapper.PropertyName}' must not be specified more than once.", nameof(propertyJsonMapper));
-
-            if (_mappings.Any(x => x.JsonName == propertyJsonMapper.JsonName))
-                throw new ArgumentException($"Column '{propertyJsonMapper.JsonName}' must not be specified more than once.", nameof(propertyJsonMapper));
-
-            _mappings.Add(propertyJsonMapper);
-        }
-
-        /// <summary>
-        /// Adds or updates <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> to the mapper.
-        /// </summary>
-        /// <typeparam name="TSourceProperty">The source property <see cref="Type"/>.</typeparam>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="jsonName">The JSON property name. Defaults to <paramref name="propertyExpression"/> name.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        /// <param name="property">An <see cref="Action"/> enabling access to the created <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/>.</param>
-        /// <returns></returns>
-        /// <remarks>Where updating an existing the <paramref name="jsonName"/> and <paramref name="operationTypes"/> where specified will override the previous values.</remarks>
-        public JsonObjectMapper<TSource> HasProperty<TSourceProperty>(Expression<Func<TSource, TSourceProperty>> propertyExpression, string? jsonName = null, OperationTypes? operationTypes = null, Action<PropertyJsonMapper<TSource, TSourceProperty>>? property = null)
-        {
-            var tmp = new PropertyJsonMapper<TSource, TSourceProperty>(this, propertyExpression, jsonName, operationTypes ?? OperationTypes.Any);
-            var pcm = _mappings.Where(x => x.PropertyName == tmp.PropertyName).OfType<PropertyJsonMapper<TSource, TSourceProperty>>().SingleOrDefault();
-            if (pcm == null)
-                AddMapping(pcm = tmp);
-            else
-            {
-                if (jsonName != null && tmp.JsonName != pcm.JsonName)
-                {
-                    if (_mappings.Any(x => x.JsonName == pcm.JsonName))
-                        throw new ArgumentException($"JSON property '{pcm.JsonName}' must not be specified more than once.", nameof(jsonName));
-                    else
-                        pcm.JsonName = tmp.JsonName;
-                }
-
-                if (operationTypes != null)
-                    pcm.OperationTypes = operationTypes.Value;
-            }
-
-            property?.Invoke(pcm);
-            return this;
-        }
-
-        /// <summary>
-        /// Inherits the property mappings from the selected <paramref name="inheritMapper"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="inheritMapper"/> source <see cref="Type"/>. Must inherit from <typeparamref name="TSource"/>.</typeparam>
-        /// <param name="inheritMapper">The <see cref="IJsonObjectMapper{T}"/> to inherit from. Must also implement <see cref="IJsonObjectMapperMappings"/>.</param>
-        public void InheritPropertiesFrom<T>(IJsonObjectMapper<T> inheritMapper) where T : class, new()
-        {
-            inheritMapper.ThrowIfNull(nameof(inheritMapper));
-            if (!typeof(TSource).IsSubclassOf(typeof(T))) throw new ArgumentException($"Type {typeof(TSource).Name} must inherit from {typeof(T).Name}.", nameof(inheritMapper));
-            if (inheritMapper is not IJsonObjectMapperMappings inheritMappings) throw new ArgumentException($"Type {typeof(T).Name} must implement {typeof(IJsonObjectMapperMappings).Name} to copy the mappings.", nameof(inheritMapper));
-
-            var pe = Expression.Parameter(typeof(TSource), "x");
-            var type = typeof(JsonObjectMapper<>).MakeGenericType(typeof(TSource));
-
-            foreach (var p in inheritMappings.Mappings)
-            {
-                var lex = Expression.Lambda(Expression.Property(pe, p.PropertyName), pe);
-                var pmap = (IPropertyJsonMapper)type
-                    .GetMethod("Property", BindingFlags.Instance | BindingFlags.Public | BindingFlags.DeclaredOnly)!
-                    .MakeGenericMethod(p.PropertyType)
-                    .Invoke(this, [lex, p.JsonName, p.OperationTypes])!;
-
-                if (p.IsPrimaryKey)
-                    pmap.SetPrimaryKey();
-
-                if (p.Converter != null)
-                    pmap.SetConverter(p.Converter);
-
-                if (p.Mapper != null)
-                    pmap.SetMapper(p.Mapper);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void MapToJson(TSource? value, JsonObject json, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            json.ThrowIfNull(nameof(json));
-            if (value == null) return;
-
-            foreach (var p in _mappings)
-            {
-                p.MapToJson(value, json, operationType);
-            }
-
-            OnMapToJson(value, json, operationType);
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapToJson(TSource, JsonObject, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="json">The <see cref="JsonObject"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        protected virtual void OnMapToJson(TSource value, JsonObject json, OperationTypes operationType) { }
-
-        /// <inheritdoc/>
-        public TSource? MapFromJson(JsonObject json, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            json.ThrowIfNull(nameof(json));
-            var value = new TSource();
-
-            foreach (var p in _mappings)
-            {
-                p.MapFromJson(json, value, operationType);
-            }
-
-            value = OnMapFromJson(value, json, operationType);
-            return (value != null && value is IInitial ii && ii.IsInitial) ? null : value;
-        }
-
-        /// <summary>
-        /// Extension opportunity when performing a <see cref="MapFromJson(JsonObject, OperationTypes)"/>.
-        /// </summary>
-        /// <param name="value">The source value.</param>
-        /// <param name="json">The <see cref="JsonObject"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        /// <returns>The source value.</returns>
-        protected virtual TSource? OnMapFromJson(TSource value, JsonObject json, OperationTypes operationType) => value;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Mapping/PropertyJsonMapper.cs b/src/CoreEx/Json/Mapping/PropertyJsonMapper.cs
deleted file mode 100644
index 6b69dcff..00000000
--- a/src/CoreEx/Json/Mapping/PropertyJsonMapper.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Mapping;
-using CoreEx.Mapping.Converters;
-using System;
-using System.ComponentModel;
-using System.Linq.Expressions;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Json.Mapping
-{
-    /// <summary>
-    /// Provides bi-directional property and <see cref="JsonObject"/> property mapping.
-    /// </summary>
-    /// <typeparam name="TSource">The source entity <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSourceProperty">The corresponding source property <see cref="Type"/>.</typeparam>
-    public class PropertyJsonMapper<TSource, TSourceProperty> : IPropertyJsonMapper where TSource : class, new()
-    {
-        private readonly PropertyExpression<TSource, TSourceProperty> _propertyExpression;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> class.
-        /// </summary>
-        /// <param name="owner">The owning <see cref="IJsonObjectMapper"/>.</param>
-        /// <param name="propertyExpression">The <see cref="Expression"/> to reference the source property.</param>
-        /// <param name="jsonName">The <see cref="JsonObject"/> property name. Defaults to the JSON name inferred by the <paramref name="propertyExpression"/>.</param>
-        /// <param name="operationTypes">The <see cref="CoreEx.Mapping.OperationTypes"/> selection to enable inclusion or exclusion of property.</param>
-        internal PropertyJsonMapper(IJsonObjectMapper owner, Expression<Func<TSource, TSourceProperty>> propertyExpression, string? jsonName = null, OperationTypes operationTypes = OperationTypes.Any)
-        {
-            Owner = owner.ThrowIfNull(nameof(owner));
-            _propertyExpression = Abstractions.Reflection.PropertyExpression.Create(propertyExpression, Owner.JsonSerializer);
-            JsonName = jsonName ?? _propertyExpression.JsonName ?? PropertyName;
-            OperationTypes = operationTypes;
-        }
-
-        /// <summary>
-        /// Gets the owning <see cref="IJsonObjectMapper"/>.
-        /// </summary>
-        /// <remarks>Required to provide the underlying <see cref="IJsonObjectMapper.JsonSerializer"/>.</remarks>
-        public IJsonObjectMapper Owner { get; }
-
-        /// <inheritdoc/>
-        public IPropertyExpression PropertyExpression => _propertyExpression;
-
-        /// <inheritdoc/>
-        public string PropertyName => _propertyExpression.Name;
-
-        /// <inheritdoc/>
-        public Type PropertyType => typeof(TSourceProperty);
-
-        /// <inheritdoc/>
-        public bool IsSrcePropertyComplex => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        public string JsonName { get; internal set; }
-
-        /// <inheritdoc/>
-        public OperationTypes OperationTypes { get; internal set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKey { get; private set; }
-
-        /// <inheritdoc/>
-        public bool IsPrimaryKeyUseEntityIdentifier { get; private set; }
-
-        /// <inheritdoc/>
-        public IConverter? Converter { get; private set; }
-
-        /// <inheritdoc/>
-        public IJsonObjectMapper? Mapper { get; private set; }
-
-        /// <inheritdoc/>
-        void IPropertyJsonMapper.SetConverter(IConverter converter)
-        {
-            converter.ThrowIfNull(nameof(converter));
-
-            if (Mapper != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (converter.SourceType != typeof(TSourceProperty))
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' and IConverter.SourceType '{converter.SourceType.Name}' must match.");
-
-            Converter = converter;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Converter"/>.
-        /// </summary>
-        /// <param name="converter">The <see cref="IConverter"/>.</param>
-        /// <returns>The <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyJsonMapper<TSource, TSourceProperty> SetConverter<TDestinationProperty>(IConverter<TSourceProperty, TDestinationProperty> converter)
-        {
-            ((IPropertyJsonMapper)this).SetConverter(converter);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyJsonMapper.SetMapper(IJsonObjectMapper mapper)
-        {
-            mapper.ThrowIfNull(nameof(mapper));
-
-            if (Converter != null)
-                throw new InvalidOperationException("The Mapper and Converter cannot be both set; only one is permissible.");
-
-            if (!_propertyExpression.IsClass)
-                throw new InvalidOperationException($"The PropertyType '{PropertyType.Name}' must be a class to set a Mapper.");
-
-            if (mapper.SourceType != typeof(TSourceProperty))
-                throw new ArgumentException($"The PropertyType '{PropertyType.Name}' and IDataverseMapper.SourceType '{mapper.SourceType.Name}' must match.", nameof(mapper));
-
-            if (IsPrimaryKey)
-                throw new InvalidOperationException("A Mapper can not be set for a primary key.");
-
-            Mapper = mapper;
-        }
-
-        /// <summary>
-        /// Sets the <see cref="Mapper"/>.
-        /// </summary>
-        /// <param name="mapper">The <see cref="IJsonObjectMapper"/>.</param>
-        /// <returns>The <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>The <see cref="Converter"/> and <see cref="Mapper"/> are mutually exclusive.</remarks>
-        public PropertyJsonMapper<TSource, TSourceProperty> SetMapper<TDestinationProperty>(IJsonObjectMapper<TDestinationProperty> mapper)
-        {
-            ((IPropertyJsonMapper)this).SetMapper(mapper);
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyJsonMapper.SetPrimaryKey()
-        {
-            if (Mapper != null) throw new InvalidOperationException("A primary key must not contain a Mapper.");
-
-            IsPrimaryKey = true;
-        }
-
-        /// <summary>
-        /// Sets the primary key (<see cref="IsPrimaryKey"/>).
-        /// </summary>
-        /// <returns>The <see cref="PropertyJsonMapper{TSource, TSourceProperty}"/> to support fluent-style method-chaining.</returns>
-        public PropertyJsonMapper<TSource, TSourceProperty> SetPrimaryKey()
-        {
-            ((IPropertyJsonMapper)this).SetPrimaryKey();
-            return this;
-        }
-
-        /// <inheritdoc/>
-        void IPropertyJsonMapper.MapToJson(object? value, JsonObject json, OperationTypes operationType) => MapToJson((TSource?)value, json, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="value"/> updating the <paramref name="json"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="json">The <see cref="JsonObject"/> to update from the <paramref name="value"/>.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapToJson(TSource? value, JsonObject json, OperationTypes operationType)
-        {
-            if (value == null || !OperationTypes.HasFlag(operationType))
-                return;
-
-            var val = _propertyExpression.GetValue(value);
-            if (Mapper != null)
-            {
-                if (val != null)
-                    Mapper.MapToJson(val, json, operationType);
-            }
-            else
-            {
-                var jv = Converter == null ? val : Converter.ConvertToDestination(val);
-                json[JsonName] = System.Text.Json.JsonSerializer.SerializeToNode(jv, Owner.JsonSerializer.Options);
-            }
-        }
-
-        /// <inheritdoc/>
-        void IPropertyJsonMapper.MapFromJson(JsonObject json, object value, OperationTypes operationType) => MapFromJson(json, (TSource)value, operationType);
-
-        /// <summary>
-        /// Maps from a <paramref name="json"/> updating the <paramref name="value"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonObject"/>.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="operationType">The single <see cref="OperationTypes"/> value being performed to enable conditional execution where appropriate.</param>
-        private void MapFromJson(JsonObject json, TSource value, OperationTypes operationType)
-        {
-            if (!OperationTypes.HasFlag(operationType))
-                return;
-
-            TSourceProperty? pval;
-            if (Mapper != null)
-                pval = (TSourceProperty?)Mapper.MapFromJson(json, operationType);
-            else
-            {
-                // Where no json property found then set to default.
-                if (json.TryGetPropertyValue(JsonName, out var jn) || jn == null)
-                {
-                    if (Converter is null)
-                        pval = (TSourceProperty)jn.Deserialize(PropertyType, Owner.JsonSerializer.Options)!;
-                    else
-                        pval = (TSourceProperty)Converter.ConvertToSource(jn.Deserialize(Converter.DestinationType, Owner.JsonSerializer.Options))!;
-                }
-                else
-                    pval = default;
-            }
-
-            _propertyExpression.SetValue(value, pval);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/DictionaryMergeApproach.cs b/src/CoreEx/Json/Merge/DictionaryMergeApproach.cs
deleted file mode 100644
index bad47ec3..00000000
--- a/src/CoreEx/Json/Merge/DictionaryMergeApproach.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections;
-using System.Collections.Generic;
-
-namespace CoreEx.Json.Merge
-{
-    /// <summary>
-    /// Defines the approach for a dictionary (see <see cref="IDictionary"/>) merge; being either <see cref="Merge"/> or <see cref="Replace"/>.
-    /// </summary>
-    /// <remarks>The formal specification <see href="https://tools.ietf.org/html/rfc7396"/> does not explictly state how to treat a dictionary; however, the <see cref="Merge"/> approach appears to most closely align as the dictionary
-    /// is represented as JSON properties (the <see cref="KeyValuePair{TKey, TValue}.Key"/> being the property name and the <see cref="KeyValuePair{TKey, TValue}.Value"/> being the corresponding value) versus an 
-    /// <see cref="System.Text.Json.JsonValueKind.Array"/>.</remarks>
-    public enum DictionaryMergeApproach
-    {
-        /// <summary>
-        /// Indicates that the dictionary (see <see cref="IDictionary"/>) merge will act similar to a property merge, in that each key is a property (which is how they present within JSON). Therefore, to remove the item the value must be set
-        /// to <see cref="System.Text.Json.JsonValueKind.Null"/> to explicitly remove. Where the merging key already exists then a standard value merge will result; otherwise, where the key does not exist, a resulting add will result.
-        /// </summary>
-        Merge,
-
-        /// <summary>
-        /// Indicates that the dictionary (see <see cref="IDictionary"/>) merge will be treated the same as any <see cref="System.Text.Json.JsonValueKind.Array"/> where the result is a replacement (overwrite) operation.
-        /// </summary>
-        Replace
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/EntityKeyCollectionMergeApproach.cs b/src/CoreEx/Json/Merge/EntityKeyCollectionMergeApproach.cs
deleted file mode 100644
index 6fecda2f..00000000
--- a/src/CoreEx/Json/Merge/EntityKeyCollectionMergeApproach.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System.Collections;
-
-namespace CoreEx.Json.Merge
-{
-    /// <summary>
-    /// Defines the approach for a collection (see <see cref="ICollection"/>) that implements <see cref="ICompositeKeyCollection{T}"/>; being either <see cref="Replace"/> or <see cref="Merge"/>.
-    /// </summary>
-    /// <remarks>The formal specification <see href="https://tools.ietf.org/html/rfc7396"/> explictly states that an <see cref="System.Text.Json.JsonValueKind.Array"/> is to be a replacement operation. However, a <see cref="Merge"/> approach
-    /// can be advantageous as it simplifies the manipulation of an <see cref="System.Text.Json.JsonValueKind.Array"/> without having to provide all content within.</remarks>
-    public enum EntityKeyCollectionMergeApproach
-    {
-        /// <summary>
-        /// Indicates that the collection (see <see cref="ICompositeKeyCollection{T}"/>) merge will be treated the same as any <see cref="System.Text.Json.JsonValueKind.Array"/> where the result is a replacement (overwrite) operation.
-        /// </summary>
-        Replace,
-
-        /// <summary>
-        /// Indicates that the collection (see <see cref="ICompositeKeyCollection{T}"/>) merge will be managed by the checking of the <see cref="IEntityKey.EntityKey"/> for all items. Where the merge JSON does not provide a matching
-        /// <see cref="IEntityKey.EntityKey"/> it will be removed from the resulting collection. Where the merging <see cref="IEntityKey.EntityKey"/> already exists then a standard value merge will result (not a replacement); otherwise,
-        /// where the key does not exist, a resulting add will result.
-        /// </summary>
-        /// <remarks>Note: this is unique to <i>CoreEx</i> and not part of the formal specification <see href="https://tools.ietf.org/html/rfc7396"/>. However, this approach can be advantageous as it simplifies the manipulation of an
-        /// <see cref="System.Text.Json.JsonValueKind.Array"/> without having to provide all content within.</remarks>
-        Merge
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/Extended/JsonMergePatchEx.cs b/src/CoreEx/Json/Merge/Extended/JsonMergePatchEx.cs
deleted file mode 100644
index 3a750d41..00000000
--- a/src/CoreEx/Json/Merge/Extended/JsonMergePatchEx.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Collections;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Json.Merge.Extended
-{
-    /// <summary>
-    /// Provides a JSON Merge Patch (<c>application/merge-patch+json</c>) whereby the contents of a JSON document are merged into an existing object value (instance) as per <see href="https://tools.ietf.org/html/rfc7396"/>
-    /// using .NET Reflection (see <see cref="TypeReflectorArgs"/>).
-    /// </summary>
-    /// <remarks><para>This object should be reused where possible as it caches the JSON serialization semantics internally to improve performance. It is also thread-safe.</para>
-    /// <para>Additional logic has been added to the merge patch enabled by <see cref="JsonMergePatchExOptions.DictionaryMergeApproach"/> and <see cref="JsonMergePatchExOptions.EntityKeyCollectionMergeApproach"/>. Note: these capabilities are
-    /// unique to <i>CoreEx</i> and not part of the formal specification <see href="https://tools.ietf.org/html/rfc7396"/>.</para></remarks>
-    public class JsonMergePatchEx : IJsonMergePatch
-    {
-        private const string EKCollectionName = "EKColl";
-        private readonly TypeReflectorArgs _trArgs;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMergePatchEx"/> class.
-        /// </summary>
-        /// <param name="options">The <see cref="JsonMergePatchExOptions"/>.</param>
-        /// <remarks>This object should be reused where possible as it caches the JSON serialization semantics internally to improve performance. It is also thread-safe.</remarks>
-        public JsonMergePatchEx(JsonMergePatchExOptions? options = null)
-        {
-            Options = options ?? new JsonMergePatchExOptions();
-
-            _trArgs = new TypeReflectorArgs(Options.JsonSerializer)
-            {
-                AutoPopulateProperties = true,
-                NameComparer = Options.PropertyNameComparer,
-                TypeBuilder = tr =>
-                {
-                    // Determine if type implements IEntityKeyCollection.
-                    if (tr.Type.GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(ICompositeKeyCollection<>)))
-                        tr.Data.Add(EKCollectionName, true);
-                },
-                PropertyBuilder = pr => pr.PropertyExpression.IsJsonSerializable // Only interested in properties that are considered serializable.
-            };
-        }
-
-        /// <summary>
-        /// Gets the <see cref="JsonMergePatchExOptions"/>.
-        /// </summary>
-        public JsonMergePatchExOptions Options { get; }
-
-        /// <inheritdoc/>
-        public bool Merge<T>(BinaryData json, ref T? value)
-        {
-            // Parse the JSON.
-            var j = ParseJson<T>(json.ThrowIfNull(nameof(json)));
-
-            // Perform the root merge patch.
-            return MergeRoot(j.JsonElement, j.Value, ref value);
-        }
-
-        /// <inheritdoc/>
-        public async Task<(bool HasChanges, T? Value)> MergeAsync<T>(BinaryData json, Func<T?, CancellationToken, Task<T?>> getValue, CancellationToken cancellationToken = default)
-        {
-            getValue.ThrowIfNull(nameof(getValue));
-
-            // Parse the JSON.
-            var j = ParseJson<T>(json.ThrowIfNull(nameof(json)));
-
-            // Get the value.
-            T? value = await getValue(j.Value, cancellationToken).ConfigureAwait(false);
-            if (value == null)
-                return (false, default!);
-
-            // Perform the root merge patch.
-            return (MergeRoot(j.JsonElement, j.Value, ref value), value);
-        }
-
-        /// <inheritdoc/>
-        public async Task<Result<(bool HasChanges, T? Value)>> MergeWithResultAsync<T>(BinaryData json, Func<T?, CancellationToken, Task<Result<T?>>> getValue, CancellationToken cancellationToken = default)
-        {
-            getValue.ThrowIfNull(nameof(getValue));
-
-            // Parse the JSON.
-            var j = ParseJson<T>(json.ThrowIfNull(nameof(json)));
-
-            // Get the value.
-            var result = await getValue(j.Value!, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(value =>
-            {
-                if (value == null)
-                    return Result<(bool, T?)>.Ok((false, default));
-
-                // Perform the root merge patch.
-                return Result.Ok((MergeRoot(j.JsonElement, j.Value, ref value), value));
-            });
-        }
-
-        /// <summary>
-        /// Performs the merge patch.
-        /// </summary>
-        private bool MergeRoot<T>(JsonElement json, T? srce, ref T? dest)
-        {
-            bool hasChanged = false;
-
-            var tr = TypeReflector.GetReflector<T>(_trArgs);
-
-            switch (json.ValueKind)
-            {
-                case JsonValueKind.Null:
-                case JsonValueKind.True:
-                case JsonValueKind.False:
-                case JsonValueKind.String:
-                case JsonValueKind.Number:
-                    hasChanged = !tr.Compare(srce, dest);
-                    dest = srce;
-                    break;
-
-                case JsonValueKind.Object:
-                    if (tr.TypeCode == TypeReflectorTypeCode.IDictionary)
-                    {
-                        // Where merging into a dictionary this can be a replace or per item merge.
-                        if (Options.DictionaryMergeApproach == DictionaryMergeApproach.Replace)
-                        {
-                            hasChanged = !tr.Compare(dest, srce);
-                            if (hasChanged)
-                                dest = srce;
-                        }
-                        else
-                            dest = (T)MergeDictionary(tr, "$", json, (IDictionary)srce!, (IDictionary)dest!, ref hasChanged)!;
-                    }
-                    else
-                    {
-                        if (srce == null || dest == null)
-                        {
-                            hasChanged = !tr.Compare(dest, srce);
-                            if (hasChanged)
-                                dest = srce;
-                        }
-                        else
-                            MergeObject(tr, "$", json, srce, dest!, ref hasChanged);
-                    }
-
-                    break;
-
-                case JsonValueKind.Array:
-                    // Unless explicitly requested an array is a full replacement only (source copy); otherwise, perform key collection item merge.
-                    if (Options.EntityKeyCollectionMergeApproach != EntityKeyCollectionMergeApproach.Replace && tr.Data.ContainsKey(EKCollectionName))
-                        dest = (T)MergeKeyedCollection(tr, "$", json, (ICompositeKeyCollection)srce!, (ICompositeKeyCollection)dest!, ref hasChanged);
-                    else
-                    {
-                        hasChanged = !tr.Compare(dest, srce);
-                        if (hasChanged)
-                            dest = srce;
-                    }
-
-                    break;
-
-                default:
-                    throw new InvalidOperationException($"A JSON element of '{json.ValueKind}' is invalid where merging the root.");
-            }
-
-            return hasChanged;
-        }
-
-        /// <summary>
-        /// Parses the JSON.
-        /// </summary>
-        private (JsonElement JsonElement, T? Value) ParseJson<T>(BinaryData json)
-        {
-            try
-            {
-                // Deserialize into a temporary value which will be used as the merge source.
-                var value = Options.JsonSerializer.Deserialize<T>(json);
-
-                // Parse the JSON into a JsonElement which will be used to navigate the merge.
-                var jr = new Utf8JsonReader(json);
-                var je = JsonElement.ParseValue(ref jr);
-                return (je, value);
-            }
-            catch (JsonException jex)
-            {
-                throw new JsonMergePatchException(jex.Message, jex);
-            }
-        }
-
-        /// <summary>
-        /// Merge the object.
-        /// </summary>
-        private void MergeObject(ITypeReflector tr, string root, JsonElement json, object? srce, object dest, ref bool hasChanged)
-        {
-            foreach (var jp in json.EnumerateObject())
-            {
-                // Find the named property; skip when not found.
-                var pr = tr.GetJsonProperty(jp.Name);
-                if (pr == null)
-                    continue;
-
-                MergeProperty(pr, $"{root}.{jp.Name}", jp, srce, dest, ref hasChanged);
-            }
-        }
-
-        /// <summary>
-        /// Merge the property.
-        /// </summary>
-        private void MergeProperty(IPropertyReflector pr, string path, JsonProperty json, object? srce, object dest, ref bool hasChanged)
-        {
-            // Update according to the value kind.
-            switch (json.Value.ValueKind)
-            {
-                case JsonValueKind.Null:
-                case JsonValueKind.True:
-                case JsonValueKind.False:
-                case JsonValueKind.String:
-                case JsonValueKind.Number:
-                    // Update the value directly from the source.
-                    SetPropertyValue(pr, pr.PropertyExpression.GetValue(srce)!, dest, ref hasChanged);
-                    break;
-
-                case JsonValueKind.Object:
-                    // Where existing is null, copy source as-is; otherwise, merge object property-by-property.
-                    var current = pr.PropertyExpression.GetValue(dest);
-                    if (current == null)
-                        SetPropertyValue(pr, pr.PropertyExpression.GetValue(srce)!, dest, ref hasChanged);
-                    else
-                    {
-                        if (pr.TypeCode == TypeReflectorTypeCode.IDictionary)
-                        {
-                            // Where the merging into a dictionary this can be a replace or per item merge.
-                            if (Options.DictionaryMergeApproach == DictionaryMergeApproach.Replace)
-                                SetPropertyValue(pr, pr.PropertyExpression.GetValue(srce)!, dest, ref hasChanged);
-                            else
-                            {
-                                var dict = MergeDictionary(pr.GetTypeReflector()!, path, json.Value, (IDictionary)pr.PropertyExpression.GetValue(srce)!, (IDictionary)pr.PropertyExpression.GetValue(dest)!, ref hasChanged);
-                                SetPropertyValue(pr, dict, dest, ref hasChanged);
-                            }
-                        }
-                        else
-                            MergeObject(pr.GetTypeReflector()!, path, json.Value, pr.PropertyExpression.GetValue(srce), current, ref hasChanged);
-                    }
-
-                    break;
-
-                case JsonValueKind.Array:
-                    // Unless explicitly requested an array is a full replacement only (source copy); otherwise, perform key collection item merge.
-                    var tr = pr.GetTypeReflector()!;
-                    if (Options.EntityKeyCollectionMergeApproach != EntityKeyCollectionMergeApproach.Replace && tr.Data.ContainsKey(EKCollectionName))
-                    {
-                        var coll = MergeKeyedCollection(tr, path, json.Value, (ICompositeKeyCollection)pr.PropertyExpression.GetValue(srce)!, (ICompositeKeyCollection)pr.PropertyExpression.GetValue(dest)!, ref hasChanged);
-                        SetPropertyValue(pr, coll, dest, ref hasChanged);
-                    }
-                    else
-                        SetPropertyValue(pr, pr.PropertyExpression.GetValue(srce)!, dest, ref hasChanged);
-
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Sets the property value.
-        /// </summary>
-        private static void SetPropertyValue(IPropertyReflector pr, object? srce, object dest, ref bool hasChanged)
-        {
-            var curr = pr.PropertyExpression.GetValue(dest);
-            if (pr.Compare(curr, srce))
-                return;
-
-            pr.PropertyExpression.SetValue(dest, srce);
-            hasChanged = true;
-        }
-
-        /// <summary>
-        /// Merge an <see cref="IDictionary"/>.
-        /// </summary>
-        private IDictionary? MergeDictionary(ITypeReflector tr, string root, JsonElement json, IDictionary srce, IDictionary? dest, ref bool hasChanged)
-        {
-            var dict = dest;
-
-            // Iterate through the properties, each is an item that will be added to the new dictionary.
-            foreach (var jp in json.EnumerateObject())
-            {
-                var path = $"{root}.{jp.Name}";
-                var srceitem = srce[jp.Name];
-
-                if (srceitem == null)
-                {
-                    // A null value results in a remove operation.
-                    if (dict != null && dict.Contains(jp.Name))
-                    {
-                        dict.Remove(jp.Name);
-                        hasChanged = true;
-                    }
-
-                    continue;
-                }
-
-                // Create new destination dictionary where it does not exist already.
-                dict ??= (IDictionary)tr.CreateInstance();
-
-                // Find the existing and merge; otherwise, add as-is.
-                if (dict.Contains(jp.Name))
-                {
-                    var destitem = dict[jp.Name]!;
-                    switch (tr.ItemTypeCode)
-                    {
-                        case TypeReflectorTypeCode.Simple:
-                            if (!hasChanged && !tr.GetItemTypeReflector()!.Compare(dict[jp.Name], destitem))
-                                hasChanged = true;
-
-                            dict[jp.Name] = srceitem;
-                            continue;
-
-                        case TypeReflectorTypeCode.Complex:
-                            MergeObject(tr.GetItemTypeReflector()!, path, jp.Value, srceitem, destitem, ref hasChanged);
-                            dict[jp.Name] = destitem;
-                            continue;
-
-                        default:
-                            throw new NotSupportedException("A merge where a dictionary value is an array or other collection type is not supported.");
-                    }
-                }
-                else
-                {
-                    // Represents an add.
-                    hasChanged = true;
-                    dict[jp.Name] = srceitem;
-                }
-            }
-
-            return dict;
-        }
-
-        /// <summary>
-        /// Merge a <see cref="ICompositeKeyCollection"/>.
-        /// </summary>
-        private ICompositeKeyCollection MergeKeyedCollection(ITypeReflector tr, string root, JsonElement json, ICompositeKeyCollection srce, ICompositeKeyCollection? dest, ref bool hasChanged)
-        {
-            if (srce!.IsAnyDuplicates())
-                throw new JsonMergePatchException($"The JSON array must not contain items with duplicate '{nameof(IEntityKey)}' keys. Path: {root}");
-
-            if (dest != null && dest.IsAnyDuplicates())
-                throw new JsonMergePatchException($"The JSON array destination collection must not contain items with duplicate '{nameof(IEntityKey)}' keys prior to merge. Path: {root}");
-
-            // Create new destination collection; add each to maintain sent order as this may be important to the consuming application.
-            var coll = (ICompositeKeyCollection)tr.CreateInstance();
-
-            // Iterate through the items and add to the new collection.
-            var i = 0;
-            ITypeReflector ier = tr.GetItemTypeReflector()!;
-
-            foreach (var ji in json.EnumerateArray())
-            {
-                var path = $"{root}[{i}]";
-                if (ji.ValueKind != JsonValueKind.Object && ji.ValueKind != JsonValueKind.Null)
-                    throw new JsonMergePatchException($"The JSON array item must be an Object where the destination collection supports '{nameof(IEntityKey)}' keys. Path: {path}");
-
-                var srceitem = (IEntityKey)srce[i++]!;
-
-                // Find the existing and merge; otherwise, add as-is.
-                var destitem = srceitem == null ? null : dest?.GetByKey(srceitem.EntityKey);
-                if (destitem != null)
-                {
-                    MergeObject(ier, path, ji, srceitem, destitem, ref hasChanged);
-                    coll.Add(destitem);
-                }
-                else
-                    coll.Add(srceitem!);
-            }
-
-            return coll;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/Extended/JsonMergePatchExOptions.cs b/src/CoreEx/Json/Merge/Extended/JsonMergePatchExOptions.cs
deleted file mode 100644
index d45e3b9d..00000000
--- a/src/CoreEx/Json/Merge/Extended/JsonMergePatchExOptions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Json.Merge.Extended
-{
-    /// <summary>
-    /// The <see cref="JsonMergePatch"/> options.
-    /// </summary>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    public class JsonMergePatchExOptions(IJsonSerializer? jsonSerializer = null)
-    {
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public IJsonSerializer JsonSerializer { get; } = jsonSerializer ?? Json.JsonSerializer.Default;
-
-        /// <summary>
-        /// Gets or sets the <see cref="StringComparer"/> for matching the JSON name (defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>).
-        /// </summary>
-        public StringComparer PropertyNameComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Merge.DictionaryMergeApproach"/>. Defaults to <see cref="DictionaryMergeApproach.Merge"/>.
-        /// </summary>
-        public DictionaryMergeApproach DictionaryMergeApproach { get; set; } = DictionaryMergeApproach.Merge;
-
-        /// <summary>
-        /// Gets or sets the <see cref="Merge.EntityKeyCollectionMergeApproach"/>. Defaults to <see cref="DictionaryMergeApproach.Replace"/>.
-        /// </summary>
-        public EntityKeyCollectionMergeApproach EntityKeyCollectionMergeApproach { get; set; } = EntityKeyCollectionMergeApproach.Replace;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/IJsonMergePatch.cs b/src/CoreEx/Json/Merge/IJsonMergePatch.cs
deleted file mode 100644
index d8596e18..00000000
--- a/src/CoreEx/Json/Merge/IJsonMergePatch.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Json.Merge
-{
-    /// <summary>
-    /// Enables a JSON Merge Patch (<c>application/merge-patch+json</c>) whereby the contents of a JSON document are merged into an existing object value as per <see href="https://tools.ietf.org/html/rfc7396"/>.
-    /// </summary>
-    public interface IJsonMergePatch
-    {
-        /// <summary>
-        /// Merges the <paramref name="json"/> content into the <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="json">The JSON to merge.</param>
-        /// <param name="value">The value to merge into.</param>
-        /// <returns><c>true</c> indicates that changes were made to the <paramref name="value"/> as a result of the merge; otherwise, <c>false</c> for no changes.</returns>
-        bool Merge<T>(BinaryData json, ref T? value);
-
-        /// <summary>
-        /// Merges the <paramref name="json"/> content into the value returned by the <paramref name="getValue"/> function.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="json">The JSON to merge.</param>
-        /// <param name="getValue">The function to get the value to merge into. The function is passed in the <paramref name="json"/> deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that changes were made to the entity value as a result of the merge; otherwise, <c>false</c> for no changes. The merged value is also returned.</returns>
-        /// <remarks>Provides the opportunity to validate the JSON before getting the value where this execution order is important; i.e. get operation is expensive (latency).</remarks>
-        Task<(bool HasChanges, T? Value)> MergeAsync<T>(BinaryData json, Func<T?, CancellationToken, Task<T?>> getValue, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Merges the <paramref name="json"/> content into the value returned by the <paramref name="getValue"/> function (with a <see cref="Result{T}"/>).
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="json">The JSON to merge.</param>
-        /// <param name="getValue">The function to get the value to merge into. The function is passed in the <paramref name="json"/> deserialized value.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns><c>true</c> indicates that changes were made to the entity value as a result of the merge; otherwise, <c>false</c> for no changes. The merged value is also returned.</returns>
-        /// <remarks>Provides the opportunity to validate the JSON before getting the value where this execution order is important; i.e. get operation is expensive (latency).</remarks>
-        Task<Result<(bool HasChanges, T? Value)>> MergeWithResultAsync<T>(BinaryData json, Func<T?, CancellationToken, Task<Result<T?>>> getValue, CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/JsonMergePatch.cs b/src/CoreEx/Json/Merge/JsonMergePatch.cs
deleted file mode 100644
index 3acac61f..00000000
--- a/src/CoreEx/Json/Merge/JsonMergePatch.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json.Compare;
-using CoreEx.Results;
-using CoreEx.Text.Json;
-using System;
-using System.Buffers;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Json.Merge
-{
-    /// <summary>
-    /// Provides a JSON Merge Patch (<c>application/merge-patch+json</c>) whereby the contents of a JSON document are merged into an existing JSON document resulting in a new merged JSON document as per <see href="https://tools.ietf.org/html/rfc7396"/>.
-    /// </summary>
-    /// <param name="options">The <see cref="JsonMergePatchOptions"/>.</param>
-    public class JsonMergePatch(JsonMergePatchOptions? options = null) : IJsonMergePatch
-    {
-        /// <summary>
-        /// Gets the <see cref="JsonMergePatchOptions"/>.
-        /// </summary>
-        public JsonMergePatchOptions Options { get; } = options ?? new JsonMergePatchOptions();
-
-        /// <inheritdoc/>
-        public bool Merge<T>(BinaryData json, ref T? value)
-        {
-            // Parse the JSON.
-            var j = ParseJson<T>(json.ThrowIfNull(nameof(json)));
-            var t = SerializeToJsonElement(value);
-
-            // Perform the root merge patch.
-            if (!TryMerge(j.JsonElement, t, out var merged))
-                return false;
-
-            // Deserialize the merged JSON.
-            value = DeserializeFromJsonElement<T>(merged);
-            return true;
-        }
-
-        /// <inheritdoc/>
-        public async Task<(bool HasChanges, T? Value)> MergeAsync<T>(BinaryData json, Func<T?, CancellationToken, Task<T?>> getValue, CancellationToken cancellationToken = default)
-        {
-            getValue.ThrowIfNull(nameof(getValue));
-
-            // Parse the JSON.
-            var j = ParseJson<T>(json.ThrowIfNull(nameof(json))); 
-
-            // Get the value.
-            var value = await getValue(j.Value, cancellationToken).ConfigureAwait(false);
-            if (value == null)
-                return (false, default!);
-
-            // Perform the merge patch.
-            var t = SerializeToJsonElement(value);
-            if (!TryMerge(j.JsonElement, t, out var merged))
-                return (false, value);
-
-            // Deserialize the merged JSON.
-            return (true, DeserializeFromJsonElement<T>(merged));
-        }
-
-        /// <inheritdoc/>
-        public async Task<Result<(bool HasChanges, T? Value)>> MergeWithResultAsync<T>(BinaryData json, Func<T?, CancellationToken, Task<Result<T?>>> getValue, CancellationToken cancellationToken = default)
-        {
-            getValue.ThrowIfNull(nameof(getValue));
-
-            // Parse the JSON.
-            var j = ParseJson<T>(json.ThrowIfNull(nameof(json)));
-
-            // Get the value.
-            var result = await getValue(j.Value!, cancellationToken).ConfigureAwait(false);
-            return result.ThenAs(value =>
-            {
-                if (value == null)
-                    return (false, default);
-
-                // Perform the merge patch.
-                var t = SerializeToJsonElement(value);
-                if (!TryMerge(true, j.JsonElement, t, out var merged))
-                    return (false, value);
-
-                // Deserialize the merged JSON.
-                return (true, DeserializeFromJsonElement<T>(merged));
-            });
-        }
-
-        /// <summary>
-        /// Serialize the <paramref name="value"/> to a <see cref="JsonElement"/>.
-        /// </summary>
-        private JsonElement SerializeToJsonElement<T>(T value)
-        {
-            // Fast path where using System.Text.Json.
-            if (Options.JsonSerializer is CoreEx.Text.Json.JsonSerializer js)
-                return System.Text.Json.JsonSerializer.SerializeToElement(value, js.Options);
-
-            // Otherwise, serialize and then parse as two separate operations (slower path).
-            var bd = Options.JsonSerializer.SerializeToBinaryData(value);
-            var jr = new Utf8JsonReader(bd);
-            return JsonElement.ParseValue(ref jr).Clone();
-        }
-
-        /// <summary>
-        /// Deserialize the <paramref name="json"/> to a <typeparamref name="T"/>.
-        /// </summary>
-        private T? DeserializeFromJsonElement<T>(JsonElement json)
-        {
-            // Fast path where using System.Text.Json.
-            if (Options.JsonSerializer is CoreEx.Text.Json.JsonSerializer js)
-                return json.Deserialize<T>(js.Options);
-
-            // Otherwise, deserialize using the specified serializer.
-            return Options.JsonSerializer.Deserialize<T>(json.GetRawText());
-        }
-
-        /// <summary>
-        /// Parses the JSON.
-        /// </summary>
-        private (JsonElement JsonElement, T? Value) ParseJson<T>(BinaryData json)
-        {
-            try
-            {
-                // Deserialize into a temporary value which will be used as the merge source.
-                var value = Options.JsonSerializer.Deserialize<T>(json);
-
-                // Parse the JSON into a JsonElement which will be used to navigate the merge.
-                var jr = new Utf8JsonReader(json);
-                var je = JsonElement.ParseValue(ref jr).Clone();
-                return (je, value);
-            }
-            catch (JsonException jex)
-            {
-                throw new JsonMergePatchException(jex.Message, jex);
-            }
-        }
-
-        /// <summary>
-        /// Merges the <paramref name="json"/> with (into) the <paramref name="target"/>.
-        /// </summary>
-        /// <param name="json">The JSON to merge.</param>
-        /// <param name="target">The JSON target to merge with (into).</param>
-        /// <returns>The resulting merged <see cref="JsonElement"/>.</returns>
-        public JsonElement Merge(JsonElement json, JsonElement target)
-        {
-            TryMerge(false, json, target, out var merged);
-            return merged;
-        }
-
-        /// <summary>
-        /// Merges the <paramref name="json"/> with (into) the <paramref name="target"/> resulting in the <paramref name="merged"/> where changes were made.
-        /// </summary>
-        /// <param name="json">The JSON to merge.</param>
-        /// <param name="target">The JSON to merge with (into).</param>
-        /// <param name="merged">The resulting JSON where changes were made.</param>
-        /// <returns><c>true</c> indicates that changes were made as a result of the merge (see resulting <paramref name="merged"/>); otherwise, <c>false</c> for no changes.</returns>
-        public bool TryMerge(JsonElement json, JsonElement target, out JsonElement merged)
-        {
-            if (TryMerge(true, json, target, out var m))
-            {
-                merged = m;
-                return true;
-            }
-
-            merged = target;
-            return false;
-        }
-
-        /// <summary>
-        /// Orchestrates the 'actual' merge processing. The `checkForChanges` is used to determine whether to check for changes after the completed merge only where necessary; therefore, the boolean result is not always guaranteed to be accurate :-)
-        /// </summary>
-        private bool TryMerge(bool checkForChanges, JsonElement json, JsonElement target, out JsonElement merged)
-        {
-            // Create writer for the merged output.
-            var buffer = new ArrayBufferWriter<byte>();
-            using var writer = new Utf8JsonWriter(buffer);
-
-            var changed = TryMerge(json, target, writer, false);
-
-            writer.Flush();
-
-            // Read the merged output and parse.
-            var reader = new Utf8JsonReader(buffer.WrittenSpan);
-            merged = JsonElement.ParseValue(ref reader).Clone();
-
-            // Where check for changes is enabled then compare the target and merged JSON if not previously identified.
-            if (checkForChanges && !changed)
-            {
-                var comparer = new JsonElementComparer(new JsonElementComparerOptions { JsonSerializer = Options.JsonSerializer, PropertyNameComparer = Options.PropertyNameComparer, MaxDifferences = 1 });
-                changed = comparer.Compare(target, merged).HasDifferences;
-            }
-
-            return changed;
-        }
-
-        /// <summary>
-        /// Merge the JSON element (record 'change' where no additional cost to do so).
-        /// </summary>
-        private bool TryMerge(JsonElement json, JsonElement target, Utf8JsonWriter writer, bool changed)
-        {
-            // Where the kinds are different then simply accept the merge and acknowledge as changed.
-            if (json.ValueKind != target.ValueKind)
-            {
-                json.WriteTo(writer);
-                return true;
-            }
-
-            // Where the kinds are the same then process accordingly.
-            switch (json.ValueKind)
-            {
-                case JsonValueKind.Object:
-                    // An object is a property-by-property merge.
-                    return TryObjectMerge(json, target, writer, changed);
-
-                case JsonValueKind.Array:
-                    // An array is always a replacement.
-                    json.WriteTo(writer);
-                    if (json.GetArrayLength() != target.GetArrayLength())
-                        changed = true;
-
-                    break;
-
-                default:
-                    // Accept merge as-is.
-                    json.WriteTo(writer);
-                    break;
-            }
-
-            return changed;
-        }
-
-        /// <summary>
-        /// Merge the JSON object and properties (record 'change' where no cost to do so).
-        /// </summary>
-        private bool TryObjectMerge(JsonElement json, JsonElement target, Utf8JsonWriter writer, bool changed)
-        {
-            writer.WriteStartObject();
-
-            // Apply merge add/override.
-            foreach (var j in json.EnumerateObject())
-            {
-                // Where the property is new then add.
-                if (!TryGetProperty(target, j.Name, out var t))
-                {
-                    if (j.Value.ValueKind != JsonValueKind.Null)
-                        j.WriteTo(writer);
-
-                    changed = true;
-                    continue;
-                }
-
-                // Null is a remove; otherwise, override.
-                if (j.Value.ValueKind != JsonValueKind.Null)
-                {
-                    writer.WritePropertyName(j.Name);
-                    changed = TryMerge(j.Value, t, writer, changed);
-                }
-                else
-                    changed = true;
-            }
-
-            // Add existing target properties not being merged.
-            foreach (var t in target.EnumerateObject())
-            {
-                // Where found then consider as handled above!
-                if (TryGetProperty(json, t.Name, out _))
-                    continue;
-
-                t.WriteTo(writer);
-            }
-
-            writer.WriteEndObject();
-            return changed;
-        }
-
-        /// <summary>
-        /// Performs the TryGetProperty using the configured comparer.
-        /// </summary>
-        private bool TryGetProperty(JsonElement json, string propertyName, out JsonElement value)
-            => Options.PropertyNameComparer is null ? json.TryGetProperty(propertyName, out value) : json.TryGetProperty(propertyName, Options.PropertyNameComparer, out value);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/JsonMergePatchException.cs b/src/CoreEx/Json/Merge/JsonMergePatchException.cs
deleted file mode 100644
index 5d311975..00000000
--- a/src/CoreEx/Json/Merge/JsonMergePatchException.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Json.Merge
-{
-    /// <summary>
-    /// Represents a <see cref="JsonMergePatch"/> <see cref="ValidationException"/>.
-    /// </summary>
-    /// <remarks>Inherits from <see cref="ValidationException"/> as the <see cref="ValidationException.StatusCode"/> and related handling are the same.</remarks>
-    public class JsonMergePatchException : ValidationException
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMergePatchException"/> class.
-        /// </summary>
-        public JsonMergePatchException() : base() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMergePatchException"/> class with the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        public JsonMergePatchException(string message) : base(message) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMergePatchException"/> class with the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The exception message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public JsonMergePatchException(string message, Exception innerException) : base(message, innerException) { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/Merge/JsonMergePatchOptions.cs b/src/CoreEx/Json/Merge/JsonMergePatchOptions.cs
deleted file mode 100644
index ccca9a4e..00000000
--- a/src/CoreEx/Json/Merge/JsonMergePatchOptions.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Json.Merge
-{
-    /// <summary>
-    /// The <see cref="JsonMergePatch"/> options.
-    /// </summary>
-    /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>. Defaults to <see cref="Json.JsonSerializer.Default"/>.</param>
-    public class JsonMergePatchOptions(IJsonSerializer? jsonSerializer = null)
-    {
-        /// <summary>
-        /// Gets the <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public IJsonSerializer JsonSerializer { get; } = jsonSerializer ?? ExecutionContext.GetService<IJsonSerializer>() ?? Json.JsonSerializer.Default;
-
-        /// <summary>
-        /// Gets or sets the <see cref="StringComparer"/> for matching the JSON name (defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>).
-        /// </summary>
-        public StringComparer PropertyNameComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Json/README.md b/src/CoreEx/Json/README.md
index c6894ec7..ebed0ba6 100644
--- a/src/CoreEx/Json/README.md
+++ b/src/CoreEx/Json/README.md
@@ -1,36 +1,46 @@
-# CoreEx.Json
+# CoreEx.Json
 
-The `CoreEx.Json` namespace provides additional [JSON](https://en.wikipedia.org/wiki/JSON)-related capabilities.
+> Provides CoreEx-specific `System.Text.Json` defaults, converters, naming policies, JSON Merge Patch (RFC 7396), JSON property filtering (include/exclude), and reference-data-aware serialization.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Json` builds on `System.Text.Json` to provide a cohesive, pre-configured serialization layer for CoreEx applications. Rather than each service independently configuring `JsonSerializerOptions`, all serialization flows through `JsonDefaults`, which exposes a centrally configured `JsonSerializerOptions` instance (defaulting to camelCase, `WhenWritingDefault`, `JsonStringEnumConverter`, and CoreEx-specific converters) and resolves the runtime instance from the ambient `ExecutionContext` where available.
 
-.NET recently added [`System.Text.Json`](https://docs.microsoft.com/en-us/dotnet/api/system.text.json); however, there is still extensive usage of [`Newtonsoft.Json`](https://www.newtonsoft.com/json), and there can be [challenges migrating](https://docs.microsoft.com/en-us/dotnet/standard/serialization/system-text-json-migrate-from-newtonsoft-how-to) from the latter to the former depending on capabilties required. As such `CoreEx` is largely JSON serializer agnostic and provides implementations for each; whilst also providing additional JSON-related capabilities.
+Beyond basic serialization, the namespace provides two advanced document-level operations: `JsonMergePatch` (RFC 7396) for partial update semantics used in `PATCH` endpoints, and `JsonFilter` for surgical include/exclude projection of JSON properties — used by the `WebApi` helper to honor `$fields` query parameters. Custom converters handle CoreEx entity types (`DataMap<TValue>` and reference data codes) transparently.
 
-<br/>
+## Key capabilities
 
-## JSON Serializer
+- ⚙️ **Centralized defaults**: `JsonDefaults.Configuration` provides a single, customizable `JsonDefaultConfiguration` instance; `JsonDefaults.SerializerOptions` resolves the runtime options from `ExecutionContext` or the static configuration.
+- 🔤 **Substitute naming policy**: `JsonSubstituteNamingPolicy` wraps any naming policy and applies registered name substitutions (e.g. `Id` → `id`), enabling per-property JSON name overrides without `[JsonPropertyName]` attributes on every type.
+- 🔀 **JSON Merge Patch (RFC 7396)**: `JsonMergePatch` merges a patch JSON document into a target object, returning a `JsonMergePatchResult<T>` carrying the merged value and the set of changed property paths.
+- 📐 **JSON property filtering**: `JsonFilter` applies include or exclude path-based filters to a `JsonNode` or raw JSON string, removing unwanted properties. Used to implement `$fields` response projection.
+- 🗃️ **Reference data converter**: `JsonReferenceDataConverter` serializes reference data types as their `Code` string and deserializes back to the full reference data instance via `ReferenceDataOrchestrator`.
+- 🗺️ **Data map converter**: `JsonDataMapConverterFactory` handles `DataMap<TValue>` serialization, preserving exact key casing rather than applying the global naming policy.
+- ⚠️ **Exception converter**: `JsonExceptionConverterFactory` serializes `Exception` instances to a structured JSON object (type, message, inner exception chain), used when surfacing exception details in diagnostic responses.
 
-To be JSON serializer agnostic, _CoreEX_ introduces [`IJsonSerializer`](./IJsonSerializer.cs) which is used almost exclusively within _CoreEx_ to encapsulate common capabilities; primarily `Serialize`, `Deserialize` and `TryApplyFilter` (enables include/exclude property filtering).
+## Key types
 
-The following implementations are provided.
+| Type | Description |
+|------|-------------|
+| **[`JsonDefaults`](./JsonDefaults.cs)** | Central access point for the application's `JsonSerializerOptions`; resolves from `ExecutionContext` or the static `JsonDefaultConfiguration`. |
+| **[`JsonDefaults.JsonDefaultConfiguration`](./JsonDefaults.cs)** | Sealed inner class holding the default `JsonSerializerOptions` with CoreEx-specific converters and naming policy; customize at startup before any serialization occurs. |
+| **[`JsonSubstituteNamingPolicy`](./JsonSubstituteNamingPolicy.cs)** | `JsonNamingPolicy` implementation that applies registered name substitutions on top of a delegate naming policy (default: camelCase). |
+| **[`JsonMergePatch`](./JsonMergePatch.cs)** | Performs RFC 7396 JSON Merge Patch: merges a patch `BinaryData`/string into a typed target, returning `Result<JsonMergePatchResult<T>>` with the merged value and changed paths. |
+| **[`JsonMergePatchOptions`](./JsonMergePatchOptions.cs)** | Options for `JsonMergePatch`: controls whether `null` means removal (RFC default) or is treated as a value, and `StringComparison` for property matching. |
+| **[`JsonMergePatchResult<T>`](./JsonMergePatchResult.cs)** | Result record from `JsonMergePatch.Merge<T>()`: carries the merged `Value`, the collection of `ChangedPaths`, and a `HasChanges` flag. |
+| **[`JsonFilter`](./JsonFilter.cs)** | Static utility applying include/exclude JSON path filters to a `JsonNode` or JSON string; exact path matching with optional indexed or non-indexed path support. |
+| **[`JsonFilterOption`](./JsonFilterOption.cs)** | Enum controlling `JsonFilter` behavior: `Include` retains only listed paths; `Exclude` removes listed paths. |
+| [`JsonReferenceDataConverter`](./JsonReferenceDataConverter.cs) | `JsonConverter` that serializes reference data instances as their `Code` string and deserializes by looking up the code in `ReferenceDataOrchestrator`. |
+| [`JsonDataMapConverterFactory`](./JsonDataMapConverterFactory.cs) | `JsonConverterFactory` that handles `DataMap<TValue>` serialization with key-casing preservation. |
+| [`JsonExceptionConverterFactory`](./JsonExceptionConverterFactory.cs) | `JsonConverterFactory` that serializes `Exception` instances to structured JSON for diagnostic purposes. |
 
- - [`CoreEx.Text.Json.JsonSerializer`](../Text/Json/JsonSerializer.cs) - leverages [`System.Text.Json`](https://docs.microsoft.com/en-us/dotnet/api/system.text.json) (see [`CoreEx.Text.Json`](../Text/Json)).
- - [`CoreEx.Newtonsoft.Json.JsonSerializer`](../../CoreEx.Newtonsoft/Json/JsonSerializer.cs) - leverages [`Newtonsoft.Json`](https://www.newtonsoft.com/json) (see [`CoreEx.Newtonsoft.Json`](../../CoreEx.Newtonsoft/Json)).
+## Related Namespaces
 
-<br/>
-
-## JSON Merge
-
-Provides a JSON Merge Patch (`application/merge-patch+json`) whereby the contents of a JSON document are merged into an existing object value as per [RFC7396](https://tools.ietf.org/html/rfc7396). This is used to achieve the exclusive _CoreEx_ HTTP `PATCH` functionality within [`CoreEx.WebApis`](../WebApis).
-
-The [`IJsonMergePatch`](./Merge/IJsonMergePatch.cs) interface and [`JsonMergePatch`](./Merge/JsonMergePatch.cs) implementation enable this functionality. The [`JsonMergePatchOptions`](./Merge/JsonMergePatchOptions.cs) specifies the options to support alternate merge approaches; for example [`DictionaryMergeApproach`](./Merge/DictionaryMergeApproach.cs) and [`EntityKeyCollectionMergeApproach`](./Merge/EntityKeyCollectionMergeApproach.cs).
-
-<br/>
-
-## JSON Data
-
-The [`JsonDataReader`](./Data/JsonDataReader.cs) reads JSON (or YAML) data and converts into a corresponding typed collection; this is primarily intended to enable data loading scenarios.
+- **[`CoreEx`](../README.md)** - `ExecutionContext` carries the runtime `JsonSerializerOptions` instance consumed by `JsonDefaults.SerializerOptions`.
+- **[`CoreEx.Entities`](../Entities/README.md)** - `DataMap<TValue>` is serialized by `JsonDataMapConverterFactory`; `ReferenceDataBase` types are serialized by `JsonReferenceDataConverter`.
+- **[`CoreEx.RefData`](../RefData/README.md)** - `ReferenceDataOrchestrator` is called by `JsonReferenceDataConverter` to resolve codes back to reference data instances during deserialization.
+- **[`CoreEx.AspNetCore`](../../CoreEx.AspNetCore/README.md)** - `WebApi` helpers use `JsonMergePatch` for `PATCH` operations and `JsonFilter` for `$fields` response projection.
 
+## Additional Resources
 
+- [RFC 7396 — JSON Merge Patch](https://tools.ietf.org/html/rfc7396) - The specification that `JsonMergePatch` implements.
\ No newline at end of file
diff --git a/src/CoreEx/Localization/ITextProvider.cs b/src/CoreEx/Localization/ITextProvider.cs
index 4c9d444c..3343d88c 100644
--- a/src/CoreEx/Localization/ITextProvider.cs
+++ b/src/CoreEx/Localization/ITextProvider.cs
@@ -1,17 +1,14 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Localization;
 
-namespace CoreEx.Localization
+/// <summary>
+/// Enables the text localization for an <see cref="LText"/>.
+/// </summary>
+public interface ITextProvider
 {
     /// <summary>
-    /// Enables the localized text for a passed key.
+    /// Gets the localized text for the specified <see cref="LText"/>.
     /// </summary>
-    public interface ITextProvider
-    {
-        /// <summary>
-        /// Gets the text for the passed <see cref="LText"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="LText"/>.</param>
-        /// <returns>The corresponding text where found; otherwise, the <see cref="LText.FallbackText"/> where specified. Where nothing found or specified then the key itself will be returned.</returns>
-        string? GetText(LText key);
-    }
+    /// <param name="text">The <see cref="LText"/>.</param>
+    /// <returns>The corresponding text where found; otherwise, the <see cref="LText.FallbackText"/> where specified. Where nothing found or specified then the key itself will be returned.</returns>
+    string? GetText(LText text);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Localization/LText.cs b/src/CoreEx/Localization/LText.cs
index bac2c64c..4e1f9837 100644
--- a/src/CoreEx/Localization/LText.cs
+++ b/src/CoreEx/Localization/LText.cs
@@ -1,108 +1,199 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Localization;
 
-using System;
-
-namespace CoreEx.Localization
+/// <summary>
+/// Represents a localization agnostic text.
+/// </summary>
+public readonly struct LText : IEquatable<LText>
 {
     /// <summary>
-    /// Represents the <b>localization text</b> key/identifier to be used by the <see cref="TextProvider"/>.
+    /// Gets the empty <see cref="LText"/>.
+    /// </summary>
+    /// <remarks>The <see cref="KeyAndOrText"/> and <see cref="FallbackText"/> are both <see langword="null"/>.</remarks>
+    public static readonly LText Empty = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LText"/> with a <paramref name="keyAndOrText"/>.
     /// </summary>
-    public struct LText : IEquatable<LText>
+    /// <param name="keyAndOrText">The key and/or text.</param>
+    public LText(string? keyAndOrText) => KeyAndOrText = keyAndOrText;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LText"/> with a <paramref name="keyAndOrText"/> and optional <paramref name="fallbackText"/>.
+    /// </summary>
+    /// <param name="keyAndOrText">The key and/or text.</param>
+    /// <param name="fallbackText">The fallback text to be used when the <paramref name="keyAndOrText"/> is not found by the <see cref="TextProvider"/>.</param>
+    /// <param name="args">The object array that contains zero or more objects to format.</param>
+    /// <remarks>Where the <paramref name="fallbackText"/> is explicitly set to <see langword="null"/> this will set <see langword="null"/> as the explicit fallback versus using the <paramref name="keyAndOrText"/> (see <see cref="WasFallBackTextSetToNull"/>).</remarks>
+    public LText(string? keyAndOrText, string? fallbackText, params IEnumerable<object?> args)
     {
-        /// <summary>
-        /// Gets the empty <see cref="LText"/>.
-        /// </summary>
-        /// <remarks>The <see cref="KeyAndOrText"/> and <see cref="FallbackText"/> are both <c>null</c>.</remarks>
-        public static readonly LText Empty = new();
-
-        /// <summary>
-        /// Gets or sets the numeric (<see cref="long"/>) key/identifier format to convert to a standardized <see cref="string"/>.
-        /// </summary>
-        public static string NumericKeyFormat { get; set; } = "000000";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LText"/> with <c>null</c> <see cref="KeyAndOrText"/> and <see cref="FallbackText"/>.
-        /// </summary>
-        public LText()
-        {
-            KeyAndOrText = null;
-            FallbackText = null;
-        }
+        KeyAndOrText = keyAndOrText;
+        FallbackText = fallbackText;
+        if (fallbackText is null)
+            WasFallBackTextSetToNull = true;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LText"/> with a <paramref name="keyAndOrText"/> and optional <paramref name="fallbackText"/>.
-        /// </summary>
-        /// <param name="keyAndOrText">The key and/or text.</param>
-        /// <param name="fallbackText">The fallback text to be used when the <paramref name="keyAndOrText"/> is not found by the <see cref="TextProvider"/>.</param>
-        /// <remarks>At least one of the arguments must be specified.</remarks>
-        public LText(string? keyAndOrText, string? fallbackText = null)
-        {
-            KeyAndOrText = keyAndOrText;
-            FallbackText = fallbackText;
-        }
+        Args = [.. args];
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LText"/> copying the existing <see cref="LText"/>.
+    /// </summary>
+    /// <param name="ltext">The existing <see cref="LText"/>.</param>
+    /// <param name="args">The object array that contains zero or more objects to format.</param>
+    private LText(LText ltext, params IEnumerable<object?>? args)
+    {
+        KeyAndOrText = ltext.KeyAndOrText;
+        FallbackText = ltext.FallbackText;
+        WasFallBackTextSetToNull = ltext.WasFallBackTextSetToNull;
+        Args = args is null ? null : [ ..args];
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="LText"/> with an <see cref="long"/> key and optional <paramref name="fallbackText"/>.
-        /// </summary>
-        /// <param name="key">The key.</param>
-        /// <param name="fallbackText">The fallback text to be used when not found by the <see cref="TextProvider"/>.</param>
-        public LText(long key, string? fallbackText = null)
+    /// <summary>
+    /// Gets the key and/or text (where the key is not found, it will used as the text; unless a <see cref="FallbackText"/> is specified.
+    /// </summary>
+    public string? KeyAndOrText { get; }
+
+    /// <summary>
+    /// Gets the optional fallback text to be used when the <see cref="KeyAndOrText"/> is not found; where not specified the <see cref="KeyAndOrText"/> becomes the fallback text.
+    /// </summary>
+    public string? FallbackText { get; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="FallbackText"/> was explicitly set to <see langword="null"/> (i.e. the fallback is not the <see cref="KeyAndOrText"/>).
+    /// </summary>
+    public bool WasFallBackTextSetToNull { get; } = false;
+
+    /// <summary>
+    /// Gets the object array that contains zero or more objects to format.
+    /// </summary>
+    /// <remarks>Also consider using <see cref="WithArgs(IEnumerable{object?})"/> to extend.</remarks>
+    public object?[]? Args { get; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="LText"/> has <see cref="Args"/>.
+    /// </summary>
+    public bool HasArgs => Args is not null && Args.Length > 0;
+
+    /// <summary>
+    /// Indicates whether the <see cref="LText"/> is empty; i.e. the <see cref="KeyAndOrText"/> and <see cref="FallbackText"/> are both <see langword="null"/>.
+    /// </summary>
+    public readonly bool IsEmpty => KeyAndOrText is null && FallbackText is null;
+
+    /// <summary>
+    /// Creates a new <see cref="LText"/> extending (adds to) the <see cref="Args"/> with the specified <paramref name="args"/>.
+    /// </summary>
+    /// <param name="args">The object array that contains zero or more objects to format.</param>
+    /// <returns>The new <see cref="LText"/>.</returns>
+    public LText WithArgs(params IEnumerable<object?> args)
+    {
+        if (args is null || !args.Any())
+            return this;
+
+        return new LText(this, Args is null ? args : [.. Args, .. args]);
+    }
+
+    /// <summary>
+    /// Ensures that the <see cref="LText"/> has no <see cref="Args"/>; otherwise, will throw an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    /// <returns>The <see cref="LText"/> to support fluent-style method-chaining.</returns>
+    public readonly LText EnsureNoArgs()
+    {
+        if (Args is not null && Args.Length > 0)
+            throw new InvalidOperationException($"The {nameof(LText)} must have no {nameof(Args)} to be used in this capacity.");
+
+        return this;
+    }
+
+    /// <summary>
+    /// Ensures that the <see cref="LText"/> has no <see cref="Args"/> <i>when</i> <paramref name="args"/> have been specified; otherwise, will throw an <see cref="InvalidOperationException"/>.
+    /// </summary>
+    /// <param name="args">The object array that contains zero or more objects to format.</param>
+    /// <returns>The <see cref="LText"/> to support fluent-style method-chaining.</returns>
+    public readonly LText EnsureNoArgsWhen(params IEnumerable<object?> args)
+    {
+        if (args is null || !args.Any())
+            return this;
+
+        return EnsureNoArgs();
+    }
+
+    /// <summary>
+    /// Returns the <see cref="LText"/> as a <see cref="string"/> (see <see cref="TextProvider"/> <see cref="TextProvider.Current"/> <see cref="TextProviderBase.GetText(LText)"/>).
+    /// </summary>
+    /// <returns>The <see cref="LText"/> string value.</returns>
+    public override readonly string? ToString() => (string?)this;
+
+    /// <inheritdoc/>
+    public override readonly bool Equals(object? obj) => obj is LText r && Equals(r);
+
+    /// <inheritdoc/>
+    public readonly bool Equals(LText other) => KeyAndOrText == other.KeyAndOrText && FallbackText == other.FallbackText && WasFallBackTextSetToNull == other.WasFallBackTextSetToNull && ArrayEquals(Args, other.Args);
+
+    /// <summary>
+    /// Compare the two arrays for equality.
+    /// </summary>
+    private static bool ArrayEquals(object?[]? a, object?[]? b)
+    {
+        if (a is null && b is null)
+            return true;
+
+        if (a is null || b is null)
+            return false;
+
+        if (a.Length != b.Length)
+            return false;
+
+        return Enumerable.SequenceEqual(a, b);
+    }
+
+    /// <inheritdoc/>
+    public override readonly int GetHashCode()
+    {
+        var hashCode = new HashCode();
+        hashCode.Add(KeyAndOrText);
+        hashCode.Add(FallbackText);
+        hashCode.Add(WasFallBackTextSetToNull);
+        if (Args is not null)
         {
-            KeyAndOrText = key <= 0 ? throw new ArgumentException("Key must be a positive integer.", nameof(key)) : key.ToString(NumericKeyFormat, System.Globalization.CultureInfo.InvariantCulture);
-            FallbackText = fallbackText;
+            foreach (var arg in Args)
+                hashCode.Add(arg);
         }
 
-        /// <summary>
-        /// Gets or sets the key and/or text (where the key is not found, it will used as the text; unless a <see cref="FallbackText"/> is specified.
-        /// </summary>
-        public string? KeyAndOrText { get; }
-
-        /// <summary>
-        /// Gets or sets the optional fallback text to be used when the <see cref="KeyAndOrText"/> is not found by the <see cref="TextProvider"/> (where not specified the <see cref="KeyAndOrText"/> becomes the fallback text).
-        /// </summary>
-        public string? FallbackText { get; set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="LText"/> is empty; i.e. the <see cref="KeyAndOrText"/> and <see cref="FallbackText"/> are both <c>null</c>.
-        /// </summary>
-        public readonly bool IsEmpty => KeyAndOrText is null && FallbackText is null;
-
-        /// <summary>
-        /// Returns the <see cref="LText"/> as a <see cref="string"/> (see <see cref="TextProvider"/> <see cref="TextProvider.Current"/> <see cref="TextProviderBase.GetText(LText)"/>).
-        /// </summary>
-        /// <returns>The <see cref="LText"/> string value.</returns>
-        public override readonly string ToString() => this!;
-
-        /// <inheritdoc/>
-        public override readonly bool Equals(object? obj) => obj is LText r && Equals(r);
-
-        /// <inheritdoc/>
-        public readonly bool Equals(LText other) => KeyAndOrText == other.KeyAndOrText && FallbackText == other.FallbackText;
-
-        /// <inheritdoc/>
-        public override readonly int GetHashCode() => HashCode.Combine(KeyAndOrText, FallbackText);
-
-        /// <summary>
-        /// Indicates whether the current <see cref="LText"/> is equal to another <see cref="LText"/>.
-        /// </summary>
-        public static bool operator ==(LText left, LText right) => left.Equals(right);
-
-        /// <summary>
-        /// Indicates whether the current <see cref="LText"/> is not equal to another <see cref="LText"/>.
-        /// </summary>
-        public static bool operator !=(LText left, LText right) => !(left == right);
-
-        /// <summary>
-        /// An implicit cast from an <see cref="LText"/> to a <see cref="string"/> (see <see cref="TextProvider"/> <see cref="TextProvider.Current"/> <see cref="TextProviderBase.GetText(LText)"/>).
-        /// </summary>
-        /// <param name="text">The <see cref="LText"/>.</param>
-        /// <returns>The corresponding text where found; otherwise, the <see cref="FallbackText"/> where specified. Where nothing found or specified then the key itself will be returned.</returns>
-        public static implicit operator string(LText text) => TextProvider.Current.GetText(text)!;
-
-        /// <summary>
-        /// An implicit cast from a text <see cref="string"/> to an <see cref="LText"/> value updating the <see cref="KeyAndOrText"/>.
-        /// </summary>
-        /// <param name="keyAndOrText">The key and/or text.</param>
-        public static implicit operator LText(string keyAndOrText) => keyAndOrText is null ? Empty : new(keyAndOrText);
+        return hashCode.ToHashCode();
     }
+
+    /// <summary>
+    /// Indicates whether the current <see cref="LText"/> is equal to another <see cref="LText"/>.
+    /// </summary>
+    public static bool operator ==(LText left, LText right) => left.Equals(right);
+
+    /// <summary>
+    /// Indicates whether the current <see cref="LText"/> is not equal to another <see cref="LText"/>.
+    /// </summary>
+    public static bool operator !=(LText left, LText right) => !(left == right);
+
+    /// <summary>
+    /// An implicit cast from an <see cref="LText"/> to a <see cref="string"/> (see <see cref="TextProvider"/> <see cref="TextProvider.Current"/> <see cref="TextProviderBase.GetText(LText)"/>).
+    /// </summary>
+    /// <param name="text">The <see cref="LText"/>.</param>
+    /// <returns>The corresponding text where found; otherwise, the <see cref="FallbackText"/> where specified. Where nothing found or specified then the key itself will be returned.</returns>
+    public static implicit operator string?(LText text) => TextProvider.Current.GetText(text)!;
+
+    /// <summary>
+    /// An implicit cast from an <see cref="LText"/> to a <see cref="string"/> (see <see cref="TextProvider"/> <see cref="TextProvider.Current"/> <see cref="TextProviderBase.GetText(LText)"/>).
+    /// </summary>
+    /// <param name="text">The <see cref="LText"/>.</param>
+    /// <returns>The corresponding text where found; otherwise, the <see cref="FallbackText"/> where specified. Where nothing found or specified then the key itself will be returned.</returns>
+    public static implicit operator string?(LText? text) => text is null ? null : TextProvider.Current.GetText(text.Value);
+
+    /// <summary>
+    /// An implicit cast from a text <see cref="string"/> to an <see cref="LText"/> value updating the <see cref="KeyAndOrText"/>.
+    /// </summary>
+    /// <param name="keyAndOrText">The key and/or text.</param>
+    public static implicit operator LText(string? keyAndOrText) => keyAndOrText is null ? Empty : new(keyAndOrText);
+
+    /// <summary>
+    /// An implicit cast from a text <see cref="string"/> to an <see cref="LText"/> value updating the <see cref="KeyAndOrText"/>.
+    /// </summary>
+    /// <param name="keyAndOrText">The key and/or text.</param>
+    public static implicit operator LText?(string? keyAndOrText) => keyAndOrText is null ? null : new(keyAndOrText);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Localization/LocalizationAttribute.cs b/src/CoreEx/Localization/LocalizationAttribute.cs
new file mode 100644
index 00000000..5d989581
--- /dev/null
+++ b/src/CoreEx/Localization/LocalizationAttribute.cs
@@ -0,0 +1,26 @@
+namespace CoreEx.Localization;
+
+/// <summary>
+/// An attribute to define the localization <see cref="LText"/> for a property.
+/// </summary>
+/// <param name="keyAndOrText">The key and/or text.</param>
+/// <param name="fallbackText">The optional fallback text to be used when the <paramref name="keyAndOrText"/> is not found.</param>
+[AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+public class LocalizationAttribute(string keyAndOrText, string? fallbackText = null) : Attribute
+{
+    /// <summary>
+    /// Gets the key and/or text (where the key is not found, it will used as the text; unless a <see cref="FallbackText"/> is specified.
+    /// </summary>
+    public string? KeyAndOrText { get; } = keyAndOrText.ThrowIfNullOrEmpty();
+
+    /// <summary>
+    /// Gets the optional fallback text to be used when the <see cref="KeyAndOrText"/> is not found; where not specified the <see cref="KeyAndOrText"/> becomes the fallback text.
+    /// </summary>
+    public string? FallbackText { get; } = fallbackText;
+
+    /// <summary>
+    /// Creates a new <see cref="LText"/> instance based on the attribute values and any optional arguments.
+    /// </summary>
+    /// <returns>The new <see cref="LText"/> instance.</returns>
+    public LText ToLText() => FallbackText is null ? new LText(KeyAndOrText) : new LText(KeyAndOrText, FallbackText);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Localization/NullTextProvider.cs b/src/CoreEx/Localization/NullTextProvider.cs
index 20c85df0..910f15b8 100644
--- a/src/CoreEx/Localization/NullTextProvider.cs
+++ b/src/CoreEx/Localization/NullTextProvider.cs
@@ -1,17 +1,10 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Localization;
 
-namespace CoreEx.Localization
+/// <summary>
+/// Provides a <see langword="null"/> <see cref="TextProviderBase"/> implementation; the <see cref="GetFormattedText"/> will always return <see langword="null"/>.
+/// </summary>
+public class NullTextProvider : TextProviderBase
 {
-    /// <summary>
-    /// Provides a null <see cref="TextProviderBase"/> implementation; the <see cref="GetTextForKey"/> will return <c>null</c>.
-    /// </summary>
-    public class NullTextProvider : TextProviderBase
-    {
-        /// <summary>
-        /// Gets the text for the passed <see cref="LText"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="LText"/>.</param>
-        /// <returns>The corresponding text where found; otherwise <c>null</c>.</returns>
-        protected override string? GetTextForKey(LText key) => null;
-    }
+    /// <inheritdoc/>
+    protected override string? GetFormattedText(LText text) => null;
 }
\ No newline at end of file
diff --git a/src/CoreEx/Localization/README.md b/src/CoreEx/Localization/README.md
index 3a9e26e5..32b044c2 100644
--- a/src/CoreEx/Localization/README.md
+++ b/src/CoreEx/Localization/README.md
@@ -1,31 +1,36 @@
-# CoreEx.Localization
+# CoreEx.Localization
 
-The `CoreEx.Localization` namespace provides additional localization capabilities.
+> Provides `LText` — a lightweight localization-agnostic text container — and `TextProvider` / `ITextProvider` for pluggable resource-key-to-string resolution used throughout CoreEx for user-facing messages.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Localization` decouples user-facing string content from the code that defines it. `LText` is a readonly struct that carries either a raw string, a resource key, or both — along with optional fallback text and format arguments. At the point of display or serialization, the ambient `TextProvider.Current` is called to resolve the final string, allowing the application to plug in any localization source (resource files, databases, translation services) without changing message definitions.
 
-To enable extended (additional) localization capabilities.
+The default `TextProvider` returns `LText.KeyAndOrText` unchanged (the key itself acts as the display string), making the system work out-of-the-box without any localization infrastructure. A custom provider is registered by setting `TextProvider.SetTextProvider(ITextProvider)` at startup.
 
-<br/>
+CoreEx uses `LText` internally for all validation error messages, exception messages, and formatted user-facing text, ensuring that every system-generated message can be localized by the consuming application.
 
-## Text localization
+## Key capabilities
 
-To simplify the localization of strings a localized text struct, [`LText`](./LText.cs), has been introduced.
+- 🌐 **Localization-agnostic text**: `LText` carries a key and/or text value with optional fallback text and format arguments; resolution is deferred to the ambient `TextProvider.Current`.
+- 🔌 **Pluggable text provider**: `ITextProvider` is a single-method interface (`GetText`); any implementation can be registered as the application-wide text resolver via `TextProvider.SetTextProvider()`.
+- 📝 **Formatted messages**: `LText` supports format argument arrays; `TextProvider` applies `string.Format` after key resolution, enabling `"Field is required: {0}"` style messages with runtime values.
+- ✅ **Zero-config default**: `NullTextProvider` returns the raw `KeyAndOrText` value unchanged, so the system works without any localization setup for development and testing.
+- 🏷️ **Localization attribute**: `[LocalizationAttribute]` marks a property with a corresponding localizable `LText` definition, enabling runtime (reflection-based) discovery of localizable content.
 
-The `LText` supports a constructor that takes a `keyAndOrText` being the key and/or text used to lookup the localized value, and an optional `fallbackText` to be used where the lookup fails. Where no text is found, then the originating `keyAndOrText` will be used.
+## Key types
 
-Additionally, the `LText` supports an implicit operator to and from a `string`, which enables the casting thereof providing a natural development experience. 
-
-The casting to a `string` is the action that performs the lookup. This invokes the static [`TextProvider.Current`](./TextProvider.cs) property, which is an instance of the [`ITextProvider`](./ITextProvider.cs) interface.
-
-<br/>
-
-## Text provider
-
-To support the `LText` lookup functionality an [`ITextProvider`](./ITextProvider.cs) implementation is required to enable. It is the responsibility of the `GetText` method to perform using the following logic, use: a) the corresponding text where found, b) the fallback text, and finally c) the key itself. 
-
-An implementation is provided within [`CoreEx.Validation`](../../CoreEx.Validation), being [`ValidationTextProvider`](../../CoreEx.Validation/ValidationTextProvider.cs) that uses embedded resources for the strings.
+| Type | Description |
+|------|-------------|
+| **[`LText`](./LText.cs)** | Readonly struct carrying a `KeyAndOrText`, optional `FallbackText`, optional format `Args`, and `WasFallBackTextSetToNull` flag; implicitly converts from `string`. |
+| **[`TextProvider`](./TextProvider.cs)** | Static accessor for the ambient `ITextProvider`; call `TextProvider.SetTextProvider(impl)` at startup to register a custom provider; `TextProvider.Current` resolves the active provider. |
+| _[`TextProviderBase`](./TextProviderBase.cs)_ | Abstract base for `ITextProvider` implementations; handles fallback logic (key lookup → fallback text → key-as-text). |
+| **[`NullTextProvider`](./NullTextProvider.cs)** | Default `ITextProvider` that returns `LText.KeyAndOrText` unchanged — no resource lookup is performed. |
+| [`ITextProvider`](./ITextProvider.cs) | Interface with a single `GetText(LText)` method returning the resolved string. |
+| [`LocalizationAttribute`](./LocalizationAttribute.cs) | Property attribute marking the presence of a localizable `LText` definition for runtime (reflection-based) discovery. |
 
+## Related Namespaces
 
+- **[`CoreEx`](../README.md)** - Semantic exception types such as `ValidationException`, `BusinessException`, and `NotFoundException` carry `LText` messages that pass through `TextProvider` when rendered.
+- **[`CoreEx.Validation`](../Validation/README.md)** - All built-in validation rule error messages are defined as `LText` constants, resolved at runtime via `TextProvider.Current`.
+- **[`CoreEx.Entities`](../Entities/README.md)** - `MessageItem.Text` is of type `LText`, enabling field-level validation messages to participate in localization.
\ No newline at end of file
diff --git a/src/CoreEx/Localization/TextProvider.cs b/src/CoreEx/Localization/TextProvider.cs
index 512ca450..fd341936 100644
--- a/src/CoreEx/Localization/TextProvider.cs
+++ b/src/CoreEx/Localization/TextProvider.cs
@@ -1,39 +1,53 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Localization;
 
-using System;
-
-namespace CoreEx.Localization
+/// <summary>
+/// Provides access to the global/static <see cref="Current"/> and <see cref="GetUICulture"/>, etc.
+/// </summary>
+public static class TextProvider
 {
+    private static ITextProvider? _textProvider;
+    private static ITextProvider? _backupTextProvider;
+
     /// <summary>
-    /// Provides access to the global/static <see cref="Current"/> instance.
+    /// Sets the <see cref="Current"/> <see cref="ITextProvider"/> instance explicitly.
     /// </summary>
-    public static class TextProvider
+    /// <param name="textProvider">The concrete <see cref="ITextProvider"/> instance.</param>
+    public static void SetTextProvider(ITextProvider? textProvider) => _textProvider = textProvider;
+
+    /// <summary>
+    /// Gets the current <see cref="ITextProvider"/> instance using in the following order: <see cref="ExecutionContext.GetService{T}"/>, the explicit <see cref="SetTextProvider(ITextProvider)"/>, otherwise, <see cref="NullTextProvider"/>. 
+    /// </summary>
+    public static ITextProvider Current
     {
-        private static ITextProvider? _textProvider;
-        private static ITextProvider? _backupTextProvider;
-
-        /// <summary>
-        /// Sets the <see cref="Current"/> <see cref="ITextProvider"/> instance explicitly.
-        /// </summary>
-        /// <param name="textProvider">The concrete <see cref="ITextProvider"/> instance.</param>
-        public static void SetTextProvider(ITextProvider? textProvider) => _textProvider = textProvider;
-
-        /// <summary>
-        /// Gets the current <see cref="ITextProvider"/> instance using in the following order: <see cref="ExecutionContext.GetService{T}"/>, the explicit <see cref="SetTextProvider(ITextProvider)"/>, otherwise, <see cref="NullTextProvider"/>. 
-        /// </summary>
-        public static ITextProvider Current
+        get
         {
-            get
-            {
-                var tp = ExecutionContext.GetService<ITextProvider>();
-                if (tp != null)
-                    return tp;
+            var tp = ExecutionContext.GetService<ITextProvider>();
+            if (tp is not null)
+                return tp;
 
-                if (_textProvider != null)
-                    return _textProvider;
+            if (_textProvider is not null)
+                return _textProvider;
 
-                return _backupTextProvider ??= new NullTextProvider();
-            }
+            return _backupTextProvider ??= new NullTextProvider();
         }
     }
+
+    /// <summary>
+    /// Gets the current UI <see cref="CultureInfo"/> (i.e. <see cref="ExecutionContext.UICulture"/> or <see cref="CultureInfo.CurrentCulture"/>).
+    /// </summary>
+    public static CultureInfo GetUICulture() => ExecutionContext.TryGetCurrent(out var ec) ? ec.UICulture : CultureInfo.CurrentUICulture;
+
+    /// <summary>
+    /// Replaces the format items in a string with the string representations of the corresponding objects in the specified array.
+    /// </summary>
+    /// <param name="format">The format string.</param>
+    /// <param name="args">The optional arguments.</param>
+    /// <remarks>The <see cref="string.Format(System.IFormatProvider, string, object[])"/> is used with the <see cref="GetUICulture"/> as the <see cref="System.IFormatProvider"/>.</remarks>
+    public static string? Format(string? format, object?[]? args)
+    {
+        if (format is null || args is null || args.Length == 0)
+            return format;
+
+        return string.Format(GetUICulture(), format, args);
+    }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Localization/TextProviderBase.cs b/src/CoreEx/Localization/TextProviderBase.cs
index fb2c8d9d..1d009cd2 100644
--- a/src/CoreEx/Localization/TextProviderBase.cs
+++ b/src/CoreEx/Localization/TextProviderBase.cs
@@ -1,30 +1,24 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Localization;
 
-namespace CoreEx.Localization
+/// <summary>
+/// Provides the base text localization functionality for an <see cref="LText"/>.
+/// </summary>
+public abstract class TextProviderBase : ITextProvider
 {
-    /// <summary>
-    /// Provides the localized text for a passed key.
-    /// </summary>
-    public abstract class TextProviderBase : ITextProvider
+    /// <inheritdoc/>
+    public string? GetText(LText text)
     {
-        /// <summary>
-        /// Gets the text for the passed <see cref="LText"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="LText"/>.</param>
-        /// <returns>The corresponding text where found; otherwise, the <see cref="LText.FallbackText"/> where specified. Where nothing found or specified then the key itself will be returned.</returns>
-        public string? GetText(LText key)
-        {
-            if (key.KeyAndOrText == null)
-                return key.FallbackText;
-
-            return GetTextForKey(key) ?? key.FallbackText ?? key.KeyAndOrText;
-        }
+        if (text.KeyAndOrText is null)
+            return TextProvider.Format(text.FallbackText, text.Args);
 
-        /// <summary>
-        /// Gets the text for the passed <see cref="LText"/>.
-        /// </summary>
-        /// <param name="key">The <see cref="LText"/>.</param>
-        /// <returns>The corresponding text where found; otherwise, <c>null</c>.</returns>
-        protected abstract string? GetTextForKey(LText key);
+        return GetFormattedText(text) ?? TextProvider.Format(text.FallbackText ?? (text.WasFallBackTextSetToNull ? null : text.KeyAndOrText), text.Args);
     }
+
+    /// <summary>
+    /// Gets the final formatted localized text for the specified <see cref="LText"/>.
+    /// </summary>
+    /// <param name="text">The <see cref="LText"/>.</param>
+    /// <returns>The corresponding localized text where found; otherwise, <see langword="null"/> (will use the <see cref="LText.FallbackText"/> where specified).</returns>
+    /// <remarks>This should leverage the <see cref="TextProvider.Format"/> to ensure intended outcome with any included <see cref="LText.Args"/>.</remarks>
+    protected abstract string? GetFormattedText(LText text);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/BiDirectionMapperT2.cs b/src/CoreEx/Mapping/BiDirectionMapperT2.cs
new file mode 100644
index 00000000..77883329
--- /dev/null
+++ b/src/CoreEx/Mapping/BiDirectionMapperT2.cs
@@ -0,0 +1,66 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides a bi-direction mapper between <typeparamref name="TSource"/> and <typeparamref name="TDestination"/>.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <remarks>The <see cref="To"/> is a left-to-right <see cref="IMapper"/>, with the <see cref="From"/> being a right-to-left <see cref="IMapper"/>.</remarks>
+public abstract class BiDirectionMapper<TSource, TDestination> : IBiDirectionMapper<TSource, TDestination> where TSource : class where TDestination : class
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BiDirectionMapper{TSource, TDestination}"/> class.
+    /// </summary>
+    public BiDirectionMapper()
+    {
+        if (typeof(TSource) == typeof(TDestination))
+            throw new InvalidOperationException($"{nameof(BiDirectionMapper<,>)} source and destination types cannot be the same.");
+
+        To = new SourceToDestinationMapper(OnMap);
+        From = new DestinationToSourceMapper(OnMap);
+    }
+
+    /// <inheritdoc/>
+    public IMapper<TSource, TDestination> To { get; }
+
+    /// <inheritdoc/>
+    public IMapper<TDestination, TSource> From { get; }
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> (<typeparamref name="TSource"/>) value to a new destination (<typeparamref name="TDestination"/>) value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination value.</returns>
+    /// <remarks>This represents the left-to-right mapping direction.</remarks>
+    protected abstract TDestination OnMap(TSource source);
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> (<typeparamref name="TDestination"/>) value to a new destination (<typeparamref name="TSource"/>) value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination value.</returns>
+    /// <remarks>This represents the right-to-left mapping direction.</remarks>
+    protected abstract TSource OnMap(TDestination source);
+
+    /// <summary>
+    /// Provides the underlying <typeparamref name="TSource"/> to <typeparamref name="TSource"/> mapping.
+    /// </summary>
+    public sealed class SourceToDestinationMapper(Func<TSource, TDestination> map) : Mapper<TSource, TDestination>
+    {
+        private readonly Func<TSource, TDestination> _map = map;
+
+        /// <inheritdoc/>
+        protected override TDestination OnMap(TSource source) => _map(source);
+    }
+
+    /// <summary>
+    /// Provides the underlying <typeparamref name="TDestination"/> to <typeparamref name="TSource"/> mapping.
+    /// </summary>
+    public sealed class DestinationToSourceMapper(Func<TDestination, TSource> map) : Mapper<TDestination, TSource>
+    {
+        private readonly Func<TDestination, TSource> _map = map;
+
+        /// <inheritdoc/>
+        protected override TSource OnMap(TDestination source) => _map(source);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/BiDirectionMapperT3.cs b/src/CoreEx/Mapping/BiDirectionMapperT3.cs
new file mode 100644
index 00000000..363be01e
--- /dev/null
+++ b/src/CoreEx/Mapping/BiDirectionMapperT3.cs
@@ -0,0 +1,80 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides a bi-directional singleton mapper between <typeparamref name="TSource"/> and <typeparamref name="TDestination"/>.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The <see cref="BiDirectionMapper{TSource, TDestination, TSelf}"/> <see cref="Type"/>.</typeparam>
+/// <remarks>The <see cref="To"/> is a left-to-right <see cref="IMapper"/>, with the <see cref="From"/> being a right-to-left <see cref="IMapper"/></remarks>
+public abstract class BiDirectionMapper<TSource, TDestination, TSelf> : IBiDirectionMapper<TSource, TDestination> where TSource : class where TDestination : class where TSelf : BiDirectionMapper<TSource, TDestination, TSelf>, new()
+{
+    /// <summary>
+    /// Static constructor.
+    /// </summary>
+    static BiDirectionMapper()
+    {
+        Default = new TSelf();
+        To = new SourceToDestinationMapper(Default.OnMap);
+        From = new DestinationToSourceMapper(Default.OnMap);
+    }
+
+    /// <summary>
+    /// Gets the default <typeparamref name="TSelf"/> instance.
+    /// </summary>
+    public static TSelf Default { get; }
+
+    /// <inheritdoc/>
+    IMapper<TSource, TDestination> IBiDirectionMapper<TSource, TDestination>.To => To;
+
+    /// <inheritdoc/>
+    IMapper<TDestination, TSource> IBiDirectionMapper<TSource, TDestination>.From => From;
+
+    /// <summary>
+    /// Gets the default underlying <see cref="SourceToDestinationMapper"/> singleton instance.
+    /// </summary>
+    public static SourceToDestinationMapper To { get; }
+
+    /// <summary>
+    /// Gets the default underlying <see cref="DestinationToSourceMapper"/> singleton instance.
+    /// </summary>
+    public static DestinationToSourceMapper From { get; }
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> (<typeparamref name="TSource"/>) value to a new destination (<typeparamref name="TDestination"/>) value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination value.</returns>
+    /// <remarks>This represents the left-to-right mapping direction.</remarks>
+    protected abstract TDestination OnMap(TSource source);
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> (<typeparamref name="TDestination"/>) value to a new destination (<typeparamref name="TSource"/>) value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination value.</returns>
+    /// <remarks>This represents the right-to-left mapping direction.</remarks>
+    protected abstract TSource OnMap(TDestination source);
+
+    /// <summary>
+    /// Provides the underlying <typeparamref name="TSource"/> to <typeparamref name="TSource"/> mapping.
+    /// </summary>
+    public sealed class SourceToDestinationMapper(Func<TSource, TDestination> map) : Mapper<TSource, TDestination>
+    {
+        private readonly Func<TSource, TDestination> _map = map;
+
+        /// <inheritdoc/>
+        protected override TDestination OnMap(TSource source) => _map(source);
+    }
+
+    /// <summary>
+    /// Provides the underlying <typeparamref name="TDestination"/> to <typeparamref name="TSource"/> mapping.
+    /// </summary>
+    public sealed class DestinationToSourceMapper(Func<TDestination, TSource> map) : Mapper<TDestination, TSource>
+    {
+        private readonly Func<TDestination, TSource> _map = map;
+
+        /// <inheritdoc/>
+        protected override TSource OnMap(TDestination source) => _map(source);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/BidirectionalMapper.cs b/src/CoreEx/Mapping/BidirectionalMapper.cs
deleted file mode 100644
index 6e322eda..00000000
--- a/src/CoreEx/Mapping/BidirectionalMapper.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Mapping;
-
-/// <summary>
-/// Provides a bidirectional mapper that encapsulates two <see cref="IMapper{TFrom, TTo}"/>; one for each direction.
-/// </summary>
-/// <typeparam name="TFrom">The from <see cref="Type"/>.</typeparam>
-/// <typeparam name="TTo">The to <typeparamref name="TTo"/>.</typeparam>
-/// <param name="mapperFromTo">The from/to mapper.</param>
-/// <param name="mapperToFrom">The to/from mapper.</param>
-/// <param name="mapNullIfNull">Indicates whether to map <c>null</c> source value to a corresponding <c>null</c> destination automatically.</param>
-public class BidirectionalMapper<TFrom, TTo>(IMapper<TFrom, TTo> mapperFromTo, IMapper<TTo, TFrom> mapperToFrom, bool mapNullIfNull = false) : IBidirectionalMapper<TFrom, TTo> where TFrom : class, new() where TTo : class, new()
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BidirectionalMapper{TFrom, TTo}"/> class.
-    /// </summary>
-    /// <param name="mapFromTo">The from/to mapping.</param>
-    /// <param name="mapToFrom">The to/from mapping.</param>
-    /// <param name="mapNullIfNull">Indicates whether to map <c>null</c> source value to a corresponding <c>null</c> destination automatically.</param> 
-    public BidirectionalMapper(Func<TFrom?, TTo?, OperationTypes, TTo?> mapFromTo, Func<TTo?, TFrom?, OperationTypes, TFrom?> mapToFrom, bool mapNullIfNull = false) : this(new Mapper<TFrom, TTo>(mapFromTo), new Mapper<TTo, TFrom>(mapToFrom), mapNullIfNull) { }
-
-    /// <inheritdoc/>
-    public IMapper<TFrom, TTo> MapperFromTo { get; } = mapperFromTo.ThrowIfNull(nameof(mapperFromTo));
-
-    /// <inheritdoc/>
-    public IMapper<TTo, TFrom> MapperToFrom { get; } = mapperToFrom.ThrowIfNull(nameof(mapperToFrom));
-
-    /// <summary>
-    /// Indicates whether to map <c>null</c> source value to a corresponding <c>null</c> destination automatically.
-    /// </summary>
-    public bool IsMapNullIfNull { get; } = mapNullIfNull;
-
-    /// <summary>
-    /// Maps the <paramref name="source"/> value to a new <typeparamref name="TTo"/> value.
-    /// </summary>
-    /// <param name="source">The source value.</param>
-    /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-    /// <returns>The destination value.</returns>
-    [return: NotNullIfNotNull(nameof(source))]
-    public TTo? Map(TFrom? source, OperationTypes operationType = OperationTypes.Unspecified) => IsMapNullIfNull && source == default ? default : MapperFromTo.Map(source, operationType);
-
-    /// <summary>
-    /// Maps the <paramref name="source"/> value into the existing <paramref name="destination"/> value.
-    /// </summary>
-    /// <param name="source">The source value.</param>
-    /// <param name="destination">The destination value.</param>
-    /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-    /// <returns>The <paramref name="destination"/> value.</returns>
-    [return: NotNullIfNotNull(nameof(source))]
-    public TTo? Map(TFrom? source, TTo? destination, OperationTypes operationType = OperationTypes.Unspecified) => IsMapNullIfNull && source == default && destination == default ? default : MapperFromTo.Map(source, destination, operationType);
-
-    /// <summary>
-    /// Maps the <paramref name="source"/> value to a new <typeparamref name="TTo"/> value.
-    /// </summary>
-    /// <param name="source">The source value.</param>
-    /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-    /// <returns>The destination value.</returns>
-    [return: NotNullIfNotNull(nameof(source))]
-    public TFrom? Map(TTo? source, OperationTypes operationType = OperationTypes.Unspecified) => IsMapNullIfNull && source == default ? default : MapperToFrom.Map(source, operationType);
-
-    /// <summary>
-    /// Maps the <paramref name="source"/> value into the existing <paramref name="destination"/> value.
-    /// </summary>
-    /// <param name="source">The source value.</param>
-    /// <param name="destination">The destination value.</param>
-    /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-    /// <returns>The <paramref name="destination"/> value.</returns>
-    [return: NotNullIfNotNull(nameof(source))]
-    public TFrom? Map(TTo? source, TFrom? destination, OperationTypes operationType = OperationTypes.Unspecified) => IsMapNullIfNull && source == default && destination == default ? default : MapperToFrom.Map(source, destination, operationType);
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/CollectionMapper.cs b/src/CoreEx/Mapping/CollectionMapper.cs
deleted file mode 100644
index a4e18963..00000000
--- a/src/CoreEx/Mapping/CollectionMapper.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Provides a simple (explicit) <see cref="ICollection{T}"/> value mapper. 
-    /// </summary>
-    /// <typeparam name="TSourceColl">The source collection <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestinationColl">The destination collection <see cref="Type"/>.</typeparam>
-    /// <remarks>Note that collection mapping results in a replacement; there is no merging of content.</remarks>
-    public class CollectionMapper<TSourceColl, TSource, TDestinationColl, TDestination> : IMapper<TSourceColl, TDestinationColl>
-        where TSourceColl : class, ICollection<TSource>, new() where TSource : class, new()
-        where TDestinationColl : class, ICollection<TDestination>, new() where TDestination : class, new()
-    {
-        private Mapper? _mapper;
-
-        /// <inheritdoc/>
-        public Mapper Owner { get => _mapper ?? throw new InvalidOperationException("Mapper has not been set to a non-null value; this is automatically performed when registered."); set => _mapper = value; }
-
-        /// <inheritdoc/>
-        public TDestinationColl CreateSource() => new();
-
-        /// <inheritdoc/>
-        public TDestinationColl CreateDestination() => new();
-
-        /// <inheritdoc/>
-        bool IMapper<TSourceColl, TDestinationColl>.IsSourceInitial(TSourceColl source) => false;
-
-        /// <inheritdoc/>
-        bool IMapper<TSourceColl, TDestinationColl>.InitializeDestination(TDestinationColl destination) => false;
-
-        /// <inheritdoc/>
-        object? IMapperBase.Map(object? source, OperationTypes operationType) => Map((TSourceColl?)source, null, operationType);
-
-        /// <inheritdoc/>
-        object? IMapperBase.Map(object? source, object? destination, OperationTypes operationType) => Map((TSourceColl?)source, (TDestinationColl?)destination, operationType);
-
-        /// <inheritdoc/>
-        TDestinationColl? IMapper<TSourceColl, TDestinationColl>.Map(TSourceColl? source, OperationTypes operationType) => Map(source, null, operationType);
-
-        /// <inheritdoc/>
-        TDestinationColl? IMapper<TSourceColl, TDestinationColl>.Map(TSourceColl? source, TDestinationColl? destination, OperationTypes operationType) => Map(source, destination, operationType);
-
-        /// <summary>
-        /// Performs the mapping.
-        /// </summary>
-        /// <param name="source">The source.</param>
-        /// <param name="destination">The destination.</param>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <returns>The destination.</returns>
-        internal TDestinationColl? Map(TSourceColl? source, TDestinationColl? destination, OperationTypes operationType = OperationTypes.Unspecified)
-        {
-            if (source is null && destination is null)
-                return destination;
-
-            if ((source == null || source.Count == 0) && Owner.ConvertEmptyCollectionsToNull)
-            {
-                destination = default;
-                return destination;
-            }
-
-            // Clear/empty destination as collection mapping is "replacement" only.
-            destination?.Clear();
-            if (source is null)
-                return destination;
-
-            destination ??= new();
-            var itemMapper = Owner.GetMapper<TSource, TDestination>();
-            source.ForEach(x => destination.Add(itemMapper.Map(x, operationType)!));
-            return destination;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/Abstractions/IDestinationConverter.cs b/src/CoreEx/Mapping/Converters/Abstractions/IDestinationConverter.cs
new file mode 100644
index 00000000..fe2eea6f
--- /dev/null
+++ b/src/CoreEx/Mapping/Converters/Abstractions/IDestinationConverter.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.Mapping.Converters.Abstractions;
+
+/// <summary>
+/// Defines the <see cref="IConverter"/> with typed <typeparamref name="TDestination"/>.
+/// </summary>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+public interface IDestinationConverter<TDestination> : IConverter
+{
+    /// <inheritdoc/>
+    Type IConverter.DestinationType => typeof(TDestination);
+
+    /// <summary>
+    /// Converts the source to the destination value (converts to).
+    /// </summary>
+    /// <param name="source">The source value to convert.</param>
+    /// <returns>The converted destination value.</returns>
+    new TDestination ConvertToDestination(object? source);
+
+    /// <summary>
+    /// Converts the destination to the source value (converts back from).
+    /// </summary>
+    /// <param name="destination">The destination value to convert.</param>
+    /// <returns>The converted source value.</returns>
+    object? ConvertToSource(TDestination destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/Abstractions/ISourceConverter.cs b/src/CoreEx/Mapping/Converters/Abstractions/ISourceConverter.cs
new file mode 100644
index 00000000..288979f9
--- /dev/null
+++ b/src/CoreEx/Mapping/Converters/Abstractions/ISourceConverter.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.Mapping.Converters.Abstractions;
+
+/// <summary>
+/// Defines the <see cref="IConverter"/> with typed <typeparamref name="TSource"/>.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+public interface ISourceConverter<TSource> : IConverter
+{
+    /// <inheritdoc/>
+    Type IConverter.SourceType => typeof(TSource);
+
+    /// <summary>
+    /// Converts the source to the destination value (converts to).
+    /// </summary>
+    /// <param name="source">The source value to convert.</param>
+    /// <returns>The converted destination value.</returns>
+    object? ConvertToDestination(TSource source);
+
+    /// <summary>
+    /// Converts the destination to the source value (converts back from).
+    /// </summary>
+    /// <param name="destination">The destination value to convert.</param>
+    /// <returns>The converted source value.</returns>
+    new TSource ConvertToSource(object? destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/Converter.cs b/src/CoreEx/Mapping/Converters/Converter.cs
deleted file mode 100644
index 7fc2e4bb..00000000
--- a/src/CoreEx/Mapping/Converters/Converter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Enables the <see cref="Create"/> of a <see cref="Converter{TSource, TDestination}"/> instance.
-    /// </summary>
-    public static class Converter
-    {
-        /// <summary>
-        /// Provides a generic means to create a one-off <see cref="Converter{TSource, TDestination}"/> instance.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="toDestination">The <typeparamref name="TSource"/> to <typeparamref name="TDestination"/> conversion logic.</param>
-        /// <param name="toSource">The <typeparamref name="TDestination"/> to <typeparamref name="TSource"/> conversion logic.</param>
-        /// <returns>The <see cref="Converter{TSource, TDestination}"/>.</returns>
-        public static Converter<TSource, TDestination> Create<TSource, TDestination>(Func<TSource, TDestination> toDestination, Func<TDestination, TSource> toSource) => new(toDestination, toSource);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/ConverterT.cs b/src/CoreEx/Mapping/Converters/ConverterT.cs
deleted file mode 100644
index bcb89a4e..00000000
--- a/src/CoreEx/Mapping/Converters/ConverterT.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Provides a generic means to create a one-off <see cref="IConverter{TSource, TDestination}"/> instance.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    /// <param name="toDestination">The <typeparamref name="TSource"/> to <typeparamref name="TDestination"/> conversion logic.</param>
-    /// <param name="toSource">The <typeparamref name="TDestination"/> to <typeparamref name="TSource"/> conversion logic.</param>
-    public readonly struct Converter<TSource, TDestination>(Func<TSource, TDestination> toDestination, Func<TDestination, TSource> toSource) : IConverter<TSource, TDestination>
-    {
-        private readonly ValueConverter<TSource, TDestination> _convertToDestination = new(toDestination);
-        private readonly ValueConverter<TDestination, TSource> _convertToSource = new(toSource);
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public readonly IValueConverter<TSource, TDestination> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public readonly IValueConverter<TDestination, TSource> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((TSource)source!);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((TDestination)destination!);
-
-        /// <inheritdoc />
-        public readonly TDestination ConvertToDestination(TSource source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly TSource ConvertToSource(TDestination destination) => ToSource.Convert(destination); 
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/DateTimeToStringConverter.cs b/src/CoreEx/Mapping/Converters/DateTimeToStringConverter.cs
deleted file mode 100644
index f2443d0b..00000000
--- a/src/CoreEx/Mapping/Converters/DateTimeToStringConverter.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Globalization;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents a <see cref="DateTime"/> to <see cref="string"/> converter.
-    /// </summary>
-    /// <remarks>The default format is '<c>G</c>' (see <see href="https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-date-and-time-format-strings#the-general-date-long-time-g-format-specifier"/>)
-    /// with an <see cref="IFormatProvider"/> of <see cref="CultureInfo.InvariantCulture"/> <see cref="CultureInfo.DateTimeFormat"/>.</remarks>
-    public readonly struct DateTimeToStringConverter : IConverter<DateTime?, string?>
-    {
-        private readonly ValueConverter<DateTime?, string?> _convertToDestination = new(s => s?.ToString("G", CultureInfo.InvariantCulture.DateTimeFormat));
-        private readonly ValueConverter<string?, DateTime?> _convertToSource = new(d => d == null ? null : DateTime.ParseExact(d, "G", CultureInfo.InvariantCulture.DateTimeFormat, DateTimeStyles.None));
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static DateTimeToStringConverter Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringToBase64Converter"/> struct.
-        /// </summary>
-        public DateTimeToStringConverter() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringToBase64Converter"/> struct.
-        /// </summary>
-        /// <param name="format">The <see cref="DateTime"/> format specifier.</param>
-        /// <param name="formatProvider">The <see cref="IFormatProvider"/>; defaults to <see cref="CultureInfo.InvariantCulture"/> <see cref="CultureInfo.DateTimeFormat"/>.</param>
-        /// <param name="style">The <see cref="DateTimeStyles"/>; defaults to <see cref="DateTimeStyles.None"/>.</param>
-        /// <param name="transform">The optional <see cref="DateTimeTransform"/> to be performed on the <see cref="DateTime"/>.</param>
-        public DateTimeToStringConverter(string format, IFormatProvider? formatProvider = null, DateTimeStyles style = DateTimeStyles.None, DateTimeTransform transform = DateTimeTransform.None)
-        {
-            format = format.ThrowIfNull(nameof(format));
-            formatProvider ??= CultureInfo.InvariantCulture.DateTimeFormat;
-            _convertToDestination = new(s => Cleaner.Clean(s, transform)?.ToString(format, formatProvider));
-            _convertToSource = new(d => d == null ? null : Cleaner.Clean(DateTime.ParseExact(d, format, formatProvider, style), transform));
-        }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<DateTime?, string?> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<string?, DateTime?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((DateTime?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((string?)destination);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToDestination(DateTime? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly DateTime? ConvertToSource(string? destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/EncodedStringToDateTimeConverter.cs b/src/CoreEx/Mapping/Converters/EncodedStringToDateTimeConverter.cs
deleted file mode 100644
index 5f2e8cda..00000000
--- a/src/CoreEx/Mapping/Converters/EncodedStringToDateTimeConverter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents an encoded <see cref="string"/> to <see cref="DateTime"/> converter.
-    /// </summary>
-    public readonly struct EncodedStringToDateTimeConverter : IConverter<string?, DateTime?>
-    {
-        private static readonly ValueConverter<string?, DateTime?> _convertToDestination = new(s => s == null ? null : DateTime.FromBinary(BitConverter.ToInt64(Convert.FromBase64String(s))));
-        private static readonly ValueConverter<DateTime?, string?> _convertToSource = new(d => d == null ? null : Convert.ToBase64String(BitConverter.GetBytes(d.Value.ToBinary())));
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static EncodedStringToDateTimeConverter Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringToBase64Converter"/> struct.
-        /// </summary>
-        public EncodedStringToDateTimeConverter() { }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<string?, DateTime?> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<DateTime?, string?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((DateTime?)destination);
-
-        /// <inheritdoc />
-        public readonly DateTime? ConvertToDestination(string? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToSource(DateTime? destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/EncodedStringToUInt32Converter.cs b/src/CoreEx/Mapping/Converters/EncodedStringToUInt32Converter.cs
index 80466dc9..21239ed4 100644
--- a/src/CoreEx/Mapping/Converters/EncodedStringToUInt32Converter.cs
+++ b/src/CoreEx/Mapping/Converters/EncodedStringToUInt32Converter.cs
@@ -1,47 +1,42 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping.Converters;
 
-using System;
-
-namespace CoreEx.Mapping.Converters
+/// <summary>
+/// Represents a BASE64 encoded <see cref="string"/> to <see cref="uint"/> converter.
+/// </summary>
+public readonly struct EncodedStringToUInt32Converter : IConverter<string?, uint>
 {
+    private static readonly ValueConverter<string?, uint> _convertToDestination = new(s => s == null ? 0 : BitConverter.ToUInt32(Convert.FromBase64String(s)));
+    private static readonly ValueConverter<uint, string?> _convertToSource = new(d => d == 0 ? null : Convert.ToBase64String(BitConverter.GetBytes(d)));
+
+    /// <summary>
+    /// Gets or sets the default (singleton) instance.
+    /// </summary>
+    public static EncodedStringToUInt32Converter Default { get; set; } = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EncodedStringToUInt32Converter"/> struct.
+    /// </summary>
+    public EncodedStringToUInt32Converter() { }
+
     /// <summary>
-    /// Represents an encoded <see cref="string"/> to <see cref="uint"/> converter.
+    /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
     /// </summary>
-    public readonly struct EncodedStringToUInt32Converter : IConverter<string?, uint>
-    {
-        private static readonly ValueConverter<string?, uint> _convertToDestination = new(s => s == null ? 0 : BitConverter.ToUInt32(Convert.FromBase64String(s)));
-        private static readonly ValueConverter<uint, string?> _convertToSource = new(d => d == 0 ? null : Convert.ToBase64String(BitConverter.GetBytes(d)));
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static EncodedStringToUInt32Converter Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringToBase64Converter"/> struct.
-        /// </summary>
-        public EncodedStringToUInt32Converter() { }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<string?, uint> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<uint, string?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((uint)destination!);
-
-        /// <inheritdoc />
-        public readonly uint ConvertToDestination(string? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToSource(uint destination) => ToSource.Convert(destination);
-    }
+    public IValueConverter<string?, uint> ToDestination => _convertToDestination;
+
+    /// <summary>
+    /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
+    /// </summary>
+    public IValueConverter<uint, string?> ToSource => _convertToSource;
+
+    /// <inheritdoc />
+    public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
+
+    /// <inheritdoc />
+    public readonly object? ConvertToSource(object? destination) => ConvertToSource((uint)destination!);
+
+    /// <inheritdoc />
+    public readonly uint ConvertToDestination(string? source) => ToDestination.Convert(source);
+
+    /// <inheritdoc />
+    public readonly string? ConvertToSource(uint destination) => ToSource.Convert(destination);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/IConverter.cs b/src/CoreEx/Mapping/Converters/IConverter.cs
index ff9eff32..581c6a92 100644
--- a/src/CoreEx/Mapping/Converters/IConverter.cs
+++ b/src/CoreEx/Mapping/Converters/IConverter.cs
@@ -1,36 +1,31 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping.Converters;
 
-using System;
-
-namespace CoreEx.Mapping.Converters
+/// <summary>
+/// Enables bi-directional conversion from a source to a destination value and vice-versa.
+/// </summary>
+public interface IConverter
 {
     /// <summary>
-    /// Enables bi-directional conversion from a source to a destination value and vice-versa.
+    /// Gets the source <see cref="Type"/>.
     /// </summary>
-    public interface IConverter
-    {
-        /// <summary>
-        /// Gets the source <see cref="Type"/>.
-        /// </summary>
-        Type SourceType { get; }
+    Type SourceType { get; }
 
-        /// <summary>
-        /// Gets the destination <see cref="Type"/>.
-        /// </summary>
-        Type DestinationType { get; }
+    /// <summary>
+    /// Gets the destination <see cref="Type"/>.
+    /// </summary>
+    Type DestinationType { get; }
 
-        /// <summary>
-        /// Converts the source to the destination value.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <returns>The destination value.</returns>
-        object? ConvertToDestination(object? source);
+    /// <summary>
+    /// Converts the source to the destination value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination value.</returns>
+    object? ConvertToDestination(object? source);
 
-        /// <summary>
-        /// Converts the destination to the source value.
-        /// </summary>
-        /// <param name="destination">The destination value.</param>
-        /// <returns>The source value.</returns>
-        object? ConvertToSource(object? destination);
-    }
+    /// <summary>
+    /// Converts the destination to the source value.
+    /// </summary>
+    /// <param name="destination">The destination value.</param>
+    /// <returns>The source value.</returns>
+    object? ConvertToSource(object? destination);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/IConverterT.cs b/src/CoreEx/Mapping/Converters/IConverterT.cs
index c24e4728..5f3ad123 100644
--- a/src/CoreEx/Mapping/Converters/IConverterT.cs
+++ b/src/CoreEx/Mapping/Converters/IConverterT.cs
@@ -1,44 +1,45 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping.Converters;
 
-using System;
-
-namespace CoreEx.Mapping.Converters
+/// <summary>
+/// Enables bi-directional conversion from a source to a destination value and vice-versa.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+public interface IConverter<TSource, TDestination> : ISourceConverter<TSource>, IDestinationConverter<TDestination>
 {
+    /// <inheritdoc/>
+    object? ISourceConverter<TSource>.ConvertToDestination(TSource source) => ConvertToDestination((TSource)source!);
+
+    /// <inheritdoc/>
+    TSource ISourceConverter<TSource>.ConvertToSource(object? destination) => ConvertToSource((TDestination)destination!);
+
+    /// <inheritdoc/>
+    TDestination IDestinationConverter<TDestination>.ConvertToDestination(object? source) => ConvertToDestination((TSource)source!);
+
+    /// <inheritdoc/>
+    object? IDestinationConverter<TDestination>.ConvertToSource(TDestination destination) => ConvertToSource((TDestination)destination!);
+
+    /// <summary>
+    /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
+    /// </summary>
+    IValueConverter<TSource, TDestination> ToDestination { get; }
+
+    /// <summary>
+    /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
+    /// </summary>
+    IValueConverter<TDestination, TSource> ToSource { get; }
+
+    /// <summary>
+    /// Converts the source to the destination value (converts to).
+    /// </summary>
+    /// <param name="source">The source value to convert.</param>
+    /// <returns>The converted destination value.</returns>
+    new TDestination ConvertToDestination(TSource source);
+
     /// <summary>
-    /// Enables bi-directional conversion from a source to a destination value and vice-versa.
+    /// Converts the destination to the source value (converts back from).
     /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    public interface IConverter<TSource, TDestination> : IConverter
-    {
-        /// <inheritdoc/>
-        Type IConverter.SourceType => typeof(TSource);
-
-        /// <inheritdoc/>
-        Type IConverter.DestinationType => typeof(TDestination);
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        IValueConverter<TSource, TDestination> ToDestination { get; }
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        IValueConverter<TDestination, TSource> ToSource { get; }
-
-        /// <summary>
-        /// Converts the source to the destination value (converts to).
-        /// </summary>
-        /// <param name="source">The source value to convert.</param>
-        /// <returns>The converted destination value.</returns>
-        TDestination ConvertToDestination(TSource source);
-
-        /// <summary>
-        /// Converts the destination to the source value (converts back from).
-        /// </summary>
-        /// <param name="destination">The destination value to convert.</param>
-        /// <returns>The converted source value.</returns>
-        TSource ConvertToSource(TDestination destination);
-    }
+    /// <param name="destination">The destination value to convert.</param>
+    /// <returns>The converted source value.</returns>
+    new TSource ConvertToSource(TDestination destination);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/IValueConverter.cs b/src/CoreEx/Mapping/Converters/IValueConverter.cs
index fd29cdcf..52308f5f 100644
--- a/src/CoreEx/Mapping/Converters/IValueConverter.cs
+++ b/src/CoreEx/Mapping/Converters/IValueConverter.cs
@@ -1,19 +1,14 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping.Converters;
 
-using System;
-
-namespace CoreEx.Mapping.Converters
+/// <summary>
+/// Enables conversion from a source to a destination value.
+/// </summary>
+public interface IValueConverter
 {
     /// <summary>
-    /// Enables conversion from a source to a destination value.
+    /// Convert <paramref name="source"/> value to destination equivalent.
     /// </summary>
-    public interface IValueConverter
-    {
-        /// <summary>
-        /// Convert <paramref name="source"/> value to destination equivalent.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <returns>The destination equivalent.</returns>
-        object? Convert(object? source);
-    }
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination equivalent.</returns>
+    object? Convert(object? source);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/IValueConverterT.cs b/src/CoreEx/Mapping/Converters/IValueConverterT.cs
index ed50f260..58250c66 100644
--- a/src/CoreEx/Mapping/Converters/IValueConverterT.cs
+++ b/src/CoreEx/Mapping/Converters/IValueConverterT.cs
@@ -1,24 +1,19 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping.Converters;
 
-using System;
-
-namespace CoreEx.Mapping.Converters
+/// <summary>
+/// Enables conversion from a source to a destination value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+public interface IValueConverter<TSource, TDestination> : IValueConverter
 {
+    /// <inheritdoc/>
+    object? IValueConverter.Convert(object? source) => Convert(source is null ? default! : (TSource)source!);
+
     /// <summary>
-    /// Enables conversion from a source to a destination value.
+    /// Convert <paramref name="source"/> value to destination equivalent.
     /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    public interface IValueConverter<TSource, TDestination> : IValueConverter
-    {
-        /// <inheritdoc/>
-        object? IValueConverter.Convert(object? source) => Convert(source == null ? default! : (TSource)source!);
-
-        /// <summary>
-        /// Convert <paramref name="source"/> value to destination equivalent.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <returns>The destination equivalent.</returns>
-        TDestination Convert(TSource source);
-    }
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination equivalent.</returns>
+    TDestination Convert(TSource source);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/JsonElementStringConverter.cs b/src/CoreEx/Mapping/Converters/JsonElementStringConverter.cs
new file mode 100644
index 00000000..557f13a9
--- /dev/null
+++ b/src/CoreEx/Mapping/Converters/JsonElementStringConverter.cs
@@ -0,0 +1,49 @@
+namespace CoreEx.Mapping.Converters;
+
+/// <summary>
+/// Represents a <see cref="JsonElement"/> to <see cref="string"/> converter.
+/// </summary>
+public readonly struct JsonElementStringConverter : IConverter<JsonElement?, string?>
+{
+    private static readonly ValueConverter<JsonElement?, string?> _convertToDestination = new(s => s?.ToString());
+    private static readonly ValueConverter<string?, JsonElement?> _convertToSource = new(d =>
+    {
+        if (d is null)
+            return null;
+
+        using var doc = JsonDocument.Parse(d);
+        return doc.RootElement.Clone();
+    });
+
+    /// <summary>
+    /// Gets or sets the default (singleton) instance.
+    /// </summary>
+    public static JsonElementStringConverter Default { get; set; } = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonElementStringConverter"/> struct.
+    /// </summary>
+    public JsonElementStringConverter() { }
+
+    /// <summary>
+    /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
+    /// </summary>
+    public IValueConverter<JsonElement?, string?> ToDestination => _convertToDestination;
+
+    /// <summary>
+    /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
+    /// </summary>
+    public IValueConverter<string?, JsonElement?> ToSource => _convertToSource;
+
+    /// <inheritdoc />
+    public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
+
+    /// <inheritdoc />
+    public readonly object? ConvertToSource(object? destination) => ConvertToSource((JsonElement?)destination);
+
+    /// <inheritdoc />
+    public readonly string? ConvertToDestination(JsonElement? source) => ToDestination.Convert(source);
+
+    /// <inheritdoc />
+    public readonly JsonElement? ConvertToSource(string? destination) => ToSource.Convert(destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/ObjectToJsonConverter.cs b/src/CoreEx/Mapping/Converters/ObjectToJsonConverter.cs
deleted file mode 100644
index 1cbf524a..00000000
--- a/src/CoreEx/Mapping/Converters/ObjectToJsonConverter.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents an <see cref="object"/> to JSON <see cref="string"/> converter.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="object"/> <see cref="Type"/>.</typeparam>
-    public readonly struct ObjectToJsonConverter<T> : IConverter<T?, string?>
-    {
-        private readonly ValueConverter<T?, string?> _convertToDestination;
-        private readonly ValueConverter<string?, T?> _convertToSource;
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static ObjectToJsonConverter<T> Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectToJsonConverter{T}"/> struct using the default <see cref="IJsonSerializer"/>.
-        /// </summary>
-        public ObjectToJsonConverter() : this(null) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ObjectToJsonConverter{T}"/> struct.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>; will default where not specified.</param>
-        public ObjectToJsonConverter(IJsonSerializer? jsonSerializer)
-        {
-            var js = jsonSerializer ?? ExecutionContext.GetService<IJsonSerializer>() ?? JsonSerializer.Default;
-            _convertToDestination = new(s => s == null ? null : js.Serialize(s));
-            _convertToSource = new(d => d == null ? default : js.Deserialize<T>(d));
-        }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<T?, string?> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<string?, T?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((T?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((string?)destination);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToDestination(T? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly T? ConvertToSource(string? destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/ReferenceDataCodeConverter.cs b/src/CoreEx/Mapping/Converters/ReferenceDataCodeConverter.cs
deleted file mode 100644
index 6a904755..00000000
--- a/src/CoreEx/Mapping/Converters/ReferenceDataCodeConverter.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents an <see cref="IReferenceData"/> to <see cref="IReferenceData.Code"/> (<see cref="string"/>) converter.
-    /// </summary>
-    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    public readonly struct ReferenceDataCodeConverter<TRef> : IConverter<TRef?, string?> where TRef : IReferenceData, new()
-    {
-        private readonly ValueConverter<TRef, string?> _convertToDestination = new(s => s?.Code);
-        private readonly ValueConverter<string?, TRef> _convertToSource = new(d => ReferenceDataOrchestrator.ConvertFromCode<TRef>(d)!);
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static ReferenceDataCodeConverter<TRef> Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeConverter{TSrceProperty}"/> struct.
-        /// </summary>
-        public ReferenceDataCodeConverter() { }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<TRef?, string?> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<string?, TRef?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((TRef?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((string?)destination);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToDestination(TRef? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly TRef? ConvertToSource(string? destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/ReferenceDataIdConverter.cs b/src/CoreEx/Mapping/Converters/ReferenceDataIdConverter.cs
deleted file mode 100644
index 44d596d8..00000000
--- a/src/CoreEx/Mapping/Converters/ReferenceDataIdConverter.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.RefData;
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents an <see cref="IReferenceData"/> to <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> converter.
-    /// </summary>
-    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-    public readonly struct ReferenceDataIdConverter<TRef, TId> : IConverter<TRef?, TId> where TRef : IReferenceData, new()
-    {
-        private readonly ValueConverter<TRef?, TId> _convertToDestination = new(s => s == null ? default! : (TId)s.Id!);
-        private readonly ValueConverter<TId, TRef?> _convertToSource = new(d => ReferenceDataOrchestrator.ConvertFromId<TRef>(d));
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static ReferenceDataIdConverter<TRef, TId> Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeConverter{TSrceProperty}"/> struct.
-        /// </summary>
-        public ReferenceDataIdConverter() { }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<TRef?, TId> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<TId, TRef?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((TRef?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((TId)destination!);
-
-        /// <inheritdoc />
-        public readonly TId ConvertToDestination(TRef? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly TRef? ConvertToSource(TId destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/StringBase64Converter.cs b/src/CoreEx/Mapping/Converters/StringBase64Converter.cs
new file mode 100644
index 00000000..be83a475
--- /dev/null
+++ b/src/CoreEx/Mapping/Converters/StringBase64Converter.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.Mapping.Converters;
+
+/// <summary>
+/// Represents a <see cref="string"/> to <see cref="byte"/> <see cref="Array"/> converter (uses <see cref="Convert.FromBase64String(string)"/> and <see cref="Convert.ToBase64String(byte[])"/>).
+/// </summary>
+public readonly struct StringBase64Converter : IConverter<string?, byte[]?>
+{
+    private static readonly ValueConverter<string?, byte[]?> _convertToDestination = new(s => s is null ? null : Convert.FromBase64String(s));
+    private static readonly ValueConverter<byte[]?, string?> _convertToSource = new(d => d is null ? null : Convert.ToBase64String(d));
+
+    /// <summary>
+    /// Gets or sets the default (singleton) instance.
+    /// </summary>
+    public static StringBase64Converter Default { get; set; } = new();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="StringBase64Converter"/> struct.
+    /// </summary>
+    public StringBase64Converter() { }
+
+    /// <summary>
+    /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
+    /// </summary>
+    public IValueConverter<string?, byte[]?> ToDestination => _convertToDestination;
+
+    /// <summary>
+    /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
+    /// </summary>
+    public IValueConverter<byte[]?, string?> ToSource => _convertToSource;
+
+    /// <inheritdoc />
+    public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
+
+    /// <inheritdoc />
+    public readonly object? ConvertToSource(object? destination) => ConvertToSource((byte[]?)destination);
+
+    /// <inheritdoc />
+    public readonly byte[]? ConvertToDestination(string? source) => ToDestination.Convert(source);
+
+    /// <inheritdoc />
+    public readonly string? ConvertToSource(byte[]? destination) => ToSource.Convert(destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/StringToBase64Converter.cs b/src/CoreEx/Mapping/Converters/StringToBase64Converter.cs
deleted file mode 100644
index 9201d427..00000000
--- a/src/CoreEx/Mapping/Converters/StringToBase64Converter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents a <see cref="string"/> to <see cref="byte"/> <see cref="Array"/> converter (uses <see cref="Convert.FromBase64String(string)"/> and <see cref="Convert.ToBase64String(byte[])"/>).
-    /// </summary>
-    public readonly struct StringToBase64Converter : IConverter<string?, byte[]?>
-    {
-        private static readonly ValueConverter<string?, byte[]?> _convertToDestination = new(s => s == null ? null : Convert.FromBase64String(s));
-        private static readonly ValueConverter<byte[]?, string?> _convertToSource = new(d => d == null ? null : Convert.ToBase64String(d));
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static StringToBase64Converter Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringToBase64Converter"/> struct.
-        /// </summary>
-        public StringToBase64Converter() { }
-
-        /// <summary>
-        /// Gets the source to destination <see cref="IValueConverter{TSource, TDestination}"/>.
-        /// </summary>
-        public IValueConverter<string?, byte[]?> ToDestination => _convertToDestination;
-
-        /// <summary>
-        /// Gets the destination to source <see cref="IValueConverter{TDestination, TSource}"/>.
-        /// </summary>
-        public IValueConverter<byte[]?, string?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((byte[]?)destination);
-
-        /// <inheritdoc />
-        public readonly byte[]? ConvertToDestination(string? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToSource(byte[]? destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/StringToTypeConverter.cs b/src/CoreEx/Mapping/Converters/StringToTypeConverter.cs
deleted file mode 100644
index 8d0dbba9..00000000
--- a/src/CoreEx/Mapping/Converters/StringToTypeConverter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.ComponentModel;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents a <see cref="string"/> to <typeparamref name="T"/> to conversion using a <see cref="TypeConverter"/>.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="Type"/> to convert.</typeparam>
-    /// <remarks>See also <see cref="TypeToStringConverter{T}"/>.</remarks>
-    public readonly struct StringToTypeConverter<T> : IConverter<string?, T>
-    {
-        private static readonly TypeConverter _typeConverter = TypeDescriptor.GetConverter(typeof(T));
-        private static readonly ValueConverter<string?, T> _convertToDestination = new(d => d == null ? default! : (T)_typeConverter.ConvertFromInvariantString(d)!);
-        private static readonly ValueConverter<T, string?> _convertToSource = new(s => s == null ? default! : _typeConverter.ConvertToInvariantString(s));
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static StringToTypeConverter<T> Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="StringToTypeConverter{T}"/> struct.
-        /// </summary>
-        public StringToTypeConverter() { }
-
-        /// <inheritdoc/>
-        public readonly IValueConverter<string?, T> ToDestination => _convertToDestination;
-
-        /// <inheritdoc/>
-        public readonly IValueConverter<T, string?> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((string?)source);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((T)destination!);
-
-        /// <inheritdoc />
-        public readonly T ConvertToDestination(string? source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToSource(T destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/TypeToStringConverter.cs b/src/CoreEx/Mapping/Converters/TypeToStringConverter.cs
deleted file mode 100644
index 65a36514..00000000
--- a/src/CoreEx/Mapping/Converters/TypeToStringConverter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.ComponentModel;
-
-namespace CoreEx.Mapping.Converters
-{
-    /// <summary>
-    /// Represents a <typeparamref name="T"/> to <see cref="string"/> conversion using a <see cref="TypeConverter"/>.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="Type"/> to convert.</typeparam>
-    /// <remarks>See also <see cref="StringToTypeConverter{T}"/>.</remarks>
-    public readonly struct TypeToStringConverter<T> : IConverter<T, string?>
-    {
-        private static readonly TypeConverter _typeConverter = TypeDescriptor.GetConverter(typeof(T));
-        private static readonly ValueConverter<T, string?> _convertToDestination = new(s => s == null ? default! : _typeConverter.ConvertToInvariantString(s));
-        private static readonly ValueConverter<string?, T> _convertToSource = new(d => d == null ? default! : (T)_typeConverter.ConvertFromInvariantString(d)!);
-
-        /// <summary>
-        /// Gets or sets the default (singleton) instance.
-        /// </summary>
-        public static TypeToStringConverter<T> Default { get; set; } = new();
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TypeToStringConverter{T}"/> struct.
-        /// </summary>
-        public TypeToStringConverter() { }
-
-        /// <inheritdoc/>
-        public readonly IValueConverter<T, string?> ToDestination => _convertToDestination;
-
-        /// <inheritdoc/>
-        public readonly IValueConverter<string?, T> ToSource => _convertToSource;
-
-        /// <inheritdoc />
-        public readonly object? ConvertToDestination(object? source) => ConvertToDestination((T)source!);
-
-        /// <inheritdoc />
-        public readonly object? ConvertToSource(object? destination) => ConvertToSource((string?)destination);
-
-        /// <inheritdoc />
-        public readonly string? ConvertToDestination(T source) => ToDestination.Convert(source);
-
-        /// <inheritdoc />
-        public readonly T ConvertToSource(string? destination) => ToSource.Convert(destination);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Converters/ValueConverter.cs b/src/CoreEx/Mapping/Converters/ValueConverter.cs
index 29f43b0a..ce7cbd44 100644
--- a/src/CoreEx/Mapping/Converters/ValueConverter.cs
+++ b/src/CoreEx/Mapping/Converters/ValueConverter.cs
@@ -1,20 +1,15 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping.Converters;
 
-using System;
-
-namespace CoreEx.Mapping.Converters
+/// <summary>
+/// Provides conversion from a source to a destination value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <param name="converter">The function to convert a <typeparamref name="TSource"/> to a <typeparamref name="TDestination"/>.</param>
+public readonly struct ValueConverter<TSource, TDestination>(Func<TSource, TDestination> converter) : IValueConverter<TSource, TDestination>
 {
-    /// <summary>
-    /// Provides conversion from a source to a destination value.
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    /// <param name="converter">The function to convert a <typeparamref name="TSource"/> to a <typeparamref name="TDestination"/>.</param>
-    public readonly struct ValueConverter<TSource, TDestination>(Func<TSource, TDestination> converter) : IValueConverter<TSource, TDestination>
-    {
-        private readonly Func<TSource, TDestination> _converter = converter.ThrowIfNull(nameof(converter));
+    private readonly Func<TSource, TDestination> _converter = converter.ThrowIfNull();
 
-        /// <inheritdoc/>
-        public TDestination Convert(TSource source) => _converter is null ? throw new InvalidOperationException($"The {nameof(ValueConverter<TSource, TDestination>)} has not been initialized with an underlying converter correctly.") : _converter(source);
-    }
+    /// <inheritdoc/>
+    public TDestination Convert(TSource source) => _converter is null ? throw new InvalidOperationException($"The {nameof(ValueConverter<,>)} has not been initialized with an underlying converter correctly.") : _converter(source);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IBiDirectionMapper.cs b/src/CoreEx/Mapping/IBiDirectionMapper.cs
new file mode 100644
index 00000000..a1dd8c74
--- /dev/null
+++ b/src/CoreEx/Mapping/IBiDirectionMapper.cs
@@ -0,0 +1,20 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Enables the bi-directional mapping between a <typeparamref name="TSource"/> value and a <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <remarks>The <see cref="To"/> is a left-to-right <see cref="IMapper"/>, with the <see cref="From"/> being a right-to-left <see cref="IMapper"/>.</remarks>
+public interface IBiDirectionMapper<TSource, TDestination> where TSource : class where TDestination : class
+{
+    /// <summary>
+    /// Gets the <typeparamref name="TSource"/> to <typeparamref name="TDestination"/> mapper (left-to-right).
+    /// </summary>
+    IMapper<TSource, TDestination> To { get; }
+
+    /// <summary>
+    /// Gets the <typeparamref name="TDestination"/> to <typeparamref name="TSource"/> mapper (right-to-left).
+    /// </summary>
+    IMapper<TDestination, TSource> From { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IBidirectionalMapperBase.cs b/src/CoreEx/Mapping/IBidirectionalMapperBase.cs
deleted file mode 100644
index 302b505b..00000000
--- a/src/CoreEx/Mapping/IBidirectionalMapperBase.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Enables a bidirectional mapper that encapsulates two <see cref="IMapperBase"/>'s; one for each direction.
-    /// </summary>
-    public interface IBidirectionalMapperBase
-    {
-        /// <summary>
-        /// Gets the <i>from</i> to <i>to</i> <see cref="IMapperBase"/>.
-        /// </summary>
-        IMapperBase MapperFromTo { get; }
-
-        /// <summary>
-        /// Gets the <i>to</i> to <i>from</i> <see cref="IMapperBase"/>.
-        /// </summary>
-        IMapperBase MapperToFrom { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IBidirectionalMapperT.cs b/src/CoreEx/Mapping/IBidirectionalMapperT.cs
deleted file mode 100644
index 48ddfbe0..00000000
--- a/src/CoreEx/Mapping/IBidirectionalMapperT.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Enables a bidirectional mapper that encapsulates two <see cref="IMapper{TSource, TDestination}"/>; one for each direction.
-    /// </summary>
-    /// <typeparam name="TFrom">The from <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TTo">The to <typeparamref name="TTo"/>.</typeparam>
-    public interface IBidirectionalMapper<TFrom, TTo> : IBidirectionalMapperBase
-    {
-        /// <inheritdoc/>
-        IMapperBase IBidirectionalMapperBase.MapperFromTo => MapperFromTo;
-
-        /// <inheritdoc/>
-        IMapperBase IBidirectionalMapperBase.MapperToFrom => MapperToFrom;
-
-        /// <summary>
-        /// Gets the <see cref="IMapper{TSource, TDestination}"/> for <typeparamref name="TFrom"/> to <typeparamref name="TTo"/>
-        /// </summary>
-        new IMapper<TFrom, TTo> MapperFromTo { get; }
-
-        /// <summary>
-        /// Gets the <see cref="IMapper{TSource, TDestination}"/> for <typeparamref name="TTo"/> to <typeparamref name="TFrom"/>"/>
-        /// </summary>
-        new IMapper<TTo, TFrom> MapperToFrom { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IIntoMapper.cs b/src/CoreEx/Mapping/IIntoMapper.cs
new file mode 100644
index 00000000..2f10c494
--- /dev/null
+++ b/src/CoreEx/Mapping/IIntoMapper.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Enables mapping from a source value into an existing destination value.
+/// </summary>
+public interface IIntoMapper : IMapperBase
+{
+    /// <summary>
+    /// Maps (merges) the <paramref name="source"/> value into an existing <paramref name="destination"/> value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <param name="destination">The destination value.</param>
+    void MapInto(object source, object destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IIntoMapperT.cs b/src/CoreEx/Mapping/IIntoMapperT.cs
new file mode 100644
index 00000000..5b8ba47c
--- /dev/null
+++ b/src/CoreEx/Mapping/IIntoMapperT.cs
@@ -0,0 +1,29 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Enables mapping from a <typeparamref name="TSource"/> value into an existing <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+public interface IIntoMapper<TSource, TDestination> : IIntoMapper where TSource : class where TDestination : class
+{
+    /// <summary>
+    /// Gets the source <see cref="Type"/>.
+    /// </summary>
+    Type IMapperBase.SourceType => typeof(TSource);
+
+    /// <summary>
+    /// Gets the destination <see cref="Type"/>.
+    /// </summary>
+    Type IMapperBase.DestinationType => typeof(TDestination);
+
+    /// <inheritdoc/>
+    void IIntoMapper.MapInto(object source, object destination) => MapInto((TSource)source.ThrowIfNull(), (TDestination)destination.ThrowIfNull());
+
+    /// <summary>
+    /// Maps (merges) the <paramref name="source"/> value into an existing <paramref name="destination"/> value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <param name="destination">The destination value.</param>
+    void MapInto(TSource source, TDestination destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IMapper.cs b/src/CoreEx/Mapping/IMapper.cs
index baaa332d..858e2717 100644
--- a/src/CoreEx/Mapping/IMapper.cs
+++ b/src/CoreEx/Mapping/IMapper.cs
@@ -1,47 +1,15 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping;
 
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Mapping
+/// <summary>
+/// Enables mapping from a source value to a new destination value.
+/// </summary>
+public interface IMapper : IMapperBase
 {
     /// <summary>
-    /// Provides mapping between source and destination values.
+    /// Maps the <paramref name="source"/> value to a new destination value.
     /// </summary>
-    /// <remarks>Decouples <i>CoreEx</i> from any specific implementation.</remarks>
-    public interface IMapper
-    {
-        /// <summary>
-        /// Maps the <paramref name="source"/> (inferring <see cref="Type"/>) value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="source">The source value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        [return: NotNullIfNotNull(nameof(source))]
-        TDestination? Map<TDestination>(object? source, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="source">The source value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        [return: NotNullIfNotNull(nameof(source))]
-        TDestination? Map<TSource, TDestination>(TSource? source, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value into the existing <paramref name="destination"/> value.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="source">The source value.</param>
-        /// <param name="destination">The destination value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The <paramref name="destination"/> value.</returns>
-        [return: NotNullIfNotNull(nameof(source))]
-        TDestination? Map<TSource, TDestination>(TSource? source, TDestination? destination, OperationTypes operationType = OperationTypes.Unspecified);
-    }
+    /// <param name="source">The source value.</param>
+    /// <returns>The destination value.</returns>
+    [return: NotNullIfNotNull(nameof(source))]
+    object? Map(object? source);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IMapperBase.cs b/src/CoreEx/Mapping/IMapperBase.cs
index 4201c9f3..6dfbe300 100644
--- a/src/CoreEx/Mapping/IMapperBase.cs
+++ b/src/CoreEx/Mapping/IMapperBase.cs
@@ -1,46 +1,17 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping;
 
-using System;
-
-namespace CoreEx.Mapping
+/// <summary>
+/// Enables base capabilities to support mapping from a <see cref="SourceType"/> to a <see cref="DestinationType"/> value.
+/// </summary>
+public interface IMapperBase
 {
     /// <summary>
-    /// Enables the base source and destination mapping capability.
+    /// Gets the source <see cref="Type"/>.
     /// </summary>
-    public interface IMapperBase
-    {
-        /// <summary>
-        /// Gets or sets the owning <see cref="Mapper"/>.
-        /// </summary>
-        /// <remarks>This enables a mapper to map an underlying property to another.
-        /// <para>This is automatically set during the <see cref="Mapper.Register{TSource, TDestination}(IMapper{TSource, TDestination})"/>.</para></remarks>
-        Mapper Owner { get; set; }
-
-        /// <summary>
-        /// Gets the source <see cref="Type"/>.
-        /// </summary>
-        Type SourceType { get; }
-
-        /// <summary>
-        /// Gets the destination <see cref="Type"/>.
-        /// </summary>
-        Type DestinationType { get; }
+    Type SourceType { get; }
 
-        /// <summary>
-        /// Maps the <paramref name="source"/> value to a new destination value.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        object? Map(object? source, OperationTypes operationType = OperationTypes.Unspecified);
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value to a new destination value.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <param name="destination">The destination value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        object? Map(object? source, object? destination, OperationTypes operationType = OperationTypes.Unspecified);
-    }
+    /// <summary>
+    /// Gets the destination <see cref="Type"/>.
+    /// </summary>
+    Type DestinationType { get; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IMapperT.cs b/src/CoreEx/Mapping/IMapperT.cs
index ef45b231..db16406d 100644
--- a/src/CoreEx/Mapping/IMapperT.cs
+++ b/src/CoreEx/Mapping/IMapperT.cs
@@ -1,63 +1,30 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Enables mapping from a <typeparamref name="TSource"/> value to a new <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+public interface IMapper<TSource, TDestination> : IMapper where TSource : class  where TDestination : class
 {
     /// <summary>
-    /// Enables mapping from the <typeparamref name="TSource"/> to the <typeparamref name="TDestination"/>.
+    /// Gets the source <see cref="Type"/>.
     /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    public interface IMapper<TSource, TDestination> : IMapperBase
-    {
-        /// <inheritdoc/>
-        Type IMapperBase.SourceType => typeof(TSource);
-
-        /// <inheritdoc/>
-        Type IMapperBase.DestinationType => typeof(TDestination);
-
-        /// <summary>
-        /// Creates a <typeparamref name="TSource"/> instance.
-        /// </summary>
-        /// <returns>A <typeparamref name="TSource"/> instance.</returns>
-        TDestination CreateSource();
-
-        /// <summary>
-        /// Creates a <typeparamref name="TDestination"/> instance.
-        /// </summary>
-        /// <returns>A <typeparamref name="TDestination"/> instance.</returns>
-        TDestination CreateDestination();
+    Type IMapperBase.SourceType => typeof(TSource);
 
-        /// <summary>
-        /// Indicates whether the <paramref name="source"/> is considered initial; i.e. all mapped property values are their default.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <returns><c>true</c> where considered initial; otherwise, <c>false</c>.</returns>
-        bool IsSourceInitial(TSource source);
-
-        /// <summary>
-        /// Initializes the destination properties to their default values during a <i>Flatten</i> where the source value is <c>null</c>.
-        /// </summary>
-        /// <param name="destination">The destination value.</param>
-        /// <returns><c>true</c> where initialization occured; otherwise, <c>false</c>.</returns>
-        bool InitializeDestination(TDestination destination);
+    /// <summary>
+    /// Gets the destination <see cref="Type"/>.
+    /// </summary>
+    Type IMapperBase.DestinationType => typeof(TDestination);
 
-        /// <summary>
-        /// Maps the <paramref name="source"/> value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The destination value.</returns>
-        TDestination? Map(TSource? source, OperationTypes operationType = OperationTypes.Unspecified);
+    /// <inheritdoc/>
+    object? IMapper.Map(object? source) => Map((TSource?)source)!;
 
-        /// <summary>
-        /// Maps the <paramref name="source"/> value into the existing <paramref name="destination"/> value.
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <param name="destination">The destination value.</param>
-        /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-        /// <returns>The <paramref name="destination"/> value.</returns>
-        TDestination? Map(TSource? source, TDestination? destination, OperationTypes operationType = OperationTypes.Unspecified);
-    }
+    /// <summary>
+    /// Maps the <paramref name="source"/> value to a new destination value.
+    /// </summary>
+    /// <param name="source">The source value .</param>
+    /// <returns>The destination value.</returns>
+    [return: NotNullIfNotNull(nameof(source))]
+    TDestination? Map(TSource? source);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IntoMapperT2.cs b/src/CoreEx/Mapping/IntoMapperT2.cs
new file mode 100644
index 00000000..601fa371
--- /dev/null
+++ b/src/CoreEx/Mapping/IntoMapperT2.cs
@@ -0,0 +1,31 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides mapping (<see cref="IIntoMapper"/>) from a <typeparamref name="TSource"/> into an existing <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <remarks>Automatically leverages the <see cref="Mapper.MapStandardInto{TSource, TDestination}(TSource, TDestination, bool)"/> (where <see cref="UseMapStandardInto"/>) to map standard properties where applicable.</remarks>
+public abstract class IntoMapper<TSource, TDestination> : IIntoMapper<TSource, TDestination> where TSource : class where TDestination : class
+{
+    /// <summary>
+    /// Indicates whether to use the <see cref="Mapper.MapStandardInto"/> automatically.
+    /// </summary>
+    /// <remarks>This occurs after the <see cref="OnMapInto(TSource, TDestination)"/>.</remarks>
+    protected virtual bool UseMapStandardInto => true;
+
+    /// <inheritdoc/>
+    public void MapInto(TSource source, TDestination destination)
+    {
+        OnMapInto(source.ThrowIfNull(), destination.ThrowIfNull());
+        if (UseMapStandardInto)
+            Mapper.MapStandardInto(source, destination);
+    }
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> value into an existing destination value.
+    /// </summary>
+    /// <param name="source">The source value .</param>
+    /// <param name="destination">The destination value.</param>
+    protected abstract void OnMapInto(TSource source, TDestination destination);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/IntoMapperT3.cs b/src/CoreEx/Mapping/IntoMapperT3.cs
new file mode 100644
index 00000000..2e15faa7
--- /dev/null
+++ b/src/CoreEx/Mapping/IntoMapperT3.cs
@@ -0,0 +1,30 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides mapping (<see cref="IIntoMapper"/>) from a <typeparamref name="TSource"/> value into an existing <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The mapper <see cref="Type"/> itself.</typeparam>
+/// <remarks>The <see cref="MapInto(TSource, TDestination)"/> method provides a convenient way to map a source value into an existing destination value using the singleton instance of the underlying mapper.
+/// <para>Automatically leverages the <see cref="Mapper.MapStandardInto{TSource, TDestination}(TSource, TDestination, bool)"/> (where <see cref="IntoMapper{TSource, TDestination}.UseMapStandardInto"/>) to map standard properties where applicable.</para></remarks>
+public abstract class IntoMapper<TSource, TDestination, TSelf> : IntoMapper<TSource, TDestination> where TSource : class where TDestination : class where TSelf : IntoMapper<TSource, TDestination, TSelf>, new()
+{
+    /// <summary>
+    /// Gets the default singleton instance of the mapper.
+    /// </summary>
+    public static TSelf Default { get; } = new TSelf();
+
+    /// <summary>
+    /// Maps (merges) the <paramref name="source"/> value into an existing <paramref name="destination"/> value.
+    /// </summary>
+    /// <param name="source">The source value.</param>
+    /// <param name="destination">The destination value.</param>
+    [return: NotNullIfNotNull(nameof(source))]
+    public static new void MapInto(TSource source, TDestination destination)
+    {
+        Default.OnMapInto(source.ThrowIfNull(), destination.ThrowIfNull());
+        if (Default.UseMapStandardInto)
+            Mapper.MapStandardInto(source, destination);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/Mapper.cs b/src/CoreEx/Mapping/Mapper.cs
index 50d62bca..bc0f6a5d 100644
--- a/src/CoreEx/Mapping/Mapper.cs
+++ b/src/CoreEx/Mapping/Mapper.cs
@@ -1,383 +1,191 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Mapping;
 
-using CoreEx.Abstractions.Reflection;
-using System;
-using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-
-namespace CoreEx.Mapping
+/// <summary>
+/// Provides utility capabilities for mapping.
+/// </summary>
+public static class Mapper
 {
     /// <summary>
-    /// Provides the simple (explicit) value <see cref="IMapper"/> capability.  
+    /// Maps the standard properties from a <paramref name="source"/> value into a new <typeparamref name="TDestination"/> value.
     /// </summary>
-    public class Mapper : IMapper
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    /// <param name="destination">The destination value.</param>
+    /// <param name="source">The source value.</param>
+    /// <param name="mapChangeLog">Indicates whether to map the <i>change log</i> properties.</param>
+    /// <returns>The <paramref name="destination"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Standard properties are mapped based on whether both the <paramref name="source"/> and <paramref name="destination"/> implement the following respectively: 
+    ///   <list type="bullet">
+    ///     <item><see cref="IReadOnlyIdentifier"/> -> <see cref="IIdentifier"/></item>
+    ///     <item><see cref="IReadOnlyETag"/> -> <see cref="IETag"/></item>
+    ///     <item><see cref="IReadOnlyTenantId"/> -> <see cref="ITenantId"/></item>
+    ///     <item><see cref="IReadOnlyPartitionKey"/> -> <see cref="IPartitionKey"/></item>
+    ///     <item><see cref="IReadOnlyLogicallyDeleted"/> -> <see cref="ILogicallyDeleted"/></item>
+    ///     <item><see cref="IReadOnlyTypeDiscriminator"/> -> <see cref="ITypeDiscriminator"/></item>
+    ///     <item><see cref="IReadOnlyChangeLog"/> -> <see cref="IChangeLog"/> or <see cref="IChangeLogEx"/></item>
+    ///     <item><see cref="IReadOnlyChangeLogEx"/> -> <see cref="IChangeLog"/> or <see cref="IChangeLogEx"/></item>
+    ///   </list>
+    ///   <para>See also <see cref="MapChangeLogInto{TSource, TDestination}(TSource, TDestination)"/>.</para>
+    /// </remarks>
+    public static TDestination MapStandardFrom<TSource, TDestination>(this TDestination destination, TSource source, bool mapChangeLog = true) where TSource : class where TDestination : class
     {
-        private readonly ConcurrentDictionary<(Type, Type), IMapperBase> _mappers = new();
+        MapStandardInto<TSource, TDestination>(source, destination, mapChangeLog);
+        return destination;
+    }
 
-        /// <summary>
-        /// Gets an empty <see cref="IMapper"/>; i.e. one that does not perform any mapping and will always throw a <see cref="NotImplementedException"/> where a <c>Map</c> operation is invoked.
-        /// </summary>
-        public static EmptyMapper Empty { get; } = new EmptyMapper();
+    /// <summary>
+    /// Maps the standard properties from a <paramref name="source"/> value into an existing <paramref name="destination"/> value.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    /// <param name="source">The source value.</param>
+    /// <param name="destination">The destination value.</param>
+    /// <param name="mapChangeLog">Indicates whether to map the <i>change log</i> properties.</param>
+    /// <remarks>Standard properties are mapped based on whether both the <paramref name="source"/> and <paramref name="destination"/> implement the following respectively: 
+    ///   <list type="bullet">
+    ///     <item><see cref="IReadOnlyIdentifier"/> -> <see cref="IIdentifier"/></item>
+    ///     <item><see cref="IReadOnlyETag"/> -> <see cref="IETag"/></item>
+    ///     <item><see cref="IReadOnlyTenantId"/> -> <see cref="ITenantId"/></item>
+    ///     <item><see cref="IReadOnlyPartitionKey"/> -> <see cref="IPartitionKey"/></item>
+    ///     <item><see cref="IReadOnlyLogicallyDeleted"/> -> <see cref="ILogicallyDeleted"/></item>
+    ///     <item><see cref="IReadOnlyTypeDiscriminator"/> -> <see cref="ITypeDiscriminator"/></item>
+    ///     <item><see cref="IReadOnlyChangeLog"/> -> <see cref="IChangeLog"/> or <see cref="IChangeLogEx"/></item>
+    ///     <item><see cref="IReadOnlyChangeLogEx"/> -> <see cref="IChangeLog"/> or <see cref="IChangeLogEx"/></item>
+    ///   </list>
+    ///   <para>See also <see cref="MapChangeLogInto{TSource, TDestination}(TSource, TDestination)"/>.</para>
+    /// </remarks>
+    public static void MapStandardInto<TSource, TDestination>(TSource source, TDestination destination, bool mapChangeLog = true) where TSource : class where TDestination : class
+    {
+        if (ReferenceEquals(source.ThrowIfNull(), destination.ThrowIfNull()))
+            return;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Mapper"/> class.
-        /// </summary>
-        /// <remarks>Also, automatically registers the mapping Cartesian product between <see cref="Entities.ChangeLog"/> and <see cref="Entities.Extended.ChangeLogEx"/> (i.e. all combinations thereof).</remarks>
-        public Mapper()
-        {
-            Register(new Mapper<Entities.ChangeLog, Entities.ChangeLog>()
-                .Map((s, d) => d.CreatedBy = s.CreatedBy, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.CreatedDate = s.CreatedDate, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.UpdatedBy = s.UpdatedBy, OperationTypes.AnyExceptCreate)
-                .Map((s, d) => d.UpdatedDate = s.UpdatedDate, OperationTypes.AnyExceptCreate));
+        if (source is IReadOnlyIdentifier si && destination is IIdentifier di && si.IdType == di.IdType)
+            di.Id = si.Id;
 
-            Register(new Mapper<Entities.Extended.ChangeLogEx, Entities.Extended.ChangeLogEx>()
-                .Map((s, d) => d.CreatedBy = s.CreatedBy, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.CreatedDate = s.CreatedDate, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.UpdatedBy = s.UpdatedBy, OperationTypes.AnyExceptCreate)
-                .Map((s, d) => d.UpdatedDate = s.UpdatedDate, OperationTypes.AnyExceptCreate));
+        if (source is IReadOnlyETag setag && destination is IETag detag)
+            detag.ETag = setag.ETag;
 
-            Register(new Mapper<Entities.ChangeLog, Entities.Extended.ChangeLogEx>()
-                .Map((s, d) => d.CreatedBy = s.CreatedBy, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.CreatedDate = s.CreatedDate, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.UpdatedBy = s.UpdatedBy, OperationTypes.AnyExceptCreate)
-                .Map((s, d) => d.UpdatedDate = s.UpdatedDate, OperationTypes.AnyExceptCreate));
+        if (source is IReadOnlyTenantId sti && destination is ITenantId dti)
+            dti.TenantId = sti.TenantId;
 
-            Register(new Mapper<Entities.Extended.ChangeLogEx, Entities.ChangeLog>()
-                .Map((s, d) => d.CreatedBy = s.CreatedBy, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.CreatedDate = s.CreatedDate, OperationTypes.AnyExceptUpdate)
-                .Map((s, d) => d.UpdatedBy = s.UpdatedBy, OperationTypes.AnyExceptCreate)
-                .Map((s, d) => d.UpdatedDate = s.UpdatedDate, OperationTypes.AnyExceptCreate));
-        }
+        if (source is IReadOnlyPartitionKey spk && destination is IPartitionKey dpk)
+            dpk.PartitionKey = spk.PartitionKey;
 
-        /// <summary>
-        /// Indicates whether to convert empty collections to <c>null</c> where supported. 
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>.</remarks>
-        public bool ConvertEmptyCollectionsToNull { get; set; } = true;
+        if (source is IReadOnlyLogicallyDeleted sld && destination is ILogicallyDeleted dld)
+            dld.IsDeleted = sld.IsDeleted;
 
-        /// <summary>
-        /// Indicates whether to allow same to same type mapping (where explicitly not registered) as always returning the source value.
-        /// </summary>
-        /// <remarks>Defaults to <c>true</c>.
-        /// <para>Creates and registers an instance of the <see cref="SameTypeMapper{TSame}"/> on first use.</para></remarks>
-        public bool MapSameTypeWithSourceValue { get; set; } = true;
+        if (source is IReadOnlyTypeDiscriminator std && destination is ITypeDiscriminator dtd)
+            dtd.TypeDiscriminator = std.TypeDiscriminator;
 
-        /// <summary>
-        /// Register (adds) all the <see cref="IMapper{TSource, TDestination}"/> and <see cref="IBidirectionalMapper{TFrom, TTo}"/> types (instances) from the <see cref="Assembly"/> from the specified <typeparamref name="TAssembly"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TAssembly">The <see cref="Assembly"/> <see cref="Type"/>.</typeparam>
-        public void Register<TAssembly>() => Register(typeof(TAssembly).Assembly);
+        if (mapChangeLog)
+            MapChangeLogInto<TSource, TDestination>(source, destination);
+    }
 
-        /// <summary>
-        /// Register (adds) all <see cref="IMapper{TSource, TDestination}"/> and <see cref="IBidirectionalMapper{TFrom, TTo}"/> types (instances) from the specified <paramref name="assemblies"/>.
-        /// </summary>
-        /// <param name="assemblies">The assemblies.</param>
-        public void Register(params Assembly[] assemblies)
-        {
-            foreach (var assembly in assemblies.Distinct())
-            {
-                foreach (var match in from type in assembly.GetTypes()
-                                      where !type.IsAbstract && !type.IsGenericTypeDefinition
-                                      let interfaces = type.GetInterfaces()
-                                      let genericInterfaces = interfaces.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IMapper<,>))
-                                      let @interface = genericInterfaces.FirstOrDefault()
-                                      let sourceType = @interface?.GetGenericArguments().Length == 2 ? @interface?.GetGenericArguments()[0] : null
-                                      let destinationType = @interface?.GetGenericArguments().Length == 2 ? @interface?.GetGenericArguments()[1] : null
-                                      where @interface != null
-                                      select new { type, sourceType, destinationType })
-                {
-                    Register(match.sourceType, match.destinationType, (IMapperBase)Activator.CreateInstance(match.type)!);
-                }
+    /// <summary>
+    /// Maps the standard change log properties from a <paramref name="source"/> value into an existing <paramref name="destination"/> changing shape as required.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    /// <param name="source">The source value.</param>
+    /// <param name="destination">The destination value.</param>
+    public static void MapChangeLogInto<TSource, TDestination>(TSource source, TDestination destination) where TSource : class where TDestination : class
+    {
+        if (ReferenceEquals(source.ThrowIfNull(), destination.ThrowIfNull()))
+            return;
 
-                foreach (var match in from type in assembly.GetTypes()
-                                      where !type.IsAbstract && !type.IsGenericTypeDefinition
-                                      let interfaces = type.GetInterfaces()
-                                      let genericInterfaces = interfaces.Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IBidirectionalMapper<,>))
-                                      let @interface = genericInterfaces.FirstOrDefault()
-                                      where @interface != null
-                                      select new { type })
-                {
-                    var bimapper = (IBidirectionalMapperBase)Activator.CreateInstance(match.type)!;
-                    _mappers.TryAdd((bimapper.MapperFromTo.SourceType, bimapper.MapperFromTo.DestinationType), bimapper.MapperFromTo);
-                    _mappers.TryAdd((bimapper.MapperToFrom.SourceType, bimapper.MapperToFrom.DestinationType), bimapper.MapperToFrom);
-                }
-            }
-        }
+        if (destination is IChangeLog dcl)
+            MapChangeLogInto<TSource, TDestination>(source, dcl);
 
-        /// <summary>
-        /// Perform the actual mapper registration and linking.
-        /// </summary>
-        private void Register(Type s, Type d, IMapperBase mapper)
-        {
-            mapper.Owner = this;
-            _mappers.TryAdd((s, d), mapper);
-        }
+        if (destination is IChangeLogEx dclex)
+            MapChangeLogInto<TSource, TDestination>(source, dclex);
+    }
 
-        /// <summary>
-        /// Registers (adds) an individual <see cref="IMapper{TSource, TDestination}"/>.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The <see cref="IMapper{TSource, TDestination}"/>.</param>
-        /// <remarks>Where an attempt is made to add a mapper for a <typeparamref name="TSource"/> and <typeparamref name="TDestination"/> more than once only the first will succeed; no exception will be thrown for subsequent adds.</remarks>
-        public void Register<TSource, TDestination>(IMapper<TSource, TDestination> mapper)
-            => _mappers.TryAdd(((mapper.ThrowIfNull(nameof(mapper))).SourceType, mapper.DestinationType), mapper.Adjust(x => x.Owner = this));
+    /// <summary>
+    /// Maps the standard change log properties from a <paramref name="source"/> value into an existing <paramref name="destination"/> (<see cref="IChangeLog"/>) value (where applicable).
+    /// </summary>
+    private static void MapChangeLogInto<TSource, TDestination>(TSource source, IChangeLog destination) where TSource : class
+    {
+        if (source is IReadOnlyChangeLog scl)
+            destination.ChangeLog = new ChangeLog(scl);
+        else if (source is IReadOnlyChangeLogEx sclex)
+            destination.ChangeLog = new ChangeLog(sclex);
 
-        /// <summary>
-        /// Registers (adds) an individual <see cref="IBidirectionalMapper{TSource, TDestination}"/>.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="bidirectionalMapper">The see cref="IBidirectionalMapper{TSource, TDestination}"/>.</param>
-        /// <remarks>Where an attempt is made to add a mapper for a <typeparamref name="TSource"/> and <typeparamref name="TDestination"/> more than once only the first will succeed; no exception will be thrown for subsequent adds.</remarks>
-        public void Register<TSource, TDestination>(IBidirectionalMapper<TSource, TDestination> bidirectionalMapper)
-        {
-            var mapperFromTo = bidirectionalMapper.ThrowIfNull(nameof(bidirectionalMapper)).MapperFromTo.Adjust(x => x.Owner = this);
-            var mapperToFrom = bidirectionalMapper.MapperToFrom.Adjust(x => x.Owner = this);
-            _mappers.TryAdd((mapperFromTo.SourceType, mapperFromTo.DestinationType), mapperFromTo);
-            _mappers.TryAdd((mapperToFrom.SourceType, mapperToFrom.DestinationType), mapperToFrom);
-        }
+        if (destination.ChangeLog?.IsDefault() ?? false)
+            destination.ChangeLog = null;
+    }
 
-        /// <inheritdoc/>
-        [return: NotNullIfNotNull(nameof(source))]
-        public TDestination? Map<TDestination>(object? source, OperationTypes operationType = OperationTypes.Unspecified)
+    /// <summary>
+    /// Maps the standard change log properties from a <paramref name="source"/> value into an existing <paramref name="destination"/> (<see cref="IChangeLogEx"/> value (where applicable).
+    /// </summary>
+    private static void MapChangeLogInto<TSource, TDestination>(TSource source, IChangeLogEx destination) where TSource : class
+    {
+        static void MapInto(IReadOnlyChangeLogEx scl, IChangeLogEx dcl)
         {
-            if (source is null)
-                return default!;
-
-            return (TDestination)GetMapper(source.GetType(), typeof(TDestination)).Map(source, operationType)!;
+            dcl.CreatedBy = scl.CreatedBy;
+            dcl.CreatedOn = scl.CreatedOn;
+            dcl.UpdatedBy = scl.UpdatedBy;
+            dcl.UpdatedOn = scl.UpdatedOn;
         }
 
-        /// <summary>
-        /// Gets the <see cref="IMapperBase"/> for the specified <paramref name="source"/> and <paramref name="destination"/> types as previously <see cref="Register{TSource, TDestination}(IMapper{TSource, TDestination})">registered</see>.
-        /// </summary>
-        /// <param name="source">The source <see cref="Type"/>.</param>
-        /// <param name="destination">The destination <see cref="Type"/>.</param>
-        /// <returns>The previously registered <see cref="IMapperBase"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown where not previously registered.</exception>
-        public IMapperBase GetMapper(Type source, Type destination)
-        { 
-            if (TryGetMapper(source, destination, out var mapper))
-                return mapper;
-
-            throw new InvalidOperationException($"No mapper has been registered for source '{source.FullName}' and destination '{destination.FullName}' types.");
-        }
-
-        /// <summary>
-        /// Gets the <see cref="IMapper{TSource, TDestination}"/> for the specified <typeparamref name="TSource"/> and <typeparamref name="TDestination"/> types as previously <see cref="Register{TSource, TDestination}(IMapper{TSource, TDestination})">registered</see>.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <returns>The previously registered <see cref="IMapper{TSource, TDestination}"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown where not previously registered.</exception>
-        public IMapper<TSource, TDestination> GetMapper<TSource, TDestination>() => (IMapper<TSource, TDestination>)GetMapper(typeof(TSource), typeof(TDestination));
-
-        /// <summary>
-        /// Try and get the mapper for the <paramref name="source"/> and <paramref name="destination"/> types.
-        /// </summary>
-        /// <param name="source">The source <see cref="Type"/>.</param>
-        /// <param name="destination">The destination <see cref="Type"/>.</param>
-        /// <param name="mapper">The previously registered <see cref="IMapper{TSource, TDestination}"/>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        public bool TryGetMapper(Type source, Type destination, [NotNullWhen(true)] out IMapperBase? mapper)
-        {
-            if (_mappers.TryGetValue((source, destination), out mapper))
-                return true;
-
-            // Check if the types are collection and automatically create where possible.
-            var si = TypeReflector.GetCollectionItemType(source);
-            if (si.TypeCode == TypeReflectorTypeCode.ICollection)
-            {
-                var di = TypeReflector.GetCollectionItemType(destination);
-                if (di.TypeCode == TypeReflectorTypeCode.ICollection)
-                {
-                    mapper = _mappers.GetOrAdd((source, destination), _ =>
-                    {
-                        var t = typeof(CollectionMapper<,,,>).MakeGenericType(source, si.ItemType!, destination, di.ItemType!);
-                        var mapper = (IMapperBase)Activator.CreateInstance(t)!;
-                        mapper.Owner = this;
-                        return mapper;
-                    });
-
-                    return true;
-                }
-            }
-
-            // Check if the types are the same and automatically create where configured to do so.
-            if (MapSameTypeWithSourceValue && si.TypeCode == TypeReflectorTypeCode.Complex && source == destination)
-            {
-                mapper = _mappers.GetOrAdd((source, destination), _ =>
-                {
-                    var t = typeof(SameTypeMapper<>).MakeGenericType(source);
-                    var mapper = (IMapperBase)Activator.CreateInstance(t)!;
-                    mapper.Owner = this;
-                    return mapper;
-                });
+        if (source is IReadOnlyChangeLogEx sclex)
+            MapInto(sclex, destination);
+        else if (source is IReadOnlyChangeLog scl)
+            MapInto(scl?.ChangeLog is null ? ChangeLog.Empty : scl.ChangeLog, destination);
+    }
 
-                return true;
-            }
+    /// <summary>
+    /// Creates a <see cref="OneOffMapper{TSource, TDestination}"/> using the specified <paramref name="map"/> function.
+    /// </summary>
+    /// <typeparam name="TSource"></typeparam>
+    /// <typeparam name="TDestination"></typeparam>
+    /// <param name="map">The mapping function.</param>
+    /// <returns>The <see cref="OneOffMapper{TSource, TDestination}"/>.</returns>
+    public static OneOffMapper<TSource, TDestination> Create<TSource, TDestination>(Func<TSource, TDestination> map) where TSource : class where TDestination : class => new(map);
 
-            return false;
-        }
+    /// <summary>
+    /// Provides a one-off runtime instantiated <see cref="IMapper"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    public sealed class OneOffMapper<TSource, TDestination> : Mapper<TSource, TDestination> where TSource : class where TDestination : class
+    {
+        private readonly Func<TSource, TDestination> _map;
 
         /// <summary>
-        /// Try and get the mapper for the <typeparamref name="TSource"/> and <typeparamref name="TDestination"/> types.
+        /// Initializes a new instance of the <see cref="OneOffMapper{TSource, TDestination}"/> class.
         /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="mapper">The previously registered <see cref="IMapper{TSource, TDestination}"/>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        public bool TryGetMapper<TSource, TDestination>([NotNullWhen(true)] out IMapper<TSource, TDestination>? mapper)
-        { 
-            if (TryGetMapper(typeof(TSource), typeof(TDestination), out var m))
-            {
-                mapper = (IMapper<TSource, TDestination>)m;
-                return true;
-            }
-
-            mapper = default;
-            return false;
-        }
+        /// <param name="map">The mapping function.</param>
+        internal OneOffMapper(Func<TSource, TDestination> map) => _map = map.ThrowIfNull();
 
         /// <inheritdoc/>
-        [return: NotNullIfNotNull(nameof(source))]
-        public TDestination? Map<TSource, TDestination>(TSource? source, OperationTypes operationType = OperationTypes.Unspecified)
-            => GetMapper<TSource, TDestination>().Map(source, operationType)!;
-
-        /// <inheritdoc/>
-        [return: NotNullIfNotNull(nameof(source))]
-        public TDestination? Map<TSource, TDestination>(TSource? source, TDestination? destination, OperationTypes operationType = OperationTypes.Unspecified)
-            => GetMapper<TSource, TDestination>().Map(source, destination, operationType)!;
-
-        /// <summary>
-        /// Represents an empty <see cref="IMapper"/>; i.e. one that does not perform any mapping and will always throw a <see cref="NotImplementedException"/>.
-        /// </summary>
-        public class EmptyMapper : IMapper
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="EmptyMapper"/> class.
-            /// </summary>
-            internal EmptyMapper() { }
-
-            /// <inheritdoc/>
-            [return: NotNullIfNotNull(nameof(source))]
-            public TDestination? Map<TDestination>(object? source, OperationTypes operationType = OperationTypes.Unspecified) => throw new NotImplementedException();
-
-            /// <inheritdoc/>
-            [return: NotNullIfNotNull(nameof(source))]
-            public TDestination? Map<TSource, TDestination>(TSource? source, OperationTypes operationType = OperationTypes.Unspecified) => throw new NotImplementedException();
-
-            /// <inheritdoc/>
-            [return: NotNullIfNotNull(nameof(source))]
-            public TDestination? Map<TSource, TDestination>(TSource? source, TDestination? destination, OperationTypes operationType = OperationTypes.Unspecified) => throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Represents a same <see cref="Type"/> <see cref="IMapper"/>; i.e. where both the source and destination <see cref="Type"/> are the same.
-        /// </summary>
-        /// <typeparam name="TSame">The source and destination <see cref="Type"/>.</typeparam>
-        public class SameTypeMapper<TSame> : IMapper<TSame, TSame>
-        {
-            private Mapper? _mapper;
-
-            /// <inheritdoc/>
-            public Mapper Owner
-            {
-                get => _mapper ?? throw new InvalidOperationException("Owner has not been set to a non-null value; this is automatically performed when registered.");
-                set => _mapper = _mapper is null ? value : throw new InvalidOperationException("Owner can not be changed once set.");
-            }
-
-            /// <inheritdoc/>
-            /// <remarks>Throws a <see cref="NotSupportedException"/>.</remarks>
-            public TSame CreateDestination() => throw new NotSupportedException();
-
-            /// <inheritdoc/>
-            /// <remarks>Throws a <see cref="NotSupportedException"/>.</remarks>
-            public TSame CreateSource() => throw new NotSupportedException();
-
-            /// <inheritdoc/>
-            public bool InitializeDestination(TSame destination) => false;
-
-            /// <inheritdoc/>
-            /// <remarks>Returns <see cref="Entities.IInitial.IsInitial"/> where implemented; otherwise, <c>false</c>.</remarks>
-            public bool IsSourceInitial(TSame source) => source is Entities.IInitial ii && ii.IsInitial;
-
-            /// <inheritdoc/>
-            /// <remarks>Always returns the <paramref name="source"/> as-is.</remarks>
-            public TSame? Map(TSame? source, OperationTypes operationType = OperationTypes.Unspecified) => source;
-
-            /// <inheritdoc/>
-            /// <remarks>Always returns the <paramref name="source"/> as-is.</remarks>
-            public TSame? Map(TSame? source, TSame? destination, OperationTypes operationType = OperationTypes.Unspecified) => source;
-
-            /// <inheritdoc/>
-            /// <remarks>Always returns the <paramref name="source"/> as-is.</remarks>
-            object? IMapperBase.Map(object? source, OperationTypes operationType) => source;
-
-            /// <inheritdoc/>
-            /// <remarks>Always returns the <paramref name="source"/> as-is.</remarks>
-            object? IMapperBase.Map(object? source, object? destination, OperationTypes operationType) => destination;
-        }
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.Get"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenGet(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Get, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.Create"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenCreate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Create, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is an <see cref="OperationTypes.Update"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenUpdate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Update, operationType, action);
-
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.Delete"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenDelete(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.Delete, operationType, action);
+        protected override TDestination OnMap(TSource source) => _map(source);
+    }
 
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.AnyExceptGet"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenAnyExceptGet(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.AnyExceptGet, operationType, action);
+    /// <summary>
+    /// Creates a <see cref="OneOffIntoMapper{TSource, TDestination}"/> using the specified <paramref name="map"/> action.
+    /// </summary>
+    /// <typeparam name="TSource"></typeparam>
+    /// <typeparam name="TDestination"></typeparam>
+    /// <param name="map">The mapping action.</param>
+    /// <returns>The <see cref="OneOffMapper{TSource, TDestination}"/>.</returns>
+    public static OneOffIntoMapper<TSource, TDestination> CreateInto<TSource, TDestination>(Action<TSource, TDestination> map) where TSource : class where TDestination : class => new(map);
 
-        /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.AnyExceptCreate"/> then the action is invoked.
-        /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenAnyExceptCreate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.AnyExceptCreate, operationType, action);
+    /// <summary>
+    /// Provides a one-off runtime instantiated <see cref="IIntoMapper"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    public sealed class OneOffIntoMapper<TSource, TDestination> : IntoMapper<TSource, TDestination> where TSource : class where TDestination : class
+    {
+        private readonly Action<TSource, TDestination> _map;
 
         /// <summary>
-        /// When <paramref name="operationType"/> is a <see cref="OperationTypes.AnyExceptUpdate"/> then the action is invoked.
+        /// Initializes a new instance of the <see cref="OneOffMapper{TSource, TDestination}"/> class.
         /// </summary>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <param name="action">The action to invoke.</param>
-        public static void WhenAnyExceptUpdate(OperationTypes operationType, Action action) => WhenOperationType(OperationTypes.AnyExceptUpdate, operationType, action);
+        /// <param name="map">The mapping action.</param>
+        internal OneOffIntoMapper(Action<TSource, TDestination> map) => _map = map.ThrowIfNull();
 
-        /// <summary>
-        /// When the <paramref name="operationType"/> matches the <paramref name="expectedOperationTypes"/> then the <paramref name="action"/> is invoked.
-        /// </summary>
-        private static void WhenOperationType(OperationTypes expectedOperationTypes, OperationTypes operationType, Action action)
-        {
-            if (expectedOperationTypes.HasFlag(operationType))
-                action?.Invoke();
-        }
+        /// <inheritdoc/>
+        protected override void OnMapInto(TSource source, TDestination destination) => _map(source, destination);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/MapperExtensions.cs b/src/CoreEx/Mapping/MapperExtensions.cs
new file mode 100644
index 00000000..a5d9e6b8
--- /dev/null
+++ b/src/CoreEx/Mapping/MapperExtensions.cs
@@ -0,0 +1,45 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides extension methods for <see cref="Mapper"/> capabilities.
+/// </summary>
+public static class MapperExtensions
+{
+    /// <summary>
+    /// Maps the <paramref name="source"/> value to a new <typeparamref name="TDestination"/> value.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IIntoMapper{TSource, TDestination}"/>.</param>
+    /// <param name="source">The source value to map from.</param>
+    /// <returns>The <typeparamref name="TDestination"/> value that was created and mapped into.</returns>
+    public static TDestination MapNew<TSource, TDestination>(this IIntoMapper<TSource, TDestination> mapper, TSource source)
+        where TSource : class
+        where TDestination : class, new()
+    {
+        var destination = new TDestination();
+        mapper.MapInto(source, destination);
+        return destination;
+    }
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> value to a new <typeparamref name="TDestination"/> value or returns <see langword="null"/> if the <paramref name="source"/> value is <see langword="null"/>.
+    /// </summary>
+    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+    /// <param name="mapper">The <see cref="IIntoMapper{TSource, TDestination}"/>.</param>
+    /// <param name="source">The source value to map from.</param>
+    /// <returns>The <typeparamref name="TDestination"/> value that was created and mapped into, or <see langword="null"/> where the source was also <see langword="null"/>.</returns>
+    [return: NotNullIfNotNull(nameof(source))]
+    public static TDestination? MapNewOrNull<TSource, TDestination>(this IIntoMapper<TSource, TDestination> mapper, TSource? source)
+        where TSource : class
+        where TDestination : class, new()
+    {
+        if (source is null)
+            return null;
+
+        var destination = new TDestination();
+        mapper.MapInto(source, destination);
+        return destination;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/MapperOptions.cs b/src/CoreEx/Mapping/MapperOptions.cs
deleted file mode 100644
index c0885844..00000000
--- a/src/CoreEx/Mapping/MapperOptions.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Represents the <see cref="Mapper{TSource, TDestination}"/> options.
-    /// </summary>
-    /// <param name="mapper">The owning <see cref="Owner"/>.</param>
-    /// <param name="operationType">The singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.</param>
-    public class MapperOptions(Mapper mapper, OperationTypes operationType)
-    {
-        /// <summary>
-        /// Gets the owning <see cref="Mapper"/>.
-        /// </summary>
-        public Mapper Owner { get; } = mapper.ThrowIfNull(nameof(mapper));
-
-        /// <summary>
-        /// Gets the singluar <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> <see cref="OperationTypes"/> value being performed.
-        /// </summary>
-        public OperationTypes OperationType { get; } = operationType;
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> (inferring <see cref="Type"/>) value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="source">The source value.</param>
-        /// <returns>The destination value.</returns>
-        public TDestination? Map<TDestination>(object? source)
-            => Owner.Map<TDestination>(source, OperationType);
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value to a new <typeparamref name="TDestination"/> value.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="source">The source value.</param>
-        /// <returns>The destination value.</returns>
-        public TDestination? Map<TSource, TDestination>(TSource? source)
-            => Owner.Map<TSource, TDestination>(source, OperationType);
-
-        /// <summary>
-        /// Maps the <paramref name="source"/> value into the existing <paramref name="destination"/> value.
-        /// </summary>
-        /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-        /// <param name="source">The source value.</param>
-        /// <param name="destination">The destination value.</param>
-        /// <returns>The <paramref name="destination"/> value.</returns>
-        public TDestination? Map<TSource, TDestination>(TSource? source, TDestination? destination)
-            => Owner.Map(source, destination, OperationType);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/MapperT.cs b/src/CoreEx/Mapping/MapperT.cs
deleted file mode 100644
index f9d6d72e..00000000
--- a/src/CoreEx/Mapping/MapperT.cs
+++ /dev/null
@@ -1,321 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Provides a simple (explicit) value mapper. 
-    /// </summary>
-    /// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
-    public class Mapper<TSource, TDestination> : IMapper<TSource, TDestination> where TSource : class, new() where TDestination : class, new()
-    {
-        private readonly List<(Action<MapperOptions, TSource, TDestination> action, OperationTypes types, Func<TSource, bool>? isSourceInitial, Action<TDestination>? initializeDestination)> _mappings = [];
-        private readonly Func<TSource?, TDestination?, OperationTypes, TDestination?>? _onMap;
-        private Mapper? _mapper;
-        private Func<TSource, bool>? _isSourceInitial;
-        private Func<TDestination, bool>? _initializeDestination;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Mapper{TSource, TDestination}"/> class.
-        /// </summary>
-        public Mapper() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Mapper{TSource, TDestination}"/> class with an <paramref name="onMap"/> function.
-        /// </summary>
-        /// <param name="onMap">The mapping function.</param>
-        /// <remarks>Provides a simple means to create an instance with <see cref="OnMap(TSource?, TDestination?, OperationTypes)"/> logic specified within the constructor; versus, having to inherit to implement.</remarks>
-        public Mapper(Func<TSource?, TDestination?, OperationTypes, TDestination?> onMap) => _onMap = onMap.ThrowIfNull(nameof(onMap));
-
-        /// <inheritdoc/>
-        public Mapper Owner
-        {
-            get => _mapper ?? throw new InvalidOperationException("Owner has not been set to a non-null value; this is automatically performed when registered.");
-            set
-            {
-                _mapper = _mapper is null ? value : throw new InvalidOperationException("Owner can not be changed once set.");
-                if (_mapper != null)
-                    OnRegister(this);
-            }
-        }
-
-        /// <summary>
-        /// Adds a mapping.
-        /// </summary>
-        /// <param name="map">The action that performs the mapping.</param>
-        /// <param name="operationTypes">The <see cref="OperationTypes"/> (condition) when the mapping should occur. Defaults to <see cref="OperationTypes.Any"/>.</param>
-        /// <param name="isSourceInitial">The function to determine whether the source is initial (has default value).</param>
-        /// <param name="initializeDestination">The action to initialize the destination as a result of a <see cref="Flatten"/> where the source property is <c>null</c>.</param>
-        public Mapper<TSource, TDestination> Map(Action<TSource, TDestination> map, OperationTypes operationTypes = OperationTypes.Any, Func<TSource, bool>? isSourceInitial = null, Action<TDestination>? initializeDestination = null)
-        {
-            map.ThrowIfNull(nameof(map));
-
-            void action(MapperOptions o, TSource s, TDestination d) => map(s, d);
-
-            _mappings.Add((action, operationTypes, isSourceInitial, initializeDestination));
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a mapping.
-        /// </summary>
-        /// <param name="map">The action that performs the mapping.</param>
-        /// <param name="operationTypes">The <see cref="OperationTypes"/> (condition) when the mapping should occur. Defaults to <see cref="OperationTypes.Any"/>.</param>
-        /// <param name="isSourceInitial">The function to determine whether the source is initial (has default value).</param>
-        /// <param name="initializeDestination">The action to initialize the destination as a result of a <see cref="Flatten"/> where the source property is <c>null</c>.</param>
-        public Mapper<TSource, TDestination> Map(Action<MapperOptions, TSource, TDestination> map, OperationTypes operationTypes = OperationTypes.Any, Func<TSource, bool>? isSourceInitial = null, Action<TDestination>? initializeDestination = null)
-        {
-            _mappings.Add((map.ThrowIfNull(nameof(map)), operationTypes, isSourceInitial, initializeDestination));
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a flatten-mapping of a nested property.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="source"/> <see cref="Type"/>.</typeparam>
-        /// <param name="source">The function to get the source value.</param>
-        /// <param name="operationTypes">The <see cref="OperationTypes"/> (condition) when the mapping should occur. Defaults to <see cref="OperationTypes.Any"/>.</param>
-        /// <param name="isSourceInitial">The function to determine whether the source is initial (has default value).</param>
-        /// <remarks>Flattening is the updating of the <typeparamref name="TDestination"/> from a <typeparamref name="TSource"/> property that is a nested class, that in turn contains the actual corresponding source properties.
-        /// Where the <typeparamref name="TSource"/> property is <c>null</c> the corresponding <typeparamref name="TDestination"/> properties are still updated as a temporary source property instance is instantiated and used.
-        /// <para>Expanding (<see cref="Expand{T}(Action{TDestination, T}, Func{TSource, TDestination, bool}?, OperationTypes, Action{TDestination}?)"/>) is the opposite of flattening.</para></remarks>
-        public Mapper<TSource, TDestination> Flatten<T>(Func<TSource, T?> source, OperationTypes operationTypes = OperationTypes.Any, Func<TSource, bool>? isSourceInitial = null) where T : class, new()
-            => Map((o, s, d) =>
-            {
-                var sv = source(s);
-                if (sv is null && o.Owner.GetMapper<T, TDestination>().InitializeDestination(d))
-                    return;
-
-                o.Map(sv ?? new(), d);
-            }, operationTypes, isSourceInitial: isSourceInitial);
-
-        /// <summary>
-        /// Adds an expand-mapping to a nested property.
-        /// </summary>
-        /// <typeparam name="T">The <typeparamref name="TDestination"/> property <see cref="Type"/>.</typeparam>
-        /// <param name="map">The action that performs the mapping.</param>
-        /// <param name="operationTypes">The <see cref="OperationTypes"/> (condition) when the mapping should occur. Defaults to <see cref="OperationTypes.Any"/>.</param>
-        /// <param name="initializeDestination">The action to initialize the destination as a result of a <see cref="Flatten"/> where the source property is <c>null</c>.</param>
-        public Mapper<TSource, TDestination> Expand<T>(Action<TDestination, T> map, OperationTypes operationTypes = OperationTypes.Any, Action<TDestination>? initializeDestination = null) where T : class, new()
-            => Expand<T>(map, null, operationTypes, initializeDestination);
-
-        /// <summary>
-        /// Adds an expand-mapping to a nested property.
-        /// </summary>
-        /// <typeparam name="T">The <typeparamref name="TDestination"/> property <see cref="Type"/>.</typeparam>
-        /// <param name="map">The action that performs the mapping.</param>
-        /// <param name="operationTypes">The <see cref="OperationTypes"/> (condition) when the mapping should occur. Defaults to <see cref="OperationTypes.Any"/>.</param>
-        /// <param name="condition">The condition that must be met for the <paramref name="map"/> to be invoked.</param>
-        /// <param name="initializeDestination">The action to initialize the destination as a result of a <see cref="Flatten"/> where the source property is <c>null</c>.</param>
-        /// <remarks>Where <paramref name="condition"/> is <c>null</c> then the <see cref="IsSourceInitial(TSource)"/> (from the expanding mapper) is used to determine whether mapping occurs (i.e. where result is <c>false</c> being <i>not</i> initial).</remarks>
-        public Mapper<TSource, TDestination> Expand<T>(Action<TDestination, T> map, Func<TSource, TDestination, bool>? condition, OperationTypes operationTypes = OperationTypes.Any, Action<TDestination>? initializeDestination = null) where T : class, new()
-            => Map((o, s, d) =>
-            {
-                if (condition is not null && !condition(s, d))
-                    return;
-
-                var em = o.Owner.GetMapper<TSource, T>();
-                if (condition is null && em.IsSourceInitial(s))
-                    return;
-
-                map(d, em.Map(s)!);
-            }, operationTypes, initializeDestination: initializeDestination);
-
-        /// <summary>
-        /// Adds a base mapping.
-        /// </summary>
-        /// <typeparam name="TBaseSource">The base source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TBaseDestination">The base destination <see cref="Type"/>.</typeparam>
-        public Mapper<TSource, TDestination> Base<TBaseSource, TBaseDestination>() where TBaseSource : class, new() where TBaseDestination : class, new()
-        {
-            VerifyBaseInstanceOf<TBaseSource, TBaseDestination>();
-            return Map((o, s, d) => o.Map((TBaseSource)(object)s, (TBaseDestination)(object)d));
-        }
-
-        /// <summary>
-        /// Adds a base mapping using the specified <paramref name="baseMapper"/>.
-        /// </summary>
-        /// <typeparam name="TBaseSource">The base source <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TBaseDestination">The base destination <see cref="Type"/>.</typeparam>
-        /// <param name="baseMapper">The base <see cref="Mapper{TBaseSource, TBaseDestination}"/>.</param>
-        public Mapper<TSource, TDestination> Base<TBaseSource, TBaseDestination>(Mapper<TBaseSource, TBaseDestination> baseMapper) where TBaseSource : class, new() where TBaseDestination : class, new()
-        {
-            VerifyBaseInstanceOf<TBaseSource, TBaseDestination>();
-            return Map((o, s, d) => baseMapper.Map((TBaseSource)(object)s, (TBaseDestination)(object)d, o.OperationType));
-        }
-
-        /// <summary>
-        /// Adds a base mapping.
-        /// </summary>
-        /// <typeparam name="TMapper">The <see cref="IMapperBase"/> <see cref="Type"/>.</typeparam>
-        public Mapper<TSource, TDestination> Base<TMapper>() where TMapper : IMapperBase, new()
-        {
-            var mapper = new TMapper();
-            VerifyBaseInstanceOf(mapper.SourceType, mapper.DestinationType);
-            return Map((o, s, d) => o.Owner.GetMapper(mapper.SourceType, mapper.DestinationType).Map((object)s, (object)d));
-        }
-
-        /// <summary>
-        /// Verify instance of base.
-        /// </summary>
-        private static void VerifyBaseInstanceOf<TBaseSource, TBaseDestination>() => VerifyBaseInstanceOf(typeof(TBaseSource), typeof(TBaseDestination));
-
-        /// <summary>
-        /// Verify instance of base.
-        /// </summary>
-        private static void VerifyBaseInstanceOf(Type baseSourceType, Type baseDestinationType)
-        {
-            if (!baseSourceType.IsAssignableFrom(typeof(TSource)))
-                throw new ArgumentException($"Source Type '{baseSourceType.FullName}' must be assignable from '{typeof(TSource).FullName}'.");
-
-            if (!baseDestinationType.IsAssignableFrom(typeof(TDestination)))
-                throw new ArgumentException($"Destination Type '{baseDestinationType.FullName}' must be assignable from '{typeof(TDestination).FullName}'.");
-        }
-
-        /// <inheritdoc/>
-        public virtual TDestination CreateSource() => new();
-
-        /// <inheritdoc/>
-        public virtual TDestination CreateDestination() => new();
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <c>false</c> where no <i>Map</i>, <i>Flatten</i>, <i>Expand</i> or <see cref="IsSourceInitial(Func{TSource, bool})"/> is performed; otherwise, returns result of the aforementioned explicit checks.</remarks>
-        public virtual bool IsSourceInitial(TSource source)
-        {
-            bool somethingConfigured = false;
-            foreach (var (_, _, isSourceInitial, _) in _mappings)
-            {
-                if (isSourceInitial is not null)
-                {
-                    if (!isSourceInitial(source))
-                        return false;
-
-                    somethingConfigured = true;
-                }
-            }
-
-            if (somethingConfigured)
-                return _isSourceInitial is null || _isSourceInitial(source);
-
-            return _isSourceInitial?.Invoke(source) ?? false;
-        }
-
-        /// <summary>
-        /// Sets the underlying function to determine whether <see cref="IsSourceInitial(TSource)"/> extending the per <i>Map</i>, <i>Flatten</i> and <i>Expand</i> specifications (provides the base <see cref="IsSourceInitial(TSource)"/> functionality).
-        /// </summary>
-        /// <param name="isSourceInitial">The function to determine whether the source is initial.</param>
-        /// <remarks>The <paramref name="isSourceInitial"/> function must return <c>true</c> where the source is initial; otherwise, <c>false</c>.</remarks>
-        public Mapper<TSource, TDestination> IsSourceInitial(Func<TSource, bool> isSourceInitial)
-        {
-            if (_isSourceInitial != null)
-                throw new ArgumentException($"{nameof(IsSourceInitial)} cannot be invoked more than once.", nameof(isSourceInitial));
-
-            _isSourceInitial = isSourceInitial.ThrowIfNull(nameof(isSourceInitial));
-            return this;
-        }
-
-        /// <inheritdoc/>
-        /// <remarks>Defaults to <c>true</c> where explicit initialization logic is performed (per <i>Map</i>, <i>Flatten</i>, <i>Expand</i> and/or <see cref="IsSourceInitial(Func{TSource, bool})"/>); otherwise,
-        /// then a newly instantiated <typeparamref name="TSource"/> is mapped to achieve initialization.</remarks>
-        public virtual bool InitializeDestination(TDestination destination)
-        {
-            bool somethingConfigured = false;
-            foreach (var (_, _, _, initializeDestination) in _mappings)
-            {
-                if (initializeDestination is not null)
-                {
-                    initializeDestination(destination);
-                    somethingConfigured = true;
-                }
-            }
-
-            var wasInitialized = _initializeDestination?.Invoke(destination) ?? false;
-            return somethingConfigured || wasInitialized;
-        }
-
-        /// <summary>
-        /// Sets the underlying function to initialize the destination properties as a result of a <see cref="Flatten"/> (provides the base <see cref="InitializeDestination(TDestination)"/> functionality).
-        /// </summary>
-        /// <param name="initializeDestination">The function to initialize the destination properties.</param>
-        /// <remarks>The <paramref name="initializeDestination"/> function must return <c>true</c> where initialization occured; otherwise, <c>false</c>.</remarks>
-        public Mapper<TSource, TDestination> InitializeDestination(Func<TDestination, bool> initializeDestination)
-        {
-            if (_initializeDestination != null)
-                throw new ArgumentException($"{nameof(InitializeDestination)} cannot be invoked more than once.", nameof(initializeDestination));
-
-            _initializeDestination = initializeDestination.ThrowIfNull(nameof(initializeDestination));
-            return this;
-        }
-
-        /// <inheritdoc/>
-        object? IMapperBase.Map(object? source, OperationTypes operationType) => source is null ? default : Map((TSource)source, null, operationType);
-
-        /// <inheritdoc/>
-        object? IMapperBase.Map(object? source, object? destination, OperationTypes operationType) => source is null ? default : Map((TSource)source, (TDestination?)destination, operationType);
-
-        /// <inheritdoc/>
-        TDestination? IMapper<TSource, TDestination>.Map(TSource? source, OperationTypes operationType) => Map(source, null, operationType);
-
-        /// <inheritdoc/>
-        TDestination? IMapper<TSource, TDestination>.Map(TSource? source, TDestination? destination, OperationTypes operationType) => Map(source, destination, operationType);
-
-        /// <summary>
-        /// Performs the mapping by iterating over the configuration.
-        /// </summary>
-        /// <param name="source">The source.</param>
-        /// <param name="destination">The destination.</param>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        public virtual TDestination? Map(TSource? source, TDestination? destination, OperationTypes operationType)
-        {
-            if (source is null && destination is null)
-                return OnMapInternal(source, destination, operationType);
-
-            if (source is null && destination is not null)
-            {
-                destination = default;
-                return OnMapInternal(source, destination, operationType);
-            }
-
-            if (destination is not null)
-                source ??= new();
-
-            destination ??= new();
-            foreach (var (action, _, _, _) in _mappings.Where(m => m.types.HasFlag(operationType)))
-            {
-                action(new MapperOptions(Owner, operationType), source!, destination);
-            }
-
-            return OnMapInternal(source, destination, operationType);
-        }
-
-        /// <summary>
-        /// Performs the internal mapping logic.
-        /// </summary>
-        private TDestination? OnMapInternal(TSource? source, TDestination? destination, OperationTypes operationType)
-        {
-            if (_onMap is not null)
-                destination = _onMap(source, destination, operationType);
-
-            return OnMap(source, destination, operationType);
-        }
-
-        /// <summary>
-        /// Invoked after the internal mapping is completed (where configured).
-        /// </summary>
-        /// <param name="source">The source value.</param>
-        /// <param name="destination">The destination value.</param>
-        /// <param name="operationType">The singular <see cref="OperationTypes"/>.</param>
-        /// <returns>The destination value.</returns>
-        protected virtual TDestination? OnMap(TSource? source, TDestination? destination, OperationTypes operationType) => destination;
-
-        /// <summary>
-        /// Invoked when the mapper is registered.
-        /// </summary>
-        /// <param name="mapper">The mapper instance being registered.</param>
-        protected virtual void OnRegister(Mapper<TSource, TDestination> mapper) { }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/MapperT2.cs b/src/CoreEx/Mapping/MapperT2.cs
new file mode 100644
index 00000000..6c9aa6f7
--- /dev/null
+++ b/src/CoreEx/Mapping/MapperT2.cs
@@ -0,0 +1,28 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides mapping (<see cref="IMapper"/>) from a <typeparamref name="TSource"/> value to a new <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <remarks>Automatically leverages the <see cref="Mapper.MapStandardFrom{TSource, TDestination}(TDestination, TSource, bool)"/> (where <see cref="UseMapStandardFrom"/>) to map standard properties where applicable.</remarks>
+public abstract class Mapper<TSource, TDestination> : IMapper<TSource, TDestination> where TSource : class where TDestination : class
+{
+    /// <summary>
+    /// Indicates whether to use the <see cref="Mapper.MapStandardFrom"/> automatically.
+    /// </summary>
+    /// <remarks>This occurs after the <see cref="OnMap(TSource)"/>.</remarks>
+    protected virtual bool UseMapStandardFrom => true;
+
+    /// <inheritdoc/>
+    [return: NotNullIfNotNull(nameof(source))]
+    public TDestination? Map(TSource? source) => source is null ? null : OnMap(source).AdjustWhen(_ => UseMapStandardFrom, d => Mapper.MapStandardFrom(d, source));
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> value to a new destination value.
+    /// </summary>
+    /// <param name="source">The source value .</param>
+    /// <returns>The destination value.</returns>
+    /// <remarks>The source will never be <see langword="null"/>; i.e. this is only invoked where not <see langword="null"/>.</remarks>
+    protected abstract TDestination OnMap(TSource source);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/MapperT3.cs b/src/CoreEx/Mapping/MapperT3.cs
new file mode 100644
index 00000000..1ac3eedb
--- /dev/null
+++ b/src/CoreEx/Mapping/MapperT3.cs
@@ -0,0 +1,25 @@
+namespace CoreEx.Mapping;
+
+/// <summary>
+/// Provides mapping (<see cref="IMapper"/>) from a <typeparamref name="TSource"/> value to a new <typeparamref name="TDestination"/> value.
+/// </summary>
+/// <typeparam name="TSource">The source <see cref="Type"/>.</typeparam>
+/// <typeparam name="TDestination">The destination <see cref="Type"/>.</typeparam>
+/// <typeparam name="TSelf">The mapper <see cref="Type"/> itself.</typeparam>
+/// <remarks>The <see cref="Map(TSource?)"/> method provides a convenient way to map a source value to a new destination value using the singleton instance of the underlying mapper.
+/// <para>Automatically leverages the <see cref="Mapper.MapStandardFrom{TSource, TDestination}(TDestination, TSource, bool)"/> (where <see cref="Mapper{TSource, TDestination}.UseMapStandardFrom"/>) to map standard properties where applicable.</para></remarks>
+public abstract class Mapper<TSource, TDestination, TSelf> : Mapper<TSource, TDestination> where TSource : class where TDestination : class where TSelf : Mapper<TSource, TDestination, TSelf>, new()
+{
+    /// <summary>
+    /// Gets the default singleton instance of the mapper.
+    /// </summary>
+    public static TSelf Default { get; } = new TSelf();
+
+    /// <summary>
+    /// Maps the <paramref name="source"/> value to a new destination value.
+    /// </summary>
+    /// <param name="source">The source value .</param>
+    /// <returns>The destination value.</returns>
+    [return: NotNullIfNotNull(nameof(source))]
+    public static new TDestination? Map(TSource? source) => source is null ? null : Default.OnMap(source).AdjustWhen(_ => Default.UseMapStandardFrom, d => Mapper.MapStandardFrom(d, source));
+}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/OperationTypes.cs b/src/CoreEx/Mapping/OperationTypes.cs
deleted file mode 100644
index f7914cd5..00000000
--- a/src/CoreEx/Mapping/OperationTypes.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Mapping
-{
-    /// <summary>
-    /// Represents the mapping <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> operation types (Create, Read, Update and Delete).
-    /// </summary>
-    [Flags]
-    public enum OperationTypes
-    {
-        /// <summary>
-        /// Unspecified operation.
-        /// </summary>
-        Unspecified = 1,
-
-        /// <summary>
-        /// A <b>Get</b> (Read) operation.
-        /// </summary>
-        Get = 2,
-
-        /// <summary>
-        /// A <b>Create</b> operation.
-        /// </summary>
-        Create = 4,
-
-        /// <summary>
-        /// An <b>update</b> operation.
-        /// </summary>
-        Update = 8,
-
-        /// <summary>
-        /// A <b>delete</b> operation.
-        /// </summary>
-        Delete = 16,
-
-        /// <summary>
-        /// Any operation.
-        /// </summary>
-        Any = Unspecified | Get | Create | Update | Delete,
-
-        /// <summary>
-        /// Any operation except <see cref="Get"/>.
-        /// </summary>
-        AnyExceptGet = Unspecified | Create | Update | Delete,
-
-        /// <summary>
-        /// Any operation except <see cref="Create"/>.
-        /// </summary>
-        AnyExceptCreate = Unspecified | Get | Update | Delete,
-
-        /// <summary>
-        /// Any operation except <see cref="Update"/>.
-        /// </summary>
-        AnyExceptUpdate = Unspecified | Get | Create | Delete
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Mapping/README.md b/src/CoreEx/Mapping/README.md
index 8952a03f..4ba5f7c9 100644
--- a/src/CoreEx/Mapping/README.md
+++ b/src/CoreEx/Mapping/README.md
@@ -1,73 +1,37 @@
-# CoreEx.Mapping
+# CoreEx.Mapping
 
-The `CoreEx.Mapping` namespace provides extended mapping capabilities.
+> Provides the `IMapper<TSource, TDestination>` family of interfaces and `Mapper` utility for explicit, type-safe property mapping between domain model, DTO, and database entity types — without AutoMapper or reflection-based conventions.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Mapping` defines a set of small, explicit mapper interfaces that infrastructure packages (`CoreEx.Database`, `CoreEx.EntityFrameworkCore`) and application code use to convert between types. Rather than convention-based mapping, CoreEx favours explicit implementation: a mapper class implements `IMapper<TSource, TDestination>` and writes the property assignments directly, keeping the mapping logic visible, testable, and refactor-safe.
 
-To support a generic, implementation agnostic, means to support object property mappings that can be leveraged (integrated) in a consistent manner within _CoreEx_. Whereby enabling a developer to leverage their respective framework of choice; for example [AutoMapper](#AutoMapper-implementation).
+Bi-directional mappers (`IBiDirectionMapper<T1, T2>`) combine `T1→T2` and `T2→T1` in a single class, and the two- and three-type variants allow reuse across related mapping paths. `MapperExtensions` adds `MapInto<TDestination>` extension methods on any source type to enable fluent calling syntax without explicit mapper references.
 
-<br/>
+The static `Mapper` utility handles the cross-cutting "standard property" mapping across CoreEx entity contracts (`IIdentifier`, `IETag`, `ITenantId`, `IPartitionKey`, `ILogicallyDeleted`, `ITypeDiscriminator`, `IChangeLog`), so explicit mapper implementations call one line (`destination.MapStandardFrom(source)`) rather than hand-coding the same guard-then-assign pattern for every entity property.
 
-## Implementation agnostic
+## Key capabilities
 
-The [`IMapper`](./IMapper.cs) interface provides the standard implementation agnostic `Map` operations that can be, and are, leveraged within _CoreEx_ to provide object property mapping functionality.
+- 🔁 **Explicit mapping contracts**: `IMapper<TSource, TDestination>` and `IIntoMapper<TSource, TDestination>` provide typed, single-responsibility mapper interfaces with no reflection overhead.
+- ↔️ **Bi-directional mappers**: `IBiDirectionMapper<T1, T2>` combines both directions in one class, reducing class proliferation for symmetric domain↔DTO mappings.
+- 🔗 **Tri-type mappers**: `IMapper<T1, T2, T3>` and `IBiDirectionMapper<T1, T2, T3>` support three-way mapping (e.g. entity → create DTO + update DTO) in a single implementation.
+- 🏗️ **Standard property mapping**: `Mapper.MapStandardFrom<TSource, TDestination>()` automatically copies `IIdentifier`, `IETag`, `ITenantId`, `IPartitionKey`, `ILogicallyDeleted`, `ITypeDiscriminator`, and `IChangeLog`/`IChangeLogEx` properties between source and destination where both implement the matching interfaces.
+- 🧩 **Fluent extension methods**: `MapperExtensions.MapInto<TDestination>(this TSource, IMapper<TSource, TDestination>)` enables `source.MapInto(mapper)` syntax for clean, readable mapping call sites.
 
-<br/>
+## Key types
 
-## Mapper implementation 
+| Type | Description |
+|------|-------------|
+| **[`Mapper`](./Mapper.cs)** | Static utility: `MapStandardFrom` copies standard CoreEx entity contract properties (identifier, ETag, tenant, partition key, change log, etc.) between source and destination. |
+| [`IMapper<TSource, TDestination>`](./IMapperT.cs) | Core mapping interface: `Map(TSource source) → TDestination`. |
+| [`IIntoMapper<TSource, TDestination>`](./IIntoMapperT.cs) | Variant of `IMapper` that maps into an existing destination: `MapInto(TSource source, TDestination destination)`. |
+| [`IBiDirectionMapper<T1, T2>`](./IBiDirectionMapper.cs) | Combines `IMapper<T1,T2>` and `IMapper<T2,T1>` in a single interface for symmetric mappings. |
+| [`MapperExtensions`](./MapperExtensions.cs) | Extension methods: `MapInto<TDestination>()` and `MapStandardFrom()` for fluent mapping syntax. |
+| _[`MapperBase<TSource, TDestination>`](./MapperT2.cs)_ | Abstract base providing `Map` and `MapInto` infrastructure; concrete mappers override `OnMap`. |
 
-The [`Mapper`](./Mapper.cs) class provides a simple (explicit) mapping implementation of the `IMapper`. It for the most part does _not_ employ reflection and/or run-time compilation; therefore, it is very simple and fast.
+## Related Namespaces
 
-The source and destination types and corresponding property mappings are configured using the [`Mapper<TSource, TDestination>`](./MapperT.cs) class which are registered with the owning `Mapper` using the `Register` method. Collection mappings are automatically enabled.
-
-Mappings are configured using the following methods.
-
-Method | Description
--|-
-`Map` | Adds a value-based mapping, generally property to property, including an [`IConverter`](./Converters/IConverter.cs) where applicable.
-`Flatten` | Adds a flatten-mapping of a nested property. Flattening is the updating of the destination from a source property that is a nested class, that in turn contains the actual corresponding source properties. Where the source property is `null` the corresponding destination properties are still updated as a temporary source property instance is instantiated and used.
-`Expand` | Adds an expand-mapping to a nested property. Expanding is the reverse of flattening (`Flatten`).
-`Base` | Adds a base-mapping; where the source and destination type configuration is inherited from the base.
-`IsSourceInitital` | Determines whether the source is initial; i.e. all properties have their respective default values. Defaults to `false` where not specified/overridden.
-`InitializeDestination` | Specifies.overrides the initialization of the destination properties as a result of a `Flatten` where the corresponding source property is `null`.
-
-
-The `Map`, `Flatten` and `Expand` methods support `isSourceInitital` and `initializeDestination` parameters to enable specification more easily per property. 
-
-The unit [`MapperTest`](../../../tests/CoreEx.Test/Framework/Mapping/MapperTest.cs) demonstrates usage; as does the _Beef_ [`EmployeeBaseData`](https://github.com/Avanade/Beef/blob/master/samples/MyEf.Hr/MyEf.Hr.Business/Data/Generated/EmployeeBaseData.cs) and [`TerminationDetailData`](https://github.com/Avanade/Beef/blob/master/samples/MyEf.Hr/MyEf.Hr.Business/Data/Generated/TerminationDetailData.cs) samples.
-
-<br/>
-
-## Explicit implementation
-
-To explicity define the mapping logic the `OnMap` should be overridden, see example below:
-
-``` csharp
-public class ProductMapper : Mapper<Product, BackendProduct>
-{
-    protected override BackendProduct? OnMap(Product? s, BackendProduct? d, OperationTypes operationType)
-    {
-        if (s is null || d is null)
-            return d;
-
-        d.Code = s.Id!;
-        d.Description = s.Name;
-        d.RetailPrice = s.Price;
-        return d;
-    }
-}
-```
-
-<br/>
-
-## Converters
-
-The [`IConverter`](./Converters/IConverter.cs) interface provides a standardized approach to value conversion. A number of [converters](./Converters) are provided for common conversion requirements.
-
-<br/>
-
-## AutoMapper implementation
-
-[AutoMapper](https://github.com/AutoMapper/AutoMapper) is a popular .NET mapper; as such [CoreEx.AutoMapper](../../CoreEx.AutoMapper) is provided to implement. The underlying [`AutoMapperWrapper`](../../CoreEx.AutoMapper/AutoMapperWrapper.cs) enables.
+- **[`CoreEx.Entities`](../Entities/README.md)** - Defines the standard entity contract interfaces (`IIdentifier<T>`, `IETag`, `IChangeLog`, etc.) that `Mapper.MapStandardFrom` automatically copies.
+- **[`CoreEx.Data`](../Data/README.md)** - `ITenantId`, `IPartitionKey`, `ILogicallyDeleted`, and `ITypeDiscriminator` from `CoreEx.Data` are also handled by `Mapper.MapStandardFrom`.
+- **[`CoreEx.Database`](../../CoreEx.Database/README.md)** - Database mappers implement `IMapper<TEntity, TDbModel>` and call `MapStandardFrom` for the standard fields.
+- **[`CoreEx.EntityFrameworkCore`](../../CoreEx.EntityFrameworkCore/README.md)** - EF Core mappers follow the same `IMapper<TEntity, TEfModel>` pattern.
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/IPropertyRuntimeMetadata.cs b/src/CoreEx/Metadata/IPropertyRuntimeMetadata.cs
new file mode 100644
index 00000000..b585a152
--- /dev/null
+++ b/src/CoreEx/Metadata/IPropertyRuntimeMetadata.cs
@@ -0,0 +1,103 @@
+namespace CoreEx.Metadata;
+
+/// <summary>
+/// Enables the runtime metadata definition for a property within an entity.
+/// </summary>
+public interface IPropertyRuntimeMetadata
+{
+    /// <summary>
+    /// Gets the owning entity <see cref="System.Type"/>.
+    /// </summary>
+    Type Owner { get; }
+
+    /// <summary>
+    /// Gets the property <see cref="System.Type"/>.
+    /// </summary>
+    Type Type { get; }
+
+    /// <summary>
+    /// Gets the property name.
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// Gets the property text.
+    /// </summary>
+    LText Text { get; }
+
+    /// <summary>
+    /// Gets the JSON property name.
+    /// </summary>
+    string? JsonName { get; }
+
+    /// <summary>
+    /// Gets the default value.
+    /// </summary>
+    object? DefaultValue { get; }
+
+    /// <summary>
+    /// Gets the <see cref="Entities.CleanOption"/>.
+    /// </summary>
+    CleanOption CleanOption { get; }
+
+    /// <summary>
+    /// Indicates whether the property is read-only (i.e. does not have a setter).
+    /// </summary>
+    bool IsReadOnly { get; }
+
+    /// <summary>
+    /// Gets the format string used when formatting the property value as a <see langword="string"/>.
+    /// </summary>
+    /// <remarks>See <see cref="IFormattable.ToString(string?, IFormatProvider?)"/> and <see href="https://learn.microsoft.com/en-us/dotnet/standard/base-types/composite-formatting">composite formatting</see>.</remarks>
+    string? Format { get; }
+
+    /// <summary>
+    /// Indicates whether the property value is considered in its default state.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    bool IsDefault(object entity);
+
+    /// <summary>
+    /// Cleans the property value based on the <see cref="CleanOption"/>.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    void Clean(object entity);
+
+    /// <summary>
+    /// Gets the property value.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    /// <returns>The property value.</returns>
+    object? GetValue(object entity);
+
+    /// <summary>
+    /// Get the property value.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="entity">The entity value.</param>
+    /// <returns>The property value.</returns>
+    T GetValue<T>(object entity);
+
+    /// <summary>
+    /// Sets (overrides) the property value with the specified <paramref name="value"/>.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    /// <param name="value">The overriding property value.</param>
+    void SetValue(object entity, object? value);
+
+    /// <summary>
+    /// Sets (overrides) the property value with the specified <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="entity">The entity value.</param>
+    /// <param name="value">The overriding property value.</param>
+    void SetValue<T>(object entity, T value);
+
+    /// <summary>
+    /// Gets the JSON property name.
+    /// </summary>
+    /// <param name="options">The optional <see cref="JsonSerializerOptions"/>.</param>
+    /// <returns>The JSON property name.</returns>
+    /// <remarks>Uses the <see cref="JsonName"/> where not <see langword="null"/>; otherwise, uses the property <see cref="Name"/> passed through the optional <see cref="JsonSerializerOptions.PropertyNamingPolicy"/> <see cref="JsonNamingPolicy.ConvertName(string)"/>.</remarks>
+    string GetJsonName(JsonSerializerOptions? options = null);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/IRuntimeMetadata.cs b/src/CoreEx/Metadata/IRuntimeMetadata.cs
new file mode 100644
index 00000000..45e07cc3
--- /dev/null
+++ b/src/CoreEx/Metadata/IRuntimeMetadata.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Metadata;
+
+/// <summary>
+/// Enables access to the <see cref="IPropertyRuntimeMetadata"/> for each property via the static <see cref="GetStaticPropertyRuntimeMetadata"/>.
+/// </summary>
+/// <remarks>See also <see cref="IRuntimeMetadataCore"/>.</remarks>
+public interface IRuntimeMetadata : IRuntimeMetadataCore
+{
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for each property.
+    /// </summary>
+    static abstract IEnumerable<IPropertyRuntimeMetadata> GetStaticPropertyRuntimeMetadata();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/IRuntimeMetadataCore.cs b/src/CoreEx/Metadata/IRuntimeMetadataCore.cs
new file mode 100644
index 00000000..945aee39
--- /dev/null
+++ b/src/CoreEx/Metadata/IRuntimeMetadataCore.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Metadata;
+
+/// <summary>
+/// Enables access to the <see cref="IPropertyRuntimeMetadata"/> for each property.
+/// </summary>
+public interface IRuntimeMetadataCore
+{
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for each property.
+    /// </summary>
+    IEnumerable<IPropertyRuntimeMetadata> GetPropertyRuntimeMetadata();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/PropertyRuntimeMetadata.cs b/src/CoreEx/Metadata/PropertyRuntimeMetadata.cs
new file mode 100644
index 00000000..d7ffecba
--- /dev/null
+++ b/src/CoreEx/Metadata/PropertyRuntimeMetadata.cs
@@ -0,0 +1,136 @@
+namespace CoreEx.Metadata;
+
+/// <summary>
+/// Provides the runtime metadata definition for a property within an entity.
+/// </summary>
+/// <typeparam name="TEntity">The owning entity <see cref="Type"/>.</typeparam>
+/// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+/// <param name="name">The property name.</param>
+/// <param name="getValue">The function to get the value.</param>
+/// <param name="setValue">The action to set the value.</param>
+/// <param name="text">The optional <see cref="LText"/>.</param>
+/// <param name="defaultValue">The optional default value.</param>
+/// <param name="clean">The <see cref="Entities.CleanOption"/> used for <see cref="Clean(TEntity)">cleaning</see>.</param>
+/// <param name="jsonName">The optional explicit JSON name.</param>
+/// <param name="format">The optional format string.</param>
+/// <remarks>The underlying implementation does not store mutable state for an entity property; therefore, an instance can be cached and reused where applicable to improve performance, etc.</remarks>
+public readonly struct PropertyRuntimeMetadata<TEntity, TProperty>(string name, Func<TEntity, TProperty> getValue, Action<TEntity, TProperty>? setValue = null, Func<LText>? text = null, TProperty defaultValue = default!, CleanOption clean = CleanOption.UseDefault, string? jsonName = null, string? format = null) : IPropertyRuntimeMetadata
+{
+    private static readonly string? _nullObject = null;
+
+    private readonly Func<TEntity, TProperty> _getValue = getValue.ThrowIfNull();
+    private readonly Action<TEntity, TProperty>? _setValue = setValue;
+    private readonly Lazy<LText> _text = new(() => text?.Invoke() ?? new LText(name, name.ToSentenceCase()));
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PropertyRuntimeMetadata{TEntity, T}"/> struct.
+    /// </summary>
+    /// <remarks>The parameterless constructor is not supported; and as such, throws a <see cref="NotSupportedException"/>.</remarks>
+    [Obsolete("Parameterless constructor is not supported.", true)]
+    public PropertyRuntimeMetadata() : this(_nullObject ?? throw new NotSupportedException("The parameterless constructor is not supported."), null!) { }
+
+    /// <inheritdoc/>
+    public Type Owner => typeof(TEntity);
+
+    /// <inheritdoc/>
+    public Type Type => typeof(TProperty);
+
+    /// <inheritdoc/>
+    public string Name { get; } = name.ThrowIfNullOrEmpty();
+
+    /// <inheritdoc/>
+    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
+    public LText Text => _text.Value;
+
+    /// <inheritdoc/>
+    public string? JsonName { get; } = jsonName;
+
+    /// <inheritdoc/>
+    object? IPropertyRuntimeMetadata.DefaultValue => DefaultValue;
+
+    /// <summary>
+    /// Gets the default value.
+    /// </summary>
+    public TProperty? DefaultValue { get; } = defaultValue;
+
+    /// <inheritdoc/>
+    public CleanOption CleanOption { get; } = clean;
+
+    /// <inheritdoc/>
+    public bool IsReadOnly => _setValue is null;
+
+    /// <inheritdoc/>
+    public string? Format { get; } = format;
+
+    /// <inheritdoc/>
+    bool IPropertyRuntimeMetadata.IsDefault(object entity) => IsDefault((TEntity)entity.ThrowIfNull());
+
+    /// <summary>
+    /// Indicates whether the property value is considered in its default state.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    public bool IsDefault(TEntity entity) => RuntimeMetadata.IsDefault(GetValue(entity), DefaultValue);
+
+    /// <inheritdoc/>
+    void IPropertyRuntimeMetadata.Clean(object entity)
+    {
+        if (entity is not null)
+            Clean((TEntity)entity);
+    }
+
+    /// <summary>
+    /// Cleans the property.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    public void Clean(TEntity entity)
+    {
+        if (entity is null)
+            return;
+
+        var clean = CleanOption == CleanOption.UseDefault ? Cleaner.DefaultCleanOption : CleanOption;
+        if (clean == CleanOption.None)
+            return;
+
+        var val = Cleaner.Clean(GetValue(entity));
+        if (IsReadOnly)
+            return;
+
+        if (clean == CleanOption.CleanAndDefault && RuntimeMetadata.AreEqual(val, DefaultValue))
+            SetValue(entity, DefaultValue!);
+    }
+
+    /// <inheritdoc/>
+    object? IPropertyRuntimeMetadata.GetValue(object entity) => GetValue((TEntity)entity);
+
+    /// <inheritdoc/>
+    T IPropertyRuntimeMetadata.GetValue<T>(object entity) => Internal.Cast<TProperty, T>(GetValue((TEntity)entity));
+
+    /// <summary>
+    /// Gets the property value.
+    /// </summary>
+    public TProperty GetValue(TEntity entity) => _getValue(entity.ThrowIfNull());
+
+    /// <inheritdoc/>
+    void IPropertyRuntimeMetadata.SetValue(object entity, object? value) => SetValue((TEntity)entity.ThrowIfNull(), (TProperty)value!);
+
+    /// <inheritdoc/>
+    void IPropertyRuntimeMetadata.SetValue<T>(object entity, T value) => SetValue((TEntity)entity, Internal.Cast<T, TProperty>(value));
+
+    /// <summary>
+    /// Sets (overrides) the property value.
+    /// </summary>
+    /// <param name="entity">The entity value.</param>
+    /// <param name="value">The property value.</param>
+    public void SetValue(TEntity entity, TProperty value)
+    {
+        if (_setValue is null)
+            throw new InvalidOperationException($"Property '{Name}' is read-only and cannot be set.");
+
+        _setValue(entity.ThrowIfNull(), value);
+    }
+
+    /// <inheritdoc/>
+    public string GetJsonName(JsonSerializerOptions? options = null) => JsonName is not null 
+        ? JsonName 
+        : (options ?? JsonDefaults.SerializerOptions).PropertyNamingPolicy?.ConvertName(Name) ?? Name;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/PropertyRuntimeMetadataReflector.cs b/src/CoreEx/Metadata/PropertyRuntimeMetadataReflector.cs
new file mode 100644
index 00000000..6f6e41cb
--- /dev/null
+++ b/src/CoreEx/Metadata/PropertyRuntimeMetadataReflector.cs
@@ -0,0 +1,36 @@
+namespace CoreEx.Metadata;
+
+/// <summary>
+/// Provides functionality to create runtime metadata using reflection.
+/// </summary>
+internal class PropertyRuntimeMetadataReflector
+{
+    /// <summary>
+    /// Creates the <see cref="IPropertyRuntimeMetadata"/> from the supplied <see cref="PropertyInfo"/>.
+    /// </summary>
+    /// <param name="pi">The corresponding <see cref="PropertyInfo"/>.</param>
+    /// <returns>The <see cref="IPropertyRuntimeMetadata"/>.</returns>
+    public static IPropertyRuntimeMetadata CreatePropertyRuntimeMetadata<TEntity, T>(PropertyInfo pi) where TEntity : class
+    {
+        pi.ThrowIfNull();
+
+        Func<TEntity, T> getValue = (Func<TEntity, T>)Delegate.CreateDelegate(typeof(Func<TEntity, T>), null, pi.GetGetMethod()!);
+
+        var mi = pi.GetSetMethod();
+        Action<TEntity, T>? setValue = mi is null ? null : (Action<TEntity, T>)Delegate.CreateDelegate(typeof(Action<TEntity, T>), null, mi);
+
+        var text = pi.GetCustomAttribute<LocalizationAttribute>()?.ToLText();
+        if (text is null)
+        {
+            var dn = pi.GetCustomAttribute<DisplayAttribute>()?.GetName();
+            if (!string.IsNullOrEmpty(dn))
+                text = new LText(pi.Name, dn);
+        }
+
+        Func<LText>? textFunc = text.HasValue ? () => text.Value : null;
+
+        return new PropertyRuntimeMetadata<TEntity, T>(pi.Name, getValue, setValue, textFunc, 
+            jsonName: pi.GetCustomAttribute<JsonPropertyNameAttribute>()?.Name, 
+            format: pi.GetCustomAttribute<DisplayFormatAttribute>()?.DataFormatString);
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/README.md b/src/CoreEx/Metadata/README.md
new file mode 100644
index 00000000..b6693405
--- /dev/null
+++ b/src/CoreEx/Metadata/README.md
@@ -0,0 +1,33 @@
+# CoreEx.Metadata
+
+> Provides `RuntimeMetadata` and `IPropertyRuntimeMetadata` — the reflection-backed (and source-generator-backed) property introspection layer used by `IContract<T>` implementations for equality, hashing, copying, cleaning, and `IsDefault` operations.
+
+## Overview
+
+`CoreEx.Metadata` is the engine behind `IContract<T>` operations. When the CoreEx source generator decorates a `partial class` with `[Contract]`, it emits `GetStaticPropertyRuntimeMetadata()` implementations that return typed `IPropertyRuntimeMetadata` descriptors for each property. At runtime, `RuntimeMetadata` uses those descriptors (or falls back to reflection with caching) to implement the shared entity contract operations: `AreEqual`, `CopyInto`, `Clean`, `GetHashCode`, and `IsDefault`.
+
+Consumers rarely interact with this namespace directly — its API surface is primarily for generated code and for the handful of framework utilities (e.g. `Cleaner`, `EntityBase`) that need property-level introspection. It is documented here for completeness and for contributors working on the source generator or advanced contract scenarios.
+
+## Key capabilities
+
+- 🔍 **Property runtime metadata**: `IPropertyRuntimeMetadata` describes a single entity property: name, type, whether it is a key property, whether to include in equality/hash/clean/copy/`IsDefault` operations, and getter/setter delegates.
+- 🏎️ **Compiled delegates**: Property accessors are compiled to typed `Func<TEntity, TProperty>` / `Action<TEntity, TProperty>` delegates (cached per type) rather than using `PropertyInfo.GetValue`, eliminating reflection overhead on the hot path.
+- 📦 **Per-type caching**: Property metadata collections are cached in a `ConcurrentDictionary` with a configurable sliding expiration (`CoreEx:Runtime:Metadata:SlidingExpirationTimespan`, default 30 min) to balance memory and startup cost.
+- ✂️ **Partial static class**: `RuntimeMetadata` is a `static partial class` with separate files for each operation (`AreEqual`, `Clean`, `CopyInto`, `GetHashCode`, `IsDefault`, `Internal`), keeping each concern isolated.
+- 🔁 **Reflection fallback**: When no source-generated `GetStaticPropertyRuntimeMetadata()` is available (e.g. for non-`[Contract]` types), `PropertyRuntimeMetadataReflector` builds the metadata from `PropertyInfo` via reflection and caches it.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`RuntimeMetadata`](./RuntimeMetadata.cs)** | Static partial class providing `AreEqual`, `CopyInto`, `Clean`, `GetHashCode`, `IsDefault`, and `GetForExpression` operations over `IContract<T>` types. |
+| **[`PropertyRuntimeMetadataReflector`](./PropertyRuntimeMetadataReflector.cs)** | Builds `IPropertyRuntimeMetadata` collections from `PropertyInfo` via reflection for types without source-generated metadata. |
+| [`IPropertyRuntimeMetadata`](./IPropertyRuntimeMetadata.cs) | Descriptor for a single property: name, type, key flag, equality/clean/copy/hash/isdefault inclusion flags, and compiled getter/setter. |
+| [`PropertyRuntimeMetadata`](./PropertyRuntimeMetadata.cs) | Default `IPropertyRuntimeMetadata` implementation used by both the source generator and reflection paths. |
+| [`IRuntimeMetadata`](./IRuntimeMetadata.cs) | Interface implemented by `IContract<T>` types providing `GetStaticPropertyRuntimeMetadata()` for source-generated fast-path access. |
+| [`IRuntimeMetadataCore`](./IRuntimeMetadataCore.cs) | Minimal interface subset of `IRuntimeMetadata` used by non-`IContract<T>` infrastructure that still needs property-level introspection. |
+
+## Related Namespaces
+
+- **[`CoreEx.Entities`](../Entities/README.md)** - `IContract<T>` extends `IRuntimeMetadata`; `Cleaner` delegates to `RuntimeMetadata.Clean`; `IdentifierGenerator` and change-log population rely on property metadata.
+- **[`CoreEx.Generator`](../../../gen/CoreEx.Generator/README.md)** - The Roslyn source generator emits `GetStaticPropertyRuntimeMetadata()` implementations consumed by `RuntimeMetadata`.
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.AreEqual.cs b/src/CoreEx/Metadata/RuntimeMetadata.AreEqual.cs
new file mode 100644
index 00000000..65895d80
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.AreEqual.cs
@@ -0,0 +1,145 @@
+namespace CoreEx.Metadata;
+
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Compare two <typeparamref name="T"/> values for equality.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="left">The left-side value.</param>
+    /// <param name="right">The right-side value.</param>
+    /// <returns><see langword="true"/> indicates they are equal; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>This improves upon the standard <see cref="object.Equals(object?, object?)"/> which for a <see langword="class"/> generally only performs a reference equality. The following additional checks
+    /// are performed: <see cref="IEquatable{T}.Equals(T)"/> comparison, <see cref="ICollection.Count"/> comparison, <see cref="IDictionary"/> per item <see cref="IDictionaryEnumerator.Key"/> and <see cref="IDictionaryEnumerator.Value"/> comparisons, 
+    /// <see cref="IEnumerable"/> item comparisons, and nested <see cref="IRuntimeMetadataCore"/> and <see cref="IPropertyRuntimeMetadata"/> comparisons. This is to achieve a best attempt deep-equals where a contract-style 
+    /// class (such as a <see href="https://en.wikipedia.org/wiki/Data_transfer_object"/>) constrains itself to simple and known types such as those described above, and/or overrides <see cref="object.Equals(object?)"/> accordingly.</remarks>
+    public static bool AreEqual<T>(T? left, T? right)
+    {
+        if (ReferenceEquals(left, right)) return true;
+        if (left is null || right is null) return false;
+
+        // Fast-path string comparison.
+        if (left is string ls && right is string rs)
+            return ls == rs;
+
+        // Where metadata, then matchy-matchy each property one-by-one.
+        if (left is IRuntimeMetadataCore lrm)
+        {
+            var epl = lrm.GetPropertyRuntimeMetadata().GetEnumerator();
+            var epr = ((IRuntimeMetadataCore)right).GetPropertyRuntimeMetadata().GetEnumerator();
+            while (epl.MoveNext())
+            {
+                if (!epr.MoveNext() || !AreEqual(epl.Current.GetValue(left), epr.Current.GetValue(right)))
+                    return false;
+            }
+
+            return true;
+        }
+
+        // Fast-path explicit equality implementation.
+        if (left is IEquatable<T> leq)
+            return leq.Equals(right);
+
+        // Short circuit arrays, collections, lists, and dictionaries based on count difference.
+        if (left is ICollection lc)
+        {
+            if (lc.Count != ((ICollection)right).Count)
+                return false;
+        }
+
+        // Per item-based comparisons.
+        if (left is IDictionary ld)
+            return IDictionaryAreEqual(ld, (IDictionary)right);
+
+        if (left is IEnumerable le)
+            return IEnumerableAreEqual(le, (IEnumerable)right);
+
+        // Special handling for JsonElement comparison.
+        if (left is JsonElement lje && right is JsonElement rje)
+#if NET8_0
+            return CoreEx.Json.JsonMergePatch.DeepEquals(lje, rje);
+#else
+            return JsonElement.DeepEquals(lje, rje);
+#endif
+
+        // Default value type comparison.
+        var type = left.GetType();
+        if (type.IsValueType)
+            return Equals(left, right);
+
+        // Must be a class so use reflection-based runtime-metadata to compare each property.
+        foreach (var p in GetCachedProperties(type).Values)
+        {
+            if (!AreEqual(p.GetValue(left), p.GetValue(right)))
+                return false;
+        }
+
+        // Well, if we got this far, then they must be equal - good job (https://www.youtube.com/watch?v=BSmliwh7D30).
+        return true;
+    }
+
+    /// <summary>
+    /// Perform an equality comparison of two <see cref="IEnumerable"/> values.
+    /// </summary>
+    private static bool IEnumerableAreEqual(IEnumerable left, IEnumerable right)
+    {
+        // Slow path, possibly with boxing
+        static bool EnumerateObjectAreEqual(IEnumerable l, IEnumerable r)
+        {
+            // Determine the element type and use cached dispatcher where possible.
+            var elementType = GetEnumerableElementType(l);
+            if (elementType is not null && elementType.IsValueType)
+            {
+                var dispatcher = GetEnumerableDispatcher(elementType);
+                return dispatcher(l, r);
+            }
+
+            // Fallback to object comparison; which is ok where there is no boxing involved.
+            var el = l.GetEnumerator();
+            var er = r.GetEnumerator();
+            while (el.MoveNext())
+            {
+                if (!(er.MoveNext() && AreEqual(el.Current, er.Current)))
+                    return false;
+            }
+
+            return true;
+        }
+
+        return (left, right) switch
+        {
+            // Fast paths for common/hot types.
+            (IEnumerable<string> ls, IEnumerable<string> rs) => TypedEnumerateAreEqual(ls, rs),
+            (IEnumerable<Guid> lg, IEnumerable<Guid> rg) => TypedEnumerateAreEqual(lg, rg),
+            (IEnumerable<Guid?> lgn, IEnumerable<Guid?> rgn) => TypedEnumerateAreEqual(lgn, rgn),
+            (IEnumerable<int> li, IEnumerable<int> ri) => TypedEnumerateAreEqual(li, ri),
+            (IEnumerable<int?> lin, IEnumerable<int?> rin) => TypedEnumerateAreEqual(lin, rin),
+            (IEnumerable<long> ll, IEnumerable<long> rl) => TypedEnumerateAreEqual(ll, rl),
+            (IEnumerable<long?> ll, IEnumerable<long?> rl) => TypedEnumerateAreEqual(ll, rl),
+            (IEnumerable<DateTimeOffset> ld, IEnumerable<DateTimeOffset> rd) => TypedEnumerateAreEqual(ld, rd),
+            (IEnumerable<DateTimeOffset?> ldg, IEnumerable<DateTimeOffset?> rdg) => TypedEnumerateAreEqual(ldg, rdg),
+
+            // Use cached dispatcher for other types.
+            _ => EnumerateObjectAreEqual(left, right)
+        };
+    }
+
+    /// <summary>
+    /// Perform an equality comparison of two <see cref="IDictionary"/> values.
+    /// </summary>
+    private static bool IDictionaryAreEqual(IDictionary left, IDictionary right)
+    {
+        var el = left.GetEnumerator();
+
+        while (el.MoveNext())
+        {
+            if (!right.Contains(el.Key))
+                return false;
+
+            if (!AreEqual(el.Value, right[el.Key]))
+                return false;
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.Clean.cs b/src/CoreEx/Metadata/RuntimeMetadata.Clean.cs
new file mode 100644
index 00000000..097e6879
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.Clean.cs
@@ -0,0 +1,82 @@
+namespace CoreEx.Metadata;
+
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Cleans (deep) the mutable properties of the <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <returns>The cleaned <paramref name="value"/>.</returns>
+    /// <remarks>This will walk the fully object graph, including arrays, collections, and dictionaries cleaning all mutable properties. Note that where the entry for an array, collection, or dictionary is a value type
+    /// this is unable to be cleaned/replaced. An empty array, collection, or dictionary will be set to <see langword="default"/>.</remarks>
+    public static T? Clean<T>(T value)
+    {
+        if (value is string str)
+            return Internal.Cast<string, T>(Cleaner.Clean(str, Cleaner.DefaultStringTrim, Cleaner.DefaultStringTransform, Cleaner.DefaultStringCase)!);
+
+        if (value is null)
+            return value;
+
+        if (value is DateTime dt)
+            return Internal.Cast<DateTime, T>(Cleaner.Clean(dt, Cleaner.DefaultDateTimeTransform));
+
+        if (value is IRuntimeMetadataCore rm)
+        {
+            foreach (var p in rm.GetPropertyRuntimeMetadata().Where(x => !x.IsReadOnly))
+            {
+                p.Clean(value);
+            }
+
+            return RuntimeMetadata.IsDefault(value) ? default : value;
+        }
+
+        // Zero-length collections are nulled out.
+        if (value is ICollection ic && ic.Count == 0)
+            return default;
+
+        // Clean each dictionary item (does not replace/null entry, only contents thereof); key remains unchanged.
+        if (value is IDictionary d)
+        {
+            foreach (DictionaryEntry de in d)
+            {
+                Clean(de.Value);
+            }
+
+            return value;
+        }
+
+        // Clean each enumerable item (does not replace/null entry, only contents thereof).
+        if (value is IEnumerable e)
+        {
+            // Fast-path common/hot types to avoid boxing - can't clean anyway!
+            if (value is ICollection<string> || value is ICollection<Guid> || value is ICollection<Guid?>
+                || value is ICollection<int> || value is ICollection<int?> || value is ICollection<long> || value is ICollection<long?>)
+                return value;
+
+            // Get the element type to determine if boxing will occur and bail if so - can't clean anyway!
+            var elementType = GetEnumerableElementType(value);
+            if (elementType is not null && elementType.IsValueType)
+                return value;
+
+            foreach (var item in e)
+            {
+                Clean(item);
+            }
+
+            return value;
+        }
+
+        // Handle value or class types.
+        var type = value.GetType();
+        if (type.IsValueType)
+            return Cleaner.Clean(value);
+
+        foreach (var p in GetCachedProperties(value.GetType()).Values.Where(x => x.IsReadOnly))
+        {
+            p.Clean(value);
+        }
+
+        return RuntimeMetadata.IsDefault(value) ? default : value;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.CopyInto.cs b/src/CoreEx/Metadata/RuntimeMetadata.CopyInto.cs
new file mode 100644
index 00000000..ed7148f6
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.CopyInto.cs
@@ -0,0 +1,139 @@
+namespace CoreEx.Metadata;
+
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Copies (shallow) <paramref name="from"/> a value <paramref name="into"/> another value where they share mutable properties.
+    /// </summary>
+    /// <typeparam name="TFrom">The from <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TInto">The into <see cref="Type"/>.</typeparam>
+    /// <param name="from">The from value.</param>
+    /// <param name="into">The into value.</param>
+    /// <remarks>Only mutable (set-based) properties will be copied; i.e. read-only (get-based) properties will remain unchanged. This performs a shallow copy only, in that only the root property values are copied (replace existing). Where
+    /// these values are complex types (i.e. class types) these are not further copied (cloned); they are updated by reference.
+    /// <para>This method ignores <see cref="string"/> and <see cref="ICollection"/> values, and the <paramref name="from"/> value must be the same type or is same assignable/subclass as the <paramref name="into"/> value.
+    /// In these instances no copying can or will be performed; i.e. is a no-op.</para>
+    /// <para>This will leverage either the underlying<see cref="IRuntimeMetadataCore"/> implementation or reflection (<see cref="GetCachedProperties{T}()"/>) depending on the types.</para></remarks>
+    public static void CopyInto<TFrom, TInto>(TFrom from, TInto into) where TFrom : class where TInto : class
+    {
+        from.ThrowIfNull();
+        into.ThrowIfNull();
+
+        if (from is string || into is string || from is ICollection || into is ICollection)
+            return;
+
+        if (!(from is TInto || into is TFrom))
+            return;
+
+        var dict = into is IRuntimeMetadataCore irm
+            ? irm.GetPropertyRuntimeMetadata().ToDictionary(p => p.Name)
+            : GetCachedProperties<TInto>();
+
+        if (from is IRuntimeMetadataCore frm)
+        {
+            foreach (var fp in frm.GetPropertyRuntimeMetadata().Where(p => !p.IsReadOnly))
+            {
+                if (dict.TryGetValue(fp.Name, out var im) && !im.IsReadOnly && fp.Type == im.Type)
+                {
+                    im.SetValue(into, fp.GetValue(from));
+                }
+            }
+        }
+        else
+        {
+            foreach (var fp in GetCachedProperties<TFrom>().Where(p => !p.Value.IsReadOnly))
+            {
+                if (dict.TryGetValue(fp.Value.Name, out var im) && !im.IsReadOnly && fp.Value.Type == im.Type)
+                {
+                    im.SetValue(into, fp.Value.GetValue(from));
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Copies (shallow) <paramref name="from"/> a value <paramref name="into"/> another value where they share mutable properties and returns a value indicating whether changes where made.
+    /// </summary>
+    /// <typeparam name="TFrom">The from <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TInto">The into <see cref="Type"/>.</typeparam>
+    /// <param name="from">The from value.</param>
+    /// <param name="into">The into value.</param>
+    /// <returns><c>true</c> where changes were made; otherwise, <c>false</c>.</returns>
+    /// <remarks>Only mutable (set-based) properties will be copied; i.e. read-only (get-based) properties will remain unchanged. This performs a shallow copy only, in that only the root property values are copied (replace existing). Where
+    /// these values are complex types (i.e. class types) these are not further copied (cloned); they are updated by reference.
+    /// <para>This method ignores <see cref="string"/> and <see cref="ICollection"/> values, and the <paramref name="from"/> value must be the same type or is same assignable/subclass as the <paramref name="into"/> value.
+    /// In these instances no copying can or will be performed; i.e. is a no-op.</para>
+    /// <para>This will leverage either the underlying<see cref="IRuntimeMetadataCore"/> implementation or reflection (<see cref="GetCachedProperties{T}()"/>) depending on the types.</para></remarks>
+    public static bool TryCopyInto<TFrom, TInto>(TFrom from, TInto into) where TFrom : class where TInto : class
+    {
+        from.ThrowIfNull();
+        into.ThrowIfNull();
+
+        if (from is string || into is string || from is ICollection || into is ICollection)
+            return false;
+
+        if (!(from is TInto || into is TFrom))
+            return false;
+
+        var changed = false;
+        var dict = into is IRuntimeMetadataCore irm
+            ? irm.GetPropertyRuntimeMetadata().ToDictionary(p => p.Name)
+            : GetCachedProperties<TInto>();
+
+        if (from is IRuntimeMetadataCore frm)
+        {
+            foreach (var fp in frm.GetPropertyRuntimeMetadata().Where(p => !p.IsReadOnly))
+            {
+                if (dict.TryGetValue(fp.Name, out var im) && !im.IsReadOnly && fp.Type == im.Type)
+                {
+                    var gv = fp.GetValue(from);
+                    if (gv is not string && gv is ICollection)
+                        continue;
+
+                    if (AreEqual(im.GetValue(into), gv))
+                        continue;
+
+                    im.SetValue(into, gv);
+                    changed = true;
+                }
+            }
+        }
+        else
+        {
+            foreach (var fp in GetCachedProperties<TFrom>().Where(p => !p.Value.IsReadOnly))
+            {
+                if (dict.TryGetValue(fp.Value.Name, out var im) && !im.IsReadOnly && fp.Value.Type == im.Type)
+                {
+                    var gv = fp.Value.GetValue(from);
+                    if (gv is not string && gv is ICollection)
+                        continue;
+
+                    if (AreEqual(im.GetValue(into), gv))
+                        continue;
+
+                    im.SetValue(into, gv);
+                    changed = true;
+                }
+            }
+        }
+
+        return changed;
+    }
+
+    /// <summary>
+    /// Creates a shallow copy (clone) of the specified <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The source value.</param>
+    /// <returns>The cloned <paramref name="value"/>.</returns>
+    /// <remarks>The <see cref="CopyInto{TInto, TFrom}(TInto, TFrom)"/> is the key enabler for this capability.</remarks>
+    public static T Clone<T>(T value) where T : class, new()
+    {
+        if (value.ThrowIfNull() is string str)
+            return Internal.Cast<string, T>(str);
+
+        var clone = new T();
+        CopyInto(clone, value.ThrowIfNull());
+        return clone;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.GetHashCode.cs b/src/CoreEx/Metadata/RuntimeMetadata.GetHashCode.cs
new file mode 100644
index 00000000..4e898423
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.GetHashCode.cs
@@ -0,0 +1,71 @@
+namespace CoreEx.Metadata;
+
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Gets the hash code for the <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <returns>A 32-bit signed integer hash code.</returns>
+    public static int GetHashCode<T>(T? value)
+    {
+        switch (value)
+        {
+            case null:
+                return 0;
+
+            case string s:
+                return s.GetHashCode();
+
+            case IRuntimeMetadataCore rm:
+                {
+                    var hash = new HashCode();
+                    foreach (var p in rm.GetPropertyRuntimeMetadata())
+                    {
+                        hash.Add(GetHashCode(p.GetValue(value)));
+                    }
+
+                    return hash.ToHashCode();
+                }
+
+            case IDictionary d:
+                {
+                    var hash = new HashCode();
+                    var e = d.GetEnumerator();
+                    while (e.MoveNext())
+                    {
+                        hash.Add(GetHashCode(e.Key));
+                        hash.Add(GetHashCode(e.Value));
+                    }
+
+                    return hash.ToHashCode();
+                }
+
+            case IEnumerable e:
+                {
+                    var hash = new HashCode();
+                    foreach (var item in e)
+                        hash.Add(GetHashCode(item));
+
+                    return hash.ToHashCode();
+                }
+
+            default:
+                {
+                    var type = value.GetType();
+                    if (type.IsValueType)
+                        return value.GetHashCode();
+
+                    // Must be a class so use reflection-based runtime-metadata.
+                    var hash = new HashCode();
+                    foreach (var p in GetCachedProperties(type).Values)
+                    {
+                        hash.Add(GetHashCode(p.GetValue(value)));
+                    }
+
+                    return hash.ToHashCode();
+                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.Internal.cs b/src/CoreEx/Metadata/RuntimeMetadata.Internal.cs
new file mode 100644
index 00000000..1504caaf
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.Internal.cs
@@ -0,0 +1,76 @@
+namespace CoreEx.Metadata;
+
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Gets the <see cref="IEnumerable"/> element type.
+    /// </summary>
+    private static Type? GetEnumerableElementType(object o) => GetEnumerableElementType(o.GetType());
+
+    /// <summary>
+    /// Gets the <see cref="IEnumerable"/> element type.
+    /// </summary>
+    private static Type? GetEnumerableElementType(Type type)
+    {
+        // Arrays are easy!
+        if (type.IsArray)
+            return type.GetElementType();
+
+        // Ok, now we need some reflection magic - must cache.
+        return Internal.MemoryCache.GetOrCreate<Type?>($"RuntimeMetadata_ElementType_{type.FullName}", entry =>
+        {
+            entry.SlidingExpiration = SlidingExpirationTimespan;
+
+            // The type itself might be IEnumerable<T>.
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+                return type.GetGenericArguments()[0];
+
+            // Or it implements IEnumerable<T>.
+            var enumIface = type.GetInterfaces().FirstOrDefault(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IEnumerable<>));
+            return enumIface?.GetGenericArguments()[0];
+        });
+    }
+
+    /// <summary>
+    /// Gets (or creates) the cached delegate that compares two sequences of the specified element type for equality.
+    /// </summary>
+    private static Func<object, object, bool> GetEnumerableDispatcher(Type elementType) => Internal.MemoryCache.GetOrCreate<Func<object, object, bool>>($"RuntimeMetadata_Dispatcher_{elementType.FullName}", entry =>
+    {
+        // Create the generic: TypedEnumerateAreEqual<T>(IEnumerable<T>, IEnumerable<T>)
+        var method = typeof(RuntimeMetadata).GetMethod(nameof(TypedEnumerateAreEqual), BindingFlags.NonPublic | BindingFlags.Static)!;
+        var generic = method.MakeGenericMethod(elementType);
+
+        // Build a delegate: (object left, object right) => TypedEnumerateAreEqual<T>((IEnumerable<T>)left, (IEnumerable<T>)right)
+        var leftParam = Expression.Parameter(typeof(object), "left");
+        var rightParam = Expression.Parameter(typeof(object), "right");
+
+        var ienumerable = typeof(IEnumerable<>).MakeGenericType(elementType);
+        var leftCast = Expression.Convert(leftParam, ienumerable);
+        var rightCast = Expression.Convert(rightParam, ienumerable);
+
+        var call = Expression.Call(generic, leftCast, rightCast);
+        var lambda = Expression.Lambda<Func<object, object, bool>>(call, leftParam, rightParam);
+
+        // Paid once, then cache.
+        entry.SlidingExpiration = SlidingExpirationTimespan;
+        return lambda.Compile();
+    })!;
+
+    /// <summary>
+    /// Perform an equality comparison of two typed <see cref="IEnumerable{T}"/> values.
+    /// </summary>
+    private static bool TypedEnumerateAreEqual<T>(IEnumerable<T> l, IEnumerable<T> r)
+    {
+        var el = l.GetEnumerator();
+        var er = r.GetEnumerator();
+
+        while (el.MoveNext())
+        {
+            if (!(er.MoveNext() && AreEqual(el.Current, er.Current)))
+                return false;
+        }
+
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.IsDefault.cs b/src/CoreEx/Metadata/RuntimeMetadata.IsDefault.cs
new file mode 100644
index 00000000..29530835
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.IsDefault.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.Metadata;
+
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Indicates whether the <paramref name="value"/> is in its default state.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <returns><see langword="true"/> indicates that the value is considered default; otherwise, <see langword="false"/>.
+    /// <para>See also <see cref="IDefault"/>.</para></returns>
+    /// <remarks>This will leverage either the underlying<see cref="IRuntimeMetadataCore"/> implementation or reflection (<see cref="GetCachedProperties{T}()"/>) depending on the types.</remarks>
+    public static bool IsDefault<T>(T value) => IsDefault(value, default!);
+
+    /// <summary>
+    /// Indicates whether the <paramref name="value"/> is in its default state.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <param name="default">The default value (used where applicable).</param>
+    /// <returns><see langword="true"/> indicates that the value is considered default; otherwise, <see langword="false"/>.</returns>
+    internal static bool IsDefault<T>(T value, T @default)
+    {
+        if (value == null)
+            return true;
+
+        if (value is string str)
+            return AreEqual(str, Internal.Cast<T, string>(@default));
+
+        if (value is IRuntimeMetadataCore rm)
+            return !rm.GetPropertyRuntimeMetadata().Any(x => !x.IsDefault(value));
+
+        if (value is ICollection ic && ic.Count == 0)
+            return true;
+
+        var type = value.GetType();
+        if (type.IsValueType)
+            return AreEqual(value, @default);
+
+        return !GetPropertyRuntimeMetadata(value.GetType()).Any(x => !x.IsDefault(value));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Metadata/RuntimeMetadata.cs b/src/CoreEx/Metadata/RuntimeMetadata.cs
new file mode 100644
index 00000000..14db3fa6
--- /dev/null
+++ b/src/CoreEx/Metadata/RuntimeMetadata.cs
@@ -0,0 +1,154 @@
+namespace CoreEx.Metadata;
+
+/// <summary>
+/// Provides the underlying <see cref="IPropertyRuntimeMetadata"/> capabilities.
+/// </summary>
+/// <remarks>
+/// The capabilities within are provided to primarily target common <i>contract</i> patterns in an <i>CoreEx</i>-opinionated manner. As such, there are limitations to the functionality included.
+/// <para>This provides both compile-based (<see cref="IContract{T}"/>) and reflection-based implementations enabling a mix of usage enabling greater flexibility and consistency.</para></remarks>
+public static partial class RuntimeMetadata
+{
+    /// <summary>
+    /// Gets the underlying caching sliding expiration <see cref="TimeSpan"/>.
+    /// </summary>
+    /// <remarks>Defaults to <c>30</c> minutes.</remarks>
+    public static TimeSpan SlidingExpirationTimespan => Internal.GetConfigurationValue("CoreEx:Runtime:Metadata:SlidingExpirationTimespan", TimeSpan.FromMinutes(30));
+
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for the specified <paramref name="propertyExpression"/> using <see cref="IRuntimeMetadata.GetStaticPropertyRuntimeMetadata"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <returns>The corresponding <see cref="IPropertyRuntimeMetadata"/>.</returns>
+    public static IPropertyRuntimeMetadata GetForExpression<TEntity, TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression) where TEntity : IContract<TEntity>
+    {
+        if (propertyExpression.ThrowIfNull().Body.NodeType != ExpressionType.MemberAccess)
+            throw new ArgumentException("Only member access expressions are supported.", nameof(propertyExpression));
+
+        var me = (MemberExpression)propertyExpression.Body;
+        if (GetCachedProperties<TEntity>().TryGetValue(me.Member.Name, out var m))
+            return m;
+
+        throw new InvalidOperationException("The underlying property metadata cannot be retrieved for the property expression.");
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for the specified <paramref name="propertyExpression"/> using reflection on a cache miss.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TProperty">The property <see cref="Type"/>.</typeparam>
+    /// <param name="propertyExpression">The property expression.</param>
+    /// <param name="unused">An <i>unused</i> parameter needed for the compiler to differentiate same named method.</param>
+    /// <returns>The corresponding <see cref="IPropertyRuntimeMetadata"/>.</returns>
+#pragma warning disable IDE0060 // Remove unused parameter; unused and needed to differentiate same named methods.
+    public static IPropertyRuntimeMetadata GetForExpression<TEntity, TProperty>(Expression<Func<TEntity, TProperty>> propertyExpression, object? unused = null) where TEntity : class
+#pragma warning restore IDE0060
+    {
+        if (propertyExpression.ThrowIfNull().Body.NodeType != ExpressionType.MemberAccess)
+            throw new ArgumentException("Only member access expressions are supported.", nameof(propertyExpression));
+
+        var me = (MemberExpression)propertyExpression.Body;
+        if (GetCachedProperties<TEntity>().TryGetValue(me.Member.Name, out var m))
+            return m;
+
+        throw new InvalidOperationException("The underlying property metadata can not be retrieved for the property expression.");
+    }
+
+    /// <summary>
+    /// Gets the cached <see cref="IPropertyRuntimeMetadata"/> dictionary for the entity <typeparamref name="T"/> <see cref="Type"/> using <see cref="IRuntimeMetadata.GetStaticPropertyRuntimeMetadata"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="IContract{T}"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The cached <see cref="IPropertyRuntimeMetadata"/> dictionary.</returns>
+    public static IDictionary<string, IPropertyRuntimeMetadata> GetCachedProperties<T>() where T : IContract<T>
+    {
+        var cacheKey = $"RuntimeMetadata_{typeof(T).FullName}";
+
+        return Internal.MemoryCache.GetOrCreate<IDictionary<string, IPropertyRuntimeMetadata>>(cacheKey, entry =>
+        {
+            var dict = new Dictionary<string, IPropertyRuntimeMetadata>();
+            foreach (var p in GetPropertyRuntimeMetadata<T>())
+                dict[p.Name] = p;
+
+            entry.SlidingExpiration = SlidingExpirationTimespan;
+            return dict;
+        })!;
+    }
+
+    /// <summary>
+    /// Gets the cached <see cref="IPropertyRuntimeMetadata"/> dictionary for the entity <typeparamref name="T"/> <see cref="Type"/> using <b>reflection</b> on a cache miss.
+    /// </summary>
+    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="ignoreProperties">The list of properties to ignore.</param>
+    /// <remarks>This implementation leverages <i>System.Reflection</i>; as such, consider implementing type as <see cref="IContract{T}"/> and use <see cref="GetPropertyRuntimeMetadata{T}()"/> where performance is a premium.</remarks>
+    public static IDictionary<string, IPropertyRuntimeMetadata> GetCachedProperties<T>(params IEnumerable<string> ignoreProperties) => GetCachedProperties(typeof(T), ignoreProperties);
+
+    /// <summary>
+    /// Gets the cached <see cref="IPropertyRuntimeMetadata"/> dictionary for the entity <paramref name="type"/> using <b>reflection</b> on a cache miss.
+    /// </summary>
+    /// <param name="type">The <see cref="Type"/>.</param>
+    /// <param name="ignoreProperties">The list of properties to ignore.</param>
+    /// <remarks>This implementation leverages <i>System.Reflection</i>; as such, consider implementing type as <see cref="IContract{T}"/> and use <see cref="GetPropertyRuntimeMetadata{T}()"/> where performance is a premium.</remarks>
+    public static IDictionary<string, IPropertyRuntimeMetadata> GetCachedProperties(Type type, params IEnumerable<string> ignoreProperties)
+    {
+        var cacheKey = $"RuntimeMetadata_{type.FullName}";
+
+        if (type.IsValueType)
+            return new Dictionary<string, IPropertyRuntimeMetadata>();
+
+        var dict = Internal.MemoryCache.GetOrCreate<IDictionary<string, IPropertyRuntimeMetadata>>(cacheKey, entry =>
+        {
+            var dict = new Dictionary<string, IPropertyRuntimeMetadata>();
+            foreach (var p in GetPropertyRuntimeMetadata(type))
+                dict[p.Name] = p;
+
+            entry.SlidingExpiration = SlidingExpirationTimespan;
+            return dict;
+        })!;
+
+        return ignoreProperties.Any() ? dict.Where(kvp => !ignoreProperties.Contains(kvp.Key)).ToDictionary(kvp => kvp.Key, kvp => kvp.Value) : dict;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for each property of the entity <typeparamref name="T"/> <see cref="Type"/> using <see cref="IRuntimeMetadata.GetStaticPropertyRuntimeMetadata"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="IContract{T}"/> <see cref="Type"/>.</typeparam>
+    /// <returns>Also, consider the <see cref="GetCachedProperties{T}()"/> equivalent where applicable. Note, the <see cref="IContract{T}"/> types do not require <b>reflection</b>.</returns>
+    public static IEnumerable<IPropertyRuntimeMetadata> GetPropertyRuntimeMetadata<T>() where T : IContract<T>
+    {
+        foreach (var p in T.GetStaticPropertyRuntimeMetadata())
+            yield return p;
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for each property of the entity <typeparamref name="T"/> <see cref="Type"/> using <b>reflection</b>.
+    /// </summary>
+    /// <typeparam name="T">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="ignoreProperties">The list of properties to ignore.</param>
+    /// <remarks>This implementation leverages <i>System.Reflection</i>; as such, consider implementing type as <see cref="IContract{T}"/> and use <see cref="GetPropertyRuntimeMetadata{T}()"/> where performance is a premium.
+    /// <para>This method bypasses the internal cache; therefore, consider <see cref="GetCachedProperties{T}(IEnumerable{string})"/> to minimize repeated <b>reflection</b> costs.</para></remarks>
+    public static IEnumerable<IPropertyRuntimeMetadata> GetPropertyRuntimeMetadata<T>(params IEnumerable<string> ignoreProperties) => GetPropertyRuntimeMetadata(typeof(T), ignoreProperties);
+
+    /// <summary>
+    /// Gets the <see cref="IPropertyRuntimeMetadata"/> for each property of the entity <see cref="Type"/> using reflection.
+    /// </summary>
+    /// <param name="type">The entity <see cref="Type"/></param>
+    /// <param name="ignoreProperties">The list of properties to ignore.</param>
+    /// <remarks>This implementation leverages <i>System.Reflection</i>; as such, consider implementing type as <see cref="IContract{T}"/> and use <see cref="GetPropertyRuntimeMetadata{T}()"/> where performance is a premium.
+    /// <para>This method bypasses the internal cache; therefore, consider <see cref="GetCachedProperties"/> to minimize repeated <b>reflection</b> costs.</para></remarks>
+    public static IEnumerable<IPropertyRuntimeMetadata> GetPropertyRuntimeMetadata(Type type, params IEnumerable<string> ignoreProperties)
+    {
+        if (!type.ThrowIfNull().IsClass || type == typeof(string))
+            throw new ArgumentException($"The type '{type.FullName}' must be a class.", nameof(type));
+
+        foreach (var pi in type.GetProperties(BindingFlags.Instance | BindingFlags.Public).Where(p => p.GetMethod is not null && p.GetMethod.IsPublic))
+        {
+            if (ignoreProperties.Contains(pi.Name))
+                continue;
+
+            var method = typeof(PropertyRuntimeMetadataReflector).GetMethod(nameof(PropertyRuntimeMetadataReflector.CreatePropertyRuntimeMetadata), BindingFlags.Static | BindingFlags.Public)!;
+            var genericMethod = method.MakeGenericMethod(type, pi.PropertyType);
+            yield return (IPropertyRuntimeMetadata)genericMethod.Invoke(null, [pi])!;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/NotFoundException.cs b/src/CoreEx/NotFoundException.cs
index ffa45c3f..d0f43054 100644
--- a/src/CoreEx/NotFoundException.cs
+++ b/src/CoreEx/NotFoundException.cs
@@ -1,72 +1,47 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a <b>Not Found</b> exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>Requested data was not found.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class NotFoundException(LText? message, Exception? innerException)
+    : ExtendedException<NotFoundException>(message ?? new LText(typeof(NotFoundException).FullName, _message), innerException)
 {
+    private const string _message = "Requested data was not found.";
+
     /// <summary>
-    /// Represents a <b>Not Found</b> exception.
+    /// Initializes a new instance of the <see cref="NotFoundException"/> class.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>Requested data was not found.</i></remarks>
-    public class NotFoundException : Exception, IExtendedException
-    {
-        private const string _message = "Requested data was not found.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<NotFoundException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotFoundException"/> class.
-        /// </summary>
-        public NotFoundException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotFoundException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public NotFoundException(string? message) : base(message ?? new LText(typeof(NotFoundException).FullName, _message)) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NotFoundException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public NotFoundException(string? message, Exception innerException) : base(message ?? new LText(typeof(NotFoundException).FullName, _message), innerException) { }
+    public NotFoundException() : this(null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.NotFoundError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.NotFoundError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.NotFoundError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.NotFoundError;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NotFoundException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public NotFoundException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.NotFound"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.NotFound;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "not-found";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.NotFound);
+    }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <summary>
+    /// Throws a <see cref="NotFoundException"/> if the <paramref name="value"/> is <see langword="default"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate as non-default.</param>
+    /// <param name="message">The optional message <see cref="LText"/>.</param>
+    /// <returns>The <paramref name="value"/> to support fluent-style method-chaining.</returns>
+    [return: NotNull]
+    public static T? ThrowIfDefault<T>([NotNull] T? value, LText? message = null)
+    {
+        if (value is null || EqualityComparer<T>.Default.Equals(value, default!))
+            throw new NotFoundException(message);
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+        return value;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/OperationType.cs b/src/CoreEx/OperationType.cs
index 89550fea..62f1d0cf 100644
--- a/src/CoreEx/OperationType.cs
+++ b/src/CoreEx/OperationType.cs
@@ -1,36 +1,37 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx;
 
-namespace CoreEx
+/// <summary>
+/// Represents the <see href="https://en.wikipedia.org/wiki/Create,_read,_update_and_delete">CRUD</see> operation types (Create, Read, Update and Delete).
+/// </summary>
+public enum OperationType
 {
     /// <summary>
-    /// Represents the possible operations types.
+    /// An <i>Unspecified</i> operation.
     /// </summary>
-    /// <remarks>Based on the standard CRUD operations: <see cref="Create"/>, <see cref="Read"/>, <see cref="Update"/> and <see cref="Delete"/>.</remarks>
-    public enum OperationType
-    {
-        /// <summary>
-        /// An unknown/unspecified operation type.
-        /// </summary>
-        Unspecified,
+    Unspecified = 0,
 
-        /// <summary>
-        /// A <b>create</b> operation.
-        /// </summary>
-        Create,
+    /// <summary>
+    /// A <i>Get</i> (keyed) operation.
+    /// </summary>
+    Get = 1,
 
-        /// <summary>
-        /// A <b>read</b> operation.
-        /// </summary>
-        Read,
+    /// <summary>
+    /// A <i>Create</i> operation.
+    /// </summary>
+    Create = 2,
 
-        /// <summary>
-        /// An <b>update</b> operation.
-        /// </summary>
-        Update,
+    /// <summary>
+    /// An <i>Update</i> operation.
+    /// </summary>
+    Update = 4,
 
-        /// <summary>
-        /// A <b>delete</b> operation.
-        /// </summary>
-        Delete
-    }
+    /// <summary>
+    /// A <i>Delete</i> operation.
+    /// </summary>
+    Delete = 8,
+
+    /// <summary>
+    /// A <i>Query</i> operation (as distinct from a <see cref="Get"/>).
+    /// </summary>
+    Query = 16,
 }
\ No newline at end of file
diff --git a/src/CoreEx/PrecisionTimeProvider.cs b/src/CoreEx/PrecisionTimeProvider.cs
new file mode 100644
index 00000000..aec86261
--- /dev/null
+++ b/src/CoreEx/PrecisionTimeProvider.cs
@@ -0,0 +1,43 @@
+namespace CoreEx;
+
+/// <summary>
+/// Provides a <see cref="TimeProvider"/> that truncates <see cref="DateTimeOffset"/> to a specified <i>precision</i>.
+/// </summary>
+/// <param name="decimalPlaces">The number of decimal places (0-7) for fractional seconds. Defaults to 6 (microseconds) for database compatibility.</param>
+/// <param name="innerProvider">The inner <see cref="TimeProvider"/> to wrap. Defaults to <see cref="TimeProvider.System"/>.</param>
+/// <remarks>This is useful for ensuring consistent timestamp precision across different database systems:
+/// <list type="bullet">
+///   <item><description>PostgreSQL <c>timestamptz</c>: 6 decimal places (microseconds).</description></item>
+///   <item><description>SQL Server <c>datetimeoffset(6)</c>: 6 decimal places (microseconds).</description></item>
+///   <item><description>SQL Server <c>datetimeoffset(7)</c>: 7 decimal places (100 nanoseconds) - default.</description></item>
+/// </list>
+/// </remarks>
+public sealed class PrecisionTimeProvider(int decimalPlaces = 6, TimeProvider? innerProvider = null) : TimeProvider
+{
+    private readonly TimeProvider _innerProvider = innerProvider ?? System;
+    private readonly int _decimalPlaces = decimalPlaces >= 0 && decimalPlaces <= 7 ? decimalPlaces : throw new ArgumentOutOfRangeException(nameof(decimalPlaces), "Must be between 0 and 7.");
+    private readonly long _tickDivisor = (long)Math.Pow(10, 7 - decimalPlaces);
+
+    /// <summary>
+    /// Gets the number of decimal places for fractional seconds.
+    /// </summary>
+    public int DecimalPlaces => _decimalPlaces;
+
+    /// <inheritdoc/>
+    public override DateTimeOffset GetUtcNow()
+    {
+        var now = _innerProvider.GetUtcNow();
+        var ticks = now.Ticks;
+        var truncatedTicks = ticks - (ticks % _tickDivisor);
+        return new DateTimeOffset(truncatedTicks, now.Offset);
+    }
+
+    /// <inheritdoc/>
+    public override long GetTimestamp() => _innerProvider.GetTimestamp();
+
+    /// <inheritdoc/>
+    public override TimeZoneInfo LocalTimeZone => _innerProvider.LocalTimeZone;
+
+    /// <inheritdoc/>
+    public override long TimestampFrequency => _innerProvider.TimestampFrequency;
+}
\ No newline at end of file
diff --git a/src/CoreEx/README.md b/src/CoreEx/README.md
index f974b47b..0872c4b4 100644
--- a/src/CoreEx/README.md
+++ b/src/CoreEx/README.md
@@ -1,65 +1,141 @@
-# CoreEx
+# CoreEx
 
-The `CoreEx` namespace provides the key root level capabilities. However, the majority of the capabilities are housed in their own respective namespaces. 
+> The foundational `CoreEx` package providing the core runtime primitives, patterns, and abstractions used across all other CoreEx libraries and consuming services.
 
-<br/>
+## Overview
+
+`CoreEx` is the shared kernel of the CoreEx framework. It defines the types that all other packages depend on and that consuming applications interact with every day: semantic exception types, execution context, railway-oriented result types, entity contracts, mapping, JSON utilities, hosting infrastructure, caching abstractions, localization, and more.
+
+The package is deliberately non-opinionated — nothing forces a particular architectural style and every capability is opt-in. Teams can adopt individual namespaces incrementally, composing only what they need without taking on the full framework surface area at once.
+
+All other CoreEx packages (`CoreEx.Events`, `CoreEx.Database`, `CoreEx.AspNetCore`, etc.) depend on this package, making it the natural starting point when working with the CoreEx ecosystem.
 
 ## Motivation
 
-The motivation for _CoreEx_ is to primarily identify key back-end business services patterns and provide additional capabilities to standardize and simplify the development of these. The intent is that _CoreEx_ is less opinionated about usage and enables opt-in where benefits can be derived. As well as being able to co-exist within a solution that leverages other frameworks, etc.
+- **Reduce boilerplate** — recurring patterns such as exception-to-HTTP-status mapping, entity identity, ETag handling, and audit change-log tracking are defined once and reused everywhere rather than reimplemented per project.
+- **Standardize errors** — a rich hierarchy of semantic exception types with built-in HTTP status codes and structured error payloads removes the need for bespoke error-handling middleware.
+- **Explicit, expected errors** — the `Result`/`Result<T>` types bring railway-oriented programming to service code, allowing known business errors to be propagated without the overhead and noise of exceptions.
+- **Execution context** — a consistent, `AsyncLocal`-based ambient context carries user identity, tenant, timestamps, and operation type across the full call chain without threading them explicitly through every method signature.
+- **Composability** — DI registration attributes, invoker tracing, and host-settings primitives are intentionally thin so they integrate into any host model without dictating structure.
+
+## Key capabilities
+
+- 🚨 **Semantic exceptions**: A hierarchy of typed exceptions (`ValidationException`, `NotFoundException`, `BusinessException`, `ConcurrencyException`, etc.) each with a pre-mapped HTTP status code, structured error type, and configurable logging enablement.
+- 🔐 **Execution context**: An `AsyncLocal`-scoped `ExecutionContext` that carries user identity (`AuthenticationUser`), tenant ID, operation type, request timestamp, and arbitrary attributes throughout the lifetime of a request.
+- 🚂 **Railway-oriented results**: `Result` and `Result<T>` value types that represent success or a typed error without throwing, enabling functional pipeline-style error propagation for expected business outcomes.
+- 📦 **Entity contracts**: Interfaces and types for identifiers (`IIdentifier<T>`), ETags (`IETag`), audit change logs (`IChangeLog`), composite keys (`CompositeKey`), and entity cleaning/transformation — used as the common contract shape across all CoreEx layers.
+- 🗺️ **Explicit mapping**: Uni- and Bi-directional mapper base classes and a `Mapper` utility for propagating standard contract properties (identity, ETags, change logs, tenant, partition) between source and destination types without a reflection-heavy mapping library.
+- 🔄 **JSON utilities**: RFC 7396 JSON Merge Patch (`JsonMergePatch`), include/exclude JSON property filtering (`JsonFilter`), and custom converters for common CoreEx types.
+- 💉 **DI lifetime attributes**: `[ScopedService]`, `[SingletonService]`, and `[TransientService]` attributes that mark implementation types for automatic discovery and registration via `AddDynamicServicesUsing<T>`.
+- ⏱️ **Hosting and work orchestration**: Base classes for timer-driven and synchronized hosted services, plus `WorkOrchestrator` for tracking long-running distributed work states with pluggable storage.
+- ⚡ **Caching abstractions**: `IHybridCache` and `ICacheKeyProvider` decouple cache consumption from provider implementation, supporting both in-process and distributed cache strategies.
+- 🌐 **Localization**: `LText` and `TextProvider` provide a lightweight, key-based localization abstraction used throughout validation messages, exception text, and reference data.
+- 🃏 **Wildcard parsing**: `Wildcard` provides standardized `*` and `?` wildcard parsing, validation, and `Regex` compilation for consistent wildcard-based filtering.
+- 🏷️ **Reference data interfaces**: Core `IReferenceData`, `IReferenceDataCollection`, and `ReferenceDataOrchestrator` types establish the reference data contract used by `CoreEx.RefData` and data-layer packages.
+- 📐 **Schema versioning**: `SchemaAttribute` and `Schema` utilities for associating a semantic version with entity types, supporting schema-aware messaging and validation.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`ExecutionContext`](./ExecutionContext.cs)** | `AsyncLocal`-scoped ambient context carrying user identity, tenant ID, operation type, timestamp, and attributes for the lifetime of a request. |
+| **[`Result`](./Results/Result.cs)** | Value type representing a successful or failed operation with no return value; the basis of railway-oriented programming in CoreEx. |
+| **[`Result<T>`](./Results/ResultT.cs)** | Value type representing a successful operation with a value, or a typed error — used for functional pipeline-style error propagation. |
+| **[`DataConsistencyException`](./DataConsistencyException.cs)** | Non-error exception used to signal a potential data consistency issue without treating it as an application error. |
+| **[`PrecisionTimeProvider`](./PrecisionTimeProvider.cs)** | `TimeProvider` implementation that truncates timestamps to a configurable fractional-second precision for database compatibility. |
+| **[`OperationType`](./OperationType.cs)** | Enum representing the CRUD operation type (Get, Create, Update, Delete, Query) carried on the `ExecutionContext`. |
+| _[`ExtendedException`](./Abstractions/ExtendedException.cs)_ | Abstract base for all CoreEx semantic exceptions; provides HTTP status, error type, error code, detail, and configurable logging. |
+| [`IExtendedException`](./Abstractions/IExtendedException.cs) | Interface defining the extended exception contract: `StatusCode`, `ErrorType`, `ErrorCode`, `IsError`, and `ShouldBeLogged`. |
+
+See the [Extended Exceptions](#extended-exceptions) section below for the full list of semantic exception types.
+
+## Errors vs Exceptions
+
+`CoreEx` distinguishes between expected and unexpected errors:
+
+| Aspect | **Errors** (Expected) | **Exceptions** (Unexpected) |
+|--------|------------------------|----------------------------|
+| **Use For** | Validation failures, business rules, "not found" | System failures, infrastructure errors |
+| **Types** | `CoreEx` semantic exceptions (implement [`IExtendedException`](./Abstractions/IExtendedException.cs))  | Standard .NET, and non-semantic, exceptions |
+| **Benefits** | Explicit error handling | Rich diagnostics (stack traces) |
+| **Example** | Customer not found | Database connection timeout |
+
+## Extended Exceptions
+
+Semantic (error-oriented) exception types with automatic HTTP status mapping:
+
+| Exception | Description | HTTP Status | Error Type |
+|-----------|-------------|-------------|------------|
+| [`AuthenticationException`](./AuthenticationException.cs) | User not authenticated. | 401-Unauthorized | `authentication` |
+| [`AuthorizationException`](./AuthorizationException.cs) | User lacks permissions. | 403-Forbidden | `authorization` |
+| [`BusinessException`](./BusinessException.cs) | Business rule violation (message shown to consumer). | 400-Bad Request | `business` |
+| [`ConcurrencyException`](./ConcurrencyException.cs) | Data concurrency conflict (ETag mismatch). | 412-Precondition Failed | `concurrency` |
+| [`ConflictException`](./ConflictException.cs) | Data conflict (e.g., identifier already exists on create). | 409-Conflict | `conflict` |
+| [`DuplicateException`](./DuplicateException.cs) | Duplicate value (e.g., unique code already in use). | 409-Conflict | `duplicate` |
+| [`NotFoundException`](./NotFoundException.cs) | Entity not found. | 404-Not Found | `not-found` |
+| [`TransientException`](./TransientException.cs) | Transient failure (retry candidate). | 503-Service Unavailable | `transient` |
+| [`ValidationException`](./ValidationException.cs) | Validation failure with message collection. | 400-Bad Request | `validation` |
+
+All inherit from [`ExtendedException<TSelf>`](./Abstractions/ExtendedExceptionT.cs) implementing [`IExtendedException`](./Abstractions/IExtendedException.cs).
+
+Additionally, these support `With*`-style methods to add additional context that is added to the resulting `ProblemDetails`:
+
+``` csharp
+throw new BusinessException($"Product '{movement.ProductId}' does not have sufficient quantity on hand.")
+    .WithErrorCode("insufficient-quantity")
+    .WithKey(movement.ProductId);
+```
+
+The above would result in the following `ProblemDetails`:
+
+``` json
+{
+  "type": "https://tools.ietf.org/html/rfc9110#section-15.5.1",
+  "title": "Product \u002700000001-0000-0000-0000-000000000000\u0027 does not have sufficient quantity on hand.",
+  "status": 400,
+  "traceId": "00-a8e8623ef74c2b53820d0ff5d799850d-df28b0bc787429f5-01",
+  "errorType": "business",
+  "errorCode": "insufficient-quantity",
+  "key": "00000001-0000-0000-0000-000000000000"
+}
+```
 
-<br/>
 
 ## Namespaces
 
-The following key namespaces are provided; additional documentation is provided for each via their respective links:
-
-Namespace | Description
--|-
-[`Abstractions`](./Abstractions) | Provides key abstractions or other largely internal capabilities.
-[`Caching`](./Caching) | Provides addition caching capabilities.
-[`Configuration`](./Configuration) | Extends [`IConfiguration`](https://docs.microsoft.com/en-us/dotnet/api/microsoft.extensions.configuration.iconfiguration) to enable a more flexible means to get and override configuration values.
-[`Entities`](./Entities) | Provides standardized and enriched capabilities for entities and data models.
-[`Events`](./Events) | Provides standardized and enriched capabilities for event (message) declaration, publishing and subscribing.
-[`Globalization`](./Globalization) | Provides extended globalization capabilities.
-[`HealthChecks`](./HealthChecks) | Provides extended health checks capabilities.
-[`Hosting`](./Hosting) | Provides extended [hosted service (worker)](https://learn.microsoft.com/en-us/dotnet/core/extensions/workers) capabilities. 
-[`Http`](./Http) | Provides extended [`HttpClient`](https://learn.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) capabilities.
-[`Invokers`](./Invokers) | Provides extended invocation capabilities.
-[`Json`](./Json) | Provides implementation agnostic [JSON](https://en.wikipedia.org/wiki/JSON)-related capabilities.
-[`Localization`](./Localization) | Provided extended localization capabilities.
-[`Mapping`](./Mapping) | Provides implementation agnostic mapping capabilities.
-[`RefData`](./RefData) | Provides standardized and enriched capabilities for reference data.
-[`Results`](./Results) | Provides [monadic](https://en.wikipedia.org/wiki/Monad_(functional_programming)) error-handling, often referred to as [Railway-oriented programming](https://swlaschin.gitbooks.io/fsharpforfunandprofit/content/posts/recipe-part2.html) via `Result` and `Result<T>` types.
-[`Security`](./Security) | Provides extended security capabilities.
-[`Serialization`](./Serialization) | Provides implementation agnostic serialization capabilities.
-[`Text.Json`](./Text/Json) | Provides [`System.Text.Json`](https://docs.microsoft.com/en-us/dotnet/api/system.text.json) implementation of the [`IJsonSerializer`](./Json/IJsonSerializer.cs).
-[`Validation`](./Validation) | Provides implementation agnostic validation capabilities.
-[`Wildcards`](./Wildcards) | Provides standardized approach to parsing and validating [`Wildcard`](./Wildcards/Wildcard.cs) text.`
-
-<br/>
-
-## Execution context
-
-The [`ExecutionContext`](./ExecutionContext.cs) is a foundational class that is integral to the underlying execution within _CoreEx_. It represents a thread-bound (request) execution context - enabling the availability of the likes of `Username` at at runtime via `ExecutionContext.Current`. Additionally, the context is passed between executing threads for the owning request (see [`AsyncLocal`](https://learn.microsoft.com/en-us/dotnet/api/system.threading.asynclocal-1)).
-
-An implementor may choose to inherit from this class and add additional capabilities as required.
-
-<br/>
-
-## Exceptions
-
-There are a number of key exceptions that have a specific built in behaviour; these all implement [`IExtendedException`](./Abstractions/IExtendedException.cs).
-
-Exception | Description | HTTP Status | [`ErrorType`](./Abstractions/ErrorType.cs)
--|-|-|-
-[`AuthenticationException`](./AuthenticationException.cs) | Represents an **Authentication** exception. | 401 Unauthorized | 8 AuthenticationError 
-[`AuthorizationException`](./AuthorizationException.cs) | Represents an **Authorization** exception. | 403 Forbidden | 3 AuthorizationError 
-[`BusinessException`](./BusinessException.cs) | Represents a **Business** exception whereby the message returned should be displayed directly to the consumer. | 400 BadRequest | 2 BusinessError 
-[`ConcurrencyException`](./ConcurrencyException.cs) | Represents a data **Concurrency** exception; generally as a result of an errant [ETag](./Entities/IETag.cs). | 412 PreconditionFailed | 4 ConcurrencyError 
-[`ConflictException`](./ConflictException.cs) | Represents a data **Conflict** exception; for example creating an entity that already exists. | 409 Conflict | 6 ConflictError 
-[`DataConsistencyException`](./DataConsistencyException.cs) | Represents a **Data Consistency** exception; for example where the operation would result in data consistency error; i.e. possible data corruption may occur. | 409 Conflict | 10 DataConsistencyError 
-[`DuplicateException`](./DuplicateException.cs) | Represents a **Duplicate** exception; for example updating a code on an entity where the value is already used. | 409 Conflict | 7 DuplicateError 
-[`NotFoundException`](./NotFoundException.cs) | Represents a **NotFound** exception; for example getting an entity that does not exist. | 404 NotFound | 5 NotFoundError 
-[`TransientException`](./TransientException.cs) | Represents a **Transient** exception; failed but is a candidate for a retry. | 503 ServiceUnavailable | 9 TransientError 
-[`ValidationException`](./ValidationException.cs) | Represents a **Validation** exception with a corresponding `Messages` [collection](./Entities/MessageItemCollection.cs). | 400 BadRequest | 1 ValidationError 
+| Namespace | Description | Documentation |
+|-----------|-------------|---------------|
+| **`CoreEx.Caching`** | `IHybridCache` abstraction and `ICacheKeyProvider` for decoupled local and/or distributed caching. | [📖 README](./Caching/README.md) |
+| **`CoreEx.Data`** | Lightweight data-access primitives: paging, query arguments, partition keys, tenant IDs, logical deletion, and `ItemsResult<T>`. | [📖 README](./Data/README.md) |
+| **`CoreEx.DependencyInjection`** | Service lifetime attributes (`[ScopedService]`, `[SingletonService]`, `[TransientService]`) for attribute-driven DI registration. | [📖 README](./DependencyInjection/README.md) |
+| **`CoreEx.Entities`** | Entity contract interfaces and types: identifiers, ETags, change logs, composite keys, string transforms, and entity cleaning. | [📖 README](./Entities/README.md) |
+| **`CoreEx.Globalization`** | `TextInfoCasing` and globalization extensions for culture-aware string casing transformations. | [📖 README](./Globalization/README.md) |
+| **`CoreEx.HealthChecks`** | Health check extensions and `HealthCheckTags` constants for standardizing CoreEx service health reporting. | [📖 README](./HealthChecks/README.md) |
+| **`CoreEx.Hosting`** | Timer and synchronized hosted service base classes, `HostSettings`, `WorkOrchestrator`, and distributed work state tracking. | [📖 README](./Hosting/README.md) |
+| **`CoreEx.Http`** | HTTP primitives: `ProblemDetails`, `IdempotencyKeyHandler`, `HttpNames`, and HTTP request/response extensions. | [📖 README](./Http/README.md) |
+| **`CoreEx.Invokers`** | Invocation pipeline abstractions providing automatic OpenTelemetry tracing and structured logging around service operations. | [📖 README](./Invokers/README.md) |
+| **`CoreEx.Json`** | JSON Merge Patch (RFC 7396), JSON property filtering, and custom converters for CoreEx entity types. | [📖 README](./Json/README.md) |
+| **`CoreEx.Localization`** | `LText` localization-agnostic text value and `TextProvider` for key-based message resolution. | [📖 README](./Localization/README.md) |
+| **`CoreEx.Mapping`** | Explicit bi-directional mapper base classes, `Mapper` standard-property utilities, and `IConverter` value converters. | [📖 README](./Mapping/README.md) |
+| **`CoreEx.Metadata`** | `RuntimeMetadata` and `IPropertyRuntimeMetadata` for compile-time and reflection-based property introspection on contract types. | [📖 README](./Metadata/README.md) |
+| **`CoreEx.RefData`** | Core reference data interfaces, `ReferenceDataOrchestrator`, and provider abstractions consumed by `CoreEx.RefData`. | [📖 README](./RefData/README.md) |
+| **`CoreEx.Results`** | `Result` and `Result<T>` railway-oriented types with a full suite of functional extension methods. | [📖 README](./Results/README.md) |
+| **`CoreEx.Schemas`** | `SchemaAttribute` and `Schema` utilities for associating semantic version metadata with entity types. | [📖 README](./Schemas/README.md) |
+| **`CoreEx.Security`** | `AuthenticationUser` record and `AuthenticationType` enum representing the authenticated user on the `ExecutionContext`. | [📖 README](./Security/README.md) |
+| **`CoreEx.Text`** | `SentenceCase` utility for converting identifier-style strings into human-readable sentence-case text. | [📖 README](./Text/README.md) |
+| **`CoreEx.Validation`** | Lightweight validation interfaces (`IValidator<T>`, `MultiValidator`) used as the validation contract across CoreEx. | [📖 README](./Validation/README.md) |
+| **`CoreEx.Wildcards`** | `Wildcard` parser, validator, and `Regex` compiler for standardized `*` and `?` wildcard-based text matching. | [📖 README](./Wildcards/README.md) |
+
+## Related Namespaces
+
+- **[`CoreEx.AspNetCore`](../CoreEx.AspNetCore/README.md)** - ASP.NET Core integration: `WebApi` HTTP helpers, `IExtendedException` middleware, and `ExecutionContext` middleware binding.
+- **[`CoreEx.Validation`](../CoreEx.Validation/README.md)** - Full validation rule engine built on top of the `IValidator<T>` contract defined in this package.
+- **[`CoreEx.Events`](../CoreEx.Events/README.md)** - Event publishing and subscribing built on top of the `ExecutionContext`, `Result`, and entity contracts from this package.
+- **[`CoreEx.Database`](../CoreEx.Database/README.md)** - Database access layer built on the data primitives (`PagingArgs`, `QueryArgs`, `IIdentifier`) defined here.
+- **[`CoreEx.EntityFrameworkCore`](../CoreEx.EntityFrameworkCore/README.md)** - Entity Framework Core integration consuming the entity contracts and mapping types from this package.
+- **[`CoreEx.RefData`](../CoreEx.RefData/README.md)** - Full reference data implementation extending the `IReferenceData` and `ReferenceDataOrchestrator` types defined here.
+- **[`CoreEx.UnitTesting`](../CoreEx.UnitTesting/README.md)** - Test helpers and fluent assertion extensions targeting the types and patterns from this package. _(test only)_
+
+## AI Usage Guide
+
+An [`AGENTS.md`](./AGENTS.md) file is included with this package. AI coding assistants (GitHub Copilot, Claude, Cursor, etc.) that support workspace-injected package documentation will automatically surface concise usage guidance, code examples, and `Do Not` rules for this package without requiring a local CoreEx checkout.
diff --git a/src/CoreEx/RefData/Abstractions/IReferenceData.cs b/src/CoreEx/RefData/Abstractions/IReferenceData.cs
new file mode 100644
index 00000000..472f02a1
--- /dev/null
+++ b/src/CoreEx/RefData/Abstractions/IReferenceData.cs
@@ -0,0 +1,110 @@
+namespace CoreEx.RefData.Abstractions;
+
+/// <summary>
+/// Enables the core <i>Reference Data</i> properties.
+/// </summary>
+/// <remarks>A reference data instance should be considered largely immutable.</remarks>
+public interface IReferenceData : IReadOnlyIdentifier, IReadOnlyETag
+{
+    /// <summary>
+    /// Gets or initializes the unique identifier.
+    /// </summary>
+    new object? Id { get; init; }
+
+    /// <summary>
+    /// Gets or initializes the unique code.
+    /// </summary>
+    string? Code { get; init; }
+
+    /// <summary>
+    /// Gets or initializes the text.
+    /// </summary>
+    /// <remarks>The get should return a localized text where possible; see also <see cref="GetText"/>.</remarks>
+    string? Text { get; init; }
+
+    /// <summary>
+    /// Gets or initializes the description.
+    /// </summary>
+    /// <remarks>The get should return a localized description where possible; see also <see cref="GetDescription"/>.</remarks>
+    string? Description { get; init; }
+
+    /// <summary>
+    /// Gets or initializes the sort order.
+    /// </summary>
+    int SortOrder { get; init; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="IReferenceData"/> is inactive.
+    /// </summary>
+    /// <value><see langword="true"/> where inactive; otherwise, <see langword="false"/> is active.</value>
+    bool IsInactive { get; init; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="IReferenceData"/> is active (opposite of <see cref="IsInactive"/>).
+    /// </summary>
+    [JsonIgnore]
+    bool IsActive { get; }
+
+    /// <summary>
+    /// Gets or initializes the validity start <see cref="DateTimeOffset"/>.
+    /// </summary>
+    DateTimeOffset? StartsOn { get; init; }
+
+    /// <summary>
+    /// Gets or initializes the validity end <see cref="DateTimeOffset"/>.
+    /// </summary>
+    DateTimeOffset? EndsOn { get; init; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="IReferenceData"/> is known and in a valid state (it may be active or inactive depending).
+    /// </summary>
+    /// <remarks>This is typically a result of casting a <see cref="IReferenceData.Code"/> to an <see cref="IReferenceData"/> that is not known by the <see cref="ReferenceDataOrchestrator"/>.</remarks>
+    [JsonIgnore]
+    bool IsValid { get; }
+
+    /// <summary>
+    /// Overrides the standard <see cref="IsValid"/> check and flags the <see cref="IReferenceData"/> as <b>Invalid</b>.
+    /// </summary>
+    /// <remarks>Will result in <see cref="IsInactive"/> set to <see langword="true"/>. Once set to invalid it can not be changed; i.e. there is not a means to set back to valid.</remarks>
+    void SetInvalid();
+
+    /// <summary>
+    /// Gets the original (non-localized) <see cref="Text"/> value.
+    /// </summary>
+    string? GetText();
+
+    /// <summary>
+    /// Gets the original (non-localized) <see cref="Description"/> value.
+    /// </summary>
+    string? GetDescription();
+
+    /// <summary>
+    /// Indicates whether any mapping values have been configured.
+    /// </summary>
+    [JsonIgnore]
+    bool HasMappings { get; }
+
+    /// <summary>
+    /// Gets the underlying mapping dictionary as read-only.
+    /// </summary>
+    /// <remarks>The <see cref="SetMapping"/> is intended to be the means in which the mappings are mutated.</remarks>
+    IReadOnlyDictionary<string, object?>? Mappings { get; }
+
+    /// <summary>
+    /// Sets the mapping <paramref name="value"/> for the specified <paramref name="name"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <remarks>A <paramref name="value"/> with the default value will not be set; assumed in this case that no mapping exists.</remarks>
+    void SetMapping<T>(string name, T? value) where T : IComparable<T?>, IEquatable<T?>;
+
+    /// <summary>
+    /// Gets the mapping <paramref name="value"/> for the specified <paramref name="name"/>.
+    /// </summary>
+    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <returns><see langword="true"/> indicates that the name exists; otherwise, <see langword="false"/>.</returns>
+    bool TryGetMapping<T>(string name, [NotNullWhen(true)] out T? value) where T : IComparable<T?>, IEquatable<T?>;
+}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/Abstractions/IReferenceDataCollection.cs b/src/CoreEx/RefData/Abstractions/IReferenceDataCollection.cs
new file mode 100644
index 00000000..6d992f5e
--- /dev/null
+++ b/src/CoreEx/RefData/Abstractions/IReferenceDataCollection.cs
@@ -0,0 +1,111 @@
+namespace CoreEx.RefData.Abstractions;
+
+/// <summary>
+/// Enables <see cref="GetById(object)"/> and <see cref="GetByCode(string)"/> functionality for an <see cref="IReferenceData"/> collection.
+/// </summary>
+public interface IReferenceDataCollection : ICollection
+{
+    /// <summary>
+    /// Gets the underlying item <see cref="Type"/>.
+    /// </summary>
+    [JsonIgnore]
+    Type ItemType { get; }
+
+    /// <summary>
+    /// Adds the <see cref="IReferenceData"/> to the <see cref="IReferenceDataCollection"/>.
+    /// </summary>
+    /// <param name="item">The <see cref="IReferenceData"/>.</param>
+    void Add(IReferenceData item);
+
+    /// <summary>
+    /// Adds the <paramref name="collection"/> of items to the <see cref="IReferenceDataCollection"/>.
+    /// </summary>
+    /// <param name="collection">The collection containing the items to add.</param>
+    void AddRange(IEnumerable<IReferenceData> collection);
+
+    /// <summary>
+    /// Determines whether the specified <see cref="IReferenceData.Id"/> exists within the collection.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData.Id"/>.</param>
+    /// <returns><see langword="true"/> if it exists; otherwise, <see langword="false"/>.</returns>
+    bool ContainsId(object? id); 
+
+    /// <summary>
+    /// Determines whether the specified <see cref="IReferenceData.Code"/> exists within the collection.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <returns><see langword="true"/> if it exists; otherwise, <see langword="false"/>.</returns>
+    bool ContainsCode(string code);
+
+    /// <summary>
+    /// Attempts to get the <paramref name="item"/> with the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData.Id"/>.</param>
+    /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    bool TryGetById(object? id, [NotNullWhen(true)] out IReferenceData? item);
+
+    /// <summary>
+    /// Attempts to get the <paramref name="item"/> with the specified <paramref name="code"/>.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    bool TryGetByCode(string code, [NotNullWhen(true)] out IReferenceData? item);
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceData"/> for the specified <see cref="IReferenceData.Id"/>.
+    /// </summary>
+    /// <param name="id">The specified reference data <see cref="IReferenceData.Id"/>.</param>
+    /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <see langword="null"/>.</returns>
+    IReferenceData? GetById(object? id);
+
+    /// <summary>
+    /// Gets the<see cref="IReferenceData"/> for the specified <see cref="IReferenceData.Code"/>.
+    /// </summary>
+    /// <param name="code">The specified <see cref="IReferenceData.Code"/>.</param>
+    /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <see langword="null"/>.</returns>
+    IReferenceData? GetByCode(string code);
+
+    /// <summary>
+    /// Determines whether the specified <see cref="IReferenceData.TryGetMapping"/> value exists within the collection.
+    /// </summary>
+    /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <returns><see langword="true"/> if it exists; otherwise, <see langword="false"/>.</returns>
+    bool ContainsMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T>;
+
+    /// <summary>
+    /// Attempts to get the <paramref name="item"/> with the specified <see cref="IReferenceData.TryGetMapping"/> value.
+    /// </summary>
+    /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    bool TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out IReferenceData? item) where T : IComparable<T>, IEquatable<T>;
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceData"/> for the specified <see cref="IReferenceData.TryGetMapping"/> value.
+    /// </summary>
+    /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <see langword="null"/>.</returns>
+    IReferenceData? GetByMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T>;
+
+    /// <summary>
+    /// Gets all items (excluding invalid only) sorted by the <see cref="IReferenceData.SortOrder"/> value.
+    /// </summary>
+    /// <value>An <see cref="IEnumerable{T}"/> containing the selected <see cref="IReferenceData"/> items.</value>
+    [JsonIgnore]
+    IEnumerable<IReferenceData> AllItems { get; }
+
+    /// <summary>
+    /// Gets all active (excluding <see cref="IReferenceData.IsInactive"/>) items sorted by the <see cref="IReferenceData.SortOrder"/> value.
+    /// </summary>
+    /// <value>An <see cref="IEnumerable{T}"/> containing the selected <see cref="IReferenceData"/> items.</value>
+    [JsonIgnore]
+    IEnumerable<IReferenceData> ActiveItems { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/Caching/FixedExpirationCacheEntry.cs b/src/CoreEx/RefData/Caching/FixedExpirationCacheEntry.cs
deleted file mode 100644
index 31b8957f..00000000
--- a/src/CoreEx/RefData/Caching/FixedExpirationCacheEntry.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Caching.Memory;
-using System;
-
-namespace CoreEx.RefData.Caching
-{
-    /// <summary>
-    /// Enables fixed expiration <see cref="ReferenceDataOrchestrator"/> <see cref="ICacheEntry"/> configuration capabilities.
-    /// </summary>
-    /// <remarks>Provides a consistent fixed expiration for all cache entries.</remarks>
-    /// <param name="absoluteExpirationRelativeToNow">The <see cref="ICacheEntry.AbsoluteExpirationRelativeToNow"/> value.</param>
-    /// <param name="slidingExpiration">The <see cref="ICacheEntry.SlidingExpiration"/> value.</param>
-    public sealed class FixedExpirationCacheEntry(TimeSpan? absoluteExpirationRelativeToNow = null, TimeSpan? slidingExpiration = null) : ICacheEntryConfig
-    {
-        private readonly TimeSpan? _absoluteExpirationRelativeToNow = absoluteExpirationRelativeToNow;
-        private readonly TimeSpan? _slidingExpiration = slidingExpiration;
-
-        /// <summary>
-        /// Provides an opportunity to the maintain the <see cref="ICacheEntry"/> data prior to the cache <i>create</i> function being invoked (as a result of <see cref="ReferenceDataOrchestrator.OnGetOrCreateAsync"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="entry">The <see cref="ICacheEntry"/>.</param>
-        public void CreateCacheEntry(Type type, ICacheEntry entry)
-        {
-            entry.AbsoluteExpirationRelativeToNow = _absoluteExpirationRelativeToNow;
-            entry.SlidingExpiration = _slidingExpiration;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/Caching/ICacheEntryConfig.cs b/src/CoreEx/RefData/Caching/ICacheEntryConfig.cs
deleted file mode 100644
index e084a887..00000000
--- a/src/CoreEx/RefData/Caching/ICacheEntryConfig.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Caching.Memory;
-using System;
-
-namespace CoreEx.RefData.Caching
-{
-    /// <summary>
-    /// Provides the <see cref="ReferenceDataOrchestrator"/> <see cref="ICacheEntry"/> configuration capabilities.
-    /// </summary>
-    public interface ICacheEntryConfig
-    {
-        /// <summary>
-        /// Gets the cache key to be used (defaults to <paramref name="type"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The cache key.</returns>
-        /// <remarks>To support the likes of multi-tenancy caching then the resulting cache key should be overridden to include the both the <see cref="ExecutionContext.TenantId"/> and <paramref name="type"/>.</remarks>
-        public object GetCacheKey(Type type) => type;
-
-        /// <summary>
-        /// Provides an opportunity to the maintain the <see cref="ICacheEntry"/> data prior to the cache <i>create</i> function being invoked (as a result of <see cref="ReferenceDataOrchestrator.OnGetOrCreateAsync"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="entry">The <see cref="ICacheEntry"/>.</param>
-        void CreateCacheEntry(Type type, ICacheEntry entry);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/Caching/SettingsBasedCacheEntry.cs b/src/CoreEx/RefData/Caching/SettingsBasedCacheEntry.cs
deleted file mode 100644
index 339559a8..00000000
--- a/src/CoreEx/RefData/Caching/SettingsBasedCacheEntry.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using Microsoft.Extensions.Caching.Memory;
-using System;
-
-namespace CoreEx.RefData.Caching
-{
-    /// <summary>
-    /// Enables the <see cref="SettingsBase"/>-based <see cref="ReferenceDataOrchestrator"/> <see cref="ICacheEntry"/> configuration capabilities.
-    /// </summary>
-    /// <remarks>See <see href="https://github.com/Avanade/CoreEx/blob/main/src/CoreEx/RefData/README.md#cache-policy-configuration">cache policy configuration</see> for more information.
-    /// <para>Where the <see cref="SettingsBase"/> has not been configured, then the default behaviour sets the following: <see cref="ICacheEntry.AbsoluteExpirationRelativeToNow"/> = 2 hours, and <see cref="ICacheEntry.SlidingExpiration"/> = 30 minutes.</para></remarks>
-    /// <param name="settings">The <see cref="IServiceProvider"/>.</param>
-    public class SettingsBasedCacheEntry(SettingsBase? settings) : ICacheEntryConfig
-    {
-        /// <summary>
-        /// Gets the optional <see cref="SettingsBase"/>.
-        /// </summary>
-        public SettingsBase? Settings { get; } = settings;
-
-        /// <summary>
-        /// Gets the cache key to be used (defaults to <paramref name="type"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The cache key.</returns>
-        /// <remarks>To support the likes of multi-tenancy caching then the resulting cache key should be overridden to include the both the <see cref="ExecutionContext.TenantId"/> and <paramref name="type"/>.</remarks>
-        public virtual object GetCacheKey(Type type) => type;
-
-        /// <summary>
-        /// Provides an opportunity to the maintain the <see cref="ICacheEntry"/> data prior to the cache <i>create</i> function being invoked (as a result of <see cref="ReferenceDataOrchestrator.OnGetOrCreateAsync"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="entry">The <see cref="ICacheEntry"/>.</param>
-        /// <remarks>The default behaviour sets the following: <see cref="ICacheEntry.AbsoluteExpirationRelativeToNow"/> = 2 hours, and <see cref="ICacheEntry.SlidingExpiration"/> = 30 minutes unless overidden by optional <see cref="Settings"/>.
-        /// This should be overridden where more advanced behaviour is required.</remarks>
-        public virtual void CreateCacheEntry(Type type, ICacheEntry entry)
-        {
-            entry.AbsoluteExpirationRelativeToNow = Settings?.GetCoreExValue($"RefDataCache:{type.Name}:{nameof(ICacheEntry.AbsoluteExpirationRelativeToNow)}", Settings.RefDataCacheAbsoluteExpirationRelativeToNow) ?? TimeSpan.FromHours(2);
-            entry.SlidingExpiration = Settings?.GetCoreExValue($"RefDataCache:{type.Name}:{nameof(ICacheEntry.SlidingExpiration)}", Settings.RefDataCacheSlidingExpiration) ?? TimeSpan.FromMinutes(30);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/Extended/ReferenceDataBaseEx.cs b/src/CoreEx/RefData/Extended/ReferenceDataBaseEx.cs
deleted file mode 100644
index f1e13951..00000000
--- a/src/CoreEx/RefData/Extended/ReferenceDataBaseEx.cs
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Entities.Extended;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.RefData.Extended
-{
-    /// <summary>
-    /// Represents the extended <see cref="IReferenceData"/> <see cref="EntityBase"/> base implementation.
-    /// </summary>
-    /// <remarks>The <see cref="Id"/> can only be of type <see cref="int"/>, <see cref="long"/>, <see cref="string"/> and <see cref="Guid"/>.
-    /// <para>This implementation is fully-featured and is generally intended for usage within backend services.</para></remarks>
-    [DebuggerDisplay("Id = {Id}, Code = {Code}, Text = {Text}, IsActive = {IsActive}")]
-    public class ReferenceDataBaseEx<TId, TSelf> : EntityBase, IReferenceData<TId> where TId : IComparable<TId>, IEquatable<TId> where TSelf : ReferenceDataBaseEx<TId, TSelf>, new()
-    {
-        private TId? _id;
-        private string? _code;
-        private string? _text;
-        private string? _description;
-        private int _sortOrder;
-        private bool _isActive = true;
-        private bool _isInvalid;
-        private DateTime? _startDate;
-        private DateTime? _endDate;
-        private string? _etag;
-        private MappingsDictionary? _mappings;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataBaseEx{TId, TSelf}"/> class.
-        /// </summary>
-        public ReferenceDataBaseEx()
-        {
-            if (_id != null && _id is not int && _id is not long && _id is not string && _id is not Guid)
-                throw new InvalidOperationException($"A Reference Data {nameof(Id)} can only be of type {nameof(Int32)}, {nameof(Int64)}, {nameof(String)} or {nameof(Guid)}.");
-        }
-
-        /// <inheritdoc/>
-        object? IIdentifier.Id { get => Id; set => Id = (TId)value!; }
-
-        /// <inheritdoc/>
-        public TId? Id { get => _id; set => SetValue(ref _id, value, immutable: true); }
-
-        /// <inheritdoc/>
-        public string? Code { get => _code; set => SetValue(ref _code, value, StringTrim.Both, immutable: true); }
-
-        /// <inheritdoc/>
-        public string? Text { get => _text; set => SetValue(ref _text, value); }
-
-        /// <inheritdoc/>
-        public string? Description { get => _description; set => SetValue(ref _description, value); }
-
-        /// <inheritdoc/>
-        public int SortOrder { get => _sortOrder; set => SetValue(ref _sortOrder, value); }
-
-        /// <inheritdoc/>
-        /// <remarks>Note to classes that override: the base <see cref="IsActive"/> should be called as it verifies <see cref="IsActive"/>, and that the <see cref="StartDate"/> and <see cref="EndDate"/> are not outside of the 
-        /// <see cref="IReferenceDataContext"/> <see cref="IReferenceDataContext.Date"/> where configured (otherwise <see cref="SystemTime.Timestamp"/>). This is accessed via <see cref="ExecutionContext.Current"/> 
-        /// <see cref="ExecutionContext.ReferenceDataContext"/> where <see cref="ExecutionContext.HasCurrent"/>. The <see cref="IsActive"/> will always return <c>false</c> when not <see cref="IsValid"/>.</remarks>
-        public virtual bool IsActive
-        {
-            get
-            {
-                if (!IsValid || !_isActive)
-                    return false;
-
-                if (StartDate != null || EndDate != null)
-                {
-                    var date = Cleaner.Clean(ExecutionContext.HasCurrent ? ExecutionContext.Current.ReferenceDataContext[GetType()] : SystemTime.Timestamp, DateTimeTransform.DateOnly);
-                    if (StartDate != null && date < StartDate)
-                        return false;
-
-                    if (EndDate != null && date > EndDate)
-                        return false;
-                }
-
-                return _isActive;
-            }
-
-            set => SetValue(ref _isActive, value);
-        }
-
-        /// <inheritdoc/>
-        public DateTime? StartDate { get => _startDate; set => SetValue(ref _startDate, value, DateTimeTransform.DateOnly); }
-
-        /// <inheritdoc/>
-        public DateTime? EndDate { get => _endDate; set => SetValue(ref _endDate, value, DateTimeTransform.DateOnly); }
-
-        /// <inheritdoc/>
-        public string? ETag { get => _etag; set => SetValue(ref _etag, value); }
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public bool IsValid => !_isInvalid;
-
-        /// <inheritdoc/>
-        void IReferenceData.SetInvalid() => _isInvalid = true;
-
-        /// <inheritdoc/>
-        [JsonIgnore]
-        public bool HasMappings { get => _mappings != null && _mappings.Count > 0; }
-
-        /// <inheritdoc/>
-        Dictionary<string, object?>? IReferenceData.Mappings => _mappings;
-
-        /// <inheritdoc/>
-        public override string ToString() => Text ?? Code ?? Id?.ToString() ?? base.ToString();
-
-        /// <inheritdoc/>
-        public void SetMapping<T>(string name, T? value) where T : IComparable<T?>, IEquatable<T?>
-        {
-            if (Comparer<T?>.Default.Compare(value, default!) == 0)
-                return;
-
-            if ((_mappings ??= new()).ContainsKey(name))
-                throw new InvalidOperationException(EntityConsts.ValueIsImmutableMessage);
-
-            if (IsReadOnly)
-                throw new InvalidOperationException(EntityConsts.EntityIsReadOnlyMessage);
-
-            _mappings.Add(name, value);
-        }
-
-        /// <inheritdoc/>
-        public T? GetMapping<T>(string name) where T : IComparable<T?>, IEquatable<T?>
-        {
-            if (!HasMappings || !_mappings!.TryGetValue(name, out var value))
-                return default!;
-
-            return (T?)value!;
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetMapping<T>(string name, [NotNullWhen(true)] out T? value) where T : IComparable<T?>, IEquatable<T?>
-        {
-            value = default!;
-            if (!HasMappings || !_mappings!.TryGetValue(name, out var val))
-                return false;
-
-            value = (T?)val!;
-            return true;
-        }
-
-        /// <inheritdoc/>
-        protected override IEnumerable<IPropertyValue> GetPropertyValues()
-        {
-            yield return CreateProperty(nameof(Id), Id, v => Id = v);
-            yield return CreateProperty(nameof(Code), Code, v => Code = v);
-            yield return CreateProperty(nameof(Text), Text, v => Text = v);
-            yield return CreateProperty(nameof(Description), Description, v => Description = v);
-            yield return CreateProperty(nameof(SortOrder), SortOrder, v => SortOrder = v);
-            yield return CreateProperty(nameof(IsActive), IsActive, v => IsActive = v, true);
-            yield return CreateProperty(nameof(StartDate), StartDate, v => StartDate = v);
-            yield return CreateProperty(nameof(EndDate), EndDate, v => EndDate = v);
-            yield return CreateProperty(nameof(_mappings), _mappings, v => _mappings = v);
-        }
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to an <see cref="int"/> where the <see cref="IIdentifier.Id"/> is of <see cref="Type"/> <see cref="int"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator int(ReferenceDataBaseEx<TId, TSelf>? item) => item != null && item.Id is int id ? id : 0;
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to a <see cref="Nullable{T}"/> <see cref="int"/> where the <see cref="IIdentifier.Id"/> is of <see cref="Type"/> <see cref="int"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator int?(ReferenceDataBaseEx<TId, TSelf>? item) => item != null && item.Id is int id ? id : null;
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to a <see cref="long"/> where the <see cref="IIdentifier.Id"/> is of <see cref="Type"/> <see cref="long"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator long(ReferenceDataBaseEx<TId, TSelf>? item) => item != null && item.Id is long id ? id : 0;
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to a <see cref="Nullable{T}"/> <see cref="long"/> where the <see cref="IIdentifier.Id"/> is of <see cref="Type"/> <see cref="long"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator long?(ReferenceDataBaseEx<TId, TSelf>? item) => item != null && item.Id is long id ? id : null;
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to a <see cref="Guid"/> where the <see cref="IIdentifier.Id"/> is of <see cref="Type"/> <see cref="Guid"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator Guid(ReferenceDataBaseEx<TId, TSelf>? item) => item != null && item.Id is Guid id ? id : Guid.Empty;
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to a <see cref="Nullable{T}"/> <see cref="Guid"/> where the <see cref="IIdentifier.Id"/> is of <see cref="Type"/> <see cref="Guid"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator Guid?(ReferenceDataBaseEx<TId, TSelf>? item) => item != null && item.Id is Guid id ? id : null;
-
-        /// <summary>
-        /// An implicit cast from a <see cref="ReferenceDataBaseEx{TId, TSelf}"/> to the <see cref="IReferenceData.Code"/> <see cref="string"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="ReferenceDataBaseEx{TId, TSelf}"/> value.</param>
-        public static implicit operator string?(ReferenceDataBaseEx<TId, TSelf>? item) => item?.Code;
-
-        /// <summary>
-        /// Performs a conversion from an <see cref="Id"/> to an instance of <typeparamref name="TSelf"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Id"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance.</returns>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        [return: NotNullIfNotNull(nameof(id))]
-        public static TSelf? ConvertFromId(TId? id) => ReferenceDataOrchestrator.ConvertFromId<TSelf, TId>(id);
-
-        /// <summary>
-        /// Performs a conversion from a <see cref="Code"/> to an instance of <typeparamref name="TSelf"/>.
-        /// </summary>
-        /// <param name="code">The <see cref="Code"/>.</param>
-        /// <returns>The <typeparamref name="TSelf"/> instance.</returns>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        [return: NotNullIfNotNull(nameof(code))]
-        public static TSelf? ConvertFromCode(string? code) => ReferenceDataOrchestrator.ConvertFromCode<TSelf>(code);
-
-        /// <summary>
-        /// Performs a conversion from a mapping value to an instance of <typeparamref name="TSelf"/>.
-        /// </summary>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        public static TSelf ConvertFromMapping<T>(string name, T? value) where T : IComparable<T?>, IEquatable<T?> => ReferenceDataOrchestrator.ConvertFromMapping<TSelf, T>(name, value);
-
-        /// <summary>
-        /// Gets the corresponding <see cref="IReferenceData.Text"/> for the specified <paramref name="code"/> where <see cref="ExecutionContext.IsTextSerializationEnabled"/> is <c>true</c>.
-        /// </summary>
-        /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
-        /// <returns>The <see cref="IReferenceData.Text"/>.</returns>
-        /// <remarks>This is intended to be consumed by classes that wish to provide an opt-in serialization of corresponding <see cref="IReferenceData.Text"/>.</remarks>
-        public static string? GetRefDataText(string? code) => code != null && ExecutionContext.HasCurrent && ExecutionContext.Current.IsTextSerializationEnabled ? ConvertFromCode(code)?.Text : null;
-
-        /// <summary>
-        /// Gets the corresponding <see cref="IReferenceData.Text"/> for the specified <paramref name="id"/> where <see cref="ExecutionContext.IsTextSerializationEnabled"/> is <c>true</c>.
-        /// </summary>
-        /// <param name="id">The <see cref="IReferenceData"/> <see cref="IIdentifier{TId}.Id"/>.</param>
-        /// <returns>The <see cref="IReferenceData.Text"/>.</returns>
-        /// <remarks>This is intended to be consumed by classes that wish to provide an opt-in serialization of corresponding <see cref="IReferenceData.Text"/>.</remarks>
-        public static string? GetRefDataText(object? id) => id != null && ExecutionContext.HasCurrent && ExecutionContext.Current.IsTextSerializationEnabled ? ConvertFromId((TId)id)?.Text : null;
-
-        #region MappingsDictionary
-
-        /// <summary>
-        /// Provides the 
-        /// </summary>
-        private class MappingsDictionary : Dictionary<string, object?>, IEquatable<MappingsDictionary?>, IEntityBaseCollection
-        {
-            /// <inheritdoc/>
-            public bool IsInitial => false;
-
-            /// <inheritdoc/>
-            public void CleanUp() { }
-
-            /// <inheritdoc/>
-            public object Clone()
-            {
-                var md = new MappingsDictionary();
-                this.ForEach(item => md.Add(item.Key, item.Value));
-                return md;
-            }
-
-            /// <inheritdoc/>
-            public bool Equals(ReferenceDataBaseEx<TId, TSelf>.MappingsDictionary? other)
-            {
-                if (other == null || Count != other.Count)
-                    return false;
-
-                var el = ((IDictionary<string, object?>)this!).GetEnumerator();
-                var er = ((IDictionary<string, object?>)other!).GetEnumerator();
-                while (el.MoveNext())
-                {
-                    if (!er.MoveNext() || !el.Current.Key.Equals(er.Current.Key))
-                        return false;
-
-                    if (el.Current.Value == null && er.Current.Value == null)
-                        continue;
-
-                    if (el.Current.Value != null && !el.Current.Value.Equals(er.Current.Value))
-                        return false;
-
-                    if (!er.Current.Value!.Equals(el.Current.Value))
-                        return false;
-                }
-
-                return true;
-            }
-
-            /// <inheritdoc/>
-            public override bool Equals(object? obj) => Equals(obj! as ReferenceDataBaseEx<TId, TSelf>.MappingsDictionary);
-
-            /// <inheritdoc/>
-            public override int GetHashCode()
-            {
-                var hash = new HashCode();
-                this.ForEach(item => hash.Add(item.GetHashCode()));
-                return hash.ToHashCode();
-            }
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/HealthChecks/ReferenceDataOrchestratorHealthCheck.cs b/src/CoreEx/RefData/HealthChecks/ReferenceDataOrchestratorHealthCheck.cs
deleted file mode 100644
index fe5a3b81..00000000
--- a/src/CoreEx/RefData/HealthChecks/ReferenceDataOrchestratorHealthCheck.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.RefData.HealthChecks
-{
-    /// <summary>
-    /// Provides a <see cref="ReferenceDataOrchestrator"/> <see cref="IHealthCheck"/> to report the <see cref="ReferenceDataOrchestrator.Cache"/> statistics.
-    /// </summary>
-    /// <param name="orchestrator">The <see cref="ReferenceDataOrchestrator"/>.</param>
-    public class ReferenceDataOrchestratorHealthCheck(ReferenceDataOrchestrator orchestrator) : IHealthCheck
-    {
-        private readonly ReferenceDataOrchestrator _orchestrator = orchestrator.ThrowIfNull();
-
-        /// <inheritdoc/>
-        /// <remarks>Will always return <see cref="HealthCheckResult.Healthy"/>.</remarks>
-        public Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
-        {
-            var data = new Dictionary<string, object> { { "types", _orchestrator.GetAllTypes().Count() } };
-
-#if NET7_0_OR_GREATER
-            data.Add("statistics", _orchestrator.Cache.GetCurrentStatistics() ?? new());
-#endif
-
-            return Task.FromResult(HealthCheckResult.Healthy(null, data));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceData.cs b/src/CoreEx/RefData/IReferenceData.cs
deleted file mode 100644
index 838da9d9..00000000
--- a/src/CoreEx/RefData/IReferenceData.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.RefData.Extended;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides the core <b>Reference Data</b> properties.
-    /// </summary>
-    public interface IReferenceData : IIdentifier, IETag
-    {
-        /// <summary>
-        /// Gets or sets the unique code.
-        /// </summary>
-        string? Code { get; set; }
-
-        /// <summary>
-        /// Gets or sets the text.
-        /// </summary>
-        string? Text { get; set; }
-
-        /// <summary>
-        /// Gets or sets the description.
-        /// </summary>
-        string? Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the sort order.
-        /// </summary>
-        int SortOrder { get; set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="IReferenceData"/> is active.
-        /// </summary>
-        /// <value><c>true</c> where active; otherwise, <c>false</c>.</value>
-        bool IsActive { get; set; }
-
-        /// <summary>
-        /// Gets of sets the validity start date.
-        /// </summary>
-        DateTime? StartDate { get; set; }
-
-        /// <summary>
-        /// Gets of sets the validity end date.
-        /// </summary>
-        DateTime? EndDate { get; set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="IReferenceData"/> is known and in a valid state.
-        /// </summary>
-        [JsonIgnore]
-        public bool IsValid => true;
-
-        /// <summary>
-        /// Overrides the standard <see cref="IsValid"/> check and flags the <see cref="ReferenceDataBaseEx{TId, TSelf}"/> as <b>Invalid</b>.
-        /// </summary>
-        /// <remarks>Will result in <see cref="IsActive"/> set to <c>false</c>. Once set to invalid it can not be changed; i.e. there is not an means to set back to valid.</remarks>
-        void SetInvalid() => throw new NotImplementedException("Either explicity override this functionality or leverage the ReferenceDataBaseEx class that enables.");
-
-        /// <summary>
-        /// Gets the underlying mapping dictionary.
-        /// </summary>
-        /// <remarks>The mapping dictionary property is intended for internal use only; generally speaking use <see cref="SetMapping{T}(string, T)"/>, <see cref="GetMapping{T}(string)"/> and <see cref="TryGetMapping{T}(string, out T)"/> 
-        /// to access.</remarks>
-        [JsonIgnore]
-        Dictionary<string, object?>? Mappings => null!;
-
-        /// <summary>
-        /// Indicates whether any mapping values have been configured.
-        /// </summary>
-        [JsonIgnore]
-        public bool HasMappings => false;
-
-        /// <summary>
-        /// Sets the mapping <paramref name="value"/> for the specified <paramref name="name"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <remarks>A <paramref name="value"/> with the default value will not be set; assumed in this case that no mapping exists.</remarks>
-        public void SetMapping<T>(string name, T? value) where T : IComparable<T?>, IEquatable<T?> => throw new NotImplementedException("Either explicity override this functionality or leverage the ReferenceDataBaseEx class that enables.");
-
-        /// <summary>
-        /// Gets a mapping value for the <see cref="ReferenceDataBaseEx{TId, TSelf}"/> for the specified <paramref name="name"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <returns>The mapping value where found; otherwise, the corresponding default value.</returns>
-        public T? GetMapping<T>(string name) where T : IComparable<T?>, IEquatable<T?> => default!;
-
-        /// <summary>
-        /// Gets a mapping value for the <see cref="ReferenceDataBaseEx{TId, TSelf}"/> for the specified <paramref name="name"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <returns><c>true</c> indicates that the name exists; otherwise, <c>false</c>.</returns>
-        public bool TryGetMapping<T>(string name, [NotNullWhen(true)] out T? value) where T : IComparable<T?>, IEquatable<T?> { value = default!; return false; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataCache.cs b/src/CoreEx/RefData/IReferenceDataCache.cs
new file mode 100644
index 00000000..7efec8a7
--- /dev/null
+++ b/src/CoreEx/RefData/IReferenceDataCache.cs
@@ -0,0 +1,16 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Enables caching of reference data in a implementation-agnostic manner.
+/// </summary>
+public interface IReferenceDataCache
+{
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <paramref name="type"/> where it exists; otherwise, invokes the <paramref name="factory"/> to create.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <param name="factory">The factory to create where the <see cref="IReferenceDataCollection"/> is not in the cache.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IReferenceDataCollection"/> from the cache.</returns>
+    Task<IReferenceDataCollection> GetOrCreateAsync(Type type, Func<Type, CancellationToken, Task<IReferenceDataCollection>> factory, CancellationToken cancellationToken = default);
+}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataCodeCollection.cs b/src/CoreEx/RefData/IReferenceDataCodeCollection.cs
new file mode 100644
index 00000000..a6e2fa43
--- /dev/null
+++ b/src/CoreEx/RefData/IReferenceDataCodeCollection.cs
@@ -0,0 +1,36 @@
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Enables a special purpose <see cref="IReferenceData"/> collection specifically for managing a referenced list of <i>serialization identifiers</i>, being the underlying <see cref="IReferenceData.Code"/>.
+/// </summary>
+public interface IReferenceDataCodeCollection
+{
+    /// <summary>
+    /// Indicates whether the collection contains invalid items (i.e. not <see cref="IReferenceData.IsValid"/>).
+    /// </summary>
+    /// <returns><see langword="true"/> indicates that invalid items exist; otherwise, <see langword="false"/>.</returns>
+    bool HasInvalidItems { get; }
+
+    /// <summary>
+    /// Indicates whether the collection contains inactive items (i.e. <see cref="IReferenceData.IsInactive"/>).
+    /// </summary>
+    /// <returns><see langword="true"/> indicates that inactive items exist; otherwise, <see langword="false"/>.</returns>
+    bool HasInactiveItems { get; }
+
+    /// <summary>
+    /// Gets the number of items in the underlying collection.
+    /// </summary>
+    int Count { get; }
+
+    /// <summary>
+    /// Gets the underlying <see cref="IReferenceData"/> entries.
+    /// </summary>
+    /// <returns>The underlying <see cref="IReferenceData"/> entries.</returns>
+    IEnumerable<IReferenceData> ToRefDataList();
+
+    /// <summary>
+    /// Gets the underlying <see cref="IReferenceData.Code"/> collection.
+    /// </summary>
+    /// <returns>The underlying <see cref="IReferenceData.Code"/> entries as a <see cref="List{T}"/>.</returns>
+    List<string?> ToCodeList();
+}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataCodeList.cs b/src/CoreEx/RefData/IReferenceDataCodeList.cs
deleted file mode 100644
index 8edcefe1..00000000
--- a/src/CoreEx/RefData/IReferenceDataCodeList.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System.Collections.Generic;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Enables the base capabilities for a special purpose <see cref="IReferenceData"/> collection specifically for managing a referenced list of <i>serialization identifiers</i> being the underlying <see cref="IReferenceData.Code"/>.
-    /// </summary>
-    public interface IReferenceDataCodeList
-    {
-        /// <summary>
-        /// Indicates whether the collection contains invalid items (i.e. not <see cref="IReferenceData.IsValid"/>).
-        /// </summary>
-        /// <returns><c>true</c> indicates that invalid items exist; otherwise, <c>false</c>.</returns>
-        bool HasInvalidItems { get; }
-
-        /// <summary>
-        /// Gets the number of items in the collection.
-        /// </summary>
-        int Count { get; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IReferenceData"/> list.
-        /// </summary>
-        /// <returns>The underlying <see cref="IReferenceData"/> list.</returns>
-        List<IReferenceData> ToRefDataList();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataCollection.cs b/src/CoreEx/RefData/IReferenceDataCollection.cs
deleted file mode 100644
index cb854c30..00000000
--- a/src/CoreEx/RefData/IReferenceDataCollection.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides <see cref="GetById(object)"/> and <see cref="GetByCode(string)"/> functionality for an <see cref="IReferenceData"/> collection.
-    /// </summary>
-    public interface IReferenceDataCollection
-    {
-        /// <summary>
-        /// Gets the underlying item <see cref="Type"/>.
-        /// </summary>
-        Type ItemType { get; }
-
-        /// <summary>
-        /// Gets the collection item count.
-        /// </summary>
-        int Count { get; }
-
-        /// <summary>
-        /// Adds the <see cref="IReferenceData"/> to the <see cref="IReferenceDataCollection"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="IReferenceData"/>.</param>
-        void Add(IReferenceData item);
-
-        /// <summary>
-        /// Adds the <paramref name="collection"/> of items to the <see cref="IReferenceDataCollection"/>.
-        /// </summary>
-        /// <param name="collection">The collection containing the items to add.</param>
-        void AddRange(IEnumerable<IReferenceData> collection);
-
-        /// <summary>
-        /// Determines whether the specified <see cref="IIdentifier.Id"/> exists within the collection.
-        /// </summary>
-        /// <param name="id">The <see cref="IIdentifier.Id"/>.</param>
-        /// <returns><c>true</c> if it exists; otherwise, <c>false</c>.</returns>
-        bool ContainsId(object id);
-
-        /// <summary>
-        /// Determines whether the specified <see cref="IReferenceData.Code"/> exists within the collection.
-        /// </summary>
-        /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
-        /// <returns><c>true</c> if it exists; otherwise, <c>false</c>.</returns>
-        bool ContainsCode(string code);
-
-        /// <summary>
-        /// Attempts to get the <paramref name="item"/> with the specifed <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="IIdentifier.Id"/>.</param>
-        /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetById(object id, [NotNullWhen(true)] out IReferenceData? item);
-
-        /// <summary>
-        /// Attempts to get the <paramref name="item"/> with the specifed <paramref name="code"/>.
-        /// </summary>
-        /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
-        /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetByCode(string code, [NotNullWhen(true)] out IReferenceData? item);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceData"/> for the specified <see cref="IIdentifier.Id"/>.
-        /// </summary>
-        /// <param name="id">The specified reference data <see cref="IIdentifier.Id"/>.</param>
-        /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <c>null</c>.</returns>
-        IReferenceData? GetById(object id);
-
-        /// <summary>
-        /// Gets the<see cref="IReferenceData"/> for the specified <see cref="IReferenceData.Code"/>.
-        /// </summary>
-        /// <param name="code">The specified <see cref="IReferenceData.Code"/>.</param>
-        /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <c>null</c>.</returns>
-        IReferenceData? GetByCode(string code);
-
-        /// <summary>
-        /// Determines whether the specified <see cref="IReferenceData.GetMapping{T}(string)"/> value exists within the collection.
-        /// </summary>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <returns><c>true</c> if it exists; otherwise, <c>false</c>.</returns>
-        bool ContainsMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T>;
-
-        /// <summary>
-        /// Attempts to get the <paramref name="item"/> with the specifed <see cref="IReferenceData.GetMapping{T}(string)"/> value.
-        /// </summary>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out IReferenceData? item) where T : IComparable<T>, IEquatable<T>;
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceData"/> for the specified <see cref="IReferenceData.GetMapping{T}(string)"/> value.
-        /// </summary>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <c>null</c>.</returns>
-        IReferenceData? GetByMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T>;
-
-        /// <summary>
-        /// Gets all items (excluding invalid only) sorted by the <see cref="IReferenceData.SortOrder"/> value.
-        /// </summary>
-        /// <value>An <see cref="IEnumerable{T}"/> containing the selected <see cref="IReferenceData"/> items.</value>
-        IEnumerable<IReferenceData> AllItems { get; }
-
-        /// <summary>
-        /// Gets all active (excluding invalid and not <see cref="IReferenceData.IsActive"/>) items sorted by the <see cref="IReferenceData.SortOrder"/> value.
-        /// </summary>
-        /// <value>An <see cref="IEnumerable{T}"/> containing the selected <see cref="IReferenceData"/> items.</value>
-        IEnumerable<IReferenceData> ActiveItems { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataCollectionT.cs b/src/CoreEx/RefData/IReferenceDataCollectionT.cs
index 269c63c6..3d99b1a0 100644
--- a/src/CoreEx/RefData/IReferenceDataCollectionT.cs
+++ b/src/CoreEx/RefData/IReferenceDataCollectionT.cs
@@ -1,124 +1,117 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.RefData;
 
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.RefData
+/// <summary>
+/// Enables <see cref="GetById(TId?)"/> functionality for an <see cref="IReferenceData{TId}"/> collection with a typed <see cref="IIdentifier{T}.Id"/>.
+/// </summary>
+public interface IReferenceDataCollection<TId, TRef> : IReferenceDataCollection, ICollection<TRef> where TRef : class, IReferenceData<TId>
 {
-    /// <summary>
-    /// Provides <see cref="GetById(TId?)"/> functionality for an <see cref="IReferenceData{TId}"/> collection with a typed <see cref="IIdentifier{T}.Id"/>.
-    /// </summary>
-    public interface IReferenceDataCollection<TId, TRef> : IReferenceDataCollection, ICollection<TRef> where TId : IComparable<TId>, IEquatable<TId> where TRef : class, IReferenceData<TId>
-    {
-        /// <inheritdoc/>
-        Type IReferenceDataCollection.ItemType => typeof(TRef);
+    /// <inheritdoc/>
+    [JsonIgnore]
+    Type IReferenceDataCollection.ItemType => typeof(TRef);
+
+    /// <inheritdoc/>
+    void IReferenceDataCollection.Add(IReferenceData item) => Add((TRef)item);
 
-        /// <inheritdoc/>
-        void IReferenceDataCollection.Add(IReferenceData item) => Add((TRef)item);
+    /// <inheritdoc/>
+    void IReferenceDataCollection.AddRange(IEnumerable<IReferenceData> collection) => AddRange((IEnumerable<TRef>)collection);
 
-        /// <inheritdoc/>
-        void IReferenceDataCollection.AddRange(IEnumerable<IReferenceData> collection) => AddRange((IEnumerable<TRef>)collection);
-        
-        /// <inheritdoc/>
-        bool IReferenceDataCollection.ContainsId(object id) => ContainsId((TId)id);
+    /// <inheritdoc/>
+    bool IReferenceDataCollection.ContainsId(object? id) => ContainsId((TId)(id ?? default(TId)!));
 
-        /// <inheritdoc/>
-        bool IReferenceDataCollection.TryGetById(object id, [NotNullWhen(true)] out IReferenceData? item)
+    /// <inheritdoc/>
+    bool IReferenceDataCollection.TryGetById(object? id, [NotNullWhen(true)] out IReferenceData? item)
+    {
+        if (TryGetById((TId)(id ?? default(TId)!), out TRef? item2))
         {
-            if (TryGetById((TId)id, out TRef? item2))
-            {
-                item = item2;
-                return true;
-            }
-
-            item = null;
-            return false;
+            item = item2;
+            return true;
         }
 
-        /// <inheritdoc/>
-        bool IReferenceDataCollection.TryGetByCode(string code, [NotNullWhen(true)] out IReferenceData? item)
+        item = null;
+        return false;
+    }
+
+    /// <inheritdoc/>
+    bool IReferenceDataCollection.TryGetByCode(string code, [NotNullWhen(true)] out IReferenceData? item)
+    {
+        if (TryGetByCode(code, out TRef? item2))
         {
-            if (TryGetByCode(code, out TRef? item2))
-            {
-                item = item2;
-                return true;
-            }
-
-            item = null;
-            return false;
+            item = item2;
+            return true;
         }
 
-        /// <inheritdoc/>
-        IReferenceData? IReferenceDataCollection.GetById(object id) => GetById((TId)id);
-
-        /// <inheritdoc/>
-        IReferenceData? IReferenceDataCollection.GetByCode(string code) => GetByCode(code);
-
-        /// <inheritdoc/>
-        IReferenceData? IReferenceDataCollection.GetByMapping<T>(string name, T value) => GetByMapping(name, value);
-
-        /// <summary>
-        /// Adds the <paramref name="collection"/> to the <see cref="ReferenceDataCollection{TId, TRef}"/>.
-        /// </summary>
-        /// <param name="collection">The collection containing the items to add.</param>
-        public void AddRange(IEnumerable<TRef> collection);
-
-        /// <summary>
-        /// Determines whether the specified <see cref="IIdentifier.Id"/> exists within the collection.
-        /// </summary>
-        /// <param name="id">The <see cref="IIdentifier.Id"/>.</param>
-        /// <returns><c>true</c> if it exists; otherwise, <c>false</c>.</returns>
-        bool ContainsId(TId id);
-
-        /// <summary>
-        /// Attempts to get the <paramref name="item"/> with the specifed <paramref name="id"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="IIdentifier.Id"/>.</param>
-        /// <param name="item">The corresponding <typeparamref name="TRef"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetById(TId id, [NotNullWhen(true)] out TRef? item);
-
-        /// <summary>
-        /// Attempts to get the <paramref name="item"/> with the specifed <paramref name="code"/>.
-        /// </summary>
-        /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
-        /// <param name="item">The corresponding <typeparamref name="TRef"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetByCode(string code, [NotNullWhen(true)] out TRef? item);
-
-        /// <summary>
-        /// Gets the <typeparamref name="TRef"/> for the specified <see cref="IIdentifier.Id"/>.
-        /// </summary>
-        /// <param name="id">The specified reference data <see cref="IIdentifier.Id"/>.</param>
-        /// <returns>The <typeparamref name="TRef"/> where found; otherwise, <c>null</c>.</returns>
-        TRef? GetById(TId id);
-
-        /// <summary>
-        /// Gets the <typeparamref name="TRef"/> for the specified <see cref="IReferenceData.Code"/>.
-        /// </summary>
-        /// <param name="code">The specified <see cref="IReferenceData.Code"/>.</param>
-        /// <returns>The <typeparamref name="TRef"/> where found; otherwise, <c>null</c>.</returns>
-        new TRef? GetByCode(string code);
-
-        /// <summary>
-        /// Attempts to get the <paramref name="item"/> with the specifed <see cref="IReferenceData.GetMapping{T}(string)"/> value.
-        /// </summary>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <c>null</c>.</param>
-        /// <returns><c>true</c> where found; otherwise, <c>false</c>.</returns>
-        bool TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out TRef? item) where T : IComparable<T>, IEquatable<T>;
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceData"/> for the specified <see cref="IReferenceData.GetMapping{T}(string)"/> value.
-        /// </summary>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <c>null</c>.</returns>
-        new TRef? GetByMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T>;
+        item = null;
+        return false;
     }
+
+    /// <inheritdoc/>
+    IReferenceData? IReferenceDataCollection.GetById(object? id) => GetById(id);
+
+    /// <inheritdoc/>
+    IReferenceData? IReferenceDataCollection.GetByCode(string code) => GetByCode(code);
+
+    /// <inheritdoc/>
+    IReferenceData? IReferenceDataCollection.GetByMapping<T>(string name, T value) => GetByMapping(name, value);
+
+    /// <summary>
+    /// Adds the <paramref name="collection"/> to the <see cref="IReferenceDataCollection{TId, TRef}"/>.
+    /// </summary>
+    /// <param name="collection">The collection containing the items to add.</param>
+    public void AddRange(IEnumerable<TRef> collection);
+
+    /// <summary>
+    /// Determines whether the specified <see cref="IReferenceData.Id"/> exists within the collection.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData.Id"/>.</param>
+    /// <returns><see langword="true"/> if it exists; otherwise, <see langword="false"/>.</returns>
+    bool ContainsId(TId id);
+
+    /// <summary>
+    /// Attempts to get the <paramref name="item"/> with the specified <paramref name="id"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="IReferenceData.Id"/>.</param>
+    /// <param name="item">The corresponding <typeparamref name="TRef"/> item where found; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    bool TryGetById(TId id, [NotNullWhen(true)] out TRef? item);
+
+    /// <summary>
+    /// Attempts to get the <paramref name="item"/> with the specified <paramref name="code"/>.
+    /// </summary>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <param name="item">The corresponding <typeparamref name="TRef"/> item where found; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    bool TryGetByCode(string code, [NotNullWhen(true)] out TRef? item);
+
+    /// <summary>
+    /// Gets the <typeparamref name="TRef"/> for the specified <see cref="IReferenceData.Id"/>.
+    /// </summary>
+    /// <param name="id">The specified reference data <see cref="IReferenceData.Id"/>.</param>
+    /// <returns>The <typeparamref name="TRef"/> where found; otherwise, <see langword="null"/>.</returns>
+    TRef? GetById(TId id);
+
+    /// <summary>
+    /// Gets the <typeparamref name="TRef"/> for the specified <see cref="IReferenceData.Code"/>.
+    /// </summary>
+    /// <param name="code">The specified <see cref="IReferenceData.Code"/>.</param>
+    /// <returns>The <typeparamref name="TRef"/> where found; otherwise, <see langword="null"/>.</returns>
+    new TRef? GetByCode(string code);
+
+    /// <summary>
+    /// Attempts to get the <paramref name="item"/> with the specified <see cref="IReferenceData.TryGetMapping"/> value.
+    /// </summary>
+    /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <param name="item">The corresponding <see cref="IReferenceData"/> item where found; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    bool TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out TRef? item) where T : IComparable<T>, IEquatable<T>;
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceData"/> for the specified <see cref="IReferenceData.TryGetMapping"/> value.
+    /// </summary>
+    /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <returns>The <see cref="IReferenceData"/> where found; otherwise, <see langword="null"/>.</returns>
+    new TRef? GetByMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T>;
 }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataContext.cs b/src/CoreEx/RefData/IReferenceDataContext.cs
index 0f4974fe..9159dd1d 100644
--- a/src/CoreEx/RefData/IReferenceDataContext.cs
+++ b/src/CoreEx/RefData/IReferenceDataContext.cs
@@ -1,33 +1,28 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.RefData;
 
-using System;
-
-namespace CoreEx.RefData
+/// <summary>
+/// Enables the contextual validation <see cref="Date"/> for a <see cref="IReferenceData.StartsOn"/> and <see cref="IReferenceData.EndsOn"/> <see cref="IReferenceData.IsValid"/> verification.
+/// </summary>
+/// <remarks>This allows for the validatity dates to be adjusted, per requrest or on-demand, to validate or invalidate the reference date where a <see cref="IReferenceData.StartsOn"/> and/or
+/// <see cref="IReferenceData.EndsOn"/> have been configured. As such, this should be a scoped service from an ASP.NET Core dependency injection (DI) perspective. 
+/// <para>The <see cref="Date"/> is a master setting for all <see cref="IReferenceData"/> <see cref="Type">types</see>. An individual
+/// <see cref="Type"/> can be overridden where required, and all dates can be <see cref="Reset"/>.</para></remarks>
+public interface IReferenceDataContext
 {
     /// <summary>
-    /// Enables the contextual validation <see cref="Date"/> for a <see cref="IReferenceData.StartDate"/> and <see cref="IReferenceData.EndDate"/> <see cref="IReferenceData.IsValid"/> verification.
+    /// Gets or sets the <see cref="IReferenceData"/> <see cref="IReferenceData.StartsOn"/> and <see cref="IReferenceData.EndsOn"/> contextual validation date.
     /// </summary>
-    /// <remarks>This allows for the validatity dates to be adjusted, per requrest or on-demand, to validate or invalidate the reference date where a <see cref="IReferenceData.StartDate"/> and/or
-    /// <see cref="IReferenceData.EndDate"/> have been configured. As such, this should be a scoped service from an ASP.NET Core dependency injection (DI) perspective. 
-    /// <para>The <see cref="Date"/> is a master setting for all <see cref="IReferenceData"/> <see cref="Type">types</see>. An individual
-    /// <see cref="Type"/> can be overridden where required, and all dates can be <see cref="Reset"/>.</para></remarks>
-    public interface IReferenceDataContext
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData"/> <see cref="IReferenceData.StartDate"/> and <see cref="IReferenceData.EndDate"/> contextual validation date.
-        /// </summary>
-        DateTime? Date { get; set; }
+    DateTimeOffset? Date { get; set; }
 
-        /// <summary>
-        /// Gets or sets a contextual validation date for a specific <see cref="IReferenceData"/> <paramref name="type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The contextual validation date where found.</returns>
-        DateTime? this[Type type] { get; set; }
+    /// <summary>
+    /// Gets or sets a contextual validation date for a specific <see cref="IReferenceData"/> <paramref name="type"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <returns>The contextual validation date where found.</returns>
+    DateTimeOffset? this[Type type] { get; set; }
 
-        /// <summary>
-        /// Resets all dates.
-        /// </summary>
-        void Reset();
-    }
+    /// <summary>
+    /// Resets all dates.
+    /// </summary>
+    void Reset();
 }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataProvider.cs b/src/CoreEx/RefData/IReferenceDataProvider.cs
index 2b3b0380..e58c8f03 100644
--- a/src/CoreEx/RefData/IReferenceDataProvider.cs
+++ b/src/CoreEx/RefData/IReferenceDataProvider.cs
@@ -1,29 +1,21 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.RefData;
 
-using CoreEx.Results;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.RefData
+/// <summary>
+/// Enables a means to manage and group one or more <see cref="IReferenceData"/> <see cref="Types"/> for use by the centralized <see cref="ReferenceDataOrchestrator"/>.
+/// </summary>
+public interface IReferenceDataProvider
 {
     /// <summary>
-    /// Provides a means to manage and group one or more <see cref="IReferenceData"/> entities for use by the centralised <see cref="ReferenceDataOrchestrator"/>.
+    /// Gets all the underlying <see cref="IReferenceData"/> and corresponding <see cref="IReferenceDataCollection"/> <see cref="Type"></see> pairs provided.
     /// </summary>
-    public interface IReferenceDataProvider
-    {
-        /// <summary>
-        /// Gets all the underlying <see cref="IReferenceData"/> <see cref="Type">types</see> provided.
-        /// </summary>
-        /// <returns>The <see cref="IReferenceData"/> <see cref="Type">types</see> provided.</returns>
-        Type[] Types { get; }
+    /// <returns>The <see cref="IReferenceData"/> and corresponding <see cref="IReferenceDataCollection"/> <see cref="Type"></see> pairs provided.</returns>
+    IEnumerable<(Type, Type)> Types { get; }
 
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/>.</returns>
-        Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/>.</returns>
+    Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/IReferenceDataT.cs b/src/CoreEx/RefData/IReferenceDataT.cs
index 78fafc99..d5935762 100644
--- a/src/CoreEx/RefData/IReferenceDataT.cs
+++ b/src/CoreEx/RefData/IReferenceDataT.cs
@@ -1,13 +1,13 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.RefData;
 
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx.RefData
+/// <summary>
+/// Enables the core <b>Reference Data</b> properties with a typed <see cref="IReadOnlyIdentifier{T}.Id"/>.
+/// </summary>
+/// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
+public interface IReferenceData<TId> : IReadOnlyIdentifier<TId>, IReferenceData 
 {
     /// <summary>
-    /// Provides the core <b>Reference Data</b> properties with a typed <see cref="IIdentifier{T}.Id"/>.
+    /// Gets or initializes the identifier.
     /// </summary>
-    /// <typeparam name="TId">The identifier <see cref="Type"/>.</typeparam>
-    public interface IReferenceData<TId> : IIdentifier<TId>, IReferenceData where TId : IComparable<TId>, IEquatable<TId> { }
+    new TId Id { get; init; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/README.md b/src/CoreEx/RefData/README.md
index 24b8a864..f487e7fe 100644
--- a/src/CoreEx/RefData/README.md
+++ b/src/CoreEx/RefData/README.md
@@ -1,157 +1,43 @@
-# CoreEx.RefData
+# CoreEx.RefData
 
-The `CoreEx.RefData` namespace provides a rich, first class, experience for _reference data_ given its key role within an application.
+> Provides the `ReferenceDataOrchestrator` and supporting interfaces for managing, caching, and resolving collections of reference data (look-up / code-list) types across a CoreEx application.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.RefData` defines the canonical pattern for reference data — think Status codes, Country lists, Gender options — within a CoreEx application. Reference data types are first-class strongly-typed entities (implementing `IReferenceData<TId>`) with `Id`, `Code`, `Text`, `IsActive`, `SortOrder`, and optional `StartDate`/`EndDate` validity windows.
 
-To provide a consistent pattern to the treatment of _reference data_ within an application, simplifying usage whilst maintaining flexibility of implementation.
+`ReferenceDataOrchestrator` is the central singleton that manages one or more `IReferenceDataProvider` implementations, loads their collections into an `IReferenceDataCache` (backed by `IHybridCache`), and exposes a unified async API for querying any reference data type by CLR type, name, or code. It also maintains an `AsyncLocal` current instance, so JSON converters and validator rules can resolve reference data without explicit orchestrator injection.
 
-<br/>
+The `IReferenceDataContext` scoping mechanism allows per-request filtering: e.g. returning only `IsActive` items for public API responses while allowing infrastructure to load all items. The `[ReferenceData<T>]` source-generator attribute on a contract property wires up the JSON code serialization and validator integration automatically.
 
-## Types of data
+## Key capabilities
 
-At a high-level a typical application deals with different types of data:
+- 📚 **Centralized collection management**: `ReferenceDataOrchestrator` manages multiple `IReferenceDataProvider` instances, loading each collection once and serving all subsequent requests from the cache.
+- 🏎️ **Cached loading**: `IReferenceDataCache` (backed by `IHybridCache`) stores loaded collections; the orchestrator reloads on cache miss and honours `LocalExpiration`/`DistributedExpiration` settings.
+- 🔍 **Multi-key lookup**: Collections are queryable by `Id`, `Code` (case-insensitive), or `Text` wildcard; `GetByTypeAsync<TRef>()` returns the full collection, and individual item resolution is available via `GetAsync<TRef>(code)`.
+- 🌐 **JSON code serialization**: `JsonReferenceDataConverter` (in `CoreEx.Json`) uses the orchestrator's `AsyncLocal` current instance to deserialize JSON code strings back to strongly typed reference data instances.
+- 🔐 **Validity filtering**: `IReferenceDataContext` filters returned collections to `IsActive` and within `StartDate`/`EndDate` windows; the context is scoped per request via `ExecutionContext`.
+- 🏷️ **Code validation**: `IReferenceDataCodeCollection` provides `ContainsCode(string)` for fast O(1) code existence checks used by validation rules.
+- 📡 **OpenTelemetry tracing**: `ReferenceDataOrchestratorInvoker` wraps every collection load with an `InvokerTracer` span, tagging the cache type, cache state, and item count.
 
-- **Reference Data** is data that is managed within an application primarily used to provide lists of valid values. These values provide contextual information that are generally used to trigger business processes, workflows and/or used for grouping / filtering.
-This data has a low level of volatility, in that it remains largely static for significant periods of time. There are low volumes of this data within an application. It is a very good candidate for the likes of caching. Reference Data is generally never deleted; instead it may become inactive. Example: Country, Gender, Payment Type, etc. 
+## Key types
 
-- **Master data** is data that is captured and continuously maintained to reflect a current known understanding; there is no historical context other than that provided by an audit process providing a version history over time. This data has a moderate level of volatility, in that changes generally occur infrequently. There are moderate volumes of this data within an application.
-Master data can be deleted (or logically deleted) as required; typically the latter. Example: Customer, Vendor, Product, GL Account, etc. 
+| Type | Description |
+|------|-------------|
+| **[`ReferenceDataOrchestrator`](./ReferenceDataOrchestrator.cs)** | Singleton managing reference data provider registration, cache-backed collection loading, and multi-key resolution via `GetByTypeAsync<TRef>()`, `GetByNameAsync()`. |
+| **[`ReferenceDataOrchestratorInvoker`](./ReferenceDataOrchestratorInvoker.cs)** | `InvokerBase<ReferenceDataOrchestrator>` wrapping collection loads with OpenTelemetry spans and structured log entries. |
+| **[`ReferenceDataMultiDictionary`](./ReferenceDataMultiDictionary.cs)** | Dictionary of reference data collections keyed by type name; the serialization-friendly result type returned by multi-type reference data API endpoints. |
+| [`IReferenceData<TId>`](./IReferenceDataT.cs) | Core reference data interface: `Id`, `Code`, `Text`, `IsActive`, `SortOrder`, `StartDate`, `EndDate`, and validity helpers. |
+| [`IReferenceDataCollectionT`](./IReferenceDataCollectionT.cs) | Strongly-typed collection interface adding `GetById`, `GetByCode`, `GetByText`, and `GetByPredicate` lookup methods. |
+| [`IReferenceDataCodeCollection`](./IReferenceDataCodeCollection.cs) | Slim interface exposing `ContainsCode(string)` for O(1) code membership tests used by validators. |
+| [`IReferenceDataProvider`](./IReferenceDataProvider.cs) | Pluggable provider interface: `GetTypes()` returns the reference data types managed by this provider; `GetAsync(Type)` loads and returns a collection. |
+| [`IReferenceDataCache`](./IReferenceDataCache.cs) | Cache interface wrapping `IHybridCache` for reference data collection storage and retrieval with configurable expiry options. |
+| [`IReferenceDataContext`](./IReferenceDataContext.cs) | Per-request scoping interface that controls which reference data items are visible (active-only vs all) for the current execution context. |
 
-- **Transactional data** is data that is recorded to capture/manage an event or action, tied to specific business rules, at a point in time. The data will typically have a high level of volatility at inception decreasing significantly over time. Once the corresponding workflow has completed the data becomes immutable and serves the purpose of providing a historical context. Transactional data is generally never deleted as it provides an auditable recording; it may be archived. There are high volumes of this type of data within an application. Example: Purchase Order, Sales Invoice, GL Posting, etc. 
+## Related Namespaces
 
-<br/>
-
-## Base capabilities
-
-The [`IReferenceData`](./IReferenceData.cs) provides for the core (standard) properties. The [`ReferenceDataBase`](./ReferenceDataBaseT.cs) or [`ReferenceDataBaseEx`](./Extended/ReferenceDataBaseEx.cs) provide the base implementation depending on the level of functionality required out-of-the-box. The latter is targeted for internal usage only with additional capabilities included that are often useful.
-
-The *primary* properties are as follows.
-
-Property | Description
--|-
-`Id` | The internal unique identifier as either an `int`, `long`, `Guid` or `string`.
-`Code` | The unique (immutable) code as a `string`. This is primarily the value that would be used by external parties (applications) to consume. Additionally, it could be used to store the reference in the underlying data source if the above `Id` is not suitable.
-`Text` | The textual `string` used for display within an application; e.g. within a drop-down. 
-`SortOrder` | Defines the sort order (integer) within the underlying reference data collection.
-`IsActive` | Indicates whether the value is active or not. It is up to the application what to do when a value is not considered active.
-
-Additional _secondary_ (largely optional) properties are as follows.
-
-Property | Description
--|-
-`Description` | A further more detailed textual `string` used for display within an application; e.g. help-style text.
-`StartDate` | The `IsValid` validity start date (`null` indicates not defined) where [`IReferenceDataContext`](./IReferenceDataContext.cs)
-`EndDate` | The `IsValid` validity end date (`null` indicates not defined).
-`ETag` | The entity tag ([`IETag`](../Entities/IETag.cs)) for optimistic concurrency and [`IF-MATCH`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/If-Match) checking.
-
-Finally, there is a feature to enable multiple code mappings; i.e. where two (or more) systems have a different codes for the same value. The `SetMapping`, `GetMapping` and `TryGetMapping`, etc. methods enable.
-
-Additional developer-defined properties can be, and should be, added where required extending on the base class. The _reference data_ framework will then make these available within the application to enable simple usage/access by a developer. 
-
-The [`ReferenceDataCollection`](./ReferenceDataCollection.cs) provides the base capabilities for a reference data collection. Including the adding, ensuring uniqueness, sorting and additional filtering (e.g. `ActiveList`).
-
-<br/>
-
-## Orchestration and caching
-
-The [`ReferenceDataOrchestrator`](./ReferenceDataOrchestrator.cs) provides the centralized reference data orchestration. Primarily responsible for the management of one or more `IReferenceDataProvider` instances. 
-
-An [`IReferenceDataProvider`](./IReferenceDataProvider.cs) defines the list of _reference data_ `Types` that are provided/supported. The `GetAsync` method is then responsible for performing the load for the specified _reference data_ type. 
-
-Each `IReferenceDataProvider` (typically only one) instance is registered via the orchestrator's `Register` method. The orchestrator then provides a number of utility methods to access the various _reference data_ types. The orchestrator will lazy-load each type (using provider's `GetAsync`) on first access and automatically cache using an [`IMemoryCache`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.caching.memory.imemorycache) to improve performance. Out-of-the-box `IMemoryCache` policies can be set to manage cache lifetimes.
-
-<br/>
-
-### Cache policy configuration
-
-The default implementation for the `IMemoryCache` is that each _reference data_ type's collection [`ICacheEntry`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.caching.memory.icacheentry) is set in a standardized manner; being `AbsoluteExpirationRelativeToNow` and `SlidingExpiration` properties defaulted to `02:00:00` (2 hours) and `00:30:00` (30 minutes) respectively. 
-
-These defaults can be overridden within the configuration [settings](../Configuration/SettingsBase.cs); as can specific _reference data_ types. The following is an example of setting the defaults and then specifically overridding the `Gender` policy (the `Type.Name` is used as the property name).
-
-``` json
-{
-  "RefDataCache": {
-    "AbsoluteExpirationRelativeToNow": "01:45:00",
-    "SlidingExpiration": "00:15:00",
-    "Gender": {
-      "AbsoluteExpirationRelativeToNow": "03:00:00",
-      "SlidingExpiration": "00:45:00"
-    }
-  }
-}
-```
-
-This is enabled by the default [`SettingsBasedCacheEntry`](./Caching/SettingsBasedCacheEntry.cs) class. Where the above is not sufficient then a custom [`ICacheEntryConfig`](./Caching/ICacheEntryConfig.cs) can be leveraged, or the virtual `ReferencedDataOrchestrator.OnCreateCacheEntry` method can be overridden to fully customize (override) the behaviour.
-
-<br/>
-
-### Distributed cache
-
-There may be times that a [distributed cache](https://learn.microsoft.com/en-us/dotnet/core/extensions/caching#distributed-caching) may be required to support higher scale-out and/or consistent multiple app server refreshing. In this scenario it is still recommended that an `IMemoryCache` is used, albeit with a nominal (small) expiration to ensure optimal performance given potential frequency of access, then implement the likes of an [`IDistribuedCache`](https://learn.microsoft.com/en-us/dotnet/api/microsoft.extensions.caching.distributed.idistributedcache) within the corresponding [`IReferenceDataProvider`](./IReferenceDataProvider.cs) implementation.
-
-<br/>
-
-## Reference data properties and serialization
-
-It is recommended that the rich _reference data_ types themselves where included within an entity are not JSON serialized/deserialized over the wire from the likes of an API; in these instances only the `Code` is generally used. This is to minimize the resulting payload size of the owning entity. 
-
-For example a `Person` entity would be defined with the rich `Gender` _reference data_ type:
-
-``` csharp
-public class Person
-{
-    public string? Name { get; set; }
-    public Gender? Gender { get; set; }
-}
-```
-
-The resulting serialized JSON should be as follows. By default the [`JsonSerializer`](../Text/Json/JsonSerializer.cs) will automatically detect a property of `IReferenceData` and serialize the `Code` only, whereby ensuring the minimized serialization. Where full serialization is required use the alternate [`ReferenceDataContentJsonSerializer`](../Text/Json/ReferenceDataContentJsonSerializer.cs).
-
-``` json
-{ "name": "Sarah", "gender": "F" }
-```
-
-<br/>
-
-## Reference data APIs
-
-The [orchestrator](#Orchestration-and-caching) encapsulates all the requisite functionality to enables rich API endpoints. By default only the active (`IReferenceData.IsActive`) items will be returned. To get both the active and inactive the [`$inactive=true`](../Http/HttpConsts.cs) URL query string must be used.
-
-<br/>
-
-### Per reference data endpoints
-
-Each reference data entity should have an API endpoint; similar to `/ref/Xxx`. This will by default return all of the active reference data entries. This can also be invoked passing additional URL query string parameters:
-
-Parameter | Description
--|-
-`code` | Zero or more codes can be passed; e.g: `?code=m,f` or `?code=m&code=f` (case insensitive).
-`text` | A single text with wildcards can be passed; e.g: `?text=m*` (case insensitive).
-
-To expose per _reference data_ type, [code similar to](../../../samples/My.Hr/My.Hr.Api/Controllers/ReferenceDataController.cs) the following should be adopted. The [orchestrator](#Orchestration-and-caching) encapsulates all the requisite functionality to filter, etc.
-
-``` csharp
-[HttpGet("genders")]
-[ProducesResponseType(typeof(IEnumerable<Gender>), (int)HttpStatusCode.OK)]
-public Task<IActionResult> GenderGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default) =>
-    _webApi.GetAsync(Request, x => _orchestrator.GetWithFilterAsync<Gender>(codes, text, x.RequestOptions.IncludeInactive));
-```
-
-<br/>
-
-### Root reference data endpoint
-
-Additionally, a root `/ref`-style endpoint can be used to return multiple reference data values in a single request; designed to reduce chattiness from a consuming channel to the above _per_ endpoints. This must be passed at least a single URL query string parameter to function.
-
-The parameter is either just the named reference data entity which will result in all corresponding entries being returned (e.g: `?gender` or `?gender&country`). Otherwise, specific codes can be specified (e.g" `?gender=m,f`, `?gender=m&gender=f`, `?gender=m,f&country=au,nz`). The options can be mixed and matched (e.g: `?gender&country=au,nz`).
-
-To expose, [code similar to](../../../samples/My.Hr/My.Hr.Api/Controllers/ReferenceDataController.cs) the following should be adopted. The [orchestrator](#Orchestration-and-caching) encapsulates all the requisite functionality to perform in a consistent manner.
-
-``` csharp
-[HttpGet()]
-[ProducesResponseType(typeof(IEnumerable<CoreEx.RefData.ReferenceDataMultiItem>), (int)HttpStatusCode.OK)]
-public Task<IActionResult> GetNamed() => _webApi.GetAsync(Request, p => _orchestrator.GetNamedAsync(p.RequestOptions));
-```
\ No newline at end of file
+- **[`CoreEx`](../README.md)** - `ExecutionContext` carries the ambient `IReferenceDataContext` and `IServiceProvider` used by the orchestrator.
+- **[`CoreEx.Caching`](../Caching/README.md)** - `IHybridCache` backs `IReferenceDataCache` for L1/L2 reference data caching.
+- **[`CoreEx.Json`](../Json/README.md)** - `JsonReferenceDataConverter` uses `ReferenceDataOrchestrator.Current` to deserialize code strings to typed reference data instances.
+- **[`CoreEx.Invokers`](../Invokers/README.md)** - `ReferenceDataOrchestratorInvoker` emits OpenTelemetry spans for every collection load.
+- **[`CoreEx.RefData`](../../CoreEx.RefData/README.md)** - The separate `CoreEx.RefData` NuGet package extends these primitives with `ReferenceDataBase<TId, TSelf>` and additional entity/collection base types.
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataBase.cs b/src/CoreEx/RefData/ReferenceDataBase.cs
deleted file mode 100644
index 7fc5725a..00000000
--- a/src/CoreEx/RefData/ReferenceDataBase.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Diagnostics;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Represents the basic <see cref="IReferenceData"/> implementation.
-    /// </summary>
-    /// <remarks>For a fully-featured implementation see <see cref="Extended.ReferenceDataBaseEx{TId, TSelf}"/>.</remarks>
-    [DebuggerDisplay("Id = {Id}, Code = {Code}, Text = {Text}, IsActive = {IsActive}")]
-    public abstract class ReferenceDataBase : IReferenceData
-    {
-        private bool _isValid = true;
-
-        /// <inheritdoc/>
-        Type IIdentifier.IdType => throw new NotImplementedException();
-        
-        /// <inheritdoc/>
-        public object? Id { get; set; }
-
-        /// <inheritdoc/>
-        public string? Code { get; set; }
-
-        /// <inheritdoc/>
-        public string? Text { get; set; }
-
-        /// <inheritdoc/>
-        public string? Description { get; set; }
-
-        /// <inheritdoc/>
-        public int SortOrder { get; set; }
-
-        /// <inheritdoc/>
-        public bool IsActive { get; set; } = true;
-
-        /// <inheritdoc/>
-        public DateTime? StartDate { get; set; }
-
-        /// <inheritdoc/>
-        public DateTime? EndDate { get; set; }
-
-        /// <inheritdoc/>
-        public string? ETag { get; set; }
-
-        /// <inheritdoc/>
-        bool IReferenceData.IsValid => _isValid;
-
-        /// <inheritdoc/>
-        void IReferenceData.SetInvalid() => _isValid = false;
-
-        /// <inheritdoc/>
-        public override string ToString() => Text ?? Code ?? Id?.ToString() ?? base.ToString()!;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataBaseT.cs b/src/CoreEx/RefData/ReferenceDataBaseT.cs
deleted file mode 100644
index 28d29847..00000000
--- a/src/CoreEx/RefData/ReferenceDataBaseT.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Diagnostics;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Represents the <see cref="IReferenceData{TId}"/> implementation.
-    /// </summary>
-    /// <remarks>For a fully-featured implementation see <see cref="Extended.ReferenceDataBaseEx{TId, TSelf}"/>.</remarks>
-    [DebuggerDisplay("Id = {Id}, Code = {Code}, Text = {Text}, IsActive = {IsActive}")]
-    public class ReferenceDataBase<TId> : ReferenceDataBase, IReferenceData<TId> where TId : IComparable<TId>, IEquatable<TId>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataBase{TId}"/> class.
-        /// </summary>
-        /// <remarks>The <see cref="Id"/> can only be of type <see cref="int"/>, <see cref="long"/>, <see cref="string"/> and <see cref="Guid"/>.</remarks>
-        public ReferenceDataBase()
-        {
-            base.Id = default(TId);
-            if (Id != null && Id is not int && Id is not long && Id is not string && Id is not Guid)
-                throw new InvalidOperationException($"A Reference Data {nameof(Id)} can only be of type {nameof(Int32)}, {nameof(Int64)}, {nameof(String)} or {nameof(Guid)}.");
-        }
-
-        /// <inheritdoc/>
-        object? IIdentifier.Id { get => base.Id; set => base.Id = (TId)value!; }
-
-        /// <inheritdoc/>
-        Type IIdentifier.IdType => typeof(TId);
-
-        /// <inheritdoc/>
-        public new TId? Id { get => (TId?)base.Id; set => base.Id = value; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataCodeList.cs b/src/CoreEx/RefData/ReferenceDataCodeList.cs
deleted file mode 100644
index 64c8308b..00000000
--- a/src/CoreEx/RefData/ReferenceDataCodeList.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Linq;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides the capabilities for a special purpose <typeparamref name="TRef"/> collection specifically for managing a referenced list of <i>serialization identifiers</i> being the underlying <see cref="IReferenceData.Code"/>.
-    /// </summary>
-    /// <typeparam name="TRef">The <see cref="IReferenceData{TId}"/> <see cref="Type"/>.</typeparam>
-    public class ReferenceDataCodeList<TRef> : IReferenceDataCodeList, IList<TRef>, INotifyCollectionChanged where TRef : class, IReferenceData, new()
-    {
-        private readonly List<string?> _codes;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeList{TRef}"/> class.
-        /// </summary>
-        public ReferenceDataCodeList() => _codes = [];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeList{TRef}"/> class with a reference to an external <see cref="IReferenceData.Code"/> list.
-        /// </summary>
-        /// <param name="codes">A reference to the external <see cref="IReferenceData.Code"/> list; it is this list that will be maintained by this collection. Changes made to the referenced list will bypass <see cref="INotifyCollectionChanged"/>.</param>
-        public ReferenceDataCodeList(ref List<string?>? codes) => _codes = codes ?? [];
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeList{TRef}"/> class with a list of items.
-        /// </summary>
-        /// <param name="items">The list of <see cref="IReferenceData"/> items.</param>
-        public ReferenceDataCodeList(IEnumerable<TRef> items) => _codes = new((items ?? []).Select(x => x.Code));
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCodeList{TRef}"/> class with a <see cref="IReferenceData.Code"/> array.
-        /// </summary>
-        /// <param name="codes">The <see cref="IReferenceData.Code"/> array.</param>
-        public ReferenceDataCodeList(params string?[] codes) => _codes = new(codes);
-
-        /// <summary>
-        /// Creates a new <see cref="IReferenceData.Code"/> list from the underlying contents.
-        /// </summary>
-        /// <returns>A new <see cref="IReferenceData.Code"/> list list.</returns>
-        public List<string?> ToCodeList() => new(_codes);
-
-        /// <inheritdoc/>
-        List<IReferenceData> IReferenceDataCodeList.ToRefDataList() => new(this);
-
-        /// <summary>
-        /// Creates a new <typeparamref name="TRef"/> list from the underlying contents.
-        /// </summary>
-        /// <returns>A new <typeparamref name="TRef"/> list</returns>
-        public List<TRef> ToRefDataList() => [.. this];
-
-        /// <summary>
-        /// Creates a new <see cref="IIdentifier{TId}.Id"/> list from the underlying contents.
-        /// </summary>
-        /// <typeparam name="TId">The <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-        /// <returns>A new <see cref="IIdentifier{TId}.Id"/> list</returns>
-        public List<TId?> ToIdList<TId>() => this.Select(x => (TId?)x.Id).ToList();
-
-        /// <summary>
-        /// Indicates whether the collection contains invalid items (i.e. not <see cref="IReferenceData.IsValid"/>).
-        /// </summary>
-        /// <returns><c>true</c> indicates that invalid items exist; otherwise, <c>false</c>.</returns>
-        public bool HasInvalidItems => this.Any(x => x == null || !x.IsValid);
-
-        /// <summary>
-        /// Gets the item for the specified <paramref name="code"/>.
-        /// </summary>
-        private static TRef GetItem(string? code)
-        {
-            if (code != null)
-                return ReferenceDataOrchestrator.ConvertFromCode<TRef>(code);
-
-            var rdx = new TRef();
-            rdx.SetInvalid();
-            return rdx;
-        }
-
-        #region IList
-
-        /// <inheritdoc/>
-        public TRef this[int index] 
-        { 
-            get => GetItem(_codes[index]); 
-
-            set
-            {
-                var e = new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Replace, value, GetItem(_codes[index]!));
-                _codes[index] = value?.Code;
-                OnCollectionChanged(e);
-            }
-        }
-
-        /// <inheritdoc/>
-        public int Count => _codes.Count;
-
-        /// <inheritdoc/>
-        public bool IsReadOnly => ((IList)_codes).IsReadOnly;
-
-        /// <inheritdoc/>
-        public void Add(TRef item)
-        {
-            var e = new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, _codes.Count);
-            _codes.Add(item?.Code);
-            OnCollectionChanged(e);
-        }
-
-        /// <inheritdoc/>
-        public void Clear()
-        {
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, this));
-            _codes.Clear();
-        }
-
-        /// <inheritdoc/>
-        public bool Contains(TRef item) => _codes.Contains(item?.Code);
-
-        /// <inheritdoc/>
-        public void CopyTo(TRef[] array, int arrayIndex)
-        {
-            if (array == null || array.Length == 0)
-                return;
-
-            var codes = new string?[array.Length];
-            for (int i = 0; i < array.Length; i++)
-            {
-                codes[i] = array[i]?.Code;
-            }
-
-            _codes.CopyTo(codes, arrayIndex);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, array, arrayIndex));
-        }
-
-        /// <inheritdoc/>
-        public IEnumerator<TRef> GetEnumerator()
-        {
-            foreach (string? code in _codes)
-            {
-                yield return GetItem(code!);
-            }
-        }
-
-        /// <inheritdoc/>
-        public int IndexOf(TRef item) => _codes.IndexOf(item?.Code);
-
-        /// <inheritdoc/>
-        public void Insert(int index, TRef item)
-        {
-            _codes.Insert(index, item?.Code);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, index));
-        }
-
-        /// <inheritdoc/>
-        public bool Remove(TRef item)
-        {
-            var index = IndexOf(item);
-            if (index < 0)
-                return false;
-
-            RemoveAt(index);
-            return true;
-        }
-
-        /// <inheritdoc/>
-        public void RemoveAt(int index)
-        {
-            var e = new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, this[index], index);
-            _codes.RemoveAt(index);
-            OnCollectionChanged(e);
-        }
-
-        /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        #endregion
-
-        #region INotifyPropertyChanged
-
-        /// <summary>
-        /// Raises the <see cref="CollectionChanged"/> event with the provided arguments.
-        /// </summary>
-        /// <param name="e">Arguments of the event being raised.</param>
-        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs e) => CollectionChanged?.Invoke(this, e);
-
-        /// <inheritdoc/>
-        public event NotifyCollectionChangedEventHandler? CollectionChanged;
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataCollection.cs b/src/CoreEx/RefData/ReferenceDataCollection.cs
deleted file mode 100644
index 471b0e2c..00000000
--- a/src/CoreEx/RefData/ReferenceDataCollection.cs
+++ /dev/null
@@ -1,297 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Represents a base <see cref="IReferenceDataCollection{TId, TRef}"/> collection.
-    /// </summary>
-    /// <typeparam name="TId">The <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TRef">The <see cref="IReferenceData{TId}"/> <see cref="Type"/>.</typeparam>
-    public class ReferenceDataCollection<TId, TRef> : IReferenceDataCollection<TId, TRef>, ICollection<TRef> where TId : IComparable<TId>, IEquatable<TId> where TRef : class, IReferenceData<TId>
-    {
-#if NET9_0_OR_GREATER
-        private readonly System.Threading.Lock _lock = new();
-#else
-        private readonly object _lock = new();
-#endif
-        private readonly ConcurrentDictionary<TId, TRef> _rdcId = new();
-        private readonly ConcurrentDictionary<string, TRef> _rdcCode;
-        private Dictionary<(string, object?), TRef>? _mappingsDict;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCollection{TItem, TId}"/> class.
-        /// </summary>
-        /// <param name="sortOrder">The <see cref="ReferenceDataSortOrder"/>. Defaults to <see cref="ReferenceDataSortOrder.SortOrder"/>.</param>
-        /// <param name="codeComparer">The <see cref="StringComparer"/> for <see cref="IReferenceData.Code"/> comparisons. Defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>.</param>
-        public ReferenceDataCollection(ReferenceDataSortOrder sortOrder = ReferenceDataSortOrder.SortOrder, StringComparer? codeComparer = null)
-        {
-            SortOrder = sortOrder;
-            _rdcCode = new ConcurrentDictionary<string, TRef>(codeComparer ?? StringComparer.OrdinalIgnoreCase);
-            OnInitialization();
-        }
-
-        /// <summary>
-        /// Provides an opportunity to extend initialization when the object is constructed.
-        /// </summary>
-        /// <remarks>Added to support scenarios whether the class is defined using the likes of partial classes to provide a means to easily add functionality during the constructor process.</remarks>
-        protected virtual void OnInitialization() { }
-
-        /// <summary>
-        /// Gets or sets the <see cref="ReferenceDataSortOrder"/> used by <see cref="GetItems"/>.
-        /// </summary>
-        public ReferenceDataSortOrder SortOrder { get; set; }
-
-        /// <summary>
-        /// Gets the item for the specified <see cref="IReferenceData.Code"/>.
-        /// </summary>
-        /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
-        /// <returns>The item where found; otherwise, <c>null</c>.</returns>
-        public TRef? this[string code] => _rdcCode[code];
-
-        /// <inheritdoc/>
-        public void Clear()
-        {
-            lock (_lock)
-            {
-                _rdcId.Clear();
-                _rdcCode.Clear();
-                _mappingsDict?.Clear();
-            }
-        }
-
-        /// <inheritdoc/>
-        /// <remarks>The underlying <see cref="IReferenceData.Mappings"/> are included during add; if they are maintained (see <see cref="IReferenceData.SetMapping{T}(string, T)"/>) after these will not be included. Also, where the item
-        /// implements <see cref="IReadOnly"/> then <see cref="IReadOnly.MakeReadOnly"/> will be invoked during the add.</remarks>
-        public void Add(TRef item)
-        {
-            item.ThrowIfNull(nameof(item));
-
-            if (item.Id == null)
-                throw new ArgumentException("Id must not be null.", nameof(item));
-
-            if (item.Code == null)
-                throw new ArgumentException("Code must not be null.", nameof(item));
-
-            lock (_lock)
-            {
-                if (_rdcId.Values.Contains(item))
-                    throw new ArgumentException($"Item already exists within the collection.", nameof(item));
-
-                if (_rdcId.ContainsKey(item.Id))
-                    throw new ArgumentException($"Item with Id '{item.Id}' already exists within the collection.", nameof(item));
-
-                if (_rdcCode.ContainsKey(item.Code))
-                    throw new ArgumentException($"Item with Code '{item.Code!}' already exists within the collection.", nameof(item));
-
-                if (item.HasMappings)
-                {
-                    _mappingsDict ??= [];
-
-                    // Make sure there are no duplicates.
-                    foreach (var map in item.Mappings!)
-                    {
-                        if (_mappingsDict.ContainsKey((map.Key, map.Value)))
-                            throw new ArgumentException($"Item with Mapping Key '{map.Key}' and Value '{map.Value}' already exists within the collection.");
-                    }
-
-                    // Now add 'em in.
-                    foreach (var map in item.Mappings)
-                    {
-                        _mappingsDict.Add((map.Key, map.Value), item);
-                    }
-                }
-
-                // Add to the underlying dictionaries.
-                _rdcId.TryAdd(item.Id, item);
-                _rdcCode.TryAdd(item.Code, item);
-
-                if (item is IReadOnly ro)
-                    ro.MakeReadOnly();
-            }
-        }
-
-        /// <summary>
-        /// Adds the <paramref name="collection"/> to the <see cref="ReferenceDataCollection{TId, TRef}"/>.
-        /// </summary>
-        /// <param name="collection">The collection containing the items to add.</param>
-        public void AddRange(IEnumerable<TRef> collection)
-        {
-            if (collection == null)
-                return;
-
-            foreach (var item in collection)
-            {
-                Add(item);
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool ContainsId(TId id) => _rdcId.ContainsKey(id);
-
-        /// <inheritdoc/>
-        public bool TryGetById(TId id, [NotNullWhen(true)] out TRef? item)
-        {
-            if (id != null)
-                return _rdcId.TryGetValue(id, out item);
-
-            item = default;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public TRef? GetById(TId id) => id == null ? default : _rdcId[id];
-
-        /// <inheritdoc/>
-        public bool ContainsCode(string code) => _rdcCode.ContainsKey(code);
-
-        /// <inheritdoc/>
-        public bool TryGetByCode(string code, [NotNullWhen(true)] out TRef? item)
-        {
-            if (code != null)
-                return _rdcCode.TryGetValue(code, out item);
-
-            item = default;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public TRef? GetByCode(string code) => code == null ? default : _rdcCode[code];
-
-        /// <inheritdoc/>
-        public bool ContainsMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T> => _mappingsDict != null && _mappingsDict.ContainsKey((name, value));
-
-        /// <inheritdoc/>
-        bool IReferenceDataCollection.TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out IReferenceData? item)
-        {
-            var r = TryGetByMapping<T>(name, value, out TRef? itemx);
-            item = itemx;
-            return r;
-        }
-
-        /// <inheritdoc/>
-        public bool TryGetByMapping<T>(string name, T value, [NotNullWhen(true)] out TRef? item) where T : IComparable<T>, IEquatable<T>
-        {
-            if (_mappingsDict != null)
-                return _mappingsDict.TryGetValue((name, value), out item);
-
-            item = default;
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public TRef? GetByMapping<T>(string name, T value) where T : IComparable<T>, IEquatable<T> => TryGetByMapping(name, value, out var item) ? item : default;
-
-        /// <inheritdoc/>
-        IEnumerable<IReferenceData> IReferenceDataCollection.AllItems => AllList;
-
-        /// <inheritdoc/>
-        IEnumerable<IReferenceData> IReferenceDataCollection.ActiveItems => ActiveList;
-
-        /// <summary>
-        /// Gets a list of all items (excluding where <i>not</i> <see cref="IsItemValid(TRef)"/>) sorted by the <see cref="SortOrder"/> value.
-        /// </summary>
-        /// <value>An <see cref="IList{T}"/> containing the selected items.</value>
-        /// <remarks>This is provided as a property to more easily support binding; it encapsulates the following method invocation: <c><see cref="GetItems"/>(SortOrder, null, null);</c></remarks>
-        public IList<TRef> AllList => GetItems(SortOrder, null, true);
-
-        /// <summary>
-        /// Gets a list of all active (<see cref="IsItemActive(TRef)"/> and <see cref="IsItemValid(TRef)"/>) items sorted by the <see cref="SortOrder"/> value.
-        /// </summary>
-        /// <value>An <see cref="IList{TItem}"/> containing the selected items.</value>
-        /// <remarks>This is provided as a property to more easily support binding; it encapsulates the following method invocation: <c><see cref="GetItems"/>(SortOrder, true, true);</c></remarks>
-        public IList<TRef> ActiveList => GetItems(SortOrder, true, true);
-
-        /// <summary>
-        /// Gets a list of <typeparamref name="TRef"/> items from the collection using the specified criteria.
-        /// </summary>
-        /// <param name="sortOrder">Defines the <see cref="ReferenceDataSortOrder"/>; <c>null</c> indicates to use the defined <see cref="SortOrder"/>.</param>
-        /// <param name="isActive">Indicates whether the list should include values with the same <see cref="IReferenceData.IsActive"/> value; otherwise, <c>null</c> indicates all.</param>
-        /// <param name="isValid">Indicates whether the list should include values with the same <see cref="IsItemValid"/> value; otherwise, <c>null</c> indicates all.</param>
-        /// <remakes>This is leveraged by <see cref="AllList"/> and <see cref="ActiveList"/>.</remakes>
-        public List<TRef> GetItems(ReferenceDataSortOrder? sortOrder = null, bool? isActive = null, bool? isValid = null)
-        {
-            if (_rdcId.IsEmpty)
-                return [];
-
-            var list = from rd in _rdcId.Values select rd;
-            if (isActive != null)
-                list = list.Where(x => IsItemActive(x));
-
-            if (isValid != null)
-                list = list.Where(x => IsItemValid(x));
-
-            list = (sortOrder ?? SortOrder) switch
-            {
-                ReferenceDataSortOrder.Id => list.OrderBy(x => x.Id),
-                ReferenceDataSortOrder.Code => list.OrderBy(x => x.Code),
-                ReferenceDataSortOrder.Text => list.OrderBy(x => x.Text).ThenBy(x => x.Code),
-                _ => list.OrderBy(x => x.SortOrder).ThenBy(x => x.Text).ThenBy(x => x.Code)
-            };
-
-            return list.ToList();
-        }
-
-        /// <summary>
-        /// Determines whether the <paramref name="item"/> is considered active and therefore accessible from within the collection.
-        /// </summary>
-        /// <param name="item">The item to validate.</param>
-        /// <returns><c>true</c> indicates active; otherwise, <c>false</c>.</returns>
-        /// <remarks>By default checks <see cref="IReferenceData.IsActive"/>.</remarks>
-        protected virtual bool IsItemActive(TRef item) => item.IsActive;
-
-        /// <summary>
-        /// Determines whether the <paramref name="item"/> is considered valid and therefore accessible from within the collection.
-        /// </summary>
-        /// <param name="item">The item to validate.</param>
-        /// <returns><c>true</c> indicates valid; otherwise, <c>false</c>.</returns>
-        /// <remarks>By default checks <see cref="IReferenceData.IsValid"/>.</remarks>
-        protected virtual bool IsItemValid(TRef item) => item.IsValid;
-
-        #region ICollection
-
-        /// <inheritdoc/>
-        public ICollection<TId> Keys => _rdcId.Keys;
-
-        /// <inheritdoc/>
-        public ICollection<TRef> Values => _rdcId.Values;
-
-        /// <inheritdoc/>
-        public int Count => _rdcId.Count;
-
-        /// <inheritdoc/>
-        bool ICollection<TRef>.IsReadOnly => ((ICollection<KeyValuePair<TId, TRef>>)_rdcId).IsReadOnly;
-
-        /// <inheritdoc/>
-        public bool Contains(TRef item) => _rdcId.Values.Contains(item);
-
-        /// <inheritdoc/>
-        void ICollection<TRef>.CopyTo(TRef[] array, int arrayIndex) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        bool ICollection<TRef>.Remove(TRef item) => throw new NotSupportedException();
-
-        /// <inheritdoc/>
-        /// <remarks>Only items that are <see cref="IsItemValid(TRef)"/> are enumerated. There is no implied sort order; use <see cref="GetItems(ReferenceDataSortOrder?, bool?, bool?)"/> for sorted lists.</remarks>
-        public IEnumerator<TRef> GetEnumerator()
-        {
-            foreach (TRef item in _rdcId.Values)
-            {
-                if (IsItemValid(item))
-                    yield return item;
-            }
-        }
-
-        /// <inheritdoc/>
-        /// <remarks>Only items that are <see cref="IsItemValid(TRef)"/> are enumerated. There is no implied sort order; use <see cref="GetItems(ReferenceDataSortOrder?, bool?, bool?)"/> for sorted lists.</remarks>
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() => GetEnumerator();
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataCollectionBase.cs b/src/CoreEx/RefData/ReferenceDataCollectionBase.cs
deleted file mode 100644
index f4de88f2..00000000
--- a/src/CoreEx/RefData/ReferenceDataCollectionBase.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Represents a base <see cref="IReferenceDataCollection{TId, TRef}"/> collection with <typeparamref name="TSelf"/> to enable the <see cref="Create(IEnumerable{TRef}?)"/>.
-    /// </summary>
-    /// <typeparam name="TId">The <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TRef">The <see cref="IReferenceData{TId}"/> <see cref="Type"/>.</typeparam>
-    /// <typeparam name="TSelf">The <see cref="ReferenceDataCollectionBase{TId, TRef, TSelf}"/> itself.</typeparam>
-    /// <param name="sortOrder">The <see cref="ReferenceDataSortOrder"/>. Defaults to <see cref="ReferenceDataSortOrder.SortOrder"/>.</param>
-    /// <param name="codeComparer">The <see cref="StringComparer"/> for <see cref="IReferenceData.Code"/> comparisons. Defaults to <see cref="StringComparer.OrdinalIgnoreCase"/>.</param>
-    public abstract class ReferenceDataCollectionBase<TId, TRef, TSelf>(ReferenceDataSortOrder sortOrder, StringComparer? codeComparer = null) : ReferenceDataCollection<TId, TRef>(sortOrder, codeComparer) where TId : IComparable<TId>, IEquatable<TId> where TRef : class, IReferenceData<TId> where TSelf : ReferenceDataCollectionBase<TId, TRef, TSelf>, new()
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataCollectionBase{TId, TRef, TSelf}"/> class.
-        /// </summary>
-        public ReferenceDataCollectionBase() : this(ReferenceDataSortOrder.SortOrder, null) { }
-
-        /// <summary>
-        /// Creates an instance of <typeparamref name="TSelf"/> and adds from the <paramref name="source"/>.
-        /// </summary>
-        /// <param name="source">The source items.</param>
-        /// <returns>An instance of <typeparamref name="TSelf"/>.</returns>
-        public static TSelf Create(IEnumerable<TRef>? source = null)
-        {
-            var coll = new TSelf();
-            if (source != null)
-                coll.AddRange(source);
-
-            return coll;
-        }
-
-        /// <summary>
-        /// Creates an instance of <typeparamref name="TSelf"/> and adds from the <paramref name="source"/> asynchronously.
-        /// </summary>
-        /// <param name="source">The source items.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>An instance of <typeparamref name="TSelf"/>.</returns>
-        public static Task<TSelf> CreateAsync(IQueryable<TRef> source, CancellationToken cancellationToken = default) 
-            => CreateAsync(source is IAsyncEnumerable<TRef> ae ? ae : throw new ArgumentException("The source must implement IAsyncEnumerable<TRef>.", nameof(source)), cancellationToken);
-
-        /// <summary>
-        /// Creates an instance of <typeparamref name="TSelf"/> and adds from the <paramref name="source"/> asynchronously.
-        /// </summary>
-        /// <param name="source">The source items.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>An instance of <typeparamref name="TSelf"/>.</returns>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Future proofing.")]
-        public static async Task<TSelf> CreateAsync(IAsyncEnumerable<TRef>? source = null, CancellationToken cancellationToken = default)
-        {
-            var coll = new TSelf();
-
-            if (source != null)
-            {
-                await foreach (TRef i in source.ConfigureAwait(false))
-                {
-                    coll.Add(i);
-                }
-            }
-
-            return coll;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataContext.cs b/src/CoreEx/RefData/ReferenceDataContext.cs
deleted file mode 100644
index 49c88f14..00000000
--- a/src/CoreEx/RefData/ReferenceDataContext.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Concurrent;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides the contextual validation <see cref="Date"/> for a <see cref="IReferenceData.StartDate"/> and <see cref="IReferenceData.EndDate"/> <see cref="IReferenceData.IsValid"/> verification.
-    /// </summary>
-    /// <remarks>All dates when set go through <see cref="Cleaner.Clean(DateTime, DateTimeTransform)"/> with <see cref="DateTimeTransform.DateOnly"/>.</remarks>
-    public class ReferenceDataContext : IReferenceDataContext
-    {
-        private DateTime? _date;
-        private readonly ConcurrentDictionary<Type, DateTime?> _coll = new();
-
-        /// <summary>
-        /// Gets or sets the <see cref="IReferenceData"/> <see cref="IReferenceData.StartDate"/> and <see cref="IReferenceData.EndDate"/> contextual validation date.
-        /// </summary>
-        /// <remarks>Defaults to <see cref="SystemTime.Timestamp"/>.</remarks>
-        public DateTime? Date
-        {
-            get => _date ??= Cleaner.Clean(SystemTime.Timestamp, DateTimeTransform.DateOnly);
-            set => _date = Cleaner.Clean(value, DateTimeTransform.DateOnly);
-        }
-
-        /// <summary>
-        /// Gets or sets a contextual validation date for a specific <see cref="IReferenceData"/> <paramref name="type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The contextual validation date.</returns>
-        public DateTime? this[Type type]
-        {
-            get => (_coll.TryGetValue(type.ThrowIfNull(nameof(type)), out var date) ? date : Date) ?? Date;
-            set => _coll.AddOrUpdate(type, Cleaner.Clean(value, DateTimeTransform.DateOnly), (_, __) => Cleaner.Clean(value, DateTimeTransform.DateOnly));
-        }
-
-        /// <summary>
-        /// Resets all dates.
-        /// </summary>
-        public void Reset()
-        {
-            _date = null;
-            _coll.Clear();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataFilter.cs b/src/CoreEx/RefData/ReferenceDataFilter.cs
deleted file mode 100644
index 28b9fa6b..00000000
--- a/src/CoreEx/RefData/ReferenceDataFilter.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Entities.Extended;
-using System.Collections.Generic;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides the <see cref="IReferenceData"/> filter properties specifically for HTTP Agent usage; see <see cref="ReferenceDataOrchestrator.GetWithFilterAsync(string, IEnumerable{string}?, string?, bool, System.Threading.CancellationToken)"/>
-    /// </summary>
-    public class ReferenceDataFilter : EntityBase
-    {
-        private IEnumerable<string>? _codes;
-        private string? _text;
-
-        /// <summary>
-        /// Gets or sets the list of codes.
-        /// </summary>
-        public IEnumerable<string>? Codes { get => _codes; set => SetValue(ref _codes, value); }
-
-        /// <summary>
-        /// Gets or sets the text (including wildcards).
-        /// </summary>
-        public string? Text { get => _text; set => SetValue(ref _text, value, StringTrim.Both ); }
-
-        /// <inheritdoc/>
-        protected override IEnumerable<IPropertyValue> GetPropertyValues()
-        {
-            yield return CreateProperty(nameof(Codes), Codes, v => Codes = v);
-            yield return CreateProperty(nameof(Text), Text, v => Text = v);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataMultiDictionary.cs b/src/CoreEx/RefData/ReferenceDataMultiDictionary.cs
index 2999054a..c816a91f 100644
--- a/src/CoreEx/RefData/ReferenceDataMultiDictionary.cs
+++ b/src/CoreEx/RefData/ReferenceDataMultiDictionary.cs
@@ -1,19 +1,14 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.RefData;
 
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.RefData
+/// <summary>
+/// Represents a dictionary where the key is the <see cref="IReferenceData"/> <see cref="Type"/> and the value is the corresponding <see cref="IReferenceData"/> items.
+/// </summary>
+/// <remarks>This is intended for the <see cref="ReferenceDataOrchestrator"/> to enable the <see cref="ReferenceDataOrchestrator.GetNamedAsync"/> to enable correct serialization of <see cref="IReferenceData"/> types.
+/// <para>To enable the <see cref="JsonReferenceDataConverter"/> is used; however, note this <i>only</i> supports serialization and not deserialization.</para></remarks>
+public class ReferenceDataMultiDictionary : Dictionary<string, IEnumerable<IReferenceData>>
 {
     /// <summary>
-    /// Represents a dictionary where the key is the <see cref="IReferenceData"/> <see cref="Type"/> and the value is the corresponding <see cref="IReferenceData"/> items.
+    /// Initializes a new instance of the <see cref="ReferenceDataMultiDictionary"/> class.
     /// </summary>
-    /// <remarks>This is generally intended for the <see cref="ReferenceDataOrchestrator"/>.</remarks>
-    public class ReferenceDataMultiDictionary : Dictionary<string, IEnumerable<IReferenceData>> 
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataMultiDictionary"/> class.
-        /// </summary>
-        public ReferenceDataMultiDictionary() : base(StringComparer.OrdinalIgnoreCase) { }
-    }
+    public ReferenceDataMultiDictionary() : base(StringComparer.OrdinalIgnoreCase) { }
 }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataOrchestrator.cs b/src/CoreEx/RefData/ReferenceDataOrchestrator.cs
index 4fc51340..904d4602 100644
--- a/src/CoreEx/RefData/ReferenceDataOrchestrator.cs
+++ b/src/CoreEx/RefData/ReferenceDataOrchestrator.cs
@@ -1,691 +1,581 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Invokers;
-using CoreEx.RefData.Caching;
-using CoreEx.Wildcards;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.RefData
+namespace CoreEx.RefData;
+
+/// <summary>
+/// Provides the centralized reference data orchestration. Primarily responsible for the management of one or more <see cref="IReferenceDataProvider"/> instances.  
+/// </summary>
+/// <remarks>Provides <i>cached</i> access to the underlying reference data collections via the likes of <see cref="GetByTypeAsync{TRef}"/>, <see cref="GetByTypeAsync(Type, CancellationToken)"/> or <see cref="GetByNameAsync(string, CancellationToken)"/>.
+/// <para>To improve performance the reference data <i>should</i> be cached; this is enabled using the <see cref="IReferenceDataCache"/>. The underlying reference data loading is executed in the context of a <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/> 
+/// to limit/minimize any impact on the processing of the current request by isolating all scoped services.</para></remarks>
+/// <param name="serviceProvider">The <see cref="IServiceProvider"/> needed to instantiate the registered providers, etc.</param>
+/// <param name="logger">The <see cref="ILogger"/>.</param>
+public sealed class ReferenceDataOrchestrator(IServiceProvider serviceProvider, ILogger<ReferenceDataOrchestrator> logger)
 {
     /// <summary>
-    /// Provides the centralized reference data orchestration. Primarily responsible for the management of one or more <see cref="IReferenceDataProvider"/> instances.  
+    /// Gets the error message where the <see cref="IReferenceData.Text"/> <see cref="Wildcard"/> value is invalid.
     /// </summary>
-    /// <remarks>Provides <i>cached</i> access to the underlying reference data collections via the likes of <see cref="GetByTypeAsync{TRef}"/>, <see cref="GetByTypeAsync(Type, CancellationToken)"/> or <see cref="GetByNameAsync(string, CancellationToken)"/>.
-    /// <para>To improve performance the reference data is cached. The <see cref="ReferenceDataOrchestrator"/> enables this via an <see cref="IMemoryCache"/> implementation; default is <see cref="MemoryCache"/> where not explicitly specified.
-    /// The underlying reference data loading is executed in the context of a <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/> to limit/minimize any impact on the processing of the current request by isolating all scoped services.</para></remarks>
-    public class ReferenceDataOrchestrator
-    {
-        /// <summary>
-        /// Gets the error message where the <see cref="IReferenceData.Text"/> <see cref="Wildcard"/> value is invalid.
-        /// </summary>
-        public const string TextWildcardErrorMessage = "Text contains invalid or unsupported wildcard selection.";
+    public const string TextWildcardErrorMessage = "Text contains invalid or unsupported wildcard selection.";
 
-        private const string InvokerCacheType = "refdata.cachetype";
-        private const string InvokerCacheState = "refdata.cachestate";
-        private const string InvokerCacheCount = "refdata.cachecount";
+    private const string InvokerCacheType = "refdata.cachetype";
+    private const string InvokerCacheState = "refdata.cachestate";
+    private const string InvokerCacheCount = "refdata.cachecount";
 
-        private static readonly AsyncLocal<ReferenceDataOrchestrator?> _asyncLocal = new();
+    private static readonly AsyncLocal<ReferenceDataOrchestrator?> _asyncLocal = new();
+    private readonly ReferenceDataOrchestratorInvoker _invoker = serviceProvider?.GetService<ReferenceDataOrchestratorInvoker>() ?? new();
 
 #if NET9_0_OR_GREATER
-        private readonly System.Threading.Lock _lock = new();
+    private readonly Lock _lock = new();
 #else
-        private readonly object _lock = new();
+    private readonly object _lock = new();
 #endif
-        private readonly ConcurrentDictionary<Type, Type> _typeToProvider = new();
-        private readonly ConcurrentDictionary<string, Type> _nameToType = new(StringComparer.OrdinalIgnoreCase);
-        private readonly ConcurrentDictionary<object, SemaphoreSlim> _semaphores = new();
-        private readonly Lazy<ILogger> _logger;
-        private readonly Lazy<SettingsBase?> _settings;
-
-        /// <summary>
-        /// Gets or sets the current <see cref="ReferenceDataOrchestrator"/> for the executing thread graph (see <see cref="AsyncLocal{T}"/>)
-        /// </summary>
-        public static ReferenceDataOrchestrator Current
+    private readonly ConcurrentDictionary<Type, Type> _typeToProvider = new();
+    private readonly ConcurrentDictionary<string, Type> _nameToType = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<Type, Type> _typeToCollType = new();
+
+    /// <summary>
+    /// Tries to get the current <see cref="ReferenceDataOrchestrator"/> for the executing thread graph (see <see cref="AsyncLocal{T}"/>), or if not set, the <see cref="ExecutionContext"/> <see cref="IServiceProvider"/> service is used.
+    /// </summary>
+    /// <param name="referenceDataOrchestrator">The <see cref="Current"/> <see cref="ReferenceDataOrchestrator"/> where <see cref="HasCurrent"/>; otherwise, <see langword="null"/>.</param>
+    /// <returns><see langword="true"/> when <see cref="HasCurrent"/>; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetCurrent([NotNullWhen(true)] out ReferenceDataOrchestrator? referenceDataOrchestrator)
+    {
+        referenceDataOrchestrator = _asyncLocal.Value ??= ExecutionContext.GetService<ReferenceDataOrchestrator>();
+        return referenceDataOrchestrator is not null;
+    }
+
+    /// <summary>
+    /// Gets the current <see cref="ReferenceDataOrchestrator"/> for the executing thread graph (see <see cref="AsyncLocal{T}"/>), or if not set, the <see cref="ExecutionContext"/> <see cref="IServiceProvider"/> service is used.
+    /// </summary>
+    public static ReferenceDataOrchestrator Current => TryGetCurrent(out var rdo) ? rdo : throw new InvalidOperationException($"Unable to get an instance of the {nameof(ReferenceDataOrchestrator)} from the {nameof(ExecutionContext)}; the {nameof(ReferenceDataOrchestrator)} must be registered as a singleton service");
+
+    /// <summary>
+    /// Indicates whether the <see cref="ReferenceDataOrchestrator"/> <see cref="Current"/> has a value.
+    /// </summary>
+    public static bool HasCurrent => TryGetCurrent(out var _);
+
+    /// <summary>
+    /// Sets (or overrides) the <see cref="Current"/> instance.
+    /// </summary>
+    /// <param name="orchestrator">The <see cref="ReferenceDataOrchestrator"/>.</param>
+    public static void SetCurrent(ReferenceDataOrchestrator? orchestrator = null) => _asyncLocal.Value = orchestrator;
+
+    /// <summary>
+    /// Gets the <see cref="IServiceProvider"/>.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; } = serviceProvider.ThrowIfNull();
+
+    /// <summary>
+    /// Gets the <see cref="ILogger"/>.
+    /// </summary>
+    public ILogger Logger { get; } = logger.ThrowIfNull();
+
+    /// <summary>
+    /// Gets or sets the <see cref="ParallelOptions.MaxDegreeOfParallelism"/> to use when performing a <see cref="PrefetchAsync(IEnumerable{string}, CancellationToken)"/>.
+    /// </summary>
+    /// <remarks>Defaults to <c>2</c> to minimize potential impact</remarks>
+    public int PrefetchMaxDegreeOfParallelism { get; set; } = 2;
+
+    /// <summary>
+    /// Registers the <see cref="IReferenceDataProvider"/> <see cref="Type"/>.
+    /// </summary>
+    /// <returns>The <see cref="ReferenceDataOrchestrator"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Internally this builds the relationship between the <see cref="IReferenceDataProvider.Types"/> and the owning <see cref="IReferenceDataProvider"/> to enable cached access to the underlying 
+    /// <see cref="IReferenceDataCollection"/> using <see cref="GetByTypeAsync(Type, CancellationToken)"/> or <see cref="this[Type]"/>.</remarks>
+    public ReferenceDataOrchestrator Register() => Register<IReferenceDataProvider>();
+
+    /// <summary>
+    /// Registers an <see cref="IReferenceDataProvider"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TProvider">The <see cref="IReferenceDataProvider"/> to register.</typeparam>
+    /// <returns>The <see cref="ReferenceDataOrchestrator"/> to support fluent-style method-chaining.</returns>
+    /// <remarks>Internally this builds the relationship between the <see cref="IReferenceDataProvider.Types"/> and the owning <see cref="IReferenceDataProvider"/> to enable cached access to the underlying 
+    /// <see cref="IReferenceDataCollection"/> using <see cref="GetByTypeAsync(Type, CancellationToken)"/> or <see cref="this[Type]"/>.</remarks>
+    public ReferenceDataOrchestrator Register<TProvider>() where TProvider : IReferenceDataProvider
+    {
+        using var scope = ServiceProvider.CreateScope();
+        var provider = scope.ServiceProvider.GetRequiredService<TProvider>();
+
+        foreach (var (refType, collType) in provider.Types)
         {
-            get
+            // Lock to ensure that the two internal dictionaries (together) are updated in a thread-safe manner
+            lock (_lock)
             {
-                if (_asyncLocal.Value is not null)
-                    return _asyncLocal.Value;
+                if (_nameToType.ContainsKey(refType.Name))
+                    throw new InvalidOperationException($"Type '{refType.FullName}' cannot be added as name '{refType.Name}' already associated with previously added Type '{_nameToType.GetValueOrDefault(refType.Name)?.FullName}'.");
 
-                if (ExecutionContext.HasCurrent)
-                {
-                    try
-                    {
-                        var rdo = ExecutionContext.GetService<ReferenceDataOrchestrator>();
-                        if (rdo is not null)
-                            return rdo;
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new InvalidOperationException($"Unable to get an instance of the {nameof(ReferenceDataOrchestrator)} from the {nameof(ExecutionContext)}. It is recommended that the {nameof(ReferenceDataOrchestrator)}.{nameof(SetCurrent)} is used to set globally; this can be performed using the IApplicationBuilder.UseReferenceDataOrchestrator method during start-up where applicable.", ex);
-                    }
-                }
+                if (!_typeToProvider.TryAdd(refType, typeof(TProvider)))
+                    throw new InvalidOperationException($"Type '{refType.FullName}' cannot be added as already associated with previously added Provider '{_typeToProvider.GetValueOrDefault(refType)?.GetType().FullName}'.");
 
-                throw new InvalidOperationException($"Unable to get an instance of the {nameof(ReferenceDataOrchestrator)} from the {nameof(ExecutionContext)}. It is recommended that the {nameof(ReferenceDataOrchestrator)}.{nameof(SetCurrent)} is used to set globally; this can be performed using the IApplicationBuilder.UseReferenceDataOrchestrator method during start-up where applicable.");
+                _nameToType.TryAdd(refType.Name, refType);
+                _typeToCollType.TryAdd(refType, collType);
             }
         }
 
-        /// <summary>
-        /// Indicates whether the <see cref="ReferenceDataOrchestrator"/> <see cref="Current"/> has a value.
-        /// </summary>
-        public static bool HasCurrent => _asyncLocal != null;
-
-        /// <summary>
-        /// Sets (or overriddes) the <see cref="Current"/> instance.
-        /// </summary>
-        /// <param name="orchestrator">The <see cref="ReferenceDataOrchestrator"/>.</param>
-        public static void SetCurrent(ReferenceDataOrchestrator? orchestrator = null) => _asyncLocal.Value = orchestrator;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataOrchestrator"/> class.
-        /// </summary>
-        /// <param name="serivceProvider">The <see cref="IServiceProvider"/> needed to instantiated the registered providers, etc.</param>
-        /// <param name="cache">The <see cref="IMemoryCache"/>. Defaults to new <see cref="MemoryCache"/> instance.</param>
-        /// <param name="cacheEntryConfig">The <see cref="ICacheEntryConfig"/>. Defaults to new <see cref="SettingsBasedCacheEntry"/> instance.</param>
-        public ReferenceDataOrchestrator(IServiceProvider serivceProvider, IMemoryCache? cache = null, ICacheEntryConfig? cacheEntryConfig = null)
-        {
-            ServiceProvider = serivceProvider.ThrowIfNull(nameof(serivceProvider));
-#if NET7_0_OR_GREATER
-            Cache = cache ?? new MemoryCache(new MemoryCacheOptions { TrackStatistics = true });
-#else
-            Cache = cache ?? new MemoryCache(new MemoryCacheOptions());
-#endif
-            CacheEntryConfig = cacheEntryConfig ?? new SettingsBasedCacheEntry(ServiceProvider.GetService<SettingsBase>());
-            _logger = new Lazy<ILogger>(ServiceProvider.GetRequiredService<ILogger<ReferenceDataOrchestrator>>);
-            _settings = new Lazy<SettingsBase?>(ServiceProvider.GetService<SettingsBase>);
-        }
+        return this;
+    }
 
-        /// <summary>
-        /// Gets the <see cref="IServiceProvider"/>.
-        /// </summary>
-        public IServiceProvider ServiceProvider { get; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="IMemoryCache"/>.
-        /// </summary>
-        public IMemoryCache Cache { get; }
-
-        /// <summary>
-        /// Gets the underlying <see cref="ICacheEntryConfig"/>.
-        /// </summary>
-        public ICacheEntryConfig CacheEntryConfig { get; }
-
-        /// <summary>
-        /// Gets the <see cref="ILogger"/>.
-        /// </summary>
-        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
-        public ILogger Logger => _logger.Value;
-
-        /// <summary>
-        /// Gets the <see cref="SettingsBase"/>.
-        /// </summary>
-        [System.Diagnostics.DebuggerBrowsable(System.Diagnostics.DebuggerBrowsableState.Never)]
-        public SettingsBase Settings => _settings.Value!;
-
-#if NET6_0_OR_GREATER
-        /// <summary>
-        /// Gets or sets the <see cref="ParallelOptions.MaxDegreeOfParallelism"/> to use when performing a <see cref="PrefetchAsync(IEnumerable{string}, CancellationToken)"/>.
-        /// </summary>
-        /// <remarks>Defaults to <c>-1</c>. The <see cref="PrefetchAsync"/> uses <see cref="Parallel.ForEachAsync{TSource}(IAsyncEnumerable{TSource}, ParallelOptions, Func{TSource, CancellationToken, ValueTask})"/> and as such 
-        /// these setting will equal the equivalent of the <see cref="Environment.ProcessorCount"/>; see this <see href="https://learn.microsoft.com/en-us/dotnet/api/system.threading.tasks.paralleloptions.maxdegreeofparallelism#remarks">article</see>.</remarks>
-        public int PrefetchMaxDegreeOfParallelism { get; set; } = -1;
-#endif
+    /// <summary>
+    /// Determines whether the <see cref="ReferenceDataOrchestrator"/> contains the specified <see cref="IReferenceData"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <returns><see langword="true"/> indicates that it exists; otherwise, <see langword="false"/>.</returns>
+    public bool ContainsType<TRef>() where TRef : IReferenceData => ContainsType(typeof(TRef));
 
-        /// <summary>
-        /// Registers the <see cref="IReferenceDataProvider"/> <see cref="Type"/>.
-        /// </summary>
-        /// <returns>The <see cref="ReferenceDataOrchestrator"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Internally this builds the relationship between the <see cref="IReferenceDataProvider.Types"/> and the owning <see cref="IReferenceDataProvider"/> to enable cached access to the underlying 
-        /// <see cref="IReferenceDataCollection"/> using <see cref="GetByTypeAsync(Type, CancellationToken)"/> or <see cref="this[Type]"/>.</remarks>
-        public ReferenceDataOrchestrator Register() => Register<IReferenceDataProvider>();
-
-        /// <summary>
-        /// Registers an <see cref="IReferenceDataProvider"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TProvider">The <see cref="IReferenceDataProvider"/> to register.</typeparam>
-        /// <returns>The <see cref="ReferenceDataOrchestrator"/> to support fluent-style method-chaining.</returns>
-        /// <remarks>Internally this builds the relationship between the <see cref="IReferenceDataProvider.Types"/> and the owning <see cref="IReferenceDataProvider"/> to enable cached access to the underlying 
-        /// <see cref="IReferenceDataCollection"/> using <see cref="GetByTypeAsync(Type, CancellationToken)"/> or <see cref="this[Type]"/>.</remarks>
-        public ReferenceDataOrchestrator Register<TProvider>() where TProvider : IReferenceDataProvider
-        {
-            using var scope = ServiceProvider.CreateScope();
-            var provider = scope.ServiceProvider.GetRequiredService<TProvider>();
+    /// <summary>
+    /// Determines whether the <see cref="ReferenceDataOrchestrator"/> contains the specified <see cref="IReferenceData"/> <see cref="Type"/>.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <returns><see langword="true"/> indicates that it exists; otherwise, <see langword="false"/>.</returns>
+    public bool ContainsType(Type type) => _typeToProvider.ContainsKey(type);
 
-            foreach (var type in provider.Types.Where(x => x != null).Distinct())
-            {
-                lock (_lock)
-                {
-                    if (_nameToType.ContainsKey(type.Name))
-                        throw new InvalidOperationException($"Type '{type.FullName}' cannot be added as name '{type.Name}' already associated with previously added Type '{_nameToType.GetValueOrDefault(type.Name)?.FullName}'.");
+    /// <summary>
+    /// Determines whether the <see cref="ReferenceDataOrchestrator"/> contains the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <returns><see langword="true"/> indicates that it exists; otherwise, <see langword="false"/>.</returns>
+    public bool ContainsName(string name) => _nameToType.ContainsKey(name);
 
-                    if (!_typeToProvider.TryAdd(type, typeof(TProvider)))
-                        throw new InvalidOperationException($"Type '{type.FullName}' cannot be added as already associated with previously added Provider '{_typeToProvider.GetValueOrDefault(type)?.GetType().FullName}'.");
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> synchronously. 
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public IReferenceDataCollection? this[Type type] => GetByType(type);
 
-                    _nameToType.TryAdd(type.Name, type);
-                }
-            }
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>) synchronously. 
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public IReferenceDataCollection? this[string name] => GetByName(name);
 
-            return this;
-        }
+    /// <summary>
+    /// Gets a <see cref="Type"/> list for all the registered <see cref="IReferenceData"/> types.
+    /// </summary>
+    /// <returns>The <see cref="Type"/> list.</returns>
+    public IEnumerable<Type> GetAllTypes() => _typeToProvider.Keys;
 
-        /// <summary>
-        /// Determines whether the <see cref="ReferenceDataOrchestrator"/> contains the specified <see cref="IReferenceData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <returns><c>true</c> indicates that it exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsType<TRef>() => ContainsType(typeof(TRef));
-
-        /// <summary>
-        /// Determines whether the <see cref="ReferenceDataOrchestrator"/> contains the specified <see cref="IReferenceData"/> <see cref="Type"/>.
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns><c>true</c> indicates that it exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsType(Type type) => _typeToProvider.ContainsKey(type);
-
-        /// <summary>
-        /// Determines whether the <see cref="ReferenceDataOrchestrator"/> contains the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <returns><c>true</c> indicates that it exists; otherwise, <c>false</c>.</returns>
-        public bool ContainsName(string name) => _nameToType.ContainsKey(name);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> synchronously. 
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public IReferenceDataCollection? this[Type type] => GetByType(type);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>) synchronously. 
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public IReferenceDataCollection? this[string name] => GetByName(name);
-
-        /// <summary>
-        /// Gets a <see cref="Type"/> list for the registered <see cref="IReferenceData"/> types.
-        /// </summary>
-        /// <returns>The <see cref="Type"/> list.</returns>
-        public IEnumerable<Type> GetAllTypes() => _typeToProvider.Keys;
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public IReferenceDataCollection? GetByType<TRef>() => GetByType(typeof(TRef));
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public IReferenceDataCollection? GetByType(Type type) => Cache.TryGetValue(OnGetCacheKey(type), out IReferenceDataCollection? coll) ? coll! : Invoker.RunSync(() => GetByTypeAsync(type));
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
-        public IReferenceDataCollection GetByTypeRequired<TRef>() => GetByTypeRequired(typeof(TRef));
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
-        public IReferenceDataCollection GetByTypeRequired(Type type) => Cache.TryGetValue(OnGetCacheKey(type), out IReferenceDataCollection? coll) ? coll! : Invoker.RunSync(() => GetByTypeRequiredAsync(type));
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public Task<IReferenceDataCollection?> GetByTypeAsync<TRef>(CancellationToken cancellationToken = default) => GetByTypeAsync(typeof(TRef), cancellationToken);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public async Task<IReferenceDataCollection?> GetByTypeAsync(Type type, CancellationToken cancellationToken = default)
-        {
-            if (!_typeToProvider.TryGetValue(type.ThrowIfNull(nameof(type)), out var providerType))
-                return null;
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public IReferenceDataCollection? GetByType<TRef>() where TRef : IReferenceData => GetByType(typeof(TRef));
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public IReferenceDataCollection? GetByType(Type type)
+    {
+        // To ensure greatest flexibility of the reference data capabilities, it may (and often from class properties by-design), be called in contexts where an async execution context is not available,
+        // so we need to support a synchronous call pattern which will execute the underlying async code as it will need to get from cache or underlying repository. RunSync is also optimized to avoid
+        // unnecessary context switches where the underlying code is already completed.
+        return Invoker.RunSync(() => GetByTypeAsync(type));
+    }
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
+    public IReferenceDataCollection GetByTypeRequired<TRef>() where TRef : IReferenceData => GetByTypeRequired(typeof(TRef));
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
+    public IReferenceDataCollection GetByTypeRequired(Type type) => Invoker.RunSync(() => GetByTypeRequiredAsync(type));
+
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public Task<IReferenceDataCollection?> GetByTypeAsync<TRef>(CancellationToken cancellationToken = default) where TRef : IReferenceData => GetByTypeAsync(typeof(TRef), cancellationToken);
 
-            var coll = await OnGetOrCreateAsync(type, (t, ct) =>
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public async Task<IReferenceDataCollection?> GetByTypeAsync(Type type, CancellationToken cancellationToken = default)
+    {
+        if (!_typeToProvider.TryGetValue(type.ThrowIfNull(), out var providerType))
+            return null;
+
+        if (!ExecutionContext.HasCurrent)
+            throw new InvalidOperationException($"The {nameof(ReferenceDataOrchestrator)} requires an active {nameof(ExecutionContext)} to support underlying scoped service resolution.");
+
+        // Get the underlying scoped cache.
+        var cache = ExecutionContext.GetRequiredService<IReferenceDataCache>();
+
+        // Get the corresponding reference data collection type.
+        var collType = _typeToCollType[type];
+
+        // Get or create the reference data collection.
+        var coll = await cache.GetOrCreateAsync(collType, (collType, cancellationToken) =>  
+        {
+            return _invoker.InvokeAsync(this, async (tracer, cancellationToken) =>
             {
-                return ReferenceDataOrchestratorInvoker.Current.InvokeAsync(this, async (ia, ct) =>
+                if (tracer.Activity is not null)
                 {
-                    if (ia.Activity is not null)
-                    {
-                        ia.Activity.AddTag(InvokerCacheType, type.ToString());
-                        ia.Activity.AddTag(InvokerCacheState, "TaskRun");
-                    }
+                    tracer.Activity.AddTag(InvokerCacheType, type.ToString());
+                    tracer.Activity.AddTag(InvokerCacheState, "Task.Run");
+                }
 
+                if (Logger?.IsEnabled(LogLevel.Debug) == true)
                     Logger.LogDebug("Reference data type {RefDataType} cache load start: ServiceProvider.CreateScope and Threading.ExecutionContext.SuppressFlow to support underlying cache data get.", type.FullName);
-                    using var ec = ExecutionContext.Current.CreateCopy();
-                    var rdo = this;
 
-                    using var scope = ServiceProvider.CreateScope();
-                    Task<IReferenceDataCollection> task;
-                    using (System.Threading.ExecutionContext.SuppressFlow())
+                /* 
+                 * OK, a bit of complexity going on here. Why? As we do not know exactly when this method will be called, we need to:
+                 * a) ensure that the underlying reference data provider is executed in a completely separate execution context to the caller to ensure that any scoped services used by the provider do not 
+                 *    impact the caller's execution context and/or scoped services.
+                 * b) when called, are we are retrieving data from a repository, and the caller in a transaction scope, we do not want to flow the transaction scope to the new thread as this may cause deadlocks;
+                 *    achieved by using Threading.ExecutionContext.SuppressFlow.
+                 * c) a Task.Run is used to ensure that the provider execution occurs on a different thread to the caller, again to ensure complete execution context separation. Note that the Task.Run is executed
+                 *    within the context of the cache GetOrCreateAsync factory method, so will only be used when the cache item is not already populated.
+                 */
+
+                using var ec = ExecutionContext.Current.CreateCopy();
+                var rdo = this;
+
+                await using var scope = ServiceProvider.CreateAsyncScope();
+                Task<IReferenceDataCollection> task;
+                using (System.Threading.ExecutionContext.SuppressFlow())
+                {
+                    task = Task.Run(async () =>
                     {
-                        task = Task.Run(async () => await GetByTypeInNewScopeAsync(rdo, ec, scope, t, providerType, ia, ct).ConfigureAwait(false));
-                    }
+                        try
+                        {
+                            return await GetByTypeInNewScopeAsync(rdo, ec, scope, type, providerType, cancellationToken).ConfigureAwait(false);
+                        }
+                        catch (Exception ex) when (Logger?.IsEnabled(LogLevel.Error) == true)
+                        {
+                            Logger.LogError(ex, "Reference data type {RefDataType} cache load failed in worker task: {ex.Message}", type.FullName, ex.Message);
+                            throw; // Re-throw to propagate
+                        }
+                    });
+                }
 
-#if NET6_0_OR_GREATER
-                    return await task.WaitAsync(ct).ConfigureAwait(false);
-#else
-                    task.Wait(ct);
-                    await Task.CompletedTask.ConfigureAwait(false);
-                    return task.Result;
-#endif
-                }, cancellationToken, nameof(GetByTypeAsync));
-            }, cancellationToken).ConfigureAwait(false);
+                var coll = await task.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-            return coll ?? throw new InvalidOperationException($"The {nameof(IReferenceDataCollection)} returned for Type '{type.FullName}' from Provider '{providerType.FullName}' must not be null.");
-        }
+                if (Logger?.IsEnabled(LogLevel.Information) == true)
+                    Logger.LogInformation("Reference data type {RefDataType} cache load finish: {ItemCount} items cached.", type.ToString(), coll.Count);
 
-        /// <summary>
-        /// Performs the actual reference data load in a new thread context / scope.
-        /// </summary>
-        private async Task<IReferenceDataCollection> GetByTypeInNewScopeAsync(ReferenceDataOrchestrator rdo, ExecutionContext executionContext, IServiceScope scope, Type type, Type providerType, InvokeArgs invokeArgs, CancellationToken cancellationToken)
-        {
-            _asyncLocal.Value = rdo;
+                tracer.Activity?.AddTag(InvokerCacheCount, coll.Count);
 
-            executionContext.ServiceProvider = scope.ServiceProvider;
-            ExecutionContext.SetCurrent(executionContext);
+                return coll;
+            }, cancellationToken, nameof(GetByTypeAsync));
+        }, cancellationToken).ConfigureAwait(false);
 
-            // Start related activity as this "work" is occuring on an unrelated different thread (by design to ensure complete separation).
-            var ria = invokeArgs.StartNewRelated(invokeArgs.Invoker, rdo, nameof(GetByTypeInNewScopeAsync));
-            try
-            {
-                if (ria.Activity is not null)
-                {
-                    ria.Activity.AddTag(InvokerCacheType, type.ToString());
-                    ria.Activity.AddTag(InvokerCacheState, "TaskWorker");
-                }
+        return coll ?? throw new InvalidOperationException($"The {nameof(IReferenceDataCollection)} returned for Type '{type.FullName}' from Provider '{providerType.FullName}' must not be null.");
+    }
 
-                var sw = Stopwatch.StartNew();
-                var provider = (IReferenceDataProvider)scope.ServiceProvider.GetRequiredService(providerType);
-                var coll = (await provider.GetAsync(type, cancellationToken).ConfigureAwait(false)).Value!;
-                sw.Stop();
+    /// <summary>
+    /// Performs the actual reference data load in a new thread context / scope.
+    /// </summary>
+    private async Task<IReferenceDataCollection> GetByTypeInNewScopeAsync(ReferenceDataOrchestrator rdo, ExecutionContext executionContext, AsyncServiceScope scope, Type type, Type providerType, CancellationToken cancellationToken)
+    {
+        _asyncLocal.Value = rdo;
 
-                Logger.LogInformation("Reference data type {RefDataType} cache load finish: {ItemCount} items cached [{Elapsed}ms]", type.ToString(), coll.Count, sw.Elapsed.TotalMilliseconds);
-                ria.Activity?.AddTag(InvokerCacheCount, coll.Count);
+        executionContext.ServiceProvider = scope.ServiceProvider;
+        ExecutionContext.SetCurrent(executionContext);
 
-                return ria.TraceResult(coll);
-            }
-            catch (Exception ex)
-            {
-                ria.TraceException(ex);
-                throw;
-            }
-            finally
+        // Start related activity as this "work" is occurring on an unrelated different thread (by design to ensure complete execution separation).
+        return await _invoker.InvokeAsync(rdo, async (tracer, cancellationToken) =>
+        {
+            if (tracer.Activity is not null)
             {
-                ria.TraceComplete();
+                tracer.Activity.AddTag(InvokerCacheType, type.ToString());
+                tracer.Activity.AddTag(InvokerCacheState, "Task.Worker");
             }
-        }
 
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
-        public Task<IReferenceDataCollection> GetByTypeRequiredAsync<TRef>(CancellationToken cancellationToken = default) => GetByTypeRequiredAsync(typeof(TRef), cancellationToken);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
-        public async Task<IReferenceDataCollection> GetByTypeRequiredAsync(Type type, CancellationToken cancellationToken = default)
-            => (await GetByTypeAsync(type, cancellationToken).ConfigureAwait(false)) ?? throw new InvalidOperationException($"Reference data collection for type '{type.FullName}' does not exist.");
-
-        /// <summary>
-        /// Gets where pre-existing and not expired, or (re-)creates, the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/>. 
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="getCollAsync">The underlying function to invoke to get the <see cref="IReferenceDataCollection"/> when (re-)creating cache collection.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IReferenceDataCollection"/>.</returns>
-        /// <remarks>Invokes the <see cref="OnCreateCacheEntry(Type, ICacheEntry)"/> prior to invoking <paramref name="getCollAsync"/> on <i>create</i>. This should be overridden where the default <see cref="IMemoryCache"/> capabilities are not
-        /// sufficient. The <paramref name="getCollAsync"/> contains the logic to invoke the underlying <see cref="IReferenceDataProvider.GetAsync(Type, System.Threading.CancellationToken)"/>; this is executed in the context of a 
-        /// <see cref="ServiceProviderServiceExtensions.CreateScope(IServiceProvider)"/> to limit/minimize any impact on the processing of the current request by isolating all scoped services. Additionally, semaphore locks are used to
-        /// manage concurrency to ensure cache loading is thread-safe.</remarks>
-        private async Task<IReferenceDataCollection> OnGetOrCreateAsync(Type type, Func<Type, CancellationToken, Task<IReferenceDataCollection>> getCollAsync, CancellationToken cancellationToken = default)
-        {
-            // Try and get as most likely already in the cache; where exists then exit fast.
-            var key = OnGetCacheKey(type);
-            if (Cache.TryGetValue(key, out IReferenceDataCollection? coll))
-                return coll!;
+            var provider = (IReferenceDataProvider)scope.ServiceProvider.GetRequiredService(providerType);
+            var coll = await provider.GetAsync(type, cancellationToken).ConfigureAwait(false);
 
-            // Get or add a new semaphore for the cache key so we can manage single concurrency for that key only.
-            SemaphoreSlim semaphore = _semaphores.GetOrAdd(key, _ => new SemaphoreSlim(1, 1));
+            tracer.Activity?.AddTag(InvokerCacheCount, coll.Count);
 
-            // Use the semaphore to manage a single thread to perform the "expensive" get operation.
-            await semaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
-            try
-            {
-                // Does a get or create as it may have been added as we went to lock.
-                return (await Cache.GetOrCreateAsync(key, async entry =>
-                {
-                    OnCreateCacheEntry(type, entry);
-                    return await getCollAsync(type, cancellationToken).ConfigureAwait(false) ?? throw new InvalidOperationException("The returned collection must not be null.");
-                }).ConfigureAwait(false))!;
-            }
-            finally
-            {
-                semaphore.Release();
-            }
-        }
+            return coll;
+        }, cancellationToken).ConfigureAwait(false);
+    }
 
-        /// <summary>
-        /// Gets the cache key to be used (defaults to <paramref name="type"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <returns>The cache key.</returns>
-        /// <remarks>Leverages the <see cref="ICacheEntryConfig.GetCacheKey(Type)"/>.
-        /// <para>To support the likes of multi-tenancy caching then the resulting cache key should be overridden to include the both the <see cref="ExecutionContext.TenantId"/> and <paramref name="type"/>.</para></remarks>
-        protected virtual object OnGetCacheKey(Type type) => CacheEntryConfig.GetCacheKey(type);
-
-        /// <summary>
-        /// Provides an opportunity to the maintain the <see cref="ICacheEntry"/> data prior to the cache <i>create</i> function being invoked (as a result of <see cref="OnGetOrCreateAsync(Type, Func{Type, CancellationToken, Task{IReferenceDataCollection}}, CancellationToken)"/>).
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="entry">The <see cref="ICacheEntry"/>.</param>
-        /// <remarks>Leverages the <see cref="ICacheEntryConfig.CreateCacheEntry(Type, ICacheEntry)"/>.</remarks>
-        protected virtual void OnCreateCacheEntry(Type type, ICacheEntry entry) => CacheEntryConfig.CreateCacheEntry(type, entry);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public IReferenceDataCollection? GetByName(string name)
-            => _nameToType.TryGetValue(name.ThrowIfNull(nameof(name)), out var type) ? GetByType(type) : null;
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public IReferenceDataCollection GetByNameRequired(string name)
-             => _nameToType.TryGetValue(name.ThrowIfNull(nameof(name)), out var type) ? GetByTypeRequired(type) : throw new InvalidOperationException($"Reference data collection for name '{name}' does not exist.");
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public Task<IReferenceDataCollection?> GetByNameAsync(string name, CancellationToken cancellationToken = default) 
-            => _nameToType.TryGetValue(name.ThrowIfNull(nameof(name)), out var type) ? GetByTypeAsync(type, cancellationToken) : Task.FromResult<IReferenceDataCollection?>(null);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <c>null</c>.</returns>
-        public Task<IReferenceDataCollection> GetByNameRequiredAsync(string name, CancellationToken cancellationToken = default) 
-            => _nameToType.TryGetValue(name.ThrowIfNull(nameof(name)), out var type) ? GetByTypeRequiredAsync(type, cancellationToken) : throw new InvalidOperationException($"Reference data collection for name '{name}' does not exist.");
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceData"/> list for the specified <see cref="IReferenceData"/> <see cref="Type"/> applying the <paramref name="codes"/> and <paramref name="text"/> filter.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="System.Type"/>.</typeparam>
-        /// <param name="codes">The reference data code list.</param>
-        /// <param name="text">The reference data text (including wildcards).</param>
-        /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsActive"/> equal <c>false</c>) entries.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The filtered collection.</returns>
-        public async Task<IEnumerable<TRef>> GetWithFilterAsync<TRef>(IEnumerable<string>? codes = null, string? text = null, bool includeInactive = false, CancellationToken cancellationToken = default) where TRef : IReferenceData
-            => (await GetWithFilterAsync(typeof(TRef), codes, text, includeInactive, cancellationToken).ConfigureAwait(false)).OfType<TRef>();
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceData"/> list for the specified <see cref="IReferenceData"/> <see cref="Type"/> applying the <paramref name="codes"/> and <paramref name="text"/> filter.
-        /// </summary>
-        /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
-        /// <param name="codes">The reference data code list.</param>
-        /// <param name="text">The reference data text (including wildcards).</param>
-        /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsActive"/> equal <c>false</c>) entries.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The filtered collection.</returns>
-        public async Task<IEnumerable<IReferenceData>> GetWithFilterAsync(Type type, IEnumerable<string>? codes = null, string? text = null, bool includeInactive = false, CancellationToken cancellationToken = default)
-            => await GetWithFilterAsync(await GetByTypeAsync(type, cancellationToken).ConfigureAwait(false) ?? throw new InvalidOperationException($"Reference data collection for type '{type.FullName}' does not exist."), codes, text, includeInactive, cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Gets the <see cref="IReferenceData"/> list for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>) applying the <paramref name="codes"/> and <paramref name="text"/> filter.
-        /// </summary>
-        /// <param name="name">The reference data name.</param>
-        /// <param name="codes">The reference data code list.</param>
-        /// <param name="text">The reference data text (including wildcards).</param>
-        /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsActive"/> equal <c>false</c>) entries.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The filtered collection.</returns>
-        public async Task<IEnumerable<IReferenceData>> GetWithFilterAsync(string name, IEnumerable<string>? codes = null, string? text = null, bool includeInactive = false, CancellationToken cancellationToken = default)
-            => await GetWithFilterAsync(await GetByNameAsync(name, cancellationToken).ConfigureAwait(false) ?? throw new InvalidOperationException($"Reference data collection for name '{name}' does not exist."), codes, text, includeInactive, cancellationToken).ConfigureAwait(false);
-
-        /// <summary>
-        /// Applys the selected filter to the collection.
-        /// </summary>
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Future proofing.")]
-        private static Task<IEnumerable<IReferenceData>> GetWithFilterAsync(IReferenceDataCollection coll, IEnumerable<string>? codes = null, string? text = null, bool includeInactive = false, CancellationToken cancellationToken = default)
-        {
-            if ((codes == null || !codes.Any()) && string.IsNullOrEmpty(text) && !includeInactive)
-                return Task.FromResult(coll.ActiveItems);
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
+    public Task<IReferenceDataCollection> GetByTypeRequiredAsync<TRef>(CancellationToken cancellationToken = default) where TRef : IReferenceData
+        => GetByTypeRequiredAsync(typeof(TRef), cancellationToken);
 
-            // Validate the arguments.
-            if (text != null && !Wildcard.Default.Validate(text))
-                throw new ValidationException(TextWildcardErrorMessage);
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> <see cref="Type"/> (will throw <see cref="InvalidOperationException"/> where not found).
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, will throw an <see cref="InvalidOperationException"/>.</returns>
+    public async Task<IReferenceDataCollection> GetByTypeRequiredAsync(Type type, CancellationToken cancellationToken = default)
+        => (await GetByTypeAsync(type, cancellationToken).ConfigureAwait(false)) ?? throw new InvalidOperationException($"Reference data collection for type '{type.FullName}' does not exist.");
 
-            // Apply the filter.
-            var items = includeInactive ? coll.AllItems : coll.ActiveItems;
-            var result = items
-                .WhereWhen(x => codes!.Contains(x.Code, StringComparer.OrdinalIgnoreCase), codes != null && codes.Distinct().FirstOrDefault() != null)
-                .WhereWildcard(x => x.Text, text);
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public IReferenceDataCollection? GetByName(string name)
+        => _nameToType.TryGetValue(name.ThrowIfNull(), out var type) ? GetByType(type) : null;
 
-            return Task.FromResult(result);
-        }
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public IReferenceDataCollection GetByNameRequired(string name)
+         => _nameToType.TryGetValue(name.ThrowIfNull(), out var type) ? GetByTypeRequired(type) : throw new InvalidOperationException($"Reference data collection for name '{name}' does not exist.");
 
-        /// <summary>
-        /// Prefetches all of the named <see cref="IReferenceData"/> items. 
-        /// </summary>
-        /// <param name="names">The list of <see cref="IReferenceData"/> names.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <remarks>As the reference data is a great candidate for caching this will force a prefetch of the cache items.</remarks>
-        public Task PrefetchAsync(IEnumerable<string> names, CancellationToken cancellationToken = default)
-        {
-#if NET6_0_OR_GREATER
-            return Parallel.ForEachAsync(names, new ParallelOptions { MaxDegreeOfParallelism = PrefetchMaxDegreeOfParallelism, CancellationToken = cancellationToken },
-                async (name, ct) => await GetByNameAsync(name, ct).ConfigureAwait(false));
-#else
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public Task<IReferenceDataCollection?> GetByNameAsync(string name, CancellationToken cancellationToken = default)
+        => _nameToType.TryGetValue(name.ThrowIfNull(), out var type) ? GetByTypeAsync(type, cancellationToken) : Task.FromResult<IReferenceDataCollection?>(null);
 
-            var tasks = new List<Task>();
-            if (names != null)
-            {
-                foreach (var name in names.Distinct(StringComparer.OrdinalIgnoreCase))
-                {
-                    tasks.Add(GetByNameAsync(name, cancellationToken));
-                }
-            }
+    /// <summary>
+    /// Gets the <see cref="IReferenceDataCollection"/> for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="System.Reflection.MemberInfo.Name"/>). 
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The corresponding <see cref="IReferenceDataCollection"/> where found; otherwise, <see langword="null"/>.</returns>
+    public Task<IReferenceDataCollection> GetByNameRequiredAsync(string name, CancellationToken cancellationToken = default)
+        => _nameToType.TryGetValue(name.ThrowIfNull(), out var type) ? GetByTypeRequiredAsync(type, cancellationToken) : throw new InvalidOperationException($"Reference data collection for name '{name}' does not exist.");
 
-            return Task.WhenAll(tasks);
-#endif
-        }
+    /// <summary>
+    /// Gets the <see cref="IReferenceData"/> list for the specified <see cref="IReferenceData"/> <see cref="Type"/> applying the <paramref name="codes"/> and <paramref name="textPattern"/> filter.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="System.Type"/>.</typeparam>
+    /// <param name="codes">The reference data code list.</param>
+    /// <param name="textPattern">The reference data text (including wildcards).</param>
+    /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsInactive"/> equal <see langword="true"/>) entries.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The filtered collection.</returns>
+    public async Task<IEnumerable<TRef>> GetWithFilterAsync<TRef>(IEnumerable<string>? codes = null, string? textPattern = null, bool includeInactive = false, CancellationToken cancellationToken = default) where TRef : IReferenceData
+        => (await GetWithFilterAsync(typeof(TRef), codes, textPattern, includeInactive, cancellationToken).ConfigureAwait(false)).OfType<TRef>();
 
-        /// <summary>
-        /// Gets the reference data items for the specified <paramref name="names"/>.
-        /// </summary>
-        /// <param name="names">The reference data names.</param>
-        /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsActive"/> equal <c>false</c>) entries.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ReferenceDataMultiDictionary"/>.</returns>
-        /// <remarks>Will return an empty collection where no <paramref name="names"/> are specified.</remarks>
-        public async Task<ReferenceDataMultiDictionary> GetNamedAsync(IEnumerable<string> names, bool includeInactive = false, CancellationToken cancellationToken = default)
-        {
-            var mc = new ReferenceDataMultiDictionary();
+    /// <summary>
+    /// Gets the <see cref="IReferenceData"/> list for the specified <see cref="IReferenceData"/> <see cref="Type"/> applying the <paramref name="codes"/> and <paramref name="textPattern"/> filter.
+    /// </summary>
+    /// <param name="type">The <see cref="IReferenceData"/> <see cref="Type"/>.</param>
+    /// <param name="codes">The reference data code list.</param>
+    /// <param name="textPattern">The reference data text (including wildcards).</param>
+    /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsInactive"/> equal <see langword="true"/>) entries.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The filtered collection.</returns>
+    public async Task<IEnumerable<IReferenceData>> GetWithFilterAsync(Type type, IEnumerable<string>? codes = null, string? textPattern = null, bool includeInactive = false, CancellationToken cancellationToken = default)
+        => GetWithFilterAsync(await GetByTypeAsync(type, cancellationToken).ConfigureAwait(false) ?? throw new InvalidOperationException($"Reference data collection for type '{type.FullName}' does not exist."), codes, textPattern, includeInactive);
 
-            if (names != null)
-            {
-                await PrefetchAsync(names, cancellationToken).ConfigureAwait(false);
+    /// <summary>
+    /// Gets the <see cref="IReferenceData"/> list for the specified <see cref="IReferenceData"/> name (see <see cref="IReferenceData"/> <see cref="Type"/> <see cref="MemberInfo.Name"/>) applying the <paramref name="codes"/> and <paramref name="textPattern"/> filter.
+    /// </summary>
+    /// <param name="name">The reference data name.</param>
+    /// <param name="codes">The reference data code list.</param>
+    /// <param name="textPattern">The reference data text (including wildcards).</param>
+    /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsInactive"/> equal <see langword="true"/>) entries.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The filtered collection.</returns>
+    public async Task<IEnumerable<IReferenceData>> GetWithFilterAsync(string name, IEnumerable<string>? codes = null, string? textPattern = null, bool includeInactive = false, CancellationToken cancellationToken = default)
+        => GetWithFilterAsync(await GetByNameAsync(name, cancellationToken).ConfigureAwait(false) ?? throw new InvalidOperationException($"Reference data collection for name '{name}' does not exist."), codes, textPattern, includeInactive);
 
-                foreach (var name in names.Where(ContainsName).Distinct(StringComparer.OrdinalIgnoreCase))
-                {
-                    mc.Add(_nameToType[name].Name, await GetWithFilterAsync(name, includeInactive: includeInactive, cancellationToken: cancellationToken).ConfigureAwait(false));
-                }
-            }
+    /// <summary>
+    /// Apply the selected filter to the collection.
+    /// </summary>
+    private static IEnumerable<IReferenceData> GetWithFilterAsync(IReferenceDataCollection coll, IEnumerable<string>? codes = null, string? textPattern = null, bool includeInactive = false)
+    {
+        if ((codes is null || !codes.Any()) && string.IsNullOrEmpty(textPattern) && !includeInactive)
+            return coll.ActiveItems;
 
-            return mc;
-        }
+        // Validate the arguments.
+        if (textPattern is not null && Wildcard.Default.Parse(textPattern).HasError)
+            throw new ValidationException(TextWildcardErrorMessage);
 
-        /// <summary>
-        /// Gets the reference data items for the specified names and related codes (see <see cref="IReferenceData.Code"/>).
-        /// </summary>
-        /// <param name="namesAndCodes">The reference data names and related codes.</param>
-        /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsActive"/> equal <c>false</c>) entries.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="ReferenceDataMultiDictionary"/>.</returns>
-        /// <remarks>Will return an empty collection where no <paramref name="namesAndCodes"/> are specified.</remarks>
-        public async Task<ReferenceDataMultiDictionary> GetNamedAsync(IEnumerable<KeyValuePair<string, List<string>>> namesAndCodes, bool includeInactive = false, CancellationToken cancellationToken = default)
-        {
-            var mc = new ReferenceDataMultiDictionary();
+        // Apply the filter.
+        var items = includeInactive ? coll.AllItems : coll.ActiveItems;
+        var result = items
+            .WhereWhen(codes is not null && codes.Any(), x => codes!.Contains(x.Code, StringComparer.OrdinalIgnoreCase))
+            .WhereWildcard(x => x.Text, textPattern);
 
-            if (namesAndCodes != null)
-            {
-                await PrefetchAsync(namesAndCodes.Select(x => x.Key).AsEnumerable(), cancellationToken).ConfigureAwait(false);
+        return result;
+    }
 
-                foreach (var kvp in namesAndCodes.Where(x => ContainsName(x.Key)))
-                {
-                    mc.Add(_nameToType[kvp.Key].Name, await GetWithFilterAsync(kvp.Key, codes: kvp.Value, includeInactive: includeInactive, cancellationToken: cancellationToken).ConfigureAwait(false));
-                }
-            }
+    /// <summary>
+    /// Prefetches all of the named <see cref="IReferenceData"/> items. 
+    /// </summary>
+    /// <param name="names">The list of <see cref="IReferenceData"/> names.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The actual distinct list of names used.</returns>
+    /// <remarks>As the reference data is a great candidate for caching this will force a prefetch of the cache items.</remarks>
+    public async Task<IEnumerable<string>> PrefetchAsync(IEnumerable<string> names, CancellationToken cancellationToken = default)
+    {
+        // Get the distinct list of known names to prefetch.
+        var list = names.Where(ContainsName).Distinct(StringComparer.OrdinalIgnoreCase);
 
-            return mc;
-        }
+        // Go get 'em all!
+        await Parallel.ForEachAsync(list, new ParallelOptions { MaxDegreeOfParallelism = PrefetchMaxDegreeOfParallelism, CancellationToken = cancellationToken },
+            async (name, ct) => await GetByNameAsync(name, ct).ConfigureAwait(false)).ConfigureAwait(false);
+
+        return list;
+    }
+
+    /// <summary>
+    /// Gets the reference data items for the specified <paramref name="names"/>.
+    /// </summary>
+    /// <param name="names">The reference data names.</param>
+    /// <param name="includeInactive">Indicates whether to include inactive (<see cref="IReferenceData.IsInactive"/> equal <see langword="true"/>) entries.</param>
+    /// <param name="mapper">The mapping of names to their replacement.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="ReferenceDataMultiDictionary"/>.</returns>
+    /// <remarks>Will return an empty collection where no <paramref name="names"/> are specified.</remarks>
+    public async Task<ReferenceDataMultiDictionary> GetNamedAsync(IEnumerable<string> names, bool includeInactive = false, IDictionary<string, string>? mapper = null, CancellationToken cancellationToken = default)
+    {
+        var mc = new ReferenceDataMultiDictionary();
 
-        /// <summary>
-        /// Performs a conversion from a <see cref="IReferenceData.Code"/> to an instance of <typeparamref name="TRef"/>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
-        /// <returns>The <typeparamref name="TRef"/> instance.</returns>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        [return: NotNullIfNotNull(nameof(code))]
-        public static TRef? ConvertFromCode<TRef>(string? code) where TRef : IReferenceData, new()
+        if (names is not null)
         {
-            if (code == null)
-                return default;
+            var list = await PrefetchAsync(ReplaceNames(names, mapper), cancellationToken).ConfigureAwait(false);
 
-            if (ExecutionContext.HasCurrent)
+            foreach (var name in list)
             {
-                var rdc = Current.GetByType<TRef>();
-                if (rdc != null && rdc.TryGetByCode(code, out var rd))
-                    return (TRef)rd!;
+                mc.Add(mapper?.Where(x => x.Value == name).Select(x => x.Key).FirstOrDefault() ?? _nameToType[name].Name,
+                    await GetWithFilterAsync(name, includeInactive: includeInactive, cancellationToken: cancellationToken).ConfigureAwait(false));
             }
-
-            var rdx = new TRef { Code = code };
-            ((IReferenceData)rdx).SetInvalid();
-            return rdx;
         }
 
-        /// <summary>
-        /// Performs a conversion from an <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> to an instance of <typeparamref name="TRef"/>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TId">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> <see cref="Type"/>.</typeparam>
-        /// <param name="id">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/>.</param>
-        /// <returns>The <typeparamref name="TRef"/> instance.</returns>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        [return: NotNullIfNotNull(nameof(id))]
-        public static TRef? ConvertFromId<TRef, TId>(TId? id) where TRef : IReferenceData<TId>, new() where TId : IComparable<TId>, IEquatable<TId>
+        return mc;
+    }
+
+    /// <summary>
+    /// Replaces the specified <paramref name="names"/> based on the provided <paramref name="mapper"/>.
+    /// </summary>
+    private static IEnumerable<string> ReplaceNames(IEnumerable<string> names, IDictionary<string, string>? mapper)
+    {
+        foreach (var name in names)
         {
-            if (id == null)
-                return default;
+            if (mapper is not null && mapper.TryGetValue(name, out var mappedName))
+                yield return mappedName;
+            else
+                yield return name;
+        }
+    }
 
-            if (ExecutionContext.HasCurrent)
+    /// <summary>
+    /// Tries to get the <typeparamref name="TRef"/> <see cref="IReferenceData"/> item for the specified <paramref name="code"/>.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <param name="code">The <see cref="IReferenceData.Code"/>.</param>
+    /// <param name="item">The <typeparamref name="TRef"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked; unless where <paramref name="code"/> is
+    /// <see langword="null"/> in which case a <see langword="null"/> will also be returned.</remarks>
+    public static bool TryGetByCode<TRef>(string? code, out TRef item) where TRef : IReferenceData, new()
+    {
+        if (code is not null && HasCurrent)
+        {
+            var rdc = Current.GetByType<TRef>();
+            if (rdc is not null && rdc.TryGetByCode(code, out var rd))
             {
-                var rdc = Current.GetByType<TRef>();
-                if (rdc != null && rdc.TryGetById(id, out var rd))
-                    return (TRef)rd!;
+                item = (TRef)rd!;
+                return true;
             }
-
-            var rdx = new TRef { Id = id };
-            ((IReferenceData)rdx).SetInvalid();
-            return rdx;
         }
 
-        /// <summary>
-        /// Performs a conversion from an <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/> to an instance of <typeparamref name="TRef"/>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <param name="id">The <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/>.</param>
-        /// <returns>The <typeparamref name="TRef"/> instance.</returns>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        [return: NotNullIfNotNull(nameof(id))]
-        public static TRef? ConvertFromId<TRef>(object? id) where TRef : IReferenceData, new()
-        {
-            if (id == null)
-                return default;
+        item = new TRef { Code = code };
+        ((IReferenceData)item).SetInvalid();
+        return false;
+    }
 
-            if (ExecutionContext.HasCurrent)
+    /// <summary>
+    /// Tries to get the <typeparamref name="TRef"/> <see cref="IReferenceData"/> item for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TId">The <see cref="IReferenceData{TId}"/> <see cref="IReferenceData.Id"/> <see cref="Type"/>.</typeparam>
+    /// <param name="id">The <see cref="IReferenceData"/> <see cref="IReferenceData.Id"/>.</param>
+    /// <param name="item">The <typeparamref name="TRef"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
+    public static bool TryGetById<TRef, TId>(TId id, out TRef item) where TRef : IReferenceData<TId>, new()
+    {
+        if (id is not null && HasCurrent)
+        {
+            var rdc = Current.GetByType<TRef>();
+            if (rdc is not null && rdc.TryGetById(id, out var rd))
             {
-                var rdc = Current.GetByType<TRef>();
-                if (rdc != null && rdc.TryGetById(id, out var rd))
-                    return (TRef)rd!;
+                item = (TRef)rd!;
+                return true;
             }
-
-            var rdx = new TRef { Id = id };
-            ((IReferenceData)rdx).SetInvalid();
-            return rdx;
         }
 
-        /// <summary>
-        /// Performs a conversion from a mapping value to an instance of <typeparamref name="TRef"/>.
-        /// </summary>
-        /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
-        /// <param name="name">The mapping name.</param>
-        /// <param name="value">The mapping value.</param>
-        /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
-        public static TRef ConvertFromMapping<TRef, T>(string name, T? value) where TRef : IReferenceData, new() where T : IComparable<T?>, IEquatable<T?>
+        item = new TRef { Id = id };
+        ((IReferenceData)item).SetInvalid();
+        return false;
+    }
+
+    /// <summary>
+    /// Tries to get the <typeparamref name="TRef"/> <see cref="IReferenceData"/> item for the specified <paramref name="id"/>.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <param name="id">The <see cref="IReferenceData"/> <see cref="IReferenceData.Id"/>.</param>
+    /// <param name="item">The <typeparamref name="TRef"/> instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
+    public static bool TryGetById<TRef>(object id, out TRef item) where TRef : IReferenceData, new()
+    {
+        if (id is not null && HasCurrent)
         {
-            if (value != null && ExecutionContext.HasCurrent)
+            var rdc = Current.GetByType<TRef>();
+            if (rdc is not null && rdc.TryGetById(id, out var rd))
             {
-                var rdc = Current.GetByType<TRef>();
-                if (rdc != null && rdc.TryGetByMapping(name, value, out var rd))
-                    return (TRef)rd!;
+                item = (TRef)rd!;
+                return true;
             }
-
-            var rdx = new TRef();
-            ((IReferenceData)rdx).SetInvalid();
-            return rdx;
         }
 
-        /// <summary>
-        /// Gets all the <see cref="IReferenceData"/> types in the same namespace as <typeparamref name="TNamespace"/>.
-        /// </summary>
-        /// <typeparam name="TNamespace">The <see cref="Type"/> to infer the namespace.</typeparam>
-        /// <returns>The <see cref="Type"/> list.</returns>
-        public static IEnumerable<Type> GetAllTypesInNamespace<TNamespace>() => typeof(TNamespace).Assembly.GetTypes().Where(t => t.Namespace == typeof(TNamespace).Namespace && t.IsClass && !t.IsAbstract && typeof(IReferenceData).IsAssignableFrom(t));
+        item = new TRef { Id = id };
+        ((IReferenceData)item).SetInvalid();
+        return false;
+    }
+
+
+    /// <summary>
+    /// Performs a conversion from a mapping value to an instance of <typeparamref name="TRef"/>.
+    /// </summary>
+    /// <typeparam name="TRef">The <see cref="IReferenceData"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The mapping value <see cref="Type"/>.</typeparam>
+    /// <param name="name">The mapping name.</param>
+    /// <param name="value">The mapping value.</param>
+    /// <remarks>Where the item (<see cref="IReferenceData"/>) is not found it will be created and <see cref="IReferenceData.SetInvalid"/> will be invoked.</remarks>
+    public static TRef ConvertFromMapping<TRef, T>(string name, T? value) where TRef : IReferenceData, new() where T : IComparable<T?>, IEquatable<T?>
+    {
+        if (value is not null && HasCurrent)
+        {
+            var rdc = Current.GetByType<TRef>();
+            if (rdc is not null && rdc.TryGetByMapping(name, value, out var rd))
+                return (TRef)rd!;
+        }
 
+        var rdx = new TRef();
+        ((IReferenceData)rdx).SetInvalid();
+        return rdx;
     }
+
+    /// <summary>
+    /// Gets all the <see cref="IReferenceData"/> types in the same namespace as <typeparamref name="TNamespace"/>.
+    /// </summary>
+    /// <typeparam name="TNamespace">The <see cref="Type"/> to infer the namespace.</typeparam>
+    /// <returns>The <see cref="Type"/> list.</returns>
+    public static IEnumerable<Type> GetAllTypesInNamespace<TNamespace>()
+        => typeof(TNamespace).Assembly.GetTypes().Where(t => t.Namespace == typeof(TNamespace).Namespace && t.IsClass && !t.IsAbstract && typeof(IReferenceData).IsAssignableFrom(t));
 }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataOrchestratorInvoker.cs b/src/CoreEx/RefData/ReferenceDataOrchestratorInvoker.cs
index c15ee57d..d5f0ff00 100644
--- a/src/CoreEx/RefData/ReferenceDataOrchestratorInvoker.cs
+++ b/src/CoreEx/RefData/ReferenceDataOrchestratorInvoker.cs
@@ -1,19 +1,7 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.RefData;
 
-using CoreEx.Invokers;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides the invocation wrapping for the <see cref="ReferenceDataOrchestrator"/> instances.
-    /// </summary>
-    public class ReferenceDataOrchestratorInvoker : InvokerBase<ReferenceDataOrchestrator>
-    {
-        private static ReferenceDataOrchestratorInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static ReferenceDataOrchestratorInvoker Current => CoreEx.ExecutionContext.GetService<ReferenceDataOrchestratorInvoker>() ?? (_default ??= new ReferenceDataOrchestratorInvoker());
-    }
-}
\ No newline at end of file
+/// <summary>
+/// Provides the <see cref="ReferenceDataOrchestrator"/> invoker.
+/// </summary>
+[InvokerName("CoreEx.RefData.ReferenceDataOrchestrator")]
+public sealed class ReferenceDataOrchestratorInvoker : InvokerBase<ReferenceDataOrchestrator> { }
\ No newline at end of file
diff --git a/src/CoreEx/RefData/ReferenceDataSortOrder.cs b/src/CoreEx/RefData/ReferenceDataSortOrder.cs
deleted file mode 100644
index 2bc31d91..00000000
--- a/src/CoreEx/RefData/ReferenceDataSortOrder.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-
-namespace CoreEx.RefData
-{
-    /// <summary>
-    /// Provides the sort order for the reference data.
-    /// </summary>
-    public enum ReferenceDataSortOrder
-    {
-        /// <summary>
-        /// Ordered by <see cref="IReferenceData.SortOrder"/>, then <see cref="IReferenceData.Text"/>, and finally <see cref="IReferenceData.Code"/> (default).
-        /// </summary>
-        SortOrder,
-
-        /// <summary>
-        /// Ordered by <see cref="IReferenceData"/> <see cref="IIdentifier.Id"/>.
-        /// </summary>
-        Id,
-
-        /// <summary>
-        /// Ordered by <see cref="IReferenceData.Code"/>.
-        /// </summary>
-        Code,
-
-        /// <summary>
-        /// Ordered by <see cref="IReferenceData.Text"/> and then <see cref="IReferenceData.Code"/>.
-        /// </summary>
-        Text
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Abstractions/IResult.cs b/src/CoreEx/Results/Abstractions/IResult.cs
new file mode 100644
index 00000000..c7b74db9
--- /dev/null
+++ b/src/CoreEx/Results/Abstractions/IResult.cs
@@ -0,0 +1,42 @@
+namespace CoreEx.Results.Abstractions;
+
+/// <summary>
+/// Enables the use of a <c>Result</c> type to represent the outcome of an operation.
+/// </summary>
+public interface IResult
+{
+    /// <summary>
+    /// Gets the underlying value where <see cref="IsSuccess"/>.
+    /// </summary>
+    object? Value { get; }
+
+    /// <summary>
+    /// Gets the underlying error represented as an <see cref="Exception"/>.
+    /// </summary>
+    Exception Error { get; }
+
+    /// <summary>
+    /// Indicates whether the result is in a successful state.
+    /// </summary>
+    bool IsSuccess { get; }
+
+    /// <summary>
+    /// Indicates whether the result is in a failure state.
+    /// </summary>
+    /// <remarks>Where <see langword="true"/> then the <see cref="Error"/> will contain a corresponding <see cref="Exception"/>.</remarks>
+    bool IsFailure { get; }
+
+    /// <summary>
+    /// Creates an equivalent <see cref="IResult"/> that is considered <see cref="IsFailure"/>.
+    /// </summary>
+    /// <param name="error">The underlying error represented as an <see cref="Exception"/>.</param>
+    /// <returns>The resulting <see cref="IResult"/>.</returns>
+    IResult ToFailure(Exception error);
+
+    /// <summary>
+    /// Indicates whether the result is in a failure state and the underlying error is of the specified <typeparamref name="TException"/> <see cref="Type"/>.
+    /// </summary>
+    /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
+    /// <returns><see langword="true"/> indicates that the result is in a failure state <i>and</i> the underlying error is of the specified <typeparamref name="TException"/> <see cref="Type"/>.</returns>
+    bool IsFailureOfType<TException>() where TException : Exception;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Abstractions/IResultT.cs b/src/CoreEx/Results/Abstractions/IResultT.cs
new file mode 100644
index 00000000..b6b319de
--- /dev/null
+++ b/src/CoreEx/Results/Abstractions/IResultT.cs
@@ -0,0 +1,14 @@
+namespace CoreEx.Results.Abstractions;
+
+/// <summary>
+/// Enables the use of a <c>Result</c> type with a <see cref="Value"/> to represent the success outcome of an operation.
+/// </summary>
+/// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
+public interface IResult<T> : IResult
+{
+    /// <summary>
+    /// Gets the underlying value where <see cref="IResult.IsSuccess"/>.
+    /// </summary>
+    /// <remarks>Where <see cref="IResult.IsFailure"/> then the corresponding <see cref="IResult.Error"/> will be thrown.</remarks>
+    new T Value { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Abstractions/IToResult.cs b/src/CoreEx/Results/Abstractions/IToResult.cs
new file mode 100644
index 00000000..de82f2d4
--- /dev/null
+++ b/src/CoreEx/Results/Abstractions/IToResult.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Results.Abstractions;
+
+/// <summary>
+/// Enables the creation of a <see cref="Result"/> representing the current state.
+/// </summary>
+public interface IToResult
+{
+    /// <summary>
+    /// Creates a <see cref="Result"/> representing the current state.
+    /// </summary>
+    Result ToResult();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Abstractions/IToResultT.cs b/src/CoreEx/Results/Abstractions/IToResultT.cs
new file mode 100644
index 00000000..a8b2d194
--- /dev/null
+++ b/src/CoreEx/Results/Abstractions/IToResultT.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Results.Abstractions;
+
+/// <summary>
+/// Enables the creation of a <see cref="Result{T}"/> representing the current state.
+/// </summary>
+public interface IToResult<T> : IToResult
+{
+    /// <inheritdoc/>
+    Result IToResult.ToResult() => ToResult().AsResult();
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> representing the current state.
+    /// </summary>
+    new Result<T> ToResult();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/AnyExtensions.cs b/src/CoreEx/Results/AnyExtensions.cs
deleted file mode 100644
index 26ac200e..00000000
--- a/src/CoreEx/Results/AnyExtensions.cs
+++ /dev/null
@@ -1,1076 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
-{
-    public static partial class ResultsExtensions
-    {
-        #region Synchronous
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Any(this Result result, Action action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            action();
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Any(this Result result, Func<Result> func)
-        {
-            ThrowIfNull(result, func);
-            return func();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Any<T>(this Result<T> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            action(result.Value);
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Any<T>(this Result<T> result, Func<T, T> func)
-        {
-            ThrowIfNull(result, func);
-            return Result<T>.Ok(func(result.Value));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Any<T>(this Result<T> result, Func<T, Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> AnyAs<T>(this Result result, Func<T> func)
-        {
-            ThrowIfNull(result, func);
-            return Result<T>.Ok(func());
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> AnyAs<T>(this Result result, Func<Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return func();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result AnyAs<T>(this Result<T> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            action(result.Value);
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result AnyAs<T>(this Result<T> result, Func<T, Result> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> AnyAs<T, U>(this Result<T> result, Func<T, U> func)
-        {
-            ThrowIfNull(result, func);
-            return Result<U>.Ok(func(result.Value));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> AnyAs<T, U>(this Result<T> result, Func<T, Result<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Any(this Result result, Func<IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return func().ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> Any<T>(this Result<T> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value).ToResult<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> Any<T>(this Result<T> result, Func<T, IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result AnyAs<T>(this Result<T> result, Func<T, IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> AnyAs<T>(this Result result, Func<ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return func().ToResult<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> AnyAs<T>(this Result result, Func<IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return func().ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> AnyAs<T, U>(this Result<T> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value).ToResult<U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> AnyAs<T, U>(this Result<T> result, Func<T, IToResult<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return func(result.Value).ToResult();
-        }
-
-        #endregion
-
-        #region AsyncResult
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Any(this Task<Result> result, Action action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.Any(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Any(this Task<Result> result, Func<Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Any(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.Any(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Func<T, T> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Any(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Func<T, Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Any(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAs<T>(this Task<Result> result, Func<T> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAs<T>(this Task<Result> result, Func<Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAs<T>(this Task<Result<T>> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAs<T>(this Task<Result<T>> result, Func<T, Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> AnyAs<T, U>(this Task<Result<T>> result, Func<T, U> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs<T, U>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> AnyAs<T, U>(this Task<Result<T>> result, Func<T, Result<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs<T, U>(func);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Any(this Task<Result> result, Func<IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Any(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Any(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Func<T, IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Any(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAs<T>(this Task<Result<T>> result, Func<T, IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAs<T>(this Task<Result> result, Func<ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs<T>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAs<T>(this Task<Result> result, Func<IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> AnyAs<T, U>(this Task<Result<T>> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs<T, U>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> AnyAs<T, U>(this Task<Result<T>> result, Func<T, IToResult<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.AnyAs<T, U>(func);
-        }
-
-        #endregion
-
-        #region AsyncFunc
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsync(this Result result, Func<Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsSuccess)
-                await func().ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsync(this Result result, Func<Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return await func().ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsSuccess)
-                await func(result.Value).ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T, Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return Result<T>.Ok(await func(result.Value).ConfigureAwait(false));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T, Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return await func(result.Value).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Result result, Func<Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return Result<T>.Ok(await func().ConfigureAwait(false));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Result result, Func<Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return await func().ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsAsync<T>(this Result<T> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsSuccess)
-                await func(result.Value).ConfigureAwait(false);
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsAsync<T>(this Result<T> result, Func<T, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return await func(result.Value).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Result<T> result, Func<T, Task<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return Result<U>.Ok(await func(result.Value).ConfigureAwait(false));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Result<T> result, Func<T, Task<Result<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            return await func(result.Value).ConfigureAwait(false);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsync(this Result result, Func<Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func().ConfigureAwait(false)).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func(result.Value).ConfigureAwait(false)).ToResult<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T, Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func(result.Value).ConfigureAwait(false)).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsAsync<T>(this Result<T> result, Func<T, Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func(result.Value).ConfigureAwait(false)).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Result result, Func<Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func().ConfigureAwait(false)).ToResult<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Result result, Func<Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func().ConfigureAwait(false)).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Result<T> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func(result.Value).ConfigureAwait(false)).ToResult<U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Result<T> result, Func<T, Task<IToResult<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            return (await func(result.Value).ConfigureAwait(false)).ToResult();
-        }
-
-        #endregion
-
-        #region AsyncBoth
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsync(this Task<Result> result, Func<Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsync(this Task<Result> result, Func<Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T, Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T, Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Task<Result> result, Func<Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> AnyAsAsync<T>(this Task<Result<T>> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> AnyAsAsync<T>(this Task<Result<T>> result, Func<T, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<Result<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsync(this Task<Result> result, Func<Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T, Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> AnyAsAsync<T>(this Task<Result<T>> result, Func<T, Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Task<Result> result, Func<Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync<T>(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> AnyAsAsync<T>(this Task<Result> result, Func<Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync<T, U>(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> AnyAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<IToResult<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.AnyAsAsync<T, U>(func).ConfigureAwait(false);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/CoreExtensions.cs b/src/CoreEx/Results/CoreExtensions.cs
deleted file mode 100644
index 86333e1c..00000000
--- a/src/CoreEx/Results/CoreExtensions.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Diagnostics;
-
-namespace CoreEx.Results
-{
-    /// <summary>
-    /// Provides the <see cref="Result"/> and <see cref="Result{T}"/> core extension methods.
-    /// </summary>
-    [DebuggerStepThrough]
-    public static class CoreExtensions
-    {
-        /// <summary>
-        /// Unwraps the <paramref name="result"/> and where <see cref="Result{T}.IsSuccess"/> invokes the <paramref name="func"/> and returns the resulting <see cref="Result{T}"/>; 
-        /// otherwise, where <see cref="Result{T}.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result{T}.Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The binding (mapping) function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> Bind<T, U>(this Result<T> result, Func<T, Result<U>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-            return result.IsSuccess ? func(result.Value) : new Result<U>(result.Error!);
-        }
-
-        /// <summary>
-        /// Binds/converts the <paramref name="result"/> to a corresponding <see cref="Result{T}"/> defaulting to <see cref="Result{T}.None"/> where <see cref="Result.IsSuccess"/> losing the <see cref="Result{T}.Value"/>;
-        /// otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> Bind<T, U>(this Result<T> result) => result.IsSuccess ? (result.Value is U uv ? new Result<U>(uv) : Result<U>.None) : new Result<U>(result.Error!);
-
-        /// <summary>
-        /// Unwraps the <paramref name="result"/> and where <see cref="Result{T}.IsSuccess"/> invokes the <paramref name="func"/> and returns the resulting <see cref="Result{T}"/>; 
-        /// otherwise, where <see cref="Result{T}.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result{T}.Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The binding (mapping) function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Bind<T>(this Result result, Func<Result<T>> func)
-        {
-            func.ThrowIfNull(nameof(func));
-            return result.IsSuccess ? func() : new Result<T>(result.Error!);
-        }
-
-        /// <summary>
-        /// Binds/converts the <paramref name="result"/> to a corresponding <see cref="Result{T}"/> defaulting to <see cref="Result{T}.None"/> where <see cref="Result.IsSuccess"/>;
-        /// otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Bind<T>(this Result result) => result.IsSuccess ? Result<T>.None : new Result<T>(result.Error!);
-
-        /// <summary>
-        /// Binds/converts the <paramref name="result"/> to a corresponding <see cref="Result"/> losing the <see cref="Result{T}.Value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Bind<T>(this Result<T> result) => result.IsSuccess ? Result.Success : new Result(result.Error);
-
-        /// <summary>
-        /// Maps a <paramref name="value"/> into a <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to map.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Map<T>(T value) => new(value);
-
-        /// <summary>
-        /// Combines the <paramref name="result"/> and <paramref name="other"/> into a single <see cref="Result"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="other">The other <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where either or both are failures, a failure state will be returned with the corresponding <see cref="Result{T}.Error"/>; where both contains errors these will be aggregated into an <see cref="AggregateException"/>.</remarks>
-        public static Result Combine(this Result result, Result other)
-        {
-            if (result.IsFailure && other.IsFailure)
-                return new Result(new AggregateException(result.Error, other.Error));
-
-            return result.IsFailure ? result : other;
-        }
-
-        /// <summary>
-        /// Combines the <paramref name="result"/> and <paramref name="other"/> into a single <see cref="Result{T}"/>; on success the <paramref name="other"/> will be returned.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="other">The other <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where either or both are failures, a failure state will be returned with the corresponding <see cref="Result{T}.Error"/>; where both contains errors these will be aggregated into an <see cref="AggregateException"/>.</remarks>
-        public static Result<T> Combine<T>(this Result result, Result<T> other)
-        {
-            if (result.IsFailure && other.IsFailure)
-                return new Result<T>(new AggregateException(result.Error, other.Error));
-
-            if (result.IsFailure)
-                return new Result<T>(result.Error!);
-
-            return other;
-        }
-
-        /// <summary>
-        /// Combines the <paramref name="result"/> and <paramref name="other"/> into a single <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The other and resulting <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="other">The other <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where either or both are failures, a failure state will be returned with the corresponding <see cref="Result{T}.Error"/>; where both contains errors these will be aggregated into an <see cref="AggregateException"/>.
-        /// <para>Where both are successful and, <typeparamref name="T"/> and <typeparamref name="U"/> are the same <see cref="Type"/>, the <paramref name="result"/> <see cref="Result{T}.Value"/> is used as the returned value (i.e <paramref name="other"/> is ignored).</para></remarks>
-        public static Result<U> Combine<T, U>(this Result<T> result, Result<U> other) 
-        {
-            if (result.IsFailure && other.IsFailure)
-                return new Result<U>(new AggregateException(result.Error, other.Error));
-
-            if (result.IsFailure)
-                return new Result<U>(result.Error!);
-
-            if (other.IsFailure)
-                return other;
-
-            return result.Value is U uv ? uv : other;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/IResult.cs b/src/CoreEx/Results/IResult.cs
deleted file mode 100644
index 20c40b36..00000000
--- a/src/CoreEx/Results/IResult.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Results
-{
-    /// <summary>
-    /// Enables the use of a <c>Result</c> type to represent the outcome of an operation.
-    /// </summary>
-    public interface IResult
-    {
-        /// <summary>
-        /// Gets the underlying value where <see cref="IsSuccess"/>.
-        /// </summary>
-        object? Value { get; }
-
-        /// <summary>
-        /// Gets the underlying error represented as an <see cref="Exception"/>.
-        /// </summary>
-        Exception Error { get; }
-
-        /// <summary>
-        /// Indicates whether the result is in a successful state.
-        /// </summary>
-        bool IsSuccess { get; }
-
-        /// <summary>
-        /// Indicates whether the result is in a failure state.
-        /// </summary>
-        /// <remarks>Where <c>true</c> then the <see cref="Error"/> will contain a corresponding <see cref="Exception"/>.</remarks>
-        bool IsFailure { get; }
-
-        /// <summary>
-        /// Creates an equivalent <see cref="IResult"/> that is considered <see cref="IsFailure"/>.
-        /// </summary>
-        /// <param name="error">The underlying error represented as an <see cref="Exception"/>.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        IResult ToFailure(Exception error);
-
-        /// <summary>
-        /// Indicates whether the result is in a failure state and the underlying error is of the specified <typeparamref name="TException"/> <see cref="Type"/>.
-        /// </summary>
-        /// <typeparam name="TException">The <see cref="Exception"/> <see cref="Type"/>.</typeparam>
-        /// <returns><c>true</c> indicates that the result is in a failure state <i>and</i> the underlying error is of the specified <typeparamref name="TException"/> <see cref="Type"/>.</returns>
-        bool IsFailureOfType<TException>() where TException : Exception;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/IResultT.cs b/src/CoreEx/Results/IResultT.cs
deleted file mode 100644
index 6d32946f..00000000
--- a/src/CoreEx/Results/IResultT.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-
-namespace CoreEx.Results
-{
-    /// <summary>
-    /// Enables the use of a <c>Result</c> type with a <see cref="Value"/> to represent the outcome of an operation.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
-    public interface IResult<out T> : IResult
-    {
-        /// <summary>
-        /// Gets the underlying value where <see cref="IResult.IsSuccess"/>.
-        /// </summary>
-        new T Value { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/IToResult.cs b/src/CoreEx/Results/IToResult.cs
deleted file mode 100644
index 036a6f13..00000000
--- a/src/CoreEx/Results/IToResult.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Results
-{
-    /// <summary>
-    /// Enables the <see cref="ToResult"/> to convert into a corresponding <see cref="Result"/>.
-    /// </summary>
-    public interface IToResult
-    {
-        /// <summary>
-        /// Converts into a corresponding <see cref="Result"/>.
-        /// </summary>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        Result ToResult();
-    }
-}
diff --git a/src/CoreEx/Results/IToResultT.cs b/src/CoreEx/Results/IToResultT.cs
deleted file mode 100644
index 60f251e7..00000000
--- a/src/CoreEx/Results/IToResultT.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Results
-{
-    /// <summary>
-    /// Enables the <see cref="ToResult"/> to convert into a corresponding <see cref="Result{T}"/>.
-    /// </summary>
-    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="System.Type"/>.</typeparam>
-    public interface IToResult<T>
-    {
-        /// <summary>
-        /// Converts into a corresponding <see cref="Result{T}"/>.
-        /// </summary>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        Result<T> ToResult();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ITypedToResult.cs b/src/CoreEx/Results/ITypedToResult.cs
deleted file mode 100644
index ad68ba59..00000000
--- a/src/CoreEx/Results/ITypedToResult.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-namespace CoreEx.Results
-{
-    /// <summary>
-    /// Enables the <see cref="ToResult"/> to convert into a corresponding <see cref="Result{T}"/>.
-    /// </summary>
-    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-    public interface ITypedToResult : IToResult
-    {
-        /// <summary>
-        /// Converts into a corresponding <see cref="Result{T}"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="System.Type"/>.</typeparam>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        Result<T> ToResult<T>();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/MatchExtensions.cs b/src/CoreEx/Results/MatchExtensions.cs
deleted file mode 100644
index b70df482..00000000
--- a/src/CoreEx/Results/MatchExtensions.cs
+++ /dev/null
@@ -1,438 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
-{
-    public static partial class ResultsExtensions
-    {
-        #region Synchronous
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Match(this Result result, Action ok, Action<Exception> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.Match(() =>
-            {
-                ok();
-                return result;
-            }, e =>
-            {
-                fail(e);
-                return result;
-            });
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Match(this Result result, Func<Result> ok, Func<Exception, Result> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok() : fail(result.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> MatchAs<T>(this Result result, Func<Result<T>> ok, Func<Exception, Result<T>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok() : fail(result.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Match<T>(this Result<T> result, Action<T> ok, Action<Exception> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.Match(v =>
-            {
-                ok(v);
-                return result;
-            }, e =>
-            {
-                fail(e);
-                return result;
-            });
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Match<T>(this Result<T> result, Func<T, Result<T>> ok, Func<Exception, Result<T>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok(result.Value) : fail(result.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> MatchAs<T, U>(this Result<T> result, Func<T, Result<U>> ok, Func<Exception, Result<U>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok(result.Value) : fail(result.Error);
-        }
-
-        #endregion
-
-        #region AsyncResult
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Match(this Task<Result> result, Action ok, Action<Exception> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.Match(() =>
-            {
-                ok();
-                return r;
-            }, e =>
-            {
-                fail(e);
-                return r;
-            });
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Match(this Task<Result> result, Func<Result> ok, Func<Exception, Result> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? ok() : fail(r.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> MatchAs<T>(this Task<Result> result, Func<Result<T>> ok, Func<Exception, Result<T>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? ok() : fail(r.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> Match<T>(this Task<Result<T>> result, Action<T> ok, Action<Exception> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.Match(v =>
-            {
-                ok(v);
-                return r;
-            }, e =>
-            {
-                fail(e);
-                return r;
-            });
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> Match<T>(this Task<Result<T>> result, Func<T, Result<T>> ok, Func<Exception, Result<T>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? ok(r.Value) : fail(r.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> MatchAs<T, U>(this Task<Result<T>> result, Func<T, Result<U>> ok, Func<Exception, Result<U>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? ok(r.Value) : fail(r.Error);
-        }
-
-        #endregion
-
-        #region AsyncFunc
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> MatchAsync(this Result result, Func<Task> ok, Func<Exception, Task> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return await result.MatchAsync(async () =>
-            {
-                await ok().ConfigureAwait(false);
-                return result;
-            }, async e =>
-            {
-                await fail(e).ConfigureAwait(false);
-                return result;
-            }).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result> MatchAsync(this Result result, Func<Task<Result>> ok, Func<Exception, Task<Result>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok() : fail(result.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Task<Result<T>> MatchAsAsync<T>(this Result result, Func<Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok() : fail(result.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<T>> MatchAsync<T>(this Result<T> result, Func<T, Task> ok, Func<Exception, Task> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.MatchAsync(async v =>
-            {
-                await ok(v).ConfigureAwait(false);
-                return result;
-            }, async e =>
-            {
-                await fail(e).ConfigureAwait(false);
-                return result;
-            });
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<T>> MatchAsync<T>(this Result<T> result, Func<T, Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok(result.Value) : fail(result.Error);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<U>> MatchAsAsync<T, U>(this Result<T> result, Func<T, Task<Result<U>>> ok, Func<Exception, Task<Result<U>>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            return result.IsSuccess ? ok(result.Value) : fail(result.Error);
-        }
-
-        #endregion
-
-        #region AsyncBoth
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> MatchAsync(this Task<Result> result, Func<Task> ok, Func<Exception, Task> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            if (r.IsSuccess)
-                await ok().ConfigureAwait(false);
-            else
-                await fail(r.Error).ConfigureAwait(false);
-
-            return r;
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> MatchAsync(this Task<Result> result, Func<Task<Result>> ok, Func<Exception, Task<Result>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? await ok().ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> MatchAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? await ok().ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> MatchAsync<T>(this Task<Result<T>> result, Func<T, Task> ok, Func<Exception, Task> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            if (r.IsSuccess)
-                await ok(r.Value).ConfigureAwait(false);
-            else
-                await fail(r.Error).ConfigureAwait(false);
-
-            return r;
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> MatchAsAsync<T>(this Task<Result<T>> result, Func<T, Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? await ok(r.Value).ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="ok">The success function.</param>
-        /// <param name="fail">The failure function.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> MatchAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<Result<U>>> ok, Func<Exception, Task<Result<U>>> fail)
-        {
-            MatchThrowIfNull(result, ok, fail);
-            var r = await result.ConfigureAwait(false);
-            return r.IsSuccess ? await ok(r.Value).ConfigureAwait(false): await fail(r.Error).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Check parameters and throw where null.
-        /// </summary>
-        private static void MatchThrowIfNull(object result, object ok, object fail)
-        {
-            result.ThrowIfNull(nameof(result));
-            ok.ThrowIfNull(nameof(ok));
-            fail.ThrowIfNull(nameof(fail));
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/OnFailureExtensions.cs b/src/CoreEx/Results/OnFailureExtensions.cs
deleted file mode 100644
index 3d5ca7e9..00000000
--- a/src/CoreEx/Results/OnFailureExtensions.cs
+++ /dev/null
@@ -1,1082 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
-{
-    public static partial class ResultsExtensions
-    {
-        #region Synchronous
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result OnFailure(this Result result, Action<Exception> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            if (result.IsFailure)
-                action(result.Error);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result OnFailure(this Result result, Func<Result> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> OnFailure<T>(this Result<T> result, Action<Exception> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            if (result.IsFailure)
-                action(result.Error);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> OnFailure<T>(this Result<T> result, Func<Exception, T> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? Result<T>.Ok(func(result.Error)) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> OnFailure<T>(this Result<T> result, Func<Exception, Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> OnFailureAs<T>(this Result result, Func<T> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? Result<T>.Ok(func()) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> OnFailureAs<T>(this Result result, Func<Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result OnFailureAs<T>(this Result<T> result, Action<Exception> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            if (result.IsFailure)
-                action(result.Error);
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result OnFailureAs<T>(this Result<T> result, Func<Exception, Result> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error) : result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> OnFailureAs<T, U>(this Result<T> result, Func<Exception, U> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? Result<U>.Ok(func(result.Error)) : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> OnFailureAs<T, U>(this Result<T> result, Func<Exception, Result<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error) : result.Bind<T, U>();
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result OnFailure(this Result result, Func<IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func().ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> OnFailure<T>(this Result<T> result, Func<Exception, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error).ToResult<T>() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> OnFailure<T>(this Result<T> result, Func<Exception, IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error).ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result OnFailureAs<T>(this Result<T> result, Func<Exception, IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error).ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> OnFailureAs<T>(this Result result, Func<ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func().ToResult<T>() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> OnFailureAs<T>(this Result result, Func<IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func().ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> OnFailureAs<T, U>(this Result<T> result, Func<Exception, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error).ToResult<U>() : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> OnFailureAs<T, U>(this Result<T> result, Func<Exception, IToResult<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? func(result.Error).ToResult() : result.Bind<T, U>();
-        }
-
-        #endregion
-
-        #region AsyncResult
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailure(this Task<Result> result, Action<Exception> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailure(this Task<Result> result, Func<Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Action<Exception> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure<T>(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Func<Exception, T> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Func<Exception, Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAs<T>(this Task<Result> result, Func<T> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAs<T>(this Task<Result> result, Func<Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAs<T>(this Task<Result<T>> result, Action<Exception> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAs<T>(this Task<Result<T>> result, Func<Exception, Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> OnFailureAs<T, U>(this Task<Result<T>> result, Func<Exception, U> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs<T, U>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> OnFailureAs<T, U>(this Task<Result<T>> result, Func<Exception, Result<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs<T, U>(func);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailure(this Task<Result> result, Func<IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Func<Exception, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Func<Exception, IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailure(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAs<T>(this Task<Result<T>> result, Func<Exception, IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAs<T>(this Task<Result> result, Func<ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs<T>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAs<T>(this Task<Result> result, Func<IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> OnFailureAs<T, U>(this Task<Result<T>> result, Func<Exception, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs<T, U>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> OnFailureAs<T, U>(this Task<Result<T>> result, Func<Exception, IToResult<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.OnFailureAs<T, U>(func);
-        }
-
-        #endregion
-
-        #region AsyncFunc
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsync(this Result result, Func<Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsFailure)
-                await func().ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsync(this Result result, Func<Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? await func().ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Exception, Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsFailure)
-                await func(result.Error).ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Exception, Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? Result<T>.Ok(await func(result.Error).ConfigureAwait(false)) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Exception, Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? await func(result.Error).ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Result result, Func<Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? Result<T>.Ok(await func().ConfigureAwait(false)) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Result result, Func<Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? await func().ConfigureAwait(false) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsAsync<T>(this Result<T> result, Func<Exception, Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsFailure)
-                await func(result.Error).ConfigureAwait(false);
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsAsync<T>(this Result<T> result, Func<Exception, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? await func(result.Error).ConfigureAwait(false) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Result<T> result, Func<Exception, Task<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? Result<U>.Ok(await func(result.Error).ConfigureAwait(false)) : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Result<T> result, Func<Exception, Task<Result<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? await func(result.Error).ConfigureAwait(false) : result.Bind<T, U>();
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsync(this Result result, Func<Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func().ConfigureAwait(false)).ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Exception, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func(result.Error).ConfigureAwait(false)).ToResult<T>() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Exception, Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func(result.Error).ConfigureAwait(false)).ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsAsync<T>(this Result<T> result, Func<Exception, Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func(result.Error).ConfigureAwait(false)).ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Result result, Func<Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func().ConfigureAwait(false)).ToResult<T>() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Result result, Func<Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func().ConfigureAwait(false)).ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Result<T> result, Func<Exception, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func(result.Error).ConfigureAwait(false)).ToResult<U>() : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Result<T> result, Func<Exception, Task<IToResult<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsFailure ? (await func(result.Error).ConfigureAwait(false)).ToResult() : result.Bind<T, U>();
-        }
-
-        #endregion
-
-        #region AsyncBoth
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsync(this Task<Result> result, Func<Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsync(this Task<Result> result, Func<Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Exception, Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Exception, Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Exception, Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Task<Result> result, Func<Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> OnFailureAsAsync<T>(this Task<Result<T>> result, Func<Exception, Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> OnFailureAsAsync<T>(this Task<Result<T>> result, Func<Exception, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Task<Result<T>> result, Func<Exception, Task<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Task<Result<T>> result, Func<Exception, Task<Result<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsync(this Task<Result> result, Func<Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Exception, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Exception, Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> OnFailureAsAsync<T>(this Task<Result<T>> result, Func<Exception, Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Task<Result> result, Func<Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync<T>(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> OnFailureAsAsync<T>(this Task<Result> result, Func<Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Task<Result<T>> result, Func<Exception, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync<T, U>(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Task<Result<T>> result, Func<Exception, Task<IToResult<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.OnFailureAsAsync<T, U>(func).ConfigureAwait(false);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/README.md b/src/CoreEx/Results/README.md
index f8908199..a0092b4e 100644
--- a/src/CoreEx/Results/README.md
+++ b/src/CoreEx/Results/README.md
@@ -1,258 +1,46 @@
 # CoreEx.Results
 
-The `CoreEx.Result` namespace enables [monadic](https://en.wikipedia.org/wiki/Monad_(functional_programming)) error-handling, often referred to as [Railway-oriented programming](https://swlaschin.gitbooks.io/fsharpforfunandprofit/content/posts/recipe-part2.html), as illustrated below (from referenced article) - this is a **must** read for context and understanding of the benefits of this approach.
+> Provides `Result` and `Result<T>` — readonly value types that represent either a successful outcome or a typed error, enabling railway-oriented programming patterns for explicit, exception-free error propagation.
 
-![Railway-oriented](../../../images/Railway_Transparent.png)
+## Overview
 
-<br/>
+`CoreEx.Results` implements the [Railway Oriented Programming](https://fsharpforfunandprofit.com/posts/recipe-part2/) pattern, drawing on [monad-based error handling](https://en.wikipedia.org/wiki/Monad_(functional_programming)) to represent the outcome of an operation as a first-class value rather than relying on thrown exceptions.
 
-## Motivation
+The core principle is a clear distinction between *expected* errors and *unexpected* errors. Exceptions remain the right tool for truly unexpected conditions — the sort that should not occur in a correctly functioning system. For *known* business outcomes (e.g. "not found", "validation failed", "concurrency conflict"), propagating a `Result` is more explicit, carries no stack-trace overhead, and produces cleaner, more predictable code paths.
 
-To provide a means to enable Railway-oriented programming within _CoreEx_, in a rich and consistent manner. The capabilities are for the most part completely optional and can be used as needed. Although C# is not a functional language, it does support a number of functional concepts (i.e. LINQ), and adding this capability to _CoreEx_ is keeping within the spirit of this.
+`Result` (no value) and `Result<T>` (with value) are both `readonly struct` types, making them allocation-free on the success path. A rich set of extension methods covers the full railway pipeline: `Then`, `When`, `OnFailure`, `Match`, `Any`, and `Bind` — all with synchronous and `async` overloads.
 
-<br/>
+## Key capabilities
 
-### Cost of exceptions
+- 🚂 **Railway-oriented pipeline**: Chain operations with `Then`, `When`, and `Bind` — each step executes only when the previous step succeeded; the first failure short-circuits the remainder of the chain.
+- 🔀 **Conditional branching**: `When` applies a condition predicate before executing a step; `Match` provides explicit success/failure branches for terminal handling.
+- ⛔ **Failure-path handling**: `OnFailure` executes only when the result is in a failure state, enabling error recovery or transformation without breaking the chain.
+- 🔄 **Unconditional steps**: `Any` executes regardless of result state — useful for side-effects such as logging that must always run.
+- 🔗 **Bind and type transformation**: `Bind` unwraps a `Result<T>` and maps it to a `Result<U>` via a delegate, enabling typed pipeline composition across different value types.
+- ▶️ **Chain entry point**: `Result.Go(...)` provides a clean, readable starting point for a new pipeline from a value, action, or function.
+- ⚡ **Async-first**: Every pipeline extension has both synchronous and `Task<Result>`/`Task<Result<T>>` overloads, including `async`/`await` variants, so pipelines compose naturally with `async` service code.
+- 🪶 **Zero-allocation success path**: Both `Result` and `Result<T>` are `readonly struct` types; the success case carries no heap allocation.
 
-There are some logic and performance benefits for leveraging, especially where managing errors, as this can avoid the traditional throwing of exceptions; and instead, provides a means to manage and return errors in a more functional manner.
+## Key types
 
-There are a number of [articles](https://csharpplayersguide.com/blog/2022/03/12/exception-performance/) on the internet that provide concrete examples of the performance challenges that can come with the usage of exceptions, these clearly demonstrate the potential impact.
+| Type | Description |
+|------|-------------|
+| **[`Result`](./Result.cs)** | Readonly struct representing a successful outcome or a typed error with no return value. Includes `IsSuccess`, `IsFailure`, `Error`, `ThrowOnError()`, and implicit conversion from `Exception`. |
+| **[`Result<T>`](./ResultT.cs)** | Readonly struct representing a successful outcome with a `Value`, or a typed error. Includes all `Result` members plus a strongly-typed `Value` property. |
+| **[`ResultsExtensions`](./ResultsExtensions.cs)** | Static partial class providing the full set of pipeline extension methods (`Then`, `When`, `OnFailure`, `Match`, `Any`, `Bind`) for both `Result` and `Result<T>`, synchronously and asynchronously. |
+| [`IResult`](./Abstractions/IResult.cs) | Core interface defining `IsSuccess`, `IsFailure`, `Error`, `Value`, and `ToFailure` — the minimum contract for result types. |
+| [`IResult<T>`](./Abstractions/IResultT.cs) | Generic extension of `IResult` adding a strongly-typed `Value` property. |
+| [`IToResult`](./Abstractions/IToResult.cs) | Interface for types that can project themselves to a `Result`. |
+| [`IToResult<T>`](./Abstractions/IToResultT.cs) | Interface for types that can project themselves to a `Result<T>`. |
 
-This is not to say that exceptions are bad and should be avoided, they absolutely serve a purpose and should continue to be leveraged in those truly _exceptional_ cases. Microsoft provides [guidance](https://learn.microsoft.com/en-us/dotnet/standard/design-guidelines/exceptions-and-performance) around this specifically; also review their [best practices](https://learn.microsoft.com/en-us/dotnet/standard/exceptions/best-practices-for-exceptions) for exceptions.
+## Related Namespaces
 
-<br/>
+- **[`CoreEx`](../README.md)** - Defines the semantic exception types (`ValidationException`, `NotFoundException`, etc.) that are used as the `Error` payload within a failed `Result`.
+- **[`CoreEx.AspNetCore`](../../CoreEx.AspNetCore/README.md)** - `WebApi` helpers consume `Result` and `Result<T>` directly, translating failure errors to the appropriate HTTP response.
+- **[`CoreEx.Validation`](../../CoreEx.Validation/README.md)** - Validators return `Result` and `Result<T>` to compose naturally within a service pipeline.
 
-### Exception vs error
+## Additional Resources
 
-However, in some instances where returning a business functional error that is intended to be handled by the consumer then an exception, although convenient, is possibly not the best approach.
-
-For example, where exposing an API that supports the updating of an entity, and the entity data is not valid, then more typically some sort of validation exception would be thrown by the business logic, then re-caught by the API logic, and finally transformed in a corresponding HTTP 400 error. This validation error is intended and expected behaviour, i.e. it is _not_ exceptional, and therefore treating it as an explicit _error_ is the most appropriate course of action.
-
-However, in this example, where persisting the entity to a database, and the database is unavailable, then this is an unexpected _exceptional_ case, and throwing a corresponding exception as a result is appropriate.
-
-Finally, an exception contains additional context, such as the stack trace to assist with the likes of troubleshooting, which is generally not required for an explicit (expected) business error.
-
-<br/>
-
-## Results
-
-_CoreEx_ enables using the following two types, which can be used to represent either a successful result or an error result.
-
-Class | Description
--|-
-[`Result`](./Result.cs) | Represents the outcome of an operation with _no_ value. It is intended to be a replacement for `void`-based methods, where the `void` is replaced with a `Result` that can be used to represent the outcome of the operation. The static `Result.Success` property represents the successful `Result` instance.
-[`Result<T>`](./ResultT.cs) | Represents the outcome of an operation _with_ a `Value` (of type `T`). It is intended to be a used where a method previously returns a value. The static `Result<T>.None` property represents the successful `Result<T>` instance with its [default](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/operators/default) value.
-
-The results each additionally contain the following key properties as per [`IResult`](./IResult.cs).
-
-Property | Description
--|-
-`IsSuccess` | Indicates whether the result is in a successful state.
-`IsFailure` | Indicates whether the result is in a failure state.
-`Error` | The failure error, represented as an `Exception`. The .NET [`Exception`](https://learn.microsoft.com/en-us/dotnet/api/system.exception) is used for the error type as it already provides a rich set of capabilities, can easily be thrown where applicable, has support for the likes of an [`AggregateException`](https://learn.microsoft.com/en-us/dotnet/api/system.aggregateexception) for combining, and is well understood by developers; i.e. it was determined that there is limited benefit in creating an alternate error type.
-
-<br/>
-
-### Success
-
-By default, each of the results has a default property to represent success, `Result.Success` and `Result<T>.None` (default value). 
-
-Additionally, the `Result<T>.Ok(T value)` method enables the creation of a successful result with the specified value. The `Result<T>` also supports [implicit](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/operators/user-defined-conversion-operators) conversion from `T` to `Result<T>` and vice-versa.
-
-<br/>
-
-### Failures
-
-The following primary failure methods are provided.
-
-Method | Description
--|-
-`Fail()` | Creates a failure result with the specified error message (internally creates a [`BusinessException`](../BusinessException.cs)), or alternatively can be passed an `Exception` directly.
-`ThrowOnError()` | Throws the `Error` if the result is a failure; otherwise, does nothing.
-
-The `Result` and `Result<T>` also support [implicit](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/operators/user-defined-conversion-operators) conversion from an `Exception`.
-
-The following secondary failure methods are provided that enable the creation of a failure result with a specific _CoreEx_ error type. These [exceptions](../README.md#exceptions) are used extensively within _CoreEx_ to both represent specific error types, and to enable related functionality as a result of the exception typically being thrown.
-
-Method | Description
--|-
-`AuthenticationError()` | Creates a failure result with the [`AuthenticationException`](../AuthenticationException.cs).
-`AuthorizationError()` | Creates a failure result with the [`AuthorizationException`](../AuthorizationException.cs).
-`ConcurrencyError()` | Creates a failure result with the [`ConcurrencyException`](../ConcurrencyException.cs).
-`ConflictError()` | Creates a failure result with the [`ConflictException`](../ConflictException.cs).
-`DataConsistencyError` | Creates a failure result with the [`DataConsistencyException`](../DataConsistencyException.cs).
-`DuplicateError()` | Creates a failure result with the [`DuplicateException`](../DuplicateException.cs).
-`NotFoundError()` | Creates a failure result with the [`NotFoundException`](../NotFoundException.cs).
-`TransientError()` | Creates a failure result with the [`TransientException`](../TransientException.cs).
-`ValidationError()` | Creates a failure result with the [`ValidationException`](../ValidationException.cs).
-
-All of the above methods support the passing of the error message, which leverages [`LText`](../Localization/LText.cs) to enable the localization of the error message.
-
-<br/>
-
-### Binding (converting)
-
-It is a common requirement where leveraging results that the result type needs to be converted to another type, either from/to a `Result` and `Result<T>`, or between different `Result<T>` types. The [`Result.Bind`](./CoreExtensions.cs) extension methods and its various overloads enable. 
-
-Where converting from a `Result<T>` to a `Result` the `Value` will be lost, and where converting from a `Result` to a `Result<T>` the `Result<T>.None` value is used. 
-
-Additionally, there is implicit conversion support from `Result` to `Result<T>` as there is no data loss; and explict conversion (casting) support from `Result<T>` to `Result` given the data loss (this is intended to minimize unintentional data loss).
-
-Finally, as a general rule the binding will be performed automatically by the framework (i.e. is used primarily internally).
-
-<br/>
-
-### Combining
-
-The [`Result.Combine`](./CoreExtensions.cs) extension methods and its various overloads enable combining two results into a single result. Where combining and there are multiple failures, then these will be combined into a single `Error` leveraging an underlying [`AggregateException`](https://learn.microsoft.com/en-us/dotnet/api/system.aggregateexception).
-
-<br/>
-
-## Composition
-
-To leverage the results beyond the basics of a response mechanism, the composition of multiple steps brings the real power of railway-oriented programming. This is implemented within .NET leveraging a fluent-style method-chaining approach.
-
-The following extension methods are provided to enable the composition of results; these are success and failure aware, as well as supporting binding (conversion) between different result types.
-
-Method | Description
--|-
-[`Go()`](./ResultGo.cs), `GoAsync()`, `GoFrom()`, `GoFromAsync()` | Begins (starts) a new result chain.
-[`Then()`](./ThenExtensions.cs), `ThenAsync()`, `ThenAs()`, `ThenAsAsync()`, `ThenFrom()`, `ThenFromAsync()`, `ThenFromAs()`, `ThenFromAsAsync()` | Executes the specified function if the result is a success; otherwise, does nothing.
-[`When()`](./WhenExtensions.cs), `WhenAsync`, `WhenAs()`, `WhenAsAsync()`, `WhenFrom()`, `WhenFromAsync()`, `WhenFromAs()`, `WhenFromAsAsync()` | Where the result is a success executes the specified function or optional otherwise function depending on corresponding condition evaluation (same as if/then/else); otherwise, does nothing.
-[`OnFailure()`](./OnFailureExtensions.cs), `OnFailureAsync()`, `OnFailureAs()`, `OnFailureAsAsync()`  | Executes the specified function if the result is a failure; otherwise, does nothing.
-[`Match()`](./MatchExtensions.cs), `MatchAsync()`, `MatchAs()`, `MatchAsAsync()` | Executes (matches) the _ok_ function when the result is a success; otherwise, invokes the corresponding _fail_ function.
-[`Any()`](./AnyExtensions.cs), `AnyAsync()`, `AnyAs()`, `AnyAsAsync()` | Executes the specified function regardless of the result state.
-[`AsResult()`](./ResultsExtensions.cs), `AsResultAsync()` | Converts (binds) the `Result<T>` to a `Result` (i.e. loses the `Value`); or a `Result<T>` to a `Result<U>`.
-
-By convention the methods above that are named with the following have the described characteristics.
-
-Convention | Description
--|-
-`As` | Supports _explicit_ [as-based](#as-based-conversion) conversion between types to minimize unintentional data loss and/or unexpected side-effects.
-`Async` | Supports asynchronous execution (versus synchronous). Note that all internal asynchronous executions are invoked with a [`ConfigureAwait(false)`](https://devblogs.microsoft.com/dotnet/configureawait-faq/#what-does-configureawaitfalse-do).
-`From` | Supports [`IToResult`](./IToResult.cs), [`IToResult<T>`](./IToResultT.cs) and [`ITypedToResult`](./ITypedToResult.cs) result conversion.
-
-<br/>
-
-### As-based conversion
-
-A key design decision was made that there _must_ be an _explicit_ conversion between types to minimize unintentional data loss and/or unexpected side-effects. Therefore the `As`-based convention was introduced to consistently support the requisite explicit conversion.
-
-<br/>
-
-### ToResult
-
-The [`IToResult`](./IToResult.cs), [`IToResult<T>`](./IToResultT.cs) and [`ITypedToResult`](./ITypedToResult.cs) interfaces enable the conversion of a type to a result. These have been added to the following types.
-
-Namespace | Type(s)
--|-
-[`CoreEx.Http`](../Http) | [`HttpResult`](../Http/HttpResult.cs) implements `IToResult`. <br/> [`HttpResult<T>`](../Http/HttpResultT.cs) implements `IToResult<T>`.
-[`CoreEx.Validation`](../Validation) | [`IValidationResult`](../Validation/IValidationResult.cs) implements `ITypedToResult`.
-
-<br/>
-
-### Simple example
-
-The following [`DatabaseQuery`](../../CoreEx.Database/Extended/DatabaseQuery.cs) code demonstrates usage; with the key takeaway being that each step in the chain is only executed if the previous step was a success.
-
-``` csharp
-private async Task<Result<TResult>> SelectWrapperWithResultAsync<TResult>(Func<DatabaseCommand, CancellationToken, Task<Result<TResult>>> func, CancellationToken cancellationToken)
-{
-    var rvp = Paging != null && Paging.IsGetCount ? Parameters.AddReturnValueParameter() : null;
-    var cmd = Command.Params(Parameters).PagingParams(Paging);
-
-    return await Result.GoAsync(func(cmd, cancellationToken))
-                       .When(_ => rvp != null && rvp.Value != null, _ => { Paging!.TotalCount = (long)rvp!.Value; })
-                       .Then(res => QueryArgs.CleanUpResult ? Cleaner.Clean(res) : res);
-}
-```
-
-<br/>
-
-### Complex example
-
-The following [`CosmosDbValueContainer`](../../CoreEx.Cosmos/CosmosDbValueContainer.cs) code demonstrates usage; with the key takeaway being steps can contain complex logic, the type can be explicitly converted by the use of the `ThenAsAsyc()`, and errors can be returned where applicable as evidenced by the usage of the `Result.ConcurrencyError()`.
-
-``` csharp
-return await Result
-    .Go(CheckAuthorized(resp))
-    .When(() => v is IETag etag2 && etag2.ETag != null && ETagGenerator.FormatETag(etag2.ETag) != resp.ETag, () => Result.ConcurrencyError())
-    .Then(() =>
-    {
-        ro.SessionToken = resp.Headers?.Session;
-        ChangeLog.PrepareUpdated(v);
-        CosmosDb.Mapper.Map(v, resp.Resource, OperationTypes.Update);
-        Cleaner.ResetTenantId(resp.Resource);
-
-        // Re-check auth to make sure not updating to something not allowed.
-        return CheckAuthorized(resp);
-    })
-    .ThenAsAsync(async () =>
-    {
-        resp = await Container.ReplaceItemAsync(resp.Resource, key, pk, ro, ct).ConfigureAwait(false);
-        return GetResponseValue(resp)!;
-    });
-```
-
-<br/>
-
-### Validation example
-
-The following [code](https://github.com/Avanade/Beef/blob/master/samples/MyEf.Hr/MyEf.Hr.Business/Generated/EmployeeManager.cs) demonstrates usage of the `Required`, `Requires` and `ValidateAsync` validation-oriented extension methods.
-
-``` csharp
-return Result.Go(value).Required().Requires(id).Then(v => v.Id = id)
-             .ValidateAsync(v => v.Entity().With<EmployeeValidator>(), cancellationToken: ct)
-             .ThenAsAsync(v => _dataService.UpdateAsync(value));
-```
-
-<br>
-
-### ToResult example
-
-The following [code](https://github.com/Avanade/Beef/blob/master/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/OktaHttpClient.cs) demonstrates the usage of the [`IToResult<T>`](./IToResult<T>.cs) interface enabled by the `HttpResult<T>`; with the key takeaway being that the `Result.GoFrom()` method is used.
-
-``` csharp
-public async Task<Result<OktaUser>> GetUserAsync(Guid id, string email) 
-    => Result.GoFrom(await GetAsync<List<OktaUser>>($"/api/v1/users?search=profile.email eq \"{email}\"").ConfigureAwait(false))
-        .ThenAs(coll => coll.Count switch 
-        {
-            0 => Result.NotFoundError($"Employee {id} with email {email} not found within OKTA."),
-            1 => Result.Ok(coll[0]),
-            _ => Result.NotFoundError($"Employee {id} with email {email} has multiple entries within OKTA.")
-        });
-```
-
-<br/>
-
-### Additional
-
-The following additional composition extensions methods are available:
-
-Method | Description
--|-
-`ValidateAsync` | Validates the `Result<T>.Value` using either the specified [`IValidator<T>`](../Validation/IValidatorT.cs) or [`IPropertyRule<ValidationValue<TEntity?>, TEntity?>`](../../CoreEx.Validation/IPropertyRuleT2.cs) resulting in either success or failure (`Result<T>.ValidationError`). Include `CoreEx.Validation` namespace to enable.
-`ValidatesAsync` | Validates the specified _value_ using either the specified [`IValidator<T>`](../Validation/IValidatorT.cs) or [`IPropertyRule<ValidationValue<TEntity?>, TEntity?>`](../../CoreEx.Validation/IPropertyRuleT2.cs) resulting in either success or failure (`Result<T>.ValidationError`). Include `CoreEx.Validation` namespace to enable.
-`Required` | Validates that the `Result<T>.Value` is non-default (i.e. is required) resulting in either success or failure (`Result<T>.ValidationError`). Include `CoreEx.Validation` namespace to enable.
-`Requires` | Validates that the specified _value_ is non-default (i.e. is required) resulting in either success or failure (`Result<T>.ValidationError`). Include `CoreEx.Validation` namespace to enable.
-`ThrowIfNull` | Throws a [`NullReferenceException`](https://docs.microsoft.com/en-us/dotnet/api/system.nullreferenceexception) if the `Result<T>.Value` is `null`. 
-`CacheGetOrAddAsync` | Gets the [`IRequestCache`](../Caching/IRequestCache.cs) cached value associated with the specified key where it exists; otherwise, adds and returns the value created by the corresponding add factory function. Include `CoreEx.Caching` namespace to enable.
-`UserIsAuthorized` | Performs the equivalent `ExecutionContext.Current.UserIsAuthorized` resulting in either success or failure.
-`UserIsInRole` | Performs the equivalent `ExecutionContext.Current.UserIsInRole` resulting in either success or failure.
-
-<br/>
-
-## WithResult
-
-Within _CoreEx_ `Result` and `Result<T>` support has been enabled; these are methods generally suffixed by `WithResult` or `WithResultAsync` by convention. These co-exist with the existing exception throwing methods. 
-
-This allows these methods to be conveniently invoked without the need to explicitly catch the related exceptions as the `IResult.Error` will have been set accordingly. Note that only exceptions that correspond to the _CoreEx_ [secondary failures](#Failures) will be caught and converted; otherwise, the _exceptional_ exceptions will continue to be thrown. These would then need to be explicitly caught and handled where applicable.
-
-The `*WithResult` or `*WithResultAsync` methods have been added to the following types:
-
-Namespace | Type(s)
--|-
-[`CoreEx.Cosmos`](../../CoreEx.Cosmos) | [`CosmosDbContainerBase`](../../CoreEx.Cosmos/CosmosDbContainerBase.cs), [`CosmosDbContainer`](../../CoreEx.Cosmos/CosmosDbContainer.cs), [`CosmosDbValueContainer`](../../CoreEx.Cosmos/CosmosDbValueContainer.cs), [`CosmosDbQueryBase`](../../CoreEx.Cosmos/CosmosDbQueryBase.cs), [`CosmosDbQuery`](../../CoreEx.Cosmos/CosmosDbQuery.cs) and [`CosmosDbValueQuery`](../../CoreEx.Cosmos/CosmosDbValueQuery.cs).
-[`CoreEx.Database`](../../CoreEx.Database) | [`DatabaseCommand`](../../CoreEx.Database/DatabaseCommand.cs), [`DatabaseQuery`](../../CoreEx.Database/Extended/DatabaseQuery.cs), [`RefDataLoadeder`](../../CoreEx.Database/Extended/RefDataLoader.cs) and [`DatabaseExtendedExtensions`](../../CoreEx.Database/Extended/DatabaseExtendedExtensions.cs).
-[`CoreEx.EntityFrameworkCore`](../../CoreEx.EntityFrameworkCore) | [`IEfDb`](../../CoreEx.EntityFrameworkCore/IEfDb.cs), [`EfDb`](../../CoreEx.EntityFrameworkCore/EfDb.cs) and [`EfDbEntity`](../../CoreEx.EntityFrameworkCore/EfDbEntity.cs).
-[`CoreEx.WebApis`](../WebApis) | [`WebApiBase`](../WebApis/WebApiBase.cs), [`WebApi`](../WebApis/WebApi.cs) and [`WebApiPublisher`](../WebApis/WebApiPublisher.cs).
+- [Railway Oriented Programming — Scott Wlaschin](https://fsharpforfunandprofit.com/posts/recipe-part2/) - The foundational article describing the pattern that `CoreEx.Results` implements.
+- [Monad (functional programming) — Wikipedia](https://en.wikipedia.org/wiki/Monad_(functional_programming)) - Background on the monad pattern underlying `Result` types.
+- [Error management — Microsoft F# guide](https://learn.microsoft.com/en-us/dotnet/fsharp/style-guide/conventions#error-management) - Microsoft's guidance on when to use result types versus exceptions.
\ No newline at end of file
diff --git a/src/CoreEx/Results/Result.Error.cs b/src/CoreEx/Results/Result.Error.cs
new file mode 100644
index 00000000..d1037726
--- /dev/null
+++ b/src/CoreEx/Results/Result.Error.cs
@@ -0,0 +1,93 @@
+namespace CoreEx.Results;
+
+public readonly partial struct Result
+{
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthenticationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result AuthenticationError(LText? message = default, Action<AuthenticationException>? configure = null) => (new AuthenticationException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthorizationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result AuthorizationError(LText? message = default, Action<AuthorizationException>? configure = null) => (new AuthorizationException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="BusinessException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result BusinessError(LText? message = default, Action<BusinessException>? configure = null) => (new BusinessException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConcurrencyException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result ConcurrencyError(LText? message = default, Action<ConcurrencyException>? configure = null) => (new ConcurrencyException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConflictException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    /// <remarks>An example would be where the identifier provided for a Create operation already exists.</remarks>
+    public static Result ConflictError(LText? message = default, Action<ConflictException>? configure = null) => (new ConflictException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="DuplicateException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result DuplicateError(LText? message = default, Action<DuplicateException>? configure = null) => (new DuplicateException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="NotFoundException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result NotFoundError(LText? message = default, Action<NotFoundException>? configure = null) => (new NotFoundException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="TransientException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result TransientError(LText? message = default, Action<TransientException>? configure = null) => (new TransientException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result ValidationError(LText? message = default, Action<ValidationException>? configure = null) => (new ValidationException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="messages">The <see cref="MessageItem"/> list.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result ValidationError(IEnumerable<MessageItem>? messages, Action<ValidationException>? configure = null) => (messages is null ? new ValidationException() : new ValidationException(messages)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="MessageItem"/>.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>       
+    public static Result ValidationError(MessageItem message, Action<ValidationException>? configure = null) => (new ValidationException(message)).Adjust(configure);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Result.Go.cs b/src/CoreEx/Results/Result.Go.cs
new file mode 100644
index 00000000..4d9a7587
--- /dev/null
+++ b/src/CoreEx/Results/Result.Go.cs
@@ -0,0 +1,114 @@
+namespace CoreEx.Results;
+
+partial struct Result
+{
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain.
+    /// </summary>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Go() => Success;
+
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain by executing the <paramref name="action"/>.
+    /// </summary>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Go(Action action) => Success.Then(action);
+
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Go(Func<Result> func) => Success.Then(func);
+
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
+    /// </summary>
+    /// <param name="result">The starting <see cref="Result"/>.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Go(Result result) => result;
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Go<T>(Func<T> func) => Result<T>.Success.Then(_ => func());
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Go<T>(Func<Result<T>> func) => Result<T>.Success.Then(_ => func());
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Go<T>() => Result<T>.Success;
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain with the specified <paramref name="value"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The starting value.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Go<T>(T value) => Result<T>.Ok(value);
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain by starting with the <paramref name="result"/>.
+    /// </summary>
+    /// <param name="result">The starting <see cref="Result{T}"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Go<T>(Result<T> result) => result;
+
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> GoAsync(Func<Task> func) => await Success.ThenAsync(func).ConfigureAwait(false);
+
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> GoAsync(Func<Task<Result>> func) => await Success.ThenAsync(func).ConfigureAwait(false);
+
+    /// <summary>
+    /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
+    /// </summary>
+    /// <param name="result">The starting <see cref="Result"/>.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> GoAsync(Task<Result> result) => await result.ConfigureAwait(false);
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> GoAsync<T>(Func<Task<Result<T>>> func) => await Result<T>.Success.ThenAsync(async _ => await func().ConfigureAwait(false)).ConfigureAwait(false);
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> GoAsync<T>(Func<Task<T>> func) => await Result<T>.Success.ThenAsync(async _ => await func().ConfigureAwait(false)).ConfigureAwait(false);
+
+    /// <summary>
+    /// Begins a new <see cref="Result{T}"/> chain by starting with the <paramref name="result"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The starting <see cref="Result{T}"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> GoAsync<T>(Task<Result<T>> result) => await result.ConfigureAwait(false);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Result.Static.cs b/src/CoreEx/Results/Result.Static.cs
new file mode 100644
index 00000000..bcbef85c
--- /dev/null
+++ b/src/CoreEx/Results/Result.Static.cs
@@ -0,0 +1,59 @@
+namespace CoreEx.Results;
+
+public readonly partial struct Result
+{
+    /// <summary>
+    /// Gets the <see cref="IsSuccess"/> <see cref="Result"/>.
+    /// </summary>
+    public static Result Success { get; } = new();
+
+    /// <summary>
+    /// Gets the <see cref="IsSuccess"/> <see cref="Result"/> <see cref="Task"/>.
+    /// </summary>
+    public static Task<Result> SuccessTask => Task.FromResult(Success);
+
+    /// <summary>
+    /// Gets the <see cref="Result{T}"/> with a <see cref="Result{T}.Value"/> of <see langword="false"/>.
+    /// </summary>
+    public static Result<bool> False { get; } = new Result<bool>(false);
+
+    /// <summary>
+    /// Gets the <see cref="Result{T}"/> with a <see cref="Result{T}.Value"/> of <see langword="true"/>.
+    /// </summary>
+    public static Result<bool> True { get; } = new Result<bool>(true);
+
+    /// <summary>
+    /// Executes the specified <paramref name="action"/> and returns <see cref="Success"/>.
+    /// </summary>
+    /// <param name="action">The action to execute.</param>
+    /// <returns>The <see cref="Success"/> <see cref="Result"/>.</returns>
+    /// <remarks>This is a helper method to simplify code where an <paramref name="action"/> should be invoked followed immediately by returning a corresponding <see cref="Success"/> to complete/conclude.</remarks>
+    public static Result Done(Action action)
+    {
+        action.ThrowIfNull()();
+        return Success;
+    }
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with a <see cref="Result{T}.Value"/> that is considered <see cref="Result{T}.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value.</param>
+    /// <returns>The <see cref="Result{T}"/> that is <see cref="Result{T}.IsSuccess"/>.</returns>
+    public static Result<T> Ok<T>(T value) => Result<T>.Ok(value);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>).
+    /// </summary>
+    /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result Fail(Exception error) => new(error);
+
+    /// <summary>
+    /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result Fail(LText? message = null, Action<ValidationException>? configure = null) => new((new ValidationException(message)).Adjust(configure));
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/Result.cs b/src/CoreEx/Results/Result.cs
index c8727110..f779d673 100644
--- a/src/CoreEx/Results/Result.cs
+++ b/src/CoreEx/Results/Result.cs
@@ -1,261 +1,128 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Localization;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
+namespace CoreEx.Results;
+
+/// <summary>
+/// Represents the outcome of an operation with no value.
+/// </summary>
+/// <remarks>There are logic and performance benefits for leveraging a <see cref="Result"/>, especially where explicitly managing <i>known/expected</i> errors, as this can avoid the overhead of throwing exceptions. 
+/// This instead, provides a means to manage and return errors in a more functional manner (see <see href="https://en.wikipedia.org/wiki/Monad_(functional_programming)">monad</see>-based error handling and 
+/// <see href="https://fsharpforfunandprofit.com/posts/recipe-part2/">Railway Oriented Programming</see> for more information). 
+/// <para>This is not to say that exceptions are not valid and should be avoided, they absolutely serve a purpose and should continue to be leveraged where the outcome of an operation is unexpected.
+/// See the <see href="https://learn.microsoft.com/en-us/dotnet/fsharp/style-guide/conventions#error-management">error management</see> guidance provided by Microsoft.</para>
+/// <para>However, in some instances where returning a business functional error that is intended to be handled by the consumer then an <see cref="Exception"/>, although convenient, is possibly not the best approach.
+/// Finally, an exception contains additional context, such as the stack trace to assist with the likes of troubleshooting, which is generally not required for an explicit (expected) business error.</para>
+/// <para>See also <see cref="Result{T}"/>.</para></remarks>
+[DebuggerStepThrough]
+[DebuggerDisplay("{ToDebuggerString()}")]
+public readonly partial struct Result : IResult, IEquatable<Result>
 {
+    private readonly Exception? _error = default;
+
     /// <summary>
-    /// Represents the outcome of an operation with no value.
+    /// Initializes a new instance of the <see cref="Result"/> that is considered <see cref="IsSuccess"/>.
     /// </summary>
-    [DebuggerStepThrough]
-    [DebuggerDisplay("{ToDebuggerString()}")]
-    public readonly partial struct Result : IResult, IEquatable<Result>
-    {
-        /// <summary>
-        /// Gets the <see cref="IsSuccess"/> <see cref="Result"/>.
-        /// </summary>
-        public static Result Success { get; } = new();
-
-        /// <summary>
-        /// Gets the <see cref="IsSuccess"/> <see cref="Result"/> <see cref="Task"/>.
-        /// </summary>
-        public static Task<Result> SuccessTask { get; } = Task.FromResult(Success);
-
-        private readonly Exception? _error = default;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Result"/> that is considered <see cref="IsSuccess"/>.
-        /// </summary>
-        public Result() { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>).
-        /// </summary>
-        /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
-        public Result(Exception error) => _error = error.ThrowIfNull(nameof(error));
-
-        /// <inheritdoc/>
-        object? IResult.Value
-        {
-            get
-            {
-                ThrowOnError();
-                return null;
-            }
-        }
-
-        /// <inheritdoc/>
-        public Exception Error { get => _error ?? throw new InvalidOperationException($"The {nameof(Error)} cannot be accessed as the {nameof(Result)} is in a successful state."); }
-
-        /// <inheritdoc/>
-        public bool IsSuccess => _error is null;
-
-        /// <inheritdoc/>
-        public bool IsFailure => _error is not null;
-
-        /// <inheritdoc/>
-        IResult IResult.ToFailure(Exception error) => new Result(error);
+    public Result() { }
 
-        /// <inheritdoc/>
-        public bool IsFailureOfType<TException>() where TException : Exception => _error is not null && _error.GetType() == typeof(TException);
-
-        /// <summary>
-        /// Converts the <see cref="Result"/> to a corresponding <see cref="Result{T}"/> (of <see cref="Type"/> <typeparamref name="T"/>) defaulting to <see cref="Result{T}.None"/> where <see cref="Result.IsSuccess"/>; otherwise, where
-        /// <see cref="IsFailure"/> returns a resulting instance with the corresponding <see cref="Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
-        /// <remarks>This invokes <see cref="CoreExtensions.Bind{T}(Result)"/> internally to perform.</remarks>
-        public Result<T> ToResult<T>() => this.Bind<T>();
-
-        /// <summary>
-        /// Throws the <see cref="Error"/> where <see cref="IsFailure"/>; otherwise, does nothing.
-        /// </summary>
-        /// <returns>The <see cref="Result"/> where <see cref="IsSuccess"/> to enable further fluent-style method-chaining.</returns>
-        public Result ThrowOnError()
-        {
-            if (IsFailure)
-                ThrowErrorOrAggregateException(Error);
-
-            return this;
-        }
-
-        /// <summary>
-        /// Throws either the <paramref name="error"/> directly where not previously thrown; otherwise, throws a new <see cref="AggregateException"/> which contains the originating <paramref name="error"/>.
-        /// </summary>
-        /// <param name="error">The originating <see cref="Exception"/>.</param>
-        [DoesNotReturn]
-        internal static void ThrowErrorOrAggregateException(Exception error)
-        {
-            if (error.StackTrace is null)
-                throw error;
-
-            throw new AggregateException(error);
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>).
+    /// </summary>
+    /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
+    public Result(Exception error) => _error = error.ThrowIfNull();
 
-        /// <summary>
-        /// Executes the specified <paramref name="action"/> and returns <see cref="Success"/>.
-        /// </summary>
-        /// <param name="action">The action to execute.</param>
-        /// <returns>The <see cref="Success"/> <see cref="Result"/>.</returns>
-        /// <remarks>This is a helper method to simplify code where an <paramref name="action"/> should be invoked followed immediately by returning a corresponding <see cref="Success"/> to complete/conclude.</remarks>
-        public static Result Done(Action action)
+    /// <inheritdoc/>
+    object? IResult.Value
+    {
+        get
         {
-            action.ThrowIfNull(nameof(action))();
-            return Success;
+            ThrowOnError();
+            return null;
         }
+    }
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with a <see cref="Result{T}.Value"/> that is considered <see cref="Result{T}.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <returns>The <see cref="Result{T}"/> that is <see cref="Result{T}.IsSuccess"/>.</returns>
-        public static Result<T> Ok<T>(T value) => Result<T>.Ok(value);
-
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>).
-        /// </summary>
-        /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result Fail(Exception error) => new(error);
-
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="BusinessException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result Fail(LText? message = null) => new(new BusinessException(message));
-
-        /// <summary>
-        /// Converts the <see cref="Result"/> to a <see cref="Task{TResult}"/> using <see cref="Task.FromResult{TResult}(TResult)"/>.
-        /// </summary>
-        /// <returns>The completed <see cref="Task{TResult}"/>.</returns>
-        public Task<Result> AsTask() => Task.FromResult(this);
-
-        /// <inheritdoc/>
-        public override string ToString() => IsSuccess ? "Success." : $"Failure: {Error.Message}";
-
-        /// <summary>
-        /// Get the <see cref="string"/> representation of the <see cref="Result"/> for debugging purposes.
-        /// </summary>
-        private string ToDebuggerString() => IsSuccess ? "Success." : $"Failure: {Error.Message} [{Error.GetType().Name}]";
-
-        /// <summary>
-        /// Implicitly converts an <see cref="Exception"/> to a <see cref="Result"/> that is considered <see cref="IsFailure"/>.
-        /// </summary>
-        /// <param name="error">The underlying error represented as an <see cref="Exception"/>.</param>
-        public static implicit operator Result(Exception error) => new(error);
-
-        #region Errors
-
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result ValidationError(LText? message = default) => new ValidationException(message);
+    /// <inheritdoc/>
+    public Exception Error { get => _error ?? throw new InvalidOperationException($"The {nameof(Error)} cannot be accessed as the {nameof(Result)} is in a successful state."); }
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
-        /// </summary>
-        /// <param name="messages">The <see cref="MessageItem"/> list.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result ValidationError(IEnumerable<MessageItem>? messages) => messages is null ? new ValidationException() : new ValidationException(messages);
+    /// <inheritdoc/>
+    public bool IsSuccess => _error is null;
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
-        /// </summary>
-        /// <param name="message">The <see cref="MessageItem"/>.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>       
-        public static Result ValidationError(MessageItem message) => new ValidationException(message);
+    /// <inheritdoc/>
+    public bool IsFailure => _error is not null;
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConflictException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        /// <remarks>An example would be where the identifier provided for a Create operation already exists.</remarks>
-        public static Result ConflictError(LText? message = default) => new ConflictException(message);
+    /// <inheritdoc/>
+    IResult IResult.ToFailure(Exception error) => new Result(error);
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConcurrencyException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result ConcurrencyError(LText? message = default) => new ConcurrencyException(message);
+    /// <inheritdoc/>
+    public bool IsFailureOfType<TException>() where TException : Exception => _error is not null && _error is TException;
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="DataConsistencyException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result DataConsistencyError(LText? message = default) => new DataConsistencyException(message);
+    /// <summary>
+    /// Converts the <see cref="Result"/> to a corresponding <see cref="Result{T}"/> (of <see cref="Type"/> <typeparamref name="T"/>) defaulting to <see cref="Result{T}.Success"/> where <see cref="IsSuccess"/>; otherwise, where
+    /// <see cref="IsFailure"/> returns a resulting instance with the corresponding <see cref="Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
+    /// <remarks>This invokes <see cref="ResultsExtensions.Bind{T}(Result)"/> internally to perform.</remarks>
+    public Result<T> ToResult<T>() => this.Bind<T>();
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="DuplicateException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result DuplicateError(LText? message = default) => new DuplicateException(message);
+    /// <summary>
+    /// Throws the <see cref="Error"/> where <see cref="IsFailure"/>; otherwise, does nothing.
+    /// </summary>
+    /// <returns>The <see cref="Result"/> where <see cref="IsSuccess"/> to enable further fluent-style method-chaining.</returns>
+    public Result ThrowOnError()
+    {
+        if (IsFailure)
+            ThrowErrorOrAggregateException(Error);
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="NotFoundException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result NotFoundError(LText? message = default) => new NotFoundException(message);
+        return this;
+    }
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="TransientException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result TransientError(LText? message = default) => new TransientException(message);
+    /// <summary>
+    /// Throws either the <paramref name="error"/> directly where not previously thrown; otherwise, throws a new <see cref="AggregateException"/> which contains the originating <paramref name="error"/>.
+    /// </summary>
+    /// <param name="error">The originating <see cref="Exception"/>.</param>
+    [DoesNotReturn]
+    internal static void ThrowErrorOrAggregateException(Exception error)
+    {
+        if (error.StackTrace is null)
+            throw error;
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthenticationException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result AuthenticationError(LText? message = default) => new AuthenticationException(message);
+        throw new AggregateException(error);
+    }
 
-        /// <summary>
-        /// Creates a <see cref="Result"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthorizationException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result AuthorizationError(LText? message = default) => new AuthorizationException(message);
+    /// <summary>
+    /// Converts the <see cref="Result"/> to a <see cref="Task{TResult}"/> using <see cref="Task.FromResult{TResult}(TResult)"/>.
+    /// </summary>
+    /// <returns>The completed <see cref="Task{TResult}"/>.</returns>
+    public Task<Result> AsTask() => Task.FromResult(this);
 
-        #endregion
+    /// <inheritdoc/>
+    public override string ToString() => IsSuccess ? "Success." : $"Failure: {Error.Message}";
 
-        #region Equality
+    /// <summary>
+    /// Get the <see cref="string"/> representation of the <see cref="Result"/> for debugging purposes.
+    /// </summary>
+    private string ToDebuggerString() => IsSuccess ? "Success." : $"Failure: {Error.Message} [{Error.GetType().Name}]";
 
-        /// <inheritdoc/>
-        public override bool Equals(object? obj) => obj is Result r && Equals(r);
+    /// <summary>
+    /// Implicitly converts an <see cref="Exception"/> to a <see cref="Result"/> that is considered <see cref="IsFailure"/>.
+    /// </summary>
+    /// <param name="error">The underlying error represented as an <see cref="Exception"/>.</param>
+    public static implicit operator Result(Exception error) => new(error);
 
-        /// <inheritdoc/>
-        public bool Equals(Result other) => IsSuccess ? other.IsSuccess : (IsFailure == other.IsFailure && Error.GetType() == other.Error.GetType() && Error.ToString() == other.Error.ToString());
+    /// <inheritdoc/>
+    public override bool Equals(object? obj) => obj is Result r && Equals(r);
 
-        /// <summary>
-        /// Indicates whether the current <see cref="Result"/> is equal to another <see cref="Result"/>.
-        /// </summary>
-        public static bool operator ==(Result left, Result right) => left.Equals(right);
+    /// <inheritdoc/>
+    public bool Equals(Result other) => IsSuccess ? other.IsSuccess : (IsFailure == other.IsFailure && Error.GetType() == other.Error.GetType() && Error.ToString() == other.Error.ToString());
 
-        /// <summary>
-        /// Indicates whether the current <see cref="Result"/> is not equal to another <see cref="Result"/>.
-        /// </summary>
-        public static bool operator !=(Result left, Result right) => !(left == right);
+    /// <summary>
+    /// Indicates whether the current <see cref="Result"/> is equal to another <see cref="Result"/>.
+    /// </summary>
+    public static bool operator ==(Result left, Result right) => left.Equals(right);
 
-        /// <inheritdoc/>
-        public override int GetHashCode() => HashCode.Combine(IsSuccess, IsFailure ? Error.GetHashCode() : 0);
+    /// <summary>
+    /// Indicates whether the current <see cref="Result"/> is not equal to another <see cref="Result"/>.
+    /// </summary>
+    public static bool operator !=(Result left, Result right) => !(left == right);
 
-        #endregion
-    }
+    /// <inheritdoc/>
+    public override int GetHashCode() => HashCode.Combine(IsSuccess, IsFailure ? Error.GetHashCode() : 0);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultGo.cs b/src/CoreEx/Results/ResultGo.cs
deleted file mode 100644
index f52a39a2..00000000
--- a/src/CoreEx/Results/ResultGo.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
-{
-    public readonly partial struct Result
-    {
-        #region Go
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain.
-        /// </summary>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Go() => Success;
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by executing the <paramref name="action"/>.
-        /// </summary>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Go(Action action) => Success.Then(action);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Go(Func<Result> func) => Success.Then(func);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The starting <see cref="Result"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Go(Result result) => result;
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The starting <see cref="IToResult"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result GoFrom(IToResult result) => Success.ThenFrom(() => result);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="func"/>.
-        /// </summary>
-        /// <param name="func">The starting <see cref="IToResult"/> function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result GoFrom(Func<IToResult> func) => Success.ThenFrom(func);
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Go<T>(Func<T> func) => Result<T>.None.Then(_ => func());
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Go<T>(Func<Result<T>> func) => Result<T>.None.Then(_ => func());
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Go<T>() => Result<T>.None;
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain with the specified <paramref name="value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The starting value.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Go<T>(T value) => Go(() => Result<T>.Ok(value));
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The starting <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Go<T>(Result<T> result) => result;
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The starting <see cref="IToResult{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> GoFrom<T>(IToResult<T> result) => Result<T>.None.ThenFrom(_ => result);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The starting <see cref="IToResult{T}"/> function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> GoFrom<T>(Func<IToResult<T>> func) => Result<T>.None.ThenFrom(_ => func());
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The starting <see cref="ITypedToResult"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> GoFrom<T>(ITypedToResult result) => Result<T>.None.ThenFrom(_ => result);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The starting <see cref="IToResult{T}"/> function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> GoFrom<T>(Func<ITypedToResult> func) => Result<T>.None.ThenFrom(_ => func());
-
-        #endregion
-
-        #region GoAsync
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result> GoAsync(Func<Task> func) => Success.ThenAsync(func);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result> GoAsync(Func<Task<Result>> func) => Success.ThenAsync(func);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The starting <see cref="Result"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> GoAsync(Task<Result> result) => await result.ConfigureAwait(false);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <param name="result">The starting <see cref="IToResult"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result> GoFromAsync(Task<IToResult> result) => Success.ThenFromAsync(() => result);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="func"/>.
-        /// </summary>
-        /// <param name="func">The starting <see cref="IToResult"/> function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result> GoFromAsync(Func<Task<IToResult>> func) => Success.ThenFromAsync(async () => await func());
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Task<Result<T>> GoAsync<T>(Func<Task<Result<T>>> func) => Result<T>.None.ThenAsync(async _ => await func().ConfigureAwait(false));
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain by executing the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Task<Result<T>> GoAsync<T>(Func<Task<T>> func) => Result<T>.None.ThenAsync(async _ => await func().ConfigureAwait(false));
-
-        /// <summary>
-        /// Begins a new <see cref="Result{T}"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The starting <see cref="Result{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> GoAsync<T>(Task<Result<T>> result) => await result.ConfigureAwait(false);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The starting <see cref="IToResult{T}"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<T>> GoFromAsync<T>(Task<IToResult<T>> result) => Result<T>.None.ThenFromAsync(_ => result);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The starting <see cref="IToResult{T}"/> function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<T>> GoFromAsync<T>(Func<Task<IToResult<T>>> func) => Result<T>.None.ThenFromAsync(async _ => await func().ConfigureAwait(false));
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="result"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The starting <see cref="ITypedToResult"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<T>> GoFromAsync<T>(Task<ITypedToResult> result) => Result<T>.None.ThenFromAsync(_ => result);
-
-        /// <summary>
-        /// Begins a new <see cref="Result"/> chain by starting with the <paramref name="func"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="func">The starting <see cref="IToResult{T}"/> function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Task<Result<T>> GoFromAsync<T>(Func<Task<ITypedToResult>> func) => Result<T>.None.ThenFromAsync(async _ => await func().ConfigureAwait(false));
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultT.Error.cs b/src/CoreEx/Results/ResultT.Error.cs
new file mode 100644
index 00000000..547f2aad
--- /dev/null
+++ b/src/CoreEx/Results/ResultT.Error.cs
@@ -0,0 +1,93 @@
+namespace CoreEx.Results;
+
+public readonly partial struct Result<T>
+{
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthenticationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> AuthenticationError(LText? message = default, Action<AuthenticationException>? configure = null) => (new AuthenticationException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthorizationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> AuthorizationError(LText? message = default, Action<AuthorizationException>? configure = null) => (new AuthorizationException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="BusinessException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> BusinessError(LText? message = default, Action<BusinessException>? configure = null) => (new BusinessException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConcurrencyException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> ConcurrencyError(LText? message = default, Action<ConcurrencyException>? configure = null) => (new ConcurrencyException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConflictException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    /// <remarks>An example would be where the identifier provided for a Create operation already exists.</remarks>
+    public static Result<T> ConflictError(LText? message = default, Action<ConflictException>? configure = null) => (new ConflictException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="DuplicateException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> DuplicateError(LText? message = default, Action<DuplicateException>? configure = null) => (new DuplicateException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="NotFoundException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> NotFoundError(LText? message = default, Action<NotFoundException>? configure = null) => (new NotFoundException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="TransientException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> TransientError(LText? message = default, Action<TransientException>? configure = null) => (new TransientException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> ValidationError(LText? message = default, Action<ValidationException>? configure = null) => (new ValidationException(message)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="messages">The <see cref="MessageItem"/> list.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
+    public static Result<T> ValidationError(IEnumerable<MessageItem>? messages, Action<ValidationException>? configure = null) => (messages is null ? new ValidationException() : new ValidationException(messages)).Adjust(configure);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="message">The <see cref="MessageItem"/>.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>       
+    public static Result<T> ValidationError(MessageItem message, Action<ValidationException>? configure = null) => (new ValidationException(message)).Adjust(configure);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultT.Static.cs b/src/CoreEx/Results/ResultT.Static.cs
new file mode 100644
index 00000000..af48c759
--- /dev/null
+++ b/src/CoreEx/Results/ResultT.Static.cs
@@ -0,0 +1,46 @@
+namespace CoreEx.Results;
+
+public readonly partial struct Result<T>
+{
+    /// <summary>
+    /// Gets the <see cref="IsSuccess"/> <see cref="Result{T}"/> with a default <see cref="Value"/>.
+    /// </summary>
+    public static Result<T> Success { get; } = default;
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with a default <see cref="Result{T}.Value"/> that is considered <see cref="Result{T}.IsSuccess"/>.
+    /// </summary>
+    /// <returns>The <see cref="Result{T}"/> that is <see cref="Result{T}.IsSuccess"/> (see <see cref="Result{T}.Success"/>).</returns>
+    public static Result<T> Ok() => Success;
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with a <see cref="Result{T}.Value"/> that is considered <see cref="Result{T}.IsSuccess"/>.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <returns>The <see cref="Result{T}"/> that is <see cref="Result{T}.IsSuccess"/>.</returns>
+    /// <remarks>This is synonymous with <see cref="Map(T)"/>.</remarks>
+    public static Result<T> Ok(T value) => Map(value);
+
+    /// <summary>
+    /// Maps a <paramref name="value"/> into a <see cref="Result{T}"/> that is considered <see cref="Result{T}.IsSuccess"/>.
+    /// </summary>
+    /// <param name="value">The value to map.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>This is synonymous with <see cref="Ok(T)"/>.</remarks>
+    public static Result<T> Map(T value) => new(value);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Result{T}.Error"/> (see <see cref="Result{T}.IsFailure"/>).
+    /// </summary>
+    /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="Result{T}.IsFailure"/>.</returns>
+    public static Result<T> Fail(Exception error) => new(error);
+
+    /// <summary>
+    /// Creates a <see cref="Result{T}"/> with an <see cref="Result{T}.Error"/> (see <see cref="Result{T}.IsFailure"/>) of type <see cref="ValidationException"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="configure">The optional configuration action.</param>
+    /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="Result{T}.IsFailure"/>.</returns>
+    public static Result<T> Fail(LText message, Action<ValidationException>? configure = null) => new((new ValidationException(message)).Adjust(configure));
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultT.cs b/src/CoreEx/Results/ResultT.cs
index e0adbd92..3950b3af 100644
--- a/src/CoreEx/Results/ResultT.cs
+++ b/src/CoreEx/Results/ResultT.cs
@@ -1,274 +1,161 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using CoreEx.Localization;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
+namespace CoreEx.Results;
+
+/// <summary>
+/// Represents the outcome of an operation with a <see cref="Value"/>.
+/// </summary>
+/// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
+/// <remarks>There are logic and performance benefits for leveraging a <see cref="Result{T}"/>, especially where explicitly managing <i>known/expected</i> errors, as this can avoid the overhead of throwing exceptions. 
+/// This instead, provides a means to manage and return errors in a more functional manner (see <see href="https://en.wikipedia.org/wiki/Monad_(functional_programming)">monad</see>-based error handling and 
+/// <see href="https://fsharpforfunandprofit.com/posts/recipe-part2/">Railway Oriented Programming</see> for more information). 
+/// <para>This is not to say that exceptions are not valid and should be avoided, they absolutely serve a purpose and should continue to be leveraged where the outcome of an operation is unexpected.
+/// See the <see href="https://learn.microsoft.com/en-us/dotnet/fsharp/style-guide/conventions#error-management">error management</see> guidance provided by Microsoft.</para>
+/// <para>However, in some instances where returning a business functional error that is intended to be handled by the consumer then an <see cref="Exception"/>, although convenient, is possibly not the best approach.
+/// Finally, an exception contains additional context, such as the stack trace to assist with the likes of troubleshooting, which is generally not required for an explicit (expected) business error.</para>
+/// <para>See also <see cref="Result"/>.</para></remarks>
+[DebuggerStepThrough]
+[DebuggerDisplay("{ToDebuggerString()}")]
+public readonly partial struct Result<T> : IResult<T>, IEquatable<Result<T>>
 {
+    private readonly T _value = default!;
+    private readonly Exception? _error = default;
+
     /// <summary>
-    /// Represents the outcome of an operation with a <see cref="Value"/>.
+    /// Initializes a new <see cref="IsSuccess"/> instance of the <see cref="Result{T}"/> with a <paramref name="value"/>.
     /// </summary>
-    /// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
-    [DebuggerStepThrough]
-    [DebuggerDisplay("{ToDebuggerString()}")]
-    public readonly struct Result<T> : IResult<T>, IEquatable<Result<T>>
-    {
-        /// <summary>
-        /// Gets the <see cref="IsSuccess"/> <see cref="Result{T}"/> with a default <see cref="Value"/>.
-        /// </summary>
-        public static Result<T> None { get; } = default;
-
-        private readonly T _value = default!;
-        private readonly Exception? _error = default;
-
-        /// <summary>
-        /// Initializes a new <see cref="IsSuccess"/> instance of the <see cref="Result{T}"/> with a <paramref name="value"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Result{T}.Value"/>.</param>
-        public Result(T value) => _value = value;
-
-        /// <summary>
-        /// Initializes a new <see cref="IsFailure"/> instance of the <see cref="Result{T}"/> with a corresponding <paramref name="error"/>.
-        /// </summary>
-        /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
-        public Result(Exception error) => _error = error.ThrowIfNull(nameof(error));
-
-        /// <inheritdoc/>
-        object? IResult.Value => Value;
-
-        /// <inheritdoc/>
-        public T Value
-        {
-            get
-            {
-                if (IsSuccess)
-                    return _value;
-
-                Result.ThrowErrorOrAggregateException(Error);
-                return default;
-            }
-        }
-
-        /// <inheritdoc/>
-        public Exception Error { get => _error ?? throw new InvalidOperationException($"The {nameof(Error)} cannot be accessed as the {nameof(Result)} is in a successful state."); }
-
-        /// <inheritdoc/>
-        public bool IsSuccess => _error is null;
-
-        /// <inheritdoc/>
-        public bool IsFailure => _error is not null;
-
-        /// <inheritdoc/>
-        IResult IResult.ToFailure(Exception error) => new Result<T>(error);
+    /// <param name="value">The <see cref="Result{T}.Value"/>.</param>
+    public Result(T value) => _value = value;
 
-        /// <inheritdoc/>
-        public bool IsFailureOfType<TException>() where TException : Exception => _error is not null && _error.GetType() == typeof(TException);
-
-        /// <summary>
-        /// Throws the <see cref="Error"/> where <see cref="IsFailure"/>; otherwise, does nothing.
-        /// </summary>
-        /// <returns>The <see cref="Result{T}"/> where <see cref="IsSuccess"/> to enable further fluent-style method-chaining.</returns>
-        public Result<T> ThrowOnError()
-        {
-            if (IsFailure)
-                Result.ThrowErrorOrAggregateException(Error);
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        public override string ToString() => IsSuccess ? $"Success: {(Value is null ? "null" : Value)}" : $"Failure: {Error.Message}";
-
-        /// <summary>
-        /// Get the <see cref="string"/> representation of the <see cref="Result"/> for debugging purposes.
-        /// </summary>
-        private string ToDebuggerString() => IsSuccess ? $"Success: {(Value is null ? "null" : Value)}" : $"Failure: {Error.Message} [{Error.GetType().Name}]";
-
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with a default <see cref="Result{T}.Value"/> that is considered <see cref="Result{T}.IsSuccess"/>.
-        /// </summary>
-        /// <returns>The <see cref="Result{T}"/> that is <see cref="Result{T}.IsSuccess"/> (see <see cref="Result{T}.None"/>).</returns>
-        public static Result<T> Ok() => Result<T>.None;
-
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with a <see cref="Result{T}.Value"/> that is considered <see cref="Result{T}.IsSuccess"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The <see cref="Result{T}"/> that is <see cref="Result{T}.IsSuccess"/>.</returns>
-        public static Result<T> Ok(T value) => value is null || (value is IComparable && Comparer<T>.Default.Compare(value, default!) == 0) ? Result<T>.None : new Result<T>(value);
-
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Result{T}.Error"/> (see <see cref="Result{T}.IsFailure"/>).
-        /// </summary>
-        /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="Result{T}.IsFailure"/>.</returns>
-        public static Result<T> Fail(Exception error) => new(error);
+    /// <summary>
+    /// Initializes a new <see cref="IsFailure"/> instance of the <see cref="Result{T}"/> with a corresponding <paramref name="error"/>.
+    /// </summary>
+    /// <param name="error">The error represented as an <see cref="Exception"/>.</param>
+    public Result(Exception error) => _error = error.ThrowIfNull();
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Result{T}.Error"/> (see <see cref="Result{T}.IsFailure"/>) of type <see cref="BusinessException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="Result{T}.IsFailure"/>.</returns>
-        public static Result<T> Fail(LText message) => new(new BusinessException(message));
+    /// <inheritdoc/>
+    object? IResult.Value => Value;
 
-        /// <summary>
-        /// Requires (validates) that the <see cref="Value"/> is non-default; otherwise, will result in a <see cref="ValidationError(MessageItem)"/>.
-        /// </summary>
-        /// <param name="name">The value name (defaults to <see cref="Validation.Validation.ValueNameDefault"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>The format of the error messages is defined by <see cref="Validation.Validation.MandatoryFormat"/>.</remarks>
-        public Result<T> Required(string? name = null, LText? text = null)
+    /// <inheritdoc/>
+    public T Value
+    {
+        get
         {
-            if (IsSuccess && Comparer<T>.Default.Compare(Value, default!) == 0)
-                return ValidationError(MessageItem.CreateErrorMessage(name ?? Validation.Validation.ValueNameDefault, Validation.Validation.MandatoryFormat, text ?? ((name == null || name == Validation.Validation.ValueNameDefault) ? Validation.Validation.ValueTextDefault : name.ToSentenceCase()!)));
+            if (IsSuccess)
+                return _value;
 
-            return this;
+            Result.ThrowErrorOrAggregateException(Error);
+            return default;
         }
+    }
 
-        /// <summary>
-        /// Converts the <see cref="Result"/> to a <see cref="Task{TResult}"/> using <see cref="Task.FromResult{TResult}(TResult)"/>.
-        /// </summary>
-        /// <returns>The completed <see cref="Task{TResult}"/>.</returns>
-        public Task<Result<T>> AsTask() => Task.FromResult(this);
-
-        /// <summary>
-        /// Implicitly converts an <see cref="Exception"/> to a <see cref="Result"/> that is considered <see cref="IsFailure"/>.
-        /// </summary>
-        /// <param name="error">The underlying error represented as an <see cref="Exception"/>.</param>
-        public static implicit operator Result<T>(Exception error) => new(error);
-
-        /// <summary>
-        /// Implicitly converts a <see cref="Result"/> to a <see cref="Result{T}"/> defaulting the <see cref="Value"/> where <see cref="IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        public static implicit operator Result<T>(Result result) => result.Bind(() => new Result<T>());
-
-        /// <summary>
-        /// Explicitly converts a <see cref="Result{T}"/> to a <see cref="Result"/> losing the <see cref="Value"/> where <see cref="IsSuccess"/>.
-        /// </summary>
-        /// <param name="result"></param>
-        public static explicit operator Result(Result<T> result) => result.Bind();
+    /// <summary>
+    /// Gets the underlying <see cref="Value"/> where <see cref="IsSuccess"/>; otherwise, returns the default value for the type <typeparamref name="T"/>.
+    /// </summary>
+    public T? ValueOrDefault => IsSuccess ? _value : default;
 
-        /// <summary>
-        /// Implicitly converts a <see cref="Value"/> to a <see cref="Result{T}"/> as <see cref="IsSuccess"/>.
-        /// </summary>
-        /// <param name="value">The underlying value.</param>
-        public static implicit operator Result<T>(T value) => Result<T>.Ok(value);
+    /// <inheritdoc/>
+    public Exception Error { get => _error ?? throw new InvalidOperationException($"The {nameof(Error)} cannot be accessed as the {nameof(Result)} is in a successful state."); }
 
-        /// <summary>
-        /// Implicitly converts a <see cref="Result{T}"/> to a <see cref="Value"/> where <see cref="IsSuccess"/>.
-        /// </summary>
-        /// <param name="result"></param>
-        public static implicit operator T(Result<T> result) => result.Value;
+    /// <inheritdoc/>
+    public bool IsSuccess => _error is null;
 
-        #region Errors
+    /// <inheritdoc/>
+    public bool IsFailure => _error is not null;
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> ValidationError(LText? message = default) => Result<T>.Fail(new ValidationException(message));
+    /// <inheritdoc/>
+    IResult IResult.ToFailure(Exception error) => new Result<T>(error);
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
-        /// </summary>
-        /// <param name="messages">The <see cref="MessageItem"/> list.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> ValidationError(IEnumerable<MessageItem>? messages) => Result<T>.Fail(new ValidationException(messages!));
+    /// <inheritdoc/>
+    public bool IsFailureOfType<TException>() where TException : Exception => _error is not null && _error is TException;
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ValidationException"/>.
-        /// </summary>
-        /// <param name="message">The <see cref="MessageItem"/>.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>       
-        public static Result<T> ValidationError(MessageItem message) => Result<T>.Fail(new ValidationException(message));
+    /// <summary>
+    /// Throws the <see cref="Error"/> where <see cref="IsFailure"/>; otherwise, does nothing.
+    /// </summary>
+    /// <returns>The <see cref="Result{T}"/> where <see cref="IsSuccess"/> to enable further fluent-style method-chaining.</returns>
+    public Result<T> ThrowOnError()
+    {
+        if (IsFailure)
+            Result.ThrowErrorOrAggregateException(Error);
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConflictException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        /// <remarks>An example would be where the identifier provided for a Create operation already exists.</remarks>
-        public static Result<T> ConflictError(LText? message = default) => Result<T>.Fail(new ConflictException(message));
+        return this;
+    }
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="ConcurrencyException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> ConcurrencyError(LText? message = default) => Result<T>.Fail(new ConcurrencyException(message));
+    /// <inheritdoc/>
+    public override string ToString() => IsSuccess ? $"Success: {(Value is null ? "null" : Value)}" : $"Failure: {Error.Message}";
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="DataConsistencyException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> DataConsistencyError(LText? message = default) => Result<T>.Fail(new DataConsistencyException(message));
+    /// <summary>
+    /// Get the <see cref="string"/> representation of the <see cref="Result"/> for debugging purposes.
+    /// </summary>
+    private string ToDebuggerString() => IsSuccess ? $"Success: {(Value is null ? "null" : Value)}" : $"Failure: {Error.Message} [{Error.GetType().Name}]";
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="DuplicateException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> DuplicateError(LText? message = default) => Result<T>.Fail(new DuplicateException(message));
+    /// <summary>
+    /// Requires (validates) that the <see cref="Value"/> is non-default; otherwise, will result in a <see cref="Result.ValidationError(MessageItem, Action{ValidationException}?)"/>.
+    /// </summary>
+    /// <param name="name">The value name (defaults to <see cref="Validation.Validation.ValueName"/>).</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>The format of the error messages is defined by <see cref="Validation.Validation.MandatoryFormat"/>.</remarks>
+    public Result<T> Required(string? name = null, LText? text = null)
+    {
+        if (IsSuccess && EqualityComparer<T>.Default.Equals(Value, default!))
+            return Result.ValidationError(MessageItem.CreateErrorMessage(name
+                ?? Validation.Validation.ValueName, Validation.Validation.MandatoryFormat, text
+                    ?? ((name is null || name == Validation.Validation.ValueName) ? Validation.Validation.ValueText : name.ToSentenceCase()!)));
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="NotFoundException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> NotFoundError(LText? message = default) => Result<T>.Fail(new NotFoundException(message));
+        return this;
+    }
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="TransientException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> TransientError(LText? message = default) => Result<T>.Fail(new TransientException(message));
+    /// <summary>
+    /// Converts the <see cref="Result"/> to a <see cref="Task{TResult}"/> using <see cref="Task.FromResult{TResult}(TResult)"/>.
+    /// </summary>
+    /// <returns>The completed <see cref="Task{TResult}"/>.</returns>
+    public Task<Result<T>> AsTask() => Task.FromResult(this);
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthenticationException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> AuthenticationError(LText? message = default) => Result<T>.Fail(new AuthenticationException(message));
+    /// <summary>
+    /// Implicitly converts an <see cref="Exception"/> to a <see cref="Result"/> that is considered <see cref="IsFailure"/>.
+    /// </summary>
+    /// <param name="error">The underlying error represented as an <see cref="Exception"/>.</param>
+    public static implicit operator Result<T>(Exception error) => new(error);
 
-        /// <summary>
-        /// Creates a <see cref="Result{T}"/> with an <see cref="Error"/> (see <see cref="IsFailure"/>) of type <see cref="AuthorizationException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <returns>The <see cref="Result{T}"/> that has a state of <see cref="IsFailure"/>.</returns>
-        public static Result<T> AuthorizationError(LText? message = default) => Result<T>.Fail(new AuthorizationException(message));
+    /// <summary>
+    /// Implicitly converts a <see cref="Result"/> to a <see cref="Result{T}"/> defaulting the <see cref="Value"/> where <see cref="IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    public static implicit operator Result<T>(Result result) => result.Bind(() => new Result<T>());
 
-        #endregion
+    /// <summary>
+    /// Explicitly converts a <see cref="Result{T}"/> to a <see cref="Result"/> losing the <see cref="Value"/> where <see cref="IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result{T}"/></param>
+    public static explicit operator Result(Result<T> result) => result.Bind();
 
-        #region Equality
+    /// <summary>
+    /// Implicitly converts a <see cref="Value"/> to a <see cref="Result{T}"/> as <see cref="IsSuccess"/>.
+    /// </summary>
+    /// <param name="value">The underlying value.</param>
+    public static implicit operator Result<T>(T value) => Result<T>.Ok(value);
 
-        /// <inheritdoc/>
-        public override bool Equals(object? obj) => obj is Result<T> r && Equals(r);
+    /// <summary>
+    /// Implicitly converts a <see cref="Result{T}"/> to a <see cref="Value"/> where <see cref="IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result{T}"/></param>
+    public static implicit operator T(Result<T> result) => result.Value;
 
-        /// <inheritdoc/>
-        public bool Equals(Result<T> other) => IsSuccess ? (other.IsSuccess && EqualityComparer<T>.Default.Equals(Value, other.Value)) : (IsFailure == other.IsFailure && Error.GetType() == other.Error.GetType() && Error.ToString() == other.Error.ToString());
+    /// <inheritdoc/>
+    public override bool Equals(object? obj) => obj is Result<T> r && Equals(r);
 
-        /// <summary>
-        /// Indicates whether the current <see cref="Result"/> is equal to another <see cref="Result"/>.
-        /// </summary>
-        public static bool operator ==(Result<T> left, Result<T> right) => left.Equals(right);
+    /// <inheritdoc/>
+    public bool Equals(Result<T> other) => IsSuccess ? (other.IsSuccess && EqualityComparer<T>.Default.Equals(Value, other.Value)) : (IsFailure == other.IsFailure && Error.GetType() == other.Error.GetType() && Error.ToString() == other.Error.ToString());
 
-        /// <summary>
-        /// Indicates whether the current <see cref="Result"/> is not equal to another <see cref="Result"/>.
-        /// </summary>
-        public static bool operator !=(Result<T> left, Result<T> right) => !(left == right);
+    /// <summary>
+    /// Indicates whether the current <see cref="Result"/> is equal to another <see cref="Result"/>.
+    /// </summary>
+    public static bool operator ==(Result<T> left, Result<T> right) => left.Equals(right);
 
-        /// <inheritdoc/>
-        public override int GetHashCode() => HashCode.Combine(IsSuccess, IsSuccess ? (Value?.GetHashCode() ?? 0) : 0, IsFailure ? Error.GetHashCode() : 0);
+    /// <summary>
+    /// Indicates whether the current <see cref="Result"/> is not equal to another <see cref="Result"/>.
+    /// </summary>
+    public static bool operator !=(Result<T> left, Result<T> right) => !(left == right);
 
-        #endregion
-    }
+    /// <inheritdoc/>
+    public override int GetHashCode() => HashCode.Combine(IsSuccess, IsSuccess ? (Value?.GetHashCode() ?? 0) : 0, IsFailure ? Error.GetHashCode() : 0);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.Any.cs b/src/CoreEx/Results/ResultsExtensions.Any.cs
new file mode 100644
index 00000000..fb71d3c5
--- /dev/null
+++ b/src/CoreEx/Results/ResultsExtensions.Any.cs
@@ -0,0 +1,620 @@
+namespace CoreEx.Results;
+
+public static partial class ResultsExtensions
+{
+    #region Synchronous
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Any(this Result result, Action action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        action();
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Any(this Result result, Func<Result> func)
+    {
+        ThrowIfNull(result, func);
+        return func();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Any<T>(this Result<T> result, Action<T?> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        action(result.ValueOrDefault);
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Any<T>(this Result<T> result, Func<T?, T> func)
+    {
+        ThrowIfNull(result, func);
+        return Result<T>.Ok(func(result.ValueOrDefault));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Any<T>(this Result<T> result, Func<T?, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return func(result.ValueOrDefault);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> AnyAs<T>(this Result result, Func<T> func)
+    {
+        ThrowIfNull(result, func);
+        return Result<T>.Ok(func());
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> AnyAs<T>(this Result result, Func<Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return func();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result AnyAs<T>(this Result<T> result, Action<T?> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        action(result.ValueOrDefault);
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result AnyAs<T>(this Result<T> result, Func<T?, Result> func)
+    {
+        ThrowIfNull(result, func);
+        return func(result.ValueOrDefault);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> AnyAs<T, U>(this Result<T> result, Func<T?, U> func)
+    {
+        ThrowIfNull(result, func);
+        return Result<U>.Ok(func(result.ValueOrDefault));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> AnyAs<T, U>(this Result<T> result, Func<T?, Result<U>> func)
+    {
+        ThrowIfNull(result, func);
+        return func(result.ValueOrDefault);
+    }
+
+    #endregion
+
+    #region AsyncResult
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> Any(this Task<Result> result, Action action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.Any(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> Any(this Task<Result> result, Func<Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Any(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Action<T?> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.Any(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Func<T?, T> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Any(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Any<T>(this Task<Result<T>> result, Func<T?, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Any(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAs<T>(this Task<Result> result, Func<T> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.AnyAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAs<T>(this Task<Result> result, Func<Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.AnyAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAs<T>(this Task<Result<T>> result, Action<T?> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.AnyAs(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAs<T>(this Task<Result<T>> result, Func<T?, Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.AnyAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> AnyAs<T, U>(this Task<Result<T>> result, Func<T?, U> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.AnyAs<T, U>(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> AnyAs<T, U>(this Task<Result<T>> result, Func<T?, Result<U>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.AnyAs<T, U>(func);
+    }
+
+    #endregion
+
+    #region AsyncFunc
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAsync(this Result result, Func<Task> func)
+    {
+        ThrowIfNull(result, func);
+        await func().ConfigureAwait(false);
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAsync(this Result result, Func<Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return await func().ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T?, Task> func)
+    {
+        ThrowIfNull(result, func);
+        await func(result.ValueOrDefault).ConfigureAwait(false);
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T?, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return Result<T>.Ok(await func(result.ValueOrDefault).ConfigureAwait(false));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAsync<T>(this Result<T> result, Func<T?, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        return await func(result.ValueOrDefault).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAsAsync<T>(this Result result, Func<Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return Result<T>.Ok(await func().ConfigureAwait(false));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> AnyAsAsync<T>(this Result result, Func<Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        return await func().ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAsAsync<T>(this Result<T> result, Func<T?, Task> func)
+    {
+        ThrowIfNull(result, func);
+        await func(result.ValueOrDefault).ConfigureAwait(false);
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAsAsync<T>(this Result<T> result, Func<T?, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return await func(result.ValueOrDefault).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> AnyAsAsync<T, U>(this Result<T> result, Func<T?, Task<U>> func)
+    {
+        ThrowIfNull(result, func);
+        return Result<U>.Ok(await func(result.ValueOrDefault).ConfigureAwait(false));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> AnyAsAsync<T, U>(this Result<T> result, Func<T?, Task<Result<U>>> func)
+    {
+        ThrowIfNull(result, func);
+        return await func(result.ValueOrDefault).ConfigureAwait(false);
+    }
+
+    #endregion
+
+    #region AsyncBoth
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAsync(this Task<Result> result, Func<Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> AnyAsync(this Task<Result> result, Func<Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T?, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T?, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> regardless of the <paramref name="result"/> state.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> AnyAsync<T>(this Task<Result<T>> result, Func<T?, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> AnyAsAsync<T>(this Task<Result> result, Func<Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> AnyAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result"/>.</return>
+    public static async Task<Result> AnyAsAsync<T>(this Task<Result<T>> result, Func<T?, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result"/>.</return>
+    public static async Task<Result> AnyAsAsync<T>(this Task<Result<T>> result, Func<T?, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<U>> AnyAsAsync<T, U>(this Task<Result<T>> result, Func<T?, Task<U>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> regardless of the <paramref name="result"/> state (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<U>> AnyAsAsync<T, U>(this Task<Result<T>> result, Func<T?, Task<Result<U>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.AnyAsAsync(func).ConfigureAwait(false);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.Error.cs b/src/CoreEx/Results/ResultsExtensions.Error.cs
new file mode 100644
index 00000000..53a24e83
--- /dev/null
+++ b/src/CoreEx/Results/ResultsExtensions.Error.cs
@@ -0,0 +1,67 @@
+namespace CoreEx.Results;
+
+public static partial class ResultsExtensions
+{
+    extension(IResult result)
+    {
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="NotFoundException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsNotFoundError => result.IsFailureOfType<NotFoundException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="ValidationException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsValidationError => result.IsFailureOfType<ValidationException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="BusinessException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsBusinessError => result.IsFailureOfType<BusinessException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="ConflictException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsConflictError => result.IsFailureOfType<ConflictException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="ConcurrencyException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsConcurrencyError => result.IsFailureOfType<ConcurrencyException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="DataConsistencyException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsDataConsistencyError => result.IsFailureOfType<DataConsistencyException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="DuplicateException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsDuplicateError => result.IsFailureOfType<DuplicateException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="TransientException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsTransientError => result.IsFailureOfType<TransientException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="AuthenticationException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsAuthenticationError => result.IsFailureOfType<AuthenticationException>();
+
+        /// <summary>
+        /// Indicates whether the <see cref="IResult"/> <see cref="IResult.IsFailure"/> and the <see cref="IResult"/> is a <see cref="AuthorizationException"/>.
+        /// </summary>
+        /// <remarks>A <see langword="false"/> result does not imply <see cref="IResult.IsSuccess"/>, just that it is not in the specified error state.</remarks>
+        public bool IsAuthorizationError => result.IsFailureOfType<AuthorizationException>();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.Match.cs b/src/CoreEx/Results/ResultsExtensions.Match.cs
new file mode 100644
index 00000000..8f6585cc
--- /dev/null
+++ b/src/CoreEx/Results/ResultsExtensions.Match.cs
@@ -0,0 +1,432 @@
+namespace CoreEx.Results;
+
+public static partial class ResultsExtensions
+{
+    #region Synchronous
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Match(this Result result, Action ok, Action<Exception> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.Match(() =>
+        {
+            ok();
+            return result;
+        }, e =>
+        {
+            fail(e);
+            return result;
+        });
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Match(this Result result, Func<Result> ok, Func<Exception, Result> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok() : fail(result.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> MatchAs<T>(this Result result, Func<Result<T>> ok, Func<Exception, Result<T>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok() : fail(result.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Match<T>(this Result<T> result, Action<T> ok, Action<Exception> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.Match(v =>
+        {
+            ok(v);
+            return result;
+        }, e =>
+        {
+            fail(e);
+            return result;
+        });
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Match<T>(this Result<T> result, Func<T, Result<T>> ok, Func<Exception, Result<T>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok(result.Value) : fail(result.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> MatchAs<T, U>(this Result<T> result, Func<T, Result<U>> ok, Func<Exception, Result<U>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok(result.Value) : fail(result.Error);
+    }
+
+    #endregion
+
+    #region AsyncResult
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> Match(this Task<Result> result, Action ok, Action<Exception> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.Match(() =>
+        {
+            ok();
+            return r;
+        }, e =>
+        {
+            fail(e);
+            return r;
+        });
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> Match(this Task<Result> result, Func<Result> ok, Func<Exception, Result> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? ok() : fail(r.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> MatchAs<T>(this Task<Result> result, Func<Result<T>> ok, Func<Exception, Result<T>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? ok() : fail(r.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result<T>> Match<T>(this Task<Result<T>> result, Action<T> ok, Action<Exception> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.Match(v =>
+        {
+            ok(v);
+            return r;
+        }, e =>
+        {
+            fail(e);
+            return r;
+        });
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result<T>> Match<T>(this Task<Result<T>> result, Func<T, Result<T>> ok, Func<Exception, Result<T>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? ok(r.Value) : fail(r.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result<U>> MatchAs<T, U>(this Task<Result<T>> result, Func<T, Result<U>> ok, Func<Exception, Result<U>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? ok(r.Value) : fail(r.Error);
+    }
+
+    #endregion
+
+    #region AsyncFunc
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> MatchAsync(this Result result, Func<Task> ok, Func<Exception, Task> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return await result.MatchAsync(async () =>
+        {
+            await ok().ConfigureAwait(false);
+            return result;
+        }, async e =>
+        {
+            await fail(e).ConfigureAwait(false);
+            return result;
+        }).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Task<Result> MatchAsync(this Result result, Func<Task<Result>> ok, Func<Exception, Task<Result>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok() : fail(result.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Task<Result<T>> MatchAsAsync<T>(this Result result, Func<Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok() : fail(result.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Task<Result<T>> MatchAsync<T>(this Result<T> result, Func<T, Task> ok, Func<Exception, Task> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.MatchAsync(async v =>
+        {
+            await ok(v).ConfigureAwait(false);
+            return result;
+        }, async e =>
+        {
+            await fail(e).ConfigureAwait(false);
+            return result;
+        });
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Task<Result<T>> MatchAsync<T>(this Result<T> result, Func<T, Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok(result.Value) : fail(result.Error);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Task<Result<U>> MatchAsAsync<T, U>(this Result<T> result, Func<T, Task<Result<U>>> ok, Func<Exception, Task<Result<U>>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        return result.IsSuccess ? ok(result.Value) : fail(result.Error);
+    }
+
+    #endregion
+
+    #region AsyncBoth
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> MatchAsync(this Task<Result> result, Func<Task> ok, Func<Exception, Task> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        if (r.IsSuccess)
+            await ok().ConfigureAwait(false);
+        else
+            await fail(r.Error).ConfigureAwait(false);
+
+        return r;
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> MatchAsync(this Task<Result> result, Func<Task<Result>> ok, Func<Exception, Task<Result>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? await ok().ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> MatchAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? await ok().ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result<T>> MatchAsync<T>(this Task<Result<T>> result, Func<T, Task> ok, Func<Exception, Task> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        if (r.IsSuccess)
+            await ok(r.Value).ConfigureAwait(false);
+        else
+            await fail(r.Error).ConfigureAwait(false);
+
+        return r;
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result<T>> MatchAsync<T>(this Task<Result<T>> result, Func<T, Task<Result<T>>> ok, Func<Exception, Task<Result<T>>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? await ok(r.Value).ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Invokes (matches) the <paramref name="ok"/> function when the <paramref name="result"/> is <see cref="IResult.IsSuccess"/>; otherwise, invokes the <paramref name="fail"/> function.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="ok">The success function.</param>
+    /// <param name="fail">The failure function.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result<U>> MatchAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<Result<U>>> ok, Func<Exception, Task<Result<U>>> fail)
+    {
+        MatchThrowIfNull(result, ok, fail);
+        var r = await result.ConfigureAwait(false);
+        return r.IsSuccess ? await ok(r.Value).ConfigureAwait(false) : await fail(r.Error).ConfigureAwait(false);
+    }
+
+    #endregion
+
+    /// <summary>
+    /// Check parameters and throw where null.
+    /// </summary>
+    private static void MatchThrowIfNull(object result, object ok, object fail)
+    {
+        result.ThrowIfNull();
+        ok.ThrowIfNull();
+        fail.ThrowIfNull();
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.OnFailure.cs b/src/CoreEx/Results/ResultsExtensions.OnFailure.cs
new file mode 100644
index 00000000..09b563b3
--- /dev/null
+++ b/src/CoreEx/Results/ResultsExtensions.OnFailure.cs
@@ -0,0 +1,632 @@
+namespace CoreEx.Results;
+
+public static partial class ResultsExtensions
+{
+    #region Synchronous
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result OnFailure(this Result result, Action<Result> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        if (result.IsFailure)
+            action(result);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result OnFailure(this Result result, Func<Result, Result> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? func(result) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> OnFailure<T>(this Result<T> result, Action<Result<T>> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        if (result.IsFailure)
+            action(result);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> OnFailure<T>(this Result<T> result, Func<Result<T>, T> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? Result<T>.Ok(func(result)) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> OnFailure<T>(this Result<T> result, Func<Result<T>, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? func(result) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> OnFailureAs<T>(this Result result, Func<Result, T> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? Result<T>.Ok(func(result)) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> OnFailureAs<T>(this Result result, Func<Result, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? func(result) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result OnFailureAs<T>(this Result<T> result, Action<Result<T>> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        if (result.IsFailure)
+            action(result);
+
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result OnFailureAs<T>(this Result<T> result, Func<Result<T>, Result> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? func(result) : result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> OnFailureAs<T, U>(this Result<T> result, Func<Result<T>, U> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? Result<U>.Ok(func(result)) : result.Bind<T, U>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> OnFailureAs<T, U>(this Result<T> result, Func<Result<T>, Result<U>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? func(result) : result.Bind<T, U>();
+    }
+
+    #endregion
+
+    #region AsyncResult
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailure(this Task<Result> result, Action<Result> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailure(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailure(this Task<Result> result, Func<Result, Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailure(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Action<Result<T>> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailure<T>(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Func<Result<T>, T> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailure(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailure<T>(this Task<Result<T>> result, Func<Result<T>, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailure(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAs<T>(this Task<Result> result, Func<Result, T> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailureAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAs<T>(this Task<Result> result, Func<Result, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailureAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAs<T>(this Task<Result<T>> result, Action<Result<T>> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailureAs(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAs<T>(this Task<Result<T>> result, Func<Result<T>, Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailureAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> OnFailureAs<T, U>(this Task<Result<T>> result, Func<Result<T>, U> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailureAs<T, U>(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> OnFailureAs<T, U>(this Task<Result<T>> result, Func<Result<T>, Result<U>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.OnFailureAs<T, U>(func);
+    }
+
+    #endregion
+
+    #region AsyncFunc
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsync(this Result result, Func<Result, Task> func)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsFailure)
+            await func(result).ConfigureAwait(false);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsync(this Result result, Func<Result, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? await func(result).ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Result<T>, Task> func)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsFailure)
+            await func(result).ConfigureAwait(false);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Result<T>, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? Result<T>.Ok(await func(result).ConfigureAwait(false)) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsync<T>(this Result<T> result, Func<Result<T>, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? await func(result).ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsAsync<T>(this Result result, Func<Result, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? Result<T>.Ok(await func(result).ConfigureAwait(false)) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsAsync<T>(this Result result, Func<Result, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? await func(result).ConfigureAwait(false) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsAsync<T>(this Result<T> result, Func<Result<T>, Task> func)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsFailure)
+            await func(result).ConfigureAwait(false);
+
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsAsync<T>(this Result<T> result, Func<Result<T>, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? await func(result).ConfigureAwait(false) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Result<T> result, Func<Result<T>, Task<U>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? Result<U>.Ok(await func(result).ConfigureAwait(false)) : result.Bind<T, U>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Result<T> result, Func<Result<T>, Task<Result<U>>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsFailure ? await func(result).ConfigureAwait(false) : result.Bind<T, U>();
+    }
+
+    #endregion
+
+    #region AsyncBoth
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsync(this Task<Result> result, Func<Result, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsync(this Task<Result> result, Func<Result, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Result<T>, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Result<T>, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsync<T>(this Task<Result<T>> result, Func<Result<T>, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsAsync<T>(this Task<Result> result, Func<Result, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> OnFailureAsAsync<T>(this Task<Result> result, Func<Result, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsAsync<T>(this Task<Result<T>> result, Func<Result<T>, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> OnFailureAsAsync<T>(this Task<Result<T>> result, Func<Result<T>, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Task<Result<T>> result, Func<Result<T>, Task<U>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsFailure"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> OnFailureAsAsync<T, U>(this Task<Result<T>> result, Func<Result<T>, Task<Result<U>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.OnFailureAsAsync(func).ConfigureAwait(false);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.Then.cs b/src/CoreEx/Results/ResultsExtensions.Then.cs
new file mode 100644
index 00000000..5f0c23f7
--- /dev/null
+++ b/src/CoreEx/Results/ResultsExtensions.Then.cs
@@ -0,0 +1,686 @@
+namespace CoreEx.Results;
+
+public static partial class ResultsExtensions
+{
+    #region Synchronous
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Then(this Result result, Action action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        if (result.IsSuccess)
+            action();
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Then(this Result result, Func<Result> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? func() : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Then<T>(this Result<T> result, Action<T> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        if (result.IsSuccess)
+            action(result.Value);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Then<T>(this Result<T> result, Func<T, T> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? Result<T>.Ok(func(result.Value)) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Then<T>(this Result<T> result, Func<T, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? func(result.Value) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Then<T>(this Result<T> result, Func<T, Result> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? func(result.Value).Combine(result) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> ThenAs<T>(this Result result, Func<T> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? Result<T>.Ok(func()) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> ThenAs<T>(this Result result, Func<Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? func() : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result ThenAs<T>(this Result<T> result, Action<T> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        if (result.IsSuccess)
+            action(result.Value);
+
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result ThenAs<T>(this Result<T> result, Func<T, Result> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? func(result.Value) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> ThenAs<T, U>(this Result<T> result, Func<T, U> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? Result<U>.Ok(func(result.Value)) : result.Bind<T, U>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> ThenAs<T, U>(this Result<T> result, Func<T, Result<U>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? func(result.Value) : result.Bind<T, U>();
+    }
+
+    #endregion
+
+    #region AsyncResult
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> Then(this Task<Result> result, Action action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.Then(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> Then(this Task<Result> result, Func<Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Then(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Action<T> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.Then(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Func<T, T> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Then(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Func<T, Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Then(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Func<T, Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.Then(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAs<T>(this Task<Result> result, Func<T> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.ThenAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAs<T>(this Task<Result> result, Func<Result<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.ThenAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="action">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAs<T>(this Task<Result<T>> result, Action<T> action)
+    {
+        ThrowIfNull(result, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.ThenAs(action);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAs<T>(this Task<Result<T>> result, Func<T, Result> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.ThenAs(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> ThenAs<T, U>(this Task<Result<T>> result, Func<T, U> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.ThenAs<T, U>(func);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> ThenAs<T, U>(this Task<Result<T>> result, Func<T, Result<U>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return r.ThenAs<T, U>(func);
+    }
+
+    #endregion
+
+    #region AsyncFunc
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAsync(this Result result, Func<Task> func)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsSuccess)
+            await func().ConfigureAwait(false);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAsync(this Result result, Func<Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? await func().ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task> func)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsSuccess)
+            await func(result.Value).ConfigureAwait(false);
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? Result<T>.Ok(await func(result.Value).ConfigureAwait(false)) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? await func(result.Value).ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).Combine(result) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsAsync<T>(this Result result, Func<Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? Result<T>.Ok(await func().ConfigureAwait(false)) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsAsync<T>(this Result result, Func<Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? await func().ConfigureAwait(false) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAsAsync<T>(this Result<T> result, Func<T, Task> func)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsSuccess)
+            await func(result.Value).ConfigureAwait(false);
+
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAsAsync<T>(this Result<T> result, Func<T, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? await func(result.Value).ConfigureAwait(false) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> ThenAsAsync<T, U>(this Result<T> result, Func<T, Task<U>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? Result<U>.Ok(await func(result.Value).ConfigureAwait(false)) : result.Bind<T, U>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> ThenAsAsync<T, U>(this Result<T> result, Func<T, Task<Result<U>>> func)
+    {
+        ThrowIfNull(result, func);
+        return result.IsSuccess ? await func(result.Value).ConfigureAwait(false) : result.Bind<T, U>();
+    }
+
+    #endregion
+
+    #region AsyncBoth
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAsync(this Task<Result> result, Func<Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ThenAsync(this Task<Result> result, Func<Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> ThenAsAsync<T>(this Task<Result> result, Func<Task<T>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> ThenAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result"/>.</return>
+    public static async Task<Result> ThenAsAsync<T>(this Task<Result<T>> result, Func<T, Task> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result"/>.</return>
+    public static async Task<Result> ThenAsAsync<T>(this Task<Result<T>> result, Func<T, Task<Result>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<U>> ThenAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<U>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsAsync(func).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The function to invoke.</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<U>> ThenAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<Result<U>>> func)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.ThenAsAsync(func).ConfigureAwait(false);
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.When.cs b/src/CoreEx/Results/ResultsExtensions.When.cs
new file mode 100644
index 00000000..12516cdd
--- /dev/null
+++ b/src/CoreEx/Results/ResultsExtensions.When.cs
@@ -0,0 +1,939 @@
+namespace CoreEx.Results;
+
+public static partial class ResultsExtensions
+{
+    #region Synchronous
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="action">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result When(this Result result, Func<bool> condition, Action action, Action? otherwise = null)
+    {
+        ThrowIfNull(result, condition, action, nameof(action));
+        if (result.IsSuccess)
+        {
+            if (condition())
+                action();
+            else
+                otherwise?.Invoke();
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result When(this Result result, Func<bool> condition, Func<Result> func, Func<Result>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition())
+            return func();
+        else
+            return otherwise is null ? result : otherwise();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="action">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, action, nameof(action));
+        if (result.IsSuccess)
+        {
+            if (condition(result.Value))
+                action(result.Value);
+            else
+                otherwise?.Invoke(result.Value);
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Func<T, T> func, Func<T, T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition(result.Value))
+            return Result<T>.Ok(func(result.Value));
+        else
+            return otherwise is null ? result : Result<T>.Ok(otherwise(result.Value));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Func<T, Result<T>> func, Func<T, Result<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition(result.Value))
+            return func(result.Value);
+        else
+            return otherwise is null ? result : otherwise(result.Value);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>  and <paramref name="condition"/> evaluates to <see langword="true"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition(result.Value))
+            return func(result.Value).Combine(result);
+        else
+            return otherwise is null ? result : func(result.Value).Combine(result);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> WhenAs<T>(this Result result, Func<bool> condition, Func<T> func, Func<T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T>();
+
+        if (condition())
+            return Result<T>.Ok(func());
+        else
+            return otherwise is null ? result.Bind<T>() : Result<T>.Ok(otherwise());
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> WhenAs<T>(this Result result, Func<bool> condition, Func<Result<T>> func, Func<Result<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T>();
+
+        if (condition())
+            return func();
+        else
+            return otherwise is null ? result.Bind<T>() : otherwise();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="action">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result WhenAs<T>(this Result<T> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, action, nameof(action));
+        if (result.IsSuccess)
+        {
+            if (condition(result.Value))
+                action(result.Value);
+            else
+                otherwise?.Invoke(result.Value);
+        }
+
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result WhenAs<T>(this Result<T> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind();
+
+        if (condition(result.Value))
+            return func(result.Value);
+        else
+            return otherwise is null ? result.Bind() : otherwise(result.Value);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> WhenAs<T, U>(this Result<T> result, Predicate<T> condition, Func<T, U> func, Func<T, U>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T, U>();
+
+        if (condition(result.Value))
+            return Result<U>.Ok(func(result.Value));
+        else
+            return otherwise is null ? result.Bind<T, U>() : Result<U>.Ok(otherwise(result.Value));
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> WhenAs<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Result<U>> func, Func<T, Result<U>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T, U>();
+
+        if (condition(result.Value))
+            return func(result.Value);
+        else
+            return otherwise is null ? result.Bind<T, U>() : otherwise(result.Value);
+    }
+
+    #endregion
+
+    #region AsyncResult
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="action">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> When(this Task<Result> result, Func<bool> condition, Action action, Action? otherwise = null)
+    {
+        ThrowIfNull(result, condition, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.When(condition, action, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> When(this Task<Result> result, Func<bool> condition, Func<Result> func, Func<Result>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.When(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="action">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.When(condition, action, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, T> func, Func<T, T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.When(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result<T>> func, Func<T, Result<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.When(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.When(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAs<T>(this Task<Result> result, Func<bool> condition, Func<T> func, Func<T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.WhenAs(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAs<T>(this Task<Result> result, Func<bool> condition, Func<Result<T>> func, Func<Result<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.WhenAs(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="action">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAs<T>(this Task<Result<T>> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, action, nameof(action));
+        var r = await result.ConfigureAwait(false);
+        return r.WhenAs(condition, action, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAs<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.WhenAs(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> WhenAs<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, U> func, Func<T, U>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.WhenAs(condition, func, otherwise);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The <see cref="Func{T, TResult}"/> to invoke.</param>
+    /// <param name="otherwise">The <see cref="Func{T, TResult}"/> to invoke where condition/predicate is <see langword="false"/> (where <paramref name="result"/> is also <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> WhenAs<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result<U>> func, Func<T, Result<U>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return r.WhenAs(condition, func, otherwise);
+    }
+
+    #endregion
+
+    #region AsyncFunc
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAsync(this Result result, Func<bool> condition, Func<Task> func, Func<Task>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsSuccess)
+        {
+            if (condition())
+                await func().ConfigureAwait(false);
+            else
+            {
+                if (otherwise is not null)
+                    await otherwise().ConfigureAwait(false);
+            }
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAsync(this Result result, Func<bool> condition, Func<Task<Result>> func, Func<Task<Result>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition())
+            return await func().ConfigureAwait(false);
+        else
+            return otherwise is not null ? await otherwise().ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsSuccess)
+        {
+            if (condition(result.Value))
+                await func(result.Value).ConfigureAwait(false);
+            else
+            {
+                if (otherwise is not null)
+                    await otherwise(result.Value).ConfigureAwait(false);
+            }
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<T>> func, Func<T, Task<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition(result.Value))
+            return Result<T>.Ok(await func(result.Value).ConfigureAwait(false));
+        else
+            return otherwise is not null ? Result<T>.Ok(await otherwise(result.Value).ConfigureAwait(false)) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result<T>>> func, Func<T, Task<Result<T>>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition(result.Value))
+            return await func(result.Value).ConfigureAwait(false);
+        else
+            return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
+    {
+        ThrowIfNull(result, func);
+        if (result.IsFailure)
+            return result;
+
+        if (condition(result.Value))
+            return await func(result.Value).ConfigureAwait(false);
+        else
+            return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result;
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsAsync<T>(this Result result, Func<bool> condition, Func<Task<T>> func, Func<Task<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T>();
+
+        if (condition())
+            return Result<T>.Ok(await func().ConfigureAwait(false));
+        else
+            return otherwise is not null ? Result<T>.Ok(await otherwise().ConfigureAwait(false)) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsAsync<T>(this Result result, Func<bool> condition, Func<Task<Result<T>>> func, Func<Task<Result<T>>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T>();
+
+        if (condition())
+            return await func().ConfigureAwait(false);
+        else
+            return otherwise is not null ? await otherwise().ConfigureAwait(false) : result.Bind<T>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAsAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsSuccess)
+        {
+            if (condition(result.Value))
+                await func(result.Value).ConfigureAwait(false);
+            else if (otherwise is not null)
+                await otherwise(result.Value).ConfigureAwait(false);
+        }
+
+        return result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAsAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind();
+
+        if (condition(result.Value))
+            return await func(result.Value).ConfigureAwait(false);
+        else
+            return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result.Bind();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> WhenAsAsync<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Task<U>> func, Func<T, Task<U>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsSuccess)
+        {
+            if (condition(result.Value))
+                return Result<U>.Ok(await func(result.Value).ConfigureAwait(false));
+            else if (otherwise is not null)
+                return Result<U>.Ok(await otherwise(result.Value).ConfigureAwait(false));
+        }
+
+        return result.Bind<T, U>();
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<U>> WhenAsAsync<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result<U>>> func, Func<T, Task<Result<U>>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        if (result.IsFailure)
+            return result.Bind<T, U>();
+
+        if (condition(result.Value))
+            return await func(result.Value).ConfigureAwait(false);
+        else
+            return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result.Bind<T, U>();
+    }
+
+    #endregion
+
+    #region AsyncBoth
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAsync(this Task<Result> result, Func<bool> condition, Func<Task> func, Func<Task>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> WhenAsync(this Task<Result> result, Func<bool> condition, Func<Task<Result>> func, Func<Task<Result>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<T>> func, Func<T, Task<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result<T>>> func, Func<T, Task<Result<T>>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
+    {
+        ThrowIfNull(result, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> WhenAsAsync<T>(this Task<Result> result, Func<bool> condition, Func<Task<T>> func, Func<Task<T>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<T>> WhenAsAsync<T>(this Task<Result> result, Func<bool> condition, Func<Task<Result<T>>> func, Func<Task<Result<T>>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result"/>.</return>
+    public static async Task<Result> WhenAsAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result"/>.</return>
+    public static async Task<Result> WhenAsAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<U>> WhenAsAsync<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<U>> func, Func<T, Task<U>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <see langword="true"/> (as new <see cref="Result"/> <see cref="Type"/>).
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="condition">The condition/predicate that must also be evaluated.</param>
+    /// <param name="func">The function to invoke where <paramref name="condition"/> is <see langword="true"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <see langword="false"/> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
+    /// <return>The resulting <see cref="Result{T}"/>.</return>
+    public static async Task<Result<U>> WhenAsAsync<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result<U>>> func, Func<T, Task<Result<U>>>? otherwise = null)
+    {
+        ThrowIfNull(result, condition, func);
+        var r = await result.ConfigureAwait(false);
+        return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
+    }
+
+
+    #endregion
+
+    /// <summary>
+    /// Check parameters and throw where null.
+    /// </summary>
+    private static void ThrowIfNull(object result, object condition, object func, string? name = null)
+    {
+        result.ThrowIfNull();
+        condition.ThrowIfNull();
+        func.ThrowIfNull(name ?? nameof(func));
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Results/ResultsExtensions.cs b/src/CoreEx/Results/ResultsExtensions.cs
index c1af2dec..9ce4a9f9 100644
--- a/src/CoreEx/Results/ResultsExtensions.cs
+++ b/src/CoreEx/Results/ResultsExtensions.cs
@@ -1,225 +1,180 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Results;
 
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
+/// <summary>
+/// Provides the <see cref="Result"/> and <see cref="Result{T}"/> extension methods.
+/// </summary>
+[SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Reviewed and considered OK for this use case.")]
+public static partial class ResultsExtensions
 {
     /// <summary>
-    /// Provides the <see cref="Result"/> and <see cref="Result{T}"/> extension methods.
+    /// Unwraps the <paramref name="result"/> and where <see cref="Result{T}.IsSuccess"/> invokes the <paramref name="func"/> and returns the resulting <see cref="Result{T}"/>; 
+    /// otherwise, where <see cref="Result{T}.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result{T}.Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="func">The binding (mapping) function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> Bind<T, U>(this Result<T> result, Func<T, Result<U>> func)
+    {
+        func.ThrowIfNull();
+        return result.IsSuccess ? func(result.Value) : new Result<U>(result.Error!);
+    }
+
+    /// <summary>
+    /// Binds/converts the <paramref name="result"/> to a corresponding <see cref="Result{T}"/> defaulting to <see cref="Result{T}.Success"/> where <see cref="Result.IsSuccess"/> losing the <see cref="Result{T}.Value"/>;
+    /// otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<U> Bind<T, U>(this Result<T> result) => result.IsSuccess ? (result.Value is U uv ? new Result<U>(uv) : Result<U>.Success) : new Result<U>(result.Error!);
+
+    /// <summary>
+    /// Unwraps the <paramref name="result"/> and where <see cref="Result{T}.IsSuccess"/> invokes the <paramref name="func"/> and returns the resulting <see cref="Result{T}"/>; 
+    /// otherwise, where <see cref="Result{T}.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result{T}.Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="func">The binding (mapping) function.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Bind<T>(this Result result, Func<Result<T>> func)
+    {
+        func.ThrowIfNull();
+        return result.IsSuccess ? func() : new Result<T>(result.Error!);
+    }
+
+    /// <summary>
+    /// Binds/converts the <paramref name="result"/> to a corresponding <see cref="Result{T}"/> defaulting to <see cref="Result{T}.Success"/> where <see cref="Result.IsSuccess"/>;
+    /// otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static Result<T> Bind<T>(this Result result) => result.IsSuccess ? Result<T>.Success : new Result<T>(result.Error!);
+
+    /// <summary>
+    /// Binds/converts the <paramref name="result"/> to a corresponding <see cref="Result"/> losing the <see cref="Result{T}.Value"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static Result Bind<T>(this Result<T> result) => result.IsSuccess ? Result.Success : new Result(result.Error);
+
+    /// <summary>
+    /// Combines the <paramref name="result"/> and <paramref name="other"/> into a single <see cref="Result"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="other">The other <see cref="Result{T}"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where either or both are failures, a failure state will be returned with the corresponding <see cref="Result{T}.Error"/>; where both contains errors these will be aggregated into an <see cref="AggregateException"/>.</remarks>
+    public static Result Combine(this Result result, Result other)
+    {
+        if (result.IsFailure && other.IsFailure)
+            return new Result(new AggregateException(result.Error, other.Error));
+
+        return result.IsFailure ? result : other;
+    }
+
+    /// <summary>
+    /// Combines the <paramref name="result"/> and <paramref name="other"/> into a single <see cref="Result{T}"/>; on success the <paramref name="other"/> will be returned.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="other">The other <see cref="Result{T}"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where either or both are failures, a failure state will be returned with the corresponding <see cref="Result{T}.Error"/>; where both contains errors these will be aggregated into an <see cref="AggregateException"/>.</remarks>
+    public static Result<T> Combine<T>(this Result result, Result<T> other)
+    {
+        if (result.IsFailure && other.IsFailure)
+            return new Result<T>(new AggregateException(result.Error, other.Error));
+
+        if (result.IsFailure)
+            return new Result<T>(result.Error!);
+
+        return other;
+    }
+
+    /// <summary>
+    /// Combines the <paramref name="result"/> and <paramref name="other"/> into a single <see cref="Result{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The other and resulting <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="other">The other <see cref="Result{T}"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where either or both are failures, a failure state will be returned with the corresponding <see cref="Result{T}.Error"/>. Where both contain errors these will be aggregated into an <see cref="AggregateException"/>.
+    /// <para>Where both are successful and, <typeparamref name="T"/> and <typeparamref name="U"/> are the same <see cref="Type"/>, the <paramref name="result"/> <see cref="Result{T}.Value"/> is used as the returned value (i.e <paramref name="other"/> is ignored).</para></remarks>
+    public static Result<U> Combine<T, U>(this Result<T> result, Result<U> other)
+    {
+        if (result.IsFailure && other.IsFailure)
+            return new Result<U>(new AggregateException(result.Error, other.Error));
+
+        if (result.IsFailure)
+            return new Result<U>(result.Error!);
+
+        if (other.IsFailure)
+            return other;
+
+        return result.Value is U uv ? uv : other;
+    }
+
+    /// <summary>
+    /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result"/> losing the <see cref="Result{T}.Value"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="Result"/>.</returns>
+    /// <remarks>This invokes <see cref="Bind{T}(Result{T})"/> internally to perform.</remarks>
+    public static Result AsResult<T>(this Result<T> result) => result.Bind();
+
+    /// <summary>
+    /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result"/> losing the <see cref="Result{T}.Value"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="Result"/>.</returns>
+    /// <remarks>This invokes <see cref="Bind{T}(Result{T})"/> internally to perform.</remarks>
+    public static async Task<Result> AsResultAsync<T>(this Task<Result<T>> result)
+    {
+        var r = await result.ConfigureAwait(false);
+        return r.Bind();
+    }
+
+    /// <summary>
+    /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result{T}"/> (of <see cref="Type"/> <typeparamref name="U"/>) defaulting to <see cref="Result{T}.Success"/> where <see cref="Result.IsSuccess"/> losing the 
+    /// <see cref="Result{T}.Value"/>; otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
+    /// <remarks>This invokes <see cref="Bind{T, U}(Result{T})"/> internally to perform.</remarks>
+    public static Result<U> AsResult<T, U>(this Result<T> result) => result.Bind<T, U>();
+
+    /// <summary>
+    /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result{T}"/> (of <see cref="Type"/> <typeparamref name="U"/>) defaulting to <see cref="Result{T}.Success"/> where <see cref="Result.IsSuccess"/> losing the 
+    /// <see cref="Result{T}.Value"/>; otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
+    /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
+    /// <remarks>This invokes <see cref="Bind{T, U}(Result{T})"/> internally to perform.</remarks>
+    public static async Task<Result<U>> AsResultAsync<T, U>(this Task<Result<T>> result)
+    {
+        var r = await result.ConfigureAwait(false);
+        return r.Bind<T, U>();
+    }
+
+    /// <summary>
+    /// Check parameters and throw where null.
+    /// </summary>
+    private static void ThrowIfNull(object result) => result.ThrowIfNull();
+
+    /// <summary>
+    /// Check parameters and throw where null.
     /// </summary>
-    [DebuggerStepThrough]
-    public static partial class ResultsExtensions
+    private static void ThrowIfNull(object result, object func, string? name = null)
     {
-        /// <summary>
-        /// Check parameters and throw where null.
-        /// </summary>
-        private static void ThrowIfNull(object result)
-        {
-            result.ThrowIfNull(nameof(result));
-        }
-
-        /// <summary>
-        /// Check parameters and throw where null.
-        /// </summary>
-        private static void ThrowIfNull(object result, object func, string? name = null)
-        {
-            ThrowIfNull(result);
-            func.ThrowIfNull(name ?? nameof(func));
-        }
-
-        /// <summary>
-        /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result"/> losing the <see cref="Result{T}.Value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        /// <remarks>This invokes <see cref="CoreExtensions.Bind{T}(Result{T})"/> internally to perform.</remarks>
-        public static Result AsResult<T>(this Result<T> result) => result.Bind();
-
-        /// <summary>
-        /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result"/> losing the <see cref="Result{T}.Value"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="Result"/>.</returns>
-        /// <remarks>This invokes <see cref="CoreExtensions.Bind{T}(Result{T})"/> internally to perform.</remarks>
-        public static async Task<Result> AsResult<T>(this Task<Result<T>> result)
-        {
-            var r = await result.ConfigureAwait(false);
-            return r.Bind();
-        }
-
-        /// <summary>
-        /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result{T}"/> (of <see cref="Type"/> <typeparamref name="U"/>) defaulting to <see cref="Result{T}.None"/> where <see cref="Result.IsSuccess"/> losing the 
-        /// <see cref="Result{T}.Value"/>; otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
-        /// <remarks>This invokes <see cref="CoreExtensions.Bind{T, U}(Result{T})"/> internally to perform.</remarks>
-        public static Result<U> AsResult<T, U>(this Result<T> result) => result.Bind<T, U>();
-
-        /// <summary>
-        /// Converts the <see cref="Result{T}"/> to a corresponding <see cref="Result{T}"/> (of <see cref="Type"/> <typeparamref name="U"/>) defaulting to <see cref="Result{T}.None"/> where <see cref="Result.IsSuccess"/> losing the 
-        /// <see cref="Result{T}.Value"/>; otherwise, where <see cref="Result.IsFailure"/> returns a resulting instance with the corresponding <see cref="Result.Error"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <returns>The corresponding <see cref="Result{T}"/>.</returns>
-        /// <remarks>This invokes <see cref="CoreExtensions.Bind{T, U}(Result{T})"/> internally to perform.</remarks>
-        public static async Task<Result<U>> AsResult<T, U>(this Task<Result<T>> result)
-        {
-            var r = await result.ConfigureAwait(false);
-            return r.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Verifies that the <see cref="Result{T}.Value"/> is not <c>null</c> where the <paramref name="result"/> is <see cref="Result{T}.IsSuccess"/> and throws a corresponding <see cref="ArgumentNullException"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="name">The value name (defaults to <see cref="Validation.Validation.ValueNameDefault"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> ThrowIfNull<T>(this Result<T> result, string? name = null)
-            => result.IsSuccess && result.Value == null ? throw new ArgumentNullException(name ?? Validation.Validation.ValueNameDefault) : result;
-
-        /// <summary>
-        /// Enables adjustment (changes) to a <see cref="Result{T}.Value"/> via an <paramref name="adjuster"/> action where the <paramref name="result"/> is <see cref="Result{T}.IsSuccess"/>
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="adjuster">The adjusting action (invoked only where the underlying <see cref="Result{T}.Value"/> is not <c>null</c>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Adjusts<T>(this Result<T> result, Action<T> adjuster)
-        {
-            if (result.IsSuccess)
-                result.Value.Adjust(adjuster);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Enables adjustment (changes) to a <see cref="Result{T}.Value"/> via an <paramref name="adjuster"/> action where the <paramref name="result"/> is <see cref="Result{T}.IsSuccess"/>
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="adjuster">The adjusting action (invoked only where the underlying <see cref="Result{T}.Value"/> is not <c>null</c>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Adjusts<T>(this Task<Result<T>> result, Action<T> adjuster)
-        {
-            var r = await result.ConfigureAwait(false);
-            return r.Adjusts(adjuster);
-        }
-
-        /// <summary>
-        /// Enables adjustment (changes) to a <see cref="Result{T}.Value"/> via an <paramref name="adjuster"/> action where the <paramref name="result"/> is <see cref="Result{T}.IsSuccess"/>
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="adjuster">The adjusting action (invoked only where the underlying <see cref="Result{T}.Value"/> is not <c>null</c>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AdjustsAsync<T>(this Result<T> result, Func<T, Task> adjuster)
-        {
-            if (result.IsSuccess && result.Value is not null)
-                await adjuster(result.Value).ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Enables adjustment (changes) to a <see cref="Result{T}.Value"/> via an <paramref name="adjuster"/> action where the <paramref name="result"/> is <see cref="Result{T}.IsSuccess"/>
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="adjuster">The adjusting action (invoked only where the underlying <see cref="Result{T}.Value"/> is not <c>null</c>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> AdjustsAsync<T>(this Task<Result<T>> result, Func<T, Task> adjuster)
-        {
-            var r = await result.ConfigureAwait(false);
-            return await r.AdjustsAsync(adjuster).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Checks whether the user has the required <paramref name="permission"/> (see <see cref="ExecutionContext.UserIsAuthorized(string)"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>; where <c>null</c> will attempt to use <see cref="ExecutionContext.Current"/> where <see cref="ExecutionContext.HasCurrent"/>.</param>
-        /// <param name="permission">The permission to validate.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public static TResult UserIsAuthorized<TResult>(this TResult result, ExecutionContext executionContext, string permission) where TResult : IResult
-        {
-            if (result.IsFailure)
-                return result;
-
-            executionContext ??= ExecutionContext.HasCurrent ? ExecutionContext.Current : executionContext.ThrowIfNull(nameof(executionContext));
-            var r = executionContext.UserIsAuthorized(permission);
-            return r.IsSuccess ? result : (TResult)result.ToFailure(r.Error);
-        }
-
-        /// <summary>
-        /// Checks whether the user has the required permission as a combination of <paramref name="entity"/> and <paramref name="action"/> (see <see cref="ExecutionContext.UserIsAuthorized(string, string)"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>; where <c>null</c> will attempt to use <see cref="ExecutionContext.Current"/> where <see cref="ExecutionContext.HasCurrent"/>.</param>
-        /// <param name="entity">The entity name.</param>
-        /// <param name="action">The action name.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public static TResult UserIsAuthorized<TResult>(this TResult result, ExecutionContext executionContext, string entity, string action) where TResult : IResult
-        {
-            if (result.IsFailure)
-                return result;
-
-            executionContext ??= ExecutionContext.HasCurrent ? ExecutionContext.Current : executionContext.ThrowIfNull(nameof(executionContext));
-            var r = executionContext.UserIsAuthorized(entity, action);
-            return r.IsSuccess ? result : (TResult)result.ToFailure(r.Error);
-        }
-
-        /// <summary>
-        /// Checks whether the user has the required <paramref name="permission"/> (see <see cref="ExecutionContext.UserIsAuthorized(string)"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="permission">The permission to validate.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public static TResult UserIsAuthorized<TResult>(this TResult result, string permission) where TResult : IResult => UserIsAuthorized(result, (ExecutionContext)null!, permission);
-
-        /// <summary>
-        /// Checks whether the user has the required permission as a combination of <paramref name="entity"/> and <paramref name="action"/> (see <see cref="ExecutionContext.UserIsAuthorized(string, string)"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="entity">The entity name.</param>
-        /// <param name="action">The action name.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public static TResult UserIsAuthorized<TResult>(this TResult result, string entity, string action) where TResult : IResult => UserIsAuthorized(result, null!, entity, action);
-
-        /// <summary>
-        /// Checks whether the user is in specified <paramref name="role"/> (see <see cref="ExecutionContext.UserIsInRole(string)"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="executionContext">The <see cref="ExecutionContext"/>; where <c>null</c> will attempt to use <see cref="ExecutionContext.Current"/> where <see cref="ExecutionContext.HasCurrent"/>.</param>
-        /// <param name="role">The role name.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public static TResult UserIsInRole<TResult>(this TResult result, ExecutionContext executionContext, string role) where TResult : IResult
-        {
-            if (result.IsFailure)
-                return result;
-
-            executionContext ??= ExecutionContext.HasCurrent ? ExecutionContext.Current : executionContext.ThrowIfNull(nameof(executionContext));
-            var r = executionContext.UserIsInRole(role);
-            return r.IsSuccess ? result : (TResult)result.ToFailure(r.Error);
-        }
-
-        /// <summary>
-        /// Checks whether the user is in specified <paramref name="role"/> (see <see cref="ExecutionContext.UserIsInRole(string)"/>).
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="IResult"/>.</param>
-        /// <param name="role">The role name.</param>
-        /// <returns>The resulting <see cref="IResult"/>.</returns>
-        public static TResult UserIsInRole<TResult>(this TResult result, string role) where TResult : IResult => UserIsInRole(result, null!, role);
+        ThrowIfNull(result);
+        func.ThrowIfNull(name ?? nameof(func));
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Results/ThenExtensions.cs b/src/CoreEx/Results/ThenExtensions.cs
deleted file mode 100644
index ebd05d44..00000000
--- a/src/CoreEx/Results/ThenExtensions.cs
+++ /dev/null
@@ -1,1136 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
-{
-    public static partial class ResultsExtensions
-    {
-        #region Synchronous
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Then(this Result result, Action action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            if (result.IsSuccess)
-                action();
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result Then(this Result result, Func<Result> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Then<T>(this Result<T> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            if (result.IsSuccess)
-                action(result.Value);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Then<T>(this Result<T> result, Func<T, T> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? Result<T>.Ok(func(result.Value)) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Then<T>(this Result<T> result, Func<T, Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> Then<T>(this Result<T> result, Func<T, Result> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value).Combine(result) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> ThenAs<T>(this Result result, Func<T> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? Result<T>.Ok(func()) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> ThenAs<T>(this Result result, Func<Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result ThenAs<T>(this Result<T> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            if (result.IsSuccess)
-                action(result.Value);
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result ThenAs<T>(this Result<T> result, Func<T, Result> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> ThenAs<T, U>(this Result<T> result, Func<T, U> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? Result<U>.Ok(func(result.Value)) : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> ThenAs<T, U>(this Result<T> result, Func<T, Result<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value) : result.Bind<T, U>();
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result ThenFrom(this Result result, Func<IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func().ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> ThenFrom<T>(this Result<T> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value).ToResult<T>() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> ThenFrom<T>(this Result<T> result, Func<T, IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value).ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result ThenFromAs<T>(this Result<T> result, Func<T, IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value).ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> ThenFromAs<T>(this Result result, Func<ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func().ToResult<T>() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> ThenFromAs<T>(this Result result, Func<IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func().ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> ThenFromAs<T, U>(this Result<T> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value).ToResult<U>() : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> ThenFromAs<T, U>(this Result<T> result, Func<T, IToResult<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? func(result.Value).ToResult() : result.Bind<T, U>();
-        }
-
-        #endregion
-
-        #region AsyncResult
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Then(this Task<Result> result, Action action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.Then(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> Then(this Task<Result> result, Func<Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Then(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.Then(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Func<T, T> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Then(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Func<T, Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Then(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> Then<T>(this Task<Result<T>> result, Func<T, Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.Then(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAs<T>(this Task<Result> result, Func<T> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAs<T>(this Task<Result> result, Func<Result<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="action">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAs<T>(this Task<Result<T>> result, Action<T> action)
-        {
-            ThrowIfNull(result, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.ThenAs(action);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAs<T>(this Task<Result<T>> result, Func<T, Result> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> ThenAs<T, U>(this Task<Result<T>> result, Func<T, U> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenAs<T, U>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> ThenAs<T, U>(this Task<Result<T>> result, Func<T, Result<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenAs<T, U>(func);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenFrom(this Task<Result> result, Func<IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFrom(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFrom<T>(this Task<Result<T>> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFrom(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFrom<T>(this Task<Result<T>> result, Func<T, IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFrom(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenFromAs<T>(this Task<Result<T>> result, Func<T, IToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFromAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAs<T>(this Task<Result> result, Func<ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFromAs<T>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAs<T>(this Task<Result> result, Func<IToResult<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFromAs(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> ThenFromAs<T, U>(this Task<Result<T>> result, Func<T, ITypedToResult> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFromAs<T, U>(func);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> ThenFromAs<T, U>(this Task<Result<T>> result, Func<T, IToResult<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return r.ThenFromAs<T, U>(func);
-        }
-
-        #endregion
-
-        #region AsyncFunc
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAsync(this Result result, Func<Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsSuccess)
-                await func().ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAsync(this Result result, Func<Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? await func().ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsSuccess)
-                await func(result.Value).ConfigureAwait(false);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? Result<T>.Ok(await func(result.Value).ConfigureAwait(false)) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? await func(result.Value).ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsync<T>(this Result<T> result, Func<T, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).Combine(result) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsAsync<T>(this Result result, Func<Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? Result<T>.Ok(await func().ConfigureAwait(false)) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsAsync<T>(this Result result, Func<Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? await func().ConfigureAwait(false) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAsAsync<T>(this Result<T> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsSuccess)
-                await func(result.Value).ConfigureAwait(false);
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAsAsync<T>(this Result<T> result, Func<T, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? await func(result.Value).ConfigureAwait(false) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> ThenAsAsync<T, U>(this Result<T> result, Func<T, Task<U>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? Result<U>.Ok(await func(result.Value).ConfigureAwait(false)) : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> ThenAsAsync<T, U>(this Result<T> result, Func<T, Task<Result<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? await func(result.Value).ConfigureAwait(false) : result.Bind<T, U>();
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenFromAsync(this Result result, Func<Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func().ConfigureAwait(false)).ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsync<T>(this Result<T> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).ToResult<T>() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsync<T>(this Result<T> result, Func<T, Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).ToResult() : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenFromAsAsync<T>(this Result<T> result, Func<T, Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsAsync<T>(this Result result, Func<Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func().ConfigureAwait(false)).ToResult<T>() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsAsync<T>(this Result result, Func<Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func().ConfigureAwait(false)).ToResult() : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> ThenFromAsAsync<T, U>(this Result<T> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).ToResult<U>() : result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> ThenFromAsAsync<T, U>(this Result<T> result, Func<T, Task<IToResult<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            return result.IsSuccess ? (await func(result.Value).ConfigureAwait(false)).ToResult() : result.Bind<T, U>();
-        }
-
-        #endregion
-
-        #region AsyncBoth
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAsync(this Task<Result> result, Func<Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenAsync(this Task<Result> result, Func<Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ThenAsync<T>(this Task<Result<T>> result, Func<T, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> ThenAsAsync<T>(this Task<Result> result, Func<Task<T>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> ThenAsAsync<T>(this Task<Result> result, Func<Task<Result<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> ThenAsAsync<T>(this Task<Result<T>> result, Func<T, Task> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> ThenAsAsync<T>(this Task<Result<T>> result, Func<T, Task<Result>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> ThenAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<U>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> ThenAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<Result<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenAsAsync(func).ConfigureAwait(false);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenFromAsync(this Task<Result> result, Func<Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsync<T>(this Task<Result<T>> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsync<T>(this Task<Result<T>> result, Func<T, Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ThenFromAsAsync<T>(this Task<Result<T>> result, Func<T, Task<IToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsAsync<T>(this Task<Result> result, Func<Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsAsync<T>(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> ThenFromAsAsync<T>(this Task<Result> result, Func<Task<IToResult<T>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsAsync(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> ThenFromAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<ITypedToResult>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsAsync<T, U>(func).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="func">The function to invoke.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> ThenFromAsAsync<T, U>(this Task<Result<T>> result, Func<T, Task<IToResult<U>>> func)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.ThenFromAsAsync<T, U>(func).ConfigureAwait(false);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Results/WhenExtensions.cs b/src/CoreEx/Results/WhenExtensions.cs
deleted file mode 100644
index a6db36d8..00000000
--- a/src/CoreEx/Results/WhenExtensions.cs
+++ /dev/null
@@ -1,1564 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Results
-{
-    public static partial class ResultsExtensions
-    {
-        #region Synchronous
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="action">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result When(this Result result, Func<bool> condition, Action action, Action? otherwise = null)
-        {
-            ThrowIfNull(result, condition, action, nameof(action));
-            if (result.IsSuccess)
-            {
-                if (condition())
-                    action();
-                else
-                    otherwise?.Invoke();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result When(this Result result, Func<bool> condition, Func<Result> func, Func<Result>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition())
-                return func();
-            else
-                return otherwise is null ? result : otherwise();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="action">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, action, nameof(action));
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    action(result.Value);
-                else
-                    otherwise?.Invoke(result.Value);
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Func<T, T> func, Func<T, T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return Result<T>.Ok(func(result.Value));
-            else
-                return otherwise is null ? result : Result<T>.Ok(otherwise(result.Value));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Func<T, Result<T>> func, Func<T, Result<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return func(result.Value);
-            else
-                return otherwise is null ? result : otherwise(result.Value);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>  and <paramref name="condition"/> evaluates to <c>true</c> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> When<T>(this Result<T> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return func(result.Value).Combine(result);
-            else
-                return otherwise is null ? result : func(result.Value).Combine(result);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> WhenAs<T>(this Result result, Func<bool> condition, Func<T> func, Func<T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T>();
-
-            if (condition())
-                return Result<T>.Ok(func());
-            else
-                return otherwise is null ? result.Bind<T>() : Result<T>.Ok(otherwise());
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<T> WhenAs<T>(this Result result, Func<bool> condition, Func<Result<T>> func, Func<Result<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T>();
-
-            if (condition())
-                return func();
-            else
-                return otherwise is null ? result.Bind<T>() : otherwise();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="action">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result WhenAs<T>(this Result<T> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, action, nameof(action));
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    action(result.Value);
-                else
-                    otherwise?.Invoke(result.Value);
-            }
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result WhenAs<T>(this Result<T> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind();
-
-            if (condition(result.Value))
-                return func(result.Value);
-            else
-                return otherwise is null ? result.Bind() : otherwise(result.Value);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> WhenAs<T, U>(this Result<T> result, Predicate<T> condition, Func<T, U> func, Func<T, U>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T, U>();
-
-            if (condition(result.Value))
-                return Result<U>.Ok(func(result.Value));
-            else
-                return otherwise is null ? result.Bind<T, U>() : Result<U>.Ok(otherwise(result.Value));
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static Result<U> WhenAs<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Result<U>> func, Func<T, Result<U>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T, U>();
-
-            if (condition(result.Value))
-                return func(result.Value);
-            else
-                return otherwise is null ? result.Bind<T, U>() : otherwise(result.Value);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result WhenFrom(this Result result, Func<bool> condition, Func<IToResult> func, Func<IToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition())
-                return func().ToResult();
-            else
-                return otherwise is null ? result : otherwise().ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> WhenFrom<T>(this Result<T> result, Predicate<T> condition, Func<T, ITypedToResult> func, Func<T, ITypedToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return func(result.Value).ToResult<T>();
-            else
-                return otherwise is null ? result : otherwise(result.Value).ToResult<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> WhenFrom<T>(this Result<T> result, Predicate<T> condition, Func<T, IToResult<T>> func, Func<T, IToResult<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return func(result.Value).ToResult();
-            else
-                return otherwise is null ? result : otherwise(result.Value).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result WhenFromAs<T>(this Result<T> result, Predicate<T> condition, Func<T, IToResult> func, Func<T, IToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind();
-
-            if (condition(result.Value))
-                return func(result.Value).ToResult();
-            else
-                return otherwise is null ? result.Bind() : otherwise(result.Value).ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> WhenFromAs<T>(this Result result, Func<bool> condition, Func<ITypedToResult> func, Func<ITypedToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T>();
-
-            if (condition())
-                return func().ToResult<T>();
-            else
-                return otherwise is null ? result.Bind<T>() : otherwise().ToResult<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<T> WhenFromAs<T>(this Result result, Func<bool> condition, Func<IToResult<T>> func, Func<IToResult<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T>();
-
-            if (condition())
-                return func().ToResult();
-            else
-                return otherwise is null ? result.Bind<T>() : otherwise().ToResult();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> WhenFromAs<T, U>(this Result<T> result, Predicate<T> condition, Func<T, ITypedToResult> func, Func<T, ITypedToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T, U>();
-
-            if (condition(result.Value))
-                return func(result.Value).ToResult<U>();
-            else
-                return otherwise is null ? result.Bind<T, U>() : otherwise(result.Value).ToResult<U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static Result<U> WhenFromAs<T, U>(this Result<T> result, Predicate<T> condition, Func<T, IToResult<U>> func, Func<T, IToResult<U>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T, U>();
-
-            if (condition(result.Value))
-                return func(result.Value).ToResult();
-            else
-                return otherwise is null ? result.Bind<T, U>() : otherwise(result.Value).ToResult();
-        }
-
-        #endregion
-
-        #region AsyncResult
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="action">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> When(this Task<Result> result, Func<bool> condition, Action action, Action? otherwise = null)
-        {
-            ThrowIfNull(result, condition, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.When(condition, action, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> When(this Task<Result> result, Func<bool> condition, Func<Result> func, Func<Result>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.When(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="action">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.When(condition, action, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, T> func, Func<T, T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.When(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result<T>> func, Func<T, Result<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.When(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> When<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.When(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAs<T>(this Task<Result> result, Func<bool> condition, Func<T> func, Func<T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenAs(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAs<T>(this Task<Result> result, Func<bool> condition, Func<Result<T>> func, Func<Result<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenAs(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="action"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="action">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAs<T>(this Task<Result<T>> result, Predicate<T> condition, Action<T> action, Action<T>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, action, nameof(action));
-            var r = await result.ConfigureAwait(false);
-            return r.WhenAs(condition, action, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAs<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result> func, Func<T, Result>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenAs(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> WhenAs<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, U> func, Func<T, U>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenAs(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The <see cref="Func{T, TResult}"/> to invoke.</param>
-        /// <param name="otherwise">The <see cref="Func{T, TResult}"/> to invoke where condition/predicate is <c>false</c> (where <paramref name="result"/> is also <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> WhenAs<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Result<U>> func, Func<T, Result<U>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenAs(condition, func, otherwise);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenFrom(this Task<Result> result, Func<bool> condition, Func<IToResult> func, Func<IToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFrom(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFrom<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, ITypedToResult> func, Func<T, ITypedToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFrom(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFrom<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, IToResult<T>> func, Func<T, IToResult<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFrom(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenFromAs<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, IToResult> func, Func<T, IToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFromAs(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAs<T>(this Task<Result> result, Func<bool> condition, Func<ITypedToResult> func, Func<ITypedToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFromAs<T>(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAs<T>(this Task<Result> result, Func<bool> condition, Func<IToResult<T>> func, Func<IToResult<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFromAs(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> WhenFromAs<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, ITypedToResult> func, Func<T, ITypedToResult>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFromAs<T, U>(condition, func, otherwise);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> WhenFromAs<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, IToResult<U>> func, Func<T, IToResult<U>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return r.WhenFromAs(condition, func, otherwise);
-        }
-
-        #endregion
-
-        #region AsyncFunc
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAsync(this Result result, Func<bool> condition, Func<Task> func, Func<Task>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition())
-                    await func().ConfigureAwait(false);
-                else
-                {
-                    if (otherwise is not null)
-                        await otherwise().ConfigureAwait(false);
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAsync(this Result result, Func<bool> condition, Func<Task<Result>> func, Func<Task<Result>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition())
-                return await func().ConfigureAwait(false);
-            else
-                return otherwise is not null ? await otherwise().ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    await func(result.Value).ConfigureAwait(false);
-                else
-                {
-                    if (otherwise is not null)
-                        await otherwise(result.Value).ConfigureAwait(false);
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<T>> func, Func<T, Task<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;  
-
-            if (condition(result.Value))
-                return Result<T>.Ok(await func(result.Value).ConfigureAwait(false));
-            else
-                return otherwise is not null ? Result<T>.Ok(await otherwise(result.Value).ConfigureAwait(false)) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result<T>>> func, Func<T, Task<Result<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return await func(result.Value).ConfigureAwait(false);
-            else
-                return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
-        {
-            ThrowIfNull(result, func);
-            if (result.IsFailure)
-                return result;
-
-            if (condition(result.Value))
-                return await func(result.Value).ConfigureAwait(false);
-            else
-                return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsAsync<T>(this Result result, Func<bool> condition, Func<Task<T>> func, Func<Task<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T>();
-
-            if (condition())
-                return Result<T>.Ok(await func().ConfigureAwait(false));
-            else
-                return otherwise is not null ? Result<T>.Ok(await otherwise().ConfigureAwait(false)) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsAsync<T>(this Result result, Func<bool> condition, Func<Task<Result<T>>> func, Func<Task<Result<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T>();
-
-            if (condition())
-                return await func().ConfigureAwait(false);
-            else
-                return otherwise is not null ? await otherwise().ConfigureAwait(false) : result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAsAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    await func(result.Value).ConfigureAwait(false);
-                else if (otherwise is not null)
-                    await otherwise(result.Value).ConfigureAwait(false);
-            }
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAsAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind();
-
-            if (condition(result.Value))
-                return await func(result.Value).ConfigureAwait(false);
-            else
-                return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> WhenAsAsync<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Task<U>> func, Func<T, Task<U>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    return Result<U>.Ok(await func(result.Value).ConfigureAwait(false));
-                else if (otherwise is not null)
-                    return Result<U>.Ok(await otherwise(result.Value).ConfigureAwait(false));
-            }
-
-            return result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<U>> WhenAsAsync<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Task<Result<U>>> func, Func<T, Task<Result<U>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsFailure)
-                return result.Bind<T, U>();
-
-            if (condition(result.Value))
-                return await func(result.Value).ConfigureAwait(false);
-            else
-                return otherwise is not null ? await otherwise(result.Value).ConfigureAwait(false) : result.Bind<T, U>();
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenFromAsync(this Result result, Func<bool> condition, Func<Task<IToResult>> func, Func<Task<IToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition())
-                    return (await func().ConfigureAwait(false)).ToResult();
-                else if (otherwise is not null)
-                    return (await otherwise().ConfigureAwait(false)).ToResult();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<ITypedToResult>> func, Func<T, Task<ITypedToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    return (await func(result.Value).ConfigureAwait(false)).ToResult<T>();
-                else if (otherwise is not null)
-                    return (await otherwise(result.Value).ConfigureAwait(false)).ToResult<T>();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<IToResult<T>>> func, Func<T, Task<IToResult<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    return (await func(result.Value).ConfigureAwait(false)).ToResult();
-                else if (otherwise is not null)
-                    return (await otherwise(result.Value).ConfigureAwait(false)).ToResult();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenFromAsAsync<T>(this Result<T> result, Predicate<T> condition, Func<T, Task<IToResult>> func, Func<T, Task<IToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    return (await func(result.Value).ConfigureAwait(false)).ToResult();
-                else if (otherwise is not null)
-                    return (await otherwise(result.Value).ConfigureAwait(false)).ToResult();
-            }
-
-            return result.Bind();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsAsync<T>(this Result result, Func<bool> condition, Func<Task<ITypedToResult>> func, Func<Task<ITypedToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition())
-                    return (await func().ConfigureAwait(false)).ToResult<T>();
-                else if (otherwise is not null)
-                    return (await otherwise().ConfigureAwait(false)).ToResult<T>();
-            }
-
-            return result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsAsync<T>(this Result result, Func<bool> condition, Func<Task<IToResult<T>>> func, Func<Task<IToResult<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition())
-                    return (await func().ConfigureAwait(false)).ToResult();
-                else if (otherwise is not null)
-                    return (await otherwise().ConfigureAwait(false)).ToResult();
-            }
-
-            return result.Bind<T>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> WhenFromAsAsync<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Task<ITypedToResult>> func, Func<T, Task<ITypedToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    return (await func(result.Value).ConfigureAwait(false)).ToResult<U>();
-                else if (otherwise is not null)
-                    return (await otherwise(result.Value).ConfigureAwait(false)).ToResult<U>();
-            }
-
-            return result.Bind<T, U>();
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> WhenFromAsAsync<T, U>(this Result<T> result, Predicate<T> condition, Func<T, Task<IToResult<U>>> func, Func<T, Task<IToResult<U>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            if (result.IsSuccess)
-            {
-                if (condition(result.Value))
-                    return (await func(result.Value).ConfigureAwait(false)).ToResult();
-                else if (otherwise is not null)
-                    return (await otherwise(result.Value).ConfigureAwait(false)).ToResult();
-            }
-
-            return result.Bind<T, U>();
-        }
-
-        #endregion
-
-        #region AsyncBoth
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAsync(this Task<Result> result, Func<bool> condition, Func<Task> func, Func<Task>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenAsync(this Task<Result> result, Func<bool> condition, Func<Task<Result>> func, Func<Task<Result>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<T>> func, Func<T, Task<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result<T>>> func, Func<T, Task<Result<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (the <paramref name="result"/> <see cref="Result{T}.Value"/> will not be lost).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> WhenAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
-        {
-            ThrowIfNull(result, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> WhenAsAsync<T>(this Task<Result> result, Func<bool> condition, Func<Task<T>> func, Func<Task<T>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<T>> WhenAsAsync<T>(this Task<Result> result, Func<bool> condition, Func<Task<Result<T>>> func, Func<Task<Result<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> WhenAsAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task> func, Func<T, Task>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result"/>.</return>
-        public static async Task<Result> WhenAsAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result>> func, Func<T, Task<Result>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> WhenAsAsync<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<U>> func, Func<T, Task<U>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c> (as new <see cref="Result"/> <see cref="Type"/>).
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <return>The resulting <see cref="Result{T}"/>.</return>
-        public static async Task<Result<U>> WhenAsAsync<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<Result<U>>> func, Func<T, Task<Result<U>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /* IToResult */
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenFromAsync(this Task<Result> result, Func<bool> condition, Func<Task<IToResult>> func, Func<Task<IToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<ITypedToResult>> func, Func<T, Task<ITypedToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<IToResult<T>>> func, Func<T, Task<IToResult<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> WhenFromAsAsync<T>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<IToResult>> func, Func<T, Task<IToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsAsync<T>(this Task<Result> result, Func<bool> condition, Func<Task<ITypedToResult>> func, Func<Task<ITypedToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsAsync<T>(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<T>> WhenFromAsAsync<T>(this Task<Result> result, Func<bool> condition, Func<Task<IToResult<T>>> func, Func<Task<IToResult<T>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> WhenFromAsAsync<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<ITypedToResult>> func, Func<T, Task<ITypedToResult>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsAsync<T, U>(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Executes the <paramref name="func"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/> and <paramref name="condition"/> evaluates to <c>true</c>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="U">The output (resulting) <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="condition">The condition/predicate that must also be evaluated.</param>
-        /// <param name="func">The function to invoke where <paramref name="condition"/> is <c>true</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <param name="otherwise">The function to invoke where <paramref name="condition"/> is <c>false</c> (where <paramref name="result"/> is <see cref="Result.IsSuccess"/>).</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result<U>> WhenFromAsAsync<T, U>(this Task<Result<T>> result, Predicate<T> condition, Func<T, Task<IToResult<U>>> func, Func<T, Task<IToResult<U>>>? otherwise = null)
-        {
-            ThrowIfNull(result, condition, func);
-            var r = await result.ConfigureAwait(false);
-            return await r.WhenFromAsAsync(condition, func, otherwise).ConfigureAwait(false);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Check parameters and throw where null.
-        /// </summary>
-        private static void ThrowIfNull(object result, object condition, object func, string? name = null)
-        {
-            result.ThrowIfNull(nameof(result));
-            condition.ThrowIfNull(nameof(condition));
-            func.ThrowIfNull(name ?? nameof(func));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Runtime.cs b/src/CoreEx/Runtime.cs
new file mode 100644
index 00000000..8230052e
--- /dev/null
+++ b/src/CoreEx/Runtime.cs
@@ -0,0 +1,26 @@
+namespace CoreEx;
+
+/// <summary>
+/// Provides standardized runtime utility capabilities.
+/// </summary>
+public static class Runtime
+{
+    /// <summary>
+    /// Gets a <see cref="DateTimeOffset"/> value whose date and time are set to the current Coordinated Universal Time (UTC) date and time and whose offset is Zero, according to either the <see cref="ExecutionContext.Current"/>
+    /// <see cref="ExecutionContext.Timestamp"/> where <see cref="ExecutionContext.HasCurrent"/>; otherwise, <see cref="TimeProvider.System"/> <see cref="TimeProvider.GetUtcNow"/>.
+    /// </summary>
+    public static DateTimeOffset UtcNow => ExecutionContext.TryGetCurrent(out var executionContext) ? executionContext.Timestamp : TimeProvider.System.GetUtcNow();
+
+    /// <summary>
+    /// Gets a new <see cref="Guid"/> value using the <see cref="IdentifierGenerator.Current"/> <see cref="IIdentifierGenerator"/>.
+    /// </summary>
+    /// <returns>A <see cref="Guid"/>.</returns>
+    /// <remarks><b>Note:</b> It is recommended that the <see cref="IdentifierGenerator.AssignIdentifierAsync{TFor}(TFor)"/> method is used for assigning identifiers to entities.</remarks>
+    public static Guid NewGuid() => IdentifierGenerator.Current.GenerateGuid();
+
+    /// <summary>
+    /// Gets a new <see cref="Guid"/> value (see <see cref="NewGuid"/>) that is a formatted as a <see cref="string"/>.
+    /// </summary>
+    /// <remarks><b>Note:</b> It is recommended that the <see cref="IdentifierGenerator.AssignIdentifierAsync{TFor}(TFor)"/> method is used for assigning identifiers to entities.</remarks>
+    public static string NewId() => IdentifierGenerator.Current.GenerateGuid().ToString();
+}
\ No newline at end of file
diff --git a/src/CoreEx/Schemas/IReadOnlySchemaVersion.cs b/src/CoreEx/Schemas/IReadOnlySchemaVersion.cs
new file mode 100644
index 00000000..41b16d1b
--- /dev/null
+++ b/src/CoreEx/Schemas/IReadOnlySchemaVersion.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Schemas;
+
+/// <summary>
+/// Enables a read-only <see cref="SchemaVersion"/>.
+/// </summary>
+public interface IReadOnlySchemaVersion
+{
+    /// <summary>
+    /// Gets the schema <see cref="Version"/>.
+    /// </summary>
+    string? SchemaVersion { get; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Schemas/ISchemaVersion.cs b/src/CoreEx/Schemas/ISchemaVersion.cs
new file mode 100644
index 00000000..c9333948
--- /dev/null
+++ b/src/CoreEx/Schemas/ISchemaVersion.cs
@@ -0,0 +1,15 @@
+namespace CoreEx.Schemas;
+
+/// <summary>
+/// Enables a mutable <see cref="SchemaVersion"/>.
+/// </summary>
+public interface ISchemaVersion : IReadOnlySchemaVersion
+{
+    /// <inheritdoc/>
+    string? IReadOnlySchemaVersion.SchemaVersion => SchemaVersion;
+
+    /// <summary>
+    /// Gets or sets the schema <see cref="Version"/>.
+    /// </summary>
+    new string? SchemaVersion { get; set; }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Schemas/README.md b/src/CoreEx/Schemas/README.md
new file mode 100644
index 00000000..7cb8b97e
--- /dev/null
+++ b/src/CoreEx/Schemas/README.md
@@ -0,0 +1,30 @@
+# CoreEx.Schemas
+
+> Provides `[Schema]` attribute and `ISchemaVersion` interfaces for annotating entities with schema name and version metadata, enabling versioned event payload and API schema identification.
+
+## Overview
+
+`CoreEx.Schemas` is a small but focused namespace that defines the schema versioning contract used when publishing or consuming typed events and API payloads. The `[SchemaAttribute]` on an entity class carries a `Name`, `Version`, and optional `Description` — metadata that event publishers include in the event envelope so consumers can route and deserialize payloads correctly.
+
+`Schema.TryGetMetadata<TEntity>()` provides a zero-allocation lookup of the attribute, returning a default `SchemaAttribute` (version `1.0`) where none is explicitly declared, so all entities have a deterministic schema version without requiring every class to be annotated.
+
+## Key capabilities
+
+- 🏷️ **Schema annotation**: `[SchemaAttribute]` marks an entity with a `Name` (defaults to the type name) and `Version` (defaults to `1.0`), carried into event envelopes by the event publishing infrastructure.
+- 🔢 **Default version**: `Schema.DefaultVersion` is `Version(1, 0)`, returned automatically for un-annotated types so that all entities participate in schema versioning.
+- 🔍 **Attribute lookup**: `Schema.TryGetMetadata<TEntity>()` and `Schema.TryGetMetadata(Type)` provide a single, cached lookup for the attribute, returning a defaulted instance when the attribute is absent.
+- 🔒 **Read/write split**: `ISchemaVersion` (mutable) and `IReadOnlySchemaVersion` (read-only) allow infrastructure to stamp schema version onto event payloads while preventing consumer code from inadvertently mutating it.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`Schema`](./Schema.cs)** | Static utility: `DefaultVersion` (`1.0`), `TryGetMetadata<TEntity>()` / `TryGetMetadata(Type)` for attribute lookup with defaulting. |
+| **[`SchemaAttribute`](./SchemaAttribute.cs)** | Attribute applied to entity classes: `Name` (defaults to type name), `Version` (`System.Version`, defaults to `1.0`), and `Description`. |
+| [`ISchemaVersion`](./ISchemaVersion.cs) | Mutable interface adding `SchemaVersion` property for event payload stamping. |
+| [`IReadOnlySchemaVersion`](./IReadOnlySchemaVersion.cs) | Read-only counterpart to `ISchemaVersion`. |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - Root package; `EventData` and event-publishing infrastructure consume schema metadata from `[SchemaAttribute]` when building event envelopes.
+- **[`CoreEx.Events`](../../CoreEx.Events/README.md)** - Event publishers read `[SchemaAttribute]` via `Schema.TryGetMetadata` to populate the `EventDataSchemaVersion` envelope property.
\ No newline at end of file
diff --git a/src/CoreEx/Schemas/Schema.cs b/src/CoreEx/Schemas/Schema.cs
new file mode 100644
index 00000000..88736e8c
--- /dev/null
+++ b/src/CoreEx/Schemas/Schema.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Schemas;
+
+/// <summary>
+/// Provides schema metadata utility.
+/// </summary>
+public static class Schema
+{
+    /// <summary>
+    /// Gets the default version being '<c>1.0</c>'.
+    /// </summary>
+    public static readonly Version DefaultVersion = new(1, 0);
+
+    /// <summary>
+    /// Gets the <see cref="DefaultVersion"/> as a formatted <see cref="string"/>.
+    /// </summary>
+    public static readonly string DefaultVersionString = DefaultVersion.ToString();
+
+    /// <summary>
+    /// Tries to get the configured <see cref="SchemaAttribute"/> for the specified <typeparamref name="TEntity"/> (defaults where not found).
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <param name="metadata">The configured <see cref="SchemaAttribute"/> metadata where found; otherwise, a defaulted instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetMetadata<TEntity>(out SchemaAttribute metadata) => TryGetMetadata(typeof(TEntity), out metadata);
+
+    /// <summary>
+    /// Tries to get the configured <see cref="SchemaAttribute"/> metadata for the specified <paramref name="type"/> (defaults where not found).
+    /// </summary>
+    /// <param name="type">The entity <see cref="Type"/>.</param>
+    /// <param name="metadata">The configured <see cref="SchemaAttribute"/> where found; otherwise, a defaulted instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    public static bool TryGetMetadata(Type type, out SchemaAttribute metadata) => SchemaAttribute.TryGetCustomAttribute(type, out metadata);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Schemas/SchemaAttribute.cs b/src/CoreEx/Schemas/SchemaAttribute.cs
new file mode 100644
index 00000000..652e58a1
--- /dev/null
+++ b/src/CoreEx/Schemas/SchemaAttribute.cs
@@ -0,0 +1,74 @@
+namespace CoreEx.Schemas;
+
+/// <summary>
+/// Provides the latest schema metadata for an entity.
+/// </summary>
+/// <param name="version">The entity schema <see cref="System.Version"/>.</param>
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+public class SchemaAttribute(string? version = null) : Attribute
+{
+    private static readonly ConcurrentDictionary<Type, Lazy<(bool, SchemaAttribute)>> _cache = new();
+
+    private string? _schema;
+    private string? _versionString;
+
+    /// <summary>
+    /// Gets the latest entity schema <see cref="System.Version"/>.
+    /// </summary>
+    /// <remarks>Defaults to <see cref="Schema.DefaultVersion"/>.</remarks>
+    public Version Version { get; } = ParseVersion(version);
+
+    /// <summary>
+    /// Gets the <see cref="Version"/> as a formatted <see cref="string"/>.
+    /// </summary>
+    public string VersionString => _versionString ??= Version.ToString();
+
+    /// <summary>
+    /// Gets or sets the entity name.
+    /// </summary>
+    /// <remarks>This defaults to the entity <see cref="Type"/> <see cref="MemberInfo.Name"/>.</remarks>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the entity schema <see cref="Uri"/>.
+    /// </summary>
+    public string? SchemaUri { get => _schema; set => _schema = value is null ? null : new Uri(value, UriKind.RelativeOrAbsolute).ToString(); }
+
+    /// <summary>
+    /// Parses the <paramref name="version"/> into a <see cref="System.Version"/> value.
+    /// </summary>
+    /// <param name="version">The version string.</param>
+    /// <returns>The <see cref="System.Version"/>.</returns>
+    internal static Version ParseVersion(string? version)
+    {
+        if (string.IsNullOrEmpty(version))
+            return Schema.DefaultVersion;
+        else if (version.Contains('.'))
+            return new Version(version);
+        else
+            return new Version(int.Parse(version), 0);
+    }
+
+    /// <summary>
+    /// Tries to get the configured <see cref="SchemaAttribute"/> for the specified <paramref name="type"/>; defaults where not found.
+    /// </summary>
+    /// <param name="type">The entity <see cref="Type"/>.</param>
+    /// <param name="attribute">The configured <see cref="SchemaAttribute"/> where found; otherwise, a defaulted instance.</param>
+    /// <returns><see langword="true"/> where found; otherwise, <see langword="false"/>.</returns>
+    internal static bool TryGetCustomAttribute(Type type, out SchemaAttribute attribute)
+    {
+        (bool exists, SchemaAttribute sa) = _cache.GetOrAdd(type.ThrowIfNull(), type => new Lazy<(bool, SchemaAttribute)>(() =>
+        {
+            var ea = type.GetCustomAttribute<SchemaAttribute>();
+            var exists = ea is not null;
+
+            ea ??= new SchemaAttribute();
+            ea.Name ??= type.Name;
+
+            return (exists, ea);
+        })).Value;
+
+        attribute = sa;
+        return exists;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Security/AuthenticationType.cs b/src/CoreEx/Security/AuthenticationType.cs
new file mode 100644
index 00000000..e705a0d6
--- /dev/null
+++ b/src/CoreEx/Security/AuthenticationType.cs
@@ -0,0 +1,33 @@
+namespace CoreEx.Security;
+
+/// <summary>
+/// Represents the type of authentication used.
+/// </summary>
+/// <remarks>See <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/extensions/authcontext.md"/> for inspiration.</remarks>
+public enum AuthenticationType
+{
+    /// <summary>
+    /// Indicates that the authentication type is not known or not specified.
+    /// </summary>
+    Unknown,
+
+    /// <summary>
+    /// Indicates that the authentication type is unauthenticated; i.e. no authentication has been performed (anonymous).
+    /// </summary>
+    Unauthenticated,
+
+    /// <summary>
+    /// Indicates that the authentication type is application based; i.e. is the end user of an application (e.g. Facebook, Google, etc.).
+    /// </summary>
+    ApplicationUser,
+
+    /// <summary>
+    /// Indicates that the authentication type is identity-provider based; i.e. is a specific user (e.g. username/password, SSO, etc.).
+    /// </summary>
+    AccountUser,
+
+    /// <summary>
+    /// Indicates that the authentication type is system based; i.e. is a service account or system identity (e.g. background service, database, daemon, etc.).
+    /// </summary>
+    SystemUser
+}
\ No newline at end of file
diff --git a/src/CoreEx/Security/AuthenticationUser.cs b/src/CoreEx/Security/AuthenticationUser.cs
new file mode 100644
index 00000000..34071ac4
--- /dev/null
+++ b/src/CoreEx/Security/AuthenticationUser.cs
@@ -0,0 +1,47 @@
+namespace CoreEx.Security;
+
+/// <summary>
+/// Represents a user within the system.
+/// </summary>
+/// <remarks>It is intended that this is extended to enable </remarks>
+public record class AuthenticationUser : IReadOnlyIdentifier<string?>
+{
+    /// <summary>
+    /// Represents an unknown user; i.e. a user that has not been authenticated or the authentication type is not known.
+    /// </summary>
+    public static AuthenticationUser Unknown { get; set; } = new AuthenticationUser { Type = AuthenticationType.Unknown, UserName = nameof(Unknown) };
+
+    /// <summary>
+    /// Represents an anonymous user; i.e. a user that has not been authenticated.
+    /// </summary>
+    public static AuthenticationUser Anonymous { get; set; } = new AuthenticationUser { Type = AuthenticationType.Unauthenticated, UserName = nameof(Anonymous) };
+
+    /// <summary>
+    /// Represents the currently authenticated environment user.
+    /// </summary>
+    public static AuthenticationUser EnvironmentUser { get; set; } = new AuthenticationUser 
+    { 
+        Type = AuthenticationType.AccountUser,
+        Id = Environment.UserDomainName is null ? Environment.UserName : Environment.UserDomainName + "\\" + Environment.UserName,
+        UserName = Environment.UserDomainName is null ? Environment.UserName : Environment.UserDomainName + "\\" + Environment.UserName 
+    };
+
+    /// <summary>
+    /// Gets the type of authentication used for the user.
+    /// </summary>
+    public required AuthenticationType Type { get; init; }
+
+    /// <summary>
+    /// Gets the unique identifier of the user principle; such as email, service account, etc.
+    /// </summary>
+    public string? Id { get; init; }
+
+    /// <summary>
+    /// Gets the user name that is used for the likes of auditing etc.
+    /// </summary>
+    public required string UserName { get; init => field = value.ThrowIfNullOrEmpty(); }
+
+    /// <inheritdoc/>
+    /// <remarks>Returns the <see cref="UserName"/>.</remarks>
+    public override string ToString() => UserName;
+}
\ No newline at end of file
diff --git a/src/CoreEx/Security/README.md b/src/CoreEx/Security/README.md
new file mode 100644
index 00000000..c8a6ed85
--- /dev/null
+++ b/src/CoreEx/Security/README.md
@@ -0,0 +1,27 @@
+# CoreEx.Security
+
+> Provides `AuthenticationUser` — the standardized representation of the authenticated caller — and `AuthenticationType` enum, both surfaced via `ExecutionContext.User` and consumed by change-log stamping and authorization checks.
+
+## Overview
+
+`CoreEx.Security` defines the minimal security identity contract used across the CoreEx runtime. `AuthenticationUser` is a record type that carries the typed identity of the caller (`Id`, `UserName`, `Type`), and is intentionally designed to be extended by consuming applications to add claims, roles, or other authorization context.
+
+Static sentinel instances (`Unknown`, `Anonymous`, `EnvironmentUser`, `System`) cover the common non-user scenarios; the ambient user is accessed through `ExecutionContext.Current.User`, which resolves to `AuthenticationUser.UserName` (or `Id` as fallback). Change-log stamping (`ChangeLog.SetCreatedBy`, `SetUpdatedBy`) uses this value automatically.
+
+## Key capabilities
+
+- 👤 **Standard user identity**: `AuthenticationUser` carries `Id` (string), `UserName`, and `AuthenticationType`; designed for extension to add claims or role membership.
+- 🏷️ **Sentinel users**: Static `Unknown`, `Anonymous`, `EnvironmentUser`, and `System` instances cover unauthenticated, environment-process, and internal system callers; all are replaceable via their static setters.
+- 🔢 **Authentication type enum**: `AuthenticationType` distinguishes `Unknown`, `Unauthenticated`, `AccountUser`, `ServiceAccount`, `System`, and `Certificate`, enabling authorization logic to branch on authentication mechanism.
+- 🔗 **ExecutionContext integration**: `ExecutionContext.UserName` resolves to the current `AuthenticationUser.UserName` and is the value stamped into `ChangeLog.CreatedBy` / `UpdatedBy`.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`AuthenticationUser`](./AuthenticationUser.cs)** | Record carrying the authenticated caller: `Id`, `UserName`, `Type` (`AuthenticationType`); static sentinels `Unknown`, `Anonymous`, `EnvironmentUser`, `System`. |
+| **[`AuthenticationType`](./AuthenticationType.cs)** | Enum: `Unknown`, `Unauthenticated`, `AccountUser`, `ServiceAccount`, `System`, `Certificate`. |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - `ExecutionContext` holds the current `AuthenticationUser` and exposes `UserName`; `ChangeLog` consumes `UserName` for audit stamping.
\ No newline at end of file
diff --git a/src/CoreEx/SystemTime.cs b/src/CoreEx/SystemTime.cs
deleted file mode 100644
index c2a26b3f..00000000
--- a/src/CoreEx/SystemTime.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-
-namespace CoreEx
-{
-    /// <summary>
-    /// Provides the system time in UTC; defaults to <see cref="DateTime.UtcNow"/>.
-    /// </summary>
-    public class SystemTime : ISystemTime
-    {
-        private DateTime? _time;
-
-        /// <summary>
-        /// Gets the default <see cref="SystemTime"/> instance which returns the current <see cref="DateTime.UtcNow"/>. 
-        /// </summary>
-        public static SystemTime Default { get; } = new SystemTime();
-
-        /// <summary>
-        /// Creates a <see cref="SystemTime"/> with a fixed specified <paramref name="time"/>.
-        /// </summary>
-        /// <param name="time">The fixed time (converted to UTC).</param>
-        /// <returns>The fixed <see cref="SystemTime"/>.</returns>
-        /// <remarks>This is generally intended for testing purposes.</remarks>
-        public static SystemTime CreateFixed(DateTime time) => new() { _time = Cleaner.Clean(time, DateTimeTransform.DateTimeUtc) };
-
-        /// <summary>
-        /// Gets the <see cref="ISystemTime"/> instance from the <see cref="ExecutionContext.ServiceProvider"/> where configured; otherwise, returns a new instance of <see cref="SystemTime"/>.
-        /// </summary>
-        /// <returns>The <see cref="ISystemTime"/> using the <see cref="ExecutionContext.ServiceProvider"/> where configured; otherwise, a new instance of <see cref="SystemTime"/>.</returns>
-        public static ISystemTime Get() => ExecutionContext.GetService<ISystemTime>() ?? new SystemTime();
-
-        /// <summary>
-        /// Gets the timestamp for the <see cref="ExecutionContext"/> lifetime; i.e (to enable consistent execution-related timestamping).
-        /// </summary>
-        /// <remarks>Where the <see cref="ExecutionContext.HasCurrent"/> then the <see cref="ExecutionContext.Current"/> <see cref="ExecutionContext.Timestamp"/> will be used; otherwise, will use <see cref="Get"/> <see cref="UtcNow"/> (passed through <see cref="Cleaner.Clean(DateTime)"/>).</remarks>
-        public static DateTime Timestamp => ExecutionContext.HasCurrent ? ExecutionContext.Current.Timestamp : Cleaner.Clean(Get().UtcNow);
-
-        /// <inheritdoc/>
-        public DateTime UtcNow => _time ?? DateTime.UtcNow;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/CloudEventSerializer.cs b/src/CoreEx/Text/Json/CloudEventSerializer.cs
deleted file mode 100644
index ea6ef23a..00000000
--- a/src/CoreEx/Text/Json/CloudEventSerializer.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CloudNative.CloudEvents;
-using CloudNative.CloudEvents.SystemTextJson;
-using CoreEx.Events;
-using Microsoft.Extensions.Options;
-using System;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides the <see cref="Stj.JsonSerializer"/>-based <see cref="IEventSerializer"/>.
-    /// </summary>
-    public class CloudEventSerializer : CloudEventSerializerBase
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CloudEventSerializer"/> class.
-        /// </summary>
-        /// <param name="eventDataFormatter">The <see cref="EventDataFormatter"/>; where <c>null</c> this will default.</param>
-        /// <param name="options">The <see cref="Stj.JsonSerializerOptions"/>; where <c>null</c> this will default.</param>
-        public CloudEventSerializer(EventDataFormatter? eventDataFormatter = null, Stj.JsonSerializerOptions? options = null) : base(eventDataFormatter)
-        {
-            EventDataFormatter.JsonSerializer ??= new JsonSerializer(options);
-            Options = options ?? (Stj.JsonSerializerOptions)EventDataFormatter.JsonSerializer.Options;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="Stj.JsonSerializerOptions"/>.
-        /// </summary>
-        public Stj.JsonSerializerOptions Options { get; }
-
-        /// <inheritdoc/>
-        protected override Task<CloudEvent> DecodeAsync(BinaryData eventData, CancellationToken cancellation = default)
-            => Task.FromResult(new JsonEventFormatter(Options, new Stj.JsonDocumentOptions()).DecodeStructuredModeMessage(eventData, new ContentType(MediaTypeNames.Application.Json), null));
-
-        /// <inheritdoc/>
-        protected override Task<CloudEvent> DecodeAsync<T>(BinaryData eventData, CancellationToken cancellation = default)
-            => Task.FromResult(new JsonEventFormatter<T>(Options, new Stj.JsonDocumentOptions()).DecodeStructuredModeMessage(eventData, new ContentType(MediaTypeNames.Application.Json), null));
-
-        /// <inheritdoc/>
-        protected override Task<BinaryData> EncodeAsync(CloudEvent cloudEvent, CancellationToken cancellation = default)
-            //=> Task.FromResult(new BinaryData(new JsonEventFormatter(Options, new Stj.JsonDocumentOptions()).EncodeStructuredModeMessage(cloudEvent, out var _)));
-            => Task.FromResult(new BinaryData(new InternalFormatter(Options, new Stj.JsonDocumentOptions()).EncodeStructuredModeMessage(cloudEvent, out var _)));
-
-        /// <summary>
-        /// Override the formatting where the <see cref="CloudEvent.Data"/> is a <see cref="BinaryData"/> and the <see cref="CloudEvent.DataContentType"/> is <see cref="MediaTypeNames.Application.Json"/> by assuming already serialized.
-        /// </summary>
-        private class InternalFormatter(Stj.JsonSerializerOptions options, Stj.JsonDocumentOptions jsonDocumentOptions) : JsonEventFormatter(options, jsonDocumentOptions)
-        {
-            /// <inheritdoc/>
-            protected override void EncodeStructuredModeData(CloudEvent cloudEvent, Stj.Utf8JsonWriter writer)
-            {
-                if (cloudEvent.Data is BinaryData bd && cloudEvent.DataContentType == MediaTypeNames.Application.Json)
-                {
-                    writer.WritePropertyName(DataPropertyName);
-                    writer.WriteRawValue(bd, true);
-                }
-                else
-                    base.EncodeStructuredModeData(cloudEvent, writer);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/CollectionResultConverterFactory.cs b/src/CoreEx/Text/Json/CollectionResultConverterFactory.cs
deleted file mode 100644
index 5243a1fa..00000000
--- a/src/CoreEx/Text/Json/CollectionResultConverterFactory.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="ICollectionResult"/> values.
-    /// </summary>
-    public class CollectionResultConverterFactory : JsonConverterFactory
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeof(ICollectionResult).IsAssignableFrom(typeToConvert);
-
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-            => (JsonConverter)Activator.CreateInstance(typeof(JsonValueConverterReferenceData<>).MakeGenericType(typeToConvert))!;
-
-        /// <summary>
-        /// Performs the "actual" JSON value conversion for <see cref="ICollectionResult"/> values.
-        /// </summary>
-        private class JsonValueConverterReferenceData<T> : JsonConverter<T> where T : ICollectionResult, new()
-        {
-            /// <inheritdoc/>
-            public override bool HandleNull => false;
-
-            /// <inheritdoc/>
-            public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                if (reader.TokenType != JsonTokenType.StartArray)
-                    throw new JsonException();
-
-                var cr = new T();
-                cr.Items = (ICollection?)System.Text.Json.JsonSerializer.Deserialize(ref reader, cr.CollectionType, options) ?? throw new InvalidOperationException();
-                return cr;
-            }
-
-            /// <inheritdoc/>
-            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-            {
-                writer.WriteStartArray();
-
-                if (value.Items != null)
-                {
-                    foreach (var item in value.Items)
-                    {
-                        System.Text.Json.JsonSerializer.Serialize(writer, item, value.ItemType, options);
-                    }
-                }
-
-                writer.WriteEndArray();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/CompositeKeyConverterFactory.cs b/src/CoreEx/Text/Json/CompositeKeyConverterFactory.cs
deleted file mode 100644
index 1bba9c2c..00000000
--- a/src/CoreEx/Text/Json/CompositeKeyConverterFactory.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="CompositeKey"/> values.
-    /// </summary>
-    public class CompositeKeyConverterFactory : JsonConverterFactory
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeToConvert == typeof(CompositeKey);
-
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) => new CompositeKeyConverter();
-
-        /// <summary>
-        /// Performs the "actual" JSON value conversion for a <see cref="CompositeKey"/>.
-        /// </summary>
-        private class CompositeKeyConverter : JsonConverter<CompositeKey>
-        {
-            /// <inheritdoc/>
-            public override bool HandleNull => true;
-
-            /// <inheritdoc/>
-            public override CompositeKey Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                if (reader.TokenType == JsonTokenType.Null)
-                    return CompositeKey.Empty;
-
-                if (reader.TokenType != JsonTokenType.StartArray)
-                    throw new JsonException($"Expected {nameof(JsonTokenType.StartArray)} for a {nameof(CompositeKey)}; found {reader.TokenType}.");
-
-                var depth = reader.CurrentDepth;
-                var args = new List<object?>();
-                
-                reader.Read();
-                while (reader.CurrentDepth > depth)
-                {
-                    if (reader.TokenType == JsonTokenType.Null)
-                    {
-                        args.Add(null);
-                        reader.Read();
-                        continue;
-                    }
-
-                    if (reader.TokenType != JsonTokenType.StartObject)
-                        throw new JsonException($"Expected {nameof(JsonTokenType.StartObject)} for a {nameof(CompositeKey)}; found {reader.TokenType}.");
-
-                    var objDepth = reader.CurrentDepth;
-                    reader.Read();
-                    while (reader.CurrentDepth > objDepth)
-                    {
-                        if (reader.TokenType != JsonTokenType.PropertyName)
-                            throw new JsonException($"Expected {nameof(JsonTokenType.PropertyName)} for a {nameof(CompositeKey)}; found {reader.TokenType}.");
-
-                        var name = reader.GetString();
-                        reader.Read();
-
-                        switch (name)
-                        {
-                            case "string": args.Add(reader.GetString()); break;
-                            case "char": args.Add(reader.GetString()?.ToCharArray().FirstOrDefault()); break;
-                            case "short": args.Add(reader.GetInt16()); break;
-                            case "int": args.Add(reader.GetInt32()); break;
-                            case "long": args.Add(reader.GetInt64()); break;
-                            case "guid": args.Add(reader.GetGuid()); break;
-                            case "datetime": args.Add(reader.GetDateTime()); break;
-                            case "datetimeoffset": args.Add(reader.GetDateTimeOffset()); break;
-                            case "ushort": args.Add(reader.GetUInt16()); break;
-                            case "uint": args.Add(reader.GetUInt32()); break;
-                            case "ulong": args.Add(reader.GetUInt64()); break;
-                            default:
-                                throw new JsonException($"Unsupported {nameof(CompositeKey)} type '{name}'.");
-                        }
-
-                        reader.Read();
-                        if (reader.TokenType != JsonTokenType.EndObject)
-                            throw new JsonException($"Expected {nameof(JsonTokenType.EndObject)} for a {nameof(CompositeKey)} argument; found {reader.TokenType}.");
-                    }
-
-                    reader.Read();
-                }   
-
-                return new CompositeKey([.. args]);
-            }
-
-            /// <inheritdoc/>
-            public override void Write(Utf8JsonWriter writer, CompositeKey value, JsonSerializerOptions options)
-            {
-                if (value.Args.Length == 0)
-                {
-                    writer.WriteNullValue();
-                    return;
-                }
-
-                writer.WriteStartArray();
-
-                foreach (var arg in value.Args)
-                {
-                    if (arg is null)
-                    {
-                        writer.WriteNullValue();
-                        continue;
-                    }
-
-                    writer.WriteStartObject();
-
-                    _ = arg switch
-                    {
-                        string str => JsonWrite(writer, "string", () => writer.WriteStringValue(str)),
-                        char c => JsonWrite(writer, "char", () => writer.WriteStringValue(c.ToString())),
-                        short s => JsonWrite(writer, "short", () => writer.WriteNumberValue(s)),
-                        int i => JsonWrite(writer, "int", () => writer.WriteNumberValue(i)),
-                        long l => JsonWrite(writer, "long", () => writer.WriteNumberValue(l)),
-                        Guid g => JsonWrite(writer, "guid", () => writer.WriteStringValue(g)),
-                        DateTime d => JsonWrite(writer, "datetime", () => writer.WriteStringValue(d)),
-                        DateTimeOffset o => JsonWrite(writer, "datetimeoffset", () => writer.WriteStringValue(o)),
-                        ushort us => JsonWrite(writer, "ushort", () => writer.WriteNumberValue(us)),
-                        uint ui => JsonWrite(writer, "uint", () => writer.WriteNumberValue(ui)),
-                        ulong ul => JsonWrite(writer, "ulong", () => writer.WriteNumberValue(ul)),
-                        _ => throw new JsonException($"Unsupported {nameof(CompositeKey)} type '{arg.GetType().Name}'.")
-                    };
-
-                    writer.WriteEndObject();
-                }
-
-                writer.WriteEndArray();
-            }
-
-            /// <summary>
-            /// Provides a simple means to write a JSON property name and value.
-            /// </summary>
-            private static bool JsonWrite(Utf8JsonWriter writer, string name, Action action)
-            {
-                writer.WritePropertyName(name);
-                action();
-                return true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/EventDataSerializer.cs b/src/CoreEx/Text/Json/EventDataSerializer.cs
deleted file mode 100644
index dac09738..00000000
--- a/src/CoreEx/Text/Json/EventDataSerializer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Events;
-using CoreEx.Json;
-using System;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides the <see cref="JsonSerializer"/>-based <see cref="IEventSerializer"/>.
-    /// </summary>
-    public class EventDataSerializer : EventDataSerializerBase
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EventDataSerializer"/> class.
-        /// </summary>
-        /// <param name="jsonSerializer">The <see cref="IJsonSerializer"/>; defaults to <see cref="JsonSerializer"/>.</param>
-        /// <param name="eventDataFormatter">The <see cref="Events.EventDataFormatter"/>.</param>
-        public EventDataSerializer(IJsonSerializer? jsonSerializer = null, EventDataFormatter? eventDataFormatter = null) : base(jsonSerializer ?? new JsonSerializer(), eventDataFormatter) 
-        {
-            if (JsonSerializer is not CoreEx.Text.Json.JsonSerializer)
-                throw new ArgumentException($"The {nameof(IJsonSerializer)} instance must be of Type '{typeof(CoreEx.Text.Json.JsonSerializer).FullName}'.", nameof(jsonSerializer));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/ExceptionConverterFactory.cs b/src/CoreEx/Text/Json/ExceptionConverterFactory.cs
deleted file mode 100644
index 5606f1ad..00000000
--- a/src/CoreEx/Text/Json/ExceptionConverterFactory.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary> 
-    /// Exception converter factory
-    /// </summary>
-    public class ExceptionConverterFactory : JsonConverterFactory
-    {
-        /// <summary>
-        /// Converter for <see cref="Exception"/>. See <see href="https://github.com/dotnet/runtime/issues/43026"/> for more information.
-        /// It can serialize <see cref="Exception"/> to <see cref="JsonElement"/> and vice versa, but deserialization is very basic - only handles <see cref="Exception.Message"/>
-        /// </summary>
-        private class ExceptionConverter<TExceptionType> : JsonConverter<TExceptionType> where TExceptionType : Exception
-        {
-            /// <inheritdoc/>
-            public override bool CanConvert(Type typeToConvert) => typeof(Exception).IsAssignableFrom(typeToConvert);
-
-            /// <inheritdoc/>
-            public override TExceptionType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                if (reader.TokenType != JsonTokenType.StartObject)
-                    throw new JsonException();
-
-                TExceptionType exception = default!;
-
-                while (reader.Read())
-                {
-                    if (reader.TokenType == JsonTokenType.EndObject)
-                        return exception;
-
-                    // Get the key.
-                    if (reader.TokenType != JsonTokenType.PropertyName)
-                        throw new JsonException();
-
-                    string? propertyName = reader.GetString();
-
-                    if (propertyName != nameof(Exception.Message))
-                    {
-                        // Skip all properties other than the message.
-                        reader.Skip();
-                        continue;
-                    }
-
-                    reader.Read();
-                    string? message = reader.GetString();
-                    exception = (TExceptionType)Activator.CreateInstance(typeof(TExceptionType), message)!;
-
-                    // read the rest of the exception
-                    while (reader.Read())
-                    {
-                        reader.Skip();
-                    }
-
-                    return exception;
-                }
-
-                throw new JsonException();
-            }
-
-            /// <inheritdoc/>
-            public override void Write(Utf8JsonWriter writer, TExceptionType value, JsonSerializerOptions options)
-            {
-                var serializableProperties = value.GetType()
-                    .GetProperties()
-                    .Select(uu => new { uu.Name, Value = uu.GetValue(value) })
-                    .Where(uu => uu.Name != nameof(Exception.TargetSite));
-
-                if (options?.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingNull)
-                    serializableProperties = serializableProperties.Where(uu => uu.Value != null);
-
-                var propList = serializableProperties.ToList();
-
-                if (propList.Count == 0)
-                    return;  // Nothing to write
-
-                writer.WriteStartObject();
-
-                foreach (var prop in propList)
-                {
-                    writer.WritePropertyName(prop.Name);
-                    Stj.JsonSerializer.Serialize(writer, prop.Value, options);
-                }
-
-                writer.WriteEndObject();
-            }
-        }
-
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeof(Exception).IsAssignableFrom(typeToConvert);
-
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) => (JsonConverter)Activator.CreateInstance(typeof(ExceptionConverter<>).MakeGenericType(typeToConvert))!;
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/JsonExtensions.cs b/src/CoreEx/Text/Json/JsonExtensions.cs
deleted file mode 100644
index 622060a3..00000000
--- a/src/CoreEx/Text/Json/JsonExtensions.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides JSON extension methods.
-    /// </summary>
-    public static class JsonExtensions
-    {
-        /// <summary>
-        /// Applies the inclusion of properties (using JSON paths) to an existing <see cref="JsonNode"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonNode"/>.</param>
-        /// <param name="pathsToInclude">The list of paths to include (i.e. remove others). Qualified paths, that include indexing, are also supported.</param>
-        /// <returns>The <paramref name="json"/> to enable fluent-style method-chaining.</returns>
-        /// <remarks>Defaults to <see cref="StringComparison.OrdinalIgnoreCase"/> to match <paramref name="pathsToInclude"/>. Leverages the <see cref="JsonFilterer.Apply"/> to perform.</remarks>
-        public static JsonNode ApplyInclude(this JsonNode json, params string[] pathsToInclude) => JsonFilterer.Apply(json, pathsToInclude, JsonPropertyFilter.Include);
-
-        /// <summary>
-        /// Applies the exclusion of properties (using JSON paths) to an existing <see cref="JsonNode"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonNode"/>.</param>
-        /// <param name="pathsToExclude">The list of paths to exclude (i.e. remove listed). Qualified paths, that include indexing, are also supported.</param>
-        /// <returns>The <paramref name="json"/> to enable fluent-style method-chaining.</returns>
-        /// <remarks>Defaults to <see cref="StringComparison.OrdinalIgnoreCase"/> to match <paramref name="pathsToExclude"/>. Leverages the <see cref="JsonFilterer.Apply"/> to perform.</remarks>
-        public static JsonNode ApplyExclude(this JsonNode json, params string[] pathsToExclude) => JsonFilterer.Apply(json, pathsToExclude, JsonPropertyFilter.Exclude);
-
-        /// <summary>
-        /// Trys to get the <see cref="JsonElement"/> with the <paramref name="propertyName"/> and <paramref name="comparer"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonElement"/>.</param>
-        /// <param name="propertyName">The property name.</param>
-        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/>.</param>
-        /// <param name="value">The named <see cref="JsonElement"/> where found.</param>
-        /// <returns><c>true</c> indicates the property was found; otherwise, <c>false</c>.</returns>
-        public static bool TryGetProperty(this JsonElement json, string propertyName, IEqualityComparer<string> comparer, out JsonElement value)
-        {
-            foreach (var j in json.EnumerateObject())
-            {
-                if (comparer.Equals(j.Name, propertyName))
-                {
-                    value = j.Value;
-                    return true;
-                }
-            }   
-            
-            value = default;
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/JsonFilterer.cs b/src/CoreEx/Text/Json/JsonFilterer.cs
deleted file mode 100644
index 671e02d8..00000000
--- a/src/CoreEx/Text/Json/JsonFilterer.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides a means to apply a filter to include or exclude JSON properties (in effect removing the unwanted properties).
-    /// </summary>
-    public static partial class JsonFilterer
-    {
-#if NET8_0_OR_GREATER
-        private static readonly Regex _regex = IndexesRegex();
-#else
-        private static readonly Regex _regex = new(@"\[(.*?)\]", RegexOptions.Compiled);
-#endif
-
-        /// <summary>
-        /// Gets the standard JSON root path.
-        /// </summary>
-        public const string JsonRootPath = "$";
-
-        /// <summary>
-        /// Prepends the JSON <paramref name="path"/> with the <see cref="JsonRootPath"/> where not already present.
-        /// </summary>
-        /// <param name="path">The JSON path.</param>
-        /// <returns>The resulting JSON path.</returns>
-        public static string PrependRootPath(string path) => string.IsNullOrEmpty(path) ? JsonRootPath : (!path.StartsWith(JsonRootPath) ? (path.StartsWith('[') ? $"{JsonRootPath}{path}" : $"{JsonRootPath}.{path}") : path);
-
-        /// <summary>
-        /// Removes all indexes from the specified <paramref name="input"/> JSON path.
-        /// </summary>
-        /// <param name="input">The input JSON path.</param>
-        /// <param name="path">The resulting JSON path.</param>
-        /// <returns><c>true</c> indicates indexes were removed; otherwise, <c>false</c>.</returns>
-        public static bool TryRemovePathIndexes(string input, out string path)
-        {
-            if (string.IsNullOrEmpty(input))
-            {
-                path = input;
-                return false;
-            }
-
-            path = _regex.Replace(input, string.Empty);
-            return path.Length != input.Length;
-        }
-
-        /// <summary>
-        /// Trys to apply the JSON <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
-        /// <param name="json">The corresponding JSON <paramref name="value"/> <see cref="string"/> with the filtering applied.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="options">The optional <see cref="JsonSerializerOptions"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <param name="preFilterInspector">The <see cref="IJsonPreFilterInspector"/> action.</param>
-        /// <returns><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</returns>
-        public static bool TryApply<T>(T value, IEnumerable<string>? paths, out string json, JsonPropertyFilter filter = JsonPropertyFilter.Include, JsonSerializerOptions? options = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-        {
-            var r = TryApply(value, paths, out JsonNode node, filter, options, comparison, preFilterInspector);
-            json = node.ToJsonString(options);
-            return r;
-        }
-
-        /// <summary>
-        /// Trys to apply the JSON property <paramref name="filter"/> (using JSON <paramref name="paths"/>) to a <paramref name="value"/> resulting in the corresponding <paramref name="json"/>.
-        /// </summary>
-        /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value.</param>
-        /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
-        /// <param name="json">The corresponding <paramref name="value"/> <see cref="JsonNode"/> with the filtering applied.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="options">The optional <see cref="JsonSerializerOptions"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <param name="preFilterInspector">The <see cref="IJsonPreFilterInspector"/> action.</param>
-        /// <returns><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</returns>
-        public static bool TryApply<T>(T value, IEnumerable<string>? paths, out JsonNode json, JsonPropertyFilter filter = JsonPropertyFilter.Include, JsonSerializerOptions? options = null, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-        {
-            json =  System.Text.Json.JsonSerializer.SerializeToNode(value.ThrowIfNull(), options)!;
-            preFilterInspector?.Invoke(new JsonPreFilterInspector(json));
-
-            return Apply(json, paths, filter, comparison);
-        }
-
-        /// <summary>
-        /// Applies the inclusion and exclusion of JSON paths to a specified <see cref="JsonNode"/>.
-        /// </summary>
-        /// <param name="json">The <see cref="JsonNode"/> value.</param>
-        /// <param name="paths">The list of JSON paths to <paramref name="filter"/>.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>; defaults to <see cref="JsonPropertyFilter.Include"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>; defaults to <see cref="StringComparison.OrdinalIgnoreCase"/>.</param>
-        /// <remarks><c>true</c> indicates that at least one JSON node was filtered (removed); otherwise, <c>false</c> for no changes.</remarks>
-        public static bool Apply(JsonNode json, IEnumerable<string>? paths, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase)
-        {
-            var maxDepth = 0;
-            var dict = CreateDictionary(paths, filter, comparison, ref maxDepth, true);
-
-            var filtered = false;
-            if (maxDepth > 0)
-                JsonFilter(json, dict, filter, 0, maxDepth, ref filtered, comparison);
-
-            return filtered;
-        }
-
-        /// <summary>
-        /// Create a <see cref="Dictionary{TKey, TValue}"/> from the <paramref name="paths"/> and expands list with intermediary paths where <paramref name="filter"/> is <see cref="JsonPropertyFilter.Include"/>.
-        /// </summary>
-        /// <param name="paths">The list of JSON paths.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>.</param>
-        /// <param name="maxDepth">The maximum hierarchy depth for all specified .</param>
-        /// <returns>The <see cref="Dictionary{TKey, TValue}"/>.</returns>
-        /// <remarks>Where the <see cref="bool"/> is <c>true</c> this indicates the specified path; versus, <c>false</c> that indicates an intermediary path.</remarks>
-        public static Dictionary<string, bool> CreateDictionary(IEnumerable<string>? paths, JsonPropertyFilter filter, StringComparison comparison, ref int maxDepth)
-            => CreateDictionary(paths, filter, comparison, ref maxDepth, false);
-
-        /// <summary>
-        /// Create a <see cref="Dictionary{TKey, TValue}"/> from the <paramref name="paths"/> and expands list with intermediary paths where <paramref name="filter"/> is <see cref="JsonPropertyFilter.Include"/>.
-        /// </summary>
-        /// <param name="paths">The list of JSON paths.</param>
-        /// <param name="filter">The <see cref="JsonPropertyFilter"/>.</param>
-        /// <param name="comparison">The paths <see cref="StringComparison"/>.</param>
-        /// <param name="maxDepth">The maximum hierarchy depth for all specified .</param>
-        /// <param name="prependRootPath">Indicates whether to prepend the <see cref="JsonRootPath"/> to each path.</param>
-        /// <returns>The <see cref="Dictionary{TKey, TValue}"/>.</returns>
-        /// <remarks>Where the <see cref="bool"/> is <c>true</c> this indicates the specified path; versus, <c>false</c> that indicates an intermediary path.</remarks>
-        public static Dictionary<string, bool> CreateDictionary(IEnumerable<string>? paths, JsonPropertyFilter filter, StringComparison comparison, ref int maxDepth, bool prependRootPath)
-        {
-            var dict = new Dictionary<string, bool>(StringComparer.FromComparison(comparison));
-            paths ??= [];
-
-            // Add each 'specified' path.
-            paths.ForEach(path => dict.TryAdd(prependRootPath ? PrependRootPath(path) : path, true));
-
-            // Add each 'intermediary' path where applicable.
-            if (filter == JsonPropertyFilter.Include)
-            {
-                var sb = new StringBuilder();
-                foreach (var kvp in dict.ToArray())
-                {
-                    sb.Clear();
-                    var parts = kvp.Key.Split('.');
-                    for (int i = 0; i < parts.Length; i++)
-                    {
-                        if (i > 0)
-                            sb.Append('.');
-
-                        sb.Append(parts[i]);
-                        dict.TryAdd(sb.ToString(), false);
-
-                        maxDepth = Math.Max(maxDepth, i + 1);
-                    }
-
-                    if (TryRemovePathIndexes(kvp.Key, out var indexless))
-                    {
-                        sb.Clear();
-                        parts = indexless.Split('.');
-                        for (int i = 0; i < parts.Length; i++)
-                        {
-                            if (i > 0)
-                                sb.Append('.');
-
-                            sb.Append(parts[i]);
-                            dict.TryAdd(sb.ToString(), false);
-                        }
-                    }
-                }
-
-                foreach (var kvp in dict.ToArray())
-                {
-                    if (dict.Keys.Any(x => !x.Equals(kvp.Key, comparison) && x.StartsWith(kvp.Key, comparison)))
-                        dict[kvp.Key] = false;
-                }
-            }
-            else
-                maxDepth = Math.Max(maxDepth, dict.Count == 0 ? 0 : dict.Max(x => x.Key.Count(c => c == '.') + 1));
-
-            return dict;
-        }
-
-        /// <summary>
-        /// Filter the JSON nodes based on the includes/excludes.
-        /// </summary>
-        private static bool JsonFilter(JsonNode json, Dictionary<string, bool> paths, JsonPropertyFilter filter, int depth, int maxDepth, ref bool filtered, StringComparison comparison)
-        {
-            // Do not check beyond maximum depth as there is no further filtering required.
-            if (depth > maxDepth)
-                return false;
-
-            // Iterate through the properties within the object and filter accordingly.
-            if (json is JsonObject jo)
-            {
-                foreach (var jn in jo.ToArray())
-                {
-                    var path = jn.Value is null ? $"{jo.GetPath()}.{jn.Key}" : jn.Value.GetPath();
-                    bool found = paths.TryGetValue(path, out var isSpecifiedPath);
-                    if (!found && TryRemovePathIndexes(path, out var pathWithoutIndexes))
-                        found = paths.TryGetValue(pathWithoutIndexes, out isSpecifiedPath);
-
-                    if ((filter == JsonPropertyFilter.Include && !found) || (filter == JsonPropertyFilter.Exclude && found))
-                    {
-                        jo.Remove(jn.Key);
-                        filtered = true;
-                        continue;
-                    }
-
-                    if (filter == JsonPropertyFilter.Include && found && isSpecifiedPath)
-                        continue;
-
-                    // Where there is a child value then continue navigation.
-                    if (jn.Value != null)
-                        JsonFilter(jn.Value, paths, filter, depth + 1, maxDepth, ref filtered, comparison);
-                }
-            }
-            else if (json is JsonArray ja)
-            {
-                // Iterate and filter each item in the array.
-                for (var i = ja.Count - 1; i >= 0; i--)
-                {
-                    var jn = ja[i];
-                    if (jn != null)
-                    {
-                        if (JsonFilter(jn, paths, filter, depth, maxDepth, ref filtered, comparison))
-                        {
-                            ja.RemoveAt(i);
-                            filtered = true;
-                        }
-                    }
-                }
-            }
-            else if (json is JsonValue)
-            {
-                var path = json.GetPath();
-                if (!paths.TryGetValue(path, out var isSpecifiedPath) && TryRemovePathIndexes(path, out var pathWithoutIndexes))
-                    paths.TryGetValue(pathWithoutIndexes, out isSpecifiedPath);
-
-                return filter == JsonPropertyFilter.Include ? !isSpecifiedPath : isSpecifiedPath;
-            }
-
-            return false;
-        }
-
-#if NET8_0_OR_GREATER
-        /// <summary>
-        /// Provides the generated <see cref="Regex"/> for <see cref="TryRemovePathIndexes"/>.
-        /// </summary>
-        [GeneratedRegex(@"\[(.*?)\]", RegexOptions.Compiled)]
-        private static partial Regex IndexesRegex();
-#endif
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/JsonPreFilterInspector.cs b/src/CoreEx/Text/Json/JsonPreFilterInspector.cs
deleted file mode 100644
index 36dfd1ec..00000000
--- a/src/CoreEx/Text/Json/JsonPreFilterInspector.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides pre (prior) to filtering JSON inspection.
-    /// </summary>
-    /// <param name="json">The <see cref="JsonNode"/>.</param>
-    public readonly struct JsonPreFilterInspector(JsonNode json) : IJsonPreFilterInspector
-    {
-        /// <inheritdoc/>
-        object IJsonPreFilterInspector.Json => Json;
-
-        /// <summary>
-        /// Gets the <see cref="JsonNode"/> before any filtering has been applied.
-        /// </summary>
-        public JsonNode Json { get; } = json;
-
-        /// <inheritdoc/>
-        public string? ToJsonString() => Json.ToJsonString();
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/JsonSerializer.cs b/src/CoreEx/Text/Json/JsonSerializer.cs
deleted file mode 100644
index 14d56f27..00000000
--- a/src/CoreEx/Text/Json/JsonSerializer.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides the <see cref="Stj.JsonSerializer"/> encapsulated implementation.
-    /// </summary>
-    public class JsonSerializer : IJsonSerializer
-    {
-        /// <summary>
-        /// Gets or sets the default <see cref="Stj.JsonSerializerOptions"/>.
-        /// </summary>
-        /// <remarks>The following <see cref="Stj.JsonSerializerOptions"/>, including use of <see cref="Stj.JsonSerializerDefaults.Web"/>, will default:
-        /// <list type="bullet">
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.DefaultIgnoreCondition"/> = <see cref="JsonIgnoreCondition.WhenWritingDefault"/>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.WriteIndented"/> = <c>false</c>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.DictionaryKeyPolicy"/> = <see cref="SubstituteNamingPolicy.Substitute"/>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.PropertyNamingPolicy"/> = <see cref="SubstituteNamingPolicy.Substitute"/>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.Converters"/> = <see cref="JsonStringEnumConverter"/>, <see cref="ExceptionConverterFactory"/>, <see cref="ReferenceDataConverterFactory"/>,
-        ///  <see cref="CollectionResultConverterFactory"/>, <see cref="ResultConverterFactory"/> and <see cref="CompositeKeyConverterFactory"/>.</description></item>
-        /// </list>
-        /// </remarks>
-        public static Stj.JsonSerializerOptions DefaultOptions { get; set; } = new Stj.JsonSerializerOptions(Stj.JsonSerializerDefaults.Web)
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
-            WriteIndented = false,
-            DictionaryKeyPolicy = SubstituteNamingPolicy.Substitute,
-            PropertyNamingPolicy = SubstituteNamingPolicy.Substitute,
-            Converters = { new JsonStringEnumConverter(), new ExceptionConverterFactory(), new ReferenceDataConverterFactory(), new CollectionResultConverterFactory(), new ResultConverterFactory(), new CompositeKeyConverterFactory() }
-        };
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonSerializer"/> class.
-        /// </summary>
-        /// <param name="options">The <see cref="Stj.JsonSerializerOptions"/>. Defaults to <see cref="DefaultOptions"/>.</param>
-        public JsonSerializer(Stj.JsonSerializerOptions? options = null)
-        {
-            Options = options ?? DefaultOptions;
-            IndentedOptions = new Stj.JsonSerializerOptions(Options) { WriteIndented = true };
-        }
-
-        /// <summary>
-        /// Gets the underlying serializer configuration settings/options.
-        /// </summary>
-        object IJsonSerializer.Options => Options;
-
-        /// <summary>
-        /// Gets the <see cref="Stj.JsonSerializerOptions"/>.
-        /// </summary>
-        public Stj.JsonSerializerOptions Options { get; }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Stj.JsonSerializerOptions"/> with <see cref="Stj.JsonSerializerOptions.WriteIndented"/> = <c>true</c>.
-        /// </summary>
-        public Stj.JsonSerializerOptions? IndentedOptions { get; }
-
-        /// <inheritdoc/>
-        public string Serialize<T>(T value, JsonWriteFormat? format = null) => SerializeToBinaryData(value, format).ToString();
-
-        /// <inheritdoc/>
-        public BinaryData SerializeToBinaryData<T>(T value, JsonWriteFormat? format = null) 
-            => new(Stj.JsonSerializer.SerializeToUtf8Bytes(value, format == null || format.Value == JsonWriteFormat.None ? Options : IndentedOptions));
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public object? Deserialize([StringSyntax(StringSyntaxAttribute.Json)] string json)
-#else
-        public object? Deserialize(string json)
-#endif
-            => Stj.JsonSerializer.Deserialize<dynamic>(json, Options);
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public object? Deserialize([StringSyntax(StringSyntaxAttribute.Json)] string json, Type type)
-#else
-        public object? Deserialize(string json, Type type)
-#endif
-            => Stj.JsonSerializer.Deserialize(json, type, Options);
-
-        /// <inheritdoc/>
-#if NET7_0_OR_GREATER
-        public T? Deserialize<T>([StringSyntax(StringSyntaxAttribute.Json)] string json)
-#else
-        public T? Deserialize<T>(string json)
-#endif
-            => Stj.JsonSerializer.Deserialize<T>(json, Options)!;
-
-        /// <inheritdoc/>
-        public object? Deserialize(BinaryData json) => Stj.JsonSerializer.Deserialize<dynamic>(json, Options);
-
-        /// <inheritdoc/>
-        public object? Deserialize(BinaryData json, Type type) => Stj.JsonSerializer.Deserialize(json, type, Options);
-
-        /// <inheritdoc/>
-        public T? Deserialize<T>(BinaryData json) => Stj.JsonSerializer.Deserialize<T>(json, Options)!;
-
-        /// <inheritdoc/>
-        public bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out string json, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-            => JsonFilterer.TryApply(value, names, out json, filter, Options, comparison, preFilterInspector);
-
-        /// <inheritdoc/>
-        public bool TryApplyFilter<T>(T value, IEnumerable<string>? names, out object json, JsonPropertyFilter filter = JsonPropertyFilter.Include, StringComparison comparison = StringComparison.OrdinalIgnoreCase, Action<IJsonPreFilterInspector>? preFilterInspector = null)
-        {
-            var r = JsonFilterer.TryApply(value, names, out JsonNode node, filter, Options, comparison, preFilterInspector);
-            json = node;
-            return r;
-        }
-
-        /// <inheritdoc/>
-        bool IJsonSerializer.TryGetJsonName(MemberInfo memberInfo, [NotNullWhen(true)] out string? jsonName)
-        {
-            var ji = memberInfo.ThrowIfNull(nameof(memberInfo)).GetCustomAttribute<JsonIgnoreAttribute>();
-            if (ji != null)
-            {
-                jsonName = null;
-                return false;
-            }
-
-            var jpn = memberInfo.GetCustomAttribute<JsonPropertyNameAttribute>(true);
-            jsonName = jpn?.Name ?? Options.PropertyNamingPolicy?.ConvertName(memberInfo.Name) ?? memberInfo.Name;
-            return true;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/NumberToStringConverter.cs b/src/CoreEx/Text/Json/NumberToStringConverter.cs
deleted file mode 100644
index fc75e3a3..00000000
--- a/src/CoreEx/Text/Json/NumberToStringConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides <see cref="JsonTokenType.Number"/> to <see cref="JsonTokenType.String"/> conversion where the number is a valid <see cref="long"/>.
-    /// </summary>
-    public class NumberToStringConverter : JsonConverter<string>
-    {
-        /// <inheritdoc/>
-        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => reader.TokenType switch
-        { 
-            JsonTokenType.Null => null,
-            JsonTokenType.String => reader.GetString(),
-            JsonTokenType.Number => reader.TryGetDecimal(out var _) ? System.Text.Encoding.Default.GetString(reader.ValueSpan) : throw new JsonException(),
-            _ => throw new JsonException()
-        };
-
-        /// <inheritdoc/>
-        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options)
-            => writer.WriteStringValue(value);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/ReferenceDataContentJsonSerializer.cs b/src/CoreEx/Text/Json/ReferenceDataContentJsonSerializer.cs
deleted file mode 100644
index ce5acc5a..00000000
--- a/src/CoreEx/Text/Json/ReferenceDataContentJsonSerializer.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Json;
-using CoreEx.RefData;
-using System.Text.Json.Serialization;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides the JSON Serialize and Deserialize implementation to allow <see cref="IReferenceData"/> types to serialize contents.
-    /// </summary>
-    /// <remarks>Generally, <see cref="IReferenceData"/> types will serialize the <see cref="IReferenceData.Code"/> as the value; this allows for full <see cref="IReferenceData"/> contents to be serialized.</remarks>
-    /// <param name="options">The <see cref="Stj.JsonSerializerOptions"/>. Defaults to <see cref="DefaultOptions"/>.</param>
-    public class ReferenceDataContentJsonSerializer(Stj.JsonSerializerOptions? options = null) : JsonSerializer(options ?? DefaultOptions), IReferenceDataContentJsonSerializer
-    {
-        /// <summary>
-        /// Gets or sets the default <see cref="Stj.JsonSerializerOptions"/> without <see cref="CollectionResultConverterFactory"/> to allow <see cref="IReferenceData"/> types to serialize contents.
-        /// </summary>
-        /// <remarks>The following <see cref="Stj.JsonSerializerOptions"/>, including use of <see cref="Stj.JsonSerializerDefaults.Web"/>, will default:
-        /// <list type="bullet">
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.DefaultIgnoreCondition"/> = <see cref="JsonIgnoreCondition.WhenWritingDefault"/>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.WriteIndented"/> = <c>false</c></description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.DictionaryKeyPolicy"/> = <see cref="SubstituteNamingPolicy.Substitute"/>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.PropertyNamingPolicy"/> = <see cref="SubstituteNamingPolicy.Substitute"/>.</description></item>
-        ///  <item><description><see cref="Stj.JsonSerializerOptions.Converters"/> = <see cref="JsonStringEnumConverter"/>, <see cref="ExceptionConverterFactory"/>, <see cref="CollectionResultConverterFactory"/>, <see cref="ResultConverterFactory"/> and <see cref="ReferenceDataMultiDictionaryConverterFactory"/>.</description></item>
-        /// </list>
-        /// </remarks>
-        public static new Stj.JsonSerializerOptions DefaultOptions { get; set; } = new Stj.JsonSerializerOptions(Stj.JsonSerializerDefaults.Web)
-        {
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
-            WriteIndented = false,
-            DictionaryKeyPolicy = SubstituteNamingPolicy.Substitute,
-            PropertyNamingPolicy = SubstituteNamingPolicy.Substitute,
-            Converters = { new JsonStringEnumConverter(), new ExceptionConverterFactory(), new CollectionResultConverterFactory(), new ResultConverterFactory(), new ReferenceDataMultiDictionaryConverterFactory() }
-        };
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/ReferenceDataConverterFactory.cs b/src/CoreEx/Text/Json/ReferenceDataConverterFactory.cs
deleted file mode 100644
index 5dcd78a3..00000000
--- a/src/CoreEx/Text/Json/ReferenceDataConverterFactory.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="IReferenceData"/> values.
-    /// </summary>
-    public class ReferenceDataConverterFactory : JsonConverterFactory
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeof(IReferenceData).IsAssignableFrom(typeToConvert);
-
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-            => (JsonConverter)Activator.CreateInstance(typeof(JsonValueConverterReferenceData<>).MakeGenericType(typeToConvert))!;
-
-        /// <summary>
-        /// Performs the "actual" JSON value conversion for <see cref="IReferenceData"/> values.
-        /// </summary>
-        private class JsonValueConverterReferenceData<T> : JsonConverter<T> where T : IReferenceData, new()
-        {
-            /// <inheritdoc/>
-            public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                if (reader.TokenType == JsonTokenType.Null)
-                    return default;
-
-                if (reader.TokenType != JsonTokenType.String)
-                    throw new JsonException(null, new InvalidCastException($"The {nameof(IReferenceData)} property TokenType must be a {nameof(JsonTokenType.String)} not a {reader.TokenType}. To support an {nameof(IReferenceData)} Object consider using the {nameof(ReferenceDataContentJsonSerializer)} {nameof(CoreEx.Json.IJsonSerializer)} instead."));
-
-                var code = reader.GetString();
-                if (code == null)
-                    return default;
-
-                if (ExecutionContext.HasCurrent)
-                {
-                    var coll = ReferenceDataOrchestrator.Current.GetByType(typeToConvert);
-                    if (coll != null && coll.TryGetByCode(code, out var rd))
-                        return (T)rd!;
-                }
-
-                var rdx = new T() { Code = code };
-                ((IReferenceData)rdx).SetInvalid();
-                return rdx;
-            }
-
-            /// <inheritdoc/>
-            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-            {
-                if (value == null || value.Code == null)
-                    return;
-
-                writer.WriteStringValue(value.Code);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/ReferenceDataMultiDictionaryConverterFactory.cs b/src/CoreEx/Text/Json/ReferenceDataMultiDictionaryConverterFactory.cs
deleted file mode 100644
index b726a23b..00000000
--- a/src/CoreEx/Text/Json/ReferenceDataMultiDictionaryConverterFactory.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.RefData;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="ReferenceDataMultiDictionary"/> values.
-    /// </summary>
-    /// <remarks>This is required to ensure each <see cref="IReferenceDataCollection"/> is serialized correctly according to its underlying type.</remarks>
-    public class ReferenceDataMultiDictionaryConverterFactory : JsonConverterFactory
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeToConvert == typeof(ReferenceDataMultiDictionary);
-
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) => new ReferenceDataMultiDictionaryConverter();
-
-        /// <summary>
-        /// Performs the "actual" JSON value conversion for <see cref="ReferenceDataMultiDictionary"/> values.
-        /// </summary>
-        private class ReferenceDataMultiDictionaryConverter : JsonConverter<ReferenceDataMultiDictionary>
-        {
-            /// <inheritdoc/>
-            public override ReferenceDataMultiDictionary Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotSupportedException($"Deserialization of Type {nameof(ReferenceDataMultiDictionary)} is not supported.");
-
-            /// <inheritdoc/>
-            public override void Write(Utf8JsonWriter writer, ReferenceDataMultiDictionary value, JsonSerializerOptions options)
-            {
-                writer.WriteStartObject();
-
-                foreach (var kvp in value)
-                {
-                    writer.WritePropertyName(options.DictionaryKeyPolicy?.ConvertName(kvp.Key) ?? kvp.Key);
-                    System.Text.Json.JsonSerializer.Serialize(writer, kvp.Value, kvp.Value.GetType(), options);
-                }
-
-                writer.WriteEndObject();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/ResultConverterFactory.cs b/src/CoreEx/Text/Json/ResultConverterFactory.cs
deleted file mode 100644
index 772eb3bc..00000000
--- a/src/CoreEx/Text/Json/ResultConverterFactory.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Results;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Performs JSON value conversion for <see cref="IResult"/> values.
-    /// </summary>
-    public class ResultConverterFactory : JsonConverterFactory
-    {
-        /// <inheritdoc/>
-        public override bool CanConvert(Type typeToConvert) => typeof(IResult).IsAssignableFrom(typeToConvert);
-
-        /// <inheritdoc/>
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options) => new ResultConverter();
-
-        /// <summary>
-        /// Performs the "actual" JSON value conversion for a <see cref="Result"/>.
-        /// </summary>
-        private class ResultConverter : JsonConverter<IResult>
-        {
-            /// <inheritdoc/>
-            public override bool HandleNull => false;
-
-            /// <inheritdoc/>
-            public override IResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotSupportedException($"Deserialization of Type {nameof(IResult)} is not supported.");
-
-            /// <inheritdoc/>
-            public override void Write(Utf8JsonWriter writer, IResult value, JsonSerializerOptions options)
-            {
-                writer.WriteStartObject();
-
-                if (value.IsSuccess)
-                {
-                    writer.WritePropertyName("isSuccess");
-                    writer.WriteBooleanValue(true);
-
-                    if (value.Value is not null)
-                    {
-                        writer.WritePropertyName("value");
-                        System.Text.Json.JsonSerializer.Serialize(writer, value.Value, value.Value.GetType(), options);
-                    }
-                }
-                else
-                {
-                    writer.WritePropertyName("isFailure");
-                    writer.WriteBooleanValue(true);
-                    writer.WritePropertyName("error");
-                    writer.WriteStringValue(value.Error.Message);
-                }
-
-                writer.WriteEndObject();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/Json/SubstituteNamingPolicy.cs b/src/CoreEx/Text/Json/SubstituteNamingPolicy.cs
deleted file mode 100644
index 24c71d9c..00000000
--- a/src/CoreEx/Text/Json/SubstituteNamingPolicy.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using Stj = System.Text.Json;
-
-namespace CoreEx.Text.Json
-{
-    /// <summary>
-    /// Provides a substitution and camel case naming policy.
-    /// </summary>
-    /// <remarks>Converts the name by checking <see cref="CoreEx.Json.JsonSerializer.NameSubstitutions"/>, then uses <see cref="Stj.JsonNamingPolicy.CamelCase"/>.</remarks>
-    public class SubstituteNamingPolicy : Stj.JsonNamingPolicy
-    {
-        /// <summary>
-        /// Gets the <see cref="SubstituteNamingPolicy"/> instance.
-        /// </summary>
-        public static SubstituteNamingPolicy Substitute { get; } = new SubstituteNamingPolicy();
-
-        /// <inheritdoc/>
-        public override string ConvertName(string name) => CoreEx.Json.JsonSerializer.NameSubstitutions.TryGetValue(name, out var jsonName) ? jsonName : CamelCase.ConvertName(name);
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Text/README.md b/src/CoreEx/Text/README.md
new file mode 100644
index 00000000..bf154b4a
--- /dev/null
+++ b/src/CoreEx/Text/README.md
@@ -0,0 +1,23 @@
+# CoreEx.Text
+
+> Provides `SentenceCase` — a utility for converting identifiers and PascalCase/camelCase strings to human-readable sentence-case text used in error messages, display labels, and OpenAPI descriptions.
+
+## Overview
+
+`CoreEx.Text` is a small, focused namespace with a single class: `SentenceCase`. It converts programming-style identifier strings (e.g. `"firstName"`, `"FirstName"`, `"FIRST_NAME"`) into readable sentence-case output (e.g. `"First Name"`). This is used by CoreEx validators and code-generation tooling to derive display-friendly property labels from property names without requiring explicit `[Display(Name = ...)]` annotations.
+
+## Key capabilities
+
+- 🔤 **Identifier to sentence case**: `SentenceCase.ToSentenceCase(string)` handles PascalCase, camelCase, underscore-separated, and all-caps identifiers, producing a human-readable label.
+- ✏️ **Word-list aware**: Common abbreviations and acronyms (e.g. `ETag`) are preserved as-is rather than being split into individual characters.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`SentenceCase`](./SentenceCase.cs)** | Static utility: `ToSentenceCase(string)` converts a programming identifier to a human-readable sentence-case string. |
+
+## Related Namespaces
+
+- **[`CoreEx.Validation`](../../CoreEx.Validation/README.md)** - Validator rule error messages derive display-friendly property names from `SentenceCase.ToSentenceCase` when no explicit label is configured.
+- **[`CoreEx`](../README.md)** - Root package; code-generation tooling uses `SentenceCase` when producing OpenAPI descriptions from property names.
\ No newline at end of file
diff --git a/src/CoreEx/Text/SentenceCase.cs b/src/CoreEx/Text/SentenceCase.cs
index fb8a583d..1fe53c71 100644
--- a/src/CoreEx/Text/SentenceCase.cs
+++ b/src/CoreEx/Text/SentenceCase.cs
@@ -1,115 +1,316 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Text;
 
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System;
-using System.Text.RegularExpressions;
-using System.Diagnostics.CodeAnalysis;
-
-namespace CoreEx.Text
+/// <summary>
+/// Provides common sentence case capabilities.
+/// </summary>
+public static partial class SentenceCase
 {
     /// <summary>
-    /// Provides common sentence case capabilities.
+    /// The <see cref="Regex"/> pattern for splitting strings into a sentence of words.
+    /// </summary>
+    public const string WordSplitPattern = @"([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-z])|[\s_-])";
+
+    /// <summary>
+    /// Gets the compiled <see cref="Regex"/> for splitting strings into a sentence of words (see <see cref="WordSplitPattern"/>).
+    /// </summary>
+    public static Regex WordSplitRegex { get; } = _wordSplitRegex();
+
+    /// <summary>
+    /// Provides the generated <see cref="Regex"/> for splitting strings into a sentence of words.
+    /// </summary>
+    [GeneratedRegex(WordSplitPattern, RegexOptions.Compiled | RegexOptions.CultureInvariant)]
+    private static partial Regex _wordSplitRegex();
+
+    /// <summary>
+    /// Performs a sentence case word split on the specified <paramref name="text"/>.
     /// </summary>
-    public static partial class SentenceCase
+    /// <param name="text">The text to sentence case word split.</param>
+    /// <returns>An array of words.</returns>
+    public static string[] SplitIntoWords(string? text)
     {
-        /// <summary>
-        /// The <see cref="Regex"/> pattern for splitting strings into a sentence of words.
-        /// </summary>
-        public const string WordSplitPattern = "([a-z](?=[A-Z])|[A-Z](?=[A-Z][a-z]))";
-
-        /// <summary>
-        /// Gets the compiled <see cref="Regex"/> for splitting strings into a sentence of words (see <see cref="WordSplitPattern"/>).
-        /// </summary>
-#if NET7_0_OR_GREATER
-        public static Regex WordSplitRegex { get; } = _wordSplitRegex();
-
-        /// <summary>
-        /// Provides the generated <see cref="Regex"/> for splitting strings into a sentence of words.
-        /// </summary>
-        [GeneratedRegex(WordSplitPattern, RegexOptions.Compiled | RegexOptions.CultureInvariant)]
-        private static partial Regex _wordSplitRegex();
-#else
-        public static Regex WordSplitRegex { get; } = new Regex(WordSplitPattern, RegexOptions.CultureInvariant | RegexOptions.Compiled);
-#endif
-
-        /// <summary>
-        /// Performs a sentence case word split on the specified <paramref name="text"/>.
-        /// </summary>
-        /// <param name="text">The text to sentence case word split.</param>
-        /// <returns>An array of words.</returns>
-        public static string[] SplitIntoWords(string? text)
+        if (string.IsNullOrEmpty(text))
+            return [];
+
+        var matches = WordSplitRegex.EnumerateMatches(text);
+        var buffer = ArrayPool<string>.Shared.Rent(16);
+        int count = 0;
+        int lastIndex = 0;
+        
+        try
         {
-            if (string.IsNullOrEmpty(text))
-                return [];
+            foreach (var match in matches)
+            {
+                if (count >= buffer.Length)
+                {
+                    var newBuffer = ArrayPool<string>.Shared.Rent(buffer.Length * 2);
+                    Array.Copy(buffer, newBuffer, count);
+                    ArrayPool<string>.Shared.Return(buffer);
+                    buffer = newBuffer;
+                }
 
-            var s = WordSplitRegex.Replace(text, "$1 "); // Add a space between each word.
-            return s.Split(' ', StringSplitOptions.RemoveEmptyEntries); // Split the string into words.
+                char matchedChar = text[match.Index];
+                
+                // If matched char is a delimiter, extract word before it and skip the delimiter
+                if (matchedChar == '_' || matchedChar == '-' || char.IsWhiteSpace(matchedChar))
+                {
+                    if (match.Index > lastIndex)
+                        buffer[count++] = text[lastIndex..match.Index];
+
+                    lastIndex = match.Index + 1; // Skip the delimiter
+                }
+                else
+                {
+                    // Case-change split: include the matched character
+                    buffer[count++] = text[lastIndex..(match.Index + 1)];
+                    lastIndex = match.Index + 1;
+                }
+            }
+
+            if (lastIndex < text.Length)
+            {
+                if (count >= buffer.Length)
+                {
+                    var newBuffer = ArrayPool<string>.Shared.Rent(buffer.Length * 2);
+                    Array.Copy(buffer, newBuffer, count);
+                    ArrayPool<string>.Shared.Return(buffer);
+                    buffer = newBuffer;
+                }
+                buffer[count++] = text[lastIndex..];
+            }
+            
+            var result = new string[count];
+            Array.Copy(buffer, result, count);
+            return result;
         }
+        finally
+        {
+            ArrayPool<string>.Shared.Return(buffer);
+        }
+    }
+
+    /// <summary>
+    /// Converts a <see cref="string"/> into sentence case.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <returns>The <see cref="string"/> as sentence case.</returns>
+    /// <remarks>For example a value of '<c>VarNameDB</c>' would return '<c>Var name DB</c>'.
+    /// <para>Uses the <see cref="SentenceCaseConverter"/> function to perform the conversion.</para></remarks>
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToSentenceCase(string? text) => SentenceCaseConverter is null ? text : SentenceCaseConverter(text);
 
-        /// <summary>
-        /// Converts a <see cref="string"/> into sentence case.
-        /// </summary>
-        /// <param name="text">The text to convert.</param>
-        /// <returns>The <see cref="string"/> as sentence case.</returns>
-        /// <remarks>For example a value of '<c>VarNameDB</c>' would return '<c>Var Name DB</c>'.
-        /// <para>Uses the <see cref="SentenceCaseConverter"/> function to perform the conversion.</para></remarks>
-        [return: NotNullIfNotNull(nameof(text))]
-        public static string? ToSentenceCase(string? text) => SentenceCaseConverter == null ? text : SentenceCaseConverter(text);
-
-        /// <summary>
-        /// Gets or sets the underlying logic to perform the sentence case conversion.
-        /// </summary>
-        /// <remarks>Defaults to the internal <see cref="SentenceCaseConversion(string?)"/> logic.</remarks>
-        public static Func<string?, string?>? SentenceCaseConverter { get; set; } = SentenceCaseConversion;
-
-        /// <summary>
-        /// Performs the out-of-the-box sentence case conversion.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <remarks>Defaults to the following: Initial word splitting is performed using the <see cref="WordSplitPattern"/> <see cref="Regex"/>. First letter is always capitalized, initial full text is tested (and replaced where matched) 
-        /// against <see cref="Substitutions"/>, then each word is tested (and replaced where matched) against <see cref="Substitutions"/>. Finally, the last word in the initial text is tested against
-        /// <see cref="LastWordRemovals"/> and where matched the final word will be removed.</remarks>
-        private static string? SentenceCaseConversion(string? text)
+    /// <summary>
+    /// Gets or sets the underlying logic to perform the sentence case conversion.
+    /// </summary>
+    /// <remarks>Defaults to the <see cref="SentenceCaseConversion(string?)"/> logic.</remarks>
+    public static Func<string?, string?>? SentenceCaseConverter { get; set; } = SentenceCaseConversion;
+
+    /// <summary>
+    /// Performs the out-of-the-box sentence case conversion.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <remarks>Defaults to the following: Initial word splitting is performed using the <see cref="WordSplitPattern"/> <see cref="Regex"/>. First letter is always capitalized, initial full text is tested (and replaced where matched) 
+    /// against <see cref="Substitutions"/>, then each word is tested (and replaced where matched) against <see cref="Substitutions"/> and first letter lowercased where remainder of word is lowercase. Finally, the last word in the
+    /// initial text is tested against the <see cref="LastWordRemovals"/> and where matched the final word will be removed.</remarks>
+    public static string? SentenceCaseConversion(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        // Make sure the first character is always upper case.
+        if (char.IsLower(text[0]))
+            text = string.Create(text.Length, text, static (span, t) =>
+            {
+                span[0] = char.ToUpper(t[0], CultureInfo.InvariantCulture);
+                t.AsSpan(1).CopyTo(span[1..]);
+            });
+
+        // Check if there is a one-to-one substitution.
+        ref var value = ref System.Runtime.InteropServices.CollectionsMarshal.GetValueRefOrNullRef(Substitutions, text);
+        if (!Unsafe.IsNullRef(ref value))
+            return value;
+
+        // Determine whether last word should be removed, then go through each word and substitute.
+        var parts = SplitIntoWords(text);
+        var removeLastWord = parts.Length > 0 && LastWordRemovals.Contains(parts[^1]);
+
+        for (int i = 0; i < parts.Length; i++)
         {
-            if (string.IsNullOrEmpty(text))
-                return text;
+            if (Substitutions.TryGetValue(parts[i], out var iscs))
+                parts[i] = iscs;
 
-            // Make sure the first character is always upper case.
-            if (char.IsLower(text[0]))
-                text = char.ToUpper(text[0], CultureInfo.InvariantCulture) + text[1..];
+            if (i > 0 && parts[i].Length >= 2)
+                parts[i] = LowercaseFirstWhereRestIsLower(parts[i]);
+        }
+
+        // Rejoin the words back into the final sentence.
+        return string.Join(" ", parts, 0, parts.Length - (removeLastWord ? 1 : 0));
+    }
+
+    /// <summary>
+    /// Lowercase the first character of the specified <paramref name="text"/> where the remainder of the text is all lowercase; otherwise returns the original value.
+    /// </summary>
+    private static string LowercaseFirstWhereRestIsLower(string text)
+    {
+        if (string.IsNullOrEmpty(text) || text.Length == 1)
+            return text;
+
+        ReadOnlySpan<char> span = text.AsSpan();
+
+        // Check remainder is all lowercase.
+        for (int i = 1; i < span.Length; i++)
+        {
+            if (!char.IsLower(span[i]))
+                return text; // no allocation
+        }
 
-            // Check if there is a one-to-one substitution.
-            if (Substitutions.TryGetValue(text, out var scs))
-                return scs;
+        char firstLower = char.ToLowerInvariant(span[0]);
 
-            // Determine whether last word should be removed, then go through each word and substitute.
-            var parts = SplitIntoWords(text);
-            var removeLastWord = LastWordRemovals.Contains(parts.Last());
+        // If already lowercase, don't allocate.
+        if (firstLower == span[0])
+            return text;
 
-            for (int i = 0; i < parts.Length; i++)
+        // Allocate only when we actually need to change.
+        return string.Create(span.Length, (text, firstLower), static (dest, state) =>
+        {
+            dest[0] = state.firstLower;
+            state.text.AsSpan()[1..].CopyTo(dest[1..]);
+        });
+    }
+
+    /// <summary>
+    /// Converts a <see cref="string"/> into PascalCase.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <returns>The <see cref="string"/> in PascalCase.</returns>
+    /// <remarks>For example '<c>employee_id</c>' or '<c>EmployeeId</c>' would return '<c>EmployeeId</c>'.</remarks>
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToPascalCase(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        var parts = SplitIntoWords(text);
+        for (int i = 0; i < parts.Length; i++)
+        {
+            if (parts[i].Length == 0) continue;
+
+            // Uppercase first letter, lowercase rest.
+            if (parts[i].Length == 1)
+                parts[i] = char.ToUpperInvariant(parts[i][0]).ToString();
+            else
+            {
+                parts[i] = string.Create(parts[i].Length, parts[i], static (span, word) =>
+                {
+                    span[0] = char.ToUpperInvariant(word[0]);
+                    for (int j = 1; j < word.Length; j++)
+                    {
+                        span[j] = char.ToLowerInvariant(word[j]);
+                    }
+                });
+            }
+        }
+
+        return string.Concat(parts);
+    }
+
+    /// <summary>
+    /// Converts a <see cref="string"/> into camelCase.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <returns>The <see cref="string"/> in camelCase.</returns>
+    /// <remarks>For example '<c>EmployeeId</c>' would return '<c>employeeId</c>'.</remarks>
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToCamelCase(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        var parts = SplitIntoWords(text);
+        for (int i = 0; i < parts.Length; i++)
+        {
+            if (parts[i].Length == 0) continue;
+
+            if (i == 0)
+                parts[i] = parts[i].ToLowerInvariant(); // First word: all lowercase.
+            else
             {
-                if (Substitutions.TryGetValue(text, out var iscs))
-                    parts[i] = iscs;
+                // Other words: uppercase first letter, lowercase rest.
+                if (parts[i].Length == 1)
+                {
+                    parts[i] = char.ToUpperInvariant(parts[i][0]).ToString();
+                }
+                else
+                {
+                    parts[i] = string.Create(parts[i].Length, parts[i], static (span, word) =>
+                    {
+                        span[0] = char.ToUpperInvariant(word[0]);
+                        for (int j = 1; j < word.Length; j++)
+                        {
+                            span[j] = char.ToLowerInvariant(word[j]);
+                        }
+                    });
+                }
             }
+        }
 
-            // Rejoin the words back into the final sentence.
-            return string.Join(" ", parts, 0, parts.Length - (removeLastWord ? 1 : 0));
+        return string.Concat(parts);
+    }
+
+    /// <summary>
+    /// Converts a <see cref="string"/> into kebab-case.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <returns>The <see cref="string"/> in kebab-case.</returns>
+    /// <remarks>For example '<c>EmployeeId</c>' would return '<c>employee-id</c>'.</remarks>
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToKebabCase(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        var parts = SplitIntoWords(text);
+        for (int i = 0; i < parts.Length; i++)
+        {
+            if (parts[i].Length == 0) continue;
+            parts[i] = parts[i].ToLowerInvariant();
+        }
+
+        return string.Join("-", parts);
+    }
+
+    /// <summary>
+    /// Converts a <see cref="string"/> into snake_case.
+    /// </summary>
+    /// <param name="text">The text to convert.</param>
+    /// <returns>The <see cref="string"/> in snake_case.</returns>
+    /// <remarks>For example '<c>EmployeeId</c>' would return '<c>employee_id</c>'.</remarks>
+    [return: NotNullIfNotNull(nameof(text))]
+    public static string? ToSnakeCase(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return text;
+
+        var parts = SplitIntoWords(text);
+        for (int i = 0; i < parts.Length; i++)
+        {
+            if (parts[i].Length == 0) continue;
+            parts[i] = parts[i].ToLowerInvariant();
         }
 
-        /// <summary>
-        /// Gets or sets the sentence case substitutions <see cref="Dictionary{TKey, TValue}"/> where the key is the originating (input) text and the value the corresponding substitution sentence case text.
-        /// </summary>
-        /// <remarks>Defaults with the following entry: key '<c>Id</c>' and value '<c>Identifier</c>'.
-        /// <para>This subtitution applies to all words in the text with the exception of the last where it matches the <see cref="LastWordRemovals"/>.</para></remarks>
-        public static Dictionary<string, string> Substitutions { get; set; } = new() { { "Id", "Identifier" } };
-
-        /// <summary>
-        /// Gets or sets the sentence case last word removal list; i.e. where there is more than one word, and there is a match, the word will be removed.
-        /// </summary>
-        /// <remarks>Defaults with the following entry: '<c>Id</c>'.
-        /// <para>For example a value of '<c>EmployeeId</c>' would return just '<c>Employee</c>'.</para></remarks>
-        public static List<string> LastWordRemovals { get; set; } = ["Id"];
+        return string.Join("_", parts);
     }
+
+    /// <summary>
+    /// Gets or sets the sentence case substitutions <see cref="Dictionary{TKey, TValue}"/> where the key is the originating (input) text and the value the corresponding substitution sentence case text.
+    /// </summary>
+    /// <remarks>Defaults with the following entry: key '<c>Id</c>' and value '<c>Identifier</c>'.
+    /// <para>This substitution applies to all words in the text with the exception of the last where it matches the <see cref="LastWordRemovals"/>.</para></remarks>
+    public static Dictionary<string, string> Substitutions { get; set; } = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) { { "Id", "Identifier" }, { "Etag", "ETag" } };
+
+    /// <summary>
+    /// Gets or sets the sentence case last word removal list; i.e. where there is more than one word, and there is a match, the word will be removed.
+    /// </summary>
+    /// <remarks>Defaults with the following entry: '<c>Id</c>'.
+    /// <para>For example a value of '<c>EmployeeId</c>' would return just '<c>Employee</c>'.</para></remarks>
+    public static HashSet<string> LastWordRemovals { get; set; } = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Id" };
 }
\ No newline at end of file
diff --git a/src/CoreEx/TransientException.cs b/src/CoreEx/TransientException.cs
index 478d4c2b..f830f1ea 100644
--- a/src/CoreEx/TransientException.cs
+++ b/src/CoreEx/TransientException.cs
@@ -1,78 +1,38 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Localization;
-using System;
-using System.Net;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a <b>Transient</b> exception; i.e. is a candidate for a retry.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A transient error has occurred; please try again.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class TransientException(LText? message, Exception? innerException) 
+    : ExtendedException<TransientException>(message ?? new LText(typeof(TransientException).FullName, _message), innerException)
 {
+    private const string _message = "A transient error has occurred; please try again.";
+
     /// <summary>
-    /// Represents a <b>Transient</b> exception; i.e. is a candidate for a retry.
+    /// Gets the default retry after interval.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A data validation error occurred.</i></remarks>
-    public class TransientException : Exception, IExtendedException
-    {
-        private const string _message = "A transient error has occurred; please try again.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<TransientException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransientException"/> class.
-        /// </summary>
-        public TransientException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransientException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public TransientException(string? message) : base(message ?? new LText(typeof(TransientException).FullName, _message)) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransientException"/> class using the specified <paramref name="message"/> and <paramref name="innerException"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public TransientException(string? message, Exception innerException) : base(message ?? new LText(typeof(TransientException).FullName, _message), innerException) { }
+    public readonly static TimeSpan DefaultRetryAfter = TimeSpan.FromSeconds(90);
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.TransientError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.TransientError.ToString();
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.TransientError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.TransientError;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.ServiceUnavailable"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.ServiceUnavailable;
-
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>true</c>; is considered transient.</returns>
-        public bool IsTransient => true;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TransientException"/> class.
+    /// </summary>
+    public TransientException() : this(null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TransientException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public TransientException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// Gets or sets the corresponding <see href="https://learn.microsoft.com/en-us/dotnet/api/microsoft.net.http.headers.headernames.retryafter">HeaderNames.RetryAfter</see> seconds.
-        /// </summary>
-        /// <remarks>Defaults to <c>120</c> seconds.</remarks>
-        public int RetryAfterSeconds { get; set; } = 120;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "transient";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.ServiceUnavailable);
+        IsTransient = true;
+        RetryAfter = DefaultRetryAfter;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/UnexpectedInternalException.cs b/src/CoreEx/UnexpectedInternalException.cs
new file mode 100644
index 00000000..7028f6cc
--- /dev/null
+++ b/src/CoreEx/UnexpectedInternalException.cs
@@ -0,0 +1,32 @@
+namespace CoreEx;
+
+/// <summary>
+/// Represents an <b>Unexpected</b> (internal server error) exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>An unexpected internal server error has occurred.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class UnexpectedInternalException(LText? message, Exception? innerException)
+    : ExtendedException<UnexpectedInternalException>(message ?? new LText(typeof(UnexpectedInternalException).FullName, _message), innerException, true)
+{
+    private const string _message = "An unexpected internal server error has occurred.";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UnexpectedInternalException"/> class.
+    /// </summary>
+    public UnexpectedInternalException() : this(null) { }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="UnexpectedInternalException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public UnexpectedInternalException(LText? message) : this(message, null) { }
+
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "unexpected-internal";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.InternalServerError);
+        IsError = false;
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Validation/DecimalRuleHelper.cs b/src/CoreEx/Validation/DecimalRuleHelper.cs
new file mode 100644
index 00000000..118ee3fa
--- /dev/null
+++ b/src/CoreEx/Validation/DecimalRuleHelper.cs
@@ -0,0 +1,160 @@
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Represents a helper for <see langword="decimal"/> values.
+/// </summary>
+public static class DecimalRuleHelper
+{
+    /// <summary>
+    /// Gets the default precision for a <see langword="decimal"/> value.
+    /// </summary>
+    public const int DefaultPrecision = 18;
+
+    /// <summary>
+    /// Checks the <paramref name="value"/> for the specified <paramref name="precision"/> and <paramref name="scale"/>.
+    /// </summary>
+    /// <param name="value">The value to check.</param>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of fractional digits; i.e. decimal places.</param>
+    /// <returns><see langword="true"/> where valid; otherwise, <see langword="false"/>.</returns>
+    /// <remarks>A <see langword="null"/> <paramref name="scale"/> will result in no scale validation.</remarks>
+    public static bool CheckPrecisionAndScale(decimal value, int precision = DefaultPrecision, int? scale = null)
+    {
+        precision.ThrowWhen(p => p < 1, "Precision minimum value (where specified) is 1.");
+        scale.ThrowWhen(s => s.HasValue && s.Value < 0, "Scale minimum value (where specified) is 0.").ThrowWhen(s => s.HasValue && s.Value >= precision, "Scale must be less than precision.");
+
+        if (value == 0m)
+            return true;
+
+        // Calculate lengths once to avoid redundant computation.
+        var integralLength = CalcIntegralPartLength(value);
+        var fractionalLength = CalcFractionalPartLength(value);
+
+        if (!CheckPrecision(precision, scale, integralLength, fractionalLength))
+            return false;
+
+        return scale is null || CheckScale(scale.Value, fractionalLength);
+    }
+
+    /// <summary>
+    /// Checks the precision.
+    /// </summary>
+    /// <param name="precision">The maximum number of significant digits (including <paramref name="scale"/>).</param>
+    /// <param name="scale">The maximum number of fractional digits; i.e. decimal places.</param>
+    /// <param name="integralLength">The integral-part length.</param>
+    /// <param name="fractionalLength">The fractional-part length.</param>
+    internal static bool CheckPrecision(int precision, int? scale, int integralLength, int fractionalLength) => (integralLength + (scale ?? fractionalLength)) <= precision;
+
+    /// <summary>
+    /// Checks the <paramref name="value"/> to determine whether the fractional-part length is less than or equal to the specified scale.
+    /// </summary>
+    /// <param name="value">The value to check.</param>
+    /// <param name="scale">The maximum number of fractional digits; i.e. decimal places.</param>
+    /// <returns><see langword="true"/> where valid; otherwise, <see langword="false"/>.</returns>
+    public static bool CheckScale(decimal value, int scale)
+    {
+        scale.ThrowWhen(s => s < 0, "Scale minimum value is 0.");
+
+        if (value == 0m)
+            return true;
+
+        return CheckScale(scale, CalcFractionalPartLength(value));
+    }
+
+    /// <summary>
+    /// Checks the scale.
+    /// </summary>
+    /// <param name="scale">The maximum number of fractional digits; i.e. decimal places.</param>
+    /// <param name="fractionalLength">The fractional-part length.</param>
+    internal static bool CheckScale(int scale, int fractionalLength) => fractionalLength <= scale;
+
+    /// <summary>
+    /// Calculates the integral-part length for a <see cref="decimal"/> value.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <returns>The integral-part length.</returns>
+    public static int CalcIntegralPartLength(decimal value)
+    {
+        if (value == 0m)
+            return 0;
+
+        // Get the integral part.
+        decimal absValue = Math.Abs(Math.Truncate(value));
+        if (absValue == 0m)
+            return 0;
+
+        // Use Log10 for O(1) performance; cast to double is safe here as we only need the magnitude for digit counting.
+        return (int)Math.Floor(Math.Log10((double)absValue)) + 1;
+    }
+
+    /// <summary>
+    /// Calculates the fractional-part length for a <see cref="decimal"/> value.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <returns>The fractional-part length.</returns>
+    public static int CalcFractionalPartLength(decimal value)
+    {
+        if (value == 0m)
+            return 0;
+
+        // Extract scale directly from decimal's internal representation (O(1) operation); scale is stored in bits 16-23 of the fourth int32
+        int scale = (decimal.GetBits(value)[3] >> 16) & 0xFF;
+        if (scale == 0)
+            return 0;
+
+        // Get fractional part
+        decimal fractional = value % 1m;
+        if (fractional == 0m)
+            return 0;
+
+        // Multiply to integer form using power of 10, then strip trailing zeros.
+        decimal multiplied = Math.Abs(fractional) * GetPowerOf10(scale);
+        while (scale > 0 && multiplied % 10m == 0m)
+        {
+            multiplied /= 10m;
+            scale--;
+        }
+
+        return scale;
+    }
+
+    /// <summary>
+    /// Gets the power of 10 for the specified exponent using a lookup table for performance.
+    /// </summary>
+    private static decimal GetPowerOf10(int exponent)
+    {
+        return exponent switch
+        {
+            0 => 1m,
+            1 => 10m,
+            2 => 100m,
+            3 => 1000m,
+            4 => 10000m,
+            5 => 100000m,
+            6 => 1000000m,
+            7 => 10000000m,
+            8 => 100000000m,
+            9 => 1000000000m,
+            10 => 10000000000m,
+            11 => 100000000000m,
+            12 => 1000000000000m,
+            13 => 10000000000000m,
+            14 => 100000000000000m,
+            15 => 1000000000000000m,
+            16 => 10000000000000000m,
+            17 => 100000000000000000m,
+            18 => 1000000000000000000m,
+            19 => 10000000000000000000m,
+            20 => 100000000000000000000m,
+            21 => 1000000000000000000000m,
+            22 => 10000000000000000000000m,
+            23 => 100000000000000000000000m,
+            24 => 1000000000000000000000000m,
+            25 => 10000000000000000000000000m,
+            26 => 100000000000000000000000000m,
+            27 => 1000000000000000000000000000m,
+            28 => 10000000000000000000000000000m,
+            _ => throw new ArgumentOutOfRangeException(nameof(exponent), exponent, "Exponent must be between 0 and 28.")
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/Validation/IValidationResult.cs b/src/CoreEx/Validation/IValidationResult.cs
index ba34d0e2..4f485347 100644
--- a/src/CoreEx/Validation/IValidationResult.cs
+++ b/src/CoreEx/Validation/IValidationResult.cs
@@ -1,47 +1,34 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Enables <see cref="Value"/> validation results.
+/// </summary>
+public interface IValidationResult : IToResult
 {
     /// <summary>
-    /// Enables <see cref="Value"/> validation results.
+    /// Gets the value being validated.
     /// </summary>
-    public interface IValidationResult : ITypedToResult
-    {
-        /// <summary>
-        /// Gets the originating value being validated.
-        /// </summary>
-        object? Value { get; }
-
-        /// <summary>
-        /// Indicates whether there has been a validation or other related error.
-        /// </summary>
-        bool HasErrors { get; }
+    object? Value { get; }
 
-        /// <summary>
-        /// Gets a <see cref="MessageItemCollection"/> where <see cref="HasErrors"/> and individual errors have been recorded or other <see cref="MessageType"/> has been recorded; otherwise, <c>null</c>.
-        /// </summary>
-        MessageItemCollection? Messages { get; }
+    /// <summary>
+    /// Indicates whether there has been one or more validation errors.
+    /// </summary>
+    bool HasErrors { get; }
 
-        /// <summary>
-        /// Converts the <see cref="IValidationResult"/> into a corresponding <see cref="Exception"/>.
-        /// </summary>
-        /// <returns>The corresponding <see cref="Exception"/> (typically a <see cref="ValidationException"/>) where <see cref="HasErrors"/>; otherwise, <c>null</c>.</returns>
-        Exception? ToException();
+    /// <summary>
+    /// Gets a <see cref="MessageItemCollection"/> where <see cref="HasErrors"/> and individual errors have been recorded or other <see cref="MessageType"/> has been recorded; otherwise, <see langword="null"/>.
+    /// </summary>
+    MessageItemCollection? Messages { get; }
 
-        /// <summary>
-        /// Throws an <see cref="Exception"/> (typically a <see cref="ValidationException"/>) where <see cref="HasErrors"/>.
-        /// </summary>
-        /// <returns>The <see cref="IValidationResult"/> to support fluent-style method-chaining.</returns>
-        IValidationResult ThrowOnError();
+    /// <summary>
+    /// Converts the <see cref="IValidationResult"/> into a corresponding <see cref="Exception"/>.
+    /// </summary>
+    /// <returns>The corresponding <see cref="Exception"/> (typically a <see cref="ValidationException"/>) where <see cref="HasErrors"/>; otherwise, <see langword="null"/>.</returns>
+    Exception? ToException();
 
-        /// <summary>
-        /// Gets the <see cref="Result.IsFailure"/> <see cref="Result"/> where returned from within an underlying validation operation.
-        /// </summary>
-        /// <remarks>Where the related <see cref="Result"/> has an <see cref="Result.IsFailure"/> state then the underlying <see cref="Result.Error"/> takes precedence over the validation <see cref="Messages"/>.</remarks>
-        Result? FailureResult { get; }
-    }
+    /// <summary>
+    /// Throws an <see cref="Exception"/> (typically a <see cref="ValidationException"/>) where <see cref="HasErrors"/>.
+    /// </summary>
+    /// <returns>The <see cref="IValidationResult"/> to support fluent-style method-chaining.</returns>
+    IValidationResult ThrowOnError();
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/IValidationResultT.cs b/src/CoreEx/Validation/IValidationResultT.cs
index fc6c92d2..82c332aa 100644
--- a/src/CoreEx/Validation/IValidationResultT.cs
+++ b/src/CoreEx/Validation/IValidationResultT.cs
@@ -1,21 +1,16 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using System;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Enables typed <see cref="Value"/> validation results.
+/// </summary>
+/// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
+public interface IValidationResult<T> : IValidationResult
 {
+    /// <inheritdoc/>
+    object? IValidationResult.Value => Value;
+
     /// <summary>
-    /// Enables typed <see cref="Value"/> validation results.
+    /// Gets the value being validated.
     /// </summary>
-    /// <typeparam name="T">The <see cref="Value"/> <see cref="Type"/>.</typeparam>
-    public interface IValidationResult<out T> : IValidationResult
-    {
-        /// <inheritdoc/>
-        object? IValidationResult.Value => Value;
-
-        /// <summary>
-        /// Gets the originating value being validated.
-        /// </summary>
-        new T? Value { get; }
-    }
+    new T? Value { get; }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/IValidator.cs b/src/CoreEx/Validation/IValidator.cs
index f3f07ca2..5de59ea3 100644
--- a/src/CoreEx/Validation/IValidator.cs
+++ b/src/CoreEx/Validation/IValidator.cs
@@ -1,28 +1,21 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Enables value validation.
+/// </summary>
+/// <remarks>Decouples <i>CoreEx</i> from any specific implementation.</remarks>
+public interface IValidator
 {
     /// <summary>
-    /// Enables value validation.
+    /// Gets the <see cref="Type"/> for the value that is being validated.
     /// </summary>
-    /// <remarks>Decouples <i>CoreEx</i> from any specific implementation.</remarks>
-    public interface IValidator
-    {
-        /// <summary>
-        /// Gets the <see cref="Type"/> for the value that is being validated.
-        /// </summary>
-        Type ValueType { get; }
+    Type ValueType { get; }
 
-        /// <summary>
-        /// Validate the <paramref name="value"/> asynchronously.
-        /// </summary>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IValidationResult"/>.</returns>
-        Task<IValidationResult> ValidateAsync(object value, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Validate the <paramref name="value"/> asynchronously.
+    /// </summary>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationResult"/>.</returns>
+    Task<IValidationResult> ValidateAsync(object? value, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/IValidatorT.cs b/src/CoreEx/Validation/IValidatorT.cs
index 3e75f5ec..c1444672 100644
--- a/src/CoreEx/Validation/IValidatorT.cs
+++ b/src/CoreEx/Validation/IValidatorT.cs
@@ -1,30 +1,23 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Enables typed value validation.
+/// </summary>
+/// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
+/// <remarks>Decouples <i>CoreEx</i> from any specific implementation.</remarks>
+public interface IValidator<T> : IValidator
 {
-    /// <summary>
-    /// Enables typed value validation.
-    /// </summary>
-    /// <typeparam name="T">The value <see cref="Type"/>.</typeparam>
-    /// <remarks>Decouples <i>CoreEx</i> from any specific implementation.</remarks>
-    public interface IValidator<T> : IValidator
-    {
-        /// <inheritdoc/>
-        Type IValidator.ValueType => typeof(T);
+    /// <inheritdoc/>
+    Type IValidator.ValueType => typeof(T);
 
-        /// <inheritdoc/>
-        async Task<IValidationResult> IValidator.ValidateAsync(object value, CancellationToken cancellationToken) => await ValidateAsync((T)value!, cancellationToken).ConfigureAwait(false);
+    /// <inheritdoc/>
+    async Task<IValidationResult> IValidator.ValidateAsync(object? value, CancellationToken cancellationToken) => await ValidateAsync((T)value!, cancellationToken).ConfigureAwait(false);
 
-        /// <summary>
-        /// Validate the <paramref name="value"/> asynchronously.
-        /// </summary>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="IValidationResult"/>.</returns>
-        Task<IValidationResult<T>> ValidateAsync(T value, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Validate the <paramref name="value"/> asynchronously.
+    /// </summary>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="IValidationResult"/>.</returns>
+    Task<IValidationResult<T>> ValidateAsync(T value, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/MultiValidator.cs b/src/CoreEx/Validation/MultiValidator.cs
index 32235242..bf5b1a29 100644
--- a/src/CoreEx/Validation/MultiValidator.cs
+++ b/src/CoreEx/Validation/MultiValidator.cs
@@ -1,100 +1,93 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Enables multiple validations to be performed (<see cref="ValidateAsync(CancellationToken)"/>) resulting in a single consolidated <see cref="MultiValidatorResult"/>.
+/// </summary>
+public class MultiValidator
 {
     /// <summary>
-    /// Enables multiple validations to be performed (<see cref="ValidateAsync(CancellationToken)"/>) resulting in a single consolidated <see cref="MultiValidatorResult"/>.
+    /// Creates a new <see cref="MultiValidator"/> instance.
     /// </summary>
-    public class MultiValidator
-    {
-        /// <summary>
-        /// Creates a new <see cref="MultiValidator"/> instance.
-        /// </summary>
-        /// <returns>The <see cref="MultiValidator"/> instance.</returns>
-        public static MultiValidator Create() => new();
+    /// <returns>The <see cref="MultiValidator"/> instance.</returns>
+    public static MultiValidator Create() => new();
 
-        /// <summary>
-        /// Gets the list of validators.
-        /// </summary>
-        public List<Func<CancellationToken, Task<IValidationResult>>> Validators { get; } = [];
+    /// <summary>
+    /// Private constructor.
+    /// </summary>
+    private MultiValidator() { }
 
-        /// <summary>
-        /// Adds an <see cref="IValidator{T}"/>.
-        /// </summary>
-        /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
-        /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
-        /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
-        /// <param name="value">The entity value.</param>
-        /// <returns>The (this) <see cref="MultiValidator"/>.</returns>
-        public MultiValidator Add<TEntity, TValidator>(TValidator validator, TEntity value) where TEntity : class where TValidator : IValidator<TEntity>
-        {
-            Validators.Add(async ct => await validator.ValidateAsync(value, ct).ConfigureAwait(false));
-            return this;
-        }
+    /// <summary>
+    /// Gets the list of validators.
+    /// </summary>
+    public List<Func<CancellationToken, Task<IValidationResult>>> Validators { get; } = [];
 
-        /// <summary>
-        /// Adds (chains) a child <see cref="MultiValidator"/>.
-        /// </summary>
-        /// <param name="validator">The child <see cref="MultiValidator"/>.</param>
-        /// <returns>The (this) <see cref="MultiValidator"/>.</returns>
-        public MultiValidator Add(MultiValidator validator)
-        {
-            Validators.Add(async ct => await validator.ValidateAsync(ct).ConfigureAwait(false));
-            return this;
-        }
+    /// <summary>
+    /// Adds an <see cref="IValidator{T}"/>.
+    /// </summary>
+    /// <typeparam name="TEntity">The entity <see cref="Type"/>.</typeparam>
+    /// <typeparam name="TValidator">The validator <see cref="Type"/>.</typeparam>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="value">The entity value.</param>
+    /// <returns>The <see cref="MultiValidator"/> to support fluent-style method-chaining.</returns>
+    public MultiValidator Add<TEntity, TValidator>(TValidator validator, TEntity value) where TEntity : class where TValidator : IValidator<TEntity>
+    {
+        Validators.Add(async ct => await validator.ValidateAsync(value, ct).ConfigureAwait(false));
+        return this;
+    }
 
-        /// <summary>
-        /// Runs the validations.
-        /// </summary>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="MultiValidatorResult"/>.</returns>
-        public Task<MultiValidatorResult> ValidateAsync(CancellationToken cancellationToken = default) => ValidationInvoker.Current.InvokeAsync(this, async (_, cancellationToken) =>
-        {
-            var res = new MultiValidatorResult();
+    /// <summary>
+    /// Adds (chains) a child <see cref="MultiValidator"/>.
+    /// </summary>
+    /// <param name="validator">The child <see cref="MultiValidator"/>.</param>
+    /// <returns>The <see cref="MultiValidator"/> to support fluent-style method-chaining.</returns>
+    public MultiValidator Add(MultiValidator validator)
+    {
+        Validators.Add(async ct => await validator.ValidateAsync(ct).ConfigureAwait(false));
+        return this;
+    }
 
-            foreach (var v in Validators)
-            {
-                var r = await v(cancellationToken).ConfigureAwait(false);
-                if (r != null)
-                {
-                    res.SetFailureResult(r.FailureResult);
-                    if (res.FailureResult is not null)
-                        return res;
+    /// <summary>
+    /// Executes the validations.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="MultiValidatorResult"/>.</returns>
+    public async Task<MultiValidatorResult> ValidateAsync(CancellationToken cancellationToken = default)
+    {
+        var res = new MultiValidatorResult();
 
-                    if (r.Messages != null && r.Messages.Count > 0)
-                        res.Messages.AddRange(r.Messages);
-                }
+        foreach (var v in Validators)
+        {
+            var r = await v(cancellationToken).ConfigureAwait(false);
+            if (r is not null)
+            {
+                if (r.Messages is not null && r.Messages.Count > 0)
+                    res.Messages.AddRange(r.Messages);
             }
+        }
 
-            return res;
-        }, cancellationToken);
+        return res;
+    }
 
-        /// <summary>
-        /// Runs the validations.
-        /// </summary>
-        /// <param name="throwOnError">Indicates whether to automatically throw a <see cref="ValidationException"/> where <see cref="IValidationResult.HasErrors"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The <see cref="MultiValidatorResult"/>.</returns>
-        public async Task<MultiValidatorResult> ValidateAsync(bool throwOnError, CancellationToken cancellationToken = default)
-        {
-            var mvr = await ValidateAsync(cancellationToken).ConfigureAwait(false);
-            return throwOnError ? mvr.ThrowOnError() : mvr;
-        }
+    /// <summary>
+    /// Executes the validations.
+    /// </summary>
+    /// <param name="throwOnError">Indicates whether to automatically throw a <see cref="ValidationException"/> where <see cref="IValidationResult.HasErrors"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The <see cref="MultiValidatorResult"/>.</returns>
+    public async Task<MultiValidatorResult> ValidateAsync(bool throwOnError, CancellationToken cancellationToken = default)
+    {
+        var mvr = await ValidateAsync(cancellationToken).ConfigureAwait(false);
+        return throwOnError ? mvr.ThrowOnError() : mvr;
+    }
 
-        /// <summary>
-        /// Defines an <paramref name="action"/> to enable additional validations to be added (see <see cref="Add"/>).
-        /// </summary>
-        /// <param name="action">The custom action.</param>
-        /// <returns>The (this) <see cref="MultiValidator"/>.</returns>
-        public MultiValidator Additional(Action<MultiValidator> action)
-        {
-            action?.Invoke(this);
-            return this;
-        }
+    /// <summary>
+    /// Defines an <paramref name="action"/> to enable additional validations to be added (see <see cref="Add"/>).
+    /// </summary>
+    /// <param name="action">The custom action.</param>
+    /// <returns>The <see cref="MultiValidator"/> to support fluent-style method-chaining.</returns>
+    public MultiValidator Additional(Action<MultiValidator> action)
+    {
+        action?.Invoke(this);
+        return this;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/MultiValidatorResult.cs b/src/CoreEx/Validation/MultiValidatorResult.cs
index 75373fe6..fc5e3905 100644
--- a/src/CoreEx/Validation/MultiValidatorResult.cs
+++ b/src/CoreEx/Validation/MultiValidatorResult.cs
@@ -1,115 +1,81 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
 
-using CoreEx.Entities;
-using CoreEx.Results;
-using System;
-using System.Linq;
+namespace CoreEx.Validation;
 
-namespace CoreEx.Validation
+/// <summary>
+/// Represents the result of a <see cref="MultiValidator"/> <see cref="MultiValidator.ValidateAsync(System.Threading.CancellationToken)"/>.
+/// </summary>
+public class MultiValidatorResult : IValidationResult
 {
-    /// <summary>
-    /// Represents the result of a <see cref="MultiValidator"/> <see cref="MultiValidator.ValidateAsync(System.Threading.CancellationToken)"/>.
-    /// </summary>
-    public class MultiValidatorResult : IValidationResult, IToResult
-    {
-        private MessageItemCollection? _messages;
-
-        /// <inheritdoc/>
-        /// <remarks>This is nonsensical and as such will throw a <see cref="NotSupportedException"/>.</remarks>
-        object? IValidationResult.Value => throw new NotSupportedException();
-        
-        /// <inheritdoc/>
-        public bool HasErrors { get; private set; }
+    private MessageItemCollection? _messages;
 
-        /// <inheritdoc/>
-        public MessageItemCollection Messages
-        {
-            get
-            {
-                if (_messages != null)
-                    return _messages;
+    /// <inheritdoc/>
+    /// <remarks>This is nonsensical and as such will throw a <see cref="NotSupportedException"/>.</remarks>
+    object? IValidationResult.Value => throw new NotSupportedException();
 
-                _messages = [];
-                _messages.CollectionChanged += Messages_CollectionChanged;
-                return _messages;
-            }
-        }
+    /// <inheritdoc/>
+    public bool HasErrors { get; private set; }
 
-        /// <summary>
-        /// Handle the add of a message.
-        /// </summary>
-        private void Messages_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    /// <inheritdoc/>
+    public MessageItemCollection Messages
+    {
+        get
         {
-            if (HasErrors)
-                return;
-
-            switch (e.Action)
-            {
-                case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
-                    foreach (var m in e.NewItems!)
-                    {
-                        MessageItem mi = (MessageItem)m;
-                        if (mi.Type == MessageType.Error)
-                        {
-                            HasErrors = true;
-                            return;
-                        }
-                    }
-
-                    break;
+            if (_messages is not null)
+                return _messages;
 
-                default:
-                    throw new InvalidOperationException("Operation invalid for Messages; only add supported.");
-            }
+            _messages = [];
+            _messages.CollectionChanged += Messages_CollectionChanged;
+            return _messages;
         }
+    }
 
-        /// <inheritdoc/>
-        public Result? FailureResult { get; private set; }
+    /// <summary>
+    /// Handle the add of a message.
+    /// </summary>
+    private void Messages_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+    {
+        if (HasErrors)
+            return;
 
-        /// <summary>
-        /// Sets the <see cref="FailureResult"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        internal void SetFailureResult(Result? result)
+        switch (e.Action)
         {
-            if (result is null)
-                return;
+            case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
+                foreach (var m in e.NewItems!)
+                {
+                    MessageItem mi = (MessageItem)m;
+                    if (mi.Type == MessageType.Error)
+                    {
+                        HasErrors = true;
+                        return;
+                    }
+                }
 
-            if (FailureResult.HasValue)
-                throw new InvalidOperationException("The ValidationContext is already in a Failure state.");
+                break;
 
-            if (result.Value.IsFailure)
-                FailureResult = result;
+            default:
+                throw new InvalidOperationException("Operation invalid for Messages; only an Add is supported.");
         }
+    }
 
-        /// <inheritdoc/>
-        public Exception? ToException() => FailureResult.HasValue ? FailureResult.Value.Error : (HasErrors ? new ValidationException(Messages!) : null);
-
-        /// <inheritdoc/>
-        IValidationResult IValidationResult.ThrowOnError() => ThrowOnError();
-
-        /// <summary>
-        /// Throws a <see cref="ValidationException"/> where an error was found (and optionally if warnings).
-        /// </summary>
-        /// <param name="includeWarnings">Indicates whether to throw where only warnings exist.</param>
-        /// <returns>The <see cref="MultiValidatorResult"/> to support fluent-style method-chaining.</returns>
-        public MultiValidatorResult ThrowOnError(bool includeWarnings = false)
-        {
-            var ex = ToException();
-            if (ex is not null)
-                throw ex;
-
-            if (includeWarnings && Messages != null && Messages.Any(x => x.Type == MessageType.Warning))
-                throw new ValidationException(Messages);
+    /// <inheritdoc/>
+    public Exception? ToException() => HasErrors ? new ValidationException(Messages!) : null;
 
-            return this;
-        }
+    /// <inheritdoc/>
+    IValidationResult IValidationResult.ThrowOnError() => ThrowOnError();
 
-        /// <inheritdoc/>
-        /// <remarks>This is largely nonsensical from a <typeparamref name="T"/> perspective and as such the <see cref="IResult{T}.Value"/> will be set to its default value (see <see cref="Result{T}.None"/>).</remarks>
-        Result<T> ITypedToResult.ToResult<T>() => FailureResult.HasValue ? FailureResult.Value.Bind<T>() : (HasErrors ? Result<T>.ValidationError(Messages!) : Result<T>.None);
+    /// <summary>
+    /// Throws a <see cref="ValidationException"/> where an error was found (and optionally any warnings).
+    /// </summary>
+    /// <returns>The <see cref="MultiValidatorResult"/> to support fluent-style method-chaining.</returns>
+    public MultiValidatorResult ThrowOnError()
+    {
+        var ex = ToException();
+        if (ex is not null)
+            throw ex;
 
-        /// <inheritdoc/>
-        public Result ToResult() => FailureResult ?? (HasErrors ? Result.ValidationError(Messages!) : Result.Success);
+        return this;
     }
+
+    /// <inheritdoc/>
+    public Result ToResult() => HasErrors ? Result.ValidationError(Messages!) : Result.Success;
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/README.md b/src/CoreEx/Validation/README.md
index 711873a4..eac3ec07 100644
--- a/src/CoreEx/Validation/README.md
+++ b/src/CoreEx/Validation/README.md
@@ -1,29 +1,35 @@
 # CoreEx.Validation
 
-The `CoreEx.Validation` namespace provides extended validation capabilities.
+> Provides the `IValidator<T>` / `IValidationResult<T>` contracts, `MultiValidator`, and the `Validation` static helper — the foundational validation interfaces shared between the `CoreEx` and `CoreEx.Validation` packages.
 
-<br/>
+## Overview
 
-## Motivation
+`CoreEx.Validation` (within `src\CoreEx`) defines the contracts and entry-point utilities that the full validation package (`CoreEx.Validation` NuGet) implements. Separating the interfaces from the implementation means that application-layer code (services, repositories) can depend on `IValidator<T>` and `IValidationResult<T>` without pulling in the full validation rule engine.
 
-To support a generic, implementation agnostic, means to support validation that can be leveraged (integrated) in a consistent manner within _CoreEx_. Whereby enabling a developer to leverage their respective framework of choice; for example [FluentValidation](#FluentValidation-implementation).
+`Validation` is a static helper providing the standard error message format strings (`MandatoryFormat`, `InvalidValueFormat`) and factory methods (`Validation.CreateResult<T>()`) used when constructing lightweight validation outcomes without the full rule pipeline. `MultiValidator` orchestrates multiple `IValidator<T>` implementations in sequence and merges their results into a single `ValidationException`.
 
-<br/>
+## Key capabilities
 
-## Implementation agnostic
+- 📋 **Validator contract**: `IValidator<T>` defines `ValidateAsync(T value, CancellationToken)` returning `Task<IValidationResult<T>>`; consumed by application services for both manual and DI-resolved validation.
+- ✅ **Validation result contract**: `IValidationResult<T>` carries the validated `Value`, a `MessageCollection`, and `ThrowOnError()` / `ToResult()` helpers to integrate naturally with both exception-based and `Result`-based service flows.
+- 🔗 **Multi-validator**: `MultiValidator` runs a sequence of validators, merges `MessageItem` collections, and produces a single result — used when a single entity must pass multiple independent validation passes.
+- 📝 **Standard message formats**: `Validation.MandatoryFormat` and `Validation.InvalidValueFormat` are `LText` values defining the standard required and invalid-value error strings, customizable globally at startup.
+- ⚡ **Extension methods**: `ValidatorExtensions.Requires(...)` and related extension methods provide concise null/empty guards that produce `ValidationException` with standardized messages.
 
-The [`IValidator`](./IValidator.cs) and [`IValidator<T>`](./IValidatorT.cs) interfaces provide the standard implementation agnostic `ValidateAsync` operations that can be, and are, leveraged within _CoreEx_ to provide validation functionality.
+## Key types
 
-A corresponding [`IValidationResult`](./IValidationResult.cs) and [`IValidationResult<T>`](./IValidationResultT.cs) provide the corresponding validation result, that includes `HasErrors` and `Messages` (see [`MessageItemCollection`](../Entities/MessageItemCollection.cs)), and functionality to throw a resulting[`ValidationException`](../ValidationException.cs). 
+| Type | Description |
+|------|-------------|
+| **[`Validation`](./Validation.cs)** | Static helper: `MandatoryFormat`, `InvalidValueFormat`, `ValueName`, `ValueText` — configurable standard validation message strings; `CreateResult<T>()` factory. |
+| **[`MultiValidator`](./MultiValidator.cs)** | Composes multiple `IValidator<T>` instances, executing in sequence and merging their `MessageCollection` into a single result. |
+| **[`MultiValidatorResult`](./MultiValidatorResult.cs)** | `IValidationResult` returned by `MultiValidator.ValidateAsync()`; aggregates messages from all constituent validators. |
+| [`IValidator<T>`](./IValidatorT.cs) | Validation contract: `ValidateAsync(T value, CancellationToken) → Task<IValidationResult<T>>`. |
+| [`IValidationResult<T>`](./IValidationResultT.cs) | Typed result: `Value`, `Messages` (`MessageCollection`), `HasErrors`, `ThrowOnError()`, `ToResult()`. |
+| [`IValidationResult`](./IValidationResult.cs) | Non-generic base of `IValidationResult<T>` for use in heterogeneous result collections. |
+| [`ValidatorExtensions`](./ValidatorExtensions.cs) | Extension methods: `Requires(...)` guards and other fluent helper methods producing `ValidationException` on failure. |
 
-<br/>
+## Related Namespaces
 
-## CoreEx.Validation implementation 
-
-The [`CoreEx.Validation`](../../CoreEx.Validation) project (assembly) provides a _CoreEx_-based implementation of the `IValidator`; being the [`ValidatorBase`](../../CoreEx.Validation/ValidatorBase.cs) and related [`Validator<TEntity>`](../../CoreEx.Validation/ValidatorT.cs), plus utility [`Validator`](../../CoreEx.Validation/Validator.cs).
-
-<br/>
-
-## FluentValidation implementation
-
-[FluentValidation](https://github.com/FluentValidation/FluentValidation) is a popular .NET validator; as such [CoreEx.FluentValidation](../../CoreEx.FluentValidation) is provided to implement, the underlying [`ValidatorWrapper`](../../CoreEx.FluentValidation/ValidatorWrapper.cs) enables.
+- **[`CoreEx`](../README.md)** - `ValidationException` is the exception type thrown by `IValidationResult.ThrowOnError()`; `MessageItem` and `MessageCollection` carry the field-level error details.
+- **[`CoreEx.Localization`](../Localization/README.md)** - `Validation.MandatoryFormat` and `InvalidValueFormat` are `LText` values resolved at runtime via `TextProvider.Current`.
+- **[`CoreEx.Validation`](../../CoreEx.Validation/README.md)** - The full validation package implements `IValidator<T>` with a rich rule engine (fluent property rules, collection rules, reference data rules, common rule library).
\ No newline at end of file
diff --git a/src/CoreEx/Validation/Validation.cs b/src/CoreEx/Validation/Validation.cs
index a6baa3d6..83a01278 100644
--- a/src/CoreEx/Validation/Validation.cs
+++ b/src/CoreEx/Validation/Validation.cs
@@ -1,279 +1,71 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Validation;
 
-using CoreEx.Entities;
-using CoreEx.Localization;
-using CoreEx.Results;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
+/// <summary>
+/// Provides standard validation-related capabilities.
+/// </summary>
+public static class Validation
 {
     /// <summary>
-    /// Adds validation-related extension methods.
+    /// Gets or sets the format string for the <i>mandatory</i> error message.
     /// </summary>
-    public static class Validation
-    {
-        /// <summary>
-        /// Gets or sets the format string for the Mandatory error message.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>{0} is required.</c>'.</remarks>
-        public static LText MandatoryFormat { get; set; } = new("CoreEx.Validation.MandatoryFormat", "{0} is required.");
-
-        /// <summary>
-        /// Gets or sets the default value name.
-        /// </summary>
-        /// <remarks>Defaults to: '<c>value</c>'.</remarks>
-        public static string ValueNameDefault { get; set; } = "value";
-
-        /// <summary>
-        /// Gets or sets the default value <see cref="LText"/>.
-        /// </summary>
-        public static LText ValueTextDefault { get; set; } = "Value";
-
-        /// <summary>
-        /// Validates (requires) that the <paramref name="value"/> is non-default and continues; otherwise, will throw a <see cref="ValidationException"/>.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to validate.</param>
-        /// <param name="name">The value name.</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>The value where non-default.</returns>
-        /// <exception cref="ValidationException">Thrown where the value is default.</exception>
-        [return: NotNull()]
-#if NETSTANDARD2_1
-        public static T Required<T>(this T value, string? name = null, LText? text = null)
-#else
-        public static T Required<T>(this T value, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null)
-#endif
-            => (Comparer<T?>.Default.Compare(value, default!) == 0) ? throw new ValidationException(MessageItem.CreateErrorMessage(name ?? ValueNameDefault, MandatoryFormat, text ?? ((name == null || name == ValueNameDefault) ? ValueTextDefault : name.ToSentenceCase()!))) : value!;
-
-        /// <summary>
-        /// Requires (validates) that the <paramref name="value"/> is non-default and continues; otherwise, will return the <paramref name="result"/> with a corresponding <see cref="ValidationException"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) instance.</param>
-        /// <param name="value">The function to return the value to validate is required.</param>
-        /// <param name="name">The value name.</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>The resulting <see cref="IResult"/></returns>
-        public static TResult Requires<TResult, T>(this TResult result, Func<T> value, string name, LText? text = null) where TResult : IResult
-        {
-            value.ThrowIfNull(nameof(value));
-            name.ThrowIfNullOrEmpty(nameof(name));
-
-            if (result.IsSuccess && Comparer<T>.Default.Compare(value(), default!) == 0)
-                return (TResult)result.ToFailure(new ValidationException(MessageItem.CreateErrorMessage(name, MandatoryFormat, text ?? name.ToSentenceCase()!)));
-
-            return result;
-        }
-
-#if NETSTANDARD2_1
-        /// <summary>
-        /// Requires (validates) that the <paramref name="value"/> is non-default and continues; otherwise, will return the <paramref name="result"/> with a corresponding <see cref="ValidationException"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) instance.</param>
-        /// <param name="value">The value to validate is required.</param>
-        /// <param name="name">The value name.</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>The resulting <see cref="IResult"/></returns>
-        public static TResult Requires<TResult, T>(this TResult result, T value, string name, LText? text = null) where TResult : IResult => result.Requires(() => value, name, text);
-#else
-        /// <summary>
-        /// Requires (validates) that the <paramref name="value"/> is non-default and continues; otherwise, will return the <paramref name="result"/> with a corresponding <see cref="ValidationException"/>.
-        /// </summary>
-        /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) <see cref="Type"/>.</typeparam>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) instance.</param>
-        /// <param name="value">The value to validate is required.</param>
-        /// <param name="name">The value name (defaults to <paramref name="value"/> name using the <see cref="CallerArgumentExpressionAttribute"/>).</param>
-        /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
-        /// <returns>The resulting <see cref="IResult"/></returns>
-        public static TResult Requires<TResult, T>(this TResult result, T value, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null) where TResult : IResult => result.Requires(() => value, name!, text);
-#endif
-
-        /// <summary>
-        /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="validator">The function to get the <see cref="IValidator{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
-        public static async Task<Result<T>> ValidateAsync<T>(this Result<T> result, Func<IValidator<T>> validator, CancellationToken cancellationToken = default) where T : class
-        {
-            validator.ThrowIfNull(nameof(validator));
-
-            return await result.ThenAsync(async v =>
-            {
-                var vi = validator() ?? throw new InvalidOperationException($"The {nameof(validator)} function must return a non-null instance to perform the requested validation.");
-                var vr = await vi.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
-                return vr.ToResult<T>();
-            });
-        }
-
-        /// <summary>
-        /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="validator">The function to get the <see cref="IValidator{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
-        public static async Task<Result<T>> ValidateAsync<T>(this Task<Result<T>> result, Func<IValidator<T>> validator, CancellationToken cancellationToken = default) where T : class
-        {
-            validator.ThrowIfNull(nameof(validator));
-
-            return await result.ThenAsync(async v =>
-            {
-                var vi = validator() ?? throw new InvalidOperationException($"The {nameof(validator)} function must return a non-null instance to perform the requested validation.");
-                var vr = await vi.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
-                return vr.ToResult<T>();
-            });
-        }
-
-        /// <summary>
-        /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
-        public static async Task<Result<T>> ValidateAsync<T>(this Result<T> result, IValidator<T> validator, CancellationToken cancellationToken = default) where T : class
-        {
-            validator.ThrowIfNull(nameof(validator));
-
-            return await result.ThenAsync(async v =>
-            {
-                var vr = await validator.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
-                return vr.ToResult<T>();
-            });
-        }
-
-        /// <summary>
-        /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
-        public static async Task<Result<T>> ValidateAsync<T>(this Task<Result<T>> result, IValidator<T> validator, CancellationToken cancellationToken = default) where T : class
-        {
-            validator.ThrowIfNull(nameof(validator));
-
-            return await result.ThenAsync(async v =>
-            {
-                var vr = await validator.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
-                return vr.ToResult<T>();
-            });
-        }
-
-        /// <summary>
-        /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ValidateAsync(this Result result, Func<MultiValidator> multiValidator, CancellationToken cancellationToken = default)
-        {
-            multiValidator.ThrowIfNull(nameof(multiValidator));
+    /// <remarks>Defaults to: '<c>{0} is required.</c>'.</remarks>
+    public static LText MandatoryFormat { get; set; } = new("CoreEx.Validation.MandatoryFormat", "{0} is required.");
 
-            return await result.ThenAsync(async () =>
-            {
-                var mv = multiValidator() ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
-                var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-                return vr.ToResult();
-            });
-        }
-
-        /// <summary>
-        /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <param name="result">The <see cref="Result"/>.</param>
-        /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result"/>.</returns>
-        public static async Task<Result> ValidateAsync(this Task<Result> result, Func<MultiValidator> multiValidator, CancellationToken cancellationToken = default)
-        {
-            multiValidator.ThrowIfNull(nameof(multiValidator));
+    /// <summary>
+    /// Gets or sets the format string for an <i>invalid value</i> error message.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>{0} is invalid: {1}.</c>'.</remarks>
+    public static LText InvalidValueFormat { get; set; } = new("CoreEx.Validation.InvalidValueFormat", "{0} is invalid: {1}.");
 
-            return await result.ThenAsync(async () =>
-            {
-                var mv = multiValidator() ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
-                var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-                return vr.ToResult();
-            });
-        }
+    /// <summary>
+    /// Gets or sets the value name.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>value</c>'.</remarks>
+    public static string ValueName { get; set; } = "value";
 
-        /// <summary>
-        /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ValidateAsync<T>(this Result<T> result, Func<T, MultiValidator> multiValidator, CancellationToken cancellationToken = default)
-        {
-            multiValidator.ThrowIfNull(nameof(multiValidator));
+    /// <summary>
+    /// Gets or sets the value <see cref="LText"/>.
+    /// </summary>
+    public static LText ValueText { get; set; } = new("CoreEx.Validation.ValueText", "Value");
 
-            return await result.ThenAsync(async v =>
-            {
-                var mv = multiValidator(v) ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
-                var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-                return vr.ToResult().Bind<T>();
-            });
-        }
+    /// <summary>
+    /// Gets or sets the <see cref="LText"/> representation of <see langword="null"/>.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>(null)</c>'.</remarks>
+    public static LText NullText { get; set; } = new("CoreEx.Validation.NullText", "(null)");
 
-        /// <summary>
-        /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
-        /// </summary>
-        /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
-        /// <param name="result">The <see cref="Result{T}"/>.</param>
-        /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        public static async Task<Result<T>> ValidateAsync<T>(this Task<Result<T>> result, Func<T, MultiValidator> multiValidator, CancellationToken cancellationToken = default)
-        {
-            multiValidator.ThrowIfNull(nameof(multiValidator));
+    /// <summary>
+    /// Gets or sets the key name.
+    /// </summary>
+    /// <remarks>Defaults to: '<c>key</c>'.</remarks>
+    public static string KeyName { get; set; } = "key";
 
-            return await result.ThenAsync(async v =>
-            {
-                var mv = multiValidator(v) ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
-                var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
-                return vr.ToResult().Bind<T>();
-            });
-        }
+    /// <summary>
+    /// Creates a required value <see cref="ValidationException"/> <see cref="Result"/>.
+    /// </summary>
+    /// <param name="name">The value name.</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <param name="configure">An optional action to configure the <see cref="ValidationException"/>.</param>
+    /// <returns>The resulting <see cref="ValidationException"/> <see cref="Result"/>.</returns>
+    public static TResult CreateRequiredValueResult<TResult>(string? name = null, LText? text = null, Action<ValidationException>? configure = null) where TResult : IResult, new()
+    {
+        var ex = new ValidationException(MessageItem.CreateErrorMessage(name ?? ValueName, MandatoryFormat, text ?? name?.ToSentenceCase() ?? ValueText));
+        configure?.Invoke(ex);
+        return (TResult)new TResult().ToFailure(ex);
+    }
 
-        /// <summary>
-        /// Converts a <paramref name="value"/> to a <see cref="Result{T}"/> where <typeparamref name="T"/> and <typeparamref name="R"/> are the same.
-        /// </summary>
-        /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
-        /// <typeparam name="R">The <see cref="Result{T}"/> <see cref="Type"/>.</typeparam>
-        /// <param name="value">The value to convert.</param>
-        /// <returns>The resulting <see cref="Result{T}"/>.</returns>
-        /// <exception cref="InvalidOperationException">Thrown where <typeparamref name="T"/> and <typeparamref name="R"/> are not the same.</exception>
-        public static Result<R> ConvertValueToResult<T, R>(T value)
-        {
-            if (value is null)
-                return Result<R>.None;
-            else if (value is R r)
-                return Result<R>.Ok(r);
-            else
-                throw new InvalidOperationException($"Cannot convert {typeof(T).Name} to {typeof(R).Name}.");
-        }
+    /// <summary>
+    /// Creates an invalid value <see cref="ValidationException"/> <see cref="Result"/>.
+    /// </summary>
+    /// <param name="message">The context message.</param>
+    /// <param name="name">The value name.</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <param name="configure">An optional action to configure the <see cref="ValidationException"/>.</param>
+    /// <returns>The resulting <see cref="ValidationException"/> <see cref="Result"/>.</returns>
+    public static TResult CreateInvalidValueResult<TResult>(string message, string? name = null, LText? text = null, Action<ValidationException>? configure = null) where TResult : IResult, new()
+    {
+        var ex = new ValidationException(MessageItem.CreateErrorMessage(name ?? ValueName, InvalidValueFormat, text ?? name?.ToSentenceCase() ?? ValueText, message.ThrowIfNullOrEmpty().Trim('.')));
+        configure?.Invoke(ex);
+        return (TResult)new TResult().ToFailure(ex);
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Validation/ValidationInvoker.cs b/src/CoreEx/Validation/ValidationInvoker.cs
deleted file mode 100644
index 28d4cd59..00000000
--- a/src/CoreEx/Validation/ValidationInvoker.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Invokers;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Validation
-{
-    /// <summary>
-    /// Provides the invocation wrapping for the <see cref="IValidator"/> instances.
-    /// </summary>
-    public class ValidationInvoker : InvokerBase<object>
-    {
-        private const string ValidationHasErrors = "validation.haserrors";
-        private const string ValidationFailureResult = "validation.failureresult";
-        private static ValidationInvoker? _default;
-
-        /// <summary>
-        /// Gets the current configured instance (see <see cref="ExecutionContext.ServiceProvider"/>).
-        /// </summary>
-        public static ValidationInvoker Current => CoreEx.ExecutionContext.GetService<ValidationInvoker>() ?? (_default ??= new ValidationInvoker());
-
-        /// <inheritdoc/>
-        protected override TResult OnInvoke<TResult>(InvokeArgs invokeArgs, object invoker, System.Func<InvokeArgs, TResult> func) => throw new NotImplementedException();
-
-        /// <inheritdoc/>
-        protected override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, object invoker, Func<InvokeArgs, CancellationToken, Task<TResult>> func, CancellationToken cancellationToken)
-        {
-            var result = base.OnInvokeAsync(invokeArgs, invoker, func, cancellationToken);
-            if (invokeArgs.Activity is not null && result is IValidationResult vr)
-            {
-                invokeArgs.Activity.AddTag(ValidationHasErrors, vr.HasErrors);
-                invokeArgs.Activity.AddTag(ValidationFailureResult, vr.FailureResult is null || vr.FailureResult.Value.IsSuccess ? null : vr.FailureResult.ToString());
-            }
-
-            return result;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/CoreEx/Validation/ValidatorExtensions.Requires.cs b/src/CoreEx/Validation/ValidatorExtensions.Requires.cs
new file mode 100644
index 00000000..55319725
--- /dev/null
+++ b/src/CoreEx/Validation/ValidatorExtensions.Requires.cs
@@ -0,0 +1,48 @@
+namespace CoreEx.Validation;
+
+public static partial class ValidatorExtensions
+{
+    /// <summary>
+    /// Validates (requires) that the <paramref name="value"/> is non-default and continues; otherwise, will throw a <see cref="ValidationException"/>.
+    /// </summary>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="value">The value to validate.</param>
+    /// <param name="name">The value name.</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <returns>The value where non-default.</returns>
+    /// <exception cref="ValidationException">Thrown where the value is default.</exception>
+    [return: NotNull()]
+    public static T Required<T>(this T value, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null)
+        => (Comparer<T?>.Default.Compare(value, default!) == 0) ? throw Validation.CreateRequiredValueResult<Result>(name, text).Error : value!;
+
+    /// <summary>
+    /// Requires (validates) that the <paramref name="value"/> is non-default and continues; otherwise, will return the <paramref name="result"/> with a corresponding <see cref="ValidationException"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) instance.</param>
+    /// <param name="value">The function to return the value to validate is required.</param>
+    /// <param name="name">The value name.</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <returns>The resulting <see cref="IResult"/></returns>
+    public static TResult Requires<TResult, T>(this TResult result, Func<T> value, string name, LText? text = null) where TResult : IResult, new()
+    {
+        value.ThrowIfNull();
+        name.ThrowIfNullOrEmpty();
+
+        return result.IsSuccess && Comparer<T>.Default.Compare(value(), default!) == 0 ? Validation.CreateRequiredValueResult<TResult>(name, text) : result;
+    }
+
+    /// <summary>
+    /// Requires (validates) that the <paramref name="value"/> is non-default and continues; otherwise, will return the <paramref name="result"/> with a corresponding <see cref="ValidationException"/>.
+    /// </summary>
+    /// <typeparam name="TResult">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) <see cref="Type"/>.</typeparam>
+    /// <typeparam name="T">The <paramref name="value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result"/> or <see cref="Result{T}"/> (see <see cref="IResult"/>) instance.</param>
+    /// <param name="value">The value to validate is required.</param>
+    /// <param name="name">The value name (defaults to <paramref name="value"/> caller argument expression).</param>
+    /// <param name="text">The friendly text name used in validation messages (defaults to <paramref name="name"/> as sentence case where not specified).</param>
+    /// <returns>The resulting <see cref="IResult"/></returns>
+    public static TResult Requires<TResult, T>(this TResult result, T value, [CallerArgumentExpression(nameof(value))] string? name = null, LText? text = null) where TResult : IResult, new()
+        => result.Requires(() => value, name ?? Validation.ValueName, text);
+}
\ No newline at end of file
diff --git a/src/CoreEx/Validation/ValidatorExtensions.cs b/src/CoreEx/Validation/ValidatorExtensions.cs
new file mode 100644
index 00000000..9ddbe381
--- /dev/null
+++ b/src/CoreEx/Validation/ValidatorExtensions.cs
@@ -0,0 +1,167 @@
+namespace CoreEx.Validation;
+
+/// <summary>
+/// Provides standard validator extensions.
+/// </summary>
+public static partial class ValidatorExtensions
+{
+    /// <summary>
+    /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="validator">The function to get the <see cref="IValidator{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
+    public static async Task<Result<T>> ValidateAsync<T>(this Result<T> result, Func<IValidator<T>> validator, CancellationToken cancellationToken = default) where T : class
+    {
+        validator.ThrowIfNull();
+
+        return await result.ThenAsync(async v =>
+        {
+            var vi = validator() ?? throw new InvalidOperationException($"The {nameof(validator)} function must return a non-null instance to perform the requested validation.");
+            var vr = await vi.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
+            return vr.ToResult();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="validator">The function to get the <see cref="IValidator{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
+    public static async Task<Result<T>> ValidateAsync<T>(this Task<Result<T>> result, Func<IValidator<T>> validator, CancellationToken cancellationToken = default) where T : class
+    {
+        validator.ThrowIfNull();
+
+        return await result.ThenAsync(async v =>
+        {
+            var vi = validator() ?? throw new InvalidOperationException($"The {nameof(validator)} function must return a non-null instance to perform the requested validation.");
+            var vr = await vi.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
+            return vr.ToResult();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
+    public static async Task<Result<T>> ValidateAsync<T>(this Result<T> result, IValidator<T> validator, CancellationToken cancellationToken = default) where T : class
+    {
+        validator.ThrowIfNull();
+
+        return await result.ThenAsync(async v =>
+        {
+            var vr = await validator.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
+            return vr.ToResult();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="validator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="validator">The <see cref="IValidator{T}"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    /// <remarks>Where the <see cref="IValidationResult"/> <see cref="IValidationResult.HasErrors"/> the corresponding <see cref="IResult.Error"/> will be updated with the <see cref="IValidationResult.ToException"/>.</remarks>
+    public static async Task<Result<T>> ValidateAsync<T>(this Task<Result<T>> result, IValidator<T> validator, CancellationToken cancellationToken = default) where T : class
+    {
+        validator.ThrowIfNull();
+
+        return await result.ThenAsync(async v =>
+        {
+            var vr = await validator.ValidateAsync(v, cancellationToken).ConfigureAwait(false);
+            return vr.ToResult();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ValidateAsync(this Result result, Func<MultiValidator> multiValidator, CancellationToken cancellationToken = default)
+    {
+        multiValidator.ThrowIfNull();
+
+        return await result.ThenAsync(async () =>
+        {
+            var mv = multiValidator() ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
+            var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
+            return vr.ToResult();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <param name="result">The <see cref="Result"/>.</param>
+    /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result"/>.</returns>
+    public static async Task<Result> ValidateAsync(this Task<Result> result, Func<MultiValidator> multiValidator, CancellationToken cancellationToken = default)
+    {
+        multiValidator.ThrowIfNull();
+
+        return await result.ThenAsync(async () =>
+        {
+            var mv = multiValidator() ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
+            var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
+            return vr.ToResult();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ValidateAsync<T>(this Result<T> result, Func<T, MultiValidator> multiValidator, CancellationToken cancellationToken = default)
+    {
+        multiValidator.ThrowIfNull();
+
+        return await result.ThenAsync(async v =>
+        {
+            var mv = multiValidator(v) ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
+            var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
+            return vr.ToResult().Bind<T>();
+        });
+    }
+
+    /// <summary>
+    /// Validates using the <paramref name="multiValidator"/> where the <paramref name="result"/> is <see cref="Result.IsSuccess"/>.
+    /// </summary>
+    /// <typeparam name="T">The <see cref="Result{T}.Value"/> <see cref="Type"/>.</typeparam>
+    /// <param name="result">The <see cref="Result{T}"/>.</param>
+    /// <param name="multiValidator">The function to get the <see cref="MultiValidator"/> instance.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>The resulting <see cref="Result{T}"/>.</returns>
+    public static async Task<Result<T>> ValidateAsync<T>(this Task<Result<T>> result, Func<T, MultiValidator> multiValidator, CancellationToken cancellationToken = default)
+    {
+        multiValidator.ThrowIfNull();
+
+        return await result.ThenAsync(async v =>
+        {
+            var mv = multiValidator(v) ?? throw new InvalidOperationException($"The {nameof(multiValidator)} function must return a non-null instance to perform the requested validation.");
+            var vr = await mv.ValidateAsync(cancellationToken).ConfigureAwait(false);
+            return vr.ToResult().Bind<T>();
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/CoreEx/ValidationException.cs b/src/CoreEx/ValidationException.cs
index 47d4c47a..6c344335 100644
--- a/src/CoreEx/ValidationException.cs
+++ b/src/CoreEx/ValidationException.cs
@@ -1,116 +1,93 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
-
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Localization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-
-namespace CoreEx
+namespace CoreEx;
+
+/// <summary>
+/// Represents a <b>Validation</b> exception.
+/// </summary>
+/// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A data validation error occurred.</i></remarks>
+/// <param name="message">The error message.</param>
+/// <param name="innerException">The inner <see cref="Exception"/>.</param>
+public class ValidationException(LText? message, Exception? innerException) 
+    : ExtendedException<ValidationException>(message ?? new LText(typeof(ValidationException).FullName, _message), innerException)
 {
+    private const string _message = "A data validation error occurred.";
+
     /// <summary>
-    /// Represents a <b>Validation</b> exception.
+    /// Creates a new <see cref="ValidationException"/> using a <see cref="MessageItem"/> with the specified <paramref name="property"/> and <paramref name="text"/>.
     /// </summary>
-    /// <remarks>The <see cref="Exception.Message"/> defaults to: <i>A data validation error occurred.</i></remarks>
-    public class ValidationException : Exception, IExtendedException
-    {
-        private const string _message = "A data validation error occurred.";
-        private static bool? _shouldExceptionBeLogged;
-
-        /// <summary>
-        /// Get or sets the <see cref="ShouldBeLogged"/> value.
-        /// </summary>
-        public static bool ShouldExceptionBeLogged { get => _shouldExceptionBeLogged ?? Internal.ShouldExceptionBeLogged<ValidationException>(); set => _shouldExceptionBeLogged = value; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationException"/> class.
-        /// </summary>
-        public ValidationException() : this(null!) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public ValidationException(string? message) : base(message ?? new LText(typeof(ValidationException).FullName, _message)) { }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationException"/> class using the specified <paramref name="message"/>.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="innerException">The inner <see cref="Exception"/>.</param>
-        public ValidationException(string? message, Exception innerException) : base(message ?? new LText(typeof(ValidationException).FullName, _message), innerException) { }
+    /// <param name="property">The property name.</param>
+    /// <param name="text">The message text.</param>
+    /// <returns>The <see cref="ValidationException"/>.</returns>
+    public static ValidationException Create(string? property, LText text) => new(MessageItem.CreateErrorMessage(property, text));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationException"/> with a <see cref="MessageItem"/> list and optional <paramref name="message"/>.
-        /// </summary>
-        /// <param name="messages">The <see cref="MessageItem"/> list.</param>
-        /// <param name="message">The error message.</param>
-        public ValidationException(IEnumerable<MessageItem> messages, string? message = null) : base(CreateMessage(messages, message ?? new LText(typeof(ValidationException).FullName, _message)))
-        {
-            if (messages != null)
-                Messages = new(messages.Where(x => x.Type == MessageType.Error));
-        }
+    /// <summary>
+    /// Creates a new <see cref="ValidationException"/> using a <see cref="MessageItem"/> with the specified <paramref name="property"/>, text <paramref name="format"/> and additional <paramref name="values"/> included in the text.
+    /// </summary>
+    /// <param name="property">The property name.</param>
+    /// <param name="format">The composite format string.</param>
+    /// <param name="values">The values that form part of the message text.</param>
+    /// <returns>The <see cref="ValidationException"/>.</returns>
+    public static ValidationException Create(string? property, LText format, params IEnumerable<object?> values) => new(MessageItem.CreateErrorMessage(property, format, values));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ValidationException"/> with a single <see cref="MessageItem"/>.
-        /// </summary>
-        /// <param name="item">The <see cref="MessageItem"/>.</param>
-        /// <param name="message">The error message.</param>
-        public ValidationException(MessageItem item, string? message = null) : this([item], message) { }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ValidationException"/> class.
+    /// </summary>
+    public ValidationException() : this(null) { }
 
-        /// <summary>
-        /// Gets the underlying messages.
-        /// </summary>
-        public MessageItemCollection? Messages { get; }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ValidationException"/> class using the specified <paramref name="message"/>.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public ValidationException(LText? message) : this(message, null) { }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.ValidationError"/> value as a <see cref="string"/>.</returns>
-        public string ErrorType => Abstractions.ErrorType.ValidationError.ToString();
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ValidationException"/> with a <see cref="MessageItem"/> collection and optional <paramref name="message"/>.
+    /// </summary>
+    /// <param name="messages">The <see cref="MessageItem"/> collection.</param>
+    /// <param name="message">The error message.</param>
+    /// <param name="innerException">The inner <see cref="Exception"/>.</param>
+    public ValidationException(IEnumerable<MessageItem> messages, LText? message = null, Exception? innerException = null) : this(message, innerException)
+    {
+        if (messages is not null)
+            Messages = [.. messages.Where(x => x.Type == MessageType.Error)];
+    }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ErrorType.ValidationError"/> value as a <see cref="string"/>.</returns>
-        public int ErrorCode => (int)Abstractions.ErrorType.ValidationError;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ValidationException"/> with a single <see cref="MessageItem"/>.
+    /// </summary>
+    /// <param name="item">The <see cref="MessageItem"/>.</param>
+    /// <param name="message">The error message.</param>
+    /// <param name="innerException">The inner <see cref="Exception"/>.</param>
+    public ValidationException(MessageItem item, LText? message = null, Exception? innerException = null) : this(message, innerException)
+    {
+        if (item is not null && item.Type == MessageType.Error)
+            Messages = [item];
+    }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="HttpStatusCode.BadRequest"/> value.</returns>
-        public HttpStatusCode StatusCode => HttpStatusCode.BadRequest;
+    /// <summary>
+    /// Gets the underlying message(s) where applicable.
+    /// </summary>
+    public MessageItemCollection? Messages { get; }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns><c>false</c>; is not considered transient.</returns>
-        public bool IsTransient => false;
+    /// <inheritdoc/>
+    protected override void OnInitialize()
+    {
+        ErrorType = "validation";
+        StatusCode = GetConfiguredStatusCode(HttpStatusCode.BadRequest);
+    }
 
-        /// <summary>
-        /// <inheritdoc/>
-        /// </summary>
-        /// <returns>The <see cref="ShouldExceptionBeLogged"/> value.</returns>
-        public bool ShouldBeLogged => ShouldExceptionBeLogged;
+    /// <inheritdoc/>
+    /// <remarks>Prepends the <see cref="Messages"/> where applicable.</remarks>
+    public override string ToString()
+    {
+        if (Messages is null || Messages.Count == 0)
+            return base.ToString();
 
-        /// <summary>
-        /// Creates the exception message.
-        /// </summary>
-        private static string CreateMessage(IEnumerable<MessageItem> mic, string message)
+        var sb = new StringBuilder("Messages:");
+        foreach (var mi in Messages.Where(x => x.Type == MessageType.Error))
         {
-            if (mic == null)
-                return message;
-
-            var sb = new StringBuilder(message);
-            foreach (var mi in mic.Where(x => x.Type == MessageType.Error))
-            {
-                sb.Append($" [{mi.Property}: {mi.Text}]");
-            }
-
-            return sb.ToString();
+            sb.Append($" [{mi.Property}: {mi.Text}]");
         }
+
+        return sb.ToString() + Environment.NewLine + base.ToString();
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Wildcards/README.md b/src/CoreEx/Wildcards/README.md
new file mode 100644
index 00000000..7f01ad5a
--- /dev/null
+++ b/src/CoreEx/Wildcards/README.md
@@ -0,0 +1,32 @@
+# CoreEx.Wildcards
+
+> Provides `Wildcard` — a configurable wildcard parser that validates and classifies user-supplied wildcard text (e.g. `*` and `?`) and produces a `WildcardResult` for downstream `LIKE`-style filtering in queries.
+
+## Overview
+
+`CoreEx.Wildcards` standardizes how wildcard text entered by users is validated and represented before being translated to a database `LIKE` clause or an in-memory predicate. Instead of scattering ad-hoc `%` / `*` handling across repositories, consuming code creates a `Wildcard` configuration instance specifying which wildcard characters and space treatments are supported, then calls `Parse(text)` to get a validated `WildcardResult`.
+
+`WildcardResult` encodes the parsed outcome: whether the text is an exact match, a starts-with, ends-with, contains, or a full multi-wildcard pattern — each as a `WildcardSelection` flags enum value. ORM integrations in `CoreEx.Data` and `CoreEx.EntityFrameworkCore` consume `WildcardResult` to produce the correct `LIKE` expression without duplicating this logic.
+
+## Key capabilities
+
+- 🔍 **Configurable wildcard characters**: `Wildcard` supports the standard `*` (multi-character) and `?` (single-character) wildcards; which characters are active is controlled by `WildcardSelection` flags at construction.
+- 🧩 **Space treatment**: `WildcardSpaceTreatment` controls whether spaces in wildcard text are converted to `*`, treated as `?`, or left unchanged, accommodating different user-facing search conventions.
+- ✅ **Validation and classification**: `Wildcard.Parse(text)` validates the input against the configured `WildcardSelection` and returns a `WildcardResult` carrying the classification (equal, startsWith, endsWith, contains, multiWildcard) and the sanitized text.
+- 📐 **Pre-defined instances**: `Wildcard.None`, `Wildcard.MultiBasic`, `Wildcard.MultiAll`, and `Wildcard.All` provide ready-made configurations for common scenarios, reducing boilerplate.
+- 🔗 **ORM integration bridge**: `WildcardResult` is consumed by `CoreEx.Data` and `CoreEx.EntityFrameworkCore` query-building utilities to produce the correct `LIKE` / `EF.Functions.Like` expression.
+
+## Key types
+
+| Type | Description |
+|------|-------------|
+| **[`Wildcard`](./Wildcard.cs)** | Configured wildcard parser: `Parse(string)` validates input and returns a `WildcardResult`; static instances `None`, `MultiBasic`, `MultiAll`, `All`. |
+| **[`WildcardResult`](./WildcardResult.cs)** | Parsed result: `Selection` (`WildcardSelection` flags), sanitized `Text`, `IsValid`, `HasWildcard`, and convenience bool properties (`IsEqual`, `IsStartsWith`, etc.). |
+| **[`WildcardSelection`](./WildcardSelection.cs)** | Flags enum describing the wildcard type: `None`, `Equal`, `Single` (`?`), `MultiBasic` (`*`), `MultiAll`, `BothEnds`, `Contains`. |
+| **[`WildcardSpaceTreatment`](./WildcardSpaceTreatment.cs)** | Enum controlling space handling: `None` (leave as-is), `MultiWildcard` (convert to `*`), `SingleWildcard` (convert to `?`). |
+
+## Related Namespaces
+
+- **[`CoreEx`](../README.md)** - Root package; `ReferenceDataOrchestrator` uses `Wildcard.MultiAll` for text-based reference data search.
+- **[`CoreEx.Data`](../Data/README.md)** - `QueryArgs` includes optional wildcard configuration; `CoreEx.Data` query builders consume `WildcardResult` to produce `LIKE` expressions.
+- **[`CoreEx.EntityFrameworkCore`](../../CoreEx.EntityFrameworkCore/README.md)** - EF Core query extensions translate `WildcardResult` into `EF.Functions.Like(...)` predicates.
\ No newline at end of file
diff --git a/src/CoreEx/Wildcards/Wildcard.cs b/src/CoreEx/Wildcards/Wildcard.cs
index 760914bf..1039ca11 100644
--- a/src/CoreEx/Wildcards/Wildcard.cs
+++ b/src/CoreEx/Wildcards/Wildcard.cs
@@ -1,191 +1,186 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Wildcards;
 
-using CoreEx.Entities;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-
-namespace CoreEx.Wildcards
+/// <summary>
+/// Provides a standardised approach to parsing and validating wildcard text.
+/// </summary>
+public sealed class Wildcard
 {
     /// <summary>
-    /// Provides a standardised approach to parsing and validating wildcard text.
+    /// Gets the standard multi (zero or more) wildcard character.
+    /// </summary>
+    public const char MultiWildcardCharacter = '*';
+
+    /// <summary>
+    /// Gets the standard single wildcard character.
+    /// </summary>
+    public const char SingleWildcardCharacter = '?';
+
+    /// <summary>
+    /// Gets the space ' ' character.
+    /// </summary>
+    public const char SpaceCharacter = ' ';
+
+    /// <summary>
+    /// Gets the <see cref="WildcardSelection.None"/> and <see cref="WildcardSelection.Single"/> <see cref="Wildcard"/>; i.e does not directly support any wildcard characters.
+    /// </summary>
+    public static Wildcard None { get; } = new Wildcard(WildcardSelection.None | WildcardSelection.Equal);
+
+    /// <summary>
+    /// Gets the <see cref="WildcardSelection.MultiBasic"/> <see cref="Wildcard"/> using only the <see cref="MultiWildcardCharacter"/>.
     /// </summary>
-    public class Wildcard
+    public static Wildcard MultiBasic { get; } = new Wildcard(WildcardSelection.MultiBasic);
+
+    /// <summary>
+    /// Gets the <see cref="WildcardSelection.MultiAll"/> <see cref="Wildcard"/> using only the <see cref="MultiWildcardCharacter"/>.
+    /// </summary>
+    public static Wildcard MultiAll { get; } = new Wildcard(WildcardSelection.MultiAll);
+
+    /// <summary>
+    /// Gets the <see cref="WildcardSelection.BothAll"/> <see cref="Wildcard"/> using both the <see cref="MultiWildcardCharacter"/> and <see cref="SingleWildcardCharacter"/>.
+    /// </summary>
+    public static Wildcard BothAll { get; } = new Wildcard(WildcardSelection.BothAll);
+
+    /// <summary>
+    /// Gets or sets the default <see cref="Wildcard"/> settings (defaults to <see cref="WildcardSelection.MultiBasic"/>.
+    /// </summary>
+    public static Wildcard Default { get; set; } = MultiBasic;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Wildcard"/> class.
+    /// </summary>
+    /// <param name="supported">The supported <see cref="WildcardSelection"/>.</param>
+    /// <param name="multiWildcard">The .NET multi (zero or more) wildcard character (defaults to <see cref="MultiWildcardCharacter"/>).</param>
+    /// <param name="singleWildcard">The .NET single wildcard character (defaults to <see cref="SingleWildcardCharacter"/>).</param>
+    /// <param name="charactersNotAllowed">The list of characters that are not allowed.</param>
+    /// <param name="spaceTreatment">The <see cref="WildcardSpaceTreatment"/> that defines the treatment of embedded space ' ' characters within the wildcard.</param>
+    public Wildcard(WildcardSelection supported, char multiWildcard = MultiWildcardCharacter, char singleWildcard = SingleWildcardCharacter, char[]? charactersNotAllowed = null, WildcardSpaceTreatment spaceTreatment = WildcardSpaceTreatment.None)
     {
-        /// <summary>
-        /// Gets the standard multi (zero or more) wildcard character.
-        /// </summary>
-        public const char MultiWildcardCharacter = '*';
-
-        /// <summary>
-        /// Gets the standard single wildcard character.
-        /// </summary>
-        public const char SingleWildcardCharacter = '?';
-
-        /// <summary>
-        /// Gets the space ' ' character.
-        /// </summary>
-        public const char SpaceCharacter = ' ';
-
-        /// <summary>
-        /// Gets the <see cref="WildcardSelection.None"/> and <see cref="WildcardSelection.Single"/> <see cref="Wildcard"/>; i.e does not directly support any wildcard characters.
-        /// </summary>
-        public static Wildcard None { get; } = new Wildcard(WildcardSelection.None | WildcardSelection.Equal);
-
-        /// <summary>
-        /// Gets the <see cref="WildcardSelection.MultiBasic"/> <see cref="Wildcard"/> using only the <see cref="MultiWildcardCharacter"/>.
-        /// </summary>
-        public static Wildcard MultiBasic { get; } = new Wildcard(WildcardSelection.MultiBasic);
-
-        /// <summary>
-        /// Gets the <see cref="WildcardSelection.MultiAll"/> <see cref="Wildcard"/> using only the <see cref="MultiWildcardCharacter"/>.
-        /// </summary>
-        public static Wildcard MultiAll { get; } = new Wildcard(WildcardSelection.MultiAll);
-
-        /// <summary>
-        /// Gets the <see cref="WildcardSelection.BothAll"/> <see cref="Wildcard"/> using both the <see cref="MultiWildcardCharacter"/> and <see cref="SingleWildcardCharacter"/>.
-        /// </summary>
-        public static Wildcard BothAll { get; } = new Wildcard(WildcardSelection.BothAll);
-
-        /// <summary>
-        /// Gets or sets the default <see cref="Wildcard"/> settings (defaults to <see cref="WildcardSelection.MultiAll"/>.
-        /// </summary>
-        public static Wildcard Default { get; set; } = MultiBasic;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Wildcard"/> class.
-        /// </summary>
-        /// <param name="supported">The supported <see cref="WildcardSelection"/>.</param>
-        /// <param name="multiWildcard">The .NET multi (zero or more) wildcard character (defaults to <see cref="MultiWildcardCharacter"/>).</param>
-        /// <param name="singleWildcard">The .NET single wildcard character (defaults to <see cref="SingleWildcardCharacter"/>).</param>
-        /// <param name="charactersNotAllowed">The list of characters that are not allowed.</param>
-        /// <param name="transform">The <see cref="StringTransform"/> option for the wildcard text.</param>
-        /// <param name="spaceTreatment">The <see cref="WildcardSpaceTreatment"/> that defines the treatment of embedded space ' ' characters within the wildcard.</param>
-        public Wildcard(WildcardSelection supported, char multiWildcard = MultiWildcardCharacter, char singleWildcard = SingleWildcardCharacter, char[]? charactersNotAllowed = null,
-            WildcardSpaceTreatment spaceTreatment = WildcardSpaceTreatment.None, StringTransform transform = StringTransform.EmptyToNull)
-        {
-            if (supported == WildcardSelection.Undetermined || supported.HasFlag(WildcardSelection.InvalidCharacter))
-                throw new ArgumentException("A Wildcard cannot be configured with Undetermined and/or InvalidCharacter supported selection(s).", nameof(supported));
+        if (supported == WildcardSelection.Undetermined || supported.HasFlag(WildcardSelection.InvalidCharacter))
+            throw new ArgumentException("A Wildcard cannot be configured with Undetermined and/or InvalidCharacter supported selection(s).", nameof(supported));
 
-            if (multiWildcard != char.MinValue && singleWildcard != char.MinValue && multiWildcard == singleWildcard)
-                throw new ArgumentException("A Wildcard cannot be configured with the same character for the MultiWildcard and SingleWildcard.", nameof(multiWildcard));
+        if (multiWildcard != char.MinValue && singleWildcard != char.MinValue && multiWildcard == singleWildcard)
+            throw new ArgumentException("A Wildcard cannot be configured with the same character for the MultiWildcard and SingleWildcard.", nameof(multiWildcard));
 
-            if (charactersNotAllowed != null && (charactersNotAllowed.Contains(multiWildcard) || charactersNotAllowed.Contains(singleWildcard)))
-                throw new ArgumentException("A Wildcard cannot be configured with either the MultiWildcard or SingleWildcard in the CharactersNotAllowed list.", nameof(charactersNotAllowed));
+        if (charactersNotAllowed is not null && (charactersNotAllowed.Contains(multiWildcard) || charactersNotAllowed.Contains(singleWildcard)))
+            throw new ArgumentException("A Wildcard cannot be configured with either the MultiWildcard or SingleWildcard in the CharactersNotAllowed list.", nameof(charactersNotAllowed));
 
-            if (supported.HasFlag(WildcardSelection.MultiWildcard) && multiWildcard == char.MinValue)
-                throw new ArgumentException("A Wildcard that supports MultiWildcard must also define the MultiWildcard character.");
+        if (supported.HasFlag(WildcardSelection.MultiWildcard) && multiWildcard == char.MinValue)
+            throw new ArgumentException("A Wildcard that supports MultiWildcard must also define the MultiWildcard character.", nameof(multiWildcard));
 
-            if (supported.HasFlag(WildcardSelection.SingleWildcard) && singleWildcard == char.MinValue)
-                throw new ArgumentException("A Wildcard that supports SingleWildcard must also define the SingleWildcard character.");
+        if (supported.HasFlag(WildcardSelection.SingleWildcard) && singleWildcard == char.MinValue)
+            throw new ArgumentException("A Wildcard that supports SingleWildcard must also define the SingleWildcard character.", nameof(singleWildcard));
 
-            Supported = supported;
-            MultiWildcard = multiWildcard;
-            SingleWildcard = singleWildcard;
-            CharactersNotAllowed = new ReadOnlyCollection<char>(charactersNotAllowed != null ? (char[])charactersNotAllowed.Clone() : []);
-            SpaceTreatment = spaceTreatment;
-            Transform = transform;
-        }
+        SupportedSelection = supported;
+        MultiWildcard = multiWildcard;
+        SingleWildcard = singleWildcard;
+        CharactersNotAllowed = new ReadOnlyCollection<char>(charactersNotAllowed is not null ? (char[])charactersNotAllowed.Clone() : []);
+        SpaceTreatment = spaceTreatment;
+    }
 
-        /// <summary>
-        /// Gets the supported <see cref="WildcardSelection"/>.
-        /// </summary>
-        public WildcardSelection Supported { get; private set; }
-
-        /// <summary>
-        /// Gets the .NET multi (zero or more) wildcard character.
-        /// </summary>
-        /// <remarks>A value of <see cref="char.MinValue"/> indicates no multi wildcard support.</remarks>
-        public char MultiWildcard { get; private set; }
-
-        /// <summary>
-        /// Gets the .NET single wildcard character.
-        /// </summary>
-        /// <remarks>A value of <see cref="char.MinValue"/> indicates no single wildcard support.</remarks>
-        public char SingleWildcard { get; private set; }
-
-        /// <summary>
-        /// Gets the list of characters that are not allowed.
-        /// </summary>
-        public IReadOnlyList<char> CharactersNotAllowed { get; private set; }
-
-        /// <summary>
-        /// Gets the <see cref="StringTransform"/> option for the wildcard text.
-        /// </summary>
-        public StringTransform Transform { get; private set; }
-
-        /// <summary>
-        /// Gets the <see cref="WildcardSpaceTreatment"/> that defines the treatment of embedded space ' ' characters within the wildcard.
-        /// </summary>
-        public WildcardSpaceTreatment SpaceTreatment { get; private set; }
-
-        /// <summary>
-        /// Validates the wildcard text against what is <see cref="Supported"/> to ensure validity.
-        /// </summary>
-        /// <param name="text">The wildcard text.</param>
-        /// <returns><c>true</c> indicates that the text is valid; otherwise, <c>false</c> for invalid.</returns>
-        /// <remarks>Note that leading and trailing spaces are ignored.</remarks>
-        public bool Validate(string? text) => !Parse(text).HasError;
-
-        /// <summary>
-        /// Validates the <paramref name="selection"/> against what is <see cref="Supported"/> to ensure validity.
-        /// </summary>
-        /// <param name="selection">The <see cref="WildcardSelection"/> to validate.</param>
-        /// <returns><c>true</c> indicates that the selection is valid; otherwise, <c>false</c> for invalid.</returns>
-        public bool Validate(WildcardSelection selection)
-        {
-            if ((selection.HasFlag(WildcardSelection.None) && !Supported.HasFlag(WildcardSelection.None)) ||
-                (selection.HasFlag(WildcardSelection.Equal) && !Supported.HasFlag(WildcardSelection.Equal)) ||
-                (selection.HasFlag(WildcardSelection.Single) && !Supported.HasFlag(WildcardSelection.Single)) ||
-                (selection.HasFlag(WildcardSelection.StartsWith) && !Supported.HasFlag(WildcardSelection.StartsWith)) ||
-                (selection.HasFlag(WildcardSelection.EndsWith) && !Supported.HasFlag(WildcardSelection.EndsWith)) ||
-                (selection.HasFlag(WildcardSelection.Contains) && !Supported.HasFlag(WildcardSelection.Contains)) ||
-                (selection.HasFlag(WildcardSelection.Embedded) && !Supported.HasFlag(WildcardSelection.Embedded)) ||
-                (selection.HasFlag(WildcardSelection.MultiWildcard) && !Supported.HasFlag(WildcardSelection.MultiWildcard)) ||
-                (selection.HasFlag(WildcardSelection.SingleWildcard) && !Supported.HasFlag(WildcardSelection.SingleWildcard)) ||
-                (selection.HasFlag(WildcardSelection.AdjacentWildcards) && !Supported.HasFlag(WildcardSelection.AdjacentWildcards)) ||
-                (selection.HasFlag(WildcardSelection.InvalidCharacter)))
-                return false;
-            else
-                return true;
-        }
+    /// <summary>
+    /// Gets the supported <see cref="WildcardSelection"/>.
+    /// </summary>
+    public WildcardSelection SupportedSelection { get; }
 
-        /// <summary>
-        /// Parses the wildcard text to ensure validitity returning a <see cref="WildcardResult"/>.
-        /// </summary>
-        /// <param name="text">The wildcard text.</param>
-        /// <returns>The corresponding <see cref="WildcardResult"/>.</returns>
-        public WildcardResult Parse(string? text)
-        {
-            text = Cleaner.Clean(text, StringTrim.Both, Transform);
-            if (string.IsNullOrEmpty(text))
-                return new WildcardResult(this) { Selection = WildcardSelection.None, Text = text };
+    /// <summary>
+    /// Gets the .NET multi (zero or more) wildcard character.
+    /// </summary>
+    /// <remarks>A value of <see cref="char.MinValue"/> indicates no multi wildcard support.</remarks>
+    public char MultiWildcard { get; }
 
-            var sb = new StringBuilder();
-            var wr = new WildcardResult(this) { Selection = WildcardSelection.Undetermined };
+    /// <summary>
+    /// Gets the .NET single wildcard character.
+    /// </summary>
+    /// <remarks>A value of <see cref="char.MinValue"/> indicates no single wildcard support.</remarks>
+    public char SingleWildcard { get; }
 
-            if (CharactersNotAllowed != null && CharactersNotAllowed.Count > 0 && text.IndexOfAny([.. CharactersNotAllowed]) >= 0)
-                wr.Selection |= WildcardSelection.InvalidCharacter;
+    /// <summary>
+    /// Gets the list of characters that are not allowed.
+    /// </summary>
+    public IReadOnlyList<char> CharactersNotAllowed { get; }
+
+    /// <summary>
+    /// Gets the <see cref="WildcardSpaceTreatment"/> that defines the treatment of embedded space ' ' characters within the wildcard.
+    /// </summary>
+    public WildcardSpaceTreatment SpaceTreatment { get; }
+
+    /// <summary>
+    /// Parses the wildcard text to ensure validity returning a <see cref="WildcardResult"/>.
+    /// </summary>
+    /// <param name="text">The wildcard text.</param>
+    /// <returns>The corresponding <see cref="WildcardResult"/>.</returns>
+    /// <remarks>Note that any leading or trailing spaces are ignored.</remarks>
+    public WildcardResult Parse(string? text)
+    {
+        if (string.IsNullOrEmpty(text))
+            return new WildcardResult(this) { Selection = WildcardSelection.None, Text = text };
+
+        text = text.Trim();
+        var sb = new StringBuilder();
+        var wr = new WildcardResult(this) { Selection = WildcardSelection.Undetermined };
 
-            var hasMulti = SpaceTreatment == WildcardSpaceTreatment.MultiWildcardWhenOthers && Supported.HasFlag(WildcardSelection.MultiWildcard) && text.Contains(MultiWildcardCharacter, StringComparison.InvariantCulture);
-            var hasTxt = false;
+        if (CharactersNotAllowed is not null && CharactersNotAllowed.Count > 0 && text.IndexOfAny([.. CharactersNotAllowed]) >= 0)
+            wr.Selection |= WildcardSelection.InvalidCharacter;
+
+        var hasMulti = SpaceTreatment == WildcardSpaceTreatment.MultiWildcardWhenOthers && SupportedSelection.HasFlag(WildcardSelection.MultiWildcard) && text.Contains(MultiWildcardCharacter, StringComparison.Ordinal);
+        var hasTxt = false;
+
+        for (int i = 0; i < text.Length; i++)
+        {
+            var c = text[i];
+            var isMulti = c == MultiWildcard;
+            var isSingle = c == SingleWildcard;
 
-            for (int i = 0; i < text.Length; i++)
+            if (isMulti)
             {
-                var c = text[i];
-                var isMulti = c == MultiWildcard;
-                var isSingle = c == SingleWildcard;
+                wr.Selection |= WildcardSelection.MultiWildcard;
 
-                if (isMulti)
+                // Skip adjacent multi's as they are redundant.
+                for (int j = i + 1; j < text.Length; j++)
                 {
-                    wr.Selection |= WildcardSelection.MultiWildcard;
+                    if (text[j] == MultiWildcard)
+                    {
+                        i = j;
+                        wr.Selection |= WildcardSelection.AdjacentWildcards;
+                        continue;
+                    }
+
+                    break;
+                }
+            }
+
+            if (isSingle)
+                wr.Selection |= WildcardSelection.SingleWildcard;
+
+            if (isMulti || isSingle)
+            {
+                if (text.Length == 1)
+                    wr.Selection |= WildcardSelection.Single;
+                else if (i == 0)
+                    wr.Selection |= WildcardSelection.EndsWith;
+                else if (i == text.Length - 1)
+                    wr.Selection |= WildcardSelection.StartsWith;
+                else
+                {
+                    if (hasTxt || isSingle)
+                        wr.Selection |= WildcardSelection.Embedded;
+                    else
+                        wr.Selection |= WildcardSelection.EndsWith;
+                }
 
-                    // Skip adjacent multi's as they are redundant.
+                if (i < text.Length - 1 && (text[i + 1] == MultiWildcard || text[i + 1] == SingleWildcard))
+                    wr.Selection |= WildcardSelection.AdjacentWildcards;
+            }
+            else
+            {
+                hasTxt = true;
+                if (c == SpaceCharacter && (SpaceTreatment == WildcardSpaceTreatment.Compress || SpaceTreatment == WildcardSpaceTreatment.MultiWildcardAlways || SpaceTreatment == WildcardSpaceTreatment.MultiWildcardWhenOthers))
+                {
+                    // Compress adjacent spaces.
+                    bool skipChar = SpaceTreatment != WildcardSpaceTreatment.Compress && text[i - 1] == MultiWildcardCharacter;
                     for (int j = i + 1; j < text.Length; j++)
                     {
-                        if (text[j] == MultiWildcard)
+                        if (text[j] == SpaceCharacter)
                         {
                             i = j;
                             continue;
@@ -193,81 +188,62 @@ public WildcardResult Parse(string? text)
 
                         break;
                     }
-                }
 
-                if (isSingle)
-                    wr.Selection |= WildcardSelection.SingleWildcard;
+                    if (skipChar || (SpaceTreatment != WildcardSpaceTreatment.Compress && text[i + 1] == MultiWildcardCharacter))
+                        continue;
 
-                if (isMulti || isSingle)
-                {
-                    if (text.Length == 1)
-                        wr.Selection |= WildcardSelection.Single;
-                    else if (i == 0)
-                        wr.Selection |= WildcardSelection.EndsWith;
-                    else if (i == text.Length - 1)
-                        wr.Selection |= WildcardSelection.StartsWith;
-                    else
+                    if (SpaceTreatment == WildcardSpaceTreatment.MultiWildcardAlways || (SpaceTreatment == WildcardSpaceTreatment.MultiWildcardWhenOthers && hasMulti))
                     {
-                        if (hasTxt || isSingle)
-                            wr.Selection |= WildcardSelection.Embedded;
-                        else
-                            wr.Selection |= WildcardSelection.EndsWith;
+                        c = MultiWildcardCharacter;
+                        wr.Selection |= WildcardSelection.MultiWildcard;
+                        wr.Selection |= WildcardSelection.Embedded;
                     }
-
-                    if (i < text.Length - 1 && (text[i + 1] == MultiWildcard || text[i + 1] == SingleWildcard))
-                        wr.Selection |= WildcardSelection.AdjacentWildcards;
                 }
-                else
-                {
-                    hasTxt = true;
-                    if (c == SpaceCharacter && (SpaceTreatment == WildcardSpaceTreatment.Compress || SpaceTreatment == WildcardSpaceTreatment.MultiWildcardAlways || SpaceTreatment == WildcardSpaceTreatment.MultiWildcardWhenOthers))
-                    {
-                        // Compress adjacent spaces.
-                        bool skipChar = SpaceTreatment != WildcardSpaceTreatment.Compress && text[i - 1] == MultiWildcardCharacter;
-                        for (int j = i + 1; j < text.Length; j++)
-                        {
-                            if (text[j] == SpaceCharacter)
-                            {
-                                i = j;
-                                continue;
-                            }
-
-                            break;
-                        }
+            }
 
-                        if (skipChar || (SpaceTreatment != WildcardSpaceTreatment.Compress && text[i + 1] == MultiWildcardCharacter))
-                            continue;
+            sb.Append(c);
+        }
 
-                        if (SpaceTreatment == WildcardSpaceTreatment.MultiWildcardAlways || (SpaceTreatment == WildcardSpaceTreatment.MultiWildcardWhenOthers && hasMulti))
-                        {
-                            c = MultiWildcardCharacter;
-                            wr.Selection |= WildcardSelection.MultiWildcard;
-                            wr.Selection |= WildcardSelection.Embedded;
-                        }
-                    }
-                }
+        if (!hasTxt && wr.Selection == (WildcardSelection.StartsWith | WildcardSelection.MultiWildcard))
+        {
+            wr.Selection |= WildcardSelection.Single;
+            wr.Selection ^= WildcardSelection.StartsWith;
+        }
 
-                sb.Append(c);
-            }
+        if (hasTxt && wr.Selection.HasFlag(WildcardSelection.StartsWith) && wr.Selection.HasFlag(WildcardSelection.EndsWith) && !wr.Selection.HasFlag(WildcardSelection.Embedded))
+        {
+            wr.Selection |= WildcardSelection.Contains;
+            wr.Selection ^= WildcardSelection.StartsWith;
+            wr.Selection ^= WildcardSelection.EndsWith;
+        }
 
-            if (!hasTxt && wr.Selection == (WildcardSelection.StartsWith | WildcardSelection.MultiWildcard))
-            {
-                wr.Selection |= WildcardSelection.Single;
-                wr.Selection ^= WildcardSelection.StartsWith;
-            }
+        if (wr.Selection == WildcardSelection.Undetermined)
+            wr.Selection |= WildcardSelection.Equal;
 
-            if (hasTxt && wr.Selection.HasFlag(WildcardSelection.StartsWith) && wr.Selection.HasFlag(WildcardSelection.EndsWith) && !wr.Selection.HasFlag(WildcardSelection.Embedded))
-            {
-                wr.Selection |= WildcardSelection.Contains;
-                wr.Selection ^= WildcardSelection.StartsWith;
-                wr.Selection ^= WildcardSelection.EndsWith;
-            }
+        wr.Text = sb.Length == 0 ? null : sb.ToString();
+        wr.HasError = !ValidateSelection(wr.Selection);
 
-            if (wr.Selection == WildcardSelection.Undetermined)
-                wr.Selection |= WildcardSelection.Equal;
+        return wr;
+    }
 
-            wr.Text = sb.Length == 0 ? null : sb.ToString();
-            return wr;
-        }
+    /// <summary>
+    /// Validates the <paramref name="selection"/> against what is <see cref="SupportedSelection"/> to ensure validity.
+    /// </summary>
+    private bool ValidateSelection(WildcardSelection selection)
+    {
+        if (selection.HasFlag(WildcardSelection.InvalidCharacter) ||
+            (selection.HasFlag(WildcardSelection.None) && !SupportedSelection.HasFlag(WildcardSelection.None)) ||
+            (selection.HasFlag(WildcardSelection.Equal) && !SupportedSelection.HasFlag(WildcardSelection.Equal)) ||
+            (selection.HasFlag(WildcardSelection.Single) && !SupportedSelection.HasFlag(WildcardSelection.Single)) ||
+            (selection.HasFlag(WildcardSelection.StartsWith) && !SupportedSelection.HasFlag(WildcardSelection.StartsWith)) ||
+            (selection.HasFlag(WildcardSelection.EndsWith) && !SupportedSelection.HasFlag(WildcardSelection.EndsWith)) ||
+            (selection.HasFlag(WildcardSelection.Contains) && !SupportedSelection.HasFlag(WildcardSelection.Contains)) ||
+            (selection.HasFlag(WildcardSelection.Embedded) && !SupportedSelection.HasFlag(WildcardSelection.Embedded)) ||
+            (selection.HasFlag(WildcardSelection.MultiWildcard) && !SupportedSelection.HasFlag(WildcardSelection.MultiWildcard)) ||
+            (selection.HasFlag(WildcardSelection.SingleWildcard) && !SupportedSelection.HasFlag(WildcardSelection.SingleWildcard)) ||
+            (selection.HasFlag(WildcardSelection.AdjacentWildcards) && !SupportedSelection.HasFlag(WildcardSelection.AdjacentWildcards)))
+            return false;
+        else
+            return true;
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Wildcards/WildcardResult.cs b/src/CoreEx/Wildcards/WildcardResult.cs
index d131b210..2167428a 100644
--- a/src/CoreEx/Wildcards/WildcardResult.cs
+++ b/src/CoreEx/Wildcards/WildcardResult.cs
@@ -1,102 +1,96 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Wildcards;
 
-using System;
-using System.Text.RegularExpressions;
-
-namespace CoreEx.Wildcards
+/// <summary>
+/// Represents the <see cref="Wildcard"/> <see cref="Wildcard.Parse"/> result.
+/// </summary>
+public class WildcardResult
 {
     /// <summary>
-    /// Represents the <see cref="Wildcard"/> <see cref="Wildcard.Parse"/> result.
+    /// Initialize a new instance of the <see cref="WildcardResult"/> class.
+    /// </summary>
+    /// <param name="wildcard">The originating <see cref="Wildcards.Wildcard"/> configuration.</param>
+    internal WildcardResult(Wildcard wildcard) => Wildcard = wildcard;
+
+    /// <summary>
+    /// Gets the originating <see cref="Wildcards.Wildcard"/> configuration.
+    /// </summary>
+    internal Wildcard Wildcard { get; private set; }
+
+    /// <summary>
+    /// Gets the resulting <see cref="WildcardSelection"/>.
+    /// </summary>
+    public WildcardSelection Selection { get; internal set; }
+
+    /// <summary>
+    /// Gets the updated wildcard text.
+    /// </summary>
+    public string? Text { get; internal set; }
+
+    /// <summary>
+    /// Indicates whether the <see cref="Text"/> contains one or more non-<see cref="Wildcard.SupportedSelection"/> errors.
+    /// </summary>
+    public bool HasError { get; internal set;}
+
+    /// <summary>
+    /// Gets the <see cref="Text"/> with all the wildcard characters removed.
+    /// </summary>
+    public string? GetTextWithoutWildcards()
+    {
+        var s = Text;
+        if (Selection.HasFlag(WildcardSelection.MultiWildcard))
+            s = s!.Replace(new string(Wildcard.MultiWildcard, 1), string.Empty, StringComparison.InvariantCulture);
+
+        if (Selection.HasFlag(WildcardSelection.SingleWildcard))
+            s = s!.Replace(new string(Wildcard.SingleWildcard, 1), string.Empty, StringComparison.InvariantCulture);
+
+        return s;
+    }
+
+    /// <summary>
+    /// Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <see langword="true"/>.
+    /// </summary>
+    /// <returns>The current instance to enable method-chaining.</returns>
+    public WildcardResult ThrowOnError() => HasError ? throw new InvalidOperationException("Wildcard selection text is not supported.") : this;
+
+    /// <summary>
+    /// Creates the corresponding <see cref="Regex"/> for the wildcard text.
+    /// </summary>
+    /// <param name="ignoreCase">Indicates whether the regular expression should ignore case (default) or not.</param>
+    /// <returns>The corresponding <see cref="Regex"/>.</returns>
+    /// <exception cref="InvalidOperationException">Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <see langword="true"/>.</exception>
+    public Regex CreateRegex(bool ignoreCase = true) => CreateRegex(ignoreCase ? RegexOptions.IgnoreCase : RegexOptions.None);
+
+    /// <summary>
+    /// Creates the corresponding <see cref="Regex"/> for the wildcard text.
     /// </summary>
-    public class WildcardResult
+    /// <param name="options">The <see cref="RegexOptions"/>.</param>
+    /// <returns>The corresponding <see cref="Regex"/>.</returns>
+    /// <exception cref="InvalidOperationException">Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <see langword="true"/>.</exception>
+    public Regex CreateRegex(RegexOptions options)
     {
-        /// <summary>
-        /// Initialize a new instance of the <see cref="WildcardResult"/> class.
-        /// </summary>
-        /// <param name="wildcard">The originating <see cref="Wildcards.Wildcard"/> configuration.</param>
-        internal WildcardResult(Wildcard wildcard) => Wildcard = wildcard;
-
-        /// <summary>
-        /// Gets the originating <see cref="Wildcards.Wildcard"/> configuration.
-        /// </summary>
-        internal Wildcard Wildcard { get; private set; }
-
-        /// <summary>
-        /// Gets the resulting <see cref="WildcardSelection"/>.
-        /// </summary>
-        public WildcardSelection Selection { get; internal set; }
-
-        /// <summary>
-        /// Gets the updated wildcard text.
-        /// </summary>
-        public string? Text { get; internal set; }
-
-        /// <summary>
-        /// Indicates whether the <see cref="Text"/> contains one or more non-<see cref="Wildcard.Supported"/> errors.
-        /// </summary>
-        public bool HasError => !Wildcard.Validate(Selection);
-
-        /// <summary>
-        /// Gets the <see cref="Text"/> with all the wildcard characters removed.
-        /// </summary>
-        public string? GetTextWithoutWildcards()
-        {
-            var s = Text;
-            if (Selection.HasFlag(WildcardSelection.MultiWildcard))
-                s = s!.Replace(new string(Wildcard.MultiWildcard, 1), string.Empty, StringComparison.InvariantCulture);
-
-            if (Selection.HasFlag(WildcardSelection.SingleWildcard))
-                s = s!.Replace(new string(Wildcard.SingleWildcard, 1), string.Empty, StringComparison.InvariantCulture);
-
-            return s;
-        }
-
-        /// <summary>
-        /// Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <c>true</c>.
-        /// </summary>
-        /// <returns>The current instance to enable method-chaining.</returns>
-        public WildcardResult ThrowOnError() => HasError ? throw new InvalidOperationException("Wildcard selection text is not supported.") : this;
-
-        /// <summary>
-        /// Creates the corresponding <see cref="Regex"/> for the wildcard text.
-        /// </summary>
-        /// <param name="ignoreCase">Indicates whether the regular expression should ignore case (default) or not.</param>
-        /// <returns>The corresponding <see cref="Regex"/>.</returns>
-        /// <exception cref="InvalidOperationException">Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <c>true</c>.</exception>
-        public Regex CreateRegex(bool ignoreCase = true) => CreateRegex(ignoreCase ? RegexOptions.IgnoreCase : RegexOptions.None);
-
-        /// <summary>
-        /// Creates the corresponding <see cref="Regex"/> for the wildcard text.
-        /// </summary>
-        /// <param name="options">The <see cref="RegexOptions"/>.</param>
-        /// <returns>The corresponding <see cref="Regex"/>.</returns>
-        /// <exception cref="InvalidOperationException">Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <c>true</c>.</exception>
-        public Regex CreateRegex(RegexOptions options)
-        {
-            ThrowOnError();
-            return new Regex(GetRegexPattern(), options);
-        }
-
-        /// <summary>
-        /// Gets the corresponding <b>regular expression</b> pattern for the wildcard text.
-        /// </summary>
-        /// <returns>The corresponding <see cref="Regex"/> pattern.</returns>
-        /// <exception cref="InvalidOperationException">Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <c>true</c>.</exception>
-        public string GetRegexPattern()
-        {
-            ThrowOnError();
-
-            if (Selection.HasFlag(WildcardSelection.Single))
-                return Selection.HasFlag(WildcardSelection.MultiWildcard) ? "^.*$" : "^.$";
-
-            var p = Regex.Escape(Text!);
-            if (Selection.HasFlag(WildcardSelection.MultiWildcard))
-                p = p.Replace("\\*", ".*", StringComparison.InvariantCulture);
-
-            if (Selection.HasFlag(WildcardSelection.SingleWildcard))
-                p = p.Replace("\\?", ".", StringComparison.InvariantCulture);
-
-            return $"^{p}$";
-        }
+        ThrowOnError();
+        return new Regex(GetRegexPattern(), options);
+    }
+
+    /// <summary>
+    /// Gets the corresponding <b>regular expression</b> pattern for the wildcard text.
+    /// </summary>
+    /// <returns>The corresponding <see cref="Regex"/> pattern.</returns>
+    /// <exception cref="InvalidOperationException">Throws an <see cref="InvalidOperationException"/> where result <see cref="HasError"/> is <see langword="true"/>.</exception>
+    public string GetRegexPattern()
+    {
+        ThrowOnError();
+
+        if (Selection.HasFlag(WildcardSelection.Single))
+            return Selection.HasFlag(WildcardSelection.MultiWildcard) ? "^.*$" : "^.$";
+
+        var p = Regex.Escape(Text!);
+        if (Selection.HasFlag(WildcardSelection.MultiWildcard))
+            p = p.Replace("\\*", ".*", StringComparison.InvariantCulture);
+
+        if (Selection.HasFlag(WildcardSelection.SingleWildcard))
+            p = p.Replace("\\?", ".", StringComparison.InvariantCulture);
+
+        return $"^{p}$";
     }
 }
\ No newline at end of file
diff --git a/src/CoreEx/Wildcards/WildcardSelection.cs b/src/CoreEx/Wildcards/WildcardSelection.cs
index 3137a059..dd6ed5cb 100644
--- a/src/CoreEx/Wildcards/WildcardSelection.cs
+++ b/src/CoreEx/Wildcards/WildcardSelection.cs
@@ -1,88 +1,83 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Wildcards;
 
-using System;
-
-namespace CoreEx.Wildcards
+/// <summary>
+/// Represents the wildcard selection.
+/// </summary>
+[Flags]
+public enum WildcardSelection
 {
     /// <summary>
-    /// Represents the wildcard selection.
+    /// Indicates that the wildcard selection is undetermined.
     /// </summary>
-    [Flags]
-    public enum WildcardSelection
-    {
-        /// <summary>
-        /// Indicates that the wildcard selection is undetermined.
-        /// </summary>
-        Undetermined,
+    Undetermined,
 
-        /// <summary>
-        /// Indicates that there was no selection; i.e the text was null or empty (see <see cref="string.IsNullOrEmpty(string)"/>).
-        /// </summary>
-        None = 1,
+    /// <summary>
+    /// Indicates that there was no selection; i.e the text was null or empty (see <see cref="string.IsNullOrEmpty(string)"/>).
+    /// </summary>
+    None = 1,
 
-        /// <summary>
-        /// Indicates that no wildcard characters were found and an equal operation should be performed.
-        /// </summary>
-        Equal = 2,
+    /// <summary>
+    /// Indicates that no wildcard characters were found and an equal operation should be performed.
+    /// </summary>
+    Equal = 2,
 
-        /// <summary>
-        /// Indicates a single wildcard character (e.g. '*' or '?').
-        /// </summary>
-        Single = 4,
+    /// <summary>
+    /// Indicates a single wildcard character (e.g. '*' or '?').
+    /// </summary>
+    Single = 4,
 
-        /// <summary>
-        /// Indicates the selection contains a starts with operation (e.g. 'xxx*', 'xxx?', 'xx*x*', etc).
-        /// </summary>
-        StartsWith = 8,
+    /// <summary>
+    /// Indicates the selection contains a starts with operation (e.g. 'xxx*', 'xxx?', 'xx*x*', etc).
+    /// </summary>
+    StartsWith = 8,
 
-        /// <summary>
-        /// Indicates the selection contains an ends with operation (e.g. '*xxx', '?xxx', '?x*xx', etc).
-        /// </summary>
-        EndsWith = 16,
+    /// <summary>
+    /// Indicates the selection contains an ends with operation (e.g. '*xxx', '?xxx', '?x*xx', etc).
+    /// </summary>
+    EndsWith = 16,
 
-        /// <summary>
-        /// Indicates the selection contains both a <see cref="StartsWith"/> and <see cref="EndsWith"/> (with no <see cref="Embedded"/>) operation (e.g. '*xxx*', '?xxx*', etc).
-        /// </summary>
-        Contains = 32,
+    /// <summary>
+    /// Indicates the selection contains both a <see cref="StartsWith"/> and <see cref="EndsWith"/> (with no <see cref="Embedded"/>) operation (e.g. '*xxx*', '?xxx*', etc).
+    /// </summary>
+    Contains = 32,
 
-        /// <summary>
-        /// Indicates the selection contains an embedded operation (e.g. 'xx*xx', '*xx*xx*', 'xx?xx*', etc).
-        /// </summary>
-        Embedded = 64,
+    /// <summary>
+    /// Indicates the selection contains an embedded operation (e.g. 'xx*xx', '*xx*xx*', 'xx?xx*', etc).
+    /// </summary>
+    Embedded = 64,
 
-        /// <summary>
-        /// Indicates the selection contains at least one instance of the <see cref="Wildcard.MultiWildcard"/> character.
-        /// </summary>
-        MultiWildcard = 128,
+    /// <summary>
+    /// Indicates the selection contains at least one instance of the <see cref="Wildcard.MultiWildcard"/> character.
+    /// </summary>
+    MultiWildcard = 128,
 
-        /// <summary>
-        /// Indicates the selection contains at least one instance of the <see cref="Wildcard.SingleWildcard"/> character.
-        /// </summary>
-        SingleWildcard = 256,
+    /// <summary>
+    /// Indicates the selection contains at least one instance of the <see cref="Wildcard.SingleWildcard"/> character.
+    /// </summary>
+    SingleWildcard = 256,
 
-        /// <summary>
-        /// Indicates the selection contains adjacent (side-by-side) wildcard characters (e.g. '*?', 'xx**xx', 'xxx**', etc.
-        /// </summary>
-        AdjacentWildcards = 512,
+    /// <summary>
+    /// Indicates the selection contains adjacent (side-by-side) wildcard characters (e.g. '*?', 'xx**xx', 'xxx**', etc.
+    /// </summary>
+    AdjacentWildcards = 512,
 
-        /// <summary>
-        /// Indicates the selection contains one or more invalid characters (see <see cref="Wildcard.CharactersNotAllowed"/>).
-        /// </summary>
-        InvalidCharacter = 1024,
+    /// <summary>
+    /// Indicates the selection contains one or more invalid characters (see <see cref="Wildcard.CharactersNotAllowed"/>).
+    /// </summary>
+    InvalidCharacter = 1024,
 
-        /// <summary>
-        /// Represents the <see cref="MultiWildcard"/> and <see cref="SingleWildcard"/> <b>all</b> selections; excludes <see cref="InvalidCharacter"/> and <see cref="Undetermined"/>.
-        /// </summary>
-        BothAll = None | Equal | Single | StartsWith | EndsWith | Contains | Embedded | MultiWildcard | SingleWildcard | AdjacentWildcards,
+    /// <summary>
+    /// Represents the <see cref="MultiWildcard"/> and <see cref="SingleWildcard"/> <b>all</b> selections; excludes <see cref="InvalidCharacter"/> and <see cref="Undetermined"/>.
+    /// </summary>
+    BothAll = None | Equal | Single | StartsWith | EndsWith | Contains | Embedded | MultiWildcard | SingleWildcard | AdjacentWildcards,
 
-        /// <summary>
-        /// Represents the <see cref="MultiWildcard"/> <b>basic</b> selections; includes <see cref="Equal"/>, <see cref="StartsWith"/>, <see cref="EndsWith"/>, <see cref="Contains"/> and <see cref="AdjacentWildcards"/>.
-        /// </summary>
-        MultiBasic = None | Equal | Single | StartsWith | EndsWith | Contains | MultiWildcard | AdjacentWildcards,
+    /// <summary>
+    /// Represents the <see cref="MultiWildcard"/> <b>basic</b> selections; includes <see cref="Equal"/>, <see cref="StartsWith"/>, <see cref="EndsWith"/>, <see cref="Contains"/> and <see cref="AdjacentWildcards"/>.
+    /// </summary>
+    MultiBasic = None | Equal | Single | StartsWith | EndsWith | Contains | MultiWildcard | AdjacentWildcards,
 
-        /// <summary>
-        /// Represents the <see cref="MultiWildcard"/> <b>all</b> selections; includes <see cref="MultiBasic"/> and <see cref="Embedded"/>.
-        /// </summary>
-        MultiAll = MultiBasic | Embedded
-    }
+    /// <summary>
+    /// Represents the <see cref="MultiWildcard"/> <b>all</b> selections; includes <see cref="MultiBasic"/> and <see cref="Embedded"/>.
+    /// </summary>
+    MultiAll = MultiBasic | Embedded
 }
\ No newline at end of file
diff --git a/src/CoreEx/Wildcards/WildcardSpaceTreatment.cs b/src/CoreEx/Wildcards/WildcardSpaceTreatment.cs
index 77f2eaff..b1735059 100644
--- a/src/CoreEx/Wildcards/WildcardSpaceTreatment.cs
+++ b/src/CoreEx/Wildcards/WildcardSpaceTreatment.cs
@@ -1,34 +1,31 @@
-// Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/CoreEx
+namespace CoreEx.Wildcards;
 
-namespace CoreEx.Wildcards
+/// <summary>
+/// Defines the treatment of embedded <see cref="Wildcard.SpaceCharacter"/> within the wildcard.
+/// </summary>
+/// <remarks>Note: leading and trailing spaces are <i>always</i> removed.</remarks>
+public enum WildcardSpaceTreatment
 {
     /// <summary>
-    /// Defines the treatment of embedded <see cref="Wildcard.SpaceCharacter"/> within the wildcard.
+    /// Indicates that no treatment is to be performed; leave as is.
     /// </summary>
-    /// <remarks>Note: leading and trailing spaces are <i>always</i> removed.</remarks>
-    public enum WildcardSpaceTreatment
-    {
-        /// <summary>
-        /// Indicates that no treatment is to be performed; leave as is.
-        /// </summary>
-        None,
+    None,
 
-        /// <summary>
-        /// Indicates that multiple adjacent embedded <see cref="Wildcard.SpaceCharacter"/> are compressed into a single space.
-        /// </summary>
-        /// <remarks>Example where underscope represents space visually: <c>'XX___XX'</c> -> <c>'XX_XX'</c>.</remarks>
-        Compress,
+    /// <summary>
+    /// Indicates that multiple adjacent embedded <see cref="Wildcard.SpaceCharacter"/> are compressed into a single space.
+    /// </summary>
+    /// <remarks>Example where underscope represents space visually: <c>'XX___XX'</c> -> <c>'XX_XX'</c>.</remarks>
+    Compress,
 
-        /// <summary>
-        /// Indicates that the embedded <see cref="Wildcard.SpaceCharacter"/> are <i>always</i> compressed and converted to the multi-wildcard character.
-        /// </summary>
-        /// <remarks>Examples where underscope represents space visually: <c>'XX___XX'</c> -> <c>'XX*XX'</c> and <c>'XX___XX*'</c> -> <c>'XX*XX*'</c>.</remarks>
-        MultiWildcardAlways,
+    /// <summary>
+    /// Indicates that the embedded <see cref="Wildcard.SpaceCharacter"/> are <i>always</i> compressed and converted to the multi-wildcard character.
+    /// </summary>
+    /// <remarks>Examples where underscope represents space visually: <c>'XX___XX'</c> -> <c>'XX*XX'</c> and <c>'XX___XX*'</c> -> <c>'XX*XX*'</c>.</remarks>
+    MultiWildcardAlways,
 
-        /// <summary>
-        /// Indicates that the embedded <see cref="Wildcard.SpaceCharacter"/> are compressed and converted to the multi-wildcard character only where <i>other</i> multi-wildcards are found.
-        /// </summary>
-        /// <remarks>Examples where underscope represents space visually: <c>'XX___XX'</c> -> <c>'XX___XX'</c> and <c>'XX___XX*'</c> -> <c>'XX*XX*'</c>.</remarks>
-        MultiWildcardWhenOthers
-    }
+    /// <summary>
+    /// Indicates that the embedded <see cref="Wildcard.SpaceCharacter"/> are compressed and converted to the multi-wildcard character only where <i>other</i> multi-wildcards are found.
+    /// </summary>
+    /// <remarks>Examples where underscope represents space visually: <c>'XX___XX'</c> -> <c>'XX___XX'</c> and <c>'XX___XX*'</c> -> <c>'XX*XX*'</c>.</remarks>
+    MultiWildcardWhenOthers
 }
\ No newline at end of file
diff --git a/src/CoreEx/strong-name-key.snk b/src/CoreEx/strong-name-key.snk
deleted file mode 100644
index 5bced390..00000000
Binary files a/src/CoreEx/strong-name-key.snk and /dev/null differ
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 00000000..84c46282
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,84 @@
+<Project>
+
+  <!-- Targeting & Language Defaults -->
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <!-- Versioning (defined in /Version.props at repo root) -->
+  <Import Project="$(MSBuildThisFileDirectory)..\Version.props" />
+
+  <!-- Build Quality -->
+  <PropertyGroup>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+  <!-- Strong Name Signing -->
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../strong-name-key.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+
+  <!-- Packaging Behavior -->
+  <PropertyGroup>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+    <EmbedAllSources>true</EmbedAllSources>
+    <IncludeSource>true</IncludeSource>
+
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
+  <!-- NuGet Package Metadata -->
+  <PropertyGroup>
+    <Authors>Avanade</Authors>
+    <Company>Avanade (https://www.avanade.com/)</Company>
+    <Copyright>Copyright (c) Avanade.</Copyright>
+
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+
+    <PackageIcon>Logo256x256.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Avanade/CoreEx</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/Avanade/CoreEx</PackageProjectUrl>
+  </PropertyGroup>
+
+  <!-- Packed Assets -->
+  <ItemGroup>
+    <None Include="../../images/Logo256x256.png"
+          Pack="true"
+          PackagePath="/"
+          Visible="false" />
+
+    <!-- Per-package README.md for NuGet package details page (required for all packages). -->
+    <None Include="README.md"
+          Pack="true"
+          PackagePath="/"
+          Visible="false" />
+
+    <!-- Per-package AGENTS.md for AI tooling (e.g. VS Copilot nuget_get_package_context). -->
+    <!-- Path resolves relative to each .csproj, so picks up the local src/{Package}/AGENTS.md when present. -->
+    <None Include="AGENTS.md"
+          Pack="true"
+          PackagePath="/"
+          Visible="false"
+          Condition="Exists('AGENTS.md')" />
+  </ItemGroup>
+
+  <!-- Azure Publish -->
+  <PropertyGroup Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' != ''">
+    <AzdPublishTargetFramework Condition="'$(AzdPublishTargetFramework)' == ''">$(AZD_DOTNET_TARGET_FRAMEWORK)</AzdPublishTargetFramework>
+    <AzdPublishTargetFramework Condition="'$(AzdPublishTargetFramework)' == ''">$(DOTNET_TARGET_FRAMEWORK)</AzdPublishTargetFramework>
+    <TargetFramework Condition="'$(AzdPublishTargetFramework)' != ''">$(AzdPublishTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
new file mode 100644
index 00000000..f6f59a9f
--- /dev/null
+++ b/src/Directory.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+  <PropertyGroup>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/CoreEx.AspNetCore/strong-name-key.snk b/strong-name-key.snk
similarity index 100%
rename from src/CoreEx.AspNetCore/strong-name-key.snk
rename to strong-name-key.snk
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Controllers/OtherController.cs b/tests/CoreEx.AspNetCore.Test.Api/Controllers/OtherController.cs
new file mode 100644
index 00000000..1f472a66
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Controllers/OtherController.cs
@@ -0,0 +1,33 @@
+using CoreEx.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Test.Api.Controllers;
+
+[ApiController, Route("api/other")]
+public class OtherController(WebApi webApi) : Controller
+{
+    [HttpGet("messages")]
+    [ProducesResponseType(204)]
+    public IActionResult Messages()
+    {
+        // Bypasses WebApi but should be picked up by the ExecutionContextMiddleware.
+        ExecutionContext.Current.AddWarningMessage("Please pay your invoice.");
+        return NoContent();
+    }
+
+    [HttpPost("unhandledexception")]
+    public IActionResult UnhandledException() => throw new Exception("Oh no, that was unexpected!");
+
+    [HttpPost("unhandledextendedexception")]
+    public IActionResult UnhandledExtendedException() => throw new DuplicateException("Oh my, we have one of those already!");
+
+    [HttpPost("idempotency-mvc/{id}")]
+    [IdempotencyKey]
+    public async Task<IActionResult> IdempotencyWebApiSuccess(int id) => await webApi.PostAsync<object>(Request, (ro, _) =>
+    {
+        if (id == 88)
+            throw new NotFoundException();
+
+        return Task.FromResult<object>(new { Id = id, Name = id == 99 ? new string('x', 512 * 1024) : "Bob" });
+    });
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Controllers/PersonController.cs b/tests/CoreEx.AspNetCore.Test.Api/Controllers/PersonController.cs
new file mode 100644
index 00000000..e305ec10
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Controllers/PersonController.cs
@@ -0,0 +1,52 @@
+using CoreEx.AspNetCore.Mvc;
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.AspNetCore.Test.Api.Services;
+using CoreEx.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Test.Api.Controllers;
+
+[ApiController, Route("api/people")]
+public class PersonController(WebApi webApi, PersonService service) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+    private readonly PersonService _service = service.ThrowIfNull();
+
+    [HttpGet("{id}"), HttpHead("{id}")]
+    [ProducesResponseType(typeof(Person), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> GetAsync(string id) => _webApi.GetAsync(Request, (ro, _) => _service.GetAsync(id));
+
+    [HttpGet]
+    [ProducesResponseType(typeof(Person[]), 200)]
+    [Query(true, true)]
+    [Paging(true)]
+    public Task<IActionResult> GetItemsAsync() => _webApi.GetAsync(Request, (ro, _) => _service.GetByQueryAsync(ro.QueryArgs, ro.PagingArgs));
+
+    [HttpPost]
+    [Accepts<Person>]
+    [ProducesResponseType<Person>(201)]
+    public Task<IActionResult> PostAsync() => _webApi.PostAsync<Person, Person>(Request, async (ro, ct) =>
+    {
+        ro.WithLocationUri(p => new Uri($"api/people/{p.Id}", UriKind.Relative));
+        return await _service.CreateAsync(ro.Value).ConfigureAwait(false);
+    });
+
+    [HttpPut("{id}")]
+    [Accepts<Person>]
+    [ProducesResponseType<Person>(200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> PutAsync(string id) => _webApi.PutAsync<Person, Person>(Request, (ro, ct) => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id)));
+
+    [HttpPatch("{id}")]
+    [Accepts<Person>(HttpNames.MergePatchJsonMediaTypeName)]
+    [ProducesResponseType(typeof(Person), 200)]
+    [ProducesNotFoundProblem()]
+    public Task<IActionResult> PatchAsync(string id) => _webApi.PatchAsync<Person>(Request,
+        get: (ro, _) => _service.GetAsync(id),
+        put: (ro, _) => _service.UpdateAsync(ro.Value.Adjust(p => p.Id = id)));
+
+    [HttpDelete("{id}")]
+    [ProducesResponseType(204)]
+    public Task<IActionResult> DeleteAsync(string id) => _webApi.DeleteAsync(Request, (ro, _) => _service.DeleteAsync(id));
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Controllers/ReferenceDataController.cs b/tests/CoreEx.AspNetCore.Test.Api/Controllers/ReferenceDataController.cs
new file mode 100644
index 00000000..4256fba0
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Controllers/ReferenceDataController.cs
@@ -0,0 +1,17 @@
+using CoreEx.AspNetCore.Mvc;
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.RefData;
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Test.Api.Controllers;
+
+[ApiController, Route("api/refdata")]
+public class ReferenceDataController(WebApi webApi) : ControllerBase
+{
+    private readonly WebApi _webApi = webApi.ThrowIfNull();
+
+    [HttpGet("genders"), HttpHead("genders")]
+    [ProducesResponseType(typeof(Gender[]), 200)]
+    public Task<IActionResult> GetGendersAsync([FromQuery] IEnumerable<string>? codes = default, string? text = default) 
+        => _webApi.GetAsync(Request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<Gender>(codes, text, ro.IsIncludeInactive, ct));
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.csproj b/tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.csproj
new file mode 100644
index 00000000..c0b05bee
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
+    <LangVersion>preview</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\CoreEx.AspNetCore.NSwag\CoreEx.AspNetCore.NSwag.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+    <PackageReference Include="Scalar.AspNetCore" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.http b/tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.http
new file mode 100644
index 00000000..49eb1c9c
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/CoreEx.AspNetCore.Test.Api.http
@@ -0,0 +1,6 @@
+@CoreEx.AspNetCore.Test.Api_HostAddress = http://localhost:5096
+
+GET {{CoreEx.AspNetCore.Test.Api_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Entities/Gender.cs b/tests/CoreEx.AspNetCore.Test.Api/Entities/Gender.cs
new file mode 100644
index 00000000..7c15de25
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Entities/Gender.cs
@@ -0,0 +1,8 @@
+using CoreEx.RefData;
+
+namespace CoreEx.AspNetCore.Test.Api.Entities;
+
+[ReferenceData]
+public partial class Gender : ReferenceData<Gender> { }
+
+public class GenderCollection : ReferenceDataCollection<Gender> { }
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Entities/Person.cs b/tests/CoreEx.AspNetCore.Test.Api/Entities/Person.cs
new file mode 100644
index 00000000..f96efdc4
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Entities/Person.cs
@@ -0,0 +1,23 @@
+using CoreEx.Entities;
+using CoreEx.RefData;
+
+namespace CoreEx.AspNetCore.Test.Api.Entities;
+
+[Contract]
+public partial class Person : IIdentifier<string?>, IETag, IChangeLog
+{
+    public string? Id { get; set; }
+
+    public string? FirstName { get; set; }
+
+    public string? LastName { get; set; }
+
+    public DateOnly? Birthday { get; set; }
+
+    [ReferenceData<Gender>]
+    public partial string? GenderSid { get; set; }
+
+    public string? ETag { get; set; }
+
+    public ChangeLog? ChangeLog { get; set; }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Program.cs b/tests/CoreEx.AspNetCore.Test.Api/Program.cs
new file mode 100644
index 00000000..5697d335
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Program.cs
@@ -0,0 +1,118 @@
+using CoreEx.AspNetCore.Http;
+using CoreEx.AspNetCore.NSwag;
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.AspNetCore.Test.Api.Services;
+using CoreEx.Http;
+using CoreEx.RefData;
+using Microsoft.AspNetCore.Mvc;
+using OpenTelemetry;
+
+namespace CoreEx.AspNetCore.Test.Api;
+
+public class Program
+{
+    private static void Main(string[] args)
+    {
+        // Create the web builder.
+        var builder = WebApplication.CreateBuilder(args);
+
+        // Add CoreEx host settings.
+        builder.AddHostSettings();
+
+        // Add CoreEx services.
+        builder.Services
+            .AddExecutionContext()
+            .AddReferenceDataOrchestrator<ReferenceDataService>()
+            .AddMvcWebApi()
+            .AddHttpWebApi();
+
+        // Add all the dynamically registered services.
+        builder.Services.AddDynamicServicesUsing<PersonService>();
+
+        // Add in-memory based idempotency provider.
+        builder.Services
+            .AddMemoryCache()
+            .AddMemoryOnlyHybridCache()
+            .AddHybridCacheIdempotencyProvider();
+
+        // Add the ASP.NET Core services.
+        builder.Services.AddControllers();
+
+        // Add the OpenAPI services.
+        builder.Services.AddOpenApiDocument(s =>
+        {
+            s.Title = builder.Environment.ApplicationName;
+            s.AddCoreExConfiguration();
+        });
+
+        // Add OpenTelemetry tracing.
+        builder.WithCoreExTelemetry()
+            .UseOtlpExporter();
+
+        // Build the application.
+        var app = builder.Build();
+
+        // Configure the pipeline/middleware (order is important).
+        app.UseCoreExExceptionHandler();
+        app.UseHttpsRedirection();
+        app.UseAuthorization();
+        app.UseExecutionContext();
+        app.UseIdempotencyKey();
+        app.MapControllers();
+
+        app.UseOpenApi();
+        app.UseSwaggerUi();
+
+        app.MapHealthChecks();
+
+        // Minimal APIs.
+        app.MapGet("api/persons/{id}",
+            (HttpRequest request, WebApi webApi, PersonService2 service, string id)
+                => webApi.GetWithResultAsync(request, (ro, _) => service.GetAsync(id)))
+            .Produces<Person>().ProducesNotFoundProblem();
+
+        app.MapGet("api/persons",
+            (HttpRequest request, WebApi webApi, PersonService2 service)
+                => webApi.GetWithResultAsync(request, (ro, _) => service.GetByQueryAsync(ro.QueryArgs, ro.PagingArgs)))
+            .Produces<Person[]>().WithQuery(true, true).WithPaging(true);
+
+        app.MapPost("api/persons",
+            (HttpRequest request, WebApi webApi, PersonService2 service)
+                => webApi.PostWithResultAsync<Person, Person>(request, async (ro, _) =>
+                {
+                    ro.WithLocationUri(p => new Uri($"api/persons/{p.Id}", UriKind.Relative));
+                    return await service.CreateAsync(ro.Value).ConfigureAwait(false);
+                }))
+            .Accepts<Person>().ProducesCreated<Person>();
+
+        app.MapPut("api/persons/{id}",
+            (HttpRequest request, WebApi webApi, PersonService2 service, string id)
+                => webApi.PutWithResultAsync<Person, Person>(request, (ro, _) => service.UpdateAsync(ro.Value.Adjust(p => p.Id = id))))
+            .Accepts<Person>().Produces<Person>().ProducesNotFoundProblem();
+
+        app.MapPatch("api/persons/{id}",
+            (HttpRequest request, WebApi webApi, PersonService2 service, string id)
+                => webApi.PatchWithResultAsync<Person>(request,
+                    get: (ro, _) => service.GetAsync(id),
+                    put: (ro, _) => service.UpdateAsync(ro.Value.Adjust(p => p.Id = id))))
+            .Accepts<Person>(HttpNames.MergePatchJsonMediaTypeName).Produces<Person>().ProducesNotFoundProblem();
+
+        app.MapDelete("api/persons/{id}",
+            (HttpRequest request, WebApi webApi, PersonService2 service, string id)
+                => webApi.DeleteWithResultAsync(request, (ro, _) => service.DeleteAsync(id)))
+            .ProducesNoContent();
+
+        app.MapGet("api/referencedata/genders",
+            (HttpRequest request, WebApi webApi, [FromQuery] string[]? codes = default, string? text = default)
+                => webApi.GetAsync(request, (ro, ct) => ReferenceDataOrchestrator.Current.GetWithFilterAsync<Gender>(codes, text, ro.IsIncludeInactive, ct)))
+            .Produces<Gender[]>();
+
+        app.MapPost("api/idempotency-key/test/{id}",
+            (HttpRequest request, WebApi webApi, int id)
+                => webApi.PostAsync<object>(request, (_, _) => Task.FromResult<object>(new { Id = id, Name = "Jen" })))
+            .WithIdempotencyKey(isRequired: true);
+
+        // Run the application.
+        app.Run();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Properties/launchSettings.json b/tests/CoreEx.AspNetCore.Test.Api/Properties/launchSettings.json
new file mode 100644
index 00000000..6738b684
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Properties/launchSettings.json
@@ -0,0 +1,41 @@
+{
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5096"
+    },
+    "https": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "http://localhost:5096/swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "https://localhost:7004;http://localhost:5096"
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:52431/",
+      "sslPort": 44368
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Services/PersonService.cs b/tests/CoreEx.AspNetCore.Test.Api/Services/PersonService.cs
new file mode 100644
index 00000000..08aacf15
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Services/PersonService.cs
@@ -0,0 +1,108 @@
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.Data;
+using CoreEx.Data.Querying;
+using CoreEx.DependencyInjection;
+using CoreEx.Validation;
+using System.Collections.Concurrent;
+
+namespace CoreEx.AspNetCore.Test.Api.Services;
+
+[ScopedService<PersonService>]
+public class PersonService
+{
+    internal static QueryArgsConfig QueryConfig { get; } = QueryArgsConfig.Create()
+        .WithFilter(f => f
+            .AddField<string>("FirstName", c => c.AsLowerCase().WithOperators(QueryFilterOperator.AllStringOperators))
+            .AddField<string>("LastName", c => c.AsLowerCase().WithOperators(QueryFilterOperator.AllStringOperators))
+            .AddField<DateOnly>("Birthday")
+            .AddReferenceDataField<Gender>("Gender", "GenderSid"))
+        .WithOrderBy(o => o
+            .AddField("LastName", c => c.WithDefault())
+            .AddField("FirstName", c => c.WithDefault()));
+
+    private static ConcurrentDictionary<string, Person> _people = Reset();
+
+    public static ConcurrentDictionary<string, Person> Reset() => _people = new()
+    {
+        ["1"] = new Person
+        {
+            Id = "1",
+            FirstName = "John",
+            LastName = "Doe",
+            Birthday = new DateOnly(1980, 1, 1),
+            GenderSid = "M",
+            ETag = Runtime.NewId()
+        },
+        ["2"] = new Person
+        {
+            Id = "2",
+            FirstName = "Jane",
+            LastName = "Doe",
+            Birthday = new DateOnly(1985, 2, 2),
+            GenderSid = "F",
+            ETag = Runtime.NewId()
+        },
+        ["3"] = new Person
+        {
+            Id = "3",
+            FirstName = "Alice",
+            LastName = "Smith",
+            Birthday = new DateOnly(1990, 3, 3),
+            GenderSid = "F",
+            ETag = Runtime.NewId()
+        },
+        ["4"] = new Person
+        {
+            Id = "4",
+            FirstName = "Bob",
+            LastName = "Smith",
+            Birthday = new DateOnly(1995, 4, 4),
+            GenderSid = "M",
+            ETag = Runtime.NewId()
+        }
+    };
+
+    public Task<Person?> GetAsync(string id) => Task.FromResult(_people.TryGetValue(id.Required(), out var person) ? person : null);
+
+    public Task<Person> CreateAsync(Person person)
+    {
+        person.ETag = Guid.NewGuid().ToString();
+        if (!_people.TryAdd(person.Id!, person))
+            throw new ConflictException();
+
+        return Task.FromResult(person);
+    }
+
+    public Task<Person> UpdateAsync(Person person)
+    {
+        person.ThrowIfNull();
+        person.Id.ThrowIfNull();
+
+        if (!_people.TryGetValue(person.Id!, out var existing))
+            throw new NotFoundException();
+
+        if (existing.ETag != person.ETag)
+            throw new ConcurrencyException();
+
+        person.ETag = Guid.NewGuid().ToString();
+        _people[person.Id!] = person;
+        return Task.FromResult(person);
+    }
+
+    public Task DeleteAsync(string id)
+    {
+        _people.TryRemove(id.Required(), out _);
+        return Task.CompletedTask;
+    }
+
+    public Task<ItemsResult<Person>> GetByQueryAsync(QueryArgs query, PagingArgs paging)
+    {
+        var ir = new ItemsResult<Person>(paging)
+        {
+            Items = [.. _people.Values.AsQueryable().Where(QueryConfig, query).WithPaging(paging).OrderBy(QueryConfig, query)]
+        };
+
+        ir.WithTotalCount(() => _people.Count);
+        return Task.FromResult(ir);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Services/PersonService2.cs b/tests/CoreEx.AspNetCore.Test.Api/Services/PersonService2.cs
new file mode 100644
index 00000000..7c1dee94
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Services/PersonService2.cs
@@ -0,0 +1,99 @@
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.Data;
+using CoreEx.Data.Querying;
+using CoreEx.DependencyInjection;
+using CoreEx.Results;
+using CoreEx.Validation;
+using System.Collections.Concurrent;
+
+namespace CoreEx.AspNetCore.Test.Api.Services;
+
+[ScopedService<PersonService2>]
+public class PersonService2
+{
+    private static ConcurrentDictionary<string, Person> _people = Reset();
+
+    public static ConcurrentDictionary<string, Person> Reset() => _people = new()
+    {
+        ["1"] = new Person
+        {
+            Id = "1",
+            FirstName = "John",
+            LastName = "Doe",
+            Birthday = new DateOnly(1980, 1, 1),
+            GenderSid = "M",
+            ETag = Runtime.NewId()
+        },
+        ["2"] = new Person
+        {
+            Id = "2",
+            FirstName = "Jane",
+            LastName = "Doe",
+            Birthday = new DateOnly(1985, 2, 2),
+            GenderSid = "F",
+            ETag = Runtime.NewId()
+        },
+        ["3"] = new Person
+        {
+            Id = "3",
+            FirstName = "Alice",
+            LastName = "Smith",
+            Birthday = new DateOnly(1990, 3, 3),
+            GenderSid = "F",
+            ETag = Runtime.NewId()
+        },
+        ["4"] = new Person
+        {
+            Id = "4",
+            FirstName = "Bob",
+            LastName = "Smith",
+            Birthday = new DateOnly(1995, 4, 4),
+            GenderSid = "M",
+            ETag = Runtime.NewId()
+        }
+    };
+
+    public Task<Result<Person?>> GetAsync(string id) => Task.FromResult(Result.Ok(_people.TryGetValue(id, out var person) ? person : null));
+
+    public Task<Result<Person>> CreateAsync(Person person)
+    {
+        person.ETag = Guid.NewGuid().ToString();
+        if (!_people.TryAdd(person.Id!, person))
+            return Task.FromResult(Result<Person>.ConflictError());
+
+        return Task.FromResult(Result.Ok(person));
+    }
+
+    public Task<Result<Person>> UpdateAsync(Person person)
+    {
+        person.ThrowIfNull();
+        person.Id.ThrowIfNull();
+
+        if (!_people.TryGetValue(person.Id!, out var existing))
+            return Task.FromResult(Result<Person>.NotFoundError());
+
+        if (existing.ETag != person.ETag)
+            return Task.FromResult(Result<Person>.ConcurrencyError());
+
+        person.ETag = Guid.NewGuid().ToString();
+        _people[person.Id!] = person;
+        return Task.FromResult(Result.Ok(person));
+    }
+
+    public Task<Result> DeleteAsync(string id)
+    {
+        _people.TryRemove(id.Required(), out _);
+        return Result.SuccessTask;
+    }
+
+    public Task<Result<ItemsResult<Person>>> GetByQueryAsync(QueryArgs query, PagingArgs paging)
+    {
+        var ir = new ItemsResult<Person>(paging)
+        {
+            Items = [.. _people.Values.AsQueryable().Where(PersonService.QueryConfig, query).WithPaging(paging).OrderBy(PersonService.QueryConfig, query)]
+        };
+
+        ir.WithTotalCount(() => _people.Count);
+        return Result.Go(ir).AsTask();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/Services/ReferenceDataService.cs b/tests/CoreEx.AspNetCore.Test.Api/Services/ReferenceDataService.cs
new file mode 100644
index 00000000..d721ee23
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/Services/ReferenceDataService.cs
@@ -0,0 +1,22 @@
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.DependencyInjection;
+using CoreEx.RefData;
+using CoreEx.RefData.Abstractions;
+using CoreEx.Results;
+
+namespace CoreEx.AspNetCore.Test.Api.Services;
+
+[ScopedService<ReferenceDataService>]
+public class ReferenceDataService : IReferenceDataProvider
+{
+    public IEnumerable<(Type, Type)> Types =>
+    [
+        (typeof(Gender), typeof(GenderCollection))
+    ];
+
+    public Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default) => type switch
+    {
+        _ when type == typeof(Gender) => Task.FromResult<IReferenceDataCollection>(new GenderCollection { { new Gender { Id = "F", Code = "F", Text = "Female" } }, { new Gender { Id = "M", Code = "M", Text = "Male" } }, { new Gender { Id = "X", Code = "X", Text = "Xxx", IsInactive = true } } }),
+        _ => throw new InvalidOperationException($"Type {type.FullName} is not a known {nameof(IReferenceData)}.")
+    };
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Api/appsettings.Development.json b/tests/CoreEx.AspNetCore.Test.Api/appsettings.Development.json
new file mode 100644
index 00000000..81dff607
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/appsettings.Development.json
@@ -0,0 +1,11 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "Microsoft.AspNetCore": "Information"
+    }
+  },
+  "CoreEx": {
+    "IncludeExceptionInProblemDetails": true
+  }
+}
diff --git a/tests/CoreEx.AspNetCore.Test.Api/appsettings.json b/tests/CoreEx.AspNetCore.Test.Api/appsettings.json
new file mode 100644
index 00000000..236927b9
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Api/appsettings.json
@@ -0,0 +1,15 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "CoreEx",
+      "DomainName": "Test"
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/CoreEx.AspNetCore.Test.Unit.csproj b/tests/CoreEx.AspNetCore.Test.Unit/CoreEx.AspNetCore.Test.Unit.csproj
new file mode 100644
index 00000000..455716d2
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/CoreEx.AspNetCore.Test.Unit.csproj
@@ -0,0 +1,56 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\Person_GetByQuery_Default.json" />
+    <None Remove="Resources\Person_GetByQuery_FilterError.json" />
+    <None Remove="Resources\Person_GetByQuery_IncludeFields.json" />
+    <None Remove="Resources\Person_GetByQuery_Paging.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\Gender_Get_All.json" />
+    <EmbeddedResource Include="Resources\Person_GetByQuery_Default.json" />
+    <EmbeddedResource Include="Resources\Person_GetByQuery_OrderByError.json" />
+    <EmbeddedResource Include="Resources\Person_GetByQuery_FilterError.json" />
+    <EmbeddedResource Include="Resources\Person_GetByQuery_IncludeFields.json" />
+    <EmbeddedResource Include="Resources\Person_GetByQuery_Paging.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="WebApiTestsBase.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
+    <ProjectReference Include="..\CoreEx.AspNetCore.Test.Api\CoreEx.AspNetCore.Test.Api.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/OtherApiTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/OtherApiTests.cs
new file mode 100644
index 00000000..e81e1b59
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/OtherApiTests.cs
@@ -0,0 +1,275 @@
+using CoreEx.AspNetCore.Idempotency;
+using CoreEx.Caching;
+using CoreEx.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Net;
+using System.Text.Json;
+using UnitTestEx.Expectations;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class OtherApiTests : WithApiTester<Api.Program>
+{
+    [Test]
+    public void ExecutionContextMiddleware_Messages()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/api/other/messages")
+            .AssertNoContent()
+            .Response.Headers.Should().ContainKey(HttpNames.WarningMessagesHeaderName)
+                .WhoseValue.Should().BeEquivalentTo("Please pay your invoice.");
+    }
+
+    [Test]
+    public async Task UnhandledException_ProblemHandling()
+    {
+        var ra = Test.Http()
+            .Run(HttpMethod.Post, "/api/other/unhandledexception", hrm =>
+            {
+                hrm.Headers.Add("traceparent", "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01");
+                hrm.Headers.Add("tracestate", "foo=bar");
+            })
+            .Assert(HttpStatusCode.InternalServerError)
+            .AssertJson("{\"title\":\"Oh no, that was unexpected!\",\"status\":500}", pathsToIgnore: ["type", "traceId", "errorCode", "detail"]);
+
+        var cpd = await ra.Response.ToProblemDetailsAsync();
+        cpd.Should().NotBeNull();
+        cpd.ProblemDetails.Type.Should().NotBeNull();
+        cpd.ProblemDetails.Title.Should().Be("Oh no, that was unexpected!");
+        cpd.ProblemDetails.Status.Should().Be(500);
+        cpd.ProblemDetails.Extensions.Should().ContainKey("traceId").WhoseValue.Should().BeOfType<JsonElement>();
+        cpd.ProblemDetails.Extensions["traceId"].As<JsonElement>().ToString().Should().StartWith("00-0af7651916cd43dd8448eb211c80319c-");
+
+        var pd = ra.GetValue<Microsoft.AspNetCore.Mvc.ProblemDetails>(System.Net.Mime.MediaTypeNames.Application.ProblemJson);
+        pd.Should().NotBeNull();
+        pd.Type.Should().NotBeNull();
+        pd.Extensions.Should().ContainKey("traceId").WhoseValue.Should().BeOfType<JsonElement>();
+        pd.Extensions["traceId"].As<JsonElement>().ToString().Should().StartWith("00-0af7651916cd43dd8448eb211c80319c-");
+    }
+
+    [Test]
+    public async Task UnhandledExtendedException_ProblemHandling()
+    {
+        var ra = Test.Http()
+            .Run(HttpMethod.Post, "/api/other/unhandledextendedexception", hrm =>
+            {
+                hrm.Headers.Add("traceparent", "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01");
+                hrm.Headers.Add("tracestate", "foo=bar");
+            })
+            .Assert(HttpStatusCode.Conflict)
+            .AssertJson("{\"title\":\"Oh my, we have one of those already!\",\"status\":409,\"errorType\":\"duplicate\"}", pathsToIgnore: ["type", "traceId", "errorCode", "detail"]);
+
+        var cpd = await ra.Response.ToProblemDetailsAsync();
+        cpd.Should().NotBeNull();
+        cpd.ProblemDetails.Type.Should().NotBeNull();
+        cpd.ProblemDetails.Title.Should().Be("Oh my, we have one of those already!");
+        cpd.ProblemDetails.Status.Should().Be(409);
+        cpd.ProblemDetails.Extensions.Should().ContainKey("traceId").WhoseValue.Should().BeOfType<JsonElement>();
+        cpd.ProblemDetails.Extensions["traceId"].As<JsonElement>().ToString().Should().StartWith("00-0af7651916cd43dd8448eb211c80319c-");
+
+        var dex = cpd.ToException<DuplicateException>();
+        dex.Should().NotBeNull();
+        dex.Message.Should().Be("Oh my, we have one of those already!");
+        dex.ErrorType.Should().Be("duplicate");
+
+        var pd = ra.GetValue<Microsoft.AspNetCore.Mvc.ProblemDetails>(System.Net.Mime.MediaTypeNames.Application.ProblemJson);
+        pd.Should().NotBeNull();
+        pd.Type.Should().NotBeNull();
+        pd.Extensions.Should().ContainKey("traceId").WhoseValue.Should().BeOfType<JsonElement>();
+        pd.Extensions["traceId"].As<JsonElement>().ToString().Should().StartWith("00-0af7651916cd43dd8448eb211c80319c-");
+    }
+
+    [Test]
+    public void Swagger_UI()
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, "/swagger")
+            .Assert(HttpStatusCode.Found)
+            .AssertLocationHeader(new Uri("/swagger/index.html", UriKind.Relative));
+
+        var html = Test.Http()
+            .Run(HttpMethod.Get, "/swagger/index.html")
+            .Assert(HttpStatusCode.OK)
+            .GetContent();
+
+        html.Should().Contain("<title>Swagger UI</title>");
+    }
+
+    [Test]
+    public void Swagger_JSON()
+    {
+        var json = Test.Http()
+            .Run(HttpMethod.Get, "/swagger/v1/swagger.json")
+            .Assert(HttpStatusCode.OK)
+            .AssertContentTypeJson()
+            .GetContent();
+
+        json.Should().Contain("CoreEx.AspNetCore.Test.Api");
+        json.Should().Contain("\"etag\""); // Asserts that JsonSubstituteNamingPolicy is in effect.
+    }
+
+    [TestCase("/health/live")]
+    [TestCase("/health/startup")]
+    [TestCase("/health/ready")]
+    public void Health_Lite(string path)
+    {
+        Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Assert(HttpStatusCode.OK)
+            .AssertContentTypePlainText()
+            .AssertContent("Healthy");
+    }
+
+    [TestCase("/health/live/detailed")]
+    [TestCase("/health/startup/detailed")]
+    [TestCase("/health/ready/detailed")]
+    public void Health_Detailed(string path)
+    {
+        var json = Test.Http()
+            .Run(HttpMethod.Get, path)
+            .Assert(HttpStatusCode.OK)
+            .AssertContentTypeJson()
+            .GetContent();
+
+        json.Should().Contain("Healthy");
+    }
+
+    [Test]
+    public void Idempotency_Mvc_Reuse_Key()
+    {
+        var ik = Guid.NewGuid().ToString();
+
+        // First request, should cache.
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/1", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertJson("{\"id\":1,\"name\":\"Bob\"}");
+
+        // Second request, same Idempotency-Key and same request, should replay.
+        Test.Http()
+            .ExpectLogContains($"Idempotent request with key '{ik}' has resulted in the response being replayed from the cache.")
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/1", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertJson("{\"id\":1,\"name\":\"Bob\"}");
+
+        // Third request, same Idempotency-Key but different request, should conflict.
+        Test.Http<ProblemDetails>()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/2", hrm => hrm.WithIdempotencyKey(ik))
+            .Assert(HttpStatusCode.UnprocessableEntity)
+            .Value!.Title.Should().Be("The 'Idempotency-Key' header has already been used for a different request.");
+
+        // Verify the cache contents.
+        Test.ScopedType<IHybridCache>(async test =>
+        {
+            var data = await test.Service.GetOrCreateByKeyAsync<IdempotencyKey>("Idempotency:" + ik, _ => throw new InvalidOperationException("Must not be empty!"));
+            data.Should().NotBeNull();
+            data.Status.Should().Be(IdempotencyStatus.CompletedAndReplayable);
+            data.StatusCode.Should().Be((int)HttpStatusCode.Created);
+            data.Headers.Should().ContainKey("Content-Type").WhoseValue.Should().Contain("application/json");
+            data.Body.Should().NotBeNull();
+            data.Body.ToString().Should().NotBeNull().And.Be("{\"id\":1,\"name\":\"Bob\"}");
+        });
+    }
+
+    [Test]
+    public void Idempotency_Mvc_KeyMissing_Success()
+    {
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/1")
+            .AssertCreated()
+            .AssertJson("{\"id\":1,\"name\":\"Bob\"}");
+    }
+
+    [Test]
+    public void Idempotency_Mvc_KeyInvalid_Failure()
+    {
+        Test.Http<ProblemDetails>()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/1", hrm => hrm.WithIdempotencyKey("inv@lid_key!"))
+            .AssertBadRequest()
+            .Value!.Title.Should().Be("The 'Idempotency-Key' header is invalid.");
+    }
+
+    [Test]
+    public void Idempotency_Mvc_NotFound_EmptyCache()
+    {
+        var ik = Guid.NewGuid().ToString();
+
+        // First request, should cache/remove due to error.
+        Test.Http<ProblemDetails>()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/88", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertNotFound();
+
+        // Second request, should cache/remove due to error.
+        Test.Http<ProblemDetails>()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/88", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertNotFound();
+
+        // Verify that the cache does not contain the idempotency key.
+        Test.ScopedType<IHybridCache>(async test =>
+        {
+            var exists = true;
+            var entry = await test.Service.GetOrCreateByKeyAsync(ik, _ =>
+            {
+                exists = false;
+                return Task.FromResult(new object());
+            });
+
+            exists.Should().BeFalse();
+        });
+    }
+
+    [Test]
+    public void Idempotency_Mvc_Response_Too_Large()
+    {
+        var ik = Guid.NewGuid().ToString();
+
+        // First request, should cache as too-large..
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/99", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertCreated();
+
+        // Second request, same Idempotency-Key and same request, should conflict due to response too large.
+        Test.Http<ProblemDetails>()
+            .Run(HttpMethod.Post, "/api/other/idempotency-mvc/99", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertConflict()
+            .Value!.Title.Should().Be("The response associated with the specified 'Idempotency-Key' is no longer available.");
+    }
+
+    [Test]
+    public void Idempotency_Http_Reuse_Key()
+    {
+        var ik = Guid.NewGuid().ToString();
+
+        // First request, should cache.
+        Test.Http()
+            .Run(HttpMethod.Post, "/api/idempotency-key/test/1", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertJson("{\"id\":1,\"name\":\"Jen\"}");
+
+        // Second request, same Idempotency-Key and same request, should replay.
+        Test.Http()
+            .ExpectLogContains($"Idempotent request with key '{ik}' has resulted in the response being replayed from the cache.")
+            .Run(HttpMethod.Post, "/api/idempotency-key/test/1", hrm => hrm.WithIdempotencyKey(ik))
+            .AssertCreated()
+            .AssertJson("{\"id\":1,\"name\":\"Jen\"}");
+
+        // Third request, same Idempotency-Key but different request, should conflict.
+        Test.Http<ProblemDetails>()
+            .Run(HttpMethod.Post, "/api/idempotency-key/test/2", hrm => hrm.WithIdempotencyKey(ik))
+            .Assert(HttpStatusCode.UnprocessableEntity)
+            .Value!.Title.Should().Be("The 'Idempotency-Key' header has already been used for a different request.");
+
+        // Verify the cache contents.
+        Test.ScopedType<IHybridCache>(async test =>
+        {
+            var data = await test.Service.GetOrCreateByKeyAsync<IdempotencyKey>("Idempotency:" + ik, _ => throw new InvalidOperationException("Must not be empty!"));
+            data.Should().NotBeNull();
+            data.Status.Should().Be(IdempotencyStatus.CompletedAndReplayable);
+            data.StatusCode.Should().Be((int)HttpStatusCode.Created);
+            data.Headers.Should().ContainKey("Content-Type").WhoseValue.Should().Contain("application/json");
+            data.Body.Should().NotBeNull();
+            data.Body.ToString().Should().NotBeNull().And.Be("{\"id\":1,\"name\":\"Jen\"}");
+        });
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_HttpMutateTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_HttpMutateTests.cs
new file mode 100644
index 00000000..27f3c398
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_HttpMutateTests.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class PersonApi_HttpMutateTests : PersonApi_MutateTestsBase
+{
+    public override string Route => "api/persons";
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_HttpQueryTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_HttpQueryTests.cs
new file mode 100644
index 00000000..fd2879d8
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_HttpQueryTests.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class PersonApi_HttpQueryTests : PersonApi_QueryTestsBase
+{
+    public override string Route => "api/persons";
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MutateTestsBase.cs b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MutateTestsBase.cs
new file mode 100644
index 00000000..ba1878da
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MutateTestsBase.cs
@@ -0,0 +1,216 @@
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.AspNetCore.Test.Api.Services;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[Parallelizable]
+public abstract class PersonApi_MutateTestsBase : WithApiTester<Api.Program>
+{
+    public abstract string Route { get; }
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp()
+    {
+        PersonService.Reset();
+        PersonService2.Reset();
+    }
+
+    [Test]
+    public void Create_NoValue()
+    {
+        Test.Http<Person>()
+            .Run(HttpMethod.Post, $"{Route}")
+            .AssertBadRequest()
+            .AssertProblemDetailsTitle("Request body is invalid: Unable to read the request as JSON because the request content type '' is not a known JSON content type.");
+    }
+
+    [Test]
+    public void Create_Success()
+    {
+        // Create a new entity.
+        var v = Test.Http<Person>()
+            .Run(HttpMethod.Post, $"{Route}", new Person
+            {
+                Id = "5",
+                FirstName = "Charlie",
+                LastName = "Brown",
+                Birthday = new DateOnly(2000, 1, 1),
+                GenderSid = "M"
+            })
+            .AssertCreated()
+            .AssertValue(new Person
+            {
+                Id = "5",
+                FirstName = "Charlie",
+                LastName = "Brown",
+                Birthday = new DateOnly(2000, 1, 1),
+                GenderSid = "M",
+            }, "etag")
+            .AssertETagHeader()
+            .AssertLocationHeader(p => new Uri($"{Route}/{p!.Id}", UriKind.Relative))
+            .Value;
+
+        // Verify the entity was created.
+        Test.Http<Person>()
+            .Run(HttpMethod.Get, $"{Route}/5")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Create_Duplicate()
+    {
+        Test.Http<Person>()
+            .Run(HttpMethod.Post, $"{Route}", new Person
+            {
+                Id = "1",
+                FirstName = "Charlie",
+                LastName = "Brown",
+                Birthday = new DateOnly(2000, 1, 1),
+                GenderSid = "M",
+            })
+            .AssertConflict();
+    }
+
+    [Test]
+    public void Update_Success()
+    {
+        // Pre-read the entity to get the etag.
+        var v = Test.Http<Person>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+
+        // Update the entity.
+        v.FirstName = "Jane";
+        v.LastName = "Doe";
+        v = Test.Http<Person>()
+            .Run(HttpMethod.Put, $"{Route}/1", v, r => r.WithIfMatch(v.ETag))
+            .AssertOK()
+            .AssertValue(v, "etag")
+            .Value;
+
+        // Verify the update.
+        Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Update_NotFound()
+    {
+        Test.Http<Person>()
+            .Run(HttpMethod.Put, $"{Route}/0", new Person
+            {
+                Id = "0",
+                FirstName = "Charlie",
+                LastName = "Brown",
+                Birthday = new DateOnly(2000, 1, 1),
+                GenderSid = "M",
+                ETag = "oops"
+            })
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Update_Concurrency()
+    {
+        // Pre-read the entity to get the etag.
+        var v = Test.Http<Person>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .Value!;
+
+        // Attempt to update the entity with an invalid etag.
+        Test.Http<Person>()
+            .Run(HttpMethod.Put, $"{Route}/1", v, r => r.WithIfMatch("oops"))
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void Patch_Success()
+    {
+        // Pre-read the entity to get the etag.
+        var v = Test.Http<Person>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.LastName += " Jr.";
+
+        // Patch the entity.
+        v = Test.Http<Person>()
+            .Run(HttpMethod.Patch, $"{Route}/1", new { v.LastName }, r => r.WithMergePatchJsonContentType().WithIfMatch(v.ETag))
+            .AssertOK()
+            .AssertValue(v, "etag")
+            .Value;
+
+        // Verify the patch.
+        Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .AssertValue(v);
+    }
+
+    [Test]
+    public void Patch_NotFound()
+    {
+        Test.Http<Person>()
+            .Run(HttpMethod.Patch, $"{Route}/0", new { FirstName = "Charlie" }, r => r.WithMergePatchJsonContentType())
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Patch_Concurrency()
+    {
+        // Pre-read the entity to get the etag.
+        var v = Test.Http<Person>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .Value!;
+
+        v.LastName += " Jr.";
+
+        // Attempt to patch the entity with an invalid etag.
+        Test.Http<Person>()
+            .Run(HttpMethod.Patch, $"{Route}/1", new { v.LastName }, r => r.WithMergePatchJsonContentType().WithIfMatch("oops"))
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void Delete_Success()
+    {
+        // Pre-read the entity to verify it exists.
+        Test.Http()
+            .Run(HttpMethod.Get, $"{Route}/4")
+            .AssertOK();
+
+        // Delete the entity.
+        Test.Http()
+            .Run(HttpMethod.Delete, $"{Route}/4")
+            .AssertNoContent();
+
+        // Verify the entity is deleted.
+        Test.Http()
+            .Run(HttpMethod.Get, $"{Route}/4")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Delete_NotFound()
+    {
+        // Verify the entity does not exist.
+        Test.Http()
+            .Run(HttpMethod.Get, $"{Route}/0")
+            .AssertNotFound();
+
+        // Delete the entity - should be idempotent.
+        Test.Http()
+            .Run(HttpMethod.Delete, $"{Route}/0")
+            .AssertNoContent();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MvcMutateTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MvcMutateTests.cs
new file mode 100644
index 00000000..89736927
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MvcMutateTests.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class PersonApi_MvcMutateTests : PersonApi_MutateTestsBase
+{
+    public override string Route => "api/people";
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MvcQueryTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MvcQueryTests.cs
new file mode 100644
index 00000000..69b0f26a
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_MvcQueryTests.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class PersonApi_MvcQueryTests : PersonApi_QueryTestsBase
+{
+    public override string Route => "api/people";
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_QueryTestsBase.cs b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_QueryTestsBase.cs
new file mode 100644
index 00000000..641bea9c
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/PersonApi_QueryTestsBase.cs
@@ -0,0 +1,192 @@
+using CoreEx.AspNetCore.Test.Api.Entities;
+using CoreEx.AspNetCore.Test.Api.Services;
+using CoreEx.Http;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+public abstract class PersonApi_QueryTestsBase : WithApiTester<Api.Program>
+{
+    public abstract string Route { get; }
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp()
+    {
+        PersonService.Reset();
+        PersonService2.Reset();
+    }
+
+    [Test]
+    public void Get_Found()
+    {
+        Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .AssertValue(new Person
+            {
+                Id = "1",
+                FirstName = "John",
+                LastName = "Doe",
+                Birthday = new DateOnly(1980, 1, 1),
+                GenderSid = "M",
+            }, "etag")
+            .AssertETagHeader();
+    }
+
+    [Test]
+    public void Get_Found_IncludeText()
+    {
+        Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/1?$text")
+            .AssertOK()
+            .AssertValue(new Person
+            {
+                Id = "1",
+                FirstName = "John",
+                LastName = "Doe",
+                Birthday = new DateOnly(1980, 1, 1),
+                GenderSid = "M",
+                GenderText = "Male"
+            }, "etag")
+            .AssertETagHeader();
+    }
+
+    [Test]
+    public void Get_NotFound()
+    {
+        Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/0")
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Get_NotModified()
+    {
+        var v = Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/1")
+            .AssertOK()
+            .Value!;
+
+        Test.Http<Person?>()
+            .Run(HttpMethod.Get, $"{Route}/1", r => r.WithIfNoneMatch(v.ETag))
+            .AssertNotModified();
+    }
+
+    [Test]
+    public void GetByQuery_Default()
+    {
+        Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route)
+            .AssertOK()
+            .AssertJsonFromResource("Person_GetByQuery_Default.json", "etag")
+            .AssertNamedHeader(HttpNames.PagingSkipHeaderName, "0")
+            .AssertNamedHeader(HttpNames.PagingTakeHeaderName, "25")
+            .AssertETagHeader();
+    }
+
+    [Test]
+    public void GetByQuery_Paging()
+    {
+        Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithPaging(1, 2, true))
+            .AssertOK()
+            .AssertJsonFromResource("Person_GetByQuery_Paging.json", "etag")
+            .AssertNamedHeader(HttpNames.PagingSkipHeaderName, "1")
+            .AssertNamedHeader(HttpNames.PagingTakeHeaderName, "2")
+            .AssertNamedHeader(HttpNames.PagingTotalCountHeaderName, "4")
+            .AssertNamedHeader("Link", $"</{Route}?$skip=0&$take=1&$count=true>; rel=\"prev\", </{Route}?$skip=3&$take=2&$count=true>; rel=\"next\"")
+            .AssertETagHeader();
+    }
+
+    [Test]
+    public void GetByQuery_WithFields()
+    {
+        Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithFields("firstname", "lastname"))
+            .AssertOK()
+            .AssertJsonFromResource("Person_GetByQuery_IncludeFields.json");
+    }
+
+    [Test]
+    public void GetByQuery_WithoutFields()
+    {
+        Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithoutFields("id", "birthday", "gender", "etag"))
+            .AssertOK()
+            .AssertJsonFromResource("Person_GetByQuery_IncludeFields.json");
+    }
+
+    [Test]
+    public void GetByQuery_Filter_Eq()
+    {
+        var v = Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithQuery("firstname eq 'John'"))
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(1);
+        v[0].Id.Should().Be("1");
+    }
+
+    [Test]
+    public void GetByQuery_Filter_EndsWith()
+    {
+        var v = Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithQuery("endswith(firstname, 'e')"))
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(2);
+        v[0].Id.Should().Be("2");
+        v[1].Id.Should().Be("3");
+    }
+
+    [Test]
+    public void GetByQuery_Filter_Gender()
+    {
+        var v = Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithQuery("gender in ('m')"))
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(2);
+        v[0].Id.Should().Be("1");
+        v[1].Id.Should().Be("4");
+    }
+
+    [Test]
+    public void GetByQuery_OrderBy_FirstName()
+    {
+        var v = Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithQuery(filter: "gender in ('m')", orderBy: "firstname"))
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(2);
+        v[0].Id.Should().Be("4");
+        v[1].Id.Should().Be("1");
+    }
+
+    [Test]
+    public void GetByQuery_Filter_Error()
+    {
+        var v = Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithQuery("gender gt 'm'"))
+            .AssertBadRequest()
+            .AssertContentType("application/problem+json")
+            .AssertJsonFromResource("Person_GetByQuery_FilterError.json", "traceid");
+    }
+
+    [Test]
+    public void GetByQuery_OrderBy_Error()
+    {
+        var v = Test.Http<Person[]>()
+            .Run(HttpMethod.Get, Route, r => r.WithQuery(orderBy: "eyecolor"))
+            .AssertBadRequest()
+            .AssertContentType("application/problem+json")
+            .AssertJsonFromResource("Person_GetByQuery_OrderByError.json", "traceid");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_HttpTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_HttpTests.cs
new file mode 100644
index 00000000..f1d615f0
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_HttpTests.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class ReferenceDataApi_HttpTests : ReferenceDataApi_TestsBase
+{
+    public override string Route => "api/referencedata";
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_MvcTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_MvcTests.cs
new file mode 100644
index 00000000..186a96d5
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_MvcTests.cs
@@ -0,0 +1,7 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class ReferenceDataApi_MvcTests : ReferenceDataApi_TestsBase
+{
+    public override string Route => "api/refdata";
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_TestsBase.cs b/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_TestsBase.cs
new file mode 100644
index 00000000..861abe5b
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/ReferenceDataApi_TestsBase.cs
@@ -0,0 +1,62 @@
+using CoreEx.AspNetCore.Test.Api.Entities;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[Parallelizable]
+public abstract class ReferenceDataApi_TestsBase : WithApiTester<Api.Program>
+{
+    public abstract string Route { get; }
+
+    [Test]
+    public void Gender_Get_All()
+    {
+        Test.Http<Gender[]>()
+            .Run(HttpMethod.Get, $"{Route}/genders")
+            .AssertOK()
+            .AssertJsonFromResource("Gender_Get_All.json");
+    }
+
+    [Test]
+    public void Gender_Get_Codes()
+    {
+        var v = Test.Http<Gender[]>()
+            .Run(HttpMethod.Get, $"{Route}/genders?codes=F&codes=X")
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(1);
+        v[0].Should().NotBeNull();
+        v[0].Code.Should().Be("F");
+    }
+
+    [Test]
+    public void Gender_Get_Text()
+    {
+        var v = Test.Http<Gender[]>()
+            .Run(HttpMethod.Get, $"{Route}/genders?text=F*")
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(1);
+        v[0].Should().NotBeNull();
+        v[0].Code.Should().Be("F");
+    }
+
+    [Test]
+    public void Gender_Get_Codes_IncludeInactive()
+    {
+        var v = Test.Http<Gender[]>()
+            .Run(HttpMethod.Get, $"{Route}/genders?codes=F&codes=X&$inactive")
+            .AssertOK()
+            .Value;
+
+        v.Should().NotBeNull();
+        v.Should().HaveCount(2);
+        v[0].Should().NotBeNull();
+        v[0].Code.Should().Be("F");
+        v[1].Should().NotBeNull();
+        v[1].Code.Should().Be("X");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/Resources/Gender_Get_All.json b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Gender_Get_All.json
new file mode 100644
index 00000000..76039f74
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Gender_Get_All.json
@@ -0,0 +1,12 @@
+[
+  {
+    "id": "F",
+    "code": "F",
+    "text": "Female"
+  },
+  {
+    "id": "M",
+    "code": "M",
+    "text": "Male"
+  }
+]
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_Default.json b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_Default.json
new file mode 100644
index 00000000..8c0b0950
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_Default.json
@@ -0,0 +1,34 @@
+[
+  {
+    "id": "2",
+    "firstName": "Jane",
+    "lastName": "Doe",
+    "birthday": "1985-02-02",
+    "gender": "F",
+    "etag": "2b0d6072-2284-4326-949d-394d0a61826c"
+  },
+  {
+    "id": "1",
+    "firstName": "John",
+    "lastName": "Doe",
+    "birthday": "1980-01-01",
+    "gender": "M",
+    "etag": "e4d24a5e-2435-448f-8dcc-a4749368a5cb"
+  },
+  {
+    "id": "3",
+    "firstName": "Alice",
+    "lastName": "Smith",
+    "birthday": "1990-03-03",
+    "gender": "F",
+    "etag": "b1f9f81e-9b6c-4c93-a78a-e2e518657054"
+  },
+  {
+    "id": "4",
+    "firstName": "Bob",
+    "lastName": "Smith",
+    "birthday": "1995-04-04",
+    "gender": "M",
+    "etag": "fc73f19d-97a2-4b6c-a526-93490e6c0454"
+  }
+]
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_FilterError.json b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_FilterError.json
new file mode 100644
index 00000000..cab8c08d
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_FilterError.json
@@ -0,0 +1,86 @@
+{
+  "type": "https://tools.ietf.org/html/rfc9110#section-15.5.1",
+  "title": "A query filter parsing error occurred.",
+  "status": 400,
+  "errors": {
+    "$filter": [
+      "Field \u0027gender\u0027 does not support the \u0027gt\u0027 operator."
+    ]
+  },
+  "errorType": "validation",
+  "traceId": "00-a981e5aedf51b7fa4cf352d897a310fe-9f5b5a1bbdd59887-01",
+  "schema": {
+    "filter": {
+      "fields": {
+        "firstname": {
+          "type": "string",
+          "operators": [
+            "eq",
+            "ne",
+            "lt",
+            "le",
+            "ge",
+            "gt",
+            "in",
+            "startswith",
+            "contains",
+            "endswith"
+          ]
+        },
+        "lastname": {
+          "type": "string",
+          "operators": [
+            "eq",
+            "ne",
+            "lt",
+            "le",
+            "ge",
+            "gt",
+            "in",
+            "startswith",
+            "contains",
+            "endswith"
+          ]
+        },
+        "birthday": {
+          "type": "string",
+          "format": "date",
+          "operators": [
+            "eq",
+            "ne",
+            "lt",
+            "le",
+            "ge",
+            "gt",
+            "in"
+          ]
+        },
+        "gender": {
+          "type": "string",
+          "operators": [
+            "eq",
+            "ne",
+            "in"
+          ]
+        }
+      }
+    },
+    "orderby": {
+      "fields": {
+        "lastname": {
+          "direction": [
+            "asc",
+            "desc"
+          ]
+        },
+        "firstname": {
+          "direction": [
+            "asc",
+            "desc"
+          ]
+        }
+      },
+      "default": "lastname asc, firstname asc"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_IncludeFields.json b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_IncludeFields.json
new file mode 100644
index 00000000..a8af085b
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_IncludeFields.json
@@ -0,0 +1,18 @@
+[
+  {
+    "firstName": "Jane",
+    "lastName": "Doe"
+  },
+  {
+    "firstName": "John",
+    "lastName": "Doe"
+  },
+  {
+    "firstName": "Alice",
+    "lastName": "Smith"
+  },
+  {
+    "firstName": "Bob",
+    "lastName": "Smith"
+  }
+]
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_OrderByError.json b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_OrderByError.json
new file mode 100644
index 00000000..1253f6f9
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_OrderByError.json
@@ -0,0 +1,86 @@
+{
+  "type": "https://tools.ietf.org/html/rfc9110#section-15.5.1",
+  "title": "A query order-by parsing error occurred.",
+  "status": 400,
+  "errors": {
+    "$orderby": [
+      "Field \u0027eyecolor\u0027 is not supported."
+    ]
+  },
+  "errorType": "validation",
+  "traceId": "00-6327ec26f7f53f956ef1a9c13f3ef61c-82a2c15e80731f97-01",
+  "schema": {
+    "filter": {
+      "fields": {
+        "firstname": {
+          "type": "string",
+          "operators": [
+            "eq",
+            "ne",
+            "lt",
+            "le",
+            "ge",
+            "gt",
+            "in",
+            "startswith",
+            "contains",
+            "endswith"
+          ]
+        },
+        "lastname": {
+          "type": "string",
+          "operators": [
+            "eq",
+            "ne",
+            "lt",
+            "le",
+            "ge",
+            "gt",
+            "in",
+            "startswith",
+            "contains",
+            "endswith"
+          ]
+        },
+        "birthday": {
+          "type": "string",
+          "format": "date",
+          "operators": [
+            "eq",
+            "ne",
+            "lt",
+            "le",
+            "ge",
+            "gt",
+            "in"
+          ]
+        },
+        "gender": {
+          "type": "string",
+          "operators": [
+            "eq",
+            "ne",
+            "in"
+          ]
+        }
+      }
+    },
+    "orderby": {
+      "fields": {
+        "lastname": {
+          "direction": [
+            "asc",
+            "desc"
+          ]
+        },
+        "firstname": {
+          "direction": [
+            "asc",
+            "desc"
+          ]
+        }
+      },
+      "default": "lastname asc, firstname asc"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_Paging.json b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_Paging.json
new file mode 100644
index 00000000..8ffeaff7
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/Resources/Person_GetByQuery_Paging.json
@@ -0,0 +1,18 @@
+[
+  {
+    "id": "1",
+    "firstName": "John",
+    "lastName": "Doe",
+    "birthday": "1980-01-01",
+    "gender": "M",
+    "etag": "a71e3cfd-2c40-474b-b4ce-f9617d900cef"
+  },
+  {
+    "id": "4",
+    "firstName": "Bob",
+    "lastName": "Smith",
+    "birthday": "1995-04-04",
+    "gender": "M",
+    "etag": "74a9dd99-167c-4178-b92c-e89db00f4621"
+  }
+]
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Delete.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Delete.cs
new file mode 100644
index 00000000..94f51ef2
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Delete.cs
@@ -0,0 +1,34 @@
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void Delete_Success()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteAsync(Test.CreateHttpRequest(HttpMethod.Delete), (ro, ct) => Task.CompletedTask))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Delete_Not_Found()
+    {
+        static Task NotFound(WebApiOptions ro, CancellationToken ct) => throw new NotFoundException();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteAsync(Test.CreateHttpRequest(HttpMethod.Delete), NotFound))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Delete_Response_Success()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteAsync<int>(Test.CreateHttpRequest(HttpMethod.Delete), (ro, ct) => Task.FromResult(123)))
+            .ToHttpResponseMessageAssertor()
+            .AssertOK()
+            .AssertValue(123);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.DeleteWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.DeleteWithResult.cs
new file mode 100644
index 00000000..29038cd8
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.DeleteWithResult.cs
@@ -0,0 +1,43 @@
+using CoreEx.Results;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void DeleteWithResult_Success()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteWithResultAsync(Test.CreateHttpRequest(HttpMethod.Delete), (ro, ct) => Result.SuccessTask))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void DeleteWithResult_Not_Found()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteWithResultAsync(Test.CreateHttpRequest(HttpMethod.Delete), (ro, ct) => Result.NotFoundError().AsTask()))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void DeleteWithResult_Not_Found_Throw()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteWithResultAsync(Test.CreateHttpRequest(HttpMethod.Delete), (ro, ct) => throw new NotFoundException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void DeleteWithResult_Response_Success()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.DeleteWithResultAsync<int>(Test.CreateHttpRequest(HttpMethod.Delete), (ro, ct) => Result.Go(123).AsTask()))
+            .ToHttpResponseMessageAssertor()
+            .AssertOK()
+            .AssertValue(123);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Exceptions.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Exceptions.cs
new file mode 100644
index 00000000..a26fa225
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Exceptions.cs
@@ -0,0 +1,50 @@
+using CoreEx.Localization;
+using System.Net;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [TestCase(typeof(AuthenticationException), HttpStatusCode.Unauthorized, "authentication")]
+    [TestCase(typeof(AuthorizationException), HttpStatusCode.Forbidden, "authorization")]
+    [TestCase(typeof(BusinessException), HttpStatusCode.BadRequest, "business")]
+    [TestCase(typeof(ConcurrencyException), HttpStatusCode.PreconditionFailed, "concurrency")]
+    [TestCase(typeof(ConflictException), HttpStatusCode.Conflict, "conflict")]
+    [TestCase(typeof(DataConsistencyException), HttpStatusCode.InternalServerError, "data-consistency")]
+    [TestCase(typeof(DuplicateException), HttpStatusCode.Conflict, "duplicate")]
+    [TestCase(typeof(NotFoundException), HttpStatusCode.NotFound, "not-found")]
+    [TestCase(typeof(TransientException), HttpStatusCode.ServiceUnavailable, "transient")]
+    [TestCase(typeof(ValidationException), HttpStatusCode.BadRequest, "validation")]
+    [TestCase(typeof(InvalidOperationException), HttpStatusCode.InternalServerError)]
+    public void Exception_ProblemHandling(Type type, HttpStatusCode statusCode, string? errorType = null, string? errorCode = null)
+    {
+        List<string> paths = ["type", "title", "traceid"];
+
+        var ex = type == typeof(BusinessException) ? new BusinessException("Biz") : (Exception)Activator.CreateInstance(type, null)!;
+        if (ex is CoreEx.Abstractions.ExtendedException eex && eex.IsError)
+        {
+            if (!string.IsNullOrEmpty(errorCode))
+                eex.ErrorCode = errorCode;
+            else
+                paths.Add("errorCode");
+        }
+        else
+        {
+            paths.Add("errorCode");
+            paths.Add("errorType");
+            paths.Add("detail");
+        }
+
+        Test.Type<TWebApi>()
+            .Run(async w =>
+            {
+                w.ConvertUnhandledExceptionsToProblemDetails = true; // Ensure enabled for unit-testing.
+                return await w.PostAsync(Test.CreateHttpRequest(HttpMethod.Post, "test"), (ro, ct) => throw ex);
+            })
+            .ToHttpResponseMessageAssertor()
+            .Assert(statusCode)
+            .AssertContentType(MediaTypeNames.Application.ProblemJson)
+            .AssertJson($"{{\"title\":\"{ex.Message}\",\"status\":{(int)statusCode},\"errorType\":\"{errorType}\",\"errorCode\":\"{errorCode}\"}}", pathsToIgnore: [.. paths]);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.ExceptionsWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.ExceptionsWithResult.cs
new file mode 100644
index 00000000..5b88e902
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.ExceptionsWithResult.cs
@@ -0,0 +1,92 @@
+using CoreEx.Results;
+using System.Net;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [TestCase(typeof(AuthenticationException), HttpStatusCode.Unauthorized, "authentication")]
+    [TestCase(typeof(AuthorizationException), HttpStatusCode.Forbidden, "authorization")]
+    [TestCase(typeof(BusinessException), HttpStatusCode.BadRequest, "business")]
+    [TestCase(typeof(ConcurrencyException), HttpStatusCode.PreconditionFailed, "concurrency")]
+    [TestCase(typeof(ConflictException), HttpStatusCode.Conflict, "conflict")]
+    [TestCase(typeof(DataConsistencyException), HttpStatusCode.InternalServerError, "data-consistency")]
+    [TestCase(typeof(DuplicateException), HttpStatusCode.Conflict, "duplicate")]
+    [TestCase(typeof(NotFoundException), HttpStatusCode.NotFound, "not-found")]
+    [TestCase(typeof(TransientException), HttpStatusCode.ServiceUnavailable, "transient")]
+    [TestCase(typeof(ValidationException), HttpStatusCode.BadRequest, "validation")]
+    [TestCase(typeof(InvalidOperationException), HttpStatusCode.InternalServerError)]
+    public void ExceptionWithResult_ProblemHandling(Type type, HttpStatusCode statusCode, string? errorType = null, string? errorCode = null)
+    {
+        List<string> paths = ["type", "title", "traceid"];
+
+        var ex = type == typeof(BusinessException) ? new BusinessException("Biz") : (Exception)Activator.CreateInstance(type, null)!;
+        if (ex is CoreEx.Abstractions.ExtendedException eex && eex.IsError)
+        {
+            if (!string.IsNullOrEmpty(errorCode))
+                eex.ErrorCode = errorCode;
+            else
+                paths.Add("errorCode");
+        }
+        else
+        {
+            paths.Add("errorCode");
+            paths.Add("errorType");
+            paths.Add("detail");
+        }
+
+        Test.Type<TWebApi>()
+            .Run(async w =>
+            {
+                w.ConvertUnhandledExceptionsToProblemDetails = true; // Ensure enabled for unit-testing.
+                return await w.PostWithResultAsync(Test.CreateHttpRequest(HttpMethod.Post, "test"), (ro, ct) => Task.FromResult(Result.Fail(ex)));
+            })
+            .ToHttpResponseMessageAssertor()
+            .Assert(statusCode)
+            .AssertContentType(MediaTypeNames.Application.ProblemJson)
+            .AssertJson($"{{\"title\":\"{ex.Message}\",\"status\":{(int)statusCode},\"errorType\":\"{errorType}\",\"errorCode\":\"{errorCode}\"}}", pathsToIgnore: [.. paths]);
+    }
+
+    [TestCase(typeof(AuthenticationException), HttpStatusCode.Unauthorized, "authentication")]
+    [TestCase(typeof(AuthorizationException), HttpStatusCode.Forbidden, "authorization")]
+    [TestCase(typeof(BusinessException), HttpStatusCode.BadRequest, "business")]
+    [TestCase(typeof(ConcurrencyException), HttpStatusCode.PreconditionFailed, "concurrency")]
+    [TestCase(typeof(ConflictException), HttpStatusCode.Conflict, "conflict")]
+    [TestCase(typeof(DataConsistencyException), HttpStatusCode.InternalServerError, "data-consistency")]
+    [TestCase(typeof(DuplicateException), HttpStatusCode.Conflict, "duplicate")]
+    [TestCase(typeof(NotFoundException), HttpStatusCode.NotFound, "not-found")]
+    [TestCase(typeof(TransientException), HttpStatusCode.ServiceUnavailable, "transient")]
+    [TestCase(typeof(ValidationException), HttpStatusCode.BadRequest, "validation")]
+    [TestCase(typeof(InvalidOperationException), HttpStatusCode.InternalServerError)]
+    public void ExceptionWithResult_Throw_ProblemHandling(Type type, HttpStatusCode statusCode, string? errorType = null, string? errorCode = null)
+    {
+        List<string> paths = ["type", "title", "traceid"];
+
+        var ex = type == typeof(BusinessException) ? new BusinessException("Biz") : (Exception)Activator.CreateInstance(type, null)!;
+        if (ex is CoreEx.Abstractions.ExtendedException eex && eex.IsError)
+        {
+            if (!string.IsNullOrEmpty(errorCode))
+                eex.ErrorCode = errorCode;
+            else
+                paths.Add("errorCode");
+        }
+        else
+        {
+            paths.Add("errorCode");
+            paths.Add("errorType");
+            paths.Add("detail");
+        }
+
+        Test.Type<TWebApi>()
+            .Run(async w =>
+            {
+                w.ConvertUnhandledExceptionsToProblemDetails = true; // Ensure enabled for unit-testing.
+                return await w.PostWithResultAsync(Test.CreateHttpRequest(HttpMethod.Post, "test"), (ro, ct) => throw ex);
+            })
+            .ToHttpResponseMessageAssertor()
+            .Assert(statusCode)
+            .AssertContentType(MediaTypeNames.Application.ProblemJson)
+            .AssertJson($"{{\"title\":\"{ex.Message}\",\"status\":{(int)statusCode},\"errorType\":\"{errorType}\",\"errorCode\":\"{errorCode}\"}}", pathsToIgnore: [.. paths]);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Get.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Get.cs
new file mode 100644
index 00000000..e2eb6a51
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Get.cs
@@ -0,0 +1,284 @@
+using CoreEx.Data;
+using CoreEx.Entities;
+using CoreEx.Http;
+using System.Net.Http.Headers;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    private readonly string[] _helloWorld = ["Hello", "World"];
+
+    [Test]
+    public void Get_Null_As_Not_Found()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(Test.CreateHttpRequest(HttpMethod.Get), (ro, ct) => Task.FromResult<string?>(null)))
+            .ToHttpResponseMessageAssertor()
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void Get_OK()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult("Hello World")))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue("Hello World")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"07cf55095ef8\"");
+    }
+
+    [Test]
+    public void Get_Collection_With_Items()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(_helloWorld)))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"");
+    }
+
+    [Test]
+    public void Get_Collection_Empty()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(Array.Empty<string>())))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("[]")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"4f53cda18c2b\"");
+    }
+
+    [Test]
+    public void Get_ItemsResult_With_Items()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>(_helloWorld))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"");
+    }
+
+    [Test]
+    public void Get_ItemsResult_Empty()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>())))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("[]")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"4f53cda18c2b\"");
+    }
+
+    [Test]
+    public void Get_ItemsResult_With_Total_Count_NoPaging()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>(_helloWorld).WithTotalCount(50))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"")
+            .AssertNoNamedHeader(HttpNames.PagingSkipHeaderName)
+            .AssertNoNamedHeader(HttpNames.PagingTakeHeaderName)
+            .AssertNoNamedHeader(HttpNames.PagingTotalCountHeaderName);
+    }
+
+    [Test]
+    public void Get_ItemsResult_With_Total_Count_WithPaging()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>(_helloWorld, PagingArgs.CreateWithCount()).WithTotalCount(50))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"")
+            .AssertNamedHeader(HttpNames.PagingSkipHeaderName, "0")
+            .AssertNamedHeader(HttpNames.PagingTakeHeaderName, PagingArgs.DefaultTake.ToString())
+            .AssertNamedHeader(HttpNames.PagingTotalCountHeaderName, "50");
+    }
+
+    [Test]
+    public void Get_ItemsResult_Prev_Next_Paging_Links1()
+    {
+        // Get a mid page.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=2&$take=5&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>(["a", "b", "c", "d", "e"], ro.PagingArgs).WithTotalCount(50))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=0&$take=2&$count&abc=def>; rel=\"prev\"", "</test?xyz=uvw&$skip=7&$take=5&$count&abc=def>; rel=\"next\""]);
+    }
+
+    [Test]
+    public void Get_ItemsResult_Prev_Next_Paging_Links2()
+    {
+        // Get the first page.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=0&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>(["a", "b"], ro.PagingArgs).WithTotalCount(50))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=2&$take=2&$count&abc=def>; rel=\"next\""]);
+    }
+
+    [Test]
+    public void Get_ItemsResult_Prev_Next_Paging_Links3()
+    {
+        // Get the last page.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=50&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>(["a"], ro.PagingArgs).WithTotalCount(51))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=48&$take=2&$count&abc=def>; rel=\"prev\""]);
+    }
+
+    [Test]
+    public void Get_ItemsResult_Prev_Next_Paging_Links4()
+    {
+        // Get a page with way too much skip - total count will help.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=250&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>([], ro.PagingArgs).WithTotalCount(50))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=48&$take=2&$count&abc=def>; rel=\"prev\""]);
+    }
+
+    [Test]
+    public void Get_ItemsResult_Prev_Next_Paging_Links5()
+    {
+        // Get a page with way too much skip - can only guess the previous.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=250&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>([], ro.PagingArgs))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=248&$take=2&$count&abc=def>; rel=\"prev\""]);
+    }
+
+    [Test]
+    public void Get_ItemsResult_Prev_Next_Paging_Links6()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ItemsResult<string>([], ro.PagingArgs))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.Should().NotContainKeys("Link");
+    }
+
+    [Test]
+    public void Get_Person_Default_ETag()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(Person.GetPerson())))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"John","lastName":"Doe","age":30,"etag":"1f5d2ae86bc2"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"1f5d2ae86bc2\"");
+    }
+
+    [Test]
+    public void Get_Person_Specified_ETag()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(Person.GetPerson("abcdefg"))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"John","lastName":"Doe","age":30,"etag":"abcdefg"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void Get_Person_Not_Modified()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        hr.Headers.IfNoneMatch = new EntityTagHeaderValue("\"abcdefg\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(Person.GetPerson("abcdefg"))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertNotModified()
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void Get_Person_Fields_Include()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        hr.QueryString = hr.QueryString.Add(HttpNames.IncludeFieldsQueryStringName, "firstname,LastName");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(Person.GetPerson())))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"John","lastName":"Doe"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"ddbd7f44c126\"");
+    }
+
+    [Test]
+    public void Get_Person_Fields_Exclude()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        hr.QueryString = hr.QueryString.Add(HttpNames.ExcludeFieldsQueryStringName, "firstname,LastName");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(Person.GetPerson())))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"age":30,"etag":"1f5d2ae86bc2"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"483e8079ddab\"");
+    }
+
+    [Test]
+    public void Get_ValueResult_Default_StatusCode()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ValueResult<string>("Hello World"))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue("Hello World")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"07cf55095ef8\"");
+    }
+
+    [Test]
+    public void Get_ValueResult_Specified_StatusCode()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetAsync(hr, (ro, ct) => Task.FromResult(new ValueResult<string>("Hello World", System.Net.HttpStatusCode.Accepted))))
+            .ToHttpResponseMessageAssertor(hr)
+            .Assert(System.Net.HttpStatusCode.Accepted)
+            .AssertValue("Hello World")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"07cf55095ef8\"");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.GetWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.GetWithResult.cs
new file mode 100644
index 00000000..dcfcda05
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.GetWithResult.cs
@@ -0,0 +1,283 @@
+using CoreEx.Data;
+using CoreEx.Entities;
+using CoreEx.Http;
+using CoreEx.Results;
+using System.Net.Http.Headers;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void GetWithResult_Null_As_Not_Found()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(Test.CreateHttpRequest(HttpMethod.Get), (ro, ct) => Task.FromResult(Result<string?>.Ok(null))))
+            .ToHttpResponseMessageAssertor()
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void GetWithResult_OK()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok("Hello World"))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue("Hello World")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"07cf55095ef8\"");
+    }
+
+    [Test]
+    public void GetWithResult_Collection_With_Items()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(_helloWorld))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"");
+    }
+
+    [Test]
+    public void GetWithResult_Collection_Empty()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(Array.Empty<string>()))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("[]")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"4f53cda18c2b\"");
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_With_Items()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>(_helloWorld)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"");
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Empty()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>()))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("[]")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"4f53cda18c2b\"");
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_With_Total_Count_NoPaging()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>(_helloWorld).WithTotalCount(50)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"")
+            .AssertNoNamedHeader(HttpNames.PagingSkipHeaderName)
+            .AssertNoNamedHeader(HttpNames.PagingTakeHeaderName)
+            .AssertNoNamedHeader(HttpNames.PagingTotalCountHeaderName);
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_With_Total_Count_WithPaging()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>(_helloWorld, PagingArgs.CreateWithCount()).WithTotalCount(50)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(_helloWorld)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"d24bf63378b2\"")
+            .AssertNamedHeader(HttpNames.PagingSkipHeaderName, "0")
+            .AssertNamedHeader(HttpNames.PagingTakeHeaderName, PagingArgs.DefaultTake.ToString())
+            .AssertNamedHeader(HttpNames.PagingTotalCountHeaderName, "50");
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Prev_Next_Paging_Links1()
+    {
+        // GetWithResult a mid page.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=2&$take=5&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>(["a", "b", "c", "d", "e"], ro.PagingArgs).WithTotalCount(50)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=0&$take=2&$count&abc=def>; rel=\"prev\"", "</test?xyz=uvw&$skip=7&$take=5&$count&abc=def>; rel=\"next\""]);
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Prev_Next_Paging_Links2()
+    {
+        // GetWithResult the first page.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=0&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>(["a", "b"], ro.PagingArgs).WithTotalCount(50)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=2&$take=2&$count&abc=def>; rel=\"next\""]);
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Prev_Next_Paging_Links3()
+    {
+        // GetWithResult the last page.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=50&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>(["a"], ro.PagingArgs).WithTotalCount(51)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=48&$take=2&$count&abc=def>; rel=\"prev\""]);
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Prev_Next_Paging_Links4()
+    {
+        // GetWithResult a page with way too much skip - total count will help.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=250&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>([], ro.PagingArgs).WithTotalCount(50)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=48&$take=2&$count&abc=def>; rel=\"prev\""]);
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Prev_Next_Paging_Links5()
+    {
+        // GetWithResult a page with way too much skip - can only guess the previous.
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$skip=250&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>([], ro.PagingArgs)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.GetValues("Link").Should().Contain(["</test?xyz=uvw&$skip=248&$take=2&$count&abc=def>; rel=\"prev\""]);
+    }
+
+    [Test]
+    public void GetWithResult_ItemsResult_Prev_Next_Paging_Links6()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get, "test?xyz=uvw&$take=2&$count&abc=def");
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ItemsResult<string>([], ro.PagingArgs)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .Response.Headers.Should().NotContainKeys("Link");
+    }
+
+    [Test]
+    public void GetWithResult_Person_Default_ETag()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(Person.GetPerson()))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"John","lastName":"Doe","age":30,"etag":"1f5d2ae86bc2"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"1f5d2ae86bc2\"");
+    }
+
+    [Test]
+    public void GetWithResult_Person_Specified_ETag()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(Person.GetPerson("abcdefg")))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"John","lastName":"Doe","age":30,"etag":"abcdefg"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void GetWithResult_Person_Not_Modified()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        hr.Headers.IfNoneMatch = new EntityTagHeaderValue("\"abcdefg\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(Person.GetPerson("abcdefg")))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertNotModified()
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void GetWithResult_Person_Fields_Include()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        hr.QueryString = hr.QueryString.Add(HttpNames.IncludeFieldsQueryStringName, "firstname,LastName");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(Person.GetPerson()))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"John","lastName":"Doe"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"ddbd7f44c126\"");
+    }
+
+    [Test]
+    public void GetWithResult_Person_Fields_Exclude()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        hr.QueryString = hr.QueryString.Add(HttpNames.ExcludeFieldsQueryStringName, "firstname,LastName");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(Person.GetPerson()))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"age":30,"etag":"1f5d2ae86bc2"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"483e8079ddab\"");
+    }
+
+    [Test]
+    public void GetWithResult_ValueResult_Default_StatusCode()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ValueResult<string>("Hello World")))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue("Hello World")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"07cf55095ef8\"");
+    }
+
+    [Test]
+    public void GetWithResult_ValueResult_Specified_StatusCode()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Get);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.GetWithResultAsync(hr, (ro, ct) => Task.FromResult(Result.Ok(new ValueResult<string>("Hello World", System.Net.HttpStatusCode.Accepted)))))
+            .ToHttpResponseMessageAssertor(hr)
+            .Assert(System.Net.HttpStatusCode.Accepted)
+            .AssertValue("Hello World")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"07cf55095ef8\"");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.MergePatch.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.MergePatch.cs
new file mode 100644
index 00000000..b7f5a50a
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.MergePatch.cs
@@ -0,0 +1,89 @@
+using CoreEx.Http;
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void MergePatch_Invalid_ContentType()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", r => r.ContentType = MediaTypeNames.Text.Plain), (ro, ct) => throw new InvalidOperationException(), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .Assert(HttpStatusCode.UnsupportedMediaType, "Unsupported 'Content-Type' for an HTTP PATCH; only JSON Merge Patch is supported using either: 'application/merge-patch+json' or 'application/json'.");
+    }
+
+    [Test]
+    public void MergePatch_No_Body()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName), (ro, ct) => throw new InvalidOperationException(), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertBadRequest()
+            .AssertErrors(new ApiError("value", "Value is required."));
+    }
+
+    [Test]
+    public void MergePatch_Invalid_Json()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", "<xml/>", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName), (ro, ct) => throw new InvalidOperationException(), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertBadRequest()
+            .AssertErrors(new ApiError("value", "Value is invalid: '<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0."));
+    }
+
+    [Test]
+    public void MergePatch_Not_Found()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", "{}", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName), (ro, ct) => Task.FromResult<Person?>(null), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void MergePatch_Concurrency()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch, "test", """{"age": 30}""", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"123456\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(hr, (ro, ct) => Task.FromResult<Person?>(Person.GetPerson("abcdefg")), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void MergePatch_No_Changes()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch, "test", """{"age": 30}""", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdef\"", true).ToString();
+
+        // As there are no changes as a result of merging then the corresponding put operation should not be invoked; should just return as-if it had done something :-)
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(hr, (ro, ct) => Task.FromResult<Person?>(Person.GetPerson("abcdef")), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertOK()
+            .AssertValue(Person.GetPerson("abcdef"));
+    }
+
+    [Test]
+    public void MergePatch_With_Changes()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch, "test", """{"age": 40}""", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdef\"", true).ToString();
+
+        var ep = Person.GetPerson("qrstuv");
+        ep.Age = 40;
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(hr, (ro, ct) => Task.FromResult<Person?>(Person.GetPerson("abcdef")), (ro, ct) => Task.FromResult(ro.Value.Adjust(p => p.ETag = "qrstuv"))))
+            .ToHttpResponseMessageAssertor()
+            .AssertOK()
+            .AssertValue(ep, "etag");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.MergePatchWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.MergePatchWithResult.cs
new file mode 100644
index 00000000..696e70e9
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.MergePatchWithResult.cs
@@ -0,0 +1,90 @@
+using CoreEx.Http;
+using CoreEx.Results;
+using System.Net;
+using System.Net.Http.Headers;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void MergePatchWithResult_Invalid_ContentType()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", r => r.ContentType = MediaTypeNames.Text.Plain), (ro, ct) => throw new InvalidOperationException(), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .Assert(HttpStatusCode.UnsupportedMediaType, "Unsupported 'Content-Type' for an HTTP PATCH; only JSON Merge Patch is supported using either: 'application/merge-patch+json' or 'application/json'.");
+    }
+
+    [Test]
+    public void MergePatchWithResult_No_Body()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName), (ro, ct) => throw new InvalidOperationException(), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertBadRequest()
+            .AssertErrors(new ApiError("value", "Value is required."));
+    }
+
+    [Test]
+    public void MergePatchWithResult_Invalid_Json()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", "<xml/>", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName), (ro, ct) => throw new InvalidOperationException(), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertBadRequest()
+            .AssertErrors(new ApiError("value", "Value is invalid: '<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0."));
+    }
+
+    [Test]
+    public void MergePatchWithResult_Not_Found()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch, "test", "{}", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName), (ro, ct) => Task.FromResult(Result<Person?>.Ok(null)), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertNotFound();
+    }
+
+    [Test]
+    public void MergePatchWithResult_Concurrency()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch, "test", """{"age": 30}""", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"123456\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(hr, (ro, ct) => Task.FromResult(Result<Person?>.Ok(Person.GetPerson("abcdefg"))), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertPreconditionFailed();
+    }
+
+    [Test]
+    public void MergePatchWithResult_No_Changes()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch, "test", """{"age": 30}""", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdef\"", true).ToString();
+
+        // As there are no changes as a result of merging then the corresponding put operation should not be invoked; should just return as-if it had done something :-)
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(hr, (ro, ct) => Task.FromResult(Result<Person?>.Ok(Person.GetPerson("abcdef"))), (ro, ct) => throw new InvalidOperationException()))
+            .ToHttpResponseMessageAssertor()
+            .AssertOK()
+            .AssertValue(Person.GetPerson("abcdef"));
+    }
+
+    [Test]
+    public void MergePatchWithResult_With_Changes()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch, "test", """{"age": 40}""", r => r.ContentType = HttpNames.MergePatchJsonMediaTypeName);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdef\"", true).ToString();
+
+        var ep = Person.GetPerson("qrstuv");
+        ep.Age = 40;
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(hr, (ro, ct) => Task.FromResult(Result<Person?>.Ok(Person.GetPerson("abcdef"))), (ro, ct) => Task.FromResult(Result.Ok(ro.Value.Adjust(p => p.ETag = "qrstuv")))))
+            .ToHttpResponseMessageAssertor()
+            .AssertOK()
+            .AssertValue(ep, "etag");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Patch.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Patch.cs
new file mode 100644
index 00000000..f38aef12
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Patch.cs
@@ -0,0 +1,120 @@
+using System.Net;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void Patch_No_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync(Test.CreateHttpRequest(HttpMethod.Patch), (ro, ct) => Task.CompletedTask))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Patch_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(Test.CreateJsonHttpRequest(HttpMethod.Patch, "test", Person.GetPerson("xx")), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Patch_Value_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync(Test.CreateHttpRequest(HttpMethod.Patch), Person.GetPerson("xx"), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Patch_No_Body_With_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch);
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person>(hr, (ro, ct) => Task.FromResult(person)))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(person)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void Patch_No_Body_With_Null_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person?>(Test.CreateHttpRequest(HttpMethod.Patch), (ro, ct) => Task.FromResult<Person?>(null)))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Patch_Body_With_Response()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Patch, "test", Person.GetPerson("xx"));
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person, Person2>(hr, (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(p);
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void Patch_Value_With_Response()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchAsync<Person, Person2>(hr, Person.GetPerson("xx"), (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(p);
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PatchWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PatchWithResult.cs
new file mode 100644
index 00000000..c98636e0
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PatchWithResult.cs
@@ -0,0 +1,121 @@
+using CoreEx.Results;
+using System.Net;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void PatchWithResult_No_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync(Test.CreateHttpRequest(HttpMethod.Patch), (ro, ct) => Task.FromResult(Result.Success)))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PatchWithResult_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(Test.CreateJsonHttpRequest(HttpMethod.Patch, "test", Person.GetPerson("xx")), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PatchWithResult_Value_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync(Test.CreateHttpRequest(HttpMethod.Patch), Person.GetPerson("xx"), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PatchWithResult_No_Body_With_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch);
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(hr, (ro, ct) => Task.FromResult(Result.Ok(person))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertValue(person)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void PatchWithResult_No_Body_With_Null_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person>(Test.CreateHttpRequest(HttpMethod.Patch), (ro, ct) => Result<Person>.Ok(null!).AsTask()))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PatchWithResult_Body_With_Response()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Patch, "test", Person.GetPerson("xx"));
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person, Person2>(hr, (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(Result.Ok(p));
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void PatchWithResult_Value_With_Response()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Patch);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PatchWithResultAsync<Person, Person2>(hr, Person.GetPerson("xx"), (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(Result.Ok(p));
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Post.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Post.cs
new file mode 100644
index 00000000..a5a91020
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Post.cs
@@ -0,0 +1,136 @@
+using CoreEx.Results;
+using System.Net;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void Post_No_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync(Test.CreateHttpRequest(HttpMethod.Post), (ro, ct) => Task.CompletedTask))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Post_No_Body_No_Response_With_Location()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Post);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync(hr, (ro, ct) =>
+            {
+                ro.WithLocationUri(() => new Uri("test", UriKind.Relative));
+                return Task.CompletedTask;
+            }, HttpStatusCode.Created))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertLocationHeaderContains("test");
+    }
+
+    [Test]
+    public void Post_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync<Person>(Test.CreateJsonHttpRequest(HttpMethod.Post, "test", Person.GetPerson()), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Post_Value_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync(Test.CreateHttpRequest(HttpMethod.Post), Person.GetPerson(), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Post_No_Body_With_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+        var hr = Test.CreateHttpRequest(HttpMethod.Post);
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync<Person>(hr, (ro, ct) => Task.FromResult(person)))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertValue(person)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void Post_No_Body_With_Null_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync<Person>(Test.CreateHttpRequest(HttpMethod.Post), (ro, ct) => Task.FromResult((Person)null!)))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Post_Body_With_Response()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Post, "test", Person.GetPerson());
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync<Person, Person2>(hr, (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(p);
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void Post_Value_With_Response()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Post);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostAsync<Person, Person2>(hr, Person.GetPerson(), (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(p);
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PostWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PostWithResult.cs
new file mode 100644
index 00000000..e3b179ce
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PostWithResult.cs
@@ -0,0 +1,136 @@
+using CoreEx.Results;
+using System.Net;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void PostWithResult_No_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync(Test.CreateHttpRequest(HttpMethod.Post), (ro, ct) => Task.FromResult(Result.Success)))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PostWithResult_No_Body_No_Response_With_Location()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Post);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync(hr, (ro, ct) =>
+            {
+                ro.WithLocationUri(() => new Uri("test", UriKind.Relative));
+                return Task.FromResult(Result.Success);
+            }, HttpStatusCode.Created))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertLocationHeaderContains("test");
+    }
+
+    [Test]
+    public void PostWithResult_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync<Person>(Test.CreateJsonHttpRequest(HttpMethod.Post, "test", Person.GetPerson()), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PostWithResult_Value_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync(Test.CreateHttpRequest(HttpMethod.Post), Person.GetPerson(), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PostWithResult_No_Body_With_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+        var hr = Test.CreateHttpRequest(HttpMethod.Post);
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync<Person>(hr, (ro, ct) => Task.FromResult(Result.Ok(person))))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertValue(person)
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"abcdefg\"");
+    }
+
+    [Test]
+    public void PostWithResult_No_Body_With_Null_Response()
+    {
+        var person = Person.GetPerson("abcdefg");
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync<Person>(Test.CreateHttpRequest(HttpMethod.Post), (ro, ct) => Result<Person>.Ok(null!).AsTask()))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PostWithResult_Body_With_Response()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Post, "test", Person.GetPerson());
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync<Person, Person2>(hr, (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(Result.Ok(p));
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void PostWithResult_Value_With_Response()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Post);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PostWithResultAsync<Person, Person2>(hr, Person.GetPerson(), (ro, ct) =>
+            {
+                var p = new Person2
+                {
+                    LastName = ro.ValueOrDefault!.LastName + "X",
+                    FirstName = ro.ValueOrDefault.FirstName + "Y",
+                    Age = ro.ValueOrDefault.Age + 10,
+                    ETag = "123456"
+                };
+                return Task.FromResult(Result.Ok(p));
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertCreated()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Put.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Put.cs
new file mode 100644
index 00000000..11beeb63
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.Put.cs
@@ -0,0 +1,123 @@
+using System.Net.Http.Headers;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void Put_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutAsync<Person>(Test.CreateJsonHttpRequest(HttpMethod.Put, "test", Person.GetPerson("xx")), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Put_Value_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutAsync(Test.CreateHttpRequest(HttpMethod.Put), Person.GetPerson("xx"), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Put_Body_With_Response()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Put, "test", Person.GetPerson("xx"));
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutAsync<Person, Person2>(hr, (ro, ct) =>
+            {
+                var p = new Person2();
+                p.LastName = ro.ValueOrDefault!.LastName + "X";
+                p.FirstName = ro.ValueOrDefault.FirstName + "Y";
+                p.Age = ro.ValueOrDefault.Age + 10;
+                p.ETag = "123456";
+                return Task.FromResult(p);
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void Put_Value_With_Response()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Put);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutAsync<Person, Person2>(hr, Person.GetPerson("xx"), (ro, ct) =>
+            {
+                var p = new Person2();
+                p.LastName = ro.ValueOrDefault!.LastName + "X";
+                p.FirstName = ro.ValueOrDefault.FirstName + "Y";
+                p.Age = ro.ValueOrDefault.Age + 10;
+                p.ETag = "123456";
+                return Task.FromResult(p);
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void Put_Body_No_Response_IfMatch()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Put, "test", Person.GetPerson("123456"));
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdefg\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutAsync<Person>(hr, (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                ro.ValueOrDefault.ETag.Should().Be("abcdefg"); // ETag should have been overridden.
+                ro.ETag.Should().Be("abcdefg");
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void Put_Value_No_Response_IfMatch()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Put);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdefg\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutAsync<Person>(hr, Person.GetPerson("123456"), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                ro.ValueOrDefault.ETag.Should().Be("abcdefg"); // ETag should have been overridden.
+                ro.ETag.Should().Be("abcdefg");
+                return Task.CompletedTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PutWithResult.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PutWithResult.cs
new file mode 100644
index 00000000..89001724
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.PutWithResult.cs
@@ -0,0 +1,124 @@
+using CoreEx.Results;
+using System.Net.Http.Headers;
+using System.Net.Mime;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+partial class WebApiTestsBase<TWebApi, TResult>
+{
+    [Test]
+    public void PutWithResult_Body_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutWithResultAsync<Person>(Test.CreateJsonHttpRequest(HttpMethod.Put, "test", Person.GetPerson("xx")), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PutWithResult_Value_No_Response()
+    {
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutWithResultAsync(Test.CreateHttpRequest(HttpMethod.Put), Person.GetPerson("xx"), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PutWithResult_Body_With_Response()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Put, "test", Person.GetPerson("xx"));
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutWithResultAsync<Person, Person2>(hr, (ro, ct) =>
+            {
+                var p = new Person2();
+                p.LastName = ro.ValueOrDefault!.LastName + "X";
+                p.FirstName = ro.ValueOrDefault.FirstName + "Y";
+                p.Age = ro.ValueOrDefault.Age + 10;
+                p.ETag = "123456";
+                return Task.FromResult(Result.Ok(p));
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void PutWithResult_Value_With_Response()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Put);
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutWithResultAsync<Person, Person2>(hr, Person.GetPerson("xx"), (ro, ct) =>
+            {
+                var p = new Person2();
+                p.LastName = ro.ValueOrDefault!.LastName + "X";
+                p.FirstName = ro.ValueOrDefault.FirstName + "Y";
+                p.Age = ro.ValueOrDefault.Age + 10;
+                p.ETag = "123456";
+                return Task.FromResult(Result.Ok(p));
+            }))
+            .ToHttpResponseMessageAssertor(hr)
+            .AssertOK()
+            .AssertJson("""{"firstName":"JohnY","lastName":"DoeX","age":40,"etag":"123456"}""")
+            .AssertContentType(MediaTypeNames.Application.Json)
+            .AssertETagHeader("\"123456\"");
+    }
+
+    [Test]
+    public void PutWithResult_Body_No_Response_IfMatch()
+    {
+        var hr = Test.CreateJsonHttpRequest(HttpMethod.Put, "test", Person.GetPerson("123456"));
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdefg\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutWithResultAsync<Person>(hr, (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                ro.ValueOrDefault.ETag.Should().Be("abcdefg"); // ETag should have been overridden.
+                ro.ETag.Should().Be("abcdefg");
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+
+    [Test]
+    public void PutWithResult_Value_No_Response_IfMatch()
+    {
+        var hr = Test.CreateHttpRequest(HttpMethod.Put);
+        hr.Headers.IfMatch = new EntityTagHeaderValue("\"abcdefg\"", true).ToString();
+
+        Test.Type<TWebApi>()
+            .Run(async w => await w.PutWithResultAsync<Person>(hr, Person.GetPerson("123456"), (ro, ct) =>
+            {
+                ro.ValueOrDefault.Should().NotBeNull();
+                ro.ValueOrDefault.FirstName.Should().Be("John");
+                ro.ValueOrDefault.LastName.Should().Be("Doe");
+                ro.ValueOrDefault.Age.Should().Be(30);
+                ro.ValueOrDefault.ETag.Should().Be("abcdefg"); // ETag should have been overridden.
+                ro.ETag.Should().Be("abcdefg");
+                return Result.SuccessTask;
+            }))
+            .ToHttpResponseMessageAssertor()
+            .AssertNoContent();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.cs
new file mode 100644
index 00000000..2915b0a6
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApiTestsBase.cs
@@ -0,0 +1,19 @@
+using CoreEx.Entities;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[Parallelizable]
+public abstract partial class WebApiTestsBase<TWebApi, TResult> : WithApiTester<Api.Program> where TWebApi : Abstractions.WebApi<TResult>
+{ 
+    public class Person : IETag
+    {
+        public static Person GetPerson(string? etag = null) => new() { FirstName = "John", LastName = "Doe", Age = 30, ETag = etag };
+
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+        public int? Age { get; set; }
+        public string? ETag { get; set; }
+    }
+
+    public class Person2 : Person { }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApi_HttpTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApi_HttpTests.cs
new file mode 100644
index 00000000..c780ae95
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApi_HttpTests.cs
@@ -0,0 +1,6 @@
+using Microsoft.AspNetCore.Http;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class WebApi_HttpTests : WebApiTestsBase<CoreEx.AspNetCore.Http.WebApi, IResult> { }
\ No newline at end of file
diff --git a/tests/CoreEx.AspNetCore.Test.Unit/WebApi_MvcTests.cs b/tests/CoreEx.AspNetCore.Test.Unit/WebApi_MvcTests.cs
new file mode 100644
index 00000000..3fd5a4fa
--- /dev/null
+++ b/tests/CoreEx.AspNetCore.Test.Unit/WebApi_MvcTests.cs
@@ -0,0 +1,6 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace CoreEx.AspNetCore.Test.Unit;
+
+[TestFixture]
+public class WebApi_MvcTests : WebApiTestsBase<CoreEx.AspNetCore.Mvc.WebApi, IActionResult> { }
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj
new file mode 100644
index 00000000..60015e3e
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/CoreEx.Azure.Messaging.ServiceBus.Test.Unit.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.Azure.Messaging.ServiceBus\CoreEx.Azure.Messaging.ServiceBus.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/EntryPoint.cs b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..29ebcb84
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/EntryPoint.cs
@@ -0,0 +1,33 @@
+using CoreEx.Azure.Messaging.ServiceBus.Test.Unit.Subscribers;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace CoreEx.Azure.Messaging.ServiceBus.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder)
+    {
+        // Add CoreEx host settings.
+        builder.AddHostSettings("CoreEx.Azure.Messaging.ServiceBus", "UnitTest", new Uri("urn:unit-test"));
+
+        // Add CoreEx services.
+        builder.Services
+            .AddExecutionContext()
+            .AddEventFormatter()
+            .AddFixedDestinationProvider("unit-test")
+            .AddAzureServiceBusPublisher();
+
+        // Add azure service bus client using aspire.
+        builder.AddAzureServiceBusClient("ServiceBus");
+
+        // Add Receiving and Subscribing services.
+        builder.Services
+            .AddScoped<ProductSubscriber>()
+            .AddSubscribedManager((_, mgr) => mgr.AddSubscriber<ProductSubscriber>())
+            .AzureServiceBusReceiving()
+                .WithReceiver(_ => ServiceBusReceiverOptions.CreateForTopicSubscription("unit-test", "default"))
+                .WithSubscribedSubscriber((_, c) => c.ErrorHandler.Add<InvalidOperationException>(Events.Subscribing.ErrorHandling.Catastrophic))
+                .Build();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusMessageTests.cs b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusMessageTests.cs
new file mode 100644
index 00000000..208bf650
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusMessageTests.cs
@@ -0,0 +1,85 @@
+using Azure.Messaging.ServiceBus;
+using CloudNative.CloudEvents;
+using CoreEx.Entities;
+using CoreEx.Events;
+
+namespace CoreEx.Azure.Messaging.ServiceBus.Test.Unit;
+
+public class ServiceBusMessageTests
+{
+    [Test]
+    public void CloudEventToServiceBusMessage_Structured()
+    {
+        var p = new Product { Id = 1, Sku = "SKU-001" };
+
+        var ed = EventData.CreateEventWith(p, EventAction.Published).WithTitle("unit.test.title").WithSource(new Uri("http://unit.test.source"));
+        var ce = new EventFormatter().ConvertToCloudEvent(ed);
+
+        var sbm = ce.ToServiceBusMessage(ContentMode.Structured);
+        sbm.Should().NotBeNull();
+        sbm.ContentType.Should().Be("application/cloudevents+json; charset=utf-8");
+
+        var sbrm = ConvertToReceivedMessage(sbm);
+        var ce2 = sbrm.ToCloudEvent();  // Inferred
+
+        var jce = ce.EncodeToJsonElement();
+        var jce2 = ce2.EncodeToJsonElement();
+        ObjectComparer.Assert(jce, jce2);
+    }
+
+    [Test]
+    public void CloudEventToServiceBusMessage_Binary()
+    {
+        var p = new Product { Id = 1, Sku = "SKU-001" };
+
+        var ed = EventData.CreateEventWith(p, EventAction.Published).WithTitle("unit.test.title").WithSource(new Uri("http://unit.test.source"));
+        var ce = new EventFormatter().ConvertToCloudEvent(ed);
+
+        var sbm = ce.ToServiceBusMessage(ContentMode.Binary);
+        sbm.Should().NotBeNull();
+
+        var sbrm = ConvertToReceivedMessage(sbm);
+        var ce2 = sbrm.ToCloudEvent();  // Inferred
+
+        var jce = ce.EncodeToJsonElement();
+        var jce2 = ce2.EncodeToJsonElement();
+
+        Console.WriteLine(jce);
+        Console.WriteLine(jce2);
+
+        ObjectComparer.Assert(jce, jce2);
+    }
+
+    public class Product : IIdentifier<int>
+    {
+        public int Id { get; set; }
+        public string? Sku { get; set; }
+    }
+
+    internal static ServiceBusReceivedMessage ConvertToReceivedMessage(ServiceBusMessage m)
+    {
+        // Copy application properties
+        var props = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        foreach (var kvp in m.ApplicationProperties)
+            props[kvp.Key] = kvp.Value;
+
+        return ServiceBusModelFactory.ServiceBusReceivedMessage(
+            body: m.Body,
+            messageId: m.MessageId,
+            partitionKey: m.PartitionKey,
+            sessionId: m.SessionId,
+            replyToSessionId: m.ReplyToSessionId,
+            timeToLive: m.TimeToLive,
+            correlationId: m.CorrelationId,
+            subject: m.Subject,
+            to: m.To,
+            contentType: m.ContentType,
+            replyTo: m.ReplyTo,
+            scheduledEnqueueTime: m.ScheduledEnqueueTime,
+            properties: props,
+            deliveryCount: 1,
+            sequenceNumber: DateTimeOffset.UtcNow.Ticks,
+            enqueuedTime: DateTimeOffset.UtcNow
+        );
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusPublisherTests.cs b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusPublisherTests.cs
new file mode 100644
index 00000000..0c39a8e2
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusPublisherTests.cs
@@ -0,0 +1,60 @@
+using CoreEx.Events.Publishing;
+using Microsoft.Extensions.DependencyInjection;
+using UnitTestEx.Expectations;
+
+namespace CoreEx.Azure.Messaging.ServiceBus.Test.Unit;
+
+public class ServiceBusPublisherTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void PublishAsync_SingleBatchOfOne() => Test.ScopedType<ExecutionContext>(test =>
+    {
+        test.ExpectLogContains("Sending batch of 1 event(s) to destination 'unit-test'.")
+            .ExpectLogContains("SendAsync start. MessageCount = 1 [Azure.Messaging.ServiceBus]")
+            .Run(async ec =>
+            {
+                var sbp = (ServiceBusPublisher)ec.ServiceProvider!.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+
+                sbp.Add(Events.EventData.CreateEvent("Entity", "Action").WithPartitionKey());
+
+                sbp.SessionIdStrategy = ServiceBusSessionStrategy.None;
+                await sbp.PublishAsync();
+            }).AssertSuccess();
+    });
+
+    [Test]
+    public void PublishAsync_MultiBatch() => Test.ScopedType<ExecutionContext>(test =>
+    {
+        test.ExpectLogContains("Sending batch of 2 event(s) to destination 'unit-test'.")
+            .ExpectLogContains("Sending batch of 1 event(s) to destination 'unit-test-2'.")
+            .ExpectLogContains("SendAsync start. MessageCount = 2 [Azure.Messaging.ServiceBus]")
+            .ExpectLogContains("SendAsync start. MessageCount = 1 [Azure.Messaging.ServiceBus]")
+            .Run(async ec =>
+            {
+                var sbp = (ServiceBusPublisher)ec.ServiceProvider!.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+
+                sbp.Add(Events.EventData.CreateEvent("Entity", "Action1").WithPartitionKey());
+                sbp.Add(Events.EventData.CreateEvent("Entity", "Action2").WithPartitionKey());
+                sbp.Add("unit-test-2", Events.EventData.CreateEvent("Entity", "Action3").WithPartitionKey());
+
+                sbp.SessionIdStrategy = ServiceBusSessionStrategy.None;
+                await sbp.PublishAsync();
+            }).AssertSuccess();
+    });
+
+    [Test]
+    public void PublishAsync_Single_UseSessions() => Test.ScopedType<ExecutionContext>(test =>
+    {
+        test.ExpectLogContains("Sending batch of 1 event(s) to destination 'unit-test'.")
+            .ExpectLogContains("SendAsync start. MessageCount = 1 [Azure.Messaging.ServiceBus]")
+            .Run(async ec =>
+            {
+                var sbp = (ServiceBusPublisher)ec.ServiceProvider!.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+
+                sbp.Add(Events.EventData.CreateEvent("Entity", "Action").WithKey("123"));
+
+                sbp.SessionIdStrategy = ServiceBusSessionStrategy.UsePartitionKeyAsIs;
+                await sbp.PublishAsync();
+            }).AssertSuccess();
+    });
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusReceiverTests.cs b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusReceiverTests.cs
new file mode 100644
index 00000000..c21f89ee
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusReceiverTests.cs
@@ -0,0 +1,260 @@
+using Azure.Messaging.ServiceBus;
+using CoreEx.Events;
+using CoreEx.Events.Publishing;
+using CoreEx.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using UnitTestEx.Expectations;
+
+namespace CoreEx.Azure.Messaging.ServiceBus.Test.Unit;
+
+public class ServiceBusReceiverTests : WithGenericTester<EntryPoint>
+{
+    [SetUp]
+    public Task SetUpAsync() => ReceiveAllMessages();
+
+    private async Task ReceiveAllMessages()
+    {
+        var c = Test.Services.GetRequiredService<ServiceBusClient>();
+        await using var receiver = c.CreateReceiver("unit-test", "default");
+
+        for (var i = 0; i < 2; i++)
+        {
+            while (true)
+            {
+                var messages = await receiver.ReceiveMessagesAsync(maxMessages: 50, maxWaitTime: TimeSpan.FromMilliseconds(5));
+                if (messages.Count == 0)
+                    break;
+
+                foreach (var m in messages)
+                    await receiver.CompleteMessageAsync(m);
+            }
+
+            await Task.Delay(100); // Allow some time for the service bus to reflect the completed messages before trying to receive again.
+        }
+    }
+
+    [Test]
+    public void Receiver_Cycle_States() => Test.ScopedType<ExecutionContext>(async test =>
+    {
+        // Create using the root services (not scoped).
+        var sbr = Test.Services.GetRequiredService<ServiceBusReceiver<ServiceBusSubscribedSubscriber>>();
+
+        Test.Run(async () =>
+        {
+            sbr.Status.Should().Be(ServiceStatus.Initializing);
+            sbr.StatusReason.Should().BeNull();
+
+            await sbr.StartAsync().ConfigureAwait(false);
+            sbr.Status.Should().Be(ServiceStatus.Running);
+            sbr.StatusReason.Should().BeNull();
+
+            await sbr.PauseAsync("Reason").ConfigureAwait(false);
+            sbr.Status.Should().Be(ServiceStatus.Paused);
+            sbr.StatusReason.Should().Be("Reason");
+
+            await sbr.ResumeAsync().ConfigureAwait(false);
+            sbr.Status.Should().Be(ServiceStatus.Running);
+            sbr.StatusReason.Should().BeNull();
+
+            await sbr.StopAsync().ConfigureAwait(false);
+            sbr.Status.Should().Be(ServiceStatus.Stopped);
+            sbr.StatusReason.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void ReceiveAsync_Success() => Test.ScopedType<ExecutionContext>(async test =>
+    {
+        // Publish a message.
+        var sp = (ServiceBusPublisher)test.Services.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+        sp.Add(EventData.CreateEventWith(new Subscribers.Product { Id = 1, Sku = "SKU-001" }, "Created"));
+        await sp.PublishAsync();
+
+        // Create using the root services (not scoped).
+        var o = ServiceBusReceiverOptions.CreateForTopicSubscription("unit-test", "default");
+        var sbr = ActivatorUtilities.CreateInstance<ServiceBusReceiver<ServiceBusSubscribedSubscriber>>(Test.Services, o);
+
+        var cts = new CancellationTokenSource();
+        cts.CancelAfter(10000); // Ensure test doesn't run indefinitely.
+        sbr.MessageProcessed += (sender, e) => cts.CancelAfter(5); // Cancel shortly after processing to allow for graceful completion.
+
+        // Act and assert.
+        Test.ExpectLogContains("Received product with Id: 1 and Sku: SKU-001.")
+            .Run(async () =>
+            {
+                try
+                {
+                    await sbr.StartAsync(cts.Token).ConfigureAwait(false);
+                    await Task.Delay(Timeout.Infinite, cts.Token); // Wait for the message to be processed or timeout; then stop and dispose.
+                }
+                finally
+                {
+                    await sbr.StopAsync().ConfigureAwait(false);
+                    await sbr.DisposeAsync().ConfigureAwait(false);
+                }
+            }).AssertException<TaskCanceledException>();
+    });
+
+    [Test]
+    public void ReceiveAsync_Retry_Then_DeadLetter() => Test.ScopedType<ExecutionContext>(async test =>
+    {
+        // Publish a message.
+        var sp = (ServiceBusPublisher)test.Services.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+        sp.Add(EventData.CreateEventWith(new Subscribers.Product { Id = 88, Sku = "SKU-088" }, "Created"));
+        await sp.PublishAsync();
+
+        // Create using the root services (not scoped).
+        var o = ServiceBusReceiverOptions.CreateForTopicSubscription("unit-test", "default");
+        o.RetryErrorHandling = Events.Subscribing.ErrorHandling.DeadLetter;
+        o.MessageResiliency = ServiceBusReceiverResiliency.CreateMessageRetryResiliency(TimeSpan.FromMilliseconds(333), 3, Polly.DelayBackoffType.Exponential);
+        o.PerUnhandledErrorDelayDuration = TimeSpan.FromMilliseconds(100);
+
+        var sbr = ActivatorUtilities.CreateInstance<ServiceBusReceiver<ServiceBusSubscribedSubscriber>>(Test.Services, o);
+
+        var cts = new CancellationTokenSource();
+        cts.CancelAfter(10000); // Ensure test doesn't run indefinitely.
+        sbr.MessageProcessed += (sender, e) => cts.CancelAfter(10); // Cancel shortly after processing to allow for graceful completion.
+
+        // Act and assert.
+        Test.ExpectLogContains("Received product with Id: 88 and Sku: SKU-088.")
+            .ExpectLogContains("A transient error has occurred; please try again. [Source: ServiceBusSubscribedSubscriber, Handling: Retry]")
+            .ExpectLogContains("Service bus message retry attempt 1 in 333ms.")
+            .ExpectLogContains("Service bus message retry attempt 2 in 666ms.")
+            .ExpectLogContains("Service bus message retry attempt 3 in 1332ms.")
+            .ExpectLogContains("DeadLetterAsync")
+            .Run(async () =>
+            {
+                try
+                {
+                    await sbr.StartAsync(cts.Token).ConfigureAwait(false);
+                    await Task.Delay(Timeout.Infinite, cts.Token); // Wait for the message to be processed or timeout; then stop and dispose.
+                }
+                finally
+                {
+                    await sbr.StopAsync().ConfigureAwait(false);
+                    await sbr.DisposeAsync().ConfigureAwait(false);
+                }
+            }).AssertException<TaskCanceledException>();
+    });
+
+    [Test]
+    public void ReceiveAsync_Catastrophic_Then_Pause() => Test.ScopedType<ExecutionContext>(async test =>
+    {
+        // Publish a message.
+        var sp = (ServiceBusPublisher)test.Services.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+        sp.Add(EventData.CreateEventWith(new Subscribers.Product { Id = 99, Sku = "SKU-099" }, "Created"));
+        await sp.PublishAsync();
+
+        // Create using the root services (not scoped).
+        var o = ServiceBusReceiverOptions.CreateForTopicSubscription("unit-test", "default");
+        o.ReceiverResiliency = ServiceBusReceiverResiliency.CreateReceiverCircuitBreakerResiliency(5, TimeSpan.FromSeconds(1), TimeSpan.FromMilliseconds(333));
+        o.PerUnhandledErrorDelayDuration = TimeSpan.FromMilliseconds(100);
+
+        var sbr = ActivatorUtilities.CreateInstance<ServiceBusReceiver<ServiceBusSubscribedSubscriber>>(Test.Services, o);
+
+        var cts = new CancellationTokenSource();
+        cts.CancelAfter(5000); // Ensure test doesn't run indefinitely.
+
+        int messagesProcessed = 0;
+
+        sbr.MessageProcessed += (sender, e) =>
+        {
+            messagesProcessed++;
+            System.Threading.Thread.Sleep(10); // Allow some time to catch up.
+            sbr.Status.Should().BeOneOf(ServiceStatus.Pausing, ServiceStatus.Paused);
+            sbr.StatusReason.Should().Be("A Catastrophic error occurred within the service bus receiver.");
+            cts.Cancel();
+        };
+
+        // Act and assert.
+        var assertor = Test.ExpectLogContains("Received product with Id: 99 and Sku: SKU-099.")
+            .ExpectLogContains("A Catastrophic error has occurred within the service bus receiver for subscriber 'ServiceBusSubscribedSubscriber'. Abandoning the message and pausing the receiver.")
+            .ExpectLogContains("AbandonAsync done.")
+            .ExpectLogContains("Azure Service Bus receiver: Pausing.")
+            .ExpectLogContains("Azure Service Bus receiver: Paused.")
+            .Run(async () =>
+            {
+                try
+                {
+                    await sbr.StartAsync(cts.Token).ConfigureAwait(false);
+                    await Task.Delay(Timeout.Infinite, cts.Token); // Wait for the message to be processed or timeout; then stop and dispose.
+                }
+                finally
+                {
+                    await sbr.StopAsync().ConfigureAwait(false);
+                    await sbr.DisposeAsync().ConfigureAwait(false);
+                }
+            }).AssertException<TaskCanceledException>();
+
+        messagesProcessed.Should().BeGreaterThanOrEqualTo(1);
+    });
+
+    [Test]
+    public void ReceiveAsync_CircuitBreaker()
+    {
+        for (int i = 0; i < 2; i++)
+        {
+            // If successful, break out of the loop; otherwise, retry once.
+            if (ReceiveAsync_CircuitBreaker_Internal())
+                break; 
+
+            if (i > 0)
+               Assert.Fail("The circuit breaker did not trip as expected. This has been attempted twice.");
+        }
+    }
+
+    private bool ReceiveAsync_CircuitBreaker_Internal()
+    {
+        bool circuitBreakerTripped = false;
+
+        Test.ScopedType<ExecutionContext>(async test =>
+        {
+            await ReceiveAllMessages();
+
+            // Publish a message.
+            var sp = (ServiceBusPublisher)test.Services.GetRequiredKeyedService<IEventPublisher>(ServiceBusPublisher.DefaultServiceKey);
+            sp.Add(EventData.CreateEventWith(new Subscribers.Product { Id = 109, Sku = "SKU-109" }, "Created"));
+            sp.Add(EventData.CreateEventWith(new Subscribers.Product { Id = 109, Sku = "SKU-109.1" }, "Created"));
+            sp.Add(EventData.CreateEventWith(new Subscribers.Product { Id = 109, Sku = "SKU-109.2" }, "Created"));
+            await sp.PublishAsync();
+
+            // Create using the root services (not scoped).
+            var o = ServiceBusReceiverOptions.CreateForTopicSubscription("unit-test", "default");
+            o.ReceiverResiliency = ServiceBusReceiverResiliency.CreateReceiverCircuitBreakerResiliency(5, TimeSpan.FromSeconds(1), TimeSpan.FromMilliseconds(333));
+            o.PerUnhandledErrorDelayDuration = TimeSpan.FromMilliseconds(100);
+
+            var sbr = ActivatorUtilities.CreateInstance<ServiceBusReceiver<ServiceBusSubscribedSubscriber>>(Test.Services, o);
+
+            var count = 0;
+            sbr.MessageProcessed += (sender, e) => count++;
+
+            var cts = new CancellationTokenSource();
+            cts.CancelAfter(30000); // Ensure test doesn't run indefinitely.
+
+            var assertor = Test.Run(async () =>
+            {
+                try
+                {
+                    await sbr.StartAsync(cts.Token).ConfigureAwait(false);
+                    await Task.Delay(Timeout.Infinite, cts.Token); // Wait for the message to be processed or timeout; then stop and dispose.
+                }
+                finally
+                {
+                    await sbr.StopAsync().ConfigureAwait(false);
+                    await sbr.DisposeAsync().ConfigureAwait(false);
+
+                    if (Test.Logger.IsEnabled(LogLevel.Information))
+                        Test.Logger.LogInformation("MESSAGE PROCESSED COUNT: {Count}.", count);
+                }
+            }).AssertException<TaskCanceledException>();
+
+            circuitBreakerTripped = assertor.LogMessages.Any(x => x?.Contains("Service bus receiver circuit breaker has been tripped for 333ms due to unhandled errors; receiver will be paused.") == true)
+                && assertor.LogMessages.Any(x => x?.Contains("Service bus receiver circuit breaker has been tripped for 666ms due to unhandled errors; receiver will be paused.") == true)
+                && assertor.LogMessages.Any(x => x?.Contains("Service bus receiver circuit breaker has been tripped for 1332ms due to unhandled errors; receiver will be paused.") == true)
+                && assertor.LogMessages.Any(x => x?.Contains("Service bus receiver circuit breaker is attempting to recover in a limited state; receiver has been resumed.") == true);
+        });
+
+        return circuitBreakerTripped;
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusSubscriberTests.cs b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusSubscriberTests.cs
new file mode 100644
index 00000000..48d4887b
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/ServiceBusSubscriberTests.cs
@@ -0,0 +1,28 @@
+using CoreEx.Events;
+using Microsoft.Extensions.DependencyInjection;
+using UnitTestEx.Expectations;
+
+namespace CoreEx.Azure.Messaging.ServiceBus.Test.Unit;
+
+public class ServiceBusSubscriberTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void ReceiveAsync_SingleMessage() => Test.ScopedType<ExecutionContext>(test =>
+    {
+        // Arrange the message.
+        var ed = EventData.CreateEventWith(new Subscribers.Product { Id = 1, Sku = "SKU-001" }, "Created");
+        var ef = test.Services.GetRequiredService<IEventFormatter>();
+        var ce = ef.ConvertToCloudEvent(ef.Format(ed));
+        var sm = ce.ToServiceBusMessage();
+        var msg = ServiceBusMessageTests.ConvertToReceivedMessage(sm);
+
+        // Act & Assert.
+        test.ExpectLogContains("Received product with Id: 1 and Sku: SKU-001.")
+            .Run(async _ =>
+            {
+                var sbss = Test.Services.GetRequiredService<ServiceBusSubscribedSubscriber>();
+                var result = await sbss.ReceiveAsync(msg!).ConfigureAwait(false);
+                result.IsSuccess.Should().BeTrue();
+            }).AssertSuccess();
+    });
+}
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/Subscribers/ProductSubscriber.cs b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/Subscribers/ProductSubscriber.cs
new file mode 100644
index 00000000..3408efe2
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/Subscribers/ProductSubscriber.cs
@@ -0,0 +1,32 @@
+using CoreEx.Entities;
+using CoreEx.Events;
+using CoreEx.Events.Subscribing;
+using CoreEx.Results;
+using Microsoft.Extensions.Logging;
+
+namespace CoreEx.Azure.Messaging.ServiceBus.Test.Unit.Subscribers;
+
+[Subscribe("**.product.**")]
+public class ProductSubscriber(ILogger<ProductSubscriber> logger) : SubscribedBase<Product>
+{
+    protected override Task<Result> OnReceiveAsync(Product value, EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken = default)
+    {
+        logger.LogInformation("Received product with Id: {Id} and Sku: {Sku}.", value.Id, value.Sku);
+
+        if (value.Id == 88)
+            return Result.TransientError().AsTask();
+        else if (value.Id == 99)
+            return Result.Fail(new InvalidOperationException("Oh no!")).AsTask();
+        else if (value.Id == 109)
+            return Result.Fail(new DivideByZeroException("Might be poison?!")).AsTask();
+
+        return Result.SuccessTask;
+    }
+}
+
+public record class Product : IReadOnlyIdentifier<int>
+{
+    public int Id { get; init; }
+
+    public required string Sku { get; init; }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/appsettings.unittest.json b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/appsettings.unittest.json
new file mode 100644
index 00000000..692a96c0
--- /dev/null
+++ b/tests/CoreEx.Azure.Messaging.ServiceBus.Test.Unit/appsettings.unittest.json
@@ -0,0 +1,11 @@
+{
+  "Aspire": {
+    "Azure": {
+      "Messaging": {
+        "ServiceBus": {
+          "ConnectionString": "Endpoint=sb://localhost;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=SAS_KEY_VALUE;UseDevelopmentEmulator=true;"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Caching.Redis.Test.Unit/CoreEx.Caching.Redis.Test.Unit.csproj b/tests/CoreEx.Caching.Redis.Test.Unit/CoreEx.Caching.Redis.Test.Unit.csproj
new file mode 100644
index 00000000..f89e40f8
--- /dev/null
+++ b/tests/CoreEx.Caching.Redis.Test.Unit/CoreEx.Caching.Redis.Test.Unit.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.StackExchange.Redis.DistributedCaching" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Caching.FusionCache\CoreEx.Caching.FusionCache.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+    <Using Include="Moq" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/tests/CoreEx.Caching.Redis.Test.Unit/EntryPoint.cs b/tests/CoreEx.Caching.Redis.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..ddf1e07f
--- /dev/null
+++ b/tests/CoreEx.Caching.Redis.Test.Unit/EntryPoint.cs
@@ -0,0 +1,40 @@
+using CoreEx.Json;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+using StackExchange.Redis;
+using ZiggyCreatures.Caching.Fusion;
+using ZiggyCreatures.Caching.Fusion.Backplane.StackExchangeRedis;
+
+namespace CoreEx.Caching.Redis.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder)
+    {
+        // Add CoreEx host settings.
+        builder.AddHostSettings("CoreEx.Caching", "UnitTest");
+
+        // Add CoreEx services.
+        builder.Services
+            .AddExecutionContext();
+
+        // Add core caching services.
+        builder.Services.AddMemoryCache();              // Add in-memory cache - L1.
+        builder.AddRedisDistributedCache("redis");      // Add Redis as the distributed cache (using Aspire library) - L2.
+
+        builder.Services.AddFusionCache()               // Add and wire-up FusionCache including backplane.
+            .WithRegisteredMemoryCache()
+            .WithRegisteredDistributedCache()
+            .WithBackplane(sp => new RedisBackplane(new RedisBackplaneOptions { Configuration = sp.GetRequiredService<IOptions<ConfigurationOptions>>().Value.ToString() }))
+            .WithSystemTextJsonSerializer(JsonDefaults.SerializerOptions)
+            .WithOptions(new FusionCacheOptions { EnableSyncEventHandlersExecution = true });    // ** NOTE: Do NOT use; this is to enable backplane unit tests only! **
+
+        // Add CoreEx caching services.
+        builder.Services.AddFusionHybridCache();        // Adds the scoped CoreEx.Caching.IHybridCache for FusionCache.
+        builder.Services.AddDefaultCacheKeyProvider();  // Adds the default CoreEx.Caching.ICacheKeyProvider.
+
+        // Add the HybridCacheSynchronizer to test also.
+        builder.Services.AddHybridCacheSynchronizer();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Caching.Redis.Test.Unit/HybridCacheSynchronizerTests.cs b/tests/CoreEx.Caching.Redis.Test.Unit/HybridCacheSynchronizerTests.cs
new file mode 100644
index 00000000..e6dd5fb1
--- /dev/null
+++ b/tests/CoreEx.Caching.Redis.Test.Unit/HybridCacheSynchronizerTests.cs
@@ -0,0 +1,37 @@
+using CoreEx.Hosting.Synchronization;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CoreEx.Caching.Redis.Test.Unit;
+
+public class HybridCacheSynchronizerTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public async Task Synchronize_Two_Processes()
+    {
+        // Arrange.
+        var root = Test.Services.GetRequiredService<IServiceProvider>();
+
+        await using var ss1 = root.CreateAsyncScope();
+        var sp1 = ss1.ServiceProvider;
+        await using var hs1 = sp1.GetRequiredService<HybridCacheSynchronizer>();
+
+        await using var ss2 = root.CreateAsyncScope();
+        var sp2 = ss2.ServiceProvider;
+        await using var hs2 = sp2.GetRequiredService<HybridCacheSynchronizer>();
+
+        // Act/Assert - First should enter, second should not.
+        var r1 = await hs1.EnterAsync<HybridCacheSynchronizerTests>();
+        r1.Should().BeTrue();
+
+        var r2 = await hs2.EnterAsync<HybridCacheSynchronizerTests>();
+        r2.Should().BeFalse();
+
+        // Assert - After first exits, second can enter.
+        await hs1.ExitAsync<HybridCacheSynchronizerTests>();
+
+        r2 = await hs2.EnterAsync<HybridCacheSynchronizerTests>();
+        r2.Should().BeTrue();
+
+        await hs2.ExitAsync<HybridCacheSynchronizerTests>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Caching.Redis.Test.Unit/HybridCacheTests.cs b/tests/CoreEx.Caching.Redis.Test.Unit/HybridCacheTests.cs
new file mode 100644
index 00000000..03c4b134
--- /dev/null
+++ b/tests/CoreEx.Caching.Redis.Test.Unit/HybridCacheTests.cs
@@ -0,0 +1,257 @@
+using CoreEx.Entities;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using ZiggyCreatures.Caching.Fusion;
+
+namespace CoreEx.Caching.Redis.Test.Unit;
+
+public class HybridCacheTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void CacheStrategy_Hybrid()
+    {
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            var key = "hybrid-key";
+            var val = "hybrid-value";
+
+            // Remove before we start.
+            await ClearKeyAsync(test.Services, key);
+
+            // Prepare usage.
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+            var options = new HybridCacheEntryOptions { Strategy = CacheStrategy.Hybrid };
+
+            // Create on first access.
+            var value = await cache.GetOrCreateByKeyAsync(key, async ct =>
+            {
+                await Task.Delay(1, ct).ConfigureAwait(false);
+                return val;
+            }, options);
+
+            value.Should().NotBeNull().And.Be(val);
+
+            // Should be created already.
+            value = await cache.GetOrCreateByKeyAsync<string>(key, _ => throw new InvalidOperationException("Should be cached?!"), options);
+            value.Should().NotBeNull().And.Be(val);
+
+            // Check strategy adhered to.
+            IsInDistributedCache(test.Services, key).Should().BeTrue();
+            IsInMemoryCache(test.Services, key).Should().BeTrue();
+        });
+    }
+
+    [Test]
+    public void CacheStrategy_Local()
+    {
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            var key = "local-key";
+            var val = "local-value";
+
+            // Remove before we start.
+            await ClearKeyAsync(test.Services, key);
+
+            // Prepare usage.
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+            var options = new HybridCacheEntryOptions { Strategy = CacheStrategy.Local };
+
+            // Create on first access.
+            var value = await cache.GetOrCreateByKeyAsync(key, async ct =>
+            {
+                await Task.Delay(1, ct).ConfigureAwait(false);
+                return val;
+            }, options);
+
+            value.Should().NotBeNull().And.Be(val);
+
+            // Should be created already.
+            value = await cache.GetOrCreateByKeyAsync<string>(key, _ => throw new InvalidOperationException("Should be cached?!"), options);
+            value.Should().NotBeNull().And.Be(val);
+
+            // Check strategy adhered to.
+            IsInDistributedCache(test.Services, key).Should().BeFalse();
+            IsInMemoryCache(test.Services, key).Should().BeTrue();
+        });
+    }
+
+    [Test]
+    public void CacheStrategy_Distributed()
+    {
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            var key = "distributed-key";
+            var val = "distributed-value";
+
+            // Remove before we start.
+            await ClearKeyAsync(test.Services, key);
+
+            // Prepare usage.
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+            var options = new HybridCacheEntryOptions { Strategy = CacheStrategy.Distributed };
+
+            // Create on first access.
+            var value = await cache.GetOrCreateByKeyAsync(key, async ct =>
+            {
+                await Task.Delay(1, ct).ConfigureAwait(false);
+                return val;
+            }, options);
+
+            value.Should().NotBeNull().And.Be(val);
+
+            // Should be created already.
+            value = await cache.GetOrCreateByKeyAsync<string>(key, _ => throw new InvalidOperationException("Should be cached?!"), options);
+            value.Should().NotBeNull().And.Be(val);
+
+            // Check strategy adhered to.
+            IsInDistributedCache(test.Services, key).Should().BeTrue();
+            IsInMemoryCache(test.Services, key).Should().BeFalse();
+        });
+    }
+
+    [Test]
+    public async Task Backplane_Synchronization()
+    {
+        var secondary = UnitTestEx.GenericTester.Create<EntryPoint>();
+        var key = "backplane-key";
+        var val = "backplane-value";
+        var val2 = "backplane-value2";
+
+        // Remove before we start.
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            await ClearKeyAsync(test.Services, key);
+        });
+
+        // Create on secondary first.
+        secondary.ScopedType<IServiceProvider>(async test =>
+        {
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+            var value = await cache.GetOrCreateByKeyAsync(key, _ => Task.FromResult(val));
+            value.Should().NotBeNull().And.Be(val);
+
+            IsInDistributedCache(test.Services, key).Should().BeTrue();
+            IsInMemoryCache(test.Services, key).Should().BeTrue();
+        });
+
+        // Now check on primary.
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            IsInMemoryCache(test.Services, key).Should().BeFalse();
+
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+            var value = await cache.GetOrCreateByKeyAsync<string>(key, _ => throw new InvalidOperationException("Should be cached?!"));
+            value.Should().NotBeNull().And.Be(val);
+
+            IsInDistributedCache(test.Services, key).Should().BeTrue();
+            IsInMemoryCache(test.Services, key).Should().BeTrue();
+
+            // Change the value and confirm.
+            await cache.SetByKeyAsync(key, val2);
+            value = await cache.GetOrCreateByKeyAsync<string>(key, _ => throw new InvalidOperationException("Should be cached?!"));
+            value.Should().NotBeNull().And.Be(val2);
+        });
+
+        // Allow backplane to do its thing!
+        await Task.Delay(1000);
+
+        // Back to secondary to check on change.
+        secondary.ScopedType<IServiceProvider>(async test =>
+        {
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+            var value = await cache.GetOrCreateByKeyAsync<string>(key, _ => throw new InvalidOperationException("Should be cached?!"));
+            value.Should().NotBeNull().And.Be(val2);
+
+            IsInDistributedCache(test.Services, key).Should().BeTrue();
+            IsInMemoryCache(test.Services, key).Should().BeTrue();
+        });
+
+        // Verifying separate instances!
+        var pfc = Test.Services.GetRequiredService<IFusionCache>();
+        var sfc = secondary.Services.GetRequiredService<IFusionCache>();
+        pfc.Should().NotBeSameAs(sfc);
+    }
+
+    [Test]
+    public async Task Cache_ByKey()
+    {
+        var key = "bykey-key";
+
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+
+            await cache.RemoveByKeyAsync(key);  // Removes key:any.
+
+            var p = await cache.GetOrDefaultByKeyAsync<Person>(key);
+            p.Should().BeNull();
+
+            await cache.RemoveByKeyAsync(key);  // Removes key:null.
+
+            p = await cache.GetOrCreateByKeyAsync(key, _ => Task.FromResult(new Person { Id = "123", Name = "Bob", Age = 33 }));
+            p.Should().NotBeNull();
+            p.Name.Should().Be("Bob");
+
+            var p2 = await cache.GetOrDefaultByKeyAsync<Person>(key);
+            p2.Should().NotBeNull().And.BeEquivalentTo(p);
+        });
+    }
+
+    [Test]
+    public async Task Cache_ByCompositeKey()
+    {
+        var key = "composite-key";
+        CompositeKey ckey = key;
+
+        Test.ScopedType<IServiceProvider>(async test =>
+        {
+            var cache = test.Services.GetRequiredService<IHybridCache>();
+
+            await cache.RemoveAsync<Person>(ckey);  // Removes key:any.
+
+            var p = await cache.GetOrDefaultAsync<Person>(ckey);
+            p.Should().BeNull();
+
+            await cache.RemoveAsync<Person>(ckey);  // Removes key:null.
+
+            p = await cache.GetOrCreateAsync(ckey, _ => Task.FromResult(new Person { Id = key, Name = "Bob", Age = 33 }));
+            p.Should().NotBeNull();
+            p.Name.Should().Be("Bob");
+
+            var p2 = await cache.GetOrDefaultAsync<Person>(ckey);
+            p2.Should().NotBeNull().And.BeEquivalentTo(p);
+        });
+    }
+
+    internal static async Task ClearKeyAsync(IServiceProvider sp, string key)
+    {
+        var cache = sp.GetRequiredService<IHybridCache>();
+        await cache.RemoveByKeyAsync(key);
+
+        IsInDistributedCache(sp, key).Should().BeFalse();
+        IsInMemoryCache(sp, key).Should().BeFalse();
+    }
+
+    private static bool IsInDistributedCache(IServiceProvider sp, string key)
+    {
+        var dc = sp.GetRequiredService<IDistributedCache>();
+        var ckp = sp.GetRequiredService<ICacheKeyProvider>();
+
+        return dc.Get("v2:" + ckp.GetFullyQualifiedCacheKey(key)) is not null; // FusionCache prefixes by major version.
+    }
+
+    private static bool IsInMemoryCache(IServiceProvider sp, string key)
+    {
+        var mc = sp.GetRequiredService<IMemoryCache>();
+        var ckp = sp.GetRequiredService<ICacheKeyProvider>();
+        return mc.TryGetValue(ckp.GetFullyQualifiedCacheKey(key), out var _);
+    }
+
+    public record Person : IIdentifier<string?>
+    {
+        public string? Id { get; set; }
+        public string? Name { get; set; }
+        public int Age { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Caching.Redis.Test.Unit/ReferenceDataCacheTests.cs b/tests/CoreEx.Caching.Redis.Test.Unit/ReferenceDataCacheTests.cs
new file mode 100644
index 00000000..0b56b5e9
--- /dev/null
+++ b/tests/CoreEx.Caching.Redis.Test.Unit/ReferenceDataCacheTests.cs
@@ -0,0 +1,138 @@
+using CoreEx.RefData;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using UnitTestEx.Expectations;
+
+namespace CoreEx.Caching.Redis.Test.Unit;
+
+public class ReferenceDataCacheTests : WithGenericTester<EntryPoint>
+{
+    [Test]
+    public void NoInMemory_GoTo_Distributed()
+    {
+        Test.ReplaceScoped<ReferenceDataProvider>();
+        Test.ReplaceScoped<IReferenceDataCache, ReferenceDataHybridCache>();
+        Test.ReplaceScoped(sp =>
+        {
+            var rdo = ActivatorUtilities.CreateInstance<ReferenceDataOrchestrator>(sp);
+            rdo.Register<ReferenceDataProvider>();
+            return rdo;
+        });
+
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.ExpectLogContains("calling the factory")
+                .Run(async _ =>
+                {
+                    // Clear any existing.
+                    await HybridCacheTests.ClearKeyAsync(test.Service.ServiceProvider!, "UnitTest:RefData:CoreEx.Caching.Redis.Test.Unit.ColorCollection");
+
+                    // Should cache for the first time (both in-memory and distributed).
+                    var rdo = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
+                    var colors = await rdo.GetByTypeAsync<Color>();
+                    colors.Should().NotBeNull().And.BeOfType<ColorCollection>().Which.Should().HaveCount(3);
+                }).AssertSuccess();
+        });
+
+        // Second time should be from cache, so log should indicate that.
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.ExpectLogContains("[MC] memory entry found")
+                .Run(async _ =>
+                {
+                    var rdo = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
+                    var colors = await rdo.GetByTypeAsync<Color>();
+                    colors.Should().NotBeNull().And.BeOfType<ColorCollection>().Which.Should().HaveCount(3);
+                }).AssertSuccess();
+        });
+
+        // Clear the in-memory cache and try again, should be from the distributed cache.
+        var mc = Test.Services.GetRequiredService<IMemoryCache>();
+        ((MemoryCache)mc).Clear();
+
+        // Third time should be from distributed cache, so log should indicate that.
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.ExpectLogContains("[MC] memory entry not found")
+                .ExpectLogContains("[DC] distributed entry found")
+                .Run(async _ =>
+                {
+                    var rdo = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
+                    var colors = await rdo.GetByTypeAsync<Color>();
+                    colors.Should().NotBeNull().And.BeOfType<ColorCollection>().Which.Should().HaveCount(3);
+                }).AssertSuccess();
+        });
+    }
+
+    [Test]
+    public void InMemory_Expired_GetFromDistributed()
+    {
+        Test.ReplaceScoped<ReferenceDataProvider>();
+        Test.ReplaceScoped<IReferenceDataCache>(sp =>
+        {
+            var rdc = ActivatorUtilities.CreateInstance<ReferenceDataHybridCache>(sp);
+            rdc.RegisterCacheEntryOptions<ColorCollection>(new HybridCacheEntryOptions { LocalExpiration = TimeSpan.FromSeconds(1), DistributedExpiration = TimeSpan.FromSeconds(1) });
+            return rdc;
+        });
+        Test.ReplaceScoped(sp =>
+        {
+            var rdo = ActivatorUtilities.CreateInstance<ReferenceDataOrchestrator>(sp);
+            rdo.Register<ReferenceDataProvider>();
+            return rdo;
+        });
+
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.ExpectLogContains("calling the factory")
+                .Run(async _ =>
+                {
+                    // Clear any existing.
+                    await HybridCacheTests.ClearKeyAsync(test.Service.ServiceProvider!, "UnitTest:RefData:CoreEx.Caching.Redis.Test.Unit.ColorCollection");
+
+                    // Should cache for the first time (both in-memory and distributed).
+                    var rdo = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
+                    var colors = await rdo.GetByTypeAsync<Color>();
+                    colors.Should().NotBeNull().And.BeOfType<ColorCollection>().Which.Should().HaveCount(3);
+                }).AssertSuccess();
+        });
+
+        // Second time should be from cache, so log should indicate that.
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.ExpectLogContains("[MC] memory entry found")
+                .Run(async _ =>
+                {
+                    var rdo = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
+                    var colors = await rdo.GetByTypeAsync<Color>();
+                    colors.Should().NotBeNull().And.BeOfType<ColorCollection>().Which.Should().HaveCount(3);
+                }).AssertSuccess();
+        });
+
+        // Wait for the in-memory cache to expire.
+        Thread.Sleep(1500);
+
+        // Should be from the distributed cache, so log should indicate that.
+        Test.ScopedType<ExecutionContext>(test =>
+        {
+            test.ExpectLogContains("[MC] memory entry not found")
+                .Run(async _ =>
+                {
+                    var rdo = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
+                    var colors = await rdo.GetByTypeAsync<Color>();
+                    colors.Should().NotBeNull().And.BeOfType<ColorCollection>().Which.Should().HaveCount(3);
+                }).AssertSuccess();
+        });
+    }
+
+    public class Color : ReferenceData<int, Color> { }
+
+    public class ColorCollection :ReferenceDataCollection<int, Color> { }
+
+    public class ReferenceDataProvider : IReferenceDataProvider
+    {
+        public IEnumerable<(Type, Type)> Types => [(typeof(Color), typeof(ColorCollection))];
+
+        public Task<RefData.Abstractions.IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default)
+            => Task.FromResult<RefData.Abstractions.IReferenceDataCollection>(new ColorCollection { new Color { Id = 1, Code = "R", Text = "Red" }, new Color { Id = 2, Code = "G", Text = "Green" }, new Color { Id = 3, Code = "B", Text = "Blue" } });
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Caching.Redis.Test.Unit/appsettings.unittest.json b/tests/CoreEx.Caching.Redis.Test.Unit/appsettings.unittest.json
new file mode 100644
index 00000000..a8169105
--- /dev/null
+++ b/tests/CoreEx.Caching.Redis.Test.Unit/appsettings.unittest.json
@@ -0,0 +1,13 @@
+{
+  "Aspire": {
+    "StackExchange": {
+      "Redis": {
+        "ConnectionString": "localhost:6379",
+        "ConfigurationOptions": {
+          "ConnectTimeout": 3000,
+          "ConnectRetry": 2
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CoreEx.Cosmos.Test.csproj b/tests/CoreEx.Cosmos.Test/CoreEx.Cosmos.Test.csproj
deleted file mode 100644
index c30f13a8..00000000
--- a/tests/CoreEx.Cosmos.Test/CoreEx.Cosmos.Test.csproj
+++ /dev/null
@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Data\Data.yaml" />
-    <None Remove="Data\RefData.yaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Data\Data.yaml" />
-    <EmbeddedResource Include="Data\RefData.yaml" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="UnitTestEx.NUnit" Version="5.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.AutoMapper\CoreEx.AutoMapper.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Cosmos\CoreEx.Cosmos.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDb.cs b/tests/CoreEx.Cosmos.Test/CosmosDb.cs
deleted file mode 100644
index 54aef6fb..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDb.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.Azure.Cosmos;
-
-namespace CoreEx.Cosmos.Test
-{
-    public class CosmosDb : Cosmos.CosmosDb
-    {
-        public CosmosDb(bool auth, bool partitioning = false) : base(TestSetUp.CosmosDatabase!, TestSetUp.Mapper!) 
-        {
-            // Apply the container configurations.
-            Container("Persons1").UsePartitionKey<Person1>(partitioning ? v => new PartitionKey(v.Filter) : null).UseAuthorizeFilter<Person1>(q => auth ? q.Where(x => x.Locked == false) : q);
-            Container("Persons2").UsePartitionKey<Person2>(partitioning ? v => new PartitionKey(v.Filter) : null!).UseAuthorizeFilter<Person2>(q => auth ? q.Where(x => x.Locked == false) : q);
-            this["Persons3"].UseValuePartitionKey<Person3>(partitioning ? v => new PartitionKey(v.Value.Filter) : null!).UseValueAuthorizeFilter<Person3>(q => auth ? q.Where(x => x.Value.Locked == false) : q);
-            Container("Persons3").UseValuePartitionKey<Person1>(partitioning ? v => new PartitionKey(v.Value.Filter) : null!);
-        }
-
-        public CosmosDbContainer<Person1, Person1> Persons1 => Container("Persons1").AsTyped<Person1, Person1>();
-
-        public CosmosDbContainer<Person2, Person2> Persons2 => Container<Person2, Person2>("Persons2");
-
-        public CosmosDbValueContainer<Person3, Person3> Persons3 => this["Persons3"].AsValueTyped<Person3, Person3>();
-
-        public CosmosDbValueContainer<Person1, Person1> Persons3X => ValueContainer<Person1, Person1>("Persons3");
-
-        public CosmosDbContainer PersonsX => Container("PersonsX");
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDbContainerAuthTest.cs b/tests/CoreEx.Cosmos.Test/CosmosDbContainerAuthTest.cs
deleted file mode 100644
index 7cd6f17c..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDbContainerAuthTest.cs
+++ /dev/null
@@ -1,195 +0,0 @@
-namespace CoreEx.Cosmos.Test
-{
-    [TestFixture]
-    [Category("WithCosmos")]
-    public class CosmosDbContainerAuthTest
-    {
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-        private CosmosDb _db;
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-
-        [OneTimeSetUp]
-        public async Task SetUp()
-        {
-            await TestSetUp.SetUpAsync().ConfigureAwait(false);
-            _db = new CosmosDb(auth: true);
-        }
-
-        [Test]
-        public void AsQueryable1() => Assert.That(_db.Persons1.Query().AsQueryable().Count(), Is.EqualTo(3));
-
-        [Test]
-        public void AsQueryable2() => Assert.That(_db.Persons2.Query().AsQueryable().Count(), Is.EqualTo(3));
-
-        [Test]
-        public void AsQueryable3() => Assert.That(_db.Persons3.Query().AsQueryable().Count(), Is.EqualTo(3));
-
-        [Test]
-        public async Task Get1Async()
-        {
-            Assert.That(await _db.Persons1.GetAsync(404.ToGuid().ToString()), Is.Null);
-
-            var v = await _db.Persons1.GetAsync(1.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(1.ToGuid().ToString()));
-
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.GetAsync(2.ToGuid().ToString()));
-        }
-
-        [Test]
-        public async Task Get2Async()
-        {
-            Assert.That(await _db.Persons2.GetAsync(404.ToGuid().ToString()), Is.Null);
-
-            var v = await _db.Persons2.GetAsync(1.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(1.ToGuid().ToString()));
-
-           Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.GetAsync(2.ToGuid().ToString()));
-        }
-
-        [Test]
-        public async Task Get3Async()
-        {
-            Assert.That(await _db.Persons3.GetAsync(404.ToGuid()), Is.Null);
-
-            var v = await _db.Persons3.GetAsync(1.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(1.ToGuid()));
-
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.GetAsync(2.ToGuid()));
-        }
-
-        [Test]
-        public async Task Create1Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons1.CreateAsync(null!));
-
-            var id = Guid.NewGuid().ToString();
-            var v = new Person1 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m };
-            v = await _db.Persons1.CreateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(id));
-
-            v = new Person1 { Id = Guid.NewGuid().ToString(), Name = "Harry", Birthday = new DateTime(1999, 07, 21), Salary = 181000m, Locked = true };
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.CreateAsync(v));
-        }
-
-        [Test]
-        public async Task Create2Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons2.CreateAsync(null!));
-
-            var id = Guid.NewGuid().ToString();
-            var v = new Person2 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m };
-            v = await _db.Persons2.CreateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(id));
-
-            v = new Person2 { Id = Guid.NewGuid().ToString(), Name = "Harry", Birthday = new DateTime(1999, 07, 21), Salary = 181000m, Locked = true };
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.CreateAsync(v));
-        }
-
-        [Test]
-        public async Task Create3Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons3.CreateAsync(null!));
-
-            var id = Guid.NewGuid();
-            var v = new Person3 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m };
-            v = await _db.Persons3.CreateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(id));
-
-            v = new Person3 { Id = Guid.NewGuid(), Name = "Harry", Birthday = new DateTime(1999, 07, 21), Salary = 181000m, Locked = true };
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.CreateAsync(v));
-        }
-
-        [Test]
-        public async Task Update1Async()
-        {
-            // Update where not auth.
-            var v = (await _db.Persons1.CosmosContainer.ReadItemAsync<Person1>(4.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None).ConfigureAwait(false)).Resource;
-            Assert.That(v, Is.Not.Null);
-
-            v.Name += "X";
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.UpdateAsync(v));
-
-            // Update to something not auth.
-            v = (await _db.Persons1.CosmosContainer.ReadItemAsync<Person2>(5.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None).ConfigureAwait(false)).Resource;
-            Assert.That(v, Is.Not.Null);
-
-            v.Name += "X";
-            v.Locked = true;
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.UpdateAsync(v));
-
-            v.Locked = false;
-            await _db.Persons1.UpdateAsync(v);
-        }
-
-        [Test]
-        public async Task Update2Async()
-        {
-            // Update where not auth.
-            var v = (await _db.Persons2.CosmosContainer.ReadItemAsync<Person2>(4.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None).ConfigureAwait(false)).Resource;
-            Assert.That(v, Is.Not.Null);
-
-            v.Name += "X";
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.UpdateAsync(v));
-
-            // Update to something not auth.
-            v = (await _db.Persons2.CosmosContainer.ReadItemAsync<Person2>(5.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None).ConfigureAwait(false)).Resource;
-            Assert.That(v, Is.Not.Null);
-
-            v.Name += "X";
-            v.Locked = true;
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.UpdateAsync(v));
-
-            v.Locked = false;
-            await _db.Persons2.UpdateAsync(v);
-        }
-
-        [Test]
-        public async Task Update3Async()
-        {
-            // Update where not auth.
-            var v = (await _db.Persons3.CosmosContainer.ReadItemAsync<Person3>(4.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None).ConfigureAwait(false)).Resource;
-            Assert.That(v, Is.Not.Null);
-
-            v.Name += "X";
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.UpdateAsync(v));
-
-            // Update to something not auth.
-            v = (await _db.Persons3.CosmosContainer.ReadItemAsync<Person3>(5.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None).ConfigureAwait(false)).Resource;
-            Assert.That(v, Is.Not.Null);
-
-            v.Name += "X";
-            v.Locked = true;
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.UpdateAsync(v));
-
-            v.Locked = false;
-            await _db.Persons3.UpdateAsync(v);
-        }
-
-        [Test]
-        public async Task Delete1Async()
-        {
-            await _db.Persons1.DeleteAsync(3.ToGuid().ToString());
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.DeleteAsync(4.ToGuid().ToString()));
-        }
-
-        [Test]
-        public async Task Delete2Async()
-        {
-            await _db.Persons2.DeleteAsync(3.ToGuid().ToString());
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.DeleteAsync(4.ToGuid().ToString()));
-        }
-
-        [Test]
-        public async Task Delete3Async()
-        {
-            await _db.Persons3.DeleteAsync(3.ToGuid());
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.DeleteAsync(4.ToGuid()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDbContainerPartitioningTest.cs b/tests/CoreEx.Cosmos.Test/CosmosDbContainerPartitioningTest.cs
deleted file mode 100644
index 9741ff05..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDbContainerPartitioningTest.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-using Microsoft.Azure.Cosmos;
-
-namespace CoreEx.Cosmos.Test
-{
-    [TestFixture]
-    [Category("WithCosmos")]
-    public class CosmosDbContainerPartitioningTest
-    {
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-        private CosmosDb _db;
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-
-        [OneTimeSetUp]
-        public async Task SetUp()
-        {
-            await TestSetUp.SetUpAsync("/filter", "/value/filter").ConfigureAwait(false);
-            _db = new CosmosDb(auth: false, partitioning: true)
-            {
-                DbArgs = new CosmosDbArgs(new PartitionKey("A"))
-            };
-        }
-
-        [Test]
-        public async Task Get1Async()
-        {
-            var v = await _db.Persons1.GetAsync(1.ToGuid());
-            Assert.That(v, Is.Null);
-
-            v = await _db.Persons1.GetAsync(4.ToGuid());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("Sally"));
-        }
-
-        [Test]
-        public async Task Create1Async()
-        {
-            var id = Guid.NewGuid().ToString();
-            var v = new Person1 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m, Filter = "B" };
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.CreateAsync(v));
-
-            v.Filter = "A";
-            await _db.Persons1.CreateAsync(v);
-
-            v = await _db.Persons1.GetAsync(id);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("Michelle"));
-        }
-
-        [Test]
-        public async Task Update1Async()
-        {
-            var v = await _db.Persons1.GetAsync(4.ToGuid());
-            Assert.That(v, Is.Not.Null);
-
-            v!.Name += "X";
-            v.Filter = "B";
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons1.UpdateAsync(v));
-
-            v.Filter = "A";
-            v = await _db.Persons1.UpdateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("SallyX"));
-        }
-
-        [Test]
-        public async Task Delete1Async()
-        {
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons1.DeleteAsync(1.ToGuid()));
-            var ir = await _db.Persons1.CosmosContainer.ReadItemAsync<Person1>(1.ToGuid().ToString(), new PartitionKey("B")).ConfigureAwait(false);
-            Assert.That(ir, Is.Not.Null);
-            Assert.That(ir.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
-
-            await _db.Persons1.DeleteAsync(5.ToGuid());
-            var v = await _db.Persons1.GetAsync(5.ToGuid());
-            Assert.That(v, Is.Null);
-        }
-
-        [Test]
-        public async Task Get2Async()
-        {
-            var v = await _db.Persons2.GetAsync(1.ToGuid());
-            Assert.That(v, Is.Null);
-
-            v = await _db.Persons2.GetAsync(4.ToGuid());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("Sally"));
-        }
-
-        [Test]
-        public async Task Create2Async()
-        {
-            var id = Guid.NewGuid().ToString();
-            var v = new Person2 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m, Filter = "B" };
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.CreateAsync(v));
-
-            v.Filter = "A";
-            await _db.Persons2.CreateAsync(v);
-
-            v = await _db.Persons2.GetAsync(id);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("Michelle"));
-        }
-
-        [Test]
-        public async Task Update2Async()
-        {
-            var v = await _db.Persons2.GetAsync(4.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-
-            v!.Name += "X";
-            v.Filter = "B";
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons2.UpdateAsync(v));
-
-            v.Filter = "A";
-            v = await _db.Persons2.UpdateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Name, Is.EqualTo("SallyX"));
-        }
-
-        [Test]
-        public async Task Delete2Async()
-        {
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons2.DeleteAsync(1.ToGuid()));
-            var ir = await _db.Persons2.CosmosContainer.ReadItemAsync<Person2>(1.ToGuid().ToString(), new PartitionKey("B")).ConfigureAwait(false);
-            Assert.That(ir, Is.Not.Null);
-            Assert.That(ir.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
-
-            await _db.Persons2.DeleteAsync(5.ToGuid().ToString());
-            var v = await _db.Persons2.GetAsync(5.ToGuid().ToString());
-            Assert.That(v, Is.Null);
-        }
-
-        [Test]
-        public async Task Get3Async()
-        {
-            var v = await _db.Persons3.GetAsync(1.ToGuid());
-            Assert.That(v, Is.Null);
-
-            v = await _db.Persons3.GetAsync(4.ToGuid());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("Sally"));
-        }
-
-        [Test]
-        public async Task Create3Async()
-        {
-            var id = Guid.NewGuid();
-            var v = new Person3 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m, Filter = "B" };
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.CreateAsync(v));
-
-            v.Filter = "A";
-            await _db.Persons3.CreateAsync(v);
-
-            v = await _db.Persons3.GetAsync(id);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Name, Is.EqualTo("Michelle"));
-        }
-
-        [Test]
-        public async Task Update3Async()
-        {
-            var v = await _db.Persons3.GetAsync(4.ToGuid());
-            Assert.That(v, Is.Not.Null);
-
-            v!.Name += "X";
-            v.Filter = "B";
-            Assert.ThrowsAsync<AuthorizationException>(() => _db.Persons3.UpdateAsync(v));
-
-            v.Filter = "A";
-            v = await _db.Persons3.UpdateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Name, Is.EqualTo("SallyX"));
-        }
-
-        [Test]
-        public async Task Delete3Async()
-        {
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons3.DeleteAsync(1.ToGuid()));
-            var ir = await _db.Persons3.CosmosContainer.ReadItemAsync<Person2>(1.ToGuid().ToString(), new PartitionKey("B")).ConfigureAwait(false);
-            Assert.That(ir, Is.Not.Null);
-            Assert.That(ir.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
-
-            await _db.Persons3.DeleteAsync(5.ToGuid());
-            var v = await _db.Persons3.GetAsync(5.ToGuid());
-            Assert.That(v, Is.Null);
-        }
-
-        [Test]
-        public async Task SelectValueMultiSetAsync_A()
-        {
-            Person3[] people = Array.Empty<Person3>();
-            var hasPerson = false;
-
-            var result = await _db["Persons3"].SelectValueMultiSetWithResultAsync(new PartitionKey("A"),
-                new MultiSetValueCollArgs<Person3, Person3>(r => people = r.ToArray()),
-                new MultiSetValueSingleArgs<Person1, Person1>(r => hasPerson = true, isMandatory: false));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(people, Has.Length.EqualTo(3));
-                Assert.That(hasPerson, Is.True);
-            });
-        }
-
-        [Test]
-        public async Task SelectValueMultiSetAsync_B()
-        {
-            Person3[] people = Array.Empty<Person3>();
-            var hasPerson = false;
-
-            var result = await _db["Persons3"].SelectValueMultiSetWithResultAsync(new PartitionKey("B"),
-                new MultiSetValueCollArgs<Person3, Person3>(r => people = r.ToArray()),
-                new MultiSetValueSingleArgs<Person1, Person1>(r => hasPerson = true, isMandatory: false));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(people, Has.Length.EqualTo(2));
-                Assert.That(hasPerson, Is.False);
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDbContainerTest.cs b/tests/CoreEx.Cosmos.Test/CosmosDbContainerTest.cs
deleted file mode 100644
index 3def41d3..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDbContainerTest.cs
+++ /dev/null
@@ -1,300 +0,0 @@
-namespace CoreEx.Cosmos.Test
-{
-    [TestFixture]
-    [Category("WithCosmos")]
-    public class CosmosDbContainerTest
-    {
-        private CosmosDb _db;
-
-        [OneTimeSetUp]
-        public async Task SetUp()
-        {
-            await TestSetUp.SetUpAsync().ConfigureAwait(false);
-            _db = new CosmosDb(auth: false);
-        }
-
-        [Test]
-        public async Task Get1Async()
-        {
-            Assert.That(await _db.Persons1.GetAsync(404.ToGuid()), Is.Null);
-
-            var v = await _db.Persons1.GetAsync(1.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v!.Id, Is.EqualTo(1.ToGuid().ToString()));
-                Assert.That(v.Name, Is.EqualTo("Rebecca"));
-                Assert.That(v.Birthday, Is.EqualTo(new DateTime(1990, 08, 07, 0, 0, 0, DateTimeKind.Unspecified)));
-                Assert.That(v.Salary, Is.EqualTo(150000m));
-            });
-        }
-
-        [Test]
-        public async Task Get2Async()
-        {
-            Assert.That(await _db.Persons2.GetAsync(404.ToGuid()), Is.Null);
-
-            var v = await _db.Persons2.GetAsync(1.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(1.ToGuid().ToString()));
-            Assert.That(v.Name, Is.EqualTo("Rebecca"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1990, 08, 07, 0, 0, 0, DateTimeKind.Unspecified)));
-            Assert.That(v.Salary, Is.EqualTo(150000m));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-        }
-
-        [Test]
-        public async Task Get3Async()
-        {
-            Assert.That(await _db.Persons3.GetAsync(404.ToGuid()), Is.Null);
-
-            var v = await _db.Persons3.GetAsync(1.ToGuid());
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(1.ToGuid()));
-            Assert.That(v.Name, Is.EqualTo("Rebecca"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1990, 08, 07, 0, 0, 0, DateTimeKind.Unspecified)));
-            Assert.That(v.Salary, Is.EqualTo(150000m));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Null);
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-
-            // Different type.
-            Assert.That(await _db.Persons3.GetAsync(100.ToGuid()), Is.Null);
-        }
-
-        [Test]
-        public async Task Create1Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons1.CreateAsync(null!));
-
-            var id = Guid.NewGuid().ToString();
-            var v = new Person1 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m };
-            v = await _db.Persons1.CreateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(id));
-            Assert.That(v.Name, Is.EqualTo("Michelle"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1979, 08, 12)));
-            Assert.That(v.Salary, Is.EqualTo(181000m));
-
-            v = await _db.Persons1.GetAsync(v.Id);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(id));
-            Assert.That(v.Name, Is.EqualTo("Michelle"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1979, 08, 12)));
-            Assert.That(v.Salary, Is.EqualTo(181000m));
-        }
-
-        [Test]
-        public async Task Create2Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons2.CreateAsync(null!));
-
-            var id = Guid.NewGuid().ToString();
-            var v = new Person2 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m };
-            v = await _db.Persons2.CreateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(id));
-            Assert.That(v.Name, Is.EqualTo("Michelle"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1979, 08, 12)));
-            Assert.That(v.Salary, Is.EqualTo(181000m));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Null); 
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-
-            v = await _db.Persons2.GetAsync(v.Id);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(id));
-            Assert.That(v.Name, Is.EqualTo("Michelle"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1979, 08, 12)));
-            Assert.That(v.Salary, Is.EqualTo(181000m));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Null); 
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-        }
-
-        [Test]
-        public async Task Create3Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons3.CreateAsync(null!));
-
-            var id = Guid.NewGuid();
-            var v = new Person3 { Id = id, Name = "Michelle", Birthday = new DateTime(1979, 08, 12), Salary = 181000m };
-            v = await _db.Persons3.CreateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(id));
-            Assert.That(v.Name, Is.EqualTo("Michelle"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1979, 08, 12)));
-            Assert.That(v.Salary, Is.EqualTo(181000m));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Null); 
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-
-            v = await _db.Persons3.GetAsync(v.Id);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v!.Id, Is.EqualTo(id));
-            Assert.That(v.Name, Is.EqualTo("Michelle"));
-            Assert.That(v.Birthday, Is.EqualTo(new DateTime(1979, 08, 12)));
-            Assert.That(v.Salary, Is.EqualTo(181000m));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Null); 
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-        }
-
-        [Test]
-        public async Task Update1Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons1.UpdateAsync(null!));
-
-            // Get previous.
-            var v = await _db.Persons1.GetAsync(5.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-
-            // Update testing.
-            v!.Id = 404.ToGuid().ToString();
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons1.UpdateAsync(v));
-
-            v.Id = 5.ToGuid().ToString();
-            v.Name += "X";
-            v = await _db.Persons1.UpdateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(5.ToGuid().ToString()));
-            Assert.That(v.Name, Is.EqualTo("MikeX"));
-        }
-
-        [Test]
-        public async Task Update2Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons2.UpdateAsync(null!));
-
-            // Get previous.
-            var v = await _db.Persons2.GetAsync(5.ToGuid().ToString());
-            Assert.That(v, Is.Not.Null);
-
-            // Update testing.
-            v!.Id = 404.ToGuid().ToString();
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons2.UpdateAsync(v));
-
-            v.Id = 5.ToGuid().ToString();
-            v.Name += "X";
-            v = await _db.Persons2.UpdateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(5.ToGuid().ToString()));
-            Assert.That(v.Name, Is.EqualTo("MikeX"));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Not.Null);
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-
-            v.ETag = "ZZZZZ";
-            v.Name += "X";
-            Assert.ThrowsAsync<ConcurrencyException>(() => _db.Persons2.UpdateAsync(v));
-        }
-
-        [Test]
-        public async Task Update3Async()
-        {
-            Assert.ThrowsAsync<ArgumentNullException>(() => _db.Persons3.UpdateAsync(null!));
-
-            // Get previous.
-            var v = await _db.Persons3.GetAsync(5.ToGuid());
-            Assert.That(v, Is.Not.Null);
-
-            // Update testing.
-            v!.Id = 404.ToGuid();
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons3.UpdateAsync(v));
-
-            v.Id = 5.ToGuid();
-            v.Name += "X";
-            v = await _db.Persons3.UpdateAsync(v);
-            Assert.That(v, Is.Not.Null);
-            Assert.That(v.Id, Is.EqualTo(5.ToGuid()));
-            Assert.That(v.Name, Is.EqualTo("MikeX"));
-            Assert.That(v.ChangeLog, Is.Not.Null);
-            Assert.That(v.ChangeLog!.CreatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.CreatedDate, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedBy, Is.Not.Null);
-            Assert.That(v.ChangeLog.UpdatedDate, Is.Not.Null);
-            Assert.That(v.ETag, Is.Not.Null);
-            Assert.That(v.ETag, Does.Not.StartsWith("\""));
-
-            v.ETag = "ZZZZZ";
-            v.Name += "X";
-            Assert.ThrowsAsync<ConcurrencyException>(() => _db.Persons3.UpdateAsync(v));
-        }
-
-        [Test]
-        public async Task Delete1Async()
-        {
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons1.DeleteAsync(404.ToGuid().ToString()));
-
-            await _db.Persons1.DeleteAsync(4.ToGuid().ToString());
-
-            using (var r = await _db.Persons1.CosmosContainer.ReadItemStreamAsync(4.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None))
-            {
-                Assert.That(r, Is.Not.Null);
-                Assert.That(r.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.NotFound));
-            };
-        }
-
-        [Test]
-        public async Task Delete2Async()
-        {
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons2.DeleteAsync(404.ToGuid().ToString()));
-
-            await _db.Persons2.DeleteAsync(4.ToGuid().ToString());
-
-            using (var r = await _db.Persons2.CosmosContainer.ReadItemStreamAsync(4.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None))
-            {
-                Assert.That(r, Is.Not.Null);
-                Assert.That(r.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.NotFound));
-            };
-        }
-
-        [Test]
-        public async Task Delete3Async()
-        {
-            Assert.ThrowsAsync<NotFoundException>(() => _db.Persons3.DeleteAsync(404.ToGuid()));
-
-            await _db.Persons3.DeleteAsync(4.ToGuid());
-
-            using (var r = await _db.Persons3.CosmosContainer.ReadItemStreamAsync(4.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None))
-            {
-                Assert.That(r, Is.Not.Null);
-                Assert.That(r.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.NotFound));
-            };
-
-            using (var r = await _db.Persons3.CosmosContainer.ReadItemStreamAsync(100.ToGuid().ToString(), Microsoft.Azure.Cosmos.PartitionKey.None))
-            {
-                Assert.That(r, Is.Not.Null);
-                Assert.That(r.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDbModelTest.cs b/tests/CoreEx.Cosmos.Test/CosmosDbModelTest.cs
deleted file mode 100644
index 5f00fdad..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDbModelTest.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using CoreEx.Cosmos.Model;
-using Microsoft.Azure.Cosmos;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CoreEx.Cosmos.Test
-{
-    [TestFixture]
-    [Category("WithCosmos")]
-    public class CosmosDbModelTest
-    {
-        private CosmosDb _db;
-
-        [OneTimeSetUp]
-        public async Task SetUp()
-        {
-            await TestSetUp.SetUpAsync().ConfigureAwait(false);
-            _db = new CosmosDb(auth: false);
-        }
-
-        [Test]
-        public async Task SelectMultiSetWithResultAsync()
-        {
-            PersonX1[] people = Array.Empty<PersonX1>();
-            var hasPerson = false;
-
-            var result = await _db.PersonsX.Model.SelectMultiSetWithResultAsync(PartitionKey.None,
-                new MultiSetModelCollArgs<PersonX1>(r => people = r.ToArray()),
-                new MultiSetModelSingleArgs<PersonX2>(r => hasPerson = true));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(people, Has.Length.EqualTo(2));
-                Assert.That(hasPerson, Is.True);
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDbQueryPartitioningTest.cs b/tests/CoreEx.Cosmos.Test/CosmosDbQueryPartitioningTest.cs
deleted file mode 100644
index 8711b29d..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDbQueryPartitioningTest.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using Microsoft.Azure.Cosmos;
-
-namespace CoreEx.Cosmos.Test
-{
-    [TestFixture]
-    [Category("WithCosmos")]
-    public class CosmosDbQueryPartitioningTest
-    {
-        private CosmosDb _db;
-
-        [OneTimeSetUp]
-        public async Task SetUp()
-        {
-            await TestSetUp.SetUpAsync("/filter", "/value/filter").ConfigureAwait(false);
-            _db = new CosmosDb(auth: false);
-        }
-
-        [Test]
-        public async Task Query1()
-        {
-            var v = await _db.Persons1.Query().ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(5));
-
-            v = await _db.Persons1.Query(new PartitionKey("A")).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(3));
-        }
-
-        [Test]
-        public async Task Query2()
-        {
-            var v = await _db.Persons2.Query().ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(5));
-
-            v = await _db.Persons2.Query(new PartitionKey("A")).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(3));
-        }
-
-        [Test]
-        public async Task Query3()
-        {
-            var v = await _db.Persons3.Query().ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(5));
-
-            v = await _db.Persons3.Query(new PartitionKey("A")).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(3));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/CosmosDbQueryTestcs.cs b/tests/CoreEx.Cosmos.Test/CosmosDbQueryTestcs.cs
deleted file mode 100644
index 1ba10d94..00000000
--- a/tests/CoreEx.Cosmos.Test/CosmosDbQueryTestcs.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using CoreEx.Data.Querying;
-using CoreEx.Data.Querying.Expressions;
-using CoreEx.Entities;
-
-namespace CoreEx.Cosmos.Test
-{
-    [TestFixture]
-    [Category("WithCosmos")]
-    public class CosmosDbQueryTest
-    {
-        private CosmosDb _db;
-
-        [OneTimeSetUp]
-        public async Task SetUp()
-        {
-            await TestSetUp.SetUpAsync().ConfigureAwait(false);
-            _db = new CosmosDb(auth: false);
-        }
-
-        [Test]
-        public async Task Query_NoPaging1()
-        {
-            var v = await _db.Persons1.Query().ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(5));
-
-            v = await _db.Persons1.Query(q => q.Where(x => x.Name == "Greg")).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(1));
-            Assert.That(v[0].Name, Is.EqualTo("Greg"));
-
-            v = await _db.Persons1.Query(q => q.Where(x => x.Name == "GREG")).ToArrayAsync();
-            Assert.That(v, Is.Empty);
-        }
-
-        [Test]
-        public async Task Query_Paging1()
-        {
-            var pr = new Entities.PagingResult(Entities.PagingArgs.CreateSkipAndTake(1, 2, true));
-            var v = await _db.Persons1.Query(q => q.OrderBy(x => x.Id)).WithPaging(pr).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-            Assert.That(pr.TotalCount, Is.EqualTo(5));
-
-            v = await _db.Persons1.Query(q => q.OrderBy(x => x.Name)).WithPaging(1, 2).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Greg"));
-            Assert.That(v[1].Name, Is.EqualTo("Mike"));
-
-            var vr = await _db.Persons1.Query(q => q.OrderBy(x => x.Name).Where(x => !x.Locked)).WithPaging(Entities.PagingArgs.CreateSkipAndTake(1, 2, true)).SelectResultAsync<Person1CollectionResult, Person1Collection>();
-            Assert.That(vr.Items, Has.Count.EqualTo(2));
-            Assert.That(vr.Items[0].Name, Is.EqualTo("Mike"));
-            Assert.That(vr.Items[1].Name, Is.EqualTo("Rebecca"));
-            Assert.That(vr.Paging, Is.Not.Null);
-            Assert.That(vr.Paging!.TotalCount, Is.EqualTo(3));
-        }
-
-        [Test]
-        public async Task Query_Wildcards1()
-        {
-            var v = await _db.Persons1.Query(q => q.WhereWildcard(x => x.Name, "g*").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-
-            v = await _db.Persons1.Query(q => q.WhereWildcard(x => x.Name, "*Y").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Sally"));
-
-            v = await _db.Persons1.Query(q => q.WhereWildcard(x => x.Name, "*e*").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(3));
-            Assert.That(v[0].Name, Is.EqualTo("Rebecca"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-            Assert.That(v[2].Name, Is.EqualTo("Mike"));
-
-            var ex = Assert.ThrowsAsync<InvalidOperationException>(() => _db.Persons1.Query(q => q.WhereWildcard(x => x.Name, "*m*e")).ToArrayAsync());
-            Assert.That(ex!.Message, Is.EqualTo("Wildcard selection text is not supported."));
-        }
-
-        [Test]
-        public async Task Query_NoPaging2()
-        {
-            var v = await _db.Persons2.Query().ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(5));
-
-            v = await _db.Persons2.Query(q => q.Where(x => x.Name == "Greg")).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(1));
-            Assert.That(v[0].Name, Is.EqualTo("Greg"));
-
-            v = await _db.Persons2.Query(q => q.Where(x => x.Name == "GREG")).ToArrayAsync();
-            Assert.That(v, Is.Empty);
-        }
-
-        [Test]
-        public async Task Query_Paging2()
-        {
-            var pr = new Entities.PagingResult(Entities.PagingArgs.CreateSkipAndTake(1, 2, true));
-            var v = await _db.Persons2.Query(q => q.OrderBy(x => x.Id)).WithPaging(pr).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-            Assert.That(pr.TotalCount, Is.EqualTo(5));
-
-            v = await _db.Persons2.Query(q => q.OrderBy(x => x.Name)).WithPaging(1, 2).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Greg"));
-            Assert.That(v[1].Name, Is.EqualTo("Mike"));
-
-            var vr = await _db.Persons2.Query(q => q.OrderBy(x => x.Name).Where(x => !x.Locked)).WithPaging(Entities.PagingArgs.CreateSkipAndTake(1, 2, true)).SelectResultAsync<Person2CollectionResult, Person2Collection>();
-            Assert.That(vr.Items, Has.Count.EqualTo(2));
-            Assert.That(vr.Items[0].Name, Is.EqualTo("Mike"));
-            Assert.That(vr.Items[1].Name, Is.EqualTo("Rebecca"));
-            Assert.That(vr.Paging, Is.Not.Null);
-            Assert.That(vr.Paging!.TotalCount, Is.EqualTo(3));
-        }
-
-        [Test]
-        public async Task Query_Wildcards2()
-        {
-            var v = await _db.Persons2.Query(q => q.WhereWildcard(x => x.Name, "g*").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-
-            v = await _db.Persons2.Query(q => q.WhereWildcard(x => x.Name, "*Y").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Sally"));
-
-            v = await _db.Persons2.Query(q => q.WhereWildcard(x => x.Name, "*e*").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(3));
-            Assert.That(v[0].Name, Is.EqualTo("Rebecca"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-            Assert.That(v[2].Name, Is.EqualTo("Mike"));
-
-            var ex = Assert.ThrowsAsync<InvalidOperationException>(() => _db.Persons2.Query(q => q.WhereWildcard(x => x.Name, "*m*e")).ToArrayAsync());
-            Assert.That(ex!.Message, Is.EqualTo("Wildcard selection text is not supported."));
-        }
-
-        [Test]
-        public async Task Query_NoPaging3()
-        {
-            var v = await _db.Persons3.Query().ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(5));
-
-            v = await _db.Persons3.Query(q => q.Where(x => x.Value.Name == "Greg")).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(1));
-            Assert.That(v[0].Name, Is.EqualTo("Greg"));
-
-            v = await _db.Persons3.Query(q => q.Where(x => x.Value.Name == "GREG")).ToArrayAsync();
-            Assert.That(v, Is.Empty);
-        }
-
-        [Test]
-        public async Task Query_Paging3()
-        {
-            var pr = new Entities.PagingResult(Entities.PagingArgs.CreateSkipAndTake(1, 2, true));
-            var v = await _db.Persons3.Query(q => q.OrderBy(x => x.Id)).WithPaging(pr).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-            Assert.That(pr.TotalCount, Is.EqualTo(5));
-
-            v = await _db.Persons3.Query(q => q.OrderBy(x => x.Value.Name)).WithPaging(1, 2).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Greg"));
-            Assert.That(v[1].Name, Is.EqualTo("Mike"));
-
-            var vr = await _db.Persons3.Query(q => q.OrderBy(x => x.Value.Name).Where(x => !x.Value.Locked)).WithPaging(Entities.PagingArgs.CreateSkipAndTake(1, 2, true)).SelectResultAsync<Person3CollectionResult, Person3Collection>();
-            Assert.That(vr.Items, Has.Count.EqualTo(2));
-            Assert.That(vr.Items[0].Name, Is.EqualTo("Mike"));
-            Assert.That(vr.Items[1].Name, Is.EqualTo("Rebecca"));
-            Assert.That(vr.Paging, Is.Not.Null);
-            Assert.That(vr.Paging!.TotalCount, Is.EqualTo(3));
-        }
-
-        [Test]
-        public async Task Query_Wildcards3()
-        {
-            var v = await _db.Persons3.Query(q => q.WhereWildcard(x => x.Value.Name, "g*").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-
-            v = await _db.Persons3.Query(q => q.WhereWildcard(x => x.Value.Name, "*Y").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Name, Is.EqualTo("Sally"));
-
-            v = await _db.Persons3.Query(q => q.WhereWildcard(x => x.Value.Name, "*e*").OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(3));
-            Assert.That(v[0].Name, Is.EqualTo("Rebecca"));
-            Assert.That(v[1].Name, Is.EqualTo("Greg"));
-            Assert.That(v[2].Name, Is.EqualTo("Mike"));
-
-            var ex = Assert.ThrowsAsync<InvalidOperationException>(() => _db.Persons3.Query(q => q.WhereWildcard(x => x.Value.Name, "*m*e")).ToArrayAsync());
-            Assert.That(ex!.Message, Is.EqualTo("Wildcard selection text is not supported."));
-        }
-
-        [Test]
-        public async Task ModelQuery_Paging3()
-        {
-            var pr = new Entities.PagingResult(Entities.PagingArgs.CreateSkipAndTake(1, 2, true));
-            var v = await _db.Persons3.Model.Query(q => q.OrderBy(x => x.Id)).WithPaging(pr).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Value.Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Value.Name, Is.EqualTo("Greg"));
-            Assert.That(pr.TotalCount, Is.EqualTo(5));
-
-            v = await _db.Persons3.Model.Query(q => q.OrderBy(x => x.Value.Name)).WithPaging(1, 2).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Value.Name, Is.EqualTo("Greg"));
-            Assert.That(v[1].Value.Name, Is.EqualTo("Mike"));
-        }
-
-        [Test]
-        public async Task ModelQuery_WithFilter()
-        {
-            var qac = QueryArgsConfig.Create()
-                .WithFilter(f => f
-                    .AddField<string>("Name", "Value.Name", c => c.WithOperators(QueryFilterOperator.AllStringOperators).WithUpperCase())
-                    .AddField<bool>("Birthday", "Value.Birthday"));
-
-            var v = await _db.Persons3.Model.Query(q => q.Where(qac, QueryArgs.Create("endswith(name, 'Y')")).OrderBy(x => x.Id)).ToArrayAsync();
-            Assert.That(v, Has.Length.EqualTo(2));
-            Assert.That(v[0].Value.Name, Is.EqualTo("Gary"));
-            Assert.That(v[1].Value.Name, Is.EqualTo("Sally"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/Data/Data.yaml b/tests/CoreEx.Cosmos.Test/Data/Data.yaml
deleted file mode 100644
index ebc337fc..00000000
--- a/tests/CoreEx.Cosmos.Test/Data/Data.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-Data:
-  - Person1:
-    - { id: ^1, name: "Rebecca", birthday: 1990-08-07, salary: 150000, locked: false, filter: B }
-    - { id: ^2, name: "Gary", birthday: 1986-11-04, salary: 95000, locked: true, filter: B }
-    - { id: ^3, name: "Greg", birthday: 1970-07-06, salary: 101000, locked: false, filter: A }
-    - { id: ^4, name: "Sally", birthday: 1999-02-28, salary: 50000, locked: true, filter: A }
-    - { id: ^5, name: "Mike", birthday: 1967-09-13, salary: 135000, locked: false, filter: A }
-  - Person2:
-    - { id: ^1, name: "Rebecca", birthday: 1990-08-07, salary: 150000, locked: false, filter: B }
-    - { id: ^2, name: "Gary", birthday: 1986-11-04, salary: 95000, locked: true, filter: B }
-    - { id: ^3, name: "Greg", birthday: 1970-07-06, salary: 101000, locked: false, filter: A }
-    - { id: ^4, name: "Sally", birthday: 1999-02-28, salary: 50000, locked: true, filter: A }
-    - { id: ^5, name: "Mike", birthday: 1967-09-13, salary: 135000, locked: false, filter: A }
-  - Person3:
-    - { id: ^1, name: "Rebecca", birthday: 1990-08-07, salary: 150000, locked: false, filter: B }
-    - { id: ^2, name: "Gary", birthday: 1986-11-04, salary: 95000, locked: true, filter: B }
-    - { id: ^3, name: "Greg", birthday: 1970-07-06, salary: 101000, locked: false, filter: A }
-    - { id: ^4, name: "Sally", birthday: 1999-02-28, salary: 50000, locked: true, filter: A }
-    - { id: ^5, name: "Mike", birthday: 1967-09-13, salary: 135000, locked: false, filter: A }
-  - PersonX:
-    - { id: A, type: PersonX1, text: "AAA" }
-    - { id: B, type: PersonX2, name: "BBB" }      
-    - { id: C, type: PersonX1, text: "CCC" }
-    - { id: D, type: PersonX3, text: "DDD" }
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/Data/RefData.yaml b/tests/CoreEx.Cosmos.Test/Data/RefData.yaml
deleted file mode 100644
index a806b7c4..00000000
--- a/tests/CoreEx.Cosmos.Test/Data/RefData.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-Ref:
-  - Gender:
-    - F: Female
-    - M: Male
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/Models.cs b/tests/CoreEx.Cosmos.Test/Models.cs
deleted file mode 100644
index 6d35c720..00000000
--- a/tests/CoreEx.Cosmos.Test/Models.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.RefData;
-using Newtonsoft.Json;
-
-namespace CoreEx.Cosmos.Test
-{
-    public class Person1 : IIdentifier<string>
-    {
-        public string? Id { get; set; }
-        public string? Name { get; set; }
-        public DateTime Birthday { get; set; }
-        public decimal Salary { get; set; }
-        public bool Locked { get; set; }
-        public string? Filter { get; set; }
-    }
-
-    public class Person1Collection : List<Person1> { }
-
-    public class Person1CollectionResult : CollectionResult<Person1Collection, Person1> { }
-
-    public class Person2 : Person1, IChangeLog, IETag
-    {
-        public ChangeLog? ChangeLog { get; set; }
-
-        [JsonProperty("_etag")]
-        public string? ETag { get; set; }
-    }
-
-    public class Person2Collection : List<Person2> { }
-
-    public class Person2CollectionResult : CollectionResult<Person2Collection, Person2> { }
-
-    public class Person3 : IIdentifier<Guid>, IChangeLog, IETag
-    {
-        public Guid Id { get; set; }
-        public string? Name { get; set; }
-        public DateTime Birthday { get; set; }
-        public decimal Salary { get; set; }
-        public bool Locked { get; set; }
-        public string? Filter { get; set; }
-        public ChangeLog? ChangeLog { get; set; }
-        public string? ETag { get; set; }
-    }
-
-    public class Person3Collection : List<Person3> { }
-
-    public class Person3CollectionResult : CollectionResult<Person3Collection, Person3> { }
-
-    public class Gender : ReferenceDataBase<string> { }
-
-    public class PersonX1 : IIdentifier<string>, ICosmosDbType
-    {
-        public string? Id { get; set; }
-
-        public string Type { get; set; } = "PersonX1";
-
-        public string? Text { get; set; }
-    }
-
-    public class PersonX2 : IIdentifier<string>, ICosmosDbType
-    {
-        public string? Id { get; set; }
-
-        public string Type { get; set; } = "PersonX2";
-
-        public string? Name { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/TestSetUp.cs b/tests/CoreEx.Cosmos.Test/TestSetUp.cs
deleted file mode 100644
index 2d3c75e2..00000000
--- a/tests/CoreEx.Cosmos.Test/TestSetUp.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using CoreEx.Cosmos.Batch;
-using CoreEx.Json.Data;
-using CoreEx.Mapping;
-using Microsoft.Azure.Cosmos;
-using AzCosmos = Microsoft.Azure.Cosmos;
-
-namespace CoreEx.Cosmos.Test
-{
-    public static class TestSetUp
-    {
-        public static AzCosmos.CosmosClient? CosmosClient { get; private set; }
-
-        public static AzCosmos.Database? CosmosDatabase { get; private set; }
-
-        public static IMapper? Mapper { get; private set; }
-
-        public static async Task SetUpAsync(string partitionKeyPath = "/_partitionKey", string valuePartitionKeyPath = "/_partitionKey")
-        {
-            CoreEx.Cosmos.Batch.CosmosDbBatch.SequentialExecution = true;
-
-            //cleanup if client was already created ??
-            CosmosClient?.Dispose();
-
-            var cco = new AzCosmos.CosmosClientOptions
-            {
-                SerializerOptions = new AzCosmos.CosmosSerializationOptions { PropertyNamingPolicy = AzCosmos.CosmosPropertyNamingPolicy.CamelCase, IgnoreNullValues = true },
-                // https://docs.microsoft.com/en-us/azure/cosmos-db/linux-emulator?tabs=sql-api%2Cssl-netstd21#my-app-cant-connect-to-emulator-endpoint-the-tlsssl-connection-couldnt-be-established-or-i-cant-start-the-data-explorer
-                HttpClientFactory = () =>
-                {
-                    HttpMessageHandler httpMessageHandler = new HttpClientHandler()
-                    {
-                        ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
-                    };
-
-                    return new HttpClient(httpMessageHandler);
-                },
-                ConnectionMode = AzCosmos.ConnectionMode.Gateway,
-                RequestTimeout = TimeSpan.FromMinutes(3)
-            };
-
-            var endpoint = Environment.GetEnvironmentVariable("CoreEx_Cosmos_Test_Endpoint") ?? "https://localhost:8081";
-            var token = Environment.GetEnvironmentVariable("CoreEx_Cosmos_Test_Token") ?? "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
-            CosmosClient = new AzCosmos.CosmosClient(endpoint, token, cco);
-
-            CosmosDatabase = (await CosmosClient.CreateDatabaseIfNotExistsAsync("CoreEx.Cosmos.Test").ConfigureAwait(false)).Database;
-
-            Mapper ??= new AutoMapperWrapper(new AutoMapper.Mapper(new AutoMapper.MapperConfiguration(c =>
-            {
-                c.AddProfile<AutoMapperProfile>();
-                c.CreateMap<Person1, Person1>();
-                c.CreateMap<Person2, Person2>();
-                c.CreateMap<Person3, Person3>();
-            })));
-
-            var c1 = await CosmosDatabase.ReplaceOrCreateContainerAsync(new AzCosmos.ContainerProperties
-            {
-                Id = "Persons1",
-                PartitionKeyPath = partitionKeyPath,
-                UniqueKeyPolicy = new AzCosmos.UniqueKeyPolicy { UniqueKeys = { new AzCosmos.UniqueKey { Paths = { "/name" } } } }
-            }, 400).ConfigureAwait(false);
-
-            var c2 = await CosmosDatabase.ReplaceOrCreateContainerAsync(new AzCosmos.ContainerProperties
-            {
-                Id = "Persons2",
-                PartitionKeyPath = partitionKeyPath,
-                UniqueKeyPolicy = new AzCosmos.UniqueKeyPolicy { UniqueKeys = { new AzCosmos.UniqueKey { Paths = { "/name" } } } }
-            }, 400).ConfigureAwait(false);
-
-            var c3 = await CosmosDatabase.ReplaceOrCreateContainerAsync(new AzCosmos.ContainerProperties
-            {
-                Id = "Persons3",
-                PartitionKeyPath = valuePartitionKeyPath,
-                UniqueKeyPolicy = new AzCosmos.UniqueKeyPolicy { UniqueKeys = { new AzCosmos.UniqueKey { Paths = { "/type", "/value/name" } } } }
-            }, 400).ConfigureAwait(false);
-
-            var c4 = await CosmosDatabase.ReplaceOrCreateContainerAsync(new AzCosmos.ContainerProperties
-            {
-                Id = "RefData",
-                PartitionKeyPath = "/_partitionKey",
-                UniqueKeyPolicy = new AzCosmos.UniqueKeyPolicy { UniqueKeys = { new AzCosmos.UniqueKey { Paths = { "/type", "/value/code" } } } }
-            }, 400);
-
-            var c5 = await CosmosDatabase.ReplaceOrCreateContainerAsync(new AzCosmos.ContainerProperties
-            {
-                Id = "PersonsX",
-                PartitionKeyPath = "/_partitionKey"
-            }, 400);
-
-            var db = new CosmosDb(auth: false);
-
-            var jdr = JsonDataReader.ParseYaml<CosmosDb>("Data.yaml");
-            await db.Persons1.ImportBatchAsync(jdr);
-            await db.Persons2.ImportBatchAsync(jdr);
-            await db.Persons3.ImportValueBatchAsync(jdr);
-            await db.ImportValueBatchAsync("Persons3", new Person1[] { new() { Id = 100.ToGuid().ToString(), Filter = "A" } }); // Add other random "type" to Person3.
-            await db.PersonsX.ImportJsonBatchAsync(jdr, "PersonX");
-
-            jdr = JsonDataReader.ParseYaml<CosmosDb>("RefData.yaml", new JsonDataReaderArgs(new Text.Json.ReferenceDataContentJsonSerializer()));
-            await db.ImportValueBatchAsync("RefData", jdr, new Type[] { typeof(Gender) });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Cosmos.Test/TestingWithEmulator.md b/tests/CoreEx.Cosmos.Test/TestingWithEmulator.md
deleted file mode 100644
index abdcc8fa..00000000
--- a/tests/CoreEx.Cosmos.Test/TestingWithEmulator.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# About
-
-Tests can be executed with [Cosmos Db Emulator](https://learn.microsoft.com/en-us/azure/cosmos-db/linux-emulator?tabs=sql-api%2Cssl-netstd21) running in a container.
-
-> Caution! Emulator requires 4 CPUs to execute tests successfully. That's more than free GitHub runners offer (2).
-
-## Docker compose
-
-Use following docker compose file to simulate github actions environment:
-
-```yaml
-# To run in root directory: docker-compose -f docker-compose.cosmos.yml run --rm myhr-cosmos-tests
-version: '3.4'
-
-services:
-
-  cosmos:
-    image: mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest
-    container_name: azure-cosmos-emulator
-    healthcheck:
-      test: curl -f -k https://localhost:8081/_explorer/emulator.pem || exit 1
-      interval: 1m30s
-      timeout: 10s
-      retries: 3
-      start_period: 30s
-    tty: true
-    ports:
-      - 8081:8081
-      - 10251:10251
-      - 10252:10252
-      - 10253:10253
-      - 10254:10254
-      - 10255:10255
-    environment:
-      - AZURE_COSMOS_EMULATOR_PARTITION_COUNT=20
-      - AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE=false
-    deploy:
-      resources:
-        limits:
-          cpus: "4.0" # Tests fail with 2 CPUs
-          memory: 4g
-
-  myhr-cosmos-tests:
-    image: mcr.microsoft.com/dotnet/sdk:6.0
-    stdin_open: true # docker run -i
-    tty: true        # docker run -t
-    volumes:
-       - .:/src
-    command: cd /src/tests/CoreEx.Cosmos.Test && dotnet test
-    depends_on:
-      - cosmos
-```
-
-## Running tests
-
-* Connection string needs to be updated to reflect docker service name: `AzCosmos.CosmosClient("https://cosmos:8081"`.
-* cd to tests directory `cd src/tests/CoreEx.Cosmos.Test/`
-* run tests `dotnet test`
diff --git a/tests/CoreEx.Cosmos.Test/Usings.cs b/tests/CoreEx.Cosmos.Test/Usings.cs
deleted file mode 100644
index cefced49..00000000
--- a/tests/CoreEx.Cosmos.Test/Usings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using NUnit.Framework;
\ No newline at end of file
diff --git a/tests/CoreEx.Data.Test.Unit/CoreEx.Data.Test.Unit.csproj b/tests/CoreEx.Data.Test.Unit/CoreEx.Data.Test.Unit.csproj
new file mode 100644
index 00000000..5c76dc5e
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/CoreEx.Data.Test.Unit.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="Resources\FilterSchema.json" />
+    <None Remove="Resources\FilterToString.txt" />
+    <None Remove="Resources\OrderBySchema.json" />
+    <None Remove="Resources\OrderByToString.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\FilterSchema.json" />
+    <EmbeddedResource Include="Resources\FilterToString.txt" />
+    <EmbeddedResource Include="Resources\OrderBySchema.json" />
+    <EmbeddedResource Include="Resources\OrderByToString.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.Data.Test.Unit/Querying/QueryFilterParserTests.cs b/tests/CoreEx.Data.Test.Unit/Querying/QueryFilterParserTests.cs
new file mode 100644
index 00000000..22e3df8c
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Querying/QueryFilterParserTests.cs
@@ -0,0 +1,243 @@
+using CoreEx.Data.Querying;
+using CoreEx.Data.Querying.Expressions;
+using CoreEx.Entities;
+
+namespace CoreEx.Data.Test.Unit.Querying;
+
+[TestFixture]
+public class QueryFilterParserTests
+{
+    // NOTHING...
+    [TestCase(null, null)]
+    [TestCase("", null)]
+    [TestCase("  ", null)]
+
+    // COMPARISON...
+    [TestCase("lastname eq 'Smith'", "(LastName != null && LastName == @0)", "Smith")]
+    [TestCase("lastname eq null", "LastName == null")]
+    [TestCase("firstname eq 'Angela'", "FirstName.ToUpper() == @0", "ANGELA")]
+    [TestCase("code eq 'Xyz'", "Code == @0", "Xyz")]
+    [TestCase("age lt 100", "Age < @0", 100)]
+    [TestCase("age le 100", "Age <= @0", 100)]
+    [TestCase("age gt 100", "Age > @0", 100)]
+    [TestCase("age ge 100", "Age >= @0", 100)]
+    [TestCase("salary gt 1036.42", "Salary > @0", 1036.42)]
+    [TestCase("isold eq true", "IsOld == true")]
+    [TestCase("IsOld ne false", "IsOld != false")]
+    [TestCase("ISOLD ne null", "IsOld != null")]
+    [TestCase("isold", "IsOld")]
+    [TestCase("messagetype eq 'info'", "MessageType == @0", MessageType.Info)]
+
+    // IN...
+    [TestCase("code in ('abc', 'def')", "Code in (@0, @1)", "abc", "def")]
+    [TestCase("age in (20, 30, 40)", "Age in (@0, @1, @2)", 20, 30, 40)]
+    [TestCase("age in (20)", "Age in (@0)", 20)]
+
+    // AND/OR...
+    [TestCase("(age eq 1 or age eq 2) and isold eq true", "(Age == @0 || Age == @1) && IsOld == true", 1, 2)]
+    [TestCase("  (  age  eq  1  or  age  eq  2 )  and   isold    ", "(Age == @0 || Age == @1) && IsOld", 1, 2)]
+    [TestCase("(age eq 1 or age eq 2) or (age eq 8 or age eq 9)", "(Age == @0 || Age == @1) || (Age == @2 || Age == @3)", 1, 2, 8, 9)]
+    [TestCase("((age eq 1 or age eq 2) or (age eq 8 or age eq 9))", "((Age == @0 || Age == @1) || (Age == @2 || Age == @3))", 1, 2, 8, 9)]
+
+    // FUNCTIONS...
+    [TestCase("startswith(firstName, 'abc')", "FirstName.ToUpper().StartsWith(@0)", "ABC")]
+    [TestCase("endswith(firstName, 'abc')", "FirstName.ToUpper().EndsWith(@0)", "ABC")]
+    [TestCase("contains(firstName, 'abc')", "FirstName.ToUpper().Contains(@0)", "ABC")]
+    [TestCase("contains(lastname, 'xyz')", "(LastName != null && LastName.Contains(@0))", "xyz")]
+
+    // NOT...
+    [TestCase("not (age eq 1)", "!(Age == @0)", 1)]
+    [TestCase("age eq 1 and not (age eq 2)", "Age == @0 && !(Age == @1)", 1, 2)]
+
+    // LITERALS...
+    [TestCase("code eq ''", "Code == @0", "")]
+    [TestCase("code eq ''''", "Code == @0", "'")]
+    [TestCase("code eq 'x''x'", "Code == @0", "x'x")]
+    [TestCase("code eq 'x'''", "Code == @0", "x'")]
+    [TestCase("code eq '''x'", "Code == @0", "'x")]
+    [TestCase("code eq '''x'''", "Code == @0", "'x'")]
+    [TestCase("code eq 'null'", "Code == @0", "null")]
+
+    // NULL_FIELD...
+    [TestCase("terminated eq null", "TerminatedDate == null")]
+    [TestCase("terminated ne null", "TerminatedDate != null")]
+    public void Parse_Success(string? filter, string? expected, params object[] expectedArgs) => TestUtility.AssertFilterSuccess(filter, expected, expectedArgs);
+
+    [Test]
+    public void Parse_Dates_Success()
+    {
+        TestUtility.AssertFilterSuccess("birthday eq 1980-01-01", "BirthDate == @0", new DateTime(1980, 1, 1));
+        TestUtility.AssertFilterSuccess("birthday ne 1980-01-01", "BirthDate != @0", new DateTime(1980, 1, 1));
+    }
+
+    // COMPARISON...
+    [TestCase("banana", "Field 'banana' is not supported.")]
+    [TestCase("banana eq", "Field 'banana' is not supported.")]
+    [TestCase("age apple", "Field 'age' does not support 'apple' as an operator.")]
+    [TestCase("age 'apple'", "Field 'age' does not support ''apple'' as an operator.")]
+    [TestCase("age eq 'apple'", "Field 'age' constant 'apple' must not be specified as a Literal where the underlying type is not a string.")]
+    [TestCase("age eq 1990-01-01", "Field 'age' has a value '1990-01-01' that is not a valid Int32: The input string '1990-01-01' was not in a correct format.")]
+    [TestCase("null eq null", "There is a 'null' positioning that is syntactically incorrect.")]
+    [TestCase("true eq null", "There is a 'true' positioning that is syntactically incorrect.")]
+    [TestCase("false eq null", "There is a 'false' positioning that is syntactically incorrect.")]
+    [TestCase("and", "There is a 'and' positioning that is syntactically incorrect.")]
+    [TestCase("or", "There is a 'or' positioning that is syntactically incorrect.")]
+    [TestCase("and age eq 1", "There is a 'and' positioning that is syntactically incorrect.")]
+    [TestCase("or age eq 1", "There is a 'or' positioning that is syntactically incorrect.")]
+    [TestCase("age eq 1 and", "The final expression is incomplete.")]
+    [TestCase("age eq 1 or", "The final expression is incomplete.")]
+    [TestCase("isold ge true", "Field 'isold' does not support the 'ge' operator.")]
+    [TestCase("age xx 1", "Field 'age' does not support 'xx' as an operator.")]
+    [TestCase("age ge null", "Field 'age' constant must not be null for an 'ge' operator.")]
+    [TestCase("age eq null", "Field 'age' constant 'null' is not supported.")]
+    [TestCase("messagetype eq 'wonky'", "Field 'messagetype' has a value 'wonky' that is not a valid MessageType.")]
+
+    // BRACKETS...
+    [TestCase("(age eq 1", "There is an opening '(' that has no matching closing ')'.")]
+    [TestCase("age eq 1)", "There is a closing ')' that has no matching opening '('.")]
+    [TestCase("age ( 1", "Field 'age' does not support '(' as an operator.")]
+    [TestCase("age eq (", "Field 'age' constant '(' is not considered valid.")]
+    [TestCase("age eq )", "Field 'age' constant ')' is not considered valid.")]
+
+    // IN...
+    [TestCase("code in", "The final expression is incomplete.")]
+    [TestCase("code in ()", "Field 'code' constant must be specified before the closing ')' for the 'in' operator.")]
+    [TestCase("code in (null)", "Field 'code' constant must not be null for an 'in' operator.")]
+    [TestCase("code in ))", "Field 'code' must specify an opening '(' for the 'in' operator.")]
+    [TestCase("code in ((", "Field 'code' must close ')' the 'in' operator before specifying a further open '('.")]
+    [TestCase("code in (,)", "Field 'code' constant ',' is not considered valid.")]
+    [TestCase("age in (1 2)", "Field 'age' expects a ',' separator between constant values for an 'in' operator.")]
+
+    // AND/OR...
+    [TestCase("or age eq 1", "There is a 'or' positioning that is syntactically incorrect.")]
+    [TestCase("and age eq 1", "There is a 'and' positioning that is syntactically incorrect.")]
+    [TestCase("age or eq 1", "Field 'age' does not support 'or' as an operator.")]
+    [TestCase("age eq and 1", "Field 'age' constant 'and' is not considered valid.")]
+    [TestCase("age eq 1 and and age eq 2", "There is a 'and' positioning that is syntactically incorrect.")]
+    [TestCase("age eq 1 or or age eq 2", "There is a 'or' positioning that is syntactically incorrect.")]
+
+    // FUNCTIONS...
+    [TestCase("startswith(code, 'abc')", "Field 'code' does not support the 'startswith' function.")]
+    [TestCase("startswith)code, 'abc')", "A 'startswith' function expects an opening '(' not a ')'.")]
+    [TestCase("startswith(firstname( 'abc')", "A 'startswith' function expects a ',' separator between the field and its constant.")]
+    [TestCase("startswith(firstname, null)", "A 'startswith' function references a null constant which is not supported.")]
+    [TestCase("startswith(firstname, 'abc',", "A 'startswith' function expects a closing ')' not a ','.")]
+
+    // NOT...
+    [TestCase("age eq 1 and not age eq 2", "A 'not' expects an opening '(' to start an expression versus a syntactically incorrect 'age' token.")]
+    [TestCase("age  eq  1  not", "There is a 'not' positioning that is syntactically incorrect.")]
+
+    // LITERALS...
+    [TestCase("code eq '", "A Literal has not been terminated.")]
+    [TestCase("code eq '''", "A Literal has not been terminated.")]
+    [TestCase("code eq '''''", "A Literal has not been terminated.")]
+    [TestCase("code eq 1", "Field 'code' constant '1' must be specified as a Literal where the underlying type is a string.")]
+    [TestCase("age eq '8'", "Field 'age' constant '8' must not be specified as a Literal where the underlying type is not a string.")]
+
+    // DATES...
+    [TestCase("birthday eq '32'", "Field 'birthday' constant '32' must not be specified as a Literal where the underlying type is not a string.")]
+    [TestCase("birthday eq kiwifruit", "Field 'birthday' constant 'kiwifruit' is not considered valid.")]
+    [TestCase("birthday eq 1980-13-01", "Field 'birthday' has a value '1980-13-01' that is not a valid DateTime: String '1980-13-01' was not recognized as a valid DateTime.")]
+    [TestCase("birthday eq 1980-01-32", "Field 'birthday' has a value '1980-01-32' that is not a valid DateTime: String '1980-01-32' was not recognized as a valid DateTime.")]
+
+    // NULL_FIELD...
+    [TestCase("terminated eq 13", "Field 'terminated' with value '13' is invalid: Only null comparisons are supported.")]
+    [TestCase("terminated gt null", "Field 'terminated' does not support the 'gt' operator.")]
+    public void Parse_Error(string? filter, string expected) => TestUtility.AssertFilterError(filter, expected);
+
+    [TestCase("lastname eq 'Smith'", "LastName == @0", "Smith")]
+    [TestCase(null, "LastName == @0", "Brown")]
+    [TestCase("firstname eq 'Jenny'", "FirstName == @0 && LastName == @1", "Jenny", "Brown")]
+    public void Parse_WithFieldDefault(string? filter, string expected, params object[] expectedArgs)
+    {
+        var config = QueryArgsConfig.Create()
+            .WithFilter(filter => filter
+                .AddField<string>("LastName", c => c.WithDefault(new QueryStatement("LastName == @0", "Brown")))
+                .AddField<string>("FirstName")
+                .WithDefault(new QueryStatement("FirstName == @0", "Zoe")));
+
+        TestUtility.AssertFilterSuccess(config, filter, expected, expectedArgs);
+    }
+
+    [TestCase("lastname eq 'Smith'", "LastName == @0", "Smith")]
+    [TestCase("", "FirstName == @0", "Zoe")]
+    [TestCase(null, "FirstName == @0", "Zoe")]
+    public void Parse_WithDefault(string? filter, string expected, params object[] expectedArgs)
+    {
+        var config = QueryArgsConfig.Create()
+            .WithFilter(filter => filter
+                .AddField<string>("LastName")
+                .AddField<string>("FirstName")
+                .WithDefault(new QueryStatement("FirstName == @0", "Zoe")));
+
+        TestUtility.AssertFilterSuccess(config, filter, expected, expectedArgs);
+    }
+
+    [TestCase(true, "lastname eq 'Smith'", "LastName == @0", "Smith")]
+    [TestCase(true, "firstname eq 'Angela'", "FirstName == @0 && LastName != null", "Angela")]
+    [TestCase(true, null, "LastName != null")]
+    [TestCase(false, "lastname eq 'Smith' and firstname eq 'Angela'", "Only a single field filter is allowed.")]
+    public void Parse_OnQuery(bool success, string? filter, string expected, params object[] expectedArgs)
+    {
+        var config = QueryArgsConfig.Create()
+            .WithFilter(filter => filter
+                .AddField<string>("LastName")
+                .AddField<string>("FirstName")
+                .OnQuery(result =>
+                {
+                    if (!result.Fields.Contains("LastName"))
+                        result.Writer.AppendStatement(new QueryStatement("LastName != null"));
+
+                    if (result.Fields.Count > 1)
+                        throw new QueryFilterParserException("Only a single field filter is allowed.");
+                }));
+
+        if (success)
+            TestUtility.AssertFilterSuccess(config, filter, expected, expectedArgs);
+        else
+            TestUtility.AssertFilterError(config, filter, expected);
+    }
+
+    [TestCase("lastname ne 'abc'", "LastName != @0", "abc")]
+    [TestCase("lastname eq 'abc'", "LastName EQUALS @0", "abc")]
+    public void Parse_WithResultWriter(string? filter, string expected, string expectedArgs)
+    {
+        static bool LastNameWriter(IQueryFilterFieldStatementExpression expression, QueryFilterParserWriter writer)
+        {
+            if (expression is QueryFilterOperatorExpression oex && oex.Operator.Kind == QueryFilterTokenKind.Equal)
+            {
+                writer.AppendStatement(new QueryStatement("LastName EQUALS @0", oex.GetConstantValue(0)));
+                return true;
+            }
+
+            return false;
+        }
+
+        var config = QueryArgsConfig.Create()
+            .WithFilter(filter => filter
+                .AddField<string>("LastName", c => c.WithResultWriter(LastNameWriter))
+                .AddField<string>("FirstName"));
+    }
+
+    [Test]
+    public void Config_ToString()
+    {
+        var s = TestUtility.Config.FilterParser.ToString().ReplaceLineEndings("\n");
+        s.Should().NotBeNull();
+
+        Console.WriteLine(s);
+
+        s.Should().NotBeNull().And.Be(Resource.GetString("FilterToString.txt"));
+    }
+
+    [Test]
+    public void Config_ToSchemaDictionary()
+    {
+        var json = TestUtility.Config.FilterParser.ToJsonSchema();
+        json.Should().NotBeNull();
+
+        Console.WriteLine(json.ToString());
+
+        ObjectComparer.AssertJsonFromResource("FilterSchema.json", json.ToString());
+    }
+}
diff --git a/tests/CoreEx.Data.Test.Unit/Querying/QueryOrderByParserTests.cs b/tests/CoreEx.Data.Test.Unit/Querying/QueryOrderByParserTests.cs
new file mode 100644
index 00000000..d5b4d677
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Querying/QueryOrderByParserTests.cs
@@ -0,0 +1,39 @@
+namespace CoreEx.Data.Test.Unit.Querying;
+
+[TestFixture]
+public class QueryOrderByParserTests
+{
+    [TestCase("firstname asc, birthday", "FirstName, BirthDate")]
+    [TestCase("lastname asc, birthday desc", "LastName, BirthDate desc")]
+    [TestCase(null, "LastName, FirstName")]
+    public void Parse_Success(string? filter, string expected) => TestUtility.AssertOrderBySuccess(filter, expected);
+
+    [TestCase("firstname, middlename", "Field 'middlename' is not supported.")]
+    [TestCase("firstname, birthday asc", "Field 'birthday' direction 'asc' is invalid; not supported.")]
+    [TestCase("firstname, birthday both", "Field 'birthday' direction 'both' is invalid; must be either 'asc' (ascending) or 'desc' (descending).")]
+    [TestCase("firstname asc, firstname desc", "Field 'firstname' must not be specified more than once.")]
+    [TestCase("firstname asc desc", "Statement is syntactically incorrect.")]
+    public void Parse_Error(string? filter, string expected) => TestUtility.AssertOrderByError(filter, expected);
+
+    [Test]
+    public void Config_ToString()
+    {
+        var s = TestUtility.Config.OrderByParser.ToString().ReplaceLineEndings("\n");
+        s.Should().NotBeNull();
+
+        Console.WriteLine(s);
+
+        s.Should().NotBeNull().And.Be(Resource.GetString("OrderByToString.txt"));
+    }
+
+    [Test]
+    public void Config_ToSchemaDictionary()
+    {
+        var json = TestUtility.Config.OrderByParser.ToJsonSchema();
+        json.Should().NotBeNull();
+
+        Console.WriteLine(json.ToString());
+
+        ObjectComparer.AssertJsonFromResource("OrderBySchema.json", json.ToString());
+    }
+}
diff --git a/tests/CoreEx.Data.Test.Unit/Querying/TestUtility.cs b/tests/CoreEx.Data.Test.Unit/Querying/TestUtility.cs
new file mode 100644
index 00000000..1a6bdd29
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Querying/TestUtility.cs
@@ -0,0 +1,71 @@
+using CoreEx.Data.Querying;
+using CoreEx.Entities;
+using CoreEx.Http;
+
+namespace CoreEx.Data.Test.Unit.Querying;
+
+internal class TestUtility
+{
+    public static readonly QueryArgsConfig Config = QueryArgsConfig.Create()
+        .WithFilter(filter => filter
+            .AddField<string>("LastName", c => c.WithOperators(QueryFilterOperator.AllStringOperators).AlsoCheckNotNull())
+            .AddField<string>("FirstName", c => c.WithOperators(QueryFilterOperator.AllStringOperators).AsUpperCase())
+            .AddField<string>("Code", c => c.WithOperators(QueryFilterOperator.EqualityOperators))
+            .AddField<DateTime>("Birthday", "BirthDate")
+            .AddField<int>("Age", c => c.WithHelpText("Age is but a number."))
+            .AddField<decimal>("Salary")
+            .AddField<bool>("IsOld", c => c.AsNullable())
+            .AddNullField("Terminated", "TerminatedDate")
+            .AddField<MessageType>("MessageType")
+            .WithHelpText($"The OData-like filtering is awesome!"))
+        .WithOrderBy(order => order
+            .AddField("LastName", c => c.WithDefault())
+            .AddField("FirstName", c => c.WithDefault())
+            .AddField("Birthday", "BirthDate", c => c.WithDirection(QueryOrderByDirection.Descending))
+            .WithHelpText($"The OData-like ordering is awesome!"));
+
+    public static void AssertFilterSuccess(string? filter, string? expected, params object[] expectedArgs) => AssertFilterSuccess(Config, filter, expected, expectedArgs);
+
+    public static void AssertFilterSuccess(QueryArgsConfig config, string? filter, string? expected, params object[] expectedArgs)
+    {
+        var result = config.FilterParser.Parse(filter);
+        result.Should().NotBeNull();
+        result.HasError.Should().BeFalse();
+        result.Error.Should().BeNull();
+        result.ToLinqString(out var args).Should().Be(expected);
+        args.Should().BeEquivalentTo(expectedArgs);
+    }
+
+    public static void AssertFilterError(string? filter, string expected) => AssertFilterError(Config, filter, expected);
+
+    public static void AssertFilterError(QueryArgsConfig config, string? filter, string expected)
+    {
+        var result = config.FilterParser.Parse(filter);
+        result.Should().NotBeNull();
+        result.HasError.Should().BeTrue();
+        result.Error.Should().NotBeNull();
+        result.Error.Messages.Should().NotBeNull().And.HaveCount(1);
+        result.Error.Messages[0].Property.Should().Be(HttpNames.QueryFilterQueryStringName);
+        result.Error.Messages[0].Text.ToString().Should().StartWith(expected);
+    }
+
+    public static void AssertOrderBySuccess(string? orderBy, string expected)
+    {
+        var result = Config.OrderByParser.Parse(orderBy);
+        result.Should().NotBeNull();
+        result.HasError.Should().BeFalse();
+        result.Error.Should().BeNull();
+        result.ToLinqString().Should().Be(expected);
+    }
+
+    public static void AssertOrderByError(string? orderBy, string expected)
+    {
+        var result = Config.OrderByParser.Parse(orderBy);
+        result.Should().NotBeNull();
+        result.HasError.Should().BeTrue();
+        result.Error.Should().NotBeNull();
+        result.Error.Messages.Should().NotBeNull().And.HaveCount(1);
+        result.Error.Messages[0].Property.Should().Be(HttpNames.QueryOrderByQueryStringName);
+        result.Error.Messages[0].Text.ToString().Should().StartWith(expected);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Data.Test.Unit/Resources/FilterSchema.json b/tests/CoreEx.Data.Test.Unit/Resources/FilterSchema.json
new file mode 100644
index 00000000..09086fc2
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Resources/FilterSchema.json
@@ -0,0 +1,49 @@
+{
+  "fields": {
+    "lastname": {
+      "type": "string",
+      "nullable": true,
+      "operators": [ "eq", "ne", "lt", "le", "ge", "gt", "in", "startswith", "contains", "endswith" ]
+    },
+    "firstname": {
+      "type": "string",
+      "operators": [ "eq", "ne", "lt", "le", "ge", "gt", "in", "startswith", "contains", "endswith" ]
+    },
+    "code": {
+      "type": "string",
+      "operators": [ "eq", "ne", "in" ]
+    },
+    "birthday": {
+      "type": "string",
+      "format": "date-time",
+      "operators": [ "eq", "ne", "lt", "le", "ge", "gt", "in" ]
+    },
+    "age": {
+      "type": "integer",
+      "format": "int32",
+      "operators": [ "eq", "ne", "lt", "le", "ge", "gt", "in" ],
+      "description": "Age is but a number."
+    },
+    "salary": {
+      "type": "number",
+      "format": "decimal",
+      "operators": [ "eq", "ne", "lt", "le", "ge", "gt", "in" ]
+    },
+    "isold": {
+      "type": "boolean",
+      "nullable": true,
+      "operators": [ "eq", "ne" ]
+    },
+    "terminated": {
+      "type": "object",
+      "nullable": true,
+      "operators": [ "eq", "ne" ]
+    },
+    "messagetype": {
+      "type": "string",
+      "operators": [ "eq", "ne", "in" ],
+      "enum": [ "Info", "Warning", "Error" ]
+    }
+  },
+  "description": "The OData-like filtering is awesome!"
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Data.Test.Unit/Resources/FilterToString.txt b/tests/CoreEx.Data.Test.Unit/Resources/FilterToString.txt
new file mode 100644
index 00000000..8c6297c6
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Resources/FilterToString.txt
@@ -0,0 +1,12 @@
+Filter field(s) are as follows:
+LastName (Type: String, Null: true, Operators: EQ, NE, LT, LE, GE, GT, IN, StartsWith, Contains, EndsWith)
+FirstName (Type: String, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN, StartsWith, Contains, EndsWith)
+Code (Type: String, Null: false, Operators: EQ, NE, IN)
+Birthday (Type: DateTime, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN)
+Age (Type: Int32, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN) - Age is but a number.
+Salary (Type: Decimal, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN)
+IsOld (Type: Boolean, Null: true, Operators: EQ, NE)
+Terminated (Type: <none>, Null: true, Operators: EQ, NE)
+MessageType (Type: MessageType, Null: false, Operators: EQ, NE, IN)
+---
+Note: The OData-like filtering is awesome!
\ No newline at end of file
diff --git a/tests/CoreEx.Data.Test.Unit/Resources/OrderBySchema.json b/tests/CoreEx.Data.Test.Unit/Resources/OrderBySchema.json
new file mode 100644
index 00000000..da4e03f3
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Resources/OrderBySchema.json
@@ -0,0 +1,9 @@
+{
+  "fields": {
+    "lastname": { "direction": [ "asc", "desc" ] },
+    "firstname": { "direction": [ "asc", "desc" ] },
+    "birthday": { "direction": [ "desc" ] }
+  },
+  "default": "lastname asc, firstname asc",
+  "description": "The OData-like ordering is awesome!"
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Data.Test.Unit/Resources/OrderByToString.txt b/tests/CoreEx.Data.Test.Unit/Resources/OrderByToString.txt
new file mode 100644
index 00000000..eedf39bb
--- /dev/null
+++ b/tests/CoreEx.Data.Test.Unit/Resources/OrderByToString.txt
@@ -0,0 +1,8 @@
+Order-by field(s) are as follows:
+lastname (Direction: asc or desc)
+firstname (Direction: asc or desc)
+birthday (Direction: desc)
+---
+Default: lastname asc, firstname asc
+---
+Note: The OData-like ordering is awesome!
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Console/CoreEx.Database.Postgres.Test.Console.csproj b/tests/CoreEx.Database.Postgres.Test.Console/CoreEx.Database.Postgres.Test.Console.csproj
new file mode 100644
index 00000000..9aeb57db
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Console/CoreEx.Database.Postgres.Test.Console.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DbEx.Postgres" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+</Project>
diff --git a/tests/CoreEx.Database.Postgres.Test.Console/Data/data.yaml b/tests/CoreEx.Database.Postgres.Test.Console/Data/data.yaml
new file mode 100644
index 00000000..b3dd3a8e
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Console/Data/data.yaml
@@ -0,0 +1,12 @@
+test:
+- table:
+  - { table_id: 1 }
+  - { table_id: 2, text: Abc, number: 123, amount: 45.67, flag: true, date: 2024-06-20, time: 14:30:59, tenant_id: A, json: {"Key":"Value"} }
+  - { table_id: 3, text: Ace, number: 567, amount: 45.67, flag: true, date: 2024-03-13, time: 14:30:59, tenant_id: A, json: {"Key":"Value"} }
+  - { table_id: 4, text: Bdf, number: 901, amount: 45.67, flag: false, date: 2025-01-08, time: 14:30:59, tenant_id: B, is_deleted: 1, json: {"Key":"Value"} }
+  - { table_id: 5, text: Qrs, number: 765, amount: 45.67, flag: true, date: 2024-06-20, time: 14:30:59, tenant_id: B, json: {"Key":"Value"} }
+  - { table_id: 6, text: Jkl, number: 765, amount: 56.24, flag: true, date: 2024-06-20, time: 14:30:59, tenant_id: A, json: {"Key":"Value"} }
+  - { table_id: 7, text: Blq, number: 765, amount: 45.67, flag: false, date: 2024-06-20, time: 14:30:59, tenant_id: A, json: {"Key":"Value"} }
+  - { table_id: 8, text: Zyi, number: 765, amount: 99.23, flag: true, date: 2024-06-20, time: 14:30:59, tenant_id: A, json: {"Key":"Value"} }
+  - { table_id: 9, text: Abz, number: 765, amount: 45.67, flag: true, date: 2024-06-20, time: 14:30:59, tenant_id: A, json: {"Key":"Value"} }
+  - { table_id: 10, text: Qpo, number: 881, amount: 12.67, flag: true, date: 2024-06-20, time: 14:30:59, tenant_id: A, is_deleted: 1, json: {"Key":"Value"} }
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Console/Migrations/001-create-test-schema.sql b/tests/CoreEx.Database.Postgres.Test.Console/Migrations/001-create-test-schema.sql
new file mode 100644
index 00000000..15676c26
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Console/Migrations/001-create-test-schema.sql
@@ -0,0 +1,3 @@
+-- Create schema: "test"
+
+CREATE SCHEMA "test";
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Console/Migrations/002-create-test-table.sql b/tests/CoreEx.Database.Postgres.Test.Console/Migrations/002-create-test-table.sql
new file mode 100644
index 00000000..0af76b22
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Console/Migrations/002-create-test-table.sql
@@ -0,0 +1,18 @@
+-- Create table: "test"."table"
+
+CREATE TABLE "test"."table" (
+    "table_id" UUID NOT NULL DEFAULT gen_random_uuid() PRIMARY KEY,
+    "text" VARCHAR(200) NULL,
+    "number" INT NULL,
+    "amount" DECIMAL(19, 4) NULL,
+    "flag" BOOLEAN NULL,
+    "date" DATE NULL,
+    "time" TIME NULL,
+    "json" JSONB NULL,
+    "tenant_id" VARCHAR(20) NULL,
+    "created_by" VARCHAR(250) NULL,
+    "created_on" TIMESTAMPTZ NULL,
+    "updated_by" VARCHAR(250) NULL,
+    "updated_on" TIMESTAMPTZ NULL,
+    "is_deleted" BOOLEAN DEFAULT false NOT NULL
+);
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Console/Migrations/003-create-test-table-unique-index.sql b/tests/CoreEx.Database.Postgres.Test.Console/Migrations/003-create-test-table-unique-index.sql
new file mode 100644
index 00000000..66917088
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Console/Migrations/003-create-test-table-unique-index.sql
@@ -0,0 +1,2 @@
+CREATE UNIQUE INDEX "ix_test_table_tenant_id_text"
+  ON "test"."table" ("tenant_id", "text");
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Console/Program.cs b/tests/CoreEx.Database.Postgres.Test.Console/Program.cs
new file mode 100644
index 00000000..23ce8624
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Console/Program.cs
@@ -0,0 +1,27 @@
+using DbEx.Migration;
+using DbEx.Postgres.Console;
+
+namespace CoreEx.Database.Postgres.Test.Console;
+
+/// <summary>
+/// Represents the <b>database utilities</b> program (capability).
+/// </summary>
+public class Program
+{
+    /// <summary>
+    /// Main startup.
+    /// </summary>
+    /// <param name="args">The startup arguments.</param>
+    /// <returns>The status code whereby zero indicates success.</returns>
+    public static Task<int> Main(string[] args) => PostgresMigrationConsole
+        .Create<Program>("Server=127.0.0.1;Database=coreex_test;Username=postgres;Password=yourStrong#!Password;Pooling=false")
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>
+    /// Configure the <see cref="MigrationArgs"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="MigrationArgs"/>.</param>
+    /// <returns>The <see cref="MigrationArgs"/>.</returns>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().IncludeExtendedSchemaScripts();
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/Contracts/TestTableDto.cs b/tests/CoreEx.Database.Postgres.Test.Unit/Contracts/TestTableDto.cs
new file mode 100644
index 00000000..d230405b
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/Contracts/TestTableDto.cs
@@ -0,0 +1,21 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Database.Postgres.Test.Unit.Contracts;
+
+public class TestTableDto : IIdentifier<Guid>, IETag, IChangeLog
+{
+    public Guid Id { get; set; }
+    public string? Text { get; set; }
+    public int? Number { get; set; }
+    public decimal? Amount { get; set; }
+    public DateOnly? Date { get; set; }
+    public TimeOnly? Time { get; set; }
+    public KeyValueDto? Key { get; set; }
+    public string? ETag { get; set; }
+    public ChangeLog? ChangeLog { get; set; }
+
+    public class KeyValueDto
+    {
+        public string? Key { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/Contracts/TestTableDtoMapper.cs b/tests/CoreEx.Database.Postgres.Test.Unit/Contracts/TestTableDtoMapper.cs
new file mode 100644
index 00000000..744c6959
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/Contracts/TestTableDtoMapper.cs
@@ -0,0 +1,32 @@
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.Json;
+using CoreEx.Mapping;
+using System.Text.Json;
+
+namespace CoreEx.Database.Postgres.Test.Unit.Contracts;
+
+public class TestTableDtoMapper : BiDirectionMapper<TestTableDto, TestTable, TestTableDtoMapper>
+{
+    protected override TestTable OnMap(TestTableDto source) => new TestTable()
+    {
+        Id = source.Id,
+        Text = source.Text,
+        Number = source.Number,
+        Amount = source.Amount,
+        Date = source.Date,
+        Time = source.Time,
+        Json = source.Key is null ? null : JsonSerializer.SerializeToElement(source.Key, JsonDefaults.SerializerOptions),
+        Flag = true
+    }.MapStandardFrom(source);
+
+    protected override TestTableDto OnMap(TestTable source) => new TestTableDto()
+    {
+        Id = source.Id,
+        Text = source.Text,
+        Number = source.Number,
+        Amount = source.Amount,
+        Date = source.Date,
+        Time = source.Time,
+        Key = source.Json?.Deserialize<TestTableDto.KeyValueDto>(JsonDefaults.SerializerOptions)
+    }.MapStandardFrom(source);
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/CoreEx.Database.Postgres.Test.Unit.csproj b/tests/CoreEx.Database.Postgres.Test.Unit/CoreEx.Database.Postgres.Test.Unit.csproj
new file mode 100644
index 00000000..5b3912a2
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/CoreEx.Database.Postgres.Test.Unit.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="DbEx.Postgres" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Database.Postgres\CoreEx.Database.Postgres.csproj" />
+    <ProjectReference Include="..\CoreEx.Database.Postgres.Test.Console\CoreEx.Database.Postgres.Test.Console.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/DatabaseTestBase.cs b/tests/CoreEx.Database.Postgres.Test.Unit/DatabaseTestBase.cs
new file mode 100644
index 00000000..aab2b315
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/DatabaseTestBase.cs
@@ -0,0 +1,25 @@
+using CoreEx.Database.Postgres.Test.Console;
+using DbEx;
+using DbEx.Migration;
+using DbEx.Postgres.Migration;
+using Microsoft.Extensions.Configuration;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public abstract class DatabaseTestBase : WithGenericTester<EntryPoint>
+{
+    [OneTimeSetUp()]
+    public async Task OneTimeSetUp()
+    {
+        var cs = Test.Configuration.GetValue<string>("Aspire:Npgsql:ConnectionString");
+        var ma = Program.ConfigureMigrationArgs(new MigrationArgs(MigrationCommand.DropAndAll, cs)).AddAssembly<DatabaseTestBase>();
+
+        using var m = new PostgresMigration(ma);
+        var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+
+        TestContext.Progress.WriteLine(Output);
+
+        if (!Success)
+            Assert.Fail("PostgresMigration failed.");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/DatabaseTests.cs b/tests/CoreEx.Database.Postgres.Test.Unit/DatabaseTests.cs
new file mode 100644
index 00000000..f6eca00c
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/DatabaseTests.cs
@@ -0,0 +1,191 @@
+using CoreEx.Database.Postgres.Test.Unit.Models;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public class DatabaseTests : DatabaseTestBase
+{
+    [Test]
+    public void SelectAndGetNullValues() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var tt = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 1.ToGuid()).SelectSingleAsync(new TestTableMapper()).ConfigureAwait(false);
+
+            tt.Should().NotBeNull();
+            tt.Id.Should().Be(1.ToGuid());
+            tt.Text.Should().BeNull();
+            tt.Number.Should().BeNull();
+            tt.Amount.Should().BeNull();
+            tt.Flag.Should().BeNull();
+            tt.Date.Should().BeNull();
+            tt.Time.Should().BeNull();
+            tt.Json.Should().BeNull();
+            tt.ETag.Should().NotBeNull();
+            tt.CreatedBy.Should().NotBeNull();
+            tt.CreatedOn.Should().NotBeNull();
+            tt.UpdatedBy.Should().BeNull();
+            tt.UpdatedOn.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectAndGetValues() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var tt = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 2.ToGuid()).SelectSingleAsync(new TestTableMapper()).ConfigureAwait(false);
+
+            tt.Should().NotBeNull();
+            tt.Id.Should().Be(2.ToGuid());
+            tt.Text.Should().Be("Abc");
+            tt.Number.Should().Be(123);
+            tt.Amount.Should().Be(45.67m);
+            tt.Flag.Should().BeTrue();
+            tt.Date.Should().Be(new DateOnly(2024, 6, 20));
+            tt.Time.Should().Be(new TimeOnly(14, 30, 59));
+            tt.ETag.Should().NotBeNull();
+            tt.Json.Should().NotBeNull().And.Subject.ToString().Should().Be("{\"Key\": \"Value\"}");
+            tt.CreatedBy.Should().NotBeNull();
+            tt.CreatedOn.Should().NotBeNull();
+            tt.UpdatedBy.Should().BeNull();
+            tt.UpdatedOn.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectSingleAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 2.ToGuid()).SelectSingleAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var act = () => db.Statement("SELECT xmin, * FROM \"test\".\"table\"").SelectSingleAsync(new TestTableMapper());
+            await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectSingleAsync has returned more than one row.");
+
+            // No rows.
+            var act2 = () => db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 404.ToGuid()).SelectSingleAsync(new TestTableMapper());
+            await act2.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectSingleAsync has not returned a row.");
+
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectSingleOrDefaultAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 2.ToGuid()).SelectSingleOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var act = () => db.Statement("SELECT xmin, * FROM \"test\".\"table\"").SelectSingleOrDefaultAsync(new TestTableMapper());
+            await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectSingleOrDefaultAsync has returned more than one row.");
+
+            // No rows.
+            var tt2 = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 404.ToGuid()).SelectSingleOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt2.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectFirstAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 2.ToGuid()).SelectFirstAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var tt2 = await db.Statement("SELECT xmin, * FROM \"test\".\"table\"").SelectFirstAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt2.Should().NotBeNull();
+
+            // No rows.
+            var act = () => db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 404.ToGuid()).SelectFirstAsync(new TestTableMapper());
+            await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectFirstAsync has not returned a row.");
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectFirstOrDefaultAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 2.ToGuid()).SelectFirstOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var tt2 = await db.Statement("SELECT xmin, * FROM \"test\".\"table\"").SelectFirstOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt2.Should().NotBeNull();
+
+            // No rows.
+            var tt3 = await db.Statement("SELECT xmin, * FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 404.ToGuid()).SelectFirstOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt3.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectQueryAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var tts = await db.Statement("SELECT xmin, * FROM \"test\".\"table\"").SelectQueryAsync(new TestTableMapper()).ConfigureAwait(false);
+            tts.Should().NotBeNull().And.HaveCount(10);
+
+            var ttc = new List<TestTable>();
+            await db.Statement("SELECT xmin, * FROM \"test\".\"table\"").SelectQueryAsync(ttc, new TestTableMapper()).ConfigureAwait(false);
+            ttc.Should().NotBeNull().And.HaveCount(10);
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var count = 0;
+            await db.Statement("SELECT * FROM \"test\".\"table\"").SelectAsync(r =>
+            {
+                count++;
+                return count < 3;
+            }).ConfigureAwait(false);
+
+            count.Should().Be(3);
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void ScalarAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var count = await db.Statement("SELECT COUNT(*) FROM \"test\".\"table\"").ScalarAsync<long>().ConfigureAwait(false);
+            count.Should().Be(10);
+
+            var created = await db.Statement("SELECT \"created_on\" FROM \"test\".\"table\" WHERE \"table_id\" = @Id LIMIT 1").Param("Id", 1.ToGuid()).ScalarAsync<DateTimeOffset?>().ConfigureAwait(false);
+            created.Should().NotBeNull();
+
+            created = await db.Statement("SELECT \"created_on\" FROM \"test\".\"table\" WHERE \"table_id\" = @Id LIMIT 1").Param("Id", 404.ToGuid()).ScalarAsync<DateTimeOffset?>().ConfigureAwait(false);
+            created.Should().BeNull();
+
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void NonQueryAsync() => Test.ScopedType<PostgresDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var rows = await db.Statement("UPDATE \"test\".\"table\" SET \"number\" = @Number + 1 WHERE \"table_id\" = @Id").Param("Id", 4.ToGuid()).Param("Number", 88).NonQueryAsync().ConfigureAwait(false);
+            rows.Should().Be(1);
+
+            var number = await db.Statement("SELECT \"number\" FROM \"test\".\"table\" WHERE \"table_id\" = @Id").Param("Id", 4.ToGuid()).ScalarAsync<int?>().ConfigureAwait(false);
+            number.Should().Be(89);
+        }).AssertSuccess();
+    });
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Create.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Create.cs
new file mode 100644
index 00000000..066a3ae4
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Create.cs
@@ -0,0 +1,146 @@
+using CoreEx.Database.Postgres.Test.Unit.Contracts;
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using CoreEx.Results;
+using System.Text.Json;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Create_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            IsDeleted = true
+        };
+
+        var act = async () => await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("*Cannot create a model with a deleted state; IsDeleted must be false.*");
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_NotAuthorized() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Flag = false,
+        };
+
+        var r = await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        r.IsAuthorizationError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Duplicate_Id() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 2.ToGuid(),
+            Flag = true
+        };
+
+        var r = await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        r.IsDuplicateError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Duplicate_Text() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = Runtime.NewGuid(),
+            Flag = true,
+            Text = "Abc"
+        };
+
+        var r = await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        r.IsDuplicateError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        using var jd = JsonDocument.Parse("{\"Key\": \"Value\"}");
+        var id = Runtime.NewGuid();
+
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = id,
+            Text = "New",
+            Number = 999,
+            Amount = 12.34m,
+            Flag = true,
+            Date = new DateOnly(2024, 7, 1),
+            Time = new TimeOnly(10, 20, 30),
+            Json = jd.RootElement.Clone()
+        };
+
+        var created = await ef.Table.CreateAsync(m).ConfigureAwait(false);
+
+        created.Should().NotBeNull();
+        created.Value.Id.Should().Be(id);
+        created.Value.Text.Should().Be("New");
+        created.Value.Number.Should().Be(999);
+        created.Value.Amount.Should().Be(12.34m);
+        created.Value.Flag.Should().BeTrue();
+        created.Value.Date.Should().Be(new DateOnly(2024, 7, 1));
+        created.Value.Time.Should().Be(new TimeOnly(10, 20, 30));
+        created.Value.Json.Should().NotBeNull().And.Subject.ToString().Should().Be("{\"Key\": \"Value\"}");
+        created.Value.ETag.Should().NotBeNull();
+        created.Value.TenantId.Should().Be("A");
+        created.Value.CreatedBy.Should().NotBeNull();
+        created.Value.CreatedOn.Should().NotBeNull();
+        created.Value.UpdatedBy.Should().BeNull();
+        created.Value.UpdatedOn.Should().BeNull();
+
+        // Verify can be retrieved and is same.
+        m = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        ObjectComparer.Assert(created.Value, m);
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Mapped_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = Runtime.NewGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var v = new TestTableDto
+        {
+            Id = id,
+            Text = "Val",
+            Number = 999,
+            Amount = 12.34m,
+            Date = new DateOnly(2024, 7, 1),
+            Time = new TimeOnly(10, 20, 30),
+            Key = new TestTableDto.KeyValueDto { Key = "Value" }
+        };
+
+        var created = await ef.TableDto.CreateAsync(v).ConfigureAwait(false);
+
+        created.Should().NotBeNull();
+        created.Value.Id.Should().Be(id);
+        created.Value.Text.Should().Be("Val");
+        created.Value.Number.Should().Be(999);
+        created.Value.Amount.Should().Be(12.34m);
+        created.Value.Date.Should().Be(new DateOnly(2024, 7, 1));
+        created.Value.Time.Should().Be(new TimeOnly(10, 20, 30));
+        created.Value.Key.Should().NotBeNull();
+        created.Value.Key.Key.Should().Be("Value");
+        created.Value.ETag.Should().NotBeNullOrEmpty();
+        created.Value.ChangeLog.Should().NotBeNull();
+        created.Value.ChangeLog.CreatedBy.Should().NotBeNull();
+        created.Value.ChangeLog.CreatedOn.Should().NotBeNull();
+        created.Value.ChangeLog.UpdatedBy.Should().BeNull();
+        created.Value.ChangeLog.UpdatedOn.Should().BeNull();
+
+        // Verify can be retrieved and is same.
+        v = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        ObjectComparer.Assert(created.Value, v);
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Delete.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Delete.cs
new file mode 100644
index 00000000..4c5b64f5
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Delete.cs
@@ -0,0 +1,61 @@
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using CoreEx.Results;
+using CoreEx.EntityFrameworkCore;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Delete_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.DeleteAsync(10.ToGuid()).ConfigureAwait(false);
+        r.WasMutated.Should().BeFalse();
+    }).AssertSuccess());
+
+    [Test]
+    public void Delete_NotFound() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.DeleteAsync(404.ToGuid()).ConfigureAwait(false);
+        r.WasMutated.Should().BeFalse();
+    }).AssertSuccess());
+
+    [Test]
+    public void Delete_NotAuthorized() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.DeleteWithResultAsync(7.ToGuid()).ConfigureAwait(false);
+        r.IsAuthorizationError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Delete_Mapped_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        // NOTE: The TableDto is a proxy over the Table, so no need to test independently.
+
+        var id = 9.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var m = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+        // Delete it.
+        var r = await ef.TableDto.DeleteAsync(id).ConfigureAwait(false);
+        r.WasMutated.Should().BeTrue();
+
+        // Delete it again.
+        dc.ChangeTracker.Clear();
+        r = await ef.TableDto.DeleteAsync(id).ConfigureAwait(false);
+        r.WasMutated.Should().BeFalse();
+
+        // Re-get to ensure Deleted.
+        dc.ChangeTracker.Clear();
+        m = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        m.Should().BeNull();
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Get.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Get.cs
new file mode 100644
index 00000000..e87069b8
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Get.cs
@@ -0,0 +1,82 @@
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using CoreEx.Results;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Get_NotFound() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var tt = await ef.Table.GetAsync(404.ToGuid()).ConfigureAwait(false);
+        tt.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_NotFound_WrongTenant() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var tt = await ef.Table.GetAsync(5.ToGuid()).ConfigureAwait(false);
+        tt.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_NotFound_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var tt = await ef.Table.GetAsync(4.ToGuid()).ConfigureAwait(false);
+        tt.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_NotAuthorized() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.GetWithResultAsync(7.ToGuid()).ConfigureAwait(false);
+        r.IsAuthorizationError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_Found() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+
+        var tt = await ef.Table.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        tt.Should().NotBeNull();
+        tt.Id.Should().Be(2.ToGuid());
+        tt.Text.Should().Be("Abc");
+        tt.Number.Should().Be(123);
+        tt.Amount.Should().Be(45.67m);
+        tt.Flag.Should().BeTrue();
+        tt.Date.Should().Be(new DateOnly(2024, 6, 20));
+        tt.Time.Should().Be(new TimeOnly(14, 30, 59));
+        tt.Json.Should().NotBeNull().And.Subject.ToString().Should().Be("{\"Key\": \"Value\"}");
+        tt.CreatedBy.Should().NotBeNull();
+        tt.CreatedOn.Should().NotBeNull();
+        tt.UpdatedBy.Should().BeNull();
+        tt.UpdatedOn.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_Mapped_Found() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+
+        var dto = await ef.TableDto.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        dto.Should().NotBeNull();
+        dto.Id.Should().Be(2.ToGuid());
+        dto.Text.Should().Be("Abc");
+        dto.Number.Should().Be(123);
+        dto.Amount.Should().Be(45.67m);
+        dto.Date.Should().Be(new DateOnly(2024, 6, 20));
+        dto.Time.Should().Be(new TimeOnly(14, 30, 59));
+        dto.Key.Should().NotBeNull();
+        dto.Key.Key.Should().Be("Value"); dto.ETag.Should().NotBeNullOrEmpty();
+        dto.ChangeLog.Should().NotBeNull();
+        dto.ChangeLog.CreatedBy.Should().NotBeNull();
+        dto.ChangeLog.CreatedOn.Should().NotBeNull();
+        dto.ChangeLog.UpdatedBy.Should().BeNull();
+        dto.ChangeLog.UpdatedOn.Should().BeNull();
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Update.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Update.cs
new file mode 100644
index 00000000..c7fd2d11
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.Update.cs
@@ -0,0 +1,157 @@
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using CoreEx.Results;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Update_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 1.ToGuid(),
+            IsDeleted = true
+        };
+
+        var act = async () => await ef.Table.UpdateWithResultAsync(m).ConfigureAwait(false);
+        await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("*Cannot update a model and set to the deleted state (IsDeleted must be false); use the delete operation to perform.*");
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_NotFound() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 404.ToGuid()
+        };
+
+        var r = await ef.Table.UpdateWithResultAsync(m).ConfigureAwait(false);
+        r.IsNotFoundError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Concurrency() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 8.ToGuid(),
+            ETag = "InvalidETag"
+        };
+
+        var r = await ef.Table.UpdateWithResultAsync(m).ConfigureAwait(false);
+        r.IsConcurrencyError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Duplicate_Text() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+
+        // Pre-get existing before modification.
+        var m = await ef.Table.GetAsync(8.ToGuid()).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+        // Modify a pre-existing value.
+        m.Text = "Abc";
+
+        // Update it.
+        var act = async () => await ef.Table.UpdateAsync(m).ConfigureAwait(false);
+        await act.Should().ThrowAsync<DuplicateException>();
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Success_Attached() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = 8.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var m = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+        // Modify a property.
+        m.Text += "XXX";
+
+        // Update it.
+        var u = await ef.Table.UpdateAsync(m).ConfigureAwait(false);
+        u.WasMutated.Should().BeTrue();
+        u.Value.Text.Should().Be(m.Text);
+        u.Value.UpdatedBy.Should().NotBeNull();
+        u.Value.UpdatedOn.Should().NotBeNull();
+
+        // Re-get to ensure updated.
+        dc.ChangeTracker.Clear();
+        var r = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        r.Should().NotBeNull();
+        r.Text.Should().Be(m.Text);
+
+        ObjectComparer.Assert(u.Value, r);
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Success_Detached() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = 8.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var m = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        m.Should().NotBeNull();
+        dc.ChangeTracker.Clear();
+
+        //Modify a property.
+        m.Text += "YYY";
+
+        // Update it.
+        var u = await ef.Table.UpdateAsync(m).ConfigureAwait(false);
+        u.WasMutated.Should().BeTrue();
+        u.Value.Text.Should().Be(m.Text);
+        u.Value.UpdatedBy.Should().NotBeNull();
+        u.Value.UpdatedOn.Should().NotBeNull();
+
+        // Re-get to ensure updated.
+        dc.ChangeTracker.Clear();
+        var r = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        r.Should().NotBeNull();
+        r.Text.Should().Be(m.Text);
+
+        ObjectComparer.Assert(u.Value, r);
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Mapped_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = 8.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var v = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        v.Should().NotBeNull();
+
+        // Modify a value.
+        v.Text += "ZZZ";
+
+        // Update it.
+        var u = await ef.TableDto.UpdateAsync(v).ConfigureAwait(false);
+        u.Value.Text.Should().Be(v.Text);
+        u.Value.ChangeLog.Should().NotBeNull();
+        u.Value.ChangeLog.UpdatedBy.Should().NotBeNull();
+        u.Value.ChangeLog.UpdatedOn.Should().NotBeNull();
+
+        // Re-get to ensure updated.
+        dc.ChangeTracker.Clear();
+        var r = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        r.Should().NotBeNull();
+        r.Text.Should().Be(v.Text);
+
+        ObjectComparer.Assert(u.Value, r);
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.cs
new file mode 100644
index 00000000..5b151d66
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkCrudTests.cs
@@ -0,0 +1,5 @@
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public partial class EntityFrameworkCrudTests : DatabaseTestBase
+{
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkQueryTests.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkQueryTests.cs
new file mode 100644
index 00000000..ef54cae0
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkQueryTests.cs
@@ -0,0 +1,165 @@
+using CoreEx.Data;
+using CoreEx.Data.Querying;
+using CoreEx.Database.Postgres.Test.Unit.Contracts;
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using CoreEx.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public class EntityFrameworkQueryTests : DatabaseTestBase
+{
+    [Test]
+    public void Query_ByPassFilters() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query();
+        var c = await q.CountAsync().ConfigureAwait(false);
+        c.Should().Be(5);   // Excludes deleted, not-authorized and wrong-tenant.
+
+        q = ef.Table.Query(new EntityFrameworkCore.EfDbArgs { BypassFilters = true });
+        c = await q.CountAsync().ConfigureAwait(false);
+        c.Should().Be(7);  // Excludes wrong-tenant (configured as not bypassable).
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToItemsResult() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToItemsResultAsync().ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(5);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(0);
+        ir.Paging.Take.Should().Be(PagingArgs.DefaultTake);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abc", "Abz", "Ace", "Jkl", "Zyi"], options => options.WithStrictOrdering());
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToItemsResult_WithPaging() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToItemsResultAsync(new PagingArgs(2, 2)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(2);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(2);
+        ir.Paging.Take.Should().Be(2);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Ace", "Jkl"], options => options.WithStrictOrdering());
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToItemsResult_WithPaging_Count() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToItemsResultAsync(new PagingArgs(2, 2, true)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(2);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(2);
+        ir.Paging.Take.Should().Be(2);
+        ir.Paging.TotalCount.Should().Be(5);
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Ace", "Jkl"], options => options.WithStrictOrdering());
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToMappedItemsResult() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToMappedItemsResultAsync(TestTableDtoMapper.From).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(5);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(0);
+        ir.Paging.Take.Should().Be(PagingArgs.DefaultTake);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abc", "Abz", "Ace", "Jkl", "Zyi"], options => options.WithStrictOrdering());
+
+        // Mapping worked?
+        var item = ir.Items.First();
+        item.Id.Should().Be(2.ToGuid());
+        item.Text.Should().Be("Abc");
+        item.Number.Should().Be(123);
+        item.Amount.Should().Be(45.67m);
+        item.Date.Should().Be(new DateOnly(2024, 06, 20));
+        item.Time.Should().Be(new TimeOnly(14, 30, 59));
+        item.Key.Should().NotBeNull();
+        item.Key.Key.Should().Be("Value");
+        item.ETag.Should().NotBeNullOrEmpty();
+        item.ChangeLog.Should().NotBeNull();
+        item.ChangeLog.CreatedBy.Should().NotBeNull();
+        item.ChangeLog.CreatedOn.Should().NotBeNull();
+        item.ChangeLog.UpdatedBy.Should().BeNull();
+        item.ChangeLog.UpdatedOn.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToMappedItemsResult_WithPaging() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToMappedItemsResultAsync(TestTableDtoMapper.From, new PagingArgs(2, 2)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(2);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(2);
+        ir.Paging.Take.Should().Be(2);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Ace", "Jkl"], options => options.WithStrictOrdering());
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToMappedItemsResult_WithPaging_Count() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToMappedItemsResultAsync(TestTableDtoMapper.From, new PagingArgs(1, 3, true)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(3);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(1);
+        ir.Paging.Take.Should().Be(3);
+        ir.Paging.TotalCount.Should().Be(5);
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abz", "Ace", "Jkl"], options => options.WithStrictOrdering());
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_Dynamic_Filter() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var qa = new QueryArgs { Filter = "startswith(text, 'a')" };
+        var q = ef.Table.Query().Where(_queryArgsConfig, qa).OrderBy(_queryArgsConfig, qa);
+        var ir = await q.ToItemsResultAsync(PagingArgs.None).ConfigureAwait(false);
+
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(3);
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abc", "Abz", "Ace"], options => options.WithStrictOrdering());
+        ir.Paging.Should().BeNull();
+    }).AssertSuccess());
+
+    private static readonly QueryArgsConfig _queryArgsConfig = QueryArgsConfig.Create()
+        .WithFilter(f => f.AddField<string>(nameof(TestTable.Text), c => c.AsLowerCase().WithOperators(QueryFilterOperator.AllStringOperators)))
+        .WithOrderBy(o => o.AddField(nameof(TestTable.Text), c => c.WithDefault()));
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkUowTests.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkUowTests.cs
new file mode 100644
index 00000000..a1a4e86b
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntityFrameworkUowTests.cs
@@ -0,0 +1,99 @@
+using CoreEx.Data;
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using CoreEx.Results;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public class EntityFrameworkUowTests : DatabaseTestBase
+{
+    [Test]
+    public void Rollback_On_Exception() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        var act = async () =>
+        {
+            await uow.TransactionAsync(async () =>
+            {
+                var r = await ef.Table.DeleteAsync(2.ToGuid()).ConfigureAwait(false);
+                r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+
+                throw new InvalidOperationException("Stop!");
+            }).ConfigureAwait(false);
+        };
+
+        await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("Stop!").ConfigureAwait(false);
+
+        // Confirm the record is still there!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Rollback_On_Error() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        var r = await uow.TransactionAsync(async () =>
+        {
+            var r = await ef.Table.DeleteAsync(2.ToGuid()).ConfigureAwait(false);
+            r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+
+            return Result.ConflictError("Stop!");
+        }).ConfigureAwait(false);
+
+        r.IsConflictError.Should().BeTrue();
+        r.Error.Message.Should().Be("Stop!");
+
+        // Confirm the record is still there!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Commit_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        await uow.TransactionAsync(async () =>
+        {
+            var r = await ef.Table.DeleteAsync(8.ToGuid()).ConfigureAwait(false);
+            r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+        }).ConfigureAwait(false);
+
+        // Confirm the record is gone!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(8.ToGuid()).ConfigureAwait(false);
+        m.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Commit_Success_Result() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        await uow.TransactionAsync(async () =>
+        {
+            var r = await ef.Table.DeleteAsync(9.ToGuid()).ConfigureAwait(false);
+            r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+            return Result.Success;
+        }).ConfigureAwait(false);
+
+        // Confirm the record is gone!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(9.ToGuid()).ConfigureAwait(false);
+        m.Should().BeNull();
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/EntryPoint.cs b/tests/CoreEx.Database.Postgres.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..ff2c1764
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/EntryPoint.cs
@@ -0,0 +1,21 @@
+using CoreEx.Database.Postgres.Test.Unit.Repository;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace CoreEx.Database.Postgres.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder) 
+    {
+        builder.Services.AddPrecisionTimeProvider();
+        builder.Services.AddExecutionContext(_ => new ExecutionContext { TenantId = "A" });
+
+        builder.AddNpgsqlDataSource("PostgreSQL");
+        builder.Services.AddPostgresDatabase();
+        builder.Services.AddPostgresUnitOfWork();
+
+        builder.Services.AddDbContext<TestDbContext>();
+        builder.Services.AddEfDb<TestEfDb>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/Models/TestTable.cs b/tests/CoreEx.Database.Postgres.Test.Unit/Models/TestTable.cs
new file mode 100644
index 00000000..9ecbc932
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/Models/TestTable.cs
@@ -0,0 +1,24 @@
+using CoreEx.Data;
+using CoreEx.Entities;
+using System.Text.Json;
+
+namespace CoreEx.Database.Postgres.Test.Unit.Models;
+
+public class TestTable : IIdentifier<Guid>, IETag, IChangeLogEx, ITenantId, ILogicallyDeleted
+{
+    public Guid Id { get; set; }
+    public string? Text { get; set; }
+    public int? Number { get; set; }
+    public decimal? Amount { get; set; }
+    public bool? Flag { get; set; }
+    public DateOnly? Date { get; set; }
+    public TimeOnly? Time { get; set; }
+    public JsonElement? Json { get; set; }
+    public string? ETag { get; set; }
+    public string? CreatedBy { get; set; }
+    public DateTimeOffset? CreatedOn { get; set; }
+    public string? UpdatedBy { get; set; }
+    public DateTimeOffset? UpdatedOn { get; set; }
+    public string? TenantId { get; set; }
+    public bool IsDeleted { get; set; }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/Models/TestTableMapper.cs b/tests/CoreEx.Database.Postgres.Test.Unit/Models/TestTableMapper.cs
new file mode 100644
index 00000000..29e0d896
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/Models/TestTableMapper.cs
@@ -0,0 +1,19 @@
+using CoreEx.Database.Mapping;
+using System.Text.Json;
+
+namespace CoreEx.Database.Postgres.Test.Unit.Models;
+
+public class TestTableMapper : DatabaseMapper<TestTable>
+{
+    public override TestTable MapFromDb(DatabaseRecord r, OperationType operationType = OperationType.Unspecified) => new TestTable()
+    {
+        Id = r.GetValue<Guid>("table_id"),
+        Text = r.GetValue<string?>("text"),
+        Number = r.GetValue<int?>("number"),
+        Amount = r.GetValue<decimal?>("amount"),
+        Flag = r.GetValue<bool?>("flag"),
+        Date = r.GetValue<DateOnly?>("date"),
+        Time = r.GetValue<TimeOnly?>("time"),
+        Json = r.GetValueFromJson<JsonElement?>("json")
+    }.MapStandardFromDb(r);
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/Repository/TestDbContext.cs b/tests/CoreEx.Database.Postgres.Test.Unit/Repository/TestDbContext.cs
new file mode 100644
index 00000000..cdef3b0d
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/Repository/TestDbContext.cs
@@ -0,0 +1,47 @@
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.EntityFrameworkCore;
+using CoreEx.EntityFrameworkCore.Converters;
+using Microsoft.EntityFrameworkCore;
+
+namespace CoreEx.Database.Postgres.Test.Unit.Repository;
+
+public class TestDbContext(DbContextOptions<TestDbContext> options, PostgresDatabase database) : DbContext(options), IEfDbContext
+{
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        // Uses IDatabase.Connection to ensure the same database/connection is used.
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseNpgsql(BaseDatabase.Connection, contextOwnsConnection: false);
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        // Add the model configuration.
+        modelBuilder.ThrowIfNull().Entity<TestTable>(e =>
+        {
+            e.ToTable("table", "test");
+            e.HasKey(nameof(TestTable.Id));
+            e.Property(p => p.Id).HasColumnName("table_id").HasColumnType("uuid");
+            e.Property(p => p.Text).HasColumnName("text").HasColumnType("varchar(200)");
+            e.Property(p => p.Number).HasColumnName("number").HasColumnType("integer");
+            e.Property(p => p.Amount).HasColumnName("amount").HasColumnType("decimal(19, 4)");
+            e.Property(p => p.Flag).HasColumnName("flag").HasColumnType("boolean");
+            e.Property(p => p.Date).HasColumnName("date").HasColumnType("date");
+            e.Property(p => p.Time).HasColumnName("time").HasColumnType("time");
+            e.Property(p => p.Json).HasColumnName("json").HasColumnType("jsonb").HasConversion(JsonElementStringEfConverter.Default);
+            e.Property(p => p.TenantId).HasColumnName("tenant_id").HasColumnType("varchar(20)");
+            e.Property(p => p.ETag).HasColumnName("xmin").HasColumnType("xid").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, uint>(BaseDatabase.RowVersionConverter));
+            e.Property(p => p.CreatedBy).HasColumnName("created_by").HasColumnType("varchar(250)").ValueGeneratedOnUpdate();
+            e.Property(p => p.CreatedOn).HasColumnName("created_on").HasColumnType("timestamptz").ValueGeneratedOnUpdate();
+            e.Property(p => p.UpdatedBy).HasColumnName("updated_by").HasColumnType("varchar(250)").ValueGeneratedOnAdd();
+            e.Property(p => p.UpdatedOn).HasColumnName("updated_on").HasColumnType("timestamptz").ValueGeneratedOnAdd();
+            e.Property(p => p.IsDeleted).HasColumnName("is_deleted").HasColumnType("boolean").HasDefaultValue(false);
+        });
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/Repository/TestEfDb.cs b/tests/CoreEx.Database.Postgres.Test.Unit/Repository/TestEfDb.cs
new file mode 100644
index 00000000..80d56539
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/Repository/TestEfDb.cs
@@ -0,0 +1,18 @@
+using CoreEx.Database.Postgres.Test.Unit.Models;
+using CoreEx.EntityFrameworkCore;
+using CoreEx.Results;
+
+namespace CoreEx.Database.Postgres.Test.Unit.Repository;
+
+public class TestEfDb(TestDbContext dbContext) : EfDb<TestDbContext>(dbContext, _options)
+{
+    private static readonly EfDbOptions _options = new EfDbOptions()
+        .WithModel<Models.TestTable>(mo => mo
+            .WithTenantFilter(allowFilterBypass: false)
+            .WithLogicalDeleteFilter(allowFilterBypass: true)
+            .WithFilter(q => q.Where(x => x.Flag != null && x.Flag == true), (_, _) => Result.AuthorizationError(), allowFilterBypass: true));
+
+    public EfDbModel<Models.TestTable> Table => Model<Models.TestTable>();
+
+    public EfDbMappedModel<Contracts.TestTableDto, TestTable, Contracts.TestTableDtoMapper> TableDto => Table.ToMappedModel<Contracts.TestTableDto, Contracts.TestTableDtoMapper>(Contracts.TestTableDtoMapper.Default);
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Postgres.Test.Unit/appsettings.unittest.json b/tests/CoreEx.Database.Postgres.Test.Unit/appsettings.unittest.json
new file mode 100644
index 00000000..4b84bda7
--- /dev/null
+++ b/tests/CoreEx.Database.Postgres.Test.Unit/appsettings.unittest.json
@@ -0,0 +1,20 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "CoreEx",
+      "DomainName": "Test"
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "CoreEx": "Debug",
+      "Microsoft.Data": "Warning"
+    }
+  },
+  "Aspire": {
+    "Npgsql": {
+      "ConnectionString": "Server=127.0.0.1;Database=coreex_test;Username=postgres;Password=yourStrong#!Password;Pooling=false"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/CoreEx.Database.SqlServer.Test.Console.csproj b/tests/CoreEx.Database.SqlServer.Test.Console/CoreEx.Database.SqlServer.Test.Console.csproj
new file mode 100644
index 00000000..ad636e81
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/CoreEx.Database.SqlServer.Test.Console.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DbEx.SqlServer" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+</Project>
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/Data/data.yaml b/tests/CoreEx.Database.SqlServer.Test.Console/Data/data.yaml
new file mode 100644
index 00000000..3670a24b
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/Data/data.yaml
@@ -0,0 +1,12 @@
+Test:
+- Table:
+  - { TableId: 1 }
+  - { TableId: 2, Text: Abc, Number: 123, Amount: 45.67, Flag: true, Date: 2024-06-20, Time: 14:30:59, TenantId: A, Json: {"Key":"Value"} }
+  - { TableId: 3, Text: Ace, Number: 567, Amount: 45.67, Flag: true, Date: 2024-03-13, Time: 14:30:59, TenantId: A, Json: {"Key":"Value"} }
+  - { TableId: 4, Text: Bdf, Number: 901, Amount: 45.67, Flag: false, Date: 2025-01-08, Time: 14:30:59, TenantId: B, IsDeleted: 1, Json: {"Key":"Value"} }
+  - { TableId: 5, Text: Qrs, Number: 765, Amount: 45.67, Flag: true, Date: 2024-06-20, Time: 14:30:59, TenantId: B, Json: {"Key":"Value"} }
+  - { TableId: 6, Text: Jkl, Number: 765, Amount: 56.24, Flag: true, Date: 2024-06-20, Time: 14:30:59, TenantId: A, Json: {"Key":"Value"} }
+  - { TableId: 7, Text: Blq, Number: 765, Amount: 45.67, Flag: false, Date: 2024-06-20, Time: 14:30:59, TenantId: A, Json: {"Key":"Value"} }
+  - { TableId: 8, Text: Zyi, Number: 765, Amount: 99.23, Flag: true, Date: 2024-06-20, Time: 14:30:59, TenantId: A, Json: {"Key":"Value"} }
+  - { TableId: 9, Text: Abz, Number: 765, Amount: 45.67, Flag: true, Date: 2024-06-20, Time: 14:30:59, TenantId: A, Json: {"Key":"Value"} }
+  - { TableId: 10, Text: Qpo, Number: 881, Amount: 12.67, Flag: true, Date: 2024-06-20, Time: 14:30:59, TenantId: A, IsDeleted: 1, Json: {"Key":"Value"} }
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/001-create-test-schema.sql b/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/001-create-test-schema.sql
new file mode 100644
index 00000000..20057278
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/001-create-test-schema.sql
@@ -0,0 +1 @@
+CREATE SCHEMA [Test]
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/002-create-test-table.sql b/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/002-create-test-table.sql
new file mode 100644
index 00000000..d773a458
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/002-create-test-table.sql
@@ -0,0 +1,17 @@
+CREATE TABLE [Test].[Table] (
+    [TableId] UNIQUEIDENTIFIER NOT NULL DEFAULT (NEWSEQUENTIALID()) PRIMARY KEY,
+    [Text] NVARCHAR (200) NULL,
+    [Number] INT NULL,
+    [Amount] MONEY NULL,
+    [Flag] BIT NULL,
+    [Date] DATE NULL,
+    [Time] TIME NULL,
+    [Json] NVARCHAR (500) NULL,
+    [TenantId] NVARCHAR(20) NULL,
+    [RowVersion] TIMESTAMP NOT NULL,
+    [CreatedBy] NVARCHAR(250) NULL,
+    [CreatedOn] DATETIMEOFFSET NULL,
+    [UpdatedBy] NVARCHAR(250) NULL,
+    [UpdatedOn] DATETIMEOFFSET NULL,
+    [IsDeleted] BIT DEFAULT 0 NOT NULL
+)
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/003-create-test-table-unique-index.sql b/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/003-create-test-table-unique-index.sql
new file mode 100644
index 00000000..2aa9f3ce
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/Migrations/003-create-test-table-unique-index.sql
@@ -0,0 +1,2 @@
+CREATE UNIQUE INDEX IX_Test_Table_TenantId_Text
+  ON [Test].[Table] (TenantId, Text);
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/Program.cs b/tests/CoreEx.Database.SqlServer.Test.Console/Program.cs
new file mode 100644
index 00000000..fd710623
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/Program.cs
@@ -0,0 +1,27 @@
+using DbEx.Migration;
+using DbEx.SqlServer.Console;
+
+namespace CoreEx.Database.SqlServer.Test.Console;
+
+/// <summary>
+/// Represents the <b>database utilities</b> program (capability).
+/// </summary>
+public class Program
+{
+    /// <summary>
+    /// Main startup.
+    /// </summary>
+    /// <param name="args">The startup arguments.</param>
+    /// <returns>The status code whereby zero indicates success.</returns>
+    public static Task<int> Main(string[] args) => SqlServerMigrationConsole
+        .Create<Program>("Data Source=127.0.0.1,1433;Initial Catalog=CoreEx.Test;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true")
+        .Configure(c => ConfigureMigrationArgs(c.Args))
+        .RunAsync(args);
+
+    /// <summary>
+    /// Configure the <see cref="MigrationArgs"/>.
+    /// </summary>
+    /// <param name="args">The <see cref="MigrationArgs"/>.</param>
+    /// <returns>The <see cref="MigrationArgs"/>.</returns>
+    public static MigrationArgs ConfigureMigrationArgs(MigrationArgs args) => args.AddAssembly<Program>().IncludeExtendedSchemaScripts();
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Console/Properties/launchSettings.json b/tests/CoreEx.Database.SqlServer.Test.Console/Properties/launchSettings.json
new file mode 100644
index 00000000..5e8e1231
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Console/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "CoreEx.Database.SqlServer.Test.Console": {
+      "commandName": "Project",
+      "commandLineArgs": "dropandall"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/Contracts/TestTableDto.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/Contracts/TestTableDto.cs
new file mode 100644
index 00000000..ca85da01
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/Contracts/TestTableDto.cs
@@ -0,0 +1,21 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Database.SqlServer.Test.Unit.Contracts;
+
+public class TestTableDto : IIdentifier<Guid>, IETag, IChangeLog
+{
+    public Guid Id { get; set; }
+    public string? Text { get; set; }
+    public int? Number { get; set; }
+    public decimal? Amount { get; set; }
+    public DateOnly? Date { get; set; }
+    public TimeOnly? Time { get; set; }
+    public KeyValueDto? Key { get; set; }
+    public string? ETag { get; set; }
+    public ChangeLog? ChangeLog { get; set; }
+
+    public class KeyValueDto
+    {
+        public string? Key { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/Contracts/TestTableDtoMapper.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/Contracts/TestTableDtoMapper.cs
new file mode 100644
index 00000000..6ed5846d
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/Contracts/TestTableDtoMapper.cs
@@ -0,0 +1,32 @@
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.Json;
+using CoreEx.Mapping;
+using System.Text.Json;
+
+namespace CoreEx.Database.SqlServer.Test.Unit.Contracts;
+
+public class TestTableDtoMapper : BiDirectionMapper<TestTableDto, TestTable, TestTableDtoMapper>
+{
+    protected override TestTable OnMap(TestTableDto source) => new TestTable()
+    {
+        Id = source.Id,
+        Text = source.Text,
+        Number = source.Number,
+        Amount = source.Amount,
+        Date = source.Date,
+        Time = source.Time,
+        Json = source.Key is null ? null : JsonSerializer.SerializeToElement(source.Key, JsonDefaults.SerializerOptions),
+        Flag = true
+    }.MapStandardFrom(source);
+
+    protected override TestTableDto OnMap(TestTable source) => new TestTableDto()
+    {
+        Id = source.Id,
+        Text = source.Text,
+        Number = source.Number,
+        Amount = source.Amount,
+        Date = source.Date,
+        Time = source.Time,
+        Key = source.Json?.Deserialize<TestTableDto.KeyValueDto>(JsonDefaults.SerializerOptions)
+    }.MapStandardFrom(source);
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/CoreEx.Database.SqlServer.Test.Unit.csproj b/tests/CoreEx.Database.SqlServer.Test.Unit/CoreEx.Database.SqlServer.Test.Unit.csproj
new file mode 100644
index 00000000..0bb8441e
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/CoreEx.Database.SqlServer.Test.Unit.csproj
@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="DbEx.SqlServer" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.EntityFrameworkCore\CoreEx.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
+    <ProjectReference Include="..\CoreEx.Database.SqlServer.Test.Console\CoreEx.Database.SqlServer.Test.Console.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Schema\**\*" />
+    <EmbeddedResource Include="Migrations\**\*" />
+    <EmbeddedResource Include="Data\**\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.unittest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/DatabaseTestBase.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/DatabaseTestBase.cs
new file mode 100644
index 00000000..15e8ea11
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/DatabaseTestBase.cs
@@ -0,0 +1,25 @@
+using CoreEx.Database.SqlServer.Test.Console;
+using DbEx;
+using DbEx.Migration;
+using DbEx.SqlServer.Migration;
+using Microsoft.Extensions.Configuration;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public abstract class DatabaseTestBase : WithGenericTester<EntryPoint>
+{
+    [OneTimeSetUp()]
+    public async Task OneTimeSetUp()
+    {
+        var cs = Test.Configuration.GetValue<string>("Aspire:Microsoft:Data:SqlClient:ConnectionString");
+        var ma = Program.ConfigureMigrationArgs(new MigrationArgs(MigrationCommand.DropAndAll, cs)).AddAssembly<DatabaseTestBase>();
+
+        using var m = new SqlServerMigration(ma);
+        var (Success, Output) = await m.MigrateAndLogAsync().ConfigureAwait(false);
+
+        TestContext.Progress.WriteLine(Output);
+
+        if (!Success)
+            Assert.Fail("SqlServerMigration failed.");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/DatabaseTests.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/DatabaseTests.cs
new file mode 100644
index 00000000..48749335
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/DatabaseTests.cs
@@ -0,0 +1,191 @@
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public class DatabaseTests : DatabaseTestBase
+{
+    [Test]
+    public void SelectAndGetNullValues() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var tt = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 1.ToGuid()).SelectSingleAsync(new TestTableMapper()).ConfigureAwait(false);
+
+            tt.Should().NotBeNull();
+            tt.Id.Should().Be(1.ToGuid());
+            tt.Text.Should().BeNull();
+            tt.Number.Should().BeNull();
+            tt.Amount.Should().BeNull();
+            tt.Flag.Should().BeNull();
+            tt.Date.Should().BeNull();
+            tt.Time.Should().BeNull();
+            tt.Json.Should().BeNull();
+            tt.ETag.Should().NotBeNull();
+            tt.CreatedBy.Should().NotBeNull();
+            tt.CreatedOn.Should().NotBeNull();
+            tt.UpdatedBy.Should().BeNull();
+            tt.UpdatedOn.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectAndGetValues() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var tt = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 2.ToGuid()).SelectSingleAsync(new TestTableMapper()).ConfigureAwait(false);
+
+            tt.Should().NotBeNull();
+            tt.Id.Should().Be(2.ToGuid());
+            tt.Text.Should().Be("Abc");
+            tt.Number.Should().Be(123);
+            tt.Amount.Should().Be(45.67m);
+            tt.Flag.Should().BeTrue();
+            tt.Date.Should().Be(new DateOnly(2024, 6, 20));
+            tt.Time.Should().Be(new TimeOnly(14, 30, 59));
+            tt.ETag.Should().NotBeNull();
+            tt.Json.Should().NotBeNull().And.Subject.ToString().Should().Be("{\"Key\": \"Value\"}");
+            tt.CreatedBy.Should().NotBeNull();
+            tt.CreatedOn.Should().NotBeNull();
+            tt.UpdatedBy.Should().BeNull();
+            tt.UpdatedOn.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectSingleAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 2.ToGuid()).SelectSingleAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var act = () => db.Statement("SELECT * FROM [Test].[Table]").SelectSingleAsync(new TestTableMapper());
+            await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectSingleAsync has returned more than one row.");
+
+            // No rows.
+            var act2 = () => db.Statement("SELECT * FROM [Test].[Table ]WHERE [TableId] = @Id").Param("Id", 404.ToGuid()).SelectSingleAsync(new TestTableMapper());
+            await act2.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectSingleAsync has not returned a row.");
+
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectSingleOrDefaultAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 2.ToGuid()).SelectSingleOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var act = () => db.Statement("SELECT * FROM [Test].[Table]").SelectSingleOrDefaultAsync(new TestTableMapper());
+            await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectSingleOrDefaultAsync has returned more than one row.");
+
+            // No rows.
+            var tt2 = await db.Statement("SELECT * FROM [Test].[Table ]WHERE [TableId] = @Id").Param("Id", 404.ToGuid()).SelectSingleOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt2.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectFirstAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 2.ToGuid()).SelectFirstAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var tt2 = await db.Statement("SELECT * FROM [Test].[Table]").SelectFirstAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt2.Should().NotBeNull();
+
+            // No rows.
+            var act = () => db.Statement("SELECT * FROM [Test].[Table ]WHERE [TableId] = @Id").Param("Id", 404.ToGuid()).SelectFirstAsync(new TestTableMapper());
+            await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("SelectFirstAsync has not returned a row.");
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectFirstOrDefaultAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            // Exactly one row.
+            var tt = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 2.ToGuid()).SelectFirstOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt.Should().NotBeNull();
+
+            // More than one row.
+            var tt2 = await db.Statement("SELECT * FROM [Test].[Table]").SelectFirstOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt2.Should().NotBeNull();
+
+            // No rows.
+            var tt3 = await db.Statement("SELECT * FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 404.ToGuid()).SelectFirstOrDefaultAsync(new TestTableMapper()).ConfigureAwait(false);
+            tt3.Should().BeNull();
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectQueryAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var tts = await db.Statement("SELECT * FROM [Test].[Table]").SelectQueryAsync(new TestTableMapper()).ConfigureAwait(false);
+            tts.Should().NotBeNull().And.HaveCount(10);
+
+            var ttc = new List<TestTable>();
+            await db.Statement("SELECT * FROM [Test].[Table]").SelectQueryAsync(ttc, new TestTableMapper()).ConfigureAwait(false);
+            ttc.Should().NotBeNull().And.HaveCount(10);
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void SelectAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var count = 0;
+            await db.Statement("SELECT * FROM [Test].[Table]").SelectAsync(r =>
+            {
+                count++;
+                return count < 3;
+            }).ConfigureAwait(false);
+
+            count.Should().Be(3);
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void ScalarAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var count = await db.Statement("SELECT COUNT(*) FROM [Test].[Table]").ScalarAsync<int>().ConfigureAwait(false);
+            count.Should().Be(10);
+
+            var created = await db.Statement("SELECT TOP 1 [CreatedOn] FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 1.ToGuid()).ScalarAsync<DateTimeOffset?>().ConfigureAwait(false);
+            created.Should().NotBeNull();
+
+            created = await db.Statement("SELECT TOP 1 [CreatedOn] FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 404.ToGuid()).ScalarAsync<DateTimeOffset?>().ConfigureAwait(false);
+            created.Should().BeNull();
+
+        }).AssertSuccess();
+    });
+
+    [Test]
+    public void NonQueryAsync() => Test.ScopedType<SqlServerDatabase>(test =>
+    {
+        test.Run(async db =>
+        {
+            var rows = await db.Statement("UPDATE [Test].[Table] SET [Number] = @Number + 1 WHERE [TableId] = @Id").Param("Id", 4.ToGuid()).Param("Number", 88).NonQueryAsync().ConfigureAwait(false);
+            rows.Should().Be(1);
+
+            var number = await db.Statement("SELECT [Number] FROM [Test].[Table] WHERE [TableId] = @Id").Param("Id", 4.ToGuid()).ScalarAsync<int?>().ConfigureAwait(false);
+            number.Should().Be(89);
+        }).AssertSuccess();
+    });
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Create.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Create.cs
new file mode 100644
index 00000000..1a72f018
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Create.cs
@@ -0,0 +1,146 @@
+using CoreEx.Database.SqlServer.Test.Unit.Contracts;
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using CoreEx.Results;
+using System.Text.Json;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Create_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            IsDeleted = true
+        };
+
+        var act = async () => await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("*Cannot create a model with a deleted state; IsDeleted must be false.*");
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_NotAuthorized() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Flag = false,
+        };
+
+        var r = await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        r.IsAuthorizationError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Duplicate_Id() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 2.ToGuid(),
+            Flag = true
+        };
+
+        var r = await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        r.IsDuplicateError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Duplicate_Text() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = Runtime.NewGuid(),
+            Flag = true,
+            Text = "Abc"
+        };
+
+        var r = await ef.Table.CreateWithResultAsync(m).ConfigureAwait(false);
+        r.IsDuplicateError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        using var jd = JsonDocument.Parse("{\"Key\": \"Value\"}");
+        var id = Runtime.NewGuid();
+
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = id,
+            Text = "New",
+            Number = 999,
+            Amount = 12.34m,
+            Flag = true,
+            Date = new DateOnly(2024, 7, 1),
+            Time = new TimeOnly(10, 20, 30),
+            Json = jd.RootElement.Clone()
+        };
+
+        var created = await ef.Table.CreateAsync(m).ConfigureAwait(false);
+
+        created.Should().NotBeNull();
+        created.Value.Id.Should().Be(id);
+        created.Value.Text.Should().Be("New");
+        created.Value.Number.Should().Be(999);
+        created.Value.Amount.Should().Be(12.34m);
+        created.Value.Flag.Should().BeTrue();
+        created.Value.Date.Should().Be(new DateOnly(2024, 7, 1));
+        created.Value.Time.Should().Be(new TimeOnly(10, 20, 30));
+        created.Value.Json.Should().NotBeNull().And.Subject.ToString().Should().Be("{\"Key\": \"Value\"}");
+        created.Value.ETag.Should().NotBeNull();
+        created.Value.TenantId.Should().Be("A");
+        created.Value.CreatedBy.Should().NotBeNull();
+        created.Value.CreatedOn.Should().NotBeNull();
+        created.Value.UpdatedBy.Should().BeNull();
+        created.Value.UpdatedOn.Should().BeNull();
+
+        // Verify can be retrieved and is same.
+        m = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        ObjectComparer.Assert(created.Value, m);
+    }).AssertSuccess());
+
+    [Test]
+    public void Create_Mapped_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = Runtime.NewGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var v = new TestTableDto
+        {
+            Id = id,
+            Text = "Val",
+            Number = 999,
+            Amount = 12.34m,
+            Date = new DateOnly(2024, 7, 1),
+            Time = new TimeOnly(10, 20, 30),
+            Key = new TestTableDto.KeyValueDto { Key = "Value" }
+        };
+
+        var created = await ef.TableDto.CreateAsync(v).ConfigureAwait(false);
+
+        created.Should().NotBeNull();
+        created.Value.Id.Should().Be(id);
+        created.Value.Text.Should().Be("Val");
+        created.Value.Number.Should().Be(999);
+        created.Value.Amount.Should().Be(12.34m);
+        created.Value.Date.Should().Be(new DateOnly(2024, 7, 1));
+        created.Value.Time.Should().Be(new TimeOnly(10, 20, 30));
+        created.Value.Key.Should().NotBeNull();
+        created.Value.Key.Key.Should().Be("Value");
+        created.Value.ETag.Should().NotBeNullOrEmpty();
+        created.Value.ChangeLog.Should().NotBeNull();
+        created.Value.ChangeLog.CreatedBy.Should().NotBeNull();
+        created.Value.ChangeLog.CreatedOn.Should().NotBeNull();
+        created.Value.ChangeLog.UpdatedBy.Should().BeNull();
+        created.Value.ChangeLog.UpdatedOn.Should().BeNull();
+
+        // Verify can be retrieved and is same.
+        v = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        ObjectComparer.Assert(created.Value, v);
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Delete.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Delete.cs
new file mode 100644
index 00000000..01c4041e
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Delete.cs
@@ -0,0 +1,61 @@
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using CoreEx.Results;
+using CoreEx.EntityFrameworkCore;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Delete_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.DeleteAsync(10.ToGuid()).ConfigureAwait(false);
+        r.WasMutated.Should().BeFalse();
+    }).AssertSuccess());
+
+    [Test]
+    public void Delete_NotFound() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.DeleteAsync(404.ToGuid()).ConfigureAwait(false);
+        r.WasMutated.Should().BeFalse();
+    }).AssertSuccess());
+
+    [Test]
+    public void Delete_NotAuthorized() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.DeleteWithResultAsync(7.ToGuid()).ConfigureAwait(false);
+        r.IsAuthorizationError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Delete_Mapped_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        // NOTE: The TableDto is a proxy over the Table, so no need to test independently.
+
+        var id = 9.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var m = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+        // Delete it.
+        var r = await ef.TableDto.DeleteAsync(id).ConfigureAwait(false);
+        r.WasMutated.Should().BeTrue();
+
+        // Delete it again.
+        dc.ChangeTracker.Clear();
+        r = await ef.TableDto.DeleteAsync(id).ConfigureAwait(false);
+        r.WasMutated.Should().BeFalse();
+
+        // Re-get to ensure Deleted.
+        dc.ChangeTracker.Clear();
+        m = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        m.Should().BeNull();
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Get.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Get.cs
new file mode 100644
index 00000000..e5a50a00
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Get.cs
@@ -0,0 +1,82 @@
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using CoreEx.Results;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Get_NotFound() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var tt = await ef.Table.GetAsync(404.ToGuid()).ConfigureAwait(false);
+        tt.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_NotFound_WrongTenant() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var tt = await ef.Table.GetAsync(5.ToGuid()).ConfigureAwait(false);
+        tt.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_NotFound_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var tt = await ef.Table.GetAsync(4.ToGuid()).ConfigureAwait(false);
+        tt.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_NotAuthorized() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var r = await ef.Table.GetWithResultAsync(7.ToGuid()).ConfigureAwait(false);
+        r.IsAuthorizationError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_Found() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+
+        var tt = await ef.Table.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        tt.Should().NotBeNull();
+        tt.Id.Should().Be(2.ToGuid());
+        tt.Text.Should().Be("Abc");
+        tt.Number.Should().Be(123);
+        tt.Amount.Should().Be(45.67m);
+        tt.Flag.Should().BeTrue();
+        tt.Date.Should().Be(new DateOnly(2024, 6, 20));
+        tt.Time.Should().Be(new TimeOnly(14, 30, 59));
+        tt.Json.Should().NotBeNull().And.Subject.ToString().Should().Be("{\"Key\": \"Value\"}");
+        tt.CreatedBy.Should().NotBeNull();
+        tt.CreatedOn.Should().NotBeNull();
+        tt.UpdatedBy.Should().BeNull();
+        tt.UpdatedOn.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Get_Mapped_Found() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+
+        var dto = await ef.TableDto.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        dto.Should().NotBeNull();
+        dto.Id.Should().Be(2.ToGuid());
+        dto.Text.Should().Be("Abc");
+        dto.Number.Should().Be(123);
+        dto.Amount.Should().Be(45.67m);
+        dto.Date.Should().Be(new DateOnly(2024, 6, 20));
+        dto.Time.Should().Be(new TimeOnly(14, 30, 59));
+        dto.Key.Should().NotBeNull();
+        dto.Key.Key.Should().Be("Value"); dto.ETag.Should().NotBeNullOrEmpty();
+        dto.ChangeLog.Should().NotBeNull();
+        dto.ChangeLog.CreatedBy.Should().NotBeNull();
+        dto.ChangeLog.CreatedOn.Should().NotBeNull();
+        dto.ChangeLog.UpdatedBy.Should().BeNull();
+        dto.ChangeLog.UpdatedOn.Should().BeNull();
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Update.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Update.cs
new file mode 100644
index 00000000..cedac560
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.Update.cs
@@ -0,0 +1,157 @@
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using CoreEx.Results;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public partial class EntityFrameworkCrudTests 
+{
+    [Test]
+    public void Update_IsDeleted() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 1.ToGuid(),
+            IsDeleted = true
+        };
+
+        var act = async () => await ef.Table.UpdateWithResultAsync(m).ConfigureAwait(false);
+        await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("*Cannot update a model and set to the deleted state (IsDeleted must be false); use the delete operation to perform.*");
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_NotFound() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 404.ToGuid()
+        };
+
+        var r = await ef.Table.UpdateWithResultAsync(m).ConfigureAwait(false);
+        r.IsNotFoundError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Concurrency() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var m = new TestTable
+        {
+            Id = 8.ToGuid(),
+            ETag = "InvalidETag"
+        };
+
+        var r = await ef.Table.UpdateWithResultAsync(m).ConfigureAwait(false);
+        r.IsConcurrencyError.Should().BeTrue();
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Duplicate_Text() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+
+        // Pre-get existing before modification.
+        var m = await ef.Table.GetAsync(8.ToGuid()).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+        // Modify a pre-existing value.
+        m.Text = "Abc";
+
+        // Update it.
+        var act = async () => await ef.Table.UpdateAsync(m).ConfigureAwait(false);
+        await act.Should().ThrowAsync<DuplicateException>();
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Success_Attached() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = 8.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var m = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+        // Modify a property.
+        m.Text += "XXX";
+
+        // Update it.
+        var u = await ef.Table.UpdateAsync(m).ConfigureAwait(false);
+        u.WasMutated.Should().BeTrue();
+        u.Value.Text.Should().Be(m.Text);
+        u.Value.UpdatedBy.Should().NotBeNull();
+        u.Value.UpdatedOn.Should().NotBeNull();
+
+        // Re-get to ensure updated.
+        dc.ChangeTracker.Clear();
+        var r = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        r.Should().NotBeNull();
+        r.Text.Should().Be(m.Text);
+
+        ObjectComparer.Assert(u.Value, r);
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Success_Detached() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = 8.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var m = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        m.Should().NotBeNull();
+        dc.ChangeTracker.Clear();
+
+        //Modify a property.
+        m.Text += "YYY";
+
+        // Update it.
+        var u = await ef.Table.UpdateAsync(m).ConfigureAwait(false);
+        u.WasMutated.Should().BeTrue();
+        u.Value.Text.Should().Be(m.Text);
+        u.Value.UpdatedBy.Should().NotBeNull();
+        u.Value.UpdatedOn.Should().NotBeNull();
+
+        // Re-get to ensure updated.
+        dc.ChangeTracker.Clear();
+        var r = await ef.Table.GetAsync(id).ConfigureAwait(false);
+        r.Should().NotBeNull();
+        r.Text.Should().Be(m.Text);
+
+        ObjectComparer.Assert(u.Value, r);
+    }).AssertSuccess());
+
+    [Test]
+    public void Update_Mapped_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var id = 8.ToGuid();
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        // Pre-get existing before modification.
+        var v = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        v.Should().NotBeNull();
+
+        // Modify a value.
+        v.Text += "ZZZ";
+
+        // Update it.
+        var u = await ef.TableDto.UpdateAsync(v).ConfigureAwait(false);
+        u.Value.Text.Should().Be(v.Text);
+        u.Value.ChangeLog.Should().NotBeNull();
+        u.Value.ChangeLog.UpdatedBy.Should().NotBeNull();
+        u.Value.ChangeLog.UpdatedOn.Should().NotBeNull();
+
+        // Re-get to ensure updated.
+        dc.ChangeTracker.Clear();
+        var r = await ef.TableDto.GetAsync(id).ConfigureAwait(false);
+        r.Should().NotBeNull();
+        r.Text.Should().Be(v.Text);
+
+        ObjectComparer.Assert(u.Value, r);
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.cs
new file mode 100644
index 00000000..c22562a3
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkCrudTests.cs
@@ -0,0 +1,5 @@
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public partial class EntityFrameworkCrudTests : DatabaseTestBase
+{
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkQueryTests.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkQueryTests.cs
new file mode 100644
index 00000000..1d93269a
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkQueryTests.cs
@@ -0,0 +1,165 @@
+using CoreEx.Data;
+using CoreEx.Data.Querying;
+using CoreEx.Database.SqlServer.Test.Unit.Contracts;
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using CoreEx.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public class EntityFrameworkQueryTests : DatabaseTestBase
+{
+    [Test]
+    public void Query_ByPassFilters() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query();
+        var c = await q.CountAsync().ConfigureAwait(false);
+        c.Should().Be(5);   // Excludes deleted, not-authorized and wrong-tenant.
+
+        q = ef.Table.Query(new EntityFrameworkCore.EfDbArgs { BypassFilters = true });
+        c = await q.CountAsync().ConfigureAwait(false);
+        c.Should().Be(7);  // Excludes wrong-tenant (configured as not bypassable).
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToItemsResult() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToItemsResultAsync().ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(5);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(0);
+        ir.Paging.Take.Should().Be(PagingArgs.DefaultTake);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abc", "Abz", "Ace", "Jkl", "Zyi"], options => options.WithStrictOrdering());
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToItemsResult_WithPaging() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToItemsResultAsync(new PagingArgs(2, 2)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(2);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(2);
+        ir.Paging.Take.Should().Be(2);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Ace", "Jkl"], options => options.WithStrictOrdering());
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToItemsResult_WithPaging_Count() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToItemsResultAsync(new PagingArgs(2, 2, true)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(2);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(2);
+        ir.Paging.Take.Should().Be(2);
+        ir.Paging.TotalCount.Should().Be(5);
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Ace", "Jkl"], options => options.WithStrictOrdering());
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToMappedItemsResult() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToMappedItemsResultAsync(TestTableDtoMapper.From).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(5);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(0);
+        ir.Paging.Take.Should().Be(PagingArgs.DefaultTake);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abc", "Abz", "Ace", "Jkl", "Zyi"], options => options.WithStrictOrdering());
+
+        // Mapping worked?
+        var item = ir.Items.First();
+        item.Id.Should().Be(2.ToGuid());
+        item.Text.Should().Be("Abc");
+        item.Number.Should().Be(123);
+        item.Amount.Should().Be(45.67m);
+        item.Date.Should().Be(new DateOnly(2024, 06, 20));
+        item.Time.Should().Be(new TimeOnly(14, 30, 59));
+        item.Key.Should().NotBeNull();
+        item.Key.Key.Should().Be("Value");
+        item.ETag.Should().NotBeNullOrEmpty();
+        item.ChangeLog.Should().NotBeNull();
+        item.ChangeLog.CreatedBy.Should().NotBeNull();
+        item.ChangeLog.CreatedOn.Should().NotBeNull();
+        item.ChangeLog.UpdatedBy.Should().BeNull();
+        item.ChangeLog.UpdatedOn.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToMappedItemsResult_WithPaging() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToMappedItemsResultAsync(TestTableDtoMapper.From, new PagingArgs(2, 2)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(2);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(2);
+        ir.Paging.Take.Should().Be(2);
+        ir.Paging.TotalCount.Should().BeNull();
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Ace", "Jkl"], options => options.WithStrictOrdering());
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_ToMappedItemsResult_WithPaging_Count() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var q = ef.Table.Query().OrderBy(x => x.Text);
+
+        var ir = await q.ToMappedItemsResultAsync(TestTableDtoMapper.From, new PagingArgs(1, 3, true)).ConfigureAwait(false);
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(3);
+        ir.Paging.Should().NotBeNull();
+        ir.Paging.Skip.Should().Be(1);
+        ir.Paging.Take.Should().Be(3);
+        ir.Paging.TotalCount.Should().Be(5);
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abz", "Ace", "Jkl"], options => options.WithStrictOrdering());
+    }).AssertSuccess());
+
+    [Test]
+    public void Query_Dynamic_Filter() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var qa = new QueryArgs { Filter = "startswith(text, 'a')" };
+        var q = ef.Table.Query().Where(_queryArgsConfig, qa).OrderBy(_queryArgsConfig, qa);
+        var ir = await q.ToItemsResultAsync(PagingArgs.None).ConfigureAwait(false);
+
+        ir.Should().NotBeNull();
+        ir.Items.Should().NotBeNull();
+        ir.Items.Count().Should().Be(3);
+        ir.Items.Select(x => x.Text).Should().BeEquivalentTo(["Abc", "Abz", "Ace"], options => options.WithStrictOrdering());
+        ir.Paging.Should().BeNull();
+    }).AssertSuccess());
+
+    private static readonly QueryArgsConfig _queryArgsConfig = QueryArgsConfig.Create()
+        .WithFilter(f => f.AddField<string>(nameof(TestTable.Text), c => c.AsLowerCase().WithOperators(QueryFilterOperator.AllStringOperators)))
+        .WithOrderBy(o => o.AddField(nameof(TestTable.Text), c => c.WithDefault()));
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkUowTests.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkUowTests.cs
new file mode 100644
index 00000000..23ccd5b7
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntityFrameworkUowTests.cs
@@ -0,0 +1,99 @@
+using CoreEx.Data;
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using CoreEx.Results;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public class EntityFrameworkUowTests : DatabaseTestBase
+{
+    [Test]
+    public void Rollback_On_Exception() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        var act = async () =>
+        {
+            await uow.TransactionAsync(async () =>
+            {
+                var r = await ef.Table.DeleteAsync(2.ToGuid()).ConfigureAwait(false);
+                r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+
+                throw new InvalidOperationException("Stop!");
+            }).ConfigureAwait(false);
+        };
+
+        await act.Should().ThrowAsync<InvalidOperationException>().WithMessage("Stop!").ConfigureAwait(false);
+
+        // Confirm the record is still there!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Rollback_On_Error() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        var r = await uow.TransactionAsync(async () =>
+        {
+            var r = await ef.Table.DeleteAsync(2.ToGuid()).ConfigureAwait(false);
+            r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+
+            return Result.ConflictError("Stop!");
+        }).ConfigureAwait(false);
+
+        r.IsConflictError.Should().BeTrue();
+        r.Error.Message.Should().Be("Stop!");
+
+        // Confirm the record is still there!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(2.ToGuid()).ConfigureAwait(false);
+        m.Should().NotBeNull();
+
+    }).AssertSuccess());
+
+    [Test]
+    public void Commit_Success() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        await uow.TransactionAsync(async () =>
+        {
+            var r = await ef.Table.DeleteAsync(8.ToGuid()).ConfigureAwait(false);
+            r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+        }).ConfigureAwait(false);
+
+        // Confirm the record is gone!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(8.ToGuid()).ConfigureAwait(false);
+        m.Should().BeNull();
+    }).AssertSuccess());
+
+    [Test]
+    public void Commit_Success_Result() => Test.ScopedType<ExecutionContext>(test => test.Run(async _ =>
+    {
+        var ef = ExecutionContext.GetRequiredService<TestEfDb>();
+        var uow = ExecutionContext.GetRequiredService<IUnitOfWork>();
+        var dc = ExecutionContext.GetRequiredService<TestDbContext>();
+
+        await uow.TransactionAsync(async () =>
+        {
+            var r = await ef.Table.DeleteAsync(9.ToGuid()).ConfigureAwait(false);
+            r.WasMutated.Should().BeTrue();    // I.e. was deleted successfully!
+            return Result.Success;
+        }).ConfigureAwait(false);
+
+        // Confirm the record is gone!
+        dc.ChangeTracker.Clear();
+        var m = await ef.Table.GetAsync(9.ToGuid()).ConfigureAwait(false);
+        m.Should().BeNull();
+    }).AssertSuccess());
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/EntryPoint.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/EntryPoint.cs
new file mode 100644
index 00000000..7f7a9c37
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/EntryPoint.cs
@@ -0,0 +1,20 @@
+using CoreEx.Database.SqlServer.Test.Unit.Repository;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace CoreEx.Database.SqlServer.Test.Unit;
+
+public class EntryPoint
+{
+    public static void ConfigureApplication(IHostApplicationBuilder builder) 
+    {
+        builder.Services.AddExecutionContext(_ => new ExecutionContext { TenantId = "A" });
+
+        builder.AddSqlServerClient("SqlServer");
+        builder.Services.AddSqlServerDatabase();
+        builder.Services.AddSqlServerUnitOfWork();
+
+        builder.Services.AddDbContext<TestDbContext>();
+        builder.Services.AddEfDb<TestEfDb>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/Models/TestTable.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/Models/TestTable.cs
new file mode 100644
index 00000000..7c5c4eb0
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/Models/TestTable.cs
@@ -0,0 +1,24 @@
+using CoreEx.Data;
+using CoreEx.Entities;
+using System.Text.Json;
+
+namespace CoreEx.Database.SqlServer.Test.Unit.Models;
+
+public class TestTable : IIdentifier<Guid>, IETag, IChangeLogEx, ITenantId, ILogicallyDeleted
+{
+    public Guid Id { get; set; }
+    public string? Text { get; set; }
+    public int? Number { get; set; }
+    public decimal? Amount { get; set; }
+    public bool? Flag { get; set; }
+    public DateOnly? Date { get; set; }
+    public TimeOnly? Time { get; set; }
+    public JsonElement? Json { get; set; }
+    public string? ETag { get; set; }
+    public string? CreatedBy { get; set; }
+    public DateTimeOffset? CreatedOn { get; set; }
+    public string? UpdatedBy { get; set; }
+    public DateTimeOffset? UpdatedOn { get; set; }
+    public string? TenantId { get; set; }
+    public bool IsDeleted { get; set; }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/Models/TestTableMapper.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/Models/TestTableMapper.cs
new file mode 100644
index 00000000..2a054331
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/Models/TestTableMapper.cs
@@ -0,0 +1,19 @@
+using CoreEx.Database.Mapping;
+using System.Text.Json;
+
+namespace CoreEx.Database.SqlServer.Test.Unit.Models;
+
+public class TestTableMapper : DatabaseMapper<TestTable>
+{
+    public override TestTable MapFromDb(DatabaseRecord r, OperationType operationType = OperationType.Unspecified) => new TestTable()
+    {
+        Id = r.GetValue<Guid>("TableId"),
+        Text = r.GetValue<string?>("Text"),
+        Number = r.GetValue<int?>("Number"),
+        Amount = r.GetValue<decimal?>("Amount"),
+        Flag = r.GetValue<bool?>("Flag"),
+        Date = r.GetValue<DateOnly?>("Date"),
+        Time = r.GetValue<TimeOnly?>("Time"),
+        Json = r.GetValueFromJson<JsonElement?>("Json")
+    }.MapStandardFromDb(r);
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/Repository/TestDbContext.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/Repository/TestDbContext.cs
new file mode 100644
index 00000000..0343ee39
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/Repository/TestDbContext.cs
@@ -0,0 +1,47 @@
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.EntityFrameworkCore;
+using CoreEx.EntityFrameworkCore.Converters;
+using Microsoft.EntityFrameworkCore;
+
+namespace CoreEx.Database.SqlServer.Test.Unit.Repository;
+
+public class TestDbContext(DbContextOptions<TestDbContext> options, SqlServerDatabase database) : DbContext(options), IEfDbContext
+{
+    public IDatabase BaseDatabase { get; } = database.ThrowIfNull();
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        base.OnConfiguring(optionsBuilder);
+
+        // Uses IDatabase.Connection to ensure the same database/connection is used.
+        if (!optionsBuilder.IsConfigured)
+            optionsBuilder.UseSqlServer(BaseDatabase.Connection, contextOwnsConnection: false);
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        // Add the model configuration.
+        modelBuilder.ThrowIfNull().Entity<TestTable>(e =>
+        {
+            e.ToTable("Table", "Test");
+            e.HasKey(nameof(TestTable.Id));
+            e.Property(p => p.Id).HasColumnName("TableId").HasColumnType("UNIQUEIDENTIFIER");
+            e.Property(p => p.Text).HasColumnName("Text").HasColumnType("NVARCHAR(200)");
+            e.Property(p => p.Number).HasColumnName("Number").HasColumnType("INT");
+            e.Property(p => p.Amount).HasColumnName("Amount").HasColumnType("MONEY");
+            e.Property(p => p.Flag).HasColumnName("Flag").HasColumnType("BIT");
+            e.Property(p => p.Date).HasColumnName("Date").HasColumnType("DATE");
+            e.Property(p => p.Time).HasColumnName("Time").HasColumnType("TIME");
+            e.Property(p => p.Json).HasColumnName("Json").HasColumnType("NVARCHAR(500)").HasConversion(JsonElementStringEfConverter.Default);
+            e.Property(p => p.TenantId).HasColumnName("TenantId").HasColumnType("NVARCHAR(20)");
+            e.Property(p => p.ETag).HasColumnName("RowVersion").HasColumnType("TIMESTAMP").IsRowVersion().HasConversion(ValueConverterBridge.Create<string?, byte[]>(BaseDatabase.RowVersionConverter));
+            e.Property(p => p.CreatedBy).HasColumnName("CreatedBy").HasColumnType("NVARCHAR(250)").ValueGeneratedOnUpdate();
+            e.Property(p => p.CreatedOn).HasColumnName("CreatedOn").HasColumnType("DATETIMEOFFSET").ValueGeneratedOnUpdate();
+            e.Property(p => p.UpdatedBy).HasColumnName("UpdatedBy").HasColumnType("NVARCHAR(250)").ValueGeneratedOnAdd();
+            e.Property(p => p.UpdatedOn).HasColumnName("UpdatedOn").HasColumnType("DATETIMEOFFSET").ValueGeneratedOnAdd();
+            e.Property(p => p.IsDeleted).HasColumnName("IsDeleted").HasColumnType("BIT").HasDefaultValue(false);
+        });
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/Repository/TestEfDb.cs b/tests/CoreEx.Database.SqlServer.Test.Unit/Repository/TestEfDb.cs
new file mode 100644
index 00000000..0f3436a6
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/Repository/TestEfDb.cs
@@ -0,0 +1,18 @@
+using CoreEx.Database.SqlServer.Test.Unit.Models;
+using CoreEx.EntityFrameworkCore;
+using CoreEx.Results;
+
+namespace CoreEx.Database.SqlServer.Test.Unit.Repository;
+
+public class TestEfDb(TestDbContext dbContext) : EfDb<TestDbContext>(dbContext, _options)
+{
+    private static readonly EfDbOptions _options = new EfDbOptions()
+        .WithModel<Models.TestTable>(mo => mo
+            .WithTenantFilter(allowFilterBypass: false)
+            .WithLogicalDeleteFilter(allowFilterBypass: true)
+            .WithFilter(q => q.Where(x => x.Flag != null && x.Flag == true), (_, _) => Result.AuthorizationError(), allowFilterBypass: true));
+
+    public EfDbModel<Models.TestTable> Table => Model<Models.TestTable>();
+
+    public EfDbMappedModel<Contracts.TestTableDto, TestTable, Contracts.TestTableDtoMapper> TableDto => Table.ToMappedModel<Contracts.TestTableDto, Contracts.TestTableDtoMapper>(Contracts.TestTableDtoMapper.Default);
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.SqlServer.Test.Unit/appsettings.unittest.json b/tests/CoreEx.Database.SqlServer.Test.Unit/appsettings.unittest.json
new file mode 100644
index 00000000..9d229aed
--- /dev/null
+++ b/tests/CoreEx.Database.SqlServer.Test.Unit/appsettings.unittest.json
@@ -0,0 +1,24 @@
+{
+  "CoreEx": {
+    "Host": {
+      "SolutionName": "CoreEx",
+      "DomainName": "Test"
+    }
+  },
+  "Logging": {
+    "LogLevel": {
+      "Default": "Debug",
+      "CoreEx": "Debug",
+      "Microsoft.Data": "Warning"
+    }
+  },
+  "Aspire": {
+    "Microsoft": {
+      "Data": {
+        "SqlClient": {
+          "ConnectionString": "Data Source=127.0.0.1,1433;Initial Catalog=CoreEx.Test;User id=sa;Password=yourStrong(!)Password;TrustServerCertificate=true"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Test.Unit/CoreEx.Database.Test.Unit.csproj b/tests/CoreEx.Database.Test.Unit/CoreEx.Database.Test.Unit.csproj
new file mode 100644
index 00000000..9d6011e3
--- /dev/null
+++ b/tests/CoreEx.Database.Test.Unit/CoreEx.Database.Test.Unit.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <TestTfmsInParallel>false</TestTfmsInParallel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Data\CoreEx.Data.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+</Project>
diff --git a/tests/CoreEx.Database.Test.Unit/DatabaseParameterCollectionTests.cs b/tests/CoreEx.Database.Test.Unit/DatabaseParameterCollectionTests.cs
new file mode 100644
index 00000000..06fa84c7
--- /dev/null
+++ b/tests/CoreEx.Database.Test.Unit/DatabaseParameterCollectionTests.cs
@@ -0,0 +1,278 @@
+using CoreEx.Database.SqlServer;
+using CoreEx.Mapping.Converters;
+using Microsoft.Data.SqlClient;
+using System.Data;
+
+namespace CoreEx.Database.Test.Unit;
+
+[TestFixture]
+public class DatabaseParameterCollectionTests
+{
+    [Test]
+    public void AddParameter_Null()
+    {
+        var dp = CreateCollection().AddParameter("foo");
+        dp.ParameterName.Should().Be("@foo");
+        dp.DbType.Should().Be(System.Data.DbType.String);
+        dp.Value.Should().Be(DBNull.Value);
+        dp.Direction.Should().Be(System.Data.ParameterDirection.Input);
+    }
+
+    [Test]
+    public void AddParameter_WithValue()
+    {
+        var dp = CreateCollection().AddParameter("bar", 123);
+        dp.ParameterName.Should().Be("@bar");
+        dp.Value.Should().Be(123);
+        dp.Direction.Should().Be(ParameterDirection.Input);
+    }
+
+    [Test]
+    public void AddParameter_WithDbType()
+    {
+        var dp = CreateCollection().AddParameter("baz", 456, DbType.Int32, ParameterDirection.Output);
+        dp.ParameterName.Should().Be("@baz");
+        dp.Value.Should().Be(456);
+        dp.DbType.Should().Be(DbType.Int32);
+        dp.Direction.Should().Be(ParameterDirection.Output);
+    }
+
+    [Test]
+    public void AddParameter_WithSize()
+    {
+        var dp = CreateCollection().AddParameter("qux", DbType.String, 50, ParameterDirection.Input);
+        dp.ParameterName.Should().Be("@qux");
+        dp.DbType.Should().Be(DbType.String);
+        dp.Size.Should().Be(50);
+        dp.Direction.Should().Be(ParameterDirection.Input);
+    }
+
+    [Test]
+    public void AddParameter_DateTimeOffset()
+    {
+        var dto = new DateTimeOffset(2020, 01, 08, 06, 30, 59, TimeSpan.FromHours(8));
+        var dtoUtc = dto.ToUniversalTime();
+        var dp = CreateCollection().AddParameter("dto", dto);
+        dp.ParameterName.Should().Be("@dto");
+        dp.Value.Should().Be(dtoUtc);
+
+        // Cast it back and make sure it's UTC.
+        var dtoUtcCast = (DateTimeOffset)dp.Value;
+        dtoUtcCast.Offset.Should().Be(TimeSpan.Zero);
+    }
+
+    [Test]
+    public void AddJsonParameter()
+    {
+        var obj = new { X = 1, Y = "abc" };
+        var dp = CreateCollection().AddJsonParameter("json", obj);
+        dp.ParameterName.Should().Be("@json");
+        dp.Value.Should().Be(System.Text.Json.JsonSerializer.Serialize(obj, CreateDatabase().JsonSerializerOptions));
+    }
+
+    [Test]
+    public void AddWildcardParameter()
+    {
+        var dp = CreateCollection().AddWildcardParameter("wild", "a*b?c");
+        dp.ParameterName.Should().Be("@wild");
+        dp.Value.Should().Be("a%b_c");
+
+        var dp2 = CreateCollection().AddWildcardParameter("wildx", "a%b_c");
+        dp2.ParameterName.Should().Be("@wildx");
+        dp2.Value.Should().Be("a[%]b[_]c");
+    }
+
+    [Test]
+    public void AddReturnValueParameter()
+    {
+        var dp = CreateCollection().AddReturnValueParameter();
+        dp.ParameterName.Should().Be("@ReturnValue");
+        dp.DbType.Should().Be(DbType.Int32);
+        dp.Direction.Should().Be(ParameterDirection.ReturnValue);
+    }
+
+    [Test]
+    public void AddReselectRecordParam()
+    {
+        var dp = CreateCollection().AddReselectRecordParam();
+        dp.ParameterName.Should().Be("@ReselectRecord");
+        dp.Value.Should().Be(true);
+    }
+
+    [Test]
+    public void AddRowVersionParam()
+    {
+        var rv = StringBase64Converter.Default.ConvertToDestination("12345678");
+        var dp = CreateCollection().AddRowVersionParam("12345678");
+        dp.ParameterName.Should().Be("@RowVersion");
+        dp.Value.Should().BeEquivalentTo(rv);
+    }
+
+    [Test]
+    public void ParameterizeName_AddsAtIfMissing()
+    {
+        DatabaseParameterCollection.ParameterizeName("foo").Should().Be("@foo");
+        DatabaseParameterCollection.ParameterizeName("@bar").Should().Be("@bar");
+    }
+
+    [Test]
+    public void Add_And_Remove_Parameter()
+    {
+        var collection = CreateCollection();
+        var param = collection.AddParameter("foo", 1);
+        collection.Contains(param).Should().BeTrue();
+        collection.Remove(param).Should().BeTrue();
+        collection.Contains(param).Should().BeFalse();
+    }
+
+    [Test]
+    public void Clear_RemovesAllParameters()
+    {
+        var collection = CreateCollection();
+        collection.AddParameter("foo", 1);
+        collection.AddParameter("bar", 2);
+        collection.Count.Should().Be(2);
+        collection.Clear();
+        collection.Count.Should().Be(0);
+    }
+
+    [Test]
+    public void Indexer_ReturnsParameter()
+    {
+        var collection = CreateCollection();
+        var param = collection.AddParameter("foo", 1);
+        collection[0].Should().Be(param);
+    }
+
+    /* Extension Methods */
+
+    [Test]
+    public void ExtensionMethods_Param()
+    {
+        var collection = CreateCollection()
+            .Param("abc")
+            .Param("foo", 1)
+            .Param("bar", "abc", DbType.String, ParameterDirection.Output)
+            .Param("baz", DbType.Int32, 10, ParameterDirection.Input)
+            .JsonParam("json", new { X = 1, Y = "abc" })
+            .WildCardParam("wild", "*")
+            .RowVersionParam("12345678")
+            .ReselectRecordParam(true);
+
+        collection.Count.Should().Be(8);
+        collection[0].ParameterName.Should().Be("@abc");
+        collection[1].ParameterName.Should().Be("@foo");
+        collection[2].ParameterName.Should().Be("@bar");
+        collection[3].ParameterName.Should().Be("@baz");
+        collection[4].ParameterName.Should().Be("@json");
+        collection[5].ParameterName.Should().Be("@wild");
+        collection[6].ParameterName.Should().Be("@RowVersion");
+        collection[7].ParameterName.Should().Be("@ReselectRecord");
+    }
+
+    [Test]
+    public void ExtensionMethods_ParamWith()
+    {
+        var collection = CreateCollection()
+            .ParamWhen(false, "foo", () => 1)
+            .ParamWhen(true, "fop", () => 1)
+            .ParamWhen(false, "bar", () => "abc", DbType.String, ParameterDirection.Output)
+            .ParamWhen(true, "baz", () => 10, DbType.Int32, ParameterDirection.Input)
+            .JsonParamWhen(false, "json", () => new { X = 1, Y = "abc" })
+            .JsonParamWhen(true, "jsonx", () => new { X = 1, Y = "abc" })
+            .WildcardParamWhen(false, "wild", () => "*")
+            .WildcardParamWhen(true, "wildx", () => "*");
+
+        collection.Count.Should().Be(4);
+        collection[0].ParameterName.Should().Be("@fop");
+        collection[1].ParameterName.Should().Be("@baz");
+        collection[2].ParameterName.Should().Be("@jsonx");
+        collection[3].ParameterName.Should().Be("@wildx");
+
+        collection = CreateCollection().RowVersionParamWhen(false, "12345678");
+        collection.Count.Should().Be(0);
+
+        collection = CreateCollection().RowVersionParamWhen(true, "12345678");
+        collection.Count.Should().Be(1);
+        collection[0].ParameterName.Should().Be("@RowVersion");
+    }
+
+    [Test]
+    public void ExtensionMethods_ParamWhen_Itself()
+    {
+        var collection = CreateCollection()
+            .ParamWith((string?)null, "foo")
+            .ParamWith("abc", "fop")
+            .ParamWith(0, "bar", direction: ParameterDirection.Input)
+            .ParamWith(1, "baz", direction: ParameterDirection.InputOutput)
+            .JsonParamWith((string?)null, "json")
+            .JsonParamWith("xyz", "jsonx")
+            .WildcardParamWith(null, "wild")
+            .WildcardParamWith("abc", "wildx");
+
+        collection.Count.Should().Be(4);
+        collection[0].ParameterName.Should().Be("@fop");
+        collection[1].ParameterName.Should().Be("@baz");
+        collection[2].ParameterName.Should().Be("@jsonx");
+        collection[3].ParameterName.Should().Be("@wildx");
+
+        collection = CreateCollection().RowVersionParamWith(null);
+        collection.Count.Should().Be(0);
+
+        collection = CreateCollection().RowVersionParamWith("12345678");
+        collection.Count.Should().Be(1);
+        collection[0].ParameterName.Should().Be("@RowVersion");
+    }
+
+    [Test]
+    public void ExtensionMethods_ParamWhen_Value()
+    {
+        var collection = CreateCollection()
+            .ParamWith((string?)null, "foo", () => 1)
+            .ParamWith("abc", "fop", () => 1)
+            .ParamWith(0, "bar", () => 1)
+            .ParamWith(1, "baz", () => 1)
+            .JsonParamWith((string?)null, "json", () => 1)
+            .JsonParamWith("xyz", "jsonx", () => 1)
+            .WildcardParamWith((string?)null, "wild", () => "*")
+            .WildcardParamWith("xyz", "wildx", () => "*");
+
+        collection.Count.Should().Be(4);
+        collection[0].ParameterName.Should().Be("@fop");
+        collection[1].ParameterName.Should().Be("@baz");
+        collection[2].ParameterName.Should().Be("@jsonx");
+        collection[3].ParameterName.Should().Be("@wildx");
+    }
+
+    [Test]
+    public void ExtensionMethods_PagingParams()
+    {
+        var collection = CreateCollection().PagingParams(null);
+        collection.Count.Should().Be(0);
+
+        collection = CreateCollection().PagingParams(new Data.PagingArgs(10, 5));
+        collection.Count.Should().Be(2);
+        collection[0].ParameterName.Should().Be("@PagingSkip");
+        collection[0].Value.Should().Be(10);
+        collection[1].ParameterName.Should().Be("@PagingTake");
+        collection[1].Value.Should().Be(5);
+
+        collection = CreateCollection().PagingParams(new Data.PagingArgs(8, 4, true));
+        collection.Count.Should().Be(3);
+        collection[0].ParameterName.Should().Be("@PagingSkip");
+        collection[0].Value.Should().Be(8);
+        collection[1].ParameterName.Should().Be("@PagingTake");
+        collection[1].Value.Should().Be(4);
+        collection[2].ParameterName.Should().Be("@PagingCount");
+        collection[2].Value.Should().Be(true);
+    }
+
+    /* Utility */
+
+    private static SqlServerDatabase CreateDatabase() => new((SqlConnection)SqlClientFactory.Instance.CreateConnection())
+    {
+        Wildcard = new Extended.DatabaseWildcard(Wildcards.Wildcard.BothAll)
+    };
+
+    private static DatabaseParameterCollection CreateCollection() => CreateDatabase().Statement(SqlStatement.FromText("SELECT 1")).Parameters;
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Database.Test.Unit/SqlStatementTests.cs b/tests/CoreEx.Database.Test.Unit/SqlStatementTests.cs
new file mode 100644
index 00000000..421aea19
--- /dev/null
+++ b/tests/CoreEx.Database.Test.Unit/SqlStatementTests.cs
@@ -0,0 +1,13 @@
+namespace CoreEx.Database.Test.Unit;
+
+[TestFixture]
+public class SqlStatementTests
+{
+    [Test]
+    public void IsIndeterminate()
+    {
+        SqlStatement.Indeterminate.IsIndeterminate.Should().BeTrue();
+        SqlStatement.FromText("SELECT * FROM TABLE").IsIndeterminate.Should().BeFalse();
+        SqlStatement.StoredProcedure("SP_TEST").IsIndeterminate.Should().BeFalse();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.DomainDriven.Test.Unit/AggregateTests.cs b/tests/CoreEx.DomainDriven.Test.Unit/AggregateTests.cs
new file mode 100644
index 00000000..141c5472
--- /dev/null
+++ b/tests/CoreEx.DomainDriven.Test.Unit/AggregateTests.cs
@@ -0,0 +1,247 @@
+using CoreEx.Entities;
+using CoreEx.Events;
+
+namespace CoreEx.DomainDriven.Test.Unit;
+
+[TestFixture]
+public class AggregateTests
+{
+    public sealed class TestEntity(int id) : Aggregate<int, TestEntity>(id)
+    {
+        // Expose wrappers to call protected base methods for testing.
+        public TestEntity PublicSetPersistenceState(PersistenceState state) => SetPersistenceState(state);
+        public TestEntity PublicMakeReadOnly() => MakeReadOnly();
+        public TestEntity PublicSetChangeLog(ChangeLog? changeLog) => SetChangeLog(changeLog);
+        public TestEntity PublicSetETag(string? eTag) => SetETag(eTag);
+        public TestEntity PublicAddEvent(EventData eventData) => AddEvent(eventData);
+        public TestEntity PublicClearEvents() => ClearEvents();
+
+        // Expose wrappers to call protected modification helpers.
+        public void PublicModify(Action? action = null) => Modify(action);
+        public TResult PublicModify<TResult>(Func<TResult> func) => Modify(func);
+        public void PublicModifyAndMakeReadOnly(Action? action = null) => ModifyAndMakeReadOnly(action);
+        public TResult PublicModifyAndMakeReadOnly<TResult>(Func<TResult> func) => ModifyAndMakeReadOnly(func);
+
+        public void PublicRemove(Action? action = null) => Remove(action);
+    }
+
+    [Test]
+    public void Constructor_SetsId_And_Defaults()
+    {
+        var e = new TestEntity(42);
+
+        e.Id.Should().Be(42);
+        e.IsReadOnly.Should().BeFalse();
+        e.PersistenceState.Should().Be(PersistenceState.Unknown);
+        e.ChangeLog.Should().BeNull();
+        e.ETag.Should().BeNull();
+    }
+
+    [Test]
+    public void SetPersistenceState_ValidTransitions()
+    {
+        var e = new TestEntity(1);
+
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+        e.PersistenceState.Should().Be(PersistenceState.NotModified);
+
+        e.PublicSetPersistenceState(PersistenceState.Modified);
+        e.PersistenceState.Should().Be(PersistenceState.Modified);
+
+        e.PublicSetPersistenceState(PersistenceState.Removed);
+        e.PersistenceState.Should().Be(PersistenceState.Removed);
+    }
+
+    [Test]
+    public void SetPersistenceState_InvalidTransitions_Throw()
+    {
+        var e = new TestEntity(1);
+        e.PublicSetPersistenceState(PersistenceState.New);
+
+        // Unknown is invalid target
+        Action actUnknown = () => e.PublicSetPersistenceState(PersistenceState.Unknown);
+        actUnknown.Should().Throw<ArgumentException>()
+            .WithMessage("*cannot be set to 'Unknown'*");
+
+        // NotModified only allowed from Unknown
+        Action actNotModifiedAgain = () => e.PublicSetPersistenceState(PersistenceState.NotModified);
+        actNotModifiedAgain.Should().Throw<ArgumentException>()
+            .WithMessage("*can only be set to 'NotModified' from 'Unknown'*");
+    }
+
+    [Test]
+    public void MakeReadOnly_SetsFlag()
+    {
+        var e = new TestEntity(1);
+
+        e.IsReadOnly.Should().BeFalse();
+        e.PublicMakeReadOnly();
+        e.IsReadOnly.Should().BeTrue();
+    }
+
+    [Test]
+    public void CheckReadOnly_Throws_When_ReadOnly()
+    {
+        var e = new TestEntity(1);
+        e.PublicMakeReadOnly();
+
+        Action act = () => e.PublicModify();
+        act.Should().Throw<InvalidOperationException>()
+            .WithMessage(EntityBase.ReadOnlyErrorMessage);
+    }
+
+    [Test]
+    public void Modify_SetsModified_When_NotModified()
+    {
+        var e = new TestEntity(1);
+
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+        e.PersistenceState.Should().Be(PersistenceState.NotModified);
+
+        e.PublicModify(); // no-op.
+
+        e.PersistenceState.Should().Be(PersistenceState.Modified);
+    }
+
+    [Test]
+    public void Modify_DoesNotChangeState_When_AlreadyModified()
+    {
+        var e = new TestEntity(1);
+
+        e.PublicSetPersistenceState(PersistenceState.Modified);
+        e.PublicModify(); // no-op.
+
+        e.PersistenceState.Should().Be(PersistenceState.Modified);
+    }
+
+    [Test]
+    public void Modify_Function_ReturnsValue_And_SetsModified()
+    {
+        var e = new TestEntity(1);
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+
+        var result = e.PublicModify(() => "ok");
+        result.Should().Be("ok");
+
+        e.PersistenceState.Should().Be(PersistenceState.Modified);
+    }
+
+    [Test]
+    public void Modify_Function_Throws_When_Func_Is_Null()
+    {
+        var e = new TestEntity(1);
+
+        Action act = () => e.PublicModify<string>(null!);
+        act.Should().Throw<ArgumentNullException>();
+    }
+
+    [Test]
+    public void ModifyAndMakeReadOnly_SetsModified_Then_ReadOnly()
+    {
+        var e = new TestEntity(1);
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+
+        e.PublicModifyAndMakeReadOnly(); // no-op.
+
+        e.PersistenceState.Should().Be(PersistenceState.Modified);
+        e.IsReadOnly.Should().BeTrue();
+    }
+
+    [Test]
+    public void ModifyAndMakeReadOnly_Function_ReturnsValue_And_SetsModified_Then_ReadOnly()
+    {
+        var e = new TestEntity(1);
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+
+        var result = e.PublicModifyAndMakeReadOnly(() => 123);
+        result.Should().Be(123);
+
+        e.PersistenceState.Should().Be(PersistenceState.Modified);
+        e.IsReadOnly.Should().BeTrue();
+    }
+
+    [Test]
+    public void Remove_SetsRemoved_And_ReadOnly()
+    {
+        var e = new TestEntity(1);
+
+        e.PublicRemove();
+
+        e.PersistenceState.Should().Be(PersistenceState.Removed);
+        e.IsReadOnly.Should().BeTrue();
+    }
+
+    [Test]
+    public void SetChangeLog_Bypasses_ReadOnly_And_DoesNotChangeState()
+    {
+        var e = new TestEntity(1);
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+        e.PublicMakeReadOnly();
+
+        var cl = new ChangeLog { UpdatedBy = "user", UpdatedOn = DateTime.UtcNow };
+
+        e.PublicSetChangeLog(cl);
+
+        e.ChangeLog.Should().Be(cl);
+        e.PersistenceState.Should().Be(PersistenceState.NotModified);
+        e.IsReadOnly.Should().BeTrue();
+    }
+
+    [Test]
+    public void SetETag_Bypasses_ReadOnly_And_DoesNotChangeState()
+    {
+        var e = new TestEntity(1);
+        e.PublicSetPersistenceState(PersistenceState.NotModified);
+        e.PublicMakeReadOnly();
+
+        e.PublicSetETag("etag-1");
+
+        e.ETag.Should().Be("etag-1");
+        e.PersistenceState.Should().Be(PersistenceState.NotModified);
+        e.IsReadOnly.Should().BeTrue();
+    }
+
+    [Test]
+    public void Equality_Compares_By_Id()
+    {
+        var e1 = new TestEntity(100);
+        var e2 = new TestEntity(100);
+        var e3 = new TestEntity(101);
+
+        e1.Equals(e2).Should().BeTrue("same Id implies equality per DDD");
+        e1.Equals(e3).Should().BeFalse();
+        e1.Equals((TestEntity?)null).Should().BeFalse();
+
+        (e1 == e2).Should().BeTrue();
+        (e1 == e3).Should().BeFalse();
+        (e1 != e2).Should().BeFalse();
+        (e1 != e3).Should().BeTrue();
+    }
+
+    [Test]
+    public void ToString_Delegates_To_IEntityKey()
+    {
+        var e = new TestEntity(7);
+        var s = e.ToString();
+
+        s.Should().Be("7");
+    }
+
+    [Test]
+    public void Create_And_Clear_Events()
+    {
+        var e = new TestEntity(7);
+
+        // No events by default.
+        e.HasEvents.Should().BeFalse();
+
+        // Add event.
+        e.PublicAddEvent(EventData.CreateEvent("test-event", "emitted"));
+        e.HasEvents.Should().BeTrue();
+        e.Events.Should().HaveCount(1);
+
+        // Clear events.
+        e.PublicClearEvents();
+        e.HasEvents.Should().BeFalse();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.DomainDriven.Test.Unit/CoreEx.DomainDriven.Test.Unit.csproj b/tests/CoreEx.DomainDriven.Test.Unit/CoreEx.DomainDriven.Test.Unit.csproj
new file mode 100644
index 00000000..f919166b
--- /dev/null
+++ b/tests/CoreEx.DomainDriven.Test.Unit/CoreEx.DomainDriven.Test.Unit.csproj
@@ -0,0 +1,34 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.DomainDriven\CoreEx.DomainDriven.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+    <Using Alias="ExecutionContext" Include="CoreEx.ExecutionContext" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/CoreEx.Events.Test.Unit/CloudEventsExtensionsTests.cs b/tests/CoreEx.Events.Test.Unit/CloudEventsExtensionsTests.cs
new file mode 100644
index 00000000..eeca6f57
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/CloudEventsExtensionsTests.cs
@@ -0,0 +1,132 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Events.Test.Unit;
+
+[TestFixture]
+public class CloudEventsExtensionsTests
+{
+    [Test]
+    public void EncodeToBinaryData_Structured()
+    {
+        var ed = new EventData().WithValue(new Product { Id = "abc", Name = "A blue carrot" }).WithAction("Created");
+        var ef = new EventFormatter { SourceBaseUri = new Uri("urn:Test"), DomainName = "CoreEx" };
+        
+        var ce = ef.ConvertToCloudEvent(ef.Format(ed));
+        var bd = ce.EncodeToBinaryData(CloudNative.CloudEvents.ContentMode.Structured);
+        bd.Should().NotBeNull();
+        bd.MediaType.Should().Be("application/cloudevents+json; charset=utf-8");
+
+        var ce2 = bd.DecodeToCloudEvent(CloudNative.CloudEvents.ContentMode.Structured);
+        ce2.Should().NotBeNull();
+        var ed2 = ef.Parse(ef.ConvertFromCloudEvent(ce2));
+        ed2.Should().NotBeNull();
+
+        // The casing will have been changed during formatting and cannot be returned to original.
+        ed2.DomainName.Should().Be("coreex");
+        ed2.Entity.Should().Be("product");
+        ed2.Action.Should().Be("created");
+
+        ObjectComparer.Assert(ed.Data, ed2.Data);
+    }
+
+    [Test]
+    public void EncodeToBinaryData_Binary()
+    {
+        var ed = new EventData().WithValue(new Product { Id = "abc", Name = "A blue carrot" }).WithAction("Created");
+        var ef = new EventFormatter { SourceBaseUri = new Uri("urn:Test"), DomainName = "CoreEx" };
+
+        var ce = ef.ConvertToCloudEvent(ef.Format(ed));
+        var bd = ce.EncodeToBinaryData(CloudNative.CloudEvents.ContentMode.Binary);
+        bd.Should().NotBeNull();
+        bd.ToString().Should().Be("""{"id":"abc","name":"A blue carrot"}""");
+
+        var ce2 = bd.DecodeToCloudEvent(CloudNative.CloudEvents.ContentMode.Binary);
+        ce2.Should().NotBeNull();
+        var ed2 = ef.Parse(ef.ConvertFromCloudEvent(ce2));
+        ed2.Should().NotBeNull();
+
+        // The non-data properties are not included in DataJson format and so will be null.
+        ed2.DomainName.Should().BeNull();
+        ed2.Entity.Should().BeNull();
+        ed2.Action.Should().BeNull();
+
+        ObjectComparer.Assert(ed.Data, ed2.Data);
+    }
+
+    //[Test]
+    //public void EncodeToBinaryData_FullBinary()
+    //{
+    //    var ed = new EventData().WithValue(new Product { Id = "abc", Name = "A blue carrot" }).WithAction("Created");
+    //    var ef = new EventFormatter { SourceBaseUri = new Uri("urn:Test"), DomainName = "CoreEx" };
+
+    //    var ce = ef.ConvertToCloudEvent(ef.Format(ed));
+    //    var bd = ce.EncodeToBinaryData(DataContentFormat.FullBinary);
+    //    bd.Should().NotBeNull();
+
+    //    var ce2 = bd.DecodeToCloudEvent(DataContentFormat.FullBinary);
+    //    ce2.Should().NotBeNull();
+    //    var ed2 = ef.Parse(ef.ConvertFromCloudEvent(ce2));
+    //    ed2.Should().NotBeNull();
+
+    //    // The casing will have been changed during formatting and cannot be returned to original.
+    //    ed2.DomainName.Should().Be("coreex");
+    //    ed2.Entity.Should().Be("product");
+    //    ed2.Action.Should().Be("created");
+
+    //    ObjectComparer.Assert(ed.Data, ed2.Data);
+    //}
+
+    //[Test]
+    //public void EncodeToBinaryData_DataBinary()
+    //{
+    //    var ed = new EventData().WithValue(new Product { Id = "abc", Name = "A blue carrot" }).WithAction("Created");
+    //    var ef = new EventFormatter { SourceBaseUri = new Uri("urn:Test"), DomainName = "CoreEx" };
+
+    //    var ce = ef.ConvertToCloudEvent(ef.Format(ed));
+    //    var bd = ce.EncodeToBinaryData(DataContentFormat.DataBinary);
+    //    bd.Should().NotBeNull();
+
+    //    var ce2 = bd.DecodeToCloudEvent(DataContentFormat.DataBinary);
+    //    ce2.Should().NotBeNull();
+    //    var ed2 = ef.Parse(ef.ConvertFromCloudEvent(ce2));
+    //    ed2.Should().NotBeNull();
+
+    //    // The non-data properties are not included in DataJson format and so will be null.
+    //    ed2.DomainName.Should().BeNull();
+    //    ed2.Entity.Should().BeNull();
+    //    ed2.Action.Should().BeNull();
+
+    //    ObjectComparer.Assert(ed.Data, ed2.Data);
+    //}
+
+    [Test]
+    public void EncodeToJsonElement_And_Back_Again()
+    {
+        var ed = new EventData().WithValue(new Product { Id = "abc", Name = "A blue carrot" }).WithAction("Created");
+        var ef = new EventFormatter { SourceBaseUri = new Uri("urn:Test"), DomainName = "coreex" };
+
+        var ce = ef.ConvertToCloudEvent(ef.Format(ed));
+        var je = ce.EncodeToJsonElement();
+        je.Should().NotBeNull();
+
+        Console.WriteLine(je.ToString());
+
+        var ce2 = je.DecodeToCloudEvent();
+        ce2.Should().NotBeNull();
+        var ed2 = ef.Parse(ef.ConvertFromCloudEvent(ce2));
+        ed2.Should().NotBeNull();
+
+        // The casing will have been changed during formatting and cannot be returned to original.
+        ed2.DomainName.Should().Be("coreex");
+        ed2.Entity.Should().Be("product");
+        ed2.Action.Should().Be("created");
+
+        ObjectComparer.Assert(ed.Data, ed2.Data);
+    }
+
+    private class Product : IIdentifier<string?>
+    {
+        public string? Id { get; set; }
+        public string? Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Events.Test.Unit/CoreEx.Events.Test.Unit.csproj b/tests/CoreEx.Events.Test.Unit/CoreEx.Events.Test.Unit.csproj
new file mode 100644
index 00000000..0d167a04
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/CoreEx.Events.Test.Unit.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.Events\CoreEx.Events.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+    <Using Include="Moq"/>
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.Events.Test.Unit/EventDataTests.cs b/tests/CoreEx.Events.Test.Unit/EventDataTests.cs
new file mode 100644
index 00000000..b4bc8d15
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/EventDataTests.cs
@@ -0,0 +1,277 @@
+using CoreEx.Data;
+using CoreEx.Entities;
+using CoreEx.Security;
+
+namespace CoreEx.Events.Test.Unit;
+
+[TestFixture]
+public class EventDataTests
+{
+    [Test]
+    public void Property_GetSet_All()
+    {
+        var dt = DateTimeOffset.UtcNow;
+        var uri = new Uri("https://test");
+        var ver = new Version(1, 2, 3, 4);
+
+        var ed = new EventData
+        {
+            Id = "id1",
+            Timestamp = dt,
+            DomainName = "DOMAIN",
+            TenantId = "TENANT",
+            Entity = "ENTITY",
+            Action = "ACTION",
+            Key = "key1",
+            TraceParent = "tp",
+            TraceState = "ts",
+            UserType = AuthenticationType.AccountUser,
+            UserId = "user1",
+            Data = new BinaryData("abc"),
+            DataSchema = uri,
+            DataSchemaVersion = ver,
+            PartitionKey = "pk",
+            ReplyTo = "reply",
+            Title = "title",
+            Source = uri
+        };
+
+        ed.Id.Should().Be("id1");
+        ed.Timestamp.Should().Be(dt);
+        ed.DomainName.Should().Be("DOMAIN");
+        ed.TenantId.Should().Be("TENANT");
+        ed.Entity.Should().Be("ENTITY");
+        ed.Action.Should().Be("ACTION");
+        ed.Key.Should().Be("key1");
+        ed.TraceParent.Should().Be("tp");
+        ed.TraceState.Should().Be("ts");
+        ed.UserType.Should().Be(AuthenticationType.AccountUser);
+        ed.UserId.Should().Be("user1");
+        ed.Data!.ToString().Should().Be("abc");
+        ed.DataSchema.Should().Be(uri);
+        ed.DataSchemaVersion.Should().Be(ver);
+        ed.PartitionKey.Should().Be("pk");
+        ed.ReplyTo.Should().Be("reply");
+        ed.Title.Should().Be("title");
+        ed.Source.Should().Be(uri);
+    }
+
+    [Test]
+    public void SetAttribute_And_TryGetAttribute()
+    {
+        var ed = new EventData();
+        ed.SetAttribute("foo", 123);
+        ed.SetAttribute("bar", "baz");
+
+        ed.Attributes.Should().ContainKey("foo");
+        ed.Attributes.Should().ContainKey("bar");
+        ed.Attributes["foo"].Should().Be(123);
+        ed.Attributes["bar"].Should().Be("baz");
+
+        ed.TryGetAttribute<int>("foo", out var v1).Should().BeTrue();
+        v1.Should().Be(123);
+
+        ed.TryGetAttribute<string>("bar", out var v2).Should().BeTrue();
+        v2.Should().Be("baz");
+
+        ed.TryGetAttribute<string>("notfound", out var v3).Should().BeFalse();
+        v3.Should().BeNull();
+    }
+
+    [Test]
+    public void WithEntity_SetsEntity()
+    {
+        var ed = new EventData().WithEntity("Order");
+        ed.Entity.Should().Be("Order");
+    }
+
+    [Test]
+    public void WithAction_String_SetsAction()
+    {
+        var ed = new EventData().WithAction("Created");
+        ed.Action.Should().Be("Created");
+    }
+
+    private enum TestAction { Created, Updated }
+
+    [Test]
+    public void WithAction_Enum_SetsAction()
+    {
+        var ed = new EventData().WithAction(TestAction.Updated);
+        ed.Action.Should().Be("Updated");
+    }
+
+    [Test]
+    public void WithKey_SetsKey()
+    {
+        var ed = new EventData().WithKey("123");
+        ed.Key.Should().Be("123");
+    }
+
+    [Test]
+    public void WithVersion_SetsDataSchemaVersion()
+    {
+        var v = new Version(1, 2, 3);
+        var ed = new EventData().WithVersion(v);
+        ed.DataSchemaVersion.Should().Be(v);
+    }
+
+    [Test]
+    public void WithUser_SetsUserTypeAndUserId()
+    {
+        var user = new Security.AuthenticationUser { Type = AuthenticationType.AccountUser, Id = "u1", UserName = "user1" };
+        var ed = new EventData().WithUser(user);
+        ed.UserType.Should().Be(AuthenticationType.AccountUser);
+        ed.UserId.Should().Be("u1");
+    }
+
+    [Test]
+    public void WithSchema_SetsDataSchema()
+    {
+        var uri = new Uri("https://schema");
+        var ed = new EventData().WithSchema(uri);
+        ed.DataSchema.Should().Be(uri);
+    }
+
+    [Test]
+    public void WithTitle_SetsTitle()
+    {
+        var ed = new EventData().WithTitle("my.title");
+        ed.Title.Should().Be("my.title");
+    }
+
+    [Test]
+    public void WithValue_SetsDataAndEntity()
+    {
+        var obj = new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1", ETag = "abc" };
+        var ed = new EventData().WithValue(obj);
+        ed.Data.Should().NotBeNull();
+        ed.Data.MediaType.Should().Be(System.Net.Mime.MediaTypeNames.Application.Json);
+        ed.Data.Length.Should().BeGreaterThan(0);
+        ed.Entity.Should().Be(nameof(TestValue));
+        ed.Key.Should().Be("42");
+        ed.TenantId.Should().Be("t1");
+        ed.PartitionKey.Should().Be("pk1");
+
+        var json = ed.Data!.ToString();
+        json.Should().Contain("abc");
+        json.Length.Should().BeGreaterThan(0);
+    }
+
+    [Test]
+    public void WithValue_Null_SetsDataNull()
+    {
+        var ed = new EventData().WithValue<TestValue>(null);
+        ed.Data.Should().BeNull();
+    }
+
+    [Test]
+    public void WithValue_ExcludePaths_ExcludesProperties()
+    {
+        var obj = new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1", Extra = "should-exclude" };
+        var ed = new EventData().WithValue(obj, "Extra");
+        var json = ed.Data!.ToString();
+        json.Should().NotContain("should-exclude");
+    }
+
+    [Test]
+    public void Create_Event()
+    {
+        var ed = EventData.CreateEvent("Order", "Created");
+        ed.Entity.Should().Be("Order");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Event);
+        ed.DomainName.Should().BeNull();
+
+        ed = EventData.CreateEvent("Order", TestAction.Created);
+        ed.Entity.Should().Be("Order");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Event);
+        ed.DomainName.Should().BeNull();
+
+        ed = EventData.CreateEventWith(new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1" }, "Created");
+        ed.Data.Should().NotBeNull();
+        ed.Data!.ToString().Should().Contain("\"id\":\"42\"");
+        ed.Entity.Should().Be("TestValue");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Event);
+        ed.DomainName.Should().BeNull();
+
+        ed = EventData.CreateEventWith(new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1" }, TestAction.Created);
+        ed.Data.Should().NotBeNull();
+        ed.Data!.ToString().Should().Contain("\"id\":\"42\"");
+        ed.Entity.Should().Be("TestValue");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Event);
+        ed.DomainName.Should().BeNull();
+    }
+
+    [Test]
+    public void Create_Command()
+    {
+        var ed = EventData.CreateCommand("Test", "Order", "Created");
+        ed.Entity.Should().Be("Order");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Command);
+        ed.DomainName.Should().Be("Test");
+
+        ed = EventData.CreateCommand("Test", "Order", TestAction.Created);
+        ed.Entity.Should().Be("Order");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Command);
+        ed.DomainName.Should().Be("Test");
+
+        ed = EventData.CreateCommandWith("Test", new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1" }, "Created");
+        ed.Data.Should().NotBeNull();
+        ed.Data!.ToString().Should().Contain("\"id\":\"42\"");
+        ed.Entity.Should().Be("TestValue");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Command);
+        ed.DomainName.Should().Be("Test");
+
+        ed = EventData.CreateCommandWith("Test", new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1" }, TestAction.Created);
+        ed.Data.Should().NotBeNull();
+        ed.Data!.ToString().Should().Contain("\"id\":\"42\"");
+        ed.Entity.Should().Be("TestValue");
+        ed.Action.Should().Be("Created");
+        ed.MessageType.Should().Be(MessageType.Command);
+        ed.DomainName.Should().Be("Test");
+    }
+
+    [Test]
+    public void ToObjectFromJson_T_ReturnsDeserializedObject()
+    {
+        var obj = new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1", ETag = "abc" };
+        var ed = new EventData().WithValue(obj);
+
+        var obj2 = ed.ToObjectFromJson<TestValue>();
+        obj2.Should().NotBeNull();
+        obj2.Id.Should().Be(obj.Id);
+        obj2.TenantId.Should().Be(obj.TenantId);
+        obj2.PartitionKey.Should().Be(obj.PartitionKey);
+        obj2.ETag.Should().Be("abc");
+    }
+
+    [Test]
+    public void ToObjectFromJson_T_ReturnsDeserializedObject_Type()
+    {
+        var obj = new TestValue { Id = "42", TenantId = "t1", PartitionKey = "pk1", ETag = "abc" };
+        var ed = new EventData().WithValue(obj);
+
+        TestValue? obj2 = ed.ToObjectFromJson<TestValue>();
+        obj2.Should().NotBeNull();
+        obj2.Id.Should().Be(obj.Id);
+        obj2.TenantId.Should().Be(obj.TenantId);
+        obj2.PartitionKey.Should().Be(obj.PartitionKey);
+        obj2.ETag.Should().Be("abc");
+    }
+
+    private class TestValue : IIdentifier<string?>, IReadOnlyTenantId, IReadOnlyPartitionKey, IReadOnlyETag
+    {
+        public string? Id { get; set; }
+        public string? TenantId { get; set; }
+        public string? PartitionKey { get; set; }
+        public string? Extra { get; set; }
+        public string? ETag { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Events.Test.Unit/EventFormatterTests.cs b/tests/CoreEx.Events.Test.Unit/EventFormatterTests.cs
new file mode 100644
index 00000000..6692506d
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/EventFormatterTests.cs
@@ -0,0 +1,246 @@
+using CloudNative.CloudEvents;
+using CloudNative.CloudEvents.Extensions;
+using CoreEx.Hosting;
+using CoreEx.Security;
+
+namespace CoreEx.Events.Test.Unit;
+
+[TestFixture]
+public class EventFormatterTests
+{
+    [Test]
+    public void Property_GetSet_All()
+    {
+        var ef = new EventFormatter
+        {
+            TraceParentAttributeName = "tp",
+            TraceStateAttributeName = "ts",
+            TraceBaggageAttributeName = "tb",
+            TenantIdAttributeName = "tid",
+            DataSchemaVersionAttributeName = "dsv",
+            AuthTypeAttributeName = "at",
+            AuthIdAttributeName = "aid",
+            ReplyToAttributeName = "rt",
+            TitlePrefix = "prefix",
+            SourceBaseUri = new Uri("https://base/"),
+            DomainName = "dn"
+        };
+
+        ef.TraceParentAttributeName.Should().Be("tp");
+        ef.TraceStateAttributeName.Should().Be("ts");
+        ef.TraceBaggageAttributeName.Should().Be("tb");
+        ef.TenantIdAttributeName.Should().Be("tid");
+        ef.DataSchemaVersionAttributeName.Should().Be("dsv");
+        ef.AuthTypeAttributeName.Should().Be("at");
+        ef.AuthIdAttributeName.Should().Be("aid");
+        ef.ReplyToAttributeName.Should().Be("rt");
+        ef.TitlePrefix.Should().Be("prefix");
+        ef.SourceBaseUri.Should().Be(new Uri("https://base/"));
+        ef.DomainName.Should().Be("dn");
+    }
+
+    [Test]
+    public void Format_TitleAndSource()
+    {
+        var ef = new EventFormatter { TitlePrefix = "pre", SourceBaseUri = new Uri("https://base/"), DomainName = "dom", PartitionKeyIsRequired = false };
+        var ed = new EventData
+        {
+            DomainName = "dom",
+            Entity = "ent",
+            Action = "act",
+            DataSchemaVersion = new Version(2, 3),
+            TenantId = "tenant"
+        };
+
+        var result = ef.Format(ed);
+        result.Title.Should().Be("pre.dom.ent.act.v2");
+        result.Source.Should().Be(new Uri("https://base/tenant"));
+    }
+
+    [Test]
+    public void Format_Title_From_HostSettings()
+    {
+        var hs = new HostSettings { SolutionName = "Coreex.Test", DomainName = "Dom", EnvironmentName = "Env" };
+        var ef = new EventFormatter(hs) { PartitionKeyIsRequired = false };
+        var ed = new EventData
+        {
+            Entity = "Ent",
+            Action = "Act",
+            DataSchemaVersion = new Version(1, 0)
+        };
+
+        var result = ef.Format(ed);
+        result.Title.Should().Be("coreex.test.dom.ent.act.v1");
+        result.Source.Should().Be(new Uri("urn:coreex:test:dom"));
+    }
+
+    [Test]
+    public void Parse_Title_Full()
+    {
+        var ef = new EventFormatter { TitlePrefix = "pre" };
+        var ed = new EventData { Title = "pre.dom.ent.act.v2" };
+        var result = ef.Parse(ed);
+        result.DomainName.Should().Be("dom");
+        result.Entity.Should().Be("ent");
+        result.Action.Should().Be("act");
+        result.DataSchemaVersion.Should().Be(new Version(2, 0));
+    }
+
+    [Test]
+    public void Parse_Title_Partial()
+    {
+        var ef = new EventFormatter();
+        var ed = new EventData { Title = "dom.ent.act" };
+        var result = ef.Parse(ed);
+        result.DomainName.Should().Be("dom");
+        result.Entity.Should().Be("ent");
+        result.Action.Should().Be("act");
+        result.DataSchemaVersion.Should().BeNull();
+    }
+
+    [Test]
+    public void Convert_EventData_To_CloudEvent_AndBack()
+    {
+        var ef = new EventFormatter();
+        var ed = new EventData
+        {
+            Id = "id1",
+            Timestamp = DateTimeOffset.UtcNow,
+            DomainName = "dom",
+            Entity = "ent",
+            Action = "act",
+            Key = "k1",
+            PartitionKey = "pk1",
+            ReplyTo = "reply",
+            UserType = AuthenticationType.AccountUser,
+            UserId = "user1",
+            TraceParent = "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
+            TraceState = "ts",
+            TraceBaggage = [new KeyValuePair<string, string?>("foo", "bar")],
+            DataSchemaVersion = new Version(1, 0),
+            DataSchema = new Uri("https://schema"),
+            Data = new BinaryData("abc"),
+            Title = "dom.ent.act.v1",
+            Source = new Uri("https://src")
+        };
+        ed.SetAttribute("foo", "bar");
+        ed.SetAttribute("_internal", "shouldnotcopy");
+
+        var ce = ef.ConvertToCloudEvent(ed);
+        ce.Id.Should().Be(ed.Id);
+        ce.Type.Should().Be(ed.Title);
+        ce.Source.Should().Be(ed.Source);
+        ce.Subject.Should().Be(ed.Key);
+        ce.Time.Should().Be(ed.Timestamp);
+        ce.DataContentType.Should().Be(ed.Data!.MediaType);
+        ce.DataSchema.Should().Be(ed.DataSchema);
+        ce.Data.Should().Be(ed.Data);
+        ce[ef.TenantIdAttributeName].Should().Be(ed.TenantId);
+        ce.GetPartitionKey().Should().Be(ed.PartitionKey);
+        ce[ef.ReplyToAttributeName].Should().Be(ed.ReplyTo);
+        ce[ef.AuthTypeAttributeName].Should().Be("user");
+        ce[ef.AuthIdAttributeName].Should().Be(ed.UserId);
+        ce[ef.TraceParentAttributeName].Should().Be(ed.TraceParent);
+        ce[ef.TraceStateAttributeName].Should().Be(ed.TraceState);
+        ce[ef.TraceBaggageAttributeName].Should().Be("foo=bar");
+        ce[ef.DataSchemaVersionAttributeName].Should().Be(ed.DataSchemaVersion.ToString());
+        ce["foo"].Should().Be("bar");
+        ce["_internal"].Should().BeNull();
+
+        // Convert back
+        var ed2 = ef.ConvertFromCloudEvent(ce);
+        ed2.Id.Should().Be(ed.Id);
+        ed2.Timestamp.Should().Be(ed.Timestamp);
+        ed2.DataSchema.Should().Be(ed.DataSchema);
+        ed2.Key.Should().Be(ed.Key);
+        ed2.PartitionKey.Should().Be(ed.PartitionKey);
+        ed2.DataSchemaVersion.Should().Be(ed.DataSchemaVersion);
+        ed2.TenantId.Should().Be(ed.TenantId);
+        ed2.ReplyTo.Should().Be(ed.ReplyTo);
+        ed2.UserType.Should().Be(ed.UserType);
+        ed2.UserId.Should().Be(ed.UserId);
+        ed2.TraceParent.Should().Be(ed.TraceParent);
+        ed2.TraceState.Should().Be(ed.TraceState);
+        ed2.TraceBaggage.Should().BeEquivalentTo(ed.TraceBaggage);
+        ed2.Source.Should().Be(ed.Source);
+        ed2.Title.Should().Be(ed.Title);
+        ed2.Attributes.Should().ContainKey("foo");
+        ed2.Attributes.Should().NotContainKey("_internal");
+    }
+
+    [Test]
+    public void Convert_CloudEvent_DataNotBinary_Throws()
+    {
+        var ef = new EventFormatter();
+        var ce = new CloudEvent
+        {
+            Id = "id",
+            Data = "not-binary"
+        };
+        Action act = () => ef.ConvertFromCloudEvent(ce);
+        act.Should().Throw<NotSupportedException>();
+    }
+
+    [Test]
+    public void AddTracing_SetsTraceParentAndState()
+    {
+        var ef = new EventFormatter();
+        var ce = new CloudEvent { Id = "id" };
+        ef.AddTracing(ce, "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01", "vendor=prop");
+        ce[ef.TraceParentAttributeName].Should().Be("00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01");
+        ce[ef.TraceStateAttributeName].Should().Be("vendor=prop");
+        ce[ef.TraceBaggageAttributeName].Should().BeNull();
+
+        ce = new CloudEvent { Id = "id" };
+        ef.AddTracing(ce, "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01", "vendor=prop", [new KeyValuePair<string, string?>("foo", "bar")]);
+        ce[ef.TraceParentAttributeName].Should().Be("00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01");
+        ce[ef.TraceStateAttributeName].Should().Be("vendor=prop");
+        ce[ef.TraceBaggageAttributeName].Should().Be("foo=bar");
+    }
+
+    [Test]
+    public void AddTracing_DoesNotOverwriteExisting()
+    {
+        var ef = new EventFormatter();
+        var ce = new CloudEvent { Id = "id" };
+        ce.SetExtensionAttribute(ef.TraceParentAttributeName, "existing");
+        ef.AddTracing(ce, "tp", "ts");
+        ce[ef.TraceParentAttributeName].Should().Be("existing");
+    }
+
+    [TestCase(AuthenticationType.Unknown, "unknown")]
+    [TestCase(AuthenticationType.Unauthenticated, "unauthenticated")]
+    [TestCase(AuthenticationType.ApplicationUser, "app_user")]
+    [TestCase(AuthenticationType.AccountUser, "user")]
+    [TestCase(AuthenticationType.SystemUser, "system")]
+    public void ConvertFromAuthenticationType_And_ConvertToAuthenticationType(AuthenticationType type, string expected)
+    {
+        var ef = new EventFormatter();
+        var methodFrom = ef.GetType().GetMethod("ConvertFromAuthenticationType", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        var methodTo = ef.GetType().GetMethod("ConvertToAuthenticationType", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+
+        var str = (string?)methodFrom!.Invoke(ef, [type]);
+        str.Should().Be(expected);
+
+        var at = (AuthenticationType?)methodTo!.Invoke(ef, [expected]);
+        at.Should().Be(type);
+    }
+
+    [Test]
+    public void ConvertFromAuthenticationType_Invalid_Throws()
+    {
+        var ef = new EventFormatter();
+        var method = ef.GetType().GetMethod("ConvertFromAuthenticationType", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        Action act = () => method!.Invoke(ef, [(AuthenticationType)999]);
+        act.Should().Throw<Exception>();
+    }
+
+    [Test]
+    public void ConvertToAuthenticationType_Invalid_Throws()
+    {
+        var ef = new EventFormatter();
+        var method = ef.GetType().GetMethod("ConvertToAuthenticationType", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
+        Action act = () => method!.Invoke(ef, ["badtype"]);
+        act.Should().Throw<Exception>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Events.Test.Unit/GlobalSuppressions.cs b/tests/CoreEx.Events.Test.Unit/GlobalSuppressions.cs
new file mode 100644
index 00000000..e5f1ebc6
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/GlobalSuppressions.cs
@@ -0,0 +1,9 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Performance", "CA1806:Do not ignore method results", Justification = "<Pending>", Scope = "member", Target = "~M:CoreEx.Events.Test.Unit.Publishing.FixedDestinationProviderTests.Name_SetNull_ShouldThrowArgumentNullException")]
+[assembly: SuppressMessage("Performance", "CA1806:Do not ignore method results", Justification = "<Pending>", Scope = "member", Target = "~M:CoreEx.Events.Test.Unit.Publishing.FixedDestinationProviderTests.Name_SetEmpty_ShouldThrowArgumentException")]
diff --git a/tests/CoreEx.Events.Test.Unit/Publishing/EventPublisherBaseTests.cs b/tests/CoreEx.Events.Test.Unit/Publishing/EventPublisherBaseTests.cs
new file mode 100644
index 00000000..5e116b81
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/Publishing/EventPublisherBaseTests.cs
@@ -0,0 +1,176 @@
+using CloudNative.CloudEvents;
+using CoreEx.Events.Publishing;
+
+namespace CoreEx.Events.Test.Unit.Publishing;
+
+public class EventPublisherBaseTests
+{
+    private class TestEventPublisher() : EventPublisherBase(new FixedDestinationProvider { Destination = "fixed" }, new EventFormatter() { PartitionKeyIsRequired = false })
+    {
+        public DestinationEvent[]? PublishedEvents { get; private set; }
+        public CancellationToken? PublishedToken { get; private set; }
+        public int PublishCallCount { get; private set; }
+
+        protected override Task OnPublishAsync(DestinationEvent[] events, CancellationToken cancellationToken = default)
+        {
+            PublishCallCount++;
+            PublishedEvents = events;
+            PublishedToken = cancellationToken;
+            return Task.CompletedTask;
+        }
+    }
+
+    private TestEventPublisher _publisher = null!;
+
+    [SetUp]
+    public void SetUp() => _publisher = new TestEventPublisher();
+
+    [Test]
+    public void IsEmpty_ShouldBeTrue_WhenNoEventsAdded()
+    {
+        _publisher.IsEmpty.Should().BeTrue();
+    }
+
+    [Test]
+    public void Add_EventData_ShouldQueueEvents()
+    {
+        var e1 = new EventData();
+        var e2 = new EventData();
+        _publisher.Add(e1, e2);
+
+        _publisher.IsEmpty.Should().BeFalse();
+    }
+
+    [Test]
+    public void Add_EventData_ShouldIgnoreNulls()
+    {
+        var e1 = new EventData();
+        _publisher.Add(e1, null!);
+
+        _publisher.IsEmpty.Should().BeFalse();
+    }
+
+    [Test]
+    public void Add_WithDestination_EventData_ShouldQueueEvents()
+    {
+        var e1 = new EventData();
+        var e2 = new EventData();
+        _publisher.Add("my-dest", e1, e2);
+
+        _publisher.IsEmpty.Should().BeFalse();
+    }
+
+    [Test]
+    public void Add_WithDestination_CloudEvent_ShouldQueueEvents()
+    {
+        var ce1 = new CloudEvent();
+        var ce2 = new CloudEvent();
+        _publisher.Add("my-dest", ce1, ce2);
+
+        _publisher.IsEmpty.Should().BeFalse();
+    }
+
+    [Test]
+    public void Add_WithNullDestination_ShouldThrow()
+    {
+        var e1 = new EventData();
+        Action act = () => _publisher.Add((string)null!, e1);
+        act.Should().Throw<ArgumentNullException>();
+    }
+
+    [Test]
+    public void Add_WithEmptyDestination_ShouldThrow()
+    {
+        var e1 = new EventData();
+        Action act = () => _publisher.Add("", e1);
+        act.Should().Throw<ArgumentException>();
+    }
+
+    [Test]
+    public void Add_CloudEvent_WithNullDestination_ShouldThrow()
+    {
+        var ce1 = new CloudEvent();
+        Action act = () => _publisher.Add(null!, ce1);
+        act.Should().Throw<ArgumentNullException>();
+    }
+
+    [Test]
+    public void Add_CloudEvent_WithEmptyDestination_ShouldThrow()
+    {
+        var ce1 = new CloudEvent();
+        Action act = () => _publisher.Add("", ce1);
+        act.Should().Throw<ArgumentException>();
+    }
+
+    [Test]
+    public void Clear_ShouldClearQueue()
+    {
+        var e1 = new EventData();
+        _publisher.Add(e1);
+        _publisher.IsEmpty.Should().BeFalse();
+
+        _publisher.Clear();
+        _publisher.IsEmpty.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Rollback_ShouldRemoveSpecifiedCountOfEvents()
+    {
+        var e1 = new EventData { Id = "X" };
+        var e2 = new EventData();
+        var e3 = new EventData();
+
+        _publisher.Add(e1, e2, e3);
+        _publisher.Count.Should().Be(3);
+
+        Action act = () => _publisher.Rollback(4);
+        act.Should().Throw<ArgumentException>();
+
+        _publisher.Rollback(2);
+        _publisher.Count.Should().Be(1);
+
+        await _publisher.PublishAsync();
+
+        _publisher.PublishCallCount.Should().Be(1);
+        _publisher.PublishedEvents!.Length.Should().Be(1);
+        _publisher.PublishedEvents![0].Event.Id.Should().Be("X");
+
+        Action act2 = () => _publisher.Rollback(1);
+        act2.Should().Throw<InvalidOperationException>();
+    }
+
+    [Test]
+    public async Task Reset_ShouldResetHasPublished()
+    {
+        var e1 = new EventData();
+        _publisher.Add(e1);
+        _publisher.HasBeenPublished.Should().BeFalse();
+
+        await _publisher.PublishAsync();
+        _publisher.HasBeenPublished.Should().BeTrue();
+
+        _publisher.Reset();
+        _publisher.HasBeenPublished.Should().BeFalse();
+    }
+
+    [Test]
+    public async Task PublishAsync_ShouldCallOnPublishAsync_AndReset()
+    {
+        var e1 = new EventData();
+        _publisher.Add(e1);
+
+        await _publisher.PublishAsync();
+
+        _publisher.PublishCallCount.Should().Be(1);
+        _publisher.PublishedEvents.Should().NotBeNull();
+        _publisher.HasBeenPublished.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task PublishAsync_WhenEmpty_ShouldNotCallOnPublishAsync()
+    {
+        await _publisher.PublishAsync();
+        _publisher.PublishCallCount.Should().Be(0);
+        _publisher.HasBeenPublished.Should().BeTrue();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Events.Test.Unit/Publishing/FixedDestinationProviderTests.cs b/tests/CoreEx.Events.Test.Unit/Publishing/FixedDestinationProviderTests.cs
new file mode 100644
index 00000000..0c823a09
--- /dev/null
+++ b/tests/CoreEx.Events.Test.Unit/Publishing/FixedDestinationProviderTests.cs
@@ -0,0 +1,57 @@
+using CoreEx.Events.Publishing;
+
+namespace CoreEx.Events.Test.Unit.Publishing;
+
+[TestFixture]
+public class FixedDestinationProviderTests
+{
+    [Test]
+    public void Name_SetAndGet_ShouldReturnValue()
+    {
+        var provider = new FixedDestinationProvider { Destination = "my-destination" };
+        provider.Destination.Should().Be("my-destination");
+    }
+
+    [Test]
+    public void Name_SetNull_ShouldThrowArgumentNullException()
+    {
+        Action act = static () => new FixedDestinationProvider { Destination = null! };
+        act.Should().Throw<ArgumentNullException>().WithParameterName("value");
+    }
+
+    [Test]
+    public void Name_SetEmpty_ShouldThrowArgumentException()
+    {
+        Action act = static () => new FixedDestinationProvider { Destination = "" };
+        act.Should().Throw<ArgumentException>().WithParameterName("value");
+    }
+
+    [Test]
+    public void CreateFrom_EventData_ShouldReturnName()
+    {
+        var provider = new FixedDestinationProvider { Destination = "fixed-dest" };
+        var eventData = new EventData();
+        provider.CreateFrom(eventData).Should().Be("fixed-dest");
+    }
+
+    [Test]
+    public void CreateFrom_String_ShouldReturnName()
+    {
+        var provider = new FixedDestinationProvider { Destination = "fixed-dest" };
+        provider.CreateFrom("any-dest").Should().Be("fixed-dest");
+    }
+
+    [Test]
+    public void CreateNew_DefaultParams_ShouldReturnName()
+    {
+        var provider = new FixedDestinationProvider { Destination = "fixed-dest" };
+        provider.CreateNew().Should().Be("fixed-dest");
+    }
+
+    [Test]
+    public void CreateNew_WithParams_ShouldReturnName()
+    {
+        var provider = new FixedDestinationProvider { Destination = "fixed-dest" };
+        provider.CreateNew(MessageType.Command, "domain", true).Should().Be("fixed-dest");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.RefData.Test.Unit/CoreEx.RefData.Test.Unit.csproj b/tests/CoreEx.RefData.Test.Unit/CoreEx.RefData.Test.Unit.csproj
new file mode 100644
index 00000000..b6309c55
--- /dev/null
+++ b/tests/CoreEx.RefData.Test.Unit/CoreEx.RefData.Test.Unit.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx.RefData\CoreEx.RefData.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+  </ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.RefData.Test.Unit/ReferenceDataCollectionTests.cs b/tests/CoreEx.RefData.Test.Unit/ReferenceDataCollectionTests.cs
new file mode 100644
index 00000000..5d5cb506
--- /dev/null
+++ b/tests/CoreEx.RefData.Test.Unit/ReferenceDataCollectionTests.cs
@@ -0,0 +1,206 @@
+using CoreEx.RefData.Abstractions;
+using System.Runtime.CompilerServices;
+
+namespace CoreEx.RefData.Test.Unit;
+
+public class ReferenceDataCollectionTests
+{
+    private class TestRefData : ReferenceData<TestRefData> { }
+
+    [Test]
+    public void Constructor_Default()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        coll.SortOrder.Should().Be(ReferenceDataSortOrder.SortOrder);
+    }
+
+    [Test]
+    public void Constructor_WithSortOrderAndComparer()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>(ReferenceDataSortOrder.Code, StringComparer.Ordinal);
+        coll.SortOrder.Should().Be(ReferenceDataSortOrder.Code);
+    }
+
+    [Test]
+    public void Add_And_Contains()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var item = new TestRefData { Id = "1", Code = "A" };
+        coll.Add(item);
+        coll.Contains(item).Should().BeTrue();
+        coll.Count.Should().Be(1);
+    }
+
+    [Test]
+    public void AddRange_AddsAll()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var items = new[] { new TestRefData { Id = "1", Code = "A" }, new TestRefData { Id = "2", Code = "B" } };
+        coll.AddRange(items);
+        coll.Count.Should().Be(2);
+    }
+
+    [Test]
+    public void Clear_RemovesAll()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>
+        {
+            new() { Id = "1", Code = "A" }
+        };
+        coll.Clear();
+        coll.Count.Should().Be(0);
+    }
+
+    [Test]
+    public void ContainsId_And_GetById()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var item = new TestRefData { Id = "1", Code = "A" };
+        coll.Add(item);
+        coll.ContainsId("1").Should().BeTrue();
+        coll.GetById("1").Should().Be(item);
+    }
+
+    [Test]
+    public void ContainsCode_And_GetByCode()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var item = new TestRefData { Id = "1", Code = "A" };
+        coll.Add(item);
+        coll.ContainsCode("A").Should().BeTrue();
+        coll.GetByCode("A").Should().Be(item);
+    }
+
+    [Test]
+    public void TryGetById_And_TryGetByCode()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var item = new TestRefData { Id = "1", Code = "A" };
+        coll.Add(item);
+        coll.TryGetById("1", out var foundById).Should().BeTrue();
+        foundById.Should().Be(item);
+        coll.TryGetByCode("A", out var foundByCode).Should().BeTrue();
+        foundByCode.Should().Be(item);
+    }
+
+    [Test]
+    public void GetEnumerator_Works()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var item = new TestRefData { Id = "1", Code = "A" };
+        coll.Add(item);
+        foreach (var i in coll)
+            i.Should().Be(item);
+    }
+
+    [Test]
+    public void ICollection_CopyTo_And_Remove()
+    {
+        var coll = new ReferenceDataCollection<TestRefData>();
+        var item = new TestRefData { Id = "1", Code = "A" };
+        coll.Add(item);
+        var arr = new TestRefData[1];
+        var act = () => ((ICollection<TestRefData>)coll).CopyTo(arr, 0);
+        act.Should().Throw<NotSupportedException>();
+    }
+
+    [Test]
+    public void GetItems_Sorting()
+    {
+        var items = new List<TestRefData>
+        {
+            new() { Id = "1", Code = "D", Text = "GGG", SortOrder = 4 },
+            new() { Id = "2", Code = "B", Text = "JJJ", SortOrder = 3 },
+            new() { Id = "3", Code = "A", Text = "HHH", SortOrder = 2 },
+            new() { Id = "4", Code = "C", Text = "III", SortOrder = 1 },
+            new() { Id = "5", Code = "E", Text = "FFF", SortOrder = 5, IsInactive = true },
+            new() { Id = "6", Code = "-", Text = "EEE", SortOrder = 6 }
+        };
+
+        ((IReferenceData)items.Last()).SetInvalid();
+
+        var coll = new ReferenceDataCollection<TestRefData>(ReferenceDataSortOrder.SortOrder);
+        coll.AddRange(items);
+
+        coll.GetItems().Select(x => x.Id).Should().BeEquivalentTo("5", "4", "3", "2", "1");
+
+        coll.GetItems(ReferenceDataSortOrder.SortOrder, true).Select(x => x.Id).Should().BeEquivalentTo("4", "3", "2", "1");
+        coll.GetItems(ReferenceDataSortOrder.Id, true).Select(x => x.Id).Should().BeEquivalentTo("1", "2", "3", "4");
+        coll.GetItems(ReferenceDataSortOrder.Code, true).Select(x => x.Code).Should().BeEquivalentTo("A", "B", "C", "D");
+        coll.GetItems(ReferenceDataSortOrder.Text, true).Select(x => x.Code).Should().BeEquivalentTo("D", "A", "C", "B");
+
+        coll.GetItems(ReferenceDataSortOrder.Code, null).Select(x => x.Code).Should().BeEquivalentTo("A", "B", "C", "D", "E");
+        coll.GetItems(ReferenceDataSortOrder.Code, false, null).Select(x => x.Code).Should().BeEquivalentTo("E", "-");
+        coll.GetItems(ReferenceDataSortOrder.Code, false, false).Select(x => x.Code).Should().BeEquivalentTo("-");
+    }
+
+    [Test]
+    public async Task AddRangeAsync_IQueryable_AddsAll()
+    {
+        var items = new List<TestRefData>
+        {
+            new() { Id = "1", Code = "A" },
+            new() { Id = "2", Code = "B" }
+        };
+        var col = new ReferenceDataCollection<TestRefData>();
+        await col.AddRangeAsync(items.AsQueryable());
+        col.Count.Should().Be(2);
+        col.GetById("1")!.Code.Should().Be("A");
+        col.GetById("2")!.Code.Should().Be("B");
+    }
+
+    [Test]
+    public async Task AddRangeAsync_IAsyncEnumerable_AddsAll()
+    {
+        static async IAsyncEnumerable<TestRefData> GetItems()
+        {
+            yield return new TestRefData { Id = "3", Code = "C" };
+            await Task.Delay(1);
+            yield return new TestRefData { Id = "4", Code = "D" };
+        }
+
+        var col = new ReferenceDataCollection<TestRefData>();
+        await col.AddRangeAsync(GetItems());
+        col.Count.Should().Be(2);
+        col.GetById("3")!.Code.Should().Be("C");
+        col.GetById("4")!.Code.Should().Be("D");
+    }
+
+    [Test]
+    public async Task AddRangeAsync_IAsyncEnumerable_Null_DoesNothing()
+    {
+        var col = new ReferenceDataCollection<TestRefData>();
+        await col.AddRangeAsync((IAsyncEnumerable<TestRefData>?)null);
+        col.Count.Should().Be(0);
+    }
+
+    [Test]
+    public async Task AddRangeAsync_IQueryable_CancellationToken()
+    {
+        var items = new List<TestRefData>
+        {
+            new() { Id = "5", Code = "E" }
+        };
+        var col = new ReferenceDataCollection<TestRefData>();
+        using var cts = new CancellationTokenSource();
+        await col.AddRangeAsync(items.AsQueryable(), cts.Token);
+        col.Count.Should().Be(1);
+        col.GetById("5")!.Code.Should().Be("E");
+    }
+
+    [Test]
+    public async Task AddRangeAsync_IAsyncEnumerable_CancellationToken()
+    {
+        static async IAsyncEnumerable<TestRefData> GetItems([EnumeratorCancellation] CancellationToken ct = default)
+        {
+            yield return new TestRefData { Id = "6", Code = "F" };
+            await Task.Delay(1, ct);
+        }
+
+        var col = new ReferenceDataCollection<TestRefData>();
+        using var cts = new CancellationTokenSource();
+        await col.AddRangeAsync(GetItems(cts.Token), cts.Token);
+        col.Count.Should().Be(1);
+        col.GetById("6")!.Code.Should().Be("F");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.RefData.Test.Unit/ReferenceDataOrchestratorTests.cs b/tests/CoreEx.RefData.Test.Unit/ReferenceDataOrchestratorTests.cs
new file mode 100644
index 00000000..62326c43
--- /dev/null
+++ b/tests/CoreEx.RefData.Test.Unit/ReferenceDataOrchestratorTests.cs
@@ -0,0 +1,430 @@
+using CoreEx.Entities;
+using CoreEx.Json;
+using CoreEx.RefData.Abstractions;
+using CoreEx.Results;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Moq;
+
+namespace CoreEx.RefData.Test.Unit;
+
+public partial class ReferenceDataOrchestratorTests
+{
+    [ReferenceData]
+    internal partial class DummyRefData : ReferenceData<int, DummyRefData> { }
+
+    [ReferenceData]
+    internal partial class DummyRefData2 : ReferenceData<DummyRefData2> 
+    {
+        [ReferenceData<DummyRefData>]
+        public partial string? ParentSid { get; set; }
+
+        [ReferenceData<DummyRefData>]
+        public partial string? InitParentSid { get; init; }
+
+        [ReferenceData<DummyRefData>]
+        public partial string? ReadOnlyParentSid { get; }
+    }
+
+    internal class InvalidRefData : ReferenceData<int, InvalidRefData> { }
+
+    internal class DummyRefDataCollection() : ReferenceDataCollection<int, DummyRefData>(ReferenceDataSortOrder.Code, StringComparer.OrdinalIgnoreCase) { }
+
+    internal class DummyRefData2Collection() : ReferenceDataCollection<DummyRefData2>() { }
+
+    private class DummyProvider : IReferenceDataProvider
+    {
+        public IEnumerable<(Type, Type)> Types =>
+        [
+            (typeof(DummyRefData), typeof(DummyRefDataCollection)),
+            (typeof(DummyRefData2), typeof(DummyRefData2Collection))
+        ];
+
+        public Task<IReferenceDataCollection> GetAsync(Type type, CancellationToken cancellationToken = default)
+            => type == typeof(DummyRefData) 
+            ?
+            Task.FromResult<IReferenceDataCollection>(new DummyRefDataCollection 
+            { 
+                new DummyRefData { Id = 1, Code = "A", Text = "Alpha" },
+                new DummyRefData { Id = 2, Code = "C", Text = "Charlie" },
+                new DummyRefData { Id = 3, Code = "B", Text = "Beta" },
+                new DummyRefData { Id = 4, Code = "D", Text = "Delta", IsInactive = true }
+            }) 
+            :
+            Task.FromResult<IReferenceDataCollection>(new DummyRefData2Collection
+            {
+                new DummyRefData2 { Id = "A-1", Code = "A", Text = "Alpha", ParentSid = "P" },
+                new DummyRefData2 { Id = "C-3", Code = "C", Text = "Charlie" }
+            });
+    }
+
+    [Contract]
+    internal partial class DummyEntity
+    {
+        [ReferenceData<DummyRefData>]
+        public partial string? RefDataSid { get; set; }
+    }
+
+    [Contract]
+    internal partial class DummyEntity2
+    {
+        [ReferenceDataCodeCollection<DummyRefData>]
+        public partial List<string>? RefDataSids { get; set; }
+    }
+
+    private static ReferenceDataOrchestrator CreateOrchestrator()
+    {
+        var sc = new ServiceCollection();
+        sc.AddExecutionContext(sp => new ExecutionContext { ServiceProvider = sp });
+        sc.AddSingleton<IReferenceDataCache>(new ReferenceDataHybridCache(new Caching.MemoryOnlyHybridCache()));
+        sc.AddScoped<DummyProvider>();
+        var sp = sc.BuildServiceProvider();
+
+        var logger = Mock.Of<ILogger<ReferenceDataOrchestrator>>();
+        var ro = new ReferenceDataOrchestrator(sp, logger);
+        ro.Register<DummyProvider>();
+        return ro;
+    }
+
+    [SetUp]
+    public void SetUp()
+    {
+        var orch = CreateOrchestrator();
+        ReferenceDataOrchestrator.SetCurrent(orch);
+        ReferenceDataOrchestrator.HasCurrent.Should().BeTrue();
+
+        _ = orch.ServiceProvider.GetRequiredService<ExecutionContext>();
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        ReferenceDataOrchestrator.SetCurrent(null);
+        ReferenceDataOrchestrator.HasCurrent.Should().BeFalse();
+    }
+
+    [Test]
+    public void PrefetchMaxDegreeOfParallelism_GetSet()
+    {
+        var orch = CreateOrchestrator();
+        orch.PrefetchMaxDegreeOfParallelism = 5;
+        orch.PrefetchMaxDegreeOfParallelism.Should().Be(5);
+    }
+
+    [Test]
+    public void Register_And_ContainsType_ContainsName()
+    {
+        var orch = CreateOrchestrator();
+        var type = typeof(DummyRefData);
+        orch.ContainsType<DummyRefData>().Should().BeTrue();
+        orch.ContainsType(type).Should().BeTrue();
+        orch.ContainsName(nameof(DummyRefData)).Should().BeTrue();
+
+        type = typeof(InvalidRefData);
+        orch.ContainsType<InvalidRefData>().Should().BeFalse();
+        orch.ContainsType(type).Should().BeFalse();
+        orch.ContainsName(nameof(InvalidRefData)).Should().BeFalse();
+    }
+
+    [Test]
+    public void GetAllTypes_ReturnsRegisteredTypes()
+    {
+        var orch = CreateOrchestrator();
+        var types = orch.GetAllTypes();
+        types.Should().HaveCount(2);
+    }
+
+    [Test]
+    public void Indexer_ByType_And_ByName()
+    {
+        var orch = CreateOrchestrator();
+        var byType = orch[typeof(DummyRefData)];
+        var byName = orch[nameof(DummyRefData)];
+        byType.Should().NotBeNull();
+        byName.Should().NotBeNull();
+    }
+
+    [Test]
+    public void GetByType_And_GetByTypeRequired()
+    {
+        var orch = CreateOrchestrator();
+        var coll = orch.GetByType<DummyRefData>();
+        coll.Should().NotBeNull();
+        var req = orch.GetByTypeRequired<DummyRefData>();
+        req.Should().NotBeNull();
+    }
+
+    [Test]
+    public void GetByName_And_GetByNameRequired()
+    {
+        var orch = CreateOrchestrator();
+        var coll = orch.GetByName(nameof(DummyRefData));
+        coll.Should().NotBeNull();
+        var req = orch.GetByNameRequired(nameof(DummyRefData));
+        req.Should().NotBeNull();
+    }
+
+    [Test]
+    public void GetAllTypesInNamespace_ReturnsTypes()
+    {
+        var types = ReferenceDataOrchestrator.GetAllTypesInNamespace<DummyRefData>();
+        types.Should().Contain(typeof(DummyRefData));
+
+        types = ReferenceDataOrchestrator.GetAllTypesInNamespace<Int32>();
+        types.Should().BeEmpty();
+    }
+
+    [Test]
+    public void TryGetByCode_ReturnsValidWhenFound()
+    {
+        ReferenceDataOrchestrator.TryGetByCode<DummyRefData>("A", out var item).Should().BeTrue();
+        item.Should().NotBeNull();
+        item.Id.Should().Be(1);
+        item.Code.Should().Be("A");
+        item.IsActive.Should().BeTrue();
+        ((IReferenceData)item).IsValid.Should().BeTrue();
+    }
+
+    [Test]
+    public void TryGetByCode_ReturnsInvalidWhenNotFound()
+    {
+        ReferenceDataOrchestrator.TryGetByCode<DummyRefData>("X", out var item).Should().BeFalse();
+        item.Should().NotBeNull();
+        item.Id.Should().Be(0);
+        item.Code.Should().Be("X");
+        item.IsActive.Should().BeFalse();
+        ((IReferenceData)item).IsValid.Should().BeFalse();
+    }
+
+    [Test]
+    public void TryGetById_ReturnsValidWhenFound()
+    {
+        ReferenceDataOrchestrator.TryGetById<DummyRefData>(1, out var item).Should().BeTrue();
+        item.Should().NotBeNull();
+        item.Id.Should().Be(1);
+        item.Code.Should().Be("A");
+        item.IsActive.Should().BeTrue();
+        ((IReferenceData)item).IsValid.Should().BeTrue();
+    }
+
+    [Test]
+    public void TryGetById_ReturnsInvalidWhenNotFound()
+    {
+        ReferenceDataOrchestrator.TryGetById<DummyRefData>(404, out var item).Should().BeFalse();
+        item.Should().NotBeNull();
+        item.Id.Should().Be(404);
+        item.Code.Should().BeNull();
+        item.IsActive.Should().BeFalse();
+        ((IReferenceData)item).IsValid.Should().BeFalse();
+    }
+
+    [Test]
+    public void TryGetById_Generic_ReturnsValidWhenFound()
+    {
+        ReferenceDataOrchestrator.TryGetById<DummyRefData, int>(1, out var item).Should().BeTrue();
+        item.Should().NotBeNull();
+        item.Id.Should().Be(1);
+        item.Code.Should().Be("A");
+        item.IsActive.Should().BeTrue();
+        ((IReferenceData)item).IsValid.Should().BeTrue();
+    }
+
+    [Test]
+    public void TryGetById_Generic_ReturnsInvalidWhenNotFound()
+    {
+        ReferenceDataOrchestrator.TryGetById<DummyRefData, int>(404, out var item).Should().BeFalse();
+        item.Should().NotBeNull();
+        item.Id.Should().Be(404);
+        item.Code.Should().BeNull();
+        item.IsActive.Should().BeFalse();
+        ((IReferenceData)item).IsValid.Should().BeFalse();
+    }
+
+    [Test]
+    public async Task GetWithFilterAsync_All()
+    {
+        var coll = await ReferenceDataOrchestrator.Current.GetWithFilterAsync<DummyRefData>();
+        coll.Should().NotBeNull();
+        coll.Count().Should().Be(3);
+    }
+
+    [Test]
+    public async Task GetWithFilterAsync_Codes()
+    {
+        var coll = await ReferenceDataOrchestrator.Current.GetWithFilterAsync<DummyRefData>(["A","C","Z"]);
+        coll.Should().NotBeNull();
+        coll.Count().Should().Be(2);
+        coll.Select(x => x.Code).Should().BeEquivalentTo(["A", "C"]);
+    }
+
+    [Test]
+    public async Task GetWithFilterAsync_Text_Wildcard()
+    {
+        var coll = await ReferenceDataOrchestrator.Current.GetWithFilterAsync<DummyRefData>(null, "*a");
+        coll.Should().NotBeNull();
+        coll.Count().Should().Be(2);
+        coll.Select(x => x.Code).Should().BeEquivalentTo(["A", "B"]);
+    }
+
+    [Test]
+    public async Task GetWithFilterAsync_Text_Wildcard_And_Inactive()
+    {
+        var coll = await ReferenceDataOrchestrator.Current.GetWithFilterAsync<DummyRefData>(null, "*a", true);
+        coll.Should().NotBeNull();
+        coll.Count().Should().Be(3);
+        coll.Select(x => x.Code).Should().BeEquivalentTo(["A", "B", "D"]);
+    }
+
+    // Entity source generation tests.
+
+    [Test]
+    public void Entity_ReferenceData_Property()
+    {
+        var entity = new DummyEntity { RefDataSid = "A" };
+        entity.RefDataSid.Should().Be("A");
+        entity.RefData.Should().NotBeNull();
+        entity.RefData.Code.Should().Be("A");
+        entity.RefData.Id.Should().Be(1);
+
+        entity.RefDataSid = DummyRefData.TryGetByCode("C", out var item) ? item : item;
+        entity.RefDataSid.Should().Be("C");
+
+        entity.RefDataSid = DummyRefData.TryGetByCode("Z", out item) ? item : item;
+        entity.RefDataSid.Should().Be("Z");
+        entity.RefData.Should().NotBeNull();
+        entity.RefData.Code.Should().Be("Z");
+        entity.RefData.Id.Should().Be(0);
+        entity.RefData.IsActive.Should().BeFalse();
+        ((IReferenceData)entity.RefData).IsValid.Should().BeFalse();
+
+        entity.RefDataSid = null;
+        entity.RefDataSid.Should().BeNull();
+        entity.RefData.Should().BeNull();
+    }
+
+    [Test]
+    public void Entity_ReferenceData_Text()
+    {
+        var entity = new DummyEntity { RefDataSid = "A" };
+        entity.RefDataText.Should().BeNull();
+
+        ExecutionContext.Current.IncludeRelatedText = true;
+        entity.RefDataText.Should().Be("Alpha");
+    }
+
+    // Explicit casting magic!
+
+    [Test]
+    public void Explicit_Cast_From_Id()
+    {
+        var rd = (DummyRefData)1;
+        rd.Id.Should().Be(1);
+        rd.Code.Should().Be("A");
+        rd.IsActive.Should().BeTrue();
+
+        rd = (DummyRefData)404;
+        rd.Id.Should().Be(404);
+        rd.Code.Should().BeNull();
+        rd.IsActive.Should().BeFalse();
+        ((IReferenceData)rd).IsValid.Should().BeFalse();
+    }
+
+    [Test]
+    public void Explict_Cast_From_Code()
+    {
+        var rd = (DummyRefData)"A";
+        rd.Id.Should().Be(1);
+        rd.Code.Should().Be("A");
+        rd.IsActive.Should().BeTrue();
+
+        rd = (DummyRefData)"G";
+        rd.Id.Should().Be(0);
+        rd.Code.Should().Be("G");
+        rd.IsActive.Should().BeFalse();
+        ((IReferenceData)rd).IsValid.Should().BeFalse();
+    }
+
+    [Test]
+    public void Implicit_Cast_From_Code()
+    {
+        DummyRefData? rd = "A";
+        rd.Id.Should().Be(1);
+        rd.Code.Should().Be("A");
+        rd.IsActive.Should().BeTrue();
+
+        rd = "G";
+        rd.Id.Should().Be(0);
+        rd.Code.Should().Be("G");
+        rd.IsActive.Should().BeFalse();
+        ((IReferenceData)rd).IsValid.Should().BeFalse();
+
+        rd = (string?)null;
+        rd.Should().BeNull();
+    }
+
+    [Test]
+    public void Explicit_Cast_From_Id_String()
+    {
+        var rd = (DummyRefData2)"A";
+        rd.Id.Should().Be("A-1");
+        rd.Code.Should().Be("A");
+        rd.IsActive.Should().BeTrue();
+
+        rd = (DummyRefData2)"ABC";
+        rd.Id.Should().BeNull();
+        rd.Code.Should().Be("ABC");
+        rd.IsActive.Should().BeFalse();
+        ((IReferenceData)rd).IsValid.Should().BeFalse();
+    }
+
+
+    [Test]
+    public void ReferenceDataBase_TryGetBy()
+    {
+        DummyRefData.TryGetById(1, out var rd).Should().BeTrue();
+        rd.Id.Should().Be(1);
+        rd.Code.Should().Be("A");
+
+        DummyRefData.TryGetByCode("A", out rd).Should().BeTrue();
+        rd.Id.Should().Be(1);
+        rd.Code.Should().Be("A");
+
+        DummyRefData2.TryGetById("C-3", out var rd2).Should().BeTrue();
+        rd2.Id.Should().Be("C-3");
+        rd2.Code.Should().Be("C");
+
+        DummyRefData2.TryGetByCode("C", out rd2).Should().BeTrue();
+        rd2.Id.Should().Be("C-3");
+        rd2.Code.Should().Be("C");
+    }
+
+    [Test]
+    public void ReferenceDataCollection_Serialization_RoundTrip()
+    {
+        var orch = CreateOrchestrator();
+        var coll = orch[typeof(DummyRefData)];
+
+        var json = System.Text.Json.JsonSerializer.Serialize<DummyRefDataCollection>((DummyRefDataCollection)coll!, JsonDefaults.SerializerOptions);
+
+        var deserialColl = System.Text.Json.JsonSerializer.Deserialize<DummyRefDataCollection>(json, JsonDefaults.SerializerOptions);
+        var json2 = System.Text.Json.JsonSerializer.Serialize(deserialColl, JsonDefaults.SerializerOptions);
+
+        json.Should().Be(json2);
+    }
+
+    [Test]
+    public void ReferenceDataCollection_Serialization_RoundTrip2()
+    {
+        var orch = CreateOrchestrator();
+        var coll = orch[typeof(DummyRefData2)];
+
+        var json = System.Text.Json.JsonSerializer.Serialize(coll!, JsonDefaults.SerializerOptions);
+
+        var deserialColl = System.Text.Json.JsonSerializer.Deserialize<DummyRefData2Collection>(json, JsonDefaults.SerializerOptions);
+        var json2 = System.Text.Json.JsonSerializer.Serialize(deserialColl, JsonDefaults.SerializerOptions);
+
+        json.Should().Be(json2);
+
+        deserialColl!.Should().Contain(x => x.ParentSid == "P");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.RefData.Test.Unit/ReferenceDataTests.cs b/tests/CoreEx.RefData.Test.Unit/ReferenceDataTests.cs
new file mode 100644
index 00000000..d8db13b1
--- /dev/null
+++ b/tests/CoreEx.RefData.Test.Unit/ReferenceDataTests.cs
@@ -0,0 +1,152 @@
+using CoreEx.RefData.Abstractions;
+
+namespace CoreEx.RefData.Test.Unit;
+
+public class ReferenceDataTests
+{
+    private class TestRefData : ReferenceData<int, TestRefData> { }
+
+    [Test]
+    public void Id_Code_Text_Description_SortOrder_ETag()
+    {
+        var rd = new TestRefData
+        {
+            Id = 123,
+            Code = "ABC",
+            Text = "MyText",
+            Description = "MyDesc",
+            SortOrder = 5,
+            ETag = "etag"
+        };
+
+        rd.Id.Should().Be(123);
+        rd.Code.Should().Be("ABC");
+        rd.GetText().Should().Be("MyText");
+        rd.GetDescription().Should().Be("MyDesc");
+        rd.SortOrder.Should().Be(5);
+        rd.ETag.Should().Be("etag");
+        rd.Text.Should().Contain("MyText");
+        rd.Description.Should().Contain("MyDesc");
+    }
+
+    [Test]
+    public void ToString_ReturnsTextOrCodeOrId()
+    {
+        var rd = new TestRefData { Text = "T", Code = "C", Id = 1 };
+        rd.ToString().Should().Contain("T");
+
+        rd = new TestRefData { Text = null, Code = "C", Id = 1 };
+        rd.ToString().Should().Contain("C");
+
+        rd = new TestRefData { Text = null, Code = null, Id = 1 };
+        rd.ToString().Should().Contain("1");
+    }
+
+    [Test]
+    public void IsActive_Default_True()
+    {
+        var rd = new TestRefData();
+        rd.IsActive.Should().BeTrue();
+    }
+
+    [Test]
+    public void IsActive_SetFalse()
+    {
+        var rd = new TestRefData { IsInactive = true };
+        rd.IsActive.Should().BeFalse();
+    }
+
+    [Test]
+    public void IsActive_StartDate_EndDate()
+    {
+        var now = DateTimeOffset.UtcNow;
+        var rd = new TestRefData { StartsOn = now.AddDays(-1), EndsOn = now.AddDays(1) };
+        rd.IsActive.Should().BeTrue();
+
+        rd = new TestRefData { StartsOn = now.AddDays(1), EndsOn = now.AddDays(2) };
+        rd.IsActive.Should().BeFalse();
+
+        rd = new TestRefData { StartsOn = now.AddDays(-2), EndsOn = now.AddDays(-1) };
+        rd.IsActive.Should().BeFalse();
+    }
+
+    [Test]
+    public void SetInvalid_SetsIsValidFalse_AndIsActiveFalse()
+    {
+        var rd = new TestRefData();
+        ((IReferenceData)rd).SetInvalid();
+        ((IReferenceData)rd).IsValid.Should().BeFalse();
+        rd.IsActive.Should().BeFalse();
+    }
+
+    [Test]
+    public void HasMappings_And_Mappings()
+    {
+        var rd = new TestRefData();
+        rd.HasMappings.Should().BeFalse();
+        rd.Mappings.Should().BeNull();
+
+        rd.SetMapping("x", 123);
+        rd.HasMappings.Should().BeTrue();
+        rd.Mappings.Should().NotBeNull();
+        rd.Mappings.Should().ContainKey("x");
+        rd.Mappings["x"].Should().Be(123);
+    }
+
+    [Test]
+    public void TryGetMapping_FoundAndNotFound()
+    {
+        var rd = new TestRefData();
+        rd.SetMapping("a", 42);
+        rd.TryGetMapping<int>("a", out var v).Should().BeTrue();
+        v.Should().Be(42);
+
+        rd.TryGetMapping<int>("b", out var v2).Should().BeFalse();
+        v2.Should().Be(0);
+    }
+
+    [Test]
+    public void Implicit_Cast_To_Id()
+    {
+        var rd = new TestRefData { Id = 88 };
+        int id = rd;
+        id.Should().Be(88);
+
+        int? id2 = rd;
+        id2.Should().Be(88);
+
+        TestRefData? rd2 = null;
+        id = rd2;
+        id.Should().Be(0);
+
+        id2 = rd2;
+        id2.Should().Be(0);
+    }
+
+    [Test]
+    public void Implicit_Cast_To_Code()
+    {
+        var rd = new TestRefData { Code = "XYZ" };
+        string code = rd;
+        code.Should().Be("XYZ");
+
+        string? code2 = rd;
+        code2.Should().Be("XYZ");
+
+        TestRefData? rd2 = null;
+        code = rd2;
+        code.Should().BeNull();
+
+        code2 = rd2;
+        code2.Should().BeNull();
+    }
+
+    [Test]
+    public void IComparable()
+    {
+        var rd = new TestRefData { Code = "XYZ" };
+        var rd2 = new TestRefData { Code = "ABC" };
+
+        rd.CompareTo(rd2).Should().BeGreaterThan(0);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.RefData.Test.Unit/ReferenceDataValidationTests.cs b/tests/CoreEx.RefData.Test.Unit/ReferenceDataValidationTests.cs
new file mode 100644
index 00000000..543bb02d
--- /dev/null
+++ b/tests/CoreEx.RefData.Test.Unit/ReferenceDataValidationTests.cs
@@ -0,0 +1,99 @@
+using CoreEx.Entities;
+using CoreEx.Validation;
+
+namespace CoreEx.RefData.Test.Unit;
+
+[TestFixture]
+public partial class ReferenceDataOrchestratorTests
+{
+    [Test]
+    public async Task Validation()
+    {
+        var vr = await ((DummyRefData?)null).Validator(c => c.IsValid()).ValidateAsync();
+        vr.HasErrors.Should().BeFalse();
+
+        vr = await ((DummyRefData)"A").Validator(c => c.IsValid()).ValidateAsync();
+        vr.HasErrors.Should().BeFalse();
+
+        vr = await ((DummyRefData)"Z").Validator(c => c.IsValid()).ValidateAsync();
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().ContainSingle().Which.Text.ToString().Should().EndWith("is invalid.");
+
+        vr = await ((DummyRefData)"D").Validator(c => c.IsValid()).ValidateAsync();
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().ContainSingle().Which.Text.ToString().Should().EndWith("is invalid.");
+
+        vr = await ((DummyRefData)"D").Validator(c => c.IsValid(allowInactive: true)).ValidateAsync();
+        vr.HasErrors.Should().BeFalse();
+    }
+
+    [Test]
+    public async Task Validation_Code()
+    {
+        var vr = await ((string?)null).Validator(c => c.ReferenceData(r => r.With<DummyRefData>())).ValidateAsync();
+        vr.HasErrors.Should().BeFalse();
+
+        vr = await "A".Validator(c => c.ReferenceData(r => r.With<DummyRefData>())).ValidateAsync();
+        vr.HasErrors.Should().BeFalse();
+
+        vr = await "Z".Validator(c => c.ReferenceData(r => r.With<DummyRefData>())).ValidateAsync();
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().ContainSingle().Which.Text.ToString().Should().EndWith("is invalid.");
+
+        vr = await "D".Validator(c => c.ReferenceData(r => r.With<DummyRefData>())).ValidateAsync();
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().ContainSingle().Which.Text.ToString().Should().EndWith("is invalid.");
+
+        vr = await "D".Validator(c => c.ReferenceData(r => r.With<DummyRefData>().AllowInactive())).ValidateAsync();
+        vr.HasErrors.Should().BeFalse();
+    }
+
+    [Test]
+    public async Task Validation_Override()
+    {
+        var e = new Entity { Code = "a" };
+
+        var ev = Validator.Create<Entity>().HasProperty(p => p.Code, p => p.ReferenceData(r => r.With<DummyRefData>()));
+        var vr = await ev.ValidateAsync(e);
+        vr.HasErrors.Should().BeFalse();
+        e.Code.Should().Be("a");
+
+        ev = Validator.Create<Entity>().HasProperty(p => p.Code, p => p.ReferenceData(r => r.With<DummyRefData>().Override()));
+        vr = await ev.ValidateAsync(e);
+        vr.HasErrors.Should().BeFalse();
+        e.Code.Should().Be("A");
+    }
+
+    [Test]
+    public async Task Validation_CodeCollection()
+    {
+        var e = new Entity { DummySids = ["A", "B", "C"] };
+
+        var ev = Validator.Create<Entity>().HasProperty(p => p.Dummies, p => p.AreValid());
+        var vr = await ev.ValidateAsync(e);
+        vr.HasErrors.Should().BeFalse();
+
+        e.DummySids.Add("D");
+        vr = await ev.ValidateAsync(e);
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().ContainSingle().Which.Text.ToString().Should().EndWith("contains one or more invalid items.");
+
+        ev = Validator.Create<Entity>().HasProperty(p => p.Dummies, p => p.AreValid(allowInactive: true));
+        vr = await ev.ValidateAsync(e);
+        vr.HasErrors.Should().BeFalse();
+
+        e.DummySids.Add("Z");
+        vr = await ev.ValidateAsync(e);
+        vr.HasErrors.Should().BeTrue();
+        vr.Messages.Should().ContainSingle().Which.Text.ToString().Should().EndWith("contains one or more invalid items.");
+    }
+
+    [Contract]
+    internal partial class Entity
+    {
+        public string? Code { get; set; }
+
+        [ReferenceDataCodeCollection<DummyRefData>]
+        public partial List<string?>? DummySids { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Solace.Test/CoreEx.Solace.Test.csproj b/tests/CoreEx.Solace.Test/CoreEx.Solace.Test.csproj
deleted file mode 100644
index e810a7dc..00000000
--- a/tests/CoreEx.Solace.Test/CoreEx.Solace.Test.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx.Solace\CoreEx.Solace.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.unittest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/tests/CoreEx.Solace.Test/PubSubOrchestratedTest.cs b/tests/CoreEx.Solace.Test/PubSubOrchestratedTest.cs
deleted file mode 100644
index f0363282..00000000
--- a/tests/CoreEx.Solace.Test/PubSubOrchestratedTest.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-
-using Microsoft.Extensions.Configuration;
-using SolaceSystems.Solclient.Messaging;
-
-namespace CoreEx.Test.TestFunction
-{
-    [TestFixture]
-    [Category("WithSolace")]
-    public class PubSubOrchestratedTest
-    {
-        // NOTE: PubSub local instance must be running in container for test to execute
-        private static IContext? _solaceContext;
-
-        [Test]
-        public void PubSubSend_Success()
-        {
-            // Arrange
-            PubSubSender sender = SetupSender();
-            var events = new List<EventSendData>
-            {
-                new EventSendData { Id = "123", Subject = "my.Product", Data = new BinaryData(Encoding.UTF8.GetBytes("Test Message1")), Destination = "try-me" },
-                new EventSendData { Id = "124", Subject = "my.Product", Data = new BinaryData(Encoding.UTF8.GetBytes("Test Message2")), Destination = "try-me" }
-            };
-
-            // Act
-            sender.SendAsync(events).Wait();
-        }
-
-        [Test]
-        public void PubSubSend_GreaterThan50Events_OnlySendsBatchOf50()
-        {
-            // Arrange
-            PubSubSender sender = SetupSender();
-            var events = new List<EventSendData>();
-            //var dataPayload1 = new BinaryData(Encoding.UTF8.GetBytes("Test Message1"));
-            //var dataPayload2 = new BinaryData(Encoding.UTF8.GetBytes("Test Message2"));
-            // build 51 events
-            for (int i = 200; i < 251; i++)
-            {
-                events.Add(new EventSendData { Id = i.ToString(), Subject = "my.Product", Data = new BinaryData(Encoding.UTF8.GetBytes($"Test Message{i}")), Destination = "try-me" });
-            }
-
-            // Act
-            sender.SendAsync(events).Wait();
-        }
-
-        [Test]
-        public void PubSubSend_NoDestination_SendstoDefaultTopic()
-        {
-            // Arrange
-            PubSubSender sender = SetupSender();
-            var events = new List<EventSendData>
-            {
-                new EventSendData { Id = "123", Subject = "my.Product", Data = new BinaryData(Encoding.UTF8.GetBytes("Test Message1")) },
-                new EventSendData { Id = "124", Subject = "my.Product", Data = new BinaryData(Encoding.UTF8.GetBytes("Test Message2")) }
-            };
-
-            // Act
-            sender.SendAsync(events).Wait();
-        }
-
-        [OneTimeTearDown]
-        public void OneTimeTearDown()
-        {
-            _solaceContext?.Dispose();
-        }
-
-        private static PubSubSender SetupSender()
-        {
-            var logger = GetLogger<PubSubSender>();
-            var convertor = new EventSendDataToPubSubConverter();
-            var sessionProperties = new SessionProperties
-            {
-                Host = "ws://localhost:8008",
-                VPNName = "default",
-                UserName = "default",
-                Password = "default"
-            };
-
-            var config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.unittest.json");
-            var testSettings = new DefaultSettings(config.Build());
-
-            if (_solaceContext == null)
-            {
-                var cfp = new ContextFactoryProperties { SolClientLogLevel = SolLogLevel.Warning };
-                cfp.LogToConsoleError();
-                ContextFactory.Instance.Init(cfp);
-                _solaceContext = ContextFactory.Instance.CreateContext(new ContextProperties(), null);
-            }
-
-            var sender = new PubSubSender(_solaceContext, sessionProperties, testSettings, logger, null, convertor);
-            return sender;
-        }
-
-        /// <summary>
-        /// Gets a console <see cref="ILogger"/>.
-        /// </summary>
-        /// <typeparam name="T">The logger <see cref="Type"/>.</typeparam>
-        /// <returns>The <see cref="ILogger"/>.</returns>
-        private static ILogger<T> GetLogger<T>() => LoggerFactory.Create(b =>
-        {
-            b.SetMinimumLevel(LogLevel.Trace);
-            b.ClearProviders();
-            b.AddConsole();
-        }).CreateLogger<T>();
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Solace.Test/Usings.cs b/tests/CoreEx.Solace.Test/Usings.cs
deleted file mode 100644
index d20c0b4f..00000000
--- a/tests/CoreEx.Solace.Test/Usings.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-global using NUnit.Framework;
-global using CoreEx.Events;
-global using CoreEx.Solace.PubSub;
-global using System.Text;
-global using Microsoft.Extensions.Logging;
-global using CoreEx.Configuration;
-global using SolaceSystems.Solclient.Messaging;
-global using Microsoft.Extensions.Configuration;
\ No newline at end of file
diff --git a/tests/CoreEx.Solace.Test/appsettings.unittest.json b/tests/CoreEx.Solace.Test/appsettings.unittest.json
deleted file mode 100644
index 00b68eaa..00000000
--- a/tests/CoreEx.Solace.Test/appsettings.unittest.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "TestQueueName": "unit-test-queue",
-  "TestTopicName": "unit-test-topic",
-  "TestSubscriptionName": "unit-test-subscription",
-  "TestQueueNameSessions": "unit-test-queue-sessions",
-  "PubSubSender": {
-    "QueueOrTopicName": "ntangle-stream" // Sets the topic for the pubsub sender.
-  }
-}
diff --git a/tests/CoreEx.Test.Unit/Abstractions/ExtensionTests.cs b/tests/CoreEx.Test.Unit/Abstractions/ExtensionTests.cs
new file mode 100644
index 00000000..2a432f90
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Abstractions/ExtensionTests.cs
@@ -0,0 +1,48 @@
+namespace CoreEx.Test.Unit.Abstractions;
+
+public class ExtenstionTests
+{
+    [Test]
+    public void ThrowIfNull_WhenNull()
+    {
+        string aussie = null!;
+        var act = () => aussie.ThrowIfNull();
+        act.Should().Throw<ArgumentNullException>().WithParameterName("aussie");
+    }
+
+    [Test]
+    public void ThrowIfNull_WhenNotNull()
+    {
+        string aussie = "Aussie";
+        aussie.ThrowIfNull().Should().Be("Aussie");
+    }
+
+    [Test]
+    public void Adjust_Value_NonNullable()
+    {
+        var p = new Person();
+        var p2 = p.Adjust(x => x.Name = "Babs");
+        p.Name.Should().Be("Babs");
+        p2.Name.Should().Be("Babs");
+    }
+
+    [Test]
+    public void Adjust_Value_Nullable()
+    {
+        Person? p = null;
+        p.Adjust(x => x.Name = "Babs");
+        p.Should().BeNull();
+    }
+
+    [Test]
+    public void Adjust_Value_Nullable_With_Value()
+    {
+        Person? p = new();
+        var p2 = p.Adjust(x => x.Name = "Babs");
+        p.Should().NotBeNull();
+        p.Name.Should().Be("Babs");
+        p2.Name.Should().Be("Babs");
+    }
+
+    public class Person { public string? Name { get; set; } }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Abstractions/InternalTests.cs b/tests/CoreEx.Test.Unit/Abstractions/InternalTests.cs
new file mode 100644
index 00000000..900ae0ec
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Abstractions/InternalTests.cs
@@ -0,0 +1,45 @@
+using CoreEx.Abstractions;
+using Microsoft.Extensions.Configuration;
+
+namespace CoreEx.Test.Unit.Abstractions;
+
+internal class InternalTests
+{
+    [Test]
+    public void TryGetConfigurationValue_Nullable()
+    {
+        var config = new ConfigurationBuilder().Build();
+        var exists = Internal.TryGetConfigurationValue<int?>("MySetting", out var value, config);
+        exists.Should().BeFalse();
+        value.Should().BeNull();
+
+        config = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?> { { "MySetting", null} }).Build();
+        exists = Internal.TryGetConfigurationValue<int?>("MySetting", out value, config);
+        exists.Should().BeFalse();
+        value.Should().BeNull();
+
+        config = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?> { { "MySetting", "0" } }).Build();
+        exists = Internal.TryGetConfigurationValue<int?>("MySetting", out value, config);
+        exists.Should().BeTrue();
+        value.Should().Be(0);
+    }
+
+    [Test]
+    public void TryGetConfigurationValue_NonNullable()
+    {
+        var config = new ConfigurationBuilder().Build();
+        var exists = Internal.TryGetConfigurationValue<int>("MySetting", out var value, config);
+        exists.Should().BeFalse();
+        value.Should().Be(0);
+
+        config = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?> { { "MySetting", null } }).Build();
+        exists = Internal.TryGetConfigurationValue<int>("MySetting", out value, config);
+        exists.Should().BeFalse();
+        value.Should().Be(0);
+
+        config = new ConfigurationBuilder().AddInMemoryCollection(new Dictionary<string, string?> { { "MySetting", "0" } }).Build();
+        exists = Internal.TryGetConfigurationValue<int>("MySetting", out value, config);
+        exists.Should().BeTrue();
+        value.Should().Be(0);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj b/tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj
new file mode 100644
index 00000000..11ae0c73
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/CoreEx.Test.Unit.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+    <Using Alias="ExecutionContext" Include="CoreEx.ExecutionContext" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/CoreEx.Test.Unit/Data/PagingArgsTests.cs b/tests/CoreEx.Test.Unit/Data/PagingArgsTests.cs
new file mode 100644
index 00000000..a4c887e8
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Data/PagingArgsTests.cs
@@ -0,0 +1,102 @@
+using CoreEx.Data;
+
+namespace CoreEx.Test.Unit.Data;
+
+[TestFixture]
+public class PagingArgsTests
+{
+    [TearDown]
+    public void TearDown()
+    {
+        // Reset static properties to defaults before each test to avoid side effects.
+        PagingArgs.DefaultTake = 25;
+        PagingArgs.MaximumTake = 1000;
+    }
+
+    [Test]
+    public void Constructor_Defaults()
+    {
+        var args = new PagingArgs();
+        args.Skip.Should().Be(0);
+        args.Take.Should().Be(25);
+        args.IsCountRequested.Should().BeFalse();
+        args.IsNone.Should().BeFalse();
+    }
+
+    [Test]
+    public void Constructor_WithValues()
+    {
+        var args = new PagingArgs(5, 10, true);
+        args.Skip.Should().Be(5);
+        args.Take.Should().Be(10);
+        args.IsCountRequested.Should().BeTrue();
+    }
+
+    [Test]
+    public void Constructor_Take_Null_UsesDefault()
+    {
+        var args = new PagingArgs(2, null, false);
+        args.Take.Should().Be(25);
+    }
+
+    [Test]
+    public void Skip_Negative_SetsToZero()
+    {
+        var args = new PagingArgs(-10, 10, false);
+        args.Skip.Should().Be(0);
+    }
+
+    [Test]
+    public void Take_ZeroOrNegative_SetsToDefaultTake()
+    {
+        var args1 = new PagingArgs(0, 0, false);
+        args1.Take.Should().Be(25);
+
+        var args2 = new PagingArgs(0, -5, false);
+        args2.Take.Should().Be(25);
+    }
+
+    [Test]
+    public void Take_AboveMaximum_SetsToMaximumTake()
+    {
+        PagingArgs.MaximumTake = 50;
+        var args = new PagingArgs(0, 100, false);
+        args.Take.Should().Be(50);
+    }
+
+    [Test]
+    public void Default_StaticProperty()
+    {
+        var def = PagingArgs.Create();
+        def.Skip.Should().Be(0);
+        def.Take.Should().Be(25);
+        def.IsCountRequested.Should().BeFalse();
+        def.IsNone.Should().BeFalse();
+    }
+
+    [Test]
+    public void None_StaticProperty()
+    {
+        var none = PagingArgs.None;
+        none.Skip.Should().Be(0);
+        none.Take.Should().Be(25);
+        none.IsCountRequested.Should().BeFalse();
+        none.IsNone.Should().BeTrue();
+    }
+
+    [Test]
+    public void DefaultTake_StaticProperty()
+    {
+        PagingArgs.DefaultTake = 77;
+        var args = new PagingArgs();
+        args.Take.Should().Be(77);
+    }
+
+    [Test]
+    public void MaximumTake_StaticProperty()
+    {
+        PagingArgs.MaximumTake = 10;
+        var args = new PagingArgs(0, 100, false);
+        args.Take.Should().Be(10);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Data/PagingResultTests.cs b/tests/CoreEx.Test.Unit/Data/PagingResultTests.cs
new file mode 100644
index 00000000..1a906012
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Data/PagingResultTests.cs
@@ -0,0 +1,66 @@
+using CoreEx.Data;
+
+namespace CoreEx.Test.Unit.Data;
+
+[TestFixture]
+public class PagingResultTests
+{
+    [TearDown]
+    public void TearDown()
+    {
+        PagingArgs.DefaultTake = 25;
+    }
+
+    [Test]
+    public void Constructor_Default()
+    {
+        var pr = new PagingResult();
+        pr.Skip.Should().Be(0);
+        pr.Take.Should().Be(25);
+        pr.IsCountRequested.Should().BeFalse();
+        pr.TotalCount.Should().BeNull();
+    }
+
+    [Test]
+    public void Constructor_WithPagingArgs()
+    {
+        var args = new PagingArgs(3, 7, true);
+        var pr = new PagingResult(args);
+        pr.Skip.Should().Be(3);
+        pr.Take.Should().Be(7);
+        pr.IsCountRequested.Should().BeTrue();
+    }
+
+    [Test]
+    public void TotalCount_SetAndGet()
+    {
+        var pr = new PagingResult().WithTotalCount(123);
+        pr.TotalCount.Should().Be(123);
+    }
+
+    [Test]
+    public void TotalCount_SetNull()
+    {
+        var pr = new PagingResult().WithTotalCount(null);
+        pr.TotalCount.Should().BeNull();
+    }
+
+    [Test]
+    public void TotalCount_SetZeroOrNegative()
+    {
+        var pr = new PagingResult().WithTotalCount(0);
+        pr.TotalCount.Should().Be(0);
+
+        pr.WithTotalCount(-5);
+        pr.TotalCount.Should().BeNull();
+    }
+
+    [Test]
+    public void WithTotalCount_Fluent()
+    {
+        var pr = new PagingResult();
+        var ret = pr.WithTotalCount(99);
+        ret.Should().BeSameAs(pr);
+        pr.TotalCount.Should().Be(99);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Data/PartitionKeyTests.cs b/tests/CoreEx.Test.Unit/Data/PartitionKeyTests.cs
new file mode 100644
index 00000000..f3d06751
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Data/PartitionKeyTests.cs
@@ -0,0 +1,27 @@
+namespace CoreEx.Data.Test.Unit;
+
+public class PartitionKeyTests
+{
+    [Test]
+    public void GetPartitionId()
+    {
+        PartitionKey.GetPartitionId("abc", 4).Should().Be(1);
+        PartitionKey.GetPartitionId("ABC", 4).Should().Be(1);
+        PartitionKey.GetPartitionId("def", 4).Should().Be(2);
+        PartitionKey.GetPartitionId("klm", 4).Should().Be(0);
+    }
+
+    [Test]
+    public void GetPartitionId_DifferentSize()
+    { 
+        PartitionKey.GetPartitionId("xxx", 4).Should().Be(3);
+        PartitionKey.GetPartitionId("xxx", 3).Should().Be(1);
+    }
+
+    [Test]
+    public void GetPartitionId_CaseSensitive()
+    {
+        PartitionKey.GetPartitionId("abc", 4, false).Should().Be(2);
+        PartitionKey.GetPartitionId("ABC", 4, false).Should().Be(1);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Data/PartitionPickerTests.cs b/tests/CoreEx.Test.Unit/Data/PartitionPickerTests.cs
new file mode 100644
index 00000000..7df8d976
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Data/PartitionPickerTests.cs
@@ -0,0 +1,99 @@
+using CoreEx.Data;
+
+namespace CoreEx.Test.Unit.Data;
+
+public class PartitionPickerTests
+{
+    [Test]
+    public void GetNextPartitions_ShouldReturnCount_InRange_NoDuplicates()
+    {
+        // Basic behavior
+        var picker = new PartitionPicker(32, 6, 5);
+        var parts = picker.GetNextPartitions(DateTimeOffset.UtcNow);
+
+        parts.Should().HaveCount(6);
+        parts.Should().OnlyHaveUniqueItems();
+        parts.Should().OnlyContain(p => p >= 0 && p < 32);
+    }
+
+    [Test]
+    public void GetNextPartitions_All_ShouldReturnAll_WithLastSuccessFirst()
+    {
+        // Fast path: all partitions
+        var picker = new PartitionPicker(8, 8, 5);
+        picker.PrioritizePartition(3);
+
+        var parts = picker.GetNextPartitions(DateTimeOffset.UtcNow);
+
+        parts.Should().HaveCount(8);
+        parts[0].Should().Be(3);
+        parts.Should().OnlyHaveUniqueItems();
+        parts.OrderBy(x => x).Should().Equal(Enumerable.Range(0, 8));
+    }
+
+    [Test]
+    public void GetNextPartitions_Single_ShouldPreferLastSuccess_ElseDeterministicStart()
+    {
+        // Fast path: single partition
+        var picker = new PartitionPicker(16, 1, 5);
+        picker.PrioritizePartition(7);
+        picker.GetNextPartitions(DateTimeOffset.UtcNow)
+              .Should().Equal([7]);
+
+        var picker2 = new PartitionPicker(16, 1, 5);
+        var parts2 = picker2.GetNextPartitions(DateTimeOffset.UtcNow);
+        parts2.Should().HaveCount(1);
+        parts2[0].Should().BeInRange(0, 15);
+    }
+
+    [Test]
+    public void ReportSuccess_ShouldBiasNextPick_FirstItemIsLastSuccess()
+    {
+        // Temporal locality
+        var picker = new PartitionPicker(32, 6, 5);
+        picker.PrioritizePartition(12);
+
+        var parts = picker.GetNextPartitions(DateTimeOffset.UtcNow);
+        parts[0].Should().Be(12);
+    }
+
+    [Test]
+    public void GetNextPartitions_ShouldChangeAcrossEpochs()
+    {
+        // Epoch rotation changes selection
+        var picker = new PartitionPicker(32, 6, 5);
+        var t1 = DateTimeOffset.FromUnixTimeSeconds(10_000);
+        var t2 = DateTimeOffset.FromUnixTimeSeconds(10_000 + 5);
+
+        var a = picker.GetNextPartitions(t1);
+        var b = picker.GetNextPartitions(t2);
+
+        a.Should().NotEqual(b);
+    }
+
+    [Test]
+    public void TwoPickers_ShouldHaveLowIntersection()
+    {
+        // Collision reduction heuristic
+        var a = new PartitionPicker(32, 6, 5);
+        var b = new PartitionPicker(32, 6, 5);
+        var now = DateTimeOffset.UtcNow;
+
+        var pa = a.GetNextPartitions(now);
+        var pb = b.GetNextPartitions(now);
+
+        pa.Intersect(pb).Count().Should().BeLessThanOrEqualTo(3);
+    }
+
+    [TestCase(32, 10)]
+    [TestCase(30, 10)]
+    public void GetNextPartitions_ShouldHaveUniqueWindow(int total, int window)
+    {
+        // Coprime stride distribution (no repeats in window)
+        var picker = new PartitionPicker(total, window, 5);
+        var parts = picker.GetNextPartitions(DateTimeOffset.UtcNow);
+
+        parts.Should().HaveCount(window);
+        parts.Should().OnlyHaveUniqueItems();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Data/QueryArgsTests.cs b/tests/CoreEx.Test.Unit/Data/QueryArgsTests.cs
new file mode 100644
index 00000000..6f39e52c
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Data/QueryArgsTests.cs
@@ -0,0 +1,106 @@
+using CoreEx.Data;
+
+namespace CoreEx.Test.Unit.Data;
+
+[TestFixture]
+public class QueryArgsTests
+{
+    [Test]
+    public void Create_Default()
+    {
+        var args = QueryArgs.Create();
+        args.Filter.Should().BeNull();
+        args.OrderBy.Should().BeNull();
+        args.IncludeFields.Should().BeNull();
+        args.ExcludeFields.Should().BeNull();
+    }
+
+    [Test]
+    public void Create_WithValues()
+    {
+        var args = QueryArgs.Create("x eq 1", "y desc");
+        args.Filter.Should().Be("x eq 1");
+        args.OrderBy.Should().Be("y desc");
+    }
+
+    [Test]
+    public void Filter_SetAndGet()
+    {
+        var args = new QueryArgs() { Filter = "abc" };
+        args.Filter.Should().Be("abc");
+    }
+
+    [Test]
+    public void OrderBy_SetAndGet()
+    {
+        var args = new QueryArgs
+        {
+            OrderBy = "def"
+        };
+        args.OrderBy.Should().Be("def");
+    }
+
+    [Test]
+    public void IncludeFields_SetAndGet()
+    {
+        var args = new QueryArgs
+        {
+            IncludeFields = ["a", "b"]
+        };
+        args.IncludeFields.Should().BeEquivalentTo("a", "b");
+    }
+
+    [Test]
+    public void ExcludeFields_SetAndGet()
+    {
+        var args = new QueryArgs
+        {
+            ExcludeFields = ["x", "y"]
+        };
+        args.ExcludeFields.Should().BeEquivalentTo("x", "y");
+    }
+
+    [Test]
+    public void Include_AddsFields()
+    {
+        var args = new QueryArgs();
+        var ret = args.WithFields("a", "b", "c");
+        ret.Should().BeSameAs(args);
+        args.IncludeFields.Should().BeEquivalentTo("a", "b", "c");
+    }
+
+    [Test]
+    public void Include_AddsFields_MultipleCalls()
+    {
+        var args = new QueryArgs();
+        args.WithFields("a").WithFields("b", "c");
+        args.IncludeFields.Should().BeEquivalentTo("a", "b", "c");
+    }
+
+    [Test]
+    public void Exclude_AddsFields()
+    {
+        var args = new QueryArgs();
+        var ret = args.WithoutFields("x", "y");
+        ret.Should().BeSameAs(args);
+        args.ExcludeFields.Should().BeEquivalentTo("x", "y");
+    }
+
+    [Test]
+    public void Exclude_AddsFields_MultipleCalls()
+    {
+        var args = new QueryArgs();
+        args.WithoutFields("x").WithoutFields("y", "z");
+        args.ExcludeFields.Should().BeEquivalentTo("x", "y", "z");
+    }
+
+    [Test]
+    public void Include_And_Exclude_AreIndependent()
+    {
+        var args = new QueryArgs();
+        args.WithFields("a", "b");
+        args.WithoutFields("x", "y");
+        args.IncludeFields.Should().BeEquivalentTo("a", "b");
+        args.ExcludeFields.Should().BeEquivalentTo("x", "y");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/ChangeLogTests.cs b/tests/CoreEx.Test.Unit/Entities/ChangeLogTests.cs
new file mode 100644
index 00000000..6aaa8f13
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/ChangeLogTests.cs
@@ -0,0 +1,75 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Test.Unit.Entities;
+
+internal class ChangeLogTests
+{
+    [Test]
+    public void CreateCreated_ShouldSetCreatedByAndCreatedDate()
+    {
+        var changeLog = ChangeLog.CreateCreated();
+
+        changeLog.IsDefault().Should().BeFalse();
+        changeLog.CreatedBy.Should().NotBeNullOrEmpty();
+        changeLog.CreatedOn.Should().NotBeNull();
+        changeLog.UpdatedBy.Should().BeNull();
+        changeLog.UpdatedOn.Should().BeNull();
+    }
+
+    [Test]
+    public void CreateChanged_ShouldCopyCreatedAndSetUpdated()
+    {
+        var created = ChangeLog.CreateCreated();
+        var changed = ChangeLog.CreateChanged(created);
+
+        changed.IsDefault().Should().BeFalse();
+        changed.CreatedBy.Should().Be(created.CreatedBy);
+        changed.CreatedOn.Should().Be(created.CreatedOn);
+        changed.UpdatedBy.Should().NotBeNullOrEmpty();
+        changed.UpdatedOn.Should().NotBeNull();
+    }
+
+    [Test]
+    public void Clone_ShouldReturnEqualButNotSameInstance()
+    {
+        var changeLog = ChangeLog.CreateCreated();
+        var clone = changeLog with { };
+
+        clone.IsDefault().Should().BeFalse();
+        clone.Should().BeEquivalentTo(changeLog);
+        clone.Should().NotBeSameAs(changeLog);
+    }
+
+    [Test]
+    public void New_IsDefaultAndAutoClean()
+    {
+        var changeLog = new ChangeLog();
+        changeLog.CreatedBy.Should().BeNull();
+        changeLog.CreatedOn.Should().BeNull();
+        changeLog.UpdatedBy.Should().BeNull();
+        changeLog.UpdatedOn.Should().BeNull();
+        changeLog.IsDefault().Should().BeTrue();
+
+        changeLog = new ChangeLog() { CreatedBy = "", UpdatedBy = "" };
+        changeLog.CreatedBy.Should().BeNull();
+        changeLog.CreatedOn.Should().BeNull();
+        changeLog.UpdatedBy.Should().BeNull();
+        changeLog.UpdatedOn.Should().BeNull();
+        changeLog.IsDefault().Should().BeTrue();
+    }
+
+    [Test]
+    public void With_ExpressionSupport()
+    {
+        var created = ChangeLog.CreateCreated();
+        var changeLog = ChangeLog.CreateChanged(created);
+
+        var changed = changeLog with { UpdatedBy = "NewUser" };
+
+        changed.UpdatedBy.Should().Be("NewUser");
+        changed.CreatedBy.Should().Be(created.CreatedBy);
+        changed.CreatedOn.Should().Be(created.CreatedOn);
+        changed.UpdatedBy.Should().NotBeNullOrEmpty();
+        changed.UpdatedOn.Should().NotBeNull();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/CleanerTests.cs b/tests/CoreEx.Test.Unit/Entities/CleanerTests.cs
new file mode 100644
index 00000000..03e45254
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/CleanerTests.cs
@@ -0,0 +1,229 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Test.Unit.Entities;
+
+[TestFixture]
+public class CleanerTests
+{
+    [SetUp]
+    public void SetUp() => Cleaner.ResetDefaults();
+
+    [Test]
+    public void Clean_String_Trim_End()
+    {
+        var input = "abc   ";
+        var result = Cleaner.Clean(input, StringTrim.End, StringTransform.None, StringCase.None);
+        result.Should().Be("abc");
+    }
+
+    [Test]
+    public void Clean_String_Trim_Both()
+    {
+        var input = "  abc  ";
+        var result = Cleaner.Clean(input, StringTrim.Both, StringTransform.None, StringCase.None);
+        result.Should().Be("abc");
+    }
+
+    [Test]
+    public void Clean_String_Trim_Start()
+    {
+        var input = "  abc";
+        var result = Cleaner.Clean(input, StringTrim.Start, StringTransform.None, StringCase.None);
+        result.Should().Be("abc");
+    }
+
+    [Test]
+    public void Clean_String_Transform_EmptyToNull()
+    {
+        var input = "";
+        var result = Cleaner.Clean(input, StringTrim.None, StringTransform.EmptyToNull, StringCase.None);
+        result.Should().BeNull();
+    }
+
+    [Test]
+    public void Clean_String_Transform_NullToEmpty()
+    {
+        string? input = null;
+        var result = Cleaner.Clean(input, StringTrim.None, StringTransform.NullToEmpty, StringCase.None);
+        result.Should().Be(string.Empty);
+    }
+
+    [Test]
+    public void Clean_String_Case_Lower()
+    {
+        var input = "ABC";
+        var result = Cleaner.Clean(input, StringTrim.None, StringTransform.None, StringCase.Lower);
+        result.Should().Be("abc");
+    }
+
+    [Test]
+    public void Clean_String_Case_Upper()
+    {
+        var input = "abc";
+        var result = Cleaner.Clean(input, StringTrim.None, StringTransform.None, StringCase.Upper);
+        result.Should().Be("ABC");
+    }
+
+    [Test]
+    public void Clean_String_Case_Title()
+    {
+        var input = "a blue carrot";
+        var result = Cleaner.Clean(input, StringTrim.None, StringTransform.None, StringCase.Title);
+        result.Should().Be("A Blue Carrot");
+    }
+
+    [Test]
+    public void Clean_String_Null()
+    {
+        Cleaner.DefaultStringTrim = StringTrim.Both;
+        Cleaner.DefaultStringTransform = StringTransform.EmptyToNull;
+        Cleaner.DefaultStringCase = StringCase.Upper;
+
+        string? input = null;
+        var result = Cleaner.Clean(input);
+        result.Should().BeNull();
+    }
+
+    [Test]
+    public void Clean_String_UseDefault_Values()
+    {
+        Cleaner.DefaultStringTrim = StringTrim.Both;
+        Cleaner.DefaultStringTransform = StringTransform.EmptyToNull;
+        Cleaner.DefaultStringCase = StringCase.Upper;
+
+        var input = "  abc  ";
+        var result = Cleaner.Clean(input);
+        result.Should().Be("ABC");
+    }
+
+    [Test]
+    public void Clean_DateTime_Transform_Utc()
+    {
+        var local = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Local);
+        var result = Cleaner.Clean(local, DateTimeTransform.DateTimeUtc);
+        result.Kind.Should().Be(DateTimeKind.Utc);
+    }
+
+    [Test]
+    public void Clean_DateTime_Transform_Local()
+    {
+        var utc = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Utc);
+        var result = Cleaner.Clean(utc, DateTimeTransform.DateTimeLocal);
+        result.Kind.Should().Be(DateTimeKind.Local);
+    }
+
+    [Test]
+    public void Clean_DateTime_Transform_DateOnly()
+    {
+        var dt = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Local);
+        var result = Cleaner.Clean(dt, DateTimeTransform.DateOnly);
+        result.Date.Should().Be(dt.Date);
+        result.Kind.Should().Be(DateTimeKind.Unspecified);
+    }
+
+    [Test]
+    public void Clean_DateTime_Transform_Unspecified()
+    {
+        var dt = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Local);
+        var result = Cleaner.Clean(dt, DateTimeTransform.DateTimeUnspecified);
+        result.Kind.Should().Be(DateTimeKind.Unspecified);
+    }
+
+    [Test]
+    public void Clean_NullableDateTime_Null()
+    {
+        DateTime? dt = null;
+        var result = Cleaner.Clean(dt, DateTimeTransform.DateTimeUtc);
+        result.Should().BeNull();
+    }
+
+    [Test]
+    public void Clean_NullableDateTime_Value()
+    {
+        DateTime? dt = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Local);
+        var result = Cleaner.Clean(dt, DateTimeTransform.DateTimeUtc);
+        result.Should().NotBeNull();
+        result!.Value.Kind.Should().Be(DateTimeKind.Utc);
+    }
+
+    [Test]
+    public void Clean_Generic_String()
+    {
+        var input = "  abc  ";
+        var result = Cleaner.Clean(input);
+        result.Should().Be("  abc");
+    }
+
+    [Test]
+    public void Clean_Generic_DateTime()
+    {
+        var dt = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Local);
+        var result = Cleaner.Clean(dt);
+        result.Kind.Should().Be(DateTimeKind.Utc);
+    }
+
+    [Test]
+    public void Clean_Generic_DateTime_Nullable()
+    {
+        DateTime? dt = new DateTime(2024, 1, 1, 12, 0, 0, DateTimeKind.Local);
+        var result = Cleaner.Clean(dt);
+        result.Should().NotBeNull();
+        result.Value.Kind.Should().Be(DateTimeKind.Utc);
+
+        dt = null;
+        result = Cleaner.Clean(dt);
+        result.Should().BeNull();
+    }
+
+    [Test]
+    public void Clean_Generic_Null()
+    {
+        object? value = null;
+        var result = Cleaner.Clean(value);
+        result.Should().BeNull();
+    }
+
+    [Test]
+    public void Clean_Generic_ICollection()
+    {
+        List<string>? input = [];
+        var result = Cleaner.Clean(input);
+        result.Should().BeNull();
+
+        List<string> input2 = [];
+        var result2 = Cleaner.Clean(input2);
+        result2.Should().BeNull();  // Don't be fooled by lack of nullability declaration (compiler sugar only) - an empty collection is always cleaned to null.
+
+        input = ["Abc"];
+        result = Cleaner.Clean(input);
+        result.Should().NotBeNull();
+    }
+
+    [Test]
+    public void DefaultStringTrim_SetToUseDefault_Throws()
+    {
+        Action act = () => Cleaner.DefaultStringTrim = StringTrim.UseDefault;
+        act.Should().Throw<ArgumentException>();
+    }
+
+    [Test]
+    public void DefaultStringTransform_SetToUseDefault_Throws()
+    {
+        Action act = () => Cleaner.DefaultStringTransform = StringTransform.UseDefault;
+        act.Should().Throw<ArgumentException>();
+    }
+
+    [Test]
+    public void DefaultStringCase_SetToUseDefault_Throws()
+    {
+        Action act = () => Cleaner.DefaultStringCase = StringCase.UseDefault;
+        act.Should().Throw<ArgumentException>();
+    }
+
+    [Test]
+    public void DefaultDateTimeTransform_SetToUseDefault_Throws()
+    {
+        Action act = () => Cleaner.DefaultDateTimeTransform = DateTimeTransform.UseDefault;
+        act.Should().Throw<ArgumentException>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/CompositeKeyTests.cs b/tests/CoreEx.Test.Unit/Entities/CompositeKeyTests.cs
new file mode 100644
index 00000000..4450b0f8
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/CompositeKeyTests.cs
@@ -0,0 +1,142 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Test.Unit.Entities;
+
+[TestFixture]
+public class CompositeKeyTests
+{
+    [Test]
+    public void Create_StaticFactory_CreatesKey()
+    {
+        var key = CompositeKey.Create(1, "abc", null);
+        key.Args.Should().BeEquivalentTo(new object?[] { 1, "abc", null });
+    }
+
+    [Test]
+    public void Constructor_Empty()
+    {
+        var key = new CompositeKey();
+        key.Args.Length.Should().Be(0);
+    }
+
+    [Test]
+    public void Constructor_WithArgs()
+    {
+        var key = CompositeKey.Create(1, "x", 3.14);
+        key.Args.Should().BeEquivalentTo(new object?[] { 1, "x", 3.14 });
+    }
+
+    [Test]
+    public void Constructor_NullArgs()
+    {
+        var key = new CompositeKey(null!);
+        key.Args.Length.Should().Be(1);
+        key.Args[0].Should().BeNull();
+    }
+
+    [Test]
+    public void Args_Immutable()
+    {
+        var key = new CompositeKey(1, 2);
+        var arr = key.Args;
+        arr[0].Should().Be(1);
+        arr[1].Should().Be(2);
+        // ImmutableArray: cannot add/remove, so just check length and values
+        arr.Length.Should().Be(2);
+    }
+
+    [Test]
+    public void Equals_SameArgs_True()
+    {
+        var k1 = CompositeKey.Create(1, "a");
+        var k2 = CompositeKey.Create(1, "a");
+        k1.Equals(k2).Should().BeTrue();
+        k1.Should().Be(k2);
+        (k1 == k2).Should().BeTrue();
+        (k1 != k2).Should().BeFalse();
+        k1.Equals((object)k2).Should().BeTrue();
+    }
+
+    [Test]
+    public void Equals_DifferentArgs_False()
+    {
+        var k1 = new CompositeKey(1, "a");
+        var k2 = new CompositeKey(2, "a");
+        k1.Equals(k2).Should().BeFalse();
+        k1.Should().NotBe(k2);
+        (k1 == k2).Should().BeFalse();
+        (k1 != k2).Should().BeTrue();
+        k1.Equals((object)k2).Should().BeFalse();
+    }
+
+    [Test]
+    public void Equals_Object_NotCompositeKey_False()
+    {
+        var k1 = new CompositeKey(1, "a");
+        k1.Equals("not a key").Should().BeFalse();
+    }
+
+    [Test]
+    public void GetHashCode_EqualKeys_SameHash()
+    {
+        var k1 = new CompositeKey(1, "a");
+        var k2 = CompositeKey.Create(1, "a");
+        k1.GetHashCode().Should().Be(k2.GetHashCode());
+    }
+
+    [Test]
+    public void GetHashCode_DifferentKeys_DifferentHash()
+    {
+        var k1 = new CompositeKey(1, "a");
+        var k2 = CompositeKey.Create(2, "a");
+        k1.GetHashCode().Should().NotBe(k2.GetHashCode());
+    }
+
+    [Test]
+    public void ToString_Formatting()
+    {
+        var k1 = new CompositeKey(123456, "abc", new DateTimeOffset(2025, 04, 13, 17, 02, 53, TimeSpan.FromHours(8)), null, -10034.3456m, true);
+        k1.ToString().Should().Be("123456,abc,2025-04-13T09:02:53.0000000+00:00,,-10034.3456,true");
+
+        var k2 = CompositeKey.Create(123456, "abc");
+        k2.ToString().Should().Be("123456,abc");
+    }
+
+    [Test]
+    public void Single_Key()
+    {
+        CompositeKey k1 = 123;
+        CompositeKey k2 = 123;
+        k1.Should().Be(k2);
+        k1.GetHashCode().Should().Be(k2.GetHashCode());
+        k1.ToString().Should().Be("123");
+        k2.ToString().Should().Be("123"); 
+    }
+
+    [Test]
+    public void Cast_To_CompositeKey()
+    {
+        CompositeKey k1 = 123; // Implicit cast from uint
+        k1.Args.Should().BeEquivalentTo(new object?[] { 123 });
+        CompositeKey k2 = (uint?)456; // Implicit cast from nullable uint
+        k2.Args.Should().BeEquivalentTo(new object?[] { 456u });
+        CompositeKey k3 = 789ul; // Implicit cast from ulong
+        k3.Args.Should().BeEquivalentTo(new object?[] { 789ul });
+        CompositeKey k4 = (ulong?)101112; // Implicit cast from nullable ulong
+        k4.Args.Should().BeEquivalentTo(new object?[] { 101112ul });
+        CompositeKey k5 = new DateOnly(2025, 04, 13); // Implicit cast from DateOnly
+        k5.Args.Should().BeEquivalentTo(new object?[] { new DateOnly(2025, 04, 13) });
+        CompositeKey k6 = (DateOnly?)new DateOnly(2025, 05, 14); // Implicit cast from nullable DateOnly
+        k6.Args.Should().BeEquivalentTo(new object?[] { new DateOnly(2025, 05, 14) });
+        CompositeKey k7 = new TimeOnly(17, 02, 53); // Implicit cast from TimeOnly
+        k7.Args.Should().BeEquivalentTo(new object?[] { new TimeOnly(17, 02, 53) });
+        CompositeKey k8 = (TimeOnly?)new TimeOnly(18, 03, 54); // Implicit cast from nullable TimeOnly
+        k8.Args.Should().BeEquivalentTo(new object?[] { new TimeOnly(18, 03, 54) });
+        byte[] bytes = { 0x01, 0x02 };
+        CompositeKey k9 = bytes; // Implicit cast from byte[]
+        k9.Args.Should().BeEquivalentTo(new object?[] { bytes });
+        object?[] arr = { "a", null };
+        CompositeKey k10 = arr; // Implicit cast from object?[]
+        k10.Args.Should().BeEquivalentTo(arr);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/IdentifierTests.cs b/tests/CoreEx.Test.Unit/Entities/IdentifierTests.cs
new file mode 100644
index 00000000..42a8a37f
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/IdentifierTests.cs
@@ -0,0 +1,43 @@
+using CoreEx.Entities;
+using CoreEx.Entities.Abstractions;
+
+namespace CoreEx.Test.Unit.Entities;
+
+[TestFixture]
+public class IdentifierTests
+{
+    public class ImmutableIdentifier : IReadOnlyIdentifier<int>
+    {
+        public int Id { get; init; }
+    }
+
+    public class MutableIdentifier : IIdentifier<int>
+    {
+        public int Id { get; set; }
+    }
+
+    [Test]
+    public void ImmutableIdentifier_Test()
+    {
+        var ii = new ImmutableIdentifier { Id = 123 };
+        ii.Id.Should().Be(123);
+        ((IReadOnlyIdentifier)ii).IdType.Should().Be<int>();
+        ((IReadOnlyIdentifier)ii).IsIdReadOnly.Should().BeTrue();
+        Action act = () => ((IReadOnlyIdentifier)ii).SetIdentifier(456);
+        act.Should().Throw<InvalidOperationException>().WithMessage("Identifier is read-only.");
+    }
+
+    [Test]
+    public void MutableIdentifier_Test()
+    {
+        var mi = new MutableIdentifier { Id = 123 };
+        mi.Id.Should().Be(123);
+        ((IReadOnlyIdentifier)mi).IdType.Should().Be<int>();
+        ((IReadOnlyIdentifier)mi).IsIdReadOnly.Should().BeFalse();
+        ((IReadOnlyIdentifier)mi).SetIdentifier(456);
+        mi.Id.Should().Be(456);
+
+        ((IIdentifier)mi).Id = 789;
+        mi.Id.Should().Be(789);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/MessageItemCollectionTests.cs b/tests/CoreEx.Test.Unit/Entities/MessageItemCollectionTests.cs
new file mode 100644
index 00000000..0726e903
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/MessageItemCollectionTests.cs
@@ -0,0 +1,72 @@
+using CoreEx.Entities;
+
+namespace CoreEx.Test.Unit.Entities;
+
+[TestFixture]
+public class MessageItemCollectionTests
+{
+    [Test]
+    public void Ctor_Default_Empty()
+    {
+        var coll = new MessageItemCollection();
+        coll.Should().BeEmpty();
+    }
+
+    [Test]
+    public void Ctor_WithMessages()
+    {
+        var msgs = new List<MessageItem>
+        {
+            MessageItem.CreateMessage(MessageType.Info, "info"),
+            MessageItem.CreateMessage(MessageType.Error, "error")
+        };
+        var coll = new MessageItemCollection(msgs);
+        coll.Should().BeEquivalentTo(msgs);
+    }
+
+    [Test]
+    public void ContainsType_TrueAndFalse()
+    {
+        var coll = new MessageItemCollection
+        {
+            MessageItem.CreateMessage(MessageType.Info, "info"),
+            MessageItem.CreateMessage(MessageType.Error, "error"),
+            MessageItem.CreateMessage(MessageType.Warning, "warn")
+        };
+        coll.ContainsType(MessageType.Info).Should().BeTrue();
+        coll.ContainsType(MessageType.Error).Should().BeTrue();
+        coll.ContainsType(MessageType.Warning).Should().BeTrue();
+        coll.ContainsType((MessageType)99).Should().BeFalse();
+    }
+
+    [Test]
+    public void GetMessagesForType_ReturnsFiltered()
+    {
+        var coll = new MessageItemCollection
+        {
+            MessageItem.CreateMessage(MessageType.Info, "info1"),
+            MessageItem.CreateMessage(MessageType.Error, "error1"),
+            MessageItem.CreateMessage(MessageType.Info, "info2"),
+            MessageItem.CreateMessage(MessageType.Error, "error2")
+        };
+        var infos = coll.GetMessagesForType(MessageType.Info);
+        infos.Should().HaveCount(2);
+        infos.Should().OnlyContain(x => x.Type == MessageType.Info);
+        infos.Should().BeEquivalentTo([MessageItem.CreateMessage(MessageType.Info, "info1"), MessageItem.CreateMessage(MessageType.Info, "info2")]);
+
+        var errors = coll.GetMessagesForType(MessageType.Error);
+        errors.Should().HaveCount(2);
+        errors.Should().OnlyContain(x => x.Type == MessageType.Error);
+    }
+
+    [Test]
+    public void GetMessagesForType_EmptyResult()
+    {
+        var coll = new MessageItemCollection
+        {
+            MessageItem.CreateMessage(MessageType.Info, "info")
+        };
+        var warnings = coll.GetMessagesForType(MessageType.Warning);
+        warnings.Should().BeEmpty();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/MessageItemCreateTests.cs b/tests/CoreEx.Test.Unit/Entities/MessageItemCreateTests.cs
new file mode 100644
index 00000000..fb23d2bc
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/MessageItemCreateTests.cs
@@ -0,0 +1,74 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+
+namespace CoreEx.Test.Unit.Entities;
+
+[TestFixture]
+public class MessageItemCreateTests
+{
+    [Test]
+    public void CreateMessage_Type_Text()
+    {
+        var ltext = new LText("msg1");
+        var item = MessageItem.CreateMessage(MessageType.Info, ltext);
+        item.Type.Should().Be(MessageType.Info);
+        item.Text.Should().Be(ltext);
+        item.Property.Should().BeNull();
+    }
+
+    [Test]
+    public void CreateMessage_Type_Format_Values()
+    {
+        var ltext = new LText("format {0} {1}");
+        var item = MessageItem.CreateMessage(MessageType.Warning, ltext, 1, "x");
+        item.Type.Should().Be(MessageType.Warning);
+        item.Text.Should().NotBeNull();
+        item.Text.Value.KeyAndOrText.Should().Be("format {0} {1}");
+        item.Text.Value.Args.Should().BeEquivalentTo(new object[] { 1, "x" });
+        item.Property.Should().BeNull();
+    }
+
+    [Test]
+    public void CreateMessage_Property_Type_Text()
+    {
+        var ltext = new LText("msg2");
+        var item = MessageItem.CreateMessage("PropA", MessageType.Error, ltext);
+        item.Property.Should().Be("PropA");
+        item.Type.Should().Be(MessageType.Error);
+        item.Text.Should().Be(ltext);
+    }
+
+    [Test]
+    public void CreateMessage_Property_Type_Format_Values()
+    {
+        var ltext = new LText("format {0}");
+        var item = MessageItem.CreateMessage("PropB", MessageType.Info, ltext, 99);
+        item.Property.Should().Be("PropB");
+        item.Type.Should().Be(MessageType.Info);
+        item.Text.Should().NotBeNull();
+        item.Text.Value.KeyAndOrText.Should().Be("format {0}");
+        item.Text.Value.Args.Should().BeEquivalentTo(new object[] { 99 });
+    }
+
+    [Test]
+    public void CreateErrorMessage_Property_Text()
+    {
+        var ltext = new LText("errormsg");
+        var item = MessageItem.CreateErrorMessage("PropC", ltext);
+        item.Property.Should().Be("PropC");
+        item.Type.Should().Be(MessageType.Error);
+        item.Text.Should().Be(ltext);
+    }
+
+    [Test]
+    public void CreateErrorMessage_Property_Format_Values()
+    {
+        var ltext = new LText("error {0}");
+        var item = MessageItem.CreateErrorMessage("PropD", ltext, "fail");
+        item.Property.Should().Be("PropD");
+        item.Type.Should().Be(MessageType.Error);
+        item.Text.Should().NotBeNull();
+        item.Text.Value.KeyAndOrText.Should().Be("error {0}");
+        item.Text.Value.Args.Should().BeEquivalentTo(new object[] { "fail" });
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Entities/MessageItemTests.cs b/tests/CoreEx.Test.Unit/Entities/MessageItemTests.cs
new file mode 100644
index 00000000..100ceaa1
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Entities/MessageItemTests.cs
@@ -0,0 +1,66 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+
+namespace CoreEx.Test.Unit.Entities;
+
+[TestFixture]
+public class MessageItemTests
+{
+    [Test]
+    public void Constructor_SetsProperties()
+    {
+        var ltext = new LText("test message");
+        var item = new MessageItem(MessageType.Warning, ltext, "Prop1");
+        item.Type.Should().Be(MessageType.Warning);
+        item.Text.Should().Be(ltext);
+        item.Property.Should().Be("Prop1");
+    }
+
+    [Test]
+    public void Constructor_NullProperty()
+    {
+        var ltext = new LText("msg");
+        var item = new MessageItem(MessageType.Info, ltext);
+        item.Type.Should().Be(MessageType.Info);
+        item.Text.Should().Be(ltext);
+        item.Property.Should().BeNull();
+    }
+
+    [Test]
+    public void Type_GetSet()
+    {
+        var item = new MessageItem(MessageType.Info, new LText("x"))
+        {
+            Type = MessageType.Error
+        };
+        item.Type.Should().Be(MessageType.Error);
+    }
+
+    [Test]
+    public void Text_GetSet()
+    {
+        var item = new MessageItem(MessageType.Info, new LText("x"));
+        var ltext = new LText("new text");
+        item.Text = ltext;
+        item.Text.Should().Be(ltext);
+    }
+
+    [Test]
+    public void Property_GetSet()
+    {
+        var item = new MessageItem(MessageType.Info, new LText("x"))
+        {
+            Property = "abc"
+        };
+        item.Property.Should().Be("abc");
+    }
+
+    [Test]
+    public void WithProperty_SetsPropertyAndReturnsSelf()
+    {
+        var item = new MessageItem(MessageType.Info, new LText("x"));
+        var ret = item.WithProperty("p1");
+        ret.Should().BeSameAs(item);
+        item.Property.Should().Be("p1");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/ExceptionTests.cs b/tests/CoreEx.Test.Unit/ExceptionTests.cs
new file mode 100644
index 00000000..1c6c65e3
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/ExceptionTests.cs
@@ -0,0 +1,142 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+using System.Net;
+
+namespace CoreEx.Test.Unit;
+
+[TestFixture]
+public class CoreExExceptionTests
+{
+    [Test]
+    public void BusinessException_DefaultAndMessage()
+    {
+        var ltext = new LText("business");
+        var ex1 = new BusinessException(ltext);
+        ex1.Message.Should().Contain("business");
+    }
+
+    [Test]
+    public void ValidationException_DefaultAndMessage()
+    {
+        var ex1 = new ValidationException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        ex1.ErrorType.Should().Be("validation");
+
+        var ltext = new LText("validation");
+        var ex2 = new ValidationException(ltext);
+        ex2.Message.Should().Contain("validation");
+
+        var item = new MessageItem(MessageType.Error, new LText("msg"));
+        var ex3 = new ValidationException(item);
+        ex3.Messages.Should().ContainSingle();
+
+        var items = new List<MessageItem> { item };
+        var ex4 = new ValidationException(items);
+        ex4.Messages.Should().ContainSingle();
+    }
+
+    [Test]
+    public void ConflictException_DefaultAndMessage()
+    {
+        var ex1 = new ConflictException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        ex1.ErrorType.Should().Be("conflict");
+
+        var ltext = new LText("conflict");
+        var ex2 = new ConflictException(ltext);
+        ex2.Message.Should().Contain("conflict");
+    }
+
+    [Test]
+    public void ConcurrencyException_DefaultAndMessage()
+    {
+        var ex1 = new ConcurrencyException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.PreconditionFailed);
+        ex1.ErrorType.Should().Be("concurrency");
+
+        var ltext = new LText("concurrency");
+        var ex2 = new ConcurrencyException(ltext);
+        ex2.Message.Should().Contain("concurrency");
+    }
+
+    [Test]
+    public void DataConsistencyException_DefaultAndMessage()
+    {
+        var ex1 = new DataConsistencyException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
+        ex1.ErrorType.Should().Be("data-consistency");
+
+        var ltext = new LText("dataconsistency");
+        var ex2 = new DataConsistencyException(ltext);
+        ex2.Message.Should().Contain("dataconsistency");
+    }
+
+    [Test]
+    public void DuplicateException_DefaultAndMessage()
+    {
+        var ex1 = new DuplicateException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        ex1.ErrorType.Should().Be("duplicate");
+
+        var ltext = new LText("duplicate");
+        var ex2 = new DuplicateException(ltext);
+        ex2.Message.Should().Contain("duplicate");
+    }
+
+    [Test]
+    public void NotFoundException_DefaultAndMessage()
+    {
+        var ex1 = new NotFoundException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        ex1.ErrorType.Should().Be("not-found");
+
+        var ltext = new LText("notfound");
+        var ex2 = new NotFoundException(ltext);
+        ex2.Message.Should().Contain("notfound");
+    }
+
+    [Test]
+    public void TransientException_DefaultAndMessage()
+    {
+        var ex1 = new TransientException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.ServiceUnavailable);
+        ex1.ErrorType.Should().Be("transient");
+
+        var ltext = new LText("transient");
+        var ex2 = new TransientException(ltext);
+        ex2.Message.Should().Contain("transient");
+    }
+
+    [Test]
+    public void AuthenticationException_DefaultAndMessage()
+    {
+        var ex1 = new AuthenticationException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.Unauthorized);
+        ex1.ErrorType.Should().Be("authentication");
+
+        var ltext = new LText("auth");
+        var ex2 = new AuthenticationException(ltext);
+        ex2.Message.Should().Contain("auth");
+    }
+
+    [Test]
+    public void AuthorizationException_DefaultAndMessage()
+    {
+        var ex1 = new AuthorizationException();
+        ex1.Message.Should().NotBeNull();
+        ex1.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        ex1.ErrorType.Should().Be("authorization");
+
+        var ltext = new LText("author");
+        var ex2 = new AuthorizationException(ltext);
+        ex2.Message.Should().Contain("author");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/ExecutionContextTests.cs b/tests/CoreEx.Test.Unit/ExecutionContextTests.cs
new file mode 100644
index 00000000..9bfe5a58
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/ExecutionContextTests.cs
@@ -0,0 +1,150 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+using System.Globalization;
+
+namespace CoreEx.Test.Unit;
+
+[TestFixture]
+public class ExecutionContextTests
+{
+    [TearDown]
+    public void TearDown()
+    {
+        ExecutionContext.Reset();
+        ExecutionContext.Create = () => new ExecutionContext();
+    }
+
+    [Test]
+    public void ServiceProvider_GetSet()
+    {
+        var ec = new ExecutionContext();
+        var sp = new TestServiceProvider();
+        ec.ServiceProvider = sp;
+        ec.ServiceProvider.Should().BeSameAs(sp);
+    }
+
+    [Test]
+    public void UserName_GetSet()
+    {
+        var ec = new ExecutionContext
+        {
+            User = new Security.AuthenticationUser { Type = Security.AuthenticationType.AccountUser, UserName = "user1" }
+        };
+        ec.User.Should().NotBeNull();
+        ec.User.UserName.Should().Be("user1");
+        ec.User.Type.Should().Be(Security.AuthenticationType.AccountUser);
+    }
+
+    [Test]
+    public void TenantId_GetSet()
+    {
+        var ec = new ExecutionContext
+        {
+            TenantId = "tenant1"
+        };
+        ec.TenantId.Should().Be("tenant1");
+    }
+
+    [Test]
+    public void Timestamp_DefaultAndSet()
+    {
+        var ec = new ExecutionContext();
+        var now = DateTimeOffset.UtcNow;
+        ec.Timestamp.Should().BeOnOrAfter(now.AddSeconds(-1));
+        var dt = new DateTimeOffset(2020, 1, 2, 3, 4, 5, TimeSpan.Zero);
+        ec.Timestamp = dt;
+        ec.Timestamp.Should().Be(dt);
+    }
+
+    [Test]
+    public void UICulture_GetSet()
+    {
+        var ec = new ExecutionContext();
+        var culture = new CultureInfo("fr-FR");
+        ec.UICulture = culture;
+        ec.UICulture.Should().Be(culture);
+    }
+
+    [Test]
+    public void AddWarningMessage_AddsMessage()
+    {
+        var ec = new ExecutionContext();
+        ec.AddWarningMessage(new LText("warn"));
+        ec.Messages.Should().NotBeNull();
+        ec.Messages!.Count.Should().Be(1);
+        ec.Messages[0].Type.Should().Be(MessageType.Warning);
+        ec.Messages[0].Text.Should().Be(new LText("warn"));
+    }
+
+    [Test]
+    public void AddInfoMessage_AddsMessage()
+    {
+        var ec = new ExecutionContext();
+        ec.AddInfoMessage(new LText("info"));
+        ec.Messages.Should().NotBeNull();
+        ec.Messages!.Count.Should().Be(1);
+        ec.Messages[0].Type.Should().Be(MessageType.Info);
+        ec.Messages[0].Text.Should().Be(new LText("info"));
+    }
+
+    [Test]
+    public void Attributes_IsLazilyCreatedAndWorks()
+    {
+        var ec = new ExecutionContext();
+        ec.Attributes.Should().NotBeNull();
+        ec.Attributes["foo"] = 123;
+        ec.Attributes["foo"].Should().Be(123);
+    }
+
+    [Test]
+    public void IsACopy_FalseByDefault_TrueWhenCopied()
+    {
+        var ec = new ExecutionContext();
+        ec.IsACopy.Should().BeFalse();
+        var copy = ec.CreateCopy();
+        copy.IsACopy.Should().BeTrue();
+    }
+
+    [Test]
+    public void CreateCopy_CopiesPropertiesAndSharesMessagesAndAttributes()
+    {
+        var ec = new ExecutionContext
+        {
+            User = new Security.AuthenticationUser { Type = Security.AuthenticationType.AccountUser, UserName = "user" },
+            TenantId = "tenant",
+            UICulture = new CultureInfo("en-US")
+        };
+        ec.AddInfoMessage(new LText("msg"));
+        ec.Attributes["k"] = "v";
+        var copy = ec.CreateCopy();
+        copy.User.Should().NotBeNull();
+        copy.User.UserName.Should().Be("user");
+        copy.User.Type.Should().Be(Security.AuthenticationType.AccountUser);
+        copy.TenantId.Should().Be("tenant");
+        copy.UICulture.Should().Be(new CultureInfo("en-US"));
+        copy.Messages.Should().BeSameAs(ec.Messages);
+        copy.Attributes.Should().NotBeNull();
+        copy.Attributes["k"].Should().Be("v");
+    }
+
+    [Test]
+    public void CreateCopy_ThrowsIfCreateIsNull()
+    {
+        ExecutionContext.Create = null;
+        var ec = new ExecutionContext();
+        Action act = () => ec.CreateCopy();
+        act.Should().Throw<InvalidOperationException>();
+    }
+
+    [Test]
+    public void OperationType_Read()
+    {
+        var ec = new ExecutionContext { OperationType = OperationType.Get };
+        ec.OperationType.IsRead.Should().BeTrue();
+    }
+
+    private class TestServiceProvider : IServiceProvider
+    {
+        public object? GetService(Type serviceType) => null;
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Hosting/Work/WorkOrchestratorTests.cs b/tests/CoreEx.Test.Unit/Hosting/Work/WorkOrchestratorTests.cs
new file mode 100644
index 00000000..f0088c9c
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Hosting/Work/WorkOrchestratorTests.cs
@@ -0,0 +1,181 @@
+using CoreEx.Hosting.Work;
+using CoreEx.Caching;
+
+namespace CoreEx.Test.Unit.Hosting.Work;
+
+[TestFixture]
+public class WorkOrchestratorTests
+{
+    [Test]
+    public async Task Orchestrate_End_To_End()
+    {
+        var p = new HybridCacheWorkProvider(new MemoryOnlyHybridCache());
+        var o = new WorkOrchestrator(p);
+
+        ExecutionContext.Reset();
+        var ec = ExecutionContext.Current;
+
+        var wa = new WorkArgs("Test-Work", "abc");
+
+        // Start work.
+        var ws = await o.CreateAsync(wa);
+        ws.Should().NotBeNull();
+        ws.TypeName.Should().Be("Test-Work");
+        ws.Id.Should().Be("abc");
+        ws.Status.Should().Be(WorkStatus.Created);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().BeNull();
+        ws.Indeterminate.Should().BeNull();
+        ws.Finished.Should().BeNull();
+        ws.Reason.Should().BeNull();
+
+        // Get not found.
+        var ws2 = await o.GetWithTypeAsync("Test-Work", "def");
+        ws2.Should().BeNull();
+
+        // Get found.
+        ws2 = await o.GetWithTypeAsync("Test-Work", "abc");
+        ObjectComparer.Assert(ws, ws2);
+
+        // Start work.
+        ws = await o.StartAsync("abc");
+        ws.Should().NotBeNull();
+        ws.TypeName.Should().Be("Test-Work");
+        ws.Id.Should().Be("abc");
+        ws.Status.Should().Be(WorkStatus.Started);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().Be(ec.Timestamp);
+        ws.Indeterminate.Should().BeNull();
+        ws.Finished.Should().BeNull();
+        ws.Reason.Should().BeNull();
+
+        // Indeterminate work.
+        ws = await o.IndeterminateAsync("abc", "Not sure!");
+        ws.Should().NotBeNull();
+        ws.TypeName.Should().Be("Test-Work");
+        ws.Id.Should().Be("abc");
+        ws.Status.Should().Be(WorkStatus.Indeterminate);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().Be(ec.Timestamp);
+        ws.Indeterminate.Should().Be(ec.Timestamp);
+        ws.Finished.Should().BeNull();
+        ws.Reason.Should().Be("Not sure!");
+
+        // Get data.
+        var bd = await o.GetDataAsync("abc");
+        bd.Should().BeNull();
+
+        // Set data.
+        await o.SetDataValueAsync("abc", "123");
+
+        // Get data.
+        var dv = await o.GetDataValueAsync<string>("abc");
+        dv.Should().Be("123");
+
+        // Complete work.
+        ws = await o.CompleteAsync("abc");
+        ws.Should().NotBeNull();
+        ws.TypeName.Should().Be("Test-Work");
+        ws.Id.Should().Be("abc");
+        ws.Status.Should().Be(WorkStatus.Completed);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().Be(ec.Timestamp);
+        ws.Indeterminate.Should().Be(ec.Timestamp);
+        ws.Finished.Should().Be(ec.Timestamp);
+        ws.Reason.Should().BeNull();
+
+        // Get different type with same id.
+        ws = await o.GetWithTypeAsync<string>("abc");
+        ws.Should().BeNull();
+
+        // Get correct type with same id, but different user.
+        ExecutionContext.Current.User = Security.AuthenticationUser.Anonymous;
+        ws = await o.GetWithTypeAsync("Test-Work", "abc");
+        ws.Should().BeNull();
+    }
+
+    [Test]
+    public async Task Auto_Expire_On_Get()
+    {
+        var p = new HybridCacheWorkProvider(new MemoryOnlyHybridCache());
+        var o = new WorkOrchestrator(p);
+
+        ExecutionContext.Reset();
+        var ec = ExecutionContext.Current;
+
+        var wa = new WorkArgs("Test-Work", "abc") { Expiry = TimeSpan.FromDays(-1) };
+
+        // Start work.
+        var ws = await o.CreateAsync(wa);
+        ws.Should().NotBeNull();
+
+        // Get work - should be expired.
+        ws = await o.GetAsync("abc");
+        ws.Should().NotBeNull();
+        ws.Status.Should().Be(WorkStatus.Expired);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().BeNull();
+        ws.Indeterminate.Should().BeNull();
+        ws.Finished.Should().Be(ec.Timestamp);
+    }
+
+    [Test]
+    public async Task Create_Then_Fail()
+    {
+        var p = new HybridCacheWorkProvider(new MemoryOnlyHybridCache());
+        var o = new WorkOrchestrator(p);
+
+        ExecutionContext.Reset();
+        var ec = ExecutionContext.Current;
+
+        var wa = new WorkArgs("Test-Work", "abc");
+
+        // Create work.
+        var ws = await o.CreateAsync(wa);
+        ws.Should().NotBeNull();
+
+        // Start work.
+        ws = await o.StartAsync("abc");
+        ws.Should().NotBeNull();
+
+        // Fail work.
+        ws = await o.FailAsync("abc", "Because I said so!");
+        ws.Should().NotBeNull();
+        ws.TypeName.Should().Be("Test-Work");
+        ws.Id.Should().Be("abc");
+        ws.Status.Should().Be(WorkStatus.Failed);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().Be(ec.Timestamp);
+        ws.Indeterminate.Should().BeNull();
+        ws.Finished.Should().Be(ec.Timestamp);
+        ws.Reason.Should().Be("Because I said so!");
+    }
+
+    [Test]
+    public async Task Create_Then_Cancel()
+    {
+        var p = new HybridCacheWorkProvider(new MemoryOnlyHybridCache());
+        var o = new WorkOrchestrator(p);
+
+        ExecutionContext.Reset();
+        var ec = ExecutionContext.Current;
+
+        var wa = new WorkArgs("Test-Work", "abc");
+
+        // Start work.
+        var ws = await o.CreateAsync(wa);
+        ws.Should().NotBeNull();
+
+        // Cancel work.
+        ws = await o.CancelAsync("abc", "Not needed!");
+        ws.Should().NotBeNull();
+        ws.TypeName.Should().Be("Test-Work");
+        ws.Id.Should().Be("abc");
+        ws.Status.Should().Be(WorkStatus.Canceled);
+        ws.Created.Should().Be(ec.Timestamp);
+        ws.Started.Should().BeNull();
+        ws.Indeterminate.Should().BeNull();
+        ws.Finished.Should().Be(ec.Timestamp);
+        ws.Reason.Should().Be("Not needed!");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Http/HttpClientTests.cs b/tests/CoreEx.Test.Unit/Http/HttpClientTests.cs
new file mode 100644
index 00000000..17ed71c9
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Http/HttpClientTests.cs
@@ -0,0 +1,117 @@
+using CoreEx.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System.Net;
+using UnitTestEx.Expectations;
+
+namespace CoreEx.Test.Unit.Http;
+
+[TestFixture]
+public class HttpClientTests
+{
+    [Test]
+    public void Resiliency_And_No_IdempotencyKey()
+    {
+        var mcf = MockHttpClientFactory.Create();
+        var mapi = mcf.CreateClient("UnitTest").WithConfigurations();
+
+        mapi.Request(HttpMethod.Get, "/test-endpoint")
+            .Respond.WithSequence(s =>
+            {
+                s.Respond().With(HttpStatusCode.InternalServerError);
+                s.Respond().With(HttpStatusCode.ServiceUnavailable);
+                s.Respond().With(HttpStatusCode.RequestTimeout);
+                s.Respond().With(HttpStatusCode.NoContent);
+            });
+
+        mapi.Request(HttpMethod.Get, "/test-endpoint-2")
+            .Respond.With(HttpStatusCode.NotFound);
+
+        using var test = GenericTester.Create<EntryPoint>();
+        test.ReplaceHttpClientFactory(mcf);
+
+        var client = test.Services.GetRequiredService<IHttpClientFactory>().CreateClient("UnitTest");
+
+        test.ExpectLogContains("Result: '500', Handled: 'True', Attempt: '0'")
+            .ExpectLogContains("Result: '503', Handled: 'True', Attempt: '1'")
+            .ExpectLogContains("Result: '408', Handled: 'True', Attempt: '2'")
+            .ExpectLogContains("Result: '204', Handled: 'False', Attempt: '3'")
+            .Run(async () =>
+            {
+                var response = await client.GetAsync("/test-endpoint");
+                var ik = response.RequestMessage!.Headers.GetValues(HttpNames.IdempotencyKeyHeaderName).FirstOrDefault();
+                ik.Should().BeNull();
+            });
+
+        test.ExpectLogContains("Result: '404', Handled: 'False', Attempt: '0'")
+            .Run(async () =>
+            {
+                var response = await client.GetAsync("/test-endpoint-2");
+                var ik = response.RequestMessage!.Headers.GetValues(HttpNames.IdempotencyKeyHeaderName).FirstOrDefault();
+                ik.Should().BeNull();
+            });
+
+        mapi.Verify();
+    }
+
+    [Test]
+    public void Resiliency_And_IdempotencyKey()
+    {
+        var mcf = MockHttpClientFactory.Create();
+        var mapi = mcf.CreateClient("UnitTest").WithConfigurations();
+
+        mapi.Request(HttpMethod.Post, "/test-endpoint")
+            .Respond.WithSequence(s =>
+            {
+                s.Respond().With(HttpStatusCode.InternalServerError);
+                s.Respond().With(HttpStatusCode.ServiceUnavailable);
+                s.Respond().With(HttpStatusCode.RequestTimeout);
+                s.Respond().With(HttpStatusCode.NoContent);
+            });
+
+        mapi.Request(HttpMethod.Post, "/test-endpoint-2")
+            .Respond.With(HttpStatusCode.NotFound);
+
+        using var test = GenericTester.Create<EntryPoint>();
+        test.ReplaceHttpClientFactory(mcf);
+
+        var client = test.Services.GetRequiredService<IHttpClientFactory>().CreateClient("UnitTest");
+        string? lastIdempotencyKey = null;
+
+        test.ExpectLogContains("Result: '500', Handled: 'True', Attempt: '0'")
+            .ExpectLogContains("Result: '503', Handled: 'True', Attempt: '1'")
+            .ExpectLogContains("Result: '408', Handled: 'True', Attempt: '2'")
+            .ExpectLogContains("Result: '204', Handled: 'False', Attempt: '3'")
+            .Run(async () =>
+            {
+                var response = await client.PostAsync("/test-endpoint", null);
+                var ik = response.RequestMessage!.Headers.GetValues(HttpNames.IdempotencyKeyHeaderName).FirstOrDefault();
+                ik.Should().NotBeNullOrEmpty();
+                lastIdempotencyKey = ik;
+            });
+
+        test.ExpectLogContains("Result: '404', Handled: 'False', Attempt: '0'")
+            .Run(async () =>
+            {
+                var response = await client.PostAsync("/test-endpoint-2", null);
+                var ik = response.RequestMessage!.Headers.GetValues(HttpNames.IdempotencyKeyHeaderName).FirstOrDefault();
+                ik.Should().NotBeNullOrEmpty();
+                ik.Should().NotBe(lastIdempotencyKey);
+            });
+
+        mapi.Verify();
+    }
+
+    public class EntryPoint
+    {
+        public static void ConfigureApplication(IHostApplicationBuilder builder)
+        {
+            builder.Services.AddHttpClient("UnitTest", static client =>
+            {
+                client.BaseAddress = new Uri("http://unittest");
+            })
+            .AddIdempotencyKeyHandler()
+            .AddStandardResilienceHandler(); // https://learn.microsoft.com/en-us/dotnet/core/resilience/http-resilience?tabs=dotnet-cli#standard-resilience-handler-defaults
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Json/JsonFilterTests.cs b/tests/CoreEx.Test.Unit/Json/JsonFilterTests.cs
new file mode 100644
index 00000000..688206d5
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Json/JsonFilterTests.cs
@@ -0,0 +1,649 @@
+using CoreEx.Json;
+using System.Text.Json.Nodes;
+
+namespace CoreEx.Test.Unit.Json;
+
+[TestFixture]
+public class JsonFilterTests
+{
+    [TestCase(null!, "$")]
+    [TestCase("", "$")]
+    [TestCase("foo", "$.foo")]
+    [TestCase("[0]", "$[0]")]
+    [TestCase("$.foo", "$.foo")]
+    public void PrependRootPath_Works(string input, string expected)
+    {
+        JsonFilter.PrependRootPath(input).Should().Be(expected);
+    }
+
+    [TestCase(null!, false, null!)]
+    [TestCase("", false, "")]
+    [TestCase("$.foo[0].bar[1]", true, "$.foo.bar")]
+    [TestCase("$.foo.bar", false, "$.foo.bar")]
+    [TestCase("$.entries['stackExchange.Redis'].enabled", false, "$.entries['stackExchange.Redis'].enabled")]
+    [TestCase("$.entries['stackExchange.Redis'][0].name", true, "$.entries['stackExchange.Redis'].name")]
+    [TestCase("$.entries[\"stackExchange.Redis\"]", false, "$.entries[\"stackExchange.Redis\"]")]
+    public void TryRemovePathIndexes_Works(string input, bool expectedResult, string expectedPath)
+    {
+        var result = JsonFilter.TryRemovePathIndexes(input, out var path);
+        result.Should().Be(expectedResult);
+        path.Should().Be(expectedPath);
+    }
+
+    [Test]
+    public void CreateDictionary_Include_AddsIntermediaries()
+    {
+        int maxDepth = 0;
+        var dict = JsonFilter.CreateDictionary(["$.a.b.c"], JsonFilterOption.Include, StringComparison.Ordinal, ref maxDepth);
+        dict.Should().ContainKey("$.a.b.c");
+        dict.Should().ContainKey("$.a.b");
+        dict.Should().ContainKey("$.a");
+        dict.Should().ContainKey("$");
+        dict["$.a.b.c"].Should().BeTrue();
+        dict["$.a.b"].Should().BeFalse();
+        dict["$.a"].Should().BeFalse();
+        dict["$"].Should().BeFalse();
+        maxDepth.Should().Be(4);
+    }
+
+    [Test]
+    public void CreateDictionary_Include_BracketNotation_AddsIntermediaries()
+    {
+        int maxDepth = 0;
+        var dict = JsonFilter.CreateDictionary(["$.entries['stackExchange.Redis'].enabled"], JsonFilterOption.Include, StringComparison.Ordinal, ref maxDepth);
+        dict.Should().ContainKey("$");
+        dict.Should().ContainKey("$.entries");
+        dict.Should().ContainKey("$.entries['stackExchange.Redis']");
+        dict.Should().ContainKey("$.entries['stackExchange.Redis'].enabled");
+        dict["$"].Should().BeFalse();
+        dict["$.entries"].Should().BeFalse();
+        dict["$.entries['stackExchange.Redis']"].Should().BeFalse();
+        dict["$.entries['stackExchange.Redis'].enabled"].Should().BeTrue();
+        maxDepth.Should().Be(4);
+    }
+
+    [Test]
+    public void CreateDictionary_Exclude_NoIntermediaries()
+    {
+        int maxDepth = 0;
+        var dict = JsonFilter.CreateDictionary(["$.a.b"], JsonFilterOption.Exclude, StringComparison.Ordinal, ref maxDepth);
+        dict.Should().ContainKey("$.a.b");
+        dict["$.a.b"].Should().BeTrue();
+        dict.Count.Should().Be(1);
+        maxDepth.Should().Be(3);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_RemovesOtherProperties()
+    {
+        var json = "{\"a\":1,\"b\":2,\"c\":3}";
+        var paths = new[] { "$.a", "$.c" };
+        var result = JsonFilter.TryJsonFilter(json, paths, out var filtered, JsonFilterOption.Include);
+        result.Should().BeTrue();
+        filtered.Should().Be("{\"a\":1,\"c\":3}");
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_RemovesSpecifiedProperties()
+    {
+        var json = "{\"a\":1,\"b\":2,\"c\":3}";
+        var paths = new[] { "$.b" };
+        var result = JsonFilter.TryJsonFilter(json, paths, out var filtered, JsonFilterOption.Exclude);
+        result.Should().BeTrue();
+        filtered.Should().Be("{\"a\":1,\"c\":3}");
+    }
+
+    [Test]
+    public void TryJsonFilter_NoPaths_NoChange()
+    {
+        var json = "{\"a\":1,\"b\":2}";
+        var result = JsonFilter.TryJsonFilter(json, null, out var filtered, JsonFilterOption.Include);
+        result.Should().BeFalse();
+        filtered.Should().Be("{\"a\":1,\"b\":2}");
+    }
+
+    public class TestObj { public int X { get; set; } public int Y { get; set; } }
+
+    [Test]
+    public void TryFilter_T_ReturnsFilteredJson()
+    {
+        var obj = new TestObj { X = 1, Y = 2 };
+        var result = JsonFilter.TryFilter(obj, ["$.X"], out string json, JsonFilterOption.Include);
+        result.Should().BeTrue();
+        json.Should().Be("{\"x\":1}");
+    }
+
+    [Test]
+    public void TryFilter_T_ReturnsFilteredJsonNode()
+    {
+        var obj = new TestObj { X = 1, Y = 2 };
+        var result = JsonFilter.TryFilter(obj, ["$.Y"], out JsonNode node, JsonFilterOption.Include);
+        result.Should().BeTrue();
+        var json = node.ToJsonString();
+        json.Should().Be("{\"y\":2}");
+    }
+
+    private const string _json = """
+    {
+        "Name": "John Doe",
+        "Age": 30,
+        "IsEmployed": true,
+        "Skills": ["C#", "JavaScript", "Python"],
+        "Address": {
+            "Street": "123 Main St",
+            "City": "Anytown",
+            "State": "CA"
+        },
+        "Projects": [
+            {
+                "Name": "Project A",
+                "Year": 2020,
+                "Technologies": ["C#", "ASP.NET"]
+            },
+            {
+                "Name": "Project B",
+                "Year": 2021,
+                "Technologies": ["JavaScript", "React"]
+            }
+        ]
+    }
+    """;
+
+    [Test]
+    public void TryJsonFilter_Include_Simple()
+    {
+        string exp = """
+            {
+                "Name": "John Doe",
+                "Skills": ["C#", "JavaScript", "Python"]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_json, ["name", "skills"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_NoMatches()
+    {
+        string exp = """
+            {
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_json, ["parent", "address.country", "skills[4]", "projects[3].years"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_Indexed()
+    {
+        string exp = """
+            {
+                "Skills": ["JavaScript"],
+                "Projects": [
+                    {
+                        "Name": "Project A",
+                        "Year": 2020,
+                        "Technologies": ["C#", "ASP.NET"]
+                    }
+                ]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_json, ["skills[1]", "projects[0]"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_Indexed_Indexed()
+    {
+        string exp = """
+            {
+                "Projects": [
+                    {
+                        "Technologies": ["React"]
+                    }
+                ]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_json, ["projects[1].technologies[1]"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_Indexed_Property_Indexed()
+    {
+        string exp = """
+            {
+                "Projects": [
+                    {
+                        "Year": 2020
+                    },
+                    {
+                        "Year": 2021,
+                        "Technologies": ["React"]
+                    }
+                ]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_json, ["projects.year", "projects[1].technologies[1]"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_Array()
+    {
+        string val = """
+            [
+                {
+                    "Name": "John Doe",
+                    "Age": 30
+                },
+                {
+                    "Name": "Jane Smith",
+                    "Age": 25
+                }
+            ]
+            """;
+
+        string exp = """
+            [
+                {
+                    "Name": "John Doe"
+                },
+                {
+                    "Name": "Jane Smith"
+                }
+            ]
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["name"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_Null_Value()
+    {
+        var r = JsonFilter.TryJsonFilter("null", ["age"], out string json);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson("null", json);
+    }
+
+    [Test]
+    public void TryFilter_Include_Null_Value()
+    {
+        var r = JsonFilter.TryFilter<string?>(null, ["age"], out string json);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson("null", json);
+    }
+
+    [Test]
+    public void TryFilter_Include_Int_Value()
+    {
+        // filtering a json value is non-sensical and will return as-is.
+        var r = JsonFilter.TryFilter(1, ["age"], out string json);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson("1", json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Nothing()
+    {
+        string val = """
+            {
+                "Name": "John Doe",
+                "Age": 30,
+                "IsEmployed": true
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["height"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson(val, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Simple()
+    {
+        string val = """
+            {
+                "Name": "John Doe",
+                "Age": 30,
+                "IsEmployed": true
+            }
+            """;
+
+        string exp = """
+            {
+                "Name": "John Doe",
+                "IsEmployed": true
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["age"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Simple_Array()
+    {
+        string val = """
+            {
+                "Name": "John Doe",
+                "Skills": ["C#", "JavaScript", "Python"]
+            }
+            """;
+
+        string exp = """
+            {
+                "Name": "John Doe",
+                "Skills": ["C#", "Python"]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["skills[1]"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Complex()
+    {
+        string val = """
+            {
+                "Name": "John Doe",
+                "Address": {
+                    "Street": "123 Main St",
+                    "City": "Anytown",
+                    "State": "CA"
+                }
+            }
+            """;
+
+        string exp = """
+            {
+                "Name": "John Doe",
+                "Address": {
+                    "Street": "123 Main St"
+                }
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["address.city", "address.state"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Complex_Array()
+    {
+        string val = """
+            {
+                "Name": "John Doe",
+                "Projects": [
+                    {
+                        "Name": "Project A",
+                        "Year": 2020,
+                        "Technologies": ["C#", "ASP.NET"]
+                    },
+                    {
+                        "Name": "Project B",
+                        "Year": 2021,
+                        "Technologies": ["JavaScript", "React"]
+                    }
+                ]
+            }
+            """;
+
+        string exp = """
+            {
+                "Name": "John Doe",
+                "Projects": [
+                    {
+                        "Name": "Project A",
+                        "Technologies": ["C#", "ASP.NET"]
+                    },
+                    {
+                        "Name": "Project B",
+                        "Year": 2021,
+                        "Technologies": ["JavaScript"]
+                    }
+                ]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["projects[0].year", "projects[1].technologies[1]"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Array()
+    {
+        string val = """
+            [
+                {
+                    "Name": "John Doe",
+                    "Age": 30
+                },
+                {
+                    "Name": "Jane Smith",
+                    "Age": 25
+                }
+            ]
+            """;
+
+        string exp = """
+            [
+                {
+                    "Name": "John Doe"
+                },
+                {
+                    "Name": "Jane Smith"
+                }
+            ]
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["age"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_Null_Value()
+    {
+        var r = JsonFilter.TryJsonFilter("null", ["age"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson("null", json);
+    }
+
+    [Test]
+    public void TryFilter_Exclude_Null_Value()
+    {
+        var r = JsonFilter.TryFilter<string?>(null, ["age"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson("null", json);
+    }
+
+    [Test]
+    public void TryFilter_Exclude_Int_Value()
+    {
+        var r = JsonFilter.TryFilter(1, ["age"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeFalse();
+        ObjectComparer.AssertJson("1", json);
+    }
+
+    [Test]
+    public void TryFilter_Object_Array_Object()
+    {
+        string val = """
+            {
+              "Products": [
+                {
+                  "Category": [
+                    { "A": "Accessories" },
+                    { "B": "Bikes" }
+                  ],
+                  "Other": [
+                    { "G": "Gear" }
+                  ]
+                }
+              ]
+            }
+            """;
+
+        string exp = """
+            {
+              "Products": [
+                {
+                  "Category": [
+                    { "A": "Accessories" },
+                    { "B": "Bikes" }
+                  ]
+                }
+              ]
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["products.category"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    private const string _bracketJson = """
+        {
+            "entries": {
+                "stackExchange.Redis": {
+                    "enabled": true,
+                    "resiliency": "high"
+                },
+                "inMemory": {
+                    "enabled": false
+                }
+            }
+        }
+        """;
+
+    [Test]
+    public void TryJsonFilter_Include_BracketNotation_SingleQuote()
+    {
+        string exp = """
+            {
+                "entries": {
+                    "stackExchange.Redis": {
+                        "enabled": true
+                    }
+                }
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_bracketJson, ["$.entries['stackExchange.Redis'].enabled"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_BracketNotation_DoubleQuote()
+    {
+        string exp = """
+            {
+                "entries": {
+                    "stackExchange.Redis": {
+                        "enabled": true
+                    }
+                }
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_bracketJson, ["$.entries[\"stackExchange.Redis\"].enabled"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_BracketNotation_ObjectNode()
+    {
+        string exp = """
+            {
+                "entries": {
+                    "stackExchange.Redis": {
+                        "enabled": true,
+                        "resiliency": "high"
+                    }
+                }
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_bracketJson, ["$.entries['stackExchange.Redis']"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Exclude_BracketNotation()
+    {
+        string exp = """
+            {
+                "entries": {
+                    "inMemory": {
+                        "enabled": false
+                    }
+                }
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(_bracketJson, ["$.entries['stackExchange.Redis']"], out string json, JsonFilterOption.Exclude);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void TryJsonFilter_Include_BracketNotation_WithIndex()
+    {
+        string val = """
+            {
+                "entries": {
+                    "stackExchange.Redis": {
+                        "hosts": ["host1", "host2"]
+                    },
+                    "inMemory": {
+                        "hosts": ["host3"]
+                    }
+                }
+            }
+            """;
+
+        string exp = """
+            {
+                "entries": {
+                    "stackExchange.Redis": {
+                        "hosts": ["host2"]
+                    }
+                }
+            }
+            """;
+
+        var r = JsonFilter.TryJsonFilter(val, ["$.entries['stackExchange.Redis'].hosts[1]"], out string json);
+        r.Should().BeTrue();
+        ObjectComparer.AssertJson(exp, json);
+    }
+
+    [Test]
+    public void GetMatched_BracketNotation()
+    {
+        var node = JsonNode.Parse(_bracketJson)!;
+        var matched = JsonFilter.GetMatched(node, "$.entries['stackExchange.Redis'].enabled");
+        matched.Should().NotBeNull();
+        matched!.GetValue<bool>().Should().BeTrue();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Json/JsonMergeTests.cs b/tests/CoreEx.Test.Unit/Json/JsonMergeTests.cs
new file mode 100644
index 00000000..b7e3605c
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Json/JsonMergeTests.cs
@@ -0,0 +1,327 @@
+using CoreEx.Json;
+
+namespace CoreEx.Test.Unit.Json;
+
+[TestFixture]
+public class JsonMergeTests
+{
+    #region Merge
+
+    [Test]
+    public void Merge_Root_Nulls()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""null""", """null""");
+        r.Should().Be("""null""");
+    }
+
+    [Test]
+    public void Merge_Root_Intrinsics_Are_Replacement()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""true""", """0""");
+        r.Should().Be("""true""");
+    }
+
+    [Test]
+    public void Merge_Root_Arrays_Are_Replacement()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("[1,2,3]", "[4,5,6]");
+        r.Should().Be("[1,2,3]");
+    }
+
+    [Test]
+    public void Merge_Object_No_Merge()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{}""", """{"age":10}""");
+        r.Should().Be("""{"age":10}""");
+    }
+
+    [Test]
+    public void Merge_Objects_Combine()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"weight":100}""", """{"age":10}""");
+        r.Should().Be("{\"weight\":100,\"age\":10}");
+    }
+
+    [Test]
+    public void Merge_Objects_Replace_Property()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"age":100}""", """{"weight":100,"age":10}""");
+        r.Should().Be("""{"age":100,"weight":100}""");
+    }
+
+    [Test]
+    public void Merge_Objects_Remove_Property_With_Null()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"age":null}""", """{"age":100}""");
+        r.Should().Be("""{}""");
+    }
+
+    [Test]
+    public void Merge_Objects_Nested_Mix()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"person":{"name":"bob","groovy":true}}""", """{"person":{"name":"gary","age":10}}""");
+        r.Should().Be("""{"person":{"name":"bob","groovy":true,"age":10}}""");
+    }
+
+    [Test]
+    public void Merge_Object_Nested_Array_Unmerged()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"person":{}}""", """{"person":{"names":["bob","gary"]}}""");
+        r.Should().Be("""{"person":{"names":["bob","gary"]}}""");
+    }
+
+    [Test]
+    public void Merge_Object_Nested_Array_Replace()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"person":{"names":["bob","jim"]}}""", """{"person":{"names":["bob","gary","simon"]}}""");
+        r.Should().Be("""{"person":{"names":["bob","jim"]}}""");
+    }
+
+    [Test]
+    public void Merge_Object_Nested_Object_Array_Replace()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"persons":[{"Name":"bob","age":10}]}""", """{"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""");
+        r.Should().Be("""{"persons":[{"Name":"bob","age":10}]}""");
+    }
+
+    [Test]
+    public void Merge_Object_Nested_Object_Array_Replace2()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"other":33}""", """{"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""");
+        r.Should().Be("""{"other":33,"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""");
+    }
+
+    [Test]
+    public void Merge_Object_Nested_Object_Array_Remove()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge("""{"other":33,"persons":null}""", """{"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""");
+        r.Should().Be("""{"other":33}""");
+    }
+
+    #endregion
+
+    #region TryMerge
+
+    [Test]
+    public void TryMerge_Root_Nulls()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""null""", """null""", out var r);
+        c.Should().BeFalse();
+        r.Should().BeNull();
+    }
+
+    [Test]
+    public void TryMerge_Root_Intrinsics_Are_Replacement()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""true""", """0""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""true""");
+    }
+
+    [Test]
+    public void TryMerge_Root_Arrays_Are_Replacement()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("[1,2,3]", "[4,5,6]", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("[1,2,3]");
+    }
+
+    [Test]
+    public void TryMerge_Object_No_Merge()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{}""", """{"age":10}""", out var r);
+        c.Should().BeFalse();
+        r.Should().BeNull();
+    }
+
+    [Test]
+    public void TryMerge_Objects_Combine()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"weight":100}""", """{"age":10}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("{\"weight\":100,\"age\":10}");
+    }
+
+    [Test]
+    public void TryMerge_Objects_Replace_Property()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"age":100}""", """{"weight":100,"age":10}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{"age":100,"weight":100}""");
+    }
+
+    [Test]
+    public void TryMerge_Objects_Remove_Property_With_Null()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"age":null}""", """{"age":100}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{}""");
+    }
+
+    [Test]
+    public void TryMerge_Objects_Nested_Mix()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"person":{"name":"bob","groovy":true}}""", """{"person":{"name":"gary","age":10}}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{"person":{"name":"bob","groovy":true,"age":10}}""");
+    }
+
+    [Test]
+    public void TryMerge_Object_Nested_Array_Unmerged()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"person":{}}""", """{"person":{"names":["bob","gary"]}}""", out var r);
+        c.Should().BeFalse();
+        r.Should().BeNull();
+    }
+
+    [Test]
+    public void TryMerge_Object_Nested_Array_Replace()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"person":{"names":["bob","jim"]}}""", """{"person":{"names":["bob","gary","simon"]}}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{"person":{"names":["bob","jim"]}}""");
+    }
+
+    [Test]
+    public void TryMerge_Object_Nested_Object_Array_Replace()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"persons":[{"Name":"bob","age":10}]}""", """{"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{"persons":[{"Name":"bob","age":10}]}""");
+    }
+
+    [Test]
+    public void TryMerge_Object_Nested_Object_Array_Replace2()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"other":33}""", """{"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{"other":33,"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""");
+    }
+
+    [Test]
+    public void TryMerge_Object_Nested_Object_Array_Remove()
+    {
+        var p = new JsonMergePatch();
+        var c = p.TryMerge("""{"other":33,"persons":null}""", """{"persons":[{"Name":"simon","age":10},{"Name":"jack","age":30}]}""", out var r);
+        c.Should().BeTrue();
+        r.Should().Be("""{"other":33}""");
+    }
+
+    #endregion
+
+    [Test]
+    public void Merge_Into_Null()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge<Person>("""{"name":"bob","age":30}""", null!);
+        r.Should().NotBeNull();
+        r.IsSuccess.Should().BeTrue();
+        r.Value.HasChanges.Should().BeFalse();
+        r.Value.Merged.Should().BeNull();
+    }
+
+    [Test]
+    public void Merge_Into_Value_Type_Mismatch()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge<Person>("""{"name":"bob","age":"thirty"}""", null!);
+        r.Should().NotBeNull();
+        r.IsFailure.Should().BeTrue();
+        r.Error.Should().NotBeNull();
+    }
+
+    [Test]
+    public void Merge_Into_Value_With_Changes()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge<Person>("""{"name":"bob","age":30}""", new Person { Name = "Jerry", Address = new Address { Street = "Main" } });
+        r.Should().NotBeNull();
+        r.IsSuccess.Should().BeTrue();
+        r.Value.HasChanges.Should().BeTrue();
+        ObjectComparer.Assert(new Person { Name = "bob", Age = 30, Address = new Address { Street = "Main" } }, r.Value.Merged);
+    }
+
+    [Test]
+    public void Merge_Into_Value_Changes_Unchanged()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge<Person>("""{"x-name":"bob","x-age":30}""", new Person { Name = "Jerry", Address = new Address { Street = "Main" } });
+        r.Should().NotBeNull();
+        r.IsSuccess.Should().BeTrue();
+        r.Value.HasChanges.Should().BeTrue();  // Is true as the underlying JSON was modified; although did not result in change to value itself as 'x-' fields were ignored during final deserializtion.
+        ObjectComparer.Assert(new Person { Name = "Jerry", Address = new Address { Street = "Main" } }, r.Value.Merged);
+    }
+
+    [Test]
+    public void Merge_Into_Value_Unchained_Unchanged()
+    {
+        var p = new JsonMergePatch();
+        var r = p.Merge<Person>("""{"name":"Jerry"}""", new Person { Name = "Jerry", Address = new Address { Street = "Main" } });
+        r.Should().NotBeNull();
+        r.IsSuccess.Should().BeTrue();
+        r.Value.HasChanges.Should().BeFalse();
+        ObjectComparer.Assert(new Person { Name = "Jerry", Address = new Address { Street = "Main" } }, r.Value.Merged);
+    }
+
+    [Test]
+    public async Task MergeAsync_Changed()
+    {
+        var p = new JsonMergePatch();
+        var r = await p.MergeAsync<Person>(new BinaryData("""{"name":"bob","age":30}"""), _ => Task.FromResult<Person?>(new Person()));
+        r.Should().NotBeNull();
+        r.IsSuccess.Should().BeTrue();
+        r.Value.HasChanges.Should().BeTrue();
+        ObjectComparer.Assert(new Person { Name = "bob", Age = 30 }, r.Value.Merged);
+    }
+
+    [Test]
+    public async Task MergeAsync_Get_Null()
+    {
+        var p = new JsonMergePatch();
+        var r = await p.MergeAsync<Person>(new BinaryData("""{"name":"bob","age":30}"""), _ => Task.FromResult<Person?>(null));
+        r.Should().NotBeNull();
+        r.IsSuccess.Should().BeTrue();
+        r.Value.HasChanges.Should().BeFalse();
+        r.Value.Merged.Should().BeNull();
+    }
+
+    public class Person
+    {
+        public string? Name { get; set; }
+        public int Age { get; set; }
+        public string[]? NickNames { get; set; }
+        public Address? Address { get; set; }
+        public List<Person>? Children { get; set; }
+    }
+
+    public class Address
+    {
+        public string? Street { get; set; }
+        public string? City { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Json/JsonSubstituteNamingPolicyTests.cs b/tests/CoreEx.Test.Unit/Json/JsonSubstituteNamingPolicyTests.cs
new file mode 100644
index 00000000..69a68fed
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Json/JsonSubstituteNamingPolicyTests.cs
@@ -0,0 +1,28 @@
+using CoreEx.Entities;
+using CoreEx.Json;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CoreEx.Test.Unit.Json;
+
+[TestFixture]
+public class JsonSubstituteNamingPolicyTests
+{
+    [Test]
+    public void Default_Test()
+    {
+        var p = new Person { Id = "abc", Age = 55, ETag = "xyz" };
+        var json = JsonSerializer.Serialize(p, JsonDefaults.SerializerOptions);
+        json.Should().Be("""{"id":"abc","years":55,"etag":"xyz"}""");
+    }
+
+    private class Person : IIdentifier<string?>, IReadOnlyETag
+    {
+        public string? Id { get; set; }
+
+        [JsonPropertyName("years")]
+        public int Age { get; set; }
+
+        public string? ETag { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Localization/LTextTests.cs b/tests/CoreEx.Test.Unit/Localization/LTextTests.cs
new file mode 100644
index 00000000..1a02e1aa
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Localization/LTextTests.cs
@@ -0,0 +1,153 @@
+using CoreEx.Localization;
+
+namespace CoreEx.Test.Unit.Localization;
+
+[TestFixture]
+public class LTextTests
+{
+    [Test]
+    public void Empty_Static_IsEmpty()
+    {
+        LText.Empty.IsEmpty.Should().BeTrue();
+        LText.Empty.KeyAndOrText.Should().BeNull();
+        LText.Empty.FallbackText.Should().BeNull();
+        LText.Empty.Args.Should().BeNull();
+    }
+
+    [Test]
+    public void Constructor_KeyOnly()
+    {
+        var ltext = new LText("key1");
+        ltext.KeyAndOrText.Should().Be("key1");
+        ltext.FallbackText.Should().BeNull();
+        ltext.Args.Should().BeNull();
+        ltext.IsEmpty.Should().BeFalse();
+        ltext.WasFallBackTextSetToNull.Should().BeFalse();
+    }
+
+    [Test]
+    public void Constructor_KeyFallbackArgs()
+    {
+        var ltext = new LText("key2", "fallback", 1, "x");
+        ltext.KeyAndOrText.Should().Be("key2");
+        ltext.FallbackText.Should().Be("fallback");
+        ltext.Args.Should().BeEquivalentTo(new object?[] { 1, "x" });
+        ltext.IsEmpty.Should().BeFalse();
+        ltext.WasFallBackTextSetToNull.Should().BeFalse();
+    }
+
+    [Test]
+    public void Constructor_KeyNullFallbackNull_SetsWasFallbackTextSetToNull()
+    {
+        var ltext = new LText("key3", null, 5);
+        ltext.KeyAndOrText.Should().Be("key3");
+        ltext.FallbackText.Should().BeNull();
+        ltext.Args.Should().BeEquivalentTo(new object?[] { 5 });
+        ltext.WasFallBackTextSetToNull.Should().BeTrue();
+    }
+
+    [Test]
+    public void WithArgs_AppendsArgs()
+    {
+        var ltext = new LText("k", "f", 1);
+        var ltext2 = ltext.WithArgs(2, 3);
+        ltext2.KeyAndOrText.Should().Be("k");
+        ltext2.FallbackText.Should().Be("f");
+        ltext2.Args.Should().BeEquivalentTo(new object?[] { 1, 2, 3 });
+        ltext2.WasFallBackTextSetToNull.Should().BeFalse();
+    }
+
+    [Test]
+    public void WithArgs_NullOrEmpty_ReturnsSelf()
+    {
+        var ltext = new LText("k", "f", 1);
+        ltext.WithArgs().Should().Be(ltext);
+        ltext.WithArgs(null!).Should().Be(ltext);
+    }
+
+    [Test]
+    public void EnsureNoArgs_NoArgs_ReturnsSelf()
+    {
+        var ltext = new LText("k");
+        ltext.EnsureNoArgs().Should().Be(ltext);
+    }
+
+    [Test]
+    public void EnsureNoArgs_WithArgs_Throws()
+    {
+        var ltext = new LText("k", "f", 1);
+        Action act = () => ltext.EnsureNoArgs();
+        act.Should().Throw<InvalidOperationException>();
+    }
+
+    [Test]
+    public void ToString_UsesTextProvider()
+    {
+        var ltext = new LText("key4", "fallback4");
+        var str = ltext.ToString();
+        str.Should().Be(TextProvider.Current.GetText(ltext));
+    }
+
+    [Test]
+    public void ToString_FormatArgs()
+    {
+        var ltext = new LText("x={0},y={1}").WithArgs(1, "a");
+        var str = ltext.ToString();
+        str.Should().Be("x=1,y=a");
+    }
+
+    [Test]
+    public void ImplicitCast_LTextToString()
+    {
+        var ltext = new LText("key5", "fallback5");
+        string? str = ltext;
+        str.Should().Be(TextProvider.Current.GetText(ltext));
+    }
+
+    [Test]
+    public void ImplicitCast_NullableLTextToString()
+    {
+        LText? ltext = null;
+        string? str = ltext;
+        str.Should().BeNull();
+    }
+
+    [Test]
+    public void ImplicitCast_StringToLText()
+    {
+        LText ltext = "abc";
+        ltext.KeyAndOrText.Should().Be("abc");
+        ltext.FallbackText.Should().BeNull();
+    }
+
+    [Test]
+    public void Equals_And_Operators()
+    {
+        var l1 = new LText("k", "f", 1);
+        var l2 = new LText("k", "f", 1);
+        var l3 = new LText("k", "f", 2);
+        l1.Equals(l2).Should().BeTrue();
+        l1.Equals((object)l2).Should().BeTrue();
+        (l1 == l2).Should().BeTrue();
+        (l1 != l2).Should().BeFalse();
+        l1.Equals(l3).Should().BeFalse();
+        (l1 == l3).Should().BeFalse();
+        (l1 != l3).Should().BeTrue();
+    }
+
+    [Test]
+    public void GetHashCode_EqualObjects_SameHash()
+    {
+        var l1 = new LText("k", "f", 1);
+        var l2 = new LText("k", "f", 1);
+        l1.GetHashCode().Should().Be(l2.GetHashCode());
+    }
+
+    [Test]
+    public void GetHashCode_DifferentObjects_DifferentHash()
+    {
+        var l1 = new LText("k", "f", 1);
+        var l2 = new LText("k", "f", 2);
+        l1.GetHashCode().Should().NotBe(l2.GetHashCode());
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Localization/TextProviderTests.cs b/tests/CoreEx.Test.Unit/Localization/TextProviderTests.cs
new file mode 100644
index 00000000..aafbd4c1
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Localization/TextProviderTests.cs
@@ -0,0 +1,84 @@
+using System.Globalization;
+using CoreEx.Localization;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace CoreEx.Test.Unit.Localization;
+
+[TestFixture]
+public class TextProviderTests
+{
+    private class TestTextProvider : ITextProvider
+    {
+        public string? GetText(LText text) => $"[{text.KeyAndOrText}]";
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        // Reset to default before each test to avoid side effects.
+        TextProvider.SetTextProvider(null);
+        ExecutionContext.Reset();
+    }
+
+    [Test]
+    public void SetTextProvider_And_Current()
+    {
+        var tp = new TestTextProvider();
+        TextProvider.SetTextProvider(tp);
+        TextProvider.Current.Should().BeSameAs(tp);
+    }
+
+    [Test]
+    public void Current_FallsBackToNullTextProvider()
+    {
+        TextProvider.SetTextProvider(null);
+        var current = TextProvider.Current;
+        current.Should().NotBeNull();
+        current.GetType().Name.Should().Be("NullTextProvider");
+    }
+
+    [Test]
+    public void Current_UsesExecutionContextService()
+    {
+        var tp = new TestTextProvider();
+        var sc = new ServiceCollection();
+        sc.AddSingleton<ITextProvider>(tp);
+        using var sp = sc.BuildServiceProvider();
+
+        ExecutionContext.Reset();
+        ExecutionContext.SetCurrent(new ExecutionContext { ServiceProvider = sp });
+        TextProvider.Current.Should().BeSameAs(tp);    
+    }
+
+    [Test]
+    public void GetUICulture_ReturnsCurrentUICulture()
+    {
+        var culture = TextProvider.GetUICulture();
+        culture.Should().Be(CultureInfo.CurrentUICulture);
+    }
+
+    [Test]
+    public void Format_NullFormat_ReturnsNull()
+    {
+        TextProvider.Format(null, [1]).Should().BeNull();
+    }
+
+    [Test]
+    public void Format_NullArgs_ReturnsFormat()
+    {
+        TextProvider.Format("abc", null).Should().Be("abc");
+    }
+
+    [Test]
+    public void Format_EmptyArgs_ReturnsFormat()
+    {
+        TextProvider.Format("abc", []).Should().Be("abc");
+    }
+
+    [Test]
+    public void Format_WithArgs_FormatsString()
+    {
+        var result = TextProvider.Format("x={0},y={1}", [1, "a"]);
+        result.Should().Be($"x=1,y=a");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Mapping/Converters/StringToBase64ConverterTests.cs b/tests/CoreEx.Test.Unit/Mapping/Converters/StringToBase64ConverterTests.cs
new file mode 100644
index 00000000..0c968a53
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Mapping/Converters/StringToBase64ConverterTests.cs
@@ -0,0 +1,59 @@
+using CoreEx.Mapping.Converters;
+
+namespace CoreEx.Test.Unit.Mapping.Converters;
+
+[TestFixture]
+public class StringToBase64ConverterTests
+{
+    private readonly StringBase64Converter _converter = StringBase64Converter.Default;
+
+    [Test]
+    public void ConvertToDestination_ValidBase64String_ReturnsBytes()
+    {
+        var text = "Hello, World!";
+        var base64 = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(text));
+        var result = _converter.ConvertToDestination(base64);
+
+        result.Should().NotBeNull();
+        System.Text.Encoding.UTF8.GetString(result!).Should().Be(text);
+    }
+
+    [Test]
+    public void ConvertToDestination_Null_ReturnsNull()
+    {
+        _converter.ConvertToDestination((string?)null).Should().BeNull();
+    }
+
+    [Test]
+    public void ConvertToSource_ValidBytes_ReturnsBase64String()
+    {
+        var bytes = System.Text.Encoding.UTF8.GetBytes("Test123");
+        var result = _converter.ConvertToSource(bytes);
+
+        result.Should().Be(Convert.ToBase64String(bytes));
+    }
+
+    [Test]
+    public void ConvertToSource_Null_ReturnsNull()
+    {
+        _converter.ConvertToSource((byte[]?)null).Should().BeNull();
+    }
+
+    [Test]
+    public void RoundTrip_StringToBytesAndBack()
+    {
+        var original = "RoundTrip!";
+        var base64 = Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(original));
+        var bytes = _converter.ConvertToDestination(base64);
+        var roundTrip = _converter.ConvertToSource(bytes);
+
+        roundTrip.Should().Be(base64);
+    }
+
+    [Test]
+    public void ConvertToDestination_InvalidBase64_ThrowsFormatException()
+    {
+        Action act = () => _converter.ConvertToDestination("not_base64!");
+        act.Should().Throw<FormatException>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Mapping/MapTests.cs b/tests/CoreEx.Test.Unit/Mapping/MapTests.cs
new file mode 100644
index 00000000..c2192af4
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Mapping/MapTests.cs
@@ -0,0 +1,124 @@
+using CoreEx.Data;
+using CoreEx.Entities;
+using CoreEx.Mapping;
+
+namespace CoreEx.Test.Unit.Mapping;
+
+public class MapTests
+{
+    private class Source : IReadOnlyIdentifier<int>, IReadOnlyETag, IReadOnlyTenantId, IReadOnlyLogicallyDeleted, IReadOnlyTypeDiscriminator, IReadOnlyPartitionKey, IReadOnlyChangeLogEx
+    {
+        public int Id { get; init; }
+        public string? ETag { get; init; }
+        public string? TenantId { get; init; }
+        public bool IsDeleted { get; init; }
+        public string? TypeDiscriminator { get; init; }
+        public string? PartitionKey { get; init; }
+        public string? CreatedBy { get; init; }
+        public DateTimeOffset? CreatedOn { get; init; }
+        public string? UpdatedBy { get; init; }
+        public DateTimeOffset? UpdatedOn { get; init; }
+    }
+
+    private class Source2 : IReadOnlyIdentifier<int>, IReadOnlyETag, IReadOnlyTenantId, IReadOnlyLogicallyDeleted, IReadOnlyTypeDiscriminator, IReadOnlyPartitionKey, IReadOnlyChangeLog
+    {
+        public int Id { get; init; }
+        public string? ETag { get; init; }
+        public string? TenantId { get; init; }
+        public bool IsDeleted { get; init; }
+        public string? TypeDiscriminator { get; init; }
+        public string? PartitionKey { get; init; }
+        public ChangeLog? ChangeLog { get; init; }
+    }
+
+    private class Destination : IIdentifier<int>, IETag, ITenantId, ILogicallyDeleted, ITypeDiscriminator, IPartitionKey, IChangeLogEx
+    {
+        public int Id { get; set; }
+        public string? ETag { get; set; }
+        public string? TenantId { get; set; }
+        public bool IsDeleted { get; set; }
+        public string? TypeDiscriminator { get; set; }
+        public string? PartitionKey { get; set; }
+        public string? CreatedBy { get; set; }
+        public DateTimeOffset? CreatedOn { get; set; }
+        public string? UpdatedBy { get; set; }
+        public DateTimeOffset? UpdatedOn { get; set; }
+    }
+
+    private class Destination2 : IIdentifier<int>, IETag, ITenantId, ILogicallyDeleted, ITypeDiscriminator, IPartitionKey, IChangeLog
+    {
+        public int Id { get; set; }
+        public Type IdType => typeof(int);
+        public string? ETag { get; set; }
+        public string? TenantId { get; set; }
+        public bool IsDeleted { get; set; }
+        public string? TypeDiscriminator { get; set; }
+        public string? PartitionKey { get; set; }
+        public ChangeLog? ChangeLog { get; set; }
+    }
+
+    [Test]
+    public void Standard_MapsAllStandardProperties()
+    {
+        var src = new Source
+        {
+            Id = 123,
+            ETag = "etag",
+            TenantId = "tenant",
+            IsDeleted = true,
+            TypeDiscriminator = "type",
+            PartitionKey = "pk",
+            CreatedBy = "cb",
+            CreatedOn = DateTimeOffset.UtcNow.AddDays(-1),
+            UpdatedBy = "ub",
+            UpdatedOn = DateTimeOffset.UtcNow
+        };
+
+        var dest = new Destination();
+        Mapper.MapStandardInto(src, dest);
+
+        dest.Id.Should().Be(123);
+        dest.ETag.Should().Be("etag");
+        dest.TenantId.Should().Be("tenant");
+        dest.IsDeleted.Should().BeTrue();
+        dest.TypeDiscriminator.Should().Be("type");
+        dest.PartitionKey.Should().Be("pk");
+        dest.CreatedBy.Should().Be("cb");
+        dest.CreatedOn.Should().Be(src.CreatedOn);
+        dest.UpdatedBy.Should().Be("ub");
+        dest.UpdatedOn.Should().Be(src.UpdatedOn);
+    }
+
+    [Test]
+    public void Standard_MapsAllStandardProperties2()
+    {
+        var src = new Source
+        {
+            Id = 123,
+            ETag = "etag",
+            TenantId = "tenant",
+            IsDeleted = true,
+            TypeDiscriminator = "type",
+            PartitionKey = "pk",
+            CreatedBy = "cb",
+            CreatedOn = DateTimeOffset.UtcNow.AddDays(-1),
+            UpdatedBy = "ub",
+            UpdatedOn = DateTimeOffset.UtcNow
+        };
+
+        var dest = new Destination2();
+        Mapper.MapStandardInto(src, dest);
+
+        dest.Id.Should().Be(123);
+        dest.ETag.Should().Be("etag");
+        dest.TenantId.Should().Be("tenant");
+        dest.IsDeleted.Should().BeTrue();
+        dest.TypeDiscriminator.Should().Be("type");
+        dest.PartitionKey.Should().Be("pk");
+        dest.ChangeLog.Should().NotBeNull();
+        dest.ChangeLog.CreatedBy.Should().Be("cb");
+        dest.ChangeLog.CreatedOn.Should().Be(src.CreatedOn);
+        dest.ChangeLog.UpdatedBy.Should().Be("ub");
+        dest.ChangeLog.UpdatedOn.Should().Be(src.UpdatedOn);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Mapping/MapperTests.cs b/tests/CoreEx.Test.Unit/Mapping/MapperTests.cs
new file mode 100644
index 00000000..ac1ae917
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Mapping/MapperTests.cs
@@ -0,0 +1,41 @@
+using CoreEx.Mapping;
+
+namespace CoreEx.Test.Unit.Mapping;
+
+public class MapperTests
+{
+    private class Source { public int Value { get; set; } }
+    private class Destination { public int Value { get; set; } }
+
+    private class TestMapper : Mapper<Source, Destination>
+    {
+        protected override Destination OnMap(Source source) => new()
+        {
+            Value = source.Value
+        };
+    }
+
+    [Test]
+    public void SourceType_And_DestinationType_AreCorrect()
+    {
+        var mapper = new TestMapper();
+        ((IMapperBase)mapper).SourceType.Should().Be<Source>();
+        ((IMapperBase)mapper).DestinationType.Should().Be<Destination>();
+    }
+
+    [Test]
+    public void Map_NullSource_EqualsNull()
+    {
+        var mapper = new TestMapper();
+        mapper.Map(null).Should().BeNull();
+    }
+
+    [Test]
+    public void Map_MapsValue()
+    {
+        var mapper = new TestMapper();
+        var src = new Source { Value = 42 };
+        var dest = mapper.Map(src);
+        dest.Value.Should().Be(42);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ExtensionsAnyTests.cs b/tests/CoreEx.Test.Unit/Results/ExtensionsAnyTests.cs
new file mode 100644
index 00000000..2f6105ba
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ExtensionsAnyTests.cs
@@ -0,0 +1,416 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ExtensionsAnyTests
+{
+    [Test]
+    public void Result_Any_Action_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = result.Any(() => called = true);
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_Any_Action_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = result.Any(() => called = true);
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_Any_FuncResult_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = result.Any(() => { called = true; return Result.Success; });
+        called.Should().BeTrue();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_Any_FuncResult_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = result.Any(() => { called = true; return Result.Success; });
+        called.Should().BeTrue();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_Any_ActionT_Success()
+    {
+        int? value = null;
+        var result = new Result<int>(42);
+        var ret = result.Any(i => value = i);
+        value.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_Any_ActionT_Failure()
+    {
+        int? value = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Any(i => value = i);
+        value.Should().Be(0); // default(int)
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_Any_FuncT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = result.Any(i => i * 2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public void ResultT_Any_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Any(i => i * 2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(0); // default(int)
+    }
+
+    [Test]
+    public void ResultT_Any_FuncResultT_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.Any(i => new Result<int>(i + 1));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(6);
+    }
+
+    [Test]
+    public void ResultT_Any_FuncResultT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Any(i => new Result<int>(i + 1));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(1); // default(int) + 1
+    }
+
+    [Test]
+    public void Result_AnyAsT_FuncT_Success()
+    {
+        var result = new Result();
+        var ret = result.AnyAs(() => 123);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Result_AnyAsT_FuncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.AnyAs(() => 123);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Result_AnyAsT_FuncResultT_Success()
+    {
+        var result = new Result();
+        var ret = result.AnyAs(() => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void Result_AnyAsT_FuncResultT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.AnyAs(() => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void ResultT_AnyAs_ActionT_Success()
+    {
+        int? captured = null;
+        var result = new Result<int>(42);
+        var ret = result.AnyAs(i => captured = i);
+        captured.Should().Be(42);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_AnyAs_ActionT_Failure()
+    {
+        int? captured = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.AnyAs(i => captured = i);
+        captured.Should().Be(0); // default(int)
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_AnyAs_FuncTResult_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.AnyAs(i => new Result());
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_AnyAs_FuncTResult_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.AnyAs(i => new Result());
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_AnyAs_FuncTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.AnyAs<int, string>(i => (i * 2).ToString());
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public void ResultT_AnyAs_FuncTU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.AnyAs<int, string>(i => (i * 2).ToString());
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("0");
+    }
+
+    [Test]
+    public void ResultT_AnyAs_FuncTResultU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.AnyAs<int, string>(i => new Result<string>((i * 2).ToString()));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public void ResultT_AnyAs_FuncTResultU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.AnyAs<int, string>(i => new Result<string>((i * 2).ToString()));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("0");
+    }
+
+    // --- ASYNC ---
+
+    [Test]
+    public async Task Result_AnyAsync_Action_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = await result.AsTask().Any(async () => { called = true; await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_AnyAsync_Action_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = await result.AsTask().Any(async () => { called = true; await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_AnyAsync_FuncResult_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = await result.AsTask().AnyAsync(async () => { called = true; await Task.Yield(); return Result.Success; });
+        called.Should().BeTrue();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_AnyAsync_FuncResult_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsync(async () => { called = true; await Task.Yield(); return Result.Success; });
+        called.Should().BeTrue();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsync_ActionT_Success()
+    {
+        int? value = null;
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().Any(async i => { value = i; await Task.Yield(); });
+        value.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsync_ActionT_Failure()
+    {
+        int? value = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().Any(async i => { value = i; await Task.Yield(); });
+        value.Should().Be(0);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsync_FuncT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = await result.AsTask().Any(i => { return i * 2; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsync_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().Any(i => { return i * 2; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(0);
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsync_FuncResultT_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().Any(i => { return new Result<int>(i + 1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(6);
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsync_FuncResultT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().Any(i => { return new Result<int>(i + 1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(1);
+    }
+
+    [Test]
+    public async Task Result_AnyAsAsyncT_FuncT_Success()
+    {
+        var result = new Result();
+        var ret = await result.AsTask().AnyAsAsync(async () => { await Task.Yield(); return 123; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_AnyAsAsyncT_FuncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsAsync(async () => { await Task.Yield(); return 123; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_AnyAsAsyncT_FuncResultT_Success()
+    {
+        var result = new Result();
+        var ret = await result.AsTask().AnyAsAsync(async () => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public async Task Result_AnyAsAsyncT_FuncResultT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsAsync(async () => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_ActionT_Success()
+    {
+        int? captured = null;
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().AnyAsAsync(async i => { captured = i; await Task.Yield(); });
+        captured.Should().Be(42);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_ActionT_Failure()
+    {
+        int? captured = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsAsync(async i => { captured = i; await Task.Yield(); });
+        captured.Should().Be(0);
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_FuncTResult_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().AnyAsAsync(async i => { await Task.Yield(); return new Result(); });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_FuncTResult_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsAsync(async i => { await Task.Yield(); return new Result(); });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_FuncTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().AnyAsAsync<int, string>(async i => { await Task.Yield(); return (i * 2).ToString(); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_FuncTU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsAsync<int, string>(async i => { await Task.Yield(); return (i * 2).ToString(); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("0");
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_FuncTResultU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().AnyAsAsync<int, string>(async i => { await Task.Yield(); return new Result<string>((i * 2).ToString()); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public async Task ResultT_AnyAsAsync_FuncTResultU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().AnyAsAsync<int, string>(async i => { await Task.Yield(); return new Result<string>((i * 2).ToString()); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("0");
+    }
+}
diff --git a/tests/CoreEx.Test.Unit/Results/ExtensionsMatchTests.cs b/tests/CoreEx.Test.Unit/Results/ExtensionsMatchTests.cs
new file mode 100644
index 00000000..86fed2cd
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ExtensionsMatchTests.cs
@@ -0,0 +1,489 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ExtensionsMatchTests
+{
+    [Test]
+    public void Result_Match_Action_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = result.Match(() => okCalled = true, e => failCalled = true);
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_Match_Action_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = result.Match(() => okCalled = true, e => { failCalled = true; e.Should().Be(ex); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_Match_Func_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = result.Match(
+            () => { okCalled = true; return Result.Success; },
+            e => { failCalled = true; return Result.Fail(e); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_Match_Func_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = result.Match(
+            () => { okCalled = true; return Result.Success; },
+            e => { failCalled = true; e.Should().Be(ex); return Result.Fail(e); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Result_MatchAsT_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = result.MatchAs(
+            () => { okCalled = true; return Result<int>.Ok(123); },
+            e => { failCalled = true; return Result<int>.Fail(e); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Result_MatchAsT_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = result.MatchAs(
+            () => { okCalled = true; return Result<int>.Ok(123); },
+            e => { failCalled = true; e.Should().Be(ex); return Result<int>.Fail(e); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void ResultT_Match_ActionT_Success()
+    {
+        int? okValue = null;
+        Exception? failEx = null;
+        var result = new Result<int>(42);
+        var ret = result.Match(i => okValue = i, e => failEx = e);
+        okValue.Should().Be(42);
+        failEx.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_Match_ActionT_Failure()
+    {
+        int? okValue = null;
+        Exception? failEx = null;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.Match(i => okValue = i, e => failEx = e);
+        okValue.Should().BeNull();
+        failEx.Should().Be(ex);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_Match_FuncT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = result.Match(
+            i => new Result<int>(i * 2),
+            e => new Result<int>(-1));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public void ResultT_Match_FuncT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.Match(
+            i => new Result<int>(i * 2),
+            e => { e.Should().Be(ex); return new Result<int>(-1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(-1);
+    }
+
+    [Test]
+    public void ResultT_MatchAsTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.MatchAs<int, string>(
+            i => new Result<string>((i * 2).ToString()),
+            e => new Result<string>("fail"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public void ResultT_MatchAsTU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.MatchAs<int, string>(
+            i => new Result<string>((i * 2).ToString()),
+            e => { e.Should().Be(ex); return new Result<string>("fail"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("fail");
+    }
+
+    // --- ASYNC ---
+
+    [Test]
+    public async Task Result_MatchAsync_Action_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = await result.AsTask().Match(() => okCalled = true, e => failCalled = true);
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_MatchAsync_Action_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = await result.AsTask().Match(() => okCalled = true, e => { failCalled = true; e.Should().Be(ex); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_MatchAsync_Func_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = await result.AsTask().Match(
+            () => { okCalled = true; return Result.Success; },
+            e => { failCalled = true; return Result.Fail(e); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_MatchAsync_Func_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = await result.AsTask().Match(
+            () => { okCalled = true; return Result.Success; },
+            e => { failCalled = true; e.Should().Be(ex); return Result.Fail(e); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task Result_MatchAsAsyncT_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = await result.AsTask().MatchAs(
+            () => { okCalled = true; return Result<int>.Ok(123); },
+            e => { failCalled = true; return Result<int>.Fail(e); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_MatchAsAsyncT_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = await result.AsTask().MatchAs(
+            () => { okCalled = true; return Result<int>.Ok(123); },
+            e => { failCalled = true; e.Should().Be(ex); return Result<int>.Fail(e); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsync_ActionT_Success()
+    {
+        int? okValue = null;
+        Exception? failEx = null;
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().Match(i => okValue = i, e => failEx = e);
+        okValue.Should().Be(42);
+        failEx.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsync_ActionT_Failure()
+    {
+        int? okValue = null;
+        Exception? failEx = null;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().Match(i => okValue = i, e => failEx = e);
+        okValue.Should().BeNull();
+        failEx.Should().Be(ex);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsync_FuncT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = await result.AsTask().Match(
+            i => new Result<int>(i * 2),
+            e => new Result<int>(-1));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsync_FuncT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().Match(
+            i => new Result<int>(i * 2),
+            e => { e.Should().Be(ex); return new Result<int>(-1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(-1);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsAsyncTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().MatchAs<int, string>(
+            i => new Result<string>((i * 2).ToString()),
+            e => new Result<string>("fail"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsAsyncTU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().MatchAs<int, string>(
+            i => new Result<string>((i * 2).ToString()),
+            e => { e.Should().Be(ex); return new Result<string>("fail"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("fail");
+    }
+
+    // --- AsyncFunc ---
+
+    [Test]
+    public async Task Result_MatchAsyncFunc_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = await result.MatchAsync(
+            async () => { okCalled = true; await Task.Yield(); },
+            async e => { failCalled = true; await Task.Yield(); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_MatchAsyncFunc_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = await result.MatchAsync(
+            async () => { okCalled = true; await Task.Yield(); },
+            async e => { failCalled = true; e.Should().Be(ex); await Task.Yield(); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_MatchAsyncFuncResult_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = await result.MatchAsync(
+            async () => { okCalled = true; await Task.Yield(); return Result.Success; },
+            async e => { failCalled = true; await Task.Yield(); return Result.Fail(e); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_MatchAsyncFuncResult_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = await result.MatchAsync(
+            async () => { okCalled = true; await Task.Yield(); return Result.Success; },
+            async e => { failCalled = true; e.Should().Be(ex); await Task.Yield(); return Result.Fail(e); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task Result_MatchAsAsyncFuncT_Success()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var result = new Result();
+        var ret = await result.MatchAsAsync(
+            async () => { okCalled = true; await Task.Yield(); return Result<int>.Ok(123); },
+            async e => { failCalled = true; await Task.Yield(); return Result<int>.Fail(e); });
+        okCalled.Should().BeTrue();
+        failCalled.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_MatchAsAsyncFuncT_Failure()
+    {
+        var okCalled = false;
+        var failCalled = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = await result.MatchAsAsync(
+            async () => { okCalled = true; await Task.Yield(); return Result<int>.Ok(123); },
+            async e => { failCalled = true; e.Should().Be(ex); await Task.Yield(); return Result<int>.Fail(e); });
+        okCalled.Should().BeFalse();
+        failCalled.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsyncFuncT_Success()
+    {
+        int? okValue = null;
+        Exception? failEx = null;
+        var result = new Result<int>(42);
+        var ret = await result.MatchAsync(
+            async i => { okValue = i; await Task.Yield(); },
+            async e => { failEx = e; await Task.Yield(); });
+        okValue.Should().Be(42);
+        failEx.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsyncFuncT_Failure()
+    {
+        int? okValue = null;
+        Exception? failEx = null;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.MatchAsync(
+            async i => { okValue = i; await Task.Yield(); },
+            async e => { failEx = e; await Task.Yield(); });
+        okValue.Should().BeNull();
+        failEx.Should().Be(ex);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsyncFuncResultT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = await result.MatchAsync(
+            async i => { await Task.Yield(); return new Result<int>(i * 2); },
+            async e => { await Task.Yield(); return new Result<int>(-1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsyncFuncResultT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.MatchAsync(
+            async i => { await Task.Yield(); return new Result<int>(i * 2); },
+            async e => { e.Should().Be(ex); await Task.Yield(); return new Result<int>(-1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(-1);
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsAsyncFuncTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.MatchAsAsync<int, string>(
+            async i => { await Task.Yield(); return new Result<string>((i * 2).ToString()); },
+            async e => { await Task.Yield(); return new Result<string>("fail"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public async Task ResultT_MatchAsAsyncFuncTU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.MatchAsAsync<int, string>(
+            async i => { await Task.Yield(); return new Result<string>((i * 2).ToString()); },
+            async e => { e.Should().Be(ex); await Task.Yield(); return new Result<string>("fail"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("fail");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ExtensionsOnFailureTests.cs b/tests/CoreEx.Test.Unit/Results/ExtensionsOnFailureTests.cs
new file mode 100644
index 00000000..43218e6a
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ExtensionsOnFailureTests.cs
@@ -0,0 +1,419 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ExtensionsOnFailureTests
+{
+    [Test]
+    public void Result_OnFailure_Action_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = result.OnFailure(e => called = true);
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_OnFailure_Action_Failure()
+    {
+        var called = false;
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = result.OnFailure(e => { called = true; e.Error.Should().Be(ex); });
+        called.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_OnFailure_Func_Success()
+    {
+        var result = new Result();
+        var ret = result.OnFailure(_ => Result.Fail(new Exception("fail2")));
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_OnFailure_Func_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.OnFailure(_ => Result.Success);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_OnFailure_Action_Success()
+    {
+        var called = false;
+        var result = new Result<int>(42);
+        var ret = result.OnFailure(e => called = true);
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_OnFailure_Action_Failure()
+    {
+        var called = false;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailure(e => { called = true; e.Error.Should().Be(ex); });
+        called.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_OnFailure_FuncT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.OnFailure(e => 99);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_OnFailure_FuncT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailure(e => 99);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public void ResultT_OnFailure_FuncResultT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.OnFailure(e => new Result<int>(99));
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_OnFailure_FuncResultT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailure(e => new Result<int>(99));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public void Result_OnFailureAsT_FuncT_Success()
+    {
+        var result = new Result();
+        var ret = result.OnFailureAs(_ => 123);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void Result_OnFailureAsT_FuncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.OnFailureAs(_ => 123);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Result_OnFailureAsT_FuncResultT_Success()
+    {
+        var result = new Result();
+        var ret = result.OnFailureAs(_ => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void Result_OnFailureAsT_FuncResultT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.OnFailureAs(_ => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_ActionT_Success()
+    {
+        var called = false;
+        var result = new Result<int>(42);
+        var ret = result.OnFailureAs(e => called = true);
+        called.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_ActionT_Failure()
+    {
+        var called = false;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailureAs(e => { called = true; e.Error.Should().Be(ex); });
+        called.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_FuncTResult_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.OnFailureAs(e => new Result());
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_FuncTResult_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailureAs(e => new Result());
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_FuncTU_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.OnFailureAs<int, string>(e => "abc");
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_FuncTU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailureAs<int, string>(e => "abc");
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_FuncTResultU_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.OnFailureAs<int, string>(e => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void ResultT_OnFailureAs_FuncTResultU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.OnFailureAs<int, string>(e => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    // --- ASYNC ---
+
+    [Test]
+    public async Task Result_OnFailureAsync_Func_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = await result.OnFailureAsync(async _ => { called = true; await Task.Yield(); });
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsync_Func_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = await result.OnFailureAsync(async _ => { called = true; await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsync_FuncResult_Success()
+    {
+        var result = new Result();
+        var ret = await result.OnFailureAsync(async _ => { await Task.Yield(); return Result.Fail(new Exception("fail2")); });
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsync_FuncResult_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.OnFailureAsync(async _ => { await Task.Yield(); return Result.Success; });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsync_ActionT_Success()
+    {
+        var called = false;
+        var result = new Result<int>(42);
+        var ret = await result.OnFailureAsync(async e => { called = true; await Task.Yield(); });
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsync_ActionT_Failure()
+    {
+        var called = false;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.OnFailureAsync(async e => { called = true; e.Error.Should().Be(ex); await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsync_FuncT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.OnFailureAsync(async e => { await Task.Yield(); return 99; });
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsync_FuncT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.OnFailureAsync(async e => { await Task.Yield(); return 99; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsync_FuncResultT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.OnFailureAsync(async e => { await Task.Yield(); return new Result<int>(99); });
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsync_FuncResultT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.OnFailureAsync(async e => { await Task.Yield(); return new Result<int>(99); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsAsyncT_FuncT_Success()
+    {
+        var result = new Result();
+        var ret = await result.OnFailureAsAsync(async _ => { await Task.Yield(); return 123; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsAsyncT_FuncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.OnFailureAsAsync(async _ => { await Task.Yield(); return 123; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsAsyncT_FuncResultT_Success()
+    {
+        var result = new Result();
+        var ret = await result.OnFailureAsAsync(async _ => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public async Task Result_OnFailureAsAsyncT_FuncResultT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.OnFailureAsAsync(async _ => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_ActionT_Success()
+    {
+        var called = false;
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().OnFailureAsAsync(async e => { called = true; await Task.Yield(); });
+        called.Should().BeFalse();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_ActionT_Failure()
+    {
+        var called = false;
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().OnFailureAsAsync(async e => { called = true; e.Error.Should().Be(ex); await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_FuncTResult_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().OnFailureAsAsync(async e => { await Task.Yield(); return new Result(); });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_FuncTResult_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().OnFailureAsAsync(async e => { await Task.Yield(); return new Result(); });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_FuncTU_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().OnFailureAsAsync<int, string>(async e => { await Task.Yield(); return "abc"; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_FuncTU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().OnFailureAsAsync<int, string>(async e => { await Task.Yield(); return "abc"; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_FuncTResultU_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().OnFailureAsAsync<int, string>(async e => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public async Task ResultT_OnFailureAsAsync_FuncTResultU_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().OnFailureAsAsync<int, string>(async e => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ExtensionsTests.cs b/tests/CoreEx.Test.Unit/Results/ExtensionsTests.cs
new file mode 100644
index 00000000..884fc67f
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ExtensionsTests.cs
@@ -0,0 +1,359 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ExtensionsTests
+{
+    [Test]
+    public void Bind_T_U_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.Bind<int, string>(i => new Result<string>(i.ToString()));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("5");
+    }
+
+    [Test]
+    public void Bind_T_U_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.Bind<int, string>(i => new Result<string>(i.ToString()));
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Bind_T_U_Success_TAssignableToU()
+    {
+        var result = new Result<string>("abc");
+        var ret = result.Bind<string, object>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void Bind_T_U_Success_TNotAssignableToU()
+    {
+        var result = new Result<int>(42);
+        var ret = result.Bind<int, string>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void Bind_T_U_Failure_TAssignableToU()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<string>(ex);
+        var ret = result.Bind<string, object>();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Bind_T_U_Failure_TNotAssignableToU()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.Bind<int, string>();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Bind_T_Func_Success()
+    {
+        var result = new Result();
+        var ret = result.Bind(() => new Result<int>(123));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Bind_T_Func_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = result.Bind(() => new Result<int>(123));
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Bind_T_Success()
+    {
+        var result = new Result();
+        var ret = result.Bind<int>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void Bind_T_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        var ret = result.Bind<int>();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Bind_T_ResultT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.Bind();
+        ret.IsSuccess.Should().BeTrue();
+        ret.IsFailure.Should().BeFalse();
+    }
+
+    [Test]
+    public void Bind_T_ResultT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.Bind();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_Result_Result_BothSuccess()
+    {
+        var r1 = new Result();
+        var r2 = new Result();
+        var ret = r1.Combine(r2);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Combine_Result_Result_ThisFailure()
+    {
+        var ex = new Exception("fail1");
+        var r1 = new Result(ex);
+        var r2 = new Result();
+        var ret = r1.Combine(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_Result_Result_OtherFailure()
+    {
+        var ex = new Exception("fail2");
+        var r1 = new Result();
+        var r2 = new Result(ex);
+        var ret = r1.Combine(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_Result_Result_BothFailure()
+    {
+        var ex1 = new Exception("fail1");
+        var ex2 = new Exception("fail2");
+        var r1 = new Result(ex1);
+        var r2 = new Result(ex2);
+        var ret = r1.Combine(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().BeOfType<AggregateException>();
+        var agg = (AggregateException)ret.Error;
+        agg.InnerExceptions.Should().Contain([ex1, ex2]);
+    }
+
+    [Test]
+    public void Combine_Result_ResultT_BothSuccess()
+    {
+        var r1 = new Result();
+        var r2 = new Result<int>(42);
+        var ret = r1.Combine(r2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(42);
+    }
+
+    [Test]
+    public void Combine_Result_ResultT_ThisFailure()
+    {
+        var ex = new Exception("fail1");
+        var r1 = new Result(ex);
+        var r2 = new Result<int>(42);
+        var ret = r1.Combine(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_Result_ResultT_OtherFailure()
+    {
+        var ex = new Exception("fail2");
+        var r1 = new Result();
+        var r2 = new Result<int>(ex);
+        var ret = r1.Combine(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_Result_ResultT_BothFailure()
+    {
+        var ex1 = new Exception("fail1");
+        var ex2 = new Exception("fail2");
+        var r1 = new Result(ex1);
+        var r2 = new Result<int>(ex2);
+        var ret = r1.Combine(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().BeOfType<AggregateException>();
+        var agg = (AggregateException)ret.Error;
+        agg.InnerExceptions.Should().Contain([ex1, ex2]);
+    }
+
+    [Test]
+    public void Combine_ResultT_ResultU_BothSuccess_TAssignableToU()
+    {
+        var r1 = new Result<string>("abc");
+        var r2 = new Result<object>(new object());
+        var ret = r1.Combine<string, object>(r2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void Combine_ResultT_ResultU_BothSuccess_TNotAssignableToU()
+    {
+        var r1 = new Result<int>(42);
+        var r2 = new Result<string>("abc");
+        var ret = r1.Combine<int, string>(r2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void Combine_ResultT_ResultU_ThisFailure()
+    {
+        var ex = new Exception("fail1");
+        var r1 = new Result<int>(ex);
+        var r2 = new Result<string>("abc");
+        var ret = r1.Combine<int, string>(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_ResultT_ResultU_OtherFailure()
+    {
+        var ex = new Exception("fail2");
+        var r1 = new Result<int>(42);
+        var r2 = new Result<string>(ex);
+        var ret = r1.Combine<int, string>(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Combine_ResultT_ResultU_BothFailure()
+    {
+        var ex1 = new Exception("fail1");
+        var ex2 = new Exception("fail2");
+        var r1 = new Result<int>(ex1);
+        var r2 = new Result<string>(ex2);
+        var ret = r1.Combine<int, string>(r2);
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().BeOfType<AggregateException>();
+        var agg = (AggregateException)ret.Error;
+        agg.InnerExceptions.Should().Contain([ex1, ex2]);
+    }
+
+    [Test]
+    public void AsResult_ResultT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = result.AsResult();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void AsResult_ResultT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.AsResult();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task AsResult_ValueTask_ResultT_Success()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().AsResultAsync();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task AsResult_ValueTask_ResultT_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().AsResultAsync();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void AsResult_T_U_Success_TAssignableToU()
+    {
+        var result = new Result<string>("abc");
+        var ret = result.AsResult<string, object>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void AsResult_T_U_Success_TNotAssignableToU()
+    {
+        var result = new Result<int>(42);
+        var ret = result.AsResult<int, string>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public void AsResult_T_U_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = result.AsResult<int, string>();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task AsResult_ValueTask_T_U_Success_TAssignableToU()
+    {
+        var result = new Result<string>("abc");
+        var ret = await result.AsTask().AsResultAsync<string, object>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public async Task AsResult_ValueTask_T_U_Success_TNotAssignableToU()
+    {
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().AsResultAsync<int, string>();
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(default);
+    }
+
+    [Test]
+    public async Task AsResult_ValueTask_T_U_Failure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        var ret = await result.AsTask().AsResultAsync<int, string>();
+        ret.IsFailure.Should().BeTrue();
+        ret.Error.Should().Be(ex);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ExtensionsThenTests.cs b/tests/CoreEx.Test.Unit/Results/ExtensionsThenTests.cs
new file mode 100644
index 00000000..a6303695
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ExtensionsThenTests.cs
@@ -0,0 +1,438 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ExtensionsThenTests
+{
+    [Test]
+    public void Result_Then_Action_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = result.Then(() => called = true);
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_Then_Action_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = result.Then(() => called = true);
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_Then_FuncResult_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = result.Then(() => { called = true; return Result.Success; });
+        called.Should().BeTrue();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_Then_FuncResult_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = result.Then(() => { called = true; return Result.Success; });
+        called.Should().BeFalse();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_Then_ActionT_Success()
+    {
+        int? value = null;
+        var result = new Result<int>(42);
+        var ret = result.Then(i => value = i);
+        value.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_Then_ActionT_Failure()
+    {
+        int? value = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Then(i => value = i);
+        value.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_Then_FuncT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = result.Then(i => i * 2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public void ResultT_Then_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Then(i => i * 2);
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_Then_FuncResultT_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.Then(i => new Result<int>(i + 1));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(6);
+    }
+
+    [Test]
+    public void ResultT_Then_FuncResultT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Then(i => new Result<int>(99));
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_Then_FuncTResult_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.Then(i => Result.Success);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(5);
+    }
+
+    [Test]
+    public void ResultT_Then_FuncTResult_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.Then(i => Result.Success);
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_ThenAsT_FuncT_Success()
+    {
+        var result = new Result();
+        var ret = result.ThenAs(() => 123);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Result_ThenAsT_FuncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.ThenAs(() => 123);
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_ThenAsT_FuncResultT_Success()
+    {
+        var result = new Result();
+        var ret = result.ThenAs(() => new Result<string>("abc"));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void Result_ThenAsT_FuncResultT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.ThenAs(() => new Result<string>("abc"));
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_ThenAs_ActionT_Success()
+    {
+        int? captured = null;
+        var result = new Result<int>(42);
+        var ret = result.ThenAs(i => captured = i);
+        captured.Should().Be(42);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_ThenAs_ActionT_Failure()
+    {
+        int? captured = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.ThenAs(i => captured = i);
+        captured.Should().BeNull();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_ThenAs_FuncTResult_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.ThenAs(i => new Result());
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_ThenAs_FuncTResult_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.ThenAs(i => new Result());
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_ThenAs_FuncTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.ThenAs<int, string>(i => (i * 2).ToString());
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public void ResultT_ThenAs_FuncTU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.ThenAs<int, string>(i => (i * 2).ToString());
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void ResultT_ThenAs_FuncTResultU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.ThenAs<int, string>(i => new Result<string>((i * 2).ToString()));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public void ResultT_ThenAs_FuncTResultU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.ThenAs<int, string>(i => new Result<string>((i * 2).ToString()));
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    // --- ASYNC ---
+
+    [Test]
+    public async Task Result_ThenAsync_Action_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = await result.ThenAsync(async () => { called = true; await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_ThenAsync_Action_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = await result.ThenAsync(async () => { called = true; await Task.Yield(); });
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_ThenAsync_FuncResult_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = await result.ThenAsync(async () => { called = true; await Task.Yield(); return Result.Success; });
+        called.Should().BeTrue();
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_ThenAsync_FuncResult_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = await result.ThenAsync(async () => { called = true; await Task.Yield(); return Result.Success; });
+        called.Should().BeFalse();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_ActionT_Success()
+    {
+        int? value = null;
+        var result = new Result<int>(42);
+        var ret = await result.ThenAsync(async i => { value = i; await Task.Yield(); });
+        value.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_ActionT_Failure()
+    {
+        int? value = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.ThenAsync(async i => { value = i; await Task.Yield(); });
+        value.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_FuncT_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = await result.ThenAsync(async i => { await Task.Yield(); return i * 2; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.ThenAsync(async i => { await Task.Yield(); return i * 2; });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_FuncResultT_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.ThenAsync(async i => { await Task.Yield(); return new Result<int>(i + 1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(6);
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_FuncResultT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.ThenAsync(async i => { await Task.Yield(); return new Result<int>(99); });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_FuncTResult_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.ThenAsync(async i => { await Task.Yield(); return Result.Success; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(5);
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsync_FuncTResult_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.ThenAsync(async i => { await Task.Yield(); return Result.Success; });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_ThenAsAsyncT_FuncT_Success()
+    {
+        var result = new Result();
+        var ret = await result.ThenAsAsync(async () => { await Task.Yield(); return 123; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_ThenAsAsyncT_FuncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.ThenAsAsync(async () => { await Task.Yield(); return 123; });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_ThenAsAsyncT_FuncResultT_Success()
+    {
+        var result = new Result();
+        var ret = await result.ThenAsAsync(async () => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public async Task Result_ThenAsAsyncT_FuncResultT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.ThenAsAsync(async () => { await Task.Yield(); return new Result<string>("abc"); });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_ActionT_Success()
+    {
+        int? captured = null;
+        var result = new Result<int>(42);
+        var ret = await result.AsTask().ThenAsAsync(async i => { captured = i; await Task.Yield(); });
+        captured.Should().Be(42);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_ActionT_Failure()
+    {
+        int? captured = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().ThenAsAsync(async i => { captured = i; await Task.Yield(); });
+        captured.Should().BeNull();
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_FuncTResult_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().ThenAsAsync(async i => { await Task.Yield(); return new Result(); });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_FuncTResult_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().ThenAsAsync(async i => { await Task.Yield(); return new Result(); });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_FuncTU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().ThenAsAsync<int, string>(async i => { await Task.Yield(); return (i * 2).ToString(); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_FuncTU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().ThenAsAsync<int, string>(async i => { await Task.Yield(); return (i * 2).ToString(); });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_FuncTResultU_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.AsTask().ThenAsAsync<int, string>(async i => { await Task.Yield(); return new Result<string>((i * 2).ToString()); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be("10");
+    }
+
+    [Test]
+    public async Task ResultT_ThenAsAsync_FuncTResultU_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.AsTask().ThenAsAsync<int, string>(async i => { await Task.Yield(); return new Result<string>((i * 2).ToString()); });
+        ret.IsFailure.Should().BeTrue();
+    }
+}
diff --git a/tests/CoreEx.Test.Unit/Results/ExtensionsWhenTests.cs b/tests/CoreEx.Test.Unit/Results/ExtensionsWhenTests.cs
new file mode 100644
index 00000000..5107f9a2
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ExtensionsWhenTests.cs
@@ -0,0 +1,392 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ExtensionsWhenTests
+{
+    [Test]
+    public void Result_When_Action_ConditionTrue_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = result.When(() => true, () => called = true);
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_When_Action_ConditionFalse_Success()
+    {
+        var called = false;
+        var otherwiseCalled = false;
+        var result = new Result();
+        var ret = result.When(() => false, () => called = true, () => otherwiseCalled = true);
+        called.Should().BeFalse();
+        otherwiseCalled.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_When_Action_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = result.When(() => true, () => called = true);
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void Result_When_Func_ConditionTrue_Success()
+    {
+        var result = new Result();
+        var ret = result.When(() => true, () => Result.Success);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_When_Func_ConditionFalse_Success()
+    {
+        var result = new Result();
+        var ret = result.When(() => false, () => Result.Fail(new Exception("fail")), () => Result.Success);
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_When_Func_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.When(() => true, () => Result.Success);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_When_ActionT_ConditionTrue_Success()
+    {
+        int? value = null;
+        var result = new Result<int>(42);
+        var ret = result.When(i => i == 42, i => value = i);
+        value.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_When_ActionT_ConditionFalse_Success()
+    {
+        int? value = null;
+        int? otherwise = null;
+        var result = new Result<int>(42);
+        var ret = result.When(i => i == 0, i => value = i, i => otherwise = i);
+        value.Should().BeNull();
+        otherwise.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_When_ActionT_Failure()
+    {
+        int? value = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.When(i => true, i => value = i);
+        value.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_When_FuncT_ConditionTrue_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = result.When(i => i == 10, i => i * 2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public void ResultT_When_FuncT_ConditionFalse_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = result.When(i => i == 0, i => i * 2, i => 99);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public void ResultT_When_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.When(i => true, i => i * 2);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_When_FuncResultT_ConditionTrue_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.When(i => i == 5, i => new Result<int>(i + 1));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(6);
+    }
+
+    [Test]
+    public void ResultT_When_FuncResultT_ConditionFalse_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.When(i => i == 0, i => new Result<int>(i + 1), i => new Result<int>(99));
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public void ResultT_When_FuncResultT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.When(i => true, i => new Result<int>(i + 1));
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public void ResultT_WhenAs_FuncT_ConditionTrue_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.WhenAs(i => i == 5, i => i * 2);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(10);
+    }
+
+    [Test]
+    public void ResultT_WhenAs_FuncT_ConditionFalse_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = result.WhenAs(i => i == 0, i => i * 2, i => 99);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public void ResultT_WhenAs_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = result.WhenAs(i => true, i => i * 2);
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void Result_WhenAsT_ConditionTrue_Success()
+    {
+        var result = new Result();
+        var ret = result.WhenAs(() => true, () => 123);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Result_WhenAsT_ConditionFalse_Success()
+    {
+        var result = new Result();
+        var ret = result.WhenAs(() => false, () => 123, () => 456);
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(456);
+    }
+
+    [Test]
+    public void Result_WhenAsT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = result.WhenAs(() => true, () => 123);
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    // --- ASYNC ---
+
+    [Test]
+    public async Task Result_WhenAsync_Action_ConditionTrue_Success()
+    {
+        var called = false;
+        var result = new Result();
+        var ret = await result.WhenAsync(() => true, async () => { called = true; await Task.Yield(); });
+        called.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_WhenAsync_Action_ConditionFalse_Success()
+    {
+        var called = false;
+        var otherwiseCalled = false;
+        var result = new Result();
+        var ret = await result.WhenAsync(() => false, async () => { called = true; await Task.Yield(); }, async () => { otherwiseCalled = true; await Task.Yield(); });
+        called.Should().BeFalse();
+        otherwiseCalled.Should().BeTrue();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_WhenAsync_Action_Failure()
+    {
+        var called = false;
+        var result = new Result(new Exception("fail"));
+        var ret = await result.WhenAsync(() => true, async () => { called = true; await Task.Yield(); });
+        called.Should().BeFalse();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task Result_WhenAsync_Func_ConditionTrue_Success()
+    {
+        var result = new Result();
+        var ret = await result.WhenAsync(() => true, async () => { await Task.Yield(); return Result.Success; });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_WhenAsync_Func_ConditionFalse_Success()
+    {
+        var result = new Result();
+        var ret = await result.WhenAsync(() => false, async () => { await Task.Yield(); return Result.Fail(new Exception("fail")); }, async () => { await Task.Yield(); return Result.Success; });
+        ret.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_WhenAsync_Func_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.WhenAsync(() => true, async () => { await Task.Yield(); return Result.Success; });
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_ActionT_ConditionTrue_Success()
+    {
+        int? value = null;
+        var result = new Result<int>(42);
+        var ret = await result.WhenAsync(i => i == 42, async i => { value = i; await Task.Yield(); });
+        value.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_ActionT_ConditionFalse_Success()
+    {
+        int? value = null;
+        int? otherwise = null;
+        var result = new Result<int>(42);
+        var ret = await result.WhenAsync(i => i == 0, async i => { value = i; await Task.Yield(); }, async i => { otherwise = i; await Task.Yield(); });
+        value.Should().BeNull();
+        otherwise.Should().Be(42);
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_ActionT_Failure()
+    {
+        int? value = null;
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.WhenAsync(i => true, async i => { value = i; await Task.Yield(); });
+        value.Should().BeNull();
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_FuncT_ConditionTrue_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = await result.WhenAsync(i => i == 10, async i => { await Task.Yield(); return i * 2; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(20);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_FuncT_ConditionFalse_Success()
+    {
+        var result = new Result<int>(10);
+        var ret = await result.WhenAsync(i => i == 0, async i => { await Task.Yield(); return i * 2; }, async i => { await Task.Yield(); return 99; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.WhenAsync(i => true, async i => { await Task.Yield(); return i * 2; });
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_FuncResultT_ConditionTrue_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.WhenAsync(i => i == 5, async i => { await Task.Yield(); return new Result<int>(i + 1); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(6);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_FuncResultT_ConditionFalse_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.WhenAsync(i => i == 0, async i => { await Task.Yield(); return new Result<int>(i + 1); }, async i => { await Task.Yield(); return new Result<int>(99); });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsync_FuncResultT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.WhenAsync(i => true, async i => { await Task.Yield(); return new Result<int>(i + 1); });
+        ret.Should().Be(result);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsAsync_FuncT_ConditionTrue_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.WhenAsAsync(i => i == 5, async i => { await Task.Yield(); return i * 2; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(10);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsAsync_FuncT_ConditionFalse_Success()
+    {
+        var result = new Result<int>(5);
+        var ret = await result.WhenAsAsync(i => i == 0, async i => { await Task.Yield(); return i * 2; }, async i => { await Task.Yield(); return 99; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(99);
+    }
+
+    [Test]
+    public async Task ResultT_WhenAsAsync_FuncT_Failure()
+    {
+        var result = new Result<int>(new Exception("fail"));
+        var ret = await result.WhenAsAsync(i => true, async i => { await Task.Yield(); return i * 2; });
+        ret.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public async Task Result_WhenAsAsyncT_ConditionTrue_Success()
+    {
+        var result = new Result();
+        var ret = await result.WhenAsAsync(() => true, async () => { await Task.Yield(); return 123; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(123);
+    }
+
+    [Test]
+    public async Task Result_WhenAsAsyncT_ConditionFalse_Success()
+    {
+        var result = new Result();
+        var ret = await result.WhenAsAsync(() => false, async () => { await Task.Yield(); return 123; }, async () => { await Task.Yield(); return 456; });
+        ret.IsSuccess.Should().BeTrue();
+        ret.Value.Should().Be(456);
+    }
+
+    [Test]
+    public async Task Result_WhenAsAsyncT_Failure()
+    {
+        var result = new Result(new Exception("fail"));
+        var ret = await result.WhenAsAsync(() => true, async () => { await Task.Yield(); return 123; });
+        ret.IsFailure.Should().BeTrue();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ResultErrorTests.cs b/tests/CoreEx.Test.Unit/Results/ResultErrorTests.cs
new file mode 100644
index 00000000..43154555
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ResultErrorTests.cs
@@ -0,0 +1,181 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ResultErrorTests
+{
+    [Test]
+    public void ValidationError_LText_Null()
+    {
+        var result = Result.ValidationError((LText?)null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Message.Should().NotBeNull();
+    }
+
+    [Test]
+    public void ValidationError_LText_Value()
+    {
+        var ltext = new LText("Validation failed");
+        var result = Result.ValidationError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Message.Should().Contain("Validation failed");
+    }
+
+    [Test]
+    public void ValidationError_IEnumerable_Null()
+    {
+        var result = Result.ValidationError((IEnumerable<MessageItem>?)null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+    }
+
+    [Test]
+    public void ValidationError_IEnumerable_List()
+    {
+        var items = new List<MessageItem> { new(MessageType.Error, new LText("msg")) };
+        var result = Result.ValidationError(items);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Messages.Should().ContainSingle();
+    }
+
+    [Test]
+    public void ValidationError_MessageItem()
+    {
+        var item = new MessageItem(MessageType.Error, new LText("msg"));
+        var result = Result.ValidationError(item);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Messages.Should().ContainSingle();
+    }
+
+    [Test]
+    public void ConflictError_Null()
+    {
+        var result = Result.ConflictError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConflictException>();
+    }
+
+    [Test]
+    public void ConflictError_Value()
+    {
+        var ltext = new LText("conflict");
+        var result = Result.ConflictError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConflictException>();
+        ((ConflictException)result.Error).Message.Should().Contain("conflict");
+    }
+
+    [Test]
+    public void ConcurrencyError_Null()
+    {
+        var result = Result.ConcurrencyError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConcurrencyException>();
+    }
+
+    [Test]
+    public void ConcurrencyError_Value()
+    {
+        var ltext = new LText("concurrency");
+        var result = Result.ConcurrencyError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConcurrencyException>();
+        ((ConcurrencyException)result.Error).Message.Should().Contain("concurrency");
+    }
+
+    [Test]
+    public void DuplicateError_Null()
+    {
+        var result = Result.DuplicateError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<DuplicateException>();
+    }
+
+    [Test]
+    public void DuplicateError_Value()
+    {
+        var ltext = new LText("duplicate");
+        var result = Result.DuplicateError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<DuplicateException>();
+        ((DuplicateException)result.Error).Message.Should().Contain("duplicate");
+    }
+
+    [Test]
+    public void NotFoundError_Null()
+    {
+        var result = Result.NotFoundError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<NotFoundException>();
+    }
+
+    [Test]
+    public void NotFoundError_Value()
+    {
+        var ltext = new LText("notfound");
+        var result = Result.NotFoundError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<NotFoundException>();
+        ((NotFoundException)result.Error).Message.Should().Contain("notfound");
+    }
+
+    [Test]
+    public void TransientError_Null()
+    {
+        var result = Result.TransientError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<TransientException>();
+    }
+
+    [Test]
+    public void TransientError_Value()
+    {
+        var ltext = new LText("transient");
+        var result = Result.TransientError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<TransientException>();
+        ((TransientException)result.Error).Message.Should().Contain("transient");
+    }
+
+    [Test]
+    public void AuthenticationError_Null()
+    {
+        var result = Result.AuthenticationError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthenticationException>();
+    }
+
+    [Test]
+    public void AuthenticationError_Value()
+    {
+        var ltext = new LText("auth");
+        var result = Result.AuthenticationError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthenticationException>();
+        ((AuthenticationException)result.Error).Message.Should().Contain("auth");
+    }
+
+    [Test]
+    public void AuthorizationError_Null()
+    {
+        var result = Result.AuthorizationError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthorizationException>();
+    }
+
+    [Test]
+    public void AuthorizationError_Value()
+    {
+        var ltext = new LText("author");
+        var result = Result.AuthorizationError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthorizationException>();
+        ((AuthorizationException)result.Error).Message.Should().Contain("author");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ResultStaticTests.cs b/tests/CoreEx.Test.Unit/Results/ResultStaticTests.cs
new file mode 100644
index 00000000..b334bd2e
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ResultStaticTests.cs
@@ -0,0 +1,74 @@
+using CoreEx.Localization;
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ResultStaticTests
+{
+    [Test]
+    public void Success_ShouldBeSuccess()
+    {
+        var result = Result.Success;
+        result.IsSuccess.Should().BeTrue();
+        result.IsFailure.Should().BeFalse();
+    }
+
+    [Test]
+    public async Task SuccessValueTask_ShouldBeSuccess()
+    {
+        var result = await Result.SuccessTask;
+        result.IsSuccess.Should().BeTrue();
+        result.IsFailure.Should().BeFalse();
+    }
+
+    [Test]
+    public void Done_Action_CallsActionAndReturnsSuccess()
+    {
+        var called = false;
+        var result = Result.Done(() => called = true);
+        called.Should().BeTrue();
+        result.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Done_Action_Null_Throws()
+    {
+        Action act = () => Result.Done(null!);
+        act.Should().Throw<ArgumentNullException>();
+    }
+
+    [Test]
+    public void OkT_ReturnsSuccessWithValue()
+    {
+        var result = Result.Ok(123);
+        result.IsSuccess.Should().BeTrue();
+        result.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void Fail_Exception_ReturnsFailureWithError()
+    {
+        var ex = new Exception("fail");
+        var result = Result.Fail(ex);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Fail_LText_Null_ReturnsFailureWithValidationException()
+    {
+        var result = Result.Fail((LText?)null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+    }
+
+    [Test]
+    public void Fail_LText_Value_ReturnsFailureWithValidationException()
+    {
+        var ltext = new LText("fail error");
+        var result = Result.Fail(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        result.Error.Message.Should().Contain("fail error");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ResultTErrorTests.cs b/tests/CoreEx.Test.Unit/Results/ResultTErrorTests.cs
new file mode 100644
index 00000000..0c1377c2
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ResultTErrorTests.cs
@@ -0,0 +1,181 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ResultTErrorTests
+{
+    [Test]
+    public void ValidationError_LText_Null()
+    {
+        var result = Result<int>.ValidationError((LText?)null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Message.Should().NotBeNull();
+    }
+
+    [Test]
+    public void ValidationError_LText_Value()
+    {
+        var ltext = new LText("Validation failed");
+        var result = Result<int>.ValidationError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Message.Should().Contain("Validation failed");
+    }
+
+    [Test]
+    public void ValidationError_IEnumerable_Null()
+    {
+        var result = Result<int>.ValidationError((IEnumerable<MessageItem>?)null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+    }
+
+    [Test]
+    public void ValidationError_IEnumerable_List()
+    {
+        var items = new List<MessageItem> { new(MessageType.Error, new LText("msg")) };
+        var result = Result<int>.ValidationError(items);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Messages.Should().ContainSingle();
+    }
+
+    [Test]
+    public void ValidationError_MessageItem()
+    {
+        var item = new MessageItem(MessageType.Error, new LText("msg"));
+        var result = Result<int>.ValidationError(item);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        ((ValidationException)result.Error).Messages.Should().ContainSingle();
+    }
+
+    [Test]
+    public void ConflictError_Null()
+    {
+        var result = Result<int>.ConflictError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConflictException>();
+    }
+
+    [Test]
+    public void ConflictError_Value()
+    {
+        var ltext = new LText("conflict");
+        var result = Result<int>.ConflictError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConflictException>();
+        ((ConflictException)result.Error).Message.Should().Contain("conflict");
+    }
+
+    [Test]
+    public void ConcurrencyError_Null()
+    {
+        var result = Result<int>.ConcurrencyError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConcurrencyException>();
+    }
+
+    [Test]
+    public void ConcurrencyError_Value()
+    {
+        var ltext = new LText("concurrency");
+        var result = Result<int>.ConcurrencyError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ConcurrencyException>();
+        ((ConcurrencyException)result.Error).Message.Should().Contain("concurrency");
+    }
+
+    [Test]
+    public void DuplicateError_Null()
+    {
+        var result = Result<int>.DuplicateError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<DuplicateException>();
+    }
+
+    [Test]
+    public void DuplicateError_Value()
+    {
+        var ltext = new LText("duplicate");
+        var result = Result<int>.DuplicateError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<DuplicateException>();
+        ((DuplicateException)result.Error).Message.Should().Contain("duplicate");
+    }
+
+    [Test]
+    public void NotFoundError_Null()
+    {
+        var result = Result<int>.NotFoundError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<NotFoundException>();
+    }
+
+    [Test]
+    public void NotFoundError_Value()
+    {
+        var ltext = new LText("notfound");
+        var result = Result<int>.NotFoundError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<NotFoundException>();
+        ((NotFoundException)result.Error).Message.Should().Contain("notfound");
+    }
+
+    [Test]
+    public void TransientError_Null()
+    {
+        var result = Result<int>.TransientError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<TransientException>();
+    }
+
+    [Test]
+    public void TransientError_Value()
+    {
+        var ltext = new LText("transient");
+        var result = Result<int>.TransientError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<TransientException>();
+        ((TransientException)result.Error).Message.Should().Contain("transient");
+    }
+
+    [Test]
+    public void AuthenticationError_Null()
+    {
+        var result = Result<int>.AuthenticationError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthenticationException>();
+    }
+
+    [Test]
+    public void AuthenticationError_Value()
+    {
+        var ltext = new LText("auth");
+        var result = Result<int>.AuthenticationError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthenticationException>();
+        ((AuthenticationException)result.Error).Message.Should().Contain("auth");
+    }
+
+    [Test]
+    public void AuthorizationError_Null()
+    {
+        var result = Result<int>.AuthorizationError(null);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthorizationException>();
+    }
+
+    [Test]
+    public void AuthorizationError_Value()
+    {
+        var ltext = new LText("author");
+        var result = Result<int>.AuthorizationError(ltext);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<AuthorizationException>();
+        ((AuthorizationException)result.Error).Message.Should().Contain("author");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ResultTTests.cs b/tests/CoreEx.Test.Unit/Results/ResultTTests.cs
new file mode 100644
index 00000000..3a2d4463
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ResultTTests.cs
@@ -0,0 +1,145 @@
+using CoreEx.Results;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ResultTTests
+{
+    [Test]
+    public void DefaultCtor_ShouldBeSuccess()
+    {
+        var result = new Result<int>();
+        result.IsSuccess.Should().BeTrue();
+        result.IsFailure.Should().BeFalse();
+        result.Value.Should().Be(0);
+    }
+
+    [Test]
+    public void ValueCtor_ShouldBeSuccess()
+    {
+        var result = new Result<string>("abc");
+        result.IsSuccess.Should().BeTrue();
+        result.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void CtorWithException_ShouldBeFailure()
+    {
+        var ex = new InvalidOperationException("fail");
+        var result = new Result<int>(ex);
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Value_ShouldThrowOnFailure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<string>(ex);
+        Action act = () => { var _ = result.Value; };
+        act.Should().Throw<Exception>().WithMessage("fail");
+    }
+
+    [Test]
+    public void ThrowOnError_ShouldThrowOnFailure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result<int>(ex);
+        Action act = () => result.ThrowOnError();
+        act.Should().Throw<Exception>().WithMessage("fail");
+    }
+
+    [Test]
+    public void ThrowOnError_ShouldNotThrowOnSuccess()
+    {
+        var result = new Result<int>(123);
+        var returned = result.ThrowOnError();
+        returned.IsSuccess.Should().BeTrue();
+        returned.Value.Should().Be(123);
+    }
+
+    [Test]
+    public void IsFailureOfType_ShouldReturnTrueForExactType()
+    {
+        var ex = new InvalidOperationException();
+        var result = new Result<int>(ex);
+        result.IsFailureOfType<InvalidOperationException>().Should().BeTrue();
+        result.IsFailureOfType<ArgumentException>().Should().BeFalse();
+    }
+
+    [Test]
+    public void Required_ShouldReturnValidationErrorOnDefault()
+    {
+        var result = new Result<int>(0);
+        var required = result.Required("Test");
+        required.IsFailure.Should().BeTrue();
+    }
+
+    [Test]
+    public void Required_ShouldReturnSelfOnNonDefault()
+    {
+        var result = new Result<int>(5);
+        var required = result.Required("Test");
+        required.IsSuccess.Should().BeTrue();
+        required.Value.Should().Be(5);
+    }
+
+    [Test]
+    public void ImplicitOperator_FromException()
+    {
+        Exception ex = new("fail");
+        Result<int> result = ex;
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void ImplicitOperator_FromValue()
+    {
+        Result<string> result = "abc";
+        result.IsSuccess.Should().BeTrue();
+        result.Value.Should().Be("abc");
+    }
+
+    [Test]
+    public void ImplicitOperator_ToValue()
+    {
+        Result<string> result = "abc";
+        string value = result;
+        value.Should().Be("abc");
+    }
+
+    [Test]
+    public void Equals_And_Operators()
+    {
+        var r1 = new Result();
+        var r2 = new Result();
+        var r3 = new Result(new Exception("fail"));
+        var r4 = new Result(new Exception("fail"));
+        var r5 = new Result(new Exception("fail2"));
+
+        (r1 == r2).Should().BeTrue();
+        (r1 != r2).Should().BeFalse();
+        (r1 == r3).Should().BeFalse();
+        (r3 != r1).Should().BeTrue();
+        (r3 == r4).Should().BeTrue(); // Different exception instances but same message.
+        (r4 == r5).Should().BeFalse(); // Different exception instances and different message.
+    }
+
+    [Test]
+    public void ToString_And_DebuggerString()
+    {
+        var r1 = new Result<string>("abc");
+        var r2 = new Result<string>(new Exception("fail"));
+        r1.ToString().Should().StartWith("Success: abc");
+        r2.ToString().Should().StartWith("Failure: fail");
+    }
+
+    [Test]
+    public async Task AsValueTask_ShouldReturnSelf()
+    {
+        var result = new Result<int>(42);
+        var valueTask = result.AsTask();
+        var awaited = await valueTask;
+        awaited.Should().Be(result);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Results/ResultTests.cs b/tests/CoreEx.Test.Unit/Results/ResultTests.cs
new file mode 100644
index 00000000..d30e24b5
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Results/ResultTests.cs
@@ -0,0 +1,112 @@
+using CoreEx.Results;
+using CoreEx.Results.Abstractions;
+
+namespace CoreEx.Test.Unit.Results;
+
+public class ResultTests
+{
+    [Test]
+    public void DefaultCtor_ShouldBeSuccess()
+    {
+        var result = new Result();
+        result.IsSuccess.Should().BeTrue();
+        result.IsFailure.Should().BeFalse();
+    }
+
+    [Test]
+    public void CtorWithException_ShouldBeFailure()
+    {
+        var ex = new InvalidOperationException("fail");
+        var result = new Result(ex);
+        result.IsFailure.Should().BeTrue();
+        result.IsSuccess.Should().BeFalse();
+        result.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public void Error_ShouldThrowOnSuccess()
+    {
+        var result = new Result();
+        Action act = () => { var _ = result.Error; };
+        act.Should().Throw<InvalidOperationException>();
+    }
+
+    [Test]
+    public void IResult_Value_ShouldThrowOnFailure()
+    {
+        var ex = new Exception("fail");
+        IResult result = new Result(ex);
+        Action act = () => { var _ = result.Value; };
+        act.Should().Throw<Exception>().WithMessage("fail");
+    }
+
+    [Test]
+    public void ThrowOnError_ShouldThrowOnFailure()
+    {
+        var ex = new Exception("fail");
+        var result = new Result(ex);
+        Action act = () => result.ThrowOnError();
+        act.Should().Throw<Exception>().WithMessage("fail");
+    }
+
+    [Test]
+    public void ThrowOnError_ShouldNotThrowOnSuccess()
+    {
+        var result = new Result();
+        var returned = result.ThrowOnError();
+        returned.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void IsFailureOfType_ShouldReturnTrueForExactType()
+    {
+        var ex = new InvalidOperationException();
+        var result = new Result(ex);
+        result.IsFailureOfType<InvalidOperationException>().Should().BeTrue();
+        result.IsFailureOfType<ArgumentException>().Should().BeFalse();
+    }
+
+    [Test]
+    public void Equals_And_Operators()
+    {
+        var r1 = new Result();
+        var r2 = new Result();
+        var r3 = new Result(new Exception("fail"));
+        var r4 = new Result(new Exception("fail"));
+        var r5 = new Result(new Exception("fail2"));
+
+        (r1 == r2).Should().BeTrue();
+        (r1 != r2).Should().BeFalse();
+        (r1 == r3).Should().BeFalse();
+        (r3 != r1).Should().BeTrue();
+        (r3 == r4).Should().BeTrue(); // Different exception instances but same message.
+        (r4 == r5).Should().BeFalse(); // Different exception instances and different message.
+    }
+
+    [Test]
+    public void ToString_And_DebuggerString()
+    {
+        var r1 = new Result();
+        var r2 = new Result(new Exception("fail"));
+        r1.ToString().Should().Be("Success.");
+        r2.ToString().Should().StartWith("Failure: fail");
+    }
+
+    [Test]
+    public void ImplicitOperator_FromException()
+    {
+        Exception ex = new("fail");
+        Result result = ex;
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().Be(ex);
+    }
+
+    [Test]
+    public async Task AsValueTask_ShouldReturnSelf()
+    {
+        var result = new Result();
+        var valueTask = result.AsTask();
+        var awaited = await valueTask;
+        awaited.Should().Be(result);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Runtime/ReflectionMetadataTests.cs b/tests/CoreEx.Test.Unit/Runtime/ReflectionMetadataTests.cs
new file mode 100644
index 00000000..973aa25d
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Runtime/ReflectionMetadataTests.cs
@@ -0,0 +1,181 @@
+using CoreEx.Entities;
+using CoreEx.Metadata;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace CoreEx.Test.Unit.Runtime;
+
+public class ReflectionMetadataTests
+{
+    private record class EntityR
+    {
+        public int Id { get; set; }
+        public string? Name { get; set; }
+    }
+
+    private class EntityA
+    {
+        public int Id { get; set; } = 88;
+
+        [Display(Name = "NAME")]
+        [JsonPropertyName("fullname")]
+        public string? Name { get; set; } = "Bob";
+
+        [ContractIgnore]
+        public bool Internal { get; set; }
+
+        public override bool Equals(object? obj) => RuntimeMetadata.AreEqual(this, obj);
+        public override int GetHashCode() => RuntimeMetadata.GetHashCode(this);
+    }
+
+    private class EntityB : EntityA
+    {
+        [DisplayFormat(DataFormatString = "{0:C}")]
+        public decimal Amount { get; set; }
+
+        public override bool Equals(object? obj) => RuntimeMetadata.AreEqual(this, obj);
+        public override int GetHashCode() => RuntimeMetadata.GetHashCode(this);
+    }
+
+    private class EntityC : EntityB
+    {
+        public ChangeLog? ChangeLog { get; set; }
+        public List<EntityA>? Children { get; set; }
+        public Dictionary<string, EntityA>? Kids { get; set; }
+
+        public override bool Equals(object? obj) => RuntimeMetadata.AreEqual(this, obj);
+        public override int GetHashCode() => RuntimeMetadata.GetHashCode(this);
+    }
+
+    private class EntityD(string id) : IReadOnlyIdentifier<string>
+    {
+        public string Id => id;
+
+        [String(casing: StringCase.Upper)]
+        public string? Code { get; set; }
+
+        [Clean(CleanOption.None)]
+        public string? Description { get; set; }
+
+        public ChangeLog? ChangeLog { get; set; }
+
+        [Clean(CleanOption.Clean)]
+        public ChangeLog? ChangeLog2 { get; set; }
+
+        [DateTime(DateTimeTransform.DateOnly)]
+        public DateTime? Date { get; set; }
+
+        public List<string>? Tags { get; set; }
+
+        public string[] Strings { get; set; } = [];
+
+        public override bool Equals(object? obj) => RuntimeMetadata.AreEqual(this, obj);
+        public override int GetHashCode() => RuntimeMetadata.GetHashCode(this);
+    }
+
+    private partial class EntityX
+    {
+        [DateTime(DateTimeTransform.DateOnly)]
+        public DateTime D1 { get; set; }
+
+        [DateTime(DateTimeTransform.DateOnly)]
+        public required DateTime D2 { get; init; }
+
+        [String(casing: StringCase.Upper)]
+        public string? S1 { get; set; }
+
+        [String(casing: StringCase.Upper)]
+        public string? S2 { get; init; }
+
+        public override bool Equals(object? obj) => RuntimeMetadata.AreEqual(this, obj);
+        public override int GetHashCode() => RuntimeMetadata.GetHashCode(this);
+    }
+
+    [Test]
+    public void AreEqual_IEnumerable_ReferenceType()
+    {
+        var arr1 = new[] { new EntityA { Name = "Bob" }, new EntityA { Name = "Jen" } };
+        var arr2 = new[] { new EntityA { Name = "Bob" }, new EntityA { Name = "Jen" } };
+        var arr3 = new[] { new EntityA { Name = "Bob" }, new EntityA { Name = "Kat" } };
+        var arr4 = new[] { new EntityA { Name = "Bob" } };
+        RuntimeMetadata.AreEqual(arr1, arr2).Should().BeTrue();
+        RuntimeMetadata.AreEqual(arr1, arr3).Should().BeFalse();
+        RuntimeMetadata.AreEqual(arr1, arr4).Should().BeFalse();
+    }
+
+    [Test]
+    public void AreEqual_Reflection()
+    {
+        var e1 = new EntityC { Id = 1, Name = "Bob", Amount = 1.3m, ChangeLog = new ChangeLog { CreatedBy = "Dave" }, Children = [new EntityA { Id = 10, Name = "Jen" }] };
+        var e2 = new EntityC { Id = 1, Name = "Bob", Amount = 1.3m, ChangeLog = new ChangeLog { CreatedBy = "Dave" }, Children = [new EntityA { Id = 10, Name = "Jen" }] };
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.Name = "Fred";
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.Name = "Bob";
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.ChangeLog = new ChangeLog { CreatedBy = "Mary" };
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.ChangeLog = new ChangeLog { CreatedBy = "Dave" };
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.Children[0].Name = "Kat";
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.Children = [new EntityA { Id = 10, Name = "Jen" }, new EntityA { Id = 11, Name = "Sam" }];
+        e1.Equals(e2).Should().BeFalse();
+        var e2AsA = (EntityA)e2;
+        e1.Equals(e2AsA).Should().BeFalse();
+
+        e2.Children = [new EntityA { Id = 10, Name = "Jen" }];
+        e1.Equals(e2).Should().BeTrue();
+        e1.Equals(e2AsA).Should().BeTrue();
+    }
+
+    [Test]
+    public void GetHashCode_Reflection()
+    {
+        var e1 = new EntityA { Id = 1, Name = "Bob" };
+        var e2 = new EntityA { Id = 1, Name = "Bob" };
+        e1.GetHashCode().Should().Be(e2.GetHashCode());
+
+        e2.Name = "Fred";
+        e1.GetHashCode().Should().NotBe(e2.GetHashCode());
+    }
+
+    [Test]
+    public void GetHashCode_IEnumerable()
+    {
+        var arr1 = new[] { 1, 2, 3 };
+        var arr2 = new[] { 1, 2, 3 };
+        RuntimeMetadata.GetHashCode(arr1).Should().Be(RuntimeMetadata.GetHashCode(arr2));
+    }
+
+    [Test]
+    public void IsDefault_TrueAndFalse()
+    {
+        var e1 = new EntityA { Id = 1, Name = "Mary" };
+        RuntimeMetadata.IsDefault(e1).Should().BeFalse();
+
+        e1.Id = 88;
+        e1.Name = "Bob";
+        RuntimeMetadata.IsDefault(e1).Should().BeFalse(); // This is because the default values are set in the class definition and cannot be determined using reflection.
+
+        e1.Id = default;
+        e1.Name = default;
+        RuntimeMetadata.IsDefault(e1).Should().BeTrue();
+    }
+
+    [Test]
+    public void Test()
+    {
+        int[] arr1 = { 1, 2, 3 };
+        int[]? arr2 = { 1 };
+
+        arr1 = default!;
+        arr2 = default;
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Runtime/RuntimeMetadataTests.cs b/tests/CoreEx.Test.Unit/Runtime/RuntimeMetadataTests.cs
new file mode 100644
index 00000000..065c1eb7
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Runtime/RuntimeMetadataTests.cs
@@ -0,0 +1,434 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+using CoreEx.Metadata;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace CoreEx.Test.Unit.Runtime;
+
+public partial class RuntimeMetadataTests
+{
+    [Contract]
+    private partial record class EntityR
+    {
+        public int Id { get; set; }
+        public string? Name { get; set; }
+    }
+
+    [Contract]
+    private partial class EntityA
+    {
+        public int Id { get; set; } = 88;
+
+        [Display(Name = "NAME")]
+        [JsonPropertyName("fullname")]
+        public string? Name { get; set; } = "Bob";
+
+        [ContractIgnore]
+        public bool Internal { get; set; }
+    }
+
+    [Contract]
+    private partial class EntityB : EntityA
+    {
+        [Display(Name = "AMOUNT")] // Should be ignored; as LText is specified and it takes precedence.
+        [Localization("EntityB.Amount", "Dollars")]
+        [DisplayFormat(DataFormatString = "{0:C}")]
+        public decimal Amount { get; set; }
+    }
+
+    [Contract]
+    private partial class EntityC : EntityB
+    {
+        public List<EntityA>? Children { get; set; }
+        public Dictionary<string, EntityA>? Kids { get; set; }
+        public ChangeLog? ChangeLog { get; set; }
+    }
+
+    [Contract]
+    private partial class EntityD(string id) : IReadOnlyIdentifier<string>
+    {
+        public string Id => id;
+
+        [String(casing: StringCase.Upper)]
+        public partial string? Code { get; set; }
+
+        [Clean(CleanOption.None)]
+        public string? Description { get; set; }
+
+        public ChangeLog? ChangeLog { get; set; }
+
+        [Clean(CleanOption.Clean)]
+        public ChangeLog? ChangeLog2 { get; set; }
+
+        [DateTime(DateTimeTransform.DateOnly)]
+        public partial DateTime? Date { get; set; } 
+
+        public List<string>? Tags { get; set; }
+
+        public string[] Strings { get; set; } = [];
+    }
+
+    [Contract]
+    private partial class EntityX
+    {
+        [DateTime(DateTimeTransform.DateOnly)]
+        public partial DateTime D1 { get; set; }
+
+        [DateTime(DateTimeTransform.DateOnly)]
+        public required partial DateTime D2 { get; init; }
+
+        [String(casing: StringCase.Upper)]
+        public partial string? S1 { get; set; }
+
+        [String(casing: StringCase.Upper)]
+        public partial string? S2 { get; init; }
+    }
+
+    [Test]
+    public void AreEqual_ReferenceEquals_True()
+    {
+        var obj = new object();
+        RuntimeMetadata.AreEqual(obj, obj).Should().BeTrue();
+    }
+
+    [Test]
+    public void AreEqual_NullCases()
+    {
+        RuntimeMetadata.AreEqual<object>(null, null).Should().BeTrue();
+        RuntimeMetadata.AreEqual<object>(null, new object()).Should().BeFalse();
+        RuntimeMetadata.AreEqual<object>(new object(), null).Should().BeFalse();
+    }
+
+    [Test]
+    public void AreEqual_Strings()
+    {
+        RuntimeMetadata.AreEqual("abc", "abc").Should().BeTrue();
+        RuntimeMetadata.AreEqual("abc", "def").Should().BeFalse();
+    }
+
+    [Test]
+    public void AreEqual_IEnumerable_ValueType()
+    {
+        var arr1 = new[] { 1, 2, 3 };
+        var arr2 = new[] { 1, 2, 3 };
+        var arr3 = new[] { 1, 2, 4 };
+        var arr4 = new[] { 1, 2 };
+        RuntimeMetadata.AreEqual(arr1, arr2).Should().BeTrue();
+        RuntimeMetadata.AreEqual(arr1, arr3).Should().BeFalse();
+        RuntimeMetadata.AreEqual(arr1, arr4).Should().BeFalse();
+    }
+
+    [Test]
+    public void AreEqual_IEnumerable_ReferenceType()
+    {
+        var arr1 = new[] { new EntityA { Name = "Bob" }, new EntityA { Name = "Jen" } };
+        var arr2 = new[] { new EntityA { Name = "Bob" }, new EntityA { Name = "Jen" } };
+        var arr3 = new[] { new EntityA { Name = "Bob" }, new EntityA { Name = "Kat" } };
+        var arr4 = new[] { new EntityA { Name = "Bob" } };
+        RuntimeMetadata.AreEqual(arr1, arr2).Should().BeTrue();
+        RuntimeMetadata.AreEqual(arr1, arr3).Should().BeFalse();
+        RuntimeMetadata.AreEqual(arr1, arr4).Should().BeFalse();
+    }
+
+    [Test]
+    public void AreEqual_Dictionary()
+    {
+        var e1 = new EntityC { Kids = [] };
+        e1.Kids.Add("Sal", new EntityA { Name = "Sal" });
+        e1.Kids.Add("Kev", new EntityA { Name = "Kev" });
+
+        var e2 = new EntityC { Kids = [] };
+        e2.Kids.Add("Kev", new EntityA { Name = "Kev" });
+        e2.Kids.Add("Sal", new EntityA { Name = "Sal" });
+
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.Kids["Kev"].Name = "Jon";
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.Kids.Remove("Kev");
+        e2.Kids.Add("Jas", new EntityA { Name = "Jas" });
+        e1.Equals(e2).Should().BeFalse();
+    }
+
+    [Test]
+    public void AreEqual_IRuntimeMetadata()
+    {
+        var e1 = new EntityC { Id = 1, Name = "Bob", Amount = 1.3m, ChangeLog = new ChangeLog { CreatedBy = "Dave" }, Children = [new EntityA { Id = 10, Name = "Jen" }] };
+        var e2 = new EntityC { Id = 1, Name = "Bob", Amount = 1.3m, ChangeLog = new ChangeLog { CreatedBy = "Dave" }, Children = [new EntityA { Id = 10, Name = "Jen" }] };
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.Name = "Fred";
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.Name = "Bob";
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.ChangeLog = new ChangeLog { CreatedBy = "Mary" };
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.ChangeLog = new ChangeLog { CreatedBy = "Dave" };
+        e1.Equals(e2).Should().BeTrue();
+
+        e2.Children[0].Name = "Kat";
+        e1.Equals(e2).Should().BeFalse();
+
+        e2.Children = [new EntityA { Id = 10, Name = "Jen" }, new EntityA { Id = 11, Name = "Sam" }];
+        e1.Equals(e2).Should().BeFalse();
+        var e2AsA = (EntityA)e2;
+        e1.Equals(e2AsA).Should().BeFalse();
+
+        e2.Children = [new EntityA { Id = 10, Name = "Jen" }];
+        e1.Equals(e2).Should().BeTrue();
+        e1.Equals(e2AsA).Should().BeTrue();
+    }
+
+    [Test]
+    public void GetHashCode_Null_Zero()
+    {
+        RuntimeMetadata.GetHashCode<object>(null).Should().Be(0);
+    }
+
+    [Test]
+    public void GetHashCode_String()
+    {
+        RuntimeMetadata.GetHashCode("abc").Should().Be("abc".GetHashCode());
+    }
+
+    [Test]
+    public void GetHashCode_IRuntimeMetadata()
+    {
+        var e1 = new EntityA { Id = 1, Name = "Bob" };
+        var e2 = new EntityA { Id = 1, Name = "Bob" };
+        e1.GetHashCode().Should().Be(e2.GetHashCode());
+
+        e2.Name = "Fred";
+        e1.GetHashCode().Should().NotBe(e2.GetHashCode());
+    }
+
+    [Test]
+    public void GetHashCode_IEnumerable()
+    {
+        var arr1 = new[] { 1, 2, 3 };
+        var arr2 = new[] { 1, 2, 3 };
+        RuntimeMetadata.GetHashCode(arr1).Should().Be(RuntimeMetadata.GetHashCode(arr2));
+    }
+
+    [Test]
+    public void GetHashCode_Default()
+    {
+        RuntimeMetadata.GetHashCode(7).Should().Be(7.GetHashCode());
+    }
+
+    [Test]
+    public void IsDefault_TrueAndFalse()
+    {
+        var e1 = new EntityA { Id = 1, Name = "Mary" };
+        e1.IsDefault().Should().BeFalse();
+
+        // This is because the Contract generated code sets the default values.
+        e1.Id = 88;
+        e1.Name = "Bob";
+        e1.IsDefault().Should().BeTrue();
+    }
+
+    [Test]
+    public void IsDefault_Empty_ICollection()
+    {
+        EntityC? e = new()
+        {
+            Children = [],
+            Kids = []
+        };
+
+        e.IsDefault().Should().BeTrue();
+
+        e.Children = [new EntityA()];
+        e.IsDefault().Should().BeFalse();
+
+        e.Children = null;
+        e.IsDefault().Should().BeTrue();
+
+        e.Kids = new Dictionary<string, EntityA> { { "A", new EntityA() } };
+        e.IsDefault().Should().BeFalse();
+
+        e.Kids = null;
+        e.IsDefault().Should().BeTrue();
+    }
+
+    [Test]
+    public void CopyFrom_CopiesValues()
+    {
+        var e1 = new EntityB { Id = 1, Name = "Bob", Amount = 1.3m };
+        var e2 = new EntityB();
+        e2.CopyFrom(e1);
+        e2.Equals(e1).Should().BeTrue();
+
+        var eA = new EntityA { Id = 7, Name = "Fred" };
+        e2.CopyFrom(eA);
+        e2.Id.Should().Be(7);
+        e2.Name.Should().Be("Fred");
+
+        var eC = new EntityC { Id = 11, Name = "Jen", Amount = 2.3m, ChangeLog = new ChangeLog { CreatedBy = "Dave" }, Children = [new EntityA { Id = 10, Name = "Jen" }] };
+        e2.CopyFrom(eC);
+        e2.Id.Should().Be(11);
+        e2.Name.Should().Be("Jen");
+        e2.Amount.Should().Be(2.3m);
+    }
+
+    [Test]
+    public void CopyFrom_TypeNotAssignable_DoesNothing()
+    {
+        var e1 = new EntityB { Id = 1, Name = "Bob", Amount = 1.3m };
+        var e2 = new ChangeLog();
+        e1.CopyFrom(e2);
+
+        e1.Id.Should().Be(1);
+        e1.Name.Should().Be("Bob");
+        e1.Amount.Should().Be(1.3m);
+    }
+
+    [Test]
+    public void PropertyRuntimeMetadata_Text()
+    {
+        var a = new EntityA();
+        var pd = a.GetPropertyRuntimeMetadata().ToDictionary(p => p.Name);
+
+        var idProp = pd["Id"];
+        idProp.Text.KeyAndOrText.Should().Be("Id");
+        idProp.Text.FallbackText.Should().Be("Identifier"); // Not specified, so using Name.ToSentenceCase().
+
+        var nameProp = pd["Name"];
+        nameProp.Text.KeyAndOrText.Should().Be("Name");
+        nameProp.Text.FallbackText.Should().Be("NAME"); // From DisplayAttribute.
+
+        var b = new EntityB();
+        var pd2 = b.GetPropertyRuntimeMetadata().ToDictionary(p => p.Name);
+
+        var amtProp = pd2["Amount"];
+        amtProp.Text.KeyAndOrText.Should().Be("EntityB.Amount");
+        amtProp.Text.FallbackText.Should().Be("Dollars"); // From LTextAttribute, which takes precedence over DisplayAttribute.
+    }
+
+    [Test]
+    public void Read_Only_Property()
+    {
+        var d = new EntityD("123")
+        {
+            Code = "abc",
+            Description = "xyz"
+        };
+
+        // Copy all properties except Id (as readonly).
+        var d2 = new EntityD("456");
+        d2.CopyFrom(d);
+        d2.Id.Should().Be("456");
+        d2.Code.Should().Be("ABC");
+        d2.Description.Should().Be("xyz");
+        d2.IsDefault().Should().BeFalse();
+
+        // Check equality.
+        d.Equals(d2).Should().BeFalse();
+        d.GetHashCode().Should().NotBe(d2.GetHashCode());
+
+        d2 = new EntityD("123");
+        d2.CopyFrom(d);
+        d.Equals(d2).Should().BeTrue();
+        d.GetHashCode().Should().Be(d2.GetHashCode());
+
+        d2 = new EntityD(null!);
+        d2.IsDefault().Should().BeTrue();
+    }
+
+    [Test]
+    public void Clean_Including_Property_Graph()
+    {
+        var d = new EntityD("123")
+        {
+            Code = "abc  ",
+            Description = "  xyz   ",
+            Date = DateTime.Now,
+            ChangeLog = new ChangeLog() { CreatedBy = "" },
+            ChangeLog2 = new ChangeLog() { CreatedBy = "" },
+            Tags = [],
+            Strings = []
+        };
+
+        Cleaner.Clean(d);
+
+        d.Id.Should().Be("123");
+        d.Code.Should().Be("ABC");
+        d.Description.Should().Be("  xyz   ");
+        d.Date.Value.Kind.Should().Be(DateTimeKind.Unspecified);
+        d.Date.Value.TimeOfDay.Should().Be(TimeSpan.Zero);
+        d.ChangeLog.Should().BeNull();
+        d.ChangeLog2.Should().NotBeNull();
+        d.ChangeLog2.IsDefault().Should().BeTrue();
+        d.Tags.Should().BeNull(); // List
+        d.Strings.Should().NotBeNull().And.HaveCount(0); // Array
+    }
+
+    [Test]
+    public void GetPropertyRuntimeMetadata_Type_With_Reflection()
+    {
+        var prms = RuntimeMetadata.GetPropertyRuntimeMetadata(typeof(EntityC), "Kids", "Internal").ToArray();
+        prms.Length.Should().Be(5);
+        prms.Select(x => x.Name).Should().BeEquivalentTo(["Id", "Name", "Amount", "ChangeLog", "Children"]);
+
+        var c = new EntityC { Name = "BARRY" };
+        var p = prms.Single(p => p.Name == "Name");
+        p.GetValue(c).Should().Be("BARRY");
+
+        p.SetValue(c, "FRED");
+        c.Name.Should().Be("FRED");
+    }
+
+    [Test]
+    public void GetPropertyRuntimeMetadata_T_With_Reflection()
+    {
+        var prms = RuntimeMetadata.GetPropertyRuntimeMetadata<EntityE>().ToArray();
+        prms.Length.Should().Be(2);
+        prms.Select(x => x.Name).Should().BeEquivalentTo(["Id", "Name"]);
+
+        var c = new EntityE(88) { Name = "BARRY" };
+        var p = prms.Single(p => p.Name == "Name");
+        p.GetValue(c).Should().Be("BARRY");
+
+        p.SetValue(c, "FRED");
+        c.Name.Should().Be("FRED");
+    }
+
+    [Test]
+    public void GetPropertyRuntimeMetadata_PropertyExpression_IEntity()
+    {
+        var prm = RuntimeMetadata.GetForExpression<EntityC, string?>(c => c.Name);
+        prm.Name.Should().Be("Name");
+        prm.GetValue<string?>(new EntityC { Name = "BARRY" }).Should().Be("BARRY");
+    }
+
+    [Test]
+    public void GetPropertyRuntimeMetadata_PropertyExpression_Class()
+    {
+        var prm = RuntimeMetadata.GetForExpression<EntityE, string?>(e => e.Name);
+        prm.Name.Should().Be("Name");
+        prm.GetValue<string?>(new EntityE(88) { Name = "BARRY" }).Should().Be("BARRY");
+    }
+
+    [Test]
+    public void CopyInto_With_Reflection()
+    {
+        var e1 = new EntityE(1) { Name = "Bob" };
+        var e2 = new EntityE(2) { Name = "Kate" };
+
+        RuntimeMetadata.CopyInto(e1, e2);
+        e2.Id.Should().Be(2); // Not copied as read-only.
+        e2.Name.Should().Be("Bob");
+    }
+
+    public class EntityE(int id)
+    {
+        public int Id { get; } = id;
+        public string? Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Schemas/SchemaTests.cs b/tests/CoreEx.Test.Unit/Schemas/SchemaTests.cs
new file mode 100644
index 00000000..70335983
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Schemas/SchemaTests.cs
@@ -0,0 +1,61 @@
+using CoreEx.Schemas;
+
+namespace CoreEx.Test.Unit.Schemas;
+
+[TestFixture]
+public class SchemaTests
+{
+    [Test]
+    public void DefaultVersion_Is_1_0()
+    {
+        Schema.DefaultVersion.Should().Be(new Version(1, 0));
+    }
+
+    [Test]
+    public void DefaultVersionString_Is_1_0()
+    {
+        Schema.DefaultVersionString.Should().Be("1.0");
+    }
+
+    [Test]
+    public void TryGetMetadata_Generic_FoundAndNotFound()
+    {
+        // With attribute
+        var found = Schema.TryGetMetadata<WithSchema>(out var meta);
+        found.Should().BeTrue();
+        meta.Should().NotBeNull();
+        meta.VersionString.Should().Be("2.1");
+        meta.Name.Should().Be("WithSchema");
+
+        // Without attribute
+        var notFound = Schema.TryGetMetadata<NoSchema>(out var meta2);
+        notFound.Should().BeFalse();
+        meta2.Should().NotBeNull();
+        meta2.Version.Should().Be(Schema.DefaultVersion);
+        meta2.VersionString.Should().Be(Schema.DefaultVersionString);
+        meta2.Name.Should().Be("NoSchema");
+    }
+
+    [Test]
+    public void TryGetMetadata_ByType_FoundAndNotFound()
+    {
+        var withSchemaType = typeof(WithSchema);
+        var noSchemaType = typeof(NoSchema);
+
+        var found = Schema.TryGetMetadata(withSchemaType, out var meta);
+        found.Should().BeTrue();
+        meta.VersionString.Should().Be("2.1");
+        meta.Name.Should().Be("WithSchema");
+
+        var notFound = Schema.TryGetMetadata(noSchemaType, out var meta2);
+        notFound.Should().BeFalse();
+        meta2.Version.Should().Be(Schema.DefaultVersion);
+        meta2.VersionString.Should().Be(Schema.DefaultVersionString);
+        meta2.Name.Should().Be("NoSchema");
+    }
+
+    [Schema("2.1")]
+    private class WithSchema { }
+
+    private class NoSchema { }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Text/SentenceCaseTests.cs b/tests/CoreEx.Test.Unit/Text/SentenceCaseTests.cs
new file mode 100644
index 00000000..6fb32e26
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Text/SentenceCaseTests.cs
@@ -0,0 +1,365 @@
+using CoreEx.Text;
+
+namespace CoreEx.Test.Unit.Text;
+
+[TestFixture]
+public class SentenceCaseTests
+{
+    [TearDown]
+    public void TearDown()
+    {
+        // Reset static state after each test to avoid side effects.
+        SentenceCase.Substitutions = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) { { "Id", "Identifier" }, { "Etag", "ETag" } };
+        SentenceCase.LastWordRemovals = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Id" };
+        SentenceCase.SentenceCaseConverter = SentenceCase.SentenceCaseConversion;
+    }
+
+    #region ToPascalCase Tests
+
+    [TestCase("EmployeeId", "EmployeeId")]           // Already PascalCase
+    [TestCase("employeeId", "EmployeeId")]           // camelCase
+    [TestCase("employee_id", "EmployeeId")]          // snake_case
+    [TestCase("employee-id", "EmployeeId")]          // kebab-case
+    [TestCase("Employee Id", "EmployeeId")]          // space-separated
+    [TestCase("EMPLOYEE_ID", "EmployeeId")]          // ALL CAPS
+    [TestCase("XMLParser", "XmlParser")]             // Acronym
+    [TestCase("xml_parser", "XmlParser")]            // Acronym from snake
+    [TestCase("VarNameDB", "VarNameDb")]             // Trailing acronym
+    public void ToPascalCase_ValidInputs_ReturnsExpected(string input, string expected)
+    {
+        SentenceCase.ToPascalCase(input).Should().Be(expected);
+    }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void ToPascalCase_NullOrEmpty_ReturnsSame(string? input)
+    {
+        SentenceCase.ToPascalCase(input).Should().Be(input);
+    }
+
+    [TestCase("a", "A")]
+    [TestCase("A", "A")]
+    [TestCase("x", "X")]
+    public void ToPascalCase_SingleCharacter_ReturnsUppercase(string input, string expected)
+    {
+        SentenceCase.ToPascalCase(input).Should().Be(expected);
+    }
+
+    [TestCase("Employee", "Employee")]
+    [TestCase("employee", "Employee")]
+    [TestCase("EMPLOYEE", "Employee")]
+    public void ToPascalCase_SingleWord_ReturnsExpected(string input, string expected)
+    {
+        SentenceCase.ToPascalCase(input).Should().Be(expected);
+    }
+
+    #endregion
+
+    #region ToCamelCase Tests
+
+    [TestCase("EmployeeId", "employeeId")]
+    [TestCase("employeeId", "employeeId")]           // Already camelCase
+    [TestCase("employee_id", "employeeId")]
+    [TestCase("employee-id", "employeeId")]
+    [TestCase("Employee Id", "employeeId")]
+    [TestCase("XMLParser", "xmlParser")]
+    [TestCase("VarNameDB", "varNameDb")]
+    public void ToCamelCase_ValidInputs_ReturnsExpected(string input, string expected)
+    {
+        SentenceCase.ToCamelCase(input).Should().Be(expected);
+    }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void ToCamelCase_NullOrEmpty_ReturnsSame(string? input)
+    {
+        SentenceCase.ToCamelCase(input).Should().Be(input);
+    }
+
+    #endregion
+
+    #region ToKebabCase Tests
+
+    [TestCase("EmployeeId", "employee-id")]
+    [TestCase("employeeId", "employee-id")]
+    [TestCase("employee_id", "employee-id")]
+    [TestCase("employee-id", "employee-id")]         // Already kebab-case
+    [TestCase("Employee Id", "employee-id")]
+    [TestCase("XMLParser", "xml-parser")]
+    [TestCase("VarNameDB", "var-name-db")]
+    public void ToKebabCase_ValidInputs_ReturnsExpected(string input, string expected)
+    {
+        SentenceCase.ToKebabCase(input).Should().Be(expected);
+    }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void ToKebabCase_NullOrEmpty_ReturnsSame(string? input)
+    {
+        SentenceCase.ToKebabCase(input).Should().Be(input);
+    }
+
+    #endregion
+
+    #region ToSnakeCase Tests
+
+    [TestCase("EmployeeId", "employee_id")]
+    [TestCase("employeeId", "employee_id")]
+    [TestCase("employee_id", "employee_id")]         // Already snake_case
+    [TestCase("employee-id", "employee_id")]
+    [TestCase("Employee Id", "employee_id")]
+    [TestCase("XMLParser", "xml_parser")]
+    [TestCase("VarNameDB", "var_name_db")]
+    public void ToSnakeCase_ValidInputs_ReturnsExpected(string input, string expected)
+    {
+        SentenceCase.ToSnakeCase(input).Should().Be(expected);
+    }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void ToSnakeCase_NullOrEmpty_ReturnsSame(string? input)
+    {
+        SentenceCase.ToSnakeCase(input).Should().Be(input);
+    }
+
+    #endregion
+
+    #region SplitIntoWords Tests
+
+    [Test]
+    public void SplitIntoWords_PascalCase_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("EmployeeId").Should().Equal("Employee", "Id");
+    }
+
+    [Test]
+    public void SplitIntoWords_CamelCase_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("employeeId").Should().Equal("employee", "Id");
+    }
+
+    [Test]
+    public void SplitIntoWords_SnakeCase_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("employee_id").Should().Equal("employee", "id");
+    }
+
+    [Test]
+    public void SplitIntoWords_KebabCase_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("employee-id").Should().Equal("employee", "id");
+    }
+
+    [Test]
+    public void SplitIntoWords_SpaceSeparated_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("Employee Id").Should().Equal("Employee", "Id");
+    }
+
+    [Test]
+    public void SplitIntoWords_Acronyms_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("XMLParser").Should().Equal("XML", "Parser");
+        SentenceCase.SplitIntoWords("HTMLElement").Should().Equal("HTML", "Element");
+        SentenceCase.SplitIntoWords("IOStream").Should().Equal("IO", "Stream");
+        SentenceCase.SplitIntoWords("DBConnection").Should().Equal("DB", "Connection");
+        SentenceCase.SplitIntoWords("HTTPSConnection").Should().Equal("HTTPS", "Connection");
+    }
+
+    [Test]
+    public void SplitIntoWords_TrailingAcronym_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("VarNameDB").Should().Equal("Var", "Name", "DB");
+    }
+
+    [Test]
+    public void SplitIntoWords_ConsecutiveDelimiters_IgnoresEmpty()
+    {
+        SentenceCase.SplitIntoWords("employee__id").Should().Equal("employee", "id");
+        SentenceCase.SplitIntoWords("employee--id").Should().Equal("employee", "id");
+        SentenceCase.SplitIntoWords("employee  id").Should().Equal("employee", "id");
+    }
+
+    [Test]
+    public void SplitIntoWords_LeadingDelimiter_IgnoresLeading()
+    {
+        SentenceCase.SplitIntoWords("_employee").Should().Equal("employee");
+        SentenceCase.SplitIntoWords("-employee").Should().Equal("employee");
+        SentenceCase.SplitIntoWords(" employee").Should().Equal("employee");
+    }
+
+    [Test]
+    public void SplitIntoWords_TrailingDelimiter_IgnoresTrailing()
+    {
+        SentenceCase.SplitIntoWords("employee_").Should().Equal("employee");
+        SentenceCase.SplitIntoWords("employee-").Should().Equal("employee");
+        SentenceCase.SplitIntoWords("employee ").Should().Equal("employee");
+    }
+
+    [Test]
+    public void SplitIntoWords_LeadingAndTrailingDelimiters_IgnoresBoth()
+    {
+        SentenceCase.SplitIntoWords("_employee_id_").Should().Equal("employee", "id");
+    }
+
+    [Test]
+    public void SplitIntoWords_OnlyDelimiters_ReturnsEmpty()
+    {
+        SentenceCase.SplitIntoWords("___").Should().BeEmpty();
+        SentenceCase.SplitIntoWords("---").Should().BeEmpty();
+        SentenceCase.SplitIntoWords("   ").Should().BeEmpty();
+    }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void SplitIntoWords_NullOrEmpty_ReturnsEmpty(string? input)
+    {
+        SentenceCase.SplitIntoWords(input).Should().BeEmpty();
+    }
+
+    [Test]
+    public void SplitIntoWords_SingleWord_ReturnsSingleElement()
+    {
+        SentenceCase.SplitIntoWords("Employee").Should().Equal("Employee");
+        SentenceCase.SplitIntoWords("employee").Should().Equal("employee");
+    }
+
+    [Test]
+    public void SplitIntoWords_SingleCharacter_ReturnsSingleElement()
+    {
+        SentenceCase.SplitIntoWords("a").Should().Equal("a");
+        SentenceCase.SplitIntoWords("A").Should().Equal("A");
+    }
+
+    [Test]
+    public void SplitIntoWords_MixedFormats_ReturnsWords()
+    {
+        SentenceCase.SplitIntoWords("employee_IdValue").Should().Equal("employee", "Id", "Value");
+        SentenceCase.SplitIntoWords("get-UserName").Should().Equal("get", "User", "Name");
+        SentenceCase.SplitIntoWords("HTTP_Response").Should().Equal("HTTP", "Response");
+    }
+
+    #endregion
+
+    #region ToSentenceCase Tests
+
+    [TestCase("EmployeeId", "Employee")]             // Last word removal
+    [TestCase("ProductName", "Product name")]        // Mixed case
+    [TestCase("XMLParser", "XML parser")]            // Acronym
+    [TestCase("employee_id", "Employee")]            // From snake_case
+    [TestCase("VarNameDB", "Var name DB")]           // From docs example
+    [TestCase("eTag", "ETag")]                       // ETag substitution
+    [TestCase("etag", "ETag")]                       // ETag substitution
+    public void ToSentenceCase_ValidInputs_ReturnsExpected(string input, string expected)
+    {
+        SentenceCase.ToSentenceCase(input).Should().Be(expected);
+    }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void ToSentenceCase_NullOrEmpty_ReturnsSame(string? input)
+    {
+        SentenceCase.ToSentenceCase(input).Should().Be(input);
+    }
+
+    [Test]
+    public void ToSentenceCase_WithSubstitutions_AppliesCorrectly()
+    {
+        var original = SentenceCase.Substitutions;
+        try
+        {
+            SentenceCase.Substitutions = new() { { "Id", "Identifier" }, { "DB", "Database" } };
+            SentenceCase.ToSentenceCase("EmployeeIdCode").Should().Be("Employee identifier code");
+            SentenceCase.ToSentenceCase("VarNameDB").Should().Be("Var name database");
+        }
+        finally
+        {
+            SentenceCase.Substitutions = original;
+        }
+    }
+
+    [Test]
+    public void ToSentenceCase_WithLastWordRemovals_RemovesCorrectly()
+    {
+        var original = SentenceCase.LastWordRemovals;
+        try
+        {
+            SentenceCase.LastWordRemovals = ["Id", "Key"];
+            SentenceCase.ToSentenceCase("EmployeeId").Should().Be("Employee");
+            SentenceCase.ToSentenceCase("ProductKey").Should().Be("Product");
+            SentenceCase.ToSentenceCase("ProductName").Should().Be("Product name");
+        }
+        finally
+        {
+            SentenceCase.LastWordRemovals = original;
+        }
+    }
+
+    [Test]
+    public void ToSentenceCase_UsesConverter()
+    {
+        SentenceCase.SentenceCaseConverter = s => "fixed";
+        SentenceCase.ToSentenceCase("anything").Should().Be("fixed");
+    }
+
+    [Test]
+    public void ToSentenceCase_NullConverter_ReturnsInput()
+    {
+        SentenceCase.SentenceCaseConverter = null;
+        SentenceCase.ToSentenceCase("abcDEF").Should().Be("abcDEF");
+    }
+
+    #endregion
+
+    #region All Formats Conversion Tests
+
+    [Test]
+    public void AllFormats_EmployeeId_ConvertsCorrectly()
+    {
+        const string input = "EmployeeId";
+
+        SentenceCase.ToPascalCase(input).Should().Be("EmployeeId");
+        SentenceCase.ToCamelCase(input).Should().Be("employeeId");
+        SentenceCase.ToKebabCase(input).Should().Be("employee-id");
+        SentenceCase.ToSnakeCase(input).Should().Be("employee_id");
+        SentenceCase.ToSentenceCase(input).Should().Be("Employee");  // Last word removed
+    }
+
+    [Test]
+    public void AllFormats_XMLParser_ConvertsCorrectly()
+    {
+        const string input = "XMLParser";
+
+        SentenceCase.ToPascalCase(input).Should().Be("XmlParser");
+        SentenceCase.ToCamelCase(input).Should().Be("xmlParser");
+        SentenceCase.ToKebabCase(input).Should().Be("xml-parser");
+        SentenceCase.ToSnakeCase(input).Should().Be("xml_parser");
+        SentenceCase.ToSentenceCase(input).Should().Be("XML parser");
+    }
+
+    [Test]
+    public void AllFormats_FromSnakeCase_ConvertsCorrectly()
+    {
+        const string input = "employee_id";
+
+        SentenceCase.ToPascalCase(input).Should().Be("EmployeeId");
+        SentenceCase.ToCamelCase(input).Should().Be("employeeId");
+        SentenceCase.ToKebabCase(input).Should().Be("employee-id");
+        SentenceCase.ToSnakeCase(input).Should().Be("employee_id");
+        SentenceCase.ToSentenceCase(input).Should().Be("Employee");
+    }
+
+    [Test]
+    public void AllFormats_FromKebabCase_ConvertsCorrectly()
+    {
+        const string input = "employee-id";
+
+        SentenceCase.ToPascalCase(input).Should().Be("EmployeeId");
+        SentenceCase.ToCamelCase(input).Should().Be("employeeId");
+        SentenceCase.ToKebabCase(input).Should().Be("employee-id");
+        SentenceCase.ToSnakeCase(input).Should().Be("employee_id");
+        SentenceCase.ToSentenceCase(input).Should().Be("Employee");
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Validation/ValidationTests.cs b/tests/CoreEx.Test.Unit/Validation/ValidationTests.cs
new file mode 100644
index 00000000..6491c606
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Validation/ValidationTests.cs
@@ -0,0 +1,134 @@
+using CoreEx.Results;
+using CoreEx.Validation;
+
+namespace CoreEx.Test.Unit.Validation;
+
+[TestFixture]
+public class ValidationTests
+{
+    [TearDown]
+    public void TearDown()
+    {
+        // Reset static properties to defaults before each test to avoid side effects.
+        CoreEx.Validation.Validation.MandatoryFormat = new("CoreEx.Validation.MandatoryFormat", "{0} is required.");
+        CoreEx.Validation.Validation.ValueName = "value";
+        CoreEx.Validation.Validation.ValueText = new("CoreEx.Validation.ValueText", "Value");
+    }
+
+    [Test]
+    public void MandatoryFormat_StaticProperty()
+    {
+        CoreEx.Validation.Validation.MandatoryFormat = new("custom", "custom required");
+        CoreEx.Validation.Validation.MandatoryFormat.KeyAndOrText.Should().Be("custom");
+        CoreEx.Validation.Validation.MandatoryFormat.FallbackText.Should().Be("custom required");
+    }
+
+    [Test]
+    public void ValueNameDefault_StaticProperty()
+    {
+        CoreEx.Validation.Validation.ValueName = "foo";
+        CoreEx.Validation.Validation.ValueName.Should().Be("foo");
+    }
+
+    [Test]
+    public void ValueTextDefault_StaticProperty()
+    {
+        CoreEx.Validation.Validation.ValueText = new("bar", "Bar");
+        CoreEx.Validation.Validation.ValueText.KeyAndOrText.Should().Be("bar");
+        CoreEx.Validation.Validation.ValueText.FallbackText.Should().Be("Bar");
+    }
+
+    [Test]
+    public void Required_NonDefault_ReturnsValue()
+    {
+        var value = 123;
+        var result = value.Required();
+        result.Should().Be(123);
+    }
+
+    [Test]
+    public void Required_Default_ThrowsValidationException()
+    {
+        int value = 0;
+        Action act = () => value.Required();
+        act.Should().Throw<ValidationException>();
+    }
+
+    [Test]
+    public void Required_CustomNameAndText()
+    {
+        int value = 0;
+        Action act = () => value.Required("myValue", new("custom", "Custom"));
+        var ex = act.Should().Throw<ValidationException>()
+            .WithMessage("A data validation error occurred.")
+            .Which.Messages.Should().ContainSingle().Which.ToString().Should().Be("MessageItem { Type = Error, Text = Custom is required., Property = myValue }");
+    }
+
+    [Test]
+    public void Requires_ResultT_NonDefault_ReturnsResult()
+    {
+        var result = Result.Ok(5).Requires(5, "myValue");
+        result.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Requires_ResultT_Default_ReturnsFailure()
+    {
+        var result = Result.Ok(0).Requires(0, "myValue");
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+    }
+
+    [Test]
+    public void Requires_ResultT_CustomText()
+    {
+        var result = Result.Ok(0).Requires(0, "myValue", new("custom", "Custom"));
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        var vex = (ValidationException)result.Error;
+        vex.Message.Should().Be("A data validation error occurred.");
+        vex.Messages.Should().ContainSingle().Which.ToString().Should().Be("MessageItem { Type = Error, Text = Custom is required., Property = myValue }");
+    }
+
+    [Test]
+    public void Requires_ResultT_Func_NonDefault_ReturnsResult()
+    {
+        var result = Result.Ok(5).Requires(() => 5, "myValue");
+        result.IsSuccess.Should().BeTrue();
+    }
+
+    [Test]
+    public void Requires_ResultT_Func_Default_ReturnsFailure()
+    {
+        var result = Result.Ok(0).Requires(() => 0, "myValue");
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+    }
+
+    [Test]
+    public void Requires_ResultT_Func_CustomText()
+    {
+        var result = Result.Ok(0).Requires(() => 0, "myValue", "Custom");
+        result.IsFailure.Should().BeTrue();
+        result.Error.Should().BeOfType<ValidationException>();
+        var vex = (ValidationException)result.Error;
+        vex.Message.Should().Be("A data validation error occurred.");
+        vex.Messages.Should().ContainSingle().Which.ToString().Should().Be("MessageItem { Type = Error, Text = Custom is required., Property = myValue }");
+    }
+
+    [Test]
+    public void Requires_ResultT_Func_Null_Throws()
+    {
+        var result = Result.Ok(1);
+        Action act = () => result.Requires((Func<int>)null!, "myValue");
+        act.Should().Throw<ArgumentNullException>();
+    }
+
+    [Test]
+    public void Requires_ResultT_Func_EmptyName_Throws()
+    {
+        var result = Result.Ok(1);
+        Action act = () => result.Requires(() => 1, "");
+        act.Should().Throw<ArgumentException>();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test.Unit/Wildcards/WildcardTests.cs b/tests/CoreEx.Test.Unit/Wildcards/WildcardTests.cs
new file mode 100644
index 00000000..f5b993a0
--- /dev/null
+++ b/tests/CoreEx.Test.Unit/Wildcards/WildcardTests.cs
@@ -0,0 +1,130 @@
+using CoreEx.Wildcards;
+
+namespace CoreEx.Test.Unit.Wildcards;
+
+[TestFixture]
+public class WildcardTests
+{
+    [Test]
+    public void StaticProperties_AreCorrect()
+    {
+        Wildcard.None.SupportedSelection.Should().Be(WildcardSelection.None | WildcardSelection.Equal);
+        Wildcard.MultiBasic.SupportedSelection.Should().Be(WildcardSelection.MultiBasic);
+        Wildcard.MultiAll.SupportedSelection.Should().Be(WildcardSelection.MultiAll);
+        Wildcard.BothAll.SupportedSelection.Should().Be(WildcardSelection.BothAll);
+
+        var oldDefault = Wildcard.Default;
+        Wildcard.Default = Wildcard.BothAll;
+        Wildcard.Default.Should().Be(Wildcard.BothAll);
+        Wildcard.Default = oldDefault;
+    }
+
+    [Test]
+    public void Constructor_ValidConfig_SetsProperties()
+    {
+        var charsNotAllowed = new[] { '!', '@' };
+        var wc = new Wildcard(WildcardSelection.MultiAll, '*', '?', charsNotAllowed, WildcardSpaceTreatment.Compress);
+        wc.SupportedSelection.Should().Be(WildcardSelection.MultiAll);
+        wc.MultiWildcard.Should().Be('*');
+        wc.SingleWildcard.Should().Be('?');
+        wc.CharactersNotAllowed.Should().BeEquivalentTo(charsNotAllowed);
+        wc.SpaceTreatment.Should().Be(WildcardSpaceTreatment.Compress);
+    }
+
+    [Test]
+    public void Constructor_InvalidConfig_Throws()
+    {
+#pragma warning disable CA1806 // Do not ignore method results
+        Action a1 = () => new Wildcard(WildcardSelection.Undetermined);
+        a1.Should().Throw<ArgumentException>();
+
+        Action a2 = () => new Wildcard(WildcardSelection.InvalidCharacter);
+        a2.Should().Throw<ArgumentException>();
+
+        Action a3 = () => new Wildcard(WildcardSelection.MultiWildcard, '*', '*');
+        a3.Should().Throw<ArgumentException>();
+
+        Action a4 = () => new Wildcard(WildcardSelection.MultiWildcard, '*', '?', ['*']);
+        a4.Should().Throw<ArgumentException>();
+
+        Action a5 = () => new Wildcard(WildcardSelection.SingleWildcard, '*', char.MinValue);
+        a5.Should().Throw<ArgumentException>();
+
+        Action a6 = () => new Wildcard(WildcardSelection.MultiWildcard, char.MinValue, '?');
+        a6.Should().Throw<ArgumentException>();
+#pragma warning restore CA1806 // Do not ignore method results
+    }
+
+    [Test]
+    public void Parse_NullOrEmpty_ReturnsNone()
+    {
+        var wc = Wildcard.MultiBasic;
+        var result = wc.Parse(null);
+        result.Selection.Should().Be(WildcardSelection.None);
+        result.Text.Should().BeNull();
+
+        result = wc.Parse("");
+        result.Selection.Should().Be(WildcardSelection.None);
+        result.Text.Should().Be("");
+    }
+
+    [Test]
+    public void Parse_InvalidPatterns()
+    {
+        var wc = Wildcard.MultiBasic;
+        wc.Parse("a*b").HasError.Should().BeTrue();
+        wc.Parse("?bc").HasError.Should().BeTrue();
+        wc.Parse("a?c").HasError.Should().BeTrue();
+        wc.Parse("ab?").HasError.Should().BeTrue();
+    }
+
+    [Test]
+    public void Parse_ValidPatterns()
+    {
+        var wc = Wildcard.BothAll;
+        var r1 = wc.Parse("abc");
+        r1.Selection.Should().HaveFlag(WildcardSelection.Equal);
+        r1.Text.Should().Be("abc");
+        r1.CreateRegex().ToString().Should().Be("^abc$");
+
+        var r2 = wc.Parse("*abc");
+        r2.Selection.Should().HaveFlag(WildcardSelection.EndsWith);
+        r2.Selection.Should().HaveFlag(WildcardSelection.MultiWildcard);
+        r2.Text.Should().Be("*abc");
+        r2.CreateRegex().ToString().Should().Be("^.*abc$");
+
+        var r3 = wc.Parse("abc*");
+        r3.Selection.Should().HaveFlag(WildcardSelection.StartsWith);
+        r3.Selection.Should().HaveFlag(WildcardSelection.MultiWildcard);
+        r3.Text.Should().Be("abc*");
+        r3.CreateRegex().ToString().Should().Be("^abc.*$");
+
+        var r4 = wc.Parse("a*c");
+        r4.Selection.Should().HaveFlag(WildcardSelection.Embedded);
+        r4.Selection.Should().HaveFlag(WildcardSelection.MultiWildcard);
+        r4.Text.Should().Be("a*c");
+        r4.CreateRegex().ToString().Should().Be("^a.*c$");
+
+        var r5 = wc.Parse("a**c");
+        r5.Selection.Should().HaveFlag(WildcardSelection.Embedded);
+        r5.Selection.Should().HaveFlag(WildcardSelection.MultiWildcard);
+        r5.Selection.Should().HaveFlag(WildcardSelection.AdjacentWildcards);
+        r5.Text.Should().Be("a*c");
+        r5.CreateRegex().ToString().Should().Be("^a.*c$");
+
+        var r6 = wc.Parse("a?c");
+        r6.Selection.Should().HaveFlag(WildcardSelection.Embedded);
+        r6.Selection.Should().HaveFlag(WildcardSelection.SingleWildcard);
+        r6.Text.Should().Be("a?c");
+        r6.CreateRegex().ToString().Should().Be("^a.c$");
+    }
+
+    [Test]
+    public void Parse_InvalidCharacters()
+    {
+        var wc = new Wildcard(WildcardSelection.BothAll, '*', '?', ['!']);
+        var result = wc.Parse("a!b");
+        result.Selection.Should().HaveFlag(WildcardSelection.InvalidCharacter);
+        result.HasError.Should().BeTrue();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/CoreEx.Test.csproj b/tests/CoreEx.Test/CoreEx.Test.csproj
deleted file mode 100644
index 2cbacba2..00000000
--- a/tests/CoreEx.Test/CoreEx.Test.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.4">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="UnitTestEx.NUnit" Version="5.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Database.SqlServer\CoreEx.Database.SqlServer.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Database\CoreEx.Database.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Dataverse\CoreEx.Dataverse.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Newtonsoft\CoreEx.Newtonsoft.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.OData\CoreEx.OData.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Solace\CoreEx.Solace.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.UnitTesting.Azure.Functions\CoreEx.UnitTesting.Azure.Functions.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.UnitTesting.Azure.ServiceBus\CoreEx.UnitTesting.Azure.ServiceBus.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Azure\CoreEx.Azure.csproj" />
-    <ProjectReference Include="..\CoreEx.TestApi\CoreEx.TestApi.csproj" />
-    <ProjectReference Include="..\CoreEx.TestFunction\CoreEx.TestFunction.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.unittest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Abstractions/ObjectExtensionsTest.cs b/tests/CoreEx.Test/Framework/Abstractions/ObjectExtensionsTest.cs
deleted file mode 100644
index 3fd31921..00000000
--- a/tests/CoreEx.Test/Framework/Abstractions/ObjectExtensionsTest.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Abstractions
-{
-    [TestFixture]
-    public class ObjectExtensionsTest
-    {
-        [Test]
-        public void ThrowIfNull_WhenNull()
-        {
-            string aussie = null!;
-            var ex = Assert.Throws<ArgumentNullException>(() => aussie.ThrowIfNull());
-            Assert.That(ex!.ParamName, Is.EqualTo("aussie"));
-        }
-
-        [Test]
-        public void ThrowIfNull_WhenNotNull()
-        {
-            string aussie = "Aussie";
-            Assert.That(aussie.ThrowIfNull(), Is.EqualTo(aussie));
-        }
-
-        [Test]
-        public void Adjust_Value_NonNullable()
-        {
-            var p = new Person();
-            var p2 = p.Adjust(x => x.Name = "Babs");
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Name, Is.EqualTo("Babs"));
-                Assert.That(p2.Name, Is.EqualTo("Babs"));
-            });
-        }
-
-        [Test]
-        public void Adjust_Value_Nullable()
-        {
-            Person? p = null;
-            p.Adjust(x => x.Name = "Babs");
-            Assert.That(p, Is.Null);
-        }
-
-        [Test]
-        public void Adjust_Value_Nullable_With_Value()
-        {
-            Person? p = new();
-            var p2 = p.Adjust(x => x.Name = "Babs");
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Name, Is.EqualTo("Babs"));
-                Assert.That(p2.Name, Is.EqualTo("Babs"));
-            });
-        }
-
-        public class Person { public string? Name { get; set; } }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Abstractions/Reflection/PropertyExpressionTest.cs b/tests/CoreEx.Test/Framework/Abstractions/Reflection/PropertyExpressionTest.cs
deleted file mode 100644
index 94a70729..00000000
--- a/tests/CoreEx.Test/Framework/Abstractions/Reflection/PropertyExpressionTest.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Abstractions.Reflection
-{
-    [TestFixture]
-    public class PropertyExpressionTest
-    {
-        [Test]
-        public void Create()
-        {
-            var pe1 = PropertyExpression.Create<Person, int>(p => p.Id);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pe1.Name, Is.EqualTo("Id"));
-                Assert.That(pe1.JsonName, Is.EqualTo("id"));
-                Assert.That((string)pe1.Text, Is.EqualTo("Identifier"));
-                Assert.That(pe1.Text.KeyAndOrText, Is.EqualTo("CoreEx.Test.Framework.Abstractions.Reflection.Person.Id"));
-                Assert.That(pe1.IsJsonSerializable, Is.True);
-            });
-
-            var pe2 = PropertyExpression.Create<Person, string?>(p => p.Name);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pe2.Name, Is.EqualTo("Name"));
-                Assert.That(pe2.JsonName, Is.EqualTo("name"));
-                Assert.That((string)pe2.Text, Is.EqualTo("Fullname"));
-                Assert.That(pe2.IsJsonSerializable, Is.True);
-            });
-
-            var pe3 = PropertyExpression.Create<Person, Gender?>(p => p.Gender);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pe3.Name, Is.EqualTo("Gender"));
-                Assert.That(pe3.JsonName, Is.EqualTo("gender"));
-                Assert.That((string)pe3.Text, Is.EqualTo("Gender"));
-                Assert.That(pe3.IsJsonSerializable, Is.False);
-            });
-
-            var pe4 = PropertyExpression.Create<Person, ChangeLog?>(p => p.ChangeLog);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pe4.Name, Is.EqualTo("ChangeLog"));
-                Assert.That(pe4.JsonName, Is.EqualTo("changeLog"));
-                Assert.That((string)pe4.Text, Is.EqualTo("Change Log"));
-                Assert.That(pe4.IsJsonSerializable, Is.True);
-            });
-
-            var pe5 = PropertyExpression.Create<Person, string?>(p => p.Secret);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pe5.Name, Is.EqualTo("Secret"));
-                Assert.That(pe5.JsonName, Is.EqualTo(null));
-                Assert.That((string)pe5.Text, Is.EqualTo("Secret"));
-                Assert.That(pe5.IsJsonSerializable, Is.False);
-            });
-        }
-
-        [Test]
-        public void ToSentenceCase()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase(null), Is.Null);
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase(string.Empty), Is.EqualTo(string.Empty));
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase("Id"), Is.EqualTo("Identifier"));
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase("id"), Is.EqualTo("Identifier"));
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase("FirstName"), Is.EqualTo("First Name"));
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase("firstName"), Is.EqualTo("First Name"));
-                Assert.That(CoreEx.Text.SentenceCase.ToSentenceCase("EmployeeId"), Is.EqualTo("Employee"));
-            });
-
-            var w = CoreEx.Text.SentenceCase.SplitIntoWords("FirstXMLCode");
-            Assert.Multiple(() =>
-            {
-                Assert.That(w, Has.Length.EqualTo(3));
-                Assert.That(w[0], Is.EqualTo("First"));
-                Assert.That(w[1], Is.EqualTo("XML"));
-                Assert.That(w[2], Is.EqualTo("Code"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Abstractions/Reflection/TypeReflectorTest.cs b/tests/CoreEx.Test/Framework/Abstractions/Reflection/TypeReflectorTest.cs
deleted file mode 100644
index c0896c5d..00000000
--- a/tests/CoreEx.Test/Framework/Abstractions/Reflection/TypeReflectorTest.cs
+++ /dev/null
@@ -1,319 +0,0 @@
-using CoreEx.Abstractions.Reflection;
-using CoreEx.Entities;
-using CoreEx.RefData;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Diagnostics;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Test.Framework.Abstractions.Reflection
-{
-    [TestFixture]
-    public class TypeReflectorTest
-    {
-        [Test]
-        public void GetReflector()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(tr.GetProperty("Id"), Is.Not.Null);
-                Assert.That(tr.GetProperty("Name"), Is.Not.Null);
-                Assert.That(tr.GetProperty("GenderSid"), Is.Not.Null);
-                Assert.That(tr.GetProperty("Gender"), Is.Not.Null);
-                Assert.That(tr.GetProperty("Addresses"), Is.Not.Null);
-                Assert.That(tr.GetProperty("ChangeLog"), Is.Not.Null);
-                Assert.That(tr.GetProperty("Secret"), Is.Not.Null);
-                Assert.That(tr.GetProperty("NickNames"), Is.Not.Null);
-                Assert.That(tr.TryGetProperty("Bananas", out var _), Is.False);
-
-                Assert.That(tr.GetJsonProperty("id"), Is.Not.Null);
-                Assert.That(tr.GetJsonProperty("Id"), Is.Null);
-                Assert.That(tr.GetJsonProperty("name"), Is.Not.Null);
-                Assert.That(tr.GetJsonProperty("genderSid"), Is.Null);
-                Assert.That(tr.GetJsonProperty("gender"), Is.Not.Null);
-                Assert.That(tr.GetJsonProperty("addresses"), Is.Not.Null);
-                Assert.That(tr.GetJsonProperty("changeLog"), Is.Not.Null);
-                Assert.That(tr.GetJsonProperty("secret"), Is.Null);
-                Assert.That(tr.GetJsonProperty("nickNames"), Is.Not.Null);
-                Assert.That(tr.GetJsonProperty("bananas"), Is.Null);
-            });
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Id()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("Id");
-            Assert.That(pr.GetTypeReflector(), Is.Not.Null);
-
-            var p = new Person { Id = 88 };
-            Assert.That(pr.PropertyExpression.GetValue(p), Is.EqualTo(88));
-
-            pr.PropertyExpression.SetValue(p, 99);
-            Assert.That(p.Id, Is.EqualTo(99));
-
-            pr.PropertyExpression.SetValue(p, null!);
-            Assert.That(p.Id, Is.EqualTo(0));
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Gender()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetJsonProperty("gender");
-            Assert.That(pr, Is.Not.Null);
-            Assert.That(pr!.Name, Is.EqualTo("GenderSid"));
-
-            pr = tr.GetProperty("Gender");
-            Assert.That(pr.GetTypeReflector()!.Type.Name, Is.EqualTo("Gender"));
-
-            var g = new Gender { Code = "F" };
-            var p = new Person { Gender = g };
-
-            var g2 = (Gender)pr.PropertyExpression.GetValue(p)!;
-            Assert.That(g2.Code, Is.EqualTo("F"));
-
-            pr.PropertyExpression.SetValue(p, new Gender { Code = "M" });
-            Assert.That(p.Gender.Code, Is.EqualTo("M"));
-
-            pr.PropertyExpression.SetValue(p, null!);
-            Assert.That(p.Gender, Is.EqualTo(null));
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Addresses()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("Addresses");
-            Assert.That(pr.GetTypeReflector(), Is.Not.Null);
-
-            var a = new List<Address> { new() { Street = "s", City = "c" } };
-            var p = new Person { Addresses = a };
-
-            var a2 = (List<Address>)pr.PropertyExpression.GetValue(p)!;
-            Assert.That(a2[0].Street, Is.EqualTo("s"));
-
-            pr.PropertyExpression.SetValue(p, new List<Address> { new() { Street = "s2", City = "c2" } });
-            Assert.That(p.Addresses[0].Street, Is.EqualTo("s2"));
-
-            pr.PropertyExpression.SetValue(p, null!);
-            Assert.That(p.Addresses, Is.EqualTo(null));
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_NickNames()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("NickNames");
-            Assert.That(pr.GetTypeReflector(), Is.Not.Null);
-
-            var n = new string[] { "baz" };
-            var p = new Person { NickNames = n };
-
-            var a2 = (string[])pr.PropertyExpression.GetValue(p)!;
-            Assert.That(a2[0], Is.EqualTo("baz"));
-
-            pr.PropertyExpression.SetValue(p, new string[] { "gaz" });
-            Assert.That(p.NickNames[0], Is.EqualTo("gaz"));
-
-            pr.PropertyExpression.SetValue(p, null!);
-            Assert.That(p.NickNames, Is.EqualTo(null));
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Salary()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("Salary");
-            Assert.That(pr.GetTypeReflector(), Is.Not.Null);
-
-            var p = new Person { Salary = 1m };
-
-            pr.PropertyExpression.SetValue(p, 2m);
-            Assert.That(p.Salary, Is.EqualTo(2m));
-
-            pr.PropertyExpression.SetValue(p, null!);
-            Assert.That(p.Salary, Is.EqualTo(null));
-        }
-
-        [Test]
-        public void GetReflector_Compare_Int()
-        {
-            var tr = TypeReflector.GetReflector<int[]>(new TypeReflectorArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(tr.Compare(new int[] { 1, 2, 3 }, new int[] { 1, 2, 3 }), Is.True);
-                Assert.That(tr.Compare(new int[] { 1, 2, 3 }, new int[] { 1, 2, 4 }), Is.False);
-            });
-        }
-
-        [Test]
-        public void GetReflector_Compare_String()
-        {
-            var tr = TypeReflector.GetReflector<string[]>(new TypeReflectorArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(tr.Compare(["a", "aa"], ["a", "aa"]), Is.True);
-                Assert.That(tr.Compare(["a", "aa"], ["b", "bb"]), Is.False);
-            });
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Compare_Int()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("Id");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(pr.TypeCode, Is.EqualTo(TypeReflectorTypeCode.Simple));
-                Assert.That(pr.Compare(null, null), Is.True);
-                Assert.That(pr.Compare(1, null), Is.False);
-                Assert.That(pr.Compare(null, 2), Is.False);
-                Assert.That(pr.Compare(1, 2), Is.False);
-                Assert.That(pr.Compare(1, 1), Is.True);
-            });
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Compare_Nullable()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("Salary");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(pr.TypeCode, Is.EqualTo(TypeReflectorTypeCode.Simple));
-                Assert.That(pr.Compare(null, null), Is.True);
-                Assert.That(pr.Compare(1m, null), Is.False);
-                Assert.That(pr.Compare(null, 2m), Is.False);
-                Assert.That(pr.Compare(1m, 2m), Is.False);
-                Assert.That(pr.Compare(1m, 1m), Is.True);
-            });
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Compare_Array()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("NickNames");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(pr.TypeCode, Is.EqualTo(TypeReflectorTypeCode.Array));
-                Assert.That(pr.Compare(null, null), Is.True);
-                Assert.That(pr.Compare(new string[] { "a", "b" }, null), Is.False);
-                Assert.That(pr.Compare(null, new string[] { "y", "z" }), Is.False);
-                Assert.That(pr.Compare(new string[] { "a", "b" }, new string[] { "y", "z" }), Is.False);
-                Assert.That(pr.Compare(new string[] { "a", "b" }, new string[] { "a", "b", "c" }), Is.False);
-                Assert.That(pr.Compare(new string[] { "a", "b" }, new string[] { "a", "b" }), Is.True);
-            });
-        }
-
-        [Test]
-        public void GetReflector_PropertyReflector_Compare_Collection()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var pr = tr.GetProperty("Addresses");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(pr.TypeCode, Is.EqualTo(TypeReflectorTypeCode.ICollection));
-                Assert.That(pr.Compare(null, null), Is.True);
-                Assert.That(pr.Compare(new List<Address>(), new List<Address>()), Is.True);
-
-                // No equality check for Address, so will all fail.
-                Assert.That(pr.Compare(new List<Address> { new() }, new List<Address> { new() }), Is.False);
-                Assert.That(pr.Compare(null, new List<Address> { new() }), Is.False);
-                Assert.That(pr.Compare(new List<Address> { new() }, null), Is.False);
-                Assert.That(pr.Compare(new List<Address> { new() }, new List<Address> { new(), new() }), Is.False);
-            });
-        }
-
-        [Test]
-        public void GetReflector_TypeCode_And_ItemType()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(TypeReflector.GetReflector<string>(new TypeReflectorArgs()).TypeCode, Is.EqualTo(TypeReflectorTypeCode.Simple));
-                Assert.That(TypeReflector.GetReflector<int>(new TypeReflectorArgs()).TypeCode, Is.EqualTo(TypeReflectorTypeCode.Simple));
-                Assert.That(TypeReflector.GetReflector<string?[]>(new TypeReflectorArgs()).TypeCode, Is.EqualTo(TypeReflectorTypeCode.Array));
-                Assert.That(TypeReflector.GetReflector<List<decimal?>>(new TypeReflectorArgs()).TypeCode, Is.EqualTo(TypeReflectorTypeCode.ICollection));
-                Assert.That(TypeReflector.GetReflector<Dictionary<string, Person>>(new TypeReflectorArgs()).TypeCode, Is.EqualTo(TypeReflectorTypeCode.IDictionary));
-                Assert.That(TypeReflector.GetReflector<Person>(new TypeReflectorArgs()).TypeCode, Is.EqualTo(TypeReflectorTypeCode.Complex));
-
-                Assert.That(TypeReflector.GetReflector<string>(new TypeReflectorArgs()).ItemType, Is.EqualTo(null));
-                Assert.That(TypeReflector.GetReflector<int>(new TypeReflectorArgs()).ItemType, Is.EqualTo(null));
-                Assert.That(TypeReflector.GetReflector<string?[]>(new TypeReflectorArgs()).ItemType, Is.EqualTo(typeof(string)));
-                Assert.That(TypeReflector.GetReflector<List<decimal?>>(new TypeReflectorArgs()).ItemType, Is.EqualTo(typeof(decimal?)));
-                Assert.That(TypeReflector.GetReflector<Dictionary<string, Person>>(new TypeReflectorArgs()).ItemType, Is.EqualTo(typeof(Person)));
-                Assert.That(TypeReflector.GetReflector<Person>(new TypeReflectorArgs()).ItemType, Is.EqualTo(null));
-            });
-        }
-
-        [Test]
-        public void SetValues()
-        {
-            var tr = TypeReflector.GetReflector<Person>(new TypeReflectorArgs());
-            var p = new Person();
-            tr.GetProperty("Id").PropertyExpression.SetValue(p, 88);
-            tr.GetProperty("Name").PropertyExpression.SetValue(p, "foo");
-
-            var sw = Stopwatch.StartNew();
-            for (int i = 0; i < 100000; i++)
-            {
-                _ = new Person
-                {
-                    Id = 88,
-                    Name = "foo"
-                };
-            }
-
-            sw.Stop();
-            System.Console.WriteLine($"Raw 100K validations - elapsed: {sw.Elapsed.TotalMilliseconds}ms (per {sw.Elapsed.TotalMilliseconds / 100000}ms)");
-
-            sw = Stopwatch.StartNew();
-            for (int i = 0; i < 100000; i++)
-            {
-                p = new Person();
-                tr.GetProperty("Id").PropertyExpression.SetValue(p, 88);
-                tr.GetProperty("Name").PropertyExpression.SetValue(p, "foo");
-            }
-
-            sw.Stop();
-            System.Console.WriteLine($"Expression 100K validations - elapsed: {sw.Elapsed.TotalMilliseconds}ms (per {sw.Elapsed.TotalMilliseconds / 100000}ms)");
-        }
-    }
-
-    public abstract class PersonBase
-    {
-        public abstract int Id { get; set; }
-    }
-
-    public class Person : PersonBase
-    {
-        public override int Id { get; set; }
-        [Display(Name = "Fullname")]
-        public string? Name { get; set; }
-        [JsonPropertyName("gender")]
-        public string? GenderSid { get; set; }
-        [JsonIgnore]
-        public Gender? Gender { get; set; }
-        public List<Address>? Addresses { get; set; }
-        public ChangeLog? ChangeLog { get; set; }
-        [JsonIgnore]
-        public string? Secret { get; set; }
-        public string[]? NickNames { get; set; }
-        public decimal? Salary { get; set; }
-    }
-
-    public class Address
-    {
-        public string? Street { get; set; }
-        public string? City { get; set; }
-    }
-
-    public class Gender : ReferenceDataBase<int> { }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Azure/ServiceBus/EventDataToServiceBusConverterTest.cs b/tests/CoreEx.Test/Framework/Azure/ServiceBus/EventDataToServiceBusConverterTest.cs
deleted file mode 100644
index 2d1d3b12..00000000
--- a/tests/CoreEx.Test/Framework/Azure/ServiceBus/EventDataToServiceBusConverterTest.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-using Azure.Core.Amqp;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Events;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using System;
-using System.Net.Mime;
-using System.Threading.Tasks;
-using Az = Azure.Messaging.ServiceBus;
-
-namespace CoreEx.Test.Framework.Azure.ServiceBus
-{
-    [TestFixture]
-    public class EventDataToServiceBusConverterTest
-    {
-        [Test]
-        public async Task Convert_NoValue_Using_TextJsonEventSerialization_ToAndFrom()
-        {
-            var c = new EventDataToServiceBusConverter();
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY" });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage());
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter();
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            AssertEventData(e);
-        }
-
-        [Test]
-        public async Task Convert_WithValue_Using_TextJsonEventSerialization_ToAndFrom()
-        {
-            var c = new EventDataToServiceBusConverter();
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", Value = new Product { Id = "X", Name = "Xxx", Price = 9.99m } });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage());
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter();
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            AssertEventData(e);
-
-            var ep = await edc.ConvertFromAsync<Product>(rm, default);
-            AssertEventData(ep);
-
-            ep = (EventData<Product>)await edc.ConvertFromAsync(rm, typeof(Product), default);
-            AssertEventData(ep);
-        }
-
-        [Test]
-        public async Task Convert_NoValue_Using_TextJsonEventSerialization_All_ToAndFrom()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer { SerializeValueOnly = false };
-
-            var c = new EventDataToServiceBusConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY" });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage());
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter(es);
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            AssertEventData(e);
-        }
-
-        [Test]
-        public async Task Convert_WithValue_Using_TextJsonEventSerialization_All_ToAndFrom()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer { SerializeValueOnly = false };
-
-            var c = new EventDataToServiceBusConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", Value = new Product { Id = "X", Name = "Xxx", Price = 9.99m } });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage());
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter(es);
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            AssertEventData(e);
-
-            var ep = await edc.ConvertFromAsync<Product>(rm, default);
-            AssertEventData(ep);
-
-            ep = (EventData<Product>)await edc.ConvertFromAsync(rm, typeof(Product), default);
-            AssertEventData(ep);
-        }
-
-        [Test]
-        public async Task Convert_NoValue_Using_TextJsonCloudEventSerialization_All_ToAndFrom()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer();
-
-            var c = new EventDataToServiceBusConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Source = new Uri("xxx", UriKind.Relative), Action = "YYY" });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage());
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter(es);
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            AssertEventData(e);
-        }
-
-        [Test]
-        public async Task Convert_As_PlainText()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer();
-
-            var c = new EventDataToServiceBusConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Source = new Uri("xxx", UriKind.Relative), Action = "YYY" });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage(), c => { c.Properties.ContentType = MediaTypeNames.Text.Plain; c.Body = new AmqpMessageBody(new ReadOnlyMemory<byte>[] { new BinaryData("Blah").ToMemory()[..] }); });
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter(es);
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(e.Value, Is.Not.Null.And.EqualTo("Blah"));
-                Assert.That(m.Subject, Is.EqualTo("xxx"));
-            });
-        }
-
-        [Test]
-        public async Task Convert_Value_As_PlainText()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer();
-
-            var c = new EventDataToServiceBusConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Source = new Uri("xxx", UriKind.Relative), Action = "YYY" });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage(), c => { c.Properties.ContentType = MediaTypeNames.Text.Plain; c.Body = new AmqpMessageBody(new ReadOnlyMemory<byte>[] { new BinaryData("Blah").ToMemory()[..] }); });
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter(es);
-            var e = await edc.ConvertFromAsync(rm, typeof(string), default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(e.Value, Is.Not.Null.And.EqualTo("Blah"));
-                Assert.That(m.Subject, Is.EqualTo("xxx"));
-            });
-        }
-
-        [Test]
-        public async Task Convert_WithValue_Using_TextJsonCloudEventSerialization_All_ToAndFrom()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer();
-
-            var c = new EventDataToServiceBusConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", Source = new Uri("xxx", UriKind.Relative), Value = new Product { Id = "X", Name = "Xxx", Price = 9.99m } });
-            AssertServiceBusMessage(m);
-
-            var rm = CreateServiceBusReceivedMessageFromAmqp(m.GetRawAmqpMessage());
-
-            var edc = new ServiceBusReceivedMessageEventDataConverter(es);
-            var e = await edc.ConvertFromAsync(rm, null, default);
-            AssertEventData(e);
-
-            var ep = await edc.ConvertFromAsync<Product>(rm, default);
-            AssertEventData(ep);
-
-            ep = (EventData<Product>)await edc.ConvertFromAsync(rm, typeof(Product), default);
-            AssertEventData(ep);
-        }
-
-        private static Az.ServiceBusReceivedMessage CreateServiceBusReceivedMessageFromAmqp(AmqpAnnotatedMessage message, Action<AmqpAnnotatedMessage>? config = null)
-        {
-            if (message == null) throw new ArgumentNullException("message");
-
-            config?.Invoke(message);
-
-            message.Header.DeliveryCount = 1;
-            message.Header.Durable = true;
-            message.Header.Priority = 1;
-            message.Header.TimeToLive = TimeSpan.FromSeconds(60);
-
-            var t = typeof(Az.ServiceBusReceivedMessage);
-            var c = t.GetConstructor(System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance, null, new Type[] { typeof(AmqpAnnotatedMessage) }, null);
-            return c == null
-                ? throw new InvalidOperationException($"'{typeof(Az.ServiceBusReceivedMessage).Name}' constructor that accepts Type '{typeof(AmqpAnnotatedMessage).Name}' parameter was not found.")
-                : (Az.ServiceBusReceivedMessage)c.Invoke(new object?[] { message });
-        }
-
-        private static void AssertServiceBusMessage(Az.ServiceBusMessage? m)
-        {
-            Assert.That(m, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(m!.MessageId, Is.EqualTo("123"));
-                Assert.That(m.Subject, Is.EqualTo("xxx"));
-                Assert.That(m.ApplicationProperties.TryGetValue(nameof(EventData.Action), out var a), Is.True);
-                Assert.That(a, Is.EqualTo("yyy"));
-            });
-        }
-
-        private static void AssertEventData(EventData e)
-        {
-            Assert.That(e, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(e.Id, Is.EqualTo("123"));
-                Assert.That(e.Subject, Is.EqualTo("xxx"));
-                Assert.That(e.Action, Is.EqualTo("yyy"));
-            });
-        }
-
-        private static void AssertEventData(EventData<Product> ep)
-        {
-            Assert.That(ep, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ep.Id, Is.EqualTo("123"));
-                Assert.That(ep.Subject, Is.EqualTo("xxx"));
-                Assert.That(ep.Action, Is.EqualTo("yyy"));
-                Assert.That(ep.Value, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(ep.Value.Id, Is.EqualTo("X"));
-                Assert.That(ep.Value.Name, Is.EqualTo("Xxx"));
-                Assert.That(ep.Value.Price, Is.EqualTo(9.99m));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Azure/Storage/BlobAttachmentStorageTest.cs b/tests/CoreEx.Test/Framework/Azure/Storage/BlobAttachmentStorageTest.cs
deleted file mode 100644
index da2ba293..00000000
--- a/tests/CoreEx.Test/Framework/Azure/Storage/BlobAttachmentStorageTest.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using Azure.Storage.Blobs;
-using CoreEx.Azure.Storage;
-using CoreEx.Events;
-using NUnit.Framework;
-using System;
-using System.Threading;
-
-namespace CoreEx.Test.Framework.Azure.Storage
-{
-    [TestFixture]
-    public class BlobAttachmentStorageTest
-    {
-        private BlobContainerClient? _bcc;
-
-        [OneTimeSetUp]
-        public void Init()
-        {
-            var containerName = "testevents";
-            var csn = $"{nameof(BlobAttachmentStorage)}ConnectionString";
-            var cs = Environment.GetEnvironmentVariable(csn);
-            if (cs is null)
-                Assert.Inconclusive($"Test cannot run as the environment variable '{csn}' is not defined.");
-
-            _bcc = new BlobContainerClient(cs, containerName);
-            _bcc.CreateIfNotExists();
-        }
-
-        [Test]
-        public void BlobAttachmentStorage_SuccessfulSendToStorage()
-        {
-            var testEvent = new EventData { Id = Guid.NewGuid().ToString() };
-            var eventData = "{ \"data\": \"1234\" }";
-            var attachmentData = new BinaryData(eventData);
-            var bas = new BlobAttachmentStorage(_bcc!);
-
-            var result = bas.WriteAsync(testEvent, attachmentData, CancellationToken.None).Result;
-
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Attachment, Is.Not.Null);
-            Assert.That(result.Attachment!.Contains(testEvent.Id), Is.True);
-
-            var eventReceivedData = bas.ReadAync(result, CancellationToken.None).Result;
-
-            Assert.That(eventReceivedData, Is.Not.Null);
-            Assert.That(eventReceivedData.ToString(), Is.EqualTo(eventData));
-
-            _bcc!.DeleteBlob($"{testEvent.Id}.json");
-        }
-
-        [Test]
-        public void BlobSasAttachmentStorage_SuccessfulSendToStorage()
-        {
-            var testEvent = new EventData { Id = Guid.NewGuid().ToString() };
-            var eventData = "{ \"id\": \"1234\" }";
-            var attachmentData = new BinaryData(eventData);
-            var bas = new BlobSasAttachmentStorage(_bcc!);
-
-            var result = bas.WriteAsync(testEvent, attachmentData, CancellationToken.None).Result;
-
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Attachment, Is.Not.Null);
-            Assert.That(result.Attachment!.Contains(testEvent.Id), Is.True);
-
-            var eventReceivedData = bas.ReadAync(result, CancellationToken.None).Result;
-
-            Assert.That(eventReceivedData, Is.Not.Null);
-            Assert.That(eventReceivedData.ToString(), Is.EqualTo(eventData));
-
-            _bcc!.DeleteBlob($"{testEvent.Id}.json");
-        }
-
-        [Test]
-        public void BlobAttachmentStorage_WithTenantId_SetsProperContainer()
-        {
-            var testTenantId = "112233";
-            var testEvent = new EventData { Id = Guid.NewGuid().ToString(), TenantId = testTenantId };
-            var eventData = "{ \"id\": \"1234\" }";
-            var attachmentData = new BinaryData(eventData);
-            var bas = new BlobAttachmentStorage(_bcc!);
-
-            var result = bas.WriteAsync(testEvent, attachmentData, CancellationToken.None).Result;
-
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Attachment, Is.Not.Null);
-            Assert.That(result.Attachment!.Contains($"{testTenantId}/{testEvent.Id}"), Is.True);
-        }
-
-        [Test]
-        public void BlobSasAttachmentStorage_WithTenantId_SetsProperContainer()
-        {
-            var testTenantId = "112233";
-            var testEvent = new EventData { Id = Guid.NewGuid().ToString(), TenantId = testTenantId };
-            var eventData = "{ \"id\": \"1234\" }";
-            var attachmentData = new BinaryData(eventData);
-            var bas = new BlobSasAttachmentStorage(_bcc!);
-
-            var result = bas.WriteAsync(testEvent, attachmentData, CancellationToken.None).Result;
-
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Attachment, Is.Not.Null);
-            Assert.That(result.Attachment!.Contains($"{testTenantId}/{testEvent.Id}"), Is.True);
-        }
-
-        [OneTimeTearDown]
-        public void Cleanup()
-        {
-            // Cleanup
-            _bcc?.Delete();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Azure/Storage/BlobLockSynchronizerTest.cs b/tests/CoreEx.Test/Framework/Azure/Storage/BlobLockSynchronizerTest.cs
deleted file mode 100644
index 4b771015..00000000
--- a/tests/CoreEx.Test/Framework/Azure/Storage/BlobLockSynchronizerTest.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Azure.Storage.Blobs;
-using CoreEx.Azure.Storage;
-using NUnit.Framework;
-using System;
-using System.Threading;
-
-namespace CoreEx.Test.Framework.Azure.Storage
-{
-    [TestFixture]
-    public class BlobLockSynchronizerTest
-    {
-        /// <summary>
-        /// If this test fails check in the Azure Portal to make sure the lease is available, or file does not exist.
-        /// </summary>
-        [Test]
-        public void EnterAndExit_AutoRenew()
-        {
-            var csn = $"{nameof(BlobLeaseSynchronizer)}ConnectionString";
-            var cs = Environment.GetEnvironmentVariable(csn);
-            if (cs is null)
-                Assert.Inconclusive($"Test cannot run as the environment variable '{csn}' is not defined.");
-
-            var bcc = new BlobContainerClient(cs, "event-synchronizer");
-            var bls = new TestBlobLockSynchronizer(bcc);
-            var bls2 = new TestBlobLockSynchronizer(bcc);
-
-            Assert.Multiple(() =>
-            {
-                // Acquire lease.
-                Assert.That(bls.Enter<int>(), Is.True);
-
-                // Try immediately.
-                Assert.That(bls2.Enter<int>(), Is.False);
-            });
-
-            // Try within the initial lease time.
-            Thread.Sleep(12000);
-            Assert.That(bls2.Enter<int>(), Is.False);
-
-            // Try and should have been renewed.
-            Thread.Sleep(12000);
-            Assert.That(bls2.Enter<int>(), Is.False);
-
-            // Release it.
-            bls.Exit<int>();
-
-            Assert.Multiple(() =>
-            {
-                // And final quick go around again.
-                Assert.That(bls.Enter<int>(), Is.True);
-                Assert.That(bls2.Enter<int>(), Is.False);
-            });
-            bls.Exit<int>();
-        }
-    }
-
-    public class TestBlobLockSynchronizer : BlobLeaseSynchronizer
-    {
-        public TestBlobLockSynchronizer(BlobContainerClient client) : base(client) { }
-
-        public override TimeSpan LeaseDuration => TimeSpan.FromSeconds(20);
-
-        public override TimeSpan AutoRenewLeaseDuration => TimeSpan.FromSeconds(15);
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Caching/RequestCacheTest.cs b/tests/CoreEx.Test/Framework/Caching/RequestCacheTest.cs
deleted file mode 100644
index 6333735b..00000000
--- a/tests/CoreEx.Test/Framework/Caching/RequestCacheTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using CoreEx.Caching;
-using CoreEx.Entities;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Caching
-{
-    [TestFixture]
-    public class RequestCacheTest
-    {
-        [Test]
-        public void CacheKeyEntityKeyPrecedence()
-        {
-            var e = new Entity();
-
-            var rc = new RequestCache();
-            rc.SetValue(e);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc.TryGetValue(new CompositeKey(1), out Entity? value), Is.False);
-                Assert.That(rc.TryGetValue(new CompositeKey(2), out value), Is.True);
-            });
-        }
-    }
-
-    public class Entity : IEntityKey, ICacheKey
-    {
-        public CompositeKey EntityKey => new(1);
-        public CompositeKey CacheKey => new(2);
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Caching/ResultExtensionsTest.cs b/tests/CoreEx.Test/Framework/Caching/ResultExtensionsTest.cs
deleted file mode 100644
index 1b18d7c7..00000000
--- a/tests/CoreEx.Test/Framework/Caching/ResultExtensionsTest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using CoreEx.Caching;
-using CoreEx.Results;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Caching
-{
-    [TestFixture]
-    internal class ResultExtensionsTest
-    {
-        [Test]
-        public async Task CacheGetOrAddAsync_PreExisting()
-        {
-            var rc = new RequestCache();
-            rc.SetValue("a", 88);
-
-            var r = await Result.Go().CacheGetOrAddAsync(rc, "a", () => Task.FromResult(Result.Go(99)));
-            Assert.That(r.Value, Is.EqualTo(88));
-        }
-
-        [Test]
-        public async Task CacheGetOrAddAsync_NotExisting()
-        {
-            var rc = new RequestCache();
-            rc.SetValue("b", 88);
-
-            var r = await Result.Go().CacheGetOrAddAsync(rc, "a", () => Task.FromResult(Result.Go(99)));
-            Assert.That(r.Value, Is.EqualTo(99));
-        }
-
-        [Test]
-        public async Task CacheGetOrAddAsync_PreError()
-        {
-            var rc = new RequestCache();
-            rc.SetValue("a", 88);
-
-            var r = await Result.Fail("bad").CacheGetOrAddAsync(rc, "a", () => Task.FromResult(Result.Go(99)));
-            Assert.That(r.IsFailure, Is.True);
-        }
-
-        [Test]
-        public async Task CacheGetOrAddAsync_FactoryError()
-        {
-            var rc = new RequestCache();
-            rc.SetValue("b", 88);
-
-            var r = await Result.Go().CacheGetOrAddAsync(rc, "a", () => Task.FromResult(Result<int>.Fail("bad")));
-            Assert.That(r.IsFailure, Is.True);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Configuration/SettingsBaseTest.cs b/tests/CoreEx.Test/Framework/Configuration/SettingsBaseTest.cs
deleted file mode 100644
index de3a16b1..00000000
--- a/tests/CoreEx.Test/Framework/Configuration/SettingsBaseTest.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using FluentAssertions;
-using Microsoft.Extensions.Configuration;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Configuration
-{
-    [TestFixture, NonParallelizable]
-    public class SettingsBaseTest
-    {
-        public class SettingsForTesting : SettingsBase
-        {
-            public SettingsForTesting(IConfiguration configuration, params string[] prefixes) : base(configuration, prefixes)
-            {
-            }
-
-            public string PropTest => GetValue<string>();
-
-            [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1822:Mark members as static", Justification = "<Pending>")]
-            public string PropTest2 => "some hardcoded value";
-
-            public string SomethingGlobal => GetValue<string>();
-            public string PropTestNested => GetValue<string>(defaultValue: SomethingGlobal);
-
-        }
-
-        private static IConfiguration CreateTestConfiguration()
-        {
-            Environment.SetEnvironmentVariable("this_is_a_unittest_underscore__key", "underscoreValue");
-            ConfigurationBuilder builder = new();
-            Dictionary<string, string> testSettings = new()
-            {
-                {"SomethingGlobal", "foo"},
-                {"prefix1/key1", "value1"},
-                {"prefix2/key2", "value2"},
-                {"common/key2", "commonValue2"},
-                {"very/custom/prefix/key3", "value3"},
-                {"key2", "globalValue2"}
-            };
-            builder.AddInMemoryCollection(testSettings);
-            return builder.AddEnvironmentVariables("this_is_a_unittest_").Build();
-        }
-
-        [Test]
-        public void CommonSettings_Should_Not_ThrowException_When_ConfigurationNull()
-        {
-            _ = new SettingsForTesting(null!);
-        }
-
-        [Test]
-        public void CommonSettings_Should_ThrowException_When_PrefixesNull()
-        {
-            // Arrange
-            var configuration = CreateTestConfiguration();
-
-            // Act
-            Action act = () => _ = new SettingsForTesting(configuration, prefixes: null!);
-
-            // Assert
-            act.Should().NotThrow<ArgumentNullException>();
-        }
-
-        [Test]
-        public void CommonSettings_Should_ThrowException_When_PrefixIsNullOrEmpty()
-        {
-            // Arrange
-            var configuration = CreateTestConfiguration();
-            var prefixes = new string[] { "foo", string.Empty };
-
-            // Act
-            Action act = () => _ = new SettingsForTesting(configuration, prefixes);
-
-            // Assert
-            act.Should().Throw<ArgumentException>();
-        }
-
-        [Test]
-        public void GetValue_Should_Return_Default_Value_When_Key_Not_Found()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "prefix2/", "Common/" });
-
-            var result = settings.GetValue<string>("key2", "foo");
-
-            // Assert
-            result.Should().Be("value2", because: "First matched prefix is returned, Sample prefix takes precedence");
-        }
-
-        [Test]
-        public void GetValueByFullKey_Should_Return_Value_When_Key_Found()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.GetValue<string>("very/custom/prefix/key3");
-
-            // Assert
-            result.Should().Be("value3");
-        }
-
-        [Test]
-        public void GetValueByFullKey_Should_Return_Value_When_Key_FoundWithoutPrefix()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.GetValue<string>("SomethingGlobal");
-
-            // Assert
-            result.Should().Be("foo");
-        }
-
-        [Test]
-        public void GetValueByFullKey_Should_Return_Default_When_Key_NotFound()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.GetValue<bool>("very/custom/notfound", true);
-
-            // Assert
-            result.Should().Be(true);
-        }
-
-        [Test]
-        public void GetValue_Should_Return_LastPrefixMatched_Value()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.GetValue<bool>("very/custom/notfound", true);
-
-            // Assert
-            result.Should().Be(true);
-        }
-
-        [Test]
-        public void GetValue_Should_Return_Value_When_KeysWithDoubleUnderscores()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.GetValue<string>("underscore__key");
-
-            // Assert
-            result.Should().Be("underscoreValue");
-        }
-
-        [Test]
-        public void GetValue_Should_Return_Value_When_SemicolonKeyUsedForDoubleUnderscore()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.GetValue<string>("underscore:key");
-
-            // Assert
-            result.Should().Be("underscoreValue");
-        }
-
-        [Test]
-        public void GetValue_Should_Return_Value_From_Property_When_Class_Has_it()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.PropTest2;
-
-            // Assert
-            result.Should().Be("some hardcoded value");
-        }
-
-        [Test]
-        public void GetValue_Should_Return_Value_From_NestedProperty_When_Class_Has_it()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var result = settings.PropTestNested;
-
-            // Assert
-            settings.SomethingGlobal.Should().Be("foo");
-            result.Should().Be("foo");
-        }
-
-        // 50 * 5 * 100 ms = 25 seconds
-        [Test, Repeat(50)]
-        public void RunInParallel()
-        {
-            var configuration = CreateTestConfiguration();
-            var settings = new SettingsForTesting(configuration, new string[] { "Sample/", "Common/" });
-
-            var reps = Enumerable.Range(1, 50);
-
-            var testResult = Parallel.ForEach(reps, (i) =>
-            {
-                var result = settings.PropTestNested;
-
-                // Assert
-                settings.SomethingGlobal.Should().Be("foo");
-                result.Should().Be("foo");
-
-                ExamineValuesOfLocalObjectsEitherSideOfAwait(settings).Wait();
-            });
-
-            testResult.IsCompleted.Should().BeTrue();
-        }
-
-        static async Task ExamineValuesOfLocalObjectsEitherSideOfAwait(SettingsForTesting settings)
-        {
-            var result = settings.PropTestNested;
-            settings.SomethingGlobal.Should().Be("foo");
-            result.Should().Be("foo");
-
-            await Task.Delay(100);
-
-            result = settings.PropTestNested;
-            settings.SomethingGlobal.Should().Be("foo");
-            result.Should().Be("foo");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Data/QueryArgsConfigTest.cs b/tests/CoreEx.Test/Framework/Data/QueryArgsConfigTest.cs
deleted file mode 100644
index 7eb0f344..00000000
--- a/tests/CoreEx.Test/Framework/Data/QueryArgsConfigTest.cs
+++ /dev/null
@@ -1,350 +0,0 @@
-using CoreEx.Data.Querying;
-using CoreEx.Data.Querying.Expressions;
-using NUnit.Framework;
-using System;
-using System.Linq;
-
-namespace CoreEx.Test.Framework.Data
-{
-    [TestFixture]
-    public class QueryArgsConfigTest
-    {
-        private static readonly QueryArgsConfig _queryConfig = QueryArgsConfig.Create()
-            .WithFilter(filter => filter
-                .AddField<string>("LastName", c => c.WithOperators(QueryFilterOperator.AllStringOperators).AlsoCheckNotNull())
-                .AddField<string>("FirstName", c => c.WithOperators(QueryFilterOperator.AllStringOperators).WithUpperCase())
-                .AddField<string>("Code")
-                .AddField<DateTime>("Birthday", "BirthDate")
-                .AddField<int>("Age", c => c.WithHelpText("Age is but a number."))
-                .AddField<decimal>("Salary")
-                .AddField<bool>("IsOld", c => c.AsNullable())
-                .AddNullField("Terminated", "TerminatedDate")
-                .WithHelpText($"---{Environment.NewLine}Note: The OData-like filtering is awesome!"))
-            .WithOrderBy(order => order
-                .AddField("FirstName")
-                .AddField("LastName")
-                .AddField("Birthday", "BirthDate", c => c.WithDirection(QueryOrderByDirection.Descending))
-                .WithDefault("LastName, FirstName")
-                .WithHelpText($"---{Environment.NewLine}Note: The OData-like ordering is awesome!"));
-
-        private static void AssertFilter(string filter, string expected, params object[] expectedArgs) => AssertFilter(_queryConfig, filter, expected, expectedArgs);
-
-        private static void AssertFilter(QueryArgsConfig config, string? filter, string expected, params object[] expectedArgs)
-        {
-            var result = config.FilterParser.Parse(filter);
-            Assert.That(result.IsSuccess, Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Value.ToLinqString(), Is.EqualTo(expected));
-                Assert.That(result.Value.Args, Is.EquivalentTo(expectedArgs));
-            });
-        }
-
-        private static void AssertException(string? filter, string expected) => AssertException(_queryConfig, filter, expected);
-
-        private static void AssertException(QueryArgsConfig config, string? filter, string expected)
-        {
-            var result = config.FilterParser.Parse(filter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsFailure, Is.True);
-                Assert.That(result.Error, Is.TypeOf<QueryFilterParserException>());
-            });
-
-            var ex = (QueryFilterParserException)result.Error;
-
-            Assert.That(ex.Messages, Is.Not.Null);
-            Assert.That(ex.Messages, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(ex.Messages!.First().Property, Is.EqualTo("$filter"));
-                Assert.That(ex.Messages!.First().Text, Does.StartWith(expected));
-            });
-        }
-
-        [Test]
-        public void FilterParser_SimpleValid()
-        {
-            AssertFilter("lastname eq 'Smith'", "(LastName != null && LastName == @0)", "Smith");
-            AssertFilter("lastname eq null", "LastName == null");
-            AssertFilter("firstname eq 'Angela'", "FirstName.ToUpper() == @0", "ANGELA");
-            AssertFilter("code eq 'Xyz'", "Code == @0", "Xyz");
-            AssertFilter("birthday eq 1980-01-01", "BirthDate == @0", new DateTime(1980, 1, 1));
-            AssertFilter("birthday ne 1980-01-01", "BirthDate != @0", new DateTime(1980, 1, 1));
-            AssertFilter("age lt 100", "Age < @0", 100);
-            AssertFilter("age le 100", "Age <= @0", 100);
-            AssertFilter("age gt 100", "Age > @0", 100);
-            AssertFilter("age ge 100", "Age >= @0", 100);
-            AssertFilter("salary gt 1036.42", "Salary > @0", 1036.42);
-            AssertFilter("isold eq true", "IsOld == true");
-            AssertFilter("IsOld ne false", "IsOld != false");
-            AssertFilter("ISOLD ne null", "IsOld != null");
-            AssertFilter("isold", "IsOld");
-        }
-
-        [Test]
-        public void FilterParser_In()
-        {
-            AssertFilter("code in ('abc', 'def')", "Code in (@0, @1)", "abc", "def");
-            AssertFilter("age in (20, 30, 40)", "Age in (@0, @1, @2)", 20, 30, 40);
-            AssertFilter("age in (20)", "Age in (@0)", 20);
-
-            AssertException("code in", "The final expression is incomplete.");
-            AssertException("code in ()", "Field 'code' constant must be specified before the closing ')' for the 'in' operator.");
-            AssertException("code in (null)", "Field 'code' constant must not be null for an 'in' operator.");
-            AssertException("code in ))", "Field 'code' must specify an opening '(' for the 'in' operator.");
-            AssertException("code in ((", "Field 'code' must close ')' the 'in' operator before specifying a further open '('.");
-            AssertException("code in (,)", "Field 'code' constant ',' is not considered valid.");
-            AssertException("age in (1 2)", "Field 'age' expects a ',' separator between constant values for an 'in' operator.");
-        }
-
-        [Test]
-        public void FilterParser_ComplexValid()
-        {
-            AssertFilter("(age eq 1 or age eq 2) and isold eq true", "(Age == @0 || Age == @1) && IsOld == true", 1, 2);
-            AssertFilter("(age  eq  1  or  age  eq  2 ) and isold    ", "(Age == @0 || Age == @1) && IsOld", 1, 2);
-            AssertFilter("(age eq 1 or age eq 2) or (age eq 8 or age eq 9)", "(Age == @0 || Age == @1) || (Age == @2 || Age == @3)", 1, 2, 8, 9);
-            AssertFilter("((age eq 1 or age eq 2) or (age eq 8 or age eq 9))", "((Age == @0 || Age == @1) || (Age == @2 || Age == @3))", 1, 2, 8, 9);
-        }
-
-        [Test]
-        public void FilterParser_Invalid()
-        {
-            AssertException("banana", "Field 'banana' is not supported.");
-            AssertException("banana eq", "Field 'banana' is not supported.");
-            AssertException("age apple", "Field 'age' does not support 'apple' as an operator.");
-            AssertException("age 'apple'", "Field 'age' does not support ''apple'' as an operator.");
-            AssertException("age eq 'apple'", "Field 'age' constant 'apple' must not be specified as a Literal where the underlying type is not a string.");
-            AssertException("age eq 1990-01-01", "Field 'age' has a value '1990-01-01' that is not a valid Int32.");
-            AssertException("null eq null", "There is a 'null' positioning that is syntactically incorrect.");
-            AssertException("true eq null", "There is a 'true' positioning that is syntactically incorrect.");
-            AssertException("false eq null", "There is a 'false' positioning that is syntactically incorrect.");
-            AssertException("and", "There is a 'and' positioning that is syntactically incorrect.");
-            AssertException("or", "There is a 'or' positioning that is syntactically incorrect.");
-            AssertException("and age eq 1", "There is a 'and' positioning that is syntactically incorrect.");
-            AssertException("or age eq 1", "There is a 'or' positioning that is syntactically incorrect.");
-            AssertException("age eq 1 and", "The final expression is incomplete.");
-            AssertException("age eq 1 or", "The final expression is incomplete.");
-            AssertException("isold ge true", "Field 'isold' does not support the 'ge' operator.");
-            AssertException("age xx 1", "Field 'age' does not support 'xx' as an operator.");
-            AssertException("age ge null", "Field 'age' constant must not be null for an 'ge' operator.");
-
-            AssertException("(age eq 1", "There is an opening '(' that has no matching closing ')'.");
-            AssertException("age eq 1)", "There is a closing ')' that has no matching opening '('.");
-            AssertException("age ( 1", "Field 'age' does not support '(' as an operator.");
-            AssertException("age eq (", "Field 'age' constant '(' is not considered valid.");
-            AssertException("age eq )", "Field 'age' constant ')' is not considered valid.");
-            AssertException("age eq null", "Field 'age' constant 'null' is not supported.");
-        }
-
-        [Test]
-        public void FilterParser_Literals()
-        {
-            AssertException("code eq '", "A Literal has not been terminated.");
-            AssertException("code eq '''", "A Literal has not been terminated.");
-            AssertException("code eq '''''", "A Literal has not been terminated.");
-
-            AssertFilter("code eq ''", "Code == @0", string.Empty);
-            AssertFilter("code eq ''''", "Code == @0", "'");
-            AssertFilter("code eq 'x''x'", "Code == @0", "x'x");
-            AssertFilter("code eq 'x'''", "Code == @0", "x'");
-            AssertFilter("code eq '''x'", "Code == @0", "'x");
-            AssertFilter("code eq '''x'''", "Code == @0", "'x'");
-
-            AssertFilter("code eq 'null'", "Code == @0", "null");
-
-            AssertException("code eq 1", "Field 'code' constant '1' must be specified as a Literal where the underlying type is a string.");
-            AssertException("age eq '8'", "Field 'age' constant '8' must not be specified as a Literal where the underlying type is not a string.");
-        }
-
-        [Test]
-        public void FilterParser_StringFunction()
-        {
-            AssertFilter("startswith(firstName, 'abc')", "FirstName.ToUpper().StartsWith(@0)", "ABC");
-            AssertFilter("endswith(firstName, 'abc')", "FirstName.ToUpper().EndsWith(@0)", "ABC");
-            AssertFilter("contains(firstName, 'abc')", "FirstName.ToUpper().Contains(@0)", "ABC");
-            AssertFilter("contains(lastname, 'xyz')", "(LastName != null && LastName.Contains(@0))", "xyz");
-
-            AssertException("startswith(code, 'abc')", "Field 'code' does not support the 'startswith' function.");
-            AssertException("startswith)code, 'abc')", "A 'startswith' function expects an opening '(' not a ')'.");
-            AssertException("startswith(firstname( 'abc')", "A 'startswith' function expects a ',' separator between the field and its constant.");
-            AssertException("startswith(firstname, null)", "A 'startswith' function references a null constant which is not supported.");
-            AssertException("startswith(firstname, 'abc',", "A 'startswith' function expects a closing ')' not a ','.");
-        }
-
-        [Test]
-        public void FilterParser_Not()
-        {
-            AssertFilter("not (age eq 1)", "!(Age == @0)", 1);
-            AssertFilter("age eq 1 and not (age eq 2)", "Age == @0 && !(Age == @1)", 1, 2);
-
-            AssertException("age eq 1 and not age eq 2", "A 'not' expects an opening '(' to start an expression versus a syntactically incorrect 'age' token.");
-            AssertException("age  eq  1  not", "There is a 'not' positioning that is syntactically incorrect.");
-        }
-
-        [Test]
-        public void FilterParser_Field_Default()
-        {
-            var config = QueryArgsConfig.Create()
-                .WithFilter(filter => filter
-                    .AddField<string>("LastName", c => c.WithDefault(new QueryStatement("LastName == @0", "Brown")))
-                    .AddField<string>("FirstName")
-                    .WithDefault(new QueryStatement("FirstName == @0", "Zoe")));
-
-            AssertFilter(config, "lastname eq 'Smith'", "LastName == @0", "Smith");
-            AssertFilter(config, null, "LastName == @0", "Brown");
-            AssertFilter(config, "firstname eq 'Jenny'", "FirstName == @0 && LastName == @1", "Jenny", "Brown");
-        }
-
-        [Test]
-        public void FilterParser_Default()
-        {
-            var config = QueryArgsConfig.Create()
-                .WithFilter(filter => filter
-                    .AddField<string>("LastName")
-                    .AddField<string>("FirstName")
-                    .WithDefault(new QueryStatement("FirstName == @0", "Zoe")));
-
-            AssertFilter(config, "lastname eq 'Smith'", "LastName == @0", "Smith");
-            AssertFilter(config, "", "FirstName == @0", "Zoe");
-            AssertFilter(config, null, "FirstName == @0", "Zoe");
-        }
-
-        [Test]
-        public void FilterParser_Field_OnQuery()
-        {
-            var config = QueryArgsConfig.Create()
-                .WithFilter(filter => filter
-                    .AddField<string>("LastName")
-                    .AddField<string>("FirstName")
-                    .OnQuery(result =>
-                    {
-                        if (!result.Fields.Contains("LastName"))
-                            result.AppendStatement(new QueryStatement("LastName != null"));
-
-                        if (result.Fields.Count > 1)
-                            throw new QueryFilterParserException("Only a single field filter is allowed.");
-                    }));
-
-            AssertFilter(config, "lastname eq 'Smith'", "LastName == @0", "Smith");
-            AssertFilter(config, "firstname eq 'Angela'", "FirstName == @0 && LastName != null", "Angela");
-            AssertFilter(config, null, "LastName != null");
-
-            AssertException(config, "lastname eq 'Smith' and firstname eq 'Angela'", "Only a single field filter is allowed.");
-        }
-
-        [Test]
-        public void FilterParser_Null()
-        {
-            var config = QueryArgsConfig.Create()
-                .WithFilter(filter => filter
-                    .AddNullField("Terminated", "TerminatedDate"));
-
-            AssertFilter(config, "terminated eq null", "TerminatedDate == null");
-            AssertFilter(config, "terminated ne null", "TerminatedDate != null");
-
-            AssertException(config, "terminated eq 13", "Field 'terminated' with value '13' is invalid: Only null comparisons are supported.");
-            AssertException(config, "terminated gt null", "Field 'terminated' does not support the 'gt' operator.");
-        }
-
-        [Test]
-        public void FilterParser_StatementWriter()
-        {
-            static bool LastNameWriter(IQueryFilterFieldStatementExpression expression, QueryFilterParserResult result)
-            {
-                if (expression is QueryFilterOperatorExpression oex && oex.Operator.Kind == QueryFilterTokenKind.Equal)
-                {
-                    result.AppendStatement(new QueryStatement("LastName EQUALS @0", oex.GetConstantValue(0)));
-                    return true;
-                }
-
-                return false;
-            }
-
-            var config = QueryArgsConfig.Create()
-                .WithFilter(filter => filter
-                    .AddField<string>("LastName", c => c.WithResultWriter(LastNameWriter))
-                    .AddField<string>("FirstName"));
-
-            AssertFilter(config, "lastname ne 'abc'", "LastName != @0", "abc");
-            AssertFilter(config, "lastname eq 'abc'", "LastName EQUALS @0", "abc");
-        }
-
-        [Test]
-        public void FilterParser_ToString()
-        {
-            var s = _queryConfig.FilterParser.ToString();
-            Console.WriteLine(s);
-            Assert.That(s, Is.EqualTo(@"Filter field(s) are as follows:
-LastName (Type: String, Null: true, Operators: EQ, NE, LT, LE, GE, GT, IN, StartsWith, Contains, EndsWith)
-FirstName (Type: String, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN, StartsWith, Contains, EndsWith)
-Code (Type: String, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN)
-Birthday (Type: DateTime, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN)
-Age (Type: Int32, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN) - Age is but a number.
-Salary (Type: Decimal, Null: false, Operators: EQ, NE, LT, LE, GE, GT, IN)
-IsOld (Type: Boolean, Null: true, Operators: EQ, NE)
-Terminated (Type: <none>, Null: true, Operators: EQ, NE)
----
-Note: The OData-like filtering is awesome!"));
-        }
-
-        [Test]
-        public void OrderByParser_Valid()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(_queryConfig.OrderByParser.Parse("firstname, birthday desc").Value.ToLinqString(), Is.EqualTo("FirstName, BirthDate desc"));
-                Assert.That(_queryConfig.OrderByParser.Parse("lastname asc, birthday desc").Value.ToLinqString(), Is.EqualTo("LastName, BirthDate desc"));
-                Assert.That(_queryConfig.OrderByParser.Parse(null).Value.ToLinqString(), Is.EqualTo("LastName, FirstName"));
-            });
-        }
-
-        [Test]
-        public void OrderByParser_Invalid()
-        {
-            void AssertException(string? orderBy, string expected)
-            {
-                var ex = Assert.Throws<QueryOrderByParserException>(() => _queryConfig.OrderByParser.Parse(orderBy).ThrowOnError());
-                Assert.That(ex?.Messages, Is.Not.Null);
-                Assert.That(ex!.Messages, Has.Count.EqualTo(1));
-                Assert.Multiple(() =>
-                {
-                    Assert.That(ex.Messages!.First().Property, Is.EqualTo("$orderby"));
-                    Assert.That(ex.Messages!.First().Text, Does.StartWith(expected));
-                });
-            }
-
-            AssertException("firstname, middlename", "Field 'middlename' is not supported.");
-            AssertException("firstname, birthday asc", "Field 'birthday' direction 'asc' is invalid; not supported.");
-            AssertException("firstname, birthday both", "Field 'birthday' direction 'both' is invalid; must be either 'asc' (ascending) or 'desc' (descending).");
-            AssertException("firstname asc, firstname desc", "Field 'firstname' must not be specified more than once.");
-            AssertException("firstname asc desc", "Statement is syntactically incorrect.");
-        }
-
-        [Test]
-        public void OrderByParser_ToString()
-        {
-            var s = _queryConfig.OrderByParser.ToString();
-            Console.WriteLine(s);
-            Assert.That(s, Is.EqualTo(@"Order-by field(s) are as follows:
-FirstName (Direction: Both)
-LastName (Direction: Both)
-Birthday (Direction: Descending)
----
-Note: The OData-like ordering is awesome!"));
-        }
-
-        [Test]
-        public void QueryArgsParse_Success()
-        {
-            var r = _queryConfig.Parse(new CoreEx.Entities.QueryArgs { Filter = "lastname eq 'Smith'", OrderBy = "firstname, birthday desc" });
-            Assert.That(r.IsSuccess, Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Value!.FilterResult!.ToLinqString(), Is.EqualTo("(LastName != null && LastName == @0)"));
-                Assert.That(r.Value.FilterResult.Args, Is.EquivalentTo(new object[] { "Smith" }));
-                Assert.That(r.Value.OrderByResult!.ToLinqString(), Is.EqualTo("FirstName, BirthDate desc"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Database/Mapping/DatabaseMapperTest.cs b/tests/CoreEx.Test/Framework/Database/Mapping/DatabaseMapperTest.cs
deleted file mode 100644
index 2ee58bbc..00000000
--- a/tests/CoreEx.Test/Framework/Database/Mapping/DatabaseMapperTest.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-using CoreEx.Database.Mapping;
-using CoreEx.Database.SqlServer;
-using CoreEx.Mapping.Converters;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Database.Mapping
-{
-    [TestFixture]
-    internal class DatabaseMapperTest
-    {
-        [Test]
-        public void MapToDb()
-        {
-            var p = new Person { Id = 88, Name = "Bob", Address = new Address { Street = "sss", City = "ccc" }, Address2 = new Address { Street = "ttt", City = "ddd" } };
-
-            var pdm = new PersonDatabaseMapper();
-            var dpc = new CoreEx.Database.DatabaseParameterCollection(new SqlServerDatabase(() => null!));
-            pdm.MapToDb(p, dpc);
-
-            Assert.That(dpc, Has.Count.EqualTo(5));
-            Assert.Multiple(() =>
-            {
-                Assert.That(dpc[0].ParameterName, Is.EqualTo("@PersonId"));
-                Assert.That(dpc[0].Value, Is.EqualTo(88));
-                Assert.That(dpc[1].ParameterName, Is.EqualTo("@firstname"));
-                Assert.That(dpc[1].Value, Is.EqualTo("Bob"));
-                Assert.That(dpc[2].ParameterName, Is.EqualTo("@Street"));
-                Assert.That(dpc[2].Value, Is.EqualTo("sss"));
-                Assert.That(dpc[3].ParameterName, Is.EqualTo("@City"));
-                Assert.That(dpc[3].Value, Is.EqualTo("ccc"));
-                Assert.That(dpc[4].ParameterName, Is.EqualTo("@Address2"));
-                Assert.That(dpc[4].Value, Is.EqualTo("{\"street\":\"ttt\",\"city\":\"ddd\"}"));
-
-                Assert.That(pdm[x => x.Name].ColumnName, Is.EqualTo("name"));
-            });
-        }
-    }
-
-    public class PersonDatabaseMapper : DatabaseMapper<Person>
-    {
-        private readonly DatabaseMapper<Address> _addressMapper = DatabaseMapper.CreateAuto<Address>("City")
-            .HasProperty(x => x.City);
-
-        public PersonDatabaseMapper()
-        {
-            InheritPropertiesFrom(DatabaseMapper.CreateAuto<PersonBase>().HasProperty(x => x.Id, null, "@PersonId"));
-            Property(x => x.Name, "name", "@firstname");
-            Property(x => x.Address).SetMapper(_addressMapper);
-            Property(x => x.Address2).SetConverter(new ObjectToJsonConverter<Address>());
-        }
-    }
-
-    public class PersonBase
-    {
-        public int Id { get; set; }
-    }
-
-    public class Person : PersonBase
-    {
-        public string? Name { get; set; }
-        public Address? Address { get; set; }
-        public Address? Address2 { get; set; }
-    }
-
-    public class Address
-    {
-        public string? Street { get; set; }
-        public string? City { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Dataverse/Mapping/DataverseMapperTest.cs b/tests/CoreEx.Test/Framework/Dataverse/Mapping/DataverseMapperTest.cs
deleted file mode 100644
index d7dfb573..00000000
--- a/tests/CoreEx.Test/Framework/Dataverse/Mapping/DataverseMapperTest.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Dataverse.Mapping;
-using Microsoft.Xrm.Sdk;
-using System;
-using CoreEx.Entities;
-using CoreEx.Mapping.Converters;
-
-namespace CoreEx.Test.Framework.Dataverse.Mapping
-{
-    [TestFixture]
-
-    internal class DataverseMapperTest
-    {
-        [Test]
-        public void MapToDataverse()
-        {
-            var p = new Person { Id = 1.ToGuid().ToString(), Name = "Bob", Address = new Address { Street = "sss", City = "ccc" }, Address2 = new Address { Street = "ttt", City = "ddd" } };
-
-            var pdm = new PersonDataverseMapper();
-            var entity = new Entity("Person");
-            pdm.MapToDataverse(p, entity);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(entity.Id, Is.EqualTo(1.ToGuid()));
-                Assert.That(entity.KeyAttributes, Is.Empty);
-                Assert.That(entity.Attributes, Has.Count.EqualTo(4));
-                Assert.That(entity.GetAttributeValue<string>("name"), Is.EqualTo("Bob"));
-                Assert.That(entity.GetAttributeValue<string>("Street"), Is.EqualTo("sss"));
-                Assert.That(entity.GetAttributeValue<string>("town"), Is.EqualTo("ccc"));
-                Assert.That(entity.GetAttributeValue<string>("Address2"), Is.EqualTo("{\"street\":\"ttt\",\"city\":\"ddd\"}"));
-            });
-
-            //OrganizationRequest req = new OrganizationRequest();
-            //PublicClientApplicationBuilder appBuilder = PublicClientApplicationBuilder.Create("clientId");
-        }
-
-        [Test]
-        public void MapFromDataverse()
-        {
-            var pdm = new PersonDataverseMapper();
-            var entity = new Entity("Person", 1.ToGuid());
-            entity["name"] = "Bob";
-            entity["Street"] = "sss";
-            entity["town"] = "ccc";
-            entity["Address2"] = "{\"street\":\"ttt\",\"city\":\"ddd\"}";
-
-            var p = pdm.MapFromDataverse(entity)!;
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Id, Is.EqualTo(1.ToGuid().ToString()));
-                Assert.That(p.Name, Is.EqualTo("Bob"));
-                Assert.That(p.Address?.Street, Is.EqualTo("sss"));
-                Assert.That(p.Address?.City, Is.EqualTo("ccc"));
-                Assert.That(p.Address2?.Street, Is.EqualTo("ttt"));
-                Assert.That(p.Address2?.City, Is.EqualTo("ddd"));
-            });
-        }
-    }
-
-    public class PersonDataverseMapper : DataverseMapper<Person>
-    {
-        private readonly DataverseMapper<Address> _addressMapper = DataverseMapper.CreateAuto<Address>("City").HasProperty(x => x.City, "town");
-
-        public PersonDataverseMapper()
-        {
-            InheritPropertiesFrom(DataverseMapper.CreateAuto<PersonBase>());
-            Property(x => x.Name, "name");
-            Property(x => x.Address).SetMapper(_addressMapper);
-            Property(x => x.Address2).SetConverter(new ObjectToJsonConverter<Address>());
-        }
-    }
-
-    public class PersonBase : IIdentifier<string>
-    {
-        public string? Id { get; set; }
-    }
-
-    public class Person : PersonBase
-    {
-        public string? Name { get; set; }
-        public Address? Address { get; set; }
-        public Address? Address2 { get; set; }
-    }
-
-    public class Address
-    {
-        public string? Street { get; set; }
-        public string? City { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/CleanerTest.cs b/tests/CoreEx.Test/Framework/Entities/CleanerTest.cs
deleted file mode 100644
index 6a7f74c2..00000000
--- a/tests/CoreEx.Test/Framework/Entities/CleanerTest.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Test.Framework.Entities
-{
-    [TestFixture, NonParallelizable]
-    public class CleanerTest
-    {
-        [Test]
-        public void DateTimeCleaning()
-        {
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeLocal;
-            var dt = DateTime.UtcNow;
-            var dtc = Cleaner.Clean(dt);
-            Assert.That(dtc.Kind, Is.EqualTo(DateTimeKind.Local));
-
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeUtc;
-            dtc = Cleaner.Clean(dt);
-            Assert.That(dtc.Kind, Is.EqualTo(DateTimeKind.Utc));
-
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeLocal;
-        }
-
-        [Test]
-        public void NullableDateTimeCleaning()
-        {
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeLocal;
-            DateTime? dt = DateTime.UtcNow;
-            DateTime? dtc = Cleaner.Clean(dt);
-            Assert.That(dtc!.Value.Kind, Is.EqualTo(DateTimeKind.Local));
-
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeUtc;
-            dtc = Cleaner.Clean(dt);
-            Assert.That(dtc!.Value.Kind, Is.EqualTo(DateTimeKind.Utc));
-
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeLocal;
-
-            dt = null;
-            dtc = Cleaner.Clean(dt);
-            Assert.That(dtc, Is.Null);
-        }
-
-        [Test]
-        public void DateTimeTransformFromSettings()
-        {
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeUtc;
-
-            ConfigurationBuilder builder = new();
-            Dictionary<string, string> testSettings = new()
-            {
-                {"CoreEx:Cleaner:DateTimeTransform", "DateTimeLocal"}
-            };
-            builder.AddInMemoryCollection(testSettings);
-
-            IServiceProvider serviceProvider = new ServiceCollection()
-                .AddSingleton<IConfiguration>(builder.Build())
-                .AddDefaultSettings()
-                .BuildServiceProvider();
-
-            using var scope = serviceProvider.CreateScope();
-            using var ec = ExecutionContext.CreateNew();
-            ec.ServiceProvider = scope.ServiceProvider;
-
-            DateTime? dt = DateTime.UtcNow;
-            DateTime? dtc = Cleaner.Clean(dt);
-            Assert.Multiple(() =>
-            {
-                Assert.That(dtc!.Value.Kind, Is.EqualTo(DateTimeKind.Local));
-                Assert.That(Cleaner.DefaultDateTimeTransform, Is.EqualTo(DateTimeTransform.DateTimeUtc));
-            });
-        }
-
-        [Test]
-        public void DateTimeTransformFromSettings_Load()
-        {
-            Cleaner.DefaultDateTimeTransform = DateTimeTransform.DateTimeUtc;
-
-            ConfigurationBuilder builder = new();
-            Dictionary<string, string> testSettings = new()
-            {
-                {"Cleaner:DateTimeTransform", "DateTimeLocal"}
-            };
-            builder.AddInMemoryCollection(testSettings);
-
-            IServiceProvider serviceProvider = new ServiceCollection()
-                .AddSingleton<IConfiguration>(builder.Build())
-                .AddDefaultSettings()
-                .BuildServiceProvider();
-
-            using var scope = serviceProvider.CreateScope();
-            using var ec = ExecutionContext.CreateNew();
-            ec.ServiceProvider = scope.ServiceProvider;
-
-            DateTime? dtc = DateTime.UtcNow;
-            for (int i = 0; i < 10000; i++)
-            {
-                dtc = Cleaner.Clean(DateTime.UtcNow);
-                Assert.That(dtc!.Value.Kind, Is.EqualTo(DateTimeKind.Local), "Iteration" + i);
-            }
-        }
-
-        [Test]
-        public void StringTransformCleaning()
-        {
-            var s1 = "";
-            var s2 = (string?)null;
-            var s3 = "ABC";
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(Cleaner.Clean(s1), Is.Null);
-                Assert.That(Cleaner.Clean(s2), Is.Null);
-                Assert.That(Cleaner.Clean(s3), Is.EqualTo("ABC"));
-            });
-
-            Cleaner.DefaultStringTransform = StringTransform.NullToEmpty;
-            Assert.Multiple(() =>
-            {
-                Assert.That(Cleaner.Clean(s1), Is.EqualTo(""));
-                Assert.That(Cleaner.Clean(s2), Is.EqualTo(""));
-                Assert.That(Cleaner.Clean(s3), Is.EqualTo("ABC"));
-            });
-
-            Cleaner.DefaultStringTransform = StringTransform.EmptyToNull;
-        }
-
-        [Test]
-        public void StringTrimCleaning()
-        {
-            var s = " ABC ";
-            Assert.That(Cleaner.Clean(s), Is.EqualTo(" ABC"));
-
-            Cleaner.DefaultStringTrim = StringTrim.Both;
-            Assert.That(Cleaner.Clean(s), Is.EqualTo("ABC"));
-
-            Cleaner.DefaultStringTrim = StringTrim.End;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/CompositeKeyTest.cs b/tests/CoreEx.Test/Framework/Entities/CompositeKeyTest.cs
deleted file mode 100644
index 4c1720c8..00000000
--- a/tests/CoreEx.Test/Framework/Entities/CompositeKeyTest.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-using CoreEx.Entities;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Entities
-{
-    [TestFixture]
-    public class CompositeKeyTest
-    {
-        [Test]
-        public void DefaultKey()
-        {
-            var ck = new CompositeKey();
-            Assert.That(ck.Args, Is.Empty);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.IsInitial, Is.True);
-
-                Assert.That(ck, Is.EqualTo(new CompositeKey()));
-            });
-            Assert.That(ck, Is.Not.EqualTo(new CompositeKey(1)));
-
-            Assert.That(ck, Is.EqualTo(new CompositeKey()));
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck, Is.Not.EqualTo(new CompositeKey(1)));
-
-                Assert.That(new CompositeKey().GetHashCode(), Is.EqualTo(ck.GetHashCode()));
-                Assert.That(new CompositeKey(1).GetHashCode(), Is.Not.EqualTo(ck.GetHashCode()));
-            });
-        }
-
-        [Test]
-        public void SpecifiedKey()
-        {
-            var ck0 = new CompositeKey(0);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck0.Args, Has.Length.EqualTo(1));
-                Assert.That(ck0.IsInitial, Is.True);
-            });
-
-            var ck1 = new CompositeKey(1);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck1.Args, Has.Length.EqualTo(1));
-                Assert.That(ck1.IsInitial, Is.False);
-
-                Assert.That(ck0, Is.EqualTo(new CompositeKey(0)));
-                Assert.That(ck1, Is.EqualTo(new CompositeKey(1)));
-                Assert.That(ck0, Is.Not.EqualTo(ck1));
-
-                Assert.That(new CompositeKey(0).GetHashCode(), Is.EqualTo(ck0.GetHashCode()));
-                Assert.That(new CompositeKey(1).GetHashCode(), Is.EqualTo(ck1.GetHashCode()));
-                Assert.That(ck1.GetHashCode(), Is.Not.EqualTo(ck0.GetHashCode()));
-            });
-        }
-
-        [Test]
-        public void KeyComparisons()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(new CompositeKey(), Is.Not.EqualTo(new CompositeKey(null!)));
-                Assert.That(new CompositeKey("A"), Is.Not.EqualTo(new CompositeKey("A", null)));
-                Assert.That(new CompositeKey(1, "A"), Is.Not.EqualTo(new CompositeKey("A", 1)));
-            });
-        }
-
-        [Test]
-        public void KeyCopy()
-        {
-            var ck0 = new CompositeKey("Xyz");
-            var ck1 = ck0;
-
-            Assert.That(ck1, Is.EqualTo(ck0));
-        }
-
-        [Test]
-        public void KeyToString_And_CreateFromString()
-        {
-            var ck = new CompositeKey();
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.Null);
-                Assert.That(CompositeKey.TryCreateFromString<string>(ck.ToString(), out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(1));
-            });
-            Assert.That(ck.Args[0], Is.Null);
-
-            int? iv = null;
-            ck = new CompositeKey(iv);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.Null);
-                Assert.That(CompositeKey.TryCreateFromString<int?>(ck.ToString(), out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(1));
-            });
-            Assert.That(ck.Args[0], Is.Null);
-
-            ck = new CompositeKey(88);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.EqualTo("88"));
-                Assert.That(CompositeKey.TryCreateFromString<int>(ck.ToString(), out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(1));
-            });
-            Assert.That(ck.Args[0], Is.EqualTo(88));
-
-            ck = new CompositeKey("abc");
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.EqualTo("abc"));
-                Assert.That(CompositeKey.TryCreateFromString<string>(ck.ToString(), out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(1));
-            });
-            Assert.That(ck.Args[0], Is.EqualTo("abc"));
-
-            ck = new CompositeKey("");
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.EqualTo(string.Empty));
-                Assert.That(CompositeKey.TryCreateFromString<string>(ck.ToString(), out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(1));
-            });
-            Assert.That(ck.Args[0], Is.Null);
-
-            ck = new CompositeKey(null, null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.EqualTo(","));
-                Assert.That(CompositeKey.TryCreateFromString<string, string>(ck.ToString(), out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(2));
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.Args[0], Is.Null);
-                Assert.That(ck.Args[1], Is.Null);
-            });
-
-            ck = new CompositeKey("text", 'x', short.MinValue, int.MinValue, long.MinValue, ushort.MaxValue, uint.MaxValue, ulong.MaxValue, Guid.Parse("8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc"),
-                new DateTime(1970, 01, 22, 0, 0, 0, DateTimeKind.Unspecified), new DateTime(2000, 01, 22, 20, 59, 43, DateTimeKind.Utc), new DateTimeOffset(2000, 01, 22, 20, 59, 43, TimeSpan.FromHours(-8)));
-
-            Console.WriteLine(ck.ToString());
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.ToString(), Is.EqualTo("text,x,-32768,-2147483648,-9223372036854775808,65535,4294967295,18446744073709551615,8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc,1970-01-22T00:00:00.0000000,2000-01-22T20:59:43.0000000Z,2000-01-22T20:59:43.0000000-08:00"));
-                Assert.That(CompositeKey.TryCreateFromString(ck.ToString(), new Type[] { typeof(string), typeof(char), typeof(short), typeof(int), typeof(long), typeof(ushort), typeof(uint), typeof(ulong), typeof(Guid), typeof(DateTime), typeof(DateTime), typeof(DateTimeOffset) }, out ck), Is.True);
-                Assert.That(ck.Args, Has.Length.EqualTo(12));
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(ck.Args[0], Is.EqualTo("text"));
-                Assert.That(ck.Args[1], Is.EqualTo('x'));
-                Assert.That(ck.Args[2], Is.EqualTo(short.MinValue));
-                Assert.That(ck.Args[3], Is.EqualTo(int.MinValue));
-                Assert.That(ck.Args[4], Is.EqualTo(long.MinValue));
-                Assert.That(ck.Args[5], Is.EqualTo(ushort.MaxValue));
-                Assert.That(ck.Args[6], Is.EqualTo(uint.MaxValue));
-                Assert.That(ck.Args[7], Is.EqualTo(ulong.MaxValue));
-                Assert.That(ck.Args[8], Is.EqualTo(Guid.Parse("8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc")));
-                Assert.That(ck.Args[9], Is.EqualTo(new DateTime(1970, 01, 22, 0, 0, 0, DateTimeKind.Unspecified)));
-                Assert.That(ck.Args[10], Is.EqualTo(new DateTime(2000, 01, 22, 20, 59, 43, DateTimeKind.Utc)));
-                Assert.That(ck.Args[11], Is.EqualTo(new DateTimeOffset(2000, 01, 22, 20, 59, 43, TimeSpan.FromHours(-8))));
-            });
-        }
-
-        [Test]
-        public void KeyToString_And_CreateFromString_Perf()
-        {
-            CompositeKey ck;
-            for (int i = 0; i < 1000; i++)
-            {
-                ck = new CompositeKey("text", 'x', short.MinValue, int.MinValue, long.MinValue, ushort.MaxValue, uint.MaxValue, ulong.MaxValue, Guid.Parse("8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc"),
-    new DateTime(1970, 01, 22, 0, 0, 0, DateTimeKind.Unspecified), new DateTime(2000, 01, 22, 20, 59, 43, DateTimeKind.Utc), new DateTimeOffset(2000, 01, 22, 20, 59, 43, TimeSpan.FromHours(-8)));
-                _ = CompositeKey.TryCreateFromString(ck.ToString(), [typeof(string), typeof(char), typeof(short), typeof(int), typeof(long), typeof(ushort), typeof(uint), typeof(ulong), typeof(Guid), typeof(DateTime), typeof(DateTime), typeof(DateTimeOffset)], out ck);
-            }
-        }
-
-        [Test]
-        public void KeySerializeDeserialize()
-        {
-            var ck = new CompositeKey();
-            Assert.That(ck.ToJsonString(), Is.EqualTo("null"));
-            ck = CompositeKey.CreateFromJson(ck.ToJsonString());
-            Assert.That(ck, Is.EqualTo(new CompositeKey()));
-
-            ck = new CompositeKey(88);
-            Assert.That(ck.ToJsonString(), Is.EqualTo("[{\"int\":88}]"));
-            ck = CompositeKey.CreateFromJson(ck.ToJsonString());
-            Assert.That(ck, Is.EqualTo(new CompositeKey(88)));
-
-            ck = new CompositeKey((int?)null);
-            Assert.That(ck.ToJsonString(), Is.EqualTo("[null]"));
-            ck = CompositeKey.CreateFromJson(ck.ToJsonString());
-            Assert.That(ck, Is.EqualTo(new CompositeKey((int?)null)));
-
-            ck = new CompositeKey((int?)88);
-            Assert.That(ck.ToJsonString(), Is.EqualTo("[{\"int\":88}]"));
-            ck = CompositeKey.CreateFromJson(ck.ToJsonString());
-            Assert.That(ck, Is.EqualTo(new CompositeKey(88)));
-
-            ck = new CompositeKey("text", 'x', short.MinValue, int.MinValue, long.MinValue, ushort.MaxValue, uint.MaxValue, long.MaxValue, Guid.Parse("8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc"),
-                new DateTime(1970, 01, 22, 0, 0, 0, DateTimeKind.Unspecified), new DateTime(2000, 01, 22, 20, 59, 43, DateTimeKind.Utc), new DateTimeOffset(2000, 01, 22, 20, 59, 43, TimeSpan.FromHours(-8)));
-
-            Assert.That(ck.ToJsonString(), Is.EqualTo("[{\"string\":\"text\"},{\"char\":\"x\"},{\"short\":-32768},{\"int\":-2147483648},{\"long\":-9223372036854775808},{\"ushort\":65535},{\"uint\":4294967295},{\"long\":9223372036854775807},{\"guid\":\"8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc\"},{\"datetime\":\"1970-01-22T00:00:00\"},{\"datetime\":\"2000-01-22T20:59:43Z\"},{\"datetimeoffset\":\"2000-01-22T20:59:43-08:00\"}]"));
-
-            var ck2 = ck;
-            ck = CompositeKey.CreateFromJson(ck.ToJsonString());
-            Assert.That(ck, Is.EqualTo(ck2));
-        }
-
-        [Test]
-        public void KeyDeserializeErrors()
-        {
-            Assert.Throws<System.Text.Json.JsonException>(() => CompositeKey.CreateFromJson("{}"));
-            Assert.Throws<System.Text.Json.JsonException>(() => CompositeKey.CreateFromJson("[[]]"));
-            Assert.Throws<System.Text.Json.JsonException>(() => CompositeKey.CreateFromJson("[{\"xxx\":1}]"));
-            Assert.Throws<System.Text.Json.JsonException>(() => CompositeKey.CreateFromJson("[{\"int\":\"x\"}]"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/Extended/EntityBaseTest.cs b/tests/CoreEx.Test/Framework/Entities/Extended/EntityBaseTest.cs
deleted file mode 100644
index 82489c98..00000000
--- a/tests/CoreEx.Test/Framework/Entities/Extended/EntityBaseTest.cs
+++ /dev/null
@@ -1,981 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Entities.Extended;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Test.Framework.Entities.Extended
-{
-    [TestFixture]
-    public class EntityBaseTest
-    {
-        [Test]
-        public void ChangeLog_Clone()
-        {
-            var cl = new ChangeLogEx { CreatedBy = "username  ", CreatedDate = CreateDateTime() };
-            var co = cl.Clone();
-
-            Assert.That(co, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(co.CreatedBy, Is.EqualTo("username"));
-                Assert.That(co.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(co.UpdatedBy, Is.Null);
-                Assert.That(co.UpdatedDate, Is.Null);
-            });
-        }
-
-        [Test]
-        public void ChangeLog_CopyFrom()
-        {
-            var cl1 = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            var cl2 = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime(), UpdatedBy = "username2", UpdatedDate = CreateDateTime().AddDays(1) };
-            cl1.CopyFrom(cl2);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(cl1.CreatedBy, Is.EqualTo("username"));
-                Assert.That(cl1.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(cl1.UpdatedBy, Is.EqualTo("username2"));
-                Assert.That(cl1.UpdatedDate, Is.EqualTo(CreateDateTime().AddDays(1)));
-            });
-        }
-
-        [Test]
-        public void ChangeLog_Equals()
-        {
-            ChangeLogEx? cl2 = null;
-
-            var cl1 = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            Assert.That(cl1, Is.Not.EqualTo(cl2));
-
-            cl2 = (ChangeLogEx)cl1.Clone();
-            Assert.That(cl1, Is.EqualTo(cl2));
-
-            cl2.CreatedBy = "username2";
-            Assert.That(cl1, Is.Not.EqualTo(cl2));
-
-            ChangeLogEx cl3 = cl1;
-            Assert.That(cl3, Is.EqualTo(cl1));
-        }
-
-        [Test]
-        public void ChangeLog_Equals2()
-        {
-            ChangeLogEx? cl1 = null;
-            ChangeLogEx? cl2 = null;
-
-            Assert.That(cl1, Is.EqualTo(cl2));
-
-            cl1 = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            Assert.That(cl1, Is.Not.EqualTo(cl2));
-
-            cl2 = (ChangeLogEx)cl1.Clone();
-            Assert.That(cl1, Is.EqualTo(cl2));
-
-            cl2.CreatedBy = "username2";
-            Assert.That(cl1, Is.Not.EqualTo(cl2));
-
-            ChangeLogEx cl3 = cl1;
-            Assert.That(cl3, Is.EqualTo(cl1));
-        }
-
-        [Test]
-        public void ChangeLog_HashCode()
-        {
-            var cl1 = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            var cl2 = (ChangeLogEx)cl1.Clone();
-            Assert.That(cl2.GetHashCode(), Is.EqualTo(cl1.GetHashCode()));
-
-            cl2.CreatedBy = "username2";
-            Assert.That(cl2.GetHashCode(), Is.Not.EqualTo(cl1.GetHashCode()));
-        }
-
-        [Test]
-        public void ChangeLog_IsInitial()
-        {
-            var cl = new ChangeLogEx();
-            Assert.That(cl.IsInitial, Is.True);
-
-            cl.UpdatedBy = "username";
-            Assert.That(cl.IsInitial, Is.False);
-
-            cl.UpdatedBy = null;
-            Assert.That(cl.IsInitial, Is.True);
-
-            cl.UpdatedDate = CreateDateTime();
-            Assert.That(cl.IsInitial, Is.False);
-        }
-
-        [Test]
-        public void ChangleLog_AcceptChanges()
-        {
-            var cl = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            Assert.That(cl.IsChanged, Is.True);
-
-            cl.AcceptChanges();
-            Assert.That(cl.IsChanged, Is.False);
-
-            cl.UpdatedBy = "username";
-            Assert.That(cl.IsChanged, Is.True);
-        }
-
-        [Test]
-        public void ChangeLog_MakeReadonly()
-        {
-            var cl = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            Assert.That(cl.IsReadOnly, Is.False);
-
-            cl.MakeReadOnly();
-            Assert.That(cl.IsReadOnly, Is.True);
-
-            Assert.Throws<InvalidOperationException>(() => cl.UpdatedBy = "username");
-        }
-
-        [Test]
-        public void Person_Clone()
-        {
-            var p = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var po = (Person)p.Clone();
-
-            Assert.That(po, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(po.Name, Is.EqualTo("dave"));
-                Assert.That(po.Age, Is.EqualTo(30));
-                Assert.That(po.ChangeLog!.CreatedBy, Is.EqualTo("username"));
-                Assert.That(po.ChangeLog.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(po.ChangeLog.UpdatedBy, Is.Null);
-                Assert.That(po.ChangeLog.UpdatedDate, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Person_CopyFrom()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "sarah", Age = 29, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime(), UpdatedBy = "username2", UpdatedDate = CreateDateTime().AddDays(1) } };
-
-            p1.CopyFrom(p2);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(p1.Name, Is.EqualTo("sarah"));
-                Assert.That(p1.Age, Is.EqualTo(29));
-                Assert.That(p1.ChangeLog.CreatedBy, Is.EqualTo("username"));
-                Assert.That(p1.ChangeLog.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(p1.ChangeLog.UpdatedBy, Is.EqualTo("username2"));
-                Assert.That(p1.ChangeLog.UpdatedDate, Is.EqualTo(CreateDateTime().AddDays(1)));
-            });
-        }
-
-        [Test]
-        public void Person_CreateFrom()
-        {
-            var p2 = new Person { Name = "sarah", Age = 29, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime(), UpdatedBy = "username2", UpdatedDate = CreateDateTime().AddDays(1) } };
-            var p1 = p2.CopyFromAs<Person>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(p1.Name, Is.EqualTo("sarah"));
-                Assert.That(p1.Age, Is.EqualTo(29));
-                Assert.That(p1.ChangeLog!.CreatedBy, Is.EqualTo("username"));
-                Assert.That(p1.ChangeLog.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(p1.ChangeLog.UpdatedBy, Is.EqualTo("username2"));
-                Assert.That(p1.ChangeLog.UpdatedDate, Is.EqualTo(CreateDateTime().AddDays(1)));
-            });
-        }
-
-        [Test]
-        public void Person_CopyFrom_Hierarchy()
-        {
-            var p1 = new Person { Name = "dave", Age = 30 };
-            var p2 = new PersonEx { Name = "sarah", Age = 29, Salary = 100000 };
-
-            p1.CopyFrom(p2);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(p1.Name, Is.EqualTo("sarah"));
-                Assert.That(p1.Age, Is.EqualTo(29));
-            });
-
-            p1.Name = "ivan";
-            p1.Age = 55;
-
-            p2.CopyFrom(p1);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p2.Name, Is.EqualTo("ivan"));
-                Assert.That(p2.Age, Is.EqualTo(55));
-                Assert.That(p2.Salary, Is.EqualTo(100000));
-            });
-        }
-
-        [Test]
-        public void Person_Equals()
-        {
-            Person? p2 = null;
-
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2 = (Person)p1.Clone();
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.ChangeLog!.CreatedBy = "username2";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2.ChangeLog.CreatedBy = "username";
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.Name = "mike";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            Person p3 = p1;
-            Assert.That(p3, Is.EqualTo(p1));
-        }
-
-        [Test]
-        public void Person_Equals2()
-        {
-            Person? p2 = null;
-
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2 = (Person)p1.Clone();
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.ChangeLog!.CreatedBy = "username2";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2.ChangeLog.CreatedBy = "username";
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.Name = "mike";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            Person p3 = p1;
-            Assert.That(p3, Is.EqualTo(p1));
-        }
-
-        [Test]
-        public void Person_HashCode()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = (Person)p1.Clone();
-            Assert.That(p2.GetHashCode(), Is.EqualTo(p1.GetHashCode()));
-
-            p1.Name = "mike";
-            Assert.That(p2.GetHashCode(), Is.Not.EqualTo(p1.GetHashCode()));
-
-            p1.Name = "dave";
-            Assert.That(p2.GetHashCode(), Is.EqualTo(p1.GetHashCode()));
-
-            p1.ChangeLog.CreatedBy = "username2";
-            Assert.That(p2.GetHashCode(), Is.Not.EqualTo(p1.GetHashCode()));
-        }
-
-        [Test]
-        public void Person_IsInitial()
-        {
-            var p = new Person();
-            Assert.That(p.IsInitial, Is.True);
-
-            p.Name = "mike";
-            Assert.That(p.IsInitial, Is.False);
-
-            p.Name = null;
-            Assert.That(p.IsInitial, Is.True);
-
-            p.ChangeLog = new ChangeLogEx { UpdatedDate = CreateDateTime() };
-            Assert.That(p.IsInitial, Is.False);
-
-            p.ChangeLog.UpdatedDate = null;
-            Assert.That(p.IsInitial, Is.False);
-
-            p.CleanUp();
-            Assert.That(p.IsInitial, Is.True);
-        }
-
-        [Test]
-        public void Person_AcceptChanges()
-        {
-            var p = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.True);
-                Assert.That(p.ChangeLog.IsChanged, Is.True);
-            });
-
-            p.AcceptChanges();
-            Assert.That(p.IsChanged, Is.False);
-
-            p.Name = "julie";
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.True);
-                Assert.That(p.ChangeLog.IsChanged, Is.False);
-            });
-
-            p.AcceptChanges();
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.False);
-                Assert.That(p.ChangeLog.IsChanged, Is.False);
-            });
-
-            p.ChangeLog.CreatedBy = "username2";
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.ChangeLog.IsChanged, Is.True);
-                Assert.That(p.IsChanged, Is.True);
-            });
-        }
-
-        [Test]
-        public void Person_Bubbling()
-        {
-            var p = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            p.AcceptChanges();
-            var cl1 = p.ChangeLog;
-            var cl2 = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.False);
-                Assert.That(p.ChangeLog.IsChanged, Is.False);
-                Assert.That(cl1.IsChanged, Is.False);
-                Assert.That(cl2.IsChanged, Is.True);
-            });
-
-            p.ChangeLog = cl2;
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.True);
-                Assert.That(p.ChangeLog.IsChanged, Is.True);
-                Assert.That(cl1.IsChanged, Is.False);
-                Assert.That(cl2.IsChanged, Is.True);
-            });
-
-            p.AcceptChanges();
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.False);
-                Assert.That(p.ChangeLog.IsChanged, Is.False);
-                Assert.That(cl1.IsChanged, Is.False);
-                Assert.That(cl2.IsChanged, Is.False);
-            });
-
-            cl1.UpdatedBy = "username";
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.False);
-                Assert.That(p.ChangeLog.IsChanged, Is.False);
-                Assert.That(cl1.IsChanged, Is.True);
-                Assert.That(cl2.IsChanged, Is.False);
-            });
-
-            cl2.UpdatedBy = "username";
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.IsChanged, Is.True);
-                Assert.That(p.ChangeLog.IsChanged, Is.True);
-                Assert.That(cl1.IsChanged, Is.True);
-                Assert.That(cl2.IsChanged, Is.True);
-            });
-        }
-
-        [Test]
-        public void Person_MakeReadonly()
-        {
-            var cl = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() };
-            Assert.That(cl.IsReadOnly, Is.False);
-
-            cl.MakeReadOnly();
-            Assert.That(cl.IsReadOnly, Is.True);
-
-            Assert.Throws<InvalidOperationException>(() => cl.UpdatedBy = "username");
-        }
-
-        [Test]
-        public void Person_Load()
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                var p1 = new Person { Name = "dave", Age = i, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-                var p2 = new Person { Name = "dave", Age = i, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-
-                p1.CleanUp();
-                p1.Clone();
-                p1.AcceptChanges();
-
-                if (p1 == p2 && p1.GetHashCode() == p2.GetHashCode())
-                {
-                    if (!p1.IsReadOnly)
-                        p1.MakeReadOnly();
-                }
-                else
-                    throw new InvalidOperationException("Should not get here!");
-            }
-        }
-
-        [Test]
-        public void PersonEx_Clone()
-        {
-            var p = new PersonEx { Name = "dave", Age = 30, Salary = 1m, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var po = (PersonEx)p.Clone();
-
-            Assert.That(po, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(po.Name, Is.EqualTo("dave"));
-                Assert.That(po.Age, Is.EqualTo(30));
-                Assert.That(po.Salary, Is.EqualTo(1m));
-                Assert.That(po.ChangeLog!.CreatedBy, Is.EqualTo("username"));
-                Assert.That(po.ChangeLog.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(po.ChangeLog.UpdatedBy, Is.Null);
-                Assert.That(po.ChangeLog.UpdatedDate, Is.Null);
-            });
-        }
-
-        [Test]
-        public void PersonEx_CopyFrom()
-        {
-            var p1 = new PersonEx { Name = "dave", Age = 30, Salary = 1m, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new PersonEx { Name = "sarah", Age = 29, Salary = 2m, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime(), UpdatedBy = "username2", UpdatedDate = CreateDateTime().AddDays(1) } };
-
-            p1.CopyFrom(p2);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(p1.Name, Is.EqualTo("sarah"));
-                Assert.That(p1.Age, Is.EqualTo(29));
-                Assert.That(p1.Salary, Is.EqualTo(2m));
-                Assert.That(p1.ChangeLog.CreatedBy, Is.EqualTo("username"));
-                Assert.That(p1.ChangeLog.CreatedDate, Is.EqualTo(CreateDateTime()));
-                Assert.That(p1.ChangeLog.UpdatedBy, Is.EqualTo("username2"));
-                Assert.That(p1.ChangeLog.UpdatedDate, Is.EqualTo(CreateDateTime().AddDays(1)));
-            });
-        }
-
-        [Test]
-        public void PersonEx_Equals()
-        {
-            PersonEx? p2 = null;
-
-            var p1 = new PersonEx { Name = "dave", Age = 30, Salary = 1m, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2 = (PersonEx)p1.Clone();
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.ChangeLog!.CreatedBy = "username2";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2.ChangeLog.CreatedBy = "username";
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.Name = "mike";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2.Name = "dave";
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.Salary = 2m;
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            Person p3 = p1;
-            Assert.That(p3, Is.EqualTo(p1));
-        }
-
-        [Test]
-        public void PersonEx_Equals2()
-        {
-            PersonEx? p2 = null;
-
-            var p1 = new PersonEx { Name = "dave", Age = 30, Salary = 1m, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2 = (PersonEx)p1.Clone();
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.ChangeLog!.CreatedBy = "username2";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2.ChangeLog.CreatedBy = "username";
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.Name = "mike";
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            p2.Name = "dave";
-            Assert.That(p1, Is.EqualTo(p2));
-
-            p2.Salary = 2m;
-            Assert.That(p1, Is.Not.EqualTo(p2));
-
-            Person p3 = p1;
-            Assert.That(p3, Is.EqualTo(p1));
-        }
-
-        [Test]
-        public void PersonEx_HashCode()
-        {
-            var p1 = new PersonEx { Name = "dave", Age = 30, Salary = 1m, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = (PersonEx)p1.Clone();
-            Assert.That(p2.GetHashCode(), Is.EqualTo(p1.GetHashCode()));
-
-            p1.Name = "mike";
-            Assert.That(p2.GetHashCode(), Is.Not.EqualTo(p1.GetHashCode()));
-
-            p1.Name = "dave";
-            Assert.That(p2.GetHashCode(), Is.EqualTo(p1.GetHashCode()));
-
-            p1.Salary = 2m;
-            Assert.That(p2.GetHashCode(), Is.Not.EqualTo(p1.GetHashCode()));
-
-            p1.Salary = 1m;
-            Assert.That(p2.GetHashCode(), Is.EqualTo(p1.GetHashCode()));
-
-            p1.ChangeLog.CreatedBy = "username2";
-            Assert.That(p2.GetHashCode(), Is.Not.EqualTo(p1.GetHashCode()));
-        }
-
-        [Test]
-        public void PersonEx_IsInitial()
-        {
-            var p = new PersonEx();
-            Assert.That(p.IsInitial, Is.True);
-
-            p.Salary = 0m;
-            Assert.That(p.IsInitial, Is.False);
-
-            p.Salary = null;
-            Assert.That(p.IsInitial, Is.True);
-
-            p.Name = "mike";
-            Assert.That(p.IsInitial, Is.False);
-
-            p.Name = null;
-            Assert.That(p.IsInitial, Is.True);
-
-            p.ChangeLog = new ChangeLogEx { UpdatedDate = CreateDateTime() };
-            Assert.That(p.IsInitial, Is.False);
-
-            p.ChangeLog.UpdatedDate = null;
-            Assert.That(p.IsInitial, Is.False);
-
-            p.CleanUp();
-            Assert.That(p.IsInitial, Is.True);
-        }
-
-        [Test]
-        public void Collection_Person_Clone()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-
-            var pc2 = (PersonCollection)pc.Clone();
-            Assert.That(pc2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc2, Has.Count.EqualTo(2));
-                Assert.That(ReferenceEquals(pc2[0], p1), Is.False);
-                Assert.That(ReferenceEquals(pc2[1], p2), Is.False);
-                Assert.That(p1, Is.EqualTo(pc2[0]));
-                Assert.That(p2, Is.EqualTo(pc2[1]));
-            });
-        }
-
-        [Test]
-        public void Collection_Person_Equals()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-
-            Assert.That(pc, Is.Not.EqualTo(null));
-
-            var pc2 = (PersonCollection)pc.Clone();
-            Assert.That(pc, Is.EqualTo(pc2));
-            pc2.Add(new Person { Name = "john", Age = 35 });
-            Assert.That(pc, Is.Not.EqualTo(pc2));
-
-            pc2 = (PersonCollection)pc.Clone();
-            Assert.That(pc, Is.EqualTo(pc2));
-            pc2[1].Name = "jenny";
-            Assert.That(pc, Is.Not.EqualTo(pc2));
-        }
-
-        [Test]
-        public void Collection_Person_Equals2()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-            var pc2 = pc;
-
-            Assert.That(pc, Is.Not.EqualTo(null));
-            Assert.That(pc, Is.EqualTo(pc2));
-
-            pc2 = (PersonCollection)pc!.Clone();
-            Assert.That(pc, Is.EqualTo(pc2));
-            pc2.Add(new Person { Name = "john", Age = 35 });
-            Assert.That(pc, Is.Not.EqualTo(pc2));
-
-            pc2 = (PersonCollection)pc.Clone();
-            Assert.That(pc, Is.EqualTo(pc2));
-            pc2[1].Name = "jenny";
-            Assert.That(pc, Is.Not.EqualTo(pc2));
-        }
-
-        [Test]
-        public void Collection_Person_HashCode()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-            var pc2 = (PersonCollection)pc.Clone();
-            Assert.That(pc2.GetHashCode(), Is.EqualTo(pc.GetHashCode()));
-
-            pc2[0].ChangeLog!.CreatedBy = "username2";
-            Assert.That(pc2.GetHashCode(), Is.Not.EqualTo(pc.GetHashCode()));
-        }
-
-        [Test]
-        public void Collection_Person_AcceptChanges()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1 };
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc.IsChanged, Is.True);
-                Assert.That(pc[0].IsChanged, Is.True);
-                Assert.That(pc[0].ChangeLog!.IsChanged, Is.True);
-            });
-
-            pc.AcceptChanges();
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc.IsChanged, Is.False);
-                Assert.That(pc[0].IsChanged, Is.False);
-                Assert.That(pc[0].ChangeLog!.IsChanged, Is.False);
-            });
-
-            pc.Add(p2);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc.IsChanged, Is.True);
-                Assert.That(pc[0].IsChanged, Is.False);
-                Assert.That(pc[0].ChangeLog!.IsChanged, Is.False);
-                Assert.That(pc[1].IsChanged, Is.True);
-            });
-
-            pc.AcceptChanges();
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc.IsChanged, Is.False);
-                Assert.That(pc[0].IsChanged, Is.False);
-                Assert.That(pc[0].ChangeLog!.IsChanged, Is.False);
-                Assert.That(pc[1].IsChanged, Is.False);
-            });
-
-            pc[0].ChangeLog!.CreatedBy = "username2";
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc.IsChanged, Is.True);
-                Assert.That(pc[0].IsChanged, Is.True);
-                Assert.That(pc[0].ChangeLog!.IsChanged, Is.True);
-                Assert.That(pc[1].IsChanged, Is.False);
-            });
-        }
-
-        [Test]
-        public void Collect_Person_Clear()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-            Assert.That(pc.IsChanged, Is.True);
-
-            pc.AcceptChanges();
-            Assert.That(pc.IsChanged, Is.False);
-
-            pc.Clear();
-            Assert.That(pc.IsChanged, Is.True);
-        }
-
-        [Test]
-        public void Collection_Person_MakeReadOnly()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1 };
-            pc.MakeReadOnly();
-            Assert.Multiple(() =>
-            {
-                Assert.That(pc.IsReadOnly, Is.True);
-                Assert.That(pc[0].IsReadOnly, Is.True);
-                Assert.That(pc[0].ChangeLog!.IsReadOnly, Is.True);
-            });
-            Assert.Throws<InvalidOperationException>(() => pc.Add(p2));
-            Assert.That(pc, Has.Count.EqualTo(1));
-
-            Assert.Throws<InvalidOperationException>(() => pc.Clear());
-            Assert.That(pc, Has.Count.EqualTo(1));
-
-            Assert.Throws<InvalidOperationException>(() => pc.Remove(p1));
-            Assert.That(pc, Has.Count.EqualTo(1));
-
-            Assert.Throws<InvalidOperationException>(() => pc.RemoveAt(0));
-            Assert.That(pc, Has.Count.EqualTo(1));
-
-            Assert.Throws<InvalidOperationException>(() => pc[0] = p2);
-            Assert.That(pc, Has.Count.EqualTo(1));
-        }
-
-        [Test]
-        public void Collection_Person_GetByPrimaryKey()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-
-            var pi = pc.GetByKey();
-            Assert.That(pi, Is.Null);
-
-            pi = pc.GetByKey("dave");
-            Assert.That(p1, Is.EqualTo(pi));
-
-            pi = pc.GetByKey("bazza");
-            Assert.That(pi, Is.Null);
-
-            pi = pc.GetByKey(p1.PrimaryKey);
-            Assert.That(p1, Is.EqualTo(pi));
-
-            pi = pc.GetByKey(new CompositeKey("bazza"));
-            Assert.That(pi, Is.Null);
-        }
-
-        [Test]
-        public void Collection_Person_DeleteByPrimaryKey()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var p3 = new Person { Name = "dave", Age = 40 };
-            var pc = new PersonCollection { p1, p2, p3 };
-
-            pc.RemoveByKey("rebecca");
-            Assert.That(pc, Has.Count.EqualTo(3));
-            Assert.That(pc[0].Name, Is.EqualTo("dave"));
-
-            pc.RemoveByKey("dave");
-            Assert.That(pc, Has.Count.EqualTo(1));
-            Assert.That(pc[0].Name, Is.EqualTo("mary"));
-
-            pc.RemoveByKey("mary");
-            Assert.That(pc, Is.Empty);
-        }
-
-        [Test]
-        public void Collection_Person_ItemsAreAllUnique()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var p3 = new Person { Name = "dave", Age = 40 };
-            var pc = new PersonCollection { p1, p2, p3 };
-
-            Assert.That(pc.IsAnyDuplicates(), Is.True);
-
-            pc.Remove(p3);
-            Assert.That(pc.IsAnyDuplicates(), Is.False);
-
-            pc = [null!, null!];
-            Assert.That(pc.IsAnyDuplicates(), Is.True);
-
-            pc.RemoveAt(0);
-            Assert.That(pc.IsAnyDuplicates(), Is.False);
-        }
-
-        [Test]
-        public void CollectionResult_Person()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pc = new PersonCollection { p1, p2 };
-            var pcr = new PersonCollectionResult(pc);
-            Assert.That(pc, Is.SameAs(pcr.Items));
-
-            var pc2 = (PersonCollection)pcr;
-            Assert.That(pc2, Is.SameAs(pc));
-
-            var pcr2 = (PersonCollectionResult)pcr.Clone();
-            Assert.Multiple(() =>
-            {
-                Assert.That(ReferenceEquals(pcr2, pcr), Is.False);
-                Assert.That(pcr2, Is.EqualTo(pcr));
-            });
-            Assert.That(pcr2, Is.EqualTo(pcr));
-        }
-
-        [Test]
-        public void Dictionary_Person_IsChanged()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pd = new PersonDictionary { { "dave", p1 }, { "mary", p2 } };
-            Assert.That(pd.IsChanged, Is.True);
-
-            pd.AcceptChanges();
-            Assert.Multiple(() =>
-            {
-                Assert.That(pd.IsChanged, Is.False);
-                Assert.That(p1.IsChanged, Is.False);
-                Assert.That(p2.IsChanged, Is.False);
-            });
-
-            p1.ChangeLog.CreatedDate = p1.ChangeLog.CreatedDate.Value.AddMinutes(1);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pd.IsChanged, Is.True);
-                Assert.That(p1.IsChanged, Is.True);
-                Assert.That(p2.IsChanged, Is.False);
-            });
-
-            pd.AcceptChanges();
-            Assert.Multiple(() =>
-            {
-                Assert.That(pd.IsChanged, Is.False);
-                Assert.That(p1.IsChanged, Is.False);
-                Assert.That(p2.IsChanged, Is.False);
-            });
-
-            pd.Remove("mary");
-            Assert.That(pd.IsChanged, Is.True);
-
-            pd.AcceptChanges();
-            Assert.That(pd.IsChanged, Is.False);
-
-            pd.Remove("mary");
-            Assert.That(pd.IsChanged, Is.False);
-        }
-
-        [Test]
-        public void Dictionary_Person_ReadOnly()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pd = new PersonDictionary { { "dave", p1 }, { "mary", p2 } };
-            pd.MakeReadOnly();
-            Assert.That(pd.IsReadOnly, Is.True);
-
-            Assert.Throws<InvalidOperationException>(() => pd.Clear());
-            Assert.Throws<InvalidOperationException>(() => pd.Remove("mary"));
-            Assert.Throws<InvalidOperationException>(() => pd.Add("donna", new Person { Name = "Donna" }));
-            Assert.Throws<InvalidOperationException>(() => pd["donna"] = new Person { Name = "Donna" });
-        }
-
-        [Test]
-        public void Dictionary_Person_Equals()
-        {
-            var p1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var p2 = new Person { Name = "mary", Age = 25 };
-            var pd = new PersonDictionary { { "dave", p1 }, { "mary", p2 } };
-
-            var px1 = new Person { Name = "dave", Age = 30, ChangeLog = new ChangeLogEx { CreatedBy = "username", CreatedDate = CreateDateTime() } };
-            var px2 = new Person { Name = "mary", Age = 25 };
-            var pxd = new PersonDictionary { { "dave", px1 }, { "mary", px2 } };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(pd, Is.EqualTo(pxd));
-                Assert.That(pxd.GetHashCode(), Is.EqualTo(pd.GetHashCode()));
-            });
-
-            px2.Name += "X";
-            Assert.Multiple(() =>
-            {
-                Assert.That(pd, Is.Not.EqualTo(pxd));
-                Assert.That(pxd.GetHashCode(), Is.Not.EqualTo(pd.GetHashCode()));
-            });
-        }
-
-        [Test]
-        public void Dictionary_Person_Add_Infer_Key()
-        {
-            var pd = new PersonDictionary();
-            var p2 = new Person { Name = "mary", Age = 25 };
-            pd.AddRange([p2]);
-
-            Assert.That(pd, Has.Count.EqualTo(1));
-            Assert.That(pd.ContainsKey("mary"), Is.True);
-        }
-
-        private static DateTime CreateDateTime() => new(2000, 01, 01, 12, 45, 59);
-
-        public class Person : EntityBase, CoreEx.Entities.IPrimaryKey
-        {
-            private string? _name;
-            private int _age;
-            private ChangeLogEx? _changeLog;
-
-            public string? Name { get => _name; set => SetValue(ref _name, value); }
-            public int Age { get => _age; set => SetValue(ref _age, value); }
-            public ChangeLogEx? ChangeLog { get => _changeLog; set => SetValue(ref _changeLog, value); }
-
-            public CoreEx.Entities.CompositeKey PrimaryKey => new(Name);
-
-            protected override IEnumerable<IPropertyValue> GetPropertyValues()
-            {
-                yield return CreateProperty(nameof(Name), Name, v => Name = v);
-                yield return CreateProperty(nameof(Age), Age, v => Age = v);
-                yield return CreateProperty(nameof(ChangeLog), ChangeLog, v => ChangeLog = v);
-            }
-        }
-
-        public class PersonCollection : EntityKeyBaseCollection<Person, PersonCollection>
-        {
-            public PersonCollection() { }
-
-            public PersonCollection(IEnumerable<Person> entities) : base(entities) { }
-
-            public static implicit operator PersonCollection(PersonCollectionResult result) => result?.Items!;
-        }
-
-        public class PersonCollectionResult : EntityCollectionResult<PersonCollection, Person, PersonCollectionResult>
-        {
-            public PersonCollectionResult() { }
-
-            public PersonCollectionResult(PagingArgs paging) : base(paging) { }
-
-            public PersonCollectionResult(PersonCollection collection, PagingArgs? paging = null) : base(paging) => Items = collection;
-        }
-
-        public class PersonEx : Person
-        {
-            private decimal? _salary;
-
-            public decimal? Salary { get => _salary; set => SetValue(ref _salary, value); }
-
-            protected override IEnumerable<IPropertyValue> GetPropertyValues()
-            {
-                foreach (var pv in base.GetPropertyValues())
-                    yield return pv;
-
-                yield return CreateProperty(nameof(Salary), Salary, v => Salary = v);
-            }
-        }
-
-        public class PersonExCollection : EntityBaseCollection<PersonEx, PersonExCollection>
-        {
-            public PersonExCollection() { }
-
-            public PersonExCollection(IEnumerable<PersonEx> entities) : base(entities) { }
-        }
-
-        public class PersonDictionary : EntityBaseDictionary<Person, PersonDictionary> { }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/Extended/EntityCoreTest.cs b/tests/CoreEx.Test/Framework/Entities/Extended/EntityCoreTest.cs
deleted file mode 100644
index 89dfdb29..00000000
--- a/tests/CoreEx.Test/Framework/Entities/Extended/EntityCoreTest.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Entities.Extended;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Entities.Extended
-{
-    [TestFixture]
-    public class EntityCoreTest
-    {
-        [Test]
-        public void SettingAndGetting()
-        {
-            var ta = new TestA { Id = 88, Code = " A ", Text = " B ", DateOnly = new DateTime(2000, 01, 01, 12, 59, 59), DateTime = new DateTime(2000, 01, 01, 12, 59, 59), Description = "the AB code." };
-            Assert.Multiple(() =>
-            {
-                Assert.That(ta.Id, Is.EqualTo(88));
-                Assert.That(ta.Code, Is.EqualTo("a"));
-                Assert.That(ta.Text, Is.EqualTo(" B"));
-                Assert.That(ta.DateOnly, Is.EqualTo(new DateTime(2000, 01, 01)));
-                Assert.That(ta.DateTime, Is.EqualTo(new DateTime(2000, 01, 01, 12, 59, 59, DateTimeKind.Utc)));
-                Assert.That(ta.IsChanged, Is.True);
-                Assert.That(ta.Description, Is.EqualTo("The AB Code."));
-            });
-
-            ta.AcceptChanges();
-            Assert.That(ta.IsChanged, Is.False);
-
-            ta.Code = null;
-            ta.Text = null;
-            ta.DateTime = null;
-            ta.Description = null;
-            Assert.That(ta.Code, Is.Empty);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ta.Text, Is.Null);
-                Assert.That(ta.DateTime, Is.Null);
-                Assert.That(ta.IsChanged, Is.True);
-                Assert.That(ta.Description, Is.Null);
-            });
-        }
-
-        private class TestA : EntityCore
-        {
-            private long _id;
-            private string? _code;
-            private string? _text;
-            private DateTime _dateOnly;
-            private DateTime? _dateTime;
-            private string? _desc;
-
-            public long Id
-            {
-                get { return _id; }
-                set { SetValue(ref _id, value); }
-            }
-
-            public string? Code
-            {
-                get { return _code; }
-                set { SetValue(ref _code, value, StringTrim.Both, StringTransform.NullToEmpty, StringCase.Lower); }
-            }
-
-            public string? Text
-            {
-                get { return _text; }
-                set { SetValue(ref _text, value); }
-            }
-
-            public DateTime DateOnly
-            {
-                get { return _dateOnly; }
-                set { SetValue(ref _dateOnly, value, DateTimeTransform.DateOnly); }
-            }
-
-            public DateTime? DateTime
-            {
-                get { return _dateTime; }
-                set { SetValue(ref _dateTime, value); }
-            }
-
-            public string? Description
-            {
-                get { return _desc; }
-                set { SetValue(ref _desc, value, casing: StringCase.Title); }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/Extended/ObservableDictionaryTest.cs b/tests/CoreEx.Test/Framework/Entities/Extended/ObservableDictionaryTest.cs
deleted file mode 100644
index c6cb8b18..00000000
--- a/tests/CoreEx.Test/Framework/Entities/Extended/ObservableDictionaryTest.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-using CoreEx.Entities.Extended;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-
-namespace CoreEx.Test.Framework.Entities.Extended
-{
-    [TestFixture]
-    public class ObservableDictionaryTest
-    {
-        private static readonly Func<string, string> _keyModifier = k => k.ToUpperInvariant();
-
-        [Test]
-        public void ObserveAdd()
-        {
-            var od = new ObservableDictionary<string, int> { KeyModifier = _keyModifier };
-            var i = 0;
-            var j = 0;
-            od.CollectionChanged += (_, e) =>
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.Action, Is.EqualTo(NotifyCollectionChangedAction.Add));
-                    Assert.That(e.NewItems!, Has.Count.EqualTo(1));
-                });
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.NewItems![0], Is.EqualTo(new KeyValuePair<string, int>("A", 88)));
-                    Assert.That(e.OldItems, Is.Null);
-                });
-                i++;
-            };
-            od.PropertyChanged += (_, e) =>
-            {
-                Assert.That(e.PropertyName, Is.EqualTo("Count"));
-                j++;
-            };
-
-            od.Add("a", 88);
-            Assert.Multiple(() =>
-            {
-                Assert.That(i, Is.EqualTo(1));
-                Assert.That(od["a"], Is.EqualTo(88));
-                Assert.That(od.TryGetValue("a", out var v), Is.True);
-                Assert.That(v, Is.EqualTo(88));
-                Assert.That(j, Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void ObserveIndexerAdd()
-        {
-            var od = new ObservableDictionary<string, int>() { KeyModifier = _keyModifier };
-            var i = 0;
-            var j = 0;
-            od.CollectionChanged += (_, e) =>
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.Action, Is.EqualTo(NotifyCollectionChangedAction.Add));
-                    Assert.That(e.NewItems!, Has.Count.EqualTo(1));
-                });
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.NewItems![0], Is.EqualTo(new KeyValuePair<string, int>("A", 88)));
-                    Assert.That(e.OldItems, Is.Null);
-                });
-                i++;
-            };
-            od.PropertyChanged += (_, e) =>
-            {
-                Assert.That(e.PropertyName, Is.EqualTo("Count"));
-                j++;
-            };
-
-            od["a"] = 88;
-            Assert.Multiple(() =>
-            {
-                Assert.That(i, Is.EqualTo(1));
-                Assert.That(od["a"], Is.EqualTo(88));
-                Assert.That(od.TryGetValue("a", out var v), Is.True);
-                Assert.That(v, Is.EqualTo(88));
-                Assert.That(j, Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void ObserveIndexerReplace()
-        {
-            var od = new ObservableDictionary<string, int> { KeyModifier = _keyModifier };
-            od.Add("a", 99);
-
-            var i = 0;
-            var j = 0;
-            od.CollectionChanged += (_, e) =>
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.Action, Is.EqualTo(NotifyCollectionChangedAction.Replace));
-                    Assert.That(e.OldItems!, Has.Count.EqualTo(1));
-                });
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.OldItems![0], Is.EqualTo(new KeyValuePair<string, int>("A", 99)));
-                    Assert.That(e.NewItems!, Has.Count.EqualTo(1));
-                });
-                Assert.That(e.NewItems![0], Is.EqualTo(new KeyValuePair<string, int>("A", 88)));
-                i++;
-            };
-            od.PropertyChanged += (_, e) =>
-            {
-                Assert.That(e.PropertyName, Is.EqualTo("Count"));
-                j++;
-            };
-
-            od["a"] = 88;
-            Assert.Multiple(() =>
-            {
-                Assert.That(i, Is.EqualTo(1));
-                Assert.That(od["a"], Is.EqualTo(88));
-                Assert.That(od.TryGetValue("a", out var v), Is.True);
-                Assert.That(v, Is.EqualTo(88));
-                Assert.That(j, Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void ObserveRemove()
-        {
-            var od = new ObservableDictionary<string, int> { KeyModifier = _keyModifier };
-            od.Add("a", 99);
-
-            var i = 0;
-            var j = 0;
-            od.CollectionChanged += (_, e) =>
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.Action, Is.EqualTo(NotifyCollectionChangedAction.Remove));
-                    Assert.That(e.OldItems!, Has.Count.EqualTo(1));
-                });
-                Assert.Multiple(() =>
-                {
-                    Assert.That(e.OldItems![0], Is.EqualTo(new KeyValuePair<string, int>("A", 99)));
-                    Assert.That(e.NewItems, Is.Null);
-                });
-                i++;
-            };
-            od.PropertyChanged += (_, e) =>
-            {
-                Assert.That(e.PropertyName, Is.EqualTo("Count"));
-                j++;
-            };
-
-            od.Remove("a");
-            Assert.That(i, Is.EqualTo(1));
-            Assert.Throws<KeyNotFoundException>(() => { var x = od["a"]; });
-            Assert.Multiple(() =>
-            {
-                Assert.That(od.TryGetValue("a", out var v), Is.False);
-                Assert.That(v, Is.EqualTo(0));
-                Assert.That(j, Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void ObserveClear()
-        {
-            var od = new ObservableDictionary<string, int> { KeyModifier = _keyModifier };
-            od.Add("a", 99);
-            od.Add("b", 98);
-
-            var i = 0;
-            var j = 0;
-            od.CollectionChanged += (_, e) =>
-            {
-                if (i == 0)
-                {
-                    Assert.Multiple(() =>
-                    {
-                        Assert.That(e.Action, Is.EqualTo(NotifyCollectionChangedAction.Remove));
-                        Assert.That(e.OldItems!, Has.Count.EqualTo(2));
-                    });
-                    Assert.Multiple(() =>
-                    {
-                        Assert.That(e.OldItems![0], Is.EqualTo(new KeyValuePair<string, int>("A", 99)));
-                        Assert.That(e.OldItems![1], Is.EqualTo(new KeyValuePair<string, int>("B", 98)));
-                        Assert.That(e.NewItems, Is.Null);
-                    });
-                }
-                else
-                {
-                    Assert.Multiple(() =>
-                    {
-                        Assert.That(e.Action, Is.EqualTo(NotifyCollectionChangedAction.Reset));
-                        Assert.That(e.OldItems, Is.Null);
-                        Assert.That(e.NewItems, Is.Null);
-                    });
-                }
-
-                i++;
-            };
-            od.PropertyChanged += (_, e) =>
-            {
-                Assert.That(e.PropertyName, Is.EqualTo("Count"));
-                j++;
-            };
-
-            od.Clear();
-            Assert.That(i, Is.EqualTo(2));
-            Assert.Throws<KeyNotFoundException>(() => { var x = od["a"]; });
-            Assert.Multiple(() =>
-            {
-                Assert.That(od.TryGetValue("a", out var v), Is.False);
-                Assert.That(v, Is.EqualTo(0));
-                Assert.That(j, Is.EqualTo(1));
-            });
-
-            // A subsequent clear should not raise any events.
-            i = j = 0;
-            od.Clear();
-            Assert.Multiple(() =>
-            {
-                Assert.That(i, Is.EqualTo(0));
-                Assert.That(j, Is.EqualTo(0));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/IdentifierTest.cs b/tests/CoreEx.Test/Framework/Entities/IdentifierTest.cs
deleted file mode 100644
index d2e647d8..00000000
--- a/tests/CoreEx.Test/Framework/Entities/IdentifierTest.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using CoreEx.Entities;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Entities
-{
-    [TestFixture]
-    public class IdentifierTest
-    {
-        [Test]
-        public void VerifyBaseIdProperty()
-        {
-            var p = new Person { Id = 88 };
-            Assert.That(p.Id, Is.EqualTo(88));
-
-            var iii = (IIdentifier<int>)p;
-            Assert.That(iii.Id, Is.EqualTo(88));
-
-            var ii = (IIdentifier)p;
-            Assert.That(ii.Id, Is.EqualTo(88));
-
-            ii.Id = 99;
-            Assert.Multiple(() =>
-            {
-                Assert.That(ii.Id, Is.EqualTo(99));
-                Assert.That(iii.Id, Is.EqualTo(99));
-                Assert.That(p.Id, Is.EqualTo(99));
-            });
-        }
-
-        private class Person : IIdentifier<int>
-        {
-            public int Id { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Entities/PagingArgsTest.cs b/tests/CoreEx.Test/Framework/Entities/PagingArgsTest.cs
deleted file mode 100644
index 8688eb70..00000000
--- a/tests/CoreEx.Test/Framework/Entities/PagingArgsTest.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using CoreEx.Entities;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Entities
-{
-    [TestFixture]
-    public class PagingArgsTest
-    {
-        [Test]
-        public void CreateSkipAndTake()
-        {
-            var pa = PagingArgs.CreateSkipAndTake(10, 20);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pa.Skip, Is.EqualTo(10));
-                Assert.That(pa.Take, Is.EqualTo(20));
-                Assert.That(pa.Option, Is.EqualTo(PagingOption.SkipAndTake));
-            });
-        }
-
-        [Test]
-        public void CreatePageAndSize()
-        {
-            var pa = PagingArgs.CreatePageAndSize(10, 20);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pa.Page, Is.EqualTo(10));
-                Assert.That(pa.Size, Is.EqualTo(20));
-                Assert.That(pa.Option, Is.EqualTo(PagingOption.PageAndSize));
-            });
-        }
-
-        [Test]
-        public void CreateTokenAndTake()
-        {
-            PagingArgs.IsTokenSupported = true;
-            var pa = PagingArgs.CreateTokenAndTake("blah-blah", 20);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pa.Token, Is.EqualTo("blah-blah"));
-                Assert.That(pa.Take, Is.EqualTo(20));
-                Assert.That(pa.Option, Is.EqualTo(PagingOption.TokenAndTake));
-            });
-        }
-
-        [TearDown]
-        public void TearDown() => PagingArgs.IsTokenSupported = false;
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Events/CloudEventSerializerTest.cs b/tests/CoreEx.Test/Framework/Events/CloudEventSerializerTest.cs
deleted file mode 100644
index 4cefd38e..00000000
--- a/tests/CoreEx.Test/Framework/Events/CloudEventSerializerTest.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-using CoreEx.Events;
-using CoreEx.Events.Attachments;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.Events
-{
-    [TestFixture]
-    public class CloudEventSerializerTest
-    {
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize1() 
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer() as IEventSerializer;
-            var ed = CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            ed2 = (EventData<Product>)await es.DeserializeAsync(bd, typeof(Product)).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize2()
-        {
-            var ef = new EventDataFormatter { SourceDefault = _ => new Uri("null", UriKind.RelativeOrAbsolute) };
-            var es = new CoreEx.Text.Json.CloudEventSerializer(ef) as IEventSerializer;
-            var ed = CreateProductEvent2();
-            ef.Format(ed);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent2));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2, "Type", "Source");
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.EqualTo(new Uri("null", UriKind.Relative)));
-                Assert.That(ed2.Type, Is.EqualTo("coreex.testfunction.models.product"));
-            });
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize1_WithAttachment()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer() { AttachmentStorage = CreateEventStorage("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}", 10) } as IEventSerializer;
-            var ed = CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1Attachement));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            ed2 = (EventData<Product>)await es.DeserializeAsync(bd, typeof(Product)).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3, "Value");
-            Assert.That(ed3.Value?.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize1_WithNoAttachment()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer() { AttachmentStorage = CreateEventStorage("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}", 1000) } as IEventSerializer;
-            var ed = CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            ed2 = (EventData<Product>)await es.DeserializeAsync(bd, typeof(Product)).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3, "Value");
-            Assert.That(ed3.Value?.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize1()
-        {
-            var es = new CoreEx.Newtonsoft.Json.CloudEventSerializer() as IEventSerializer;
-            var ed = CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize2()
-        {
-            var ef = new EventDataFormatter { SourceDefault = _ => new Uri("null", UriKind.RelativeOrAbsolute) };
-            var es = new CoreEx.Newtonsoft.Json.CloudEventSerializer(ef) as IEventSerializer;
-            var ed = CreateProductEvent2();
-            ef.Format(ed);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent2));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2, "Type", "Source");
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.EqualTo(new Uri("null", UriKind.Relative)));
-                Assert.That(ed2.Type, Is.EqualTo("coreex.testfunction.models.product"));
-            });
-        }
-
-        internal static EventData<Product> CreateProductEvent1() => new()
-        {
-            Id = "id",
-            Type = "product.created",
-            Source = new Uri("product/a", UriKind.Relative),
-            Subject = "product",
-            Action = "created",
-            CorrelationId = "cid",
-            TenantId = "tid",
-            Timestamp = new DateTime(2022, 02, 22, 22, 02, 22, DateTimeKind.Utc),
-            PartitionKey = "pid",
-            ETag = "etag",
-            Attributes = new Dictionary<string, string> { { "fruit", "bananas" } },
-            Value = new Product { Id = "A", Name = "B", Price = 1.99m },
-            Key = "A"
-        };
-
-        internal static EventData<Product> CreateProductEvent2() => new()
-        {
-            Id = "id",
-            Timestamp = new DateTime(2022, 02, 22, 22, 02, 22, DateTimeKind.Utc),
-            Value = new Product { Id = "A", Name = "B", Price = 1.99m },
-            CorrelationId = "cid",
-            Key = "A"
-        };
-
-        private const string CloudEvent1 = "{\"specversion\":\"1.0\",\"id\":\"id\",\"time\":\"2022-02-22T22:02:22Z\",\"type\":\"product.created\",\"source\":\"product/a\",\"subject\":\"product\",\"action\":\"created\",\"correlationid\":\"cid\",\"partitionkey\":\"pid\",\"tenantid\":\"tid\",\"etag\":\"etag\",\"key\":\"A\",\"fruit\":\"bananas\",\"datacontenttype\":\"application/json\",\"data\":{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}}";
-
-        private const string CloudEvent2 = "{\"specversion\":\"1.0\",\"id\":\"id\",\"time\":\"2022-02-22T22:02:22Z\",\"type\":\"coreex.testfunction.models.product\",\"source\":\"null\",\"correlationid\":\"cid\",\"key\":\"A\",\"datacontenttype\":\"application/json\",\"data\":{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}}";
-
-        private const string CloudEvent1Attachement = "{\"specversion\":\"1.0\",\"id\":\"id\",\"time\":\"2022-02-22T22:02:22Z\",\"type\":\"product.created\",\"source\":\"product/a\",\"subject\":\"product\",\"action\":\"created\",\"correlationid\":\"cid\",\"partitionkey\":\"pid\",\"tenantid\":\"tid\",\"etag\":\"etag\",\"key\":\"A\",\"fruit\":\"bananas\",\"datacontenttype\":\"application/json\",\"data\":{\"contentType\":\"application/json\",\"attachment\":\"bananas.json\"}}";
-
-        internal static EventStorage CreateEventStorage(string? data = null, int? max = null) => new(data) { MaxDataSize = max ?? 100000 };
-
-        internal class EventStorage : IAttachmentStorage
-        {
-            private readonly BinaryData _data;
-
-            public EventStorage(string? data)
-                => _data = data is null ? BinaryData.Empty : new BinaryData(data);
-
-            public int MaxDataSize { get; set; } = 10;
-
-            public Task<BinaryData> ReadAync(EventAttachment attachment, CancellationToken cancellationToken) => Task.FromResult(_data);
-
-            public Task<EventAttachment> WriteAsync(EventData @event, BinaryData attachmentData, CancellationToken cancellationToken)
-            {
-                Assert.That(attachmentData.ToString(), Is.EqualTo(_data.ToString()));
-                return Task.FromResult(new EventAttachment { Attachment = "bananas.json", ContentType = "application/json" });
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Events/EventDataFormatterTest.cs b/tests/CoreEx.Test/Framework/Events/EventDataFormatterTest.cs
deleted file mode 100644
index c1b14642..00000000
--- a/tests/CoreEx.Test/Framework/Events/EventDataFormatterTest.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Events;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using System;
-using System.Text.Json.Serialization;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.Events
-{
-    [TestFixture]
-    public class EventDataFormatterTest
-    {
-        [Test]
-        public void PropertySelection()
-        {
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var ed2 = new EventData { Id = ed.Id, Timestamp = ed.Timestamp, Value = ed.Value, CorrelationId = null };
-            var ef = new EventDataFormatter { PropertySelection = EventDataProperty.None };
-            ef.Format(ed);
-            ObjectComparer.Assert(ed2, ed);
-        }
-
-        [Test]
-        public void TypeCasing()
-        {
-            var ed = new EventData { Type = "AbCd" };
-            var ef = new EventDataFormatter { TypeCasing = CoreEx.Globalization.TextInfoCasing.None };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("AbCd"));
-
-            ed = new EventData { Type = "AbCd" };
-            ef = new EventDataFormatter { TypeCasing = CoreEx.Globalization.TextInfoCasing.Lower };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("abcd"));
-
-            ed = new EventData { Type = "AbCd" };
-            ef = new EventDataFormatter { TypeCasing = CoreEx.Globalization.TextInfoCasing.Upper };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("ABCD"));
-        }
-
-        [Test]
-        public void TypeDefaultToValueTypeName()
-        {
-            var ed = new EventData();
-            var ef = new EventDataFormatter { TypeDefaultToValueTypeName = false };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo(null));
-
-            ed = new EventData();
-            ef.TypeDefaultToValueTypeName = true;
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("none"));
-
-            ed = new EventData { Value = new Product() };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("coreex.testfunction.models.product"));
-
-            ed = new EventData { Value = new Product() };
-            ef.TypeSeparatorCharacter = '/';
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("coreex/testfunction/models/product"));
-        }
-
-        [Test]
-        public void TypeAppendIdOrPrimaryKey()
-        {
-            var ed = new EventData { Type = "product", Value = new Product { Id = "abc" } };
-            var ef = new EventDataFormatter { TypeAppendEntityKey = true };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("product.abc"));
-
-            ed = new EventData { Type = "product", Value = new BackendProduct { Code = "xyz" } };
-            ef.Format(ed);
-            Assert.That(ed.Type, Is.EqualTo("product.xyz"));
-        }
-
-        [Test]
-        public void SubjectCasing()
-        {
-            var ed = new EventData { Subject = "AbCd" };
-            var ef = new EventDataFormatter { SubjectCasing = CoreEx.Globalization.TextInfoCasing.None };
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("AbCd"));
-
-            ed = new EventData { Subject = "AbCd" };
-            ef = new EventDataFormatter { SubjectCasing = CoreEx.Globalization.TextInfoCasing.Lower };
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("abcd"));
-
-            ed = new EventData { Subject = "AbCd" };
-            ef = new EventDataFormatter { SubjectCasing = CoreEx.Globalization.TextInfoCasing.Upper };
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("ABCD"));
-        }
-
-        [Test]
-        public void SubjectDefaultToValueSubjectName()
-        {
-            var ed = new EventData();
-            var ef = new EventDataFormatter { SubjectDefaultToValueTypeName = false };
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.Null);
-
-            ef.SubjectDefaultToValueTypeName = true;
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.Null);
-
-            ed.Value = new Product();
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("coreex.testfunction.models.product"));
-
-            ed.Subject = null;
-            ef.SubjectSeparatorCharacter = '/';
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("coreex/testfunction/models/product"));
-        }
-
-        [Test]
-        public void SubjectAppendIdOrPrimaryKey()
-        {
-            var ed = new EventData { Subject = "product", Value = new Product { Id = "abc" } };
-            var ef = new EventDataFormatter { SubjectAppendEntityKey = true };
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("product.abc"));
-
-            ed = new EventData { Subject = "product", Value = new BackendProduct { Code = "xyz" } };
-            ef.Format(ed);
-            Assert.That(ed.Subject, Is.EqualTo("product.xyz"));
-        }
-
-        [Test]
-        public void ActionCasing()
-        {
-            var ed = new EventData { Action = "AbCd" };
-            var ef = new EventDataFormatter { ActionCasing = CoreEx.Globalization.TextInfoCasing.None };
-            ef.Format(ed);
-            Assert.That(ed.Action, Is.EqualTo("AbCd"));
-
-            ed = new EventData { Action = "AbCd" };
-            ef = new EventDataFormatter { ActionCasing = CoreEx.Globalization.TextInfoCasing.Lower };
-            ef.Format(ed);
-            Assert.That(ed.Action, Is.EqualTo("abcd"));
-
-            ed = new EventData { Action = "AbCd" };
-            ef = new EventDataFormatter { ActionCasing = CoreEx.Globalization.TextInfoCasing.Upper };
-            ef.Format(ed);
-            Assert.That(ed.Action, Is.EqualTo("ABCD"));
-        }
-
-        [Test]
-        public void SourceDefault()
-        {
-            var ed = new EventData();
-            var ef = new EventDataFormatter { SourceDefault = _ => new Uri("null", UriKind.Relative) };
-            ef.Format(ed);
-            Assert.That(ed.Source, Is.EqualTo(new Uri("null", UriKind.Relative)));
-        }
-
-        [Test]
-        public void ETagDefaultFromValue()
-        {
-            var ed = new EventData { Value = new Person { ETag = "xxx" } };
-            var ef = new EventDataFormatter { ETagDefaultFromValue = true };
-            ef.Format(ed);
-            Assert.That(ed.ETag, Is.EqualTo("xxx"));
-        }
-
-        [Test]
-        public void ETagDefaultGenerated()
-        {
-            var ed = new EventData { Value = new Product { Id = "abc" } };
-            var ef = new EventDataFormatter { ETagDefaultGenerated = true };
-            Assert.Throws<InvalidOperationException>(() => ef.Format(ed));
-
-            ef.JsonSerializer = new CoreEx.Text.Json.JsonSerializer();
-            ef.Format(ed);
-            Assert.That(ed.ETag, Is.EqualTo("0rk/Eu4Si62XCw/qDYxqLh9fhNR/4rrAijmAigS0NDM="));
-        }
-
-        [Test]
-        public void FormattableValue()
-        {
-            var ed = new EventData { Value = new SalesOrderItem { OrderNo = "X400", ItemNo = 10, ProductId = "abc" } };
-            var ef = new EventDataFormatter();
-            ef.Format(ed);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Key, Is.EqualTo("X400,10"));
-                Assert.That(ed.HasAttributes, Is.True);
-                Assert.That(ed.Attributes!["_SessionId"], Is.EqualTo("abc"));
-            });
-        }
-
-        internal class Person : IETag
-        {
-            public string? Name { get; set; }
-
-            public string? ETag { get; set; }
-        }
-
-        internal class SalesOrderItem : IPrimaryKey, IEventDataFormatter
-        {
-            public string? OrderNo { get; set; }
-
-            public int ItemNo { get; set; }
-
-            public string? ProductId { get; set; }
-
-            [JsonIgnore]
-            public CompositeKey PrimaryKey => new(OrderNo, ItemNo);
-
-            void IEventDataFormatter.Format(EventData eventData)
-            {
-                var p = (SalesOrderItem)eventData.Value!;
-                eventData.AddAttribute("_SessionId", p.ProductId!);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Events/EventDataPublisherTest.cs b/tests/CoreEx.Test/Framework/Events/EventDataPublisherTest.cs
deleted file mode 100644
index f2fc39bd..00000000
--- a/tests/CoreEx.Test/Framework/Events/EventDataPublisherTest.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Events;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Events
-{
-    [TestFixture]
-    public class EventDataPublisherTest
-    {
-        [Test]
-        public void Create()
-        {
-            var ep = new NullEventPublisher();
-
-            var ed = ep.CreateEvent(new System.Uri("http://blah"), "sub", "act");
-            Assert.That(ed, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Source, Is.EqualTo(new System.Uri("http://blah")));
-                Assert.That(ed.Subject, Is.EqualTo("sub"));
-                Assert.That(ed.Action, Is.EqualTo("act"));
-                Assert.That(ed.Key, Is.Null);
-            });
-
-            ed = ep.CreateEvent(new System.Uri("http://blah"), "sub", "act", "x");
-            Assert.That(ed, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Source, Is.EqualTo(new System.Uri("http://blah")));
-                Assert.That(ed.Subject, Is.EqualTo("sub"));
-                Assert.That(ed.Action, Is.EqualTo("act"));
-                Assert.That(ed.Key, Is.EqualTo("x"));
-            });
-
-            ed = ep.CreateEvent(new System.Uri("http://blah"), "sub", "act", "a", "b");
-            Assert.That(ed, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Source, Is.EqualTo(new System.Uri("http://blah")));
-                Assert.That(ed.Subject, Is.EqualTo("sub"));
-                Assert.That(ed.Action, Is.EqualTo("act"));
-                Assert.That(ed.Key, Is.EqualTo("a,b"));
-            });
-
-            ed = ep.CreateEvent(new System.Uri("http://blah"), "sub", "act", new CoreEx.Entities.CompositeKey("c", "d"));
-            Assert.That(ed, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Source, Is.EqualTo(new System.Uri("http://blah")));
-                Assert.That(ed.Subject, Is.EqualTo("sub"));
-                Assert.That(ed.Action, Is.EqualTo("act"));
-                Assert.That(ed.Key, Is.EqualTo("c,d"));
-            });
-
-            var ed2 = ep.CreateEvent("sub", "act");
-            Assert.That(ed2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.Null);
-                Assert.That(ed2.Subject, Is.EqualTo("sub"));
-                Assert.That(ed2.Action, Is.EqualTo("act"));
-                Assert.That(ed2.Key, Is.Null);
-            });
-
-            ed2 = ep.CreateEvent("sub", "act", "x");
-            Assert.That(ed2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.Null);
-                Assert.That(ed2.Subject, Is.EqualTo("sub"));
-                Assert.That(ed2.Action, Is.EqualTo("act"));
-                Assert.That(ed2.Key, Is.EqualTo("x"));
-            });
-
-            ed2 = ep.CreateEvent("sub", "act", "a", "b");
-            Assert.That(ed2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.Null);
-                Assert.That(ed2.Subject, Is.EqualTo("sub"));
-                Assert.That(ed2.Action, Is.EqualTo("act"));
-                Assert.That(ed2.Key, Is.EqualTo("a,b"));
-            });
-
-            ed2 = ep.CreateEvent("sub", "act", new CoreEx.Entities.CompositeKey("c", "d"));
-            Assert.That(ed2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.Null);
-                Assert.That(ed2.Subject, Is.EqualTo("sub"));
-                Assert.That(ed2.Action, Is.EqualTo("act"));
-                Assert.That(ed2.Key, Is.EqualTo("c,d"));
-            });
-        }
-
-        [Test]
-        public void CreateValue()
-        {
-            var ep = new NullEventPublisher();
-            ep.EventDataFormatter.KeySeparatorCharacter = '|';
-
-            var ed1 = ep.CreateValueEvent(new Person1 { Id = 88 }, new System.Uri("http://blah"), "sub", "act");
-            Assert.That(ed1, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed1.Source, Is.EqualTo(new System.Uri("http://blah")));
-                Assert.That(ed1.Subject, Is.EqualTo("sub"));
-                Assert.That(ed1.Action, Is.EqualTo("act"));
-                Assert.That(ed1.Key, Is.EqualTo("88"));
-            });
-
-            var ed2 = ep.CreateValueEvent(new Person2 { PrimaryKey = new CompositeKey("a", "b") }, new System.Uri("http://blah"), "sub", "act");
-            Assert.That(ed2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.EqualTo(new System.Uri("http://blah")));
-                Assert.That(ed2.Subject, Is.EqualTo("sub"));
-                Assert.That(ed2.Action, Is.EqualTo("act"));
-                Assert.That(ed2.Key, Is.EqualTo("a|b"));
-            });
-
-            var ed3 = ep.CreateValueEvent(new Person1 { Id = 88 }, "sub", "act");
-            Assert.That(ed3, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed3.Source, Is.Null);
-                Assert.That(ed3.Subject, Is.EqualTo("sub"));
-                Assert.That(ed3.Action, Is.EqualTo("act"));
-                Assert.That(ed3.Key, Is.EqualTo("88"));
-            });
-
-            var ed4 = ep.CreateValueEvent(new Person2 { PrimaryKey = new CompositeKey("a", "b") }, "sub", "act");
-            Assert.That(ed4, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed4.Source, Is.Null);
-                Assert.That(ed4.Subject, Is.EqualTo("sub"));
-                Assert.That(ed4.Action, Is.EqualTo("act"));
-                Assert.That(ed4.Key, Is.EqualTo("a|b"));
-            });
-        }
-
-        [Test]
-        public void ExtentionMethods()
-        {
-            var uri = new System.Uri("http://blah");
-            var ep = new NullEventPublisher();
-            ep.CreateEvent("sub");
-            ep.CreateEvent("sub", "act");
-            ep.CreateEvent("sub", "act", 88);
-            ep.CreateEvent("sub", "act", CompositeKey.Create(88));
-
-            ep.CreateEvent(uri, "sub");
-            ep.CreateEvent(uri, "sub", "act");
-            ep.CreateEvent(uri, "sub", "act", 88);
-            ep.CreateEvent(uri, "sub", "act", CompositeKey.Create(88));
-
-            ep.CreateValueEvent(new Person1 { Id = 88 }, "sub");
-            ep.CreateValueEvent(new Person1 { Id = 88 }, "sub", "act");
-            ep.CreateValueEvent(new Person1 { Id = 88 }, "sub", "act", 88);
-            ep.CreateValueEvent(new Person1 { Id = 88 }, "sub", "act", CompositeKey.Create(88));
-
-            ep.CreateValueEvent(new Person1 { Id = 88 }, uri, "sub");
-            ep.CreateValueEvent(new Person1 { Id = 88 }, uri, "sub", "act");
-            ep.CreateValueEvent(new Person1 { Id = 88 }, uri, "sub", "act", 88);
-            ep.CreateValueEvent(new Person1 { Id = 88 }, uri, "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishEvent("sub");
-            ep.PublishEvent("sub", "act");
-            ep.PublishEvent("sub", "act", 88);
-            ep.PublishEvent("sub", "act", CompositeKey.Create(88));
-
-            ep.PublishEvent(uri, "sub");
-            ep.PublishEvent(uri, "sub", "act");
-            ep.PublishEvent(uri, "sub", "act", 88);
-            ep.PublishEvent(uri, "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishNamedEvent("q", "sub");
-            ep.PublishNamedEvent("q", "sub", "act");
-            ep.PublishNamedEvent("q", "sub", "act", 88);
-            ep.PublishNamedEvent("q", "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishNamedEvent("q", uri, "sub");
-            ep.PublishNamedEvent("q", uri, "sub", "act");
-            ep.PublishNamedEvent("q", uri, "sub", "act", 88);
-            ep.PublishNamedEvent("q", uri, "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishValueEvent(new Person1 { Id = 88 }, "sub");
-            ep.PublishValueEvent(new Person1 { Id = 88 }, "sub", "act");
-            ep.PublishValueEvent(new Person1 { Id = 88 }, "sub", "act", 88);
-            ep.PublishValueEvent(new Person1 { Id = 88 }, "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishValueEvent(new Person1 { Id = 88 }, uri, "sub");
-            ep.PublishValueEvent(new Person1 { Id = 88 }, uri, "sub", "act");
-            ep.PublishValueEvent(new Person1 { Id = 88 }, uri, "sub", "act", 88);
-            ep.PublishValueEvent(new Person1 { Id = 88 }, uri, "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, "sub");
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, "sub", "act");
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, "sub", "act", 88);
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, "sub", "act", CompositeKey.Create(88));
-
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, uri, "sub");
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, uri, "sub", "act");
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, uri, "sub", "act", 88);
-            ep.PublishNamedValueEvent("q", new Person1 { Id = 88 }, uri, "sub", "act", CompositeKey.Create(88));
-        }
-
-        public class Person1 : IIdentifier<int>
-        {
-            public int Id { get; set; }
-        }
-
-        public class Person2 : IPrimaryKey
-        {
-            public CompositeKey PrimaryKey { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Events/EventDataSerializerTest.cs b/tests/CoreEx.Test/Framework/Events/EventDataSerializerTest.cs
deleted file mode 100644
index 6ab9a951..00000000
--- a/tests/CoreEx.Test/Framework/Events/EventDataSerializerTest.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-using CoreEx.Events;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-using UnitTestEx;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Test.Framework.Events
-{
-    [TestFixture]
-    public class EventDataSerializerTest
-    {
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData1()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData2()
-        {
-            var ef = new EventDataFormatter { SourceDefault = _ => new Uri("null", UriKind.RelativeOrAbsolute) };
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer(), ef) { SerializeValueOnly = false } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent2();
-            ef.Format(ed);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent2));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2, "Type", "Source");
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.EqualTo(new Uri("null", UriKind.Relative)));
-                Assert.That(ed2.Type, Is.EqualTo("coreex.testfunction.models.product"));
-            });
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData3()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped) { Value = ped.Value };
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            ed2 = (EventData<Product>)await es.DeserializeAsync(bd, typeof(Product)).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3, "Value");
-            Assert.That(ed3.Value?.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData4()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_ValueOnly()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = true } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(new EventData<Product> { Value = ed.Value }, ed2);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_ValueOnly2()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = true } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(new EventData<Product>(), ed2);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData1_WithAttachment()
-        {
-            // Serialized length is > 10, so it will be stored in attachment
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false, AttachmentStorage = CloudEventSerializerTest.CreateEventStorage("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}", 10) } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1Attachment));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData1_WithNoAttachment()
-        {
-            // Serialized length is < 100, so it will _not_ be stored in attachment
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false, AttachmentStorage = CloudEventSerializerTest.CreateEventStorage("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}", 100) } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData3_WithAttachment()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false, AttachmentStorage = CloudEventSerializerTest.CreateEventStorage("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}", 10) } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped) { Value = ped.Value };
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1Attachment));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            ed2 = (EventData<Product>)await es.DeserializeAsync(bd, typeof(Product)).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3, "Value");
-            Assert.That(ed3.Value?.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_EventData3_WithNoAttachment()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false, AttachmentStorage = CloudEventSerializerTest.CreateEventStorage("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}", 100) } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped) { Value = ped.Value };
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            ed2 = (EventData<Product>)await es.DeserializeAsync(bd, typeof(Product)).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3, "Value");
-            Assert.That(ed3.Value?.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-        }
-
-        [Test]
-        public async Task SystemTextJson_Serialize_Deserialize_Custom_EventData1()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer(new Text.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            es.CustomSerializers.Add<Product>((ed, js, _) => new BinaryData(js.SerializeWithExcludeFilter(ed, "value.price")));
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2, "value.price");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Value.Price, Is.Not.Zero);
-                Assert.That(ed2.Value.Price, Is.Zero); // Price should be scrubbed.
-            });
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize_EventData1()
-        {
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize_EventData2()
-        {
-            var ef = new EventDataFormatter { SourceDefault = _ => new Uri("null", UriKind.RelativeOrAbsolute) };
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer(), ef) { SerializeValueOnly = false } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent2();
-            ef.Format(ed);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent2));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2, "Type", "Source");
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed2.Source, Is.EqualTo(new Uri("null", UriKind.Relative)));
-                Assert.That(ed2.Type, Is.EqualTo("coreex.testfunction.models.product"));
-            });
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize_EventData3()
-        {
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped) { Value = ped.Value };
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo(CloudEvent1));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3, "Value");
-            Assert.That(((Nsj.Linq.JToken)ed3.Value!).ToString(Nsj.Formatting.None), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize_EventData4()
-        {
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2);
-
-            var ed3 = await es.DeserializeAsync(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed3);
-        }
-
-        [Test]
-        public async Task NewtonsoftJson_Serialize_Deserialize_ValueOnly()
-        {
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer()) { SerializeValueOnly = true } as IEventSerializer;
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-            Assert.That(bd.ToString(), Is.EqualTo("{\"id\":\"A\",\"name\":\"B\",\"price\":1.99}"));
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(new EventData<Product> { Value = ed.Value }, ed2);
-        }
-
-        [Test]
-        public async Task NewtonsoftText_Serialize_Deserialize_ValueOnly2()
-        {
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer()) { SerializeValueOnly = true } as IEventSerializer;
-            var ped = CloudEventSerializerTest.CreateProductEvent1();
-            var ed = new EventData(ped);
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(new EventData<Product>(), ed2);
-        }
-
-        [Test]
-        public async Task NewtonsoftText_Serialize_Deserialize_Custom_EventData1()
-        {
-            var es = new CoreEx.Newtonsoft.Json.EventDataSerializer(new Newtonsoft.Json.JsonSerializer()) { SerializeValueOnly = false } as IEventSerializer;
-            es.CustomSerializers.Add<Product>((ed, js, _) => new BinaryData(js.SerializeWithExcludeFilter(ed, "value.price")));
-            var ed = CloudEventSerializerTest.CreateProductEvent1();
-            var bd = await es.SerializeAsync(ed).ConfigureAwait(false);
-            Assert.That(bd, Is.Not.Null);
-
-            var ed2 = await es.DeserializeAsync<Product>(bd).ConfigureAwait(false);
-            ObjectComparer.Assert(ed, ed2, "value.price");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(ed.Value.Price, Is.Not.Zero);
-                Assert.That(ed2.Value.Price, Is.Zero); // Price should be scrubbed.
-            });
-        }
-
-        private const string CloudEvent1 = "{\"value\":{\"id\":\"A\",\"name\":\"B\",\"price\":1.99},\"id\":\"id\",\"subject\":\"product\",\"action\":\"created\",\"type\":\"product.created\",\"source\":\"product/a\",\"timestamp\":\"2022-02-22T22:02:22+00:00\",\"correlationId\":\"cid\",\"key\":\"A\",\"tenantId\":\"tid\",\"partitionKey\":\"pid\",\"etag\":\"etag\",\"attributes\":{\"fruit\":\"bananas\"}}";
-
-        private const string CloudEvent2 = "{\"value\":{\"id\":\"A\",\"name\":\"B\",\"price\":1.99},\"id\":\"id\",\"type\":\"coreex.testfunction.models.product\",\"source\":\"null\",\"timestamp\":\"2022-02-22T22:02:22+00:00\",\"correlationId\":\"cid\",\"key\":\"A\"}";
-
-        private const string CloudEvent1Attachment = "{\"value\":{\"contentType\":\"application/json\",\"attachment\":\"bananas.json\"},\"id\":\"id\",\"subject\":\"product\",\"action\":\"created\",\"type\":\"product.created\",\"source\":\"product/a\",\"timestamp\":\"2022-02-22T22:02:22+00:00\",\"correlationId\":\"cid\",\"key\":\"A\",\"tenantId\":\"tid\",\"partitionKey\":\"pid\",\"etag\":\"etag\",\"attributes\":{\"fruit\":\"bananas\"}}";
-
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Events/Subscribing/EventSubscriberAttributeTest.cs b/tests/CoreEx.Test/Framework/Events/Subscribing/EventSubscriberAttributeTest.cs
deleted file mode 100644
index 583d52a7..00000000
--- a/tests/CoreEx.Test/Framework/Events/Subscribing/EventSubscriberAttributeTest.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Events.Subscribing
-{
-    [TestFixture]
-    public class EventSubscriberAttributeTest
-    {
-        [Test]
-        public void Match_Subject_Only()
-        {
-            var edf = new EventDataFormatter();
-            var esa = new EventSubscriberAttribute("root.*");
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create("root", null, null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("root.a", null, null)), Is.True);
-                Assert.That(esa.IsMatch(edf, Create("root.a.b", null, null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("other", null, null)), Is.False);
-            });
-
-            esa = new EventSubscriberAttribute("root.*.*");
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create("root", null, null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("root.a", null, null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("ROOT.A.B", null, null)), Is.True);
-                Assert.That(esa.IsMatch(edf, Create("root.a.b.c", null, null)), Is.False);
-            });
-
-            esa = new EventSubscriberAttribute("root.*.**");
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create("root", null, null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("root.a", null, null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("root.a.b", null, null)), Is.True);
-                Assert.That(esa.IsMatch(edf, Create("root.a.b.c", null, null)), Is.True);
-            });
-        }
-
-        [Test]
-        public void Match_Type_Only()
-        {
-            var edf = new EventDataFormatter();
-            var esa = new EventSubscriberAttribute() { Type = "root.*" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create(null, "root", null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a", null)), Is.True);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a.b", null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, "other", null)), Is.False);
-            });
-
-            esa = new EventSubscriberAttribute() { Type = "root.*.*" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create(null, "root", null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a", null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, "ROOT.A.B", null)), Is.True);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a.b.c", null)), Is.False);
-            });
-
-            esa = new EventSubscriberAttribute() { Type = "root.*.**" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create(null, "root", null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a", null)), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a.b", null)), Is.True);
-                Assert.That(esa.IsMatch(edf, Create(null, "root.a.b.c", null)), Is.True);
-            });
-        }
-
-        [Test]
-        public void Match_Actions_Only()
-        {
-            var edf = new EventDataFormatter();
-            var esa = new EventSubscriberAttribute(null, "a*", "b");
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create(null, null, "a")), Is.True);
-                Assert.That(esa.IsMatch(edf, Create(null, null, "AA")), Is.True);
-                Assert.That(esa.IsMatch(edf, Create(null, null, "b")), Is.True);
-                Assert.That(esa.IsMatch(edf, Create(null, null, "BB")), Is.False);
-                Assert.That(esa.IsMatch(edf, Create(null, null, "c")), Is.False);
-            });
-        }
-
-        [Test]
-        public void Match_Multi()
-        {
-            var edf = new EventDataFormatter();
-            var esa = new EventSubscriberAttribute("root.*", "a*", "b");
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create("root", null, "aa")), Is.False);
-                Assert.That(esa.IsMatch(edf, Create("root.a", null, "b")), Is.True);
-                Assert.That(esa.IsMatch(edf, Create("root.a.b", null, "b")), Is.False);
-            });
-        }
-
-        [Test]
-        public void Match_CaseSensitive()
-        {
-            var edf = new EventDataFormatter();
-            var esa = new EventSubscriberAttribute("root.*", "a*", "b");
-
-            Assert.That(esa.IsMatch(edf, Create("ROOT.A", null, "b")), Is.True);
-
-            esa.IgnoreCase = false;
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, Create("root.a", null, "b")), Is.True);
-                Assert.That(esa.IsMatch(edf, Create("ROOT.A", null, "b")), Is.False);
-            });
-        }
-
-        [Test]
-        public void Match_Source()
-        {
-            var edf = new EventDataFormatter();
-
-            var esa = new EventSubscriberAttribute(new Uri("*", UriKind.Relative));
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("test", UriKind.Relative) }), Is.True);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://test", UriKind.Absolute) }), Is.True);
-            });
-
-            esa = new EventSubscriberAttribute(new Uri("test/*", UriKind.Relative));
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("test", UriKind.Relative) }), Is.False);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("test/abc", UriKind.Relative) }), Is.True);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("/test/abc", UriKind.Relative) }), Is.True);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://host/test", UriKind.Absolute) }), Is.False);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://host/test/abc", UriKind.Absolute) }), Is.True);
-            });
-
-            esa = new EventSubscriberAttribute(new Uri("http://host/test/*", UriKind.Absolute));
-            Assert.Multiple(() =>
-            {
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("test/abc", UriKind.Relative) }), Is.False);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://host/test", UriKind.Absolute) }), Is.False);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://host/test/xyz", UriKind.Absolute) }), Is.True);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://tsoh/test/xyz", UriKind.Absolute) }), Is.False);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("https://host/test/xyz", UriKind.Absolute) }), Is.False);
-                Assert.That(esa.IsMatch(edf, new EventData { Source = new Uri("http://host:5050/test/xyz", UriKind.Absolute) }), Is.False);
-            });
-        }
-
-        private EventData Create(string? subject, string? type, string? action) => new() { Subject = subject, Type = type, Action = action };
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Events/Subscribing/EventSubscriberOrchestratorTest.cs b/tests/CoreEx.Test/Framework/Events/Subscribing/EventSubscriberOrchestratorTest.cs
deleted file mode 100644
index add09a53..00000000
--- a/tests/CoreEx.Test/Framework/Events/Subscribing/EventSubscriberOrchestratorTest.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.Hosting.Work;
-using CoreEx.Results;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Events.Subscribing
-{
-    [TestFixture]
-    public class EventSubscriberOrchestratorTest
-    {
-        [Test]
-        public void NoMatch_NoSubscribers()
-        {
-            var sb = SetUpServiceProvider();
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var eso = new EventSubscriberOrchestrator();
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.employee", Type = "blah.blah", Action = "created" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.False);
-                Assert.That(match.Subscriber, Is.Null);
-                Assert.That(match.ValueType, Is.Null);
-            });
-        }
-
-        [Test]
-        public void NoMatch_WithSubscribers()
-        {
-            var sb = SetUpServiceProvider();
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var eso = new EventSubscriberOrchestrator().AddSubscriber<OthersSubscriber>().AddSubscriber<DeleteSubscriber>();
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.employee", Type = "blah.blah", Action = "created" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.False);
-                Assert.That(match.Subscriber, Is.Null);
-                Assert.That(match.ValueType, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Match_Success_WithValue()
-        {
-            var sb = SetUpServiceProvider(sc => sc.AddScoped<ModifySubscriber>());
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var eso = new EventSubscriberOrchestrator().AddSubscriber<ModifySubscriber>().AddSubscriber<DeleteSubscriber>();
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.employee", Type = "blah.blah", Action = "tweaked" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.True);
-                Assert.That(match.Subscriber, Is.Not.Null.And.TypeOf<ModifySubscriber>());
-                Assert.That(match.ValueType, Is.Not.Null.And.EqualTo(typeof(Employee)));
-            });
-        }
-
-        [Test]
-        public void Match_Success_NoValue()
-        {
-            var sb = SetUpServiceProvider(sc => sc.AddScoped<DeleteSubscriber>());
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var eso = new EventSubscriberOrchestrator().AddSubscriber<ModifySubscriber>().AddSubscriber<DeleteSubscriber>();
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.employee", Type = "blah.blah", Action = "deleted" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.True);
-                Assert.That(match.Subscriber, Is.Not.Null.And.TypeOf<DeleteSubscriber>());
-                Assert.That(match.ValueType, Is.Null);
-            });
-        }
-
-        [Test]
-        public void NoMatch_Ambiquous()
-        {
-            var sb = SetUpServiceProvider(sc => sc.AddScoped<DeleteSubscriber>());
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var eso = new EventSubscriberOrchestrator().AddSubscriber<DeleteSubscriber>().AddSubscriber<DuplicateSubscriber>().UseAmbiquousSubscriberHandling(ErrorHandling.HandleByHost);
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.employee", Type = "blah.blah", Action = "deleted" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.False);
-                Assert.That(match.Subscriber, Is.Not.Null.And.TypeOf<DeleteSubscriber>());
-                Assert.That(match.ValueType, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Match_With_ExtendedMatchMethod()
-        {
-            var sb = SetUpServiceProvider(sc => sc.AddScoped<OthersSubscriber>());
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var eso = new EventSubscriberOrchestrator().AddSubscriber<OthersSubscriber>();
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.other", Type = "blah.blah", Action = "created", Key = "KEY" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.True);
-                Assert.That(match.Subscriber, Is.Not.Null.And.TypeOf<OthersSubscriber>());
-                Assert.That(match.ValueType, Is.Null);
-            });
-
-            match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.other", Type = "blah.blah", Action = "created", Key = "XXX" }, new EventSubscriberArgs());
-            Assert.Multiple(() =>
-            {
-                Assert.That(match.Matched, Is.False);
-                Assert.That(match.Subscriber, Is.Null);
-                Assert.That(match.ValueType, Is.Null);
-            });
-        }
-
-        [Test] public async Task Receive_Unhandled_None() => await ReceiveTest(null, () => throw new System.NotImplementedException("Unhandled exception."), typeof(System.NotImplementedException), false, message: "Unhandled exception.");
-        [Test] public async Task Receive_Unhandled_Exception() => await ReceiveTest(ms => ms._UnhandledHandling = ErrorHandling.HandleBySubscriber, () => throw new System.NotImplementedException("Unhandled exception."), typeof(System.NotImplementedException), true, message: "Unhandled exception.", ins: "Test.Error.UnhandledError");
-        [Test] public async Task Receive_Unhandled_CompleteSilent() => await ReceiveTest(ms => ms._UnhandledHandling = ErrorHandling.CompleteAsSilent, () => throw new System.NotImplementedException("Unhandled exception."), ins: "Test.Complete.UnhandledError");
-
-        [Test] public async Task Receive_Unhandled_FailFast()
-        {
-            // The following must be tested independently (comment out Assert.Inconclusive) to verify as it will kill the test process.
-            Assert.Inconclusive("FailFast can not be executed within testing as it will kill the test process; must be manually tested!");
-            await ReceiveTest(ms => ms._UnhandledHandling = ErrorHandling.CriticalFailFast, () => throw new System.NotImplementedException("Unhandled exception."));
-            Assert.Fail("Should never, ever, ever, get here ;-)");
-        }
-
-        [Test] public async Task Receive_Security_None() => await ReceiveTest(null, () => throw new AuthenticationException(), typeof(AuthenticationException), false);
-        [Test] public async Task Receive_Security_Exception() => await ReceiveTest(ms => ms._SecurityHandling = ErrorHandling.HandleBySubscriber, () => throw new AuthorizationException(), typeof(AuthorizationException), true, ins: "Test.Error.AuthorizationError");
-        [Test] public async Task Receive_Security_Retry() => await ReceiveTest(ms => ms._SecurityHandling = ErrorHandling.Retry, () => throw new AuthorizationException(), typeof(AuthorizationException), true, true, ins: "Test.Retry.AuthorizationError");
-        [Test] public async Task Receive_Security_CompleteSilent() => await ReceiveTest(ms => ms._SecurityHandling = ErrorHandling.CompleteAsSilent, () => throw new AuthorizationException(), ins: "Test.Complete.AuthorizationError");
-
-        [Test] public async Task Receive_InvalidData_None() => await ReceiveTest(null, () => throw new BusinessException(), typeof(BusinessException), false);
-        [Test] public async Task Receive_InvalidData_Exception() => await ReceiveTest(ms => ms._InvalidDataHandling = ErrorHandling.HandleBySubscriber, () => throw new ConflictException(), typeof(ConflictException), true, ins: "Test.Error.ConflictError");
-        [Test] public async Task Receive_InvalidData_CompleteSilent() => await ReceiveTest(ms => ms._InvalidDataHandling = ErrorHandling.CompleteAsSilent, () => throw new DuplicateException(), ins: "Test.Complete.DuplicateError");
-        [Test] public async Task Receive_InvalidData_Exception_ValueIsRequired() => await ReceiveTest(ms => ms._InvalidDataHandling = ErrorHandling.HandleBySubscriber, () => throw new DivideByZeroException(), typeof(ValidationException), true, message: "Invalid message; body was not provided, contained invalid JSON, or was incorrectly formatted: Value is required.", ed: new EventData<Employee>(), ins: "Test.Error.ValidationError");
-
-        [Test] public async Task Receive_Concurrency_None() => await ReceiveTest(null, () => throw new ConcurrencyException(), typeof(ConcurrencyException), false);
-        [Test] public async Task Receive_Concurrency_Exception() => await ReceiveTest(ms => ms._ConcurrencyHandling = ErrorHandling.HandleBySubscriber, () => throw new ConcurrencyException(), typeof(ConcurrencyException), true, ins: "Test.Error.ConcurrencyError");
-        [Test] public async Task Receive_Concurrency_CompleteSilent() => await ReceiveTest(ms => ms._ConcurrencyHandling = ErrorHandling.CompleteAsSilent, () => throw new ConcurrencyException(), ins: "Test.Complete.ConcurrencyError");
-
-        [Test] public async Task Receive_NotFound_None() => await ReceiveTest(null, () => throw new NotFoundException(), typeof(NotFoundException), false);
-        [Test] public async Task Receive_NotFound_Exception() => await ReceiveTest(ms => ms._NotFoundHandling = ErrorHandling.HandleBySubscriber, () => throw new NotFoundException(), typeof(NotFoundException), true, ins: "Test.Error.NotFoundError");
-        [Test] public async Task Receive_NotFound_CompleteSilent() => await ReceiveTest(ms => ms._NotFoundHandling = ErrorHandling.CompleteAsSilent, () => throw new NotFoundException(), ins: "Test.Complete.NotFoundError");
-
-        [Test] public async Task Receive_Transient_None() => await ReceiveTest(null, () => throw new TransientException(), typeof(TransientException), false, true);
-        [Test] public async Task Receive_Transient_Retry() => await ReceiveTest(ms => ms._TransientHandling = ErrorHandling.Retry, () => throw new TransientException(), typeof(TransientException), true, true, ins: "Test.Retry.TransientError");
-        [Test] public async Task Receive_Transient_Exception() => await ReceiveTest(ms => ms._TransientHandling = ErrorHandling.HandleBySubscriber, () => throw new TransientException(), typeof(TransientException), true, false, ins: "Test.Error.TransientError");
-        [Test] public async Task Receive_Transient_CompleteSilent() => await ReceiveTest(ms => ms._TransientHandling = ErrorHandling.CompleteAsSilent, () => throw new TransientException(), ins: "Test.Complete.TransientError");
-
-        [Test] public async Task Receive_DataConsistency_None() => await ReceiveTest(null, () => throw new DataConsistencyException(), typeof(DataConsistencyException), false, true);
-        [Test] public async Task Receive_DataConsistency_Retry() => await ReceiveTest(ms => ms._DataConsistencyHandling = ErrorHandling.Retry, () => throw new DataConsistencyException(), typeof(DataConsistencyException), true, true, ins: "Test.Retry.DataConsistencyError");
-        [Test] public async Task Receive_DataConsistency_Exception() => await ReceiveTest(ms => ms._DataConsistencyHandling = ErrorHandling.HandleBySubscriber, () => throw new DataConsistencyException(), typeof(DataConsistencyException), true, false, ins: "Test.Error.DataConsistencyError");
-        [Test] public async Task Receive_DataConsistency_CompleteSilent() => await ReceiveTest(ms => ms._DataConsistencyHandling = ErrorHandling.CompleteAsSilent, () => throw new DataConsistencyException(), ins: "Test.Complete.DataConsistencyError");
-
-        [Test] public async Task Receive_Success() => await ReceiveTest(null, () => { }, null, false, ins: "Test.Complete.Success");
-
-        [Test]
-        public void GetSubscriber()
-        {
-            var s = EventSubscriberOrchestrator.GetSubscribers<EventSubscriberOrchestratorTest>();
-            Assert.That(s, Is.Not.Null.And.Length.EqualTo(4));
-        }
-
-        private static ServiceProvider SetUpServiceProvider(Action<IServiceCollection>? action = null)
-        {
-            var sc = new ServiceCollection();
-            sc.AddLogging(lb => lb.AddConsole());
-            sc.AddCloudEventSerializer();
-            sc.AddExecutionContext();
-            sc.AddDefaultSettings();
-            sc.AddSingleton<EmployeeEventSub>();
-            sc.AddEventDataFormatter();
-            sc.AddAzureServiceBusReceivedMessageConverter();
-            sc.AddSingleton<IWorkStatePersistence, InMemoryWorkStatePersistence>();
-            sc.AddSingleton<WorkStateOrchestrator>();
-
-            action?.Invoke(sc);
-
-            return sc.BuildServiceProvider();
-        }
-
-        private static async Task ReceiveTest(System.Action<ModifySubscriber>? setAction, System.Action receiveAction, System.Type? exceptionType = null, bool eventSubscriberException = true, bool isTransient = false, string? message = null, EventData<Employee>? ed = null, string? ins = null)
-        {
-            var ms = new ModifySubscriber();
-            var sb = SetUpServiceProvider(sc => sc.AddSingleton(ms));
-
-            var eso = new EventSubscriberOrchestrator().AddSubscriber<ModifySubscriber>().AddSubscriber<DeleteSubscriber>();
-            var ees = sb.GetRequiredService<EmployeeEventSub>();
-
-            var match = eso.TryMatchSubscriber(ees, new EventData { Subject = "my.hr.employee", Type = "blah.blah", Action = "tweaked" }, new EventSubscriberArgs());
-            Assert.That(match.Matched, Is.True);
-
-            setAction?.Invoke(ms);
-            ms.Action = () => receiveAction();
-
-            try
-            {
-                await eso.ReceiveAsync(ees, match.Subscriber!, ed ?? new EventData<Employee> { Value = new Employee { Id = 1, Name = "Bob" } }, new EventSubscriberArgs());
-                Assert.That(exceptionType, Is.Null, "Expected an exception!");
-            }
-            catch (EventSubscriberException esex)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(eventSubscriberException, Is.True, "Should be an EventSubscriberException!");
-                    Assert.That(esex.IsTransient, Is.EqualTo(isTransient));
-                    Assert.That(esex.InnerException, Is.Not.Null.And.TypeOf(exceptionType!));
-                });
-                if (message != null)
-                    Assert.That(esex.Message, Is.Not.Null.And.EqualTo(message));
-            }
-            catch (System.Exception ex)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(eventSubscriberException, Is.False, "Should not be an EventSubscriberException!");
-                    Assert.That(ex, Is.Not.Null.And.TypeOf(exceptionType!));
-                });
-                if (message != null)
-                    Assert.That(ex.Message, Is.Not.Null.And.EqualTo(message));
-            }
-            finally
-            {
-                // Reset.
-                ms._UnhandledHandling = ErrorHandling.HandleByHost;
-                ms._SecurityHandling = ErrorHandling.HandleByHost;
-                ms._TransientHandling = ErrorHandling.HandleByHost;
-                ms._NotFoundHandling = ErrorHandling.HandleByHost;
-                ms._ConcurrencyHandling = ErrorHandling.HandleByHost;
-                ms._DataConsistencyHandling = ErrorHandling.HandleByHost;
-                ms._InvalidDataHandling = ErrorHandling.HandleByHost;
-            }
-
-            var status = ((TestInstrumentation)ees.Instrumentation!).Status;
-            if (ins is null)
-                Assert.That(status, Is.Null);
-            else
-                Assert.That(status, Is.EqualTo(ins));
-        }
-
-        [EventSubscriber("my.hr.employee", "created", "updated")]
-        [EventSubscriber("my.hr.employee", "tweaked")]
-        public class ModifySubscriber : SubscriberBase<Employee>
-        {
-            public System.Action Action { get; set; } = () => throw new System.NotImplementedException("Unhandled exception.");
-
-            public override Task<Result> ReceiveAsync(EventData<Employee> @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-            {
-                Action();
-                return Task.FromResult(Result.Success);
-            }
-
-            public ErrorHandling _UnhandledHandling = ErrorHandling.HandleByHost;
-            public ErrorHandling _SecurityHandling = ErrorHandling.HandleByHost;
-            public ErrorHandling _TransientHandling = ErrorHandling.HandleByHost;
-            public ErrorHandling _NotFoundHandling = ErrorHandling.HandleByHost;
-            public ErrorHandling _ConcurrencyHandling = ErrorHandling.HandleByHost;
-            public ErrorHandling _DataConsistencyHandling = ErrorHandling.HandleByHost;
-            public ErrorHandling _InvalidDataHandling = ErrorHandling.HandleByHost;
-
-            public override ErrorHandling UnhandledHandling => _UnhandledHandling;
-
-            public override ErrorHandling SecurityHandling => _SecurityHandling;
-
-            public override ErrorHandling TransientHandling => _TransientHandling;
-
-            public override ErrorHandling NotFoundHandling => _NotFoundHandling;
-
-            public override ErrorHandling ConcurrencyHandling => _ConcurrencyHandling;
-
-            public override ErrorHandling DataConsistencyHandling => _DataConsistencyHandling;
-
-            public override ErrorHandling InvalidDataHandling => _InvalidDataHandling;
-        }
-
-        [EventSubscriber("my.hr.employee", "deleted")]
-        public class DeleteSubscriber : SubscriberBase
-        {
-            public override Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-            {
-                throw new System.NotImplementedException();
-            }
-        }
-
-        [EventSubscriber("my.hr.employee", "deleted")]
-        public class DuplicateSubscriber : SubscriberBase
-        {
-            public override Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-            {
-                throw new System.NotImplementedException();
-            }
-        }
-
-        [EventSubscriber("my.hr.other", ExtendedMatchMethod = nameof(IsExtendedMatch))]
-        public class OthersSubscriber : SubscriberBase
-        {
-            public override Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-            {
-                throw new System.NotImplementedException();
-            }
-
-            [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Needed by the ExtendedMatchMethod functionality.")]
-            public static bool IsExtendedMatch(EventData ed, EventSubscriberArgs args) => ed.Key == "KEY";
-        }
-
-        public class Employee
-        {
-            public int? Id { get; set; }
-            public string? Name { get; set; }
-        }
-
-        public class EmployeeEventSub : EventSubscriberBase
-        {
-            public EmployeeEventSub(IEventDataConverter eventDataConverter, ExecutionContext executionContext, SettingsBase settings, ILogger<EventSubscriberBase> logger, EventSubscriberInvoker? eventSubscriberInvoker = null)
-                : base(eventDataConverter, executionContext, settings, logger, eventSubscriberInvoker)
-            {
-                Instrumentation = new TestInstrumentation();
-            }
-        }
-
-        public class TestInstrumentation : EventSubscriberInstrumentationBase
-        {
-            public override void Instrument(ErrorHandling? errorHandling = null, Exception? exception = null) => Status += GetInstrumentName("Test", errorHandling, exception);
-
-            public string? Status { get; set; } 
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/FluentValidation/HttpRequestTest.cs b/tests/CoreEx.Test/Framework/FluentValidation/HttpRequestTest.cs
deleted file mode 100644
index 84f989b3..00000000
--- a/tests/CoreEx.Test/Framework/FluentValidation/HttpRequestTest.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-using CoreEx.AspNetCore.Http;
-using CoreEx.FluentValidation;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Validators;
-using NUnit.Framework;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.FluentValidation
-{
-    [TestFixture]
-    public class HttpRequestTest
-    {
-        [Test]
-        public async Task NoBody_NoValidation()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "");
-            var vr = await hr.ReadAsJsonValueAsync(new Text.Json.JsonSerializer(), valueIsRequired: false, validator: new ProductValidator().Wrap()).ConfigureAwait(false);
-            Assert.That(vr, Is.Not.Null);
-            Assert.That(vr.IsValid, Is.True);
-        }
-
-        [Test]
-        public async Task NoBody_ValueRequired()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "");
-            var vr = await hr.ReadAsJsonValueAsync(new Text.Json.JsonSerializer(), valueIsRequired: true, validator: new ProductValidator().Wrap()).ConfigureAwait(false);
-            Assert.That(vr, Is.Not.Null);
-            Assert.That(vr.IsValid, Is.False);
-        }
-
-        [Test]
-        public async Task Value_Error()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateJsonHttpRequest(HttpMethod.Get, "", new Product { Id = "B2TF", Name = "DeLorean", Price = 88m });
-            var vr = await hr.ReadAsJsonValueAsync(new Text.Json.JsonSerializer(), validator: new ProductValidator().Wrap()).ConfigureAwait(false);
-            Assert.That(vr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vr.IsValid, Is.False);
-                Assert.That(vr.ValidationException, Is.Not.Null);
-            });
-
-            Assert.That(vr.ValidationException, Is.Not.Null.And.TypeOf<ValidationException>());
-            var vex = (ValidationException)vr.ValidationException!;
-            Assert.That(vex.Messages, Is.Not.Null);
-            Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-            Assert.That(vex.Messages!.GetMessagesForProperty(nameof(Product.Name))[0].Text, Is.EqualTo("A DeLorean cannot be priced at 88 as that could cause a chain reaction that would unravel the very fabric of the space-time continuum and destroy the entire universe."));
-        }
-
-        [Test]
-        public async Task Value_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateJsonHttpRequest(HttpMethod.Get, "", new Product { Id = "B2TF", Name = "DeLorean", Price = 66m });
-            var vr = await hr.ReadAsJsonValueAsync(new Text.Json.JsonSerializer(), validator: new ProductValidator().Wrap()).ConfigureAwait(false);
-            Assert.That(vr, Is.Not.Null);
-            Assert.That(vr.IsValid, Is.True);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/FluentValidation/MultiValidatorTest.cs b/tests/CoreEx.Test/Framework/FluentValidation/MultiValidatorTest.cs
deleted file mode 100644
index edb18bb5..00000000
--- a/tests/CoreEx.Test/Framework/FluentValidation/MultiValidatorTest.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.FluentValidation;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Validators;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.FluentValidation
-{
-    [TestFixture]
-    public class MultiValidatorTest
-    {
-        [Test]
-        public async Task FluentError()
-        {
-            var r = await MultiValidator.Create()
-                .Add(new ProductValidator().Wrap(), new Product { Id = "B2TF", Name = "DeLorean", Price = 88m })
-                .ValidateAsync().ConfigureAwait(false);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages, Has.Count.EqualTo(1));
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Messages[0].Text, Is.EqualTo("A DeLorean cannot be priced at 88 as that could cause a chain reaction that would unravel the very fabric of the space-time continuum and destroy the entire universe."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Name"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/FluentValidation/ServiceBusTriggerExecutorTest.cs b/tests/CoreEx.Test/Framework/FluentValidation/ServiceBusTriggerExecutorTest.cs
deleted file mode 100644
index c26b95b0..00000000
--- a/tests/CoreEx.Test/Framework/FluentValidation/ServiceBusTriggerExecutorTest.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using CoreEx.Abstractions;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Functions;
-using CoreEx.TestFunction.Models;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using Moq;
-using NUnit.Framework;
-using System.Collections.Generic;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.FluentValidation
-{
-    [TestFixture]
-    public class ServiceBusTriggerExecutorTest
-    {
-        [Test]
-        public void ReceiveAsync_ValidationException_Validation()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new Product { Id = "Zed", Name = "is dead", Price = 1.99m });
-
-            test.ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(s => s.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsAny<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/FluentValidation/ServiceCollectionTest.cs b/tests/CoreEx.Test/Framework/FluentValidation/ServiceCollectionTest.cs
deleted file mode 100644
index e134571b..00000000
--- a/tests/CoreEx.Test/Framework/FluentValidation/ServiceCollectionTest.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using CoreEx.FluentValidation;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Validators;
-using CoreEx.Validation;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using System.Threading.Tasks;
-using FV = FluentValidation;
-
-namespace CoreEx.Test.Framework.FluentValidation
-{
-    public class ServiceCollectionTest
-    {
-        [Test]
-        public async Task ServiceCollectionAdd()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddFluentValidators<ProductValidator>(alsoRegisterInterfaces: false);
-
-            var sp = sc.BuildServiceProvider();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(sp.GetService<ProductValidator>(), Is.Not.Null);
-                Assert.That(sp.GetService<FV.IValidator<Product>>(), Is.Null);
-                Assert.That(sp.GetService<CoreEx.Validation.IValidator<Product>>(), Is.Null);
-            });
-
-            var pv = sp.GetRequiredService<ProductValidator>();
-            var cv = pv.Wrap();
-
-            var rs = await cv.ValidateAsync(new Product());
-            Assert.That(rs.HasErrors, Is.True);
-
-            rs = await cv.ValidateAsync(new Product { Id = "XXX", Name = "Blah", Price = 1.5m });
-            Assert.That(rs.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task ServiceCollectionAddWithInterfaces()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddFluentValidators<ProductValidator>(alsoRegisterInterfaces: true);
-
-            var sp = sc.BuildServiceProvider();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(sp.GetService<ProductValidator>(), Is.Not.Null);
-                Assert.That(sp.GetService<FV.IValidator<Product>>(), Is.Not.Null);
-                Assert.That(sp.GetService<CoreEx.Validation.IValidator<Product>>(), Is.Not.Null);
-            });
-
-            var iv = sp.GetRequiredService<CoreEx.Validation.IValidator<Product>>();
-            Assert.That(iv, Is.Not.Null);
-
-            var pv = sp.GetRequiredService<ProductValidator>();
-            var cv = pv.Wrap();
-
-            var rs = await cv.ValidateAsync(new Product());
-            Assert.That(rs.HasErrors, Is.True);
-
-            rs = await cv.ValidateAsync(new Product { Id = "XXX", Name = "Blah", Price = 1.5m });
-            Assert.That(rs.HasErrors, Is.False);
-        }
-
-        [Test]
-        public void CreateValidator()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddFluentValidators<ProductValidator>();
-
-            var sp = sc.BuildServiceProvider();
-
-            var pv = FluentValidator.Create<ProductValidator>(sp);
-            Assert.That(pv, Is.Not.Null);
-        }
-
-        [Test]
-        public void CreateValidatorFromInterface()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddFluentValidators<ProductValidator>(alsoRegisterInterfaces: true);
-
-            var sp = sc.BuildServiceProvider();
-
-            var pv = FluentValidator.Create<FV.IValidator<Product>>(sp);
-            Assert.That(pv, Is.Not.Null);
-
-            Assert.That(pv.Wrap(), Is.Not.Null);
-        }
-
-        [Test]
-        public async Task InteropTest()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddFluentValidators<ProductValidator>();
-
-            var sp = sc.BuildServiceProvider();
-
-            var rs = await new Product().Validate().Configure(c => c.Mandatory().Interop(FluentValidator.Create<ProductValidator>(sp).Wrap())).ValidateAsync();
-            Assert.That(rs.HasErrors, Is.True);
-
-            rs = await new Product { Id = "XXX", Name = "Blah", Price = 1.5m }.Validate(c => c.Mandatory().Interop(FluentValidator.Create<ProductValidator>(sp).Wrap())).ValidateAsync();
-            Assert.That(rs.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task InteropFuncTest()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddFluentValidators<ProductValidator>();
-
-            var sp = sc.BuildServiceProvider();
-
-            var rs = await new Product().Validate().Configure(c => c.Mandatory().Interop(FluentValidator.Create<ProductValidator>(sp).Wrap())).ValidateAsync();
-            Assert.That(rs.HasErrors, Is.True);
-
-            rs = await new Product { Id = "XXX", Name = "Blah", Price = 1.5m }.Validate().Configure(c => c.Mandatory().Interop(() => FluentValidator.Create<ProductValidator>(sp).Wrap())).ValidateAsync();
-            Assert.That(rs.HasErrors, Is.False);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Globalization/TextInfoTest.cs b/tests/CoreEx.Test/Framework/Globalization/TextInfoTest.cs
deleted file mode 100644
index 2235c3b5..00000000
--- a/tests/CoreEx.Test/Framework/Globalization/TextInfoTest.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using CoreEx.Globalization;
-using NUnit.Framework;
-using System.Globalization;
-
-namespace CoreEx.Test.Framework.Globalization
-{
-    [TestFixture]
-    public class TextInfoTest
-    {
-        [Test]
-        public void ToCasing_None() => Assert.That(CultureInfo.InvariantCulture.TextInfo.ToCasing("AbCd", TextInfoCasing.None), Is.EqualTo("AbCd"));
-
-        [Test]
-        public void ToCasing_Lower() => Assert.That(CultureInfo.InvariantCulture.TextInfo.ToCasing("AbCd", TextInfoCasing.Lower), Is.EqualTo("abcd"));
-
-        [Test]
-        public void ToCasing_Upper() => Assert.That(CultureInfo.InvariantCulture.TextInfo.ToCasing("AbCd", TextInfoCasing.Upper), Is.EqualTo("ABCD"));
-
-        [Test]
-        public void ToCasing_Title() => Assert.That(CultureInfo.InvariantCulture.TextInfo.ToCasing("the qUick BROWN fox.", TextInfoCasing.Title), Is.EqualTo("The Quick BROWN Fox."));
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Hosting/Work/WorkStateOrchestratorTest.cs b/tests/CoreEx.Test/Framework/Hosting/Work/WorkStateOrchestratorTest.cs
deleted file mode 100644
index 63fac744..00000000
--- a/tests/CoreEx.Test/Framework/Hosting/Work/WorkStateOrchestratorTest.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-using Azure.Data.Tables;
-using CoreEx.Azure.Storage;
-using CoreEx.Configuration;
-using CoreEx.Hosting.Work;
-using CoreEx.Test.Framework.Json.Mapping;
-using Microsoft.Extensions.Configuration;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-
-namespace CoreEx.Test.Framework.Hosting.Work
-{
-    [TestFixture]
-    internal class WorkStateOrchestratorTest
-    {
-        private static WorkStateOrchestrator CreateOrchestrator(string persistType)
-        {
-            var config = new ConfigurationBuilder().AddInMemoryCollection(new[] { new KeyValuePair<string, string>(FileWorkStatePersistence.ConfigKey, Path.GetTempPath()) });
-            var s = new DefaultSettings(config.Build());
-            IWorkStatePersistence p = persistType switch
-            {
-                "fs" => new FileWorkStatePersistence(s),
-                "at" => CreateTableWorkStatePersistence(),
-                _ => new InMemoryWorkStatePersistence()
-            };
-
-            if (p is null)
-                return null!;
-
-            return new WorkStateOrchestrator(p, s);
-        }
-
-        private static TableWorkStatePersistence CreateTableWorkStatePersistence()
-        {
-            var csn = $"{nameof(BlobAttachmentStorage)}ConnectionString";
-            var cs = Environment.GetEnvironmentVariable(csn);
-            if (string.IsNullOrEmpty(cs))
-                return null!;
-
-            var tsc = new TableServiceClient(cs);
-            return new TableWorkStatePersistence(tsc);
-        }
-
-        [Test]
-        public async Task Orchestrate_With_FileSystem() => await Orchestrate(CreateOrchestrator("fs"));
-
-        [Test]
-        public async Task Orchestrate_With_InMemory() => await Orchestrate(CreateOrchestrator("im"));
-
-        [Test]
-        public async Task Orchestrate_With_AzureTable() => await Orchestrate(CreateOrchestrator("at"));
-
-        private static async Task Orchestrate(WorkStateOrchestrator o)
-        {
-            if (o is null)
-            {
-                Assert.Inconclusive("Test cannot run as the environment variable 'TableWorkStatePersistenceConnectionString' is not defined.");
-                return;
-            }
-
-            ExecutionContext.Reset();
-            ExecutionContext.SetCurrent(new ExecutionContext { UserName = ExecutionContext.EnvironmentUserName });
-
-            // Clean up before we begin.
-            await o.Persistence.DeleteAsync("abc", default);
-
-            // Get where not found.
-            var wr = await o.GetAsync<Person>("abc");
-            Assert.That(wr, Is.Null);
-
-            // Create work and assert state.
-            wr = await o.CreateAsync(WorkStateArgs.Create<Person>().Adjust(x => x.Id = "abc").Adjust(x => x.Key = "bananas"));
-            Assert.That(wr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wr.Id, Is.EqualTo("abc"));
-                Assert.That(wr.TypeName, Is.EqualTo(typeof(Person).FullName));
-                Assert.That(wr.Status, Is.EqualTo(WorkStatus.Created));
-            });
-
-            ObjectComparer.Assert(wr, await o.GetAsync<Person>("abc"));
-            Assert.That(await o.GetDataAsync("abc", default), Is.Null);
-
-            // Start work and assert state.
-            wr = await o.StartAsync("abc");
-            Assert.That(wr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wr.Id, Is.EqualTo("abc"));
-                Assert.That(wr.Status, Is.EqualTo(WorkStatus.Started));
-            });
-
-            ObjectComparer.Assert(wr, await o.GetAsync<Person>("abc"));
-            Assert.That(await o.GetDataAsync("abc", default), Is.Null);
-
-            // Set to indeterminate and assert state.
-            wr = await o.IndeterminateAsync("abc", "Not sure!");
-            Assert.That(wr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wr.Id, Is.EqualTo("abc"));
-                Assert.That(wr.Status, Is.EqualTo(WorkStatus.Indeterminate));
-                Assert.That(wr.Reason, Is.EqualTo("Not sure!"));
-            });
-
-            ObjectComparer.Assert(wr, await o.GetAsync<Person>("abc"));
-            Assert.That(await o.GetDataAsync("abc", default), Is.Null);
-
-            // Set the data and assert by getting and comparing.
-            var p = new Person { Id = "xyz", Name = "John" };
-            await o.SetDataAsync("abc", p);
-
-            var p2 = await o.GetDataAsync<Person>("abc", default);
-            Assert.That(p2, Is.Not.Null);
-            ObjectComparer.Assert(p, await o.GetDataAsync<Person>("abc"));
-
-            // Set to complete and assert state.
-            wr = await o.CompleteAsync("abc");
-            Assert.That(wr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wr.Id, Is.EqualTo("abc"));
-                Assert.That(wr.Status, Is.EqualTo(WorkStatus.Completed));
-                Assert.That(wr.Reason, Is.Null);
-            });
-
-            ObjectComparer.Assert(wr, await o.GetAsync<Person>("abc"));
-
-            // Check different type; but same id. Confirms same type as extra pre-caution!
-            wr = await o.GetAsync("other", "abc");
-            Assert.That(wr, Is.Null);
-
-            // Check different username; but same id. Confirms same user as extra/extra pre-caution!
-            ExecutionContext.Reset();
-            ExecutionContext.SetCurrent(new ExecutionContext { UserName = "other" });
-            wr = await o.GetAsync<Person>("abc");
-            Assert.That(wr, Is.Null);
-
-            // Check no username set; but same id. Confirms same user as extra/extra/extra pre-caution!
-            ExecutionContext.Reset();
-            wr = await o.GetAsync<Person>("abc");
-            Assert.That(wr, Is.Null);
-        }
-
-        [Test]
-        public async Task Orchestrate_LargeData_With_FileSystem() => await Orchestrate_LargeData(CreateOrchestrator("fs"));
-
-        [Test]
-        public async Task Orchestrate_LargeData_With_InMemory() => await Orchestrate_LargeData(CreateOrchestrator("im"));
-
-        [Test]
-        public async Task Orchestrate_LargeData_With_AzureTable() => await Orchestrate_LargeData(CreateOrchestrator("at"));
-
-        private static async Task Orchestrate_LargeData(WorkStateOrchestrator o)
-        {
-            if (o is null)
-            {
-                Assert.Inconclusive("Test cannot run as the environment variable 'TableWorkStatePersistenceConnectionString' is not defined.");
-                return;
-            }
-
-            // Clean up before we begin.
-            await o.Persistence.DeleteAsync("large", default);
-
-            // Create the work.
-            var wr = await o.CreateAsync(WorkStateArgs.Create<Person>().Adjust(x => x.Id = "large"));
-            Assert.That(wr, Is.Not.Null);
-
-            // Set large data and assert by getting and comparing.
-            var ls = new string('x', 959998);
-            await o.SetDataAsync("large", ls);
-
-            var ls2 = await o.GetDataAsync<string>("large", default);
-            Assert.That(ls2, Is.EqualTo(ls));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Http/HttpRequestOptionsTest.cs b/tests/CoreEx.Test/Framework/Http/HttpRequestOptionsTest.cs
deleted file mode 100644
index b1c5ff08..00000000
--- a/tests/CoreEx.Test/Framework/Http/HttpRequestOptionsTest.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Http;
-using NUnit.Framework;
-using System.Linq;
-using System.Net.Http;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-
-namespace CoreEx.Test.Framework.Http
-{
-    [TestFixture]
-    public class HttpRequestOptionsTest
-    {
-        [Test]
-        public void IncludeAndExcludeFields()
-        {
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = new HttpRequestOptions().Include("fielda", "fieldb").Exclude("fieldc");
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$fields=fielda,fieldb&$exclude=fieldc"));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing?id=123");
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?id=123&$fields=fielda,fieldb&$exclude=fieldc"));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing?id=123");
-            ro.Exclude("<app& le>");
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?id=123&$fields=fielda,fieldb&$exclude=fieldc,%3capp%26+le%3e"));
-        }
-
-        [Test]
-        public void Paging()
-        {
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(20, 25));
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$skip=20&$take=25"));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            ro = HttpRequestOptions.Create(PagingArgs.CreateSkipAndTake(20, 25, true));
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$skip=20&$take=25&$count=true"));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            ro = HttpRequestOptions.Create(PagingArgs.CreatePageAndSize(2, 25));
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$page=2&$size=25"));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            ro = HttpRequestOptions.Create(PagingArgs.CreatePageAndSize(2, 25, true));
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$page=2&$size=25&$count=true"));
-        }
-
-        [Test]
-        public void ETag()
-        {
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = new HttpRequestOptions() { ETag = "abc" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Is.Empty);
-                Assert.That(hr.Headers.IfNoneMatch, Has.Count.EqualTo(1));
-            });
-            Assert.That(hr.Headers.IfNoneMatch.First().Tag, Is.EqualTo("\"abc\""));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            ro = new HttpRequestOptions() { ETag = "\"abc\"" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Is.Empty);
-                Assert.That(hr.Headers.IfNoneMatch, Has.Count.EqualTo(1));
-            });
-            Assert.That(hr.Headers.IfNoneMatch.First().Tag, Is.EqualTo("\"abc\""));
-
-            hr = new HttpRequestMessage(HttpMethod.Head, "https://unittest/testing");
-            ro = new HttpRequestOptions() { ETag = "abc" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Is.Empty);
-                Assert.That(hr.Headers.IfNoneMatch, Has.Count.EqualTo(1));
-            });
-            Assert.That(hr.Headers.IfNoneMatch.First().Tag, Is.EqualTo("\"abc\""));
-
-            hr = new HttpRequestMessage(HttpMethod.Post, "https://unittest/testing");
-            ro = new HttpRequestOptions() { ETag = "abc" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Has.Count.EqualTo(1));
-                Assert.That(hr.Headers.IfNoneMatch, Is.Empty);
-            });
-            Assert.That(hr.Headers.IfMatch.First().Tag, Is.EqualTo("\"abc\""));
-
-            hr = new HttpRequestMessage(HttpMethod.Put, "https://unittest/testing");
-            ro = new HttpRequestOptions() { ETag = "abc" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Has.Count.EqualTo(1));
-                Assert.That(hr.Headers.IfNoneMatch, Is.Empty);
-            });
-            Assert.That(hr.Headers.IfMatch.First().Tag, Is.EqualTo("\"abc\""));
-
-            hr = new HttpRequestMessage(HttpMethod.Patch, "https://unittest/testing");
-            ro = new HttpRequestOptions() { ETag = "abc" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Has.Count.EqualTo(1));
-                Assert.That(hr.Headers.IfNoneMatch, Is.Empty);
-            });
-            Assert.That(hr.Headers.IfMatch.First().Tag, Is.EqualTo("\"abc\""));
-
-            hr = new HttpRequestMessage(HttpMethod.Delete, "https://unittest/testing");
-            ro = new HttpRequestOptions() { ETag = "abc" };
-            hr.ApplyRequestOptions(ro);
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Headers.IfMatch, Has.Count.EqualTo(1));
-                Assert.That(hr.Headers.IfNoneMatch, Is.Empty);
-            });
-            Assert.That(hr.Headers.IfMatch.First().Tag, Is.EqualTo("\"abc\""));
-        }
-
-        [Test]
-        public void IncludeText()
-        {
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing?fruit=apple");
-            var ro = new HttpRequestOptions() { IncludeText = true };
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?fruit=apple&$text=true"));
-        }
-
-        [Test]
-        public void IncludeInActive()
-        {
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = new HttpRequestOptions() { IncludeInactive = true };
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$inactive=true"));
-        }
-
-        [Test]
-        public void UrlQueryString()
-        {
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = new HttpRequestOptions() { UrlQueryString = "fruit=apple" };
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?fruit=apple"));
-
-            hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing?fruit=banana");
-            ro = new HttpRequestOptions() { UrlQueryString = "fruit=apple" };
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?fruit=banana&fruit=apple"));
-        }
-
-        [Test]
-        public void QueryArgsQueryString()
-        {
-            QueryArgs qa = "name eq 'bob'";
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = new HttpRequestOptions() { IncludeInactive = true }.Include("name", "text");
-            ro = ro.WithQuery(qa);
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$filter=name+eq+%27bob%27&$fields=name,text&$inactive=true"));
-        }
-
-        [Test]
-        public void QueryArgsQueryStringWithIncludeText()
-        {
-            var qa = QueryArgs.Create("name eq 'bob'").IncludeText();
-            var hr = new HttpRequestMessage(HttpMethod.Get, "https://unittest/testing");
-            var ro = new HttpRequestOptions() { IncludeInactive = true }.Include("name", "text");
-            ro = ro.WithQuery(qa);
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.RequestUri!.AbsoluteUri, Is.EqualTo("https://unittest/testing?$filter=name+eq+%27bob%27&$fields=name,text&$text=true&$inactive=true"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Http/HttpResultTest.cs b/tests/CoreEx.Test/Framework/Http/HttpResultTest.cs
deleted file mode 100644
index eacdff25..00000000
--- a/tests/CoreEx.Test/Framework/Http/HttpResultTest.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using CoreEx.Http;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Http
-{
-    [TestFixture]
-    public class HttpResultTest
-    {
-        [Test]
-        public async Task Create_InternalException()
-        {
-            var r = new System.Net.Http.HttpResponseMessage(HttpStatusCode.OK) { Content = new System.Net.Http.StringContent("[]") };
-            var hr = await HttpResult.CreateAsync<int>(r);
-
-            Assert.That(hr.IsSuccess, Is.False);
-            Assert.Throws<InvalidOperationException>(() => hr.ThrowOnError());
-            Assert.Throws<InvalidOperationException>(() => _ = hr.Value);
-
-            var rr = hr.ToResult();
-            Assert.Multiple(() =>
-            {
-                Assert.That(rr.IsSuccess, Is.False);
-                Assert.That(rr.Error, Is.TypeOf<InvalidOperationException>());
-            });
-        }
-
-        [Test]
-        public async Task Messages()
-        {
-            var r = new HttpResponseMessage(System.Net.HttpStatusCode.OK);
-            r.Headers.Add("x-messages", """[{"type":"Warning","text":"Please renew licence."}]""");
-
-            var hr = await HttpResult.CreateAsync(r);
-            Assert.That(hr, Is.Not.Null);
-            Assert.That(hr.Messages, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Messages[0].Type, Is.EqualTo(CoreEx.Entities.MessageType.Warning));
-                Assert.That(hr.Messages[0].Text, Is.EqualTo("Please renew licence."));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Http/TypedHttpClientBaseTest.cs b/tests/CoreEx.Test/Framework/Http/TypedHttpClientBaseTest.cs
deleted file mode 100644
index 2b1959fa..00000000
--- a/tests/CoreEx.Test/Framework/Http/TypedHttpClientBaseTest.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Http;
-using CoreEx.RefData;
-using NUnit.Framework;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-
-namespace CoreEx.Test.Framework.Http
-{
-    [TestFixture]
-    public class TypedHttpClientBaseTest
-    {
-        [Test]
-        public void UpdateRequestUri_FormatArgNone()
-        {
-            var uri = new TestHttpClient().VerifyUri("product/88");
-            Assert.That(uri, Is.EqualTo("/product/88"));
-        }
-
-        [Test]
-        public void UpdateRequestUri_FormatArgNull()
-        {
-            var uri = new TestHttpClient().VerifyUri("product/{id}");
-            Assert.That(uri, Is.EqualTo("/product/"));
-
-            uri = new TestHttpClient().VerifyUri("product/{id}/other");
-            Assert.That(uri, Is.EqualTo("/product//other"));
-
-            uri = new TestHttpClient().VerifyUri("product/{}");
-            Assert.That(uri, Is.EqualTo("/product/"));
-
-            uri = new TestHttpClient().VerifyUri("product/{}/other");
-            Assert.That(uri, Is.EqualTo("/product//other"));
-        }
-
-        [Test]
-        public void UpdateRequestUri_FormatArgValue()
-        {
-            var arg = new HttpArg<int>("id", 88);
-            var uri = new TestHttpClient().VerifyUri("product/{id}", null, arg);
-            Assert.That(uri, Is.EqualTo("/product/88"));
-
-            uri = new TestHttpClient().VerifyUri("product/{id}/other", null, arg);
-            Assert.That(uri, Is.EqualTo("/product/88/other"));
-
-            var arg2 = new HttpArg<string>("id", "&;");
-            uri = new TestHttpClient().VerifyUri("product/{id}", null, arg2);
-            Assert.That(uri, Is.EqualTo("/product/%26%3B"));
-
-            arg2 = new HttpArg<string>("id", "abc");
-            uri = new TestHttpClient().VerifyUri("product/{id}/other", null, arg2);
-            Assert.That(uri, Is.EqualTo("/product/abc/other"));
-        }
-
-        [Test]
-        public void UpdateRequestUri_QueryArg()
-        {
-            var arg = new HttpArg<int>("id", 88);
-            var uri = new TestHttpClient().VerifyUri("product", null, arg);
-            Assert.That(uri, Is.EqualTo("/product?id=88"));
-
-            var arg2 = new HttpArg<string>("id", "abc");
-            uri = new TestHttpClient().VerifyUri("product", null, arg2);
-            Assert.That(uri, Is.EqualTo("/product?id=abc"));
-
-            var arg3 = new HttpArg<DateTime>("id", new DateTime(2022, 01, 31, 08, 45, 59, DateTimeKind.Utc));
-            uri = new TestHttpClient().VerifyUri("product", null, arg3);
-            Assert.That(uri, Is.EqualTo("/product?id=2022-01-31T08%3a45%3a59.0000000Z"));
-        }
-
-        [Test]
-        public void UpdateRequestUri_QueryArgs()
-        {
-            var uri = new TestHttpClient().VerifyUri("product", null,
-                new HttpArg<int>("id", 88), new HttpArg<string>("text", "bananas"), new HttpArg<DateTime>("date", new DateTime(2020, 01, 01, 11, 59, 58, DateTimeKind.Utc)),
-                new HttpArg<string>("body", "in_the_body_only", HttpArgType.FromBody),
-                new HttpArg<int?>("id2", null), new HttpArg<HttpArgType>("type", HttpArgType.FromUri), new HttpArg<char[]>("char", new char[] { 'a', 'b', 'c' }), new HttpArg<Gender>("gender", new Gender { Id = 1, Code = "F", Text = "Female" }));
-
-            Assert.That(uri, Is.EqualTo("/product?id=88&text=bananas&date=2020-01-01T11%3a59%3a58.0000000Z&type=FromUri&char=a&char=b&char=c&gender=F"));
-
-            uri = new TestHttpClient().VerifyUri("product/{id}", null,
-                new HttpArg<int>("id", 88), new HttpArg<string>("text", "bananas"), new HttpArg<DateTime>("date", new DateTime(2020, 01, 01, 11, 59, 58, DateTimeKind.Utc)),
-                new HttpArg<string>("body", "in_the_body_only", HttpArgType.FromBody),
-                new HttpArg<int?>("id2", null), new HttpArg<HttpArgType>("type", HttpArgType.FromUri), new HttpArg<char[]>("char", new char[] { 'a', 'b', 'c' }), new HttpArg<Gender>("gender", new Gender { Id = 1, Code = "F", Text = "Female" }));
-
-            Assert.That(uri, Is.EqualTo("/product/88?text=bananas&date=2020-01-01T11%3a59%3a58.0000000Z&type=FromUri&char=a&char=b&char=c&gender=F"));
-        }
-
-        [Test]
-        public void UpdateRequestUri_QueryArg_Class()
-        {
-            var arg = new HttpArg<Person>("person", new Person { Id = 88, Name = "gary", Date = new DateTime(2020, 01, 01, 11, 59, 58, DateTimeKind.Utc), Amount = -123.85m, Happy = true });
-            var uri = new TestHttpClient().VerifyUri("people", null, arg);
-            Assert.That(uri, Is.EqualTo("/people"));
-
-            arg = new HttpArg<Person>("person", new Person { Id = 88, Name = "gary", Date = new DateTime(2020, 01, 01, 11, 59, 58, DateTimeKind.Utc), Amount = -123.85m, Happy = true, Codes = new List<int> { 0, 1, 2 } }, HttpArgType.FromUriUseProperties);
-            uri = new TestHttpClient().VerifyUri("people", null, arg);
-            Assert.That(uri, Is.EqualTo("/people?id=88&name=gary&date=2020-01-01T11%3a59%3a58.0000000Z&amount=-123.85&happy=true&codes=0&codes=1&codes=2"));
-
-            arg = new HttpArg<Person>("person", new Person { Id = 88, Name = "*gary*", Date = new DateTime(2020, 01, 01, 11, 59, 58, DateTimeKind.Utc), Amount = -123.85m, Happy = true, Codes = new List<int> { 0, 1, 2 } }, HttpArgType.FromUriUseProperties);
-            uri = new TestHttpClient().VerifyUri("people", null, arg);
-            Assert.That(uri, Is.EqualTo("/people?id=88&name=*gary*&date=2020-01-01T11%3a59%3a58.0000000Z&amount=-123.85&happy=true&codes=0&codes=1&codes=2"));
-
-            arg = new HttpArg<Person>("person", new Person { Id = 88, Name = "gary", Date = new DateTime(2020, 01, 01, 11, 59, 58, DateTimeKind.Unspecified), Amount = -123.85m, Happy = true, Codes = new List<int> { 0, 1, 2 } }, HttpArgType.FromUriUsePropertiesAndPrefix);
-            uri = new TestHttpClient().VerifyUri("people", null, arg);
-            Assert.That(uri, Is.EqualTo("/people?person.id=88&person.name=gary&person.date=2020-01-01T11%3a59%3a58.0000000&person.amount=-123.85&person.happy=true&person.codes=0&person.codes=1&person.codes=2"));
-        }
-
-        [Test]
-        public void UpdateRequestUri_QueryArg_With_IFormattable()
-        {
-            var arg = new HttpArg<Coordinates>("coordinates", new Coordinates());
-            var uri = new TestHttpClient().VerifyUri("map", null, arg);
-            Assert.That(uri, Is.EqualTo("/map?coordinates=1%2c2"));
-
-            var arg2 = new HttpArg<CoordinatesArgs>("ignored", new CoordinatesArgs(), HttpArgType.FromUriUseProperties);
-            var uri2 = new TestHttpClient().VerifyUri("map", null, arg2);
-            Assert.That(uri2, Is.EqualTo("/map?coordinates=1%2c2"));
-        }
-
-        public class Person
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-            public DateTime Date { get; set; }
-            public decimal? Amount { get; set; }
-            public bool Happy { get; set; }
-            public List<int>? Codes { get; set; }
-        }
-
-        public class Gender : ReferenceDataBase<int> { }
-
-        public class Coordinates : IFormattable
-        {
-            public int Long { get; set; } = 1;
-            public int Lat { get; set; } = 2;
-
-            public string ToString(string? format, IFormatProvider? formatProvider) => $"{Long},{Lat}";
-        }
-
-        public class CoordinatesArgs
-        {
-            public Coordinates? Coordinates { get; set; } = new Coordinates();
-        }
-    }
-
-    public class TestHttpClient : TypedHttpClientBase
-    {
-        public TestHttpClient() : base(new HttpClient { BaseAddress = new Uri("https://unittest") }, new CoreEx.Text.Json.JsonSerializer()) { }
-
-        public string VerifyUri(string requestUri, HttpRequestOptions? requestOptions = null, params IHttpArg[] args)
-        {
-            var request = CreateRequestAsync(HttpMethod.Post, requestUri, requestOptions, args).Result;
-            return request.RequestUri!.ToString();
-        }
-
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) => throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Http/TypedHttpClientCoreTest.cs b/tests/CoreEx.Test/Framework/Http/TypedHttpClientCoreTest.cs
deleted file mode 100644
index e285f66c..00000000
--- a/tests/CoreEx.Test/Framework/Http/TypedHttpClientCoreTest.cs
+++ /dev/null
@@ -1,831 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using CoreEx.Abstractions;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Http.Extended;
-using CoreEx.Mapping;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using UnitTestEx;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-
-namespace CoreEx.Test.Framework.Http
-{
-    [TestFixture]
-    public class TypedHttpClientCoreTest
-    {
-        [Test]
-        public void Get_ValidationError()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("{\"Name\":[\"'Name' must not be empty.\"]}", HttpStatusCode.BadRequest);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync("test"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.False);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-                Assert.That(r.Result.ErrorCode, Is.Null);
-                Assert.That(r.Result.ErrorType, Is.Null);
-            });
-
-            try
-            {
-                r.Result.ThrowOnError();
-                Assert.Fail("Should not get here!");
-            }
-            catch (ValidationException vex)
-            {
-                Assert.That(vex.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.Multiple(() =>
-                {
-                    Assert.That(vex.Messages[0].Property, Is.EqualTo("Name"));
-                    Assert.That(vex.Messages[0].Text, Is.EqualTo("'Name' must not be empty."));
-                    Assert.That(vex.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                });
-            }
-            catch
-            {
-                Assert.Fail("Should not get here!");
-            }
-
-            Assert.Throws<HttpRequestException>(() => r.Result.ThrowOnError(false));
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_ValidationError_NoMessages()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("Serious error occurred.", HttpStatusCode.BadRequest, r =>
-            {
-                r.Headers.Add(HttpConsts.ErrorTypeHeaderName, ErrorType.ValidationError.ToString());
-                r.Headers.Add(HttpConsts.ErrorCodeHeaderName, ((int)ErrorType.ValidationError).ToString());
-            });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync("test"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.False);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-                Assert.That(r.Result.ErrorCode, Is.EqualTo(1));
-                Assert.That(r.Result.ErrorType, Is.EqualTo("ValidationError"));
-                Assert.That(r.Result.Content, Is.EqualTo("Serious error occurred."));
-            });
-
-            var vex = Assert.Throws<ValidationException>(() => r.Result.ThrowOnError());
-            Assert.That(vex!.Message, Is.EqualTo("Serious error occurred."));
-            Assert.Throws<HttpRequestException>(() => r.Result.ThrowOnError(false));
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_BusinessError()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("Serious error occurred.", HttpStatusCode.BadRequest, r =>
-            {
-                r.Headers.Add(HttpConsts.ErrorTypeHeaderName, ErrorType.BusinessError.ToString());
-                r.Headers.Add(HttpConsts.ErrorCodeHeaderName, ((int)ErrorType.BusinessError).ToString());
-            });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync("test"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.False);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.BadRequest));
-                Assert.That(r.Result.ErrorCode, Is.EqualTo(2));
-                Assert.That(r.Result.ErrorType, Is.EqualTo("BusinessError"));
-                Assert.That(r.Result.Content, Is.EqualTo("Serious error occurred."));
-            });
-
-            Assert.Throws<BusinessException>(() => r.Result.ThrowOnError());
-            Assert.Throws<HttpRequestException>(() => r.Result.ThrowOnError(false));
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_Success()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("test-content");
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync("test"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.EqualTo("test-content"));
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_SuccessWithResponse()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "product/abc").Respond.WithJson(new Product { Id = "abc", Name = "banana", Price = 0.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync<Product>("product/abc"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new Product { Id = "abc", Name = "banana", Price = 0.99m }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_SuccessWithCollectionResult()
-        {
-            var pc = new ProductCollection { new Product { Id = "abc", Name = "banana", Price = 0.99m }, new Product { Id = "def", Name = "apple", Price = 0.49m } };
-
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "product").Respond.WithJson(pc);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync<ProductCollectionResult>("product"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new ProductCollectionResult { Items = pc }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_SuccessWithCollectionResultAndPaging()
-        {
-            var pc = new ProductCollection { new Product { Id = "abc", Name = "banana", Price = 0.99m }, new Product { Id = "def", Name = "apple", Price = 0.49m } };
-
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "product").Respond.WithJson(pc, HttpStatusCode.OK, r =>
-            {
-                r.Headers.Add(HttpConsts.PagingSkipHeaderName, "100");
-                r.Headers.Add(HttpConsts.PagingTakeHeaderName, "25");
-                r.Headers.Add(HttpConsts.PagingTotalCountHeaderName, "1000");
-            });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync<ProductCollectionResult>("product"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new ProductCollectionResult { Items = pc, Paging = new PagingResult(PagingArgs.CreateSkipAndTake(100, 25), 1000) }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Get_SuccessWithCollectionResultAndTokenPaging()
-        {
-            PagingArgs.IsTokenSupported = true;
-            var pc = new ProductCollection { new Product { Id = "abc", Name = "banana", Price = 0.99m }, new Product { Id = "def", Name = "apple", Price = 0.49m } };
-
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "product").Respond.WithJson(pc, HttpStatusCode.OK, r =>
-            {
-                r.Headers.Add(HttpConsts.PagingTokenHeaderName, "token");
-                r.Headers.Add(HttpConsts.PagingTakeHeaderName, "25");
-                r.Headers.Add(HttpConsts.PagingTotalCountHeaderName, "1000");
-            });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.GetAsync<ProductCollectionResult>("product"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new ProductCollectionResult { Items = pc, Paging = new PagingResult(PagingArgs.CreateTokenAndTake("token", 25), 1000) }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [TearDown]
-        public void TearDown() => PagingArgs.IsTokenSupported = false;
-
-        [Test]
-        public void Post_Success()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").Respond.With("test-content");
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PostAsync("test"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.EqualTo("test-content"));
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Post_SuccessWithRequest()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new Product { Id = "abc", Name = "banana", Price = 0.99m }).Respond.With("test-content");
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PostAsync("test", new Product { Id = "abc", Name = "banana", Price = 0.99m }))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.EqualTo("test-content"));
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Post_SuccessWithResponse()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").Respond.WithJson(new Product { Id = "abc", Name = "banana", Price = 0.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PostAsync<Product>("test"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new Product { Id = "abc", Name = "banana", Price = 0.99m }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Post_SuccessWithRequestResponse()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new BackendProduct { Code = "def", Description = "apple", RetailPrice = 0.49m }).Respond.WithJson(new Product { Id = "abc", Name = "banana", Price = 0.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PostAsync<BackendProduct, Product>("test", new BackendProduct { Code = "def", Description = "apple", RetailPrice = 0.49m }))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new Product { Id = "abc", Name = "banana", Price = 0.99m }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Put_SuccessWithRequest()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Put, "test").WithJsonBody(new Product { Id = "abc", Name = "banana", Price = 0.99m }).Respond.With("test-content");
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PutAsync("test", new Product { Id = "abc", Name = "banana", Price = 0.99m }))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.EqualTo("test-content"));
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Put_SuccessWithRequestResponse()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Put, "test").WithJsonBody(new BackendProduct { Code = "def", Description = "apple", RetailPrice = 0.49m }).Respond.WithJson(new Product { Id = "abc", Name = "banana", Price = 0.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PutAsync<BackendProduct, Product>("test", new BackendProduct { Code = "def", Description = "apple", RetailPrice = 0.49m }))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-            });
-            ObjectComparer.Assert(new Product { Id = "abc", Name = "banana", Price = 0.99m }, r.Result.Value);
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Delete_Success()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Delete, "test/1").Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.DeleteAsync("test/1"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.Null);
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Head_Success()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Head, "test/1").Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.HeadAsync("test/1"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.Null);
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Head_Success_QueryStringOnly()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Head, "?name=bob").Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.HeadAsync("?name=bob"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.Null);
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Head_Success_QueryStringAndRequestOptions()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Head, "?name=bob&$text=true").Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.HeadAsync("?name=bob", new HttpRequestOptions { IncludeText = true }))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.Null);
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Patch_SuccessMergePatch()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Patch, "test/1").WithBody("{\"name\":\"jenny\"}", HttpConsts.MergePatchMediaTypeName).Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PatchAsync("test/1", HttpPatchOption.MergePatch, "{\"name\":\"jenny\"}"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.Null);
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Patch_SuccessJsonPatch()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Patch, "test/1").WithBody("{\"name\":\"jenny\"}", HttpConsts.JsonPatchMediaTypeName).Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .Type<BackendHttpClient>()
-                .Run(f => f.PatchAsync("test/1", HttpPatchOption.JsonPatch, "{\"name\":\"jenny\"}"))
-                .AssertSuccess();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Result.IsSuccess, Is.True);
-                Assert.That(r.Result.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(r.Result.Content, Is.Null);
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void InternalServerErrorAsTransient()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new { ClassName = "Retry" }).Respond.With(HttpStatusCode.InternalServerError);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ConfigureServices(sc => mcf.Replace(sc))
-                .Type<BackendHttpClient>()
-                .Run(f => f.ThrowTransientException().PostAsync("test", new { ClassName = "Retry" } ))
-                .AssertException<TransientException>();
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void ServiceUnavailableAsTransient()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new { ClassName = "Retry" }).Respond.With(HttpStatusCode.ServiceUnavailable);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ConfigureServices(sc => mcf.Replace(sc))
-                .Type<BackendHttpClient>()
-                .Run(f => f.ThrowTransientException().PostAsync("test", new { ClassName = "Retry" }))
-                .AssertException<TransientException>();
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void RequestTimeoutAsTransient()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new { ClassName = "Retry" }).Respond.With(HttpStatusCode.RequestTimeout);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ConfigureServices(sc => mcf.Replace(sc))
-                .Type<BackendHttpClient>()
-                .Run(f => f.ThrowTransientException().PostAsync("test", new { ClassName = "Retry" }))
-                .AssertException<TransientException>();
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void TooManyRequestsAsTransient()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new { ClassName = "Retry" }).Respond.With(HttpStatusCode.TooManyRequests);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ConfigureServices(sc => mcf.Replace(sc))
-                .Type<BackendHttpClient>()
-                .Run(f => f.ThrowTransientException().PostAsync("test", new { ClassName = "Retry" }))
-                .AssertException<TransientException>();
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void SocketExceptionAsTransient()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "test").WithJsonBody(new { ClassName = "Retry" }).Respond.With(HttpStatusCode.TooManyRequests, _ => throw new System.Net.Sockets.SocketException());
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ConfigureServices(sc => mcf.Replace(sc))
-                .Type<BackendHttpClient>()
-                .Run(f => f.ThrowTransientException().PostAsync("test", new { ClassName = "Retry" }))
-                .AssertException<TransientException>();
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public async Task TypedHttpClientInstance()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("test-content");
-
-            var thc = mcf.GetHttpClient("Backend")!.CreateTypedClient(onBeforeRequest: (req, ct) => { req.Headers.MaxForwards = 88; return Task.CompletedTask; });
-            var res = await thc.GetAsync("test");
-
-            Assert.That(res, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(res.IsSuccess, Is.True);
-                Assert.That(res.Content, Is.EqualTo("test-content"));
-                Assert.That(res.Request!.Headers.MaxForwards, Is.EqualTo(88));
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void OnBeforeRequest_Option()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("test-content");
-
-            using var test = FunctionTester.Create<Startup>();
-            var res = test.ConfigureServices(sc => mcf.Replace(sc))
-                .Type<BackendHttpClient>()
-                .Run(f => f.OnBeforeRequest((req, ct) => { req.Headers.MaxForwards = 88; return Task.CompletedTask; }).GetAsync("test"))
-                .AssertSuccess()
-                .Result;
-
-            Assert.That(res, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(res.IsSuccess, Is.True);
-                Assert.That(res.Content, Is.EqualTo("test-content"));
-                Assert.That(res.Request!.Headers.MaxForwards, Is.EqualTo(88));
-            });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public async Task TypedHttpClientInstance_OnConfiguration()
-        {
-            try
-            {
-                TypedMappedHttpClient.OnDefaultOptionsConfiguration = null;
-                TypedHttpClient.OnDefaultOptionsConfiguration = x => x.EnsureSuccess();
-
-                Assert.Multiple(() =>
-                {
-                    Assert.That(TypedHttpClient.OnDefaultOptionsConfiguration, Is.Not.Null);
-                    Assert.That(TypedMappedHttpClient.OnDefaultOptionsConfiguration, Is.Null);
-                });
-
-                var mcf = MockHttpClientFactory.Create();
-                var mc = mcf.CreateClient("Backend", "https://backend/");
-                mc.Request(HttpMethod.Get, "test").Respond.With("test-content");
-
-                var thc = mcf.GetHttpClient("Backend")!.CreateTypedClient(onBeforeRequest: (req, ct) => { req.Headers.MaxForwards = 88; return Task.CompletedTask; });
-
-                Assert.That(thc.SendOptions.ShouldEnsureSuccess, Is.True);
-
-                var res = await thc.GetAsync("test");
-
-                Assert.That(res, Is.Not.Null);
-                Assert.Multiple(() =>
-                {
-                    Assert.That(res.IsSuccess, Is.True);
-                    Assert.That(res.Content, Is.EqualTo("test-content"));
-                    Assert.That(res.Request!.Headers.MaxForwards, Is.EqualTo(88));
-                });
-
-                mcf.VerifyAll();
-            }
-            finally
-            {
-                TypedHttpClient.OnDefaultOptionsConfiguration = null;
-            }
-        }
-
-        [Test]
-        public async Task NullOnNotFound()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.WithSequence(s =>
-            {
-                s.Respond().With(HttpStatusCode.NotFound);
-                s.Respond().With("1");
-                s.Respond().With("2");
-            });
-
-            var thc = mcf.GetHttpClient("Backend")!.CreateTypedClient();
-            var res = await thc.GetAsync<int>("test");
-
-            Assert.That(res, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(res.IsSuccess, Is.False);
-                Assert.That(res.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
-                Assert.That(res.ErrorType, Is.Null);
-                Assert.That(res.ErrorCode, Is.Null);
-                Assert.That(res.WillResultInNullAsNotFound, Is.False);
-            });
-            Assert.Throws<NotFoundException>(() => _ = res.Value);
-
-            res.NullOnNotFoundResponse = true;
-            Assert.Multiple(() =>
-            {
-                Assert.That(res.IsSuccess, Is.True);
-                Assert.That(res.StatusCode, Is.EqualTo(HttpStatusCode.NoContent));
-                Assert.That(res.ErrorType, Is.Null);
-                Assert.That(res.ErrorCode, Is.Null);
-                Assert.That(res.WillResultInNullAsNotFound, Is.True);
-                Assert.That(res.Value, Is.EqualTo(0));
-            });
-
-            res = await thc.GetAsync<int>("test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(res.NullOnNotFoundResponse, Is.False);
-                Assert.That(res.IsSuccess, Is.True);
-                Assert.That(res.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(res.ErrorType, Is.Null);
-                Assert.That(res.ErrorCode, Is.Null);
-                Assert.That(res.WillResultInNullAsNotFound, Is.False);
-                Assert.That(res.Value, Is.EqualTo(1));
-            });
-
-            res = await thc.NullOnNotFound().GetAsync<int>("test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(res.NullOnNotFoundResponse, Is.True);
-                Assert.That(res.IsSuccess, Is.True);
-                Assert.That(res.StatusCode, Is.EqualTo(HttpStatusCode.OK));
-                Assert.That(res.ErrorType, Is.Null);
-                Assert.That(res.ErrorCode, Is.Null);
-                Assert.That(res.WillResultInNullAsNotFound, Is.False);
-                Assert.That(res.Value, Is.EqualTo(2));
-            });
-        }
-
-        [Test]
-        public async Task ToResult()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.WithSequence(s =>
-            {
-                s.Respond().With(HttpStatusCode.NotFound);
-                s.Respond().With("no-not-happy", HttpStatusCode.NotAcceptable);
-                s.Respond().With(HttpStatusCode.OK);
-            });
-
-            var thc = mcf.GetHttpClient("Backend")!.CreateTypedClient();
-
-            var res = await thc.GetAsync("test");
-            var r = res.ToResult();
-            Assert.That(r.Error, Is.InstanceOf<NotFoundException>());
-
-            res = await thc.GetAsync("test");
-            r = res.ToResult();
-            Assert.That(r.Error, Is.InstanceOf<HttpRequestException>().And.Message.EqualTo("no-not-happy"));
-
-            res = await thc.GetAsync("test");
-            r = res.ToResult();
-            Assert.That(r, Is.EqualTo(CoreEx.Results.Result.Success));
-        }
-
-        [Test]
-        public async Task ToResultT()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.WithSequence(s =>
-            {
-                s.Respond().With(HttpStatusCode.NotFound);
-                s.Respond().With("no-not-happy", HttpStatusCode.NotAcceptable);
-                s.Respond().With("2");
-                s.Respond().With("a");
-            });
-
-            var thc = mcf.GetHttpClient("Backend")!.CreateTypedClient();
-
-            var res = await thc.GetAsync<int>("test");
-            var r = res.ToResult();
-            Assert.That(r.Error, Is.InstanceOf<NotFoundException>());
-
-            res = await thc.GetAsync<int>("test");
-            r = res.ToResult();
-            Assert.That(r.Error, Is.InstanceOf<HttpRequestException>().And.Message.EqualTo("no-not-happy"));
-
-            res = await thc.GetAsync<int>("test");
-            r = res.ToResult();
-            Assert.That(r.Value, Is.EqualTo(2));
-
-            res = await thc.GetAsync<int>("test");
-            r = res.ToResult();
-            Assert.That(r.Error, Is.InstanceOf<InvalidOperationException>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Http/TypedHttpClientOptionsTest.cs b/tests/CoreEx.Test/Framework/Http/TypedHttpClientOptionsTest.cs
deleted file mode 100644
index d3e831c3..00000000
--- a/tests/CoreEx.Test/Framework/Http/TypedHttpClientOptionsTest.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using CoreEx.Configuration;
-using CoreEx.Http;
-using CoreEx.Http.Extended;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Http
-{
-    [TestFixture]
-    public class TypedHttpClientOptionsTest
-    {
-        private static void AssertIsInitial(TypedHttpClientOptions o)
-        {
-            Assert.That(o, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o.ShouldThrowTransientException, Is.False);
-                Assert.That(o.ShouldThrowKnownException, Is.False);
-                Assert.That(o.ShouldThrowKnownUseContentAsMessage, Is.False);
-                Assert.That(o.IsTransientPredicate, Is.Not.Null);
-                Assert.That(o.ShouldEnsureSuccess, Is.False);
-                Assert.That(o.ExpectedStatusCodes, Is.Null);
-                Assert.That(o.BeforeRequest, Is.Null);
-            });
-        }
-
-        [Test]
-        public void ThrowTransientException()
-        {
-            var o = new TypedHttpClientOptions();
-            o.ThrowTransientException();
-            Assert.Multiple(() =>
-            {
-                Assert.That(o.ShouldThrowTransientException, Is.True);
-                Assert.That(o.IsTransientPredicate, Is.Not.Null);
-            });
-
-            var o2 = new TypedHttpClientOptions(o);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o2.ShouldThrowTransientException, Is.True);
-                Assert.That(o2.IsTransientPredicate, Is.Not.Null);
-            });
-
-            o.Reset();
-            AssertIsInitial(o);
-        }
-
-        [Test]
-        public void ThrowKnownException()
-        {
-            var o = new TypedHttpClientOptions();
-            o.ThrowKnownException();
-            Assert.Multiple(() =>
-            {
-                Assert.That(o.ShouldThrowKnownException, Is.True);
-                Assert.That(o.ShouldThrowKnownUseContentAsMessage, Is.False);
-            });
-
-            o.ThrowKnownException(true);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o.ShouldThrowKnownException, Is.True);
-                Assert.That(o.ShouldThrowKnownUseContentAsMessage, Is.True);
-            });
-
-            var o2 = new TypedHttpClientOptions(o);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o2.ShouldThrowKnownException, Is.True);
-                Assert.That(o2.ShouldThrowKnownUseContentAsMessage, Is.True);
-            });
-
-            o.Reset();
-            AssertIsInitial(o);
-        }
-
-        [Test]
-        public void EnsureSuccess()
-        {
-            var o = new TypedHttpClientOptions();
-            o.EnsureSuccess();
-            Assert.That(o.ShouldEnsureSuccess, Is.True);
-
-            var o2 = new TypedHttpClientOptions(o);
-            Assert.That(o2.ShouldEnsureSuccess, Is.True);
-
-            o.Reset();
-            AssertIsInitial(o);
-        }
-
-        [Test]
-        public void Ensure()
-        {
-            var o = new TypedHttpClientOptions();
-            o.EnsureOK();
-            o.EnsureAccepted();
-            o.EnsureCreated();
-            o.EnsureNoContent();
-            Assert.That(o.ExpectedStatusCodes!.ToArray(), Is.EqualTo(new HttpStatusCode[] { HttpStatusCode.OK, HttpStatusCode.Accepted, HttpStatusCode.Created, HttpStatusCode.NoContent }));
-
-            o.Ensure(HttpStatusCode.Continue, HttpStatusCode.Conflict);
-            Assert.That(o.ExpectedStatusCodes!.ToArray(), Is.EqualTo(new HttpStatusCode[] { HttpStatusCode.OK, HttpStatusCode.Accepted, HttpStatusCode.Created, HttpStatusCode.NoContent, HttpStatusCode.Continue, HttpStatusCode.Conflict }));
-
-            var o2 = new TypedHttpClientOptions(o);
-            Assert.That(o2.ExpectedStatusCodes!.ToArray(), Is.EqualTo(new HttpStatusCode[] { HttpStatusCode.OK, HttpStatusCode.Accepted, HttpStatusCode.Created, HttpStatusCode.NoContent, HttpStatusCode.Continue, HttpStatusCode.Conflict }));
-
-            o.Reset();
-            AssertIsInitial(o);
-        }
-
-        [Test]
-        public void OnBeforeRequest()
-        {
-            var o = new TypedHttpClientOptions();
-            o.OnBeforeRequest((r, ct) => Task.CompletedTask);
-            Assert.That(o.BeforeRequest, Is.Not.Null);
-
-            var o2 = new TypedHttpClientOptions(o);
-            Assert.That(o2.BeforeRequest, Is.Not.Null);
-
-            o.Reset();
-            AssertIsInitial(o);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Http/TypedMapperHttpClientBaseTest.cs b/tests/CoreEx.Test/Framework/Http/TypedMapperHttpClientBaseTest.cs
deleted file mode 100644
index dd702bb0..00000000
--- a/tests/CoreEx.Test/Framework/Http/TypedMapperHttpClientBaseTest.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using CoreEx.Http.Extended;
-using CoreEx.Mapping;
-using Moq;
-using NUnit.Framework;
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Web.Http;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.Http
-{
-    [TestFixture]
-    public class TypedMapperHttpClientBaseTest
-    {
-        [Test]
-        public async Task MapSuccess()
-        {
-            var m = new Mapper();
-            m.Register(new CustomerMapper());
-            m.Register(new BackendMapper());
-
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateDefaultClient().Request(HttpMethod.Post, "test").WithJsonBody(new Backend { First = "John", Last = "Doe" }).Respond.WithJson(new Backend { First = "John", Last = "Doe" });
-
-            var mc = new TypedMappedHttpClient(mcf.GetHttpClient()!, m);
-            var hr = await mc.PostMappedAsync<Customer, Backend, Customer, Backend>("test", new Customer { FirstName = "John", LastName = "Doe" });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.IsSuccess, Is.True);
-                Assert.That(hr.Value, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.Value.FirstName, Is.EqualTo("John"));
-                Assert.That(hr.Value.LastName, Is.EqualTo("Doe"));
-            });
-
-            var r = hr.ToResult();
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task MapServerError()
-        {
-            var m = new Mapper();
-            m.Register(new CustomerMapper());
-            m.Register(new BackendMapper());
-
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateDefaultClient().Request(HttpMethod.Post, "test").WithJsonBody(new Backend { First = "John", Last = "Doe" }).Respond.With(HttpStatusCode.InternalServerError);
-
-            var mc = new TypedMappedHttpClient(mcf.GetHttpClient()!, m);
-            var hr = await mc.PostMappedAsync<Customer, Backend, Customer, Backend>("test", new Customer { FirstName = "John", LastName = "Doe" });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.IsSuccess, Is.False);
-                Assert.That(hr.StatusCode, Is.EqualTo(HttpStatusCode.InternalServerError));
-            });
-
-            var r = hr.ToResult();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.Error, Is.TypeOf<HttpRequestException>());
-            });
-        }
-
-        [Test]
-        public async Task MapJsonError()
-        {
-            var m = new Mapper();
-            m.Register(new CustomerMapper());
-            m.Register(new BackendMapper());
-
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateDefaultClient().Request(HttpMethod.Post, "test").WithJsonBody(new Backend { First = "John", Last = "Doe" }).Respond.WithJson("{\"first\":\"Dave\",\"age\":\"ten\"}");
-
-            var mc = new TypedMappedHttpClient(mcf.GetHttpClient()!, m);
-            var hr = await mc.PostMappedAsync<Customer, Backend, Customer, Backend>("test", new Customer { FirstName = "John", LastName = "Doe" });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(hr.IsSuccess, Is.False);
-                Assert.That(hr.StatusCode, Is.EqualTo(HttpStatusCode.InternalServerError));
-                Assert.That(hr.Exception, Is.TypeOf<InvalidOperationException>());
-            });
-
-            var r = hr.ToResult();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.Error, Is.TypeOf<InvalidOperationException>());
-            });
-        }
-    }
-
-    public class Customer
-    { 
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-    }
-
-    public class Backend
-    {
-        public string? First { get; set; }
-        public string? Last { get; set; }
-        public int? Age { get; set; }
-    }
-
-    public class CustomerMapper : CoreEx.Mapping.Mapper<Customer, Backend>
-    {
-        protected override Backend? OnMap(Customer? source, Backend? destination, OperationTypes operationType)
-        {
-            destination ??= new Backend();
-            destination.First = source?.FirstName;
-            destination.Last = source?.LastName;
-            return destination;
-        }
-    }
-
-    public class BackendMapper : Mapper<Backend, Customer>
-    {
-        protected override Customer? OnMap(Backend? source, Customer? destination, OperationTypes operationType)
-        {
-            destination ??= new Customer();
-            destination.FirstName = source?.First;
-            destination.LastName = source?.Last;
-            return destination;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Invokers/InvokerBaseTest.cs b/tests/CoreEx.Test/Framework/Invokers/InvokerBaseTest.cs
deleted file mode 100644
index caf956eb..00000000
--- a/tests/CoreEx.Test/Framework/Invokers/InvokerBaseTest.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using CoreEx.Invokers;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Invokers
-{
-    [TestFixture]
-    public class InvokerBaseTest
-    {
-        [Test]
-        public async Task Invoke_AsyncNoResult()
-        {
-            var i = new TestInvoker();
-            await i.InvokeAsync(this, async (_, ct) => { await Task.Delay(100, ct); });
-            Assert.Multiple(() =>
-            {
-                Assert.That(i.Before, Is.True);
-                Assert.That(i.After, Is.True);
-            });
-        }
-
-        [Test]
-        public void Invoke_AsyncWithResult()
-        {
-            var i = new TestInvoker();
-            Assert.Multiple(async () =>
-            {
-                Assert.That(await i.InvokeAsync(this, async (_, ct) => { await Task.Delay(100, ct); return 88; }), Is.EqualTo(88));
-                Assert.That(i.Before, Is.True);
-                Assert.That(i.After, Is.True);
-            });
-        }
-
-        [Test]
-        public async Task Invoke_AsyncWithResult_Load()
-        {
-            var i = new TestInvoker();
-            for (var j = 0; j < 100000; j++)
-            {
-                await i.InvokeAsync(this, async (_, ct) => { await Task.Delay(0, ct); return 88; });
-            }
-        }
-
-        [Test]
-        public void Invoke_WithException()
-        {
-            var i = new TestInvoker();
-            Assert.ThrowsAsync<DivideByZeroException>(async () => await i.InvokeAsync(this, async (_, ct) => { await Task.Delay(0, ct); throw new DivideByZeroException(); }));
-        }
-
-        public class TestInvoker : InvokerBase<InvokerBaseTest, object?>
-        {
-            public bool Before { get; set; }
-
-            public bool After { get; set; }
-
-            protected async override Task<TResult> OnInvokeAsync<TResult>(InvokeArgs invokeArgs, InvokerBaseTest invoker, Func<InvokeArgs, System.Threading.CancellationToken, Task<TResult>> func, object? param, System.Threading.CancellationToken ct)
-            {
-                Before = true;
-                var r = await base.OnInvokeAsync(invokeArgs, invoker, func, param, ct).ConfigureAwait(false);
-                After = true;
-                return r;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Invokers/InvokerTest.cs b/tests/CoreEx.Test/Framework/Invokers/InvokerTest.cs
deleted file mode 100644
index cdbbdc5b..00000000
--- a/tests/CoreEx.Test/Framework/Invokers/InvokerTest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using CoreEx.Invokers;
-using CoreEx.Results;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Invokers
-{
-    [TestFixture]
-    public class InvokerTest
-    {
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/Compare/JsonElementComparerTest.cs b/tests/CoreEx.Test/Framework/Json/Compare/JsonElementComparerTest.cs
deleted file mode 100644
index b4b70a82..00000000
--- a/tests/CoreEx.Test/Framework/Json/Compare/JsonElementComparerTest.cs
+++ /dev/null
@@ -1,389 +0,0 @@
-using CoreEx.Json.Compare;
-using NUnit.Framework;
-using System;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-
-namespace CoreEx.Test.Framework.Json.Compare
-{
-    [TestFixture]
-    internal class JsonElementComparerTest
-    {
-        [Test]
-        public void Compare_Object_SameSame()
-        {
-            var r = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}", "{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}");
-            Assert.That(r.AreEqual, Is.True);
-        }
-
-        [Test]
-        public void Compare_Object_DiffOrderAndDiffNumberFormat()
-        {
-            var r = new JsonElementComparer().Compare("{\"name\":\"gary\",\"cool\":false,\"age\":40,\"salary\":null}", "{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.AreEqual, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo("No differences detected."));
-            });
-        }
-
-        [Test]
-        public void Compare_Object_DiffValuesAndTypes()
-        {
-            var r = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":null,\"salary\":42000}", "{\"name\":\"brian\",\"age\":41.0,\"cool\":false,\"salary\":null}");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasDifferences, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo(@"Path '$.name': Value is not equal: ""gary"" != ""brian"".
-Path '$.age': Value is not equal: 40.0 != 41.0.
-Path '$.cool': Kind is not equal: Null != False.
-Path '$.salary': Kind is not equal: Number != Null."));
-            });
-        }
-
-        [Test]
-        public void Compare_Object_PropertyNameMismatch()
-        {
-            var r = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}", "{\"Name\":\"gary\",\"age\":40.0,\"cool\":false}");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasDifferences, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo(@"Path '$.name': Does not exist in right JSON.
-Path '$.salary': Does not exist in right JSON.
-Path '$.Name': Does not exist in left JSON."));
-            });
-        }
-
-        [Test]
-        public void Compare_Object_PropertyNameMismatch_Exclude()
-        {
-            var r = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}", "{\"Name\":\"gary\",\"age\":40.0,\"cool\":false}", "name", "Name");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasDifferences, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo(@"Path '$.salary': Does not exist in right JSON."));
-            });
-        }
-
-        [Test]
-        public void Compare_Array_LengthMismatch()
-        {
-            var r = new JsonElementComparer().Compare("[1,2,3]", "[1,2,3,4]");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasDifferences, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo("Path '$': Array lengths are not equal: 3 != 4."));
-            });
-        }
-
-        [Test]
-        public void Compare_Array_ItemMismatch()
-        {
-            var r = new JsonElementComparer().Compare("[1,2,3,5]", "[1,2,3,4]");
-            Assert.That(r.ToString(), Is.EqualTo("Path '$[3]': Value is not equal: 5 != 4."));
-        }
-
-        [Test]
-        public void Compare_Object_Array_ItemMismatch()
-        {
-            var r = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\"},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\"},{\"name\":\"rebecca\"}]}");
-            Assert.That(r.ToString(), Is.EqualTo(@"Path '$.names[1].name': Value is not equal: ""brian"" != ""rebecca""."));
-        }
-
-        [Test]
-        public void Compare_Object_Array_Exclude()
-        {
-            var r = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\"},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\"},{\"name\":\"rebecca\"}]}", "names.name");
-            Assert.That(r.AreEqual, Is.True);
-        }
-
-        [Test]
-        public void Compare_Object_Array_ItemMismatchComplex()
-        {
-            var r = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}");
-            Assert.That(r.ToString(), Is.EqualTo(@"Path '$.names[0].address.street': Value is not equal: 1 != 2."));
-        }
-
-        [Test]
-        public void CompareValue()
-        {
-            var r = new JsonElementComparer().CompareValue(100, 100);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.AreEqual, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo("No differences detected."));
-            });
-
-            r = new JsonElementComparer().CompareValue(100, "Abc");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasDifferences, Is.True);
-                Assert.That(r.ToString(), Is.EqualTo("Path '$': Kind is not equal: Number != String."));
-            });
-        }
-
-        [Test]
-        public void Compare_Exact_Number()
-        {
-            var ro = new JsonElementComparerOptions { ValueComparison = JsonElementComparison.Exact };
-            var r = new JsonElementComparer(ro).Compare("{\"value\": 1.200}", "{\"value\": 1.2000}");
-            Assert.That(r.AreEqual, Is.False);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": 1.200}", "{\"value\": 1.200}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": 1.0E+2}", "{\"value\": 100}");
-            Assert.That(r.AreEqual, Is.False);
-        }
-
-        [Test]
-        public void Compare_Semantic_Number()
-        {
-            var ro = new JsonElementComparerOptions { ValueComparison = JsonElementComparison.Semantic };
-            var r = new JsonElementComparer(ro).Compare("{\"value\": 1.200}", "{\"value\": 1.2000}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": 1.200}", "{\"value\": 1.200}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": 1.0E+2}", "{\"value\": 100}");
-            Assert.That(r.AreEqual, Is.True);
-        }
-
-        [Test]
-        public void Compare_Exact_String()
-        {
-            var ro = new JsonElementComparerOptions { ValueComparison = JsonElementComparison.Exact };
-            var r = new JsonElementComparer(ro).Compare("{\"value\": \"2000-01-01\"}", "{\"value\": \"2000-01-01T00:00:00\"}");
-            Assert.That(r.AreEqual, Is.False);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": \"2000-01-01T13:52:18\"}", "{\"value\": \"2000-01-01T13:52:18\"}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": \"327b0068-e7a9-40b8-a9d6-14317ce36efd\"}", "{\"value\": \"327b0068-e7a9-40b8-a9d6-14317ce36efd\"}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": \"327b0068-E7A9-40B8-A9D6-14317CE36EFD\"}", "{\"value\": \"327b0068-e7a9-40b8-a9d6-14317ce36efd\"}");
-            Assert.That(r.AreEqual, Is.False);
-        }
-
-        [Test]
-        public void Compare_Semantic_String()
-        {
-            var ro = new JsonElementComparerOptions { ValueComparison = JsonElementComparison.Semantic };
-            var r = new JsonElementComparer(ro).Compare("{\"value\": \"2000-01-01\"}", "{\"value\": \"2000-01-01T00:00:00\"}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": \"2000-01-01T13:52:18\"}", "{\"value\": \"2000-01-01T13:52:18\"}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": \"327b0068-e7a9-40b8-a9d6-14317ce36efd\"}", "{\"value\": \"327b0068-e7a9-40b8-a9d6-14317ce36efd\"}");
-            Assert.That(r.AreEqual, Is.True);
-
-            r = new JsonElementComparer(ro).Compare("{\"value\": \"327b0068-E7A9-40B8-A9D6-14317CE36EFD\"}", "{\"value\": \"327b0068-e7a9-40b8-a9d6-14317ce36efd\"}");
-            Assert.That(r.AreEqual, Is.True);
-        }
-
-        [Test]
-        public void Equals_Object_SameSame()
-        {
-            Assert.That(new JsonElementComparer().Equals("{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}", "{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}"), Is.True);
-        }
-
-        [Test]
-        public void Equals_Object_DiffOrderAndDiffNumberFormat()
-        {
-            Assert.That(new JsonElementComparer().Equals("{\"name\":\"gary\",\"cool\":false,\"age\":40,\"salary\":null}", "{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}"), Is.True);
-        }
-
-        [Test]
-        public void Equals_Object_DiffValuesAndTypes()
-        {
-            Assert.That(new JsonElementComparer().Equals("{\"name\":\"gary\",\"age\":40.0,\"cool\":null,\"salary\":42000}", "{\"name\":\"brian\",\"age\":41.0,\"cool\":false,\"salary\":null}"), Is.False);
-        }
-
-        [Test]
-        public void Equals_Object_PropertyNameMismatch()
-        {
-            Assert.That(new JsonElementComparer().Equals("{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}", "{\"Name\":\"gary\",\"age\":40.0,\"cool\":false}"), Is.False);
-        }
-
-        [Test]
-        public void Equals_Array_LengthMismatch()
-        {
-            Assert.That(new JsonElementComparer().Equals("[1,2,3]", "[1,2,3,4]"), Is.False);
-        }
-
-        [Test]
-        public void Equals_Array_ItemMismatch()
-        {
-            Assert.That(new JsonElementComparer().Equals("[1,2,3,5]", "[1,2,3,4]"), Is.False);
-        }
-
-        [Test]
-        public void Equals_Object_Array_ItemMismatch()
-        {
-            Assert.That(new JsonElementComparer().Equals("{\"names\":[{\"name\":\"gary\"},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\"},{\"name\":\"rebecca\"}]}"), Is.False);
-        }
-
-        [Test]
-        public void Equals_Object_Array_ItemMismatchComplex()
-        {
-            Assert.That(new JsonElementComparer().Equals("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}"), Is.False);
-        }
-
-        [Test]
-        public void Hashcode_Object_DiffOrderAndDiffNumberFormat()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonElementComparer().GetHashCode("{\"name\":\"gary\",\"age\":40.0,\"cool\":false,\"salary\":null}"), Is.EqualTo(new JsonElementComparer().GetHashCode("{\"name\":\"gary\",\"cool\":false,\"age\":40,\"salary\":null}")));
-                Assert.That(new JsonElementComparer().GetHashCode("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}"), Is.Not.EqualTo(new JsonElementComparer().GetHashCode("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}")));
-            });
-        }
-
-        [Test]
-        public void ToMergePatch_Object_Simple()
-        {
-            var jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":null,\"salary\":42000}", "{\"name\":\"gary\",\"age\":41.0,\"cool\":false,\"salary\":null}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"age\":41.0,\"cool\":false,\"salary\":null}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_Simple_Null_To_Null()
-        {
-            var jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":null,\"salary\":42000}", "{\"name\":\"gary\",\"age\":41.0,\"cool\":null,\"salary\":null}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"age\":41.0,\"salary\":null}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_Simple_Null_To_Null_Paths()
-        {
-            var jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"age\":40.0,\"cool\":null,\"salary\":42000}", "{\"name\":\"gary\",\"age\":41.0,\"cool\":null,\"salary\":null}").ToMergePatch("cool");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"age\":41.0,\"cool\":null,\"salary\":null}"));
-        } 
-
-        [Test]
-        public void ToMergePatch_Object_Simple_Nested()
-        {
-            var jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}", "{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":12345}}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"address\":{\"postcode\":12345}}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_Simple_Nested_Paths()
-        {
-            var jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}", "{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":12345}}").ToMergePatch("address");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"address\":{\"street\":\"petherick\",\"postcode\":12345}}"));
-
-            jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}", "{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":12345}}").ToMergePatch("address.street");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"address\":{\"street\":\"petherick\",\"postcode\":12345}}"));
-
-            jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}", "{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":12345}}").ToMergePatch("address.country");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"address\":{\"postcode\":12345}}"));
-
-            jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}", "{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{}"));
-
-            jn = new JsonElementComparer().Compare("{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}", "{\"name\":\"gary\",\"address\":{\"street\":\"petherick\",\"postcode\":1234}}").ToMergePatch("address.country");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_With_ReplaceAllArray()
-        {
-            var jn = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\":2}},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_With_NoReplaceAllArray()
-        {
-            var o = new JsonElementComparerOptions { ReplaceAllArrayItemsOnMerge = false };
-            var jn = new JsonElementComparer(o).Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"address\":{\"street\":2}}]}"));
-
-            jn = new JsonElementComparer(o).Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_With_Array_Paths()
-        {
-            var jn = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}").ToMergePatch("names.name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\":2}},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}").ToMergePatch("names.name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\":1}},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}").ToMergePatch("names[1].name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\":2}},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer().Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}").ToMergePatch("names[1].name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\":1}},{\"name\":\"brian\"}]}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Object_With_NoReplaceAllArray_Paths()
-        {
-            var o = new JsonElementComparerOptions { ReplaceAllArrayItemsOnMerge = false };
-            var jn = new JsonElementComparer(o).Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}").ToMergePatch("names.name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\":2}},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer(o).Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}").ToMergePatch("names.name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"gary\"},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer(o).Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 2}},{\"name\":\"brian\"}]}").ToMergePatch("names[1].name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"address\":{\"street\":2}},{\"name\":\"brian\"}]}"));
-
-            jn = new JsonElementComparer(o).Compare("{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}", "{\"names\":[{\"name\":\"gary\",\"address\":{\"street\": 1}},{\"name\":\"brian\"}]}").ToMergePatch("names[1].name");
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("{\"names\":[{\"name\":\"brian\"}]}"));
-        }
-
-        [Test]
-        public void ToMergePatch_Value()
-        {
-            var jn = new JsonElementComparer().Compare("\"Blah\"", "\"Blah2\"").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("\"Blah2\""));
-
-            jn = new JsonElementComparer().Compare("123", "456").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("456"));
-
-            jn = new JsonElementComparer().Compare("true", "true").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("true"));
-
-            jn = new JsonElementComparer().Compare("null", "null").ToMergePatch();
-            Assert.That(jn, Is.Null);
-        }
-
-        [Test]
-        public void ToMergePatch_Root_Array()
-        {
-            var jn = new JsonElementComparer().Compare("[1,2,3]", "[1,9,3]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[1,9,3]"));
-
-            jn = new JsonElementComparer().Compare("[1,2,3]", "[1,null,3]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[1,null,3]"));
-
-            jn = new JsonElementComparer().Compare("[1,2,3]", "[1,null,3,{\"age\":21}]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[1,null,3,{\"age\":21}]"));
-
-            var o = new JsonElementComparerOptions { ReplaceAllArrayItemsOnMerge = false };
-            jn = new JsonElementComparer(o).Compare("[1,2,3]", "[1,9,3]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[9]"));
-
-            jn = new JsonElementComparer(o).Compare("[1,2,3]", "[1,null,3]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[null]"));
-
-            jn = new JsonElementComparer(o).Compare("[1,2,3]", "[1,null,{\"age\":21}]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[null,{\"age\":21}]"));
-
-            // Array length difference always results in a replace (i.e. all).
-            jn = new JsonElementComparer(o).Compare("[1,2,3]", "[1,null,{\"age\":21},8]").ToMergePatch();
-            Assert.That(jn!.ToJsonString(), Is.EqualTo("[1,null,{\"age\":21},8]"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/Data/JsonDataReaderTest.cs b/tests/CoreEx.Test/Framework/Json/Data/JsonDataReaderTest.cs
deleted file mode 100644
index ea9d01b2..00000000
--- a/tests/CoreEx.Test/Framework/Json/Data/JsonDataReaderTest.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Json.Data;
-using CoreEx.RefData;
-using CoreEx.Text.Json;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Json.Data
-{
-    [TestFixture]
-    public class JsonDataReaderTest
-    {
-        private readonly string data =
-@"data:
- - Person:
-   - { id: ^1, first: Bob, last: Smith, age: 23 }
-   - { id: ^2, first: Jenny, last: Browne, age: 51 }
- - Contact:
-   - { id: ^1, first: Bob, last: Smith }
-   - { id: ^2, first: Jenny, last: Browne }";
-
-        [Test]
-        public void Parse_NonJsonObject()
-        {
-            var ex = Assert.Throws<ArgumentException>(() => JsonDataReader.ParseYaml("apples"));
-            Assert.That(ex!.Message, Does.StartWith("JSON root element must be an Object."));
-        }
-
-        [Test]
-        public void Parse_JsonNoArray()
-        {
-            var ex = Assert.Throws<ArgumentException>(() => JsonDataReader.ParseJson("{\"fruit\":\"apples\"}"));
-            Assert.That(ex!.Message, Does.StartWith("JSON root element must be an Object with an underlying array."));
-        }
-
-        [Test]
-        public void Deserialize_NotFound()
-        {
-            var jdr = JsonDataReader.ParseYaml(data);
-            Assert.Multiple(() =>
-            {
-                Assert.That(jdr.TryDeserialize<Person>("Bananas", out var coll), Is.False);
-                Assert.That(coll, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Deserialize_Single()
-        {
-            var jdr = JsonDataReader.ParseYaml(
-@"data:
- - Person:
-   - { id: ^1, first: Bob, last: Smith, age: 23 }", new JsonDataReaderArgs(null, "XXXX", new DateTime(2000, 01, 01)));
-
-            Assert.That(jdr.TryDeserialize<Person>("Person", out var coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll![0].Id, Is.EqualTo(new Guid(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
-                Assert.That(coll[0].First, Is.EqualTo("Bob"));
-                Assert.That(coll[0].Last, Is.EqualTo("Smith"));
-                Assert.That(coll[0].Age, Is.EqualTo(23));
-                Assert.That(coll[0].ChangeLog, Is.Not.Null);
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll[0].ChangeLog!.CreatedBy, Is.EqualTo("XXXX"));
-                Assert.That(coll[0].ChangeLog!.CreatedDate, Is.EqualTo(new DateTime(2000, 01, 01)));
-                Assert.That(coll[0].ChangeLog!.UpdatedBy, Is.Null);
-                Assert.That(coll[0].ChangeLog!.UpdatedDate, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Deserialize_Multi()
-        {
-            var jdr = JsonDataReader.ParseYaml(data);
-            Assert.That(jdr.TryDeserialize<Person>("Person", out var coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(2));
-                Assert.That(coll![0].Id, Is.EqualTo(new Guid(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
-                Assert.That(coll[0].First, Is.EqualTo("Bob"));
-                Assert.That(coll[0].Last, Is.EqualTo("Smith"));
-                Assert.That(coll[0].Age, Is.EqualTo(23));
-                Assert.That(coll[1].Id, Is.EqualTo(new Guid(2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)));
-                Assert.That(coll[1].First, Is.EqualTo("Jenny"));
-                Assert.That(coll[1].Last, Is.EqualTo("Browne"));
-                Assert.That(coll[1].Age, Is.EqualTo(51));
-            });
-        }
-
-        [Test]
-        public void Deserialize_GenerateIdentifier()
-        {
-            var jdr = JsonDataReader.ParseJson("{\"data\":[{\"Person\":[{\"first\":\"Bob\"}]}]}");
-            Assert.That(jdr.TryDeserialize<Person>("Person", out var coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll![0].First, Is.EqualTo("Bob"));
-                Assert.That(coll[0].Id, Is.Not.EqualTo(Guid.Empty));
-            });
-        }
-
-        [Test]
-        public void Deserialize_RuntimeParameter1()
-        {
-            var jdr = JsonDataReader.ParseJson("{\"data\":[{\"Person\":[{\"first\":\"^(System.Environment.UserName)\"}]}]}");
-            Assert.Multiple(() =>
-            {
-                Assert.That(jdr.TryDeserialize<Person>("Person", out var coll), Is.True);
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll![0].First, Is.EqualTo(System.Environment.UserName));
-            });
-        }
-
-        [Test]
-        public void Deserialize_RuntimeParameter2()
-        {
-            var args = new JsonDataReaderArgs();
-            args.Parameters.Add("fruit", "banana");
-            var jdr = JsonDataReader.ParseJson("{\"data\":[{\"Person\":[{\"first\":\"^(fruit)\"}]}]}", args);
-            Assert.Multiple(() =>
-            {
-                Assert.That(jdr.TryDeserialize<Person>("Person", out var coll), Is.True);
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll![0].First, Is.EqualTo("banana"));
-            });
-        }
-
-        [Test]
-        public void Deserialize_RefData()
-        {
-            var jdr = JsonDataReader.ParseJson("{\"data\":[{\"Gender\":[{\"F\":\"Female\"},{\"code\":\"M\",\"text\":\"Male\"},{\"code\":\"O\",\"text\":\"Other\",\"isActive\":false,\"sortOrder\":99}]}]}", new JsonDataReaderArgs(new ReferenceDataContentJsonSerializer()));
-            Assert.That(jdr.TryDeserialize<Gender>("Gender", out var coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(3));
-                Assert.That(coll![0].Id, Is.Not.Null);
-                Assert.That(coll[0].Code, Is.EqualTo("F"));
-                Assert.That(coll[0].Text, Is.EqualTo("Female"));
-                Assert.That(coll[0].SortOrder, Is.EqualTo(1));
-                Assert.That(coll[0].IsActive, Is.EqualTo(true));
-                Assert.That(coll[1].Code, Is.EqualTo("M"));
-                Assert.That(coll[1].Text, Is.EqualTo("Male"));
-                Assert.That(coll[1].SortOrder, Is.EqualTo(2));
-                Assert.That(coll[1].IsActive, Is.EqualTo(true));
-                Assert.That(coll[2].Code, Is.EqualTo("O"));
-                Assert.That(coll[2].Text, Is.EqualTo("Other"));
-                Assert.That(coll[2].SortOrder, Is.EqualTo(99));
-                Assert.That(coll[2].IsActive, Is.EqualTo(false));
-            });
-        }
-
-        [Test]
-        public void Deserialize_RefData2()
-        {
-            var jdr = JsonDataReader.ParseJson("{\"data\":[{\"Gender\":[{\"F\":\"Female\"},{\"Code\":\"M\",\"Text\":\"Male\"},{\"Code\":\"O\",\"Text\":\"Other\",\"IsActive\":false,\"SortOrder\":99}]}]}", new JsonDataReaderArgs(new ReferenceDataContentJsonSerializer()));
-            Assert.That(jdr.TryDeserialize<Gender>("Gender", out var coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(3));
-                Assert.That(coll![0].Id, Is.Not.Null);
-                Assert.That(coll[0].Code, Is.EqualTo("F"));
-                Assert.That(coll[0].Text, Is.EqualTo("Female"));
-                Assert.That(coll[0].SortOrder, Is.EqualTo(1));
-                Assert.That(coll[0].IsActive, Is.EqualTo(true));
-                Assert.That(coll[1].Code, Is.EqualTo("M"));
-                Assert.That(coll[1].Text, Is.EqualTo("Male"));
-                Assert.That(coll[1].SortOrder, Is.EqualTo(2));
-                Assert.That(coll[1].IsActive, Is.EqualTo(true));
-                Assert.That(coll[2].Code, Is.EqualTo("O"));
-                Assert.That(coll[2].Text, Is.EqualTo("Other"));
-                Assert.That(coll[2].SortOrder, Is.EqualTo(99));
-                Assert.That(coll[2].IsActive, Is.EqualTo(false));
-            });
-        }
-
-        [Test]
-        public void Deserialize_NumberToStringIdentifier()
-        {
-            var jdr = JsonDataReader.ParseJson("{\"data\":[{\"Contact\":[{\"id\":123456}]}]}");
-            Assert.That(jdr.TryDeserialize<Contact>("Contact", out var coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll![0].Id, Is.EqualTo("123456"));
-            });
-
-            jdr = JsonDataReader.ParseYaml(
-@"data:
- - Contact:
-   - { id: 0123456, first: Bob }");
-
-            Assert.That(jdr.TryDeserialize<Contact>("Contact", out coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll![0].Id, Is.EqualTo("0123456"));
-            });
-
-            jdr = JsonDataReader.ParseJson("{\"data\":[{\"Contact\":[{\"id\":123.456}]}]}");
-            Assert.That(jdr.TryDeserialize<Contact>("Contact", out coll), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(coll, Is.Not.Null);
-                Assert.That(coll!, Has.Count.EqualTo(1));
-                Assert.That(coll[0].Id, Is.EqualTo("123.456"));
-            });
-
-            jdr = JsonDataReader.ParseJson("{\"data\":[{\"Contact\":[{\"id\":true}]}]}");
-            Assert.Throws<System.Text.Json.JsonException>(() => jdr.TryDeserialize<Contact>("Contact", out coll));
-        }
-
-        public class Person : IIdentifier<Guid>, IChangeLog
-        {
-            public Guid Id { get; set; }
-            public string? First { get; set; }
-            public string? Last { get; set; }
-            public int? Age { get; set; }
-            public ChangeLog? ChangeLog { get; set; }
-        }
-
-        public class Contact : IIdentifier<string>
-        {
-            public string? Id { get; set; }
-            public string? First { get; set; }
-        }
-
-        public class Gender : ReferenceDataBase<string> { }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/JsonEmployeeTest.cs b/tests/CoreEx.Test/Framework/Json/JsonEmployeeTest.cs
deleted file mode 100644
index a3f022df..00000000
--- a/tests/CoreEx.Test/Framework/Json/JsonEmployeeTest.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using CoreEx.Json;
-using CoreEx.TestFunction.Models;
-using FluentAssertions;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Nsj = Newtonsoft.Json;
-
-namespace CoreEx.Test.Framework.Json
-{
-    [TestFixture]
-    public class JsonEmployeeTest
-    {
-        public class Employee
-        {
-            /// <summary>
-            /// Gets or sets the 'EmployeeId' column value.
-            /// </summary>
-            public Guid EmployeeId { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'Email' column value.
-            /// </summary>
-            public string? Email { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'FirstName' column value.
-            /// </summary>
-            public string? FirstName { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'LastName' column value.
-            /// </summary>
-            public string? LastName { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'GenderCode' column value.
-            /// </summary>
-            public string? GenderCode { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'Birthday' column value.
-            /// </summary>
-            public DateTime? Birthday { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'StartDate' column value.
-            /// </summary>
-            public DateTime? StartDate { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'TerminationDate' column value.
-            /// </summary>
-            public DateTime? TerminationDate { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'TerminationReasonCode' column value.
-            /// </summary>
-            public string? TerminationReasonCode { get; set; }
-
-            /// <summary>
-            /// Gets or sets the 'PhoneNo' column value.
-            /// </summary>
-            public string? PhoneNo { get; set; }
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_Deserialize()
-        {
-            // Arrange
-            var json = "{\n  \"email\": \"piotr.karpala@avanade.com\",\n  \"FirstName\": \"Piotr\",\n  \"lastName\": \"Karpala\",\n  \"genderCode\": \"male\",\n  \"birthday\": \"1990-03-24T13:49:11.813Z\",\n  \"startDate\": \"2022-03-24T13:49:11.813Z\",\n  \"phoneNo\": \"985 657 9455\"\n}";
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-
-            // Act
-            var employee = js.Deserialize<Employee>(json);
-
-            // Assert
-            employee.Should().NotBeNull();
-            employee!.FirstName.Should().Be("Piotr");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/JsonSerializerTest.cs b/tests/CoreEx.Test/Framework/Json/JsonSerializerTest.cs
deleted file mode 100644
index 2fc6a463..00000000
--- a/tests/CoreEx.Test/Framework/Json/JsonSerializerTest.cs
+++ /dev/null
@@ -1,760 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Json;
-using FluentAssertions;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using Nsj = Newtonsoft.Json;
-using Stj = System.Text.Json;
-
-namespace CoreEx.Test.Framework.Json
-{
-    [TestFixture]
-    public class JsonSerializerTest
-    {
-        #region SystemTextJson
-
-        [Test]
-        public void SystemTextJson_Serialize_Deserialize()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X", ETag = "xxx" };
-            var json = js.Serialize(p);
-            Assert.That(json, Is.EqualTo("{\"code\":\"A\",\"DESCRIPTION\":\"B\",\"retailPrice\":1.99,\"etag\":\"xxx\"}"));
-
-            p = js.Deserialize<BackendProduct>(json);
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p!.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-                Assert.That(p.ETag, Is.EqualTo("xxx"));
-            });
-
-            p = (BackendProduct)js.Deserialize(json, typeof(BackendProduct))!;
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-                Assert.That(p.ETag, Is.EqualTo("xxx"));
-            });
-
-            json = js.Serialize(p, JsonWriteFormat.Indented);
-            json.Should().Be("{\n  \"code\": \"A\",\n  \"DESCRIPTION\": \"B\",\n  \"retailPrice\": 1.99,\n  \"etag\": \"xxx\"\n}"
-                .Replace("\n", Environment.NewLine), because: "Line breaks should be preserved in indented JSON with different line endings on Linux and Windows");
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_Deserialize_BinaryData()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X" };
-            var bs = js.SerializeToBinaryData(p);
-
-            p = js.Deserialize<BackendProduct>(bs);
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p!.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-            });
-
-            p = (BackendProduct)js.Deserialize(bs, typeof(BackendProduct))!;
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_Deserialize_Dynamic()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X" };
-            var json = js.Serialize(p);
-
-            var o = js.Deserialize(json);
-            Assert.That(o, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o, Is.InstanceOf<System.Text.Json.JsonElement>());
-                Assert.That(o!.ToString(), Is.EqualTo("{\"code\":\"A\",\"DESCRIPTION\":\"B\",\"retailPrice\":1.99}"));
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_Deserialize_Dynamic_BinaryData()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X" };
-            var bs = js.SerializeToBinaryData(p);
-
-            var o = js.Deserialize(bs);
-            Assert.That(o, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o, Is.InstanceOf<System.Text.Json.JsonElement>());
-                Assert.That(o!.ToString(), Is.EqualTo("{\"code\":\"A\",\"DESCRIPTION\":\"B\",\"retailPrice\":1.99}"));
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_TryApplyFilter_JsonString()
-        {
-            var p = new Person { FirstName = "John", LastName = "Smith", Addresses = new List<Address> { new() { Street = "One", City = "First" }, new() { Street = "Two", City = "Second" } } };
-
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out string json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\",\"addresses\":[{\"street\":\"One\"},{\"street\":\"Two\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out json), Is.True);
-                Assert.That(json, Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"city\":\"First\"},{\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(json, Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "firstName" }, out json), Is.True);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json), Is.True);
-                Assert.That(json, Is.EqualTo("{}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json, JsonPropertyFilter.Exclude), Is.False);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\",\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_TryApplyFilter_JsonObject()
-        {
-            var p = new Person { FirstName = "John", LastName = "Smith", Addresses = new List<Address> { new() { Street = "One", City = "First" }, new() { Street = "Two", City = "Second" } } };
-
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out object json, JsonPropertyFilter.Exclude), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"firstName\":\"John\",\"addresses\":[{\"street\":\"One\"},{\"street\":\"Two\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out json), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"city\":\"First\"},{\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "firstName" }, out json), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json, JsonPropertyFilter.Exclude), Is.False);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"firstName\":\"John\",\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "addresses[1].city" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"firstName\":\"John\",\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\"}]}"));
-            });
-
-            p.Address = new Address { Street = "One", City = "First" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "address" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonObject)json).ToJsonString(), Is.EqualTo("{\"address\":{\"street\":\"One\",\"city\":\"First\"}}"));
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_TryApplyFilter_JsonArray()
-        {
-            var p = new int[] { 11, 22, 333 };
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            object json;
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "[2]" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonArray)json).ToJsonString(), Is.EqualTo("[333]"));
-            });
-
-            js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "[2]" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((System.Text.Json.Nodes.JsonArray)json).ToJsonString(), Is.EqualTo("[11,22]"));
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_Deserialize_Exceptions()
-        {
-            // Arrange
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            Exception realException;
-
-            try { throw new Exception("Test"); }
-            catch (Exception ex) { realException = ex; }
-
-            // Act
-            var serialized = js.Serialize(realException);
-            var deserialized = js.Deserialize<Exception>(serialized)!;
-
-            // Assert
-            deserialized.Data.Should().BeEquivalentTo(realException.Data);
-            deserialized.Message.Should().BeEquivalentTo(realException.Message, because: "Custom converter only handles Message on deserialization");
-        }
-
-        [Test]
-        public void SystemTextJson_TryGetJsonName()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            var t = typeof(Other);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other.FirstName))!, out string? jn), Is.True);
-                Assert.That(jn, Is.EqualTo("first-name"));
-
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other.MiddleName))!, out jn), Is.False);
-                Assert.That(jn, Is.EqualTo(null));
-
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other.LastName))!, out jn), Is.True);
-                Assert.That(jn, Is.EqualTo("lastName"));
-
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_DictionaryKeys()
-        {
-            var d = new Dictionary<string, string> { { "ABC", "XXX" }, { "Efg", "Xxx" }, { "hij", "xxx" }, { "AbEfg", "xxXxx" }, { "ETag", "ETAG" } };
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-            var json = js.Serialize(d);
-            Assert.That(json, Is.EqualTo("{\"abc\":\"XXX\",\"efg\":\"Xxx\",\"hij\":\"xxx\",\"abEfg\":\"xxXxx\",\"etag\":\"ETAG\"}"));
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_CollectionResult()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-
-            // Null object.
-            var pcr = (PersonCollectionResult?)null;
-
-            var json = js.Serialize(pcr);
-            Assert.That(json, Is.EqualTo("null"));
-
-            pcr = js.Deserialize<PersonCollectionResult>(json);
-            Assert.That(pcr, Is.Null);
-
-            // Empty collection.
-            pcr = new PersonCollectionResult();
-
-            json = js.Serialize(pcr);
-            Assert.That(json, Is.EqualTo("[]"));
-
-            pcr = js.Deserialize<PersonCollectionResult>(json);
-            Assert.That(pcr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pcr!.Items, Is.Not.Null);
-                Assert.That(pcr.Items, Is.Empty);
-                Assert.That(pcr.Paging, Is.Null);
-            });
-
-            // Items in collection.
-            pcr.Items.Add(new Person { FirstName = "Jane" });
-            pcr.Items.Add(new Person { FirstName = "John" });
-
-            json = js.Serialize(pcr);
-            Assert.That(json, Is.EqualTo("[{\"firstName\":\"Jane\"},{\"firstName\":\"John\"}]"));
-
-            pcr = js.Deserialize<PersonCollectionResult>(json);
-            Assert.That(pcr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pcr!.Items, Is.Not.Null);
-                Assert.That(pcr.Items, Has.Count.EqualTo(2));
-                Assert.That(pcr.Paging, Is.Null);
-                Assert.That(pcr.Items[0].FirstName, Is.EqualTo("Jane"));
-                Assert.That(pcr.Items[1].FirstName, Is.EqualTo("John"));
-            });
-        }
-
-        [Test]
-        public void SystemTextJson_Serialize_CompositeKey()
-        {
-            var js = new CoreEx.Text.Json.JsonSerializer() as IJsonSerializer;
-
-            var ck = CompositeKey.Empty;
-            var json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("null"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-
-            ck = new CompositeKey((int?)null);
-            json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("[null]"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-
-            ck = new CompositeKey(88);
-            json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("[{\"int\":88}]"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-
-            ck = new CompositeKey("text", 'x', short.MinValue, int.MinValue, long.MinValue, ushort.MaxValue, uint.MaxValue, long.MaxValue, Guid.Parse("8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc"),
-    new DateTime(1970, 01, 22, 0, 0, 0, DateTimeKind.Unspecified), new DateTime(2000, 01, 22, 20, 59, 43, DateTimeKind.Utc), new DateTimeOffset(2000, 01, 22, 20, 59, 43, TimeSpan.FromHours(-8)));
-            json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("[{\"string\":\"text\"},{\"char\":\"x\"},{\"short\":-32768},{\"int\":-2147483648},{\"long\":-9223372036854775808},{\"ushort\":65535},{\"uint\":4294967295},{\"long\":9223372036854775807},{\"guid\":\"8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc\"},{\"datetime\":\"1970-01-22T00:00:00\"},{\"datetime\":\"2000-01-22T20:59:43Z\"},{\"datetimeoffset\":\"2000-01-22T20:59:43-08:00\"}]"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-        }
-
-        #endregion
-
-        #region NewtonsoftJson
-
-        [Test]
-        public void NewtonsoftJson_Serialize_Deserialize()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X", ETag = "xxx" };
-            var json = js.Serialize(p);
-            Assert.That(json, Is.EqualTo("{\"code\":\"A\",\"DESCRIPTION\":\"B\",\"retailPrice\":1.99,\"etag\":\"xxx\"}"));
-
-            p = js.Deserialize<BackendProduct>(json);
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p!.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-                Assert.That(p.ETag, Is.EqualTo("xxx"));
-            });
-
-            p = (BackendProduct)js.Deserialize(json, typeof(BackendProduct))!;
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-                Assert.That(p.ETag, Is.EqualTo("xxx"));
-            });
-
-            json = js.Serialize(p, JsonWriteFormat.Indented);
-            json.Should().Be("{\n  \"code\": \"A\",\n  \"DESCRIPTION\": \"B\",\n  \"retailPrice\": 1.99,\n  \"etag\": \"xxx\"\n}"
-                .Replace("\n", Environment.NewLine), because: "Line breaks should be preserved in indented JSON with different line endings on Linux and Windows");
-        }
-
-        [Test]
-        public void NewtonsoftJson_Serialize_Deserialize_BinaryData()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X" };
-            var bs = js.SerializeToBinaryData(p);
-
-            p = js.Deserialize<BackendProduct>(bs);
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p!.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-            });
-
-            p = (BackendProduct)js.Deserialize(bs, typeof(BackendProduct))!;
-            Assert.That(p, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Code, Is.EqualTo("A"));
-                Assert.That(p.Description, Is.EqualTo("B"));
-                Assert.That(p.RetailPrice, Is.EqualTo(1.99m));
-                Assert.That(p.Secret, Is.Null);
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_Serialize_Deserialize_Dynamic()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X" };
-            var json = js.Serialize(p);
-
-            var o = js.Deserialize(json);
-            Assert.That(o, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o, Is.InstanceOf<Nsj.Linq.JObject>());
-                Assert.That(((Nsj.Linq.JObject)o!).ToString(Nsj.Formatting.None), Is.EqualTo("{\"code\":\"A\",\"DESCRIPTION\":\"B\",\"retailPrice\":1.99}"));
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_Serialize_Deserialize_Dynamic_BinaryData()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            var p = new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m, Secret = "X" };
-            var bs = js.SerializeToBinaryData(p);
-
-            var o = js.Deserialize(bs);
-            Assert.That(o, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(o, Is.InstanceOf<Nsj.Linq.JObject>());
-                Assert.That(((Nsj.Linq.JObject)o!).ToString(Nsj.Formatting.None), Is.EqualTo("{\"code\":\"A\",\"DESCRIPTION\":\"B\",\"retailPrice\":1.99}"));
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_TryApplyFilter_JsonString()
-        {
-            var p = new Person { FirstName = "John", LastName = "Smith", Addresses = new List<Address> { new() { Street = "One", City = "First" }, new() { Street = "Two", City = "Second" } } };
-
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out string json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\",\"addresses\":[{\"street\":\"One\"},{\"street\":\"Two\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out json), Is.True);
-                Assert.That(json, Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"city\":\"First\"},{\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(json, Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "firstName" }, out json), Is.True);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json), Is.True);
-                Assert.That(json, Is.EqualTo("{}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json, JsonPropertyFilter.Exclude), Is.False);
-                Assert.That(json, Is.EqualTo("{\"firstName\":\"John\",\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_TryApplyFilter_JsonObject()
-        {
-            var p = new Person { FirstName = "John", LastName = "Smith", Addresses = new List<Address> { new() { Street = "One", City = "First" }, new() { Street = "Two", City = "Second" } } };
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            object json;
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"firstName\":\"John\",\"addresses\":[{\"street\":\"One\"},{\"street\":\"Two\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "LastName", "Addresses.City", "LastName" }, out json), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"city\":\"First\"},{\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "lastname", "addresses" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "firstName" }, out json), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"firstName\":\"John\"}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "middlename" }, out json, JsonPropertyFilter.Exclude), Is.False);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"firstName\":\"John\",\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\",\"city\":\"Second\"}]}"));
-
-                Assert.That(js.TryApplyFilter(p, new string[] { "addresses[1].city" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"firstName\":\"John\",\"lastName\":\"Smith\",\"addresses\":[{\"street\":\"One\",\"city\":\"First\"},{\"street\":\"Two\"}]}"));
-            });
-
-            p.Address = new Address { Street = "One", City = "First" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "address" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("{\"address\":{\"street\":\"One\",\"city\":\"First\"}}"));
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_TryApplyFilter_JsonOArray()
-        {
-            var p = new int[] { 11, 22, 333 };
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            object json;
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "[2]" }, out json, JsonPropertyFilter.Include), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("[333]"));
-            });
-
-            js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryApplyFilter(p, new string[] { "[2]" }, out json, JsonPropertyFilter.Exclude), Is.True);
-                Assert.That(((Nsj.Linq.JToken)json).ToString(Nsj.Formatting.None), Is.EqualTo("[11,22]"));
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_Serialize_Deserialize_Exceptions()
-        {
-            // Arrange
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            Exception realException;
-
-            try { throw new Exception("Test"); }
-            catch (Exception ex) { realException = ex; }
-
-            // Act
-            var serialized = js.Serialize(realException);
-            var deserialized = js.Deserialize<Exception>(serialized)!;
-
-            // Assert
-            deserialized.Data.Should().BeEquivalentTo(realException.Data);
-            deserialized.Message.Should().BeEquivalentTo(realException.Message);
-            deserialized.StackTrace.Should().BeEquivalentTo(realException.StackTrace);
-        }
-
-        [Test]
-        public void NewtonsoftJson_TryGetJsonName()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            var t = typeof(Other);
-
-            Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other.FirstName))!, out string? jn), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(jn, Is.EqualTo("first_name"));
-
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other.MiddleName))!, out jn), Is.False);
-                Assert.That(jn, Is.EqualTo(null));
-
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other.LastName))!, out jn), Is.False);
-                Assert.That(jn, Is.EqualTo(null));
-            });
-
-            // Verify JsonObject usage.
-            t = typeof(Other2);
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other2.FirstName))!, out jn), Is.True);
-                Assert.That(jn, Is.EqualTo("firstName"));
-
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(Other2.LastName))!, out jn), Is.False);
-                Assert.That(jn, Is.EqualTo(null));
-            });
-
-            // Verify ContractResolver STJ marked-up objects.
-            t = typeof(CoreEx.AspNetCore.WebApis.ExtendedContentResult);
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(CoreEx.AspNetCore.WebApis.ExtendedContentResult.AfterExtension))!, out jn), Is.False);
-                Assert.That(jn, Is.EqualTo(null));
-            });
-
-            t = typeof(CoreEx.Entities.ChangeLog);
-            Assert.Multiple(() =>
-            {
-                Assert.That(js.TryGetJsonName(t.GetProperty(nameof(CoreEx.Entities.ChangeLog.CreatedBy))!, out jn), Is.True);
-                Assert.That(jn, Is.EqualTo("createdBy"));
-            });
-        }
-
-        [Test]
-        public void NewtonsoftJson_Serialize_DictionaryKeys()
-        {
-            var d = new Dictionary<string, string> { { "ABC", "XXX" }, { "Efg", "Xxx" }, { "hij", "xxx" }, { "AbEfg", "xxXxx" }, { "ETag", "ETAG" } };
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-            var json = js.Serialize(d);
-            Assert.That(json, Is.EqualTo("{\"abc\":\"XXX\",\"efg\":\"Xxx\",\"hij\":\"xxx\",\"abEfg\":\"xxXxx\",\"etag\":\"ETAG\"}"));
-        }
-
-        [Test]
-        public void NewtonsoftJson_Serialize_CollectionResult()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-
-            // Null object.
-            var pcr = (PersonCollectionResult?)null;
-
-            var json = js.Serialize(pcr);
-            Assert.That(json, Is.EqualTo("null"));
-
-            pcr = js.Deserialize<PersonCollectionResult>(json);
-            Assert.That(pcr, Is.Null);
-
-            // Empty collection.
-            pcr = new PersonCollectionResult();
-
-            json = js.Serialize(pcr);
-            Assert.That(json, Is.EqualTo("[]"));
-
-            pcr = js.Deserialize<PersonCollectionResult>(json);
-            Assert.That(pcr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pcr!.Items, Is.Not.Null);
-                Assert.That(pcr.Items, Is.Empty);
-                Assert.That(pcr.Paging, Is.Null);
-            });
-
-            // Items in collection.
-            pcr.Items.Add(new Person { FirstName = "Jane" });
-            pcr.Items.Add(new Person { FirstName = "John" });
-
-            json = js.Serialize(pcr);
-            Assert.That(json, Is.EqualTo("[{\"firstName\":\"Jane\"},{\"firstName\":\"John\"}]"));
-
-            pcr = js.Deserialize<PersonCollectionResult>(json);
-            Assert.That(pcr, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(pcr!.Items, Is.Not.Null);
-                Assert.That(pcr.Items, Has.Count.EqualTo(2));
-                Assert.That(pcr.Paging, Is.Null);
-                Assert.That(pcr.Items[0].FirstName, Is.EqualTo("Jane"));
-                Assert.That(pcr.Items[1].FirstName, Is.EqualTo("John"));
-            });
-        }
-
-        [Test]
-        public void Newtonsoft_Serialize_CompositeKey()
-        {
-            var js = new CoreEx.Newtonsoft.Json.JsonSerializer() as IJsonSerializer;
-
-            var ck = CompositeKey.Empty;
-            var json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("null"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-
-            ck = new CompositeKey((int?)null);
-            json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("[null]"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-
-            ck = new CompositeKey(88);
-            json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("[{\"int\":88}]"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-
-            ck = new CompositeKey("text", 'x', short.MinValue, int.MinValue, long.MinValue, ushort.MaxValue, uint.MaxValue, long.MaxValue, Guid.Parse("8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc"),
-    new DateTime(1970, 01, 22, 0, 0, 0, DateTimeKind.Unspecified), new DateTime(2000, 01, 22, 20, 59, 43, DateTimeKind.Utc), new DateTimeOffset(2000, 01, 22, 20, 59, 43, TimeSpan.FromHours(-8)));
-            json = js.Serialize(ck);
-            Assert.Multiple(() =>
-            {
-                Assert.That(json, Is.EqualTo("[{\"string\":\"text\"},{\"char\":\"x\"},{\"short\":-32768},{\"int\":-2147483648},{\"long\":-9223372036854775808},{\"ushort\":65535},{\"uint\":4294967295},{\"long\":9223372036854775807},{\"guid\":\"8bd5f616-ed6b-4fc5-9cb8-4472cc8955fc\"},{\"datetime\":\"1970-01-22T00:00:00\"},{\"datetime\":\"2000-01-22T20:59:43Z\"},{\"datetimeoffset\":\"2000-01-22T20:59:43-08:00\"}]"));
-                Assert.That(js.Deserialize<CompositeKey>(json), Is.EqualTo(ck));
-            });
-        }
-
-        #endregion
-
-        public class Person
-        {
-            public string? FirstName { get; set; }
-            public string? LastName { get; set; }
-            public List<Address>? Addresses { get; set; }
-            public string? SSN { get; set; }
-            public decimal NetWorth { get; set; }
-            public bool? IsAwesome { get; set; }
-            public Address? Address { get; set; }
-        }
-
-        public class Address
-        {
-            public string? Street { get; set; }
-            public string? City { get; set; }
-        }
-
-        public class PersonCollection : List<Person> { }
-
-        public class PersonCollectionResult : CollectionResult<PersonCollection, Person> { }
-
-        public class Other
-        {
-            [Stj.Serialization.JsonPropertyName("first-name")]
-            [Nsj.JsonProperty("first_name")]
-            public string? FirstName { get; set; }
-            [Stj.Serialization.JsonIgnore]
-            public string? MiddleName { get; set; }
-            [Nsj.JsonIgnore]
-            public string? LastName { get; set; }
-        }
-
-        [Nsj.JsonObject(MemberSerialization = Nsj.MemberSerialization.OptIn)]
-        public class Other2
-        {
-            [Nsj.JsonProperty("firstName")]
-            public string? FirstName { get; set; }
-            public string? LastName { get; set; }
-        }
-
-        public class BackendProduct
-        {
-            [Nsj.JsonProperty("code")]
-            [Stj.Serialization.JsonPropertyName("code")]
-            public string? Code { get; set; }
-
-            [Nsj.JsonProperty("DESCRIPTION")]
-            [Stj.Serialization.JsonPropertyName("DESCRIPTION")]
-            public string? Description { get; set; }
-
-            [Nsj.JsonProperty("retailPrice")]
-            [Stj.Serialization.JsonPropertyName("retailPrice")]
-            public decimal RetailPrice { get; set; }
-
-            [Nsj.JsonIgnore]
-            [Stj.Serialization.JsonIgnore]
-            public string? Secret { get; set; }
-
-            [Nsj.JsonIgnore]
-            [Stj.Serialization.JsonIgnore]
-            public CompositeKey PrimaryKey => new(Code);
-
-            public string? ETag { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/Mapping/JsonObjectMapperTest.cs b/tests/CoreEx.Test/Framework/Json/Mapping/JsonObjectMapperTest.cs
deleted file mode 100644
index 61c25678..00000000
--- a/tests/CoreEx.Test/Framework/Json/Mapping/JsonObjectMapperTest.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using NUnit.Framework;
-using System;
-using CoreEx.Entities;
-using CoreEx.Mapping.Converters;
-using CoreEx.Json.Mapping;
-using System.Text.Json.Nodes;
-using System.Text.Json;
-
-namespace CoreEx.Test.Framework.Json.Mapping
-{
-    [TestFixture]
-    internal class JsonObjectMapperTest
-    {
-        [Test]
-        public void MapToJson()
-        {
-            var p = new Person { Id = 1.ToGuid().ToString(), Name = "Bob", Address = new Address { Street = "sss", City = "ccc" }, Address2 = new Address { Street = "ttt", City = "ddd" }, Other = new DateTime(2000, 01, 01, 02, 58, 34) };
-
-            var pdm = new PersonJsonMapper();
-            var json = new JsonObject();
-            pdm.MapToJson(p, json);
-
-            Assert.That(json.ToJsonString(new JsonSerializerOptions { WriteIndented = false }), Is.EqualTo("{\"id\":\"00000001-0000-0000-0000-000000000000\",\"nname\":\"Bob\",\"street\":\"sss\",\"town\":\"ccc\",\"address2\":{\"street\":\"ttt\",\"city\":\"ddd\"},\"other\":\"01/01/2000 02:58:34\"}"));
-        }
-
-        [Test]
-        public void MapFromJson()
-        {
-            var json = JsonNode.Parse("{\"id\":\"00000001-0000-0000-0000-000000000000\",\"nname\":\"Bob\",\"street\":\"sss\",\"town\":\"ccc\",\"address2\":{\"street\":\"ttt\",\"city\":\"ddd\"},\"other\":\"01/01/2000 02:58:34\"}")!;
-
-            var pdm = new PersonJsonMapper();
-            var p = pdm.MapFromJson(json.AsObject())!;
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(p.Id, Is.EqualTo(1.ToGuid().ToString()));
-                Assert.That(p.Name, Is.EqualTo("Bob"));
-                Assert.That(p.Address?.Street, Is.EqualTo("sss"));
-                Assert.That(p.Address?.City, Is.EqualTo("ccc"));
-                Assert.That(p.Address2?.Street, Is.EqualTo("ttt"));
-                Assert.That(p.Address2?.City, Is.EqualTo("ddd"));
-                Assert.That(p.Other, Is.EqualTo(new DateTime(2000, 01, 01, 02, 58, 34)));
-            });
-        }
-    }
-
-    public class PersonJsonMapper : JsonObjectMapper<Person>
-    {
-        private readonly JsonObjectMapper<Address> _addressMapper = JsonObjectMapper.CreateAuto<Address>("City").HasProperty(x => x.City, "town");
-
-        public PersonJsonMapper()
-        {
-            InheritPropertiesFrom(JsonObjectMapper.CreateAuto<PersonBase>());
-            Property(x => x.Name, "nname");
-            Property(x => x.Address).SetMapper(_addressMapper);
-            Property(x => x.Address2);
-            Property(x => x.Other).SetConverter(new DateTimeToStringConverter());
-        }
-    }
-
-    public class PersonBase : IIdentifier<string>
-    {
-        public string? Id { get; set; }
-    }
-
-    public class Person : PersonBase
-    {
-        public string? Name { get; set; }
-        public Address? Address { get; set; }
-        public Address? Address2 { get; set; }
-        public DateTime? Other { get; set; }
-    }
-
-    public class Address
-    {
-        public string? Street { get; set; }
-        public string? City { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/Merge/Extended/JsonMergePatchExTest.cs b/tests/CoreEx.Test/Framework/Json/Merge/Extended/JsonMergePatchExTest.cs
deleted file mode 100644
index cf9e773e..00000000
--- a/tests/CoreEx.Test/Framework/Json/Merge/Extended/JsonMergePatchExTest.cs
+++ /dev/null
@@ -1,1370 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Json.Merge;
-using CoreEx.Json.Merge.Extended;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Json.Merge
-{
-    [TestFixture]
-    public class JsonMergePatchExTest
-    {
-        public class SubData
-        {
-            public string? Code { get; set; }
-            public string? Text { get; set; }
-            public int Count { get; set; }
-        }
-
-        public class KeyData : IPrimaryKey
-        {
-            public string? Code { get; set; }
-            public string? Text { get; set; }
-            public string? Other { get; set; }
-            public CompositeKey PrimaryKey => new(Code);
-        }
-
-        public class KeyDataCollection : EntityKeyCollection<KeyData> { }
-
-        public class NonKeyData
-        {
-            public string? Code { get; set; }
-
-            public string? Text { get; set; }
-        }
-
-        public class NonKeyDataCollection : List<NonKeyData> { }
-
-        public class TestData
-        {
-            public Guid Id { get; set; }
-            public string? Name { get; set; }
-            [JsonIgnore]
-            public string? Ignore { get; set; }
-            public bool IsValid { get; set; }
-            public DateTime Date { get; set; }
-            public int Count { get; set; }
-            public decimal Amount { get; set; }
-            public SubData? Sub { get; set; }
-            public int[]? Values { get; set; }
-            public List<SubData>? NoKeys { get; set; }
-            public List<KeyData>? Keys { get; set; }
-            public KeyDataCollection? KeysColl { get; set; }
-            public NonKeyDataCollection? NonKeys { get; set; }
-            public Dictionary<string, string>? Dict { get; set; }
-            public Dictionary<string, KeyData>? Dict2 { get; set; }
-        }
-
-        [Test]
-        public void Merge_NullJsonArgument()
-        {
-            var td = new TestData();
-            Assert.Throws<ArgumentNullException>(() => { new JsonMergePatchEx().Merge(null!, ref td); });
-        }
-
-        [Test]
-        public void Merge_Malformed()
-        {
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx().Merge(BinaryData.FromString("<xml/>"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("'<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0."));
-        }
-
-        [Test]
-        public void Merge_Empty()
-        {
-            var td = new TestData();
-            Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ }"), ref td), Is.False);
-        }
-
-        [Test]
-        public void Merge_Int()
-        {
-            int i = 1;
-            Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("1"), ref i), Is.False);
-
-            Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("2"), ref i), Is.True);
-            Assert.That(i, Is.EqualTo(2));
-        }
-
-        [Test]
-        public void Merge_Property_StringValue()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"name\": \"Barry\" }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.EqualTo("Barry"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringValue_DifferentNameCasingSupported()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"nAmE\": \"Barry\" }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.EqualTo("Barry"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringValue_DifferentNameCasingNotSupported()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { PropertyNameComparer = StringComparer.Ordinal }).Merge(BinaryData.FromString("{ \"nAmE\": \"Barry\" }"), ref td), Is.False);
-                Assert.That(td!.Name, Is.EqualTo("Fred"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringNull()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"name\": null }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringNumberValue()
-        {
-            var td = new TestData { Name = "Fred" };
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"name\": 123 }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.String. Path: $.name | LineNumber: 0 | BytePositionInLine: 13."));
-        }
-
-        [Test]
-        public void Merge_Property_String_MalformedA()
-        {
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"name\": [ \"Barry\" ] }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.String. Path: $.name | LineNumber: 0 | BytePositionInLine: 11."));
-        }
-
-        [Test]
-        public void Merge_PrimitiveTypesA()
-        {
-            var td = new TestData();
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58 }"), ref td), Is.True);
-
-                Assert.That(td!.Id, Is.EqualTo(new Guid("13512759-4f50-e911-b35c-bc83850db74d")));
-                Assert.That(td.Name, Is.EqualTo("Barry"));
-                Assert.That(td.IsValid, Is.True);
-                Assert.That(td.Date, Is.EqualTo(new DateTime(2018, 12, 31)));
-                Assert.That(td.Count, Is.EqualTo(12));
-            });
-            Assert.That(td.Amount, Is.EqualTo(132.58m));
-        }
-
-        [Test]
-        public void Merge_PrimitiveTypes_NonCached_X100()
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                var td = new TestData();
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58 }"), ref td), Is.True);
-            }
-        }
-
-        [Test]
-        public void Merge_PrimitiveTypes_Cached_X100()
-        {
-            var jom = new JsonMergePatchEx();
-            for (int i = 0; i < 100; i++)
-            {
-                var td = new TestData();
-                Assert.That(jom.Merge(BinaryData.FromString("{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58 }"), ref td), Is.True);
-            }
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityNull()
-        {
-            var td = new TestData { Sub = new SubData() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"sub\": null }"), ref td), Is.True);
-                Assert.That(td!.Sub, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityNewEmpty()
-        {
-            var td = new TestData();
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"sub\": { } }"), ref td), Is.True);
-                Assert.That(td!.Sub, Is.Not.Null);
-                Assert.That(td.Sub!.Code, Is.Null);
-                Assert.That(td.Sub.Text, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityExistingEmpty()
-        {
-            var td = new TestData { Sub = new SubData() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge<TestData>(BinaryData.FromString("{ \"sub\": { } }"), ref td), Is.False);
-                Assert.That(td!.Sub, Is.Not.Null);
-                Assert.That(td.Sub!.Code, Is.Null);
-                Assert.That(td.Sub.Text, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityExistingChanged()
-        {
-            var td = new TestData { Sub = new SubData() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"sub\": { \"code\": \"x\", \"text\": \"xxx\" } }"), ref td), Is.True);
-                Assert.That(td!.Sub, Is.Not.Null);
-                Assert.That(td.Sub!.Code, Is.EqualTo("x"));
-                Assert.That(td.Sub.Text, Is.EqualTo("xxx"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayMalformed()
-        {
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"values\": { } }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.Int32[]. Path: $.values | LineNumber: 0 | BytePositionInLine: 13."));
-        }
-
-        [Test]
-        public void Merge_Property_ArrayNull()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"values\": null }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayEmpty()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"values\": [] }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Not.Null);
-                Assert.That(td.Values!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayValues_NoChanges()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"values\": [ 1, 2, 3] }"), ref td), Is.False);
-                Assert.That(td!.Values, Is.Not.Null);
-                Assert.That(td.Values!, Has.Length.EqualTo(3));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayValues_Changes()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"values\": [ 3, 2, 1] }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Not.Null);
-                Assert.That(td.Values!, Has.Length.EqualTo(3));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Values[0], Is.EqualTo(3));
-                Assert.That(td.Values[1], Is.EqualTo(2));
-                Assert.That(td.Values[2], Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_NoKeys_ListNull()
-        {
-            var td = new TestData { NoKeys = new List<SubData> { new() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"nokeys\": null }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_NoKeys_ListEmpty()
-        {
-            var td = new TestData { NoKeys = new List<SubData> { new() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"nokeys\": [ ] }"), ref td), Is.True);
-                Assert.That(td!.NoKeys, Is.Not.Null);
-                Assert.That(td!.NoKeys!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_NoKeys_List()
-        {
-            var td = new TestData { NoKeys = new List<SubData> { new() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"nokeys\": [ { \"code\": \"abc\", \"text\": \"xyz\" }, { }, null ] }"), ref td), Is.True);
-                Assert.That(td!.NoKeys, Is.Not.Null);
-                Assert.That(td.NoKeys!, Has.Count.EqualTo(3));
-                Assert.That(td.NoKeys![0], Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.NoKeys[0].Code, Is.EqualTo("abc"));
-                Assert.That(td.NoKeys[0].Text, Is.EqualTo("xyz"));
-                Assert.That(td.NoKeys[1], Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.NoKeys[1].Code, Is.Null);
-                Assert.That(td.NoKeys[1].Text, Is.Null);
-                Assert.That(td.NoKeys[2], Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_ListNull()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"keys\": null }"), ref td), Is.True);
-                Assert.That(td!.Keys, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_ListEmpty()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"keys\": [ ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_Null()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"keys\": [ null ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Has.Count.EqualTo(1));
-                Assert.That(td.Keys![0], Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_Replace()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"keys\": [ { \"code\": \"abc\" }, { \"code\": \"uvw\", \"text\": \"xyz\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Keys[0].Code, Is.EqualTo("abc"));
-                Assert.That(td.Keys[0].Text, Is.EqualTo(null));
-                Assert.That(td.Keys[1].Code, Is.EqualTo("uvw"));
-                Assert.That(td.Keys[1].Text, Is.EqualTo("xyz"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_NoChanges()
-        {
-            // Note, although technically no changes, there is no means to verify without specific equality checking, so is seen as a change.
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{ \"keys\": [ { \"code\": \"abc\", \"text\": \"def\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Has.Count.EqualTo(1));
-            });
-            
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Keys[0].Code, Is.EqualTo("abc"));
-                Assert.That(td.Keys[0].Text, Is.EqualTo("def"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_ListNull()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": null }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_ListEmpty()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ ] }"), ref td), Is.True);
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_Null()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ null ] }"), ref td), Is.True);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(1));
-                Assert.That(td.KeysColl![0], Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_DuplicateNulls()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData() } };
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ null, null ] }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON array must not contain items with duplicate 'IEntityKey' keys. Path: $.keyscoll"));
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_DuplicateVals1()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData() } };
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { }, { } ] }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON array must not contain items with duplicate 'IEntityKey' keys. Path: $.keyscoll"));
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_DuplicateVals2()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData() } };
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { \"code\": \"a\" }, { \"code\": \"a\" } ] }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON array must not contain items with duplicate 'IEntityKey' keys. Path: $.keyscoll"));
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_DuplicateVals_Dest()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData(), new KeyData() } };
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { } ] }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON array destination collection must not contain items with duplicate 'IEntityKey' keys prior to merge. Path: $.keyscoll"));
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_Null_NoChanges()
-        {
-            var td = new TestData { };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": null }"), ref td), Is.False);
-
-                Assert.That(td!.KeysColl, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_Empty_NoChanges()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ ] }"), ref td), Is.False);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_NullItem_NoChanges()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { null! } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ null ] }"), ref td), Is.False);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(1));
-                Assert.That(td.KeysColl![0], Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_Item_NoChanges()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData { Code = "a" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { \"code\": \"a\"  } ] }"), ref td), Is.False);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(1));
-                Assert.That(td.KeysColl![0].Code, Is.EqualTo("a"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_KeyedItem_Changes()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData { Code = "a", Text = "aa" }, new KeyData { Code = "b", Text = "bb" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { \"code\": \"a\", \"text\": \"zz\" }, { \"code\": \"b\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(2));
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.KeysColl[0].Code, Is.EqualTo("a"));
-                Assert.That(td.KeysColl[0].Text, Is.EqualTo("zz"));
-                Assert.That(td.KeysColl[1].Code, Is.EqualTo("b"));
-                Assert.That(td.KeysColl[1].Text, Is.EqualTo("bb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_KeyedItem_SequenceChanges()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData { Code = "a", Text = "aa" }, new KeyData { Code = "b", Text = "bb" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { \"code\": \"b\", \"text\": \"yy\" }, { \"code\": \"a\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.KeysColl[0].Code, Is.EqualTo("b"));
-                Assert.That(td.KeysColl[0].Text, Is.EqualTo("yy"));
-                Assert.That(td.KeysColl[1].Code, Is.EqualTo("a"));
-                Assert.That(td.KeysColl[1].Text, Is.EqualTo("aa"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_KeyedItem_AllNew()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData { Code = "a", Text = "aa" }, new KeyData { Code = "b", Text = "bb" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { \"code\": \"y\", \"text\": \"yy\" }, { \"code\": \"z\", \"text\": \"zz\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(2));
-            });
-            
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.KeysColl[0].Code, Is.EqualTo("y"));
-                Assert.That(td.KeysColl[0].Text, Is.EqualTo("yy"));
-                Assert.That(td.KeysColl[1].Code, Is.EqualTo("z"));
-                Assert.That(td.KeysColl[1].Text, Is.EqualTo("zz"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeysColl_KeyedItem_Delete()
-        {
-            var td = new TestData { KeysColl = new KeyDataCollection { new KeyData { Code = "a", Text = "aa" }, new KeyData { Code = "b", Text = "bb" }, new KeyData { Code = "c", Text = "cc" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"keyscoll\": [ { \"code\": \"a\" }, { \"code\": \"c\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.KeysColl, Is.Not.Null);
-                Assert.That(td.KeysColl!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.KeysColl[0].Code, Is.EqualTo("a"));
-                Assert.That(td.KeysColl[0].Text, Is.EqualTo("aa"));
-                Assert.That(td.KeysColl[1].Code, Is.EqualTo("c"));
-                Assert.That(td.KeysColl[1].Text, Is.EqualTo("cc"));
-            });
-        }
-
-        // *** Dictionary<string, string> - DictionaryMergeApproach.Replace
-
-        [Test]
-        public void Merge_Property_DictReplace_Null()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{ \"dict\": null }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_Empty()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{ \"dict\": {} }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_NullValue()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{ \"dict\": {\"k\":null} }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo(null));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_DuplicateKeys_IntoNull()
-        {
-            var td = new TestData();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_DuplicateKeys_IntoEmpty()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string>() };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_NoChange()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k1\":\"v1\"}}"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_ReOrder_NoChange()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict\":{\"k1\":\"v1\",\"k\":\"v\"}}"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictReplace_AddUpdateDelete_Replace()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k2\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k2"], Is.EqualTo("v2"));
-            });
-        }
-
-        // *** Dictionary<string, string> - DictionaryMergeApproach.Merge
-
-        [Test]
-        public void Merge_Property_DictMerge_Null()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"dict\": null }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_Empty()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                // Should result in no changes as no property (key) was provided.
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"dict\": {} }"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_NullValue()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                // A key with a value of null indicates it should be removed.
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{ \"dict\": {\"k\":null} }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_DuplicateKeys_IntoNull()
-        {
-            var td = new TestData { };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_DuplicateKeys_IntoEmpty()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string>() };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_NoChange()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k1\":\"v1\"}}"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_ReOrder_NoChange()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict\":{\"k1\":\"v1\",\"k\":\"v\"}}"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_AddUpdateDelete()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"vx\",\"k2\":\"v2\",\"k1\":null}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("vx"));
-                Assert.That(td.Dict["k2"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_AddUpdate()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"vx\",\"k2\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(3));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("vx"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-                Assert.That(td.Dict["k2"], Is.EqualTo("v2"));
-            });
-        }
-
-        // ***
-
-        [Test]
-        public void Merge_Property_Dict2Replace_DuplicateKeys_IntoEmpty()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData>() };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aa\",\"text\": \"aaa\"},\"a\":{\"code\": \"bb\",\"text\": \"bbb\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(1));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("bbb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Dict2Replace_NoChange()
-        {
-            // Note, although technically no changes, there is no means to verify without specific equality checking, so is seen as a change.
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aa\",\"text\": \"aaa\"},\"b\":{\"code\": \"bb\",\"text\": \"bbb\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["b"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["b"].Text, Is.EqualTo("bbb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Dict2Replace_AddUpdateDelete_Replace()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aaaa\"},\"c\":{\"code\": \"cc\",\"text\": \"ccc\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aaaa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo(null));
-                Assert.That(td.Dict2["c"].Code, Is.EqualTo("cc"));
-                Assert.That(td.Dict2["c"].Text, Is.EqualTo("ccc"));
-            });
-        }
-
-        // ***
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_DuplicateKeys_IntoEmpty()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData>() };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aa\",\"text\": \"aaa\"},\"a\":{\"code\": \"bb\",\"text\": \"bbb\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(1));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("bbb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_NoChange()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aa\",\"text\": \"aaa\"},\"b\":{\"code\": \"bb\",\"text\": \"bbb\"}}}"), ref td), Is.False);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["b"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["b"].Text, Is.EqualTo("bbb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_AddUpdateDelete()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aaaa\"},\"c\":{\"code\": \"cc\",\"text\": \"ccc\"},\"b\":null}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aaaa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["c"].Code, Is.EqualTo("cc"));
-                Assert.That(td.Dict2["c"].Text, Is.EqualTo("ccc"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_AddUpdate()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aaaa\"},\"c\":{\"code\": \"cc\",\"text\": \"ccc\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(3));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aaaa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["b"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["b"].Text, Is.EqualTo("bbb"));
-                Assert.That(td.Dict2["c"].Code, Is.EqualTo("cc"));
-                Assert.That(td.Dict2["c"].Text, Is.EqualTo("ccc"));
-            });
-        }
-
-        // ***
-
-        [Test]
-        public void Merge_XLoadTest_NoCache_1_1000()
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                var td = JsonMergePatchTest._testData;
-                new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge, DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString(JsonMergePatchTest._text), ref td);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_WithCache_1_1000()
-        {
-            var jmp = new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge, DictionaryMergeApproach = DictionaryMergeApproach.Merge });
-            for (int i = 0; i < 1000; i++)
-            {
-                var td = JsonMergePatchTest._testData;
-                jmp.Merge(BinaryData.FromString(JsonMergePatchTest._text), ref td);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_NoCache_2_1000()
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                var td = JsonMergePatchTest._testData;
-                new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge, DictionaryMergeApproach = DictionaryMergeApproach.Merge }).Merge(BinaryData.FromString(JsonMergePatchTest._text), ref td);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_WithCache_2_1000()
-        {
-            var jmp = new JsonMergePatchEx(new JsonMergePatchExOptions { EntityKeyCollectionMergeApproach = EntityKeyCollectionMergeApproach.Merge, DictionaryMergeApproach = DictionaryMergeApproach.Merge });
-            for (int i = 0; i < 1000; i++)
-            {
-                var td = JsonMergePatchTest._testData;
-                jmp.Merge(BinaryData.FromString(JsonMergePatchTest._text), ref td);
-            }
-        }
-
-        [Test]
-        public async Task Merge_XLoadTest_WithRead_10000()
-        {
-            var jmp = new JsonMergePatchEx();
-
-            for (int i = 0; i < 10000; i++)
-            {
-                var td = new TestData { Values = new int[] { 1, 2, 3 }, Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } }, Dict = new Dictionary<string, string>() { { "a", "b" } }, Dict2 = new Dictionary<string, KeyData> { { "x", new KeyData { Code = "xx" } } } };
-                _ = await jmp.MergeWithResultAsync<TestData>(new BinaryData(JsonMergePatchTest._text), async (v, _) => await Task.FromResult(v).ConfigureAwait(false));
-            }
-        }
-
-        // **
-
-        [Test]
-        public void MergeInvalidMergeValueForType()
-        {
-            var jmp = new JsonMergePatchEx();
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => jmp.Merge<TestData>(BinaryData.FromString("""{ "id": { "value": "123" }}"""), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.Guid. Path: $.id | LineNumber: 0 | BytePositionInLine: 9."));
-        }
-
-        [Test]
-        public void Merge_RootSimple_NullString()
-        {
-            string? s = null;
-            var jmp = new JsonMergePatchEx();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref s), Is.False);
-                Assert.That(s, Is.EqualTo(null));
-            });
-
-            s = "x";
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref s), Is.True);
-                Assert.That(s, Is.EqualTo(null));
-            });
-
-            s = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("\"x\""), ref s), Is.True);
-                Assert.That(s, Is.EqualTo("x"));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("\"x\""), ref s), Is.False);
-                Assert.That(s, Is.EqualTo("x"));
-            });
-        }
-
-        [Test]
-        public void Merge_RootSimple_NullInt()
-        {
-            int? i = null;
-            var jmp = new JsonMergePatchEx();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref i), Is.False);
-                Assert.That(i, Is.EqualTo(null));
-            });
-
-            i = 88;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref i), Is.True);
-                Assert.That(i, Is.EqualTo(null));
-            });
-
-            i = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("88"), ref i), Is.True);
-                Assert.That(i, Is.EqualTo(88));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("88"), ref i), Is.False);
-                Assert.That(i, Is.EqualTo(88));
-            });
-        }
-
-        [Test]
-        public void Merge_RootSimple_Int()
-        {
-            int i = 0;
-            var jmp = new JsonMergePatchEx();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("0"), ref i), Is.False);
-                Assert.That(i, Is.EqualTo(0));
-
-                Assert.That(jmp.Merge(BinaryData.FromString("88"), ref i), Is.True);
-                Assert.That(i, Is.EqualTo(88));
-            });
-        }
-
-        [Test]
-        public void Merge_RootComplex_Null()
-        {
-            SubData? sd = null!;
-            var jmp = new JsonMergePatchEx();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref sd), Is.False);
-                Assert.That(sd, Is.Null);
-            });
-
-            sd = new SubData { Code = "X" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref sd), Is.True);
-                Assert.That(sd, Is.Null);
-            });
-
-            sd = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"code\":\"x\"}"), ref sd), Is.True);
-                Assert.That(sd, Is.Not.Null);
-            });
-            Assert.That(sd!.Code, Is.EqualTo("x"));
-        }
-
-        [Test]
-        public void Merge_RootArray_Simple_Null()
-        {
-            var arr = Array.Empty<int>();
-            var jmp = new JsonMergePatchEx();
-            jmp.Merge(BinaryData.FromString("null"), ref arr);
-            Assert.That(arr, Is.EqualTo(null));
-
-            arr = new int[] { 1, 2 };
-            jmp.Merge(BinaryData.FromString("null"), ref arr);
-            Assert.That(arr, Is.EqualTo(null));
-
-            int[]? arr2 = null;
-            jmp.Merge(BinaryData.FromString("null"), ref arr2);
-            Assert.That(arr2, Is.EqualTo(null));
-
-            arr2 = new int[] { 1, 2 };
-            jmp.Merge(BinaryData.FromString("null"), ref arr2);
-            Assert.That(arr2, Is.EqualTo(null));
-        }
-
-        [Test]
-        public void Merge_RootArray_Simple()
-        {
-            var arr = Array.Empty<int>();
-            var jmp = new JsonMergePatchEx();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("[1,2,3]"), ref arr), Is.True);
-                Assert.That(arr, Is.EqualTo(new int[] { 1, 2, 3 }));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("[1,2,3]"), ref arr), Is.False);
-                Assert.That(arr, Is.EqualTo(new int[] { 1, 2, 3 }));
-            });
-        }
-
-        [Test]
-        public void Merge_RootArray_Complex()
-        {
-            var arr = new SubData[] { new() { Code = "a", Text = "aa" }, new() { Code = "b", Text = "bb" } };
-            var jmp = new JsonMergePatchEx();
-
-            Assert.Multiple(() =>
-            {
-                // No equality checker so will appear as changed - is a replacement.
-                Assert.That(jmp.Merge(BinaryData.FromString("[{\"code\":\"a\",\"text\":\"aa\"},{\"code\":\"b\",\"text\":\"bb\"}]"), ref arr), Is.True);
-                Assert.That(arr!, Has.Length.EqualTo(2));
-
-                // Replaced.
-                Assert.That(jmp.Merge(BinaryData.FromString("[{\"code\":\"c\",\"text\":\"cc\"},{\"code\":\"b\",\"text\":\"bb\"}]"), ref arr), Is.True);
-                Assert.That(arr!, Has.Length.EqualTo(2));
-                Assert.That(arr![0].Code, Is.EqualTo("c"));
-            });
-        }
-
-        [Test]
-        public void Merge_RootDictionary_Simple()
-        {
-            var dict = new Dictionary<string, int>();
-            var jmp = new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":1}"), ref dict), Is.True);
-                Assert.That(dict, Is.EqualTo(new Dictionary<string, int> { { "x", 1 } }));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":1}"), ref dict), Is.False);
-                Assert.That(dict, Is.EqualTo(new Dictionary<string, int> { { "x", 1 } }));
-            });
-
-            dict = new Dictionary<string, int>();
-            jmp = new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":1}"), ref dict), Is.True);
-                Assert.That(dict, Is.EqualTo(new Dictionary<string, int> { { "x", 1 } }));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":1}"), ref dict), Is.False);
-                Assert.That(dict, Is.EqualTo(new Dictionary<string, int> { { "x", 1 } }));
-            });
-        }
-
-        [Test]
-        public void Merge_RootDictionary_Complex()
-        {
-            var dict = new Dictionary<string, SubData>();
-            var jmp = new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Merge });
-
-            Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":{\"code\":\"xx\"},\"y\":{\"code\":\"yy\",\"text\":\"YY\"}}"), ref dict), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(dict, Is.Not.Null);
-                Assert.That(dict!, Has.Count.EqualTo(2));
-                Assert.That(dict!["x"].Code, Is.EqualTo("xx"));
-                Assert.That(dict!["x"].Text, Is.EqualTo(null));
-                Assert.That(dict!["y"].Code, Is.EqualTo("yy"));
-                Assert.That(dict!["y"].Text, Is.EqualTo("YY"));
-            });
-
-            Assert.That(jmp.Merge(BinaryData.FromString("{\"y\":{\"code\":\"yyy\"},\"x\":{\"code\":\"xxx\"}}"), ref dict), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(dict, Is.Not.Null);
-                Assert.That(dict!, Has.Count.EqualTo(2));
-                Assert.That(dict!["x"].Code, Is.EqualTo("xxx"));
-                Assert.That(dict!["x"].Text, Is.EqualTo(null));
-                Assert.That(dict!["y"].Code, Is.EqualTo("yyy"));
-                Assert.That(dict!["y"].Text, Is.EqualTo("YY"));
-            });
-
-            // --
-
-            dict = new Dictionary<string, SubData>();
-            jmp = new JsonMergePatchEx(new JsonMergePatchExOptions { DictionaryMergeApproach = DictionaryMergeApproach.Replace });
-
-            Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":{\"code\":\"xx\"},\"y\":{\"code\":\"yy\",\"text\":\"YY\"}}"), ref dict), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(dict, Is.Not.Null);
-                Assert.That(dict!, Has.Count.EqualTo(2));
-                Assert.That(dict!["x"].Code, Is.EqualTo("xx"));
-                Assert.That(dict!["x"].Text, Is.EqualTo(null));
-                Assert.That(dict!["y"].Code, Is.EqualTo("yy"));
-                Assert.That(dict!["y"].Text, Is.EqualTo("YY"));
-            });
-
-            Assert.That(jmp.Merge(BinaryData.FromString("{\"y\":{\"code\":\"yyy\"},\"x\":{\"code\":\"xxx\"}}"), ref dict), Is.True);
-            Assert.Multiple(() =>
-            {
-
-                Assert.That(dict, Is.Not.Null);
-                Assert.That(dict!, Has.Count.EqualTo(2));
-                Assert.That(dict!["x"].Code, Is.EqualTo("xxx"));
-                Assert.That(dict!["x"].Text, Is.EqualTo(null));
-                Assert.That(dict!["y"].Code, Is.EqualTo("yyy"));
-                Assert.That(dict!["y"].Text, Is.EqualTo(null));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Json/Merge/JsonMergePatchTest.cs b/tests/CoreEx.Test/Framework/Json/Merge/JsonMergePatchTest.cs
deleted file mode 100644
index e100dee4..00000000
--- a/tests/CoreEx.Test/Framework/Json/Merge/JsonMergePatchTest.cs
+++ /dev/null
@@ -1,963 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Json.Merge;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Json.Merge
-{
-    [TestFixture]
-    public class JsonMergePatchTest
-    {
-        public class SubData
-        {
-            public string? Code { get; set; }
-            public string? Text { get; set; }
-            public int Count { get; set; }
-        }
-
-        public class KeyData : IPrimaryKey
-        {
-            public string? Code { get; set; }
-            public string? Text { get; set; }
-            public string? Other { get; set; }
-            public CompositeKey PrimaryKey => new(Code);
-        }
-
-        public class KeyDataCollection : EntityKeyCollection<KeyData> { }
-
-        public class NonKeyData
-        {
-            public string? Code { get; set; }
-
-            public string? Text { get; set; }
-        }
-
-        public class NonKeyDataCollection : List<NonKeyData> { }
-
-        public class TestData
-        {
-            public Guid Id { get; set; }
-            public string? Name { get; set; }
-            [JsonIgnore]
-            public string? Ignore { get; set; }
-            public bool IsValid { get; set; }
-            public DateTime Date { get; set; }
-            public int Count { get; set; }
-            public decimal Amount { get; set; }
-            public SubData? Sub { get; set; }
-            public int[]? Values { get; set; }
-            public List<SubData>? NoKeys { get; set; }
-            public List<KeyData>? Keys { get; set; }
-            public KeyDataCollection? KeysColl { get; set; }
-            public NonKeyDataCollection? NonKeys { get; set; }
-            public Dictionary<string, string>? Dict { get; set; }
-            public Dictionary<string, KeyData>? Dict2 { get; set; }
-        }
-
-        [Test]
-        public void Merge_NullJsonArgument()
-        {
-            var td = new TestData();
-            Assert.Throws<ArgumentNullException>(() => { new JsonMergePatch().Merge(null!, ref td); });
-        }
-
-        [Test]
-        public void Merge_Malformed()
-        {
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatch().Merge(BinaryData.FromString("<xml/>"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("'<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0."));
-        }
-
-        [Test]
-        public void Merge_Empty()
-        {
-            var td = new TestData();
-            Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ }"), ref td), Is.False);
-        }
-
-        [Test]
-        public void Merge_Int()
-        {
-            int i = 1;
-            Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("1"), ref i), Is.False);
-
-            Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("2"), ref i), Is.True);
-            Assert.That(i, Is.EqualTo(2));
-        }
-
-        [Test]
-        public void Merge_Property_StringValue()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"name\": \"Barry\" }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.EqualTo("Barry"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringValue_DifferentNameCasingSupported()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"nAmE\": \"Barry\" }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.EqualTo("Barry"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringValue_DifferentNameCasingNotSupported()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                // Returns true as this is intitially patching the JSON-to-JSON directly, then deserializing, so seen as a JSON change, but then ignored during deserialization?! Sorry! 
-                Assert.That(new JsonMergePatch(new JsonMergePatchOptions { PropertyNameComparer = StringComparer.Ordinal }).Merge(BinaryData.FromString("{ \"nAmE\": \"Barry\" }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.EqualTo("Fred"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringNull()
-        {
-            var td = new TestData { Name = "Fred" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"name\": null }"), ref td), Is.True);
-                Assert.That(td!.Name, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_StringNumberValue()
-        {
-            var td = new TestData { Name = "Fred" };
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatch().Merge(BinaryData.FromString("{ \"name\": 123 }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.String. Path: $.name | LineNumber: 0 | BytePositionInLine: 13."));
-        }
-
-        [Test]
-        public void Merge_Property_String_MalformedA()
-        {
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatch().Merge(BinaryData.FromString("{ \"name\": [ \"Barry\" ] }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.String. Path: $.name | LineNumber: 0 | BytePositionInLine: 11."));
-        }
-
-        [Test]
-        public void Merge_PrimitiveTypesA()
-        {
-            var td = new TestData();
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58 }"), ref td), Is.True);
-
-                Assert.That(td!.Id, Is.EqualTo(new Guid("13512759-4f50-e911-b35c-bc83850db74d")));
-                Assert.That(td.Name, Is.EqualTo("Barry"));
-                Assert.That(td.IsValid, Is.True);
-                Assert.That(td.Date, Is.EqualTo(new DateTime(2018, 12, 31)));
-                Assert.That(td.Count, Is.EqualTo(12));
-            });
-            Assert.That(td.Amount, Is.EqualTo(132.58m));
-        }
-
-        [Test]
-        public void Merge_PrimitiveTypes_NonCached_X100()
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                var td = new TestData();
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58 }"), ref td), Is.True);
-            }
-        }
-
-        [Test]
-        public void Merge_PrimitiveTypes_Cached_X100()
-        {
-            var jom = new JsonMergePatch();
-            for (int i = 0; i < 100; i++)
-            {
-                var td = new TestData();
-                Assert.That(jom.Merge(BinaryData.FromString("{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58 }"), ref td), Is.True);
-            }
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityNull()
-        {
-            var td = new TestData { Sub = new SubData() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"sub\": null }"), ref td), Is.True);
-                Assert.That(td!.Sub, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityNewEmpty()
-        {
-            var td = new TestData();
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"sub\": { } }"), ref td), Is.True);
-                Assert.That(td!.Sub, Is.Not.Null);
-                Assert.That(td.Sub!.Code, Is.Null);
-                Assert.That(td.Sub.Text, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityExistingEmpty()
-        {
-            var td = new TestData { Sub = new SubData() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge<TestData>(BinaryData.FromString("{ \"sub\": { } }"), ref td), Is.False);
-                Assert.That(td!.Sub, Is.Not.Null);
-                Assert.That(td.Sub!.Code, Is.Null);
-                Assert.That(td.Sub.Text, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_SubEntityExistingChanged()
-        {
-            var td = new TestData { Sub = new SubData() };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"sub\": { \"code\": \"x\", \"text\": \"xxx\" } }"), ref td), Is.True);
-                Assert.That(td!.Sub, Is.Not.Null);
-                Assert.That(td.Sub!.Code, Is.EqualTo("x"));
-                Assert.That(td.Sub.Text, Is.EqualTo("xxx"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayMalformed()
-        {
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => new JsonMergePatch().Merge(BinaryData.FromString("{ \"values\": { } }"), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.Int32[]. Path: $.values | LineNumber: 0 | BytePositionInLine: 13."));
-        }
-
-        [Test]
-        public void Merge_Property_ArrayNull()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"values\": null }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayEmpty()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"values\": [] }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Not.Null);
-                Assert.That(td.Values!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayValues_NoChanges()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"values\": [ 1, 2, 3] }"), ref td), Is.False);
-                Assert.That(td!.Values, Is.Not.Null);
-                Assert.That(td.Values!, Has.Length.EqualTo(3));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_ArrayValues_Changes()
-        {
-            var td = new TestData { Values = new int[] { 1, 2, 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"values\": [ 3, 2, 1] }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Not.Null);
-                Assert.That(td.Values!, Has.Length.EqualTo(3));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Values[0], Is.EqualTo(3));
-                Assert.That(td.Values[1], Is.EqualTo(2));
-                Assert.That(td.Values[2], Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_NoKeys_ListNull()
-        {
-            var td = new TestData { NoKeys = new List<SubData> { new() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"nokeys\": null }"), ref td), Is.True);
-                Assert.That(td!.Values, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_NoKeys_ListEmpty()
-        {
-            var td = new TestData { NoKeys = new List<SubData> { new() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"nokeys\": [ ] }"), ref td), Is.True);
-                Assert.That(td!.NoKeys, Is.Not.Null);
-                Assert.That(td!.NoKeys!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_NoKeys_List()
-        {
-            var td = new TestData { NoKeys = new List<SubData> { new() } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"nokeys\": [ { \"code\": \"abc\", \"text\": \"xyz\" }, { }, null ] }"), ref td), Is.True);
-                Assert.That(td!.NoKeys, Is.Not.Null);
-                Assert.That(td.NoKeys!, Has.Count.EqualTo(3));
-                Assert.That(td.NoKeys![0], Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.NoKeys[0].Code, Is.EqualTo("abc"));
-                Assert.That(td.NoKeys[0].Text, Is.EqualTo("xyz"));
-                Assert.That(td.NoKeys[1], Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.NoKeys[1].Code, Is.Null);
-                Assert.That(td.NoKeys[1].Text, Is.Null);
-                Assert.That(td.NoKeys[2], Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_ListNull()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"keys\": null }"), ref td), Is.True);
-                Assert.That(td!.Keys, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_ListEmpty()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"keys\": [ ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_Null()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"keys\": [ null ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Has.Count.EqualTo(1));
-                Assert.That(td.Keys![0], Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_Replace()
-        {
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"keys\": [ { \"code\": \"abc\" }, { \"code\": \"uvw\", \"text\": \"xyz\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Keys[0].Code, Is.EqualTo("abc"));
-                Assert.That(td.Keys[0].Text, Is.EqualTo(null));
-                Assert.That(td.Keys[1].Code, Is.EqualTo("uvw"));
-                Assert.That(td.Keys[1].Text, Is.EqualTo("xyz"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_Keys_NoChanges()
-        {
-            // Note, although technically no changes, there is no means to verify without specific equality checking, so is seen as a change.
-            var td = new TestData { Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"keys\": [ { \"code\": \"abc\", \"text\": \"def\" } ] }"), ref td), Is.True);
-
-                Assert.That(td!.Keys, Is.Not.Null);
-                Assert.That(td.Keys!, Has.Count.EqualTo(1));
-            });
-            
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Keys[0].Code, Is.EqualTo("abc"));
-                Assert.That(td.Keys[0].Text, Is.EqualTo("def"));
-            });
-        }
-
-        // *** Dictionary<string, string> - DictionaryMergeApproach.Merge
-
-        [Test]
-        public void Merge_Property_DictMerge_Null()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"dict\": null }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_Empty()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                // Should result in no changes as no property (key) was provided.
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"dict\": {} }"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_NullValue()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" } } };
-
-            Assert.Multiple(() =>
-            {
-                // A key with a value of null indicates it should be removed.
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{ \"dict\": {\"k\":null} }"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Is.Empty);
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_DuplicateKeys_IntoNull()
-        {
-            var td = new TestData { };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_DuplicateKeys_IntoEmpty()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string>() };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(1));
-                Assert.That(td.Dict!["k"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_NoChange()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"v\",\"k1\":\"v1\"}}"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_ReOrder_NoChange()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict\":{\"k1\":\"v1\",\"k\":\"v\"}}"), ref td), Is.False);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("v"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_AddUpdateDelete()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"vx\",\"k2\":\"v2\",\"k1\":null}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("vx"));
-                Assert.That(td.Dict["k2"], Is.EqualTo("v2"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_DictMerge_AddUpdate()
-        {
-            var td = new TestData { Dict = new Dictionary<string, string> { { "k", "v" }, { "k1", "v1" } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict\":{\"k\":\"vx\",\"k2\":\"v2\"}}"), ref td), Is.True);
-                Assert.That(td!.Dict, Is.Not.Null);
-                Assert.That(td.Dict!, Has.Count.EqualTo(3));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict["k"], Is.EqualTo("vx"));
-                Assert.That(td.Dict["k1"], Is.EqualTo("v1"));
-                Assert.That(td.Dict["k2"], Is.EqualTo("v2"));
-            });
-        }
-
-        // ***
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_DuplicateKeys_IntoEmpty()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData>() };
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aa\",\"text\": \"aaa\"},\"a\":{\"code\": \"bb\",\"text\": \"bbb\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(1));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("bbb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_NoChange()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aa\",\"text\": \"aaa\"},\"b\":{\"code\": \"bb\",\"text\": \"bbb\"}}}"), ref td), Is.False);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["b"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["b"].Text, Is.EqualTo("bbb"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_AddUpdateDelete()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aaaa\"},\"c\":{\"code\": \"cc\",\"text\": \"ccc\"},\"b\":null}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(2));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aaaa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["c"].Code, Is.EqualTo("cc"));
-                Assert.That(td.Dict2["c"].Text, Is.EqualTo("ccc"));
-            });
-        }
-
-        [Test]
-        public void Merge_Property_KeyDict2Merge_AddUpdate()
-        {
-            var td = new TestData { Dict2 = new Dictionary<string, KeyData> { { "a", new KeyData { Code = "aa", Text = "aaa" } }, { "b", new KeyData { Code = "bb", Text = "bbb" } } } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(new JsonMergePatch().Merge(BinaryData.FromString("{\"dict2\":{\"a\":{\"code\": \"aaaa\"},\"c\":{\"code\": \"cc\",\"text\": \"ccc\"}}}"), ref td), Is.True);
-                Assert.That(td!.Dict2, Is.Not.Null);
-                Assert.That(td.Dict2!, Has.Count.EqualTo(3));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.Dict2["a"].Code, Is.EqualTo("aaaa"));
-                Assert.That(td.Dict2["a"].Text, Is.EqualTo("aaa"));
-                Assert.That(td.Dict2["b"].Code, Is.EqualTo("bb"));
-                Assert.That(td.Dict2["b"].Text, Is.EqualTo("bbb"));
-                Assert.That(td.Dict2["c"].Code, Is.EqualTo("cc"));
-                Assert.That(td.Dict2["c"].Text, Is.EqualTo("ccc"));
-            });
-        }
-
-        [Test]
-        public void Merge_RootSimple_NullString()
-        {
-            string? s = null;
-            var jmp = new JsonMergePatch();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref s), Is.False);
-                Assert.That(s, Is.EqualTo(null));
-            });
-
-            s = "x";
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref s), Is.True);
-                Assert.That(s, Is.EqualTo(null));
-            });
-
-            s = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("\"x\""), ref s), Is.True);
-                Assert.That(s, Is.EqualTo("x"));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("\"x\""), ref s), Is.False);
-                Assert.That(s, Is.EqualTo("x"));
-            });
-        }
-
-        [Test]
-        public void Merge_RootSimple_NullInt()
-        {
-            int? i = null;
-            var jmp = new JsonMergePatch();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref i), Is.False);
-                Assert.That(i, Is.EqualTo(null));
-            });
-
-            i = 88;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref i), Is.True);
-                Assert.That(i, Is.EqualTo(null));
-            });
-
-            i = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("88"), ref i), Is.True);
-                Assert.That(i, Is.EqualTo(88));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("88"), ref i), Is.False);
-                Assert.That(i, Is.EqualTo(88));
-            });
-        }
-
-        [Test]
-        public void Merge_RootSimple_Int()
-        {
-            int i = 0;
-            var jmp = new JsonMergePatch();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("0"), ref i), Is.False);
-                Assert.That(i, Is.EqualTo(0));
-
-                Assert.That(jmp.Merge(BinaryData.FromString("88"), ref i), Is.True);
-                Assert.That(i, Is.EqualTo(88));
-            });
-        }
-
-        [Test]
-        public void Merge_RootComplex_Null()
-        {
-            SubData? sd = null!;
-            var jmp = new JsonMergePatch();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref sd), Is.False);
-                Assert.That(sd, Is.Null);
-            });
-
-            sd = new SubData { Code = "X" };
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("null"), ref sd), Is.True);
-                Assert.That(sd, Is.Null);
-            });
-
-            sd = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"code\":\"x\"}"), ref sd), Is.True);
-                Assert.That(sd, Is.Not.Null);
-            });
-            Assert.That(sd!.Code, Is.EqualTo("x"));
-        }
-
-        [Test]
-        public void Merge_RootArray_Simple_Null()
-        {
-            var arr = Array.Empty<int>();
-            var jmp = new JsonMergePatch();
-            jmp.Merge(BinaryData.FromString("null"), ref arr);
-            Assert.That(arr, Is.EqualTo(null));
-
-            arr = new int[] { 1, 2 };
-            jmp.Merge(BinaryData.FromString("null"), ref arr);
-            Assert.That(arr, Is.EqualTo(null));
-
-            int[]? arr2 = null;
-            jmp.Merge(BinaryData.FromString("null"), ref arr2);
-            Assert.That(arr2, Is.EqualTo(null));
-
-            arr2 = new int[] { 1, 2 };
-            jmp.Merge(BinaryData.FromString("null"), ref arr2);
-            Assert.That(arr2, Is.EqualTo(null));
-        }
-
-        [Test]
-        public void Merge_RootArray_Simple()
-        {
-            var arr = Array.Empty<int>();
-            var jmp = new JsonMergePatch();
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("[1,2,3]"), ref arr), Is.True);
-                Assert.That(arr, Is.EqualTo(new int[] { 1, 2, 3 }));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("[1,2,3]"), ref arr), Is.False);
-                Assert.That(arr, Is.EqualTo(new int[] { 1, 2, 3 }));
-            });
-        }
-
-        [Test]
-        public void Merge_RootArray_Complex()
-        {
-            var arr = new SubData[] { new() { Code = "a", Text = "aa" }, new() { Code = "b", Text = "bb" } };
-            var jmp = new JsonMergePatch();
-
-            Assert.Multiple(() =>
-            {
-                // No equality checker so will appear as changed - is a replacement.
-                Assert.That(jmp.Merge(BinaryData.FromString("[{\"code\":\"a\",\"text\":\"aa\"},{\"code\":\"b\",\"text\":\"bb\"}]"), ref arr), Is.False);
-                Assert.That(arr!, Has.Length.EqualTo(2));
-
-                // Replaced.
-                Assert.That(jmp.Merge(BinaryData.FromString("[{\"code\":\"c\",\"text\":\"cc\"},{\"code\":\"b\",\"text\":\"bb\"}]"), ref arr), Is.True);
-                Assert.That(arr!, Has.Length.EqualTo(2));
-                Assert.That(arr![0].Code, Is.EqualTo("c"));
-            });
-        }
-
-        [Test]
-        public void Merge_RootDictionary_Simple()
-        {
-            var dict = new Dictionary<string, int>();
-            var jmp = new JsonMergePatch();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":1}"), ref dict), Is.True);
-                Assert.That(dict, Is.EqualTo(new Dictionary<string, int> { { "x", 1 } }));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":1}"), ref dict), Is.False);
-                Assert.That(dict, Is.EqualTo(new Dictionary<string, int> { { "x", 1 } }));
-            });
-        }
-
-        [Test]
-        public void Merge_RootDictionary_Complex()
-        {
-            var dict = new Dictionary<string, SubData>();
-            var jmp = new JsonMergePatch();
-
-            Assert.That(jmp.Merge(BinaryData.FromString("{\"x\":{\"code\":\"xx\"},\"y\":{\"code\":\"yy\",\"text\":\"YY\"}}"), ref dict), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(dict, Is.Not.Null);
-                Assert.That(dict!, Has.Count.EqualTo(2));
-                Assert.That(dict!["x"].Code, Is.EqualTo("xx"));
-                Assert.That(dict!["x"].Text, Is.EqualTo(null));
-                Assert.That(dict!["y"].Code, Is.EqualTo("yy"));
-                Assert.That(dict!["y"].Text, Is.EqualTo("YY"));
-            });
-
-            Assert.That(jmp.Merge(BinaryData.FromString("{\"y\":{\"code\":\"yyy\"},\"x\":{\"code\":\"xxx\"}}"), ref dict), Is.True);
-            Assert.Multiple(() =>
-            {
-                Assert.That(dict, Is.Not.Null);
-                Assert.That(dict!, Has.Count.EqualTo(2));
-                Assert.That(dict!["x"].Code, Is.EqualTo("xxx"));
-                Assert.That(dict!["x"].Text, Is.EqualTo(null));
-                Assert.That(dict!["y"].Code, Is.EqualTo("yyy"));
-                Assert.That(dict!["y"].Text, Is.EqualTo("YY"));
-            });
-        }
-
-        [Test]
-        public void Merge_XLoadTest_1_1000()
-        {
-            var jmp = new JsonMergePatch();
-            for (int i = 0; i < 1000; i++)
-            {
-                var td = _testData;
-                jmp.Merge(BinaryData.FromString(_text), ref td);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_2_1000()
-        {
-            var jmp = new JsonMergePatch();
-            for (int i = 0; i < 1000; i++)
-            {
-                var td = _testData;
-                jmp.Merge(BinaryData.FromString(_text), ref td);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_1000_1_NoChangeCheck()
-        {
-            var jmp = new JsonMergePatch();
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = jmp.Merge(_jtext, _jtestdata);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_1000_1_WithChangeCheck()
-        {
-            var jmp = new JsonMergePatch();
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = jmp.TryMerge(_jtext, _jtestdata, out _);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_1000_2_NoChangeCheck()
-        {
-            var jmp = new JsonMergePatch();
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = jmp.Merge(_jtext, _jtestdata);
-            }
-        }
-
-        [Test]
-        public void Merge_XLoadTest_1000_2_WithChangeCheck()
-        {
-            var jmp = new JsonMergePatch();
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = jmp.TryMerge(_jtext, _jtestdata, out _);
-            }
-        }
-
-        [Test]
-        public async Task Merge_XLoadTest_WithRead_10000()
-        {
-            var jmp = new JsonMergePatch();
-
-            for (int i = 0; i < 10000; i++)
-            {
-                var td = new TestData { Values = new int[] { 1, 2, 3 }, Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } }, Dict = new Dictionary<string, string>() { { "a", "b" } }, Dict2 = new Dictionary<string, KeyData> { { "x", new KeyData { Code = "xx" } } } };
-                _ = await jmp.MergeWithResultAsync<TestData>(new BinaryData(JsonMergePatchTest._text), async (v, _) => await Task.FromResult(v).ConfigureAwait(false));
-            }
-        }
-
-        [Test]
-        public void MergeInvalidMergeValueForType()
-        {
-            var jmp = new JsonMergePatch();
-            var td = new TestData();
-            var ex = Assert.Throws<JsonMergePatchException>(() => jmp.Merge<TestData>(BinaryData.FromString("""{ "id": { "value": "123" }}"""), ref td));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to System.Guid. Path: $.id | LineNumber: 0 | BytePositionInLine: 9."));
-        }
-
-        internal const string _text = "{ \"id\": \"13512759-4f50-e911-b35c-bc83850db74d\", \"name\": \"Barry\", \"isValid\": true, \"date\": \"2018-12-31\", \"count\": \"12\", \"amount\": 132.58, \"dict\": {\"k\":\"v\",\"k1\":\"v1\"}, "
-                + "\"values\": [ 1, 2, 4], \"sub\": { \"code\": \"abc\", \"text\": \"xyz\" }, \"nokeys\": [ { \"code\": \"abc\", \"text\": \"xyz\" }, null, { } ], "
-                + "\"keys\": [ { \"code\": \"abc\", \"text\": \"xyz\" }, { }, null ],\"dict2\":{\"a\":{\"code\": \"aaaa\"},\"c\":{\"code\": \"cc\",\"text\": \"ccc\"}}}";
-
-        internal static readonly TestData _testData = new TestData { Values = new int[] { 1, 2, 3 }, Keys = new List<KeyData> { new() { Code = "abc", Text = "def" } }, Dict = new Dictionary<string, string>() { { "a", "b" } }, Dict2 = new Dictionary<string, KeyData> { { "x", new KeyData { Code = "xx" } } } };
-
-        internal static readonly JsonElement _jtext = JsonDocument.Parse(_text).RootElement;
-        internal static readonly JsonElement _jtestdata = JsonDocument.Parse(JsonSerializer.Serialize(_testData)).RootElement;
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Localization/LTextTest.cs b/tests/CoreEx.Test/Framework/Localization/LTextTest.cs
deleted file mode 100644
index fb757223..00000000
--- a/tests/CoreEx.Test/Framework/Localization/LTextTest.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using CoreEx.Localization;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Localization
-{
-    [TestFixture]
-    public class LTextTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => TextProvider.SetTextProvider(new NullTextProvider());
-
-        [Test]
-        public void Null_ToString()
-        {
-            var l = new LText();
-            string t = l;
-            Assert.Multiple(() =>
-            {
-                Assert.That(t, Is.EqualTo(null));
-                Assert.That(l.ToString(), Is.EqualTo(null));
-            });
-        }
-
-        [Test]
-        public void Key_ToString()
-        {
-            var l = new LText("key");
-            string t = l;
-            Assert.Multiple(() =>
-            {
-                Assert.That(t, Is.EqualTo("key"));
-                Assert.That(l.ToString(), Is.EqualTo("key"));
-            });
-        }
-
-        [Test]
-        public void NumericKey_ToString()
-        {
-            var l = new LText(451);
-            string t = l;
-            Assert.Multiple(() =>
-            {
-                Assert.That(t, Is.EqualTo("000451"));
-                Assert.That(l.ToString(), Is.EqualTo("000451"));
-            });
-        }
-
-        [Test]
-        public void FallBack_ToString()
-        {
-            var l = new LText("key", "fallback");
-            string t = l;
-            Assert.Multiple(() =>
-            {
-                Assert.That(t, Is.EqualTo("fallback"));
-                Assert.That(l.ToString(), Is.EqualTo("fallback"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Mapping/Converters/ConverterTest.cs b/tests/CoreEx.Test/Framework/Mapping/Converters/ConverterTest.cs
deleted file mode 100644
index a17422c6..00000000
--- a/tests/CoreEx.Test/Framework/Mapping/Converters/ConverterTest.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Mapping.Converters
-{
-    [TestFixture]
-    public class ConverterTest
-    {
-        [Test]
-        public void Convert()
-        {
-            var converter = CoreEx.Mapping.Converters.Converter.Create<string, int>(s => int.Parse(s), i => i.ToString());
-            Assert.Multiple(() =>
-            {
-                Assert.That(converter.ToDestination.Convert("123"), Is.EqualTo(123));
-                Assert.That(converter.ToSource.Convert(123), Is.EqualTo("123"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Mapping/Converters/DateTimeToStringConverterTest.cs b/tests/CoreEx.Test/Framework/Mapping/Converters/DateTimeToStringConverterTest.cs
deleted file mode 100644
index 9559079a..00000000
--- a/tests/CoreEx.Test/Framework/Mapping/Converters/DateTimeToStringConverterTest.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using CoreEx.Mapping.Converters;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Mapping.Converters
-{
-    [TestFixture]
-    public class DateTimeToStringConverterTest
-    {
-        [Test]
-        public void ConvertToDestination()
-        {
-            var dt = new DateTime(2022, 11, 28, 13, 09, 42, 987, DateTimeKind.Unspecified);
-            var val = new DateTimeToStringConverter("yyyy-MMM-dd").ToDestination.Convert(dt);
-            Assert.That(val, Is.EqualTo("2022-Nov-28"));
-        }
-
-        [Test]
-        public void ConvertToSource()
-        {
-            var dt = new DateTimeToStringConverter("yyyy-MMM-dd").ToSource.Convert("2022-Nov-28");
-            Assert.That(dt, Is.EqualTo(new DateTime(2022, 11, 28, 0, 0, 0, 0, DateTimeKind.Unspecified)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Mapping/Converters/EncodedStringToDateTimeConverterTest.cs b/tests/CoreEx.Test/Framework/Mapping/Converters/EncodedStringToDateTimeConverterTest.cs
deleted file mode 100644
index 812866f8..00000000
--- a/tests/CoreEx.Test/Framework/Mapping/Converters/EncodedStringToDateTimeConverterTest.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using CoreEx.Mapping.Converters;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Mapping.Converters
-{
-    [TestFixture]
-    public class EncodedStringToDateTimeConverterTest
-    {
-        [Test]
-        public void ConvertToSource()
-        {
-            var dt = new DateTime(2022, 11, 28, 13, 09, 42, 987, DateTimeKind.Utc);
-            var val = EncodedStringToDateTimeConverter.Default.ToSource.Convert(dt);
-            Assert.That(val, Is.EqualTo("sImk0EHR2kg="));
-        }
-
-        [Test]
-        public void ConvertToDestination()
-        {
-            var dt = EncodedStringToDateTimeConverter.Default.ToDestination.Convert("sImk0EHR2kg=");
-            Assert.That(dt, Is.EqualTo(new DateTime(2022, 11, 28, 13, 09, 42, 987, DateTimeKind.Utc)));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Mapping/Converters/EncodedStringToUInt32ConverterTest.cs b/tests/CoreEx.Test/Framework/Mapping/Converters/EncodedStringToUInt32ConverterTest.cs
deleted file mode 100644
index 072f9b9b..00000000
--- a/tests/CoreEx.Test/Framework/Mapping/Converters/EncodedStringToUInt32ConverterTest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using CoreEx.Mapping.Converters;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Mapping.Converters
-{
-    [TestFixture]
-    public class EncodedStringToUInt32ConverterTest
-    {
-        [Test]
-        public void ConvertToSource()
-        {
-            uint i = 4020;
-            var val = EncodedStringToUInt32Converter.Default.ToSource.Convert(i);
-            Assert.That(val, Is.EqualTo("tA8AAA=="));
-        }
-
-        [Test]
-        public void ConvertToDestination()
-        {
-            var i = EncodedStringToUInt32Converter.Default.ToDestination.Convert("tA8AAA==");
-            Assert.That(i, Is.EqualTo(4020));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Mapping/Converters/TypeToStringConverterTest.cs b/tests/CoreEx.Test/Framework/Mapping/Converters/TypeToStringConverterTest.cs
deleted file mode 100644
index 3e697acd..00000000
--- a/tests/CoreEx.Test/Framework/Mapping/Converters/TypeToStringConverterTest.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using CoreEx.Mapping.Converters;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CoreEx.Test.Framework.Mapping.Converters
-{
-    [TestFixture]
-    public class TypeToStringConverterTest
-    {
-        private const string GuidString = "382c74c3-721d-4f34-80e5-57657b6cbc27";
-        private readonly Guid GuidValue = new(GuidString);
-
-        [Test]
-        public void Convert()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(TypeToStringConverter<Guid>.Default.ToDestination.Convert(GuidValue), Is.EqualTo(GuidString));
-                Assert.That(TypeToStringConverter<Guid>.Default.ToDestination.Convert(null!), Is.EqualTo(Guid.Empty.ToString()));
-                Assert.That(TypeToStringConverter<Guid?>.Default.ToDestination.Convert(GuidValue), Is.EqualTo(GuidString));
-                Assert.That(TypeToStringConverter<Guid?>.Default.ToDestination.Convert(null), Is.Null);
-
-                Assert.That(TypeToStringConverter<Guid>.Default.ToSource.Convert(GuidString), Is.EqualTo(GuidValue));
-                Assert.That(TypeToStringConverter<Guid>.Default.ToSource.Convert(null), Is.EqualTo(Guid.Empty));
-                Assert.That(TypeToStringConverter<Guid?>.Default.ToSource.Convert(GuidString), Is.EqualTo(GuidValue));
-                Assert.That(TypeToStringConverter<Guid?>.Default.ToSource.Convert(null), Is.Null);
-
-                Assert.That(TypeToStringConverter<int>.Default.ToSource.Convert("123"), Is.EqualTo(123));
-
-                Assert.That(TypeToStringConverter<TestOption>.Default.ToDestination.Convert(TestOption.Abc), Is.EqualTo("Abc"));
-                Assert.That(TypeToStringConverter<TestOption>.Default.ToSource.Convert("Abc"), Is.EqualTo(TestOption.Abc));
-                Assert.That(TypeToStringConverter<TestOption>.Default.ToSource.Convert(null), Is.EqualTo(TestOption.None));
-            });
-        }
-
-        [Test]
-        public void Convert_StringToDateTime()
-        {
-            var now = DateTime.Now;
-            Assert.That(TypeToStringConverter<DateTime>.Default.ToSource.Convert(now.ToString("O")), Is.EqualTo(now));
-        }
-
-        public enum TestOption
-        {
-            None = 0,
-            Abc = 1
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Mapping/MapperTest.cs b/tests/CoreEx.Test/Framework/Mapping/MapperTest.cs
deleted file mode 100644
index 9203ec9f..00000000
--- a/tests/CoreEx.Test/Framework/Mapping/MapperTest.cs
+++ /dev/null
@@ -1,1060 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.Validation.Clauses;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-
-namespace CoreEx.Test.Framework.Mapping
-{
-    [TestFixture]
-    public class MapperTest
-    {
-        [Test]
-        public void Mapping()
-        {
-            var pm = new Mapper<PersonA, PersonB>()
-                .Map((s, d) => d.ID = s.Id)
-                .Map((s, d) => d.Text = s.Name);
-
-            var m = new Mapper();
-            m.Register(pm);
-
-            var p2 = m.Map<PersonB>(new PersonA { Id = 1, Name = "Bob" });
-            Assert.Multiple(() =>
-            {
-                Assert.That(p2.ID, Is.EqualTo(1));
-                Assert.That(p2.Text, Is.EqualTo("Bob"));
-            });
-        }
-
-        [Test]
-        public void Mapping_Collection()
-        {
-            var pm = new Mapper<PersonA, PersonB>()
-                .Map((s, d) => d.ID = s.Id)
-                .Map((s, d) => d.Text = s.Name);
-
-            var pmc = new CollectionMapper<PersonACollection, PersonA, PersonBCollection, PersonB>();
-
-            var m = new Mapper();
-            m.Register(pm);
-            m.Register(pmc);
-
-            var pac = new PersonACollection() { new PersonA { Id = 1, Name = "Bob" } };
-            var pbc = m.Map<PersonBCollection>(pac);
-
-            Assert.That(pbc, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(pbc[0].ID, Is.EqualTo(1));
-                Assert.That(pbc[0].Text, Is.EqualTo("Bob"));
-            });
-        }
-
-        [Test]
-        public void Mapping_Collection_Auto()
-        {
-            var pm = new Mapper<PersonA, PersonB>()
-                .Map((s, d) => d.ID = s.Id)
-                .Map((s, d) => d.Text = s.Name);
-
-            var m = new Mapper();
-            m.Register(pm);
-
-            var pac = new PersonACollection() { new PersonA { Id = 1, Name = "Bob" } };
-            var pbc = m.Map<PersonBCollection>(pac);
-
-            Assert.That(pbc, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(pbc[0].ID, Is.EqualTo(1));
-                Assert.That(pbc[0].Text, Is.EqualTo("Bob"));
-            });
-        }
-
-        [Test]
-        public void Mapping_Collection_Auto_Into_Existing()
-        {
-            var pm = new Mapper<PersonA, PersonB>()
-                .Map((s, d) => d.ID = s.Id)
-                .Map((s, d) => d.Text = s.Name);
-
-            var m = new Mapper();
-            m.Register(pm);
-
-            var pac = new PersonACollection() { new PersonA { Id = 1, Name = "Bob" } };
-            var pbc = new PersonBCollection() { new PersonB { ID = 2, Text = "Carly" } };
-            var pbc2 = m.Map(pac, pbc);
-
-            Assert.That(pbc, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(pbc[0].ID, Is.EqualTo(1));
-                Assert.That(pbc[0].Text, Is.EqualTo("Bob"));
-
-                Assert.That(pbc2, Has.Count.EqualTo(1));
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(pbc2[0].ID, Is.EqualTo(1));
-                Assert.That(pbc2[0].Text, Is.EqualTo("Bob"));
-            });
-        }
-
-        [Test]
-        public void Mapping_Collection_Auto_Empty_To_Null()
-        {
-            var pm = new Mapper<PersonA, PersonB>()
-                .Map((s, d) => d.ID = s.Id)
-                .Map((s, d) => d.Text = s.Name);
-
-            var m = new Mapper();
-            m.Register(pm);
-
-            var pac = new PersonACollection();
-            var pbc = new PersonBCollection() { new PersonB { ID = 2, Text = "Carly" } };
-            var pbc2 = m.Map(pac, pbc);
-
-            Assert.That(pbc2, Is.Null);
-        }
-
-        [Test]
-        public void ServicesMapper()
-        {
-            var sc = new ServiceCollection();
-            sc.AddMappers<MapperTest>();
-        }
-
-        [Test]
-        public void Mapping_Flatten()
-        {
-            var mc = new Mapper<Contact, Model>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Flatten(s => s.Address);
-
-            var ma = new Mapper<Address, Model>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-
-            var c = new Contact { Id = 88, Name = "Brian", Address = new Address { Street = "Main", City = "Wellington" } };
-            var r = m.Map<Model>(c);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(88));
-                Assert.That(r.Name, Is.EqualTo("Brian"));
-                Assert.That(r.Street, Is.EqualTo("Main"));
-                Assert.That(r.City, Is.EqualTo("Wellington"));
-            });
-
-            // Try with Address of null - map into should null-ify!
-            c.Address = null;
-            m.Map(c, r);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(88));
-                Assert.That(r.Name, Is.EqualTo("Brian"));
-                Assert.That(r.Street, Is.Null);
-                Assert.That(r.City, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Flatten_DoubleNest()
-        {
-            var mc = new Mapper<Contact, Model>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Flatten(s => s.Address);
-
-            var ma = new Mapper<Address, Model>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City)
-                .Flatten(s => s.Other);
-
-            var mo = new Mapper<Other, Model>()
-                .Map((s, d) => d.Other = s.Value);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-            m.Register(mo);
-
-            var c = new Contact { Id = 88, Name = "Brian", Address = new Address { Street = "Main", City = "Wellington" } };
-            var r = m.Map<Model>(c);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(88));
-                Assert.That(r.Name, Is.EqualTo("Brian"));
-                Assert.That(r.Street, Is.EqualTo("Main"));
-                Assert.That(r.City, Is.EqualTo("Wellington"));
-                Assert.That(r.Other, Is.Null);
-            });
-
-            c = new Contact { Id = 88, Name = "Brian", Address = new Address { Street = "Main", City = "Wellington", Other = new Other { Value = "Blah" } } };
-            r = m.Map<Model>(c);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(88));
-                Assert.That(r.Name, Is.EqualTo("Brian"));
-                Assert.That(r.Street, Is.EqualTo("Main"));
-                Assert.That(r.City, Is.EqualTo("Wellington"));
-                Assert.That(r.Other, Is.EqualTo("Blah"));
-            });
-        }
-
-        [Test]
-        public void Mapping_Flatten_DoubleNest_Perf()
-        {
-            var mc = new Mapper<Contact, Model>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Flatten(s => s.Address);
-
-            var ma = new Mapper<Address, Model>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City)
-                .Flatten(s => s.Other);
-
-            var mo = new Mapper<Other, Model>()
-                .Map((s, d) => d.Other = s.Value);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-            m.Register(mo);
-
-            var c = new Contact { Id = 88, Name = "Brian", Address = new Address { Street = "Main", City = "Wellington" } };
-            for (int i = 0; i < 10000; i++)
-            {
-                _ = m.Map<Model>(c);
-            }
-        }
-
-        [Test]
-        public void Mapping_Flatten_Nullable_NonNullable_Inherit()
-        {
-            var m = new Mapper();
-            m.Register(new EmployeeMapper());
-            m.Register(new TerminationMapper());
-
-            var e = new Employee { Name = "Tim" };
-            var em = m.Map<EmployeeModel>(e);
-
-            Assert.That(em, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(em.Name, Is.EqualTo("Tim"));
-                Assert.That(em.Reason, Is.Null);
-                Assert.That(em.Date, Is.Null);
-            });
-
-            em = new EmployeeModel { Name = "Tom", Reason = "Because", Date = DateTime.UtcNow };
-            em = m.Map(e, em);
-
-            Assert.That(em, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(em.Name, Is.EqualTo("Tim"));
-                Assert.That(em.Reason, Is.Null);
-                Assert.That(em.Date, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Flatten_Nullable_NonNullable_Fluent()
-        {
-            var me = new Mapper<Employee, EmployeeModel>()
-                .Map((s, d) => d.Name = s.Name)
-                .Flatten(s => s.Termination);
-
-            var mt = new Mapper<Termination, EmployeeModel>()
-                .Map((s, d) => d.Reason = s.Reason)
-                .Map((s, d) => d.Date = s.Date)
-                .InitializeDestination(d =>
-                {
-                    d.Reason = null;
-                    d.Date = null;
-                    return true;
-                });
-
-            var m = new Mapper();
-            m.Register(me);
-            m.Register(mt);
-
-            var e = new Employee { Name = "Tim" };
-            var em = m.Map<EmployeeModel>(e);
-
-            Assert.That(em, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(em.Name, Is.EqualTo("Tim"));
-                Assert.That(em.Reason, Is.Null);
-                Assert.That(em.Date, Is.Null);
-            });
-
-            em = new EmployeeModel { Name = "Tom", Reason = "Because", Date = DateTime.UtcNow };
-            em = m.Map(e, em);
-
-            Assert.That(em, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(em.Name, Is.EqualTo("Tim"));
-                Assert.That(em.Reason, Is.Null);
-                Assert.That(em.Date, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Flatten_Nullable_NonNullable_InLine()
-        {
-            var me = new Mapper<Employee, EmployeeModel>()
-                .Map((s, d) => d.Name = s.Name, isSourceInitial: s => s.Name == default, initializeDestination: d => d.Name = default)
-                .Flatten(s => s.Termination, isSourceInitial: s => s.Termination == default);
-
-            var mt = new Mapper<Termination, EmployeeModel>()
-                .Map((s, d) => d.Reason = s.Reason, isSourceInitial: s => s.Reason == default, initializeDestination: d => d.Reason = default)
-                .Map((s, d) => d.Date = s.Date, isSourceInitial: s => s.Date == default, initializeDestination: d => d.Date = default);
-
-            var m = new Mapper();
-            m.Register(me);
-            m.Register(mt);
-
-            var e = new Employee { Name = "Tim" };
-            var em = m.Map<EmployeeModel>(e);
-
-            Assert.That(em, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(em.Name, Is.EqualTo("Tim"));
-                Assert.That(em.Reason, Is.Null);
-                Assert.That(em.Date, Is.Null);
-            });
-
-            em = new EmployeeModel { Name = "Tom", Reason = "Because", Date = DateTime.UtcNow };
-            em = m.Map(e, em);
-
-            Assert.That(em, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(em.Name, Is.EqualTo("Tim"));
-                Assert.That(em.Reason, Is.Null);
-                Assert.That(em.Date, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Expand_Condition()
-        {
-            var mc = new Mapper<Model, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Expand<Address>((d, v) => d.Address = v, (s, d) => d.Address != null || !(s.Street is null && s.City is null));
-
-            var ma = new Mapper<Model, Address>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-
-            var r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington" };
-            var c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-            });
-
-            // Try with all properties of Address are default - should not touch as condition not true.
-            r.Street = null;
-            r.City = null;
-            c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Expand_No_Condition()
-        {
-            var mc = new Mapper<Model, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Expand<Address>((d, v) => d.Address = v);
-
-            var ma = new Mapper<Model, Address>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-
-            var r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington" };
-            var c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-            });
-
-            // Try with all properties of Address are default - should not touch as condition not true.
-            r.Street = null;
-            r.City = null;
-            c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.Null);
-                Assert.That(c.Address!.City, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Expand_No_Condition_IsInitializedCheck()
-        {
-            var mc = new Mapper<Model, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Expand<Address>((d, v) => d.Address = v, initializeDestination: d => d.Address = null);
-
-            var ma = new Mapper<Model, Address>()
-                .Map((s, d) => d.Street = s.Street, isSourceInitial: s => s.Street == default)
-                .Map((s, d) => d.City = s.City, isSourceInitial: s => s.City == default);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-
-            var r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington" };
-            var c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-            });
-
-            // Try with all properties of Address are default - should nullify as all are initial.
-            r.Street = null;
-            r.City = null;
-            c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Expand_DoubleNest()
-        {
-            var mc = new Mapper<Model, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Expand<Address>((d, v) => d.Address = v, (s, d) => d.Address != null || !(s.Street is null && s.City is null));
-
-            var ma = new Mapper<Model, Address>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City)
-                .Expand<Other>((d, v) => d.Other = v, (s, d) => !(s.Other == default));
-
-            var mo = new Mapper<Model, Other>()
-                .Map((s, d) => d.Value = s.Other);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-            m.Register(mo);
-
-            // Other won't expand as no value specified.
-            var r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington" };
-            var c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-                Assert.That(c.Address!.Other, Is.Null);
-            });
-
-            // Other expands as it now has a value.
-            r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington", Other = "Blah" };
-            c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-                Assert.That(c.Address!.Other, Is.Not.Null);
-            });
-            Assert.That(c.Address!.Other!.Value, Is.EqualTo("Blah"));
-
-            // Other will not expand as the Address is not specified; data must flow along expand branch.
-            r = new Model { Id = 88, Name = "Brian", Street = null, City = null, Other = "Blah" };
-            c = m.Map<Contact>(r);
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Mapping_Expand_DoubleNest_Perf()
-        {
-            var mc = new Mapper<Model, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Expand<Address>((d, v) => d.Address = v, (s, d) => d.Address != null || !(s.Street is null && s.City is null));
-
-            var ma = new Mapper<Model, Address>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City)
-                .Expand<Other>((d, v) => d.Other = v, (s, d) => !(s.Other == default));
-
-            var mo = new Mapper<Model, Other>()
-                .Map((s, d) => d.Value = s.Other);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-            m.Register(mo);
-
-            // Other won't expand as no value specified.
-            var r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington" };
-            for (int i = 0; i < 10000; i++)
-            {
-                _ = m.Map<Contact>(r);
-            }
-        }
-
-        [Test]
-        public void Mapping_Expand_DoubleNext2()
-        {
-            var mc = new Mapper<Model, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Expand<Address>((d, v) => d.Address = v, (s, d) => !(s.Street is null && s.City is null && s.Other is null));
-
-            var ma = new Mapper<Model, Address>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City)
-                .Expand<Other>((d, v) => d.Other = v, (s, d) => !(s.Other == default));
-
-            var mo = new Mapper<Model, Other>()
-                .Map((s, d) => d.Value = s.Other);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-            m.Register(mo);
-
-            // Other won't expand as no value specified.
-            var r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington" };
-            var c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-                Assert.That(c.Address!.Other, Is.Null);
-            });
-
-            // Other expands as it now has a value.
-            r = new Model { Id = 88, Name = "Brian", Street = "Main", City = "Wellington", Other = "Blah" };
-            c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-                Assert.That(c.Address!.Other, Is.Not.Null);
-            });
-            Assert.That(c.Address!.Other!.Value, Is.EqualTo("Blah"));
-
-            // Other *will* expand as the Address has the Other in the condition.
-            r = new Model { Id = 88, Name = "Brian", Street = null, City = null, Other = "Blah" };
-            c = m.Map<Contact>(r);
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.Null);
-                Assert.That(c.Address!.City, Is.Null);
-                Assert.That(c.Address!.Other, Is.Not.Null);
-            });
-            Assert.That(c.Address!.Other!.Value, Is.EqualTo("Blah"));
-        }
-
-        [Test]
-        public void Test_Class_Property()
-        {
-            var mc = new Mapper<Contact, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Map((o, s, d) => d.Address = o.Map(s.Address, d.Address));
-
-            var ma = new Mapper<Address, Address>()
-                .Map((s, d) => d.Street = s.Street)
-                .Map((s, d) => d.City = s.City);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(ma);
-
-            var r = new Contact { Id = 88, Name = "Brian", Address = new Address { Street = "Main", City = "Wellington" } };
-            var c = m.Map<Contact>(r);
-
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Address!.Street, Is.EqualTo("Main"));
-                Assert.That(c.Address!.City, Is.EqualTo("Wellington"));
-                Assert.That(c.Address!.Other, Is.Null);
-            });
-
-            r = new Contact { Id = 88, Name = "Brian", Address = null };
-            c = m.Map<Contact>(r);
-            Assert.That(c, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c.Id, Is.EqualTo(88));
-                Assert.That(c.Name, Is.EqualTo("Brian"));
-                Assert.That(c.Address, Is.Null);
-            });
-        }
-
-        [Test]
-        public void ChangeLog_OperationType()
-        {
-            var m = new Mapper();
-            var cl = new ChangeLog();
-            ChangeLog.PrepareCreated((IChangeLogAudit)cl);
-            ChangeLog.PrepareUpdated((IChangeLogAudit)cl);
-
-            var cl2 = m.Map<ChangeLog>(cl, OperationTypes.Create);
-            Assert.That(cl2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(cl2.CreatedBy, Is.Not.Null);
-                Assert.That(cl2.CreatedDate, Is.Not.Null);
-                Assert.That(cl2.UpdatedBy, Is.Null);
-                Assert.That(cl2.UpdatedDate, Is.Null);
-            });
-
-            cl2 = m.Map<ChangeLog>(cl, OperationTypes.Update);
-            Assert.That(cl2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(cl2.CreatedBy, Is.Null);
-                Assert.That(cl2.CreatedDate, Is.Null);
-                Assert.That(cl2.UpdatedBy, Is.Not.Null);
-                Assert.That(cl2.UpdatedDate, Is.Not.Null);
-            });
-        }
-
-        [Test]
-        public void Contact_ChangeLog_OperationType()
-        {
-            var mc = new Mapper<Contact, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Map((o, s, d) => d.ChangeLog = o.Map(s.ChangeLog, d.ChangeLog));
-
-            var m = new Mapper();
-            m.Register(mc);
-
-            var cl = new ChangeLog();
-            ChangeLog.PrepareCreated((IChangeLogAudit)cl);
-            ChangeLog.PrepareUpdated((IChangeLogAudit)cl);
-
-            var c = new Contact { Id = 88, Name = "Dave", ChangeLog = cl };
-            var c2 = m.Map<Contact>(c, OperationTypes.Create);
-
-            Assert.That(c2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(c2.Id, Is.EqualTo(88));
-                Assert.That(c2.Name, Is.EqualTo("Dave"));
-                Assert.That(c2.ChangeLog, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(c2.ChangeLog!.CreatedBy, Is.Not.Null);
-                Assert.That(c2.ChangeLog.CreatedDate, Is.Not.Null);
-                Assert.That(c2.ChangeLog.UpdatedBy, Is.Null);
-                Assert.That(c2.ChangeLog.UpdatedDate, Is.Null);
-            });
-        }
-
-        [Test]
-        public void Register_WithBase()
-        {
-            var mc = new Mapper<Contact, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Map((o, s, d) => d.ChangeLog = o.Map(s.ChangeLog, d.ChangeLog));
-
-            var mce = new Mapper<ContactDetail, ContactDetail>()
-                .Map((s, d) => d.ExtraDetail = s.ExtraDetail)
-                .Base(mc);
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(mce);
-
-            var cd = new ContactDetail { Id = 88, Name = "Dave", ExtraDetail = "read all about it" };
-            var cd2 = m.Map<ContactDetail>(cd);
-
-            Assert.That(cd2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(cd2.Id, Is.EqualTo(88));
-                Assert.That(cd2.Name, Is.EqualTo("Dave"));
-                Assert.That(cd2.ExtraDetail, Is.EqualTo("read all about it"));
-            });
-        }
-
-        [Test]
-        public void Register_WithBase2()
-        {
-            var mc = new Mapper<Contact, Contact>()
-                .Map((s, d) => d.Id = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Map((o, s, d) => d.ChangeLog = o.Map(s.ChangeLog, d.ChangeLog));
-
-            var mce = new Mapper<ContactDetail, ContactDetail>()
-                .Map((s, d) => d.ExtraDetail = s.ExtraDetail)
-                .Base<Contact, Contact>();
-
-            var m = new Mapper();
-            m.Register(mc);
-            m.Register(mce);
-
-            var cd = new ContactDetail { Id = 88, Name = "Dave", ExtraDetail = "read all about it" };
-            var cd2 = m.Map<ContactDetail>(cd);
-
-            Assert.That(cd2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(cd2.Id, Is.EqualTo(88));
-                Assert.That(cd2.Name, Is.EqualTo("Dave"));
-                Assert.That(cd2.ExtraDetail, Is.EqualTo("read all about it"));
-            });
-        }
-
-        [Test]
-        public void Register_WithBase3()
-        {
-            var mce = new Mapper<ContactDetail, ContactDetail>()
-                .Map((s, d) => d.ExtraDetail = s.ExtraDetail)
-                .Base<ContactMapper>();
-
-            var m = new Mapper();
-            m.Register(new ContactMapper());
-            m.Register(mce);
-
-            var cd = new ContactDetail { Id = 88, Name = "Dave", ExtraDetail = "read all about it" };
-            var cd2 = m.Map<ContactDetail>(cd);
-
-            Assert.That(cd2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(cd2.Id, Is.EqualTo(88));
-                Assert.That(cd2.Name, Is.EqualTo("Dave"));
-                Assert.That(cd2.ExtraDetail, Is.EqualTo("read all about it"));
-            });
-        }
-
-        [Test]
-        public void CustomMapper()
-        {
-            var m = new Mapper<PersonA, PersonB>((s, d, t) =>
-            {
-                d ??= new PersonB();
-                Mapper.WhenCreate(t, () => d!.ID = s?.Id ?? 0);
-                return d;
-            });
-
-            var d = m.Map(new PersonA { Id = 88, Name = "blah" }, null, OperationTypes.Create);
-            Assert.That(d!.ID, Is.EqualTo(88));
-
-            d = m.Map(new PersonA { Id = 88, Name = "blah" }, null, OperationTypes.Update);
-            Assert.That(d!.ID, Is.EqualTo(0));
-        }
-
-        [Test]
-        public void BidirectionalMapper()
-        {
-            var bm = new BidirectionalMapper<PersonA, PersonB>((s, d, _) =>
-            {
-                d ??= new PersonB();
-                d.ID = s?.Id ?? 0;
-                return d;
-            }, (s, d, _) =>
-            {
-                d ??= new PersonA();
-                d.Id = s?.ID ?? 0;
-                return d;
-            });
-
-            var pa = new PersonA { Id = 99, Name = "blah" };
-            var pb = bm.Map(pa);
-            var pa2 = bm.Map(pb);
-            Assert.That(pa2.Id, Is.EqualTo(99));
-
-            var m = new Mapper();
-            m.Register(bm);
-
-            pa = new PersonA { Id = 88, Name = "blah" };
-            pb = m.Map<PersonB>(pa);
-            pa2 = m.Map<PersonA>(pb);
-            Assert.That(pa2.Id, Is.EqualTo(88));
-        }
-
-        [Test]
-        public void MapWithSameType_Allowed()
-        {
-            var m = new Mapper();
-            var r = m.TryGetMapper<PersonA, PersonA>(out var sm);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r, Is.True);
-                Assert.That(sm, Is.Not.Null);
-            });
-
-            var p = new PersonA { Id = 88, Name = "blah" };
-            var d = sm!.Map(p);
-            Assert.That(d, Is.Not.Null);
-            Assert.That(d, Is.SameAs(p));
-        }
-
-        [Test]
-        public void MapWithSameType_NotAllowed()
-        {
-            var m = new Mapper
-            {
-                MapSameTypeWithSourceValue = false
-            };
-
-            var r = m.TryGetMapper<PersonA, PersonA>(out var sm);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r, Is.False);
-                Assert.That(sm, Is.Null);
-            });
-        }
-
-        public class PersonAMapper : Mapper<PersonA, PersonB>
-        {
-            public PersonAMapper()
-            {
-                Map((s, d) => d.ID = s.Id);
-                Map((s, d) => d.Text = s.Name);
-            }
-        }
-
-        public class PersonA
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-        }
-
-        public class PersonB
-        {
-            public int ID { get; set; }
-            public string? Text { get; set; }
-        }
-
-        public class PersonACollection : List<PersonA> { }
-
-        public class PersonBCollection : List<PersonB> { }
-
-        public class PersonACollectionMapper : CollectionMapper<PersonACollection, PersonA, PersonBCollection, PersonB> { }
-
-        public class Contact
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-            public Address? Address { get; set; }
-            public ChangeLog? ChangeLog { get; set; }
-        }
-
-        public class ContactDetail : Contact
-        {
-            public string? ExtraDetail { get; set; }
-        }
-
-        public class ContactMapper : Mapper<Contact, Contact>
-        {
-            public ContactMapper()
-            {
-                Map((s, d) => d.Id = s.Id);
-                Map((s, d) => d.Name = s.Name);
-                Map((o, s, d) => d.ChangeLog = o.Map(s.ChangeLog, d.ChangeLog));
-            }
-        }
-
-        public class Address
-        {
-            public string? Street { get; set; }
-            public string? City { get; set; }
-            public Other? Other { get; set; }
-        }
-
-        public class Other
-        {
-            public string? Value { get; set; }
-        }
-
-        public class Model
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-            public string? Street { get; set; }
-            public string? City { get; set; }
-            public string? Other { get; set; }
-        }
-
-        public class Employee
-        {
-            public string? Name { get; set; }
-            public Termination? Termination { get; set; }
-        }
-
-        public class Termination
-        {
-            public string? Reason { get; set; }
-            public DateTime Date { get; set; }
-        }
-
-        public class EmployeeModel
-        {
-            public string? Name { get; set; }
-            public string? Reason { get; set; }
-            public DateTime? Date { get; set; }
-        }
-
-        public class EmployeeMapper : Mapper<Employee, EmployeeModel>
-        { 
-            public EmployeeMapper()
-            {
-                Map((s, d) => d.Name = s.Name);
-                Flatten(s => s.Termination);
-            }
-        }
-
-        public class TerminationMapper : Mapper<Termination, EmployeeModel>
-        { 
-            public TerminationMapper()
-            {
-                Map((s, d) => d.Reason = s.Reason);
-                Map((s, d) => d.Date = s.Date);
-            }
-
-            public override bool InitializeDestination(EmployeeModel d)
-            {
-                d.Reason = null;
-                d.Date = null;
-                return true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Messaging/Azure/ServiceBus/ServiceBusSubscriberTest.cs b/tests/CoreEx.Test/Framework/Messaging/Azure/ServiceBus/ServiceBusSubscriberTest.cs
deleted file mode 100644
index 9e32d82f..00000000
--- a/tests/CoreEx.Test/Framework/Messaging/Azure/ServiceBus/ServiceBusSubscriberTest.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using CoreEx.Abstractions;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Events;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Models;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using Moq;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.Messaging.Azure.ServiceBus
-{
-    [TestFixture]
-    public class ServiceBusSubscriberTest
-    {
-        [Test]
-        public void ReceiveAsync_ValidationException()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue<Product?>(null);
-
-            test.Type<ServiceBusSubscriber>()
-                .Run(s => s.ReceiveAsync<Product>(message, actionsMock.Object, (ed, _) => throw new InvalidOperationException("Should not get here.")))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsAny<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void ReceiveAsync_TransientException()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new Product { Id = "A", Price = 1.99m });
-
-            test.Type<ServiceBusSubscriber>()
-                .Run(s => s.ReceiveAsync<Product>(message, actionsMock.Object, (ed, _) => throw new TransientException()))
-                .AssertException<EventSubscriberException>("A transient error has occurred; please try again.");
-
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void ReceiveAsync_UnhandledException()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new Product { Id = "A", Price = 1.99m });
-
-            test.Type<ServiceBusSubscriber>()
-                .Run(s => s.ReceiveAsync<Product>(message, actionsMock.Object, (ed, _) => throw new DivideByZeroException()))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.UnhandledError.ToString(), It.IsAny<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void ReceiveAsync_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new Product { Id = "A", Price = 1.99m });
-
-            test.Type<ServiceBusSubscriber>()
-                .Run(s => s.ReceiveAsync<Product>(message, actionsMock.Object, (ed, _) => Task.CompletedTask))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.CompleteMessageAsync(message, default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/OData/ODataTest.cs b/tests/CoreEx.Test/Framework/OData/ODataTest.cs
deleted file mode 100644
index c3b8c2e3..00000000
--- a/tests/CoreEx.Test/Framework/OData/ODataTest.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Mapping;
-using CoreEx.OData;
-using NUnit.Framework;
-using System;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Soc = Simple.OData.Client;
-
-namespace CoreEx.Test.Framework.ODatax
-{
-    [TestFixture]
-    internal class ODataTest
-    {
-        private static string? _personUrl; //https://www.odata.org/odata-services/service-usages/request-key-tutorial/
-
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            using var hc = new HttpClient();
-            var response = hc.GetAsync("https://services.odata.org/TripPinRESTierService/").Result;
-            Assert.That(response.IsSuccessStatusCode, Is.True);
-
-            _personUrl = response.RequestMessage!.RequestUri!.ToString();
-        }
-
-        internal static IMapper GetMapper()
-        {
-            var mapper = new Mapper();
-            mapper.Register(new Mapper<Product, MProduct>()
-                .Map((s, d) => d.ID = s.Id)
-                .Map((s, d) => d.Name = s.Name)
-                .Map((s, d) => d.Description = s.Description));
-
-            mapper.Register(new Mapper<MProduct, Product>()
-                .Map((s, d) => d.Id = s.ID)
-                .Map((s, d) => d.Name = s.Name)
-                .Map((s, d) => d.Description = s.Description));
-
-            mapper.Register(new Mapper<Person, MPerson>()
-                .Map((s, d) => d.UserName = s.Id)
-                .Map((s, d) => d.FirstName = s.FirstName)
-                .Map((s, d) => d.LastName = s.LastName));
-
-            mapper.Register(new Mapper<MPerson, Person>()
-                .Map((s, d) => d.Id = s.UserName)
-                .Map((s, d) => d.FirstName = s.FirstName)
-                .Map((s, d) => d.LastName = s.LastName));
-
-            return mapper;
-        }
-
-        internal static ODataClient GetPersonClient(Soc.ODataClientSettings? settings = null)
-        {
-            settings ??= new Soc.ODataClientSettings();
-            settings.BaseUri = new Uri(_personUrl!);
-            settings.BeforeRequest = r => Console.WriteLine($"{r.Method} {r.RequestUri}");
-            return new ODataClient(new Soc.ODataClient(settings), GetMapper());
-        }
-
-        [Test]
-        public async Task A010_Get_NotFound()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "invalid_key", default);
-            Assert.That(result.Value, Is.Null);
-        }
-
-        [Test]
-        public async Task A020_Get_NotFound_IgnoreResourceNotFoundException()
-        {
-            var odata = GetPersonClient(new Soc.ODataClientSettings { IgnoreResourceNotFoundException = true });
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "invalid_key", default);
-            Assert.That(result.Value, Is.Null);
-        }
-
-        [Test]
-        public async Task A030_Get_Success()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-            Assert.That(result.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Value.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result.Value.FirstName, Is.EqualTo("Russell"));
-                Assert.That(result.Value.LastName, Is.EqualTo("Whyte"));
-            });
-        }
-
-        [Test]
-        public async Task B010_SelectSingle()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.Query<Person, MPerson>("People", q => q.Filter(p => p.UserName == "russellwhyte")).SelectSingleAsync(default);
-            Assert.That(result, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result.FirstName, Is.EqualTo("Russell"));
-                Assert.That(result.LastName, Is.EqualTo("Whyte"));
-            });
-
-            var result2 = (await odata.Query<Person, MPerson>("People", q => q.Filter(p => p.UserName == "russellwhyte")).SelectSingleWithResultAsync(default)).Value;
-            Assert.That(result2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2!.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result2.FirstName, Is.EqualTo("Russell"));
-                Assert.That(result2.LastName, Is.EqualTo("Whyte"));
-            });
-        }
-
-        [Test]
-        public async Task B020_SelectFirstOrDefault()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.Query<Person, MPerson>("People", q => q.Filter(p => p.FirstName == "Russell")).SelectFirstAsync(default);
-            Assert.That(result, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result.FirstName, Is.EqualTo("Russell"));
-                Assert.That(result.LastName, Is.EqualTo("Whyte"));
-            });
-
-            var result2 = (await odata.Query<Person, MPerson>("People", q => q.Filter(p => p.FirstName == "Russell")).SelectFirstWithResultAsync(default)).Value;
-            Assert.That(result2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2!.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result2.FirstName, Is.EqualTo("Russell"));
-                Assert.That(result2.LastName, Is.EqualTo("Whyte"));
-            });
-
-            var result3 = await odata.Query<Person, MPerson>("People", q => q.Filter(p => p.FirstName == "does-not-exist")).SelectFirstOrDefaultAsync(default);
-            Assert.That(result3, Is.Null);
-
-            var result4 = (await odata.Query<Person, MPerson>("People", q => q.Filter(p => p.FirstName == "does-not-exist")).SelectFirstOrDefaultWithResultAsync(default)).Value;
-            Assert.That(result4, Is.Null);
-        }
-
-        [Test]
-        public async Task B030_SelectQueryWithResultAsync()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.Query<Person, MPerson>("People").WithPaging(2, 3).SelectQueryWithResultAsync<PersonCollection>(default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(result.Value, Has.Count.EqualTo(3));
-                Assert.That(result.Value.Select(x => x.FirstName).ToArray(), Is.EqualTo(new string[] { "Elaine", "Genevieve", "Georgina" }));
-            });
-        }
-
-        [Test]
-        public async Task B030_SelectResultWithResultAsync()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.Query<Person, MPerson>("People").WithPaging(PagingArgs.CreateSkipAndTake(2, 3, true)).SelectResultWithResultAsync<PersonCollectionResult, PersonCollection>(default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(result.Value.Items, Has.Count.EqualTo(3));
-                Assert.That(result.Value.Items.Select(x => x.FirstName).ToArray(), Is.EqualTo(new string[] { "Elaine", "Genevieve", "Georgina" }));
-                Assert.That(result.Value.Paging!.TotalCount, Is.EqualTo(20));
-            });
-        }
-
-        [Test]
-        public async Task B040_SelectResultWithResultAsync_WildCards()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.Query<Person, MPerson>("People", q => q.FilterWildcard(x => x.FirstName, "*s*")).WithPaging(PagingArgs.CreateSkipAndTake(2, 3, true)).SelectResultWithResultAsync<PersonCollectionResult, PersonCollection>(default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(result.Value.Items, Has.Count.EqualTo(3));
-                Assert.That(result.Value.Items.Select(x => x.FirstName).ToArray(), Is.EqualTo(new string[] { "Russell", "Sallie", "Sandy" }));
-                Assert.That(result.Value.Paging!.TotalCount, Is.EqualTo(7));
-            });
-
-            // Weird how Scott comes last as it is first when no paging is requested, but that is what is returned from the service <shrug_emoji/>.
-            result = await odata.Query<Person, MPerson>("People", q => q.FilterWildcard(x => x.FirstName, "s*")).WithPaging(PagingArgs.CreateSkipAndTake(2, 3, true)).SelectResultWithResultAsync<PersonCollectionResult, PersonCollection>(default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsSuccess, Is.True);
-                Assert.That(result.Value.Items, Has.Count.EqualTo(1));
-                Assert.That(result.Value.Items.Select(x => x.FirstName).ToArray(), Is.EqualTo(new string[] { "Scott" }));
-                Assert.That(result.Value.Paging!.TotalCount, Is.EqualTo(3));
-            });
-        }
-
-        [Test]
-        public async Task B050_SelectQuery()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.Query<Person, MPerson>("People", q => q.FilterWith((string)null!, x => x.FirstName == "Scott")).SelectQueryAsync<PersonCollection>();
-            Assert.That(result, Has.Count.EqualTo(20));
-
-            result = await odata.Query<Person, MPerson>("People", q => q.FilterWith("abc", x => x.FirstName == "Scott")).SelectQueryAsync<PersonCollection>();
-            Assert.That(result, Has.Count.EqualTo(1));
-
-            odata = GetPersonClient();
-            result = await odata.Query<Person, MPerson>("People", q => q.FilterWith((string)null!, x => x.FirstName == "Scott")).SelectQueryAsync<PersonCollection>();
-            Assert.That(result, Has.Count.EqualTo(20));
-
-            result = await odata.Query<Person, MPerson>("People", q => q.FilterWith("abc", x => x.FirstName == "Scott")).SelectQueryAsync<PersonCollection>();
-            Assert.That(result, Has.Count.EqualTo(1));
-        }
-
-        [Test]
-        public async Task C010_Create_Success()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.CreateWithResultAsync<Person, MPerson>("People", new Person { Id = "bobsmith", FirstName = "Bob", LastName = "Smith" }, default);
-            Assert.That(result.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Value.Id, Is.EqualTo("bobsmith"));
-                Assert.That(result.Value.FirstName, Is.EqualTo("Bob"));
-                Assert.That(result.Value.LastName, Is.EqualTo("Smith"));
-            });
-
-            var result2 = await odata.GetWithResultAsync<Person, MPerson>("People", "bobsmith", default);
-            Assert.That(result2.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2.Value.Id, Is.EqualTo("bobsmith"));
-                Assert.That(result2.Value.FirstName, Is.EqualTo("Bob"));
-                Assert.That(result2.Value.LastName, Is.EqualTo("Smith"));
-            });
-        }
-
-        [Test]
-        public async Task D010_Update_NotFound()
-        {
-            var odata = GetPersonClient();
-            odata.Args = new ODataArgs { PreReadOnUpdate = false };
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-
-            result.Value!.Id = "russellwhyteeeee";
-            result.Value.FirstName = "Russell2";
-
-            var ex = Assert.ThrowsAsync<Soc.WebRequestException>(async () => await odata.UpdateWithResultAsync<Person, MPerson>("People", result.Value, default));
-            Assert.That(ex!.Code, Is.EqualTo(HttpStatusCode.InternalServerError));
-        }
-
-        [Test]
-        public async Task D020_Update_NotFound_PreRead()
-        {
-            var odata = GetPersonClient();
-            odata.Args = new ODataArgs { PreReadOnUpdate = true };
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-
-            result.Value!.Id = "russellwhyteeeee";
-            result.Value.FirstName = "Russell2";
-            var result2 = await odata.UpdateWithResultAsync<Person, MPerson>("People", result.Value, default);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2.IsFailure, Is.True);
-                Assert.That(result2.Error, Is.InstanceOf<NotFoundException>());
-            });
-        }
-
-        [Test]
-        public async Task D030_Update_NotFound_NoPreRead()
-        {
-            var odata = GetPersonClient();
-            odata.Args = new ODataArgs { PreReadOnUpdate = false };
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-
-            result.Value!.Id = "russellwhyteeeee";
-            result.Value.FirstName = "Russell2";
-
-            var ex = Assert.ThrowsAsync<Soc.WebRequestException>(async () => await odata.UpdateWithResultAsync<Person, MPerson>("People", result.Value, default));
-            Assert.That(ex!.Code, Is.EqualTo(HttpStatusCode.InternalServerError));
-        }
-
-        [Test]
-        public async Task D040_Update_Success()
-        {
-            var odata = GetPersonClient();
-            var result = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-
-            result.Value!.FirstName = "Russell2";
-            var result2 = await odata.UpdateWithResultAsync<Person, MPerson>("People", result.Value, default);
-            Assert.That(result2.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2.Value!.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result2.Value.FirstName, Is.EqualTo("Russell2"));
-                Assert.That(result2.Value.LastName, Is.EqualTo("Whyte"));
-            });
-
-            result = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-            Assert.That(result.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Value!.Id, Is.EqualTo("russellwhyte"));
-                Assert.That(result.Value.FirstName, Is.EqualTo("Russell2"));
-                Assert.That(result.Value.LastName, Is.EqualTo("Whyte"));
-            });
-        }
-
-        [Test]
-        public async Task E010_Delete_PreRead()
-        {
-            var odata = GetPersonClient();
-            odata.Args = new ODataArgs { PreReadOnDelete = true };
-            var result = await odata.DeleteWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-            Assert.That(result.IsSuccess, Is.True);
-
-            var result2 = await odata.GetWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-            Assert.That(result2.Value, Is.Null);
-
-            // Pre-read will determine not found :-)
-            result = await odata.DeleteWithResultAsync<Person, MPerson>("People", "russellwhyte", default);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.IsFailure, Is.True);
-                Assert.That(result.Error, Is.InstanceOf<NotFoundException>());
-            });
-        }
-
-        [Test]
-        public async Task E020_Delete_NoPreRead()
-        {
-            var odata = GetPersonClient();
-            odata.Args = new ODataArgs { PreReadOnDelete = false };
-            var result = await odata.DeleteWithResultAsync<Person, MPerson>("People", "ronaldmundy", default);
-            Assert.That(result.IsSuccess, Is.True);
-
-            var result2 = await odata.GetWithResultAsync<Person, MPerson>("People", "ronaldmundy", default);
-            Assert.That(result2.Value, Is.Null);
-
-            // Alas, arguably this endpoint should return not found :-(
-            var ex = Assert.ThrowsAsync<Soc.WebRequestException>(async () => await odata.DeleteWithResultAsync<Person, MPerson>("People", "ronaldmundy", default));
-            Assert.That(ex!.Code, Is.EqualTo(HttpStatusCode.InternalServerError));
-        }
-
-        [Test]
-        public async Task F010_Collection_CRD()
-        {
-            var odata = GetPersonClient();
-            var ocoll = odata.CreateItemCollection("People", new PersonMapper());
-            var result = await ocoll.CreateWithResultAsync(new Person { Id = "barbsmith", FirstName = "Barbara", LastName = "Smith" });
-            Assert.That(result.IsSuccess, Is.True);
-
-            var result2 = await ocoll.GetWithResultAsync("barbsmith");
-            Assert.That(result2.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2.Value.Id, Is.EqualTo("barbsmith"));
-                Assert.That(result2.Value.FirstName, Is.EqualTo("Barbara"));
-                Assert.That(result2.Value.LastName, Is.EqualTo("Smith"));
-            });
-
-            result2 = await ocoll.GetWithResultAsync("barbsmith");
-            Assert.That(result2.Value, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result2.Value.Id, Is.EqualTo("barbsmith"));
-                Assert.That(result2.Value.FirstName, Is.EqualTo("Barbara"));
-                Assert.That(result2.Value.LastName, Is.EqualTo("Smith"));
-            });
-
-            var result3 = await ocoll.DeleteWithResultAsync("barbsmith");
-            Assert.That(result3.IsSuccess, Is.True);
-
-            result2 = await ocoll.GetWithResultAsync("barbsmith");
-            Assert.That(result2.Value, Is.Null);
-        }
-    }
-
-    public class PersonCollectionResult : CollectionResult<PersonCollection, Person> { }
-
-    public class PersonCollection : System.Collections.Generic.List<Person> { }
-
-    public class Person : IIdentifier<string>
-    {
-        public string? Id { get; set; }
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-    }
-
-    public class MPerson
-    {
-        public string? UserName { get; set; }
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-    }
-
-    public class PersonMapper : OData.Mapping.ODataMapper<Person>
-    {
-        public PersonMapper()
-        {
-            Map(x => x.Id, "UserName").SetPrimaryKey();
-            Map(x => x.FirstName);
-            Map(x => x.LastName);
-        }
-    }
-
-    public class Product : IIdentifier<int>
-    {
-        public int Id { get; set; }
-
-        public string? Name { get; set; }
-
-        public string? Description { get; set; }
-    }
-
-    public class MProduct
-    {
-        public int ID { get; set; }
-
-        public string? Name { get; set; }
-
-        public string? Description { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/RefData/ReferenceDataTest.cs b/tests/CoreEx.Test/Framework/RefData/ReferenceDataTest.cs
deleted file mode 100644
index 0539c222..00000000
--- a/tests/CoreEx.Test/Framework/RefData/ReferenceDataTest.cs
+++ /dev/null
@@ -1,1298 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Entities.Extended;
-using CoreEx.Mapping.Converters;
-using CoreEx.RefData;
-using CoreEx.RefData.Caching;
-using CoreEx.RefData.Extended;
-using CoreEx.Results;
-using CoreEx.TestFunction;
-using FluentAssertions;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using UnitTestEx;
-using Nsj = Newtonsoft.Json;
-using Stj = System.Text.Json;
-using CoreEx.AspNetCore.Http;
-
-namespace CoreEx.Test.Framework.RefData
-{
-    [TestFixture]
-    public class ReferenceDataTest
-    {
-        [Test]
-        public void RefDataSimple()
-        {
-            var r = new RefDataSimple { Id = 1, Code = "X", Text = "XX" };
-            r.Id = 1;
-            r.Code = "X";
-            r.Text = "XX";
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(1));
-                Assert.That(((ReferenceDataBase<int>)r).Id, Is.EqualTo(1));
-                Assert.That(((ReferenceDataBase)r).Id, Is.EqualTo(1));
-                Assert.That(((IReferenceData)r).Id, Is.EqualTo(1));
-                Assert.That(((IIdentifier)r).Id, Is.EqualTo(1));
-                Assert.That(r.Code, Is.EqualTo("X"));
-                Assert.That(r.Text, Is.EqualTo("XX"));
-
-                Assert.That(((IIdentifier)r).IdType, Is.EqualTo(typeof(int)));
-            });
-
-            var ir = (IReferenceData)r;
-            Assert.That(ir.IsValid, Is.True);
-
-            ir.SetInvalid();
-            Assert.Multiple(() =>
-            {
-                Assert.That(ir.IsValid, Is.False);
-                Assert.That(typeof(int), Is.SameAs(ir.IdType));
-            });
-
-            Assert.That(new CoreEx.Text.Json.ReferenceDataContentJsonSerializer().Serialize(r), Is.EqualTo("{\"id\":1,\"code\":\"X\",\"text\":\"XX\",\"isActive\":true}"));
-        }
-
-        [Test]
-        public void Exercise_RefData()
-        {
-            var r = new RefData { Id = 1, Code = "X", Text = "XX" };
-            r.Id = 1;
-            r.Code = "X";
-            r.Text = "XX";
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(1));
-                Assert.That(((IReferenceData)r).Id, Is.EqualTo(1));
-                Assert.That(((ReferenceDataBaseEx<int, RefData>)r).Id, Is.EqualTo(1));
-                Assert.That(((IIdentifier)r).Id, Is.EqualTo(1));
-
-                Assert.That(((IIdentifier)r).IdType, Is.EqualTo(typeof(int)));
-            });
-
-            // Immutable.
-            Assert.Throws<InvalidOperationException>(() => r.Id = 2);
-            Assert.Throws<InvalidOperationException>(() => r.Code = "Y");
-            r.Text = "YY";
-
-            var r2 = r;
-            Assert.That(r, Is.EqualTo(r2));
-
-            r2 = (RefData)r.Clone();
-            Assert.That(r, Is.EqualTo(r2));
-            Assert.That(r, Is.EqualTo(r2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(r, Is.EqualTo((object)r2));
-                Assert.That(r2.GetHashCode(), Is.EqualTo(r.GetHashCode()));
-            });
-
-            r2 = new RefData { Id = 1, Code = "X", Text = "XXXX" };
-            Assert.That(r, Is.Not.EqualTo(r2));
-            Assert.That(r, Is.Not.EqualTo(r2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(r, Is.Not.EqualTo((object)r2));
-                Assert.That(r2.GetHashCode(), Is.Not.EqualTo(r.GetHashCode()));
-            });
-
-            r.MakeReadOnly();
-            Assert.That(r.IsReadOnly, Is.True);
-            Assert.Throws<InvalidOperationException>(() => r.Text = "XXXXX");
-        }
-
-        [Test]
-        public void Exercise_RefDataEx()
-        {
-            var r = new RefDataEx { Id = "@", Code = "X", Text = "XX", Description = "XXX", IsActive = true, StartDate = new DateTime(2020, 01, 01), EndDate = new DateTime(2020, 12, 31) };
-            r.Id = "@";
-            r.Code = "X";
-            r.Text = "XX";
-            r.Description = "XXX";
-            r.IsActive = true;
-            r.StartDate = new DateTime(2020, 01, 01);
-            r.EndDate = new DateTime(2020, 12, 31);
-
-            // Immutable.
-            Assert.Throws<InvalidOperationException>(() => r.Id = "Q");
-            Assert.Throws<InvalidOperationException>(() => r.Code = "Y");
-            r.Text = "YY";
-            r.Description = "YYY";
-            r.IsActive = false;
-            r.StartDate = r.StartDate.Value.AddDays(1);
-            r.EndDate = r.EndDate.Value.AddDays(1);
-
-            var r2 = r;
-            Assert.That(r, Is.EqualTo(r2));
-
-            r2 = (RefDataEx)r.Clone();
-            Assert.That(r, Is.EqualTo(r2));
-            Assert.That(r, Is.EqualTo(r2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(r, Is.EqualTo((object)r2));
-                Assert.That(r2.GetHashCode(), Is.EqualTo(r.GetHashCode()));
-            });
-
-            r2 = new RefDataEx { Id = "@", Code = "X", Text = "XX", Description = "XXX", IsActive = true, StartDate = new DateTime(2020, 01, 01), EndDate = new DateTime(2021, 12, 31) };
-            Assert.That(r, Is.Not.EqualTo(r2));
-            Assert.That(r, Is.Not.EqualTo(r2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(r, Is.Not.EqualTo((object)r2));
-                Assert.That(r2.GetHashCode(), Is.Not.EqualTo(r.GetHashCode()));
-            });
-
-            r.MakeReadOnly();
-            Assert.That(r.IsReadOnly, Is.True);
-            Assert.Throws<InvalidOperationException>(() => r.Text = "Bananas");
-            Assert.Throws<InvalidOperationException>(() => r.IsActive = true);
-        }
-
-        [Test]
-        public void Exercise_RefDataEx_Mappings()
-        {
-            var r = new RefDataEx();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsInitial, Is.True);
-                Assert.That(r.HasMappings, Is.False);
-            });
-
-            r.SetMapping("X", 1);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsInitial, Is.False);
-                Assert.That(r.HasMappings, Is.True);
-
-                Assert.That(r.TryGetMapping("X", out int val), Is.True);
-                Assert.That(val, Is.EqualTo(1));
-                Assert.That(r.GetMapping<int>("X"), Is.EqualTo(1));
-            });
-
-            var r2 = (RefDataEx)r.Clone();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r2.HasMappings, Is.True);
-                Assert.That(r2.TryGetMapping("X", out int val), Is.True);
-                Assert.That(val, Is.EqualTo(1));
-                Assert.That(r2.GetMapping<int>("X"), Is.EqualTo(1));
-            });
-
-            r2 = new RefDataEx();
-            r2.SetMapping("X", 1);
-            Assert.That(r, Is.EqualTo(r2));
-
-            r2.SetMapping("Y", 2);
-            Assert.That(r, Is.Not.EqualTo(r2));
-
-            r.MakeReadOnly();
-            Assert.That(r.IsReadOnly, Is.True);
-            Assert.Throws<InvalidOperationException>(() => r.SetMapping("Y", 2));
-        }
-
-        [Test]
-        public void IsValid_IsActive()
-        {
-            var rd = new RefDataEx();
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.True);
-                Assert.That(rd.IsValid, Is.True);
-            });
-
-            rd.IsActive = false;
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.False);
-                Assert.That(rd.IsValid, Is.True);
-            });
-
-            rd.IsActive = true;
-            rd.EndDate = new DateTime(2000, 01, 01);
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.False);
-                Assert.That(rd.IsValid, Is.True);
-            });
-
-            rd.EndDate = null;
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.True);
-                Assert.That(rd.IsValid, Is.True);
-            });
-
-            rd.StartDate = DateTime.UtcNow.AddDays(20);
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.False);
-                Assert.That(rd.IsValid, Is.True);
-            });
-
-            rd.StartDate = DateTime.UtcNow.AddDays(-20);
-            rd.EndDate = DateTime.UtcNow.AddDays(20);
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.True);
-                Assert.That(rd.IsValid, Is.True);
-            });
-
-            // Set invalid explicitly; makes it inactive; can not reset.
-            ((IReferenceData)rd).SetInvalid();
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.False);
-                Assert.That(rd.IsValid, Is.False);
-            });
-
-            rd.IsActive = true;
-            Assert.Multiple(() =>
-            {
-                Assert.That(rd.IsActive, Is.False);
-                Assert.That(rd.IsValid, Is.False);
-            });
-        }
-
-        [Test]
-        public void IsValid_IsActive_SystemTime()
-        {
-            // Set the system time to the past.
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddExecutionContext();
-            sc.AddScoped<ISystemTime>(_ => SystemTime.CreateFixed(new DateTime(1999, 06, 01)));
-            var sb = sc.BuildServiceProvider();
-            using var scope = sb.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var rd = new RefDataEx { IsActive = true };
-            Assert.That(rd.IsValid, Is.True);
-
-            rd.StartDate = new DateTime(1999, 01, 01);
-            rd.EndDate = new DateTime(1999, 12, 31);
-            Assert.That(rd.IsValid, Is.True);
-        }
-
-        [Test]
-        public void IsValid_IsActive_ReferenceDataContext()
-        {
-            // Set the reference data context back in time.
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddExecutionContext();
-            sc.AddScoped<IReferenceDataContext>(_ => new ReferenceDataContext { Date = new DateTime(1999, 06, 01) });
-            var sb = sc.BuildServiceProvider();
-            using var scope = sb.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var rd = new RefDataEx { IsActive = true};
-            Assert.That(rd.IsValid, Is.True);
-
-            rd.StartDate = new DateTime(1999, 01, 01);
-            rd.EndDate = new DateTime(1999, 12, 31);
-            Assert.That(rd.IsValid, Is.True);
-        }
-
-        [Test]
-        public void Casting_FromRefData()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That((int)(RefData)null!, Is.EqualTo(0));
-                Assert.That((string?)(RefData)null!, Is.EqualTo(null));
-                Assert.That((int)new RefData(), Is.EqualTo(0));
-                Assert.That((string?)new RefData(), Is.EqualTo(null));
-                Assert.That((int)new RefData { Id = 1, Code = "X", Text = "XX" }, Is.EqualTo(1));
-                Assert.That((string?)new RefData { Id = 1, Code = "X", Text = "XX" }, Is.EqualTo("X"));
-                Assert.That((int)new RefDataEx { Id = "X", Code = "XX", Text = "XXX" }, Is.EqualTo(0));
-                Assert.That((string?)new RefDataEx { Id = "X", Code = "XX", Text = "XXX" }, Is.EqualTo("XX"));
-
-                Assert.That((int?)(RefDataEx)null!, Is.EqualTo(null));
-                Assert.That((string?)(RefDataEx)null!, Is.EqualTo(null));
-                Assert.That((int?)new RefDataEx(), Is.EqualTo(null));
-                Assert.That((string?)new RefDataEx(), Is.EqualTo(null));
-                Assert.That((int?)new RefData { Id = 1, Code = "X", Text = "XX" }, Is.EqualTo(1));
-                Assert.That((string?)new RefData { Id = 1, Code = "X", Text = "XX" }, Is.EqualTo("X"));
-                Assert.That((int?)new RefDataEx { Id = "X", Code = "XX", Text = "XXX" }, Is.EqualTo(null));
-                Assert.That((string?)new RefDataEx { Id = "X", Code = "XX", Text = "XXX" }, Is.EqualTo("XX"));
-            });
-        }
-
-        [Test]
-        public void Collection_Add()
-        {
-            var rc = new RefDataExCollection();
-            Assert.Throws<ArgumentNullException>(() => rc.Add(null!));
-            Assert.Throws<ArgumentException>(() => rc.Add(new RefDataEx()))!.Message.Should().StartWith("Id must not be null.");
-            Assert.Throws<ArgumentException>(() => rc.Add(new RefDataEx{ Id = "X" }))!.Message.Should().StartWith("Code must not be null.");
-
-            var r = new RefDataEx { Id = "X", Code = "XX" };
-            rc.Add(r);
-            Assert.That(rc, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc["XX"], Is.SameAs(r));
-                Assert.That(rc["xx"], Is.SameAs(r));
-                Assert.That(rc.GetByCode("XX"), Is.SameAs(r));
-                Assert.That(rc.GetByCode("xx"), Is.SameAs(r));
-                Assert.That(rc.GetById("X"), Is.SameAs(r));
-                Assert.That(r.IsReadOnly, Is.True);
-            });
-
-            Assert.Throws<ArgumentException>(() => rc.Add(r))!.Message.Should().StartWith("Item already exists within the collection.");
-            Assert.Throws<ArgumentException>(() => rc.Add(new RefDataEx { Id = "X", Code = "YY" }))!.Message.Should().StartWith("Item with Id 'X' already exists within the collection.");
-            Assert.Throws<ArgumentException>(() => rc.Add(new RefDataEx { Id = "Y", Code = "XX" }))!.Message.Should().StartWith("Item with Code 'XX' already exists within the collection.");
-            Assert.Throws<ArgumentException>(() => rc.Add(new RefDataEx { Id = "Y", Code = "xx" }))!.Message.Should().StartWith("Item with Code 'xx' already exists within the collection.");
-
-            r = new RefDataEx { Id = "Y", Code = "YY" };
-            rc.Add(r);
-            Assert.That(rc, Has.Count.EqualTo(2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc["YY"], Is.SameAs(r));
-                Assert.That(rc["yy"], Is.SameAs(r));
-                Assert.That(rc.GetByCode("YY"), Is.SameAs(r));
-                Assert.That(rc.GetByCode("yy"), Is.SameAs(r));
-                Assert.That(rc.GetById("Y"), Is.SameAs(r));
-                Assert.That(r.IsReadOnly, Is.True);
-            });
-        }
-
-        [Test]
-        public void Collection_Lists()
-        {
-            var rc = new RefDataCollection { new RefData { Id = 1, Code = "Z", Text = "A", SortOrder = 2 }, new RefData { Id = 2, Code = "A", Text = "B", IsActive = false, SortOrder = 4 }, new RefData { Id = 3, Code = "Y", Text = "D", SortOrder = 1 }, new RefData { Id = 4, Code = "B", Text = "C", SortOrder = 3 } };
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.Id, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 2, 3, 4 }));
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.Code, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 2, 4, 3, 1 }));
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.Text, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 2, 4, 3 }));
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.SortOrder, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 1, 4, 2 }));
-            });
-
-            rc.SortOrder = ReferenceDataSortOrder.Id;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 2, 3, 4 }));
-            rc.SortOrder = ReferenceDataSortOrder.Code;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 2, 4, 3, 1 }));
-            rc.SortOrder = ReferenceDataSortOrder.Text;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 2, 4, 3 }));
-            rc.SortOrder = ReferenceDataSortOrder.SortOrder;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 1, 4, 2 }));
-
-            rc.SortOrder = ReferenceDataSortOrder.Id;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 3, 4 }));
-            rc.SortOrder = ReferenceDataSortOrder.Code;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 4, 3, 1 }));
-            rc.SortOrder = ReferenceDataSortOrder.Text;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 4, 3 }));
-            rc.SortOrder = ReferenceDataSortOrder.SortOrder;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 1, 4 }));
-
-            ((IReferenceData)rc.GetById(1)!).SetInvalid();
-
-            rc.SortOrder = ReferenceDataSortOrder.Id;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 2, 3, 4 }));
-            rc.SortOrder = ReferenceDataSortOrder.Code;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 2, 4, 3 }));
-            rc.SortOrder = ReferenceDataSortOrder.Text;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 2, 4, 3 }));
-            rc.SortOrder = ReferenceDataSortOrder.SortOrder;
-            Assert.That(rc.AllList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 4, 2 }));
-
-            rc.SortOrder = ReferenceDataSortOrder.Id;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 4 }));
-            rc.SortOrder = ReferenceDataSortOrder.Code;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 4, 3 }));
-            rc.SortOrder = ReferenceDataSortOrder.Text;
-            Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 4, 3 }));
-            rc.SortOrder = ReferenceDataSortOrder.SortOrder;
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc.ActiveList.Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 4 }));
-
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.Id, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 2, 3, 4 }));
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.Code, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 2, 4, 3, 1 }));
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.Text, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 1, 2, 4, 3 }));
-                Assert.That(rc.GetItems(ReferenceDataSortOrder.SortOrder, null, null).Select(x => x.Id).ToArray(), Is.EqualTo(new int[] { 3, 1, 4, 2 }));
-            });
-        }
-
-        [Test]
-        public void Collection_Mappings()
-        {
-            var rc = new RefDataCollection();
-            var r = new RefData { Id = 1, Code = "A" };
-            r.SetMapping("D365", "A-1");
-            r.SetMapping("SAP", 4300);
-
-            rc.Add(r);
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc.ContainsMapping("D365", "A-1"), Is.True);
-                Assert.That(rc.ContainsMapping("SAP", 4300), Is.True);
-                Assert.That(rc.ContainsMapping("OTHER", Guid.NewGuid()), Is.False);
-                Assert.That(rc.GetByMapping("D365", "A-1"), Is.SameAs(r));
-                Assert.That(rc.GetByMapping("SAP", 4300), Is.SameAs(r));
-                Assert.That(rc.GetByMapping("OTHER", Guid.NewGuid()), Is.Null);
-                Assert.That(rc.TryGetByMapping("SAP", 4300, out RefData? r2), Is.True);
-                Assert.That(r2, Is.SameAs(r));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc.TryGetByMapping("OTHER", Guid.NewGuid(), out RefData? r2), Is.False);
-                Assert.That(r2, Is.Null);
-            });
-
-            var r2 = new RefData { Id = 2, Code = "B" };
-            Assert.Multiple(() =>
-            {
-                r2.SetMapping("D365", "A-2");
-                r2.SetMapping("SAP", 4301);
-                rc.Add(r2);
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(rc.ContainsMapping("D365", "A-1"), Is.True);
-                Assert.That(rc.ContainsMapping("D365", "A-2"), Is.True);
-
-                Assert.That(rc.GetByMapping("D365", "A-1"), Is.SameAs(r));
-                Assert.That(rc.GetByMapping("D365", "A-2"), Is.SameAs(r2));
-            });
-
-            var r3 = new RefData { Id = 3, Code = "C" };
-            r3.SetMapping("D365", "A-2");
-            Assert.Throws<ArgumentException>(() => rc.Add(r3))!.Message.Should().StartWith("Item with Mapping Key 'D365' and Value 'A-2' already exists within the collection.");
-        }
-
-        [Test]
-        public void OrchestratorProviders()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-            var o = new ReferenceDataOrchestrator(sp);
-            o.Register<RefDataProvider>();
-
-            Assert.Throws<InvalidOperationException>(() => o.Register<RefDataProvider>())!.Message.Should().StartWith("Type 'CoreEx.Test.Framework.RefData.RefData' cannot be added as name 'RefData' already associated with previously added Type 'CoreEx.Test.Framework.RefData.RefData'.");
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(o[typeof(RefData)], Is.InstanceOf(typeof(RefDataCollection)));
-                Assert.That(o[typeof(RefDataEx)], Is.InstanceOf(typeof(RefDataExCollection)));
-                Assert.That(o[typeof(string)], Is.Null);
-
-                Assert.That(o["refdata"], Is.InstanceOf(typeof(RefDataCollection)));
-                Assert.That(o[nameof(RefDataEx)], Is.InstanceOf(typeof(RefDataExCollection)));
-                Assert.That(o["bananas"], Is.Null);
-            });
-
-            // Simulate access.
-            Assert.Multiple(() =>
-            {
-                Assert.That(o[typeof(RefData)]!.GetByCode("A")!.Id, Is.EqualTo(1));
-                Assert.That(o[typeof(RefDataEx)]!.GetByCode("BBB")!.Id, Is.EqualTo("BB"));
-            });
-
-            // Provider not wired up to execution context should not throw an exception; all will be invalid.
-            var r = (RefData)1;
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(1));
-                Assert.That(r.Code, Is.EqualTo(null));
-                Assert.That(r.IsValid, Is.False);
-            });
-
-            r = (RefData)"A";
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.Id, Is.EqualTo(0));
-                Assert.That(r.Code, Is.EqualTo("A"));
-                Assert.That(r.IsValid, Is.False);
-            });
-        }
-
-        [Test]
-        public void RefData_ImplicitCast_Load()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator(sp => new ReferenceDataOrchestrator(sp).Register<RefDataProvider>());
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            RefData? r = null;
-            RefData? r1 = null;
-            RefData? r2 = null;
-            for (int i = 0; i < 1000; i++)
-            {
-                r = (RefData)1;
-                r1 = (RefData)"B";
-                r2 = (RefData)"C";
-            }
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r!.Id, Is.EqualTo(1));
-                Assert.That(r.Code, Is.EqualTo("A"));
-                Assert.That(r.IsValid, Is.True);
-
-                Assert.That(r1, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r1!.Id, Is.EqualTo(2));
-                Assert.That(r1.Code, Is.EqualTo("B"));
-                Assert.That(r1.IsValid, Is.True);
-
-                Assert.That(r2, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r2!.Id, Is.EqualTo(0));
-                Assert.That(r2.Code, Is.EqualTo("C"));
-                Assert.That(r2.IsValid, Is.False);
-            });
-        }
-
-        [Test]
-        public void RefenceDataIdConverter()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator(sp => new ReferenceDataOrchestrator(sp).Register<RefDataProvider>());
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var rd = (RefData)1;
-            new ReferenceDataIdConverter<RefData, int>().ToDestination.Convert(rd).Should().Be(1);
-            new ReferenceDataIdConverter<RefData, int>().ToDestination.Convert(null).Should().Be(0);
-            new ReferenceDataIdConverter<RefData, int?>().ToDestination.Convert(rd).Should().Be(1);
-            new ReferenceDataIdConverter<RefData, int?>().ToDestination.Convert(null).Should().BeNull();
-
-            new ReferenceDataIdConverter<RefData, int>().ToSource.Convert(1).Should().NotBeNull().And.BeOfType<RefData>().Which.Id.Should().Be(1);
-            new ReferenceDataIdConverter<RefData, int>().ToSource.Convert(0).Should().NotBeNull().And.BeOfType<RefData>().Which.Id.Should().Be(0);
-            new ReferenceDataIdConverter<RefData, int?>().ToSource.Convert(1).Should().NotBeNull().And.BeOfType<RefData>().Which.Id.Should().Be(1);
-            new ReferenceDataIdConverter<RefData, int?>().ToSource.Convert(null).Should().BeNull();
-
-            Assert.Throws<InvalidCastException>(() => new ReferenceDataIdConverter<RefData, Guid?>().ToSource.Convert(Guid.Empty));
-        }
-
-        [Test]
-        public void SidList()
-        {
-            var sl = new ReferenceDataCodeList<RefData>("A", "B");
-            Assert.Multiple(() =>
-            {
-                Assert.That(sl[0].Code, Is.EqualTo("A"));
-                Assert.That(sl[0].Id, Is.EqualTo(0));
-                Assert.That(sl[1].Code, Is.EqualTo("B"));
-                Assert.That(sl[1].Id, Is.EqualTo(0));
-            });
-
-            var sids = new System.Collections.Generic.List<string?>() { "A" };
-            sl = new ReferenceDataCodeList<RefData>(ref sids);
-            Assert.That(sl, Has.Count.EqualTo(1));
-            Assert.Multiple(() =>
-            {
-                Assert.That(sl[0].Code, Is.EqualTo("A"));
-                Assert.That(sl[0].Id, Is.EqualTo(0));
-            });
-
-            sids!.Add("B");
-            Assert.That(sl, Has.Count.EqualTo(2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(sl[0].Code, Is.EqualTo("A"));
-                Assert.That(sl[0].Id, Is.EqualTo(0));
-                Assert.That(sl[1].Code, Is.EqualTo("B"));
-                Assert.That(sl[1].Id, Is.EqualTo(0));
-                Assert.That(sl.HasInvalidItems, Is.True);
-            });
-
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator(sp => new ReferenceDataOrchestrator(sp).Register<RefDataProvider>());
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            Assert.That(sl, Has.Count.EqualTo(2));
-            Assert.Multiple(() =>
-            {
-                Assert.That(sl[0].Code, Is.EqualTo("A"));
-                Assert.That(sl[0].Id, Is.EqualTo(1));
-                Assert.That(sl[1].Code, Is.EqualTo("B"));
-                Assert.That(sl[1].Id, Is.EqualTo(2));
-                Assert.That(sl.HasInvalidItems, Is.False);
-            });
-
-            sids = new System.Collections.Generic.List<string?>() { "A" };
-            sl = new ReferenceDataCodeList<RefData>(ref sids);
-            Assert.That(sl, Has.Count.EqualTo(1));
-
-            sl.Add((RefData)"B");
-            Assert.Multiple(() =>
-            {
-                Assert.That(sl, Has.Count.EqualTo(2));
-                Assert.That(sids!, Has.Count.EqualTo(2));
-                Assert.Multiple(() =>
-            {
-                Assert.That(sids, Is.EqualTo(new string?[] { "A", "B" }));
-            });
-
-                Assert.That(sl.ToIdList<int>(), Is.EqualTo(new int[] { 1, 2 }));
-                Assert.That(sl.ToCodeList(), Is.EqualTo(new string?[] { "A", "B" }));
-            });
-        }
-
-        [Test]
-        public void GetWithFilter()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-            var o = scope.ServiceProvider.GetRequiredService<ReferenceDataOrchestrator>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(o.GetWithFilterAsync<State>().GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "CO", "IL", "SC", "WA" }));
-                Assert.That(o.GetWithFilterAsync<State>(null, null, false).GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "CO", "IL", "SC", "WA" }));
-
-                Assert.That(o.GetWithFilterAsync<State>(new string[] { "AZ", "IL" }).GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "IL" }));
-                Assert.That(o.GetWithFilterAsync<State>(new string[] { "AZ", "IL", "XX" }).GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "IL" }));
-                Assert.That(o.GetWithFilterAsync<State>(new string[] { "AZ", "IL", "XX" }, includeInactive: true).GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "IL", "XX" }));
-
-                Assert.That(o.GetWithFilterAsync<State>(text: "*IN*").GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "IL", "SC", "WA" }));
-                Assert.That(o.GetWithFilterAsync<State>(text: "*in*").GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "IL", "SC", "WA" }));
-                Assert.That(o.GetWithFilterAsync<State>(text: "*on").GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "WA" }));
-                Assert.That(o.GetWithFilterAsync<State>(text: "pl*").GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(Array.Empty<string>()));
-                Assert.That(o.GetWithFilterAsync<State>(text: "pl*", includeInactive: true).GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "XX" }));
-
-                Assert.That(o.GetWithFilterAsync<State>(new string[] { "az", "il", "wa" }, text: "*in*").GetAwaiter().GetResult().Select(x => x.Code), Is.EqualTo(new string[] { "IL", "WA" }));
-            });
-        }
-
-        [Test]
-        public void GetNamed()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-            var o = scope.ServiceProvider.GetRequiredService<ReferenceDataOrchestrator>();
-
-            var mc = o.GetNamedAsync(new string[] { "state", "bananas", "suburb" }).GetAwaiter().GetResult();
-            Assert.That(mc, Is.Not.Null);
-            Assert.That(mc, Has.Count.EqualTo(2));
-            var mc1 = mc["State"];
-            Assert.That(mc1.Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "CO", "IL", "SC", "WA" }));
-            var mc2 = mc["Suburb"];
-            Assert.That(mc2.Select(x => x.Code), Is.EqualTo(new string[] { "B", "H", "R" }));
-
-            mc = o.GetNamedAsync(new string[] { "state", "bananas", "suburb" }, includeInactive: true).GetAwaiter().GetResult();
-            Assert.That(mc, Is.Not.Null);
-            Assert.That(mc, Has.Count.EqualTo(2));
-            mc1 = mc["State"];
-            Assert.That(mc1.Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "CO", "IL", "XX", "SC", "WA"}));
-            mc2 = mc["Suburb"];
-            Assert.That(mc2.Select(x => x.Code), Is.EqualTo(new string[] { "B", "H", "R" }));
-        }
-
-        [Test]
-        public void GetNamed_HttpRequest()
-        {
-            using var test = FunctionTester.Create<Startup>().ReplaceScoped<RefDataProvider>().ReplaceSingleton(sp => new ReferenceDataOrchestrator(sp).Register<RefDataProvider>());
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/ref?names=state,bananas,suburb");
-            var o = test.Services.GetRequiredService<ReferenceDataOrchestrator>();
-
-            var mc = o.GetNamedAsync(hr.GetRequestOptions()).GetAwaiter().GetResult();
-            Assert.That(mc, Is.Not.Null);
-            Assert.That(mc, Has.Count.EqualTo(2));
-            var mc1 = mc["State"];
-            Assert.That(mc1.Select(x => x.Code), Is.EqualTo(new string[] { "AZ", "CO", "IL", "SC", "WA" }));
-            var mc2 = mc["Suburb"];
-            Assert.That(mc2.Select(x => x.Code), Is.EqualTo(new string[] { "B", "H", "R" }));
-
-            hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/ref?state=co,il&suburb&state=xx");
-            mc = o.GetNamedAsync(hr.GetRequestOptions()).GetAwaiter().GetResult();
-            Assert.That(mc, Is.Not.Null);
-            Assert.That(mc, Has.Count.EqualTo(2));
-            mc1 = mc["State"];
-            Assert.That(mc1.Select(x => x.Code), Is.EqualTo(new string[] { "CO", "IL" }));
-            mc2 = mc["Suburb"];
-            Assert.That(mc2.Select(x => x.Code), Is.EqualTo(new string[] { "B", "H", "R" }));
-
-            hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/ref?state=co,il&suburb=h&state=xx&include-inactive&bananas");
-            mc = o.GetNamedAsync(hr.GetRequestOptions()).GetAwaiter().GetResult();
-            Assert.That(mc, Is.Not.Null);
-            Assert.That(mc, Has.Count.EqualTo(2));
-            mc1 = mc["State"];
-            Assert.That(mc1.Select(x => x.Code), Is.EqualTo(new string[] { "CO", "IL", "XX" }));
-            mc2 = mc["Suburb"];
-            Assert.That(mc2.Select(x => x.Code), Is.EqualTo(new string[] { "H" }));
-        }
-
-        [Test]
-        public async Task Caching()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProviderSlow>();
-            sc.AddReferenceDataOrchestrator<RefDataProviderSlow>();
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            // 1st time should take time and get cached.
-            var sw = Stopwatch.StartNew();
-            IReferenceDataCollection?  c = await ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().ConfigureAwait(false);
-            sw.Stop();
-            Assert.Multiple(() =>
-            {
-                Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(500));
-                Assert.That(c, Is.Not.Null);
-                Assert.That(c!.ContainsCode("A"), Is.True);
-            });
-
-            sw = Stopwatch.StartNew();
-            c = ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().GetAwaiter().GetResult();
-            sw.Stop();
-            Assert.That(sw.ElapsedMilliseconds, Is.LessThan(500));
-
-            sw = Stopwatch.StartNew();
-            c = ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().GetAwaiter().GetResult();
-            sw.Stop();
-            Assert.That(sw.ElapsedMilliseconds, Is.LessThan(500));
-        }
-
-        [Test]
-        public async Task Caching_LoadA()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProviderSlow>();
-            sc.AddReferenceDataOrchestrator<RefDataProviderSlow>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = await ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().ConfigureAwait(false);
-            }
-        }
-
-        [Test]
-        public async Task Caching_Refresh()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProviderSlow>();
-            sc.AddReferenceDataOrchestrator(sp => new ReferenceDataOrchestrator(sp, cacheEntryConfig: new FixedExpirationCacheEntry(TimeSpan.FromMilliseconds(250))).Register<RefDataProviderSlow>());
-            var sp = sc.BuildServiceProvider();
-
-            var rdo = sp.GetRequiredService<ReferenceDataOrchestrator>();
-            ReferenceDataOrchestrator.SetCurrent(rdo);
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            // 1st time should take time and get cached.
-            var sw = Stopwatch.StartNew();
-            IReferenceDataCollection? c = await ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().ConfigureAwait(false);
-            sw.Stop();
-            Assert.Multiple(() =>
-            {
-                Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(490));
-                Assert.That(c, Is.Not.Null);
-            });
-            Assert.That(c!.ContainsCode("A"), Is.True);
-
-            // 2nd time should be fast-as from cache.
-            sw = Stopwatch.StartNew();
-            c = ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().GetAwaiter().GetResult();
-            sw.Stop();
-            Assert.That(sw.ElapsedMilliseconds, Is.LessThan(500));
-
-            // Await longer than cache time.
-            await Task.Delay(500).ConfigureAwait(false);
-
-            // 3rd time should take some time to cache again.
-            sw = Stopwatch.StartNew();
-            c = await ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().ConfigureAwait(false);
-            sw.Stop();
-            Assert.Multiple(() =>
-            {
-                Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(490));
-                Assert.That(c, Is.Not.Null);
-                Assert.That(c!.ContainsCode("A"), Is.True);
-            });
-
-            // 4th time should be fast-as from cache.
-            sw = Stopwatch.StartNew();
-            c = ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().GetAwaiter().GetResult();
-            sw.Stop();
-            Assert.That(sw.ElapsedMilliseconds, Is.LessThan(500));
-        }
-
-        [Test]
-        public void Caching_LoadB()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProviderSlow>();
-            sc.AddReferenceDataOrchestrator<RefDataProviderSlow>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>().GetAwaiter().GetResult();
-            }
-        }
-
-        [Test]
-        public async Task Caching_Prefetch()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProviderSlow>();
-            sc.AddReferenceDataOrchestrator<RefDataProviderSlow>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            // Should load both in parallel.
-            var sw = Stopwatch.StartNew();
-            await ReferenceDataOrchestrator.Current.PrefetchAsync(new string[] { "RefData", "RefDataEx" }).ConfigureAwait(false);
-            sw.Stop();
-            Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(480));
-
-            sw = Stopwatch.StartNew();
-            var c = await ReferenceDataOrchestrator.Current.GetByTypeAsync<RefData>();
-            sw.Stop();
-            Assert.Multiple(() =>
-            {
-                Assert.That(sw.ElapsedMilliseconds, Is.LessThan(520));
-                Assert.That(c, Is.Not.Null);
-                Assert.That(c!.ContainsCode("A"), Is.True);
-            });
-
-            sw = Stopwatch.StartNew();
-            c = await ReferenceDataOrchestrator.Current.GetByTypeAsync<RefDataEx>();
-            sw.Stop();
-            Assert.Multiple(() =>
-            {
-                Assert.That(sw.ElapsedMilliseconds, Is.LessThan(520));
-                Assert.That(c, Is.Not.Null);
-                Assert.That(c!.ContainsId("BB"), Is.True);
-            });
-        }
-
-        [Test]
-        public async Task Caching_Concurrency()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataConcurrencyProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataConcurrencyProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var colls = new IReferenceDataCollection?[5];
-
-            var tasks = new Task[5];
-            tasks[0] = Task.Run(() => colls[0] = ReferenceDataOrchestrator.Current.GetByType<RefData>());
-            tasks[1] = Task.Run(() => colls[1] = ReferenceDataOrchestrator.Current.GetByType<RefData>());
-            tasks[2] = Task.Run(() => colls[2] = ReferenceDataOrchestrator.Current.GetByType<RefData>());
-            tasks[3] = Task.Run(() => colls[3] = ReferenceDataOrchestrator.Current.GetByType<RefData>());
-            tasks[4] = Task.Run(() => colls[4] = ReferenceDataOrchestrator.Current.GetByType<RefData>());
-
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-
-            for (int i = 0; i < colls.Length; i++)
-            {
-                Assert.That(colls[i], Is.Not.Null);
-                Assert.That(colls[i]!.Count, Is.EqualTo(2));
-            }
-
-            Assert.That(colls[4], Is.SameAs(colls[0])); // First and last should be same object ref.
-        }
-
-        [Test]
-        public void Serialization_STJ_NoOrchestrator()
-        {
-            // Serialize.
-            var td = new TestData { Id = 1, Name = "Bob" };
-            Assert.That(new Text.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\"}"));
-
-            td.RefData = new RefData { Code = "a" };
-            Assert.That(new Text.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\",\"refData\":\"a\"}"));
-
-            // Deserialize.
-            td = new Text.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-            });
-            Assert.That(td.RefData, Is.Null);
-
-            td = new Text.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\",\"refData\":\"a\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-                Assert.That(td.RefData, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.RefData!.Code, Is.EqualTo("a"));
-                Assert.That(td.RefData.IsValid, Is.False);
-            });
-
-            var ex = Assert.Throws<Stj.JsonException>(() => new Text.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\",\"refData\":1}"));
-            Assert.That(ex!.Message, Is.EqualTo("The JSON value could not be converted to CoreEx.Test.Framework.RefData.RefData. Path: $.refData | LineNumber: 0 | BytePositionInLine: 32."));
-        }
-
-        [Test]
-        public void Serialization_STJ_WithOrchestrator()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            // Serialize.
-            var td = new TestData { Id = 1, Name = "Bob" };
-            Assert.That(new Text.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\"}"));
-
-            td.RefData = "a";
-            Assert.That(new Text.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\",\"refData\":\"A\"}"));
-
-            // Deserialize.
-            td = new Text.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-            });
-            Assert.That(td.RefData, Is.Null);
-
-            td = new Text.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\",\"refData\":\"a\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-                Assert.That(td.RefData, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.RefData!.Code, Is.EqualTo("A"));
-                Assert.That(td.RefData.IsValid, Is.True);
-            });
-        }
-
-        [Test]
-        public void Serialization_NSJ_NoOrchestrator()
-        {
-            // Serialize.
-            var td = new TestData { Id = 1, Name = "Bob" };
-            Assert.That(new Newtonsoft.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\"}"));
-
-            td.RefData = new RefData { Code = "a" };
-            Assert.That(new Newtonsoft.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\",\"refData\":\"a\"}"));
-
-            // Deserialize.
-            td = new Newtonsoft.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-            });
-            Assert.That(td.RefData, Is.Null);
-
-            td = new Newtonsoft.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\",\"refData\":\"a\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-                Assert.That(td.RefData, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.RefData!.Code, Is.EqualTo("a"));
-                Assert.That(td.RefData.IsValid, Is.False);
-            });
-
-            var ex = Assert.Throws<Nsj.JsonSerializationException>(() => new Newtonsoft.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\",\"refData\":1}"));
-            Assert.That(ex!.Message, Is.EqualTo("Reference data value must be a string."));
-        }
-
-        [Test]
-        public void Serialization_NSJ_WithOrchestrator()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            // Serialize.
-            var td = new TestData { Id = 1, Name = "Bob" };
-            Assert.That(new Newtonsoft.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\"}"));
-
-            td.RefData = "a";
-            Assert.That(new Newtonsoft.Json.JsonSerializer().Serialize(td), Is.EqualTo("{\"id\":1,\"name\":\"Bob\",\"refData\":\"A\"}"));
-
-            // Deserialize.
-            td = new Newtonsoft.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-            });
-            Assert.That(td.RefData, Is.Null);
-
-            td = new Newtonsoft.Json.JsonSerializer().Deserialize<TestData>("{\"id\":1,\"name\":\"Bob\",\"refData\":\"a\"}");
-            Assert.That(td, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(td!.Id, Is.EqualTo(1));
-                Assert.That(td.Name, Is.EqualTo("Bob"));
-                Assert.That(td.RefData, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(td.RefData!.Code, Is.EqualTo("A"));
-                Assert.That(td.RefData.IsValid, Is.True);
-            });
-        }
-
-        [Test]
-        public void GetAllTypesInNamespace()
-        {
-            var types = ReferenceDataOrchestrator.GetAllTypesInNamespace<RefData>().ToList();
-            Assert.That(types, Has.Count.EqualTo(5));
-        }
-    }
-
-    public class RefData : ReferenceDataBaseEx<int, RefData> 
-    {
-        public static implicit operator RefData(int id) => ConvertFromId(id);
-
-        [return: NotNullIfNotNull("code")]
-        public static implicit operator RefData?(string? code) => ConvertFromCode(code);
-    }
-
-    public class RefDataSimple : ReferenceDataBase<int> { }
-
-    public class RefDataCollection : ReferenceDataCollection<int, RefData> { }
-
-    public class RefDataEx : ReferenceDataBaseEx<string, RefDataEx>
-    {
-        [return: NotNullIfNotNull("code")]
-        public static implicit operator RefDataEx?(string? code) => ConvertFromCode(code);
-    }
-
-    public class RefDataExCollection : ReferenceDataCollection<string, RefDataEx> { }
-
-    public class State : ReferenceDataBaseEx<int, State> { }
-
-    public class StateCollection : ReferenceDataCollection<int, State> { }
-
-    public class Suburb : ReferenceDataBaseEx<string, Suburb> { }
-
-    public class SuburbCollection : ReferenceDataCollection<string, Suburb> { }
-
-    public class RefDataProvider : IReferenceDataProvider
-    {
-        private readonly RefDataCollection _refData = new() { new RefData { Id = 1, Code = "A" }, new RefData { Id = 2, Code = "B" } };
-        private readonly RefDataExCollection _refDataEx = new() { new RefDataEx { Id = "AA", Code = "AAA" }, new RefDataEx { Id = "BB", Code = "BBB" } };
-        private readonly StateCollection _state = new() 
-        {
-            new State { Id = 1, Code = "IL", Text = "Illinois" },
-            new State { Id = 2, Code = "SC", Text = "South Carolina" },
-            new State { Id = 3, Code = "AZ", Text = "Arizona" },
-            new State { Id = 4, Code = "CO", Text = "Colorado" },
-            new State { Id = 5, Code = "XX", Text = "Placeholder", IsActive = false },
-            new State { Id = 6, Code = "WA", Text = "Washington" }
-        };
-        private readonly SuburbCollection _suburb = new()
-        {
-            new Suburb { Id = "BB", Code = "B", Text = "Bardon" },
-            new Suburb { Id = "RR", Code = "R", Text = "Redmond" },
-            new Suburb { Id = "HH", Code = "H", Text = "Hataitai" }
-        };
-
-        public Type[] Types => new Type[] { typeof(RefData), typeof(RefDataEx), typeof(State), typeof(Suburb) };
-
-        public Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default)
-        {
-            IReferenceDataCollection coll = type switch
-            {
-                Type _ when type == typeof(RefData) => _refData,
-                Type _ when type == typeof(RefDataEx) => _refDataEx,
-                Type _ when type == typeof(State) => _state,
-                Type _ when type == typeof(Suburb) => _suburb,
-                _ => throw new InvalidOperationException()
-            };
-
-            return Task.FromResult(Result.Ok(coll));
-        }
-    }
-
-    public class RefDataProviderSlow : IReferenceDataProvider
-    {
-        private readonly RefDataCollection _refData = new() { new RefData { Id = 1, Code = "A" }, new RefData { Id = 2, Code = "B" } };
-        private readonly RefDataExCollection _refDataEx = new() { new RefDataEx { Id = "AA", Code = "AAA" }, new RefDataEx { Id = "BB", Code = "BBB" } };
-
-        public Type[] Types => new Type[] { typeof(RefData), typeof(RefDataEx) };
-
-        public async Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default)
-        {
-            IReferenceDataCollection coll = type switch
-            {
-                Type _ when type == typeof(RefData) => _refData,
-                Type _ when type == typeof(RefDataEx) => _refDataEx,
-                _ => throw new InvalidOperationException()
-            };
-
-            await Task.Delay(500, cancellationToken).ConfigureAwait(false);
-
-            return Result.Ok(coll);
-        }
-    }
-
-    public class RefDataConcurrencyProvider : IReferenceDataProvider
-    {
-        private int _count;
-
-        public Type[] Types => new Type[] { typeof(RefData) };
-
-        public async Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default)
-        {
-            System.Diagnostics.Debug.WriteLine($"GetAsync=>Enter({_count})");
-            Interlocked.Increment(ref _count);
-            if (_count > 1)
-                //throw new InvalidOperationException("ReferenceData has loaded already; this should not occur as the ReferenceDataOrchestrator should ensure multi-load under concurrency does not occur.");
-                Assert.Fail("ReferenceData has loaded already; this should not occur as the ReferenceDataOrchestrator should ensure multi-load under concurrency does not occur.");
-
-            var coll = new RefDataCollection() { new RefData { Id = 1, Code = "A" }, new RefData { Id = 2, Code = "B" } };
-            await Task.Delay(100, cancellationToken).ConfigureAwait(false);
-            System.Diagnostics.Debug.WriteLine($"GetAsync=>Exit({_count})");
-            return coll;
-        }
-    }
-
-    public class TestData : CoreEx.Entities.Extended.EntityBase
-    {
-        private int _id;
-        private string? _name;
-        private string? _gender;
-
-        public int Id { get => _id; set => SetValue(ref _id, value); }
-
-        public string? Name { get => _name; set => SetValue(ref _name, value); }
-
-        public RefData? RefData { get => _gender; set => SetValue(ref _gender, value); }
-
-        protected override IEnumerable<IPropertyValue> GetPropertyValues()
-        {
-            yield return CreateProperty(nameof(Id), Id, v => Id = v);
-            yield return CreateProperty(nameof(Name), Name, v => Name = v);
-            yield return CreateProperty(nameof(RefData), RefData, v => RefData = v);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/AnyExtensionsTest.cs b/tests/CoreEx.Test/Framework/Results/AnyExtensionsTest.cs
deleted file mode 100644
index 08ff4aee..00000000
--- a/tests/CoreEx.Test/Framework/Results/AnyExtensionsTest.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using CoreEx.Results;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class AnyExtensionsTest
-    {
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/MatchExtensionsTest.cs b/tests/CoreEx.Test/Framework/Results/MatchExtensionsTest.cs
deleted file mode 100644
index a9b9b18e..00000000
--- a/tests/CoreEx.Test/Framework/Results/MatchExtensionsTest.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-using CoreEx.Results;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class MatchExtensionsTest
-    {
-    //    [Test]
-    //    public void Sync_Match_Result_Actions_Ok()
-    //    {
-    //        var r = Result.Success;
-    //        var r2 = r.Match(
-    //            ok: () => { Assert.Pass(); },
-    //            fail: e => { Assert.Fail(); });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_Result_Actions_Fail()
-    //    {
-    //        var r = Result.Fail("bad");
-    //        var r2 = r.Match(
-    //            ok: () => { Assert.Fail(); },
-    //            fail: e => { Assert.Pass(); });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_Result_Func_Return_Result_Ok()
-    //    {
-    //        var r = Result.Success;
-    //        var r2 = r.Match(
-    //            ok: () => Result.Fail("ok"),
-    //            fail: e => Result.Fail("bad"));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("ok"));
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_Result_Func_Return_Result_Fail()
-    //    {
-    //        var r = Result.Fail("test");
-    //        var r2 = r.Match(
-    //            ok: () => Result.Fail("ok"),
-    //            fail: e => Result.Fail("bad"));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_ResultT_Actions_Ok()
-    //    {
-    //        var r = Result.Ok(1);
-    //        var r2 = r.Match(
-    //            ok: v => { Assert.AreEqual(1, v); },
-    //            fail: e => { Assert.Fail(); });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_ResultT_Actions_Fail()
-    //    {
-    //        var r = Result<int>.Fail("test");
-    //        var r2 = r.Match(
-    //            ok: v => { Assert.Fail(); },
-    //            fail: e => { Assert.Pass(); });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_ResultT_Func_Ok()
-    //    {
-    //        var r = Result.Ok(1);
-    //        var r2 = r.Match(
-    //            ok: v => Result.Ok(true),
-    //            fail: e => false);
-
-    //        Assert.IsTrue(r2.Value);
-    //    }
-
-    //    [Test]
-    //    public void Sync_Match_ResultT_Func_Fail()
-    //    {
-    //        var r = Result<int>.Fail("test");
-    //        var r2 = r.Match(
-    //            ok: v => Result.Ok(true),
-    //            fail: e => false);
-
-    //        Assert.IsFalse(r2.Value);
-    //    }
-
-    //    /* AsyncResult */
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_Result_Actions_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Success);
-    //        var r2 = await r.Match(
-    //            ok: () => { Assert.Pass(); },
-    //            fail: e => { Assert.Fail(); });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_Result_Actions_Fail()
-    //    {
-    //        var r = Task.FromResult(Result.Fail("bad"));
-    //        var r2 = await r.Match(
-    //            ok: () => { Assert.Fail(); },
-    //            fail: e => { Assert.Pass(); });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_Result_Func_Return_Result_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Success);
-    //        var r2 = await r.Match(
-    //            ok: () => Result.Fail("ok"),
-    //            fail: e => Result.Fail("bad"));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("ok"));
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_Result_Func_Return_Result_Fail()
-    //    {
-    //        var r = Task.FromResult(Result.Fail("test"));
-    //        var r2 = await r.Match(
-    //            ok: () => Result.Fail("ok"),
-    //            fail: e => Result.Fail("bad"));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_ResultT_Actions_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Ok(1));
-    //        var r2 = await r.Match(
-    //            ok: v => { Assert.AreEqual(1, v); },
-    //            fail: e => { Assert.Fail(); });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_ResultT_Actions_Fail()
-    //    {
-    //        var r = Task.FromResult(Result<int>.Fail("test"));
-    //        var r2 = await r.Match(
-    //            ok: v => { Assert.Fail(); },
-    //            fail: e => { Assert.Pass(); });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_ResultT_Func_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Ok(1));
-    //        var r2 = await r.Match(
-    //            ok: v => Result.Ok(true),
-    //            fail: e => false);
-
-    //        Assert.IsTrue(r2.Value);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncResult_Match_ResultT_Func_Fail()
-    //    {
-    //        var r = Task.FromResult(Result<int>.Fail("test"));
-    //        var r2 = await r.Match(
-    //            ok: v => Result.Ok(true),
-    //            fail: e => false);
-
-    //        Assert.IsFalse(r2.Value);
-    //    }
-
-    //    /* AsyncFunc */
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_Result_Actions_Ok()
-    //    {
-    //        var r = Result.Success;
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => { Assert.Pass(); return Task.CompletedTask; },
-    //            fail: e => { Assert.Fail(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_Result_Actions_Fail()
-    //    {
-    //        var r = Result.Fail("bad");
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => { Assert.Fail(); return Task.CompletedTask; },
-    //            fail: e => { Assert.Pass(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_Result_Func_Return_Result_Ok()
-    //    {
-    //        var r = Result.Success;
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => Task.FromResult(Result.Fail("ok")),
-    //            fail: e => Task.FromResult(Result.Fail("bad")));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("ok"));
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_Result_Func_Return_Result_Fail()
-    //    {
-    //        var r = Result.Fail("test");
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => Task.FromResult(Result.Fail("ok")),
-    //            fail: e => Task.FromResult(Result.Fail("bad")));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_ResultT_Actions_Ok()
-    //    {
-    //        var r = Result.Ok(1);
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => { Assert.AreEqual(1, v); return Task.CompletedTask; },
-    //            fail: e => { Assert.Fail(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_ResultT_Actions_Fail()
-    //    {
-    //        var r = Result<int>.Fail("test");
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => { Assert.Fail(); return Task.CompletedTask; },
-    //            fail: e => { Assert.Pass(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_ResultT_Func_Ok()
-    //    {
-    //        var r = Result.Ok(1);
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => Task.FromResult(Result.Ok(true)),
-    //            fail: e => Task.FromResult(Result.Ok(false)));
-
-    //        Assert.IsTrue(r2.Value);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncFunc_Match_ResultT_Func_Fail()
-    //    {
-    //        var r = Result<int>.Fail("test");
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => Task.FromResult(Result.Ok(true)),
-    //            fail: e => Task.FromResult(Result.Ok(false)));
-
-    //        Assert.IsFalse(r2.Value);
-    //    }
-
-    //    /* AsyncBoth */
-    //    [Test]
-    //    public async Task AsyncBoth_Match_Result_Actions_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Success);
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => { Assert.Pass(); return Task.CompletedTask; },
-    //            fail: e => { Assert.Fail(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_Result_Actions_Fail()
-    //    {
-    //        var r = Task.FromResult(Result.Fail("bad"));
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => { Assert.Fail(); return Task.CompletedTask; },
-    //            fail: e => { Assert.Pass(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_Result_Func_Return_Result_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Success);
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => Task.FromResult(Result.Fail("ok")),
-    //            fail: e => Task.FromResult(Result.Fail("bad")));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("ok"));
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_Result_Func_Return_Result_Fail()
-    //    {
-    //        var r = Task.FromResult(Result.Fail("test"));
-    //        var r2 = await r.MatchAsync(
-    //            ok: () => Task.FromResult(Result.Fail("ok")),
-    //            fail: e => Task.FromResult(Result.Fail("bad")));
-
-    //        Assert.That(r2.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_ResultT_Actions_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Ok(1));
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => { Assert.AreEqual(1, v); return Task.CompletedTask; },
-    //            fail: e => { Assert.Fail(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsSuccess);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_ResultT_Actions_Fail()
-    //    {
-    //        var r = Task.FromResult(Result<int>.Fail("test"));
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => { Assert.Fail(); return Task.CompletedTask; },
-    //            fail: e => { Assert.Pass(); return Task.CompletedTask; });
-
-    //        Assert.IsTrue(r2.IsFailure);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_ResultT_Func_Ok()
-    //    {
-    //        var r = Task.FromResult(Result.Ok(1));
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => Task.FromResult(Result.Ok(true)),
-    //            fail: e => Task.FromResult(Result.Ok(false)));
-
-    //        Assert.IsTrue(r2.Value);
-    //    }
-
-    //    [Test]
-    //    public async Task AsyncBoth_Match_ResultT_Func_Fail()
-    //    {
-    //        var r = Task.FromResult(Result<int>.Fail("test"));
-    //        var r2 = await r.MatchAsync(
-    //            ok: v => Task.FromResult(Result.Ok(true)),
-    //            fail: e => Task.FromResult(Result.Ok(false)));
-
-    //        Assert.IsFalse(r2.Value);
-    //    }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/OnFailureExtensionsTest.cs b/tests/CoreEx.Test/Framework/Results/OnFailureExtensionsTest.cs
deleted file mode 100644
index f64172ef..00000000
--- a/tests/CoreEx.Test/Framework/Results/OnFailureExtensionsTest.cs
+++ /dev/null
@@ -1,616 +0,0 @@
-using CoreEx.Results;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class OnFailureExtensionsTest
-    {
-        //[Test]
-        //public void Sync_Result_OnFailure_With_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Result.Success;
-        //    var r2 = r.OnFailure(() => i = 1);
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public void Sync_Result_OnFailure_With_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Result.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => i = 1);
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public void Sync_Result_OnFailure_With_Func_Success()
-        //{
-        //    var r = Result.Success;
-        //    var r2 = r.OnFailure(() => Result.Fail("Test"));
-        //    Assert.True(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public void Sync_Result_OnFailure_With_Func_Failure()
-        //{
-        //    var r = Result.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => Result.NotFoundError());
-        //    Assert.True(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(() => { i = 1; });
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => { i = 1; });
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Value_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(() => 1);
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Value_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => 1);
-        //    Assert.AreEqual(1, r2.Value);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Result_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(() => Result.Fail("Test"));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Result_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => Result.NotFoundError());
-        //    Assert.IsTrue(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Diff_Value_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(() => true);
-        //    Assert.AreEqual(false, r2.Value);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Diff_Value_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => true);
-        //    Assert.AreEqual(true, r2.Value);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Result_Value_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(() => Result<int>.Fail("Test"));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_Func_Result_Value_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(() => Result<int>.Fail(new NotFoundException()));
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_FuncT_Result_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(v => new Result<bool>(true));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_FuncT_Result_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(v => new Result<bool>(true));
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_FuncT_ResultT_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = r.OnFailure(v => true);
-        //    Assert.IsFalse(r2.Value);
-        //}
-
-        //[Test]
-        //public void Sync_ResultT_OnFailure_FuncT_ResultT_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = r.OnFailure(v => true);
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        ///* AsyncResult */
-
-        //[Test]
-        //public async Task AsyncResult_Result_OnFailure_With_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result.Success);
-        //    var r2 = await r.OnFailure(() => i = 1);
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_Result_OnFailure_With_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => i = 1);
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_Result_OnFailure_With_Func_Success()
-        //{
-        //    var r = Task.FromResult(Result.Success);
-        //    var r2 = await r.OnFailure(() => Result.Fail("Test"));
-        //    Assert.True(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_Result_OnFailure_With_Func_Failure()
-        //{
-        //    var r = Task.FromResult(Result.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => Result.NotFoundError());
-        //    Assert.True(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(() => { i = 1; });
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => { i = 1; });
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Value_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(() => 1);
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Value_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => 1);
-        //    Assert.AreEqual(1, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Result_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(() => Result.Fail("Test"));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Result_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => Result.NotFoundError());
-        //    Assert.IsTrue(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Diff_Value_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(() => true);
-        //    Assert.AreEqual(false, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Diff_Value_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => true);
-        //    Assert.AreEqual(true, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Result_Value_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(() => Result<int>.Fail("Test"));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_Func_Result_Value_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(() => Result<int>.Fail(new NotFoundException()));
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_FuncT_Result_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(v => new Result<bool>(true));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_FuncT_Result_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(v => new Result<bool>(true));
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_FuncT_ResultT_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailure(v => true);
-        //    Assert.IsFalse(r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncResult_ResultT_OnFailure_FuncT_ResultT_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailure(v => true);
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        ///* AsyncFunc */
-
-        //[Test]
-        //public async Task AsyncFunc_Result_OnFailure_With_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Result.Success;
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_Result_OnFailure_With_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Result.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_Result_OnFailure_With_Func_Success()
-        //{
-        //    var r = Result.Success;
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.Fail("Test")));
-        //    Assert.True(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_Result_OnFailure_With_Func_Failure()
-        //{
-        //    var r = Result.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.NotFoundError()));
-        //    Assert.True(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Value_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(1));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Value_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(1));
-        //    Assert.AreEqual(1, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Result_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.Fail("Test")));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Result_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.NotFoundError()));
-        //    Assert.IsTrue(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Diff_Value_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(true));
-        //    Assert.AreEqual(false, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Diff_Value_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(true));
-        //    Assert.AreEqual(true, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Result_Value_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result<int>.Fail("Test")));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_Func_Result_Value_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result<int>.Fail(new NotFoundException())));
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_FuncT_Result_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(new Result<bool>(true)));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_FuncT_Result_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(new Result<bool>(true)));
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_FuncT_ResultT_Success()
-        //{
-        //    var r = Result<int>.Ok();
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(true));
-        //    Assert.IsFalse(r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncFunc_ResultT_OnFailure_FuncT_ResultT_Failure()
-        //{
-        //    var r = Result<int>.Fail(new BusinessException());
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(true));
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        ///* AsyncBoth */
-
-        //[Test]
-        //public async Task AsyncBoth_Result_OnFailure_With_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result.Success);
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_Result_OnFailure_With_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_Result_OnFailure_With_Func_Success()
-        //{
-        //    var r = Task.FromResult(Result.Success);
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.Fail("Test")));
-        //    Assert.True(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_Result_OnFailure_With_Func_Failure()
-        //{
-        //    var r = Task.FromResult(Result.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.NotFoundError()));
-        //    Assert.True(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Action_Success()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(0, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Action_Failure()
-        //{
-        //    var i = 0;
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => { i = 1; return Task.CompletedTask; });
-        //    Assert.AreEqual(1, i);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Value_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(1));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Value_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(1));
-        //    Assert.AreEqual(1, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Result_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.Fail("Test")));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Result_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result.NotFoundError()));
-        //    Assert.IsTrue(r2.IsFailure);
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Diff_Value_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(true));
-        //    Assert.AreEqual(false, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Diff_Value_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(true));
-        //    Assert.AreEqual(true, r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Result_Value_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result<int>.Fail("Test")));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_Func_Result_Value_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(() => Task.FromResult(Result<int>.Fail(new NotFoundException())));
-        //    Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_FuncT_Result_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(new Result<bool>(true)));
-        //    Assert.IsTrue(r2.IsSuccess);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_FuncT_Result_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(new Result<bool>(true)));
-        //    Assert.IsTrue(r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_FuncT_ResultT_Success()
-        //{
-        //    var r = Task.FromResult(Result<int>.Ok());
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(true));
-        //    Assert.IsFalse(r2.Value);
-        //}
-
-        //[Test]
-        //public async Task AsyncBoth_ResultT_OnFailure_FuncT_ResultT_Failure()
-        //{
-        //    var r = Task.FromResult(Result<int>.Fail(new BusinessException()));
-        //    var r2 = await r.OnFailureAsync(v => Task.FromResult(true));
-        //    Assert.IsTrue(r2.Value);
-        //}
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ResultGoTest.cs b/tests/CoreEx.Test/Framework/Results/ResultGoTest.cs
deleted file mode 100644
index 9153dc8c..00000000
--- a/tests/CoreEx.Test/Framework/Results/ResultGoTest.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-using CoreEx.Results;
-using CoreEx.TestFunction;
-using NUnit.Framework;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ResultGoTest
-    {
-        [Test]
-        public void Go_No_Args()
-        {
-            var r = Result.Go();
-            Assert.That(r, Is.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public void Go_With_Action()
-        {
-            var r = Result.Go(() => { });
-            Assert.That(r, Is.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public void Go_With_Result_Func()
-        {
-            var r = Result.Go(() => Result.Fail("Test"));
-            Assert.That(r.IsFailure, Is.True);
-        }
-
-        [Test]
-        public void Go_Value_Func()
-        {
-            var r = Result.Go(() => 1);
-            Assert.That(r.Value, Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Go_Value_Result_Func()
-        {
-            var r = Result.Go(() => Result.Ok(1));
-            Assert.That(r.Value, Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Go_Value_No_Args()
-        {
-            var r = Result.Go<int>();
-            Assert.That(r, Is.EqualTo(Result<int>.None));
-        }
-
-        /* Go_Async */
-
-        [Test]
-        public async Task GoAsync_With_Action()
-        {
-            var r = await Result.GoAsync(() => Task.CompletedTask);
-            Assert.That(r, Is.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public async Task GoAsync_With_Result_Func()
-        {
-            var r = await Result.GoAsync(() => Task.FromResult(Result.Fail("Test")));
-            Assert.That(r.IsFailure, Is.True);
-        }
-
-        [Test]
-        public async Task GoAsync_Value_Func()
-        {
-            var r = await Result.GoAsync<int>(() => Task.FromResult(1));
-            Assert.That(r.Value, Is.EqualTo(1));
-        }
-
-        [Test]
-        public async Task GoAsync_Value_Result_Func()
-        {
-            var r = await Result.GoAsync(() => Task.FromResult(Result.Ok(1)));
-            Assert.That(r.Value, Is.EqualTo(1));
-        }
-
-        [Test]
-        public void GoFromAsync_Http_Result_OK()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Get, "test").Respond.With("{\"Name\":\"Steve\"}", HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceHttpClientFactory(mcf)
-                .UseJsonSerializer(new CoreEx.Text.Json.JsonSerializer()) // Required as the Result type needs to be deserialized using CoreEx.
-                .Type<BackendHttpClient>()
-                .Run(hc => Result.GoFromAsync<Person>(async () => await hc.GetAsync<Person>("test")))
-                .AssertSuccess();
-
-            Assert.That(r.Result.Value.Name, Is.EqualTo("Steve"));
-        }
-
-        public class Person
-        {
-            public string? Name { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ResultInvokerWithTest.cs b/tests/CoreEx.Test/Framework/Results/ResultInvokerWithTest.cs
deleted file mode 100644
index f24b4973..00000000
--- a/tests/CoreEx.Test/Framework/Results/ResultInvokerWithTest.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using CoreEx.Invokers;
-using CoreEx.Results;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ResultInvokerWithTest
-    {
-        [Test]
-        public void Manager_Sycn()
-        {
-            var r = Result.Go().Manager(this).With(r => r);
-            Assert.That(r.IsSuccess, Is.True);
-
-            r = Result.Go().Manager(this).With(r => Result.Fail("boo hoo"));
-            Assert.That(r.Error, Is.TypeOf<BusinessException>().And.Message.EqualTo("boo hoo"));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ResultStateTest.cs b/tests/CoreEx.Test/Framework/Results/ResultStateTest.cs
deleted file mode 100644
index 26bb3092..00000000
--- a/tests/CoreEx.Test/Framework/Results/ResultStateTest.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Results;
-using NUnit.Framework;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ResultStateTest
-    {
-        [Test]
-        public void Result_Success_No_Value()
-        {
-            var r = Result<int>.Ok();
-            Assert.That(r, Is.EqualTo(Result<int>.None));
-        }
-
-        [Test]
-        public void Result_Success_With_Value()
-        {
-            var r = Result.Ok(1);
-            Assert.That(r, Is.EqualTo(Result<int>.Ok(1)));
-        }
-
-        [Test]
-        public void Result_Failure_With_Exception()
-        {
-            var r = Result<int>.Fail(new BusinessException());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Result_Failure_With_Message()
-        {
-            var r = Result<int>.Fail("Test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>().And.Message.EqualTo("Test"));
-            });
-        }
-
-        [Test]
-        public void Result_Success()
-        {
-            var r = Result.Success;
-            Assert.That(r, Is.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public void Result_Ok_With_Value()
-        {
-            var r = Result.Ok(1);
-            Assert.That(r, Is.EqualTo(Result<int>.Ok(1)));
-        }
-
-        [Test]
-        public void Result_Fail_With_Exception()
-        {
-            var r = Result.Fail(new BusinessException());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Result_Fail_With_Message()
-        {
-            var r = Result.Fail("Test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>().And.Message.EqualTo("Test"));
-            });
-        }
-
-        [Test]
-        public void Result_ValidationError_With_Message()
-        {
-            var r = Result.ValidationError("Test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<ValidationException>().And.Message.EqualTo("Test"));
-            });
-        }
-
-        [Test]
-        public void Result_ValidationError_With_MessageItem()
-        {
-            var r = Result.ValidationError(new MessageItem { Type = MessageType.Error, Text = "Error" });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<ValidationException>());
-            });
-            var ve = (ValidationException)r.Error;
-            Assert.That(ve.Messages, Is.Not.Null.And.Count.EqualTo(1));
-        }
-
-        [Test]
-        public void Result_ValidationError_With_MessageItems()
-        {
-            var r = Result.ValidationError(new MessageItemCollection { new MessageItem { Type = MessageType.Error, Text = "Error" }, new MessageItem { Type = MessageType.Error, Text = "Error2" } });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<ValidationException>());
-            });
-            var ve = (ValidationException)r.Error;
-            Assert.That(ve.Messages, Is.Not.Null.And.Count.EqualTo(2));
-        }
-
-        [Test]
-        public void Result_ConflictError()
-        {
-            var r = Result.ConflictError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<ConflictException>());
-            });
-        }
-
-        [Test]
-        public void Result_ConcurrencyError()
-        {
-            var r = Result.ConcurrencyError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<ConcurrencyException>());
-            });
-        }
-
-        [Test]
-        public void Result_DuplicateError()
-        {
-            var r = Result.DuplicateError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<DuplicateException>());
-            });
-        }
-
-        [Test]
-        public void Result_NotFoundError()
-        {
-            var r = Result.NotFoundError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<NotFoundException>());
-            });
-        }
-
-        [Test]
-        public void Result_TransientError()
-        {
-            var r = Result.TransientError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<TransientException>());
-            });
-        }
-
-        [Test]
-        public void Result_AuthenticationError()
-        {
-            var r = Result.AuthenticationError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<AuthenticationException>());
-            });
-        }
-
-        [Test]
-        public void Result_AuthorizationError()
-        {
-            var r = Result.AuthorizationError();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<AuthorizationException>());
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ResultTTest.cs b/tests/CoreEx.Test/Framework/Results/ResultTTest.cs
deleted file mode 100644
index d34f7e32..00000000
--- a/tests/CoreEx.Test/Framework/Results/ResultTTest.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Results;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ResultTTest
-    {
-        [Test]
-        public void Success_Property()
-        {
-            var r = Result<int>.None;
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.True);
-                Assert.That(r.IsFailure, Is.False);
-            });
-        }
-
-        [Test]
-        public void Result_Success_Ctor()
-        {
-            var r = new Result<int>();
-            Assert.That(r, Is.EqualTo(Result<int>.None));
-        }
-
-        [Test]
-        public void Success_Is_Success()
-        {
-            var r = Result<int>.Ok();
-            Assert.That(r, Is.EqualTo(Result<int>.None));
-        }
-
-        [Test]
-        public void Success_Implicit_Conversion_From_Value()
-        {
-            var r = (Result<int>) 1;
-            Assert.That(r.Value, Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Success_Implicit_Conversion_From_Result()
-        {
-            int i = Result<int>.Ok(1);
-            Assert.That(i, Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Success_ThrowOnError()
-        {
-            Result<int>.Ok().ThrowOnError();
-        }
-
-        [Test]
-        public void Failure_Ctor()
-        {
-            var r = new Result<int>(new BusinessException());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Failure_Is_Failure()
-        {
-            var r = Result<int>.Fail(new BusinessException());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Failure_Is_Failure_With_Message()
-        {
-            var r = Result<int>.Fail("Test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>().And.Message.EqualTo("Test"));
-            });
-        }
-
-        [Test]
-        public void Failure_Explicit_Conversion()
-        {
-            var r = (Result<int>) new BusinessException();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Failure_ThrowOnError()
-        {
-            Assert.Throws<BusinessException>(() => Result<int>.Fail(new BusinessException()).ThrowOnError());
-        }
-
-        [Test]
-        public void Compare_Success_And_Failure()
-        {
-            Assert.That(Result<int>.Fail(new BusinessException()), Is.Not.EqualTo(Result<int>.Ok()));
-        }
-
-        [Test]
-        public void Compare_Two_Same_Successes()
-        {
-            var r1 = Result<int>.Ok();
-            var r2 = Result<int>.Ok();
-            Assert.That(r2, Is.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Same_Successes_With_Value()
-        {
-            var r1 = Result<int>.Ok(1);
-            var r2 = Result<int>.Ok(1);
-            Assert.That(r2, Is.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Different_Successes()
-        {
-            var r1 = Result<int>.Ok();
-            var r2 = Result<int>.Ok(1);
-            Assert.That(r2, Is.Not.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Different_Successes_With_Value()
-        {
-            var r1 = Result<int>.Ok(1);
-            var r2 = Result<int>.Ok(2);
-            Assert.That(r2, Is.Not.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Same_Failures()
-        {
-            var r1 = Result<int>.Fail(new BusinessException());
-            var r2 = Result<int>.Fail(new BusinessException());
-            Assert.That(r2, Is.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Different_Failures()
-        {
-            var r1 = Result<int>.Fail(new BusinessException());
-            var r2 = Result<int>.Fail(new BusinessException("Test"));
-            Assert.That(r2, Is.Not.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Different_Type_Failures()
-        {
-            var r1 = Result<int>.Fail(new ValidationException("Test"));
-            var r2 = Result<int>.Fail(new BusinessException("Test"));
-            Assert.That(r2, Is.Not.EqualTo(r1));
-        }
-
-        [Test]
-        public void Result_Success_Explicit_Convert_To_Result()
-        {
-            Result<int> r = Result<int>.Ok(1);
-            Result r2 = (Result)r;
-            Assert.That(r2, Is.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public void Result_Failure_Explicit_Convert_To_Result()
-        {
-            Result<int> r = Result<int>.Fail(new BusinessException());
-            Result r2 = (Result)r;
-            Assert.Multiple(() =>
-            {
-                Assert.That(r2.IsFailure, Is.True);
-                Assert.That(r2.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Success_Value_ToString()
-        {
-            var r = Result<int>.Ok(1);
-            Assert.That(r.ToString(), Is.EqualTo("Success: 1"));
-        }
-
-        [Test]
-        public void Success_Null_Value_ToString()
-        {
-            var r = Result<string?>.Ok(null);
-            Assert.That(r.ToString(), Is.EqualTo("Success: null"));
-        }
-
-        [Test]
-        public void Failure_ToString()
-        {
-            var r = Result<int>.Fail(new BusinessException("Test"));
-            Assert.That(r.ToString(), Is.EqualTo("Failure: Test"));
-        }
-
-        [Test]
-        public async Task AsTask()
-        {
-            var r = await Result.Go(1).AsTask();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.True);
-                Assert.That(r.Value, Is.EqualTo(1));
-            });
-        }
-
-        [Test]
-        public void Failure_Value()
-        {
-            var ir = (IResult)Result<int>.Fail("On no!");
-            Assert.Throws<BusinessException>(() => _ = ir.Value);
-        }
-
-        [Test]
-        public void Adjusts()
-        {
-            var r = Result<Person>.Ok(new Person());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.True);
-                Assert.That(r.Value.Id, Is.EqualTo(0));
-            });
-
-            var r2 = r.Adjusts(v => v.Id = 2);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r2.IsSuccess, Is.True);
-                Assert.That(r2.Value.Id, Is.EqualTo(2));
-            });
-
-            r = Result<Person>.Fail(new BusinessException());
-            r2 = r.Adjusts(v => v.Id = 2);
-            Assert.That(r2.IsSuccess, Is.False);
-        }
-
-        [Test]
-        public async Task AdjustsAsync()
-        {
-            var r = Result<Person>.Ok(new Person());
-            var r2 = await r.AdjustsAsync(async v =>
-            {
-                await Task.CompletedTask;
-                v.Id = 2;
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r2.IsSuccess, Is.True);
-                Assert.That(r2.Value.Id, Is.EqualTo(2));
-            });
-        }
-
-        [Test]
-        public async Task Adjusts2Async()
-        {
-            var r = Result.GoAsync(async () =>
-            {
-                await Task.CompletedTask;
-                return new Person();
-            });
-
-            var r2 = await r.AdjustsAsync(async v =>
-            {
-                await Task.CompletedTask;
-                v.Id = 2;
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r2.IsSuccess, Is.True);
-                Assert.That(r2.Value.Id, Is.EqualTo(2));
-            });
-        }
-
-        [Test]
-        public async Task Adjusts2AsyncTightLoop()
-        {
-            for (int i = 0; i < 10000; i++)
-            {
-                var r = Result.GoAsync(async () =>
-                {
-                    await Task.CompletedTask;
-                    return new Person();
-                });
-
-                var r2 = await r.AdjustsAsync(async v =>
-                {
-                    await Task.CompletedTask;
-                    v.Id = 2;
-                });
-            }
-        }
-
-        public class Person
-        {
-            public int Id { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ResultTest.cs b/tests/CoreEx.Test/Framework/Results/ResultTest.cs
deleted file mode 100644
index 190ab57d..00000000
--- a/tests/CoreEx.Test/Framework/Results/ResultTest.cs
+++ /dev/null
@@ -1,159 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Results;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ResultTest
-    {
-        [Test]
-        public void Success_Property()
-        {
-            var r = Result.Success;
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.True);
-                Assert.That(r.IsFailure, Is.False);
-            });
-        }
-
-        [Test]
-        public void Result_Success_Ctor()
-        {
-            var r = new Result();
-            Assert.That(r, Is.EqualTo(Result.Success));
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public void Success_Is_Success()
-        {
-            var r = Result.Success;
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public void Success_ThrowOnError()
-        {
-            Result.Success.ThrowOnError();
-        }
-
-        [Test]
-        public void Failure_Ctor()
-        {
-            var r = new Result(new BusinessException());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Failure_Is_Failure()
-        {
-            var r = Result.Fail(new BusinessException());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Failure_Is_Failure_With_Message()
-        {
-            var r = Result.Fail("Test");
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>().And.Message.EqualTo("Test"));
-            });
-        }
-
-        [Test]
-        public void Failure_Explicit_Conversion()
-        {
-            var r = (Result) new BusinessException();
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.IsSuccess, Is.False);
-                Assert.That(r.IsFailure, Is.True);
-                Assert.That(r.Error, Is.Not.Null.And.InstanceOf<BusinessException>());
-            });
-        }
-
-        [Test]
-        public void Failure_ThrowOnError()
-        {
-            Assert.Throws<BusinessException>(() => Result.Fail(new BusinessException()).ThrowOnError());
-        }
-
-        [Test]
-        public void Compare_Success_And_Failure()
-        {
-            Assert.That(Result.Fail(new BusinessException()), Is.Not.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public void Compare_Two_Same_Failures()
-        {
-            var r1 = Result.Fail(new BusinessException());
-            var r2 = Result.Fail(new BusinessException());
-            Assert.That(r2, Is.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Different_Failures()
-        {
-            var r1 = Result.Fail(new BusinessException());
-            var r2 = Result.Fail(new BusinessException("Test"));
-            Assert.That(r2, Is.Not.EqualTo(r1));
-        }
-
-        [Test]
-        public void Compare_Two_Different_Types_Failures()
-        {
-            var r1 = Result.Fail(new ValidationException("Test"));
-            var r2 = Result.Fail(new BusinessException("Test"));
-            Assert.That(r2, Is.Not.EqualTo(r1));
-        }
-
-        [Test]
-        public void Success_ToString()
-        {
-            Assert.That(Result.Success.ToString(), Is.EqualTo("Success."));
-        }
-
-        [Test]
-        public void Failure_ToString()
-        {
-            Assert.That(Result.Fail(new BusinessException()).ToString(), Is.EqualTo("Failure: A business error occurred."));
-        }
-
-        [Test]
-        public async Task AsTask()
-        {
-            var r = await Result.Go().AsTask();
-            Assert.That(r, Is.EqualTo(Result.Success));
-        }
-
-        [Test]
-        public void Success_Value()
-        {
-            var ir = (IResult)Result.Success;
-            Assert.That(ir.Value, Is.Null);
-        }
-
-        [Test]
-        public void Failure_Value()
-        {
-            var ir = (IResult)Result.Fail("On no!");
-            Assert.Throws<BusinessException>(() => _ = ir.Value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ThenExtensionsTest.cs b/tests/CoreEx.Test/Framework/Results/ThenExtensionsTest.cs
deleted file mode 100644
index 7b42f380..00000000
--- a/tests/CoreEx.Test/Framework/Results/ThenExtensionsTest.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-using CoreEx.Results;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ThenExtensionsTest
-    {
-        internal static void AssertSuccess(Result result) => Assert.That(result.IsSuccess, Is.True);
-        internal static void AssertFailure(Result result) => Assert.That(result.IsFailure, Is.True);
-
-        internal static T AssertSuccess<T>(Result<T> result)
-        {
-            Assert.That(result.IsSuccess, Is.True);
-            return result.Value;
-        }
-
-        internal static void AssertFailure<T>(Result<T> result) => Assert.That(result.IsFailure, Is.True);
-
-
-        [Test]
-        public void Sync()
-        {
-            int j = 0;
-            AssertSuccess(Result.Go().Then(() => { j++; }));
-            Assert.That(j, Is.EqualTo(1));
-            AssertFailure(Result.Fail(new BusinessException()).Then(() => { Assert.Fail(); }));
-
-            AssertSuccess(Result.Go().Then(() => Result.Success));
-            AssertFailure(Result.Fail(new BusinessException()).Then(() => Result.NotFoundError()));
-
-            j = 0;
-            AssertSuccess(Result.Go(0).Then(_ => { j++; }));
-            Assert.That(j, Is.EqualTo(1));
-            AssertFailure(Result.Go<int>(new NotFoundException()).Then(_ => { Assert.Fail(); }));
-
-            Assert.That(AssertSuccess(Result.Go(0).Then(i => ++i)), Is.EqualTo(1));
-            AssertFailure(Result.Go<int>(new NotFoundException()).Then(i => { Assert.Fail(); return +i; }));
-
-            Assert.That(AssertSuccess(Result.Go(0).Then(i => Result.Ok(++i))), Is.EqualTo(1));
-            AssertFailure(Result.Go<int>(new NotFoundException()).Then(i => { Assert.Fail(); return Result.Ok(++i); }));
-
-            Assert.That(AssertSuccess(Result.Go().ThenAs(() => 1)), Is.EqualTo(1));
-            AssertFailure(Result.NotFoundError().ThenAs(() => { Assert.Fail(); return 1; }));
-
-            Assert.That(AssertSuccess(Result.Go().ThenAs(() => Result.Ok(1))), Is.EqualTo(1));
-            AssertFailure(Result.NotFoundError().ThenAs(() => { Assert.Fail(); return Result.Ok(1); }));
-
-            AssertSuccess(Result.Go(1).ThenAs(_ => { }));
-            AssertFailure(Result<int>.NotFoundError().ThenAs(_ => { Assert.Fail(); }));
-
-            AssertSuccess(Result.Go(1).ThenAs(_ => Result.Success));
-            AssertFailure(Result<int>.NotFoundError().ThenAs(_ => Result.Success));
-
-            Assert.That(AssertSuccess(Result.Go(1).ThenAs(i => i + 1f)), Is.EqualTo(2f));
-            AssertFailure(Result.Go<int>(new NotFoundException()).ThenAs(i => { Assert.Fail(); return i + 1f; }));
-
-            Assert.That(AssertSuccess(Result.Go(1).ThenAs(i => Result.Ok(i + 1f))), Is.EqualTo(2f));
-            AssertFailure(Result.Go<int>(new NotFoundException()).ThenAs(i => { Assert.Fail(); return Result.Ok(i + 1f); }));
-
-            AssertSuccess(Result.Go().Then(() => { }));
-            AssertFailure(Result.NotFoundError().ThenFrom(() => { Assert.Fail(); return new IToResultTest(); }));
-
-            Assert.That(AssertSuccess(Result.Go(0).ThenFrom(_ => new ITypedToResultTest())), Is.EqualTo(1));
-            AssertFailure(Result<int>.NotFoundError().ThenFrom(_ => { Assert.Fail(); return new ITypedToResultTest(); }));
-
-            Assert.That(AssertSuccess(Result.Go(0).ThenFrom(_ => new IToResultIntTest())), Is.EqualTo(1));
-            AssertFailure(Result<int>.NotFoundError().ThenFrom(_ => { Assert.Fail(); return new IToResultIntTest(); }));
-
-            Assert.That(AssertSuccess(Result.Go().ThenFromAs<int>(() => new ITypedToResultTest())), Is.EqualTo(1));
-            AssertFailure(Result.NotFoundError().ThenFromAs<int>(() => { Assert.Fail(); return new ITypedToResultTest(); }));
-
-            Assert.That(AssertSuccess(Result.Go().ThenFromAs<int>(() => new IToResultIntTest())), Is.EqualTo(1));
-            AssertFailure(Result.NotFoundError().ThenFromAs<int>(() => { Assert.Fail(); return new IToResultIntTest(); }));
-
-            Assert.That(AssertSuccess(Result.Go(1f).ThenFromAs<float, int>(_ => new ITypedToResultTest())), Is.EqualTo(1));
-            AssertFailure(Result<float>.NotFoundError().ThenFromAs<float, int>(_ => { Assert.Fail(); return new ITypedToResultTest(); }));
-
-            Assert.That(AssertSuccess(Result.Go(1f).ThenFromAs<float, int>(_ => new IToResultIntTest())), Is.EqualTo(1));
-            AssertFailure(Result<float>.NotFoundError().ThenFromAs<float, int>(_ => { Assert.Fail(); return new IToResultIntTest(); }));
-        }
-
-        [Test]
-        public async Task Async()
-        {
-            int j = 0;
-            AssertSuccess(await Result.Go().ThenAsync(() => { ++j;  return Task.CompletedTask; })); 
-            Assert.That(j, Is.EqualTo(1));
-            AssertFailure(await Result.Fail(new BusinessException()).ThenAsync(() => { Assert.Fail(); return Task.CompletedTask; }));
-
-            AssertSuccess(await Result.Go().ThenAsync(() => Task.FromResult(Result.Success)));
-            AssertFailure(await Result.Fail(new BusinessException()).ThenAsync(() => Task.FromResult(Result.NotFoundError())));
-
-            j = 0;
-            AssertSuccess(await Result.Go(0).ThenAsync(_ => { ++j; return Task.CompletedTask; }));
-            Assert.That(j, Is.EqualTo(1));
-            AssertFailure(await Result.Go<int>(new NotFoundException()).ThenAsync(_ => { Assert.Fail(); return Task.CompletedTask; }));
-
-            Assert.That(AssertSuccess(await Result.Go(1).ThenAsync(i => Task.FromResult(++i))), Is.EqualTo(2));
-            AssertFailure(await Result.Go<int>(new NotFoundException()).ThenAsync(i => { Assert.Fail(); return Task.FromResult(++i); }));
-
-            Assert.That(AssertSuccess(await Result.Go(1).ThenAsync(i => Task.FromResult(Result.Ok(++i)))), Is.EqualTo(2));
-            AssertFailure(await Result.Go<int>(new NotFoundException()).ThenAsync(i => { Assert.Fail(); return Task.FromResult(Result.Ok(++i)); }));
-
-            Assert.That(AssertSuccess(await Result.Go().ThenAsAsync(() => Task.FromResult(1))), Is.EqualTo(1));
-            AssertFailure(await Result.NotFoundError().ThenAsAsync(() => { Assert.Fail(); return Task.FromResult(1); }));
-
-            Assert.That(AssertSuccess(await Result.Go().ThenAsAsync(() => Task.FromResult(Result.Ok(1)))), Is.EqualTo(1));
-            AssertFailure(await Result.NotFoundError().ThenAsAsync(() => { Assert.Fail(); return Task.FromResult(Result.Ok(1)); }));
-
-            AssertSuccess(await Result.Go(1).ThenAsAsync(_ => Task.CompletedTask));
-            AssertFailure(await Result<int>.NotFoundError().ThenAsAsync(_ => { Assert.Fail(); return Task.CompletedTask; }));
-
-            AssertSuccess(await Result.Go(1).ThenAsAsync(_ => Task.FromResult(Result.Success)));
-            AssertFailure(await Result<int>.NotFoundError().ThenAsAsync(_ => Task.FromResult(Result.Success)));
-
-            Assert.That(AssertSuccess(await Result.Go(1).ThenAsAsync(i => Task.FromResult(i + 1f))), Is.EqualTo(2f));
-            AssertFailure(await Result.Go<int>(new NotFoundException()).ThenAsAsync(i => { Assert.Fail(); return Task.FromResult(i + 1f); }));
-
-            Assert.That(AssertSuccess(await Result.Go(1).ThenAsAsync(i => Task.FromResult(Result.Ok(i + 1f)))), Is.EqualTo(2f));
-            AssertFailure(await Result.Go<int>(new NotFoundException()).ThenAsAsync(i => { Assert.Fail(); return Task.FromResult(Result.Ok(i + 1f)); }));
-
-            AssertSuccess(await Result.Go().ThenFromAsync(async () => await Task.FromResult(new IToResultTest())));
-            AssertFailure(await Result.NotFoundError().ThenFromAsync(async () => { Assert.Fail(); return await Task.FromResult(new IToResultTest()); }));
-
-            Assert.That(AssertSuccess(await Result.Go(0).ThenFromAsync(async _ => await Task.FromResult(new ITypedToResultTest()))), Is.EqualTo(1));
-            AssertFailure(await Result<int>.NotFoundError().ThenFromAsync(async _ => { Assert.Fail(); return await Task.FromResult(new ITypedToResultTest()); }));
-
-            Assert.That(AssertSuccess(await Result.Go(0).ThenFromAsync(async _ => await Task.FromResult(new IToResultIntTest()))), Is.EqualTo(1));
-            AssertFailure(await Result<int>.NotFoundError().ThenFromAsync(async _ => { Assert.Fail(); return await Task.FromResult(new IToResultIntTest()); }));
-
-            Assert.That(AssertSuccess(await Result.Go().ThenFromAsAsync<int>(async () => await Task.FromResult(new ITypedToResultTest()))), Is.EqualTo(1));
-            AssertFailure(await Result.NotFoundError().ThenFromAsAsync<int>(async () => { Assert.Fail(); return await Task.FromResult(new ITypedToResultTest()); }));
-
-            Assert.That(AssertSuccess(await Result.Go().ThenFromAsAsync<int>(async () => await Task.FromResult(new IToResultIntTest()))), Is.EqualTo(1));
-            AssertFailure(await Result.NotFoundError().ThenFromAsAsync<int>(async () => { Assert.Fail(); return await Task.FromResult(new IToResultIntTest()); }));
-
-            Assert.That(AssertSuccess(await Result.Go(1f).ThenFromAsAsync<float, int>(async _ => await Task.FromResult(new ITypedToResultTest()))), Is.EqualTo(1));
-            AssertFailure(await Result<float>.NotFoundError().ThenFromAsAsync<float, int>(async _ => { Assert.Fail(); return await Task.FromResult(new ITypedToResultTest()); }));
-
-            Assert.That(AssertSuccess(await Result.Go(1f).ThenFromAsAsync<float, int>(async _ => await Task.FromResult(new IToResultIntTest()))), Is.EqualTo(1));
-            AssertFailure(await Result<float>.NotFoundError().ThenFromAsAsync<float, int>(async _ => { Assert.Fail(); return await Task.FromResult(new IToResultIntTest()); }));
-
-            Func<int, Task<Result>>? func = null;
-            var t = Result.Go().ThenAsync(() => func?.Invoke(1) ?? Result.SuccessTask).Then(() => { });
-        }
-
-        public class IToResultTest : IToResult
-        {
-            public Result ToResult() => Result.Success;
-        }
-
-        public class ITypedToResultTest : ITypedToResult
-        {
-            public Result<T> ToResult<T>() => Result.Ok((T)(object)1);
-
-            public Result ToResult() => Result.Success;
-        }
-
-        public class IToResultIntTest : IToResult<int>
-        {
-            public Result<int> ToResult() => Result.Ok(1);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/ValidationExtensionsTest.cs b/tests/CoreEx.Test/Framework/Results/ValidationExtensionsTest.cs
deleted file mode 100644
index 32e8605c..00000000
--- a/tests/CoreEx.Test/Framework/Results/ValidationExtensionsTest.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-using CoreEx.Invokers;
-using CoreEx.Results;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class ValidationExtensionsTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public void Ensure_Success_NonDefaultValue()
-        {
-            var r = Result.Ok(1).Required();
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public void Ensure_Success_DefaultValue()
-        {
-            var r = Result.Ok(0).Required();
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("A data validation error occurred. [value: Value is required.]"));
-        }
-
-        [Test]
-        public void Ensure_Failure()
-        {
-            var r = Result<int>.Fail("bad").Required();
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-        }
-
-        [Test]
-        public async Task Validation_Success_Entity_ValidationContext_Valid()
-        {
-            var r = await Result.Ok(new Person { Name = "Tom", Age = 18 }).ValidateAsync(() => _personValidator);
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_Success_Entity_ValidationContext_Invalid()
-        {
-            var r = await Result.Ok(new Person { Name = "Tom" }).ValidateAsync(_personValidator);
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("A data validation error occurred. [Age: Age must be greater than 0.]"));
-        }
-
-        [Test]
-        public async Task Validation_Failure_Entity_ValidationContext_Invalid()
-        {
-            var r = await Result<Person>.Fail("bad").ValidateAsync(_personValidator);
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-        }
-
-        [Test]
-        public async Task Validation_Success_Entity_IValidationResult_Valid()
-        {
-            var r = await Result.Ok(new Person { Name = "Tom", Age = 18 }).ValidateAsync(_personValidator);
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_Success_Entity_IValidationResult_InValid()
-        {
-            var r = await Result.Ok(new Person { Name = "Tom" }).ValidateAsync(v => v.Mandatory().Entity(_personValidator));
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("A data validation error occurred. [value.Age: Age must be greater than 0.]"));
-        }
-
-        [Test]
-        public async Task Validation_Failure_Entity_IValidationResult_InValid()
-        {
-            var r = await Result<Person>.Fail("bad").ValidateAsync(v => v.Mandatory().Entity(_personValidator));
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("bad"));
-        }
-
-        [Test]
-        public async Task Validation_Success_Other_Value()
-        {
-            var r = await Result.Go().ValidatesAsync(1, v => v.Mandatory().CompareValue(CompareOperator.LessThanEqual, 10));
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_Failure_Other_Value()
-        {
-            var id = 88;
-            var r = await Result.Go().ValidatesAsync(id, v => v.Mandatory().CompareValue(CompareOperator.LessThanEqual, 10));
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("A data validation error occurred. [id: Identifier must be less than or equal to 10.]"));
-        }
-
-        [Test]
-        public async Task Validation_Success_Other_String()
-        {
-            string? email = "a@b";
-            var r = await Result.Go().ValidatesAsync(email, v => v.Email());
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_Success_Other_String2()
-        {
-            string email = "a@b";
-            var r = await Result.Go(email).ValidatesAsync(email, v => v.Email());
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_Simulate_Ensure_And_Validation()
-        {
-            var value = new Person { Name = "Tom", Age = 18 };
-            var id = 88;
-
-            var r = await Result.Go().Manager(this, InvokerArgs.Create).WithAsAsync(r =>
-            {
-                return Result.Go(value)
-                    .Required()
-                    .Then(v => v.Id = id)
-                    .ThenAsync(v => v.Validate().Configure(c => c.Entity(_personValidator)).ValidateAsync());
-            });
-
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_MultiValidator_Success()
-        {
-            var value = new Person { Name = "Tom", Age = 18 };
-            var r = await Result.Go().ValidateAsync(() => MultiValidator.Create().Add(value.Validate().Configure(c => c.Mandatory().Entity(_personValidator))));
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_MultiValidator_Failure()
-        {
-            var value = new Person { Name = "Tom" };
-            var r = await Result.Go().ValidateAsync(() => MultiValidator.Create().Add(value.Validate().Configure(c => c.Mandatory().Entity(_personValidator))));
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("A data validation error occurred. [value.Age: Age must be greater than 0.]"));
-        }
-
-        [Test]
-        public async Task Validation_MultiValidator_Value_Success()
-        {
-            var value = new Person { Name = "Tom", Age = 18 };
-            var r = await Result.Go(value).ValidateAsync(p => MultiValidator.Create().Add(p.Validate().Configure(c => c.Mandatory().Entity(_personValidator))));
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_MultiValidator_Value_Failure()
-        {
-            var value = new Person { Name = "Tom" };
-            var r = await Result.Go(value).ValidateAsync(_ => MultiValidator.Create().Add(value.Validate().Configure(c => c.Mandatory().Entity(_personValidator))));
-            Assert.That(r.Error, Is.Not.Null.And.Message.EqualTo("A data validation error occurred. [value.Age: Age must be greater than 0.]"));
-        }
-
-        private static readonly Validator<Person> _personValidator = Validator.Create<Person>()
-            .HasProperty(x => x.Name, p => p.Mandatory())
-            .HasProperty(x => x.Age, p => p.CompareValue(CompareOperator.GreaterThan, 0));
-
-        public class Person
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-            public int Age { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Results/WhenExtensionsTest.cs b/tests/CoreEx.Test/Framework/Results/WhenExtensionsTest.cs
deleted file mode 100644
index d54063e3..00000000
--- a/tests/CoreEx.Test/Framework/Results/WhenExtensionsTest.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using CoreEx.Results;
-using NUnit.Framework;
-using System.Threading.Tasks;
-using static CoreEx.Test.Framework.Results.ThenExtensionsTest;
-
-namespace CoreEx.Test.Framework.Results
-{
-    [TestFixture]
-    public class WhenExtensionsTest
-    {
-        internal static void AssertSuccess(Result result) => Assert.That(result.IsSuccess, Is.True);
-        internal static void AssertFailure(Result result) => Assert.That(result.IsFailure, Is.True);
-
-        internal static T AssertSuccess<T>(Result<T> result)
-        {
-            Assert.That(result.IsSuccess, Is.True);
-            return result.Value;
-        }
-
-        internal static void AssertFailure<T>(Result<T> result) => Assert.That(result.IsFailure, Is.True);
-
-        [Test]
-        public void Sync()
-        {
-            int j = 0;
-            AssertSuccess(Result.Go().When(() => true, () => { j++; }).When(() => false, () => { j++; }));
-            Assert.That(j, Is.EqualTo(1));
-            AssertFailure(Result.Fail(new BusinessException()).When(() => true, () => { Assert.Fail(); }));
-
-            AssertSuccess(Result.Go().When(() => true, () => Result.Success).When(() => false, () => Result.Fail()));
-            AssertFailure(Result.Fail(new BusinessException()).When(() => true, () => Result.NotFoundError()));
-
-            j = 0;
-            AssertSuccess(Result.Go(0).When(_ => true, _ => { j++; }).When(_ => false, _ => { Assert.Fail(); }));
-            Assert.That(j, Is.EqualTo(1));
-            AssertFailure(Result.Go<int>(new NotFoundException()).When(_ => true, _ => { Assert.Fail(); }));
-
-            Assert.That(AssertSuccess(Result.Go(0).When(_ => true, i => ++i).When(_ => false, _ => Assert.Fail())), Is.EqualTo(1));
-            AssertFailure(Result.Go<int>(new NotFoundException()).When(_ => true, i => { Assert.Fail(); return +i; }));
-
-            Assert.That(AssertSuccess(Result.Go(0).When(_ => true, i => Result.Ok(++i)).When(_ => false, i => Result.Ok(++i))), Is.EqualTo(1));
-            AssertFailure(Result.Go<int>(new NotFoundException()).When(_ => true, i => { Assert.Fail(); return Result.Ok(++i); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go().WhenAs(() => true, () => 1)), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go().WhenAs(() => false, () => 1)), Is.EqualTo(0));
-            });
-            AssertFailure(Result.NotFoundError().WhenAs(() => true, () => { Assert.Fail(); return 1; }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go().WhenAs(() => true, () => Result.Ok(1))), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go().WhenAs(() => false, () => Result.Ok(1))), Is.EqualTo(0));
-            });
-            AssertFailure(Result.NotFoundError().WhenAs(() => true, () => { Assert.Fail(); return Result.Ok(1); }));
-
-            AssertSuccess(Result.Go(1).WhenAs(_ => true, _ => { }));
-            AssertSuccess(Result.Go(1).WhenAs(_ => false, _ => { Assert.Fail(); }));
-            AssertFailure(Result<int>.NotFoundError().WhenAs(_ => true, _ => { Assert.Fail(); }));
-
-            AssertSuccess(Result.Go(1).WhenAs(_ => true, _ => Result.Success));
-            AssertSuccess(Result.Go(1).WhenAs(_ => false, _ => Result.Fail()));
-            AssertFailure(Result<int>.NotFoundError().WhenAs(_ => true, _ => Result.Success));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go(1).WhenAs(_ => true, i => i + 1f)), Is.EqualTo(2f));
-                Assert.That(AssertSuccess(Result.Go(1).WhenAs(_ => false, i => i + 1f)), Is.EqualTo(0f));
-            });
-            AssertFailure(Result.Go<int>(new NotFoundException()).WhenAs(_ => true, i => { Assert.Fail(); return i + 1f; }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go(1).WhenAs(_ => true, i => Result.Ok(i + 1f))), Is.EqualTo(2f));
-                Assert.That(AssertSuccess(Result.Go(1).WhenAs(_ => false, i => Result.Ok(i + 1f))), Is.EqualTo(0f));
-            });
-            AssertFailure(Result.Go<int>(new NotFoundException()).WhenAs(_ => true, i => { Assert.Fail(); return Result.Ok(i + 1f); }));
-
-            AssertSuccess(Result.Go().WhenFrom(() => true, () => new IToResultTest()));
-            AssertSuccess(Result.Go().WhenFrom(() => false, () => { Assert.Fail(); return new IToResultTest(); }));
-            AssertFailure(Result.NotFoundError().WhenFrom(() => true, () => { Assert.Fail(); return new IToResultTest(); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go(0).WhenFrom(_ => true, _ => new ITypedToResultTest())), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go(0).WhenFrom(_ => false, _ => new ITypedToResultTest())), Is.EqualTo(0));
-            });
-            AssertFailure(Result<int>.NotFoundError().WhenFrom(_ => true, _ => { Assert.Fail(); return new ITypedToResultTest(); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go(0).WhenFrom(_ => true, _ => new IToResultIntTest())), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go(0).WhenFrom(_ => false, _ => new IToResultIntTest())), Is.EqualTo(0));
-            });
-            AssertFailure(Result<int>.NotFoundError().WhenFrom(_ => true, _ => { Assert.Fail(); return new IToResultIntTest(); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go().WhenFromAs<int>(() => true, () => new ITypedToResultTest())), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go().WhenFromAs<int>(() => false, () => new ITypedToResultTest())), Is.EqualTo(0));
-            });
-            AssertFailure(Result.NotFoundError().WhenFromAs<int>(() => true, () => { Assert.Fail(); return new ITypedToResultTest(); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go().WhenFromAs<int>(() => true, () => new IToResultIntTest())), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go().WhenFromAs<int>(() => false, () => new IToResultIntTest())), Is.EqualTo(0));
-            });
-            AssertFailure(Result.NotFoundError().WhenFromAs<int>(() => true, () => { Assert.Fail(); return new IToResultIntTest(); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go(2.2f).WhenFromAs<float, int>(_ => true, _ => new ITypedToResultTest())), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go(2.2f).WhenFromAs<float, int>(_ => false, _ => new ITypedToResultTest())), Is.EqualTo(0));
-            });
-            AssertFailure(Result<float>.NotFoundError().WhenFromAs<float, int>(_ => true, _ => { Assert.Fail(); return new ITypedToResultTest(); }));
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(AssertSuccess(Result.Go(2.2f).WhenFromAs<float, int>(_ => true, _ => new IToResultIntTest())), Is.EqualTo(1));
-                Assert.That(AssertSuccess(Result.Go(2.2f).WhenFromAs<float, int>(_ => false, _ => new IToResultIntTest())), Is.EqualTo(0));
-            });
-            AssertFailure(Result<float>.NotFoundError().WhenFromAs<float, int>(_ => true, _ => { Assert.Fail(); return new IToResultIntTest(); }));
-        }
-
-        [Test]
-        public void Sync_Otherwise()
-        {
-            int j = 0;
-            AssertSuccess(Result.Go().When(() => j == 0, () => { ++j; }, () => { j += 10; }));
-            Assert.That(j, Is.EqualTo(1));
-
-            AssertSuccess(Result.Go().When(() => j == 0, () => { ++j; }, () => { j += 10; }));
-            Assert.That(j, Is.EqualTo(11));
-
-            j = AssertSuccess(Result.Go(0).When(x => x == 0, x => ++x, x => x += 10));
-            Assert.That(j, Is.EqualTo(1));
-
-            j = AssertSuccess(Result.Go(1).When(x => x == 0, x => ++x, x => x += 10));
-            Assert.That(j, Is.EqualTo(11));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Solace/PubSub/EventDataToPubSubConverterTest.cs b/tests/CoreEx.Test/Framework/Solace/PubSub/EventDataToPubSubConverterTest.cs
deleted file mode 100644
index abfa2163..00000000
--- a/tests/CoreEx.Test/Framework/Solace/PubSub/EventDataToPubSubConverterTest.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using CoreEx.Events;
-using CoreEx.Solace.PubSub;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using SolaceSystems.Solclient.Messaging;
-using System;
-
-namespace CoreEx.Test.Framework.Solace.PubSub
-{
-    [TestFixture]
-    public class EventDataToPubSubConverterTest
-    {
-        [Test]
-        public void Convert_NoValue_Using_EventDataToPubSubMessageConverter()
-        {
-            var c = new EventDataToPubSubMessageConverter();
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY" });
-            AssertPubSubMessage(m);
-        }
-
-        [Test]
-        public void Convert_NoValue_WithPartitionKey_Using_EventDataToPubSubMessageConverter()
-        {
-            var c = new EventDataToPubSubMessageConverter();
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", PartitionKey = "ZZZ" });
-            AssertPubSubMessage(m);
-        }
-
-        [Test]
-        public void Convert_WithValue_Using_EventDataToPubSubMessageConverter()
-        {
-            var c = new EventDataToPubSubMessageConverter();
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", Value = new Product { Id = "X", Name = "Xxx", Price = 9.99m } });
-            AssertPubSubMessage(m);
-        }
-
-        [Test]
-        public void Convert_NoValue_Using_TextJsonEventSerialization()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer { SerializeValueOnly = false };
-
-            var c = new EventDataToPubSubMessageConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY" });
-            AssertPubSubMessage(m);
-        }
-
-        [Test]
-        public void Convert_WithValue_Using_TextJsonEventSerialization()
-        {
-            var es = new CoreEx.Text.Json.EventDataSerializer { SerializeValueOnly = false };
-
-            var c = new EventDataToPubSubMessageConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", Value = new Product { Id = "X", Name = "Xxx", Price = 9.99m } });
-            AssertPubSubMessage(m);
-        }
-
-        [Test]
-        public void Convert_NoValue_Using_TextJsonCloudEventSerialization()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer();
-
-            var c = new EventDataToPubSubMessageConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Source = new Uri("xxx", UriKind.Relative), Action = "YYY" });
-            AssertPubSubMessage(m);
-        }
-
-        [Test]
-        public void Convert_WithValue_Using_TextJsonCloudEventSerialization()
-        {
-            var es = new CoreEx.Text.Json.CloudEventSerializer();
-
-            var c = new EventDataToPubSubMessageConverter(es);
-            var m = c.Convert(new EventData { Id = "123", Subject = "XXX", Action = "YYY", Source = new Uri("xxx", UriKind.Relative), Value = new Product { Id = "X", Name = "Xxx", Price = 9.99m } });
-            AssertPubSubMessage(m);
-        }
-
-        private static void AssertPubSubMessage(IMessage m)
-        {
-            Assert.That(m, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(m!.ApplicationMessageId, Is.EqualTo("123"));
-                Assert.That(m.UserPropertyMap.GetString("Subject"), Is.EqualTo("xxx"));
-                Assert.That(m.UserPropertyMap.GetString("Action"), Is.EqualTo("yyy"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/UnitTesting/AgentTest.cs b/tests/CoreEx.Test/Framework/UnitTesting/AgentTest.cs
deleted file mode 100644
index d859c0c1..00000000
--- a/tests/CoreEx.Test/Framework/UnitTesting/AgentTest.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-using CoreEx.TestApi;
-using NUnit.Framework;
-using UnitTestEx;
-using Microsoft.Extensions.Logging;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Threading;
-using CoreEx.Json;
-using CoreEx.Configuration;
-using CoreEx.Http;
-using CoreEx.TestFunction.Models;
-using UnitTestEx.Expectations;
-using UnitTestEx.Assertors;
-
-namespace CoreEx.Test.Framework.UnitTesting
-{
-    [TestFixture]
-    public class AgentTest
-    {
-        [OneTimeSetUp]
-        public void SetUp() => TestSetUp.Default.JsonSerializer = new CoreEx.Text.Json.JsonSerializer().ToUnitTestEx();
-
-        [Test]
-        public void Get()
-        {
-            var test = ApiTester.Create<Startup>();
-            test.Agent().With<ProductAgent, Product>()
-                .ExpectIdentifier()
-                .ExpectValue(new Product { Name = "Apple", Price = 0.79m })
-                .Run(a => a.GetAsync("abc"))
-                .AssertOK();
-        }
-
-        [Test]
-        public void Update_Error()
-        {
-            var test = ApiTester.Create<Startup>();
-            var result = test.Agent().With<ProductAgent, Product>()
-                .ExpectErrorType(CoreEx.Abstractions.ErrorType.ValidationError)
-                .ExpectError("Zed is dead.")
-                .Run(a => a.UpdateAsync(new Product { Name = "Apple", Price = 0.79m }, "Zed"))
-                .Result;
-
-            Assert.That(result.Response.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.BadRequest));
-        }
-
-        [Test]
-        public void Delete()
-        {
-            var test = ApiTester.Create<Startup>();
-            var res = test.Agent().With<ProductAgent>()
-                .Run(a => a.DeleteAsync("abc"))
-                .AssertNoContent();
-
-            var result = (HttpResultAssertor)res;
-            Assert.That(result.Response.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.NoContent));
-        }
-
-        [Test]
-        public void Catalogue()
-        {
-            var test = ApiTester.Create<Startup>();
-            var res = test.Agent().With<ProductAgent>()
-                .Run(a => a.CatalogueAsync("abc"))
-                .AssertOK()
-                .AssertContentTypePlainText()
-                .AssertContent("Catalog for 'abc'.");
-
-            var result = (HttpResultAssertor)res;
-            Assert.That(result.Response.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
-        }
-
-        public class ProductAgent(HttpClient client, IJsonSerializer jsonSerializer, CoreEx.ExecutionContext executionContext) : CoreEx.Http.TypedHttpClientBase<ProductAgent>(client, jsonSerializer, executionContext)
-        {
-            public Task<HttpResult<Product>> GetAsync(string id, CoreEx.Http.HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-                => GetAsync<Product>("products/{id}", requestOptions: requestOptions, args: new IHttpArg[] { new HttpArg<string>("id", id) }, cancellationToken: cancellationToken);
-
-            public Task<HttpResult> DeleteAsync(string id, CoreEx.Http.HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-                => DeleteAsync("products/{id}", requestOptions: requestOptions, args: new IHttpArg[] { new HttpArg<string>("id", id) }, cancellationToken: cancellationToken);
-
-            public Task<HttpResult<Product>> UpdateAsync(Product value, string id, CoreEx.Http.HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-                => PutAsync<Product, Product>("products/{id}", value, requestOptions: requestOptions, args: new IHttpArg[] { new HttpArg<string>("id", id) }, cancellationToken: cancellationToken);
-
-            public Task<HttpResult> CatalogueAsync(string id, CoreEx.Http.HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-                => GetAsync("products/{id}/catalogue", requestOptions: requestOptions, args: new IHttpArg[] { new HttpArg<string>("id", id) }, cancellationToken: cancellationToken);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/UnitTesting/ExpectationsTest.cs b/tests/CoreEx.Test/Framework/UnitTesting/ExpectationsTest.cs
deleted file mode 100644
index 94ed1893..00000000
--- a/tests/CoreEx.Test/Framework/UnitTesting/ExpectationsTest.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Http;
-using NUnit.Framework;
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx.Expectations;
-using UnitTestEx;
-
-namespace CoreEx.Test.Framework.UnitTesting
-{
-    [TestFixture]
-    public class ExpectationsTest
-    {
-        [Test]
-        public void ExpectIdentifier()
-        {
-            var gt = GenericTester.CreateFor<Entity<string>>().ExpectIdentifier();
-            var ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string>())))!;
-            Assert.That(ex.Message, Does.Contain("Expected IIdentifier.Id to have a non-null value."));
-
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { Id = "x" }));
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectIdentifier("y");
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { Id = "x" })))!;
-            Assert.That(ex.Message, Does.Contain("Expected IIdentifier.Id value of 'y'; actual 'x'."));
-
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { Id = "y" }));
-        }
-
-        [Test]
-        public void ExpectPrimaryKey()
-        {
-            var gt = GenericTester.CreateFor<Entity2<string>>().ExpectPrimaryKey();
-            var ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity2<string>())))!;
-            Assert.That(ex.Message, Does.Contain("Expected IPrimaryKey.PrimaryKey.Args to have one or more non-default values."));
-
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity2<string> { Id = "x" }));
-
-            gt = GenericTester.CreateFor<Entity2<string>>().ExpectPrimaryKey("y");
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity2<string> { Id = "x" })))!;
-            Assert.That(ex.Message, Does.Contain("Expected IPrimaryKey.PrimaryKey value of 'y'; actual 'x'."));
-
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity2<string> { Id = "y" }));
-        }
-
-        [Test]
-        public void ExpectETag()
-        {
-            var gt = GenericTester.CreateFor<Entity<string>>().ExpectETag();
-            var ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string>())))!;
-            Assert.That(ex.Message, Does.Contain("Expected IETag.ETag to have a non-null value."));
-
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ETag = "xxx" }));
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectETag("yyy");
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ETag = "yyy" })))!;
-            Assert.That(ex.Message, Does.Contain("Expected IETag.ETag value of 'yyy' to be different to actual."));
-
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ETag = "xxx" }));
-        }
-
-        [Test]
-        public void ExpectChangeLogCreated()
-        {
-            var gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogCreated();
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { CreatedBy = "Anonymous", CreatedDate = DateTime.UtcNow } }));
-
-            var ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string>())))!;
-            Assert.That(ex.Message, Does.Contain("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit) to have a non-null value."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog() })))!;
-            Assert.That(ex.Message, Does.Contain("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit).CreatedBy value of 'Anonymous'; actual was null."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { CreatedBy = "Anonymous" } })))!;
-            Assert.That(ex.Message, Does.Contain("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit).CreatedDate to have a non-null value."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { CreatedBy = "Anonymous", CreatedDate = DateTime.UtcNow.AddMinutes(-1) } })))!;
-            Assert.That(ex.Message.Contains("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit).CreatedDate value of '") && ex.Message.Contains("' must be greater than or equal to expected."), Is.True);
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogCreated("Banana");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { CreatedBy = "Banana", CreatedDate = DateTime.UtcNow } }));
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogCreated("b*");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { CreatedBy = "Banana", CreatedDate = DateTime.UtcNow } }));
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogCreated("*");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { CreatedBy = "Banana", CreatedDate = DateTime.UtcNow } }));
-        }
-
-        [Test]
-        public void ExpectChangeLogUpdated()
-        {
-            var gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogUpdated();
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { UpdatedBy = "Anonymous", UpdatedDate = DateTime.UtcNow } }));
-
-            var ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string>())))!;
-            Assert.That(ex.Message, Does.Contain("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit) to have a non-null value."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog() })))!;
-            Assert.That(ex.Message, Does.Contain("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit).UpdatedBy value of 'Anonymous'; actual was null."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { UpdatedBy = "Anonymous" } })))!;
-            Assert.That(ex.Message, Does.Contain("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit).UpdatedDate to have a non-null value."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { UpdatedBy = "Anonymous", UpdatedDate = DateTime.UtcNow.AddMinutes(-1) } })))!;
-            Assert.That(ex.Message.Contains("Expected Change Log (IChangeLogAuditLog.ChangeLogAudit).UpdatedDate value of '") && ex.Message.Contains("' must be greater than or equal to expected."), Is.True);
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogUpdated("Banana");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { UpdatedBy = "Banana", UpdatedDate = DateTime.UtcNow } }));
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogUpdated("b*");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { UpdatedBy = "Banana", UpdatedDate = DateTime.UtcNow } }));
-
-            gt = GenericTester.CreateFor<Entity<string>>().ExpectChangeLogUpdated("*");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertValueAsync(null, new Entity<string> { ChangeLog = new ChangeLog { UpdatedBy = "Banana", UpdatedDate = DateTime.UtcNow } }));
-        }
-
-        [Test]
-        public void ExpectErrorType()
-        {
-            var gt = GenericTester.CreateFor<Entity<string>>().ExpectErrorType(CoreEx.Abstractions.ErrorType.ValidationError);
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertAsync(null, new ValidationException()));
-
-            var ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertAsync(null, new BusinessException())))!;
-            Assert.That(ex.Message, Does.Contain("Expected error type of 'ValidationError' but actual was 'BusinessError'."));
-
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertAsync(null, new Exception())))!;
-            Assert.That(ex.Message, Does.Contain("Expected error type of 'ValidationError' but none was returned."));
-
-            var hr = new HttpResponseMessage(System.Net.HttpStatusCode.BadRequest);
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertAsync(gt.ExpectationsArranger.CreateArgs(null, null).AddExtra(hr))))!;
-            Assert.That(ex.Message, Does.Contain("Expected error type of 'ValidationError' but none was returned."));
-
-            hr.Headers.Add(HttpConsts.ErrorTypeHeaderName, "BusinessError");
-            ex = Assert.Throws<Exception>(() => ArrangerAssert(async () => await gt.ExpectationsArranger.AssertAsync(gt.ExpectationsArranger.CreateArgs(null, null).AddExtra(hr))))!;
-            Assert.That(ex.Message, Does.Contain("Expected error type of 'ValidationError' but actual was 'BusinessError'."));
-
-            hr.Headers.Add(HttpConsts.ErrorTypeHeaderName, "ValidationError");
-            ArrangerAssert(async () => await gt.ExpectationsArranger.AssertAsync(gt.ExpectationsArranger.CreateArgs(null, null).AddExtra(hr)));
-        }
-
-        private static void ArrangerAssert(Func<Task> func)
-        {
-            try
-            {
-                var t = Task.Run(() => func());
-                t.Wait();
-            }
-            catch (AggregateException agex) when (agex.InnerException is not null && agex.InnerException is AssertionException aex)
-            {
-                throw new Exception(aex.Message, aex);
-            }
-            catch (AssertionException aex)
-            {
-                throw new Exception(aex.Message, aex);
-            }
-        }
-
-        public class Entity<TId> : IIdentifier<TId>, IChangeLog, IETag where TId : IComparable<TId>, IEquatable<TId>
-        {
-            public TId? Id { get; set; }
-
-            public string? Name { get; set; }
-
-            public ChangeLog? ChangeLog { get; set; }
-
-            public string? ETag { get; set; }
-        }
-
-        public class Entity2<TId> : IPrimaryKey, IChangeLog, IETag where TId : IComparable<TId>, IEquatable<TId>
-        {
-            public TId? Id { get; set; }
-
-            public string? Name { get; set; }
-
-            public CompositeKey PrimaryKey => new(Id);
-
-            public ChangeLog? ChangeLog { get; set; }
-
-            public string? ETag { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/UnitTesting/ValidationTest.cs b/tests/CoreEx.Test/Framework/UnitTesting/ValidationTest.cs
deleted file mode 100644
index f394a597..00000000
--- a/tests/CoreEx.Test/Framework/UnitTesting/ValidationTest.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using NUnit.Framework;
-using UnitTestEx;
-using UnitTestEx.Expectations;
-using CoreEx;
-using CoreEx.TestApi;
-using CoreEx.TestApi.Validation;
-using CoreEx.TestFunction.Models;
-using CoreEx.Localization;
-using CoreEx.Validation;
-
-namespace CoreEx.Test.Framework.UnitTesting
-{
-    [TestFixture]
-    public class ValidationTest
-    {
-        [Test]
-        public void Validate_Error()
-        {
-            GenericTester.Create<Startup>()
-                .ExpectErrors("Name is required.", "Price must be between 0 and 100.")
-                .Validation().With<ProductValidator, Product>(new Product { Price = 450.95m })
-                .AssertErrors("Name is required.", "Price must be between 0 and 100.");
-        }
-
-        [Test]
-        public void Validate_OK()
-        {
-            GenericTester.Create<Startup>()
-                .ExpectSuccess()
-                .Validation().With<ProductValidator, Product>(new Product { Id = "abc", Name = "xyz", Price = 50.95m });
-        }
-
-        [Test]
-        public void Validate_OK_Provide()
-        {
-            GenericTester.Create<Startup>()
-                .ExpectSuccess()
-                .Validation().With(new ProductValidator(), new Product { Id = "abc", Name = "xyz", Price = 50.95m });
-        }
-
-        [Test]
-        public void Validate_Error_Provide()
-        {
-            GenericTester.Create()
-                .ReplaceSingleton<ITextProvider, ValidationTextProvider>()
-                .ExpectErrors("Name is required.", "Price must be between 0 and 100.")
-                .Validation().With(new ProductValidator(), new Product { Price = 450.95m });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/AbstractValidatorTest.cs b/tests/CoreEx.Test/Framework/Validation/AbstractValidatorTest.cs
deleted file mode 100644
index 7b1a0a18..00000000
--- a/tests/CoreEx.Test/Framework/Validation/AbstractValidatorTest.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Entities;
-using CoreEx.Validation;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    [TestFixture]
-    public class AbstractValidatorTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(null);
-
-        [Test]
-        public async Task Abstract_And_RuleFor()
-        {
-            var r = await new TestDataValidator().ValidateAsync(new TestData());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Please specify a text value."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-                Assert.That(r.Messages![1].Text, Is.EqualTo("Date B is required."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("DateB"));
-            });
-        }
-
-        [Test]
-        public async Task With_Message()
-        {
-            var r = await new TestDataValidator2().ValidateAsync(new TestData());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Text is wonky."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-                Assert.That(r.Messages![1].Text, Is.EqualTo("Date B null-as."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("DateB"));
-            });
-        }
-
-        [Test]
-        public async Task IncludeSameType()
-        {
-            var r = await new TestDataValidator3().ValidateAsync(new TestData());
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Please specify a text value."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-                Assert.That(r.Messages![1].Text, Is.EqualTo("Date B is required."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("DateB"));
-            });
-        }
-    }
-
-    public class TestDataValidator : AbstractValidator<TestData>
-    {
-        public TestDataValidator()
-        {
-            RuleFor(x => x.Text).NotEmpty().WithMessage("Please specify a text value.");
-            RuleFor(x => x.DateB).NotNull();
-        }
-    }
-
-    public class TestDataValidator2 : AbstractValidator<TestData>
-    {
-        public TestDataValidator2()
-        {
-            RuleFor(x => x.Text).WithMessage("Text is wonky.").NotEmpty();
-            RuleFor(x => x.DateB).WithMessage("Data B is wonky").NotNull().WithMessage("Date B null-as.");
-        }
-    }
-
-    public class TestDataValidator3 : AbstractValidator<TestData>
-    {
-        public TestDataValidator3()
-        {
-            Include(new TestDataValidator());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Clauses/DependsOnClauseTest.cs b/tests/CoreEx.Test/Framework/Validation/Clauses/DependsOnClauseTest.cs
deleted file mode 100644
index b8e6eec7..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Clauses/DependsOnClauseTest.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Clauses
-{
-    [TestFixture]
-    public class DependsOnClauseTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task DependsOn()
-        {
-            var v = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory())
-                .HasProperty(x => x.CountA, p => p.Between(1, 10).DependsOn(x => x.Text));
-
-            var td = new TestData { Text = null, CountA = 88 };
-            var v1 = await td.Validate("value").Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Property, Is.EqualTo("value.Text"));
-            });
-
-            td = new TestData { Text = "xxx", CountA = 88 };
-            v1 = await td.Validate("value").Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Property, Is.EqualTo("value.CountA"));
-            });
-
-            td = new TestData { Text = "xxx", CountA = 5 };
-            v1 = await td.Validate("value").Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Clauses/WhenClauseTest.cs b/tests/CoreEx.Test/Framework/Validation/Clauses/WhenClauseTest.cs
deleted file mode 100644
index e89e8a52..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Clauses/WhenClauseTest.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Clauses
-{
-    [TestFixture]
-    public class WhenClauseTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task When()
-        {
-            var v1 = await 1.Validate(c => c.Between(2, 10).When(true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 1.Validate(c => c.Between(2, 10).When(false)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate(c => c.Between(2, 10).When(() => true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 1.Validate(c => c.Between(2, 10).When(() => false)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate(c => c.Between(2, 10).When(x => x.Value == 1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 1.Validate(c => c.Between(2, 10).When(x => x.Value != 1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var v = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory())
-                .HasProperty(x => x.CountA, p => p.Between(1, 10).When(x => x.Text == "xxx"));
-
-            var td = new TestData { Text = "xxx", CountA = 88 };
-            var v2 = await td.Validate().Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.True);
-
-            td = new TestData { Text = "yyy", CountA = 88 };
-            v2 = await td.Validate().Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task WhenValue()
-        {
-            var v1 = await 1.Validate(c => c.Between(2, 10).WhenValue(v => v == 1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 1.Validate(c => c.Between(2, 10).WhenValue(v => v == 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var v = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory())
-                .HasProperty(x => x.CountA, p => p.Between(1, 10).WhenValue(v => v == 88));
-
-            var td = new TestData { Text = "xxx", CountA = 88 };
-            var v2 = await td.Validate().Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.True);
-
-            td = new TestData { Text = "xxx", CountA = 99 };
-            v2 = await td.Validate().Configure(c => c.Entity(v)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task WhenHasValue()
-        {
-            var v1 = await 1.Validate(c => c.Immutable().WhenHasValue()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 0.Validate(c => c.Immutable().WhenHasValue()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task WhenOperation()
-        {
-            ExecutionContext.Current.OperationType = OperationType.Update;
-
-            var v1 = await 1.Validate(c => c.Immutable().WhenOperation(OperationType.Update)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 1.Validate(c => c.Immutable().WhenOperation(OperationType.Create)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task WhenNotOperation()
-        {
-            ExecutionContext.Current.OperationType = OperationType.Update;
-
-            var v1 = await 1.Validate(c => c.Immutable().WhenNotOperation(OperationType.Create)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await 1.Validate(c => c.Immutable().WhenNotOperation(OperationType.Update)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/CommonValidatorTest.cs b/tests/CoreEx.Test/Framework/Validation/CommonValidatorTest.cs
deleted file mode 100644
index 9bcf9c64..00000000
--- a/tests/CoreEx.Test/Framework/Validation/CommonValidatorTest.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Validation;
-using CoreEx.Results;
-using NUnit.Framework;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    [TestFixture]
-    public class CommonValidatorTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        private static readonly CommonValidator<string?> _cv = Validator.CreateFor<string?>(v => v.String(5).Must(x => x.Value != "XXXXX"));
-        private static readonly CommonValidator<int?> _cv2 = Validator.CreateFor<int?>(v => v.Mandatory().CompareValue(CompareOperator.NotEqual, 1));
-
-        [Test]
-        public async Task Validate()
-        {
-            var r = await "XXXXXX".Validate(_cv, null).ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Value must not exceed 5 characters in length."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            r = await "XXXXX".Validate(_cv, "Name").ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Name is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Name"));
-            });
-
-            r = await "XXX".Validate(_cv, "Name").ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Common()
-        {
-            var r = await Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().Common(_cv))
-                .ValidateAsync(new TestData { Text = "XXXXXX" });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Text must not exceed 5 characters in length."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-
-            r = await Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().Common(_cv))
-                .ValidateAsync(new TestData { Text = "XXXXX" });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Text is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-
-            r = await Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().Common(_cv))
-                .ValidateAsync(new TestData { Text = "XXX" });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Nullable()
-        {
-            int? v = 1;
-            var r = await v.Validate(_cv2, null).ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Value must not be equal to 1."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Common_Nullable()
-        {
-            var r = await Validator.Create<TestData>()
-                .HasProperty(x => x.CountB, p => p.Mandatory().Common(_cv2))
-                .ValidateAsync(new TestData { CountB = 1 });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Count B must not be equal to 1."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("CountB"));
-            });
-        }
-
-        [Test]
-        public async Task Common_FailureResult_ViaAdditional()
-        {
-            var cv = Validator.CreateFor<string?>(v => v.String(5)).AdditionalAsync((c, _) => Task.FromResult(Result.NotFoundError()));
-            var r = await "abc".Validate(cv).ValidateAsync();
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.FailureResult, Is.Not.Null);
-            });
-            Assert.That(r.FailureResult!.Value.Error, Is.Not.Null.And.TypeOf<NotFoundException>());
-            Assert.Throws<NotFoundException>(() => r.ThrowOnError());
-        }
-
-        [Test]
-        public async Task Common_FailureResult_ViaCustom()
-        {
-            var cv = CommonValidator.Create<string>(v => v.String(5).Custom(ctx => Result.NotFoundError()));
-            var r = await "abc".Validate(cv).ValidateAsync();
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.FailureResult, Is.Not.Null);
-            });
-            Assert.That(r.FailureResult!.Value.Error, Is.Not.Null.And.TypeOf<NotFoundException>());
-            Assert.Throws<NotFoundException>(() => r.ThrowOnError());
-        }
-
-        [Test]
-        public async Task Common_FailureResult_WithOwningValidator()
-        {
-            var cv = CommonValidator.Create<string>(v => v.String(5).Custom(ctx => Result.NotFoundError()));
-            var pv = Validator.Create<Person>().HasProperty(x => x.Name, p => p.Common(cv));
-
-            var p = new Person { Name = "abc" };
-            var r = await pv.ValidateAsync(p);
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.FailureResult, Is.Not.Null);
-            });
-            Assert.That(r.FailureResult!.Value.Error, Is.Not.Null.And.TypeOf<NotFoundException>());
-            Assert.Throws<NotFoundException>(() => r.ThrowOnError());
-        }
-
-        [Test]
-        public async Task CreateFor()
-        {
-            var cv = Validator.CreateFor<string>().Configure(v => v.MaximumLength(5));
-            var r = await "abcdef".Validate(cv, null).ValidateAsync();
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Value must not exceed 5 characters in length."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task CommonExtensionMethod()
-        {
-            await CommonExtensionMethod(null, false);
-            await CommonExtensionMethod("12345", false);
-            await CommonExtensionMethod("1234567", true);
-        }
-
-        private async Task CommonExtensionMethod(string? accountId, bool expectErrors)
-        {
-            var r = await accountId.Validate().Configure(cv => cv.Common(Validators.String5)).ValidateAsync();
-            Assert.That(r.HasErrors, Is.EqualTo(expectErrors));
-        }
-
-        [Test]
-        public async Task CommonEntity()
-        {
-            var pv = new PersonValidator();
-            var r = await pv.ValidateAsync(new Person());
-            Assert.That(r.HasErrors, Is.False);
-
-            r = await pv.ValidateAsync(new Person { Name = "12345" });
-            Assert.That(r.HasErrors, Is.False);
-
-            r = await pv.ValidateAsync(new Person { Name = "12345678" });
-            Assert.That(r.HasErrors, Is.True);
-        }
-
-        public static class Validators
-        {
-            public static CommonValidator<string> String5 => CommonValidator.Create<string>(c => c.String(5));
-        }
-
-        public class PersonValidator : Validator<Person>
-        {
-            public PersonValidator() => HasProperty(x => x.Name, p => p.Common(Validators.String5));
-        }
-
-        public class Person
-        {
-            public string? Name { get; set; }
-        }   
-
-        public class IntValidator : CommonValidator<int>
-        {
-            public IntValidator() => this.Text("Count").Mandatory().CompareValue(CompareOperator.GreaterThanEqual, 10).CompareValue(CompareOperator.LessThanEqual, 20);
-
-            protected override Task<Result> OnValidateAsync(PropertyContext<ValidationValue<int>, int> context, CancellationToken ct)
-            {
-                if (context.Value == 11)
-                    context.CreateErrorMessage("{0} is not allowed to be eleven.");
-
-                return Task.FromResult(Result.Success);
-            }
-        }
-
-        [Test]
-        public async Task Inherited_Basic()
-        {
-            var iv = new IntValidator();
-            var vr = await 8.Validate(iv, null).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(vr.HasErrors, Is.True);
-                Assert.That(vr.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vr.Messages![0].Text, Is.EqualTo("Count must be greater than or equal to 10."));
-                Assert.That(vr.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Inherited_Basic2()
-        {
-            var iv = new IntValidator();
-            var vr = await 28.Validate(iv, "length").ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(vr.HasErrors, Is.True);
-                Assert.That(vr.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vr.Messages![0].Text, Is.EqualTo("Count must be less than or equal to 20."));
-                Assert.That(vr.Messages[0].Property, Is.EqualTo("length"));
-            });
-        }
-
-        [Test]
-        public async Task Inherited_OnValidate()
-        {
-            var iv = new IntValidator();
-            var vr = await 11.Validate(iv, null).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(vr.HasErrors, Is.True);
-                Assert.That(vr.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vr.Messages![0].Text, Is.EqualTo("Count is not allowed to be eleven."));
-                Assert.That(vr.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/MultiValidatorTest.cs b/tests/CoreEx.Test/Framework/Validation/MultiValidatorTest.cs
deleted file mode 100644
index e1925c11..00000000
--- a/tests/CoreEx.Test/Framework/Validation/MultiValidatorTest.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    [TestFixture]
-    public class MultiValidatorTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task MultiError()
-        {
-            var v1 = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().String(10))
-                .HasProperty(x => x.CountB, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10));
-
-            var r = await MultiValidator.Create()
-                .Add(v1, new TestData { CountB = 0 })
-                .Add(1.Validate("value").Configure(c => c.Between(10, 20)))
-                .ValidateAsync().ConfigureAwait(false);
-            
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-
-                Assert.That(r.Messages!, Has.Count.EqualTo(3));
-
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Text is required."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Count B must be greater than 10."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("CountB"));
-
-                Assert.That(r.Messages[2].Text, Is.EqualTo("Value must be between 10 and 20."));
-                Assert.That(r.Messages[2].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[2].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task MultiError2()
-        {
-            var v1 = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().String(10))
-                .HasProperty(x => x.CountB, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10));
-
-            var r = await MultiValidator.Create()
-                .Add(new TestData { CountB = 0 }.Validate("value").Configure(c => c.Entity(v1)))
-                .Add(1.Validate("id").Configure(c => c.Between(10, 20)))
-                .ValidateAsync().ConfigureAwait(false);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-
-                Assert.That(r.Messages!, Has.Count.EqualTo(3));
-
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Text is required."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value.Text"));
-
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Count B must be greater than 10."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("value.CountB"));
-
-                Assert.That(r.Messages[2].Text, Is.EqualTo("Identifier must be between 10 and 20."));
-                Assert.That(r.Messages[2].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[2].Property, Is.EqualTo("id"));
-            });
-
-            Assert.Throws<ValidationException>(() => r.ThrowOnError());
-        }
-
-        [Test]
-        public async Task MultiSuccess()
-        {
-            var v1 = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().String(10))
-                .HasProperty(x => x.CountB, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10));
-
-            var r = await MultiValidator.Create()
-                .Add(new TestData { Text = "XXXXXXXXXX", CountB = 11 }.Validate("value").Configure(c => c.Entity(v1)))
-                .Add(15.Validate("id").Configure(c => c.Between(10, 20)))
-                .ValidateAsync().ConfigureAwait(false);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-            r.ThrowOnError();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/ReferenceDataValidatorTest.cs b/tests/CoreEx.Test/Framework/Validation/ReferenceDataValidatorTest.cs
deleted file mode 100644
index 64a54d4d..00000000
--- a/tests/CoreEx.Test/Framework/Validation/ReferenceDataValidatorTest.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.RefData.Extended;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    [TestFixture, NonParallelizable]
-    public class ReferenceDataValidatorTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        public class Gender : ReferenceDataBaseEx<int, Gender> { }
-
-        public class GenderValidator : ReferenceDataValidatorBase<Gender, GenderValidator> { }
-
-        [Test]
-        public async Task Validate_Null()
-        {
-            var r = await new ReferenceDataValidator<Gender>().ValidateAsync(null!);
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Empty()
-        {
-            var r = await GenderValidator.Default.ValidateAsync(new Gender());
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(3));
-                Assert.That(r.Messages![0].Property, Is.EqualTo("Id"));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("Code"));
-                Assert.That(r.Messages[2].Property, Is.EqualTo("Text"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Dates()
-        {
-            var r = await GenderValidator.Default.ValidateAsync(new Gender { Id = 1, Code = "X", Text = "XX", StartDate = new DateTime(2000, 01, 01), EndDate = new DateTime(1950, 01, 01) });
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("End Date must be greater than or equal to Start Date."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("EndDate"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_SupportsDescription()
-        {
-            ReferenceDataValidation.SupportsDescription = true;
-            var r = await GenderValidator.Default.ValidateAsync(new Gender { Id = 1, Code = "X", Text = "XX", Description = new string('x', 1001) });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description must not exceed 1000 characters in length."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Description"));
-            });
-
-            r = await GenderValidator.Default.ValidateAsync(new Gender { Id = 1, Code = "X", Text = "XX", Description = new string('x', 500) });
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-
-            r = await GenderValidator.Default.ValidateAsync(new Gender { Id = 1, Code = "X", Text = "XX" });
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_NoSupportsDescription()
-        {
-            ReferenceDataValidation.SupportsDescription = false;
-            var r = await GenderValidator.Default.ValidateAsync(new Gender { Id = 1, Code = "X", Text = "XX", Description = "XXX" });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description must not be specified."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Description"));
-            });
-
-            r = await GenderValidator.Default.ValidateAsync(new Gender { Id = 1, Code = "X", Text = "XX" });
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/BetweenRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/BetweenRuleTest.cs
deleted file mode 100644
index b01e7cef..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/BetweenRuleTest.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class BetweenRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 5.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.Between(2, 10)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 2 and 10."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 10.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 11.Validate("value").Configure(c => c.Between(1, 10, "One", "Ten")).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between One and Ten."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 2.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 5.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 1 and 10 (exclusive)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 9.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 10.Validate("value").Configure(c => c.Between(1, 10, "One", "Ten", exclusiveBetween: true)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between One and Ten (exclusive)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Nullable()
-        {
-            int? v = null;
-            var v1 = await v.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 1 and 10."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v = 1;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v = 5;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v = 1;
-            v1 = await v.Validate("value").Configure(c => c.Between(2, 10)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 2 and 10."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v = 10;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v = 11;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10, "One", "Ten")).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between One and Ten."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v = 2;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v = 5;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v = 1;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 1 and 10 (exclusive)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v = 9;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10, exclusiveBetween: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v = 10;
-            v1 = await v.Validate("value").Configure(c => c.Between(1, 10, "One", "Ten", exclusiveBetween: true)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between One and Ten (exclusive)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_InclusiveBetween()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.InclusiveBetween(2, 10)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 2 and 10."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 10.Validate("value").Configure(c => c.InclusiveBetween(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_ExclusiveBetween()
-        {
-            var v1 = await 2.Validate("value").Configure(c => c.ExclusiveBetween(2, 10)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be between 2 and 10 (exclusive)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 9.Validate("value").Configure(c => c.ExclusiveBetween(1, 10)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/CollectionRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/CollectionRuleTest.cs
deleted file mode 100644
index 3e9e91d6..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/CollectionRuleTest.cs
+++ /dev/null
@@ -1,323 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using System.Collections.Generic;
-using CoreEx.Entities;
-using CoreEx.Validation.Rules;
-using System.Threading.Tasks;
-using static CoreEx.Test.Framework.Validation.ValidatorTest;
-using System;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class CollectionRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_Errors()
-        {
-            var v1 = await new int[] { 1 }.Validate("value").Configure(c => c.Collection(2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must have at least 2 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await new int[] { 1 }.Validate("value").Configure(c => c.Collection(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new int[] { 1, 2, 3 }.Validate("value").Configure(c => c.Collection(maxCount: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not exceed 2 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await new int[] { 1, 2 }.Validate("value").Configure(c => c.Collection(maxCount: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((int[]?)null).Validate("value").Configure(c => c.Collection(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await Array.Empty<int>().Validate("value").Configure(c => c.Collection(1)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must have at least 1 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await new int[] { 1, 2, 3 }.Validate("value").Configure(c => c.Collection()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_MinCount()
-        {
-            var v1 = await new List<int> { 1 }.Validate("value").Configure(c => c.Collection(2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must have at least 2 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Item()
-        {
-            var iv = Validator.Create<TestItem>().HasProperty(x => x.Id, p => p.Mandatory());
-
-            var v1 = await Array.Empty<TestItem>().Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new TestItem[] { new() }.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Identifier is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value[0].Id"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_ItemInt()
-        {
-            var iv = Validator.CreateFor<int>(r => r.Text("Number").CompareValue(CompareOperator.LessThanEqual, 5));
-
-            var v1 = await new int[] { 1, 2, 3, 4, 5 }.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new int[] { 6, 2, 3, 4, 5 }.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Number must be less than or equal to 5."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value[0]"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_ItemInt2()
-        {
-            var iv = Validator.CreateFor<int>(r => r.Text("Number").LessThanOrEqualTo(5));
-
-            var v1 = await new int[] { 1, 2, 3, 4, 5 }.Validate("value").Configure(c => c.Collection(iv)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new int[] { 6, 2, 3, 4, 5 }.Validate("value").Configure(c => c.Collection(iv)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Number must be less than or equal to 5."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value[0]"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Item_Null()
-        {
-            var v1 = await new List<TestItem?> { new() }.Validate("value").Configure(c => c.Collection()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new List<TestItem?>() { null }.Validate("value").Configure(c => c.Collection()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains one or more items that are not specified."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await new List<TestItem?> { null }.Validate("value").Configure(c => c.Collection(allowNullItems: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Item_Duplicates()
-        {
-            var iv = Validator.Create<TestItem>().HasProperty(x => x.Id, p => p.Mandatory());
-
-            var v1 = await Array.Empty<TestItem>().Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck(x => x.Id))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var tis = new TestItem[] { new() { Id = "ABC", Text = "Abc" }, new() { Id = "DEF", Text = "Def" }, new() { Id = "GHI", Text = "Ghi" } };
-
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck(x => x.Id))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            tis[2].Id = "ABC";
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck(x => x.Id))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains duplicates; Identifier 'ABC' specified more than once."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Item_Duplicates_PrimaryKey()
-        {
-            var iv = Validator.Create<TestItem2>().HasProperty(x => x.Part1, p => p.Mandatory()).HasProperty(x => x.Part2, p => p.Mandatory());
-
-            var v1 = await Array.Empty<TestItem2>().Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck())).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var tis = new TestItem2[] { new() { Part1 = "ABC", Part2 = 1, Text = "Abc" }, new() { Part1 = "DEF", Part2 = 1, Text = "Def" }, new() { Part1 = "GHI", Part2 = 1, Text = "Ghi" } };
-
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck())).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            tis[2].Part1 = "ABC";
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck())).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains duplicates; Primary Key specified more than once."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Item_Duplicates_Identifier()
-        {
-            var iv = Validator.Create<TestItem>().HasProperty(x => x.Id, p => p.Mandatory());
-
-            var v1 = await Array.Empty<TestItem>().Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var tis = new TestItem[] { new() { Id = "ABC", Text = "Abc" }, new() { Id = "DEF", Text = "Def" }, new() { Id = "GHI", Text = "Ghi" } };
-
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            tis[2].Id = "ABC";
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create(iv).DuplicateCheck(true))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains duplicates; Identifier 'ABC' specified more than once."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Item_Duplicates_Identifier2()
-        {
-            var v1 = await Array.Empty<TestItem3>().Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var tis = new TestItem3[] { new() { Id = 1.ToGuid() }, new() { Id = 2.ToGuid() }, new() { Id = 3.ToGuid() } };
-
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            tis[2].Id = 1.ToGuid();
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo($"Value contains duplicates; Identifier '{1.ToGuid()}' specified more than once."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            tis[2].Id = Guid.Empty;
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Item_Duplicates_IgnoreInitial()
-        {
-            var v1 = await Array.Empty<TestItem3>().Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var tis = new TestItem3[] { new() { Id = Guid.Empty }, new() { Id = 2.ToGuid() }, new() { Id = Guid.Empty } };
-
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            tis[2].Id = 2.ToGuid();
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo($"Value contains duplicates; Identifier '{2.ToGuid()}' specified more than once."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            tis[2].Id = Guid.Empty;
-            v1 = await tis.Validate("value").Configure(c => c.Collection(item: CollectionRuleItem.Create<TestItem3>().DuplicateCheck(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Ints_MinCount()
-        {
-            var v1 = await new int[] { 1, 2, 3, 4 }.Validate(name: "Array").Configure(c => c.MinimumCount(4)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new int[] { 1, 2, 3, 4 }.Validate(name: "Array").Configure(c => c.MinimumCount(5)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Array must have at least 5 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Array"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Ints2_MaxCount()
-        {
-            var v1 = await new int[] { 1, 2, 3, 4 }.Validate(name: "Array").Configure(c => c.MaximumCount(5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new int[] { 1, 2, 3, 4 }.Validate(name: "Array").Configure(c => c.MaximumCount(3)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Array must not exceed 3 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Array"));
-            });
-        }
-
-        public class TestItem3 : IIdentifier<Guid>
-        {
-            public Guid Id { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/ComparePropertyRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/ComparePropertyRuleTest.cs
deleted file mode 100644
index ffd00794..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/ComparePropertyRuleTest.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class ComparePropertyRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v = Validator.Create<TestData>()
-                .HasProperty(x => x.DateA, p => p.CompareValue(CompareOperator.GreaterThan, new DateTime(1950, 1, 1), "Minimum"))
-                .HasProperty(x => x.DateB, p => p.CompareProperty(CompareOperator.GreaterThanEqual, y => y.DateA));
-
-            // Date B will be bad.
-            var v1 = await v.ValidateAsync(new TestData { DateA = new DateTime(2000, 1, 1), DateB = new DateTime(1999, 1, 1) });
-            Assert.That(v1, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Date B must be greater than or equal to Date A."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("DateB"));
-            });
-
-            // Date B should not validate as dependent DateA has already failed.
-            var v2 = await v.ValidateAsync(new TestData { DateA = new DateTime(1949, 1, 1), DateB = new DateTime(1939, 1, 1) });
-            Assert.That(v2, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v2.HasErrors, Is.True);
-                Assert.That(v2.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v2.Messages![0].Text, Is.EqualTo("Date A must be greater than Minimum."));
-                Assert.That(v2.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v2.Messages[0].Property, Is.EqualTo("DateA"));
-            });
-
-            // All is a-ok.
-            var v3 = await v.ValidateAsync(new TestData { DateA = new DateTime(2001, 1, 1), DateB = new DateTime(2001, 1, 1) });
-            Assert.That(v3, Is.Not.Null);
-            Assert.That(v3.HasErrors, Is.False);
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/CompareValueRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/CompareValueRuleTest.cs
deleted file mode 100644
index ed1f2f0d..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/CompareValueRuleTest.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class CompareValueRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.CompareValue(CompareOperator.Equal, 1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.CompareValue(CompareOperator.Equal, 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be equal to 2."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 1.Validate("value").Configure(c => c.CompareValue(CompareOperator.GreaterThan, 0)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.CompareValue(CompareOperator.GreaterThan, 2, "Two")).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be greater than Two."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Nullable()
-        {
-            int? v = 1;
-            var v1 = await v.Validate("value").Configure(c => c.CompareValue(CompareOperator.Equal, 1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await v.Validate("value").Configure(c => c.CompareValue(CompareOperator.Equal, 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be equal to 2."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Equal()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.Equal(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.Equal(2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be equal to 2."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_NotEqual()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.NotEqual(2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.NotEqual(1)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not be equal to 1."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_LessThan()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.LessThan(2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.LessThan(1)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be less than 1."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_LessThanOrEqualTo()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.LessThanOrEqualTo(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 2.Validate("value").Configure(c => c.LessThanOrEqualTo(1)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be less than or equal to 1."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_GreaterThan()
-        {
-            var v1 = await 2.Validate("value").Configure(c => c.GreaterThan(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.GreaterThan(2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be greater than 2."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_GreaterThanOrEqualTo()
-        {
-            var v1 = await 2.Validate("value").Configure(c => c.GreaterThanOrEqualTo(2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.GreaterThanOrEqualTo(2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be greater than or equal to 2."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/CompareValuesRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/CompareValuesRuleTest.cs
deleted file mode 100644
index 37651453..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/CompareValuesRuleTest.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class CompareValuesRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await 1.Validate("value").Configure(c => c.CompareValues(new int[] { 1, 2 })).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 1.Validate("value").Configure(c => c.CompareValues(new int[] { 2, 3 })).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_String()
-        {
-            var v1 = await "A".Validate("value").Configure(c => c.CompareValues(new string[] { "A", "B" })).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "C".Validate("value").Configure(c => c.CompareValues(new string[] { "A", "B" })).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await "a".Validate("value").Configure(c => c.CompareValues(new string[] { "A", "B" }, true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_String_Override()
-        {
-            var v = new Validator<CompareClass>().HasProperty(x => x.Option, p => p.CompareValues(new string[] { "A", "B" }, true, true));
-
-            var cc = new CompareClass();
-            var v1 = await v.ValidateAsync(cc);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(cc.Option, Is.EqualTo(null));
-            });
-
-            cc.Option = "A";
-            v1 = await v.ValidateAsync(cc);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(cc.Option, Is.EqualTo("A"));
-            });
-
-            cc.Option = "a";
-            v1 = await v.ValidateAsync(cc);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(cc.Option, Is.EqualTo("A"));
-            });
-
-            cc.Option = "c";
-            v1 = await v.ValidateAsync(cc);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(cc.Option, Is.EqualTo("c"));
-            });
-        }
-
-        public class CompareClass
-        {
-            public string? Option { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/CustomRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/CustomRuleTest.cs
deleted file mode 100644
index 14833091..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/CustomRuleTest.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-using CoreEx.Results;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class CustomRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await "Abc".Validate("value").Configure(c => c.Custom(x => { x.CreateErrorMessage("Test"); return Result.Success; })).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Test"));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/DecimalRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/DecimalRuleTest.cs
deleted file mode 100644
index 8e554bd9..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/DecimalRuleTest.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using CoreEx.Validation.Rules;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class DecimalRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_AllowNegatives()
-        {
-            var v1 = await (123).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (-123).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not be negative."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (-123).Validate("value").Configure(c => c.Numeric(true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var v2 = await (123m).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await (-123m).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v2.HasErrors, Is.True);
-                Assert.That(v2.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v2.Messages![0].Text, Is.EqualTo("Value must not be negative."));
-                Assert.That(v2.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v2.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v2 = await (-123m).Validate("value").Configure(c => c.Numeric(true)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_MaxDigits()
-        {
-            var v1 = await (123).Validate("value").Configure(c => c.Numeric(maxDigits: 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (12345).Validate("value").Configure(c => c.Numeric(maxDigits: 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (123456).Validate("value").Configure(c => c.Numeric(maxDigits: 5)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not exceed 5 digits in total."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            var v2 = await (12.34m).Validate("value").Configure(c => c.Numeric(maxDigits: 5)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await (12.345m).Validate("value").Configure(c => c.Numeric(maxDigits: 5)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await (1.23456m).Validate("value").Configure(c => c.Numeric(maxDigits: 5)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v2.HasErrors, Is.True);
-                Assert.That(v2.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v2.Messages![0].Text, Is.EqualTo("Value must not exceed 5 digits in total."));
-                Assert.That(v2.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v2.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_DecimalPlaces()
-        {
-            var v1 = await (12.3m).Validate("value").Configure(c => c.Numeric(decimalPlaces: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (123.400m).Validate("value").Configure(c => c.Numeric(decimalPlaces: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (0.123m).Validate("value").Configure(c => c.Numeric(decimalPlaces: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value exceeds the maximum specified number of decimal places (2)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_MaxDigits_And_DecimalPlaces()
-        {
-            var v1 = await (12.3m).Validate("value").Configure(c => c.Numeric(maxDigits: 5, decimalPlaces: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (123.400m).Validate("value").Configure(c => c.Numeric(maxDigits: 5, decimalPlaces: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (0.123m).Validate("value").Configure(c => c.Numeric(maxDigits: 5, decimalPlaces: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value exceeds the maximum specified number of decimal places (2)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (1234.0m).Validate("value").Configure(c => c.Numeric(maxDigits: 5, decimalPlaces: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not exceed 5 digits in total."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_PrecisionScale()
-        {
-            var v1 = await (12.3m).Validate("value").Configure(c => c.PrecisionScale(precision: 5, scale: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (123.400m).Validate("value").Configure(c => c.PrecisionScale(precision: 5, scale: 2)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (0.123m).Validate("value").Configure(c => c.PrecisionScale(precision: 5, scale: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value exceeds the maximum specified number of decimal places (2)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (1234.0m).Validate("value").Configure(c => c.PrecisionScale(precision: 5, scale: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not exceed 5 digits in total."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public void CalcIntegralLength()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(0m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(0.0000001m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(0.9999999m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(1.0000001m), Is.EqualTo(1));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(9.9999999m), Is.EqualTo(1));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(10.0000001m), Is.EqualTo(2));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(99.9999999m), Is.EqualTo(2));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(decimal.MaxValue), Is.EqualTo(29));
-
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(-0.0000001m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(-0.9999999m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(-1.0000001m), Is.EqualTo(1));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(-9.9999999m), Is.EqualTo(1));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(-10.0000001m), Is.EqualTo(2));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(-99.9999999m), Is.EqualTo(2));
-                Assert.That(DecimalRuleHelper.CalcIntegerPartLength(decimal.MinValue), Is.EqualTo(29));
-            });
-        }
-
-        [Test]
-        public void CalcDecimalPlaces()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(0m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(0.0000001m), Is.EqualTo(7));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(0.0001000m), Is.EqualTo(4));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(1.0000001m), Is.EqualTo(7));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(450.678m), Is.EqualTo(3));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(1500m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(decimal.MaxValue), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(long.MaxValue + 1.0001m), Is.EqualTo(4));
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(0m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(-0.0000001m), Is.EqualTo(7));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(-0.0001000m), Is.EqualTo(4));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(-1.0000001m), Is.EqualTo(7));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(-450.678m), Is.EqualTo(3));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(-1500m), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(decimal.MinValue), Is.EqualTo(0));
-                Assert.That(DecimalRuleHelper.CalcFractionalPartLength(long.MinValue - 1.0001m), Is.EqualTo(4));
-            });
-        }
-
-        [Test]
-        public void CheckMaxDigits()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(0m, 5), Is.True);
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(12345m, 5), Is.True);
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(123.45m, 5), Is.True);
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(1.2345m, 5), Is.True);
-
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(123456m, 5), Is.False);
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(123.456m, 5), Is.False);
-                Assert.That(DecimalRuleHelper.CheckMaxDigits(1.23456m, 5), Is.False);
-            });
-        }
-
-        [Test]
-        public void CheckDecimalPlaces()
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(DecimalRuleHelper.CheckDecimalPlaces(0m, 2), Is.True);
-                Assert.That(DecimalRuleHelper.CheckDecimalPlaces(1.1m, 2), Is.True);
-                Assert.That(DecimalRuleHelper.CheckDecimalPlaces(1.12m, 2), Is.True);
-                Assert.That(DecimalRuleHelper.CheckDecimalPlaces(1.123m, 2), Is.False);
-                Assert.That(DecimalRuleHelper.CheckDecimalPlaces(1.1234m, 2), Is.False);
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/DictionaryRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/DictionaryRuleTest.cs
deleted file mode 100644
index ec0ce8f7..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/DictionaryRuleTest.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using System.Collections.Generic;
-using CoreEx.Entities;
-using CoreEx.Validation.Rules;
-using System.Threading.Tasks;
-using static CoreEx.Test.Framework.Validation.ValidatorTest;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class DictionaryRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await new Dictionary<string, string> { { "k1", "v1" } }.Validate("Dict").Configure(c => c.Dictionary(2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Dict must have at least 2 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict"));
-            });
-
-            v1 = await new Dictionary<string, string> { { "k1", "v1" } }.Validate("Dict").Configure(c => c.Dictionary(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, string> { { "k1", "v1" }, { "k2", "v2" }, { "k3", "v3" } }.Validate("Dict").Configure(c => c.Dictionary(maxCount: 2)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Dict must not exceed 2 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict"));
-            });
-
-            v1 = await new Dictionary<string, string> { { "k1", "v1" }, { "k2", "v2" }, { "k3", "v3" } }.Validate("Dict").Configure(c => c.Dictionary(maxCount: 3)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((Dictionary<string, string>?)null).Validate().Configure(c => c.Collection(1)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, string> { }.Validate("Dict").Configure(c => c.Dictionary(1)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Dict must have at least 1 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Value()
-        {
-            var iv = Validator.Create<TestItem>().HasProperty(x => x.Id, p => p.Mandatory());
-
-            var v1 = await new Dictionary<string, TestItem>().Validate("Dict").Configure(c => c.Dictionary(item: DictionaryRuleItem.Create<string, TestItem>(value: iv))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, TestItem> { { "k1", new TestItem() } }.Validate("Dict").Configure(c => c.Dictionary(item: DictionaryRuleItem.Create<string, TestItem>(value: iv))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Identifier is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict[k1].Id"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Null_Value()
-        {
-            var v1 = await new Dictionary<string, TestItem?> { { "k1", new TestItem() } }.Validate("Dict").Configure(c => c.Dictionary()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, TestItem?> { { "k1", null } }.Validate("Dict").Configure(c => c.Dictionary()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Dict contains one or more values that are not specified."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict"));
-            });
-
-            v1 = await new Dictionary<string, TestItem?> { { "k1", null } }.Validate("Dict").Configure(c => c.Dictionary(allowNullValues: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Ints()
-        {
-            var v1 = await new Dictionary<string, int> { { "k1", 1 }, { "k2", 2 }, { "k3", 3 }, { "k4", 4 } }.Validate("Dict").Configure(c => c.Dictionary(maxCount: 4)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, int> { { "k1", 1 }, { "k2", 2 }, { "k3", 3 }, { "k4", 4 } }.Validate("Dict").Configure(c => c.Dictionary(maxCount: 3)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Dict must not exceed 3 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Key()
-        {
-            var kv = Validator.CreateFor<string>(r => r.Text("Key").Mandatory().String(2));
-
-            var v1 = await new Dictionary<string, int> { { "k1", 1 }, { "k2", 2 } }.Validate("Dict").Configure(c => c.Dictionary(item: DictionaryRuleItem.Create<string, int>(kv))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, int> { { "k1", 1 }, { "k2x", 2 } }.Validate("Dict").Configure(c => c.Dictionary(kv, Validator.Null<int>())).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Key must not exceed 2 characters in length."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict[k2x]"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_KeyAndValue()
-        {
-            var kv = Validator.CreateFor<string>(r => r.Text("Key").Mandatory().String(2));
-            var vv = Validator.CreateFor<int>(r => r.Mandatory().CompareValue(CompareOperator.LessThanEqual, 10));
-
-            var v1 = await new Dictionary<string, int> { { "k1", 1 }, { "k2", 2 } }.Validate("Dict").Configure(c => c.Dictionary(item: DictionaryRuleItem.Create(kv, vv))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await new Dictionary<string, int> { { "k1", 11 }, { "k2x", 2 } }.Validate("Dict").Configure(c => c.Dictionary(kv, vv)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(2));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be less than or equal to 10."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Dict[k1]"));
-                Assert.That(v1.Messages[1].Text, Is.EqualTo("Key must not exceed 2 characters in length."));
-                Assert.That(v1.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[1].Property, Is.EqualTo("Dict[k2x]"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/DuplicateRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/DuplicateRuleTest.cs
deleted file mode 100644
index eecdae0a..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/DuplicateRuleTest.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class DuplicateRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_Value()
-        {
-            var v1 = await 123.Validate("value").Configure(c => c.Duplicate(x => false)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-            
-            v1 = await 123.Validate("value").Configure(c => c.Duplicate(x => true)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value already exists and would result in a duplicate."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.Duplicate(() => false)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.Duplicate(() => true)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value already exists and would result in a duplicate."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/EmailRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/EmailRuleTest.cs
deleted file mode 100644
index 1f83e9e1..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/EmailRuleTest.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class EmailRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Email()
-        {
-            var v1 = await ((string?)null).Validate().Configure(c => c.Email()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "blah@.com".Validate().Configure(c => c.Email()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "blah.com".Validate().Configure(c => c.Email()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await "@blah.com".Validate().Configure(c => c.Email()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await "blah@".Validate().Configure(c => c.Email()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await $"mynameis@{new string('x', 250)}.com".Validate().Configure(c => c.Email()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await $"mynameis@{new string('x', 250)}.com".Validate().Configure(c => c.Email(null)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await $"mynameis@{new string('x', 500)}.com".Validate().Configure(c => c.Email(null)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task EmailAddress()
-        {
-            var v1 = await ((string?)null).Validate().Configure(c => c.EmailAddress()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "blah@.com".Validate().Configure(c => c.EmailAddress()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "blah.com".Validate().Configure(c => c.EmailAddress()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await "@blah.com".Validate().Configure(c => c.EmailAddress()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await "blah@".Validate().Configure(c => c.EmailAddress()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await $"mynameis@{new string('x', 250)}.com".Validate().Configure(c => c.EmailAddress()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True);
-
-            v1 = await $"mynameis@{new string('x', 250)}.com".Validate().Configure(c => c.EmailAddress(null)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await $"mynameis@{new string('x', 500)}.com".Validate().Configure(c => c.EmailAddress(null)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/EntityRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/EntityRuleTest.cs
deleted file mode 100644
index 50c67100..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/EntityRuleTest.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-using static CoreEx.Test.Framework.Validation.ValidatorTest;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class EntityRuleTest
-    {
-        private static readonly IValidatorEx _tiv = Validator.Create<TestItem>().HasProperty(x => x.Id, p => p.Mandatory());
-        private static readonly IValidatorEx _tev = Validator.Create<TestEntity>().HasProperty(x => x.Item, p => p.Entity(_tiv));
-
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var te = new TestEntity { Item = new TestItem() };
-            var v1 = await te.Validate("entity", "EnTiTy").Configure(c => c.Entity(_tev)).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Identifier is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("entity.Item.Id"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/EnumRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/EnumRuleTest.cs
deleted file mode 100644
index 7d04eb5e..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/EnumRuleTest.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class EnumRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await ((AbcOption)1).Validate("value").Configure(c => c.Enum()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((AbcOption)88).Validate("value").Configure(c => c.Enum()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_NonNullable()
-        {
-            var ac = new AbcClass();
-            var v = new Validator<AbcClass>().HasProperty(x => x.Option, p => p.Enum());
-
-            var v1 = await v.ValidateAsync(ac);
-            Assert.That(v1.HasErrors, Is.False);
-
-            ac.Option = AbcOption.B;
-            v1 = await v.ValidateAsync(ac);
-            Assert.That(v1.HasErrors, Is.False);
-
-            ac.Option = ((AbcOption)404);
-            v1 = await v.ValidateAsync(ac);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Option is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Option"));
-            });
-        }
-
-        public class AbcClass
-        {
-            public AbcOption Option { get; set; }
-        }
-
-        [Test]
-        public async Task Validate_Nullable()
-        {
-            var ac = new AbcClassN();
-            var v = new Validator<AbcClassN>().HasProperty(x => x.Option, p => p.Enum());
-
-            var v1 = await v.ValidateAsync(ac);
-            Assert.That(v1.HasErrors, Is.False);
-
-            ac.Option = AbcOption.B;
-            v1 = await v.ValidateAsync(ac);
-            Assert.That(v1.HasErrors, Is.False);
-
-            ac.Option = ((AbcOption)404);
-            v1 = await v.ValidateAsync(ac);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Option is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("Option"));
-            });
-        }
-
-        public class AbcClassN
-        {
-            public AbcOption? Option { get; set; }
-        }
-    }
-
-    public enum AbcOption
-    {
-        A,
-        B,
-        C
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/EnumValueRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/EnumValueRuleTest.cs
deleted file mode 100644
index bdbe4536..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/EnumValueRuleTest.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class EnumValueRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate()
-        {
-            var v1 = await "A".Validate("value").Configure(c => c.Enum().As<AbcOption>()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "a".Validate("value").Configure(c => c.Enum().As<AbcOption>()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await "a".Validate("value").Configure(c => c.Enum().As<AbcOption>(true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "X".Validate("value").Configure(c => c.Enum().As<AbcOption>()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.Enum().As<AbcOption>()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task ValidateAndOverride()
-        {
-            var v1 = await "someoptionwithcasing".Validate("value").Configure(c => c.Enum().As<CaseOption>(true, false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(v1.Value, Is.EqualTo("someoptionwithcasing"));
-            });
-
-            var ec = new EnumClass { Option = "someoptionwithcasing" };
-            var v2 = await new Validator<EnumClass>().HasProperty(x => x.Option, p => p.Enum().As<CaseOption>(true, false)).ValidateAsync(ec);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(ec.Option, Is.EqualTo("someoptionwithcasing"));
-            });
-
-            v2 = await new Validator<EnumClass>().HasProperty(x => x.Option, p => p.Enum().As<CaseOption>(true, true)).ValidateAsync(ec);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(ec.Option, Is.EqualTo("SomeOptionWithCasing"));
-            });
-
-            ec.Option = null;
-            v2 = await new Validator<EnumClass>().HasProperty(x => x.Option, p => p.Enum().As<CaseOption>(true, true)).ValidateAsync(ec);
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.False);
-                Assert.That(ec.Option, Is.EqualTo(null));
-            });
-        }
-
-        public class EnumClass
-        { 
-            public string? Option { get; set; }
-        }
-    }
-
-    public enum CaseOption
-    {
-        SomeOptionWithCasing
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/ExistsRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/ExistsRuleTest.cs
deleted file mode 100644
index fc15893f..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/ExistsRuleTest.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-using CoreEx.Results;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class ExistsRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_Value()
-        {
-            var v1 = await 123.Validate("value").Configure(c => c.Exists(x => true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-            
-            v1 = await 123.Validate("value").Configure(c => c.Exists(x => false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not found; a valid value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.Exists(true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.Exists(false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not found; a valid value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.ExistsAsync((_, __) => Task.FromResult(true))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.ExistsAsync((_, __) => Task.FromResult(false))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not found; a valid value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.ValueExistsAsync((_, __) => Task.FromResult<object?>(new object()))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.ValueExistsAsync((_, __) => Task.FromResult((object?)null))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not found; a valid value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.AgentExistsAsync((_, __) => CoreEx.Http.HttpResult.CreateAsync(new System.Net.Http.HttpResponseMessage(System.Net.HttpStatusCode.OK), __))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.AgentExistsAsync((_, __) => CoreEx.Http.HttpResult.CreateAsync(new System.Net.Http.HttpResponseMessage(System.Net.HttpStatusCode.NotFound), __))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not found; a valid value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.AgentExistsAsync((_, __) => CoreEx.Http.HttpResult.CreateAsync<int>(new System.Net.Http.HttpResponseMessage(System.Net.HttpStatusCode.OK), cancellationToken: __))).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.AgentExistsAsync((_, __) => CoreEx.Http.HttpResult.CreateAsync<int>(new System.Net.Http.HttpResponseMessage(System.Net.HttpStatusCode.NotFound), cancellationToken: __))).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not found; a valid value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.ValueExistsAsync(async (_, __) => await GetBlahAsync())).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.True); // Result.Success is not a valid value
-        }
-
-        private static Task<Result> GetBlahAsync() => Task.FromResult(Result.Success);
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/ImmutableRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/ImmutableRuleTest.cs
deleted file mode 100644
index aff7fa53..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/ImmutableRuleTest.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class ImmutableRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_Value()
-        {
-            var v1 = await 123.Validate("value").Configure(c => c.Immutable(x => true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-            
-            v1 = await 123.Validate("value").Configure(c => c.Immutable(x => false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not allowed to change; please reset value."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.Immutable(() => true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.Immutable(() => false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is not allowed to change; please reset value."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/MandatoryRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/MandatoryRuleTest.cs
deleted file mode 100644
index dae5e463..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/MandatoryRuleTest.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class MandatoryRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_String()
-        {
-            var v1 = await "XXX".Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (string.Empty).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Int32()
-        {
-            var v1 = await (123).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (0).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            var v2 = await ((int?)123).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await ((int?)0).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await ((int?)null).Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v2.HasErrors, Is.True);
-                Assert.That(v2.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v2.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v2.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v2.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        public class Foo
-        {
-            public string? Bar { get; set; }
-        }
-
-        [Test]
-        public async Task Validate_Entity()
-        {
-            Foo? foo = new();
-            var v1 = await foo.Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            foo = null;
-            v1 = await foo.Validate("value").Configure(c => c.Mandatory()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_NotEmpty_String()
-        {
-            var v1 = await "XXX".Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (string.Empty).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_NotEmpty_Int32()
-        {
-            var v1 = await (123).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (0).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            var v2 = await ((int?)123).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await ((int?)0).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await ((int?)null).Validate("value").Configure(c => c.NotEmpty()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v2.HasErrors, Is.True);
-                Assert.That(v2.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v2.Messages![0].Text, Is.EqualTo("Value is required."));
-                Assert.That(v2.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v2.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/MustRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/MustRuleTest.cs
deleted file mode 100644
index 2d42e1e6..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/MustRuleTest.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class MustRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_Value()
-        {
-            var v1 = await 123.Validate("value").Configure(c => c.Must(x => true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-            
-            v1 = await 123.Validate("value").Configure(c => c.Must(x => false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await 123.Validate("value").Configure(c => c.Must(() => true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await 123.Validate("value").Configure(c => c.Must(() => false)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/NoneRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/NoneRuleTest.cs
deleted file mode 100644
index b733bd67..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/NoneRuleTest.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using NUnit.Framework;
-using CoreEx.Validation;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class NoneRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_String()
-        {
-            var v1 = await "XXX".Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not be specified."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (string.Empty).Validate("value").Configure(c => c.Validate()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "  ".Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Int32()
-        {
-            var v1 = await (123).Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not be specified."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (0).Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var v2 = await ((int?)123).Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.True);
-
-            v2 = await ((int?)0).Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.True);
-
-            v2 = await ((int?)null).Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-        }
-
-        public class Foo
-        {
-            public string? Bar { get; set; }
-        }
-
-        [Test]
-        public async Task Validate_Entity()
-        {
-            Foo? foo = new();
-            var v1 = await foo.Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not be specified."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            foo = null;
-            v1 = await foo.Validate("value").Configure(c => c.None()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/NumericRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/NumericRuleTest.cs
deleted file mode 100644
index 6b4c93ea..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/NumericRuleTest.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class NumericRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_AllowNegatives()
-        {
-            var v1 = await (123f).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await (-123f).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not be negative."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await (-123f).Validate("value").Configure(c => c.Numeric(true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            var v2 = await (123d).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-
-            v2 = await (-123d).Validate("value").Configure(c => c.Numeric()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v2.HasErrors, Is.True);
-                Assert.That(v2.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v2.Messages![0].Text, Is.EqualTo("Value must not be negative."));
-                Assert.That(v2.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v2.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v2 = await (-123d).Validate("value").Configure(c => c.Numeric(true)).ValidateAsync();
-            Assert.That(v2.HasErrors, Is.False);
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/OverrideRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/OverrideRuleTest.cs
deleted file mode 100644
index abb26409..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/OverrideRuleTest.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using System;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class OverrideRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public void Validate_Value()
-        {
-            Assert.ThrowsAsync<InvalidOperationException>(async () => await 123.Validate().Configure(c => c.Override(456)).ValidateAsync());
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/ReferenceDataRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/ReferenceDataRuleTest.cs
deleted file mode 100644
index 300db284..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/ReferenceDataRuleTest.cs
+++ /dev/null
@@ -1,182 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.RefData;
-using CoreEx.Test.Framework.RefData;
-using CoreEx.Validation;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    internal class ReferenceDataRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_RefData()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var v1 = await ((RefDataEx)"Aaa").Validate("value").Configure(c => c.IsValid()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((RefDataEx)"Abc").Validate("value").Configure(c => c.IsValid()).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Validate_Code()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var v1 = await "Aaa".Validate("value").Configure(c => c.RefDataCode().As<RefDataEx>()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "Abc".Validate("value").Configure(c => c.RefDataCode().As<RefDataEx>()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task SidList_Validate()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var sids = new ReferenceDataCodeList<RefDataEx>("Aaa", "Abc");
-            var v1 = await sids.Validate("value").Configure(c => c.AreValid()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains one or more invalid items."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            sids = new ReferenceDataCodeList<RefDataEx>("Aaa", "Aaa");
-            v1 = await sids.Validate("value").Configure(c => c.AreValid()).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains duplicates; Code 'AAA' specified more than once."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await sids.Validate("value").Configure(c => c.AreValid(allowDuplicates: true)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await sids.Validate("value").Configure(c => c.AreValid(true, 5)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must have at least 5 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await sids.Validate("value").Configure(c => c.AreValid(true, maxCount: 1)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not exceed 1 item(s)."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Entity_Sids()
-        {
-            IServiceCollection sc = new ServiceCollection();
-            sc.AddLogging();
-            sc.AddJsonSerializer();
-            sc.AddExecutionContext();
-            sc.AddScoped<RefDataProvider>();
-            sc.AddReferenceDataOrchestrator<RefDataProvider>();
-            var sp = sc.BuildServiceProvider();
-
-            ReferenceDataOrchestrator.SetCurrent(sp.GetRequiredService<ReferenceDataOrchestrator>());
-
-            using var scope = sp.CreateScope();
-            var ec = scope.ServiceProvider.GetService<ExecutionContext>();
-
-            var rde = new RDEntity() { Refs = ["X"] };
-            var v1 = await rde.Validate().Configure(c => c.Entity(new RDValidator())).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Refs contains one or more invalid items."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("rde.Refs"));
-            });
-        }
-
-        public class RDEntity
-        {
-            public ReferenceDataCodeList<RefDataEx>? Refs { get; set; }
-        }
-
-        public class RDValidator : Validator<RDEntity>
-        {
-            public RDValidator()
-            {
-                HasProperty(x => x.Refs, p => p.AreValid());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/StringRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/StringRuleTest.cs
deleted file mode 100644
index bb8d85c9..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/StringRuleTest.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class StringRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Validate_MinLength()
-        {
-            var v1 = await "Abc".Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "Ab".Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "A".Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be at least 2 characters in length."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await string.Empty.Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_MaxLength()
-        {
-            var v1 = await "Abc".Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "Abcde".Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "Abcdef".Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must not exceed 5 characters in length."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await string.Empty.Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_Regex()
-        {
-            var r = new Regex("[a-zA-Z]$");
-            var v1 = await "Abc".Validate("value").Configure(c => c.String(r)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "123".Validate("value").Configure(c => c.String(r)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value is invalid."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await string.Empty.Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await ((string?)null).Validate("value").Configure(c => c.String(2, 5)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Validate_ExactLength()
-        {
-            var v1 = await "Abc".Validate("value").Configure(c => c.String(3, 3)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "A".Validate("value").Configure(c => c.String(3, 3)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be exactly 3 characters in length."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-
-            v1 = await "AAAA".Validate("value").Configure(c => c.Length(3)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value must be exactly 3 characters in length."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.Test/Framework/Validation/Rules/WildcardRuleTest.cs b/tests/CoreEx.Test/Framework/Validation/Rules/WildcardRuleTest.cs
deleted file mode 100644
index c39c1a2f..00000000
--- a/tests/CoreEx.Test/Framework/Validation/Rules/WildcardRuleTest.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using CoreEx.Validation;
-using NUnit.Framework;
-using CoreEx.Entities;
-using System.Threading.Tasks;
-using CoreEx.Wildcards;
-
-namespace CoreEx.Test.Framework.Validation.Rules
-{
-    [TestFixture]
-    public class WildcardRuleTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task ValidateWildcard()
-        {
-            var v1 = await "xxxx".Validate("value").Configure(c => c.Wildcard()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "*xxxx".Validate("value").Configure(c => c.Wildcard()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "xxxx*".Validate("value").Configure(c => c.Wildcard()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "*xxxx*".Validate("value").Configure(c => c.Wildcard()).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "x*x".Validate("value").Configure(c => c.Wildcard(wildcard: Wildcard.MultiAll)).ValidateAsync();
-            Assert.That(v1.HasErrors, Is.False);
-
-            v1 = await "x?x".Validate("value").Configure(c => c.Wildcard(wildcard: Wildcard.MultiAll)).ValidateAsync();
-            Assert.Multiple(() =>
-            {
-                Assert.That(v1.HasErrors, Is.True);
-                Assert.That(v1.Messages!, Has.Count.EqualTo(1));
-                Assert.That(v1.Messages![0].Text, Is.EqualTo("Value contains invalid or non-supported wildcard selection."));
-                Assert.That(v1.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(v1.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/TestData.cs b/tests/CoreEx.Test/Framework/Validation/TestData.cs
deleted file mode 100644
index 0f3d88dc..00000000
--- a/tests/CoreEx.Test/Framework/Validation/TestData.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    public class TestDataBase
-    {
-        [JsonPropertyName("text")]
-        public string? Text { get; set; }
-    }
-
-    public class TestData : TestDataBase
-    {
-        [JsonPropertyName("datefrom")]
-        public DateTime DateA { get; set; }
-
-        [JsonPropertyName("dateto")]
-        public DateTime? DateB { get; set; }
-
-        public int CountA { get; set; }
-
-        public int? CountB { get; set; }
-
-        public decimal AmountA { get; set; }
-
-        public decimal? AmountB { get; set; }
-
-        public double DoubleA { get; set; }
-
-        public double? DoubleB { get; set; }
-
-        public bool SwitchA { get; set; }
-
-        public bool? SwitchB { get; set; }
-
-        public List<int>? Vals { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/ValidatorTest.cs b/tests/CoreEx.Test/Framework/Validation/ValidatorTest.cs
deleted file mode 100644
index 4a15be74..00000000
--- a/tests/CoreEx.Test/Framework/Validation/ValidatorTest.cs
+++ /dev/null
@@ -1,903 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Results;
-using CoreEx.Validation;
-using CoreEx.Validation.Rules;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    [TestFixture]
-    public class ValidatorTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Create_NewValidator()
-        {
-            var r = await Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory().String(10))
-                .HasProperty(x => x.CountB, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10))
-                .ValidateAsync(new TestData { CountB = 0 });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Text is required."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Count B must be greater than 10."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("CountB"));
-            });
-        }
-
-        [Test]
-        public async Task Create_NewValidator_WithIncludeBase()
-        {
-            var v = Validator.Create<TestDataBase>()
-                .HasProperty(x => x.Text, p => p.Mandatory().String(10));
-
-            var r = await Validator.Create<TestData>()
-                .IncludeBase(v)
-                .HasProperty(x => x.CountB, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10))
-                .ValidateAsync(new TestData { CountB = 0 });
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Text is required."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Count B must be greater than 10."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("CountB"));
-            });
-        }
-
-        [Test]
-        public async Task Ruleset_UsingValidatorClass()
-        {
-            var r = await new TestItemValidator().ValidateAsync(new TestItem { Id = "A", Text = "X" });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-
-            r = await new TestItemValidator().ValidateAsync(new TestItem { Id = "A", Text = "A" });
-            Assert.That(r.HasErrors, Is.False);
-
-            r = await new TestItemValidator().ValidateAsync(new TestItem { Id = "B", Text = "X" });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-
-            r = await new TestItemValidator().ValidateAsync(new TestItem { Id = "B", Text = "B" });
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Ruleset_UsingInline()
-        {
-            var v = Validator.Create<TestItem>()
-                .HasRuleSet(x => x.Value!.Id == "A", y =>
-                {
-                    y.Property(x => x.Text).Mandatory().Must(x => x.Text == "A");
-                })
-                .HasRuleSet(x => x.Value!.Id == "B", (y) =>
-                {
-                    y.Property(x => x.Text).Mandatory().Must(x => x.Text == "B");
-                });
-
-            var r = await v.ValidateAsync(new TestItem { Id = "A", Text = "X" });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-
-            r = await v.ValidateAsync(new TestItem { Id = "A", Text = "A" });
-            Assert.That(r.HasErrors, Is.False);
-
-            r = await v.ValidateAsync(new TestItem { Id = "B", Text = "X" });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-
-            r = await v.ValidateAsync(new TestItem { Id = "B", Text = "B" });
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task CheckJsonNamesUsage()
-        {
-            var v = Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Mandatory())
-                .HasProperty(x => x.DateA, p => p.Mandatory())
-                .HasProperty(x => x.DateA, p => p.Mandatory());
-
-            var r = await v.ValidateAsync(new TestData(), new ValidationArgs { UseJsonNames = true });
-        }
-
-        [Test]
-        public async Task Override_OnValidate_WithCheckPredicate()
-        {
-            var r = await new TestItemValidator2().ValidateAsync(new TestItem(), new ValidationArgs { UseJsonNames = true });
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Identifier is invalid."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("id"));
-
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Description must not exceed 10 item(s)."));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("Text"));
-            });
-        }
-
-        [Test]
-        public async Task Inline_OnValidate_WithWhen()
-        {
-            var r = await Validator.Create<TestItem>()
-                .AdditionalAsync((context, _) =>
-                {
-                    context.Check(x => x.Text, true, ValidatorStrings.MaxCountFormat, 10);
-                    context.Check(x => x.Text, true, ValidatorStrings.MaxCountFormat, 10);
-                    return Task.FromResult(Result.Success);
-                }).ValidateAsync(new TestItem());
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Description must not exceed 10 item(s)."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Text"));
-            });
-        }
-
-        [Test]
-        public async Task Multi_Common_Validator()
-        {
-            var cv1 = CommonValidator.Create<string?>(v => v.String(5).Must(x => x.Value != "XXXXX"));
-            var cv2 = CommonValidator.Create<string?>(v => v.String(2).Must(x => x.Value != "YYY"));
-
-            var vx = Validator.Create<TestItem>()
-                .HasProperty(x => x.Id, p => p.Common(cv2))
-                .HasProperty(x => x.Text, p => p.Common(cv1));
-
-            var r = await vx.ValidateAsync(new TestItem { Id = "YYY", Text = "XXXXX" });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-            });
-        }
-
-        [Test]
-        public async Task Entity_SubEntity_Mandatory()
-        {
-            var r = await Validator.Create<TestEntity>()
-                .HasProperty(x => x.Items, (p) => p.Mandatory())
-                .HasProperty(x => x.Item, (p) => p.Mandatory())
-                .ValidateAsync(new TestEntity { Items = null });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(2));
-            });
-        }
-
-        [Test]
-        public async Task NonNullableString()
-        {
-            var v = Validator.Create<TestDataString>().HasProperty(x => x.Name, p => p.Mandatory().String(10));
-            var r = await v.ValidateAsync(new TestDataString("a"));
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-
-            r = await v.ValidateAsync(new TestDataString(null!));
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Name is required."));
-            });
-        }
-
-        public class TestItemValidator : Validator<TestItem>
-        {
-            public TestItemValidator()
-            {
-                RuleSet(x => x.Value!.Id == "A", () =>
-                {
-                    Property(x => x.Text).Mandatory().Must(x => x.Text == "A");
-                });
-
-                RuleSet(x => x.Value!.Id == "B", () =>
-                {
-                    Property(x => x.Text).Mandatory().Must(x => x.Text == "B");
-                });
-            }
-        }
-
-        public class TestItemValidator2 : Validator<TestItem>
-        {
-            protected override Task<Result> OnValidateAsync(ValidationContext<TestItem> context, CancellationToken ct)
-            {
-                if (!context.HasError(x => x.Id))
-                    context.AddError(x => x.Id, ValidatorStrings.InvalidFormat);
-
-                if (!context.HasError(x => x.Id))
-                    Assert.Fail();
-
-                context.Check(x => x.Text, (v) => string.IsNullOrEmpty(v), ValidatorStrings.MaxCountFormat, 10);
-                context.Check(x => x.Text, (v) => throw new NotFoundException(), ValidatorStrings.MaxCountFormat, 10);
-                return Task.FromResult(Result.Success);
-            }
-        }
-
-        public class TestEntity
-        {
-            public List<TestItem>? Items { get; set; } = [];
-
-            public TestItem? Item { get; set; }
-
-            public Dictionary<string, string>? Dict { get; set; }
-
-            public Dictionary<string, TestItem>? Dict2 { get; set; }
-        }
-
-        public class TestItem : IIdentifier<string>
-        {
-            public string? Id { get; set; }
-
-            [JsonPropertyName("Text")]
-            [System.ComponentModel.DataAnnotations.Display(Name = "Description")]
-            public string? Text { get; set; }
-        }
-
-        public class TestItem2 : IPrimaryKey
-        {
-            public string? Part1 { get; set; }
-
-            public int Part2 { get; set; }
-
-            [JsonPropertyName("Text")]
-            [System.ComponentModel.DataAnnotations.Display(Name = "Description")]
-            public string? Text { get; set; }
-
-            public CompositeKey PrimaryKey => new(Part1, Part2);
-
-        }
-
-        public class TestDataString(string name)
-        {
-            public string Name { get; set; } = name;
-        }
-
-        [Test]
-        public async Task Create_NewValidator_CollectionDuplicate()
-        {
-            var e = new TestEntity();
-            e.Items!.Add(new TestItem { Id = "ABC", Text = "Abc" });
-            e.Items.Add(new TestItem { Id = "DEF", Text = "Abc" });
-            e.Items.Add(new TestItem { Id = "ABC", Text = "Def" });
-            e.Items.Add(new TestItem { Id = "XYZ", Text = "Xyz" });
-
-            var v = Validator.Create<TestItem>();
-
-            var r = await Validator.Create<TestEntity>()
-                .HasProperty(x => x.Items, p => p.Collection(item: CollectionRuleItem.Create(v).DuplicateCheck(y => y.Id)))
-                .ValidateAsync(e);
-
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Items contains duplicates; Identifier 'ABC' specified more than once."));
-                Assert.That(r.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("Items"));
-            });
-        }
-
-        [Test]
-        public void ThrowValidationException_NoArgs()
-        {
-            try
-            {
-                Validator.Create<TestItem>().ThrowValidationException(x => x.Id, "Some text.");
-                Assert.Fail();
-            }
-            catch (ValidationException vex)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(vex.Messages![0].Text, Is.EqualTo("Some text."));
-                    Assert.That(vex.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                    Assert.That(vex.Messages[0].Property, Is.EqualTo("Id"));
-                });
-            }
-        }
-
-        [Test]
-        public void ThrowValidationException_WithArgs()
-        {
-            try
-            {
-                Validator.Create<TestItem>().ThrowValidationException(x => x.Id, "{0} {1} {2} Stuff.", "XXX", "ZZZ");
-                Assert.Fail();
-            }
-            catch (ValidationException vex)
-            {
-                Assert.Multiple(() =>
-                {
-                    Assert.That(vex.Messages![0].Text, Is.EqualTo("Identifier XXX ZZZ Stuff."));
-                    Assert.That(vex.Messages[0].Type, Is.EqualTo(MessageType.Error));
-                    Assert.That(vex.Messages[0].Property, Is.EqualTo("Id"));
-                });
-            }
-        }
-
-        private class TestInject
-        {
-            public string? Text { get; set; }
-            public object? Value { get; set; }
-        }
-
-        public class TestInjectChild
-        {
-            public int Code { get; set; }
-        }
-
-        [Test]
-        public async Task ManualProperty_Inject()
-        {
-            var vx = await Validator.Create<TestInject>()
-                .HasProperty(x => x.Text, p => p.Mandatory())
-                .HasProperty(x => x.Value, p => p.Mandatory().Custom(TestInjectValueValidate))
-                .ValidateAsync(new TestInject { Text = "X", Value = new TestInjectChild { Code = 5 } });
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(vx.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vx.Messages![0].Text, Is.EqualTo("Code must be greater than 10."));
-                Assert.That(vx.Messages[0].Property, Is.EqualTo("Value.Code"));
-            });
-        }
-
-        private Result TestInjectValueValidate(PropertyContext<TestInject, object?> context)
-        {
-            var vxc = Validator.Create<TestInjectChild>()
-                .HasProperty(x => x.Code, p => p.Mandatory().CompareValue(CompareOperator.GreaterThan, 10));
-
-            var type = vxc.GetType();
-            var mi = type.GetMethod("ValidateAsync")!;
-            var vc = ((Task<ValidationContext<TestInjectChild>>)mi.Invoke(vxc, [context.Value, context.CreateValidationArgs(), System.Threading.CancellationToken.None])!).GetAwaiter().GetResult();
-            context.Parent.MergeResult(vc);
-            return Result.Success;
-        }
-
-        [Test]
-        public async Task Entity_ValueOverrideAndDefault()
-        {
-            var vc = CommonValidator.Create<decimal>(v => v.Default(100));
-
-            var ti = new TestData { Text = "ABC", CountA = 1 };
-
-            var vx = await Validator.Create<TestData>()
-                .HasProperty(x => x.Text, p => p.Override("XYZ"))
-                .HasProperty(x => x.CountA, p => p.Default(x => 10))
-                .HasProperty(x => x.CountB, p => p.Default(x => 20))
-                .HasProperty(x => x.AmountA, p => p.Common(vc))
-                .ValidateAsync(ti);
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(vx.HasErrors, Is.False);
-                Assert.That(ti.Text, Is.EqualTo("XYZ"));
-                Assert.That(ti.CountA, Is.EqualTo(1));
-                Assert.That(ti.CountB, Is.EqualTo(20));
-                Assert.That(ti.AmountA, Is.EqualTo(100));
-            });
-        }
-
-        public class Employee
-        {
-            public string? FirstName { get; set; }
-            public string? LastName { get; set; }
-            public DateTime Birthdate { get; set; }
-            public decimal Salary { get; set; }
-            public int WorkingYears { get; set; }
-        }
-
-        public class EmployeeValidator : Validator<Employee>
-        {
-            public EmployeeValidator()
-            {
-                Property(x => x.FirstName).Mandatory().String(100);
-                Property(x => x.LastName).Mandatory().String(100);
-                Property(x => x.Birthdate).Mandatory().CompareValue(CompareOperator.LessThanEqual, DateTime.UtcNow, "today");
-                Property(x => x.Salary).Mandatory().Numeric(allowNegatives: false, maxDigits: 10, decimalPlaces: 2);
-                Property(x => x.WorkingYears).Numeric(allowNegatives: false).CompareValue(CompareOperator.LessThanEqual, 50);
-            }
-        }
-
-        [Test]
-        public void Entity_ValueCachePerfSync()
-        {
-            InstantiateValidators();
-        }
-
-        private static void InstantiateValidators()
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                _ = new EmployeeValidator();
-            }
-        }
-
-        [Test]
-        public void Entity_ValueCachePerfAsync()
-        {
-            var tasks = new Task[10];
-            for (int i = 0; i < 10; i++)
-            {
-                tasks[i] = Task.Run(() => InstantiateValidators());
-            }
-
-            Task.WaitAll(tasks);
-        }
-
-        [Test]
-        public async Task Coll_Validator_MaxCount()
-        {
-            var vxc = Validator.CreateForCollection<List<TestItem>>(minCount: 1, maxCount: 2, item: CollectionRuleItem.Create(new TestItemValidator()));
-            var tc = new List<TestItem> { new() { Id = "A", Text = "aaa" }, new() { Id = "B", Text = "bbb" }, new() { Id = "C", Text = "ccc" } };
-
-            var r = await tc.Validate(vxc, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(3));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value[0].Text"));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("value[1].Text"));
-                Assert.That(r.Messages[2].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[2].Text, Is.EqualTo("Value must not exceed 2 item(s)."));
-                Assert.That(r.Messages[2].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Coll_Validator_MinCount()
-        {
-            var vxc = Validator.CreateForCollection<List<TestItem>, TestItem>(new TestItemValidator(), minCount: 3);
-            var tc = new List<TestItem> { new() { Id = "A", Text = "A" }, new() { Id = "B", Text = "B" } };
-
-            var r = await tc.Validate(vxc, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Value must have at least 3 item(s)."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Coll_Validator_MinCount2()
-        {
-            var vxc = Validator.CreateFor<List<TestItem>>().Configure(c => c.Collection(new TestItemValidator(), minCount: 3));
-            var tc = new List<TestItem> { new() { Id = "A", Text = "A" }, new() { Id = "B", Text = "B" } };
-
-            var r = await tc.Validate(vxc, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Value must have at least 3 item(s)."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Coll_Validator_Duplicate()
-        {
-            var vxc = Validator.CreateForCollection<List<TestItem>>(item: CollectionRuleItem.Create(new TestItemValidator()).DuplicateCheck(x => x.Id));
-            var tc = new List<TestItem> { new() { Id = "A", Text = "A" }, new() { Id = "A", Text = "A" } };
-
-            var r = await tc.Validate(vxc, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Value contains duplicates; Identifier 'A' specified more than once."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Coll_Validator_OK()
-        {
-            var vxc = Validator.CreateForCollection<List<TestItem>>(minCount: 1, maxCount: 2, item: CollectionRuleItem.Create(new TestItemValidator()).DuplicateCheck(x => x.Id));
-            var tc = new List<TestItem> { new() { Id = "A", Text = "A" }, new() { Id = "B", Text = "B" } };
-
-            var r = await tc.Validate(vxc, null).ValidateAsync();
-
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Coll_Validator_Int_OK()
-        {
-            var vxc = Validator.CreateForCollection<List<int>>(minCount: 1, maxCount: 5);
-            var ic = new List<int> { 1, 2, 3, 4, 5 };
-
-            var r = await ic.Validate(vxc, null).ValidateAsync();
-
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Coll_Validator_Int_Error()
-        {
-            var vxc = Validator.CreateFor<List<int>>(v => v.Collection(1, 3));
-            var ic = new List<int> { 1, 2, 3, 4, 5 };
-
-            var r = await ic.Validate(vxc, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Value must not exceed 3 item(s)."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Dict_Validator_MaxCount()
-        {
-            var vxd = Validator.CreateForDictionary<Dictionary<string, TestItem>>(minCount: 1, maxCount: 2, item: DictionaryRuleItem.Create<string, TestItem>(value: new TestItemValidator()));
-            var tc = new Dictionary<string, TestItem> { { "k1", new TestItem { Id = "A", Text = "aaa" } }, { "k2", new TestItem { Id = "B", Text = "bbb" } }, { "k3", new TestItem { Id = "C", Text = "ccc" } } };
-
-            var r = await tc.Validate(vxd, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(3));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value[k1].Text"));
-                Assert.That(r.Messages[1].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[1].Text, Is.EqualTo("Description is invalid."));
-                Assert.That(r.Messages[1].Property, Is.EqualTo("value[k2].Text"));
-                Assert.That(r.Messages[2].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[2].Text, Is.EqualTo("Value must not exceed 2 item(s)."));
-                Assert.That(r.Messages[2].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Dict_Validator_MinCount()
-        {
-            var vxd = Validator.CreateForDictionary<Dictionary<string, TestItem>>(minCount: 3, item: DictionaryRuleItem.Create<string, TestItem>(value: new TestItemValidator()));
-            var tc = new Dictionary<string, TestItem> { { "k1", new TestItem { Id = "A", Text = "A" } }, { "k2", new TestItem { Id = "B", Text = "B" } } };
-
-            var r = await tc.Validate(vxd, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Value must have at least 3 item(s)."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Dict_Validator_OK()
-        {
-            var vxd = Validator.CreateForDictionary<Dictionary<string, TestItem>, string, TestItem>(new TestItemValidator(), minCount: 2);
-            var tc = new Dictionary<string, TestItem> { { "k1", new TestItem { Id = "A", Text = "A" } }, { "k2", new TestItem { Id = "B", Text = "B" } } };
-
-            var r = await tc.Validate(vxd, null).ValidateAsync();
-
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Dict_Validator_Int_OK()
-        {
-            var vxd = Validator.CreateForDictionary<Dictionary<string, int>>(minCount: 1, maxCount: 5);
-            var id = new Dictionary<string, int> { { "k1", 1 }, { "k2", 2 }, { "k3", 3 }, { "k4", 4 }, { "k5", 5 } };
-
-            var r = await id.Validate(vxd, null).ValidateAsync();
-
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Dict_Validator_Int_Error()
-        {
-            var vxd = Validator.CreateForDictionary<Dictionary<string, int>>(minCount: 1, maxCount: 3);
-            var id = new Dictionary<string, int> { { "k1", 1 }, { "k2", 2 }, { "k3", 3 }, { "k4", 4 }, { "k5", 5 } };
-
-            var r = await id.Validate(vxd, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Value must not exceed 3 item(s)."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value"));
-            });
-        }
-
-        [Test]
-        public async Task Dict_Validator_KeyError()
-        {
-            var kv = CommonValidator.Create<string>(x => x.Text("Key").Mandatory().String(2));
-            var vxd = Validator.CreateForDictionary<Dictionary<string, TestItem>, string, TestItem>(kv, new TestItemValidator(), minCount: 2);
-            var tc = new Dictionary<string, TestItem> { { "k1", new TestItem { Id = "A", Text = "A" } }, { "k2x", new TestItem { Id = "B", Text = "B" } } };
-
-            var r = await tc.Validate(vxd, null).ValidateAsync();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Key must not exceed 2 characters in length."));
-                Assert.That(r.Messages[0].Property, Is.EqualTo("value[k2x]"));
-            });
-        }
-
-        [Test]
-        public async Task Validator_Perf_SameValidator()
-        {
-            var ev = new EmployeeValidator();
-            var v = new Employee { FirstName = "Speedy", LastName = "Fasti", Birthdate = new DateTime(1999, 10, 22), Salary = 51000m, WorkingYears = 20 };
-
-            await ev.ValidateAsync(v).ConfigureAwait(false);
-
-            var sw = System.Diagnostics.Stopwatch.StartNew();
-
-            for (int i = 0; i < 100000; i++)
-            {
-                var r = await ev.ValidateAsync(v).ConfigureAwait(false);
-                r.ThrowOnError();
-            }
-
-            sw.Stop();
-            System.Console.WriteLine($"100K validations - elapsed: {sw.Elapsed.TotalMilliseconds}ms (per {sw.Elapsed.TotalMilliseconds / 100000}ms)");
-        }
-
-        [Test]
-        public void Required()
-        {
-            var vex = Assert.Throws<ValidationException>(() => 0.Required());
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("0 is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("0"));
-            });
-
-            var count = 0;
-            vex = Assert.Throws<ValidationException>(() => count.Required());
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("Count is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("count"));
-            });
-
-            vex = Assert.Throws<ValidationException>(() => 0.Required("count"));
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("Count is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("count"));
-            });
-
-            vex = Assert.Throws<ValidationException>(() => 0.Required("count", "Counter"));
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("Counter is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("count"));
-            });
-
-            vex = Assert.Throws<ValidationException>(() => 0.Required("numberOfPlayers"));
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("Number Of Players is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("numberOfPlayers"));
-            });
-
-            vex = Assert.Throws<ValidationException>(() => 0.Required("id"));
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("Identifier is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("id"));
-            });
-
-            vex = Assert.Throws<ValidationException>(() => 0.Required());
-            Assert.That(vex, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(vex!.Messages, Is.Not.Null);
-                Assert.That(vex.Messages!, Has.Count.EqualTo(1));
-                Assert.That(vex.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(vex.Messages[0].Text, Is.EqualTo("0 is required."));
-                Assert.That(vex.Messages[0].Property, Is.EqualTo("0"));
-
-                Assert.That(123.Required(), Is.EqualTo(123));
-            });
-        }
-
-        [Test]
-        public async Task Validator_FailureResult()
-        {
-            var ev = new EmployeeValidator2();
-            var v = new Employee { FirstName = "Speedy", LastName = "Fasti", Birthdate = new DateTime(1999, 10, 22), Salary = 51000m, WorkingYears = 20 };
-
-            var r = await ev.ValidateAsync(v).ConfigureAwait(false);
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-
-            v.Salary += 88000;
-            r = await ev.ValidateAsync(v).ConfigureAwait(false);
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.FailureResult, Is.Not.Null);
-            });
-            Assert.That(r.FailureResult!.Value.Error, Is.Not.Null.And.TypeOf<ConflictException>());
-
-            Assert.Throws<ConflictException>(() => r.ThrowOnError());
-        }
-
-        public class EmployeeValidator2 : Validator<Employee>
-        {
-            public EmployeeValidator2()
-            {
-                Property(x => x.FirstName).Mandatory().String(100);
-                Property(x => x.LastName).Mandatory().String(100);
-                Property(x => x.Birthdate).Mandatory().CompareValue(CompareOperator.LessThanEqual, DateTime.UtcNow, "today");
-                Property(x => x.Salary).Mandatory().Numeric(allowNegatives: false, maxDigits: 10, decimalPlaces: 2);
-                Property(x => x.WorkingYears).Numeric(allowNegatives: false).CompareValue(CompareOperator.LessThanEqual, 50);
-            }
-
-            protected override async Task<Result> OnValidateAsync(ValidationContext<Employee> context, CancellationToken cancellationToken)
-            {
-                if (context.Value.Salary > 88000m)
-                    return Result.ConflictError("Highly paid individual already exists.");
-
-                return await base.OnValidateAsync(context, cancellationToken);
-            }
-        }
-
-        public class TeamLeader
-        {
-            public Employee? Person { get; set; }
-
-            public string? TeamName { get; set; }
-        }
-
-        public class TeamLeaderValidator : Validator<TeamLeader>
-        {
-            public TeamLeaderValidator()
-            {
-                Property(x => x.Person).Mandatory().Entity(new EmployeeValidator2());
-                Property(x => x.TeamName).Mandatory().String(20);
-            }
-        }
-
-        [Test]
-        public async Task Validator_Nested_FailureResult()
-        {
-            var tlv = new TeamLeaderValidator();
-            var v = new TeamLeader { Person = new Employee { FirstName = "Speedy", LastName = "Fasti", Birthdate = new DateTime(1999, 10, 22), Salary = 51000m, WorkingYears = 20 }, TeamName = "Bananas" };
-
-            var r = await tlv.ValidateAsync(v).ConfigureAwait(false);
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-
-            v.TeamName += " and Oranges and Apples and Kiwi Fruit";
-            r = await tlv.ValidateAsync(v).ConfigureAwait(false);
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Type, Is.EqualTo(MessageType.Error));
-                Assert.That(r.Messages[0].Text, Is.EqualTo("Team Name must not exceed 20 characters in length."));
-            });
-
-            v.Person.Salary += 88000;
-            r = await tlv.ValidateAsync(v).ConfigureAwait(false);
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.FailureResult, Is.Not.Null);
-            });
-            Assert.That(r.FailureResult!.Value.Error, Is.Not.Null.And.TypeOf<ConflictException>());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Validation/ValueValidatorTest.cs b/tests/CoreEx.Test/Framework/Validation/ValueValidatorTest.cs
deleted file mode 100644
index 0ca6a8a5..00000000
--- a/tests/CoreEx.Test/Framework/Validation/ValueValidatorTest.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using CoreEx.Results;
-using CoreEx.Validation;
-using NUnit.Framework;
-using System.Threading.Tasks;
-
-namespace CoreEx.Test.Framework.Validation
-{
-    [TestFixture]
-    public class ValueValidatorTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => CoreEx.Localization.TextProvider.SetTextProvider(new ValidationTextProvider());
-
-        [Test]
-        public async Task Run_With_NotNull()
-        {
-            string name = "George";
-            var r = await name.Validate().Configure(c => c.Mandatory().String(50)).ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.That(r.HasErrors, Is.False);
-        }
-
-        [Test]
-        public async Task Run_With_Null()
-        {
-            string? name = null;
-            var r = await name.Validate().Configure(c => c.Mandatory().String(50)).ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.Messages!, Has.Count.EqualTo(1));
-                Assert.That(r.Messages![0].Text, Is.EqualTo("Name is required."));
-            });
-        }
-
-        [Test]
-        public async Task Validate_With_FailureResult()
-        {
-            string name = "Bill";
-            var r = await name.Validate().Configure(c => c.Mandatory().Custom(ctx => Result.Go().When(() => ctx.Value == "Bill", () => Result.NotFoundError())).String(5)).ValidateAsync();
-            Assert.That(r, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(r.HasErrors, Is.True);
-                Assert.That(r.FailureResult, Is.Not.Null);
-            });
-            Assert.That(r.FailureResult!.Value.Error, Is.Not.Null.And.TypeOf<NotFoundException>());
-            Assert.Throws<NotFoundException>(() => r.ThrowOnError());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/WebApis/WebApiPublisherTest.cs b/tests/CoreEx.Test/Framework/WebApis/WebApiPublisherTest.cs
deleted file mode 100644
index 4311b20e..00000000
--- a/tests/CoreEx.Test/Framework/WebApis/WebApiPublisherTest.cs
+++ /dev/null
@@ -1,567 +0,0 @@
-using CoreEx.Events;
-using CoreEx.Results;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Models;
-using CoreEx.AspNetCore.WebApis;
-using NUnit.Framework;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx;
-using CoreEx.Mapping;
-using Microsoft.Extensions.DependencyInjection;
-using CoreEx.Hosting.Work;
-using System;
-using Microsoft.AspNetCore.Mvc;
-using System.Net;
-
-namespace CoreEx.Test.Framework.WebApis
-{
-    [TestFixture]
-    public class WebApiPublisherTest
-    {
-        [OneTimeSetUp]
-        public void OneTimeSetUp() => UnitTestEx.Abstractions.CoreExOneOffTestSetUp.ForceSetUp();
-
-        [Test]
-        public void PublishAsync_NoValue()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), new WebApiPublisherArgs("test")))
-                .ToActionResultAssertor()
-                .AssertAccepted();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(1));
-        }
-
-        [Test]
-        public void PublishAsync_Value_Success()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new Product { Id = "A", Name = "B", Price = 1.99m }), new WebApiPublisherArgs<Product>("test")))
-                .ToActionResultAssertor()
-                .AssertAccepted();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, ed[0].Value);
-        }
-
-        [Test]
-        public void PublishAsync_Value_Error()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishAsync<Product>(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), new WebApiPublisherArgs<Product>("test")))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Value is mandatory.");
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Is.Empty);
-        }
-
-        [Test]
-        public void PublishAsync_Value_Mapper()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .ConfigureServices(sc => sc.AddMappers<WebApiPublisherTest>())
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishAsync<Product, BackendProduct>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new Product { Id = "A", Name = "B", Price = 1.99m }), new WebApiPublisherArgs<Product, BackendProduct>("test")))
-                .ToActionResultAssertor()
-                .AssertAccepted();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }, ed[0].Value);
-        }
-
-        [Test]
-        public void PublishCollectionAsync_Success()
-        {
-            var products = new ProductCollection
-            {
-                new Product { Id = "Xyz", Name = "Widget", Price = 9.95m },
-                new Product { Id = "Xyz2", Name = "Widget2", Price = 9.95m },
-                new Product { Id = "Xyz3", Name = "Widget3", Price = 9.95m }
-            };
-
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishCollectionAsync<ProductCollection, Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", products), new WebApiPublisherCollectionArgs<ProductCollection, Product>("test")))
-                .ToActionResultAssertor()
-                .AssertAccepted();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(3));
-            ObjectComparer.Assert(products[0], ed[0].Value);
-            ObjectComparer.Assert(products[1], ed[1].Value);
-            ObjectComparer.Assert(products[2], ed[2].Value);
-        }
-
-        [Test]
-        public void PublishCollectionAsync_Success_Mapper()
-        {
-            var products = new ProductCollection
-            {
-                new Product { Id = "Xyz", Name = "Widget", Price = 9.95m },
-                new Product { Id = "Xyz2", Name = "Widget2", Price = 9.95m },
-                new Product { Id = "Xyz3", Name = "Widget3", Price = 9.95m }
-            };
-
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .ConfigureServices(sc => sc.AddMappers<WebApiPublisherTest>())
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishCollectionAsync<ProductCollection, Product, BackendProduct>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", products), new WebApiPublisherCollectionArgs<ProductCollection, Product, BackendProduct>("test")))
-                .ToActionResultAssertor()
-                .AssertAccepted();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(3));
-            ObjectComparer.Assert(new BackendProduct { Code = "Xyz", Description = "Widget", RetailPrice = 9.95m }, ed[0].Value);
-            ObjectComparer.Assert(new BackendProduct { Code = "Xyz2", Description = "Widget2", RetailPrice = 9.95m }, ed[1].Value);
-            ObjectComparer.Assert(new BackendProduct { Code = "Xyz3", Description = "Widget3", RetailPrice = 9.95m }, ed[2].Value);
-        }
-
-        [Test]
-        public void PublishCollectionAsync_Success_WithCorrelationId()
-        {
-            var products = new ProductCollection
-            {
-                new Product { Id = "Xyz", Name = "Widget", Price = 9.95m },
-                new Product { Id = "Xyz2", Name = "Widget2", Price = 9.95m },
-                new Product { Id = "Xyz3", Name = "Widget3", Price = 9.95m }
-            };
-
-            using var test = FunctionTester.Create<Startup>();
-            var imp = new InMemoryPublisher();
-            var hr = test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", products);
-            hr.Headers.Add("x-correlation-id", "corr-id"); // Send through a known correlation id.
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishCollectionAsync<ProductCollection, Product>(hr, new WebApiPublisherCollectionArgs<ProductCollection, Product>("test")))
-                .ToActionResultAssertor()
-                .AssertAccepted();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(3));
-            ObjectComparer.Assert(products[0], ed[0].Value);
-            ObjectComparer.Assert(products[1], ed[1].Value);
-            ObjectComparer.Assert(products[2], ed[2].Value);
-
-            Assert.Multiple(() =>
-            {
-                // Assert the known correlation id.
-                Assert.That(ed[0].CorrelationId, Is.EqualTo("corr-id"));
-                Assert.That(ed[1].CorrelationId, Is.EqualTo("corr-id"));
-                Assert.That(ed[2].CorrelationId, Is.EqualTo("corr-id"));
-            });
-        }
-
-        [Test]
-        public void PublishCollectionAsync_SizeError()
-        {
-            var products = new ProductCollection
-            {
-                new Product { Id = "Xyz", Name = "Widget", Price = 9.95m },
-                new Product { Id = "Xyz2", Name = "Widget2", Price = 9.95m },
-                new Product { Id = "Xyz3", Name = "Widget3", Price = 9.95m }
-            };
-
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishCollectionAsync<ProductCollection, Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", products), new WebApiPublisherCollectionArgs<ProductCollection, Product>("test") { MaxCollectionSize = 2 }))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("The publish collection contains 3 items where only a maximum size of 2 is supported.");
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Is.Empty);
-        }
-
-        [Test]
-        public void PublishAsync_BeforeError()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new Product { Id = "Xyz", Name = "Widget", Price = 9.95m }),
-                    new WebApiPublisherArgs<Product> { EventName = "test", OnBeforeEventAsync = (_, __) => throw new BusinessException("Nope, nope!") }))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Nope, nope!");
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Is.Empty);
-        }
-
-        [Test]
-        public void PublishAsync_BeforeErrorResult()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new Product { Id = "Xyz", Name = "Widget", Price = 9.95m }),
-                    new WebApiPublisherArgs<Product> { EventName = "test", OnBeforeEventAsync = (_, __) => Task.FromResult(Result.Fail("Nope, nope!")) }))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Nope, nope!");
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Is.Empty);
-        }
-
-        [Test]
-        public void PublishCollectionAsync_BeforeError()
-        {
-            var products = new ProductCollection
-            {
-                new Product { Id = "Xyz", Name = "Widget", Price = 9.95m },
-                new Product { Id = "Xyz2", Name = "Widget2", Price = 9.95m },
-                new Product { Id = "Xyz3", Name = "Widget3", Price = 9.95m }
-            };
-
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishCollectionAsync<ProductCollection, Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", products), new WebApiPublisherCollectionArgs<ProductCollection, Product>("test") { OnBeforeEventAsync = (_, __) => throw new BusinessException("Nope, nope!") }))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Nope, nope!");
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Is.Empty);
-        }
-
-        [Test]
-        public void PublishCollectionAsync_BeforeErrorResult()
-        {
-            var products = new ProductCollection
-            {
-                new Product { Id = "Xyz", Name = "Widget", Price = 9.95m },
-                new Product { Id = "Xyz2", Name = "Widget2", Price = 9.95m },
-                new Product { Id = "Xyz3", Name = "Widget3", Price = 9.95m }
-            };
-
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f => f.PublishCollectionAsync<ProductCollection, Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", products), new WebApiPublisherCollectionArgs<ProductCollection, Product>("test") { OnBeforeEventAsync = (_, __) => Task.FromResult(Result.Fail("Nope, nope!")) }))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Nope, nope!");
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Is.Empty);
-        }
-
-        [Test]
-        public void Publish_With_Work_State()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            var ws = test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.PublishAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new Product { Id = "A", Name = "B", Price = 1.99m }),
-                        new WebApiPublisherArgs<Product>("test") { CreateLocation = (_, @event) => new Uri($"status/{@event.Id}", UriKind.Relative) }.WithWorkState());
-                })
-                .ToActionResultAssertor()
-                .AssertAccepted()
-                .AssertLocationHeaderContains("status/")
-                .GetValue<WorkState>();
-
-            var qn = imp.GetNames();
-            Assert.That(qn, Has.Length.EqualTo(1));
-            Assert.That(qn[0], Is.EqualTo("test"));
-
-            var ed = imp.GetEvents("test");
-            Assert.That(ed, Has.Length.EqualTo(1));
-            ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, ed[0].Value);
-
-            var ws2 = wso.GetAsync(ed[0].Id!).Result;
-            Assert.That(ws2, Is.Not.Null);
-            Assert.That(ws2!.Status, Is.EqualTo(WorkStatus.Created));
-            
-            ObjectComparer.Assert(ws, ws2);
-        }
-
-        [Test]
-        public void GetWorkStatus_NotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-                    return f.GetWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherStatusArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void GetWorkStatus_InProgress_OK()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-
-            using var test = FunctionTester.Create<Startup>();
-
-            // Status of created.
-            var ara = test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherStatusArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(ws)
-                .AssertResultType<ValueContentResult>();
-
-            var vcr = ara.Result as ValueContentResult;
-            Assert.That(vcr?.RetryAfter, Is.EqualTo(TimeSpan.FromSeconds(30)));
-
-            // Status of started.
-            ws = wso.StartAsync(ws.Id!).Result;
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherStatusArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(ws);
-
-            // Status of indeterminate.
-            ws = wso.IndeterminateAsync(ws.Id!, "Oh no!").Result;
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherStatusArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(ws);
-        }
-
-        [Test]
-        public void GetWorkStatus_Fail_BadRequest()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-            ws = wso.StartAsync("abc").Result;
-            ws = wso.FailAsync("abc", "bad-request").Result;
-
-            using var test = FunctionTester.Create<Startup>();
-
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherStatusArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertValue(ws);
-        }
-
-        [Test]
-        public void GetWorkStatus_Completed()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-            ws = wso.StartAsync("abc").Result;
-            ws = wso.CompleteAsync("abc").Result;
-
-            using var test = FunctionTester.Create<Startup>();
-
-            var ara = test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherStatusArgs("test", "abc") { CreateResultLocation = ws => new Uri($"/result/{ws.Id}", UriKind.Relative) });
-                })
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.Redirect)
-                .AssertLocationHeader(new Uri($"/result/{ws.Id}", UriKind.Relative));
-        }
-
-        [Test]
-        public void GetWorkResult_NotFound()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-
-            using var test = FunctionTester.Create<Startup>();
-
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherResultArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void GetWorkResult_NoValue()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-            ws = wso.StartAsync("abc").Result;
-            ws = wso.CompleteAsync("abc").Result;
-
-            using var test = FunctionTester.Create<Startup>();
-
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherResultArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void GetWorkResult_WithValue()
-        {
-            var p = new Product { Id = "A", Name = "B", Price = 1.99m };
-
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-            ws = wso.StartAsync("abc").Result;
-            ws = wso.CompleteAsync("abc").Result;
-            wso.SetDataAsync(ws.Id!, p).Wait();
-
-            using var test = FunctionTester.Create<Startup>();
-
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.GetWorkResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherResultArgs<Product>("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(p);
-        }
-
-        [Test]
-        public void CancelWorkStatus_AlreadyFailed()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-            ws = wso.StartAsync("abc").Result;
-            ws = wso.FailAsync("abc", "bad-request").Result;
-
-            using var test = FunctionTester.Create<Startup>();
-
-            // Status of created.
-            test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.CancelWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherCancelArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("A cancellation can not be performed when the current status is Failed.");
-        }
-
-        [Test]
-        public void CancelWorkStatus_Success()
-        {
-            var wso = new WorkStateOrchestrator(new InMemoryWorkStatePersistence());
-            var ws = wso.CreateAsync(new WorkStateArgs("test", "abc")).Result;
-            ws = wso.StartAsync("abc").Result;
-
-            using var test = FunctionTester.Create<Startup>();
-
-            ws = test.Type<WebApiPublisher>()
-                .Run(f =>
-                {
-                    f.WorkStateOrchestrator = wso;
-                    return f.CancelWorkStatusAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/status/abc"), new WebApiPublisherCancelArgs("test", "abc"));
-                })
-                .ToActionResultAssertor()
-                .AssertOK()
-                .GetValue<WorkState>();
-
-            Assert.That(ws, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(ws!.Status, Is.EqualTo(WorkStatus.Canceled));
-                Assert.That(ws.Reason, Is.EqualTo("No reason was specified."));
-            });
-        }
-    }
-
-    // Demonstrates a hard-coded mapper.
-    public class ProductMapper : Mapper<Product, BackendProduct>
-    {
-        protected override BackendProduct? OnMap(Product? s, BackendProduct? d, OperationTypes operationType)
-        {
-            if (s is null || d is null)
-                return d;
-
-            d.Code = s.Id!;
-            d.Description = s.Name;
-            d.RetailPrice = s.Price;
-            return d;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/WebApis/WebApiRequestOptionsTest.cs b/tests/CoreEx.Test/Framework/WebApis/WebApiRequestOptionsTest.cs
deleted file mode 100644
index cf8459fe..00000000
--- a/tests/CoreEx.Test/Framework/WebApis/WebApiRequestOptionsTest.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using CoreEx.AspNetCore.Http;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.TestFunction;
-using NUnit.Framework;
-using System.Net.Http;
-using UnitTestEx;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-
-namespace CoreEx.Test.Framework.WebApis
-{
-    [TestFixture]
-    public class WebApiRequestOptionsTest
-    {
-        [Test]
-        public void GetRequestOptions_None()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest");
-
-            var wro = hr.GetRequestOptions();
-
-            Assert.That(wro, Is.Not.Null);
-            Assert.That(wro.Request, Is.SameAs(hr));
-            Assert.Multiple(() =>
-            {
-                Assert.That(wro.ETag, Is.Null);
-                Assert.That(wro.IncludeText, Is.False);
-                Assert.That(wro.IncludeInactive, Is.False);
-                Assert.That(wro.IncludeFields, Is.Null);
-                Assert.That(wro.ExcludeFields, Is.Null);
-                Assert.That(wro.Paging, Is.Null);
-            });
-        }
-
-        [Test]
-        public void GetRequestOptions_Configured()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest");
-            var ro = new HttpRequestOptions() { ETag = "etag-value", IncludeText = true, IncludeInactive = true, UrlQueryString = "fruit=apples" }.WithPaging(PagingArgs.CreateSkipAndTake(20, 25, true)).Include("fielda", "fieldb").Exclude("fieldc");
-            
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.QueryString.Value, Is.EqualTo("?$skip=20&$take=25&$count=true&$fields=fielda,fieldb&$exclude=fieldc&$text=true&$inactive=true&fruit=apples"));
-
-            var wro = hr.GetRequestOptions();
-
-            Assert.That(wro, Is.Not.Null);
-            Assert.That(wro.Request, Is.SameAs(hr));
-            Assert.Multiple(() =>
-            {
-                Assert.That(wro.ETag, Is.EqualTo("etag-value"));
-                Assert.That(wro.IncludeText, Is.True);
-                Assert.That(wro.IncludeInactive, Is.True);
-                Assert.That(wro.IncludeFields, Is.EqualTo(new string[] { "fielda", "fieldb" }));
-                Assert.That(wro.ExcludeFields, Is.EqualTo(new string[] { "fieldc" }));
-                Assert.That(wro.Paging, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(wro.Paging!.Skip, Is.EqualTo(20));
-                Assert.That(wro.Paging.Take, Is.EqualTo(25));
-                Assert.That(wro.Paging.IsGetCount, Is.True);
-            });
-        }
-
-
-        [Test]
-        public void GetRequestOptions_Configured_TokenPaging()
-        {
-            PagingArgs.IsTokenSupported = true;
-
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest");
-            var ro = new HttpRequestOptions { ETag = "etag-value", IncludeText = true, IncludeInactive = true, UrlQueryString = "fruit=apples" }.WithPaging(PagingArgs.CreateTokenAndTake("token", 25, true)).Include("fielda", "fieldb").Exclude("fieldc");
-
-            hr.ApplyRequestOptions(ro);
-            Assert.That(hr.QueryString.Value, Is.EqualTo("?$token=token&$take=25&$count=true&$fields=fielda,fieldb&$exclude=fieldc&$text=true&$inactive=true&fruit=apples"));
-
-            var wro = hr.GetRequestOptions();
-
-            Assert.That(wro, Is.Not.Null);
-            Assert.That(wro.Request, Is.SameAs(hr));
-            Assert.Multiple(() =>
-            {
-                Assert.That(wro.ETag, Is.EqualTo("etag-value"));
-                Assert.That(wro.IncludeText, Is.True);
-                Assert.That(wro.IncludeInactive, Is.True);
-                Assert.That(wro.IncludeFields, Is.EqualTo(new string[] { "fielda", "fieldb" }));
-                Assert.That(wro.ExcludeFields, Is.EqualTo(new string[] { "fieldc" }));
-                Assert.That(wro.Paging, Is.Not.Null);
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(wro.Paging!.Token, Is.EqualTo("token"));
-                Assert.That(wro.Paging.Take, Is.EqualTo(25));
-                Assert.That(wro.Paging.IsGetCount, Is.True);
-            });
-        }
-
-        [TearDown]
-        public void TearDown() => PagingArgs.IsTokenSupported = false;
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/WebApis/WebApiTest.cs b/tests/CoreEx.Test/Framework/WebApis/WebApiTest.cs
deleted file mode 100644
index 16ebcf95..00000000
--- a/tests/CoreEx.Test/Framework/WebApis/WebApiTest.cs
+++ /dev/null
@@ -1,733 +0,0 @@
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Results;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Models;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Net.Http.Headers;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using UnitTestEx;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-using CoreEx.AspNetCore.Http;
-
-namespace CoreEx.Test.Framework.WebApis
-{
-    [TestFixture]
-    public class WebApiTest
-    {
-        [Test]
-        public void RunAsync_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest"), r => Task.FromResult((IActionResult)new StatusCodeResult(200))))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Assert(HttpStatusCode.OK);
-        }
-
-        [Test]
-        public void RunAsync_CorrelationId()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Post, "https://unittest");
-            hr.Headers.Add("x-correlation-id", "corr-id");
-
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(hr, r => { Assert.That(ExecutionContext.Current.CorrelationId, Is.EqualTo("corr-id")); return Task.FromResult((IActionResult)new StatusCodeResult(200)); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Assert(HttpStatusCode.OK);
-        }
-
-        [Test]
-        public void RunAsync_ValidationException1()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), _ => throw new ValidationException()))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertValue("A data validation error occurred."); // TODO: this is wonky!
-        }
-
-        [Test]
-        public void RunAsync_ValidationException2()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), _ =>
-                {
-                    var mic = new MessageItemCollection();
-                    mic.AddPropertyError("Test", "Invalid.");
-                    throw new ValidationException(mic);
-                }))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertErrors(new ApiError("Test", "Invalid."));
-        }
-
-        [Test]
-        public void RunAsync_ValidationException_NoCatchAndHandleExceptions()
-        {
-            using var test = FunctionTester.Create<Startup>().ReplaceScoped(_ => new WebApiInvoker { CatchAndHandleExceptions = false });
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), _ => throw new ValidationException()))
-                .AssertException<ValidationException>();
-        }
-
-        [Test]
-        public void RunAsync_TransientException()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), _ => throw new TransientException()))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.ServiceUnavailable);
-        }
-
-        [Test]
-        public void RunAsync_UnhandledException()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), _ => throw new DivideByZeroException()))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.InternalServerError);
-        }
-
-        [Test]
-        public void RunAsync_UnhandledException_NoCatchAndHandleExceptions()
-        {
-            using var test = FunctionTester.Create<Startup>().ReplaceScoped(_ => new WebApiInvoker { CatchAndHandleExceptions = false });
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), _ => throw new DivideByZeroException()))
-                .AssertException<DivideByZeroException>();
-        }
-
-        [Test]
-        public void RunAsync_WithValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.RunAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult((IActionResult)new StatusCodeResult(201)); }))
-                .ToActionResultAssertor()
-                .AssertCreated();
-        }
-
-        [Test]
-        public void GetAsync_NoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest"), r => Task.FromResult<string?>(null)))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.NotFound);
-        }
-
-        [Test]
-        public void GetAsync_WithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult("it-worked")))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue("it-worked");
-        }
-
-        [Test]
-        public void GetAsync_WithETag()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget"), r => Task.FromResult(new Person { Id = 1, Name = "Angela", ETag = "my-etag" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("my-etag"));
-
-            // Second time should be the same.
-            vcr = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget"), r => Task.FromResult(new Person { Id = 1, Name = "Angela", ETag = "my-etag" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("my-etag"));
-
-            // However, if a query string, then etag will need to be generated, as it possibly can influence result.
-            vcr = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new Person { Id = 1, Name = "Angela", ETag = "my-etag" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.Not.EqualTo("my-etag"));
-
-            var vcr2 = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new Person { Id = 1, Name = "Angela", ETag = "my-etag" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr2, Is.Not.Null);
-            Assert.That(vcr2!.ETag, Is.EqualTo(vcr.ETag));
-        }
-
-        [Test]
-        public void GetAsync_WithETagValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget"), r => Task.FromResult(new Person { Id = 1, Name = "Angela", ETag = "my-etag" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("my-etag"));
-        }
-
-        [Test]
-        public void GetAsync_WithETagValueNotModified()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget");
-            hr.Headers.Add(HeaderNames.IfMatch, "\\W\"my-etag\"");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(hr, r => Task.FromResult(new Person { Id = 1, Name = "Angela", ETag = "my-etag" })))
-                .ToActionResultAssertor()
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void GetAsync_WithGenETagValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget"), r => Task.FromResult(new Person { Id = 1, Name = "Angela" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("iVsGVb/ELj5dvXpe3ImuOy/vxLIJnUtU2b8nIfpX5PM="));
-
-            var p = test.JsonSerializer.Deserialize<Person>(vcr.Content!);
-            Assert.That(p, Is.Not.Null);
-            Assert.That(p!.ETag, Is.EqualTo("iVsGVb/ELj5dvXpe3ImuOy/vxLIJnUtU2b8nIfpX5PM="));
-        }
-
-        [Test]
-        public void GetAsync_WithGenETagValue_QueryString()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new Person { Id = 1, Name = "Angela" })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("cpDn3xugV1xKSHF9AY4kQRNQ1yC/SU49xC66C92WZbE="));
-
-            var p = test.JsonSerializer.Deserialize<Person>(vcr.Content!);
-            Assert.That(p, Is.Not.Null);
-            Assert.That(p!.ETag, Is.EqualTo("iVsGVb/ELj5dvXpe3ImuOy/vxLIJnUtU2b8nIfpX5PM="));
-        }
-
-        [Test]
-        public void GetAsync_WithGenETagValueNotModified()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples");
-            hr.Headers.Add(HeaderNames.IfMatch, "\\W\"cpDn3xugV1xKSHF9AY4kQRNQ1yC/SU49xC66C92WZbE=\"");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(hr, r => Task.FromResult(new Person { Id = 1, Name = "Angela" })))
-                .ToActionResultAssertor()
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionNull()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult<PersonCollection>(null!), alternateStatusCode: HttpStatusCode.NoContent)) 
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionEmpty()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new PersonCollection()), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection());
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionResultNull()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult<PersonCollectionResult>(null!), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionResultNullCollection()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new PersonCollectionResult()), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(Array.Empty<object?>());
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionResultItems()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } }), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionResultItemsAndPaging()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new PersonCollectionResult { Paging = new PagingResult(PagingArgs.CreateSkipAndTake(2, 3), 20), Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } }), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-
-            Assert.That(((ValueContentResult)r.Result).PagingResult, Is.EqualTo(new PagingResult(PagingArgs.CreateSkipAndTake(2, 3), 20)));
-        }
-
-        [Test]
-        public void GetAsync_WithCollectionResultItems_ETagDiffQueryString()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } }), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-
-            var r2 = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=oranges"), r => Task.FromResult(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } }), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-
-            Assert.That(((ValueContentResult)r2.Result).ETag, Is.Not.EqualTo(((ValueContentResult)r.Result).ETag));
-        }
-
-        [Test]
-        public void GetAsync_WithCollection_FieldsInclude()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples&$fields=name"), r => Task.FromResult(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } }), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Name = "Simon" } });
-        }
-
-        [Test]
-        public void GetAsync_WithCollection_FieldsExclude()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples&$exclude=name"), r => Task.FromResult(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } }), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1 } });
-        }
-
-        [Test]
-        public void GetAsync_WithMessages_ErrorStatusCode()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var result = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest"), r =>
-                {
-                    ExecutionContext.Current.Messages.Add(MessageType.Warning, "Please renew licence.");
-                    return Task.FromResult<string?>(null);
-                }))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.NotFound)
-                .Result as StatusCodeResult;
-
-            Assert.That(result, Is.Not.Null);
-        }
-
-        [Test]
-        public void GetAsync_WithMessages_SuccessStatusCode()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var result = test.Type<WebApi>()
-                .Run(f => f.GetAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest"), r =>
-                {
-                    ExecutionContext.Current.Messages.Add(MessageType.Warning, "Please renew licence.");
-                    return Task.FromResult<string?>("This is ok.");
-                }))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.OK)
-                .Result as ValueContentResult;
-
-            Assert.That(result, Is.Not.Null);
-            Assert.Multiple(() =>
-            {
-                Assert.That(result!.Messages, Is.Not.Null);
-                Assert.That(result.Messages, Has.Count.EqualTo(1));
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.That(result!.Messages![0].Type, Is.EqualTo(MessageType.Warning));
-                Assert.That(result.Messages[0].Text, Is.EqualTo("Please renew licence."));
-            });
-        }
-
-        [Test]
-        public void PostAsync_NoValueNoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), r => Task.CompletedTask))
-                .ToActionResultAssertor()
-                .AssertOK();
-        }
-
-        [Test]
-        public void PostAsync_NoValueWithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), r => Task.FromResult(new Product { Id = "A", Name = "B", Price = 1.99m })))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "A", Name = "B", Price = 1.99m });
-        }
-
-        [Test]
-        public void PostAsync_WithValueNoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.CompletedTask; }))
-                .ToActionResultAssertor()
-                .AssertOK();
-        }
-
-        [Test]
-        public void PostAsync_WithValueWithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostAsync<Product, Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult(new Product { Id = "Y", Name = "Z", Price = 3.01m }); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "Y", Name = "Z", Price = 3.01m });
-        }
-
-        [Test]
-        public void PutAsync_WithValueNoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.CompletedTask; }))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void PutAsync_WithValueWithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutAsync<Product, Product>(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult(new Product { Id = "Y", Name = "Z", Price = 3.01m }); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "Y", Name = "Z", Price = 3.01m });
-        }
-
-        [Test]
-        public void PutAsync_AutoConcurrency_NoIfMatch()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 2.99m }),
-                        r => Task.FromResult<Product?>(new Product { Id = "A", Name = "B", Price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 2.99m }, r.Value); return Task.FromResult(new Product { Id = "Y", Name = "Z", Price = 3.99m }); },
-                        simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("An 'If-Match' header is required for an HTTP PUT where the underlying entity supports concurrency (ETag).");
-        }
-
-        [Test]
-        public void PutAsync_AutoConcurrency_NoMatch()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 2.99m }, new HttpRequestOptions { ETag = "bbb" }),
-                        r => Task.FromResult<Product?>(new Product { Id = "A", Name = "B", Price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 2.99m }, r.Value); return Task.FromResult(new Product { Id = "Y", Name = "Z", Price = 3.99m }); },
-                        simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PutAsync_AutoConcurrency_Match()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            
-            test.Type<WebApi>()
-                .Run(f => f.PutAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 2.99m }, new HttpRequestOptions { ETag = "98Oe+fRzgTuVae59mLwf0Mj+iKySTlgUxEQt18huJZg=" }),
-                        r => Task.FromResult<Product?>(new Product { Id = "A", Name = "B", Price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 2.99m }, r.Value); return Task.FromResult(new Product { Id = "Y", Name = "Z", Price = 3.99m }); },
-                        simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "Y", Name = "Z", Price = 3.99m });
-        }
-
-        [Test]
-        public void DeleteAsync()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.DeleteAsync(test.CreateHttpRequest(HttpMethod.Delete, "https://unittest"), _ => Task.CompletedTask))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void PatchAsync_WithInvalidContentType()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Patch, "https://unittest");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(null), put: _ => Task.FromResult<Person>(null!)))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.UnsupportedMediaType)
-                .AssertContent("Unsupported 'Content-Type' for a PATCH; only JSON Merge Patch is supported using either: 'application/merge-patch+json' or 'application/json'.");
-        }
-
-        [Test]
-        public void PatchAsync_WithNullJson()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, null);
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<PersonCollection?>(null), put: _ => Task.FromResult<PersonCollection>(null!)))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Value is mandatory.");
-        }
-
-        [Test]
-        public void PatchAsync_WithBadJson()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "<xml/>");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<PersonCollection?>(null), put: _ => Task.FromResult<PersonCollection>(null!)))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("'<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0.");
-        }
-
-        [Test]
-        public void PatchAsync_WithNoETag()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ }");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person()), put: _ => Task.FromResult<Person>(null!)))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("An 'If-Match' header is required for an HTTP PATCH where the underlying entity supports concurrency (ETag).");
-        }
-
-        [Test]
-        public void PatchAsync_WithETagHeader_ThenNotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ }", "aaaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(null), put: _ => Task.FromResult<Person>(null!)))
-                .ToActionResultAssertor()
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void PatchAsync_WithETagProperty_ThenNotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"etag\": \"aaa\"}");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(null), put: _ => Task.FromResult<Person>(null!)))
-                .ToActionResultAssertor()
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void PatchAsync_WithETagHeader_NotMatched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { ETag = "bbb" }), put: _ => Task.FromResult<Person>(null!)))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchAsync_WithETagProperty_NotMatched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"etag\": \"aaa\"}");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { ETag = "bbb" }), put: _ => Task.FromResult<Person>(null!)))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchAsync_WithETagHeader_PutConcurrency()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bob\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { ETag = "aaa" }), put: _ => throw new ConcurrencyException()))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchAsync_WithETagHeader_SimulateDuplicate_WasMergedWithChanges()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bob\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { Name = "bobby", ETag = "aaa" }), put: _ => throw new DuplicateException()))
-                .ToActionResultAssertor()
-                .AssertConflict();
-        }
-
-        [Test]
-        public void PatchAsync_WithETagHeader_OK_WithNoMergeChanges()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bob\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { Name = "bob", ETag = "aaa" }), put: _ => throw new ConcurrencyException()))
-                .ToActionResultAssertor()
-                .AssertOK();
-        }
-
-        [Test]
-        public void PatchAsync_WithETagHeader_OK_SimulateChanged()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bobby\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr,
-                    get: _ => Task.FromResult<Person?>(new Person { Name = "bob", ETag = "aaa" }),
-                    put: p => { ObjectComparer.Assert(new Person { Name = "bobby", ETag = "aaa" }, p.Value); p.Value!.ETag = "bbb"; return Task.FromResult(p.Value!); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Person { Name = "bobby", ETag = "bbb" })
-                .AssertETagHeader("bbb");
-        }
-
-        [Test]
-        public void PatchAsync_AutoConcurrency_NoIfMatchHeader()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"Gazza\" }");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { Id = 13, Name = "Deano" }), put: _ => Task.FromResult<Person>(null!), simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("An 'If-Match' header is required for an HTTP PATCH where the underlying entity supports concurrency (ETag).");
-        }
-
-        [Test]
-        public void PatchAsync_AutoConcurrency_NotMatched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"Gazza\" }", etag: "bbb");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { Id = 13, Name = "Deano" }), put: _ => Task.FromResult<Person>(null!), simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchAsync_AutoConcurrency_Matched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"Gazza\" }", etag: "Q8nNyU0hP+j7+1tDN0JzLGMcfPOX8OsLAh7lma4U0xo=");
-            test.Type<WebApi>()
-                .Run(f => f.PatchAsync(hr, get: _ => Task.FromResult<Person?>(new Person { Id = 13, Name = "Deano" }), put: _ => Task.FromResult<Person>(new Person { Id = 13, Name = "Gazza" }), simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Person { Id = 13, Name = "Gazza", ETag = "tEEokPXk+4Q5MoiGqyAs1+6A00e2ww59Zm57LJgvBcg=" });
-        }
-
-        private static HttpRequest CreatePatchRequest(UnitTestEx.Azure.Functions.FunctionTester<Startup> test, string? json, string? etag = null)
-            => test.CreateHttpRequest(HttpMethod.Patch, "https://unittest", json, HttpConsts.MergePatchMediaTypeName, hr => hr.ApplyRequestOptions(new HttpRequestOptions { ETag = etag }));
-
-        private class Person : IIdentifier<int>, IETag
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-            public string? ETag { get; set; }
-        }
-
-        private class PersonCollection : List<Person> { }
-
-        private class PersonCollectionResult : CollectionResult<PersonCollection, Person> { }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/WebApis/WebApiWithResultTest.cs b/tests/CoreEx.Test/Framework/WebApis/WebApiWithResultTest.cs
deleted file mode 100644
index 0547e0b7..00000000
--- a/tests/CoreEx.Test/Framework/WebApis/WebApiWithResultTest.cs
+++ /dev/null
@@ -1,618 +0,0 @@
-using CoreEx.AspNetCore.Http;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Results;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Net.Http.Headers;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
-using UnitTestEx;
-using HttpRequestOptions = CoreEx.Http.HttpRequestOptions;
-
-namespace CoreEx.Test.Framework.WebApis
-{
-    [TestFixture]
-    public class WebApiWithResultTest
-    {
-        [Test]
-        public void GetWithResultAsync_NoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest"), r => Task.FromResult(Result<string?>.Ok(null))))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.NotFound);
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok("it-worked"))))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue("it-worked");
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithETagValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget"), r => Task.FromResult(Result.Ok(new Person { Id = 1, Name = "Angela", ETag = "my-etag" }))))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("my-etag"));
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithETagValueNotModified()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget");
-            hr.Headers.Add(HeaderNames.IfMatch, "\\W\"my-etag\"");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(hr, r => Task.FromResult(Result.Ok(new Person { Id = 1, Name = "Angela", ETag = "my-etag" }))))
-                .ToActionResultAssertor()
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithGenETagValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget"), r => Task.FromResult(Result.Ok(new Person { Id = 1, Name = "Angela" }))))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("iVsGVb/ELj5dvXpe3ImuOy/vxLIJnUtU2b8nIfpX5PM="));
-
-            var p = test.JsonSerializer.Deserialize<Person>(vcr.Content!);
-            Assert.That(p, Is.Not.Null);
-            Assert.That(p!.ETag, Is.EqualTo("iVsGVb/ELj5dvXpe3ImuOy/vxLIJnUtU2b8nIfpX5PM="));
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithGenETagValue_QueryString()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var vcr = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok(new Person { Id = 1, Name = "Angela" }))))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .Result as ValueContentResult;
-
-            Assert.That(vcr, Is.Not.Null);
-            Assert.That(vcr!.ETag, Is.EqualTo("cpDn3xugV1xKSHF9AY4kQRNQ1yC/SU49xC66C92WZbE="));
-
-            var p = test.JsonSerializer.Deserialize<Person>(vcr.Content!);
-            Assert.That(p, Is.Not.Null);
-            Assert.That(p!.ETag, Is.EqualTo("iVsGVb/ELj5dvXpe3ImuOy/vxLIJnUtU2b8nIfpX5PM="));
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithGenETagValueNotModified()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples");
-            hr.Headers.Add(HeaderNames.IfMatch, "\\W\"cpDn3xugV1xKSHF9AY4kQRNQ1yC/SU49xC66C92WZbE=\"");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(hr, r => Task.FromResult(Result.Ok(new Person { Id = 1, Name = "Angela" }))))
-                .ToActionResultAssertor()
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionNull()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result<PersonCollection>.Ok(null!)), alternateStatusCode: HttpStatusCode.NoContent)) 
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionEmpty()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok(new PersonCollection())), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection());
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionResultNull()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result<PersonCollectionResult>.Ok(null!)), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionResultNullCollection()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok(new PersonCollectionResult())), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(Array.Empty<object?>());
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionResultItems()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } })), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionResultItemsAndPaging()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok(new PersonCollectionResult { Paging = new PagingResult(PagingArgs.CreateSkipAndTake(2, 3), 20), Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } })), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-
-            Assert.That(((ValueContentResult)r.Result).PagingResult, Is.EqualTo(new PagingResult(PagingArgs.CreateSkipAndTake(2, 3), 20)));
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollectionResultItems_ETagDiffQueryString()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result.Ok(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } })), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-
-            var r2 = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=oranges"), r => Task.FromResult(Result.Ok(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } })), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1, Name = "Simon" } });
-
-            Assert.That(((ValueContentResult)r2.Result).ETag, Is.Not.EqualTo(((ValueContentResult)r.Result).ETag));
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollection_FieldsInclude()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples&$fields=name"), r => Task.FromResult(Result.Ok(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } })), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Name = "Simon" } });
-        }
-
-        [Test]
-        public void GetWithResultAsync_WithCollection_FieldsExclude()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples&$exclude=name"), r => Task.FromResult(Result.Ok(new PersonCollectionResult { Items = new PersonCollection { new Person { Id = 1, Name = "Simon" } } })), alternateStatusCode: HttpStatusCode.NoContent))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new PersonCollection { new Person { Id = 1 } });
-        }
-
-        [Test]
-        public void GetWithResultAsync_OverrideIActionResult_OK()
-        {
-            static Task<Result<IActionResult>> Success(WebApiParam p) => Result.Ok(p.CreateActionResult("It works!", HttpStatusCode.OK)).AsTask();
-
-            using var test = FunctionTester.Create<Startup>();
-            var req = test.CreateHttpRequest(HttpMethod.Get, "https://unittest");
-            req.ApplyETag("1JkYXLLxYY4Zw02qg/K2yVGH+J+oGshN7M/BlIH20/0=");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(req, Success))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertContent("It works!");
-        }
-
-        [Test]
-        public void GetWithResultAsync_OverrideIActionResult_NotModified()
-        {
-            static Task<Result<IActionResult>> Success(WebApiParam p) => Result.Ok(p.CreateActionResult("It works!", HttpStatusCode.OK)).AsTask();
-
-            using var test = FunctionTester.Create<Startup>();
-            var req = test.CreateHttpRequest(HttpMethod.Get, "https://unittest");
-            req.ApplyETag("1JkYXLLxYY4Zw02qg/J2yVGH+J+oGshN7M/BlIH20/0=");
-
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(req, Success))
-                .ToActionResultAssertor()
-                .AssertNotModified();
-        }
-
-        [Test]
-        public void PostWithResultAsync_NoValueNoResult()
-        {
-            static Task<Result> Success(WebApiParam p) => Task.FromResult(Result.Success);
-
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostWithResultAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), Success))
-                .ToActionResultAssertor()
-                .AssertOK();
-        }
-
-        [Test]
-        public void PostWithResultAsync_NoValueWithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostWithResultAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), r => Task.FromResult(Result.Ok(new Product { Id = "A", Name = "B", Price = 1.99m }))))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "A", Name = "B", Price = 1.99m });
-        }
-
-        [Test]
-        public void PostWithResultAsync_WithValueNoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostWithResultAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult(Result.Success); }))
-                .ToActionResultAssertor()
-                .AssertOK();
-        }
-
-        [Test]
-        public void PostWithResultAsync_WithValueWithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostWithResultAsync<Product, Product>(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult(Result.Ok(new Product { Id = "Y", Name = "Z", Price = 3.01m })); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "Y", Name = "Z", Price = 3.01m });
-        }
-
-        [Test]
-        public void PostWithResultAsync_OverrideIActionResult()
-        {
-            static Task<Result<IActionResult>> Success(WebApiParam p) => Result.Ok(p.CreateActionResult("It works!", HttpStatusCode.OK)).AsTask();
-
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PostWithResultAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest"), Success))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertContent("It works!");
-        }
-
-        [Test]
-        public void PutWithResultAsync_WithValueNoResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutWithResultAsync<Product>(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult(Result.Success); }))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void PutWithResultAsync_WithValueWithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutWithResultAsync<Product, Product>(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 1.99m }),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, r.Value); return Task.FromResult(Result.Ok(new Product { Id = "Y", Name = "Z", Price = 3.01m })); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "Y", Name = "Z", Price = 3.01m });
-        }
-
-        [Test]
-        public void PutWithResultAsync_AutoConcurrency_NoIfMatch()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutWithResultAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 2.99m }),
-                        r => Task.FromResult<Result<Product?>>(Result.Ok<Product?>(new Product { Id = "A", Name = "B", Price = 1.99m })),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 2.99m }, r.Value); return Task.FromResult(Result.Ok(new Product { Id = "Y", Name = "Z", Price = 3.99m })); },
-                        simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("An 'If-Match' header is required for an HTTP PUT where the underlying entity supports concurrency (ETag).");
-        }
-
-        [Test]
-        public void PutWithResultAsync_AutoConcurrency_NoMatch()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutWithResultAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 2.99m }, new HttpRequestOptions { ETag = "bbb" }),
-                        r => Task.FromResult<Result<Product?>>(Result.Ok<Product?>(new Product { Id = "A", Name = "B", Price = 1.99m })),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 2.99m }, r.Value); return Task.FromResult(Result.Ok(new Product { Id = "Y", Name = "Z", Price = 3.99m })); },
-                        simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PutWithResultAsync_AutoConcurrency_Match()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.PutWithResultAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest", new { id = "A", name = "B", price = 2.99m }, new HttpRequestOptions { ETag = "98Oe+fRzgTuVae59mLwf0Mj+iKySTlgUxEQt18huJZg=" }),
-                        r => Task.FromResult<Result<Product?>>(Result.Ok<Product?>(new Product { Id = "A", Name = "B", Price = 1.99m })),
-                        r => { ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 2.99m }, r.Value); return Task.FromResult(Result.Ok(new Product { Id = "Y", Name = "Z", Price = 3.99m })); },
-                        simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Product { Id = "Y", Name = "Z", Price = 3.99m });
-        }
-
-        [Test]
-        public void DeleteWithResultAsync()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.DeleteWithResultAsync(test.CreateHttpRequest(HttpMethod.Delete, "https://unittest"), _ => Task.FromResult(Result.Success)))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void DeleteWithResultAsync_NotFoundError()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.DeleteWithResultAsync(test.CreateHttpRequest(HttpMethod.Delete, "https://unittest"), _ => Task.FromResult(Result.NotFoundError())))
-                .ToActionResultAssertor()
-                .AssertNoContent();
-        }
-
-        [Test]
-        public void DeleteWithResultAsync_AuthenticationError()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.Type<WebApi>()
-                .Run(f => f.DeleteWithResultAsync(test.CreateHttpRequest(HttpMethod.Delete, "https://unittest"), _ => Task.FromResult(Result.AuthenticationError())))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.Unauthorized);
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithInvalidContentType()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = test.CreateHttpRequest(HttpMethod.Patch, "https://unittest");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(null!)), put: _ => Task.FromResult(Result<Person>.Ok(null!))))
-                .ToActionResultAssertor()
-                .Assert(HttpStatusCode.UnsupportedMediaType)
-                .AssertContent("Unsupported 'Content-Type' for a PATCH; only JSON Merge Patch is supported using either: 'application/merge-patch+json' or 'application/json'.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithNullJson()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, null);
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<PersonCollection?>.Ok(null!)), put: _ => Task.FromResult(Result<PersonCollection>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Value is mandatory.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithBadJson()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "<xml/>");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<PersonCollection?>.Ok(null!)), put: _ => Task.FromResult(Result<PersonCollection>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertBadRequest()
-                .AssertContent("'<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithNoETag()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ }");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person())), put: _ => Task.FromResult(Result<Person>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("An 'If-Match' header is required for an HTTP PATCH where the underlying entity supports concurrency (ETag).");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagHeader_ThenNotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ }", "aaaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(null!)), put: _ => Task.FromResult(Result<Person>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagProperty_ThenNotFound()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"etag\": \"aaa\"}");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(null!)), put: _ => Task.FromResult(Result<Person>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertNotFound();
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagHeader_NotMatched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { ETag = "bbb" })), put: _ => Task.FromResult(Result<Person>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagProperty_NotMatched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"etag\": \"aaa\"}");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { ETag = "bbb" })), put: _ => Task.FromResult(Result<Person>.Ok(null!))))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagHeader_PutConcurrency()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bob\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { ETag = "aaa" })), put: _ => throw new ConcurrencyException()))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagHeader_SimulateDuplicate_WasMergedWithChanges()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bob\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { Name = "bobby", ETag = "aaa" })), put: _ => throw new DuplicateException()))
-                .ToActionResultAssertor()
-                .AssertConflict();
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagHeader_OK_WithNoMergeChanges()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bob\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { Name = "bob", ETag = "aaa" })), put: _ => throw new ConcurrencyException()))
-                .ToActionResultAssertor()
-                .AssertOK();
-        }
-
-        [Test]
-        public void PatchWithResultAsync_WithETagHeader_OK_SimulateChanged()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"bobby\" }", "aaa");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr,
-                    get: _ => Task.FromResult(Result<Person?>.Ok(new Person { Name = "bob", ETag = "aaa" })),
-                    put: p => { ObjectComparer.Assert(new Person { Name = "bobby", ETag = "aaa" }, p.Value); p.Value!.ETag = "bbb"; return Task.FromResult(Result.Ok(p.Value!)); }))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Person { Name = "bobby", ETag = "bbb" })
-                .AssertETagHeader("bbb");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_AutoConcurrency_NoIfMatchHeader()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"Gazza\" }");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { Id = 13, Name = "Deano" })), put: _ => Task.FromResult(Result<Person>.Ok(null!)), simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("An 'If-Match' header is required for an HTTP PATCH where the underlying entity supports concurrency (ETag).");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_AutoConcurrency_NotMatched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"Gazza\" }", etag: "bbb");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { Id = 13, Name = "Deano" })), put: _ => Task.FromResult(Result<Person>.Ok(null!)), simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertPreconditionFailed()
-                .AssertContent("A concurrency error occurred; please refresh the data and try again.");
-        }
-
-        [Test]
-        public void PatchWithResultAsync_AutoConcurrency_Matched()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var hr = CreatePatchRequest(test, "{ \"name\": \"Gazza\" }", etag: "Q8nNyU0hP+j7+1tDN0JzLGMcfPOX8OsLAh7lma4U0xo=");
-            test.Type<WebApi>()
-                .Run(f => f.PatchWithResultAsync(hr, get: _ => Task.FromResult(Result<Person?>.Ok(new Person { Id = 13, Name = "Deano" })), put: _ => Task.FromResult(Result.Ok(new Person { Id = 13, Name = "Gazza" })), simulatedConcurrency: true))
-                .ToActionResultAssertor()
-                .AssertOK()
-                .AssertValue(new Person { Id = 13, Name = "Gazza", ETag = "tEEokPXk+4Q5MoiGqyAs1+6A00e2ww59Zm57LJgvBcg=" });
-        }
-
-        [Test]
-        public void RunAsync_ValidationException_NoCatchAndHandleExceptions()
-        {
-            using var test = FunctionTester.Create<Startup>().ReplaceScoped(_ => new WebApiInvoker { CatchAndHandleExceptions = false });
-            test.Type<WebApi>()
-                .Run(f => f.GetWithResultAsync(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/testget?fruit=apples"), r => Task.FromResult(Result<string>.Fail("it-failed"))))
-                .AssertException<BusinessException>();
-        }
-
-        private static HttpRequest CreatePatchRequest(UnitTestEx.Azure.Functions.FunctionTester<Startup> test, string? json, string? etag = null)
-            => test.CreateHttpRequest(HttpMethod.Patch, "https://unittest", json, HttpConsts.MergePatchMediaTypeName, hr => hr.ApplyRequestOptions(new HttpRequestOptions { ETag = etag }));
-
-        private class Person : IIdentifier<int>, IETag
-        {
-            public int Id { get; set; }
-            public string? Name { get; set; }
-            public string? ETag { get; set; }
-        }
-
-        private class PersonCollection : List<Person> { }
-
-        private class PersonCollectionResult : CollectionResult<PersonCollection, Person> { }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/Framework/Wildcards/WildcardTest.cs b/tests/CoreEx.Test/Framework/Wildcards/WildcardTest.cs
deleted file mode 100644
index 347e017d..00000000
--- a/tests/CoreEx.Test/Framework/Wildcards/WildcardTest.cs
+++ /dev/null
@@ -1,425 +0,0 @@
-using CoreEx.Wildcards;
-using FluentAssertions;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace CoreEx.Test.Framework.Wildcards
-{
-    [TestFixture]
-    public class WildcardTest
-    {
-        #region Determine
-
-        [Test]
-        public void Parse_1_NoneOrEqual()
-        {
-            var wc = Wildcard.BothAll;
-            Check(WildcardSelection.None, null, wc.Parse(null));
-            Check(WildcardSelection.None, null, wc.Parse(string.Empty));
-            Check(WildcardSelection.None, null, wc.Parse(" "));
-            Check(WildcardSelection.Equal, "X", wc.Parse("X"));
-            Check(WildcardSelection.Equal, "XX", wc.Parse("XX"));
-            Check(WildcardSelection.Equal, "XXX", wc.Parse("XXX"));
-            Check(WildcardSelection.Equal, "XXX", wc.Parse(" XXX "));
-        }
-
-        [Test]
-        public void Parse_2_Single()
-        {
-            var wc = Wildcard.BothAll;
-            Check(WildcardSelection.Single | WildcardSelection.MultiWildcard, "*", wc.Parse("*"));
-            Check(WildcardSelection.Single | WildcardSelection.MultiWildcard, "*", wc.Parse("**"));
-            Check(WildcardSelection.Single | WildcardSelection.MultiWildcard, "*", wc.Parse("***"));
-            Check(WildcardSelection.Single | WildcardSelection.SingleWildcard, "?", wc.Parse("?"));
-            Check(WildcardSelection.StartsWith | WildcardSelection.EndsWith | WildcardSelection.SingleWildcard | WildcardSelection.AdjacentWildcards, "??", wc.Parse("??"));
-            Check(WildcardSelection.StartsWith | WildcardSelection.EndsWith | WildcardSelection.Embedded | WildcardSelection.SingleWildcard | WildcardSelection.AdjacentWildcards, "???", wc.Parse("???"));
-        }
-
-        [Test]
-        public void Parse_3_StartsAndEndsWithOrContains()
-        {
-            var wc = Wildcard.BothAll;
-            Check(WildcardSelection.EndsWith | WildcardSelection.MultiWildcard, "*X", wc.Parse("*X"));
-            Check(WildcardSelection.EndsWith | WildcardSelection.SingleWildcard, "?X", wc.Parse("?X"));
-            Check(WildcardSelection.EndsWith | WildcardSelection.SingleWildcard, "?XX", wc.Parse("?XX"));
-            Check(WildcardSelection.StartsWith | WildcardSelection.MultiWildcard, "X*", wc.Parse("X*"));
-            Check(WildcardSelection.StartsWith | WildcardSelection.SingleWildcard, "X?", wc.Parse("X?"));
-            Check(WildcardSelection.StartsWith | WildcardSelection.SingleWildcard, "XX?", wc.Parse("XX?"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Contains, "*X*", wc.Parse("*X*"));
-            Check(WildcardSelection.SingleWildcard | WildcardSelection.Contains, "?X?", wc.Parse("?X?"));
-        }
-
-        [Test]
-        public void Parse_4_EmbeddedOrContains()
-        {
-            var wc = Wildcard.BothAll;
-            Check(WildcardSelection.Embedded | WildcardSelection.MultiWildcard, "X*X", wc.Parse("X*X"));
-            Check(WildcardSelection.Embedded | WildcardSelection.MultiWildcard, "XX*XX", wc.Parse("XX*XX"));
-            Check(WildcardSelection.Embedded | WildcardSelection.SingleWildcard, "XX?XX", wc.Parse("XX?XX"));
-            Check(WildcardSelection.Embedded | WildcardSelection.SingleWildcard, "XX?XX", wc.Parse("XX?XX"));
-            Check(WildcardSelection.Embedded | WildcardSelection.MultiWildcard, "X*X*XX", wc.Parse("X*X*XX"));
-            Check(WildcardSelection.Embedded | WildcardSelection.MultiWildcard, "X*XX", wc.Parse("X**XX"));
-            Check(WildcardSelection.Embedded | WildcardSelection.MultiWildcard | WildcardSelection.StartsWith, "XX*XX*", wc.Parse("XX*XX*"));
-
-            Check(WildcardSelection.Contains | WildcardSelection.MultiWildcard, "*X*", wc.Parse("*X*"));
-            Check(WildcardSelection.Contains | WildcardSelection.MultiWildcard | WildcardSelection.SingleWildcard, "*X?", wc.Parse("*X?"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Contains, "*X*", wc.Parse("**X*"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Contains, "*X*", wc.Parse("*X**"));
-        }
-
-        [Test]
-        public void Parse_5_InvalidCharacters()
-        {
-            var wc = new Wildcard(WildcardSelection.BothAll, singleWildcard: '_', charactersNotAllowed: new char[] { '?' });
-            Check(WildcardSelection.SingleWildcard | WildcardSelection.InvalidCharacter | WildcardSelection.StartsWith, "X?_", wc.Parse("X?_"));
-        }
-
-        [Test]
-        public void Parse_6_SpaceTreatment()
-        {
-            var wc = new Wildcard(WildcardSelection.MultiAll, spaceTreatment: WildcardSpaceTreatment.Compress);
-            Check(WildcardSelection.Equal, "X X", wc.Parse("X X"));
-            Check(WildcardSelection.Equal, "X X", wc.Parse("X  X"));
-            Check(WildcardSelection.Equal, "X X X", wc.Parse("X  X  X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.EndsWith, "*X X", wc.Parse("*X X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.StartsWith, "X X*", wc.Parse("X  X*"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded, "X X* X", wc.Parse("X  X*  X"));
-
-            wc = new Wildcard(WildcardSelection.MultiAll, spaceTreatment: WildcardSpaceTreatment.MultiWildcardAlways);
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded, "X*X", wc.Parse("X X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded, "X*X", wc.Parse("X  X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded, "X*X*X", wc.Parse("X  X  X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded | WildcardSelection.EndsWith, "*X*X", wc.Parse("*X X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded | WildcardSelection.StartsWith, "X*X*", wc.Parse("X  X*"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded, "X*X*X", wc.Parse("X  X*  X"));
-
-            wc = new Wildcard(WildcardSelection.MultiAll, spaceTreatment: WildcardSpaceTreatment.MultiWildcardWhenOthers);
-            Check(WildcardSelection.Equal, "X X", wc.Parse("X X"));
-            Check(WildcardSelection.Equal, "X X", wc.Parse("X  X"));
-            Check(WildcardSelection.Equal, "X X X", wc.Parse("X  X  X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded | WildcardSelection.EndsWith, "*X*X", wc.Parse("*X X"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded | WildcardSelection.StartsWith, "X*X*", wc.Parse("X  X*"));
-            Check(WildcardSelection.MultiWildcard | WildcardSelection.Embedded, "X*X*X", wc.Parse("X  X*  X"));
-        }
-
-        private void Check(WildcardSelection selection, string? text, WildcardResult result)
-        {
-            Assert.Multiple(() =>
-            {
-                Assert.That(result.Selection, Is.EqualTo(selection));
-                Assert.That(result.Text, Is.EqualTo(text));
-            });
-        }
-
-        #endregion
-
-        #region Validate
-
-        [Test]
-        public void Validate_1_Default()
-        {
-            var wc = Wildcard.BothAll;
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate(null), Is.True);
-                Assert.That(wc.Validate(string.Empty), Is.True);
-                Assert.That(wc.Validate("X"), Is.True);
-                Assert.That(wc.Validate("*"), Is.True);
-                Assert.That(wc.Validate("?"), Is.True);
-                Assert.That(wc.Validate("XX"), Is.True);
-                Assert.That(wc.Validate("*X"), Is.True);
-                Assert.That(wc.Validate("?X"), Is.True);
-                Assert.That(wc.Validate("X*"), Is.True);
-                Assert.That(wc.Validate("X?"), Is.True);
-                Assert.That(wc.Validate("XXX"), Is.True);
-                Assert.That(wc.Validate("X*X"), Is.True);
-                Assert.That(wc.Validate("X?X"), Is.True);
-                Assert.That(wc.Validate("*?*"), Is.True);
-                Assert.That(wc.Validate("*X*"), Is.True);
-            });
-        }
-
-        [Test]
-        public void Validate_2_CharactersNotAllowed()
-        {
-            var wc = new Wildcard(WildcardSelection.BothAll, multiWildcard: '%', singleWildcard: '_', charactersNotAllowed: new char[] { '*', '?' });
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate(null), Is.True);
-                Assert.That(wc.Validate(string.Empty), Is.True);
-                Assert.That(wc.Validate("X"), Is.True);
-                Assert.That(wc.Validate("*"), Is.False);
-                Assert.That(wc.Validate("?"), Is.False);
-                Assert.That(wc.Validate("XX"), Is.True);
-                Assert.That(wc.Validate("*X"), Is.False);
-                Assert.That(wc.Validate("?X"), Is.False);
-                Assert.That(wc.Validate("X*"), Is.False);
-                Assert.That(wc.Validate("X?"), Is.False);
-                Assert.That(wc.Validate("XXX"), Is.True);
-                Assert.That(wc.Validate("X*X"), Is.False);
-                Assert.That(wc.Validate("X?X"), Is.False);
-                Assert.That(wc.Validate("*?*"), Is.False);
-                Assert.That(wc.Validate("*X*"), Is.False);
-            });
-        }
-
-        [Test]
-        public void Validate_3_EndWildcardOnly()
-        {
-            var wc = new Wildcard(WildcardSelection.EndsWith | WildcardSelection.MultiWildcard | WildcardSelection.SingleWildcard, singleWildcard: Wildcard.SingleWildcardCharacter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate(null), Is.False);
-                Assert.That(wc.Validate(string.Empty), Is.False);
-                Assert.That(wc.Validate("X"), Is.False);
-                Assert.That(wc.Validate("*"), Is.False);
-                Assert.That(wc.Validate("?"), Is.False);
-                Assert.That(wc.Validate("XX"), Is.False);
-                Assert.That(wc.Validate("*X"), Is.True);
-                Assert.That(wc.Validate("?X"), Is.True);
-                Assert.That(wc.Validate("X*"), Is.False);
-                Assert.That(wc.Validate("X?"), Is.False);
-                Assert.That(wc.Validate("XXX"), Is.False);
-                Assert.That(wc.Validate("X*X"), Is.False);
-                Assert.That(wc.Validate("X?X"), Is.False);
-                Assert.That(wc.Validate("*?*"), Is.False);
-                Assert.That(wc.Validate("*X*"), Is.False);
-            });
-        }
-
-        [Test]
-        public void Validate_4_StartWildcardOnly()
-        {
-            var wc = new Wildcard(WildcardSelection.StartsWith | WildcardSelection.MultiWildcard | WildcardSelection.SingleWildcard, singleWildcard: Wildcard.SingleWildcardCharacter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate(null), Is.False);
-                Assert.That(wc.Validate(string.Empty), Is.False);
-                Assert.That(wc.Validate("X"), Is.False);
-                Assert.That(wc.Validate("*"), Is.False);
-                Assert.That(wc.Validate("?"), Is.False);
-                Assert.That(wc.Validate("XX"), Is.False);
-                Assert.That(wc.Validate("*X"), Is.False);
-                Assert.That(wc.Validate("?X"), Is.False);
-                Assert.That(wc.Validate("X*"), Is.True);
-                Assert.That(wc.Validate("X?"), Is.True);
-                Assert.That(wc.Validate("XXX"), Is.False);
-                Assert.That(wc.Validate("X*X"), Is.False);
-                Assert.That(wc.Validate("X?X"), Is.False);
-                Assert.That(wc.Validate("*?*"), Is.False);
-                Assert.That(wc.Validate("*X*"), Is.False);
-            });
-        }
-
-        [Test]
-        public void Validate_5_EmbeddedWildcardOnly()
-        {
-            var wc = new Wildcard(WildcardSelection.Embedded | WildcardSelection.MultiWildcard | WildcardSelection.SingleWildcard, singleWildcard: Wildcard.SingleWildcardCharacter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate(null), Is.False);
-                Assert.That(wc.Validate(string.Empty), Is.False);
-                Assert.That(wc.Validate("X"), Is.False);
-                Assert.That(wc.Validate("*"), Is.False);
-                Assert.That(wc.Validate("?"), Is.False);
-                Assert.That(wc.Validate("XX"), Is.False);
-                Assert.That(wc.Validate("*X"), Is.False);
-                Assert.That(wc.Validate("?X"), Is.False);
-                Assert.That(wc.Validate("X*"), Is.False);
-                Assert.That(wc.Validate("X?"), Is.False);
-                Assert.That(wc.Validate("XXX"), Is.False);
-                Assert.That(wc.Validate("X*X"), Is.True);
-                Assert.That(wc.Validate("X?X"), Is.True);
-                Assert.That(wc.Validate("*?*"), Is.False);
-                Assert.That(wc.Validate("*X*"), Is.False);
-            });
-        }
-
-        [Test]
-        public void Validate_6_SingleOrMultiWildcard()
-        {
-            var wc = new Wildcard(WildcardSelection.Embedded | WildcardSelection.MultiWildcard, singleWildcard: Wildcard.SingleWildcardCharacter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate("X*X"), Is.True);
-                Assert.That(wc.Validate("X?X"), Is.False);
-            });
-
-            wc = new Wildcard(WildcardSelection.Embedded | WildcardSelection.SingleWildcard, singleWildcard: Wildcard.SingleWildcardCharacter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate("X*X"), Is.False);
-                Assert.That(wc.Validate("X?X"), Is.True);
-            });
-        }
-
-        [Test]
-        public void Validate_7_NoneAndEqual()
-        {
-            var wc = new Wildcard(WildcardSelection.None | WildcardSelection.Equal, singleWildcard: Wildcard.SingleWildcardCharacter);
-            Assert.Multiple(() =>
-            {
-                Assert.That(wc.Validate(null), Is.True);
-                Assert.That(wc.Validate(string.Empty), Is.True);
-                Assert.That(wc.Validate("X"), Is.True);
-                Assert.That(wc.Validate("*"), Is.False);
-                Assert.That(wc.Validate("?"), Is.False);
-                Assert.That(wc.Validate("XX"), Is.True);
-                Assert.That(wc.Validate("*X"), Is.False);
-                Assert.That(wc.Validate("?X"), Is.False);
-                Assert.That(wc.Validate("X*"), Is.False);
-                Assert.That(wc.Validate("X?"), Is.False);
-                Assert.That(wc.Validate("XXX"), Is.True);
-                Assert.That(wc.Validate("X*X"), Is.False);
-                Assert.That(wc.Validate("X?X"), Is.False);
-                Assert.That(wc.Validate("*?*"), Is.False);
-                Assert.That(wc.Validate("*X*"), Is.False);
-            });
-        }
-
-        #endregion
-
-        #region WhereWildcard
-
-        private class Person
-        {
-            public string? First { get; set; }
-            public string? Last { get; set; }
-        }
-
-        private List<Person> GetPeople()
-        {
-            return new List<Person>
-            {
-                new() { First = "Amy", Last = "Johnson" },
-                new() { First = "Jenny", Last = "Smith" },
-                new() { First = "Gerry", Last = "McQuire" },
-                new() { First = "Gary", Last = "Lawson" },
-                new() { First = "Simon", Last = "Reynolds" },
-                new() { First = "Amanada", Last = "Gray" },
-                new() { First = "B", Last = "P" },
-                new() { First = null, Last = null }
-            };
-        }
-
-        [Test]
-        public void WhereWildcard_IEnumerableExtensions()
-        {
-            Assert.Multiple(() =>
-            {
-                // None (all).
-                Assert.That(GetPeople().WhereWildcard(x => x.First, null).Select(x => x.Last).Count(), Is.EqualTo(8));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "").Select(x => x.Last).Count(), Is.EqualTo(8));
-
-                // Equal.
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "SIMON").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "SIMON", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Single (all).
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "*").Select(x => x.Last).Count(), Is.EqualTo(8));
-
-                // Starts with.
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "SI*").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "SI*", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Ends with.
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "*ON").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "*ON", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Contains.
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "*IM*").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "*IM*", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Regex-based: embedded.
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "S*N", wildcard: Wildcard.MultiAll).Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "S*N", ignoreCase: false, wildcard: Wildcard.MultiAll).Select(x => x.Last).SingleOrDefault(), Is.Null);
-
-                // Regex-based: single-char match.
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "G?RY", wildcard: Wildcard.BothAll).Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Lawson"));
-                Assert.That(GetPeople().WhereWildcard(x => x.First, "G?RY", ignoreCase: false, wildcard: Wildcard.BothAll).Select(x => x.Last).SingleOrDefault(), Is.Null);
-
-                // Regex-based: single-char all.
-                Assert.That(GetPeople().Where(x => true).WhereWildcard(x => x.First, " ? ", wildcard: new Wildcard(WildcardSelection.MultiAll, singleWildcard: char.MinValue)).Select(x => x.Last).SingleOrDefault(), Is.Null);
-                Assert.That(GetPeople().Where(x => true).WhereWildcard(x => x.First, " ? ", wildcard: Wildcard.BothAll).Select(x => x.Last).SingleOrDefault(), Is.EqualTo("P"));
-            });
-        }
-
-        [Test]
-        public void WhereWildcard_IQueryableExtensions()
-        {
-            Assert.Multiple(() =>
-            {
-                // None(all).
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, null).Select(x => x.Last).Count(), Is.EqualTo(8));
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "").Select(x => x.Last).Count(), Is.EqualTo(8));
-
-                // Equal.
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "SIMON").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "SIMON", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Single (all).
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "*").Select(x => x.Last).Count(), Is.EqualTo(8));
-
-                // Starts with.
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "SI*").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "SI*", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Ends with.
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "*ON").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "*ON", ignoreCase: false).SingleOrDefault(), Is.Null);
-
-                // Contains.
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "*IM*").Select(x => x.Last).SingleOrDefault(), Is.EqualTo("Reynolds"));
-                Assert.That(GetPeople().AsQueryable().WhereWildcard(x => x.First, "*IM*", ignoreCase: false).SingleOrDefault(), Is.Null);
-            });
-
-            // Embedded.
-            Assert.Throws<InvalidOperationException>(() => GetPeople().AsQueryable().WhereWildcard(x => x.First, "S*N").Select(x => x.Last).SingleOrDefault())!.Message.Should().Be("Wildcard selection text is not supported.");
-            Assert.Throws<InvalidOperationException>(() => GetPeople().AsQueryable().WhereWildcard(x => x.First, "S*N", ignoreCase: false).Select(x => x.Last).SingleOrDefault())!.Message.Should().Be("Wildcard selection text is not supported.");
-
-            Assert.Multiple(() =>
-            {
-                // Single-char all; '?' is ignored.
-                Assert.That(GetPeople().AsQueryable().Where(x => true).WhereWildcard(x => x.First, " ? ", wildcard: new Wildcard(WildcardSelection.MultiAll, singleWildcard: char.MinValue)).Select(x => x.Last).SingleOrDefault(), Is.Null);
-                Assert.That(GetPeople().AsQueryable().Where(x => true).WhereWildcard(x => x.First, " ? ", ignoreCase: false, wildcard: new Wildcard(WildcardSelection.MultiAll, singleWildcard: char.MinValue)).Select(x => x.Last).SingleOrDefault(), Is.Null);
-            });
-        }
-
-        [Test]
-        public void WhereWildcard_IQueryableExtensions_Load_Skippable()
-        {
-            var p = GetPeople();
-
-            for (int i = 0; i < 100; i++)
-            {
-                p.AsQueryable().WhereWildcard(x => x.First, null).Select(x => x.Last).Count();
-                p.AsQueryable().WhereWildcard(x => x.First, "").Select(x => x.Last).Count();
-                p.AsQueryable().WhereWildcard(x => x.First, "*").Select(x => x.Last).Count();
-            }
-        }
-
-        [Test]
-        public void WhereWildcard_IQueryableExtensions_Load_WithExpressions()
-        {
-            var p = GetPeople();
-
-            for (int i = 0; i < 100; i++)
-            {
-                p.AsQueryable().WhereWildcard(x => x.First, "SIMON").Select(x => x.Last).SingleOrDefault();
-                p.AsQueryable().WhereWildcard(x => x.First, "SIMON", ignoreCase: false).SingleOrDefault();
-                p.AsQueryable().WhereWildcard(x => x.First, "SI*").Select(x => x.Last).SingleOrDefault();
-                p.AsQueryable().WhereWildcard(x => x.First, "*ON", ignoreCase: false).SingleOrDefault();
-                p.AsQueryable().WhereWildcard(x => x.First, "*IM*").Select(x => x.Last).SingleOrDefault();
-                p.AsQueryable().WhereWildcard(x => x.First, "*IM*", ignoreCase: false).SingleOrDefault();
-                p.AsQueryable().Where(x => true).WhereWildcard(x => x.First, " ? ", wildcard: new Wildcard(WildcardSelection.MultiAll, singleWildcard: char.MinValue)).Select(x => x.Last).SingleOrDefault();
-                p.AsQueryable().Where(x => true).WhereWildcard(x => x.First, " ? ", ignoreCase: false, wildcard: new Wildcard(WildcardSelection.MultiAll, singleWildcard: char.MinValue)).Select(x => x.Last).SingleOrDefault();
-            }
-
-            // Calc as t (time) / 100 (iterations) / 8 (queries) = avg per invocation cost :: this builds run-time expression to execute - super flexible but will not be uber fast.
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/HealthChecks/TypedHttpClientCoreHealthCheckTests.cs b/tests/CoreEx.Test/HealthChecks/TypedHttpClientCoreHealthCheckTests.cs
deleted file mode 100644
index 4400becf..00000000
--- a/tests/CoreEx.Test/HealthChecks/TypedHttpClientCoreHealthCheckTests.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Http.HealthChecks;
-using CoreEx.TestFunction;
-using FluentAssertions;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Moq;
-using NUnit.Framework;
-using UnitTestEx;
-
-namespace CoreEx.Test.HealthChecks
-{
-
-    [TestFixture, NonParallelizable]
-    public class TypedHttpClientCoreHealthCheckTests
-    {
-        [Test]
-        public async Task CheckHealthAsync_Should_Succeed_When_SampleApiOK()
-        {
-            // Arrange
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateClient("Backend", "https://backend/").Request(HttpMethod.Head, string.Empty).Respond.With(statusCode: HttpStatusCode.OK);
-            using var test = FunctionTester.Create<Startup>()
-                .ReplaceHttpClientFactory(mcf);
-            var mock = new Mock<IHealthCheck>();
-
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", mock.Object, null, null)
-            };
-
-            // Act
-            var result = await test.Type<TypedHttpClientCoreHealthCheck<BackendHttpClient>>()
-             .RunAsync(x => x.CheckHealthAsync(context, CancellationToken.None));
-
-            // Assert
-            result.Result.Status.Should().Be(HealthStatus.Healthy, because: "Sample API is OK");
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Fail_When_SampleApiDown()
-        {
-            // Arrange
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateClient("Backend", "https://backend/").Request(HttpMethod.Head, string.Empty).Respond.With(statusCode: HttpStatusCode.ServiceUnavailable);
-            using var test = FunctionTester.Create<Startup>()
-                .UseJsonSerializer(new CoreEx.Text.Json.JsonSerializer()) // Required as the Result type needs to be deserialized using CoreEx.
-                .ReplaceHttpClientFactory(mcf);
-            var mock = new Mock<IHealthCheck>();
-
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", mock.Object, null, null)
-            };
-
-            // Act
-            var result = await test.Type<TypedHttpClientCoreHealthCheck<BackendHttpClient>>()
-             .RunAsync(x => x.CheckHealthAsync(context, CancellationToken.None));
-
-            // Assert
-            result.Result.Status.Should().Be(HealthStatus.Unhealthy, because: "Sample API return 502");
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Fail_When_SampleApiThrowsException()
-        {
-            // Arrange
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateClient("Backend", "https://backend/").Request(HttpMethod.Head, string.Empty).Respond.With(string.Empty, response: x => throw new Exception("Sample API is down"));
-            using var test = FunctionTester.Create<Startup>()
-                .UseJsonSerializer(new CoreEx.Text.Json.JsonSerializer()) // Required as the Result type needs to be deserialized using CoreEx.
-                .ReplaceHttpClientFactory(mcf);
-            var mock = new Mock<IHealthCheck>();
-
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", mock.Object, null, null)
-            };
-
-            // Act
-            var result = await test.Type<TypedHttpClientCoreHealthCheck<BackendHttpClient>>()
-             .RunAsync(x => x.CheckHealthAsync(context, CancellationToken.None));
-
-            // Assert
-            result.Result.Status.Should().Be(HealthStatus.Unhealthy, because: "Sample API is Down");
-            result.Result.Exception.Should().NotBeNull();
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Fail_When_NoHttpClientInjected()
-        {
-            // Arrange
-            var target = new TypedHttpClientCoreHealthCheck<BackendHttpClient>(null!);
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", new Mock<IHealthCheck>().Object, null, null)
-            };
-
-            // Act
-            var result = await target.CheckHealthAsync(context, CancellationToken.None);
-
-            // Assert
-            result.Status.Should().Be(HealthStatus.Unhealthy, because: "No HttpClient injected.");
-            result.Description.Should().Be("Typed Http client dependency for 'CoreEx.TestFunction.BackendHttpClient' not resolved.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/HealthChecks/TypedHttpClientHealthCheckTest.cs b/tests/CoreEx.Test/HealthChecks/TypedHttpClientHealthCheckTest.cs
deleted file mode 100644
index 832e6c56..00000000
--- a/tests/CoreEx.Test/HealthChecks/TypedHttpClientHealthCheckTest.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using CoreEx.Http;
-using CoreEx.Http.HealthChecks;
-using CoreEx.Json;
-using CoreEx.TestFunction;
-using FluentAssertions;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Moq;
-using NUnit.Framework;
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace CoreEx.Test.HealthChecks
-{
-    [TestFixture, NonParallelizable]
-    public class TypedHttpClientHealthCheckTest
-    {
-        public class TestHttpClient(HttpClient client, IJsonSerializer jsonSerializer, CoreEx.ExecutionContext executionContext) : TypedHttpClientBase<TestHttpClient>(client, jsonSerializer, executionContext)
-        {
-            public override Task<HttpResult> HealthCheckAsync(CancellationToken cancellationToken = default)
-            {
-                return base.HeadAsync("/health", null, null, new CancellationTokenSource(TimeSpan.FromSeconds(10)).Token);
-            }
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Succeed_When_TestBackendOK()
-        {
-            // Arrange
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateClient("Test", "https://testing/").Request(HttpMethod.Head, "health").Respond.With(HttpStatusCode.OK);
-
-            using var test = FunctionTester.Create<Startup>()
-                .ReplaceHttpClientFactory(mcf)
-                .ConfigureServices(sc => sc.AddHttpClient<TestHttpClient>("Test", c => c.BaseAddress = new Uri("https://testing/")));
-
-            var mock = new Mock<IHealthCheck>();
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", mock.Object, null, null)
-            };
-
-            // Act
-            var result = await test.Type<TypedHttpClientHealthCheck<TestHttpClient>>()
-             .RunAsync(x => x.CheckHealthAsync(context, CancellationToken.None));
-
-            // Assert
-            result.Result.Status.Should().Be(HealthStatus.Healthy, because: "TestBackend is OK");
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Fail_When_TestBackendDown()
-        {
-            // Arrange
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateClient("Test", "https://testing/").Request(HttpMethod.Head, "health").Respond.With(HttpStatusCode.ServiceUnavailable);
-
-            using var test = FunctionTester.Create<Startup>()
-                .UseJsonSerializer(new CoreEx.Text.Json.JsonSerializer()) // Required as the Result type needs to be deserialized using CoreEx.
-                .ReplaceHttpClientFactory(mcf)
-                .ConfigureServices(sc => sc.AddHttpClient<TestHttpClient>("Test", c => c.BaseAddress = new Uri("https://testing/")));
-
-            var mock = new Mock<IHealthCheck>();
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", mock.Object, null, null)
-            };
-
-            // Act
-            var result = await test.Type<TypedHttpClientHealthCheck<TestHttpClient>>()
-             .RunAsync(x => x.CheckHealthAsync(context, CancellationToken.None));
-
-            // Assert
-            result.Result.Status.Should().Be(HealthStatus.Unhealthy, because: "Testing service returned 502");
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Fail_When_TestBackendThrowsException()
-        {
-            // Arrange
-            var mcf = MockHttpClientFactory.Create();
-            mcf.CreateClient("Test", "https://testing/").Request(HttpMethod.Head, "health")
-                .Respond.With(string.Empty, response: x => throw new Exception("Testing service is down"));
-
-            using var test = FunctionTester.Create<Startup>()
-                .UseJsonSerializer(new CoreEx.Text.Json.JsonSerializer()) // Required as the Result type needs to be deserialized using CoreEx.
-                .ReplaceHttpClientFactory(mcf)
-                .ConfigureServices(sc => sc.AddHttpClient<TestHttpClient>("Test", c => c.BaseAddress = new Uri("https://testing/")));
-
-            var mock = new Mock<IHealthCheck>();
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", mock.Object, null, null)
-            };
-
-            // Act
-            var result = await test.Type<TypedHttpClientHealthCheck<TestHttpClient>>()
-             .RunAsync(x => x.CheckHealthAsync(context, CancellationToken.None));
-
-            // Assert
-            result.Result.Status.Should().Be(HealthStatus.Unhealthy, because: "Testing service is Down");
-            result.Result.Exception.Should().NotBeNull();
-        }
-
-        [Test]
-        public async Task CheckHealthAsync_Should_Fail_When_NoHttpClientInjected()
-        {
-            // Arrange
-            var target = new TypedHttpClientHealthCheck<TestHttpClient>(null!);
-            var context = new HealthCheckContext()
-            {
-                Registration = new HealthCheckRegistration("test", new Mock<IHealthCheck>().Object, null, null)
-            };
-
-            // Act
-            var result = await target.CheckHealthAsync(context, CancellationToken.None);
-
-            // Assert
-            result.Status.Should().Be(HealthStatus.Unhealthy, because: "No HttpClient injected.");
-            result.Description.Should().Be("Typed Http client dependency for 'CoreEx.Test.HealthChecks.TypedHttpClientHealthCheckTest+TestHttpClient' not resolved.");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/TestFunction/HttpTriggerFunctionTest.cs b/tests/CoreEx.Test/TestFunction/HttpTriggerFunctionTest.cs
deleted file mode 100644
index 30c3589e..00000000
--- a/tests/CoreEx.Test/TestFunction/HttpTriggerFunctionTest.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using CoreEx.Json;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Functions;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using System.Net.Http;
-using UnitTestEx;
-
-namespace CoreEx.Test.TestFunction
-{
-    [TestFixture]
-    public class HttpTriggerFunctionTest
-    {
-        [Test]
-        public void NoBody()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IJsonSerializer, CoreEx.Text.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Value is mandatory.");
-        }
-
-        [Test]
-        public void InvalidBody()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var r = test.ReplaceScoped<IJsonSerializer, CoreEx.Text.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products", "<xml/>")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: '<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0.");
-        }
-
-        [Test]
-        public void InvalidBody_Newtonsoft()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products", "<xml/>")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Unexpected character encountered while parsing value: <. Path '', line 0, position 0.");
-        }
-
-        [Test]
-        public void InvalidJson()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IJsonSerializer, CoreEx.Text.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products", "{\"price\": \"xx.xx\"}")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: The JSON value could not be converted to System.Decimal. Path: $.price | LineNumber: 0 | BytePositionInLine: 17.");
-        }
-
-        [Test]
-        public void InvalidJson_Newtonsoft()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products", "{\"price\": \"xx.xx\"}")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Could not convert string to decimal: xx.xx. Path 'price', line 1, position 17.");
-        }
-
-        [Test]
-        public void InvalidValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IJsonSerializer, CoreEx.Text.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest/products", new { id = "A", price = 1.99m })))
-                .AssertBadRequest()
-                .AssertErrors(new ApiError("Name", "'Name' must not be empty."));
-        }
-
-        [Test]
-        public void InvalidValue_Newtonsoft()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PostAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest/products", new { id = "A", price = 1.99m })))
-                .AssertBadRequest()
-                .AssertErrors(new ApiError("Name", "'Name' must not be empty."));
-        }
-
-        [Test]
-        public void Success()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/products");
-            mc.Request(HttpMethod.Post, "").WithJsonBody(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }).Respond.WithJson(new BackendProduct { Code = "AX", Description = "BX", RetailPrice = 10.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceHttpClientFactory(mcf)
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PutAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest/products", new { id = "A", name = "B", price = 1.99m })))
-                .AssertOK()
-                .AssertValue(new Product { Id = "AX", Name = "BX", Price = 10.99m });
-
-            mcf.VerifyAll();
-        }
-
-        [Test]
-        public void Success_Newtonsoft()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/products");
-            mc.Request(HttpMethod.Post, "").WithJsonBody(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }).Respond.WithJson(new BackendProduct { Code = "AX", Description = "BX", RetailPrice = 10.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceHttpClientFactory(mcf)
-                .ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .HttpTrigger<HttpTriggerFunction>()
-                .Run(f => f.PutAsync(test.CreateJsonHttpRequest(HttpMethod.Put, "https://unittest/products", new { id = "A", name = "B", price = 1.99m })))
-                .AssertOK()
-                .AssertValue(new Product { Id = "AX", Name = "BX", Price = 10.99m });
-
-            mcf.VerifyAll();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/TestFunction/HttpTriggerPublishFunctionTest.cs b/tests/CoreEx.Test/TestFunction/HttpTriggerPublishFunctionTest.cs
deleted file mode 100644
index c7f1cd23..00000000
--- a/tests/CoreEx.Test/TestFunction/HttpTriggerPublishFunctionTest.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-using System.Linq;
-using System.Net.Http;
-using CoreEx.Events;
-using CoreEx.Json;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Functions;
-using CoreEx.TestFunction.Models;
-using NUnit.Framework;
-using UnitTestEx;
-
-namespace CoreEx.Test.TestFunction
-{
-    [TestFixture]
-    public class HttpTriggerPublishFunctionTest
-    {
-        [Test]
-        public void NoBody()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products/publish")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Value is mandatory.");
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void InvalidBody()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products/publish", "<xml/>")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: '<' is an invalid start of a value. Path: $ | LineNumber: 0 | BytePositionInLine: 0.");
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void InvalidBody_Newtonsoft()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ConfigureServices(sc => sc.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>())
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products/publish", "<xml/>")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Unexpected character encountered while parsing value: <. Path '', line 0, position 0.");
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void InvalidJson()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products/publish", "{\"price\": \"xx.xx\"}")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: The JSON value could not be converted to System.Decimal. Path: $.price | LineNumber: 0 | BytePositionInLine: 17.");
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void InvalidJson_Newtonsoft()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .ConfigureServices(sc => sc.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>())
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateHttpRequest(HttpMethod.Post, "https://unittest/products/publish", "{\"price\": \"xx.xx\"}")))
-                .AssertBadRequest()
-                .AssertErrors("Invalid request: content was not provided, contained invalid JSON, or was incorrectly formatted: Could not convert string to decimal: xx.xx. Path 'price', line 1, position 17.");
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void InvalidValue()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest/products/publish", new { id = "A", price = 1.99m })))
-                .AssertBadRequest()
-                .AssertErrors(new ApiError("Name", "'Name' must not be empty."));
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void InvalidValue_Newtonsoft()
-        {
-            var imp = new InMemoryPublisher();
-            using var test = FunctionTester.Create<Startup>();
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .ConfigureServices(sc => sc.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>())
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest/products/publish", new { id = "A", price = 1.99m })))
-                .AssertBadRequest()
-                .AssertErrors(new ApiError("Name", "'Name' must not be empty."));
-
-            Assert.That(imp.GetNames(), Is.Empty);
-        }
-
-        [Test]
-        public void Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var imp = new InMemoryPublisher(test.Logger);
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest/products/publish", new { id = "A", name = "B", price = 1.99m })))
-                .AssertAccepted();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-            Assert.That(imp.GetNames().First(), Is.EqualTo("test-queue"));
-            var events = imp.GetEvents("test-queue");
-            Assert.That(events.Count(), Is.EqualTo(1));
-            ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, events[0].Value);
-        }
-
-        [Test]
-        public void Success_Newtonsoft()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var imp = new InMemoryPublisher(test.Logger, new CoreEx.Newtonsoft.Json.JsonSerializer());
-
-            test.ReplaceScoped<IEventPublisher>(_ => imp)
-                .ConfigureServices(sc => sc.ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>())
-                .HttpTrigger<HttpTriggerPublishFunction>()
-                .Run(f => f.RunAsync(test.CreateJsonHttpRequest(HttpMethod.Post, "https://unittest/products/publish", new { id = "A", name = "B", price = 1.99m })))
-                .AssertAccepted();
-
-            Assert.That(imp.GetNames(), Has.Length.EqualTo(1));
-            Assert.That(imp.GetNames().First(), Is.EqualTo("test-queue"));
-            var events = imp.GetEvents("test-queue");
-            Assert.That(events.Count(), Is.EqualTo(1));
-            ObjectComparer.Assert(new Product { Id = "A", Name = "B", Price = 1.99m }, events[0].Value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/TestFunction/ServiceBusOrchestratedTriggerFunctionTest.cs b/tests/CoreEx.Test/TestFunction/ServiceBusOrchestratedTriggerFunctionTest.cs
deleted file mode 100644
index 24ed6494..00000000
--- a/tests/CoreEx.Test/TestFunction/ServiceBusOrchestratedTriggerFunctionTest.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-using Azure.Core.Amqp;
-using CoreEx.Abstractions;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Functions;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Subscribers;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using Microsoft.Extensions.DependencyInjection;
-using Moq;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using UnitTestEx.Abstractions;
-using UnitTestEx;
-using Az = Azure.Messaging.ServiceBus;
-
-namespace CoreEx.Test.TestFunction
-{
-    [TestFixture]
-    public class ServiceBusOrchestratedTriggerFunctionTest
-    {
-        [Test]
-        public void NotSubscribed()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<ServiceBusSender>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromEvent(new EventData { Id = 1.ToGuid().ToString(), Subject = "my.unknown" });
-
-            test.ServiceBusTrigger<ServiceBusOrchestratedTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), EventSubscriberExceptionSource.OrchestratorNotSubscribed.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void NoValue_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.ReplaceScoped<ServiceBusSender>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromEvent(new EventData { Id = 101.ToGuid().ToString(), Subject = "my.novalue" });
-
-            test.ServiceBusTrigger<ServiceBusOrchestratedTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.CompleteMessageAsync(message, default), Times.Once);
-            Assert.That(NoValueSubscriber.EventIds.Contains(101.ToGuid().ToString()), Is.True);
-        }
-
-        [Test]
-        public void Product_ValueIsRequired()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromEvent(new EventData<Product> { Id = 201.ToGuid().ToString(), Subject = "my.Product", Value = null! });
-
-            test.ServiceBusTrigger<ServiceBusOrchestratedTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void Product_ValueIsInvalid()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromEvent(new EventData<Product> { Id = 201.ToGuid().ToString(), Subject = "my.Product", Value = new Product() });
-
-            test.ServiceBusTrigger<ServiceBusOrchestratedTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void Product_Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromEvent(new EventData<Product> { Id = 201.ToGuid().ToString(), Subject = "my.Product", Value = new Product { Id = "XBX", Name = "XBox Series X", Price = 999.99m } });
-
-            test.ServiceBusTrigger<ServiceBusOrchestratedTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.CompleteMessageAsync(message, default), Times.Once);
-            Assert.That(ProductSubscriber.EventIds.Contains(201.ToGuid().ToString()), Is.True);
-        }
-
-        [Test]
-        public void Product_Transient()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromEvent(new EventData<Product> { Id = 202.ToGuid().ToString(), Subject = "my.Product", Value = new Product { Id = "PS5", Name = "Sony Playstation 5", Price = 1099.99m } });
-
-            test.ServiceBusTrigger<ServiceBusOrchestratedTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertException<EventSubscriberException>("Sony Playstation 5 is currently not permissable; please try again later.");
-
-            actionsMock.VerifyNoOtherCalls();
-            Assert.That(ProductSubscriber.EventIds.Contains(202.ToGuid().ToString()), Is.True);
-        }
-    }
-
-    public static class EM
-    {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Needed for now!")]
-        public static Az.ServiceBusReceivedMessage CreateServiceBusMessageFromAmqp(this TesterBase tester, AmqpAnnotatedMessage message)
-        {
-            if (message == null) throw new ArgumentNullException("message");
-
-            message.Header.DeliveryCount = 1;
-            message.Header.Durable = true;
-            message.Header.Priority = 1;
-            message.Header.TimeToLive = TimeSpan.FromSeconds(60);
-
-            var t = typeof(Az.ServiceBusReceivedMessage);
-            var c = t.GetConstructor(System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance, null, new Type[] { typeof(AmqpAnnotatedMessage) }, null);
-            return c == null
-                ? throw new InvalidOperationException($"'{typeof(Az.ServiceBusReceivedMessage).Name}' constructor that accepts Type '{typeof(AmqpAnnotatedMessage).Name}' parameter was not found.")
-                : (Az.ServiceBusReceivedMessage)c.Invoke(new object?[] { message });
-        }
-
-        public static Az.ServiceBusReceivedMessage CreateServiceBusMessageFromEvent(this TesterBase tester, EventData @event)
-        {
-            if (@event == null) throw new ArgumentNullException("@event");
-            var message = (tester.Services.GetService<EventDataToServiceBusConverter>() ?? new EventDataToServiceBusConverter()).Convert(@event);
-            return CreateServiceBusMessageFromAmqp(tester, message.GetRawAmqpMessage());
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/TestFunction/ServiceBusSubsciberTest.cs b/tests/CoreEx.Test/TestFunction/ServiceBusSubsciberTest.cs
deleted file mode 100644
index 051cc3f7..00000000
--- a/tests/CoreEx.Test/TestFunction/ServiceBusSubsciberTest.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Events;
-using CoreEx.Results;
-using CoreEx.TestFunction;
-using Microsoft.Extensions.DependencyInjection;
-using NUnit.Framework;
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using UnitTestEx;
-
-namespace CoreEx.Test.TestFunction
-{
-    [TestFixture]
-    public class ServiceBusSubsciberTest
-    {
-        [Test]
-        public void NoAbandonOnTransient()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = false;
-
-            Assert.ThrowsAsync<EventSubscriberException>(() => sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please.")));
-
-            actions.AssertRenew(0);
-            actions.AssertNone();
-        }
-
-        [Test]
-        public void NoAbandonOnTransient_WithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = false;
-
-            Assert.ThrowsAsync<EventSubscriberException>(() => sbs.ReceiveAsync(message, actions, (_, _) => Task.FromResult(Result.TransientError("Retry again please."))));
-
-            actions.AssertRenew(0);
-            actions.AssertNone();
-        }
-
-        [Test]
-        public async Task AbandonOnTransient()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-
-            actions.AssertRenew(0);
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task AbandonOnTransient_WithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => Task.FromResult(Result.TransientError("Retry again please.")));
-
-            actions.AssertRenew(0);
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task RetryDelay_DeliveryCount1()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.RetryDelay = TimeSpan.FromSeconds(1);
-
-            var sw = Stopwatch.StartNew();
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-            sw.Stop();
-
-            Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(950));
-
-            actions.AssertRenew(0); // Renew is no longer supported; hence 0.
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task RetryDelay_DeliveryCount1_WithResult()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.RetryDelay = TimeSpan.FromSeconds(1);
-
-            var sw = Stopwatch.StartNew();
-            await sbs.ReceiveAsync(message, actions, (_, _) => Task.FromResult(Result.TransientError("Retry again please.")));
-            sw.Stop();
-
-            Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(950));
-
-            actions.AssertRenew(0); // Renew is no longer supported; hence 0.
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task RetryDelay_DeliveryCount2()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 2);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.RetryDelay = TimeSpan.FromSeconds(1);
-
-            var sw = Stopwatch.StartNew();
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-            sw.Stop();
-
-            Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(1950));
-
-            actions.AssertRenew(0); // Renew is no longer supported; hence 0.
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task RetryDelay_DeliveryCount2_WithMax()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 2);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.RetryDelay = TimeSpan.FromSeconds(1);
-            sbs.MaxRetryDelay = TimeSpan.FromMilliseconds(1100);
-
-            var sw = Stopwatch.StartNew();
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-            sw.Stop();
-
-            Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(1050));
-
-            actions.AssertRenew(0); // Renew is no longer supported; hence 0.
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task RetryDelay_DeliveryCount2_WithMaxOnly()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 2);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.MaxRetryDelay = TimeSpan.FromMilliseconds(600);
-
-            var sw = Stopwatch.StartNew();
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-            sw.Stop();
-
-            Assert.That(sw.ElapsedMilliseconds, Is.GreaterThanOrEqualTo(550));
-
-            actions.AssertRenew(0); // Renew is no longer supported; hence 0.
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task MaxDeliveryCount_LessThan()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 2);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.MaxDeliveryCount = 3;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-
-            actions.AssertRenew(0);
-            actions.AssertAbandon();
-
-            Assert.Multiple(() =>
-            {
-                Assert.That(actions.PropertiesModified, Is.Not.Null);
-                Assert.That(actions.PropertiesModified!["SubscriberAbandonReason"], Is.EqualTo("Retry again please."));
-            });
-        }
-
-        [Test]
-        public async Task MaxDeliveryCount_EqualTo()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 3);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-            sbs.MaxDeliveryCount = 3;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new TransientException("Retry again please."));
-
-            actions.AssertRenew(0);
-            actions.AssertDeadLetter("MaxDeliveryCountExceeded", "Message could not be consumed after 3 attempts (as defined by ServiceBusSubscriber).");
-            Assert.That(actions.PropertiesModified, Is.Not.Null);
-            Assert.That(actions.PropertiesModified!["SubscriberException"], Is.Not.Null);
-        }
-
-        [Test]
-        public async Task Complete()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 3);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => Task.CompletedTask);
-
-            actions.AssertRenew(0);
-            actions.AssertComplete();
-        }
-
-        [Test]
-        public async Task Complete_Result()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m }, m => m.Header.DeliveryCount = 3);
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.AbandonOnTransient = true;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => Result.SuccessTask);
-
-            actions.AssertRenew(0);
-            actions.AssertComplete();
-        }
-
-        [Test]
-        public async Task Unhandled_Throw_DeadLetter()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.UnhandledHandling = Events.Subscribing.ErrorHandling.HandleBySubscriber;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new DivideByZeroException("Zero is bad dude!"));
-
-            actions.AssertRenew(0);
-            actions.AssertDeadLetter("UnhandledError", "Zero is bad dude!");
-        }
-
-        [Test]
-        public async Task Unhandled_None_Bubble()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.UnhandledHandling = Events.Subscribing.ErrorHandling.HandleByHost;
-
-            try
-            {
-                await sbs.ReceiveAsync(message, actions, (_, _) => throw new DivideByZeroException("Zero is bad dude!"));
-            }
-            catch (DivideByZeroException)
-            {
-            }
-            catch (Exception ex)
-            {
-                Assert.Fail($"Expected {nameof(DivideByZeroException)} but got {ex.GetType().Name}.");
-            }
-
-            actions.AssertRenew(0);
-            actions.AssertNone();
-        }
-
-        [Test]
-        public async Task Unhandled_ContinueAsSilent_Complete()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWebJobsServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            var sbs = test.Services.GetRequiredService<ServiceBusSubscriber>();
-            sbs.UnhandledHandling = Events.Subscribing.ErrorHandling.CompleteAsSilent;
-
-            await sbs.ReceiveAsync(message, actions, (_, _) => throw new DivideByZeroException("Zero is bad dude!"));
-
-            actions.AssertRenew(0);
-            actions.AssertComplete();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/TestFunction/ServiceBusTriggerTest.cs b/tests/CoreEx.Test/TestFunction/ServiceBusTriggerTest.cs
deleted file mode 100644
index 83908ee9..00000000
--- a/tests/CoreEx.Test/TestFunction/ServiceBusTriggerTest.cs
+++ /dev/null
@@ -1,188 +0,0 @@
-using CoreEx.Abstractions;
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.Json;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Functions;
-using CoreEx.TestFunction.Models;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using Moq;
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using UnitTestEx;
-
-namespace CoreEx.Test.TestFunction
-{
-    [TestFixture]
-    public class ServiceBusTriggerTest
-    {
-        [Test]
-        public void NullMessage()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue<Product>(null!);
-
-            test.ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void InvalidMessage()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue("<xml/>");
-
-            test.ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), EventSubscriberExceptionSource.EventDataDeserialization.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void InvalidMessage_Newtonsoft()
-        {
-            using var test = FunctionTester.Create<Startup>()
-                .ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .ReplaceScoped<IEventSerializer, CoreEx.Newtonsoft.Json.EventDataSerializer>();
-
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue("<xml/>");
-
-            test.ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), EventSubscriberExceptionSource.EventDataDeserialization.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void InvalidValue()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", price = 1.99m });
-
-            test.ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void InvalidValue_Newtonsoft()
-        {
-            using var test = FunctionTester.Create<Startup>()
-                .ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .ReplaceScoped<IEventSerializer, CoreEx.Newtonsoft.Json.EventDataSerializer>();
-
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", price = 1.99m });
-
-            test.ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.ValidationError.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void TransientError()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "products").WithJsonBody(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }).Respond.With(HttpStatusCode.InternalServerError);
-
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            test.ReplaceHttpClientFactory(mcf)
-                .ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertException<EventSubscriberException>("Response status code was InternalServerError >= 500.");
-
-            mc.Verify();
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void UnhandledError()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "products").WithJsonBody(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }).Respond.With(HttpStatusCode.Ambiguous);
-
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            test.ReplaceHttpClientFactory(mcf)
-                .ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            mc.Verify();
-            actionsMock.Verify(m => m.DeadLetterMessageAsync(message, It.IsAny<Dictionary<string, object?>>(), ErrorType.UnhandledError.ToString(), It.IsNotNull<string>(), default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void Success()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "products").WithJsonBody(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }).Respond.WithJson(new BackendProduct { Code = "AX", Description = "BX", RetailPrice = 10.99m });
-
-            using var test = FunctionTester.Create<Startup>();
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            test.ReplaceHttpClientFactory(mcf)
-                .ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            mc.Verify();
-            actionsMock.Verify(m => m.CompleteMessageAsync(message, default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void Success_Newtonsoft()
-        {
-            var mcf = MockHttpClientFactory.Create();
-            var mc = mcf.CreateClient("Backend", "https://backend/");
-            mc.Request(HttpMethod.Post, "products").WithJsonBody(new BackendProduct { Code = "A", Description = "B", RetailPrice = 1.99m }).Respond.WithJson(new BackendProduct { Code = "AX", Description = "BX", RetailPrice = 10.99m });
-
-            using var test = FunctionTester.Create<Startup>()
-                .ReplaceScoped<IJsonSerializer, CoreEx.Newtonsoft.Json.JsonSerializer>()
-                .ReplaceScoped<IEventSerializer, CoreEx.Newtonsoft.Json.EventDataSerializer>();
-
-            var actionsMock = new Mock<ServiceBusMessageActions>();
-            var message = test.CreateServiceBusMessageFromValue(new { id = "A", name = "B", price = 1.99m });
-
-            test.ReplaceHttpClientFactory(mcf)
-                .ServiceBusTrigger<ServiceBusTriggerFunction>()
-                .Run(f => f.RunAsync(message, actionsMock.Object))
-                .AssertSuccess();
-
-            mc.Verify();
-            actionsMock.Verify(m => m.CompleteMessageAsync(message, default), Times.Once);
-            actionsMock.VerifyNoOtherCalls();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test/appsettings.unittest.json b/tests/CoreEx.Test/appsettings.unittest.json
deleted file mode 100644
index 957e73ba..00000000
--- a/tests/CoreEx.Test/appsettings.unittest.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ServiceBusConnection": "test-connection-string",
-  "TestQueueName": "unit-test-queue",
-  "TestTopicName": "unit-test-topic",
-  "TestSubscriptionName": "unit-test-subscription",
-  "TestQueueNameSessions": "unit-test-queue-sessions"
-}
diff --git a/tests/CoreEx.Test2/CoreEx.Test2.csproj b/tests/CoreEx.Test2/CoreEx.Test2.csproj
deleted file mode 100644
index 54e6d529..00000000
--- a/tests/CoreEx.Test2/CoreEx.Test2.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="UnitTestEx.NUnit" Version="5.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Azure\CoreEx.Azure.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.UnitTesting.Azure.Functions\CoreEx.UnitTesting.Azure.Functions.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.UnitTesting.Azure.ServiceBus\CoreEx.UnitTesting.Azure.ServiceBus.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.UnitTesting\CoreEx.UnitTesting.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\CoreEx.TestFunctionIso\CoreEx.TestFunctionIso.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/tests/CoreEx.Test2/Framework/Validation/ValidationExtensionsTest.cs b/tests/CoreEx.Test2/Framework/Validation/ValidationExtensionsTest.cs
deleted file mode 100644
index 9a5a2b38..00000000
--- a/tests/CoreEx.Test2/Framework/Validation/ValidationExtensionsTest.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using CoreEx.Results;
-using CoreEx.Validation;
-
-namespace CoreEx.Test2.Framework.Validation
-{
-    [TestFixture]
-    public class ValidationExtensionsTest
-    {
-        [Test]
-        public async Task Validation_Success_Other_String()
-        {
-            string? email = "a@b";
-            var r = await Result.Go(email).ValidatesAsync(email, v => v.Email());
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        [Test]
-        public async Task Validation_Success_Other_String2()
-        {
-            string? email = "a@b";
-            var r = await ValidateAsync(email);
-            Assert.That(r.IsSuccess, Is.True);
-        }
-
-        private static async Task<Result<string>> ValidateAsync(string? email2)
-        {
-            return await Result.Go().ValidatesAsync(email2, v =>
-            {
-                var v2 = v;
-                var v3 = v2.Email();
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test2/GlobalUsings.cs b/tests/CoreEx.Test2/GlobalUsings.cs
deleted file mode 100644
index cefced49..00000000
--- a/tests/CoreEx.Test2/GlobalUsings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using NUnit.Framework;
\ No newline at end of file
diff --git a/tests/CoreEx.Test2/TestFunctionIso/HttpFunctionTest.cs b/tests/CoreEx.Test2/TestFunctionIso/HttpFunctionTest.cs
deleted file mode 100644
index 80b143b6..00000000
--- a/tests/CoreEx.Test2/TestFunctionIso/HttpFunctionTest.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using CoreEx.TestFunctionIso;
-using UnitTestEx;
-
-namespace CoreEx.Test2.TestFunctionIso
-{
-    [TestFixture]
-    public class HttpFunctionTest
-    {
-        [Test]
-        public void Get()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            test.HttpTrigger<HttpFunction>()
-                .Run(f => f.Run(test.CreateHttpRequest(HttpMethod.Get, "https://unittest/blah"), "blah"))
-                .AssertOK()
-                .AssertJson("{\"message\":\"Hello blah\"}");
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Test2/TestFunctionIso/ServiceBusTest.cs b/tests/CoreEx.Test2/TestFunctionIso/ServiceBusTest.cs
deleted file mode 100644
index 84470217..00000000
--- a/tests/CoreEx.Test2/TestFunctionIso/ServiceBusTest.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using CoreEx.Hosting.Work;
-using CoreEx.TestFunctionIso;
-using Microsoft.Extensions.DependencyInjection;
-using UnitTestEx.Expectations;
-using UnitTestEx;
-
-namespace CoreEx.Test2.TestFunctionIso
-{
-    [TestFixture]
-    public class ServiceBusTest
-    {
-        [Test]
-        public async Task InvalidMessage()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWorkerServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue(new { Blah = true });
-
-            var wo = test.Services.GetRequiredService<WorkStateOrchestrator>();
-            await wo.CreateAsync(new WorkStateArgs("test") { Id = message.MessageId });
-
-            test.ServiceBusTrigger<ServiceBusFunction>()
-                .Run(f => f.Run(message, actions))
-                .AssertSuccess();
-
-            actions.AssertDeadLetter("EventDataDeserialization", "Invalid message; body was not provided, contained invalid JSON, or was incorrectly formatted: The JSON value could not be converted to System.String");
-
-            var ws = await wo.GetAsync(message.MessageId);
-            Assert.That(ws, Is.Not.Null);
-            Assert.That(ws!.Status, Is.EqualTo(WorkStatus.Failed));
-        }
-
-        [Test]
-        public async Task Complete_WorkStatus_Cancelled()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWorkerServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue("Bob");
-
-            var wo = test.Services.GetRequiredService<WorkStateOrchestrator>();
-            await wo.CreateAsync(new WorkStateArgs("test") { Id = message.MessageId });
-            await wo.CancelAsync(message.MessageId, "No longer needed.");
-
-            test.ServiceBusTrigger<ServiceBusFunction>()
-                .ExpectLogContains("warn: Unable to process message as corresponding work state status is Canceled: No longer needed.")
-                .Run(f => f.Run(message, actions))
-                .AssertSuccess();
-
-            actions.AssertComplete();
-
-            var ws = await wo.GetAsync(message.MessageId);
-            Assert.That(ws, Is.Not.Null);
-            Assert.That(ws!.Status, Is.EqualTo(WorkStatus.Canceled));
-        }
-
-        [Test]
-        public async Task Success()
-        {
-            using var test = FunctionTester.Create<Startup>();
-            var actions = test.CreateWorkerServiceBusMessageActions();
-            var message = test.CreateServiceBusMessageFromValue("Bob");
-
-            var wo = test.Services.GetRequiredService<WorkStateOrchestrator>();
-            await wo.CreateAsync(new WorkStateArgs("test") { Id = message.MessageId });
-
-            test.ServiceBusTrigger<ServiceBusFunction>()
-                .ExpectLogContains("Received message: Bob")
-                .Run(f => f.Run(message, actions))
-                .AssertSuccess();
-
-            actions.AssertComplete();
-
-            var ws = await wo.GetAsync(message.MessageId);
-            Assert.That(ws, Is.Not.Null);
-            Assert.That(ws!.Status, Is.EqualTo(WorkStatus.Completed));
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestApi/Controllers/ProductController.cs b/tests/CoreEx.TestApi/Controllers/ProductController.cs
deleted file mode 100644
index 24fb2501..00000000
--- a/tests/CoreEx.TestApi/Controllers/ProductController.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using CoreEx.FluentValidation;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Services;
-using CoreEx.TestFunction.Validators;
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
-using System;
-
-namespace CoreEx.TestApi.Controllers
-{
-    [ApiController]
-    [Route("products")]
-    public class ProductController : ControllerBase
-    {
-        private readonly WebApi _webApi;
-        private readonly ProductService _service;
-
-        public ProductController(WebApi webApi, ProductService service)
-        {
-            _webApi = webApi;
-            _service = service;
-        }
-
-        [HttpGet]
-        [Route("{id}")]
-        public Task<IActionResult> GetAsync(string id) => _webApi.GetAsync(Request, _ => _service.GetProductAsync(id));
-
-        [HttpPost]
-        public Task<IActionResult> PostAsync() => _webApi.PostAsync<Product, Product>(Request, r => _service.AddProductAsync(r.Value), validator: new ProductValidator().Wrap());
-
-        [HttpPut]
-        [Route("{id}")]
-        public Task<IActionResult> PutAsync(string id) => _webApi.PutAsync<Product, Product>(Request, r => _service.UpdateProductAsync(r.Value, id));
-
-        [HttpDelete]
-        [Route("{id}")]
-        public Task<IActionResult> DeleteAsync(string id) => _webApi.DeleteAsync(Request, _ => _service.DeleteProductAsync(id));
-
-        [HttpGet]
-        [Route("{id}/catalogue")]
-        public Task<IActionResult> GetCatalogueAsync(string id) => _webApi.GetAsync<FileContentResult>(Request, _ => _service.GetCatalogueAsync(id));
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestApi/CoreEx.TestApi.csproj b/tests/CoreEx.TestApi/CoreEx.TestApi.csproj
deleted file mode 100644
index 994c8466..00000000
--- a/tests/CoreEx.TestApi/CoreEx.TestApi.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.FluentValidation\CoreEx.FluentValidation.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Newtonsoft\CoreEx.Newtonsoft.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
-    <ProjectReference Include="..\CoreEx.TestFunction\CoreEx.TestFunction.csproj" />
-  </ItemGroup>
-
-
-</Project>
diff --git a/tests/CoreEx.TestApi/Program.cs b/tests/CoreEx.TestApi/Program.cs
deleted file mode 100644
index d510a39c..00000000
--- a/tests/CoreEx.TestApi/Program.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestApi
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
-}
diff --git a/tests/CoreEx.TestApi/Properties/launchSettings.json b/tests/CoreEx.TestApi/Properties/launchSettings.json
deleted file mode 100644
index 35ef12f5..00000000
--- a/tests/CoreEx.TestApi/Properties/launchSettings.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:53660",
-      "sslPort": 44380
-    }
-  },
-  "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "products",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "CoreEx.TestApi": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "weatherforecast",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestApi/Startup.cs b/tests/CoreEx.TestApi/Startup.cs
deleted file mode 100644
index 6c5dd7e0..00000000
--- a/tests/CoreEx.TestApi/Startup.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using CoreEx.Configuration;
-using CoreEx.Events;
-using CoreEx.Json;
-using CoreEx.TestFunction;
-using CoreEx.TestFunction.Services;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using CoreEx.TestApi.Validation;
-
-namespace CoreEx.TestApi
-{
-    public class Startup
-    {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            // Register the core services.
-            services
-                .AddSettings<TestSettings>()
-                .AddExecutionContext()
-                .AddJsonSerializer()
-                .AddEventDataSerializer()
-                .AddNullEventPublisher()
-                .AddValidationTextProvider()
-                .AddScoped<WebApi, WebApi>();
-
-            // Register the typed backend http client.
-            services.AddTypedHttpClient<BackendHttpClient>("Backend", (sp, hc) =>
-            {
-                var settings = sp.GetService<TestSettings>();
-                hc.BaseAddress = settings.BackendBaseAddress;
-            });
-
-            // Register the underlying function services.
-            services
-                .AddAutoMapper(typeof(ProductService).Assembly)
-                .AddScoped<ProductService>()
-                .AddScoped<ProductValidator>();
-
-            services.AddControllers();
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            app.UseHttpsRedirection();
-
-            app.UseRouting();
-
-            app.UseAuthorization();
-
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapControllers();
-            });
-        }
-    }
-}
diff --git a/tests/CoreEx.TestApi/Validators/ProductValidator.cs b/tests/CoreEx.TestApi/Validators/ProductValidator.cs
deleted file mode 100644
index 6a3917f7..00000000
--- a/tests/CoreEx.TestApi/Validators/ProductValidator.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using CoreEx.TestFunction.Models;
-using CoreEx.Validation;
-
-namespace CoreEx.TestApi.Validation
-{
-    public class ProductValidator : Validator<Product>
-    {
-        public ProductValidator()
-        {
-            Property(p => p.Name).Mandatory();
-            Property(p => p.Price).Between(0, 100);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestApi/appsettings.Development.json b/tests/CoreEx.TestApi/appsettings.Development.json
deleted file mode 100644
index 8983e0fc..00000000
--- a/tests/CoreEx.TestApi/appsettings.Development.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  }
-}
diff --git a/tests/CoreEx.TestApi/appsettings.json b/tests/CoreEx.TestApi/appsettings.json
deleted file mode 100644
index 4a5a3f5a..00000000
--- a/tests/CoreEx.TestApi/appsettings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information"
-    }
-  },
-  "AllowedHosts": "*",
-  "Test/BackendBaseAddress": "https://backend/"
-}
diff --git a/tests/CoreEx.TestFunction/BackendHttpClient.cs b/tests/CoreEx.TestFunction/BackendHttpClient.cs
deleted file mode 100644
index 26ccf624..00000000
--- a/tests/CoreEx.TestFunction/BackendHttpClient.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using CoreEx.Http;
-using CoreEx.Json;
-using System.Net.Http;
-
-namespace CoreEx.TestFunction
-{
-    public class BackendHttpClient(HttpClient client, IJsonSerializer jsonSerializer, ExecutionContext executionContext) : TypedHttpClientCore<BackendHttpClient>(client, jsonSerializer, executionContext) { }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/CoreEx.TestFunction.csproj b/tests/CoreEx.TestFunction/CoreEx.TestFunction.csproj
deleted file mode 100644
index 8684ed09..00000000
--- a/tests/CoreEx.TestFunction/CoreEx.TestFunction.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.6.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.AutoMapper\CoreEx.AutoMapper.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Azure\CoreEx.Azure.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.FluentValidation\CoreEx.FluentValidation.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Newtonsoft\CoreEx.Newtonsoft.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="appsettings.unittest.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-</Project>
diff --git a/tests/CoreEx.TestFunction/Functions/HttpTriggerFunction.cs b/tests/CoreEx.TestFunction/Functions/HttpTriggerFunction.cs
deleted file mode 100644
index ee3a2040..00000000
--- a/tests/CoreEx.TestFunction/Functions/HttpTriggerFunction.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using CoreEx.FluentValidation;
-using CoreEx.TestFunction.Services;
-using CoreEx.TestFunction.Validators;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.Http;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Functions
-{
-    public class HttpTriggerFunction(WebApi webApi, ProductService service)
-    {
-        private readonly WebApi _webApi = webApi;
-        private readonly ProductService _service = service;
-
-        [FunctionName("HttpTriggerProductGet")]
-        public Task<IActionResult> GetAsync([HttpTrigger(AuthorizationLevel.Function, "get", Route = "products/{id}")] HttpRequest request, string id)
-            => _webApi.GetAsync(request, (_, __) => _service.GetProductAsync(id));
-
-        [FunctionName("HttpTriggerProductPost")]
-        public Task<IActionResult> PostAsync([HttpTrigger(AuthorizationLevel.Function, "post", Route = "products")] HttpRequest request)
-            => _webApi.PostAsync(request, (r, _) => _service.AddProductAsync(r.Value!), validator: new ProductValidator().Wrap());
-
-        [FunctionName("HttpTriggerProductPut")]
-        public Task<IActionResult> PutAsync([HttpTrigger(AuthorizationLevel.Function, "put", Route = "products")] HttpRequest request)
-            => _webApi.PutAsync(request, (r, _) => _service.UpdateProductAsync(r.Value!, r.Value!.Id!), validator: new ProductValidator().Wrap());
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Functions/HttpTriggerPublishFunction.cs b/tests/CoreEx.TestFunction/Functions/HttpTriggerPublishFunction.cs
deleted file mode 100644
index 3652d3bc..00000000
--- a/tests/CoreEx.TestFunction/Functions/HttpTriggerPublishFunction.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using CoreEx.FluentValidation;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Validators;
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.Extensions.Http;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Functions
-{
-    public class HttpTriggerPublishFunction
-    {
-        private readonly WebApiPublisher _webApiPublisher;
-
-        public HttpTriggerPublishFunction(WebApiPublisher webApiPublisher)
-        {
-            _webApiPublisher = webApiPublisher;
-        }
-
-        [FunctionName("HttpTriggerPublishFunction")]
-        public Task<IActionResult> RunAsync([HttpTrigger(AuthorizationLevel.Function, "post", Route = "products/publish")] HttpRequest request)
-            => _webApiPublisher.PublishAsync(request, new WebApiPublisherArgs<Product>("test-queue", new ProductValidator().Wrap()));
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Functions/ServiceBusOrchestratedTriggerFunction.cs b/tests/CoreEx.TestFunction/Functions/ServiceBusOrchestratedTriggerFunction.cs
deleted file mode 100644
index 6965b276..00000000
--- a/tests/CoreEx.TestFunction/Functions/ServiceBusOrchestratedTriggerFunction.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Azure.Messaging.ServiceBus;
-using CoreEx.Azure.ServiceBus;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Functions
-{
-    public class ServiceBusOrchestratedTriggerFunction
-    {
-        private readonly ServiceBusOrchestratedSubscriber _subscriber;
-
-        public ServiceBusOrchestratedTriggerFunction(ServiceBusOrchestratedSubscriber subscriber)
-            => _subscriber = subscriber;
-
-        [FunctionName("ServiceBusOrchestratedFunction")]
-        [ExponentialBackoffRetry(3, "00:02:00", "00:30:00")]
-        public Task RunAsync([ServiceBusTrigger("%" + nameof(TestSettings.OrchestratedQueueName) + "%", Connection = nameof(TestSettings.ServiceBusConnection))] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions)
-            => _subscriber.ReceiveAsync(message, messageActions);
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Functions/ServiceBusTriggerFunction.cs b/tests/CoreEx.TestFunction/Functions/ServiceBusTriggerFunction.cs
deleted file mode 100644
index 5895cd1d..00000000
--- a/tests/CoreEx.TestFunction/Functions/ServiceBusTriggerFunction.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using Azure.Messaging.ServiceBus;
-using CoreEx.FluentValidation;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Services;
-using CoreEx.TestFunction.Validators;
-using Microsoft.Azure.WebJobs;
-using Microsoft.Azure.WebJobs.ServiceBus;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Functions
-{
-    public class ServiceBusTriggerFunction
-    {
-        private readonly ServiceBusSubscriber _subscriber;
-        private readonly ProductService _service;
-
-        public ServiceBusTriggerFunction(ServiceBusSubscriber subscriber, ProductService service)
-        {
-            _subscriber = subscriber;
-            _service = service;
-        }
-
-        [FunctionName("ServiceBusFunction")]
-        [ExponentialBackoffRetry(3, "00:02:00", "00:30:00")]
-        public Task RunAsync([ServiceBusTrigger("%" + nameof(TestSettings.QueueName) + "%", Connection = nameof(TestSettings.ServiceBusConnection))] ServiceBusReceivedMessage message, ServiceBusMessageActions messageActions)
-            => _subscriber.ReceiveAsync(message, messageActions, (ed, _) => _service.UpdateProductAsync(ed.Value!, ed.Value.Id!), validator: new ProductValidator().Wrap());
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Mappers/ProductMapperProfile.cs b/tests/CoreEx.TestFunction/Mappers/ProductMapperProfile.cs
deleted file mode 100644
index bd9c9fdf..00000000
--- a/tests/CoreEx.TestFunction/Mappers/ProductMapperProfile.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using AutoMapper;
-using CoreEx.TestFunction.Models;
-
-namespace CoreEx.TestFunction.Mappers
-{
-    internal class ProductMapperProfile : Profile
-    {
-        public ProductMapperProfile()
-        {
-            CreateMap<Product, BackendProduct>()
-                .ForMember(d => d.Code, o => o.MapFrom(s => s.Id))
-                .ForMember(d => d.Description, o => o.MapFrom(s => s.Name))
-                .ForMember(d => d.RetailPrice, o => o.MapFrom(s => s.Price))
-                .ReverseMap();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Models/Product.cs b/tests/CoreEx.TestFunction/Models/Product.cs
deleted file mode 100644
index d376cda4..00000000
--- a/tests/CoreEx.TestFunction/Models/Product.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using CoreEx.Entities;
-using System.Collections.Generic;
-using Nsj = Newtonsoft.Json;
-using Stj = System.Text.Json.Serialization;
-
-namespace CoreEx.TestFunction.Models
-{
-    public class Product : IIdentifier<string>
-    {
-        [Nsj.JsonProperty("id")]
-        [Stj.JsonPropertyName("id")]
-        public string? Id { get; set; }
-
-        [Nsj.JsonProperty("name")]
-        [Stj.JsonPropertyName("name")]
-        public string? Name { get; set; }
-
-        [Nsj.JsonProperty("price")]
-        [Stj.JsonPropertyName("price")]
-        public decimal Price { get; set; }
-    }
-
-    public class ProductCollection : List<Product> { }
-
-    public class ProductCollectionResult : CollectionResult<ProductCollection, Product> { }
-
-    public class BackendProduct : IPrimaryKey
-    {
-        [Nsj.JsonProperty("code")]
-        [Stj.JsonPropertyName("code")]
-        public string Code { get; set; } = string.Empty;
-
-        [Nsj.JsonProperty("description")]
-        [Stj.JsonPropertyName("description")]
-        public string? Description { get; set; }
-
-        [Nsj.JsonProperty("retailPrice")]
-        [Stj.JsonPropertyName("retailPrice")]
-        public decimal RetailPrice { get; set; }
-
-        [Nsj.JsonIgnore]
-        [Stj.JsonIgnore]
-        public string? Secret { get; set; }
-
-        [Nsj.JsonIgnore]
-        [Stj.JsonIgnore]
-        public CompositeKey PrimaryKey => new(Code);
-
-        public string? ETag { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Properties/serviceDependencies.json b/tests/CoreEx.TestFunction/Properties/serviceDependencies.json
deleted file mode 100644
index df4dcc9d..00000000
--- a/tests/CoreEx.TestFunction/Properties/serviceDependencies.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "appInsights1": {
-      "type": "appInsights"
-    },
-    "storage1": {
-      "type": "storage",
-      "connectionId": "AzureWebJobsStorage"
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Properties/serviceDependencies.local.json b/tests/CoreEx.TestFunction/Properties/serviceDependencies.local.json
deleted file mode 100644
index b804a289..00000000
--- a/tests/CoreEx.TestFunction/Properties/serviceDependencies.local.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "appInsights1": {
-      "type": "appInsights.sdk"
-    },
-    "storage1": {
-      "type": "storage.emulator",
-      "connectionId": "AzureWebJobsStorage"
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Services/ProductService.cs b/tests/CoreEx.TestFunction/Services/ProductService.cs
deleted file mode 100644
index 02c351e0..00000000
--- a/tests/CoreEx.TestFunction/Services/ProductService.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using AutoMapper;
-using CoreEx.TestFunction.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Services
-{
-    public class ProductService
-    {
-        private readonly BackendHttpClient _backend;
-        private readonly IMapper _mapper;
-        private readonly ILogger _logger;
-
-        public ProductService(BackendHttpClient backend, IMapper mapper, ILogger<ProductService> logger)
-        {
-            _backend = backend;
-            _mapper = mapper;
-            _logger = logger;
-        }
-
-        public Task<Product?> GetProductAsync(string id)
-        {
-            if (id == "Zed")
-                return Task.FromResult<Product?>(null!);
-
-            return Task.FromResult<Product?>(new Product { Id = id, Name = "Apple", Price = 0.79m });
-        }
-
-        public Task<Product> AddProductAsync(Product product)
-        {
-            product.Id = "new";
-            return Task.FromResult(product);
-        }
-
-        public async Task<Product> UpdateProductAsync(Product product, string id)
-        {
-            product.Id = id;
-            using (_logger.BeginScope(new Dictionary<string, object>() { { "ProductId", product.Id } }))
-            {
-                if (product.Id == "Zed")
-                    throw new ValidationException("Zed is dead.");
-
-                var bep = _mapper.Map<BackendProduct>(product);
-                var r = await _backend.ThrowTransientException().ThrowKnownException().EnsureSuccess().PostAsync<BackendProduct, BackendProduct>("products", bep).ConfigureAwait(false);
-
-                return _mapper.Map<Product>(r.Value);
-            }
-        }
-
-        public Task DeleteProductAsync(string id)
-        {
-            _logger.LogInformation($"Deleting product {id}.");
-            return Task.CompletedTask;
-        }
-
-        public Task<FileContentResult> GetCatalogueAsync(string id)
-        {
-            var fcr = new FileContentResult(Encoding.ASCII.GetBytes($"Catalog for '{id}'."), "text/plain");
-            return Task.FromResult(fcr);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Startup.cs b/tests/CoreEx.TestFunction/Startup.cs
deleted file mode 100644
index ef8ac3ae..00000000
--- a/tests/CoreEx.TestFunction/Startup.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using CoreEx.Azure.ServiceBus;
-using CoreEx.TestFunction.Services;
-using CoreEx.AspNetCore.HealthChecks;
-using Microsoft.Azure.Functions.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection;
-using CoreEx.Events.Subscribing;
-using CoreEx.TestFunction.Subscribers;
-using CoreEx.AspNetCore.WebApis;
-using CoreEx.Http.HealthChecks;
-
-[assembly: FunctionsStartup(typeof(CoreEx.TestFunction.Startup))]
-
-namespace CoreEx.TestFunction
-{
-    public class Startup : FunctionsStartup
-    {
-        public override void ConfigureAppConfiguration(IFunctionsConfigurationBuilder builder)
-        {
-        }
-
-        public override void Configure(IFunctionsHostBuilder builder)
-        {
-            // Register the core services.
-            builder.Services
-                .AddSettings<TestSettings>()
-                .AddExecutionContext()
-                .AddJsonSerializer()
-                //.AddNewtonsoftJsonSerializer()
-                .AddEventDataSerializer()
-                //.AddCloudEventSerializer()
-                //.AddNewtonsoftEventDataSerializer()
-                //.AddNewtonsoftCloudEventSerializer()
-                //.AddScoped<IEventSerializer, CoreEx.Text.Json.EventDataSerializer>()
-                // replace by your own implementation of IEventPublisher to send events to e.g. service bus
-                .AddNullEventPublisher()
-                .AddScoped<WebApi, WebApi>()
-                .AddJsonMergePatch()
-                .AddScoped<WebApiPublisher, WebApiPublisher>()
-                .AddScoped<ServiceBusSubscriber>();
-
-            // Register orchestrated.
-            builder.Services
-                .AddEventSubscribers<NoValueSubscriber>()
-                .AddEventSubscriberOrchestrator((_, eso) => eso.AddSubscribers(EventSubscriberOrchestrator.GetSubscribers<NoValueSubscriber>()))
-                .AddAzureServiceBusOrchestratedSubscriber();
-
-            // Register the health checks.
-            builder.Services
-                .AddHealthChecks()
-                .AddTypeActivatedCheck<TypedHttpClientCoreHealthCheck<BackendHttpClient>>("Backend");
-
-            // Register the typed backend http client.
-            builder.Services.AddTypedHttpClient<BackendHttpClient>("Backend", (sp, hc) =>
-            {
-                var settings = sp.GetRequiredService<TestSettings>();
-                hc.BaseAddress = settings.BackendBaseAddress;
-            });
-
-            // Register the underlying function services.
-            builder.Services
-                .AddAutoMapper(typeof(ProductService).Assembly)
-                .AddScoped<ProductService>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Subscribers/NoValueSubscriber.cs b/tests/CoreEx.TestFunction/Subscribers/NoValueSubscriber.cs
deleted file mode 100644
index eccfabd6..00000000
--- a/tests/CoreEx.TestFunction/Subscribers/NoValueSubscriber.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.Results;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Subscribers
-{
-    [EventSubscriber("my.novalue")]
-    public class NoValueSubscriber : SubscriberBase
-    {
-        private readonly ILogger _logger;
-
-        public static HashSet<string> EventIds { get; } = new HashSet<string>();
-
-        public NoValueSubscriber(ILogger<NoValueSubscriber> logger) => _logger = logger;
-
-        public override Task<Result> ReceiveAsync(EventData @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-        {
-            EventIds.Add(@event.Id!);
-            _logger.LogInformation($"Message {@event.Id} was received.");
-            return Task.FromResult(Result.Success);
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Subscribers/ProductSubscriber.cs b/tests/CoreEx.TestFunction/Subscribers/ProductSubscriber.cs
deleted file mode 100644
index 072ef907..00000000
--- a/tests/CoreEx.TestFunction/Subscribers/ProductSubscriber.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using CoreEx.Events;
-using CoreEx.Events.Subscribing;
-using CoreEx.FluentValidation;
-using CoreEx.Results;
-using CoreEx.TestFunction.Models;
-using CoreEx.TestFunction.Validators;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CoreEx.TestFunction.Subscribers
-{
-    [EventSubscriber("my.product")]
-    public class ProductSubscriber(ILogger<NoValueSubscriber> logger) : SubscriberBase<Product>(new ProductValidator().Wrap())
-    {
-        private readonly ILogger _logger = logger;
-
-        public static HashSet<string> EventIds { get; } = [];
-
-        public async override Task<Result> ReceiveAsync(EventData<Product> @event, EventSubscriberArgs args, CancellationToken cancellationToken)
-        {
-            await Task.CompletedTask.ConfigureAwait(false);
-            EventIds.Add(@event.Id!);
-            _logger.LogInformation($"Message {@event.Id} for Product {@event.Value.Id} was received.");
-
-            if (@event.Value.Id == "PS5")
-                return Result.TransientError($"{@event.Value.Name} is currently not permissable; please try again later.");
-
-            return Result.Success;
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/TestSettings.cs b/tests/CoreEx.TestFunction/TestSettings.cs
deleted file mode 100644
index 17f7c295..00000000
--- a/tests/CoreEx.TestFunction/TestSettings.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using CoreEx.Configuration;
-using Microsoft.Extensions.Configuration;
-using System;
-
-namespace CoreEx.TestFunction
-{
-    public class TestSettings : SettingsBase
-    {
-        /// <summary>
-        /// Gets the setting prefixes in order of precedence.
-        /// </summary>
-        public static string[] Prefixes { get; } = { "Test/", "Common/" };
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestSettings"/> class.
-        /// </summary>
-        /// <param name="configuration">The <see cref="IConfiguration"/>.</param>
-        public TestSettings(IConfiguration configuration) : base(configuration, Prefixes) { }
-
-        /// <summary>
-        /// Gets the <see cref="BackendHttpClient"/> base endpoint/address URI.
-        /// </summary>
-        public Uri BackendBaseAddress
-        {
-            get
-            {
-                var uri = GetRequiredValue<string>(nameof(BackendBaseAddress));
-                if (Uri.IsWellFormedUriString(uri, UriKind.Absolute))
-                    return new Uri(uri, UriKind.Absolute);
-                else
-                    throw new InvalidOperationException($"Configuration key '{nameof(BackendBaseAddress)}' is not a valid URI: {uri}");
-            }
-        }
-
-        /// <summary>
-        /// The Azure Service Bus connection string used for <b>Publishing</b> when service bus is used.
-        /// </summary>
-        /// <remarks>It defaults to managed identity connection string used by triggers 'ServiceBusConnection__fullyQualifiedNamespace'</remarks>
-        public string ServiceBusConnection => GetValue<string>(defaultValue: ServiceBusConnection__fullyQualifiedNamespace);
-
-        /// <summary>
-        /// The Azure Service Bus connection string used by <b>Triggers</b> using managed identity.
-        /// </summary>
-        /// <remarks> <b>Caution</b> this key is used implicitly by function triggers when 'ServiceBusConnection' is not set. </remarks>
-        /// <remarks> Underscores in environment variables are replaced by semicolon ':' in configuration object, hence lookup also replaces '__' with ':'</remarks>
-        public string ServiceBusConnection__fullyQualifiedNamespace => GetValue<string>();
-
-        /// <summary>
-        /// Name of the queue used for function trigger
-        /// </summary>
-        public string? QueueName { get; set; }
-
-        /// <summary>
-        /// Name of the queue used for function trigger
-        /// </summary>
-        public string? OrchestratedQueueName { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/Validators/ProductValidator.cs b/tests/CoreEx.TestFunction/Validators/ProductValidator.cs
deleted file mode 100644
index 2c3d006e..00000000
--- a/tests/CoreEx.TestFunction/Validators/ProductValidator.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using CoreEx.TestFunction.Models;
-using FluentValidation;
-using System.Collections.Generic;
-
-namespace CoreEx.TestFunction.Validators
-{
-    public class ProductValidator : AbstractValidator<Product>
-    {
-        public ProductValidator()
-        {
-            RuleFor(x => x.Id).NotEmpty();
-            RuleFor(x => x.Name).NotEmpty().Length(0, 100);
-            RuleFor(x => x.Price).NotEmpty().PrecisionScale(10, 2, true).GreaterThan(0).Custom((v, ctx) =>
-            {
-                if (ctx.InstanceToValidate.Name == "Widget" && v >= 100)
-                    ctx.AddFailure($"'{ctx.DisplayName}' must be less than $100.00 for a 'Widget'.");
-                else if (ctx.InstanceToValidate.Name == "DeLorean" && ctx.InstanceToValidate.Price == 88m)
-                    ctx.AddFailure(nameof(Product.Name), "A DeLorean cannot be priced at 88 as that could cause a chain reaction that would unravel the very fabric of the space-time continuum and destroy the entire universe.");
-            });
-        }
-    }
-
-    public class ProductsValidator : AbstractValidator<List<Product>>
-    {
-        public ProductsValidator() => RuleForEach(value => value).SetValidator(new ProductValidator());
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/appsettings.unittest.json b/tests/CoreEx.TestFunction/appsettings.unittest.json
deleted file mode 100644
index 6eb6a280..00000000
--- a/tests/CoreEx.TestFunction/appsettings.unittest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "Test/BackendBaseAddress": "https://backend/"
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/host.json b/tests/CoreEx.TestFunction/host.json
deleted file mode 100644
index beb2e402..00000000
--- a/tests/CoreEx.TestFunction/host.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "version": "2.0",
-    "logging": {
-        "applicationInsights": {
-            "samplingSettings": {
-                "isEnabled": true,
-                "excludedTypes": "Request"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunction/local.settings.json b/tests/CoreEx.TestFunction/local.settings.json
deleted file mode 100644
index 4c5a3118..00000000
--- a/tests/CoreEx.TestFunction/local.settings.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "IsEncrypted": false,
-  "Values": {
-    "AzureWebJobsStorage": "UseDevelopmentStorage=true",
-    "FUNCTIONS_WORKER_RUNTIME": "dotnet",
-    "ServiceBusConnection": "supersecretconnectionstring",
-    "Test/BackendBaseAddress": "https://backend/",
-    "BindingRedirects": "[ { \"ShortName\": \"System.Memory.Data\", \"RedirectToVersion\": \"6.0.0.0\", \"PublicKeyToken\": \"cc7b13ffcd2ddd51\" } ]",
-
-    "Deployment.By": "me",
-    "Deployment.Build": "build no",
-    "Deployment.Name": "my deployment",
-    "Deployment.Version": "1.0.0",
-    "Deployment.Date": "today"
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/.gitignore b/tests/CoreEx.TestFunctionIso/.gitignore
deleted file mode 100644
index ff5b00c5..00000000
--- a/tests/CoreEx.TestFunctionIso/.gitignore
+++ /dev/null
@@ -1,264 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# Azure Functions localsettings file
-local.settings.json
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-#*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/CoreEx.TestFunctionIso.csproj b/tests/CoreEx.TestFunctionIso/CoreEx.TestFunctionIso.csproj
deleted file mode 100644
index 7f01b965..00000000
--- a/tests/CoreEx.TestFunctionIso/CoreEx.TestFunctionIso.csproj
+++ /dev/null
@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
-    <OutputType>Exe</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.4.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="1.3.2" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\CoreEx.AspNetCore\CoreEx.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx.Azure\CoreEx.Azure.csproj" />
-    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/HttpFunction.cs b/tests/CoreEx.TestFunctionIso/HttpFunction.cs
deleted file mode 100644
index 949d92eb..00000000
--- a/tests/CoreEx.TestFunctionIso/HttpFunction.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using CoreEx.AspNetCore.WebApis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Azure.Functions.Worker;
-
-namespace CoreEx.TestFunctionIso
-{
-    public class HttpFunction(WebApi webApi)
-    {
-        private readonly WebApi _webApi = webApi;
-
-        [Function("HttpFunction")]
-        public Task<IActionResult> Run([HttpTrigger(AuthorizationLevel.Function, "get", Route = "{id}")] HttpRequest req, string id)
-            => _webApi.GetAsync(req, _ => Task.FromResult(new { Message = $"Hello {id}" }));
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/Program.cs b/tests/CoreEx.TestFunctionIso/Program.cs
deleted file mode 100644
index 613cb31d..00000000
--- a/tests/CoreEx.TestFunctionIso/Program.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-//using Azure.Monitor.OpenTelemetry.AspNetCore;
-using CoreEx.Hosting;
-using CoreEx.TestFunctionIso;
-using Microsoft.Azure.Functions.Worker;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using OpenTelemetry.Trace;
-using Azure.Monitor.OpenTelemetry.Exporter;
-
-new HostBuilder()
-    .ConfigureFunctionsWebApplication()
-    .ConfigureServices(services =>
-    {
-        services.AddApplicationInsightsTelemetryWorkerService();
-        services.ConfigureFunctionsApplicationInsights();
-        services.AddOpenTelemetry().WithTracing(b => b.AddSource("CoreEx.*").AddAzureMonitorTraceExporter());
-        //services.AddOpenTelemetry().UseAzureMonitor();
-        //services.ConfigureOpenTelemetryTracerProvider(tpb => tpb.AddSource("CoreEx.*"));
-    })
-    .ConfigureHostStartup<Startup>()
-    .Build()
-    .Run();
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/Properties/launchSettings.json b/tests/CoreEx.TestFunctionIso/Properties/launchSettings.json
deleted file mode 100644
index 2c217e9a..00000000
--- a/tests/CoreEx.TestFunctionIso/Properties/launchSettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "profiles": {
-    "CoreEx.TestFunctionIso": {
-      "commandName": "Project",
-      "commandLineArgs": "--port 7073",
-      "launchBrowser": false
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/Properties/serviceDependencies.json b/tests/CoreEx.TestFunctionIso/Properties/serviceDependencies.json
deleted file mode 100644
index df4dcc9d..00000000
--- a/tests/CoreEx.TestFunctionIso/Properties/serviceDependencies.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "appInsights1": {
-      "type": "appInsights"
-    },
-    "storage1": {
-      "type": "storage",
-      "connectionId": "AzureWebJobsStorage"
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/Properties/serviceDependencies.local.json b/tests/CoreEx.TestFunctionIso/Properties/serviceDependencies.local.json
deleted file mode 100644
index b804a289..00000000
--- a/tests/CoreEx.TestFunctionIso/Properties/serviceDependencies.local.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "appInsights1": {
-      "type": "appInsights.sdk"
-    },
-    "storage1": {
-      "type": "storage.emulator",
-      "connectionId": "AzureWebJobsStorage"
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/ServiceBusFunction.cs b/tests/CoreEx.TestFunctionIso/ServiceBusFunction.cs
deleted file mode 100644
index bb3e579b..00000000
--- a/tests/CoreEx.TestFunctionIso/ServiceBusFunction.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Azure.Messaging.ServiceBus;
-using CoreEx.Azure.ServiceBus;
-using CoreEx.Results;
-using Microsoft.Azure.Functions.Worker;
-using Microsoft.Extensions.Logging;
-
-namespace CoreEx.TestFunctionIso
-{
-    public class ServiceBusFunction(ServiceBusSubscriber subscriber, ILogger<ServiceBusFunction> logger)
-    {
-        private readonly ServiceBusSubscriber _subscriber = subscriber;
-        private readonly ILogger _logger = logger;
-
-        [Function(nameof(ServiceBusFunction))]
-        public Task Run([ServiceBusTrigger("test-queue", Connection = "ServiceBusConnectionString")] ServiceBusReceivedMessage message, ServiceBusMessageActions sbma)
-            => _subscriber.ReceiveAsync<string>(message, sbma, (@event, args) =>
-            {
-                if (@event.Value == "not-found")
-                    return Result.NotFoundError().AsTask();
-
-                _logger.LogInformation($"Received message: {@event.Value}");
-                return Result.SuccessTask;
-            });
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/Startup.cs b/tests/CoreEx.TestFunctionIso/Startup.cs
deleted file mode 100644
index 4a12956f..00000000
--- a/tests/CoreEx.TestFunctionIso/Startup.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using CoreEx.Hosting;
-using CoreEx.Hosting.Work;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace CoreEx.TestFunctionIso
-{
-    public class Startup : HostStartup
-    {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            services
-                .AddDefaultSettings()
-                .AddExecutionContext()
-                .AddJsonSerializer()
-                .AddWebApi()
-                .AddEventDataSerializer()
-                .AddAzureServiceBusSubscriber((sp, s) =>
-                {
-                    s.WorkStateAlreadyFinishedHandling = Events.Subscribing.ErrorHandling.CompleteWithWarning;
-                    s.WorkStateOrchestrator = sp.GetRequiredService<WorkStateOrchestrator>();
-                });
-
-            services
-                .AddSingleton<IWorkStatePersistence, InMemoryWorkStatePersistence>()
-                .AddSingleton<WorkStateOrchestrator>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.TestFunctionIso/host.json b/tests/CoreEx.TestFunctionIso/host.json
deleted file mode 100644
index ee5cf5f8..00000000
--- a/tests/CoreEx.TestFunctionIso/host.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "version": "2.0",
-    "logging": {
-        "applicationInsights": {
-            "samplingSettings": {
-                "isEnabled": true,
-                "excludedTypes": "Request"
-            },
-            "enableLiveMetricsFilters": true
-        }
-    }
-}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Clauses/DependsOnClauseTests.cs b/tests/CoreEx.Validation.Test.Unit/Clauses/DependsOnClauseTests.cs
new file mode 100644
index 00000000..373014b9
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Clauses/DependsOnClauseTests.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.Validation.Test.Unit.Clauses;
+
+[TestFixture]
+public class DependsOnClauseTests
+{
+    [Test]
+    public void DependsOn()
+    {
+        var v = Validator.Create<Person>().HasProperty(p => p.FirstName, c => c.Length(4).DependsOn(p => p.LastName));
+
+        v.ValidateAsSuccess(new Person());
+        v.ValidateAsSuccess(new Person { FirstName = "Joh" });
+        v.ValidateAsSuccess(new Person { FirstName = "John", LastName = "Doe" });
+
+        v.ValidateAsError(new Person { FirstName = "Joh", LastName = "Doe" }, "firstName", "First name must be exactly 4 character(s) in length.");
+    }
+
+    private class Person
+    {
+        public string? FirstName { get; set; }
+        public string? LastName { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Clauses/WhenClauseTests.cs b/tests/CoreEx.Validation.Test.Unit/Clauses/WhenClauseTests.cs
new file mode 100644
index 00000000..e40cde00
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Clauses/WhenClauseTests.cs
@@ -0,0 +1,25 @@
+using CoreEx.Results;
+
+namespace CoreEx.Validation.Test.Unit.Clauses;
+
+[TestFixture]
+public class WhenClauseTests
+{
+    [Test]
+    public void When()
+    {
+        0.Validator(c => c.Mandatory().WhenEntity(e => e.Value == 0)).ValidateAsError("is required.");
+        0.Validator(c => c.Mandatory().WhenValue(v => v == 0)).ValidateAsError("is required.");
+        0.Validator(c => c.Mandatory().When(true)).ValidateAsError("is required.");
+        0.Validator(c => c.Mandatory().When(() => true)).ValidateAsError("is required.");
+        0.Validator(c => c.Mandatory().When((c, _) => Task.FromResult(true))).ValidateAsError("is required.");
+        1.Validator(c => c.Mandatory().WhenHasValue()).ValidateAsSuccess();
+
+        1.Validator(c => c.Mandatory().WhenEntity(e => e.Value == 0)).ValidateAsSuccess();
+        1.Validator(c => c.Mandatory().WhenValue(v => v == 0)).ValidateAsSuccess();
+        1.Validator(c => c.Mandatory().When(false)).ValidateAsSuccess();
+        1.Validator(c => c.Mandatory().When(() => false)).ValidateAsSuccess();
+        1.Validator(c => c.Mandatory().When((c, _) => Task.FromResult(false))).ValidateAsSuccess();
+        ((int?)null).Validator(c => c.Mandatory().WhenHasValue()).ValidateAsSuccess();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/CommonValidatorTests.cs b/tests/CoreEx.Validation.Test.Unit/CommonValidatorTests.cs
new file mode 100644
index 00000000..dcdf2b4a
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/CommonValidatorTests.cs
@@ -0,0 +1,12 @@
+namespace CoreEx.Validation.Test.Unit;
+
+[TestFixture]
+public class CommonValidatorTests
+{
+    [Test]
+    public void Create()
+    {
+        var cv = Validator.CreateCommon<string>(c => c.Mandatory().MaximumLength(20));
+        var cv2 = Validator.CreateCommon<int>(c => c.Mandatory().Between(0, 20));
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/CoreEx.Validation.Test.Unit.csproj b/tests/CoreEx.Validation.Test.Unit/CoreEx.Validation.Test.Unit.csproj
new file mode 100644
index 00000000..7a4327ef
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/CoreEx.Validation.Test.Unit.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <NoWarn>CA1861;SYSLIB1045</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="AwesomeAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="UnitTestEx.NUnit" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\gen\CoreEx.Generator\CoreEx.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\CoreEx.Validation\CoreEx.Validation.csproj" />
+    <ProjectReference Include="..\..\src\CoreEx\CoreEx.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="AwesomeAssertions" />
+    <Using Include="NUnit.Framework" />
+    <Using Include="UnitTestEx" />
+    <Using Alias="ExecutionContext" Include="CoreEx.ExecutionContext" />
+  </ItemGroup>
+
+</Project>
diff --git a/tests/CoreEx.Validation.Test.Unit/Helper.cs b/tests/CoreEx.Validation.Test.Unit/Helper.cs
new file mode 100644
index 00000000..4b6896c9
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Helper.cs
@@ -0,0 +1,105 @@
+using CoreEx.Entities;
+using CoreEx.Invokers;
+using CoreEx.Validation.Abstractions;
+using System.Text.Json;
+
+namespace CoreEx.Validation.Test.Unit;
+
+internal static class Helper
+{
+    private static JsonSerializerOptions? _jsonSerializerOptions;
+
+    private static JsonSerializerOptions GetJsonSerializerOptions()
+    {
+        if (_jsonSerializerOptions is not null)
+            return _jsonSerializerOptions;
+
+        _jsonSerializerOptions = new JsonSerializerOptions { WriteIndented = true };
+        _jsonSerializerOptions.Converters.Add(new IgnoreTypeConverter<Type>());
+        _jsonSerializerOptions.Converters.Add(new IgnoreTypeConverter<Exception>());
+        _jsonSerializerOptions.Converters.Add(new IgnoreTypeConverter<IServiceProvider>());
+        _jsonSerializerOptions.Converters.Add(new IgnoreTypeConverter<JsonSerializerOptions>());
+        return _jsonSerializerOptions;
+    }
+
+    public static IValidationResult<ValidationValue<T>> ValidateAsSuccess<T>(this IValueValidator<T> validator, ValidationArgs? args = null)
+    {
+        var r = Invoker.RunSync(() => validator.ThrowIfNull().ValidateAsync(args));
+        r.Should().NotBeNull();
+
+        Console.WriteLine(JsonSerializer.Serialize(r, GetJsonSerializerOptions()));
+        Console.WriteLine("----");
+
+        r.HasErrors.Should().BeFalse();
+        return r;
+    }
+
+    public static IValidationResult<ValidationValue<T>> ValidateAsError<T>(this IValueValidator<T> validator, string containsErrorText, ValidationArgs? args = null)
+    {
+        var r = Invoker.RunSync(() => validator.ThrowIfNull().ValidateAsync(args));
+        r.Should().NotBeNull();
+
+        Console.WriteLine(JsonSerializer.Serialize(r, GetJsonSerializerOptions()));
+        Console.WriteLine("----");
+
+        r.HasErrors.Should().BeTrue();
+        r.Messages.Should().NotBeNull().And.HaveCount(1);
+        r.Messages[0].Should().NotBeNull();
+        r.Messages[0].Type.Should().Be(MessageType.Error);
+        r.Messages[0].Text.ToString().Should().Contain(containsErrorText);
+        return r;
+    }
+
+    public static IValidationResult<ValidationValue<T>> ValidateAsError<T>(this IValueValidator<T> validator, string propertyName, string containsErrorText)
+    {
+        var r = Invoker.RunSync(() => validator.ThrowIfNull().ValidateAsync());
+
+        Console.WriteLine(JsonSerializer.Serialize(r, GetJsonSerializerOptions()));
+        Console.WriteLine("----");
+
+        r.Should().NotBeNull();
+        r.HasErrors.Should().BeTrue();
+        r.Messages.Should().NotBeNull().And.HaveCount(1);
+        r.Messages[0].Should().NotBeNull();
+        r.Messages[0].Type.Should().Be(MessageType.Error);
+        r.Messages[0].Property.Should().Be(propertyName);
+        r.Messages[0].Text.ToString().Should().Contain(containsErrorText);
+        return r;
+    }
+
+    public static IValidationResult<T> ValidateAsSuccess<T>(this Validator<T> validator, T value) where T : class
+    {
+        var r = Invoker.RunSync(() => validator.ThrowIfNull().ValidateAsync(value));
+        r.Should().NotBeNull();
+
+        Console.WriteLine(JsonSerializer.Serialize(r, GetJsonSerializerOptions()));
+        Console.WriteLine("----");
+
+        r.HasErrors.Should().BeFalse();
+        return r;
+    }
+
+    public static IValidationResult<T> ValidateAsError<T>(this Validator<T> validator, T value, string propertyName, string containsErrorText) where T : class
+    {
+        var r = Invoker.RunSync(() => validator.ThrowIfNull().ValidateAsync(value));
+        r.Should().NotBeNull();
+
+        Console.WriteLine(JsonSerializer.Serialize(r, GetJsonSerializerOptions()));
+        Console.WriteLine("----");
+
+        r.HasErrors.Should().BeTrue();
+        r.Messages.Should().NotBeNull().And.HaveCount(1);
+        r.Messages[0].Should().NotBeNull();
+        r.Messages[0].Type.Should().Be(MessageType.Error);
+        r.Messages[0].Property.Should().Be(propertyName);
+        r.Messages[0].Text.ToString().Should().Contain(containsErrorText);
+        return r;
+    }
+
+    private sealed class IgnoreTypeConverter<T> : System.Text.Json.Serialization.JsonConverter<T>
+    {
+        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => default;
+
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) => writer.WriteNullValue();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/BetweenRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/BetweenRuleTests.cs
new file mode 100644
index 00000000..31544fbf
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/BetweenRuleTests.cs
@@ -0,0 +1,52 @@
+using CoreEx.Results;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class BetweenRuleTests
+{
+    [Test]
+    public void Between_Values()
+    {
+        ((int?)null).Validator(c => c.Between(1, 3)).ValidateAsSuccess();
+        1.Validator(c => c.Between(1, 3)).ValidateAsSuccess();
+        2.Validator(c => c.Between(1, 3)).ValidateAsSuccess();
+        ((int?)3).Validator(c => c.Between(1, 3)).ValidateAsSuccess();
+        ((string?)null).Validator(c => c.Between("a", "g")).ValidateAsSuccess();
+        "b".Validator(c => c.Between("a", "g")).ValidateAsSuccess();
+
+        0.Validator(c => c.Between(1, 3)).ValidateAsError(" must be between '1' and '3'.");
+        4.Validator(c => c.Between(1, 3)).ValidateAsError(" must be between '1' and '3'.");
+        ((int?)0).Validator(c => c.Between(1, 3)).ValidateAsError(" must be between '1' and '3'.");
+        ((int?)4).Validator(c => c.Between(1, 3)).ValidateAsError(" must be between '1' and '3'.");
+
+        ((int?)4).Validator(c => c.Between(1, 3, "One", "Three")).ValidateAsError(" must be between One and Three.");
+    }
+
+    [Test]
+    public void Between_Funcs()
+    {
+        ((int?)null).Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsSuccess();
+        1.Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsSuccess();
+        2.Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsSuccess();
+        ((int?)3).Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsSuccess();
+        ((string?)null).Validator(c => c.Between(_ => "a", _ => "g")).ValidateAsSuccess();
+        "b".Validator(c => c.Between(_ => "a", _ => "g")).ValidateAsSuccess();
+
+        0.Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsError(" must be between '1' and '3'.");
+        4.Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsError(" must be between '1' and '3'.");
+        ((int?)0).Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsError(" must be between '1' and '3'.");
+        ((int?)4).Validator(c => c.Between(_ => 1, _ => 3)).ValidateAsError(" must be between '1' and '3'.");
+
+        ((int?)4).Validator(c => c.Between(_ => 1, _ => 3, _ => "One", _ => "Three")).ValidateAsError(" must be between One and Three.");
+    }
+
+    [Test]
+    public void Between_Funcs_Args()
+    {
+        var args = new ValidationArgs { Parameters = new Dictionary<string, object?> { { "Min", 1 }, { "Max", 3 } } };
+        1.Validator(c => c.Between((c) => Result.Ok((int)c.Parameters!["Min"]!), (c) => Result.Ok((int)c.Parameters!["Max"]!))).ValidateAsSuccess(args);
+
+        5.Validator(c => c.Between((c) => Result.Ok((int)c.Parameters!["Min"]!), (c) => Result.Ok((int)c.Parameters!["Max"]!))).ValidateAsError(" must be between '1' and '3'.", args);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/CollectionRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/CollectionRuleTests.cs
new file mode 100644
index 00000000..b46bc7b6
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/CollectionRuleTests.cs
@@ -0,0 +1,301 @@
+using CoreEx.Entities;
+using CoreEx.Validation;
+using System.Globalization;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class CollectionRuleTests
+{
+    [Test]
+    public void MaxCount()
+    {
+        new int[] { 1, 2 }.Validator(c => c.Collection(2)).ValidateAsSuccess();
+        ((IEnumerable<int>)[1, 2]).Validator(c => c.Collection(2)).ValidateAsSuccess();
+        Array.Empty<int>().Validator(c => c.Collection(2)).ValidateAsSuccess();
+        Enumerable.Empty<int>().Validator(c => c.Collection(2)).ValidateAsSuccess();
+        ((IEnumerable<int>?)null).Validator(c => c.Collection(2)).ValidateAsSuccess();
+
+        new int[] { 1, 2, 3 }.Validator(c => c.Collection(2)).ValidateAsError("must not exceed 2 item(s).");
+        ((IEnumerable<int>)[1, 2, 3]).Validator(c => c.Collection(2)).ValidateAsError("must not exceed 2 item(s).");
+    }
+
+    [Test]
+    public void MaxCount_Func()
+    {
+        new int[] { 1, 2 }.Validator(c => c.Collection(_ => 2)).ValidateAsSuccess();
+        ((IEnumerable<int>)[1, 2]).Validator(c => c.Collection(_ => 2)).ValidateAsSuccess();
+        Array.Empty<int>().Validator(c => c.Collection(_ => 2)).ValidateAsSuccess();
+        Enumerable.Empty<int>().Validator(c => c.Collection(_ => 2)).ValidateAsSuccess();
+        ((IEnumerable<int>?)null).Validator(c => c.Collection(_ => 2)).ValidateAsSuccess();
+
+        new int[] { 1, 2, 3 }.Validator(c => c.Collection(_ => 2)).ValidateAsError("must not exceed 2 item(s).");
+        ((IEnumerable<int>)[1, 2, 3]).Validator(c => c.Collection(_ => 2)).ValidateAsError("must not exceed 2 item(s).");
+    }
+
+    [Test]
+    public void MinCount()
+    {
+        new int[] { 1, 2 }.Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsSuccess();
+        ((IEnumerable<int>)[1, 2]).Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsSuccess();
+
+        List<int>? list = null;
+        list.Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsSuccess();
+
+        Array.Empty<int>().Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        Enumerable.Empty<int>().Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        new int[] { 1 }.Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        ((IEnumerable<int>)[1]).Validator(c => c.Collection(minCount: 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+    }
+
+    [Test]
+    public void MinCount_Func()
+    {
+        new int[] { 1, 2 }.Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsSuccess();
+        ((IEnumerable<int>)[1, 2]).Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsSuccess();
+
+        List<int>? list = null;
+        list.Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsSuccess();
+
+        Array.Empty<int>().Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        Enumerable.Empty<int>().Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        new int[] { 1 }.Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        ((IEnumerable<int>)[1]).Validator(c => c.Collection(minCount: _ => 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+    }
+
+    [Test]
+    public void CommonValidator()
+    {
+        var ic = Validator.CreateCommon<int>(v => v.Between(10, 20));
+
+        new int[] { 11, 18 }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Between(10, 20)))).ValidateAsSuccess();
+        new int?[] { 11, null, 18 }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Between(10, 20)).AllowNullItems())).ValidateAsSuccess();
+        new int[] { 11, 18 }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Common(ic)))).ValidateAsSuccess();
+        new int?[] { 11, null, 18 }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Common(ic)).AllowNullItems())).ValidateAsSuccess();
+
+        new List<int> { 11, 18 }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Between(10, 20)))).ValidateAsSuccess();
+        new List<int?> { 11, null, 18 }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Between(10, 20)).AllowNullItems())).ValidateAsSuccess();
+
+        new string[] { "AAA", "BBB" }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Length(3)))).ValidateAsSuccess();
+        new string?[] { "AAA", null, "BBB" }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Length(3)).AllowNullItems())).ValidateAsSuccess();
+
+        new string?[] { "AAA", null, "BBB" }.Validator(c => c.Collection(w => w.WithItemValidator(v => v.Length(3)))).ValidateAsError("contains one or more items that are not specified.");
+    }
+
+    [Test]
+    public void DuplicateCheck_IEquatable()
+    {
+        new int[] { 1, 2, 3 }.Validator(c => c.Collection(w => w.WithDuplicateCheck())).ValidateAsSuccess();
+        new int[] { 1, 2, 1 }.Validator(c => c.Collection(w => w.WithDuplicateCheck())).ValidateAsError("contains duplicates; Item specified more than once.");
+    }
+
+    [Test]
+    public void DuplicateCheck_KeySelector()
+    {
+        new int[] { 1, 2, 3 }.Validator(c => c.Collection(w => w.WithDuplicateCheck(i => i))).ValidateAsSuccess();
+        new int[] { 1, 2, 1 }.Validator(c => c.Collection(w => w.WithDuplicateCheck(i => i))).ValidateAsError("contains duplicates; Item specified more than once.");
+    }
+
+    [Test]
+    public void DuplicateIdCheck()
+    {
+        var list = new List<Person>
+        {
+            new() { Id = "A", Name = "Bob" },
+            new() { Id = "B", Name = "Kate" }
+        };
+
+        list[0].Id = "B";
+        list.Validator(c => c.Collection(w => w.WithDuplicateIdCheck())).ValidateAsError("contains duplicates; Identifier specified more than once.");
+    }
+
+    [Test]
+    public void DuplicateKeyCheck()
+    {
+        var list = new List<Person>
+        {
+            new() { Id = "A", Name = "Bob" },
+            new() { Id = "B", Name = "Kate" }
+        };
+
+        list.Validator(c => c.Collection(w => w.WithDuplicateKeyCheck())).ValidateAsSuccess();
+
+        list[0].Id = "B";
+        list.Validator(c => c.Collection(w => w.WithDuplicateKeyCheck())).ValidateAsError("contains duplicates; Key specified more than once.");
+    }
+
+    [Test]
+    public void DuplicatePropertyCheck()
+    {
+        var list = new List<Person>
+        {
+            new() { Id = "A", Name = "Bob" },
+            new() { Id = "B", Name = "Kate" }
+        };
+
+        list.Validator(c => c.Collection(w => w.WithDuplicatePropertyCheck(p => p.Name))).ValidateAsSuccess();
+
+        list[0].Name = "Kate";
+        list.Validator(c => c.Collection(w => w.WithDuplicatePropertyCheck(p => p.Name))).ValidateAsError("contains duplicates; Name specified more than once.");
+    }
+
+    [Test]
+    public void Entity()
+    {
+        var av = Validator.Create<Address>()
+            .HasProperty(p => p.Street, c => c.Mandatory().MaximumLength(20));
+
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Id, c => c.Mandatory())
+            .HasProperty(p => p.Name, c => c.Mandatory())
+            .HasProperty(p => p.Addresses, c => c.Mandatory().Collection(c => c.WithItemValidator(av).WithDuplicatePropertyCheck(a => a.Street)));
+
+        var p = new Person
+        {
+            Id = "1",
+            Name = "John",
+            Addresses =
+            [
+                new Address { Street = "1 St" },
+                new Address { Street = "2 St" }
+            ]
+        };
+
+        pv.ValidateAsSuccess(p);
+
+        p.Addresses.Add(new Address());
+        pv.ValidateAsError(p, "addresses[2].street", "Street is required.");
+
+        p.Addresses[2]!.Street = "1 St";
+        pv.ValidateAsError(p, "addresses", "Addresses contains duplicates; Street specified more than once.");
+    }
+
+    [Test]
+    public void EnclosingCollection()
+    {
+        var av = Validator.Create<Address>().HasProperty(p => p.Street, c => c.Mandatory().MaximumLength(20));
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Id, c => c.Mandatory())
+            .HasProperty(p => p.Name, c => c.Mandatory())
+            .HasProperty(p => p.Addresses, c => c.Mandatory().Collection(c => c.WithItemValidator(av).WithDuplicatePropertyCheck(a => a.Street)));
+
+        var pc = new PersonCollection
+        {
+            new Person
+            {
+                Id = "1",
+                Name = "John",
+                Addresses =
+                [
+                    new Address { Street = "1 St" },
+                    new Address { Street = "2 St" }
+                ]
+            },
+            new Person
+            {
+                Id = "2",
+                Name = "Jane",
+                Addresses =
+                [
+                    new Address { Street = "A St" },
+                    new Address { Street = "B St" }
+                ]
+            }
+        };
+
+        var pcv = Validator.Create<PersonCollection>().Self(c => c.WithText("Collection").Collection(c => c.WithItemValidator(pv).WithDuplicateIdCheck()));
+        
+        pcv.ValidateAsSuccess(pc);
+        pc.Validator(c => c.Collection(c => c.WithItemValidator(pv).WithDuplicateIdCheck())).ValidateAsSuccess();
+
+        pc[1].Addresses!.Add(new Address());
+        pc.Validator(c => c.Collection(c => c.WithItemValidator(pv).WithDuplicateIdCheck())).ValidateAsError("pc[1].addresses[2].street", "Street is required.");
+
+        pcv.ValidateAsError(pc, "[1].addresses[2].street", "Street is required.");
+
+        pc[1].Addresses![2]!.Street = "A St";
+        pc.Validator(c => c.Collection(c => c.WithItemValidator(pv).WithDuplicateIdCheck())).ValidateAsError("pc[1].addresses", "Addresses contains duplicates; Street specified more than once.");
+
+        pcv.ValidateAsError(pc, "[1].addresses", "Addresses contains duplicates; Street specified more than once.");
+
+
+        pc[1].Addresses![2]!.Street = "C St";
+
+        pc.Add(new Person
+        {
+            Id = "1",
+            Name = "Jake",
+            Addresses =
+                [
+                    new Address { Street = "X St" },
+                    new Address { Street = "Y St" }
+                ]
+        });
+
+        pc.Validator(c => c.Collection(c => c.WithItemValidator(pv).WithDuplicateIdCheck())).ValidateAsError("pc", "Pc contains duplicates; Identifier specified more than once.");
+
+        pcv.ValidateAsError(pc, "", "Collection contains duplicates; Identifier specified more than once.");
+    }
+
+    [Test]
+    public void GetCollectionIndex()
+    {
+        var pc = new PersonCollection
+        {
+            new Person
+            {
+                Id = "1",
+                Name = "John"
+            }
+        };
+
+        pc.Validator(c => c.Collection(w => w.WithItemValidator(iv => iv.NotFound().When(ctx => ctx.GetCollectionIndex() != 0)))).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void WithItemValidator_InlineConfigure_NoErrantValueSegment()
+    {
+        // Inline configure path must not inject ".value" into the error property path.
+        // Path must be "tags[2]" — NOT "tags[2].value".
+        var pv = Validator.Create<PersonWithTags>()
+            .HasProperty(p => p.Tags, c => c.Collection(c => c.WithItemValidator(v => v.MaximumLength(4))));
+        var p = new PersonWithTags { Tags = ["ok", "fine", "toolong"] };
+        pv.ValidateAsError(p, "tags[2]", "must not exceed 4 character(s) in length.");
+    }
+
+    [Test]
+    public void WithItemValidator_DirectValidator_Parity()
+    {
+        // Direct IValidatorEx<TItem> path (entity validator) must produce the same nested path as the inline configure path.
+        var av = Validator.Create<Address>().HasProperty(p => p.Street, c => c.Mandatory().MaximumLength(20));
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Addresses, c => c.Collection(c => c.WithItemValidator(av)));
+        var p = new Person
+        {
+            Id = "1",
+            Name = "John",
+            Addresses = [new Address { Street = "1 St" }, new Address { Street = "2 St" }, new Address()]
+        };
+        pv.ValidateAsError(p, "addresses[2].street", "Street is required.");
+    }
+
+    public class PersonCollection : List<Person> { }
+
+    public class PersonWithTags
+    {
+        public List<string>? Tags { get; set; }
+    }
+
+    public class Person : IIdentifier<string?>
+    {
+        public string? Id { get; set; }
+        public string? Name { get; set; }
+        public int? Age { get; set; }
+        public List<Address>? Addresses { get; set; }
+    }
+
+    public class Address
+    {
+        public string? Street { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/CommonRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/CommonRuleTests.cs
new file mode 100644
index 00000000..bfbad727
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/CommonRuleTests.cs
@@ -0,0 +1,65 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class CommonRuleTests
+{
+    [Test]
+    public void Common_String()
+    {   
+        var cv = Validator.CreateCommon<string>(c => c.Mandatory().MaximumLength(5));
+
+        "abc".Validator(c => c.Common(cv)).ValidateAsSuccess();
+        "abcdef".Validator(c => c.Common(cv)).ValidateAsError("must not exceed 5 character(s) in length.");
+        ((string?)null).Validator(c => c.Common(cv)).ValidateAsError("is required.");
+    }
+
+    [Test]
+    public void Common_Int32()
+    {
+        var cv = Validator.CreateCommon<int>(c => c.Mandatory().Between(0, 10));
+
+        ((int?)5).Validator(c => c.Common(cv)).ValidateAsSuccess();
+        ((int?)20).Validator(c => c.Common(cv)).ValidateAsError("must be between '0' and '10'.");
+        ((int?)null).Validator(c => c.Common(cv)).ValidateAsError("is required.");
+
+        5.Validator(c => c.Common(cv)).ValidateAsSuccess();
+        20.Validator(c => c.Common(cv)).ValidateAsError("must be between '0' and '10'.");
+
+    }
+
+    [Test]
+    public void Common_Entity()
+    {
+        var cvs = Validator.CreateCommon<string>(c => c.Mandatory().MaximumLength(5));
+        var cvi = Validator.CreateCommon<int>(c => c.Mandatory().Between(0, 10));
+
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Name, c => c.Common(cvs))
+            .HasProperty(p => p.Age, c => c.Common(cvi))
+            .HasProperty(p => p.Address, c => c.Entity(new AddressValidator()));
+
+        pv.ValidateAsSuccess(new Person { Name = "John", Age = 5, Address = new Address { Street = "1 St" } });
+        pv.ValidateAsError(new Person { Name = "John", Age = -5, Address = new Address { Street = "1 St" } }, "age", "Age must be between '0' and '10'.");
+        pv.ValidateAsError(new Person { Name = "John", Age = 5, Address = new Address { Street = "1 Street" } }, "address.street", "Street must not exceed 5 character(s) in length.");
+    }
+
+    public class Person
+    {
+        public string? Name { get; set; }
+        public int? Age { get; set; }
+        public Address? Address { get; set; }
+    }
+
+    public class Address
+    {
+        public string? Street { get; set; }
+    }
+
+    public class AddressValidator : Validator<Address>
+    { 
+        public AddressValidator()
+        {
+            Property(a => a.Street).Mandatory().MaximumLength(5);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/ComparePropertyRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/ComparePropertyRuleTests.cs
new file mode 100644
index 00000000..6fb92078
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/ComparePropertyRuleTests.cs
@@ -0,0 +1,55 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class ComparePropertyRuleTests
+{
+    [Test]
+    public void CompareProperty()
+    {
+        var v = Validator.Create<Ranges>()
+            .HasProperty(p => p.ToNumber, c => c.CompareProperty(CompareOperator.GreaterThanOrEqualTo, p => p.FromNumber))
+            .HasProperty(p => p.ToText, c => c.CompareProperty(CompareOperator.GreaterThanOrEqualTo, p => p.FromText));
+
+        v.ValidateAsSuccess(new Ranges());
+        v.ValidateAsSuccess(new Ranges { FromNumber = null, ToNumber = 2 });
+        v.ValidateAsSuccess(new Ranges { FromNumber = 1, ToNumber = null });
+        v.ValidateAsSuccess(new Ranges { FromNumber = 1, ToNumber = 2 });
+        v.ValidateAsError(new Ranges { FromNumber = 2, ToNumber = 1 }, "toNumber", "To number must be greater than or equal to '2'.");
+
+        v.ValidateAsSuccess(new Ranges());
+        v.ValidateAsSuccess(new Ranges { FromText = null, ToText = "b" });
+        v.ValidateAsSuccess(new Ranges { FromText = "a", ToText = null });
+        v.ValidateAsSuccess(new Ranges { FromText = "a", ToText = "b" });
+        v.ValidateAsError(new Ranges { FromText = "b", ToText = "a" }, "toText", "To text must be greater than or equal to 'b'.");
+    }
+
+    [Test]
+    public void CompareProperty_CompareToText()
+    {
+        var v = Validator.Create<Ranges>().HasProperty(p => p.ToNumber, c => c.CompareProperty(CompareOperator.GreaterThanOrEqualTo, p => p.FromNumber, _ => "Two"));
+        v.ValidateAsError(new Ranges { FromNumber = 2, ToNumber = 1 }, "toNumber", "To number must be greater than or equal to Two.");
+    }
+
+    [Test]
+    public void CompareProperty_Cast_Exception()
+    {
+        var v = Validator.Create<Ranges>().HasProperty(p => p.ToNumber, c => c.CompareProperty(CompareOperator.GreaterThanOrEqualTo, p => p.FromText!));
+        var ex = Assert.ThrowsAsync<InvalidCastException>(async () => await v.ValidateAsync(new Ranges { FromNumber = 2, ToNumber = 1, FromText = "a", ToText = "b" }));
+        ex.Message.Should().Contain("Property 'FromText' and 'ToNumber' are incompatible for a comparison: The input string 'a' was not in a correct format.");
+    }
+
+    [Test]
+    public void CompareProperty_WithMessage()
+    {
+        var v = Validator.Create<Ranges>().HasProperty(p => p.ToNumber, c => c.CompareProperty(CompareOperator.GreaterThanOrEqualTo, p => p.FromNumber).WithMessage("Oh no!"));
+        v.ValidateAsError(new Ranges { FromNumber = 2, ToNumber = 1 }, "toNumber", "Oh no!");
+    }
+
+    private class Ranges
+    {
+        public int? FromNumber { get; set; }
+        public int? ToNumber { get; set; }
+        public string? FromText { get; set; }
+        public string? ToText { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/CompareValueRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/CompareValueRuleTests.cs
new file mode 100644
index 00000000..9b271b3f
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/CompareValueRuleTests.cs
@@ -0,0 +1,195 @@
+using CoreEx.Results;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class CompareValueRuleTests
+{
+    [Test]
+    public void Compare_Int32()
+    {
+        ((int?)null).Validator(c => c.Compare(CompareOperator.Equal, 1)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.Equal, 1)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.NotEqual, 2)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.GreaterThan, 0)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, 1)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.LessThan, 2)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, 1)).ValidateAsSuccess();
+
+        1.Validator(c => c.Equal(1)).ValidateAsSuccess();
+        1.Validator(c => c.NotEqual(2)).ValidateAsSuccess();
+        1.Validator(c => c.GreaterThan(0)).ValidateAsSuccess();
+        1.Validator(c => c.GreaterThanOrEqualTo(1)).ValidateAsSuccess();
+        1.Validator(c => c.LessThan(2)).ValidateAsSuccess();
+        1.Validator(c => c.LessThanOrEqualTo(1)).ValidateAsSuccess();
+
+        1.Validator(c => c.Compare(CompareOperator.Equal, 2)).ValidateAsError(" must be equal to '2'.");
+        1.Validator(c => c.Compare(CompareOperator.NotEqual, 1)).ValidateAsError(" must not be equal to '1'.");
+        1.Validator(c => c.Compare(CompareOperator.GreaterThan, 1)).ValidateAsError(" must be greater than '1'.");
+        1.Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, 2)).ValidateAsError(" must be greater than or equal to '2'.");
+        1.Validator(c => c.Compare(CompareOperator.LessThan, 1)).ValidateAsError(" must be less than '1'.");
+        1.Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, 0)).ValidateAsError(" must be less than or equal to '0'.");
+
+        1.Validator(c => c.Equal(2)).ValidateAsError(" must be equal to '2'.");
+        1.Validator(c => c.NotEqual(1)).ValidateAsError(" must not be equal to '1'.");
+        1.Validator(c => c.GreaterThan(1)).ValidateAsError(" must be greater than '1'.");
+        1.Validator(c => c.GreaterThanOrEqualTo(2)).ValidateAsError(" must be greater than or equal to '2'.");
+        1.Validator(c => c.LessThan(1)).ValidateAsError(" must be less than '1'.");
+        1.Validator(c => c.LessThanOrEqualTo(0)).ValidateAsError(" must be less than or equal to '0'.");
+    }
+
+    [Test]
+    public void Compare_Nullable_Int32()
+    {
+        ((int?)1).Validator(c => c.Compare(CompareOperator.Equal, 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.NotEqual, 2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThan, 0)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThan, 2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, 1)).ValidateAsSuccess();
+
+        ((int?)1).Validator(c => c.Equal(1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.NotEqual(2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.GreaterThan(0)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.GreaterThanOrEqualTo(1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.LessThan(2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.LessThanOrEqualTo(1)).ValidateAsSuccess();
+
+        ((int?)1).Validator(c => c.Compare(CompareOperator.Equal, 2)).ValidateAsError(" must be equal to '2'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.NotEqual, 1)).ValidateAsError(" must not be equal to '1'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThan, 1)).ValidateAsError(" must be greater than '1'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, 2)).ValidateAsError(" must be greater than or equal to '2'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThan, 1)).ValidateAsError(" must be less than '1'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, 0)).ValidateAsError(" must be less than or equal to '0'.");
+
+        ((int?)1).Validator(c => c.Equal(2)).ValidateAsError(" must be equal to '2'.");
+        ((int?)1).Validator(c => c.NotEqual(1)).ValidateAsError(" must not be equal to '1'.");
+        ((int?)1).Validator(c => c.GreaterThan(1)).ValidateAsError(" must be greater than '1'.");
+        ((int?)1).Validator(c => c.GreaterThanOrEqualTo(2)).ValidateAsError(" must be greater than or equal to '2'.");
+        ((int?)1).Validator(c => c.LessThan(1)).ValidateAsError(" must be less than '1'.");
+        ((int?)1).Validator(c => c.LessThanOrEqualTo(0)).ValidateAsError(" must be less than or equal to '0'.");
+    }
+
+    [Test]
+    public void Compare_String()
+    {
+        ((string?)null).Validator(c => c.Compare(CompareOperator.Equal, "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.Equal, "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.Equal, "A", comparer: StringComparer.OrdinalIgnoreCase)).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.NotEqual, "b")).ValidateAsSuccess();
+        "b".Validator(c => c.Compare(CompareOperator.GreaterThan, "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.LessThan, "b")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, "a")).ValidateAsSuccess();
+
+        "a".Validator(c => c.Equal("a")).ValidateAsSuccess();
+        "a".Validator(c => c.Equal("A", comparer: StringComparer.OrdinalIgnoreCase)).ValidateAsSuccess();
+        "a".Validator(c => c.NotEqual("b")).ValidateAsSuccess();
+        "b".Validator(c => c.GreaterThan("a")).ValidateAsSuccess();
+        "a".Validator(c => c.GreaterThanOrEqualTo("a")).ValidateAsSuccess();
+        "a".Validator(c => c.LessThan("b")).ValidateAsSuccess();
+        "a".Validator(c => c.LessThanOrEqualTo("a")).ValidateAsSuccess();
+
+        "a".Validator(c => c.Compare(CompareOperator.Equal, "b")).ValidateAsError(" must be equal to 'b'.");
+        "a".Validator(c => c.Compare(CompareOperator.NotEqual, "a")).ValidateAsError(" must not be equal to 'a'.");
+        "a".Validator(c => c.Compare(CompareOperator.GreaterThan, "a")).ValidateAsError(" must be greater than 'a'.");
+        "a".Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, "b")).ValidateAsError(" must be greater than or equal to 'b'.");
+        "a".Validator(c => c.Compare(CompareOperator.LessThan, "a")).ValidateAsError(" must be less than 'a'.");
+        "b".Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, "a", comparer: StringComparer.OrdinalIgnoreCase)).ValidateAsError(" must be less than or equal to 'a'.");
+
+        "a".Validator(c => c.Equal("b")).ValidateAsError(" must be equal to 'b'.");
+        "a".Validator(c => c.NotEqual("a")).ValidateAsError(" must not be equal to 'a'.");
+        "a".Validator(c => c.GreaterThan("a")).ValidateAsError(" must be greater than 'a'.");
+        "a".Validator(c => c.GreaterThanOrEqualTo("b")).ValidateAsError(" must be greater than or equal to 'b'.");
+        "a".Validator(c => c.LessThan("a")).ValidateAsError(" must be less than 'a'.");
+        "b".Validator(c => c.LessThanOrEqualTo("a", comparer: StringComparer.OrdinalIgnoreCase)).ValidateAsError(" must be less than or equal to 'a'.");
+    }
+
+    [Test]
+    public void Compare_Int32_Func()
+    {
+        ((int?)null).Validator(c => c.Compare(CompareOperator.Equal, _ => 1)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.Equal, _ => 1)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.NotEqual, _ => 2)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.GreaterThan, _ => 0)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, _ => 1)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.LessThan, _ => 2)).ValidateAsSuccess();
+        1.Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => 1)).ValidateAsSuccess();
+
+        1.Validator(c => c.Equal(_ => 1)).ValidateAsSuccess();
+        1.Validator(c => c.NotEqual(_ => 2)).ValidateAsSuccess();
+        1.Validator(c => c.GreaterThan(_ => 0)).ValidateAsSuccess();
+        1.Validator(c => c.GreaterThanOrEqualTo(_ => 1)).ValidateAsSuccess();
+        1.Validator(c => c.LessThan(_ => 2)).ValidateAsSuccess();
+        1.Validator(c => c.LessThanOrEqualTo(_ => 1)).ValidateAsSuccess();
+
+        1.Validator(c => c.Compare(CompareOperator.Equal, _ => 2)).ValidateAsError(" must be equal to '2'.");
+        1.Validator(c => c.Compare(CompareOperator.NotEqual, _ => 1)).ValidateAsError(" must not be equal to '1'.");
+        1.Validator(c => c.Compare(CompareOperator.GreaterThan, _ => 1)).ValidateAsError(" must be greater than '1'.");
+        1.Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, _ => 2)).ValidateAsError(" must be greater than or equal to '2'.");
+        1.Validator(c => c.Compare(CompareOperator.LessThan, _ => 1)).ValidateAsError(" must be less than '1'.");
+        1.Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => 0)).ValidateAsError(" must be less than or equal to '0'.");
+
+        1.Validator(c => c.Equal(_ => 2)).ValidateAsError(" must be equal to '2'.");
+        1.Validator(c => c.NotEqual(_ => 1)).ValidateAsError(" must not be equal to '1'.");
+        1.Validator(c => c.GreaterThan(_ => 1)).ValidateAsError(" must be greater than '1'.");
+        1.Validator(c => c.GreaterThanOrEqualTo(_ => 2)).ValidateAsError(" must be greater than or equal to '2'.");
+        1.Validator(c => c.LessThan(_ => 1)).ValidateAsError(" must be less than '1'.");
+        1.Validator(c => c.LessThanOrEqualTo(_ => 0)).ValidateAsError(" must be less than or equal to '0'.");
+    }
+
+    [Test]
+    public void Compare_Nullable_Int32_Func()
+    {
+        ((int?)null).Validator(c => c.Compare(CompareOperator.Equal, _ => 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.Equal, _ => 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.NotEqual, _ => 2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThan, _ => 0)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, _ => 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThan, _ => 2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => 1)).ValidateAsSuccess();
+
+        ((int?)1).Validator(c => c.Equal(_ => 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.NotEqual(_ => 2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.GreaterThan(_ => 0)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.GreaterThanOrEqualTo(_ => 1)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.LessThan(_ => 2)).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.LessThanOrEqualTo(_ => 1)).ValidateAsSuccess();
+
+        ((int?)1).Validator(c => c.Compare(CompareOperator.Equal, _ => 2)).ValidateAsError(" must be equal to '2'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.NotEqual, _ => 1)).ValidateAsError(" must not be equal to '1'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThan, _ => 1)).ValidateAsError(" must be greater than '1'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, _ => 2)).ValidateAsError(" must be greater than or equal to '2'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThan, _ => 1)).ValidateAsError(" must be less than '1'.");
+        ((int?)1).Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => 0)).ValidateAsError(" must be less than or equal to '0'.");
+
+        ((int?)1).Validator(c => c.Equal(_ => 2)).ValidateAsError(" must be equal to '2'.");
+        ((int?)1).Validator(c => c.NotEqual(_ => 1)).ValidateAsError(" must not be equal to '1'.");
+        ((int?)1).Validator(c => c.GreaterThan(_ => 1)).ValidateAsError(" must be greater than '1'.");
+        ((int?)1).Validator(c => c.GreaterThanOrEqualTo(_ => 2)).ValidateAsError(" must be greater than or equal to '2'.");
+        ((int?)1).Validator(c => c.LessThan(_ => 1)).ValidateAsError(" must be less than '1'.");
+        ((int?)1).Validator(c => c.LessThanOrEqualTo(_ => 0)).ValidateAsError(" must be less than or equal to '0'.");
+    }
+
+    [Test]
+    public void Compare_String_Func()
+    {
+        ((string?)null).Validator(c => c.Compare(CompareOperator.Equal, _ => "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.Equal, _ => "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.Equal, _ => "A", comparer: StringComparer.OrdinalIgnoreCase)).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.NotEqual, _ => "b")).ValidateAsSuccess();
+        "b".Validator(c => c.Compare(CompareOperator.GreaterThan, _ => "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, _ => "a")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.LessThan, _ => "b")).ValidateAsSuccess();
+        "a".Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => "a")).ValidateAsSuccess();
+
+        "a".Validator(c => c.Compare(CompareOperator.Equal, _ => "b")).ValidateAsError(" must be equal to 'b'.");
+        "a".Validator(c => c.Compare(CompareOperator.NotEqual, _ => "a")).ValidateAsError(" must not be equal to 'a'.");
+        "a".Validator(c => c.Compare(CompareOperator.GreaterThan, _ => "a")).ValidateAsError(" must be greater than 'a'.");
+        "a".Validator(c => c.Compare(CompareOperator.GreaterThanOrEqualTo, _ => "b")).ValidateAsError(" must be greater than or equal to 'b'.");
+        "a".Validator(c => c.Compare(CompareOperator.LessThan, _ => "a")).ValidateAsError(" must be less than 'a'.");
+        "b".Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => "a", _ => "Aye", StringComparer.OrdinalIgnoreCase)).ValidateAsError(" must be less than or equal to Aye.");
+
+        "b".Validator(c => c.Compare(CompareOperator.LessThanOrEqualTo, _ => "a", _ => "Aye", StringComparer.OrdinalIgnoreCase).WithMessage("Oh no!")).ValidateAsError("Oh no!");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/CompareValuesRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/CompareValuesRuleTests.cs
new file mode 100644
index 00000000..9ebc40e0
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/CompareValuesRuleTests.cs
@@ -0,0 +1,78 @@
+using CoreEx.Results;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class CompareValuesRuleTests
+{
+    [Test]
+    public void CompareValues_Int32()
+    {
+        var vals = new[] { 1, 2, 3 };
+
+        ((int?)null).Validator(c => c.CompareValues(vals)).ValidateAsSuccess();
+        1.Validator(c => c.CompareValues(vals)).ValidateAsSuccess();
+
+        4.Validator(c => c.CompareValues(vals)).ValidateAsError("is invalid.");
+    }
+
+    [Test]
+    public void CompareValues_String()
+    {
+        var vals = new[] { "a", "b", "c" };
+
+        ((string?)null).Validator(c => c.CompareValues(vals)).ValidateAsSuccess();
+        "c".Validator(c => c.CompareValues(vals)).ValidateAsSuccess();
+        "C".Validator(c => c.CompareValues(vals, StringComparer.OrdinalIgnoreCase)).ValidateAsSuccess();
+
+        "C".Validator(c => c.CompareValues(vals)).ValidateAsError("is invalid.");
+        "C".Validator(c => c.CompareValues(vals).WithMessage("Oh no!")).ValidateAsError("Oh no!");
+    }
+
+    [Test]
+    public void CompareValues_Int32_Func()
+    {
+        var vals = new[] { 1, 2, 3 };
+
+        ((int?)null).Validator(c => c.CompareValues(_ => vals)).ValidateAsSuccess();
+        1.Validator(c => c.CompareValues(_ => vals)).ValidateAsSuccess();
+
+        4.Validator(c => c.CompareValues(_ => vals)).ValidateAsError("is invalid.");
+    }
+
+    [Test]
+    public void CompareValues_String_Func()
+    {
+        var vals = new[] { "a", "b", "c" };
+
+        ((string?)null).Validator(c => c.CompareValues(_ => vals)).ValidateAsSuccess();
+        "c".Validator(c => c.CompareValues(_ => vals)).ValidateAsSuccess();
+        "C".Validator(c => c.CompareValues(_ => vals, StringComparer.OrdinalIgnoreCase)).ValidateAsSuccess();
+
+        "C".Validator(c => c.CompareValues(_ => vals)).ValidateAsError("is invalid.");
+        "C".Validator(c => c.CompareValues(_ => vals).WithMessage("Oh no!")).ValidateAsError("Oh no!");
+    }
+
+    [Test]
+    public void CompareValues_Override()
+    {
+        var vals = new[] { "A", "B", "C" };
+        var v = Validator.Create<Person>()
+            .HasProperty(p => p.Id, p => p.CompareValues(vals, StringComparer.OrdinalIgnoreCase, true))
+            .HasProperty(p => p.Code, p => p.CompareValues(vals, StringComparer.OrdinalIgnoreCase, true));
+
+        v.ValidateAsSuccess(new Person("A"));
+
+        var r = v.ValidateAsSuccess(new Person("A") { Code = "a" });
+        r.Value!.Code.Should().NotBeNull().And.Be("A");
+
+        var ex = Assert.ThrowsAsync<InvalidOperationException>(async () => await v.ValidateAsync(new Person("a")));
+        ex.Message.Should().Be("The property 'Id' is read-only and cannot be overridden.");
+    }
+
+    public class Person(string id)
+    {
+        public string Id { get; } = id;
+        public string? Code { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/DecimalRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/DecimalRuleTests.cs
new file mode 100644
index 00000000..f7f85153
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/DecimalRuleTests.cs
@@ -0,0 +1,256 @@
+using CoreEx.Validation.Abstractions;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class DecimalRuleTests
+{
+    [Test]
+    public void Decimal()
+    {
+        1.0m.Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        1.20m.Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        1.230m.Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        12.34m.Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        123.45m.Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        (-1.0m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        (-1.20m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        (-1.230m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        (-12.34m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        (-123.45m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+
+        1234.56m.Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        12345.78m.Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        12345.789m.Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        (-1234.56m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        (-12345.78m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        (-12345.789m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        123.456m.Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        0.123m.Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        (-123.456m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        (-0.123m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        (-1.0m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void Decimal_Func()
+    {
+        1.0m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        1.20m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        1.230m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        12.34m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        123.45m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        (-1.0m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        (-1.20m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        (-1.230m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        (-12.34m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        (-123.45m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+
+        1234.56m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        12345.78m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        12345.789m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        (-1234.56m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+        (-12345.78m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+        (-12345.789m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        123.456m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        0.123m.Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        (-123.456m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        (-0.123m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        (-1.0m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void Decimal_Nullable()
+    {
+        ((decimal?)1.0m).Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)1.20m).Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)1.230m).Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)12.34m).Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)123.45m).Validator(c => c.Decimal(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)-1.0m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        ((decimal?)-1.20m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        ((decimal?)-1.230m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        ((decimal?)-12.34m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+        ((decimal?)-123.45m).Validator(c => c.Decimal(5, 2)).ValidateAsSuccess();
+
+        ((decimal?)1234.56m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.78m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.789m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-1234.56m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.78m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.789m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        ((decimal?)123.456m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)0.123m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-123.456m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-0.123m).Validator(c => c.Decimal(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        ((decimal?)-1.0m).Validator(c => c.Decimal(5, 2, false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void Decimal_Nullable_Func()
+    {
+        ((decimal?)1.0m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)1.20m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)1.230m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)12.34m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)123.45m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)-1.0m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-1.20m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-1.230m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-12.34m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-123.45m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsSuccess();
+
+        ((decimal?)1234.56m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.78m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.789m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-1234.56m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.78m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.789m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        ((decimal?)123.456m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)0.123m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-123.456m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-0.123m).Validator(c => c.Decimal(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        ((decimal?)-1.0m).Validator(c => c.Decimal(_ => 5, _ => 2, _ => false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void PrecisionScale()
+    {
+        1.0m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        1.20m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        1.230m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        12.34m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        123.45m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        (-1.0m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        (-1.20m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        (-1.230m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        (-12.34m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        (-123.45m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+
+        1234.56m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        12345.78m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        12345.789m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        (-1234.56m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        (-12345.78m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        (-12345.789m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        123.456m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        0.123m.Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        (-123.456m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        (-0.123m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        (-1.0m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void PrecisionScale_Nullable()
+    {
+        ((decimal?)1.0m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)1.20m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)1.230m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)12.34m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)123.45m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsSuccess();
+        ((decimal?)-1.0m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        ((decimal?)-1.20m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        ((decimal?)-1.230m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        ((decimal?)-12.34m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+        ((decimal?)-123.45m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsSuccess();
+
+        ((decimal?)1234.56m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.78m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.789m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-1234.56m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.78m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.789m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        ((decimal?)123.456m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)0.123m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-123.456m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-0.123m).Validator(c => c.PrecisionScale(5, 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        ((decimal?)-1.0m).Validator(c => c.PrecisionScale(5, 2, false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void PrecisionScale_Nullable_Func()
+    {
+        ((decimal?)1.0m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)1.20m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)1.230m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)12.34m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)123.45m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsSuccess();
+        ((decimal?)-1.0m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-1.20m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-1.230m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-12.34m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsSuccess();
+        ((decimal?)-123.45m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsSuccess();
+
+        ((decimal?)1234.56m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.78m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)12345.789m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-1234.56m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.78m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+        ((decimal?)-12345.789m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum digits (5).");
+
+        ((decimal?)123.456m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)0.123m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-123.456m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+        ((decimal?)-0.123m).Validator(c => c.PrecisionScale(_ => 5, _ => 2)).ValidateAsError("exceeds the maximum decimal places (2).");
+
+        ((decimal?)-1.0m).Validator(c => c.PrecisionScale(_ => 5, _ => 2, _ => false)).ValidateAsError("must not be negative.");
+    }
+
+    [Test]
+    public void CalcIntegralPartLength()
+    {
+        DecimalRuleHelper.CalcIntegralPartLength(0m).Should().Be(0);
+        DecimalRuleHelper.CalcIntegralPartLength(0.0000001m).Should().Be(0);
+        DecimalRuleHelper.CalcIntegralPartLength(0.9999999m).Should().Be(0);
+        DecimalRuleHelper.CalcIntegralPartLength(1.0000001m).Should().Be(1);
+        DecimalRuleHelper.CalcIntegralPartLength(9.9999999m).Should().Be(1);
+        DecimalRuleHelper.CalcIntegralPartLength(10.0000001m).Should().Be(2);
+        DecimalRuleHelper.CalcIntegralPartLength(99.9999999m).Should().Be(2);
+        DecimalRuleHelper.CalcIntegralPartLength(decimal.MaxValue).Should().Be(29);
+
+        DecimalRuleHelper.CalcIntegralPartLength(-0.0000001m).Should().Be(0);
+        DecimalRuleHelper.CalcIntegralPartLength(-0.9999999m).Should().Be(0);
+        DecimalRuleHelper.CalcIntegralPartLength(-1.0000001m).Should().Be(1);
+        DecimalRuleHelper.CalcIntegralPartLength(-9.9999999m).Should().Be(1);
+        DecimalRuleHelper.CalcIntegralPartLength(-10.0000001m).Should().Be(2);
+        DecimalRuleHelper.CalcIntegralPartLength(-99.9999999m).Should().Be(2);
+        DecimalRuleHelper.CalcIntegralPartLength(decimal.MinValue).Should().Be(29);
+    }
+
+    [Test]
+    public void CalcFractionalPartLength()
+    {
+        DecimalRuleHelper.CalcFractionalPartLength(0m).Should().Be(0);
+        DecimalRuleHelper.CalcFractionalPartLength(0.0000000m).Should().Be(0);
+        DecimalRuleHelper.CalcFractionalPartLength(0.0001000m).Should().Be(4);
+        DecimalRuleHelper.CalcFractionalPartLength(0.0000001m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(0.9999999m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(1.0000001m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(9.9999999m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(10.0000001m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(99.9999999m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(decimal.MaxValue).Should().Be(0);
+
+        DecimalRuleHelper.CalcFractionalPartLength(-0.0000000m).Should().Be(0);
+        DecimalRuleHelper.CalcFractionalPartLength(-0.0001000m).Should().Be(4);
+        DecimalRuleHelper.CalcFractionalPartLength(-0.0000001m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(-0.9999999m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(-1.0000001m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(-9.9999999m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(-10.0000001m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(-99.9999999m).Should().Be(7);
+        DecimalRuleHelper.CalcFractionalPartLength(decimal.MinValue).Should().Be(0);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/DictionaryRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/DictionaryRuleTests.cs
new file mode 100644
index 00000000..8bd2c898
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/DictionaryRuleTests.cs
@@ -0,0 +1,167 @@
+using CoreEx.Entities;
+using CoreEx.Validation;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class DictionaryRuleTests
+{
+    [Test]
+    public void MinCount()
+    {
+        new Dictionary<string, string> { { "abc", "mnop" }, { "def", "qrst" } }.Validator(c => c.Dictionary(minCount: 2, maxCount: null)).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abc", "mnop" } }.Validator(c => c.Dictionary(minCount: 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        new Dictionary<string, string>().Validator(c => c.Dictionary(minCount: 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        ((Dictionary<string, string>?)null).Validator(c => c.Dictionary(minCount: 2, maxCount: null)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void MinCount_Func()
+    {
+        new Dictionary<string, string> { { "abc", "mnop" }, { "def", "qrst" } }.Validator(c => c.Dictionary(minCount: _ => 2, maxCount: null)).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abc", "mnop" } }.Validator(c => c.Dictionary(minCount: _ => 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        new Dictionary<string, string>().Validator(c => c.Dictionary(minCount: _ => 2, maxCount: null)).ValidateAsError("must have at least 2 item(s).");
+        ((Dictionary<string, string>?)null).Validator(c => c.Dictionary(minCount: _ => 2, maxCount: null)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void MaxCount()
+    {
+        new Dictionary<string, string> { { "abc", "mnop" }, { "def", "qrst" } }.Validator(c => c.Dictionary(2)).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abc", "mnop" } }.Validator(c => c.Dictionary(2)).ValidateAsSuccess();
+        new Dictionary<string, string>().Validator(c => c.Dictionary(2)).ValidateAsSuccess();
+        ((Dictionary<string, string>?)null).Validator(c => c.Dictionary(2)).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abc", "mnop" }, { "def", "qrst" }, { "ghi", "uvwx" } }.Validator(c => c.Dictionary(2)).ValidateAsError("must not exceed 2 item(s).");
+    }
+
+    [Test]
+    public void MaxCount_Func()
+    {
+        new Dictionary<string, string> { { "abc", "mnop" }, { "def", "qrst" } }.Validator(c => c.Dictionary(_ => 2)).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abc", "mnop" } }.Validator(c => c.Dictionary(_ => 2)).ValidateAsSuccess();
+        new Dictionary<string, string>().Validator(c => c.Dictionary(_ => 2)).ValidateAsSuccess();
+        ((Dictionary<string, string>?)null).Validator(c => c.Dictionary(_ => 2)).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abc", "mnop" }, { "def", "qrst" }, { "ghi", "uvwx" } }.Validator(c => c.Dictionary(_ => 2)).ValidateAsError("must not exceed 2 item(s).");
+    }
+
+    [Test]
+    public void CommonValidator()
+    {
+        new Dictionary<string, string> { { "abc", "mnop" } }.Validator(c => c.Dictionary(c => c.WithKeyValidator(k => k.MaximumLength(3)).WithValueValidator(v => v.MaximumLength(4)))).ValidateAsSuccess();
+        new Dictionary<string, string> { { "abcd", "mnop" } }.Validator(c => c.Dictionary(c => c.WithKeyValidator(k => k.MaximumLength(3)).WithValueValidator(v => v.MaximumLength(4)))).ValidateAsError("Key must not exceed 3 character(s) in length.");
+        new Dictionary<string, string> { { "abd", "mnopq" } }.Validator(c => c.Dictionary(c => c.WithKeyValidator(k => k.MaximumLength(3)).WithValueValidator(v => v.MaximumLength(4)))).ValidateAsError("Value must not exceed 4 character(s) in length.");
+    }
+
+    [Test]
+    public void Entity()
+    {
+        var av = Validator.Create<Address>().HasProperty(p => p.Street, c => c.Mandatory().MaximumLength(20));
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Id, c => c.Mandatory())
+            .HasProperty(p => p.Name, c => c.Mandatory())
+            .HasProperty(p => p.Addresses, c => c.Mandatory().Dictionary(c => c.WithKeyValidator("Address code", k => k.Mandatory().MaximumLength(4)).WithValueValidator(av)));
+
+        var p = new Person
+        {
+            Id = "1",
+            Name = "John",
+            Addresses = new Dictionary<string, Address>
+            {
+                { "home", new Address { Street = "1 St" } },
+                { "post", new Address { Street = "2 St" } }
+            }
+        };
+
+        pv.ValidateAsSuccess(p);
+
+        p.Addresses.Clear();
+        p.Addresses.Add("other", new Address { Street = "3 St" });
+        var vr = pv.ValidateAsError(p, "addresses.other", "Address code must not exceed 4 character(s) in length.");
+
+        p.Addresses.Remove("other");
+
+        p.Addresses.Add("othr", new Address());
+        pv.ValidateAsError(p, "addresses.othr.street", "Street is required.");
+
+        p.Addresses["othr"] = new Address { Street = "This street address is way too long" };
+        pv.ValidateAsError(p, "addresses.othr.street", "Street must not exceed 20 character(s) in length.");
+
+        p.Addresses["othr"] = null!;
+        pv.ValidateAsError(p, "addresses", "Addresses contains one or more values that are not specified.");
+
+        p.Addresses.Remove("othr");
+        p.Addresses.Add("", new Address { Street = "33rd rd" });
+        pv.ValidateAsError(p, "addresses.key", "Address code is required.");
+    }
+
+    [Test]
+    public void GetDictionaryKey()
+    {
+        var av = Validator.Create<Address>().HasProperty(p => p.Street, c
+            => c.Mandatory().MaximumLength(20).NotFound().When(ctx => ctx.GetDictionaryKey<string>() != "home" && ctx.GetDictionaryKey<string>() != "post"));
+
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Id, c => c.Mandatory())
+            .HasProperty(p => p.Name, c => c.Mandatory())
+            .HasProperty(p => p.Addresses, c => c.Mandatory().Dictionary(c => c.WithKeyValidator("Address code", k => k.Mandatory().MaximumLength(4)).WithValueValidator(av)));
+
+        var p = new Person
+        {
+            Id = "1",
+            Name = "John",
+            Addresses = new Dictionary<string, Address>
+            {
+                { "home", new Address { Street = "1 St" } },
+                { "post", new Address { Street = "2 St" } }
+            }
+        };
+
+        pv.ValidateAsSuccess(p);
+    }
+
+    [Test]
+    public void WithValueValidator_InlineConfigure_NoErrantValueSegment()
+    {
+        // Inline configure path must not inject ".value" into the error property path.
+        // Path must be "values.post" — NOT "values.post.value".
+        var pv = Validator.Create<PersonWithValues>()
+            .HasProperty(p => p.Values, c => c.Dictionary(c => c.WithValueValidator(v => v.MaximumLength(4))));
+        var p = new PersonWithValues
+        {
+            Values = new Dictionary<string, string> { { "home", "ok" }, { "post", "toolong" } }
+        };
+        pv.ValidateAsError(p, "values.post", "must not exceed 4 character(s) in length.");
+    }
+
+    [Test]
+    public void WithValueValidator_DirectValidator_Parity()
+    {
+        // Direct IValidatorEx<TValue> path (entity validator) must produce the same nested path as the inline configure path.
+        var av = Validator.Create<Address>().HasProperty(p => p.Street, c => c.Mandatory().MaximumLength(20));
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Addresses, c => c.Dictionary(c => c.WithValueValidator(av)));
+        var p = new Person
+        {
+            Addresses = new Dictionary<string, Address> { { "home", new Address { Street = "1 St" } }, { "post", new Address() } }
+        };
+        pv.ValidateAsError(p, "addresses.post.street", "Street is required.");
+    }
+
+    public class Person : IIdentifier<string?>
+    {
+        public string? Id { get; set; }
+        public string? Name { get; set; }
+        public int? Age { get; set; }
+        public Dictionary<string, Address>? Addresses { get; set; }
+    }
+
+    public class PersonWithValues
+    {
+        public Dictionary<string, string>? Values { get; set; }
+    }
+
+    public class Address
+    {
+        public string? Street { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/EmailRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/EmailRuleTests.cs
new file mode 100644
index 00000000..b52ed573
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/EmailRuleTests.cs
@@ -0,0 +1,23 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class EmailRuleTests
+{
+    [Test]
+    public void Email()
+    {
+        ((string?)null).Validator(c => c.Email()).ValidateAsSuccess();
+        "blah@domain".Validator(c => c.Email()).ValidateAsSuccess();
+        "blah@domain.co.nz".Validator(c => c.Email()).ValidateAsSuccess();
+        $"mynameis@{new string('x', 250)}.com".Validator(c => c.Email()).ValidateAsSuccess();
+        $"mynameis@{new string('x', 250)}.com".Validator(c => c.Email(null)).ValidateAsSuccess();
+
+        "".Validator(c => c.Email()).ValidateAsError("is an invalid e-mail address.");
+        ((string?)"blah").Validator(c => c.Email()).ValidateAsError("is an invalid e-mail address.");
+        "blah@".Validator(c => c.Email()).ValidateAsError("is an invalid e-mail address.");
+        "blah@.com".Validator(c => c.Email()).ValidateAsError("is an invalid e-mail address.");
+        $"mynameis@{new string('x', 250)}.com".Validator(c => c.Email(100)).ValidateAsError("must not exceed 100 character(s) in length.");
+
+        $"mynameis@{new string('x', 250)}.com".Validator(c => c.Email(_ => 100)).ValidateAsError("must not exceed 100 character(s) in length.");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/EntityRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/EntityRuleTests.cs
new file mode 100644
index 00000000..84daf1e5
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/EntityRuleTests.cs
@@ -0,0 +1,40 @@
+using CoreEx.Validation;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class EntityRuleTests
+{
+    [Test]
+    public void WithValidator_InlineConfigure_NoErrantValueSegment()
+    {
+        // Inline configure path must not inject ".value" into the error property path.
+        // Path must be "name" — NOT "name.value".
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Name, c => c.Entity(c => c.WithValidator(v => v.MaximumLength(4))));
+        var p = new Person { Name = "toolong" };
+        pv.ValidateAsError(p, "name", "must not exceed 4 character(s) in length.");
+    }
+
+    [Test]
+    public void WithValidator_DirectValidator_Parity()
+    {
+        // Direct IValidatorEx<TProperty> path (entity validator) must produce the same nested path as the inline configure path.
+        var av = Validator.Create<Address>().HasProperty(p => p.Street, c => c.Mandatory().MaximumLength(20));
+        var pv = Validator.Create<Person>()
+            .HasProperty(p => p.Address, c => c.Entity(c => c.WithValidator(av)));
+        var p = new Person { Address = new Address() };
+        pv.ValidateAsError(p, "address.street", "Street is required.");
+    }
+
+    public class Person
+    {
+        public string? Name { get; set; }
+        public Address? Address { get; set; }
+    }
+
+    public class Address
+    {
+        public string? Street { get; set; }
+    }
+}
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/EnumRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/EnumRuleTests.cs
new file mode 100644
index 00000000..03ae8db6
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/EnumRuleTests.cs
@@ -0,0 +1,59 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class EnumRuleTests
+{
+    [Test]
+    public void Enum()
+    {
+        DayOfWeek.Monday.Validator(c => c.Enum()).ValidateAsSuccess();
+        ((DayOfWeek)100).Validator(c => c.Enum()).ValidateAsError("is invalid.");
+        ((DayOfWeek)(-1)).Validator(c => c.Enum()).ValidateAsError("is invalid.");
+
+        DayOfWeek.Monday.Validator(c => c.Enum((List<DayOfWeek>)null!)).ValidateAsSuccess();
+        DayOfWeek.Monday.Validator(c => c.Enum(DayOfWeek.Monday, DayOfWeek.Tuesday)).ValidateAsSuccess();
+        DayOfWeek.Tuesday.Validator(c => c.Enum(new List<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Tuesday })).ValidateAsSuccess();
+        DayOfWeek.Wednesday.Validator(c => c.Enum(DayOfWeek.Monday, DayOfWeek.Tuesday)).ValidateAsError("is invalid.");
+        DayOfWeek.Wednesday.Validator(c => c.Enum(new List<DayOfWeek> { DayOfWeek.Monday, DayOfWeek.Tuesday })).ValidateAsError("is invalid.");
+
+        ((DayOfWeek?)DayOfWeek.Monday).Validator(c => c.Enum()).ValidateAsSuccess();
+        ((DayOfWeek?)DayOfWeek.Monday).Validator(c => c.Enum(DayOfWeek.Monday, DayOfWeek.Tuesday)).ValidateAsSuccess();
+        ((DayOfWeek?)DayOfWeek.Wednesday).Validator(c => c.Enum(DayOfWeek.Monday, DayOfWeek.Tuesday)).ValidateAsError("is invalid.");
+
+        DayOfWeek? dow = null;
+        dow.Validator(c => c.Enum()).ValidateAsSuccess();
+
+        dow = DayOfWeek.Monday;
+        dow.Validator(c => c.Enum()).ValidateAsSuccess();
+        dow.Validator(c => c.Enum(new List<DayOfWeek> { DayOfWeek.Wednesday, DayOfWeek.Thursday })).ValidateAsError("is invalid.");
+    }
+
+    [Test]
+    public void EnumString()
+    {
+        "Monday".Validator(c => c.Enum(e => e.With<DayOfWeek>())).ValidateAsSuccess();
+        "monday".Validator(c => c.Enum(e => e.With<DayOfWeek>())).ValidateAsError("is invalid.");
+        "monday".Validator(c => c.Enum(e => e.With<DayOfWeek>().IgnoreCase())).ValidateAsSuccess();
+        "monday".Validator(c => c.Enum(e => e.With<DayOfWeek>().IgnoreCase())).ValidateAsSuccess();
+
+        ((string?)null).Validator(c => c.Enum(e => e.With<DayOfWeek>())).ValidateAsSuccess();
+        ((string?)"monday").Validator(c => c.Enum(e => e.With(DayOfWeek.Monday, DayOfWeek.Tuesday).IgnoreCase())).ValidateAsSuccess();
+        "friday".Validator(c => c.Enum(e => e.With(DayOfWeek.Monday, DayOfWeek.Tuesday).IgnoreCase())).ValidateAsError("is invalid.");
+    }
+
+    public class AppointmentValidator : Validator<Appointment>
+    {
+        public AppointmentValidator()
+        {
+            Property(p => p.DayOfWeek).Enum();
+            //Property(p => p.AlternateDay).Enum();
+        }
+    }
+
+    public class Appointment
+    {
+        public DayOfWeek DayOfWeek { get; set; }
+
+        public DayOfWeek? AlternateDay { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/ErrorRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/ErrorRuleTests.cs
new file mode 100644
index 00000000..733b0004
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/ErrorRuleTests.cs
@@ -0,0 +1,45 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class ErrorRuleTests
+{
+    [Test]
+    public void Error()
+    {
+        0.Validator(c => c.Error("An error occurred.")).ValidateAsError("An error occurred.");
+        0.Validator(c => c.Error("An error occurred.").WhenValue(v => v == 0)).ValidateAsError("An error occurred.");
+        1.Validator(c => c.Error("An error occurred.").WhenValue(v => v == 0)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void Duplicate()
+    {
+        0.Validator(c => c.Duplicate()).ValidateAsError("0 already exists and would result in a duplicate.");
+        0.Validator(c => c.Duplicate().WhenValue(v => v == 0)).ValidateAsError("0 already exists and would result in a duplicate.");
+        1.Validator(c => c.Duplicate().WhenValue(v => v == 0)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void NotFound()
+    {
+        0.Validator(c => c.NotFound()).ValidateAsError("0 was not found.");
+        0.Validator(c => c.NotFound().WhenValue(v => v == 0)).ValidateAsError("0 was not found.");
+        1.Validator(c => c.NotFound().WhenValue(v => v == 0)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void Invalid()
+    {
+        0.Validator(c => c.Invalid()).ValidateAsError("0 is invalid.");
+        0.Validator(c => c.Invalid().WhenValue(v => v == 0)).ValidateAsError("0 is invalid.");
+        1.Validator(c => c.Invalid().WhenValue(v => v == 0)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void Immutable()
+    {
+        0.Validator(c => c.Immutable()).ValidateAsError("0 is not allowed to change; please reset value.");
+        0.Validator(c => c.Immutable().WhenValue(v => v == 0)).ValidateAsError("0 is not allowed to change; please reset value.");
+        1.Validator(c => c.Immutable().WhenValue(v => v == 0)).ValidateAsSuccess();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/MandatoryRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/MandatoryRuleTests.cs
new file mode 100644
index 00000000..a6be4705
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/MandatoryRuleTests.cs
@@ -0,0 +1,74 @@
+using System.Collections;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class MandatoryRuleTests
+{
+    private const string _errorIsRequired = " is required.";
+
+    [Test]
+    public void Mandatory()
+    {
+        new object().Validator(c => c.Mandatory()).ValidateAsSuccess();
+        "XXX".Validator(c => c.Mandatory()).ValidateAsSuccess();
+        1.Validator(c => c.Mandatory()).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.Mandatory()).ValidateAsSuccess();
+        new int[] { 1, 2 }.Validator(c => c.Mandatory()).ValidateAsSuccess();
+        Enumerable.Range(1, 2).Validator(c => c.Mandatory()).ValidateAsSuccess();
+
+        ((int?)0).Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        ((object)null!).Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        ((string?)null).Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        "".Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        " ".Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        0.Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        ((int?)null).Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        Array.Empty<int>().Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        Enumerable.Empty<int>().Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+    }
+
+    [Test]
+    public void NotEmpty()
+    {
+        new object().Validator(c => c.NotEmpty()).ValidateAsSuccess();
+        "XXX".Validator(c => c.NotEmpty()).ValidateAsSuccess();
+        1.Validator(c => c.NotEmpty()).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.NotEmpty()).ValidateAsSuccess();
+        new int[] { 1, 2 }.Validator(c => c.NotEmpty()).ValidateAsSuccess();
+        Enumerable.Range(1, 2).Validator(c => c.NotEmpty()).ValidateAsSuccess();
+
+        ((int?)0).Validator(c => c.Mandatory()).ValidateAsError(_errorIsRequired);
+        ((object)null!).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        ((string?)null).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        "".Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        " ".Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        0.Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        ((int?)null).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        Array.Empty<int>().Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        Enumerable.Empty<int>().Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+    }
+
+    [Test]
+    public void NotNull()
+    {
+        new object().Validator(c => c.NotNull()).ValidateAsSuccess();
+        "XXX".Validator(c => c.NotNull()).ValidateAsSuccess();
+        "".Validator(c => c.NotNull()).ValidateAsSuccess();
+        " ".Validator(c => c.NotNull()).ValidateAsSuccess();
+        0.Validator(c => c.NotNull()).ValidateAsSuccess();
+        1.Validator(c => c.NotNull()).ValidateAsSuccess();
+        ((int?)0).Validator(c => c.NotNull()).ValidateAsSuccess();
+        ((int?)1).Validator(c => c.NotNull()).ValidateAsSuccess();
+        new int[] { 1, 2 }.Validator(c => c.NotNull()).ValidateAsSuccess();
+        Enumerable.Range(1, 2).Validator(c => c.NotNull()).ValidateAsSuccess();
+        Array.Empty<int>().Validator(c => c.NotNull()).ValidateAsSuccess();
+        Enumerable.Empty<int>().Validator(c => c.NotNull()).ValidateAsSuccess();
+
+        ((object)null!).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        ((string?)null).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        ((int?)null).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        ((ICollection)null!).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+        ((IEnumerable)null!).Validator(c => c.NotEmpty()).ValidateAsError(_errorIsRequired);
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/NullNoneEmptyRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/NullNoneEmptyRuleTests.cs
new file mode 100644
index 00000000..23c4ccf1
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/NullNoneEmptyRuleTests.cs
@@ -0,0 +1,60 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class NullNoneEmptyRuleTests
+{
+    private const string _errorContains = " must not be specified.";
+
+    [Test]
+    public void Null()
+    {
+        ((object?)null!).Validator(c => c.Null()).ValidateAsSuccess();
+        ((object)null!).Validator(c => c.Null()).ValidateAsSuccess();
+        ((string?)null).Validator(c => c.Null()).ValidateAsSuccess();
+        ((string)null!).Validator(c => c.Null()).ValidateAsSuccess();
+        ((int?)null).Validator(c => c.Null()).ValidateAsSuccess();
+
+        new object().Validator(c => c.Null()).ValidateAsError(_errorContains);
+        ((string)"XXX").Validator(c => c.Null()).ValidateAsError(_errorContains);
+        ((string?)"XXX").Validator(c => c.Null()).ValidateAsError(_errorContains);
+        ((int?)0).Validator(c => c.Null()).ValidateAsError(_errorContains);
+    }
+
+    [Test]
+    public void None()
+    {
+        new object().Validator(c => c.None()).ValidateAsError(_errorContains);
+        1.Validator(c => c.None()).ValidateAsError(_errorContains);
+        ((int?)1).Validator(c => c.None()).ValidateAsError(_errorContains);
+        string.Empty.Validator(c => c.None()).ValidateAsError(_errorContains);
+        " ".Validator(c => c.None()).ValidateAsError(_errorContains);
+        Array.Empty<int>().Validator(c => c.None()).ValidateAsError(_errorContains);
+        new int[] { 1, 2 }.Validator(c => c.None()).ValidateAsError(_errorContains);
+        Enumerable.Empty<int>().Validator(c => c.None()).ValidateAsError(_errorContains);
+        Enumerable.Range(1, 2).Validator(c => c.None()).ValidateAsError(_errorContains);
+
+        ((string?)null).Validator(c => c.None()).ValidateAsSuccess();
+        0.Validator(c => c.None()).ValidateAsSuccess();
+        ((int?)0).Validator(c => c.None()).ValidateAsSuccess();
+        ((int[])null!).Validator(c => c.None()).ValidateAsSuccess();
+        ((IEnumerable<int>)null!).Validator(c => c.None()).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void Empty()
+    {
+        new object().Validator(c => c.Empty()).ValidateAsError(_errorContains);
+        "XXX".Validator(c => c.Empty()).ValidateAsError(_errorContains);
+        ((string?)"XXX").Validator(c => c.Empty()).ValidateAsError(_errorContains);
+        new int[] { 1, 2 }.Validator(c => c.Empty()).ValidateAsError(_errorContains);
+        Enumerable.Range(1, 2).Validator(c => c.Empty()).ValidateAsError(_errorContains);
+
+        ((string?)null).Validator(c => c.Empty()).ValidateAsSuccess();
+        string.Empty.Validator(c => c.Empty()).ValidateAsSuccess();
+        " ".Validator(c => c.Empty()).ValidateAsSuccess();
+        ((int[])null!).Validator(c => c.Empty()).ValidateAsSuccess();
+        Array.Empty<int>().Validator(c => c.Empty()).ValidateAsSuccess();
+        ((IEnumerable<int>)null!).Validator(c => c.Empty()).ValidateAsSuccess();
+        Enumerable.Empty<int>().Validator(c => c.Empty()).ValidateAsSuccess();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/NumericRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/NumericRuleTests.cs
new file mode 100644
index 00000000..05636ee7
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/NumericRuleTests.cs
@@ -0,0 +1,117 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class NumericRuleTests
+{
+    [Test]
+    public void Numeric()
+    {
+        0.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        123.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        (-123).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        int.MinValue.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        int.MaxValue.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        0L.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        123L.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        (-123L).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        long.MinValue.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        long.MaxValue.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        0.0M.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        123.45M.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        (-123.45M).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        decimal.MinValue.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        decimal.MaxValue.Validator(c => c.Numeric(true)).ValidateAsSuccess();
+
+        ((int?)0).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((int?)123).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((int?)-123).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((int?)int.MinValue).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((int?)int.MaxValue).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((long?)null).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((long?)0).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((long?)123).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((long?)-123).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((long?)long.MinValue).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((long?)long.MaxValue).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((decimal?)null).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((decimal?)0).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((decimal?)123.45M).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((decimal?)-123.45M).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((decimal?)decimal.MinValue).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+        ((decimal?)decimal.MaxValue).Validator(c => c.Numeric(true)).ValidateAsSuccess();
+
+        0.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        123.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        (-123).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        int.MinValue.Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        int.MaxValue.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        0L.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        123L.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        (-123L).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        long.MinValue.Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        long.MaxValue.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        0.0M.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        123.45M.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        (-123.45M).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        decimal.MinValue.Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        decimal.MaxValue.Validator(c => c.Numeric(false)).ValidateAsSuccess();
+
+        ((int?)null).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((int?)0).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((int?)123).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((int?)-123).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        ((int?)int.MinValue).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        ((int?)int.MaxValue).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((long?)null).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((long?)0).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((long?)123).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((long?)-123).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        ((long?)long.MinValue).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        ((long?)long.MaxValue).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((decimal?)null).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((decimal?)0).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((decimal?)123.45M).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+        ((decimal?)-123.45M).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        ((decimal?)decimal.MinValue).Validator(c => c.Numeric(false)).ValidateAsError("must not be negative.");
+        ((decimal?)decimal.MaxValue).Validator(c => c.Numeric(false)).ValidateAsSuccess();
+    }
+
+    [Test]
+    public void Positive()
+    {
+        0.Validator(c => c.Positive()).ValidateAsSuccess();
+        123.Validator(c => c.Positive()).ValidateAsSuccess();
+        (-123).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        int.MinValue.Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        int.MaxValue.Validator(c => c.Positive()).ValidateAsSuccess();
+        0L.Validator(c => c.Positive()).ValidateAsSuccess();
+        123L.Validator(c => c.Positive()).ValidateAsSuccess();
+        (-123L).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        long.MinValue.Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        long.MaxValue.Validator(c => c.Positive()).ValidateAsSuccess();
+        0.0M.Validator(c => c.Positive()).ValidateAsSuccess();
+        123.45M.Validator(c => c.Positive()).ValidateAsSuccess();
+        (-123.45M).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        decimal.MinValue.Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        decimal.MaxValue.Validator(c => c.Positive()).ValidateAsSuccess();
+
+        ((int?)null).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((int?)0).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((int?)123).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((int?)-123).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        ((int?)int.MinValue).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        ((int?)int.MaxValue).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((long?)null).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((long?)0).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((long?)123).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((long?)-123).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        ((long?)long.MinValue).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        ((long?)long.MaxValue).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((decimal?)null).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((decimal?)0).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((decimal?)123.45M).Validator(c => c.Positive()).ValidateAsSuccess();
+        ((decimal?)-123.45M).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        ((decimal?)decimal.MinValue).Validator(c => c.Positive()).ValidateAsError("must not be negative.");
+        ((decimal?)decimal.MaxValue).Validator(c => c.Positive()).ValidateAsSuccess();
+    }
+}
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/StringRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/StringRuleTests.cs
new file mode 100644
index 00000000..dd6f921e
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/StringRuleTests.cs
@@ -0,0 +1,109 @@
+using System.Text.RegularExpressions;
+
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class StringRuleTests
+{
+    [Test]
+    public void String_MaximumLength()
+    {
+        ((string?)null).Validator(c => c.String(3)).ValidateAsSuccess();
+        "".Validator(c => c.String(3)).ValidateAsSuccess();
+        "abc".Validator(c => c.String(3)).ValidateAsSuccess();
+
+        "abcd".Validator(c => c.String(3)).ValidateAsError(" must not exceed 3 character(s) in length.");
+    }
+
+    [Test]
+    public void String_MinimumLength()
+    {
+        ((string?)null).Validator(c => c.String(1, null)).ValidateAsSuccess();
+        "abc".Validator(c => c.String(2, null)).ValidateAsSuccess();
+        "ab".Validator(c => c.String(2, null)).ValidateAsSuccess();
+
+        "".Validator(c => c.String(1, null)).ValidateAsError(" must be at least 1 character(s) in length.");
+        "a".Validator(c => c.String(2, null)).ValidateAsError(" must be at least 2 character(s) in length.");
+    }
+
+    [Test]
+    public void String_MinimumMaximumLength()
+    {
+        ((string?)null).Validator(c => c.String(1, 3)).ValidateAsSuccess();
+        "a".Validator(c => c.String(1, 3)).ValidateAsSuccess();
+        "ab".Validator(c => c.String(1, 3)).ValidateAsSuccess();
+        "abc".Validator(c => c.String(1, 3)).ValidateAsSuccess();
+
+        "".Validator(c => c.String(1, 3)).ValidateAsError(" must be at least 1 character(s) in length.");
+        "abcd".Validator(c => c.String(1, 3)).ValidateAsError(" must not exceed 3 character(s) in length.");
+    }
+
+    [Test]
+    public void String_ExactLength()
+    {
+        ((string?)null).Validator(c => c.String(3, 3)).ValidateAsSuccess();
+        "abc".Validator(c => c.String(3, 3)).ValidateAsSuccess();
+
+        "".Validator(c => c.String(3, 3)).ValidateAsError("must be exactly 3 character(s) in length.");
+        "ab".Validator(c => c.String(3, 3)).ValidateAsError("must be exactly 3 character(s) in length.");
+        "abcd".Validator(c => c.String(3, 3)).ValidateAsError("must be exactly 3 character(s) in length.");
+    }
+
+    [Test]
+    public void String_Regex()
+    {
+        var regex = new Regex(@"^\w+$");
+
+        ((string?)null).Validator(c => c.String(regex)).ValidateAsSuccess();
+        "abc123".Validator(c => c.String(regex)).ValidateAsSuccess();
+
+        "".Validator(c => c.String(regex)).ValidateAsError(" is invalid.");
+        "abc 123".Validator(c => c.String(regex)).ValidateAsError(" is invalid.");
+        "abc 123".Validator(c => c.String(regex).WithMessage("No matchy matchy!")).ValidateAsError("No matchy matchy!");
+    }
+
+    [Test]
+    public void MaximumLength()
+    {
+        ((string?)null).Validator(c => c.MaximumLength(3)).ValidateAsSuccess();
+        "".Validator(c => c.MaximumLength(3)).ValidateAsSuccess();
+        "abc".Validator(c => c.MaximumLength(3)).ValidateAsSuccess();
+
+        "abcd".Validator(c => c.MaximumLength(3)).ValidateAsError(" must not exceed 3 character(s) in length.");
+    }
+
+    [Test]
+    public void MinimumLength()
+    {
+        ((string?)null).Validator(c => c.MinimumLength(1)).ValidateAsSuccess();
+        "abc".Validator(c => c.MinimumLength(2)).ValidateAsSuccess();
+        "ab".Validator(c => c.MinimumLength(2)).ValidateAsSuccess();
+
+        "".Validator(c => c.MinimumLength(1)).ValidateAsError(" must be at least 1 character(s) in length.");
+        "a".Validator(c => c.MinimumLength(2)).ValidateAsError(" must be at least 2 character(s) in length.");
+    }
+
+    [Test]
+    public void Length()
+    {
+        ((string?)null).Validator(c => c.Length(3)).ValidateAsSuccess();
+        "abc".Validator(c => c.Length(3)).ValidateAsSuccess();
+
+        "".Validator(c => c.Length(3)).ValidateAsError("must be exactly 3 character(s) in length.");
+        "ab".Validator(c => c.Length(3)).ValidateAsError("must be exactly 3 character(s) in length.");
+        "abcd".Validator(c => c.Length(3)).ValidateAsError("must be exactly 3 character(s) in length.");
+    }
+
+    [Test]
+    public void Matches()
+    {
+        var regex = new Regex(@"^\w+$");
+
+        ((string?)null).Validator(c => c.Matches(regex)).ValidateAsSuccess();
+        "abc123".Validator(c => c.Matches(regex)).ValidateAsSuccess();
+
+        "".Validator(c => c.Matches(regex)).ValidateAsError(" is invalid.");
+        "abc 123".Validator(c => c.Matches(regex)).ValidateAsError(" is invalid.");
+        "abc 123".Validator(c => c.Matches(regex).WithMessage("No matchy matchy!")).ValidateAsError("No matchy matchy!");
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/Rules/WildcardRuleTests.cs b/tests/CoreEx.Validation.Test.Unit/Rules/WildcardRuleTests.cs
new file mode 100644
index 00000000..896bf539
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/Rules/WildcardRuleTests.cs
@@ -0,0 +1,20 @@
+namespace CoreEx.Validation.Test.Unit.Rules;
+
+[TestFixture]
+public class WildcardRuleTests
+{
+    [Test]
+    public void Wildcard()
+    {
+        ((string?)null).Validator(c => c.Wildcard()).ValidateAsSuccess();
+        "xxx".Validator(c => c.Wildcard()).ValidateAsSuccess();
+        "*xxx".Validator(c => c.Wildcard()).ValidateAsSuccess();
+        "xxx*".Validator(c => c.Wildcard()).ValidateAsSuccess();
+        "*xxx*".Validator(c => c.Wildcard()).ValidateAsSuccess();
+
+        "x*x".Validator(c => c.Wildcard()).ValidateAsError("contains invalid or non-supported wildcard selection.");
+        "x*x".Validator(c => c.Wildcard(Wildcards.Wildcard.MultiAll)).ValidateAsSuccess();
+        "x?x".Validator(c => c.Wildcard(_ => Wildcards.Wildcard.MultiAll)).ValidateAsError("contains invalid or non-supported wildcard selection.");
+        "x?x".Validator(c => c.Wildcard(Wildcards.Wildcard.BothAll)).ValidateAsSuccess();
+    }
+}
\ No newline at end of file
diff --git a/tests/CoreEx.Validation.Test.Unit/ValidatorTests.cs b/tests/CoreEx.Validation.Test.Unit/ValidatorTests.cs
new file mode 100644
index 00000000..a1f4eab9
--- /dev/null
+++ b/tests/CoreEx.Validation.Test.Unit/ValidatorTests.cs
@@ -0,0 +1,153 @@
+using CoreEx.Entities;
+using CoreEx.Localization;
+using System.ComponentModel.DataAnnotations;
+using System.Globalization;
+
+namespace CoreEx.Validation.Test.Unit;
+
+public class ValidatorTests
+{
+    [Test]
+    public void BaseValidator_Include()
+    {
+        var p = new Person(1) { Name = "a", Code = "b", Age = 2 };
+        var pv = new PersonValidator();
+
+        pv.ValidateAsSuccess(p);
+
+        // Verify base validator.
+        p.Name = "c";
+        pv.ValidateAsError(p, "name", "Name must be between 'a' and 'b'.");
+
+        // Verify main validator.
+        p.Name = "a";
+        p.Code = "c";
+        pv.ValidateAsError(p, "code", "Code must be between 'a' and 'b'.");
+    }
+
+    [Test]
+    public void InlineValidator_Include()
+    {
+        var p = new Person(1) { Name = "a", Code = "b", Age = 2 };
+
+        var pb = Validator.Create<PersonBase>()
+            .HasProperty(p => p.Id, p => p.Between(1, 2))
+            .HasProperty(p => p.Name, p => p.MaximumLength(10).Between("a", "b"));
+
+        var pv = Validator.Create<Person>()
+            .Include(pb)
+            .HasProperty(p => p.Code, p => p.Mandatory().Between("a", "b"))
+            .HasProperty(p => p.Age, p => p.Mandatory().Between(1, 4).DependsOn(p => p.Code).WhenValue(v => v == 2).Between(1, 4));
+
+        pv.ValidateAsSuccess(p);
+
+        // Verify base validator.
+        p.Name = "c";
+        pv.ValidateAsError(p, "name", "Name must be between 'a' and 'b'.");
+
+        // Verify main validator.
+        p.Name = "a";
+        p.Code = "c";
+        pv.ValidateAsError(p, "code", "Code must be between 'a' and 'b'.");
+    }
+
+    [Test]
+    public void WithText()
+    {
+        var pv = Validator.Create<Person>().HasProperty(p => p.Name, c => c.WithText("Fullname").Mandatory());
+        pv.ValidateAsError(new Person(1), "name", "Fullname is required.");
+
+        // Verify Include also works.
+        var pb = Validator.Create<PersonBase>().HasProperty(p => p.Name, c => c.WithText("Fullname").Mandatory());
+        pv = Validator.Create<Person>().Include(pb);
+        pv.ValidateAsError(new Person(1), "name", "Fullname is required.");
+    }
+
+    [Test]
+    public void WithFormat_And_Localization()
+    {
+        var originalCulture = CultureInfo.CurrentCulture;
+        try
+        {
+            CultureInfo.CurrentCulture = new CultureInfo("en-US");
+
+            var pv = Validator.Create<Person>().HasProperty(p => p.Salary, c => c.Between(100000m, 200000m));
+            pv.ValidateAsError(new Person(1) { Salary = 99999m }, "salary", "Monies must be between '100000' and '200000'.");
+
+            pv = Validator.Create<Person>().HasProperty(p => p.Salary, c => c.WithFormat("C").Between(100000m, 200000m));
+            pv.ValidateAsError(new Person(1) { Salary = 99999m }, "salary", "Monies must be between '$100,000.00' and '$200,000.00'.");
+
+            pv = Validator.Create<Person>().HasProperty(p => p.Salary, c => c.WithFormat("{0:C}").Between(100000m, 200000m));
+            pv.ValidateAsError(new Person(1) { Salary = 99999m }, "salary", "Monies must be between '$100,000.00' and '$200,000.00'.");
+        }
+        finally
+        {
+            CultureInfo.CurrentCulture = originalCulture;
+        }
+    }
+
+    [Test]
+    public void WithFormat_Reflection()
+    {
+        var pv = Validator.Create<Person>().HasProperty(p => p.Age, c => c.Between(18, 60));
+        pv.ValidateAsError(new Person(1) { Age = 12 }, "age", "Age must be between '018' and '060'.");
+    }
+
+    [Test]
+    public void RuleSet()
+    {
+        var pv = Validator.Create<Person>()
+            .HasRuleSet(x => x.Value.Code == "A", c =>
+            {
+                c.HasProperty(p => p.Age, c => c.Equal(18));
+            })
+            .HasRuleSet(x => x.Value.Code == "B", c =>
+            {
+                c.HasProperty(p => p.Age, c => c.Equal(19, _ => "nineteen"));
+            });
+
+        pv.ValidateAsSuccess(new Person(1) { Code = "A", Age = 18 });
+        pv.ValidateAsSuccess(new Person(1) { Code = "B", Age = 19 });
+        pv.ValidateAsSuccess(new Person(1) { Code = "C", Age = 20 });
+
+        pv.ValidateAsError(new Person(1) { Code = "A", Age = 19 }, "age", "Age must be equal to '018'.");
+        pv.ValidateAsError(new Person(1) { Code = "B", Age = 18 }, "age", "Age must be equal to nineteen.");
+    }
+
+    private class PersonBase(int id) : IReadOnlyIdentifier<int>
+    {
+        public int Id { get; } = id;
+
+        public string? Name { get; set; }
+    }
+
+    private class Person(int id) : PersonBase(id)
+    {
+        public string Code { get; set; } = "A";
+
+        [DisplayFormat(DataFormatString = "{0:D3}")]
+        public int? Age { get; set; }
+
+        [Localization("Monies")]
+        public decimal Salary { get; init; }
+    }
+
+    private class PersonBaseValidator : Validator<PersonBase>
+    {
+        public PersonBaseValidator()
+        {
+            Property(p => p.Id).Between(1, 2);
+            Property(p => p.Name).MaximumLength(10).Between("a", "b");
+        }
+    }
+
+    private class PersonValidator : Validator<Person>
+    {
+        public PersonValidator()
+        {
+            Include(new PersonBaseValidator());
+            Property(p => p.Code).Mandatory().Between("a", "b");
+            Property(p => p.Age).Between(1, 4).Mandatory().DependsOn(p => p.Code).WhenValue(v => v == 2).Between(1, 4);
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/CoreEx.Tooling.Console/CoreEx.Tooling.Console.csproj b/tools/CoreEx.Tooling.Console/CoreEx.Tooling.Console.csproj
new file mode 100644
index 00000000..c051c408
--- /dev/null
+++ b/tools/CoreEx.Tooling.Console/CoreEx.Tooling.Console.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\CoreEx.CodeGen\CoreEx.CodeGen.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/tools/CoreEx.Tooling.Console/Program.cs b/tools/CoreEx.Tooling.Console/Program.cs
new file mode 100644
index 00000000..790a542f
--- /dev/null
+++ b/tools/CoreEx.Tooling.Console/Program.cs
@@ -0,0 +1,16 @@
+using OnRamp.Utility;
+using CoreEx.CodeGen.RefData.Config;
+
+if (args.Length == 1)
+{
+    switch (args[0].ToUpperInvariant())
+    {
+        case "--GENERATE-JSON-SCHEMA":
+            JsonSchemaGenerator.Generate<CodeGenConfig>("../../schema/coreex-refdata.json", "JSON Schema for CoreEx code-generation (https://github.com/avanade/coreex).");
+            break;
+
+        case "--GENERATE-DOC-MARKDOWN":
+            MarkdownDocumentationGenerator.Generate<CodeGenConfig>(null, "../../src/CoreEx.CodeGen/docs");
+            break;
+    }
+}
\ No newline at end of file
diff --git a/tools/CoreEx.Tooling.Console/generate.ps1 b/tools/CoreEx.Tooling.Console/generate.ps1
new file mode 100644
index 00000000..689bfaa2
--- /dev/null
+++ b/tools/CoreEx.Tooling.Console/generate.ps1
@@ -0,0 +1,2 @@
+dotnet run --no-launch-profile -- --generate-json-schema
+dotnet run --no-build --no-launch-profile -- --generate-doc-markdown
\ No newline at end of file
diff --git a/tools/validate-template-pack.ps1 b/tools/validate-template-pack.ps1
new file mode 100644
index 00000000..7281b9cb
--- /dev/null
+++ b/tools/validate-template-pack.ps1
@@ -0,0 +1,227 @@
+#!/usr/bin/env pwsh
+<#
+.SYNOPSIS
+Validates the CoreEx.Template pack by scaffolding and building all required template combinations.
+
+.DESCRIPTION
+This script validates the CoreEx.Template pack by:
+1. Building the template package
+2. Installing it locally
+3. Scaffolding each template combination with the specified parameters
+4. Verifying each generated solution builds and tests successfully
+5. Cleaning up temporary test directories
+
+.PARAMETER SkipCleanup
+If specified, temporary test directories are not cleaned up after validation.
+
+.PARAMETER NoRebuild
+If specified, the template pack is not rebuilt before validation.
+
+.EXAMPLE
+.\validate-template-pack.ps1
+.\validate-template-pack.ps1 -SkipCleanup
+#>
+
+[CmdletBinding()]
+param(
+    [switch]$SkipCleanup = $false,
+    [switch]$NoRebuild = $false
+)
+
+$ErrorActionPreference = "Stop"
+$VerbosePreference = "Continue"
+
+$repoRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
+$templateProjectPath = Join-Path $repoRoot "src/CoreEx.Template"
+$temporaryTestRoot = Join-Path $repoRoot "artifacts/template-validation-test-$(Get-Date -Format 'yyyyMMdd-HHmmss')"
+$nugetCacheDir = Join-Path $env:USERPROFILE ".nuget/packages"
+
+Write-Verbose "Repository root: $repoRoot"
+Write-Verbose "Template project: $templateProjectPath"
+Write-Verbose "Test root: $temporaryTestRoot"
+
+# Define test scenarios
+$testScenarios = @(
+    @{
+        Name = "coreex-fullstack"
+        Template = "coreex"
+        Parameters = @{
+            "data-provider" = "SqlServer"
+            "messaging-provider" = "ServiceBus"
+            "refdata-enabled" = "true"
+            "rop-enabled" = "false"
+            "domain-driven-enabled" = "false"
+            "outbox-enabled" = "true"
+        }
+        TestPath = "test-fullstack"
+    },
+    @{
+        Name = "coreex-api-with-refdata"
+        Template = "coreex-api"
+        Parameters = @{
+            "data-provider" = "SqlServer"
+            "refdata-enabled" = "true"
+        }
+        TestPath = "test-api-refdata"
+    },
+    @{
+        Name = "coreex-relay-with-servicebus"
+        Template = "coreex-relay"
+        Parameters = @{
+            "data-provider" = "SqlServer"
+            "messaging-provider" = "ServiceBus"
+        }
+        TestPath = "test-relay-servicebus"
+    },
+    @{
+        Name = "coreex-subscriber-with-refdata"
+        Template = "coreex-subscriber"
+        Parameters = @{
+            "data-provider" = "SqlServer"
+            "messaging-provider" = "ServiceBus"
+            "refdata-enabled" = "true"
+        }
+        TestPath = "test-subscriber-refdata"
+    }
+)
+
+function Write-Header {
+    param([string]$Message)
+    Write-Output ""
+    Write-Output "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    Write-Output $Message
+    Write-Output "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+}
+
+function Write-Success {
+    param([string]$Message)
+    Write-Host "✓ $Message" -ForegroundColor Green
+}
+
+function Write-Error-Custom {
+    param([string]$Message)
+    Write-Host "✗ $Message" -ForegroundColor Red
+}
+
+try {
+    # Step 1: Build and pack the template
+    Write-Header "Building CoreEx.Template package"
+    
+    if (-not $NoRebuild) {
+        Push-Location $templateProjectPath
+        Write-Verbose "Running: dotnet pack"
+        dotnet pack -c Release
+        if ($LASTEXITCODE -ne 0) {
+            throw "Failed to pack CoreEx.Template"
+        }
+        Pop-Location
+        Write-Success "Template packed successfully"
+    }
+
+    # Step 2: Get the template package path
+    $nupkgPattern = Join-Path $templateProjectPath "bin/Release/CoreEx.Template.*.nupkg" | Resolve-Path
+    $nupkgFile = @($nupkgPattern)[0]
+    if (-not (Test-Path $nupkgFile)) {
+        throw "Template package not found: $nupkgPattern"
+    }
+    Write-Verbose "Using template package: $nupkgFile"
+
+    # Step 3: Create test root
+    Write-Header "Creating test environment"
+    New-Item -ItemType Directory -Path $temporaryTestRoot -Force | Out-Null
+    Write-Success "Test root created: $temporaryTestRoot"
+
+    # Step 4: Run test scenarios
+    Write-Header "Running template validation scenarios"
+    
+    $failedScenarios = @()
+    
+    foreach ($scenario in $testScenarios) {
+        Write-Output ""
+        Write-Output "Testing: $($scenario.Name)"
+        Write-Output "  Template: $($scenario.Template)"
+        Write-Output "  Parameters: $(($scenario.Parameters | ConvertTo-Json -Compress))"
+        
+        $testDir = Join-Path $temporaryTestRoot $scenario.TestPath
+        
+        try {
+            # Create test directory
+            New-Item -ItemType Directory -Path $testDir -Force | Out-Null
+            
+            # Build the dotnet new command with parameters
+            $newCommand = "dotnet new $($scenario.Template) --output `"$testDir`" --force"
+            foreach ($param in $scenario.Parameters.GetEnumerator()) {
+                $newCommand += " --$($param.Key) `"$($param.Value)`""
+            }
+            
+            # Scaffold the template
+            Write-Verbose "Running: $newCommand"
+            Invoke-Expression $newCommand
+            if ($LASTEXITCODE -ne 0) {
+                throw "Template scaffolding failed"
+            }
+            
+            # For API, Relay, and Subscriber, verify basic compilation
+            if ($scenario.Template -in @("coreex-api", "coreex-relay", "coreex-subscriber")) {
+                # Verify the generated files compile
+                $projFile = Get-ChildItem -Path $testDir -Filter "*.csproj" -Recurse | Select-Object -First 1
+                if ($projFile) {
+                    Write-Verbose "Validating: $($projFile.FullName)"
+                    # Just check if dotnet can load the project without building the entire solution
+                    $dotnetListPropsResult = & dotnet list `"$($projFile.FullName)`" --format json 2>&1 | Out-String
+                    if ($LASTEXITCODE -ne 0) {
+                        throw "Project file validation failed: $dotnetListPropsResult"
+                    }
+                }
+            }
+            
+            # For full solution (coreex), verify the solution can be loaded
+            if ($scenario.Template -eq "coreex") {
+                $slnFile = Get-ChildItem -Path $testDir -Filter "*.sln" -Recurse | Select-Object -First 1
+                if ($slnFile) {
+                    Write-Verbose "Validating solution: $($slnFile.FullName)"
+                    # Verify the solution exists and has projects
+                    $solutionContent = Get-Content $slnFile.FullName | Select-Object -First 10
+                    if ($solutionContent -notmatch 'Project') {
+                        throw "Solution file appears invalid"
+                    }
+                }
+            }
+            
+            Write-Success "$($scenario.Name) validated successfully"
+        }
+        catch {
+            Write-Error-Custom "$($scenario.Name) failed: $_"
+            $failedScenarios += $scenario.Name
+        }
+    }
+
+    # Step 5: Summary
+    Write-Header "Validation Summary"
+    
+    $passedCount = $testScenarios.Count - $failedScenarios.Count
+    $totalCount = $testScenarios.Count
+    
+    Write-Output "Passed: $passedCount / $totalCount"
+    
+    if ($failedScenarios.Count -gt 0) {
+        Write-Error-Custom "Failed scenarios:"
+        $failedScenarios | ForEach-Object { Write-Output "  - $_" }
+        throw "Template validation failed"
+    }
+    else {
+        Write-Success "All validation scenarios passed!"
+    }
+}
+finally {
+    # Cleanup
+    if (-not $SkipCleanup -and (Test-Path $temporaryTestRoot)) {
+        Write-Header "Cleaning up test environment"
+        Remove-Item -Path $temporaryTestRoot -Recurse -Force -ErrorAction SilentlyContinue
+        Write-Success "Test directory cleaned up: $temporaryTestRoot"
+    }
+    elseif ($SkipCleanup) {
+        Write-Output ""
+        Write-Output "Test directory preserved (--SkipCleanup): $temporaryTestRoot"
+    }
+}
diff --git a/tools/validate-template-pack.sh b/tools/validate-template-pack.sh
new file mode 100644
index 00000000..d8453294
--- /dev/null
+++ b/tools/validate-template-pack.sh
@@ -0,0 +1,202 @@
+#!/bin/bash
+set -e
+
+# Template Pack Validation Script for Linux/macOS
+# This script validates the CoreEx.Template pack by scaffolding and building test scenarios.
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(dirname "$SCRIPT_DIR")"
+TEMPLATE_PROJECT_PATH="$REPO_ROOT/src/CoreEx.Template"
+TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+TEMPORARY_TEST_ROOT="$REPO_ROOT/artifacts/template-validation-test-$TIMESTAMP"
+
+SKIP_CLEANUP=false
+NO_REBUILD=false
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --skip-cleanup)
+            SKIP_CLEANUP=true
+            shift
+            ;;
+        --no-rebuild)
+            NO_REBUILD=true
+            shift
+            ;;
+        *)
+            echo "Unknown option: $1"
+            exit 1
+            ;;
+    esac
+done
+
+# Color codes
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+NC='\033[0m' # No Color
+
+write_header() {
+    echo ""
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+    echo "$1"
+    echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+}
+
+write_success() {
+    echo -e "${GREEN}✓ $1${NC}"
+}
+
+write_error() {
+    echo -e "${RED}✗ $1${NC}"
+}
+
+echo "Repository root: $REPO_ROOT"
+echo "Template project: $TEMPLATE_PROJECT_PATH"
+echo "Test root: $TEMPORARY_TEST_ROOT"
+
+# Build and pack the template
+if [ "$NO_REBUILD" != "true" ]; then
+    write_header "Building CoreEx.Template package"
+    cd "$TEMPLATE_PROJECT_PATH"
+    dotnet pack -c Release
+    if [ $? -ne 0 ]; then
+        echo "Failed to pack CoreEx.Template"
+        exit 1
+    fi
+    cd - > /dev/null
+    write_success "Template packed successfully"
+fi
+
+# Get template package path
+NUPKG_FILE=$(find "$TEMPLATE_PROJECT_PATH/bin/Release" -name "CoreEx.Template.*.nupkg" -type f | head -1)
+if [ -z "$NUPKG_FILE" ] || [ ! -f "$NUPKG_FILE" ]; then
+    echo "Template package not found in $TEMPLATE_PROJECT_PATH/bin/Release"
+    exit 1
+fi
+echo "Using template package: $NUPKG_FILE"
+
+# Create test environment
+write_header "Creating test environment"
+mkdir -p "$TEMPORARY_TEST_ROOT"
+write_success "Test root created: $TEMPORARY_TEST_ROOT"
+
+# Define test scenarios
+declare -a scenarios
+declare -a scenario_names
+declare -a scenario_templates
+declare -a scenario_params
+
+# Scenario 1: coreex-fullstack
+scenarios[0]="test-fullstack"
+scenario_names[0]="coreex-fullstack"
+scenario_templates[0]="coreex"
+scenario_params[0]="--data-provider SqlServer --messaging-provider ServiceBus --refdata-enabled true --rop-enabled false --domain-driven-enabled false --outbox-enabled true"
+
+# Scenario 2: coreex-api-with-refdata
+scenarios[1]="test-api-refdata"
+scenario_names[1]="coreex-api-with-refdata"
+scenario_templates[1]="coreex-api"
+scenario_params[1]="--data-provider SqlServer --refdata-enabled true"
+
+# Scenario 3: coreex-relay-with-servicebus
+scenarios[2]="test-relay-servicebus"
+scenario_names[2]="coreex-relay-with-servicebus"
+scenario_templates[2]="coreex-relay"
+scenario_params[2]="--data-provider SqlServer --messaging-provider ServiceBus"
+
+# Scenario 4: coreex-subscriber-with-refdata
+scenarios[3]="test-subscriber-refdata"
+scenario_names[3]="coreex-subscriber-with-refdata"
+scenario_templates[3]="coreex-subscriber"
+scenario_params[3]="--data-provider SqlServer --messaging-provider ServiceBus --refdata-enabled true"
+
+# Run test scenarios
+write_header "Running template validation scenarios"
+
+FAILED_SCENARIOS=()
+SCENARIO_COUNT=${#scenarios[@]}
+
+for i in $(seq 0 $((SCENARIO_COUNT - 1))); do
+    TEST_DIR="$TEMPORARY_TEST_ROOT/${scenarios[$i]}"
+    SCENARIO_NAME="${scenario_names[$i]}"
+    TEMPLATE="${scenario_templates[$i]}"
+    PARAMS="${scenario_params[$i]}"
+    
+    echo ""
+    echo "Testing: $SCENARIO_NAME"
+    echo "  Template: $TEMPLATE"
+    echo "  Parameters: $PARAMS"
+    
+    mkdir -p "$TEST_DIR"
+    
+    # Scaffold the template
+    NEW_CMD="dotnet new $TEMPLATE --output \"$TEST_DIR\" --force $PARAMS"
+    eval "$NEW_CMD"
+    if [ $? -ne 0 ]; then
+        write_error "$SCENARIO_NAME failed: Template scaffolding failed"
+        FAILED_SCENARIOS+=("$SCENARIO_NAME")
+        continue
+    fi
+    
+    # Validate generated files for specific templates
+    if [[ "$TEMPLATE" == "coreex-api" || "$TEMPLATE" == "coreex-relay" || "$TEMPLATE" == "coreex-subscriber" ]]; then
+        # Find and validate .csproj file
+        PROJ_FILE=$(find "$TEST_DIR" -name "*.csproj" -type f | head -1)
+        if [ ! -z "$PROJ_FILE" ]; then
+            echo "Validating project: $PROJ_FILE"
+            dotnet list "$PROJ_FILE" --format json > /dev/null 2>&1
+            if [ $? -ne 0 ]; then
+                write_error "$SCENARIO_NAME failed: Project file validation failed"
+                FAILED_SCENARIOS+=("$SCENARIO_NAME")
+                continue
+            fi
+        fi
+    fi
+    
+    # Validate solution for full coreex template
+    if [[ "$TEMPLATE" == "coreex" ]]; then
+        SLN_FILE=$(find "$TEST_DIR" -name "*.sln" -type f | head -1)
+        if [ ! -z "$SLN_FILE" ]; then
+            echo "Validating solution: $SLN_FILE"
+            if ! grep -q "Project" "$SLN_FILE"; then
+                write_error "$SCENARIO_NAME failed: Solution file appears invalid"
+                FAILED_SCENARIOS+=("$SCENARIO_NAME")
+                continue
+            fi
+        fi
+    fi
+    
+    write_success "$SCENARIO_NAME validated successfully"
+done
+
+# Summary
+write_header "Validation Summary"
+
+PASSED_COUNT=$((SCENARIO_COUNT - ${#FAILED_SCENARIOS[@]}))
+echo "Passed: $PASSED_COUNT / $SCENARIO_COUNT"
+
+if [ ${#FAILED_SCENARIOS[@]} -gt 0 ]; then
+    write_error "Failed scenarios:"
+    for scenario in "${FAILED_SCENARIOS[@]}"; do
+        echo "  - $scenario"
+    done
+    EXIT_CODE=1
+else
+    write_success "All validation scenarios passed!"
+    EXIT_CODE=0
+fi
+
+# Cleanup
+if [ "$SKIP_CLEANUP" != "true" ] && [ -d "$TEMPORARY_TEST_ROOT" ]; then
+    write_header "Cleaning up test environment"
+    rm -rf "$TEMPORARY_TEST_ROOT"
+    write_success "Test directory cleaned up: $TEMPORARY_TEST_ROOT"
+else
+    if [ "$SKIP_CLEANUP" = "true" ]; then
+        echo ""
+        echo "Test directory preserved (--skip-cleanup): $TEMPORARY_TEST_ROOT"
+    fi
+fi
+
+exit $EXIT_CODE